From axeld at mail.berlios.de  Wed Aug  1 00:37:22 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 1 Aug 2007 00:37:22 +0200
Subject: [Haiku-commits] r21778 - haiku/trunk/build/jam
Message-ID: <200707312237.l6VMbMm2006309@sheep.berlios.de>

Author: axeld
Date: 2007-08-01 00:37:21 +0200 (Wed, 01 Aug 2007)
New Revision: 21778
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21778&view=rev

Modified:
   haiku/trunk/build/jam/MiscRules
Log:
bonefish: Fixed bug #1346. The relative output directory for the root directory was
computed as '.' which resulted in output path ending with '/.', causing mkdir to choke.


Modified: haiku/trunk/build/jam/MiscRules
===================================================================
--- haiku/trunk/build/jam/MiscRules	2007-07-31 21:50:28 UTC (rev 21777)
+++ haiku/trunk/build/jam/MiscRules	2007-07-31 22:37:21 UTC (rev 21778)
@@ -2,6 +2,9 @@
 rule SetupObjectsDir
 {
 	local relPath = [ FDirName $(SUBDIR_TOKENS[2-]) ] ;
+	if $(relPath) = . {
+		relPath = ;
+	}
 	COMMON_PLATFORM_LOCATE_TARGET =
 		[ FDirName $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) $(relPath) ] ;
 



From darkwyrm at earthlink.net  Wed Aug  1 00:54:17 2007
From: darkwyrm at earthlink.net (DarkWyrm)
Date: Tue, 31 Jul 2007 18:54:17 -0400 EDT
Subject: [Haiku-commits]
 =?windows-1252?q?r21760_-_in_haiku/trunk/src/add-?=
 =?windows-1252?q?ons/kernel/drivers/audio/ac97=3A_=2E_es1370?=
In-Reply-To: <1e80d8750707311322v263778dej7fdf3b85b638ff0a@mail.gmail.com>
Message-ID: <2356713435-BeMail@tourmalline>

> I will test with QEMU!
> 
> Maybe I can help in some way to add 1371 support - I enabled the
> device_id to see what would happen and it obviously crashed pretty
> badly ;) I see that the header has many of the constants already
> defined - I assume you used the freebsd driver for inspiration?
> 
> Maybe I can take a look at it myself a bit - but I'm really not very
> good at C/C++
According to my conversatioin yesterday with J?r?me, it partly works in 
QEMU and not at all in VMWare because QEMU emulates a 1370 and VMWare a 
1371. Over vacation last week I managed to stumble upon the specs for 
it. I'll see if I can dig them up and -- maybe -- even see if I can 
kick in a little help myself.

--DW


From geist at foobox.com  Wed Aug  1 10:01:43 2007
From: geist at foobox.com (Travis Geiselbrecht)
Date: Wed, 1 Aug 2007 01:01:43 -0700
Subject: [Haiku-commits] r21757 -
	haiku/trunk/src/add-ons/kernel/partitioning_systems/intel
In-Reply-To: <c47b1d430707310425t4a60a67fqa21c1d09271a39c@mail.gmail.com>
References: <200707301957.l6UJvpuE011879@sheep.berlios.de>
	<Pine.SOC.4.64.0707310346270.17536@bolero>
	<c47b1d430707310050y2aa1373ew9b6b1a744083ff96@mail.gmail.com>
	<Pine.SOC.4.64.0707311258370.12158@bolero>
	<c47b1d430707310425t4a60a67fqa21c1d09271a39c@mail.gmail.com>
Message-ID: <6D10F625-7526-4CAC-ADCA-29DEAA3BE17B@foobox.com>


On Jul 31, 2007, at 4:25 AM, J?r?me Duval wrote:

> 2007/7/31, Ingo Weinhold <bonefish at cs.tu-berlin.de>:
>> I meant your change. Since the compiler should be clever enough to
>> recognize that multiplying with 1 is a no-op, all that's left is the
>> promotion to double (instead of the previous cast to float).
>
> The compiler must use the op multiply with float, which is different
> from cast to float.
>
>>
>>> Could we link
>>> every kernel addon against libgcc.a ?
>>
>> We could. That will increase the size of the kernel modules, of  
>> course.
>>
>
> Even if they link to libgcc after kernel.so ?

That would be a very bad idea, since it would tie the addon to that  
precise version of the kernel. If it happened to get the symbol  
because that version of the kernel needed that particular routine,  
and then a later version didn't use it, it'd fail to load.

The point of libgcc.a is it's a collection of routines that the  
compiler emits calls to for pieces of code it decides for whatever  
reason it shouldn't inline. It doesn't tend to get called too often  
on x86, since there's an instruction for everything, but you can  
definitely see it when doing a bunch of 64bit routines on a 32bit  
x86. On other architectures, however, you may see it more often,  
especially if the instruction set is simpler (any floating point ops  
on a arm7 with no fpu, for example).

Since it contains a bunch of internal gcc routines, they are also by  
definition compiler version specific, so you should always link the  
libgcc that comes with the compiler actually emitting the code. Most  
of the time when on an existing platform compiling code for that  
platform it automatically links against libgcc for you.

For example on OSX x86 the last stage of gcc -v foo.c -o foo

  /usr/libexec/gcc/i686-apple-darwin8/4.0.1/collect2 -dynamic -arch  
i386 -weak_reference_mismatches non-weak -o foo -lcrt1.o -L/usr/lib/ 
gcc/i686-apple-darwin8/4.0.1 -L/usr/lib/gcc/i686-apple-darwin8/4.0.1 - 
L/usr/lib/gcc/i686-apple-darwin8/4.0.1/../../.. /var/tmp//ccuMEv4u.o - 
lgcc -lSystem

on linux x86:

/usr/libexec/gcc/i686-pc-linux-gnu/4.1.2/collect2 --eh-frame-hdr -m  
elf_i386 -dynamic-linker /lib/ld-linux.so.2 -o foo /usr/lib/gcc/i686- 
pc-linux-gnu/4.1.2/../../../crt1.o /usr/lib/gcc/i686-pc-linux-gnu/ 
4.1.2/../../../crti.o /usr/lib/gcc/i686-pc-linux-gnu/4.1.2/crtbegin.o  
-L/usr/lib/gcc/i686-pc-linux-gnu/4.1.2 -L/usr/lib/gcc/i686-pc-linux- 
gnu/4.1.2 -L/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/../../../../i686-pc- 
linux-gnu/lib -L/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/../../.. /tmp/ 
ccoZfFGI.o -lgcc --as-needed -lgcc_s --no-as-needed -lc -lgcc --as- 
needed -lgcc_s --no-as-needed /usr/lib/gcc/i686-pc-linux-gnu/4.1.2/ 
crtend.o /usr/lib/gcc/i686-pc-linux-gnu/4.1.2/../../../crtn.o

both have a -lgcc, though linux has some sort of shared libgcc thing  
going on.

Travis






From korli at users.berlios.de  Wed Aug  1 10:40:12 2007
From: korli at users.berlios.de (=?ISO-8859-1?Q?J=E9r=F4me_Duval?=)
Date: Wed, 1 Aug 2007 10:40:12 +0200
Subject: [Haiku-commits] r21757 -
	haiku/trunk/src/add-ons/kernel/partitioning_systems/intel
In-Reply-To: <6D10F625-7526-4CAC-ADCA-29DEAA3BE17B@foobox.com>
References: <200707301957.l6UJvpuE011879@sheep.berlios.de>
	<Pine.SOC.4.64.0707310346270.17536@bolero>
	<c47b1d430707310050y2aa1373ew9b6b1a744083ff96@mail.gmail.com>
	<Pine.SOC.4.64.0707311258370.12158@bolero>
	<c47b1d430707310425t4a60a67fqa21c1d09271a39c@mail.gmail.com>
	<6D10F625-7526-4CAC-ADCA-29DEAA3BE17B@foobox.com>
Message-ID: <c47b1d430708010140s702c6ad3x7e9c43278126b07e@mail.gmail.com>

2007/8/1, Travis Geiselbrecht <geist at foobox.com>:
> > Even if they link to libgcc after kernel.so ?
>
> That would be a very bad idea, since it would tie the addon to that
> precise version of the kernel. If it happened to get the symbol
> because that version of the kernel needed that particular routine,
> and then a later version didn't use it, it'd fail to load.

Indeed.

>
> The point of libgcc.a is it's a collection of routines that the
> compiler emits calls to for pieces of code it decides for whatever
> reason it shouldn't inline. It doesn't tend to get called too often
> on x86, since there's an instruction for everything, but you can
> definitely see it when doing a bunch of 64bit routines on a 32bit
> x86. On other architectures, however, you may see it more often,
> especially if the instruction set is simpler (any floating point ops
> on a arm7 with no fpu, for example).

Thanks for explaining.

>
> Since it contains a bunch of internal gcc routines, they are also by
> definition compiler version specific, so you should always link the
> libgcc that comes with the compiler actually emitting the code. Most
> of the time when on an existing platform compiling code for that
> platform it automatically links against libgcc for you.

The current KernelAddon rule defines linking against custom libs and kernel.so.
You're suggesting to define linking against libgcc.a, custom libs and
kernel.so ?

Bye,
J?r?me


From korli at users.berlios.de  Wed Aug  1 11:08:26 2007
From: korli at users.berlios.de (=?ISO-8859-1?Q?J=E9r=F4me_Duval?=)
Date: Wed, 1 Aug 2007 11:08:26 +0200
Subject: [Haiku-commits] r21760 - in
	haiku/trunk/src/add-ons/kernel/drivers/audio/ac97: . es1370
In-Reply-To: <2356713435-BeMail@tourmalline>
References: <1e80d8750707311322v263778dej7fdf3b85b638ff0a@mail.gmail.com>
	<2356713435-BeMail@tourmalline>
Message-ID: <c47b1d430708010208o20277ebcw8e74e25a1d3a2c7d@mail.gmail.com>

2007/8/1, DarkWyrm <darkwyrm at earthlink.net>:
> According to my conversatioin yesterday with J?r?me, it partly works in
> QEMU and not at all in VMWare because QEMU emulates a 1370 and VMWare a
> 1371. Over vacation last week I managed to stumble upon the specs for
> it. I'll see if I can dig them up and -- maybe -- even see if I can
> kick in a little help myself.
>

Thanks for digging up. If you don't come to me before, I'll try to
make it support 1371, when I have time.

Bye,
J?r?me


From bonefish at cs.tu-berlin.de  Wed Aug  1 14:02:45 2007
From: bonefish at cs.tu-berlin.de (Ingo Weinhold)
Date: Wed, 1 Aug 2007 14:02:45 +0200 (MEST)
Subject: [Haiku-commits] r21757 -
	haiku/trunk/src/add-ons/kernel/partitioning_systems/intel
In-Reply-To: <c47b1d430708010140s702c6ad3x7e9c43278126b07e@mail.gmail.com>
References: <200707301957.l6UJvpuE011879@sheep.berlios.de>
	<Pine.SOC.4.64.0707310346270.17536@bolero>
	<c47b1d430707310050y2aa1373ew9b6b1a744083ff96@mail.gmail.com>
	<Pine.SOC.4.64.0707311258370.12158@bolero>
	<c47b1d430707310425t4a60a67fqa21c1d09271a39c@mail.gmail.com>
	<6D10F625-7526-4CAC-ADCA-29DEAA3BE17B@foobox.com>
	<c47b1d430708010140s702c6ad3x7e9c43278126b07e@mail.gmail.com>
Message-ID: <Pine.SOC.4.64.0708011352580.29009@bolero>

On Wed, 1 Aug 2007, J?r?me Duval wrote:

> 2007/8/1, Travis Geiselbrecht <geist at foobox.com>:
>>
>> Since it contains a bunch of internal gcc routines, they are also by
>> definition compiler version specific, so you should always link the
>> libgcc that comes with the compiler actually emitting the code. Most
>> of the time when on an existing platform compiling code for that
>> platform it automatically links against libgcc for you.
>
> The current KernelAddon rule defines linking against custom libs and kernel.so.
> You're suggesting to define linking against libgcc.a, custom libs and
> kernel.so ?

I would add $(HAIKU_GCC_LIBGCC) to HAIKU_KERNEL_ADDON_END_GLUE_CODE 
(before crtend.o). I would have done this already, but I only have my 
not so amazingly fast laptop at hand and testing the change would at 
least require a full build. If you feel like doing that, please go ahead. 
There are probably a few kernel add-ons, that do already link manually 
against libgcc. Those should, of course, no longer do that (they can be 
tracked down easily by adding output to the KernelAddon rule).

CU, Ingo

From axeld at mail.berlios.de  Wed Aug  1 16:28:50 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 1 Aug 2007 16:28:50 +0200
Subject: [Haiku-commits] r21779 - haiku/trunk/headers/private/kernel/util
Message-ID: <200708011428.l71ESok7022302@sheep.berlios.de>

Author: axeld
Date: 2007-08-01 16:28:50 +0200 (Wed, 01 Aug 2007)
New Revision: 21779
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21779&view=rev

Modified:
   haiku/trunk/headers/private/kernel/util/DoublyLinkedList.h
Log:
* Added the default constructor to the Iterator class.
* Added a Current() method to the same class that returns the current element again.


Modified: haiku/trunk/headers/private/kernel/util/DoublyLinkedList.h
===================================================================
--- haiku/trunk/headers/private/kernel/util/DoublyLinkedList.h	2007-07-31 22:37:21 UTC (rev 21778)
+++ haiku/trunk/headers/private/kernel/util/DoublyLinkedList.h	2007-08-01 14:28:50 UTC (rev 21779)
@@ -123,6 +123,10 @@
 			Rewind();
 		}
 
+		Iterator()
+		{
+		}
+
 		Iterator(const Iterator &other)
 		{
 			*this = other;
@@ -141,6 +145,11 @@
 			return fCurrent;
 		}
 
+		Element *Current()
+		{
+			return fCurrent;
+		}
+
 		Element *Remove()
 		{
 			Element *element = fCurrent;



From axeld at mail.berlios.de  Wed Aug  1 16:48:50 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 1 Aug 2007 16:48:50 +0200
Subject: [Haiku-commits] r21780 - in haiku/trunk: headers/os/drivers
	headers/private/kernel headers/private/kernel/fs
	src/kits/storage src/system/kernel src/system/kernel/fs
Message-ID: <200708011448.l71EmoKJ024236@sheep.berlios.de>

Author: axeld
Date: 2007-08-01 16:48:44 +0200 (Wed, 01 Aug 2007)
New Revision: 21780
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21780&view=rev

Removed:
   haiku/trunk/headers/os/drivers/node_monitor.h
Modified:
   haiku/trunk/headers/private/kernel/Notifications.h
   haiku/trunk/headers/private/kernel/fs/node_monitor.h
   haiku/trunk/headers/private/kernel/syscalls.h
   haiku/trunk/src/kits/storage/NodeMonitor.cpp
   haiku/trunk/src/system/kernel/Notifications.cpp
   haiku/trunk/src/system/kernel/fs/Jamfile
   haiku/trunk/src/system/kernel/fs/node_monitor.cpp
Log:
bonefish+axeld:
* Simplified the notification framework: removed the updater stuff completely;
  it was only there to account for some peculiarities of the node monitor which
  we now solved differently.
* NotificationListener no longer includes a doubly linked list link for convenience;
  it might want to listen to more than just one service.
* NotificationService cannot have an abstract destructor.
* Changed the _user_stop_watching() syscall to mirror the Be API; ie. it's no
  longer possible to just remove some flags separately, just to stop listening
  completely.
* Adapted the node monitor implementation to live in the NodeMonitorService class
  that uses the new notification framework.
* Removed the public kernel node monitor API - it wasn't useful that way since you
  couldn't do a lot with the KMessage in the kernel without using a private API.
  Now you will have to use the (private) notification manager to use the node monitor
  from inside the kernel. At a later point, we might introduce a public API for that,
  too.


Deleted: haiku/trunk/headers/os/drivers/node_monitor.h

Modified: haiku/trunk/headers/private/kernel/Notifications.h
===================================================================
--- haiku/trunk/headers/private/kernel/Notifications.h	2007-08-01 14:28:50 UTC (rev 21779)
+++ haiku/trunk/headers/private/kernel/Notifications.h	2007-08-01 14:48:44 UTC (rev 21780)
@@ -22,21 +22,24 @@
 #include <Referenceable.h>
 
 #include <util/AutoLock.h>
-#include <util/DoublyLinkedList.h>
 #include <util/KMessage.h>
 #include <util/OpenHashTable.h>
 
 
 class NotificationService;
 
-class NotificationListener
-	: public DoublyLinkedListLinkImpl<NotificationListener> {
+class NotificationListener {
 	public:
 		virtual ~NotificationListener();
 
 		virtual void EventOccured(NotificationService& service,
 			const KMessage* event);
-		virtual void AllListenersNotified();
+		virtual void AllListenersNotified(NotificationService& service);
+
+		virtual bool operator==(const NotificationListener& other) const;
+
+		bool operator!=(const NotificationListener& other) const
+			{ return !(*this == other); }
 };
 
 class UserMessagingMessageSender {
@@ -64,10 +67,10 @@
 
 		virtual void EventOccured(NotificationService& service,
 			const KMessage* event);
-		virtual void AllListenersNotified();
+		virtual void AllListenersNotified(NotificationService& service);
 
-		port_id Port()	{ return fPort; }
-		int32 Token()	{ return fToken; }
+		port_id Port() const	{ return fPort; }
+		int32 Token() const		{ return fToken; }
 
 	private:
 		UserMessagingMessageSender&	fSender;
@@ -75,55 +78,16 @@
 		int32						fToken;
 };
 
-class NotificationListenerUpdater {
-	public:
-		enum update_action {
-			UPDATED,
-			SKIP,
-			DELETE,
-			REMOVE
-		};
-
-		NotificationListenerUpdater(const KMessage* eventSpecifier);
-		virtual ~NotificationListenerUpdater();
-
-		virtual status_t UpdateListener(NotificationListener& listener,
-			enum update_action& action);
-
-		virtual status_t CreateListener(NotificationListener** _listener);
-
-		virtual void SetEventSpecifier(const KMessage* eventSpecifier);
-		const KMessage* EventSpecifier() const	{ return fEventSpecifier; }
-
-	protected:
-		const KMessage* fEventSpecifier;
-};
-
-class UserMessagingListenerUpdater : public NotificationListenerUpdater {
-	public:
-		UserMessagingListenerUpdater(const KMessage* eventSpecifier, port_id port,
-			int32 token);
-
-		virtual status_t UpdateListener(NotificationListener& listener,
-			enum update_action& action);
-
-	protected:
-		virtual status_t UpdateListener(UserMessagingListener& listener,
-			enum update_action& action) = 0;
-
-		port_id	fPort;
-		int32	fToken;
-};
-
 class NotificationService : public Referenceable {
 	public:
-		virtual ~NotificationService() = 0;
+		virtual ~NotificationService();
 
 		virtual status_t AddListener(const KMessage* eventSpecifier,
 			NotificationListener& listener) = 0;
 		virtual status_t RemoveListener(const KMessage* eventSpecifier,
 			NotificationListener& listener) = 0;
-		virtual status_t UpdateListener(NotificationListenerUpdater& updater) = 0;
+		virtual status_t UpdateListener(const KMessage* eventSpecifier,
+			NotificationListener& listener) = 0;
 
 		virtual const char* Name() = 0;
 		HashTableLink<NotificationService>& Link() { return fLink; }
@@ -148,14 +112,14 @@
 		status_t AddListener(const char* service,
 			const KMessage* eventSpecifier, NotificationListener& listener);
 
-		status_t RemoveListener(const char* service, uint32 eventMask,
-			NotificationListener& listener);
+		status_t UpdateListener(const char* service,
+			uint32 eventMask, NotificationListener& listener);
+		status_t UpdateListener(const char* service,
+			const KMessage* eventSpecifier, NotificationListener& listener);
+
 		status_t RemoveListener(const char* service,
 			const KMessage* eventSpecifier, NotificationListener& listener);
 
-		status_t UpdateListener(const char* service,
-			NotificationListenerUpdater& updater);
-
 	private:
 		NotificationManager();
 		~NotificationManager();

Modified: haiku/trunk/headers/private/kernel/fs/node_monitor.h
===================================================================
--- haiku/trunk/headers/private/kernel/fs/node_monitor.h	2007-08-01 14:28:50 UTC (rev 21779)
+++ haiku/trunk/headers/private/kernel/fs/node_monitor.h	2007-08-01 14:48:44 UTC (rev 21780)
@@ -26,8 +26,8 @@
 extern status_t _user_stop_notifying(port_id port, uint32 token);
 extern status_t _user_start_watching(dev_t device, ino_t node, uint32 flags,
 					port_id port, uint32 token);
-extern status_t _user_stop_watching(dev_t device, ino_t node, uint32 flags,
-					port_id port, uint32 token);
+extern status_t _user_stop_watching(dev_t device, ino_t node, port_id port,
+					uint32 token);
 
 #ifdef __cplusplus
 }

Modified: haiku/trunk/headers/private/kernel/syscalls.h
===================================================================
--- haiku/trunk/headers/private/kernel/syscalls.h	2007-08-01 14:28:50 UTC (rev 21779)
+++ haiku/trunk/headers/private/kernel/syscalls.h	2007-08-01 14:48:44 UTC (rev 21780)
@@ -201,8 +201,8 @@
 extern status_t		_kern_stop_notifying(port_id port, uint32 token);
 extern status_t		_kern_start_watching(dev_t device, ino_t node, uint32 flags,
 						port_id port, uint32 token);
-extern status_t		_kern_stop_watching(dev_t device, ino_t node, uint32 flags,
-						port_id port, uint32 token);
+extern status_t		_kern_stop_watching(dev_t device, ino_t node, port_id port,
+						uint32 token);
 
 // time functions
 extern status_t		_kern_set_real_time_clock(uint32 time);

Modified: haiku/trunk/src/kits/storage/NodeMonitor.cpp
===================================================================
--- haiku/trunk/src/kits/storage/NodeMonitor.cpp	2007-08-01 14:28:50 UTC (rev 21779)
+++ haiku/trunk/src/kits/storage/NodeMonitor.cpp	2007-08-01 14:48:44 UTC (rev 21780)
@@ -56,7 +56,7 @@
 		if (node == NULL)
 			return B_BAD_VALUE;
 
-		return _kern_stop_watching(node->device, node->node, flags, port, token);
+		return _kern_stop_watching(node->device, node->node, port, token);
 	}
 
 	// subscribe to...

Modified: haiku/trunk/src/system/kernel/Notifications.cpp
===================================================================
--- haiku/trunk/src/system/kernel/Notifications.cpp	2007-08-01 14:28:50 UTC (rev 21779)
+++ haiku/trunk/src/system/kernel/Notifications.cpp	2007-08-01 14:48:44 UTC (rev 21780)
@@ -30,11 +30,18 @@
 
 
 void
-NotificationListener::AllListenersNotified()
+NotificationListener::AllListenersNotified(NotificationService& service)
 {
 }
 
 
+bool
+NotificationListener::operator==(const NotificationListener& other) const
+{
+	return &other == this;
+}
+
+
 // #pragma mark - UserMessagingMessageSender
 
 
@@ -102,86 +109,18 @@
 
 
 void
-UserMessagingListener::AllListenersNotified()
+UserMessagingListener::AllListenersNotified(NotificationService& service)
 {
 	fSender.FlushMessage();
 }
 
 
-// #pragma mark - NotificationListenerUpdater
+//	#pragma mark - NotificationService
 
 
-NotificationListenerUpdater::NotificationListenerUpdater(
-		const KMessage* eventSpecifier)
-	: fEventSpecifier(eventSpecifier)
-{
-}
-
-
-NotificationListenerUpdater::~NotificationListenerUpdater()
-{
-}
-
-
-status_t
-NotificationListenerUpdater::UpdateListener(NotificationListener& listener,
-	enum update_action& action)
-{
-	action = SKIP;
-	return B_OK;
-}
-
-
-status_t
-NotificationListenerUpdater::CreateListener(NotificationListener** _listener)
-{
-	return B_ERROR;
-}
-
-
-void
-NotificationListenerUpdater::SetEventSpecifier(const KMessage* eventSpecifier)
-{
-	fEventSpecifier = eventSpecifier;
-}
-
-
-// #pragma mark - NotificationListenerUpdater
-
-
-UserMessagingListenerUpdater::UserMessagingListenerUpdater(
-		const KMessage* eventSpecifier, port_id port, int32 token)
-	:
-	NotificationListenerUpdater(eventSpecifier),
-	fPort(port),
-	fToken(token)
-{
-}
-
-
-status_t
-UserMessagingListenerUpdater::UpdateListener(NotificationListener& _listener,
-	enum update_action& action)
-{
-	UserMessagingListener* listener
-		= dynamic_cast<UserMessagingListener*>(&_listener);
-	if (listener != NULL && listener->Port() == fPort
-		&& listener->Token() == fToken) {
-		return UpdateListener(*listener, action);
-	}
-
-	action = SKIP;
-	return B_OK;
-}
-
-
-//	#pragma mark - NotificationManager
-
-#if 0
 NotificationService::~NotificationService()
 {
 }
-#endif
 
 
 //	#pragma mark - NotificationManager
@@ -285,20 +224,20 @@
 
 
 status_t
-NotificationManager::RemoveListener(const char* serviceName, uint32 eventMask,
-	NotificationListener& listener)
+NotificationManager::UpdateListener(const char* serviceName,
+	uint32 eventMask, NotificationListener& listener)
 {
 	char buffer[96];
 	KMessage specifier;
 	specifier.SetTo(buffer, sizeof(buffer), 0);
 	specifier.AddInt32("event mask", eventMask);
 
-	return RemoveListener(serviceName, &specifier, listener);
+	return UpdateListener(serviceName, &specifier, listener);
 }
 
 
 status_t
-NotificationManager::RemoveListener(const char* serviceName,
+NotificationManager::UpdateListener(const char* serviceName,
 	const KMessage* eventSpecifier, NotificationListener& listener)
 {
 	MutexLocker locker(fLock);
@@ -309,13 +248,13 @@
 	Reference<NotificationService> reference(service);
 	locker.Unlock();
 
-	return service->RemoveListener(eventSpecifier, listener);
+	return service->UpdateListener(eventSpecifier, listener);
 }
 
 
 status_t
-NotificationManager::UpdateListener(const char* serviceName,
-	NotificationListenerUpdater& updater)
+NotificationManager::RemoveListener(const char* serviceName,
+	const KMessage* eventSpecifier, NotificationListener& listener)
 {
 	MutexLocker locker(fLock);
 	NotificationService* service = _ServiceFor(serviceName);
@@ -325,7 +264,7 @@
 	Reference<NotificationService> reference(service);
 	locker.Unlock();
 
-	return service->UpdateListener(updater);
+	return service->RemoveListener(eventSpecifier, listener);
 }
 
 

Modified: haiku/trunk/src/system/kernel/fs/Jamfile
===================================================================
--- haiku/trunk/src/system/kernel/fs/Jamfile	2007-08-01 14:28:50 UTC (rev 21779)
+++ haiku/trunk/src/system/kernel/fs/Jamfile	2007-08-01 14:48:44 UTC (rev 21780)
@@ -3,7 +3,7 @@
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName kernel fs ] ;
 UsePrivateHeaders [ FDirName kernel util ] ;
-UsePrivateHeaders storage ;
+UsePrivateHeaders shared storage ;
 
 KernelMergeObject kernel_fs.o : 
 	devfs.cpp

Modified: haiku/trunk/src/system/kernel/fs/node_monitor.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/node_monitor.cpp	2007-08-01 14:28:50 UTC (rev 21779)
+++ haiku/trunk/src/system/kernel/fs/node_monitor.cpp	2007-08-01 14:48:44 UTC (rev 21780)
@@ -4,23 +4,26 @@
  */
 
 
-#include <drivers/node_monitor.h>
-#include <app/AppDefs.h>
+#include <fs/node_monitor.h>
 
-#include <fs/node_monitor.h>
-#include <vfs.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+#include <AppDefs.h>
+#include <NodeMonitor.h>
+
 #include <fd.h>
+#include <khash.h>
 #include <lock.h>
-#include <khash.h>
 #include <messaging.h>
+#include <Notifications.h>
+#include <vfs.h>
 #include <util/AutoLock.h>
+#include <util/DoublyLinkedList.h>
 #include <util/KMessage.h>
 #include <util/list.h>
 
-#include <malloc.h>
-#include <stddef.h>
 
-
 //#define TRACE_MONITOR
 #ifdef TRACE_MONITOR
 #	define TRACE(x) dprintf x
@@ -31,7 +34,6 @@
 
 // ToDo: add more fine grained locking - maybe using a ref_count in the
 //		node_monitor structure?
-// ToDo: implement watching mounts/unmounts
 // ToDo: return another error code than B_NO_MEMORY if the team's maximum is hit
 
 
@@ -39,333 +41,428 @@
 typedef struct node_monitor node_monitor;
 
 struct monitor_listener {
-	monitor_listener	*next;
-	monitor_listener	*prev;
-	list_link			monitor_link;
-	port_id				port;
-	uint32				token;
+	list_link			context_link;
+	DoublyLinkedListLink<monitor_listener> monitor_link;
+	NotificationListener *listener;
 	uint32				flags;
 	node_monitor		*monitor;
 };
 
+typedef DoublyLinkedList<monitor_listener, DoublyLinkedListMemberGetLink<
+	monitor_listener, &monitor_listener::monitor_link> > MonitorListenerList;
+
 struct node_monitor {
-	node_monitor		*next;
+	HashTableLink<node_monitor> link;
 	dev_t				device;
 	ino_t				node;
-	struct list			listeners;
+	MonitorListenerList	listeners;
 };
 
-struct monitor_hash_key {
-	dev_t	device;
-	ino_t	node;
-};
-
 struct interested_monitor_listener_list {
-	struct list			*listeners;
-	monitor_listener	*first_listener;
+	MonitorListenerList::Iterator iterator;
 	uint32				flags;
 };
 
-#define MONITORS_HASH_TABLE_SIZE 16
+static UserMessagingMessageSender sNodeMonitorSender;
 
-static hash_table *gMonitorHash;
-static mutex gMonitorMutex;
+class UserNodeListener : public UserMessagingListener {
+	public:
+		UserNodeListener(port_id port, int32 token)
+			: UserMessagingListener(sNodeMonitorSender, port, token)
+		{
+		}
 
+		bool operator==(const NotificationListener& _other) const
+		{
+			const UserNodeListener* other
+				= dynamic_cast<const UserNodeListener*>(&_other);
+			return other != NULL && other->Port() == Port()
+				&& other->Token() == Token();
+		}
+};
 
-static int
-monitor_compare(void *_monitor, const void *_key)
-{
-	node_monitor *monitor = (node_monitor*)_monitor;
-	const struct monitor_hash_key *key = (const struct monitor_hash_key*)_key;
+class NodeMonitorService : public NotificationService {
+	public:
+		NodeMonitorService();
+		virtual ~NodeMonitorService();
 
-	if (monitor->device == key->device && monitor->node == key->node)
-		return 0;
+		status_t InitCheck();
 
-	return -1;
-}
+		status_t NotifyEntryCreatedOrRemoved(int32 opcode, dev_t device,
+			ino_t directory, const char *name, ino_t node);
+		status_t NotifyEntryMoved(dev_t device, ino_t fromDirectory,
+			const char *fromName, ino_t toDirectory, const char *toName,
+			ino_t node);
+		status_t NotifyStatChanged(dev_t device, ino_t node, uint32 statFields);
+		status_t NotifyAttributeChanged(dev_t device, ino_t node,
+			const char *attribute, int32 cause);
+		status_t NotifyUnmount(dev_t device);
+		status_t NotifyMount(dev_t device, dev_t parentDevice,
+			ino_t parentDirectory);
 
+		status_t RemoveListeners(io_context *context);
 
-static uint32
-monitor_hash(void *_monitor, const void *_key, uint32 range)
-{
-	node_monitor *monitor = (node_monitor*)_monitor;
-	const struct monitor_hash_key *key = (const struct monitor_hash_key*)_key;
+		status_t AddListener(const KMessage *eventSpecifier,
+			NotificationListener &listener);
+		status_t UpdateListener(const KMessage *eventSpecifier,
+			NotificationListener &listener);
+		status_t RemoveListener(const KMessage *eventSpecifier,
+			NotificationListener &listener);
 
-#define MHASH(device, node) (((uint32)((node) >> 32) + (uint32)(node)) ^ (uint32)(device))
+		status_t RemoveListener(io_context *context, dev_t device, ino_t node,
+			NotificationListener &notificationListener);
 
-	if (monitor != NULL)
-		return MHASH(monitor->device, monitor->node) % range;
+		status_t RemoveUserListeners(struct io_context *context,
+			port_id port, uint32 token);
+		status_t UpdateUserListener(io_context *context, dev_t device,
+			ino_t node, uint32 flags, UserNodeListener &userListener);
 
-	return MHASH(key->device, key->node) % range;
-#undef MHASH
-}
+		virtual const char* Name() { return "node monitor"; }
 
+	private:
+		void _RemoveMonitor(node_monitor *monitor);
+		void _RemoveListener(monitor_listener *listener);
+		node_monitor *_MonitorFor(dev_t device, ino_t node);
+		status_t _GetMonitor(io_context *context, dev_t device, ino_t node,
+			bool addIfNecessary, node_monitor **_monitor);
+		monitor_listener *_MonitorListenerFor(node_monitor* monitor,
+			NotificationListener& notificationListener);
+		status_t _AddMonitorListener(io_context *context,
+			node_monitor* monitor, uint32 flags,
+			NotificationListener& notificationListener);
+		status_t _AddListener(io_context *context, dev_t device, ino_t node,
+			uint32 flags, NotificationListener &notificationListener);
+		status_t _UpdateListener(io_context *context, dev_t device, ino_t node,
+			uint32 flags, bool addFlags,
+			NotificationListener &notificationListener);
+		void _GetInterestedMonitorListeners(dev_t device, ino_t node,
+			uint32 flags, interested_monitor_listener_list *interestedListeners,
+			int32 &interestedListenerCount);
+		status_t _SendNotificationMessage(KMessage &message,
+			interested_monitor_listener_list *interestedListeners,
+			int32 interestedListenerCount);
 
-/** Returns the monitor that matches the specified device/node pair.
- *	Must be called with monitors lock hold.
- */
+		struct monitor_hash_key {
+			dev_t	device;
+			ino_t	node;
+		};
 
-static node_monitor *
-get_monitor_for(dev_t device, ino_t node)
+		struct HashDefinition {
+			typedef monitor_hash_key* KeyType;
+			typedef	node_monitor ValueType;
+
+			size_t HashKey(monitor_hash_key* key) const
+				{ return _Hash(key->device, key->node); }
+			size_t Hash(node_monitor *monitor) const
+				{ return _Hash(monitor->device, monitor->node); }
+
+			bool Compare(monitor_hash_key* key, node_monitor *monitor) const
+			{
+				return key->device == monitor->device
+					&& key->node == monitor->node;
+			}
+
+			HashTableLink<node_monitor>* GetLink(
+					node_monitor* monitor) const
+				{ return &monitor->link; }
+
+			uint32 _Hash(dev_t device, ino_t node) const
+			{
+				return ((uint32)(node >> 32) + (uint32)node) ^ (uint32)device;
+			}
+		};
+
+		typedef OpenHashTable<HashDefinition> MonitorHash;
+		MonitorHash	fMonitors;
+		mutex		fMutex;
+};
+
+static NodeMonitorService sNodeMonitorService;
+
+
+/*!	\brief Notifies the listener of a live query that an entry has been added
+  		   to or removed from the query (for whatever reason).
+  	\param opcode \c B_ENTRY_CREATED or \c B_ENTRY_REMOVED.
+  	\param port The target port of the listener.
+  	\param token The BHandler token of the listener.
+  	\param device The ID of the mounted FS, the entry lives in.
+  	\param directory The entry's parent directory ID.
+  	\param name The entry's name.
+  	\param node The ID of the node the entry refers to.
+  	\return
+  	- \c B_OK, if everything went fine,
+  	- another error code otherwise.
+*/
+static status_t
+notify_query_entry_created_or_removed(int32 opcode, port_id port, int32 token,
+	dev_t device, ino_t directory, const char *name, ino_t node)
 {
-	struct monitor_hash_key key;
-	key.device = device;
-	key.node = node;
+	if (!name)
+		return B_BAD_VALUE;
 
-	return (node_monitor *)hash_lookup(gMonitorHash, &key);
+	// construct the message
+	char messageBuffer[1024];
+	KMessage message;
+	message.SetTo(messageBuffer, sizeof(messageBuffer), B_QUERY_UPDATE);
+	message.AddInt32("opcode", opcode);
+	message.AddInt32("device", device);
+	message.AddInt64("directory", directory);
+	message.AddInt64("node", node);
+	message.AddString("name", name);
+
+	// send the message
+	messaging_target target;
+	target.port = port;
+	target.token = token;
+
+	return send_message(&message, &target, 1);
 }
 
 
-/** Returns the listener that matches the specified port/token pair.
- *	Must be called with monitors lock hold.
- */
+//	#pragma mark - NodeMonitorService
 
-static monitor_listener *
-get_listener_for(node_monitor *monitor, port_id port, uint32 token)
+
+NodeMonitorService::NodeMonitorService()
 {
-	monitor_listener *listener = NULL;
-	
-	while ((listener = (monitor_listener*)list_get_next_item(
-			&monitor->listeners, listener)) != NULL) {
-		// does this listener match?
-		if (listener->port == port && listener->token == token)
-			return listener;
-	}
+	mutex_init(&fMutex, "node monitor");
+}
 
-	return NULL;
+
+NodeMonitorService::~NodeMonitorService()
+{
 }
 
 
-/** Removes the specified node_monitor from the hashtable
- *	and free it.
- *	Must be called with monitors lock hold.
- */
+status_t
+NodeMonitorService::InitCheck()
+{
+	return fMutex.sem >= B_OK ? B_OK : fMutex.sem;
+}
 
-static void
-remove_monitor(node_monitor *monitor)
+
+/*! Removes the specified node_monitor from the hashtable
+	and free it.
+	Must be called with monitors lock hold.
+*/
+void
+NodeMonitorService::_RemoveMonitor(node_monitor *monitor)
 {
-	hash_remove(gMonitorHash, monitor);
-	free(monitor);
+	fMonitors.Remove(monitor);
+	delete monitor;
 }
 
 
-/** Removes the specified monitor_listener from all lists
- *	and free it.
- *	Must be called with monitors lock hold.
- */
-
-static void
-remove_listener(monitor_listener *listener)
+/*! Removes the specified monitor_listener from all lists
+	and free it.
+	Must be called with monitors lock hold.
+*/
+void
+NodeMonitorService::_RemoveListener(monitor_listener *listener)
 {
 	node_monitor *monitor = listener->monitor;
 
 	// remove it from the listener and I/O context lists	
-	list_remove_link(&listener->monitor_link);
+	monitor->listeners.Remove(listener);
 	list_remove_link(listener);
 
-	free(listener);
+	delete listener;
 
-	if (list_is_empty(&monitor->listeners))
-		remove_monitor(monitor);
+	if (monitor->listeners.IsEmpty())
+		_RemoveMonitor(monitor);
 }
 
 
-static status_t
-add_node_monitor(io_context *context, dev_t device, ino_t node,
-	uint32 flags, port_id port, uint32 token)
+/*! Returns the monitor that matches the specified device/node pair.
+	Must be called with monitors lock hold.
+*/
+node_monitor *
+NodeMonitorService::_MonitorFor(dev_t device, ino_t node)
 {
-	monitor_listener *listener;
-	node_monitor *monitor;
-	status_t status = B_OK;
+	struct monitor_hash_key key;
+	key.device = device;
+	key.node = node;
 
-	TRACE(("add_node_monitor(dev = %ld, node = %Ld, flags = %ld, port = %ld, token = %ld\n",
-		device, node, flags, port, token));
+	return fMonitors.Lookup(&key);
+}
 
-	mutex_lock(&gMonitorMutex);
 
-	monitor = get_monitor_for(device, node);
-	if (monitor == NULL) {
-		// check if this team is allowed to have more listeners
-		if (context->num_monitors >= context->max_monitors) {
-			// the BeBook says to return B_NO_MEMORY in this case, but
-			// we should have another one.
-			status = B_NO_MEMORY;
-			goto out;
-		}
+/*! Returns the monitor that matches the specified device/node pair.
+	If the monitor does not exist yet, it will be created.
+	Must be called with monitors lock hold.
+*/
+status_t
+NodeMonitorService::_GetMonitor(io_context *context, dev_t device, ino_t node,
+	bool addIfNecessary, node_monitor** _monitor)
+{
+	node_monitor* monitor = _MonitorFor(device, node);
+	if (monitor != NULL) {
+		*_monitor = monitor;
+		return B_OK;
+	}
+	if (!addIfNecessary)
+		return B_BAD_VALUE;
 
-		// create new monitor
-		monitor = (node_monitor *)malloc(sizeof(node_monitor));
-		if (monitor == NULL) {
-			status = B_NO_MEMORY;
-			goto out;
-		}
+	// check if this team is allowed to have more listeners
+	if (context->num_monitors >= context->max_monitors) {
+		// the BeBook says to return B_NO_MEMORY in this case, but
+		// we should have another one.
+		return B_NO_MEMORY;
+	}
 
-		// initialize monitor		
-		monitor->device = device;
-		monitor->node = node;
-		list_init_etc(&monitor->listeners, offsetof(monitor_listener, monitor_link));
+	// create new monitor
+	monitor = new(std::nothrow) node_monitor;
+	if (monitor == NULL)
+		return B_NO_MEMORY;
 
-		hash_insert(gMonitorHash, monitor);
-	} else {
-		// check if the listener is already listening, and
-		// if so, just add the new flags
+	// initialize monitor		
+	monitor->device = device;
+	monitor->node = node;
 
-		listener = get_listener_for(monitor, port, token);
-		if (listener != NULL) {
-			listener->flags |= flags;
-			goto out;
-		}
+	if (fMonitors.Insert(monitor) < B_OK) {
+		delete monitor;
+		return B_NO_MEMORY;
+	}
 
-		// check if this team is allowed to have more listeners
-		if (context->num_monitors >= context->max_monitors) {
-			// the BeBook says to return B_NO_MEMORY in this case, but
-			// we should have another one.
-			status = B_NO_MEMORY;
-			goto out;
-		}
+	*_monitor = monitor;
+	return B_OK;
+}
+
+
+/*! Returns the listener that matches the specified port/token pair.
+	Must be called with monitors lock hold.
+*/
+monitor_listener*
+NodeMonitorService::_MonitorListenerFor(node_monitor* monitor,
+	NotificationListener& notificationListener)
+{
+	MonitorListenerList::Iterator iterator
+		= monitor->listeners.GetIterator();
+
+	while (monitor_listener* listener = iterator.Next()) {
+		// does this listener match?
+		if (*listener->listener == notificationListener)
+			return listener;
 	}
 
-	// add listener
+	return NULL;
+}
 
-	listener = (monitor_listener *)malloc(sizeof(monitor_listener));
+
+status_t
+NodeMonitorService::_AddMonitorListener(io_context *context,
+	node_monitor* monitor, uint32 flags,
+	NotificationListener& notificationListener)
+{
+	monitor_listener *listener = new(std::nothrow) monitor_listener;
 	if (listener == NULL) {
 		// no memory for the listener, so remove the monitor as well if needed
-		if (list_is_empty(&monitor->listeners))
-			remove_monitor(monitor);
+		if (monitor->listeners.IsEmpty())
+			_RemoveMonitor(monitor);
 
-		status = B_NO_MEMORY;
-		goto out;
+		return B_NO_MEMORY;
 	}
 
 	// initialize listener, and add it to the lists
-	listener->port = port;
-	listener->token = token;
+	listener->listener = &notificationListener;
 	listener->flags = flags;
 	listener->monitor = monitor;
 
-	list_add_link_to_head(&monitor->listeners, &listener->monitor_link);
+	monitor->listeners.Add(listener);
 	list_add_link_to_head(&context->node_monitors, listener);
 
 	context->num_monitors++;
-
-out:
-	mutex_unlock(&gMonitorMutex);
-	return status;
+	return B_OK;
 }
 
 
-static status_t
-remove_node_monitor(struct io_context *context, dev_t device, ino_t node,
-	uint32 flags, port_id port, uint32 token)
+status_t
+NodeMonitorService::_AddListener(io_context *context, dev_t device, ino_t node,
+	uint32 flags, NotificationListener& notificationListener)
 {
-	monitor_listener *listener;
-	node_monitor *monitor;
-	status_t status = B_OK;
+	TRACE(("%s(dev = %ld, node = %Ld, flags = %ld, listener = %p\n",
+		__PRETTY_FUNCTION__, device, node, flags, &notificationListener));
 
-	TRACE(("remove_node_monitor(dev = %ld, node = %Ld, flags = %ld, port = %ld, token = %ld\n",
-		device, node, flags, port, token));
+	MutexLocker _(fMutex);
 
-	mutex_lock(&gMonitorMutex);
+	node_monitor *monitor;
+	status_t status = _GetMonitor(context, device, node, true, &monitor);
+	if (status < B_OK)
+		return status;
 
-	// get the monitor for this device/node pair
-	monitor = get_monitor_for(device, node);
-	if (monitor == NULL) {
-		status = B_ENTRY_NOT_FOUND;
-		goto out;
-	}
+	// add listener
 
-	// see if it has the listener we are looking for
-	listener = get_listener_for(monitor, port, token);
-	if (listener == NULL) {
-		status = B_ENTRY_NOT_FOUND;
-		goto out;
-	}
-
-	// no flags means remove all flags
-	if (flags == B_STOP_WATCHING)
-		flags = ~0;
-
-	listener->flags &= ~flags;
-
-	// if there aren't anymore flags, remove this listener
-	if (listener->flags == B_STOP_WATCHING) {
-		remove_listener(listener);
-		context->num_monitors--;
-	}
-
-out:
-	mutex_unlock(&gMonitorMutex);
-	return status;
+	return _AddMonitorListener(context, monitor, flags, notificationListener);
 }
 
 
-static status_t
-remove_node_monitors_by_target(struct io_context *context, port_id port, uint32 token)
+status_t
+NodeMonitorService::_UpdateListener(io_context *context, dev_t device,
+	ino_t node, uint32 flags, bool addFlags,
+	NotificationListener& notificationListener)
 {
-	monitor_listener *listener = NULL;
-	int32 count = 0;
+	TRACE(("%s(dev = %ld, node = %Ld, flags = %ld, listener = %p\n",
+		__PRETTY_FUNCTION__, device, node, flags, &notificationListener));
 
-	while ((listener = (monitor_listener*)list_get_next_item(
-			&context->node_monitors, listener)) != NULL) {
-		monitor_listener *removeListener;
+	MutexLocker _(fMutex);
 
-		if (listener->port != port || listener->token != token)
-			continue;
+	node_monitor *monitor;
+	status_t status = _GetMonitor(context, device, node, false, &monitor);
+	if (status < B_OK)
+		return status;
 
-		listener = (monitor_listener*)list_get_prev_item(
-			&context->node_monitors, removeListener = listener);
-			// this line sets the listener one item back, allowing us
-			// to remove its successor (which is saved in "removeListener")
-
-		remove_listener(removeListener);
-		count++;
+	MonitorListenerList::Iterator iterator = monitor->listeners.GetIterator();
+	while (monitor_listener* listener = iterator.Next()) {
+		if (*listener->listener == notificationListener) {
+			if (addFlags)
+				listener->flags |= flags;
+			else
+				listener->flags = flags;
+			return B_OK;
+		}
 	}
 
-	return count > 0 ? B_OK : B_ENTRY_NOT_FOUND;
+	return B_BAD_VALUE;
 }
 
 
-/**	\brief Given device and node ID and a node monitoring event mask, the
- *		   function checks whether there are listeners interested in any of
- *		   the events for that node and, if so, adds the respective listener
- *		   list to a supplied array of listener lists.
- *
- *	Note, that in general not all of the listeners in an appended list will be
- *	interested in the events, but it is guaranteed that
- *	interested_monitor_listener_list::first_listener is indeed
- *	the first listener in the list, that is interested.
- *
- *	\param device The ID of the mounted FS, the node lives in.
- *	\param node The ID of the node.
- *	\param flags The mask specifying the events occurred for the given node
- *		   (a combination of \c B_WATCH_* constants).
- *	\param interestedListeners An array of listener lists. If there are
- *		   interested listeners for the node, the list will be appended to
- *		   this array.
- *	\param interestedListenerCount The number of elements in the
- *		   \a interestedListeners array. Will be incremented, if a list is
- *		   appended.
- */

[... truncated: 1025 lines follow ...]


From axeld at mail.berlios.de  Wed Aug  1 18:46:26 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 1 Aug 2007 18:46:26 +0200
Subject: [Haiku-commits] r21781 - haiku/trunk/src/system/kernel
Message-ID: <200708011646.l71GkQlt025193@sheep.berlios.de>

Author: axeld
Date: 2007-08-01 18:46:24 +0200 (Wed, 01 Aug 2007)
New Revision: 21781
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21781&view=rev

Modified:
   haiku/trunk/src/system/kernel/sem.c
Log:
Extended the "last acquirer" debug stuff to also contain the thread that
released it last, and the counts involved.
Furthermore, release_sem_etc() will now only negate the acquirer thread
ID instead of setting it to -1.


Modified: haiku/trunk/src/system/kernel/sem.c
===================================================================
--- haiku/trunk/src/system/kernel/sem.c	2007-08-01 14:48:44 UTC (rev 21780)
+++ haiku/trunk/src/system/kernel/sem.c	2007-08-01 16:46:24 UTC (rev 21781)
@@ -50,6 +50,9 @@
 			team_id				owner;	// if set to -1, means owned by a port
 #ifdef DEBUG_LAST_ACQUIRER
 			thread_id			last_acquirer;
+			int32				last_acquire_count;
+			thread_id			last_releaser;
+			int32				last_release_count;
 #endif
 		} used;
 
@@ -161,7 +164,10 @@
 		} else
 			kprintf(" -\n");
 #ifdef DEBUG_LAST_ACQUIRER
-		kprintf("last acquired by: 0x%lx\n", sem->u.used.last_acquirer);
+		kprintf("last acquired by: %ld, count: %ld\n", sem->u.used.last_acquirer,
+			sem->u.used.last_acquire_count);
+		kprintf("last released by: %ld, count: %ld\n", sem->u.used.last_releaser,
+			sem->u.used.last_release_count);
 #endif
 	} else {
 		kprintf("next:    %p\n", sem->u.unused.next);
@@ -649,8 +655,10 @@
 		}
 
 #ifdef DEBUG_LAST_ACQUIRER
-		if (thread->sem.acquire_status >= B_OK)
+		if (thread->sem.acquire_status >= B_OK) {
 			sSems[slot].u.used.last_acquirer = thread_get_current_thread_id();
+			sSems[slot].u.used.last_acquire_count = count;
+		}
 #endif
 
 		restore_interrupts(state);
@@ -662,6 +670,7 @@
 	} else {
 #ifdef DEBUG_LAST_ACQUIRER
 		sSems[slot].u.used.last_acquirer = thread_get_current_thread_id();
+		sSems[slot].u.used.last_acquire_count = count;
 #endif
 	}
 
@@ -715,13 +724,16 @@
 	//	doesn't have any use outside the kernel
 	if ((flags & B_CHECK_PERMISSION) != 0
 		&& sSems[slot].u.used.owner == team_get_kernel_team_id()) {
-		dprintf("thread %ld tried to release kernel semaphore.\n", thread_get_current_thread()->id);
+		dprintf("thread %ld tried to release kernel semaphore.\n",
+			thread_get_current_thread_id());
 		status = B_NOT_ALLOWED;
 		goto err;
 	}
 
 #ifdef DEBUG_LAST_ACQUIRER
-	sSems[slot].u.used.last_acquirer = -1;
+	sSems[slot].u.used.last_acquirer = -sSems[slot].u.used.last_acquirer;
+	sSems[slot].u.used.last_releaser = thread_get_current_thread_id();
+	sSems[slot].u.used.last_release_count = count;
 #endif
 
 	// clear out a queue we will use to hold all of the threads that we will have to



From mmlr at mail.berlios.de  Wed Aug  1 20:00:46 2007
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Wed, 1 Aug 2007 20:00:46 +0200
Subject: [Haiku-commits] r21782 - haiku/trunk/src/apps/glteapot
Message-ID: <200708011800.l71I0kPv022701@sheep.berlios.de>

Author: mmlr
Date: 2007-08-01 20:00:46 +0200 (Wed, 01 Aug 2007)
New Revision: 21782
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21782&view=rev

Modified:
   haiku/trunk/src/apps/glteapot/FPS.cpp
Log:
Made FPS counter of GLTeapot more scalable. Also made the file style guide compliant.

Modified: haiku/trunk/src/apps/glteapot/FPS.cpp
===================================================================
--- haiku/trunk/src/apps/glteapot/FPS.cpp	2007-08-01 16:46:24 UTC (rev 21781)
+++ haiku/trunk/src/apps/glteapot/FPS.cpp	2007-08-01 18:00:46 UTC (rev 21782)
@@ -2,38 +2,37 @@
 	Copyright 1999, Be Incorporated.   All Rights Reserved.
 	This file may be used under the terms of the Be Sample Code License.
 */
-
-
 #include "FPS.h"
 
-
 FPS::FPS()
 {
 }
 
+
 FPS::~FPS()
 {
 }
 
-void FPS::drawChar( GLfloat x, GLfloat y, GLint number )
+
+void
+FPS::drawChar(GLfloat x, GLfloat y, GLint number)
 {
 	static bool numbers[13][7] = {
-		{true,true,true,true,true,true,false}, 		/* 0 */
-		{false,true,true,false,false,false,false},	/* 1 */
-		{true,true,false,true,true,false,true},		/* 2 */
-		{true,true,true,true,false,false,true},		/* 3 */
-		{false,true,true,false,false,true,true},		/* 4 */
-		{true,false,true,true,false,true,true},		/* 5 */
-		{true,false,true,true,true,true,true},		/* 6 */
-		{true,true,true,false,false,false,false},		/* 7 */
-		{true,true,true,true,true,true,true},			/* 8 */
-		{true,true,true,false,false,true,true},		/* 9 */
+		{ true, true, true, true, true, true, false }, 		/* 0 */
+		{ false, true, true, false, false, false, false },	/* 1 */
+		{ true, true, false, true, true, false, true },		/* 2 */
+		{ true, true, true, true, false, false, true },		/* 3 */
+		{ false, true, true, false, false, true, true },	/* 4 */
+		{ true, false, true, true, false, true, true },		/* 5 */
+		{ true, false, true, true, true, true, true },		/* 6 */
+		{ true, true, true, false, false, false, false },	/* 7 */
+		{ true, true, true, true, true, true, true },		/* 8 */
+		{ true, true, true, false, false, true, true },		/* 9 */
 
-		{true,false,false,false,true,true,true},		/* F */
-		{true,true,false,false,true,true,true},		/* P */
-		{true,false,true,true,false,true,true},		/* S */
-		
-		};
+		{ true, false, false, false, true, true, true },	/* F */
+		{ true, true, false, false, true, true, true },		/* P */
+		{ true, false, true, true, false, true, true },		/* S */
+	};
 
 	static GLfloat gap = 0.03;
 	static GLfloat size = 1.0;
@@ -51,85 +50,81 @@
 	static GLfloat y5 = -y1;
 	static GLfloat y6 = -y0;
 
-	glBegin( GL_LINES );
-	if( numbers[number][0] )
-	{
-		glVertex2f( x1 + x, y0 + y );
-		glVertex2f( x2 + x, y0 + y );
+	glBegin(GL_LINES);
+	if (numbers[number][0]) {
+		glVertex2f(x1 + x, y0 + y);
+		glVertex2f(x2 + x, y0 + y);
 	}
-	if( numbers[number][1] )
-	{
-		glVertex2f( x3 + x, y1 + y );
-		glVertex2f( x3 + x, y2 + y );
+
+	if (numbers[number][1]) {
+		glVertex2f(x3 + x, y1 + y);
+		glVertex2f(x3 + x, y2 + y);
 	}
-	if( numbers[number][2] )
-	{
-		glVertex2f( x3 + x, y4 + y );
-		glVertex2f( x3 + x, y5 + y );
+
+	if (numbers[number][2]) {
+		glVertex2f(x3 + x, y4 + y);
+		glVertex2f(x3 + x, y5 + y);
 	}
-	if( numbers[number][3] )
-	{
-		glVertex2f( x1 + x, y6 + y );
-		glVertex2f( x2 + x, y6 + y );
+
+	if (numbers[number][3]) {
+		glVertex2f(x1 + x, y6 + y);
+		glVertex2f(x2 + x, y6 + y);
 	}
-	if( numbers[number][4] )
-	{
-		glVertex2f( x0 + x, y5 + y );
-		glVertex2f( x0 + x, y4 + y );
+
+	if (numbers[number][4]) {
+		glVertex2f(x0 + x, y5 + y);
+		glVertex2f(x0 + x, y4 + y);
 	}
-	if( numbers[number][5] )
-	{
-		glVertex2f( x0 + x, y2 + y );
-		glVertex2f( x0 + x, y1 + y );
+
+	if (numbers[number][5]) {
+		glVertex2f(x0 + x, y2 + y);
+		glVertex2f(x0 + x, y1 + y);
 	}
-	if( numbers[number][6] )
-	{
-		glVertex2f( x1 + x, y3 + y );
-		glVertex2f( x2 + x, y3 + y );
+
+	if (numbers[number][6]) {
+		glVertex2f(x1 + x, y3 + y);
+		glVertex2f(x2 + x, y3 + y);
 	}
-	glEnd();
 
+	glEnd();
 }
 
-void FPS::drawCounter( GLfloat frameRate )
+
+void
+FPS::drawCounter(GLfloat frameRate)
 {
 	GLfloat pos = 0;
-	int ifps = (int) (frameRate * 10 +0.5);
-	int c100,c10,c1,c_1;
+	int ifps = (int)(frameRate * 10 + 0.5);
 
-	c100 = ifps / 1000;
-	c10 = (ifps / 100) % 10;
-	c1 = (ifps / 10) % 10;
-	c_1 = ifps % 10;
-	
-	if( c100 )
-	{	
-		drawChar( pos, 0, c100 );
-		pos += 1;
+	int count = 0;
+	int number = 10;
+	while (ifps > number) {
+		number *= 10;
+		count++;
 	}
-	if( c100 || c10 )
-	{	
-		drawChar( pos, 0, c10 );
-		pos += 1;
+
+	number /= 10;
+	for (int i = 0; i < count; i++) {
+		drawChar(pos, 0, (ifps / number) % 10);
+		pos += 1.0;
+		if (number == 1)
+			break;
+		number /= 10;
 	}
-	drawChar( pos, 0, c1 );
-	pos += 0.5;
 
-	glBegin( GL_POINTS );
-	glVertex2f( pos, -0.5 );
+	pos -= 0.5;
+	glBegin(GL_POINTS);
+	glVertex2f(pos, -0.5);
 	glEnd();
 	pos += 0.5;
 
-	drawChar( pos, 0, c_1 );
+	drawChar(pos, 0, (ifps / number) % 10);
 	pos += 1.5;
 
-
-	drawChar( pos, 0, 10 );
+	drawChar(pos, 0, 10);
 	pos += 1;
-	drawChar( pos, 0, 11 );
+	drawChar(pos, 0, 11);
 	pos += 1;
-	drawChar( pos, 0, 12 );
+	drawChar(pos, 0, 12);
 	pos += 1;
-
 }
-



From bonefish at mail.berlios.de  Thu Aug  2 04:37:38 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 2 Aug 2007 04:37:38 +0200
Subject: [Haiku-commits] r21783 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200708020237.l722bcgc005716@sheep.berlios.de>

Author: bonefish
Date: 2007-08-02 04:37:35 +0200 (Thu, 02 Aug 2007)
New Revision: 21783
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21783&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_thread.c
Log:
axeld + bonefish:
After exec() we re-entered the userland without removing the syscall
iframe from the iframe stack, thus leaking one stack slot.
Fixes bug #1304.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_thread.c
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_thread.c	2007-08-01 18:00:46 UTC (rev 21782)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_thread.c	2007-08-02 02:37:35 UTC (rev 21783)
@@ -334,6 +334,10 @@
 
 	disable_interrupts();
 
+	// When entering the userspace, the iframe stack needs to be empty. After
+	// an exec() it'll still contain the iframe from the syscall, though.
+	t->arch_info.iframes.index = 0;
+
 	i386_set_tss_and_kstack(t->kernel_stack_base + KERNEL_STACK_SIZE);
 
 	// set the CPU dependent GDT entry for TLS



From bonefish at mail.berlios.de  Thu Aug  2 04:48:12 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 2 Aug 2007 04:48:12 +0200
Subject: [Haiku-commits] r21784 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200708020248.l722mC7M007433@sheep.berlios.de>

Author: bonefish
Date: 2007-08-02 04:48:11 +0200 (Thu, 02 Aug 2007)
New Revision: 21784
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21784&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_int.c
Log:
axeld + bonefish:
Certain interrupts don't disable interrupts. We were calling 
x86_{push,pop}_iframe() without specifically disabling them, thus causing 
a race condition with could cause the iframe stack to be invalid. This 
could cause all kinds of problems.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_int.c
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_int.c	2007-08-02 02:37:35 UTC (rev 21783)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_int.c	2007-08-02 02:48:11 UTC (rev 21784)
@@ -355,10 +355,13 @@
 {
 	struct thread *thread = thread_get_current_thread();
 	int ret = B_HANDLED_INTERRUPT;
+	cpu_status state;
 
 	// all exceptions besides 3 (breakpoint), and 99 (syscall) enter this
 	// function with interrupts disabled
 
+	state = disable_interrupts();
+
 	if (thread)
 		x86_push_iframe(&thread->arch_info.iframes, &frame);
 	else
@@ -369,6 +372,8 @@
 		thread_at_kernel_entry();
 	}
 
+	restore_interrupts(state);
+
 //	if(frame.vector != 0x20)
 //		dprintf("i386_handle_trap: vector 0x%x, ip 0x%x, cpu %d\n", frame.vector, frame.eip, smp_get_current_cpu());
 
@@ -457,7 +462,6 @@
 
 			if (kernelDebugger) {
 				// if this thread has a fault handler, we're allowed to be here
-				struct thread *thread = thread_get_current_thread();
 				if (thread && thread->fault_handler != NULL) {
 					frame.eip = thread->fault_handler;
 					break;
@@ -589,6 +593,8 @@
 
 //	dprintf("0x%x cpu %d!\n", thread_get_current_thread_id(), smp_get_current_cpu());
 
+	disable_interrupts();
+
 	if (thread)
 		x86_pop_iframe(&thread->arch_info.iframes);
 	else



From stefano.ceccherini at gmail.com  Thu Aug  2 08:21:49 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 2 Aug 2007 08:21:49 +0200
Subject: [Haiku-commits] r21783 - haiku/trunk/src/system/kernel/arch/x86
In-Reply-To: <200708020237.l722bcgc005716@sheep.berlios.de>
References: <200708020237.l722bcgc005716@sheep.berlios.de>
Message-ID: <894b9700708012321r3aa587aeu6a858a90819a1382@mail.gmail.com>

2007/8/2, bonefish at BerliOS <bonefish at mail.berlios.de>:

> axeld + bonefish:
> After exec() we re-entered the userland without removing the syscall
> iframe from the iframe stack, thus leaking one stack slot.
> Fixes bug #1304.
>
>
Great work!


From jackburton at mail.berlios.de  Thu Aug  2 08:44:34 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Thu, 2 Aug 2007 08:44:34 +0200
Subject: [Haiku-commits] r21785 - haiku/trunk/src/apps/terminal
Message-ID: <200708020644.l726iYxu015430@sheep.berlios.de>

Author: jackburton
Date: 2007-08-02 08:44:34 +0200 (Thu, 02 Aug 2007)
New Revision: 21785
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21785&view=rev

Modified:
   haiku/trunk/src/apps/terminal/SmartTabView.cpp
   haiku/trunk/src/apps/terminal/SmartTabView.h
Log:
Try to have a really smart tab view... It won't show any tabs when 
there's only one view attached.


Modified: haiku/trunk/src/apps/terminal/SmartTabView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/SmartTabView.cpp	2007-08-02 02:48:11 UTC (rev 21784)
+++ haiku/trunk/src/apps/terminal/SmartTabView.cpp	2007-08-02 06:44:34 UTC (rev 21785)
@@ -8,10 +8,15 @@
 
 #include "SmartTabView.h"
 
+#include <TabView.h>
+
+
 SmartTabView::SmartTabView(BRect frame, const char *name, button_width width, 
 				uint32 resizingMode, uint32 flags)
 	:
-	BTabView(frame, name, width, resizingMode, flags)
+	BView(frame, name, resizingMode, flags),
+	fTabView(NULL),
+	fView(NULL)
 {
 }
 
@@ -21,50 +26,116 @@
 }
 
 
+BView *
+SmartTabView::ContainerView()
+{
+	return fTabView != NULL ? fTabView->ContainerView() : this;
+}
+
+
+BView *
+SmartTabView::ViewForTab(int32 tab)
+{
+	return fTabView != NULL ? fTabView->ViewForTab(tab) : fView; 
+}
+
+
 void
 SmartTabView::Select(int32 index)
 {
-	BTabView::Select(index);
-	BTab *tab = TabAt(Selection());
-	if (tab != NULL) {	
-		BView *view = tab->View();
-		if (view != NULL)
-			view->ResizeTo(Bounds().Width(), Bounds().Height());
+	if (fView != NULL) {
+		fView->ResizeTo(Bounds().Width(), Bounds().Height());	
+	} else if (fTabView != NULL) {
+		fTabView->Select(index);
+		BTab *tab = fTabView->TabAt(fTabView->Selection());
+		if (tab != NULL) {	
+			BView *view = tab->View();
+			if (view != NULL)
+				view->ResizeTo(fTabView->Bounds().Width(), fTabView->Bounds().Height());
+		}
 	}
 }
 
-/*
+
+int32
+SmartTabView::Selection() const
+{
+	return fTabView != NULL ? fTabView->Selection() : 0;
+}
+
+
 void
 SmartTabView::AddTab(BView *target, BTab *tab)
 {
 	if (target == NULL)
 		return;
 
-	if (CountTabs() == 1) {
-		
-	} 
-	AddTab(target, tab);
+	if (fView == NULL && fTabView == NULL) {
+		fView = target;
+		AddChild(target);	
+	} else {
+		if (fTabView == NULL) {
+			RemoveChild(fView);
+			fTabView = new BTabView(Bounds(), "tabview");			
+			AddChild(fTabView);
+			fTabView->MoveTo(B_ORIGIN);
+			fTabView->ResizeTo(Bounds().Width(), Bounds().Height());
+			fTabView->AddTab(fView);
+			fTabView->Select(0);
+			fView = NULL;
+		}					
+		fTabView->AddTab(target, tab);
+	}
 }
 
 
 BTab *
 SmartTabView::RemoveTab(int32 index)
 {
-	BTab *oldTab = RemoveTab(index);
-	if (CountTabs() == 1) {
-			
+	BTab *returnTab = NULL;
+	if (fTabView != NULL) {
+		returnTab = fTabView->RemoveTab(index);
+		if (fTabView->CountTabs() == 1) {
+			BTab *tab = fTabView->RemoveTab(0);			
+			RemoveChild(fTabView);
+			delete fTabView;			
+			fTabView = NULL;
+			fView = tab->View();
+			tab->SetView(NULL);			
+			AddChild(fView);
+			fView->MoveTo(B_ORIGIN);
+			fView->ResizeTo(Bounds().Width(), Bounds().Height());
+			delete tab;
+		}
+	} else if (fView != NULL) {		
+		RemoveChild(fView);
+		returnTab = new BTab();
+		returnTab->SetView(fView);		
+		fView = NULL;
 	}
-	return oldTab;
+	
+	return returnTab;
 }
 
 
-BRect
-SmartTabView::DrawTabs()
+int32
+SmartTabView::CountTabs() const
 {
-	//if (CountTabs() > 1)
-		return BTabView::DrawTabs();
-	//return BRect(0, 0, -1, -1);		
+	if (fTabView != NULL)
+		return fTabView->CountTabs();
+
+	return fView != NULL ? 1 : 0;	
 }
+
+
+/*
+void
+SmartTabView::Draw(BRect updateRect)
+{
+	if (fView != NULL) {
+		
+	}	
+}
 */
 
-	
+

Modified: haiku/trunk/src/apps/terminal/SmartTabView.h
===================================================================
--- haiku/trunk/src/apps/terminal/SmartTabView.h	2007-08-02 02:48:11 UTC (rev 21784)
+++ haiku/trunk/src/apps/terminal/SmartTabView.h	2007-08-02 06:44:34 UTC (rev 21785)
@@ -9,9 +9,10 @@
 #ifndef __SMARTTABVIEW_H
 #define __SMARTTABVIEW_H
 
-#include <TabView.h>
+#include <View.h>
 
-class SmartTabView : public BTabView {
+class BTabView;
+class SmartTabView : public BView {
 public:
 	SmartTabView(BRect frame, const char *name,
 			button_width width = B_WIDTH_AS_USUAL, 
@@ -20,12 +21,22 @@
 					B_WILL_DRAW | B_NAVIGABLE_JUMP |
 					B_FRAME_EVENTS | B_NAVIGABLE);
 	virtual ~SmartTabView();
+	
+	virtual BView *ContainerView();
+	virtual BView *ViewForTab(int32);
+
 	virtual	void Select(int32 tab);
-	/*
+	virtual int32 Selection() const;
+
 	virtual	void AddTab(BView *target, BTab *tab = NULL);
 	virtual BTab* RemoveTab(int32 index);
-	virtual BRect DrawTabs();*/
+	virtual int32 CountTabs() const;	
+	
+	//virtual void Draw(BRect rect);
 
+private:
+	BTabView *fTabView;
+	BView *fView;
 };
 
 #endif // __SMARTTABVIEW_H



From bonefish at mail.berlios.de  Thu Aug  2 14:29:02 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 2 Aug 2007 14:29:02 +0200
Subject: [Haiku-commits] r21786 - haiku/trunk/build/jam
Message-ID: <200708021229.l72CT2sP001391@sheep.berlios.de>

Author: bonefish
Date: 2007-08-02 14:29:02 +0200 (Thu, 02 Aug 2007)
New Revision: 21786
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21786&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
Added bison to the image.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2007-08-02 06:44:34 UTC (rev 21785)
+++ haiku/trunk/build/jam/HaikuImage	2007-08-02 12:29:02 UTC (rev 21786)
@@ -22,8 +22,8 @@
 	GPL_ONLY = "" ;
 }
 
-BEOS_BIN = "[" addattr alert arp basename bc beep bzip2 cat cardctl catattr chgrp
-	chmod chop chown cksum clear clockconfig cmp comm compress cp copyattr
+BEOS_BIN = "[" addattr alert arp basename bc beep bison bzip2 cat cardctl catattr
+	chgrp chmod chop chown cksum clear clockconfig cmp comm compress cp copyattr
 	$(X86_ONLY)CortexAddOnHost
 	csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname
 	driveinfo dstcheck du dump_cis dump_cisreg echo eject env error expand
@@ -334,6 +334,11 @@
 
 AddFilesToHaikuImage home config settings : <keymap>US-International : Key_map ;
 
+# bison files
+SEARCH on <bison>m4sugar.m4
+	= [ FDirName $(HAIKU_TOP) src bin bison data m4sugar ] ;
+AddFilesToHaikuImage beos etc m4sugar : <bison>m4sugar.m4 ;
+
 # boot loader
 AddFilesToHaikuImage beos system : zbeos ;
 



From bonefish at mail.berlios.de  Thu Aug  2 14:33:00 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 2 Aug 2007 14:33:00 +0200
Subject: [Haiku-commits] r21787 - haiku/trunk/src/tests/apps/partitioner
Message-ID: <200708021233.l72CX05W001661@sheep.berlios.de>

Author: bonefish
Date: 2007-08-02 14:33:00 +0200 (Thu, 02 Aug 2007)
New Revision: 21787
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21787&view=rev

Modified:
   haiku/trunk/src/tests/apps/partitioner/Partitioner.cpp
Log:
Return a valid partition index also when there's only the disk device.


Modified: haiku/trunk/src/tests/apps/partitioner/Partitioner.cpp
===================================================================
--- haiku/trunk/src/tests/apps/partitioner/Partitioner.cpp	2007-08-02 12:29:02 UTC (rev 21786)
+++ haiku/trunk/src/tests/apps/partitioner/Partitioner.cpp	2007-08-02 12:33:00 UTC (rev 21787)
@@ -549,6 +549,7 @@
 		// if the disk device has no children, we select it without asking
 		if (fDevice->CountChildren() == 0) {
 			partition = fDevice;
+			_partitionIndex = 0;
 			return true;
 		}
 



From bonefish at mail.berlios.de  Thu Aug  2 14:43:51 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 2 Aug 2007 14:43:51 +0200
Subject: [Haiku-commits] r21788 - in haiku/trunk: headers/os/drivers
	headers/private/fs_shell src/add-ons/kernel/file_systems/bfs
	src/kits/storage src/system/kernel/disk_device_manager
	src/tools/fs_shell
Message-ID: <200708021243.l72ChpNq002168@sheep.berlios.de>

Author: bonefish
Date: 2007-08-02 14:43:49 +0200 (Thu, 02 Aug 2007)
New Revision: 21788
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21788&view=rev

Modified:
   haiku/trunk/headers/os/drivers/fs_interface.h
   haiku/trunk/headers/private/fs_shell/fssh_fs_interface.h
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.h
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
   haiku/trunk/src/kits/storage/DiskDevice.cpp
   haiku/trunk/src/system/kernel/disk_device_manager/KFileSystem.cpp
   haiku/trunk/src/system/kernel/disk_device_manager/KPartitioningSystem.cpp
   haiku/trunk/src/tools/fs_shell/unistd.cpp
   haiku/trunk/src/tools/fs_shell/vfs.cpp
Log:
* Added mapping of dup() in the FS shell.
* Adjusted the FS initialize() hook to have FD and partition_id
  parameters like the other hooks instead of the partition path.
* Adjusted initialization in BFS accordingly.
* Implemented the FS initialization method in KFileSystem.


Modified: haiku/trunk/headers/os/drivers/fs_interface.h
===================================================================
--- haiku/trunk/headers/os/drivers/fs_interface.h	2007-08-02 12:33:00 UTC (rev 21787)
+++ haiku/trunk/headers/os/drivers/fs_interface.h	2007-08-02 12:43:49 UTC (rev 21788)
@@ -245,10 +245,8 @@
 				const char *name, disk_job_id job);
 	status_t (*set_content_parameters)(int fd, partition_id partition,
 				const char *parameters, disk_job_id job);
-	status_t (*initialize)(const char *partition, const char *name,
+	status_t (*initialize)(int fd, partition_id partition, const char *name,
 				const char *parameters, disk_job_id job);
-		// This is pretty close to how the hook in R5 looked. Save the job ID,
-		// of course and that the parameters were given as (void*, size_t) pair.
 } file_system_module_info;
 
 

Modified: haiku/trunk/headers/private/fs_shell/fssh_fs_interface.h
===================================================================
--- haiku/trunk/headers/private/fs_shell/fssh_fs_interface.h	2007-08-02 12:33:00 UTC (rev 21787)
+++ haiku/trunk/headers/private/fs_shell/fssh_fs_interface.h	2007-08-02 12:43:49 UTC (rev 21788)
@@ -279,10 +279,8 @@
 				const char *name, fssh_disk_job_id job);
 	fssh_status_t (*set_content_parameters)(int fd, fssh_partition_id partition,
 				const char *parameters, fssh_disk_job_id job);
-	fssh_status_t (*initialize)(const char *partition, const char *name,
-				const char *parameters, fssh_disk_job_id job);
-		// This is pretty close to how the hook in R5 looked. Save the job ID,
-		// of course and that the parameters were given as (void*, size_t) pair.
+	fssh_status_t (*initialize)(int fd, fssh_partition_id partition,
+				const char *name, const char *parameters, fssh_disk_job_id job);
 } fssh_file_system_module_info;
 
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp	2007-08-02 12:33:00 UTC (rev 21787)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.cpp	2007-08-02 12:43:49 UTC (rev 21788)
@@ -27,10 +27,12 @@
 
 class DeviceOpener {
 	public:
+		DeviceOpener(int fd, int mode);
 		DeviceOpener(const char *device, int mode);
 		~DeviceOpener();
 
 		int Open(const char *device, int mode);
+		int Open(int fd, int mode);
 		void *InitCache(off_t numBlocks, uint32 blockSize);
 		void RemoveCache(bool allowWrites);
 
@@ -56,6 +58,14 @@
 }
 
 
+DeviceOpener::DeviceOpener(int fd, int mode)
+	:
+	fBlockCache(NULL)
+{
+	Open(fd, mode);
+}
+
+
 DeviceOpener::~DeviceOpener()
 {
 	if (fDevice >= B_OK) {
@@ -97,6 +107,19 @@
 }
 
 
+int
+DeviceOpener::Open(int fd, int mode)
+{
+	fDevice = dup(fd);
+	if (fDevice < 0)
+		return errno;
+
+	fMode = mode;
+
+	return fDevice;
+}
+
+
 void *
 DeviceOpener::InitCache(off_t numBlocks, uint32 blockSize)
 {
@@ -563,7 +586,7 @@
 
 
 status_t
-Volume::Initialize(const char *device, const char *name, uint32 blockSize,
+Volume::Initialize(int fd, const char *name, uint32 blockSize,
 	uint32 flags)
 {
 	// although there is no really good reason for it, we won't
@@ -576,7 +599,7 @@
 		&& blockSize != 8192)
 		return B_BAD_VALUE;
 
-	DeviceOpener opener(device, O_RDWR);
+	DeviceOpener opener(fd, O_RDWR);
 	if (opener.Device() < B_OK)
 		return B_BAD_VALUE;
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.h	2007-08-02 12:33:00 UTC (rev 21787)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Volume.h	2007-08-02 12:43:49 UTC (rev 21788)
@@ -31,7 +31,7 @@
 
 		status_t			Mount(const char *device, uint32 flags);
 		status_t			Unmount();
-		status_t			Initialize(const char *device, const char *name,
+		status_t			Initialize(int fd, const char *name,
 								uint32 blockSize, uint32 flags);
 
 		bool				IsValidSuperBlock();

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	2007-08-02 12:33:00 UTC (rev 21787)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp	2007-08-02 12:43:49 UTC (rev 21788)
@@ -2038,12 +2038,9 @@
 
 
 status_t
-bfs_initialize(const char *partition, const char *name, const char *parameters,
-	disk_job_id job)
+bfs_initialize(int fd, partition_id partition, const char *name,
+	const char *parameters, disk_job_id job)
 {
-	if (partition == NULL)
-		return B_BAD_VALUE;
-	
 	uint32 blockSize = 1024;
 	uint32 flags = 0;
 	bool verbose = false;
@@ -2070,7 +2067,7 @@
 	}
 
 	Volume volume(-1);
-	status_t status = volume.Initialize(partition, name, blockSize, flags);
+	status_t status = volume.Initialize(fd, name, blockSize, flags);
 	if (status < B_OK) {
 		INFORM(("Initializing volume failed: %s\n", strerror(status)));
 		return status;

Modified: haiku/trunk/src/kits/storage/DiskDevice.cpp
===================================================================
--- haiku/trunk/src/kits/storage/DiskDevice.cpp	2007-08-02 12:33:00 UTC (rev 21787)
+++ haiku/trunk/src/kits/storage/DiskDevice.cpp	2007-08-02 12:43:49 UTC (rev 21788)
@@ -228,6 +228,7 @@
 	if (!_IsShadow())
 		return B_BAD_VALUE;
 	// TODO: Get port and token from the progressMessenger
+	// TODO: Respect "synchronously"!
 	port_id port = -1;
 	int32 token = -1;
 	error = _kern_commit_disk_device_modifications(ID(), port, token,

Modified: haiku/trunk/src/system/kernel/disk_device_manager/KFileSystem.cpp
===================================================================
--- haiku/trunk/src/system/kernel/disk_device_manager/KFileSystem.cpp	2007-08-02 12:33:00 UTC (rev 21787)
+++ haiku/trunk/src/system/kernel/disk_device_manager/KFileSystem.cpp	2007-08-02 12:43:49 UTC (rev 21788)
@@ -7,6 +7,7 @@
 #include <fs_interface.h>
 
 #include "ddm_modules.h"
+#include "KDiskDeviceJob.h"
 #include "KDiskDeviceUtils.h"
 #include "KFileSystem.h"
 #include "KPartition.h"
@@ -308,8 +309,31 @@
 KFileSystem::Initialize(KPartition *partition, const char *name,
 	const char *parameters, KDiskDeviceJob *job)
 {
-	// to be implemented
-	return B_ERROR;
+	// check parameters
+	if (!partition || !job || !fModule)
+		return B_BAD_VALUE;
+	if (!fModule->initialize)
+		return B_NOT_SUPPORTED;
+
+	// open partition device (we need a temporary read-lock)
+	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
+	if (!manager->ReadLockPartition(partition->ID()))
+		return B_ERROR;
+	DeviceReadLocker locker(partition->Device(), true);
+
+	int fd = -1;
+	status_t result = partition->Open(O_RDWR, &fd);
+	if (result != B_OK)
+		return result;
+
+	locker.Unlock();
+
+	// call the module hook
+	result = fModule->initialize(fd, partition->ID(), name, parameters,
+		job->ID());
+
+	close(fd);
+	return result;
 }
 
 

Modified: haiku/trunk/src/system/kernel/disk_device_manager/KPartitioningSystem.cpp
===================================================================
--- haiku/trunk/src/system/kernel/disk_device_manager/KPartitioningSystem.cpp	2007-08-02 12:33:00 UTC (rev 21787)
+++ haiku/trunk/src/system/kernel/disk_device_manager/KPartitioningSystem.cpp	2007-08-02 12:43:49 UTC (rev 21788)
@@ -901,6 +901,7 @@
 	}
 
 	// let the module do its job
+// TODO: The partition must not be locked at this point!
 	status_t result = fModule->initialize(fd, partition->ID(), name, parameters,
 		job->ID());
 

Modified: haiku/trunk/src/tools/fs_shell/unistd.cpp
===================================================================
--- haiku/trunk/src/tools/fs_shell/unistd.cpp	2007-08-02 12:33:00 UTC (rev 21787)
+++ haiku/trunk/src/tools/fs_shell/unistd.cpp	2007-08-02 12:43:49 UTC (rev 21788)
@@ -34,7 +34,8 @@
 
 
 #ifndef __BEOS__
-	// The _kern_close() defined in libroot_build.so.
+	// Defined in libroot_build.so.
+	extern "C" int _kern_dup(int fd);
 	extern "C" status_t _kern_close(int fd);
 #endif
 
@@ -77,6 +78,24 @@
 
 
 int
+fssh_dup(int fd)
+{
+	// Use the _kern_dup() defined in libroot on BeOS incompatible systems.
+	// Required for proper attribute emulation support.
+	#if __BEOS__
+		return dup(fd);
+	#else
+		int result = _kern_dup(fd);
+		if (result < 0) {
+			fssh_set_errno(result);
+			return -1;
+		}
+		return result;
+	#endif
+}
+
+
+int
 fssh_close(int fd)
 {
 	// Use the _kern_close() defined in libroot on BeOS incompatible systems.

Modified: haiku/trunk/src/tools/fs_shell/vfs.cpp
===================================================================
--- haiku/trunk/src/tools/fs_shell/vfs.cpp	2007-08-02 12:33:00 UTC (rev 21787)
+++ haiku/trunk/src/tools/fs_shell/vfs.cpp	2007-08-02 12:43:49 UTC (rev 21788)
@@ -16,6 +16,7 @@
 #include "fssh_atomic.h"
 #include "fssh_defs.h"
 #include "fssh_dirent.h"
+#include "fssh_errno.h"
 #include "fssh_fcntl.h"
 #include "fssh_fs_info.h"
 #include "fssh_fs_volume.h"
@@ -5184,30 +5185,30 @@
 
 	// The partition argument should point to a real file/device.
 
-	// normalize the device path
-	KPath normalizedDevice;
-//	status = normalizedDevice.SetTo(device, true);
-// NOTE: normalizing works only in our namespace.
-	fssh_status_t status = normalizedDevice.SetTo(partition, false);
-	if (status != FSSH_B_OK)
-		return status;
+	// open partition
+	int fd = fssh_open(partition, FSSH_O_RDWR);
+	if (fd < 0)
+		return fssh_errno;
 
-	partition = normalizedDevice.Path();
-		// correct path to file device
-
 	// get the file system module
 	fssh_file_system_module_info* fsModule = get_file_system(fsName);
-	if (fsModule == NULL)
+	if (fsModule == NULL) {
+		fssh_close(fd);
 		return FSSH_ENODEV;
+	}
 
 	// initialize
-	if (fsModule->initialize) 
-		status = (*fsModule->initialize)(partition, name, parameters, -1);
-	else
+	fssh_status_t status;
+	if (fsModule->initialize) {
+		status = (*fsModule->initialize)(fd, -1, name, parameters, -1);
+			// We've got no partition or job IDs -- the FS will hopefully
+			// ignore that.
+	} else
 		status = FSSH_B_NOT_SUPPORTED;
 
-	// put the file system module
+	// put the file system module, close partition
 	put_file_system(fsModule);
+	fssh_close(fd);
 
 	return status;
 }



From stippi at mail.berlios.de  Thu Aug  2 15:04:28 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 2 Aug 2007 15:04:28 +0200
Subject: [Haiku-commits] r21789 - haiku/trunk/src/servers/app
Message-ID: <200708021304.l72D4SED003440@sheep.berlios.de>

Author: stippi
Date: 2007-08-02 15:04:27 +0200 (Thu, 02 Aug 2007)
New Revision: 21789
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21789&view=rev

Modified:
   haiku/trunk/src/servers/app/MultiLocker.h
Log:
* added IsLocked() method to AutoWriteLocker


Modified: haiku/trunk/src/servers/app/MultiLocker.h
===================================================================
--- haiku/trunk/src/servers/app/MultiLocker.h	2007-08-02 12:43:49 UTC (rev 21788)
+++ haiku/trunk/src/servers/app/MultiLocker.h	2007-08-02 13:04:27 UTC (rev 21789)
@@ -112,6 +112,11 @@
 			fLock.WriteLock();
 		}
 
+		bool IsLocked() const
+		{
+			return fLock.IsWriteLocked();
+		}
+
 		~AutoWriteLocker()
 		{
 			fLock.WriteUnlock();



From jackburton at mail.berlios.de  Thu Aug  2 15:17:23 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Thu, 2 Aug 2007 15:17:23 +0200
Subject: [Haiku-commits] r21790 - haiku/trunk/src/apps/terminal
Message-ID: <200708021317.l72DHNf3004714@sheep.berlios.de>

Author: jackburton
Date: 2007-08-02 15:17:23 +0200 (Thu, 02 Aug 2007)
New Revision: 21790
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21790&view=rev

Modified:
   haiku/trunk/src/apps/terminal/SmartTabView.cpp
   haiku/trunk/src/apps/terminal/SmartTabView.h
   haiku/trunk/src/apps/terminal/TermWindow.cpp
   haiku/trunk/src/apps/terminal/TermWindow.h
Log:
Implemented tabbed terminal (with a couple of bad hacks which will go 
away soon, hopefully). The menuitem to open a new tab is still 
disabled, until I figure out how to catch the exit signal... HELP ? 
Plus there are still a couple of visual issues, but AFAICT without tabs 
the Terminal appearance should be the same as it was before, so no one 
should complain.


Modified: haiku/trunk/src/apps/terminal/SmartTabView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/SmartTabView.cpp	2007-08-02 13:04:27 UTC (rev 21789)
+++ haiku/trunk/src/apps/terminal/SmartTabView.cpp	2007-08-02 13:17:23 UTC (rev 21790)
@@ -8,16 +8,19 @@
 
 #include "SmartTabView.h"
 
-#include <TabView.h>
+#include <Message.h>
+#include <Window.h>
 
+#include <stdio.h>
 
 SmartTabView::SmartTabView(BRect frame, const char *name, button_width width, 
 				uint32 resizingMode, uint32 flags)
 	:
-	BView(frame, name, resizingMode, flags),
-	fTabView(NULL),
-	fView(NULL)
+	BTabView(frame, name, width, resizingMode, flags)
 {
+	// See BTabView::_InitObject() to see why we are doing this
+	ContainerView()->MoveBy(-3, -TabHeight() - 3);
+	ContainerView()->ResizeBy(9, TabHeight() + 9);
 }
 
 
@@ -26,116 +29,82 @@
 }
 
 
-BView *
-SmartTabView::ContainerView()
+void
+SmartTabView::MouseDown(BPoint point)
 {
-	return fTabView != NULL ? fTabView->ContainerView() : this;
+	int32 buttons;
+	Window()->CurrentMessage()->FindInt32("buttons", &buttons);
+
+	if (CountTabs() > 1 && point.y <= TabHeight() && buttons & B_TERTIARY_MOUSE_BUTTON) {
+		for (int32 i = 0; i < CountTabs(); i++) {
+			if (TabFrame(i).Contains(point)) {
+				// Select another tab				
+				if (i > 0)
+					Select(i - 1);
+				else if (i < CountTabs())
+					Select(i + 1);
+				BTab *tab = RemoveTab(i);		
+				delete tab;		
+				return;
+			}
+		}
+	} else 
+		BTabView::MouseDown(point);
 }
 
 
-BView *
-SmartTabView::ViewForTab(int32 tab)
+void
+SmartTabView::AllAttached()
 {
-	return fTabView != NULL ? fTabView->ViewForTab(tab) : fView; 
+	BTabView::AllAttached();
 }
 
 
 void
 SmartTabView::Select(int32 index)
 {
-	if (fView != NULL) {
-		fView->ResizeTo(Bounds().Width(), Bounds().Height());	
-	} else if (fTabView != NULL) {
-		fTabView->Select(index);
-		BTab *tab = fTabView->TabAt(fTabView->Selection());
-		if (tab != NULL) {	
-			BView *view = tab->View();
-			if (view != NULL)
-				view->ResizeTo(fTabView->Bounds().Width(), fTabView->Bounds().Height());
-		}
+	BTabView::Select(index);
+	BView *view = ViewForTab(index);
+	if (view != NULL) {
+		view->ResizeTo(ContainerView()->Bounds().Width(), ContainerView()->Bounds().Height());
 	}
 }
 
 
-int32
-SmartTabView::Selection() const
-{
-	return fTabView != NULL ? fTabView->Selection() : 0;
-}
-
-
 void
 SmartTabView::AddTab(BView *target, BTab *tab)
 {
 	if (target == NULL)
 		return;
 
-	if (fView == NULL && fTabView == NULL) {
-		fView = target;
-		AddChild(target);	
-	} else {
-		if (fTabView == NULL) {
-			RemoveChild(fView);
-			fTabView = new BTabView(Bounds(), "tabview");			
-			AddChild(fTabView);
-			fTabView->MoveTo(B_ORIGIN);
-			fTabView->ResizeTo(Bounds().Width(), Bounds().Height());
-			fTabView->AddTab(fView);
-			fTabView->Select(0);
-			fView = NULL;
-		}					
-		fTabView->AddTab(target, tab);
+	if (CountTabs() == 1) {
+		ContainerView()->ResizeBy(0, -TabHeight());
+		ContainerView()->MoveBy(0, TabHeight());	
 	}
+	BTabView::AddTab(target, tab);
+	
+	Invalidate(TabFrame(CountTabs() - 1).InsetByCopy(-2, -2));
 }
 
 
 BTab *
 SmartTabView::RemoveTab(int32 index)
 {
-	BTab *returnTab = NULL;
-	if (fTabView != NULL) {
-		returnTab = fTabView->RemoveTab(index);
-		if (fTabView->CountTabs() == 1) {
-			BTab *tab = fTabView->RemoveTab(0);			
-			RemoveChild(fTabView);
-			delete fTabView;			
-			fTabView = NULL;
-			fView = tab->View();
-			tab->SetView(NULL);			
-			AddChild(fView);
-			fView->MoveTo(B_ORIGIN);
-			fView->ResizeTo(Bounds().Width(), Bounds().Height());
-			delete tab;
-		}
-	} else if (fView != NULL) {		
-		RemoveChild(fView);
-		returnTab = new BTab();
-		returnTab->SetView(fView);		
-		fView = NULL;
+	BTab *tab = BTabView::RemoveTab(index);
+	if (CountTabs() == 1) {
+		ContainerView()->MoveBy(0, -TabHeight());		
+		ContainerView()->ResizeBy(0, TabHeight());	
 	}
-	
-	return returnTab;
+	return tab;
 }
 
 
-int32
-SmartTabView::CountTabs() const
+BRect
+SmartTabView::DrawTabs()
 {
-	if (fTabView != NULL)
-		return fTabView->CountTabs();
-
-	return fView != NULL ? 1 : 0;	
+	if (CountTabs() > 1)
+		return BTabView::DrawTabs();
+	return BRect();
 }
 
 
-/*
-void
-SmartTabView::Draw(BRect updateRect)
-{
-	if (fView != NULL) {
-		
-	}	
-}
-*/
-
-

Modified: haiku/trunk/src/apps/terminal/SmartTabView.h
===================================================================
--- haiku/trunk/src/apps/terminal/SmartTabView.h	2007-08-02 13:04:27 UTC (rev 21789)
+++ haiku/trunk/src/apps/terminal/SmartTabView.h	2007-08-02 13:17:23 UTC (rev 21790)
@@ -9,10 +9,9 @@
 #ifndef __SMARTTABVIEW_H
 #define __SMARTTABVIEW_H
 
-#include <View.h>
+#include <TabView.h>
 
-class BTabView;
-class SmartTabView : public BView {
+class SmartTabView : public BTabView {
 public:
 	SmartTabView(BRect frame, const char *name,
 			button_width width = B_WIDTH_AS_USUAL, 
@@ -22,21 +21,15 @@
 					B_FRAME_EVENTS | B_NAVIGABLE);
 	virtual ~SmartTabView();
 	
-	virtual BView *ContainerView();
-	virtual BView *ViewForTab(int32);
+	virtual void MouseDown(BPoint where);
 
+	virtual void AllAttached();
 	virtual	void Select(int32 tab);
-	virtual int32 Selection() const;
-
+	
 	virtual	void AddTab(BView *target, BTab *tab = NULL);
 	virtual BTab* RemoveTab(int32 index);
-	virtual int32 CountTabs() const;	
-	
-	//virtual void Draw(BRect rect);
 
-private:
-	BTabView *fTabView;
-	BView *fView;
+	virtual BRect DrawTabs();
 };
 
 #endif // __SMARTTABVIEW_H

Modified: haiku/trunk/src/apps/terminal/TermWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-02 13:04:27 UTC (rev 21789)
+++ haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-02 13:17:23 UTC (rev 21790)
@@ -31,6 +31,7 @@
 #include <Roster.h>
 #include <Screen.h>
 #include <ScrollBar.h>
+#include <ScrollView.h>
 #include <String.h>
 #include <TextControl.h>
 #include <WindowScreen.h>
@@ -49,11 +50,11 @@
 
 
 const static float kViewOffset = 3;
+const static uint32 kNewTab = 'NTab';
 
 TermWindow::TermWindow(BRect frame, const char* title, const char *command)
 	: BWindow(frame, title, B_DOCUMENT_WINDOW, B_CURRENT_WORKSPACE|B_QUIT_ON_WINDOW_CLOSE),
 	fTabView(NULL),
-	fTermView(NULL),	
 	fMenubar(NULL),
 	fFilemenu(NULL),
 	fEditmenu(NULL),
@@ -75,14 +76,6 @@
 	fMatchWord(false)
 {
 	_InitWindow(command);
-	/*BView *view = new TermView(Bounds());
-	
-	AddChild(view);
-	BRect draggerFrame(0, 0, 16, 16);
-	draggerFrame.OffsetTo(Bounds().RightBottom() - BPoint(16, 16));
-	BDragger *dragger = new BDragger(draggerFrame, view, B_FOLLOW_RIGHT|B_FOLLOW_BOTTOM, B_WILL_DRAW);
-		
-	view->AddChild(dragger);*/
 }
 
 
@@ -110,71 +103,13 @@
 	// make menu bar
 	_SetupMenu();
 
-	// Setup font.
+	BRect textFrame = Bounds();
+	textFrame.top = fMenubar->Bounds().bottom + 1.0;
 
-	const char *family = PrefHandler::Default()->getString(PREF_HALF_FONT_FAMILY);
-
-	BFont halfFont;
-	halfFont.SetFamilyAndStyle(family, NULL);
-	float size = PrefHandler::Default()->getFloat(PREF_HALF_FONT_SIZE);
-	if (size < 6.0f)
-		size = 6.0f;
-	halfFont.SetSize(size);
+	fTabView = new SmartTabView(textFrame, "tab view");
+	AddChild(fTabView);
 	
-	family = PrefHandler::Default()->getString(PREF_FULL_FONT_FAMILY);
-
-	BFont fullFont;
-	fullFont.SetFamilyAndStyle(family, NULL);
-	size = PrefHandler::Default()->getFloat(PREF_FULL_FONT_SIZE);
-	if (size < 6.0f)
-		size = 6.0f;
-	fullFont.SetSize(size);
-	fullFont.SetSpacing(B_FIXED_SPACING);
-
-	// Make Terminal text view.
-
-	BRect textframe = Bounds();
-	textframe.top = fMenubar->Bounds().bottom + 1.0;
-
-	fTermView = new TermView(textframe, command);
-	fTermView->SetEncoding(longname2id(PrefHandler::Default()->getString(PREF_TEXT_ENCODING)));
-
-	// Initialize TermView. (font, size and color)
-	fTermView->SetTermFont(&halfFont, &fullFont);
-	
-	_SetTermColors();
-	BRect rect = fTermView->SetTermSize(PrefHandler::Default()->getInt32(PREF_ROWS),
-					PrefHandler::Default()->getInt32(PREF_COLS), true);
-
-	int width, height;
-	fTermView->GetFontSize(&width, &height);
-	SetSizeLimits(MIN_COLS * width, MAX_COLS * width,
-		MIN_COLS * height, MAX_COLS * height);
-	
-	// Add offset to baseview.
-	rect.InsetBy(-kViewOffset, -kViewOffset);
-
-	// Resize Window
-	ResizeTo(rect.Width()+ B_V_SCROLL_BAR_WIDTH,
-		rect.Height() + fMenubar->Bounds().Height());
-
-	fTermView->ResizeTo(rect.Width(), rect.Height());
-	
-	// Make Scroll Bar.
-
-	BRect scrollRect(0, 0, B_V_SCROLL_BAR_WIDTH,
-		rect.Height() - B_H_SCROLL_BAR_HEIGHT + 1);
-
-	scrollRect.OffsetBy(rect.Width() + 1, fMenubar->Bounds().Height());
-
-	BScrollBar *scrollBar = new BScrollBar(scrollRect, "scrollbar",
-		fTermView, 0, 0, B_VERTICAL);
-	fTermView->SetScrollBar(scrollBar);
-	
-	AddChild(scrollBar);
-	AddChild(fTermView);
-
-	fEditmenu->SetTargetForItems(fTermView);
+	_NewTab(command);
 }
 
 
@@ -182,7 +117,7 @@
 TermWindow::MenusBeginning()
 {
 	// Syncronize Encode Menu Pop-up menu and Preference.
-	BMenuItem *item = fEncodingmenu->FindItem(id2longname(fTermView->Encoding()));
+	BMenuItem *item = fEncodingmenu->FindItem(id2longname(_ActiveTermView()->Encoding()));
 	if (item != NULL)
 		item->SetMarked(true);
 	BWindow::MenusBeginning();
@@ -203,6 +138,12 @@
 	fFilemenu = new BMenu("Terminal");
 	fFilemenu->AddItem(new BMenuItem("Switch Terminals", new BMessage(MENU_SWITCH_TERM),'G'));
 	fFilemenu->AddItem(new BMenuItem("New Terminal" B_UTF8_ELLIPSIS, new BMessage(MENU_NEW_TERM), 'N'));
+	
+
+	// TODO: Tabs disabled until various problems are fixed.
+	// n. 1: calling "exit" from a tab closes the whole app.
+	//fFilemenu->AddItem(new BMenuItem("New Tab", new BMessage(kNewTab), 'T'));
+	
 	fFilemenu->AddSeparatorItem();
 	fFilemenu->AddItem(new BMenuItem("Page Setup...", new BMessage(MENU_PAGE_SETUP)));
 	fFilemenu->AddItem(new BMenuItem("Print", new BMessage(MENU_PRINT),'P'));
@@ -286,6 +227,10 @@
 			be_app->PostMessage(MENU_SWITCH_TERM);
 			break;
 		}
+		case kNewTab:
+			_NewTab(NULL);
+			break;
+
 		case MENU_NEW_TERM: {
 			app_info info;
 			be_app->GetAppInfo(&info);
@@ -325,7 +270,7 @@
 			if (!fFindSelection) 
 				message->FindString("findstring", &fFindString);
 			else 
-				fTermView->GetSelection(fFindString);
+				_ActiveTermView()->GetSelection(fFindString);
 
 			if (fFindString.Length() == 0) {
 				BAlert *alert = new BAlert("find failed", "No search string.", "Okay", NULL, 
@@ -339,7 +284,7 @@
 			message->FindBool("forwardsearch", &fForwardSearch);
 			message->FindBool("matchcase", &fMatchCase);
 			message->FindBool("matchword", &fMatchWord);
-			findresult = fTermView->Find(fFindString, fForwardSearch, fMatchCase, fMatchWord);
+			findresult = _ActiveTermView()->Find(fFindString, fForwardSearch, fMatchCase, fMatchWord);
 				
 			if (!findresult) {
 				BAlert *alert = new BAlert("find failed", "Not Found.", "Okay", NULL,
@@ -356,7 +301,7 @@
 			break;
 		}
 		case MENU_FIND_FORWARD: {
-			findresult = fTermView->Find(fFindString, true, fMatchCase, fMatchWord);
+			findresult = _ActiveTermView()->Find(fFindString, true, fMatchCase, fMatchWord);
 			if (!findresult) {
 				BAlert *alert = new BAlert("find failed", "Not Found.", "Okay", NULL,
 					NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
@@ -365,7 +310,7 @@
 			break;
 		}
 		case MENU_FIND_BACKWARD: {
-			findresult = fTermView->Find(fFindString, false, fMatchCase, fMatchWord);
+			findresult = _ActiveTermView()->Find(fFindString, false, fMatchCase, fMatchWord);
 			if (!findresult) {
 				BAlert *alert = new BAlert("find failed", "Not Found.", "Okay", NULL,
 					NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
@@ -379,14 +324,14 @@
 
 		case MENU_ENCODING: {
 			message->FindInt32 ("op", &coding_id);
-			fTermView->SetEncoding(coding_id);
+			_ActiveTermView()->SetEncoding(coding_id);
 			break;
 		}
 		
 		// Message from Preference panel.
 		case MSG_ROWS_CHANGED:
 		case MSG_COLS_CHANGED: {
-			r = fTermView->SetTermSize (PrefHandler::Default()->getInt32 (PREF_ROWS),
+			r = _ActiveTermView()->SetTermSize (PrefHandler::Default()->getInt32 (PREF_ROWS),
 										PrefHandler::Default()->getInt32 (PREF_COLS), 0);
 		
 			ResizeTo (r.Width()+ B_V_SCROLL_BAR_WIDTH + kViewOffset * 2,
@@ -410,12 +355,12 @@
 			fullFont.SetSize (PrefHandler::Default()->getFloat(PREF_FULL_FONT_SIZE));
 			fullFont.SetSpacing (B_FIXED_SPACING);
 			
-			fTermView->SetTermFont (&halfFont, &fullFont);
-			r = fTermView->SetTermSize (0, 0, 0);
+			_ActiveTermView()->SetTermFont (&halfFont, &fullFont);
+			r = _ActiveTermView()->SetTermSize (0, 0, 0);
 			
 			int width, height;
 			
-			fTermView->GetFontSize (&width, &height);
+			_ActiveTermView()->GetFontSize (&width, &height);
 			
 			SetSizeLimits (MIN_COLS * width, MAX_COLS * width,
 							MIN_COLS * height, MAX_COLS * height);
@@ -423,7 +368,7 @@
 			ResizeTo (r.Width()+ B_V_SCROLL_BAR_WIDTH + kViewOffset * 2,
 			r.Height()+fMenubar->Bounds().Height() + kViewOffset * 2);
 			
-			fTermView->Invalidate();
+			_ActiveTermView()->Invalidate();
 			break;
 		}
 		case EIGHTYTWENTYFOUR: {
@@ -461,9 +406,9 @@
 				float mbHeight = fMenubar->Bounds().Height() + 1;
 				fSavedFrame = Frame();
 				BScreen screen(this);
-				fTermView->ScrollBar()->Hide();
+				_ActiveTermView()->ScrollBar()->Hide();
 				fMenubar->Hide();
-				fTermView->ResizeBy(B_V_SCROLL_BAR_WIDTH, mbHeight);
+				_ActiveTermView()->ResizeBy(B_V_SCROLL_BAR_WIDTH, mbHeight);
 				fSavedLook = Look();
 				// done before ResizeTo to work around a Dano bug (not erasing the decor)
 				SetLook(B_NO_BORDER_WINDOW_LOOK);
@@ -472,10 +417,10 @@
 			} else { // exit fullscreen
 				float mbHeight = fMenubar->Bounds().Height() + 1;
 				fMenubar->Show();
-				fTermView->ScrollBar()->Show();
+				_ActiveTermView()->ScrollBar()->Show();
 				ResizeTo(fSavedFrame.Width(), fSavedFrame.Height());
 				MoveTo(fSavedFrame.left, fSavedFrame.top);
-				fTermView->ResizeBy(-B_V_SCROLL_BAR_WIDTH, -mbHeight);
+				_ActiveTermView()->ResizeBy(-B_V_SCROLL_BAR_WIDTH, -mbHeight);
 				SetLook(fSavedLook);
 				fSavedFrame = BRect(0,0,-1,-1);
 			}
@@ -488,7 +433,7 @@
 		}
 		case MSG_COLOR_CHANGED: {
 			_SetTermColors();
-			fTermView->Invalidate();
+			_ActiveTermView()->Invalidate();
 			break;
 		}
 		case SAVE_AS_DEFAULT: {
@@ -536,13 +481,13 @@
 void
 TermWindow::_SetTermColors()
 {
-	fTermView->SetTextColor(PrefHandler::Default()->getRGB(PREF_TEXT_FORE_COLOR),
+	_ActiveTermView()->SetTextColor(PrefHandler::Default()->getRGB(PREF_TEXT_FORE_COLOR),
 				PrefHandler::Default()->getRGB(PREF_TEXT_BACK_COLOR));
 
-	fTermView->SetSelectColor(PrefHandler::Default()->getRGB(PREF_SELECT_FORE_COLOR),
+	_ActiveTermView()->SetSelectColor(PrefHandler::Default()->getRGB(PREF_SELECT_FORE_COLOR),
 				PrefHandler::Default()->getRGB(PREF_SELECT_BACK_COLOR));
 	
-	fTermView->SetCursorColor(PrefHandler::Default()->getRGB(PREF_CURSOR_FORE_COLOR),
+	_ActiveTermView()->SetCursorColor(PrefHandler::Default()->getRGB(PREF_CURSOR_FORE_COLOR),
 				PrefHandler::Default()->getRGB(PREF_CURSOR_BACK_COLOR));
 }
 
@@ -579,7 +524,7 @@
 	int pHeight = (int)pageRect.Height();
 	int pWidth = (int)pageRect.Width();
 	float w,h;
-	fTermView->GetFrameSize(&w, &h);
+	_ActiveTermView()->GetFrameSize(&w, &h);
 	int xPages = (int)ceil(w / pWidth);
 	int yPages = (int)ceil(h / pHeight);
 
@@ -589,7 +534,7 @@
 	for (int x = 0; x < xPages; x++) {
 		for (int y = 0; y < yPages; y++) {
 			curPageRect.OffsetTo(x * pWidth, y * pHeight);
-			job.DrawView(fTermView, curPageRect, B_ORIGIN);
+			job.DrawView(_ActiveTermView(), curPageRect, B_ORIGIN);
 			job.SpoolPage();
     
 			if (!job.CanContinue()){
@@ -610,9 +555,78 @@
 void
 TermWindow::_NewTab(const char *command)
 {
-	TermView *view = new TermView(Bounds(), command);
-	fTabView->AddTab(view);
+	// Setup font.
+
+	const char *family = PrefHandler::Default()->getString(PREF_HALF_FONT_FAMILY);
+
+	BFont halfFont;
+	halfFont.SetFamilyAndStyle(family, NULL);
+	float size = PrefHandler::Default()->getFloat(PREF_HALF_FONT_SIZE);
+	if (size < 6.0f)
+		size = 6.0f;
+	halfFont.SetSize(size);
+	
+	family = PrefHandler::Default()->getString(PREF_FULL_FONT_FAMILY);
+
+	BFont fullFont;
+	fullFont.SetFamilyAndStyle(family, NULL);
+	size = PrefHandler::Default()->getFloat(PREF_FULL_FONT_SIZE);
+	if (size < 6.0f)
+		size = 6.0f;
+	fullFont.SetSize(size);
+	fullFont.SetSpacing(B_FIXED_SPACING);
+
+	// Make Terminal text view.
+	TermView *view = new TermView(BRect(0, 0, 10, 10), command);
+	
+	BScrollView *scrollView = new BScrollView("scrollView", view, B_FOLLOW_ALL,
+					B_WILL_DRAW|B_FRAME_EVENTS, false, true);	
+	fTabView->AddTab(scrollView);
+	view->SetScrollBar(scrollView->ScrollBar(B_VERTICAL));
+	
+	// TODO: Resize the vertical scrollbar to take the window gripping handle into account
+	// (shouldn't this be done in BScrollView itself ? At least BScrollBar does that).	
+	scrollView->ScrollBar(B_VERTICAL)->ResizeBy(0, -13);
+	view->SetEncoding(longname2id(PrefHandler::Default()->getString(PREF_TEXT_ENCODING)));
+	view->SetTermFont(&halfFont, &fullFont);
+	
+	_SetTermColors();
+	
+	BRect rect = view->SetTermSize(PrefHandler::Default()->getInt32(PREF_ROWS),
+					PrefHandler::Default()->getInt32(PREF_COLS), false);
+
+	
+	// If it's the first time we're called, setup the window
+	if (fTabView->CountTabs() == 1) {
+		int width, height;
+		view->GetFontSize(&width, &height);
+		SetSizeLimits(MIN_COLS * width, MAX_COLS * width,
+			MIN_COLS * height, MAX_COLS * height);
+	
+		// Add offset to baseview.
+		rect.InsetBy(-kViewOffset, -kViewOffset);
+	
+		// Resize Window
+		ResizeTo(rect.Width()+ B_V_SCROLL_BAR_WIDTH,
+			rect.Height() + fMenubar->Bounds().Height());
+
+		// TODO: If I don't do this, the view won't show up.
+		// Bug in BTabView or in my code ?
+		fTabView->Select(0);
+	}
+	
+	// TODO: How do I set this for the current active tab,
+	// every time a different tab is chosen ? 
+	fEditmenu->SetTargetForItems(view);
 }
 
 
+TermView *
+TermWindow::_ActiveTermView()
+{
+	// TODO: BAD HACK:
+	// We should probably use the observer api to tell
+	// the various "tabs" when settings are changed. Fix this.
+	return (TermView *)((BScrollView *)fTabView->ViewForTab(fTabView->Selection()))->Target();
+}
 

Modified: haiku/trunk/src/apps/terminal/TermWindow.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.h	2007-08-02 13:04:27 UTC (rev 21789)
+++ haiku/trunk/src/apps/terminal/TermWindow.h	2007-08-02 13:17:23 UTC (rev 21790)
@@ -60,6 +60,7 @@
 	status_t	_DoPageSetup();
 	void		_DoPrint();
 	void		_NewTab(const char *command);
+	TermView*	_ActiveTermView();
 	
 	SmartTabView	*fTabView;
 	TermView	*fTermView;



From axeld at pinc-software.de  Thu Aug  2 17:35:09 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Thu, 02 Aug 2007 17:35:09 +0200
Subject: [Haiku-commits] r21790 - haiku/trunk/src/apps/terminal
In-Reply-To: <200708021317.l72DHNf3004714@sheep.berlios.de>
Message-ID: <8389746148-BeMail@ibm>

jackburton at BerliOS <jackburton at mail.berlios.de> wrote:
> Log:
> Implemented tabbed terminal (with a couple of bad hacks which will go 
> away soon, hopefully). The menuitem to open a new tab is still 
> disabled, until I figure out how to catch the exit signal... HELP ? 

Who exactly is sending an exit signal? If it is you, you might just 
want to change how that mechanism works.
Otherwise, have a look at sigaction():
http://www.opengroup.org/onlinepubs/009695399/toc.htm

Just keep in mind that if you're catching this signal, nobody else will 
be able to send it to you either :-)

Bye,
   Axel.



From stippi at mail.berlios.de  Thu Aug  2 18:23:49 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 2 Aug 2007 18:23:49 +0200
Subject: [Haiku-commits] r21791 - in haiku/trunk/src: kits/storage
	kits/tracker tests/servers/registrar
Message-ID: <200708021623.l72GNnMa013136@sheep.berlios.de>

Author: stippi
Date: 2007-08-02 18:23:49 +0200 (Thu, 02 Aug 2007)
New Revision: 21791
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21791&view=rev

Modified:
   haiku/trunk/src/kits/storage/LibBeAdapter.cpp
   haiku/trunk/src/kits/tracker/FSUtils.cpp
   haiku/trunk/src/tests/servers/registrar/Jamfile
Log:
* fix the build of the app_server test environment (libbe_test) after
  the change to the nodemonitor syscall


Modified: haiku/trunk/src/kits/storage/LibBeAdapter.cpp
===================================================================
--- haiku/trunk/src/kits/storage/LibBeAdapter.cpp	2007-08-02 13:17:23 UTC (rev 21790)
+++ haiku/trunk/src/kits/storage/LibBeAdapter.cpp	2007-08-02 16:23:49 UTC (rev 21791)
@@ -125,10 +125,8 @@
 
 			
 status_t
-_kern_stop_watching(dev_t device, ino_t node, uint32 flags,
-	port_id port, uint32 token)
+_kern_stop_watching(dev_t device, ino_t node, port_id port, uint32 token)
 {
-	(void)flags;
 	return _kstop_watching_vnode_(device, node, port, token);
 }
 

Modified: haiku/trunk/src/kits/tracker/FSUtils.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/FSUtils.cpp	2007-08-02 13:17:23 UTC (rev 21790)
+++ haiku/trunk/src/kits/tracker/FSUtils.cpp	2007-08-02 16:23:49 UTC (rev 21791)
@@ -2891,7 +2891,7 @@
 
 extern "C" char** environ;
 
-#ifdef __HAIKU__
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 extern "C" status_t _kern_load_image(int32 argCount, const char **args,
 	int32 envCount, const char **env, int32 priority, uint32 flags,
 	port_id errorPort, uint32 errorToken);
@@ -2917,7 +2917,7 @@
 
 	char *argv[2] = { const_cast<char *>(path.Path()), 0};
 
-#ifdef __HAIKU__
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 	port_id errorPort = create_port(1, "Tracker loader error");
 
 	// count environment variables

Modified: haiku/trunk/src/tests/servers/registrar/Jamfile
===================================================================
--- haiku/trunk/src/tests/servers/registrar/Jamfile	2007-08-02 13:17:23 UTC (rev 21790)
+++ haiku/trunk/src/tests/servers/registrar/Jamfile	2007-08-02 16:23:49 UTC (rev 21791)
@@ -85,7 +85,6 @@
 	PriorityMessageQueue.cpp
 	RecentApps.cpp
 	RecentEntries.cpp
-	Referenceable.cpp
 	Registrar.cpp
 	RosterAppInfo.cpp
 	RosterSettingsCharStream.cpp



From stippi at mail.berlios.de  Thu Aug  2 18:28:36 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 2 Aug 2007 18:28:36 +0200
Subject: [Haiku-commits] r21792 - in haiku/trunk: headers/private/shared
	src/kits/shared
Message-ID: <200708021628.l72GSaBf013617@sheep.berlios.de>

Author: stippi
Date: 2007-08-02 18:28:34 +0200 (Thu, 02 Aug 2007)
New Revision: 21792
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21792&view=rev

Added:
   haiku/trunk/headers/private/shared/HashMap.h
   haiku/trunk/headers/private/shared/HashString.h
   haiku/trunk/headers/private/shared/OpenHashTable.h
   haiku/trunk/src/kits/shared/HashString.cpp
Modified:
   haiku/trunk/src/kits/shared/Jamfile
Log:
* put some more useful utility classes into "shared". I tried to make sure
  that OpenHashTable.h does not collide with all the other places that this
  is used, it seems everything still builds fine. Most problematic could be
  the OpenHashTable.h at kernel/util, but it seems it the target using
  that are not affected.


Added: haiku/trunk/headers/private/shared/HashMap.h
===================================================================
--- haiku/trunk/headers/private/shared/HashMap.h	2007-08-02 16:23:49 UTC (rev 21791)
+++ haiku/trunk/headers/private/shared/HashMap.h	2007-08-02 16:28:34 UTC (rev 21792)
@@ -0,0 +1,450 @@
+// HashMap.h
+// 
+// Copyright (c) 2004-2007, Ingo Weinhold (bonefish at cs.tu-berlin.de)
+// 
+// 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.
+// 
+// Except as contained in this notice, the name of a copyright holder shall
+// not be used in advertising or otherwise to promote the sale, use or other
+// dealings in this Software without prior written authorization of the
+// copyright holder.
+
+#ifndef HASH_MAP_H
+#define HASH_MAP_H
+
+//#include <Debug.h>
+#include <Locker.h>
+
+#include "AutoLocker.h"
+#include "OpenHashTable.h"
+
+namespace BPrivate {
+
+// HashMapElement
+template<typename Key, typename Value>
+class HashMapElement : public OpenHashElement {
+private:
+	typedef HashMapElement<Key, Value> Element;
+public:
+
+	HashMapElement() : OpenHashElement(), fKey(), fValue()
+	{
+		fNext = -1;
+	}
+
+	inline uint32 Hash() const
+	{
+		return fKey.GetHashCode();
+	}
+
+	inline bool operator==(const OpenHashElement &_element) const
+	{
+		const Element &element = static_cast<const Element&>(_element);
+		return (fKey == element.fKey);
+	}
+
+	inline void Adopt(Element &element)
+	{
+		fKey = element.fKey;
+		fValue = element.fValue;
+	}
+
+	Key		fKey;
+	Value	fValue;
+};
+
+// HashMap
+template<typename Key, typename Value>
+class HashMap {
+public:
+	class Entry {
+	public:
+		Entry() {}
+		Entry(const Key& key, Value value) : key(key), value(value) {}
+
+		Key		key;
+		Value	value;
+	};
+
+	class Iterator {
+	private:
+		typedef HashMapElement<Key, Value>	Element;
+	public:
+		Iterator(const Iterator& other)
+			: fMap(other.fMap),
+			  fIndex(other.fIndex),
+			  fElement(other.fElement),
+			  fLastElement(other.fElement)
+		{
+		}
+	
+		bool HasNext() const
+		{
+			return fElement;
+		}
+	
+		Entry Next()
+		{
+			if (!fElement)
+				return Entry();
+			Entry result(fElement->fKey, fElement->fValue);
+			_FindNext();
+			return result;
+		}
+	
+		Entry Remove()
+		{
+			if (!fLastElement)
+				return Entry();
+			Entry result(fLastElement->fKey, fLastElement->fValue);
+			fMap->fTable.Remove(fLastElement, true);
+			fLastElement = NULL;
+			return result;
+		}
+	
+		Iterator& operator=(const Iterator& other)
+		{
+			fMap = other.fMap;
+			fIndex = other.fIndex;
+			fElement = other.fElement;
+			fLastElement = other.fLastElement;
+			return *this;
+		}
+	
+	private:
+		Iterator(const HashMap<Key, Value>* map)
+			: fMap(const_cast<HashMap<Key, Value>*>(map)),
+			  fIndex(0),
+			  fElement(NULL),
+			  fLastElement(NULL)
+		{
+			// find first
+			_FindNext();
+		}
+	
+		void _FindNext()
+		{
+			fLastElement = fElement;
+			if (fElement && fElement->fNext >= 0) {
+				fElement = fMap->fTable.ElementAt(fElement->fNext);
+				return;
+			}
+			fElement = NULL;
+			int32 arraySize = fMap->fTable.ArraySize();
+			for (; !fElement && fIndex < arraySize; fIndex++)
+				fElement = fMap->fTable.FindFirst(fIndex);
+		}
+	
+	private:
+		friend class HashMap<Key, Value>;
+	
+		HashMap<Key, Value>*	fMap;
+		int32					fIndex;
+		Element*				fElement;
+		Element*				fLastElement;
+	};
+
+	HashMap();
+	~HashMap();
+
+	status_t InitCheck() const;
+
+	status_t Put(const Key& key, Value value);
+	Value Remove(const Key& key);
+	void Clear();
+	Value Get(const Key& key) const;
+
+	bool ContainsKey(const Key& key) const;
+
+	int32 Size() const;
+
+	Iterator GetIterator() const;
+
+protected:
+	typedef HashMapElement<Key, Value>	Element;
+	friend class Iterator;
+
+private:
+	Element *_FindElement(const Key& key) const;
+
+protected:
+	OpenHashElementArray<Element>							fElementArray;
+	OpenHashTable<Element, OpenHashElementArray<Element> >	fTable;
+};
+
+// SynchronizedHashMap
+template<typename Key, typename Value>
+class SynchronizedHashMap : public BLocker {
+public:
+	typedef HashMap<Key, Value>::Entry Entry;
+	typedef HashMap<Key, Value>::Iterator Iterator;
+
+	SynchronizedHashMap() : BLocker("synchronized hash map")	{}
+	~SynchronizedHashMap()	{ Lock(); }
+
+	status_t InitCheck() const
+	{
+		return fMap.InitCheck();
+	}
+
+	status_t Put(const Key& key, Value value)
+	{
+		MapLocker locker(this);
+		if (!locker.IsLocked())
+			return B_ERROR;
+		return fMap.Put(key, value);
+	}
+
+	Value Remove(const Key& key)
+	{
+		MapLocker locker(this);
+		if (!locker.IsLocked())
+			return Value();
+		return fMap.Remove(key);
+	}
+
+	void Clear()
+	{
+		MapLocker locker(this);
+		return fMap.Clear();
+	}
+
+	Value Get(const Key& key) const
+	{
+		const BLocker* lock = this;
+		MapLocker locker(const_cast<BLocker*>(lock));
+		if (!locker.IsLocked())
+			return Value();
+		return fMap.Get(key);
+	}
+
+	bool ContainsKey(const Key& key) const
+	{
+		const BLocker* lock = this;
+		MapLocker locker(const_cast<BLocker*>(lock));
+		if (!locker.IsLocked())
+			return false;
+		return fMap.ContainsKey(key);
+	}
+
+	int32 Size() const
+	{
+		const BLocker* lock = this;
+		MapLocker locker(const_cast<BLocker*>(lock));
+		return fMap.Size();
+	}
+
+	Iterator GetIterator()
+	{
+		return fMap.GetIterator();
+	}
+
+	// for debugging only
+	const HashMap<Key, Value>& GetUnsynchronizedMap() const	{ return fMap; }
+	HashMap<Key, Value>& GetUnsynchronizedMap()				{ return fMap; }
+
+protected:
+	typedef AutoLocker<BLocker> MapLocker;
+
+	HashMap<Key, Value>	fMap;
+};
+
+// HashKey32
+template<typename Value>
+struct HashKey32 {
+	HashKey32() {}
+	HashKey32(const Value& value) : value(value) {}
+
+	uint32 GetHashCode() const
+	{
+		return (uint32)value;
+	}
+
+	HashKey32<Value> operator=(const HashKey32<Value>& other)
+	{
+		value = other.value;
+		return *this;
+	}
+
+	bool operator==(const HashKey32<Value>& other) const
+	{
+		return (value == other.value);
+	}
+
+	bool operator!=(const HashKey32<Value>& other) const
+	{
+		return (value != other.value);
+	}
+
+	Value	value;
+};
+
+
+// HashKey64
+template<typename Value>
+struct HashKey64 {
+	HashKey64() {}
+	HashKey64(const Value& value) : value(value) {}
+
+	uint32 GetHashCode() const
+	{
+		uint64 v = (uint64)value;
+		return (uint32)(v >> 32) ^ (uint32)v;
+	}
+
+	HashKey64<Value> operator=(const HashKey64<Value>& other)
+	{
+		value = other.value;
+		return *this;
+	}
+
+	bool operator==(const HashKey64<Value>& other) const
+	{
+		return (value == other.value);
+	}
+
+	bool operator!=(const HashKey64<Value>& other) const
+	{
+		return (value != other.value);
+	}
+
+	Value	value;
+};
+
+
+// HashMap
+
+// constructor
+template<typename Key, typename Value>
+HashMap<Key, Value>::HashMap()
+	: fElementArray(1000),
+	  fTable(1000, &fElementArray)
+{
+}
+
+// destructor
+template<typename Key, typename Value>
+HashMap<Key, Value>::~HashMap()
+{
+}
+
+// InitCheck
+template<typename Key, typename Value>
+status_t
+HashMap<Key, Value>::InitCheck() const
+{
+	return (fTable.InitCheck() && fElementArray.InitCheck()
+			? B_OK : B_NO_MEMORY);
+}
+
+// Put
+template<typename Key, typename Value>
+status_t
+HashMap<Key, Value>::Put(const Key& key, Value value)
+{
+	Element* element = _FindElement(key);
+	if (element) {
+		// already contains the key: just set the new value
+		element->fValue = value;
+		return B_OK;
+	}
+	// does not contain the key yet: add an element	
+	element = fTable.Add(key.GetHashCode());
+	if (!element)
+		return B_NO_MEMORY;
+	element->fKey = key;
+	element->fValue = value;
+	return B_OK;
+}
+
+// Remove
+template<typename Key, typename Value>
+Value
+HashMap<Key, Value>::Remove(const Key& key)
+{
+	Value value = Value();
+	if (Element* element = _FindElement(key)) {
+		value = element->fValue;
+		fTable.Remove(element);
+	}
+	return value;
+}
+
+// Clear
+template<typename Key, typename Value>
+void
+HashMap<Key, Value>::Clear()
+{
+	fTable.RemoveAll();
+}
+
+// Get
+template<typename Key, typename Value>
+Value
+HashMap<Key, Value>::Get(const Key& key) const
+{
+	if (Element* element = _FindElement(key))
+		return element->fValue;
+	return Value();
+}
+
+// ContainsKey
+template<typename Key, typename Value>
+bool
+HashMap<Key, Value>::ContainsKey(const Key& key) const
+{
+	return _FindElement(key);
+}
+
+// Size
+template<typename Key, typename Value>
+int32
+HashMap<Key, Value>::Size() const
+{
+	return fTable.CountElements();
+}
+
+// GetIterator
+template<typename Key, typename Value>
+HashMap<Key, Value>::Iterator
+HashMap<Key, Value>::GetIterator() const
+{
+	return Iterator(this);
+}
+
+// _FindElement
+template<typename Key, typename Value>
+HashMap<Key, Value>::Element *
+HashMap<Key, Value>::_FindElement(const Key& key) const
+{
+	Element* element = fTable.FindFirst(key.GetHashCode());
+	while (element && element->fKey != key) {
+		if (element->fNext >= 0)
+			element = fTable.ElementAt(element->fNext);
+		else
+			element = NULL;
+	}
+	return element;
+}
+
+}	// namespace BPrivate
+
+using BPrivate::HashMap;
+
+#endif	// HASH_MAP_H

Added: haiku/trunk/headers/private/shared/HashString.h
===================================================================
--- haiku/trunk/headers/private/shared/HashString.h	2007-08-02 16:23:49 UTC (rev 21791)
+++ haiku/trunk/headers/private/shared/HashString.h	2007-08-02 16:28:34 UTC (rev 21792)
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2004-2007, Ingo Weinhold, bonefish at users.sf.net. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef HASH_STRING_H
+#define HASH_STRING_H
+
+#include <SupportDefs.h>
+
+// string_hash
+//
+// from the Dragon Book: a slightly modified hashpjw()
+static inline
+uint32
+string_hash(const char *name)
+{
+	uint32 h = 0;
+	if (name) {
+		for (; *name; name++) {
+			uint32 g = h & 0xf0000000;
+			if (g)
+				h ^= g >> 24;
+			h = (h << 4) + *name;
+		}
+	}
+	return h;
+}
+
+#ifdef __cplusplus
+
+namespace BPrivate {
+
+// HashString
+class HashString {
+public:
+	HashString();
+	HashString(const HashString &string);
+	HashString(const char *string, int32 length = -1);
+	~HashString();
+
+	bool SetTo(const char *string, int32 maxLength = -1);
+	void Unset();
+
+	void Truncate(int32 newLength);
+
+	const char *GetString() const;
+	int32 GetLength() const	{ return fLength; }
+
+	uint32 GetHashCode() const	{ return string_hash(GetString()); }
+
+	HashString &operator=(const HashString &string);
+	bool operator==(const HashString &string) const;
+	bool operator!=(const HashString &string) const { return !(*this == string); }
+
+private:
+	bool _SetTo(const char *string, int32 length);
+
+private:
+	int32	fLength;
+	char	*fString;
+};
+
+}	// namespace BPrivate
+
+using BPrivate::HashString;
+
+#endif	// __cplusplus
+
+#endif	// HASH_STRING_H

Added: haiku/trunk/headers/private/shared/OpenHashTable.h
===================================================================
--- haiku/trunk/headers/private/shared/OpenHashTable.h	2007-08-02 16:23:49 UTC (rev 21791)
+++ haiku/trunk/headers/private/shared/OpenHashTable.h	2007-08-02 16:28:34 UTC (rev 21792)
@@ -0,0 +1,510 @@
+/*
+Open Tracker License
+
+Terms and Conditions
+
+Copyright (c) 1991-2000, Be Incorporated. All rights reserved.
+
+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 applies to all licensees
+and 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 TITLE, MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+BE INCORPORATED 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.
+
+Except as contained in this notice, the name of Be Incorporated shall not be
+used in advertising or otherwise to promote the sale, use or other dealings in
+this Software without prior written authorization from Be Incorporated.
+
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
+of Be Incorporated in the United States and other countries. Other brand product
+names are registered trademarks or trademarks of their respective holders.
+All rights reserved.
+*/
+
+// bonefish:
+// * removed need for exceptions
+// * fixed warnings
+// * implemented rehashing
+// * added RemoveAll()
+// TODO:
+// * shrinking of element vectors
+
+// Hash table with open addresssing
+
+#ifndef __OPEN_HASH_TABLE__
+#define __OPEN_HASH_TABLE__
+
+#include <malloc.h>
+#include <new.h>
+
+// don't include <Debug.h>
+#define ASSERT(E)               (void)0
+#define TRESPASS()              (void)0
+ 
+namespace BPrivate {
+
+template <class Element>
+class ElementVector {
+	// element vector for OpenHashTable needs to implement this
+	// interface
+public:
+	Element &At(int32 index);
+	Element *Add();
+	int32 IndexOf(const Element &) const;
+	void Remove(int32 index);
+};
+
+class OpenHashElement {
+public:
+	uint32 Hash() const;
+	bool operator==(const OpenHashElement &) const;
+	void Adopt(OpenHashElement &);
+		// low overhead copy, original element is in undefined state
+		// after call (calls Adopt on BString members, etc.)
+	int32 fNext;
+};
+
+const uint32 kPrimes [] = {
+	509, 1021, 2039, 4093, 8191, 16381, 32749, 65521, 131071, 262139,
+	524287, 1048573, 2097143, 4194301, 8388593, 16777213, 33554393, 67108859,
+	134217689, 268435399, 536870909, 1073741789, 2147483647, 0
+};
+
+template <class Element, class ElementVec = ElementVector<Element> >
+class OpenHashTable {
+public:
+	OpenHashTable(int32 minSize, ElementVec *elementVector = 0,
+				  float maxLoadFactor = 0.8);
+		// it is up to the subclass of OpenHashTable to supply
+		// elementVector
+	~OpenHashTable();
+	
+	bool InitCheck() const;
+
+	void SetElementVector(ElementVec *elementVector);
+	
+	Element *FindFirst(uint32 elementHash) const;
+	Element *Add(uint32 elementHash);
+	
+	void Remove(Element *element, bool dontRehash = false);
+	void RemoveAll();
+	
+	// when calling Add, any outstanding element pointer may become
+	// invalid; to deal with this, get the element index and restore
+	// it after the add
+	int32 ElementIndex(const Element *) const;
+	Element *ElementAt(int32 index) const;
+
+	int32 ArraySize() const;
+	int32 VectorSize() const;
+	int32 CountElements() const;
+
+protected:
+	static int32 OptimalSize(int32 minSize);
+
+private:
+	bool _RehashIfNeeded();
+	bool _Rehash();
+	
+	int32 fArraySize;
+	int32 fInitialSize;
+	int32 fElementCount;
+	int32 *fHashArray;
+	ElementVec *fElementVector;
+	float fMaxLoadFactor;
+};
+
+template <class Element>
+class OpenHashElementArray : public ElementVector<Element> {
+	// this is a straightforward implementation of an element vector
+	// deleting is handled by linking deleted elements into a free list
+	// the vector never shrinks
+public:
+	OpenHashElementArray(int32 initialSize);
+	~OpenHashElementArray();
+
+	bool InitCheck() const;
+
+	Element &At(int32 index);
+	const Element &At(int32 index) const;
+	Element *Add(const Element &);
+	Element *Add();
+	void Remove(int32 index);
+	int32 IndexOf(const Element &) const;
+	int32 Size() const;
+
+private:
+	Element *fData;
+	int32 fSize;
+	int32 fNextFree;
+	int32 fNextDeleted;
+};
+
+
+//-----------------------------------
+
+template<class Element, class ElementVec>
+OpenHashTable<Element, ElementVec>::OpenHashTable(int32 minSize,
+	ElementVec *elementVector, float maxLoadFactor)
+	:	fArraySize(OptimalSize(minSize)),
+		fInitialSize(fArraySize),
+		fElementCount(0),
+		fElementVector(elementVector),
+		fMaxLoadFactor(maxLoadFactor)
+{
+	// sanity check the maximal load factor
+	if (fMaxLoadFactor < 0.5)
+		fMaxLoadFactor = 0.5;
+	// allocate and init the array
+	fHashArray = (int32*)calloc(fArraySize, sizeof(int32));
+	if (fHashArray) {
+		for (int32 index = 0; index < fArraySize; index++)
+			fHashArray[index] = -1;
+	}
+}
+
+template<class Element, class ElementVec>
+OpenHashTable<Element, ElementVec>::~OpenHashTable()
+{
+	RemoveAll();
+	free(fHashArray);
+}
+
+template<class Element, class ElementVec>
+bool
+OpenHashTable<Element, ElementVec>::InitCheck() const
+{
+	return (fHashArray && fElementVector);
+}
+
+template<class Element, class ElementVec>
+int32 
+OpenHashTable<Element, ElementVec>::OptimalSize(int32 minSize)
+{
+	for (int32 index = 0; ; index++)
+		if (!kPrimes[index] || kPrimes[index] >= (uint32)minSize)
+			return (int32)kPrimes[index];
+
+	return 0;
+}
+
+template<class Element, class ElementVec>
+Element *
+OpenHashTable<Element, ElementVec>::FindFirst(uint32 hash) const
+{
+	ASSERT(fElementVector);
+	hash %= fArraySize;
+	if (fHashArray[hash] < 0)
+		return 0;
+	
+	return &fElementVector->At(fHashArray[hash]);
+}
+
+template<class Element, class ElementVec>
+int32 
+OpenHashTable<Element, ElementVec>::ElementIndex(const Element *element) const
+{
+	return fElementVector->IndexOf(*element);
+}
+
+template<class Element, class ElementVec>
+Element *
+OpenHashTable<Element, ElementVec>::ElementAt(int32 index) const
+{
+	return &fElementVector->At(index);
+}
+
+template<class Element, class ElementVec>
+int32 
+OpenHashTable<Element, ElementVec>::ArraySize() const
+{
+	 return fArraySize;
+}
+
+template<class Element, class ElementVec>
+int32 
+OpenHashTable<Element, ElementVec>::VectorSize() const
+{
+	 return fElementVector->Size();
+}
+
+template<class Element, class ElementVec>
+int32 
+OpenHashTable<Element, ElementVec>::CountElements() const
+{
+	 return fElementCount;
+}
+
+
+template<class Element, class ElementVec>
+Element *
+OpenHashTable<Element, ElementVec>::Add(uint32 hash)
+{
+	ASSERT(fElementVector);
+	_RehashIfNeeded();
+	hash %= fArraySize;
+	Element *result = fElementVector->Add();
+	if (result) {
+		result->fNext = fHashArray[hash];
+		fHashArray[hash] = fElementVector->IndexOf(*result);
+		fElementCount++;
+	}
+	return result;
+}
+
+template<class Element, class ElementVec>
+void 
+OpenHashTable<Element, ElementVec>::Remove(Element *element, bool dontRehash)
+{
+	if (!dontRehash)
+		_RehashIfNeeded();
+	uint32 hash = element->Hash() % fArraySize;
+	int32 next = fHashArray[hash];
+	ASSERT(next >= 0);
+
+	if (&fElementVector->At(next) == element) {
+		fHashArray[hash] = element->fNext;
+		fElementVector->Remove(next);
+		fElementCount--;
+		return;
+	}
+
+	for (int32 index = next; index >= 0; ) {
+		// look for an existing match in table
+		next = fElementVector->At(index).fNext;
+		if (next < 0) {
+			TRESPASS();
+			return;
+		}
+		
+		if (&fElementVector->At(next) == element) {
+			fElementVector->At(index).fNext = element->fNext;
+			fElementVector->Remove(next);
+			fElementCount--;
+			return;
+		}
+		index = next;
+	}
+}
+
+template<class Element, class ElementVec>
+void 
+OpenHashTable<Element, ElementVec>::RemoveAll()
+{
+	for (int32 i = 0; fElementCount > 0 && i < fArraySize; i++) {
+		int32 index = fHashArray[i];
+		while (index >= 0) {
+			Element* element = &fElementVector->At(index);
+			int32 next = element->fNext;
+			fElementVector->Remove(index);
+			fElementCount--;
+			index = next;
+		}
+		fHashArray[i] = -1;
+	}
+	_RehashIfNeeded();
+}
+
+template<class Element, class ElementVec>
+void 
+OpenHashTable<Element, ElementVec>::SetElementVector(ElementVec *elementVector)
+{
+	fElementVector = elementVector;
+}
+
+// _RehashIfNeeded
+template<class Element, class ElementVec>
+bool
+OpenHashTable<Element, ElementVec>::_RehashIfNeeded()
+{
+	// The load factor range [fMaxLoadFactor / 3, fMaxLoadFactor] is fine,
+	// I think. After rehashing the load factor will be about
+	// fMaxLoadFactor * 2 / 3, respectively fMaxLoadFactor / 2.
+	float loadFactor = (float)fElementCount / (float)fArraySize;
+	if (loadFactor > fMaxLoadFactor
+		|| (fArraySize > fInitialSize && loadFactor < fMaxLoadFactor / 3)) {
+		return _Rehash();
+	}
+	return true;
+}
+
+// _Rehash
+template<class Element, class ElementVec>
+bool
+OpenHashTable<Element, ElementVec>::_Rehash()
+{
+	bool result = true;
+	int32 newSize = int32(fElementCount * 1.73 * fMaxLoadFactor);
+	newSize = (fInitialSize > newSize ? fInitialSize : newSize);
+	if (newSize != fArraySize) {
+		// allocate a new array
+		int32 *newHashArray = (int32*)calloc(newSize, sizeof(int32));
+		if (newHashArray) {
+			// init the new hash array
+			for (int32 index = 0; index < newSize; index++)
+				newHashArray[index] = -1;
+			// iterate through all elements and put them into the new
+			// hash array
+			for (int i = 0; i < fArraySize; i++) {
+				int32 index = fHashArray[i];
+				while (index >= 0) {
+					// insert the element in the new array
+					Element &element = fElementVector->At(index);
+					int32 next = element.fNext;
+					uint32 hash = (element.Hash() % newSize);
+					element.fNext = newHashArray[hash];
+					newHashArray[hash] = index;
+					// next element in old list
+					index = next;
+				}
+			}
+			// delete the old array and set the new one
+			free(fHashArray);
+			fHashArray = newHashArray;
+			fArraySize = newSize;
+		} else
+			result = false;
+	}
+	return result;
+}
+
+
+template<class Element>
+OpenHashElementArray<Element>::OpenHashElementArray(int32 initialSize)
+	:	fSize(initialSize),
+		fNextFree(0),
+		fNextDeleted(-1)
+{
+	fData = (Element*)calloc((size_t)initialSize, sizeof(Element));
+}
+
+template<class Element>
+OpenHashElementArray<Element>::~OpenHashElementArray()
+{
+	free(fData);
+}
+
+template<class Element>
+bool
+OpenHashElementArray<Element>::InitCheck() const
+{
+	return fData;
+}
+
+template<class Element>
+Element &
+OpenHashElementArray<Element>::At(int32 index)
+{
+	ASSERT(index < fSize);
+	return fData[index];
+}
+
+template<class Element>
+const Element &
+OpenHashElementArray<Element>::At(int32 index) const
+{
+	ASSERT(index < fSize);
+	return fData[index];
+}
+
+template<class Element>
+int32 
+OpenHashElementArray<Element>::IndexOf(const Element &element) const
+{
+	int32 result = &element - fData;
+	if (result < 0 || result > fSize)
+		return -1;
+	
+	return result;
+}
+
+template<class Element>
+int32 
+OpenHashElementArray<Element>::Size() const
+{
+	return fSize;
+}
+
+
+template<class Element>
+Element *
+OpenHashElementArray<Element>::Add(const Element &newElement)
+{
+	Element *element = Add();
+	if (element)
+		element.Adopt(newElement);
+	return element;
+}
+
+#if DEBUG
+const int32 kGrowChunk = 10;
+#else
+const int32 kGrowChunk = 1024;
+#endif
+
+template<class Element>
+Element *
+OpenHashElementArray<Element>::Add()
+{
+	int32 index = fNextFree;
+	if (fNextDeleted >= 0) {
+		index = fNextDeleted;
+		fNextDeleted = At(index).fNext;		
+	} else if (fNextFree >= fSize - 1) {

[... truncated: 202 lines follow ...]


From axeld at mail.berlios.de  Thu Aug  2 18:55:46 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 2 Aug 2007 18:55:46 +0200
Subject: [Haiku-commits] r21793 - haiku/trunk/src/apps/terminal
Message-ID: <200708021655.l72Gtk4h022161@sheep.berlios.de>

Author: axeld
Date: 2007-08-02 18:55:44 +0200 (Thu, 02 Aug 2007)
New Revision: 21793
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21793&view=rev

Modified:
   haiku/trunk/src/apps/terminal/Shell.cpp
   haiku/trunk/src/apps/terminal/TermApp.cpp
   haiku/trunk/src/apps/terminal/TermBuffer.cpp
Log:
Fixed the build under BeOS/Dano:
* setenv() actually exists in Dano.
* On R5, it now uses sprintf() - the previous version would not compile.
* Cleaned some weird code in TermBuffer.cpp to set the "buf" variable to the
  end of the string - it also no longer uses the index() BSD extension
  (same as strchr()).


Modified: haiku/trunk/src/apps/terminal/Shell.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/Shell.cpp	2007-08-02 16:28:34 UTC (rev 21792)
+++ haiku/trunk/src/apps/terminal/Shell.cpp	2007-08-02 16:55:44 UTC (rev 21793)
@@ -86,7 +86,7 @@
 /*
  * Set environment variable.
  */
-#if !defined(__HAIKU__) || defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
+#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
 
 extern char **environ;
 
@@ -102,7 +102,7 @@
 			/* found it */
 			if (overwrite) {
 				environ[envindex] = (char *)malloc((unsigned)len + val_len + 2);
-				snprintf(environ[envindex], "%s=%s", var, value);
+				sprintf(environ[envindex], "%s=%s", var, value);
 			}
 			return 0;
 		}

Modified: haiku/trunk/src/apps/terminal/TermApp.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermApp.cpp	2007-08-02 16:28:34 UTC (rev 21792)
+++ haiku/trunk/src/apps/terminal/TermApp.cpp	2007-08-02 16:55:44 UTC (rev 21793)
@@ -25,6 +25,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 
 static bool sUsageRequested = false;

Modified: haiku/trunk/src/apps/terminal/TermBuffer.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermBuffer.cpp	2007-08-02 16:28:34 UTC (rev 21792)
+++ haiku/trunk/src/apps/terminal/TermBuffer.cpp	2007-08-02 16:55:44 UTC (rev 21793)
@@ -200,7 +200,7 @@
 		if (ptr->attr != (ptr + 1)->attr)
 			return all_count;
 
-		buf = (uchar *)index((char *)buf, 0x00);
+		buf += strlen((char *)buf);
 		ptr++;
 		col++;
 



From axeld at mail.berlios.de  Thu Aug  2 19:21:12 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 2 Aug 2007 19:21:12 +0200
Subject: [Haiku-commits] r21794 - haiku/trunk/src/apps/terminal
Message-ID: <200708021721.l72HLCoP003738@sheep.berlios.de>

Author: axeld
Date: 2007-08-02 19:21:12 +0200 (Thu, 02 Aug 2007)
New Revision: 21794
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21794&view=rev

Modified:
   haiku/trunk/src/apps/terminal/Shell.cpp
   haiku/trunk/src/apps/terminal/SmartTabView.h
   haiku/trunk/src/apps/terminal/TermParse.cpp
   haiku/trunk/src/apps/terminal/TermView.cpp
Log:
* The PtyReader thread now just exits when there is no more left to be read.
* setpgid() when spawning the shell was superfluous, as we're already the
  session leader.
* Added a comment to TermView::NotifyQuit() about why sending B_QUIT_REQUESTED
  to the window isn't such a good idea when you have more than one use for it.


Modified: haiku/trunk/src/apps/terminal/Shell.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/Shell.cpp	2007-08-02 16:55:44 UTC (rev 21793)
+++ haiku/trunk/src/apps/terminal/Shell.cpp	2007-08-02 17:21:12 UTC (rev 21794)
@@ -345,7 +345,6 @@
 		return B_ERROR;
 	}
 
-
 	handshake_t handshake;
 
 	if (fProcessID == 0) {
@@ -489,21 +488,9 @@
 
 		ioctl(0, TIOCSWINSZ, &ws);
 
-		/*
-		 * Set process group ID to process, and Terminal Process group ID
-		 * to this process group ID (equal process ID).
-		 */
+		tcsetpgrp(0, getpgrp());
+			// set this process group ID as the controlling terminal
 
-		pid_t processGroup = getpid();
-		if (setpgid(processGroup, processGroup) < 0) {
-			handshake.status = PTY_NG;
-			snprintf(handshake.msg, sizeof(handshake.msg),
-				"can't set process group id.");
-			send_handshake_message(terminalThread, handshake);
-			exit(1);		
-		}
-		tcsetpgrp(0, processGroup);
-
 		/* pty open and set termios successful. */
 		handshake.status = PTY_OK;
 		send_handshake_message(terminalThread, handshake);

Modified: haiku/trunk/src/apps/terminal/SmartTabView.h
===================================================================
--- haiku/trunk/src/apps/terminal/SmartTabView.h	2007-08-02 16:55:44 UTC (rev 21793)
+++ haiku/trunk/src/apps/terminal/SmartTabView.h	2007-08-02 17:21:12 UTC (rev 21794)
@@ -5,7 +5,6 @@
  *	Authors:
  *		Stefano Ceccherini (burton666 at libero.it)
  */
-
 #ifndef __SMARTTABVIEW_H
 #define __SMARTTABVIEW_H
 

Modified: haiku/trunk/src/apps/terminal/TermParse.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermParse.cpp	2007-08-02 16:55:44 UTC (rev 21793)
+++ haiku/trunk/src/apps/terminal/TermParse.cpp	2007-08-02 17:21:12 UTC (rev 21794)
@@ -258,10 +258,7 @@
 		int nread = read(fFd, buf, READ_BUF_SIZE - (read_p - fBufferPosition));
 		if (nread <= 0) {
 			fView->NotifyQuit(errno);
-			// on the next iteration, fQuitting will probably be true,
-			// or the semaphore acquisition will fail, so this thread will
-			// be killed anyway.
-			continue;			
+			return B_OK;
 		}
 
 		// Copy read string to PtyBuffer.

Modified: haiku/trunk/src/apps/terminal/TermView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-02 16:55:44 UTC (rev 21793)
+++ haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-02 17:21:12 UTC (rev 21794)
@@ -2454,7 +2454,8 @@
 TermView::NotifyQuit(int32 reason)
 {
 	// TODO: If we are a replicant, we can't just quit the BWindow, no?.
-	Window()->PostMessage(B_QUIT_REQUESTED);	
+	// Exactly, and the same is true for tabs!
+	Window()->PostMessage(B_QUIT_REQUESTED);
 }
 
 



From korli at mail.berlios.de  Thu Aug  2 19:50:17 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Thu, 2 Aug 2007 19:50:17 +0200
Subject: [Haiku-commits] r21795 - in haiku/trunk: build/jam
	src/add-ons/kernel/partitioning_systems/intel
Message-ID: <200708021750.l72HoH5P005382@sheep.berlios.de>

Author: korli
Date: 2007-08-02 19:50:17 +0200 (Thu, 02 Aug 2007)
New Revision: 21795
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21795&view=rev

Modified:
   haiku/trunk/build/jam/BuildSetup
   haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/intel.cpp
Log:
reverted r21757 which is now fixed by the following
added $(HAIKU_GCC_LIBGCC) to HAIKU_KERNEL_ADDON_END_GLUE_CODE as suggested by Ingo


Modified: haiku/trunk/build/jam/BuildSetup
===================================================================
--- haiku/trunk/build/jam/BuildSetup	2007-08-02 17:21:12 UTC (rev 21794)
+++ haiku/trunk/build/jam/BuildSetup	2007-08-02 17:50:17 UTC (rev 21795)
@@ -306,7 +306,7 @@
 ;
 HAIKU_EXECUTABLE_END_GLUE_CODE = $(HAIKU_LIBRARY_END_GLUE_CODE) ;
 HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE = crtbegin.o ;
-HAIKU_KERNEL_ADDON_END_GLUE_CODE = crtend.o ;
+HAIKU_KERNEL_ADDON_END_GLUE_CODE = $(HAIKU_GCC_LIBGCC) crtend.o ;
 
 SEARCH on crtbegin.o crtend.o = $(HAIKU_GCC_LIB_DIR) ;
 
@@ -747,7 +747,7 @@
 
 # common stuff
 
-# start with a clean slate
+# start with a clean state
 CCFLAGS = ;
 C++FLAGS = ;
 DEFINES = ;

Modified: haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/intel.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/intel.cpp	2007-08-02 17:21:12 UTC (rev 21794)
+++ haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/intel.cpp	2007-08-02 17:50:17 UTC (rev 21795)
@@ -1542,7 +1542,7 @@
 			return error;
 		fromOffset += buffer_size;
 		toOffset += buffer_size;
-		update_disk_device_job_progress(job, i * 1.0 / cycleCount);
+		update_disk_device_job_progress(job, (float)i / cycleCount);
 	}
 	if (remainingSize)
 		error = move_block(fd, fromOffset, toOffset, buffer, remainingSize);



From stippi at mail.berlios.de  Thu Aug  2 20:32:00 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 2 Aug 2007 20:32:00 +0200
Subject: [Haiku-commits] r21796 - haiku/trunk/src/apps/fontdemo
Message-ID: <200708021832.l72IW0SE008856@sheep.berlios.de>

Author: stippi
Date: 2007-08-02 20:32:00 +0200 (Thu, 02 Aug 2007)
New Revision: 21796
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21796&view=rev

Modified:
   haiku/trunk/src/apps/fontdemo/FontDemoView.cpp
Log:
* I was trying to debug my new font stuff in the app_server for about an hour
  before I realized that it was FontDemo which was broken. It was easy to tell
  once I ran it on R5 for comparison... :-\


Modified: haiku/trunk/src/apps/fontdemo/FontDemoView.cpp
===================================================================
--- haiku/trunk/src/apps/fontdemo/FontDemoView.cpp	2007-08-02 17:50:17 UTC (rev 21795)
+++ haiku/trunk/src/apps/fontdemo/FontDemoView.cpp	2007-08-02 18:32:00 UTC (rev 21796)
@@ -141,12 +141,8 @@
 		xCoordArray[i] += xCenter;
 		yCoordArray[i] += yCoord;
 
-		boundBoxes[i].left = xCoordArray[i] + edgeInfo[i].left * FontSize();
-		boundBoxes[i].right = boundBoxes[i].left + width;
+		boundBoxes[i].OffsetBy(xCoordArray[i], yCoordArray[i]);
 
-		boundBoxes[i].bottom = yCoordArray[i];
- 		boundBoxes[i].top = boundBoxes[i].bottom - height;
-
 		if (OutLineLevel()) {
 			view->MovePenTo(xCoordArray[i], yCoordArray[i]);
 			view->SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR));



From stippi at mail.berlios.de  Thu Aug  2 21:10:43 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 2 Aug 2007 21:10:43 +0200
Subject: [Haiku-commits] r21797 - in haiku/trunk: headers/os/interface
	headers/private/app src/kits/interface src/servers/app
	src/servers/app/drawing src/servers/app/drawing/Painter
	src/servers/app/drawing/Painter/font_support src/tests/servers/app
Message-ID: <200708021910.l72JAheH010598@sheep.berlios.de>

Author: stippi
Date: 2007-08-02 21:10:38 +0200 (Thu, 02 Aug 2007)
New Revision: 21797
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21797&view=rev

Added:
   haiku/trunk/src/servers/app/FontCache.cpp
   haiku/trunk/src/servers/app/FontCache.h
   haiku/trunk/src/servers/app/FontCacheEntry.cpp
   haiku/trunk/src/servers/app/FontCacheEntry.h
   haiku/trunk/src/servers/app/FontEngine.cpp
   haiku/trunk/src/servers/app/FontEngine.h
   haiku/trunk/src/servers/app/GlyphLayoutEngine.h
Removed:
   haiku/trunk/src/servers/app/drawing/Painter/font_support/agg_font_freetype.cpp
   haiku/trunk/src/servers/app/drawing/Painter/font_support/agg_font_freetype.h
Modified:
   haiku/trunk/headers/os/interface/Font.h
   haiku/trunk/headers/private/app/ServerProtocol.h
   haiku/trunk/src/kits/interface/Font.cpp
   haiku/trunk/src/servers/app/Jamfile
   haiku/trunk/src/servers/app/ProfileMessageSupport.cpp
   haiku/trunk/src/servers/app/ServerFont.cpp
   haiku/trunk/src/servers/app/ServerFont.h
   haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp
   haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
   haiku/trunk/src/servers/app/drawing/Painter/Jamfile
   haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp
   haiku/trunk/src/servers/app/drawing/Painter/Painter.h
   haiku/trunk/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp
   haiku/trunk/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h
   haiku/trunk/src/tests/servers/app/Jamfile
Log:
* complete overhaul of the font/glyph caching
* the previous AGG implementation is superfluous
* the new implementation is based on that one, but in a way that allows
  read/write locking to the list of cache entries (fonts) as well as
  read/write locking to the cached glyphs per individual font cache entry
* new GlyphLayoutEngine.h, which is to be the central place for layouting
  glyphs along the baseline.
  It handles the locking for getting the font cache entries.
  It works by giving it a template class GlyphConsumer which does the
  actual work.
* changed AGGTextRenderer to use the new font cache
* changed ServerFont::StringWidth(), and the bounding box stuff to use it
* changed DrawingEngine, it doesn't need the global font lock anymore
* our BFont thought that GetBoundingBoxesAsGlyphs and GetBoundingBoxesAsString
  is the same, which of course it isn't, hence the two separate functions...
  AsGlyphs just gets the bounding box of each glyph in a string, not treating
  the string as an actual word
  AsString adds the offset of the glyph in the word to the bounding box
* changed ServerProtocol.h accordingly for the different bounding box meaning


Modified: haiku/trunk/headers/os/interface/Font.h
===================================================================
--- haiku/trunk/headers/os/interface/Font.h	2007-08-02 18:32:00 UTC (rev 21796)
+++ haiku/trunk/headers/os/interface/Font.h	2007-08-02 19:10:38 UTC (rev 21797)
@@ -254,7 +254,7 @@
 		void			_GetBoundingBoxes(const char charArray[], 
 							int32 numChars, font_metric_mode mode,
 							bool string_escapement, escapement_delta *delta,
-							BRect boundingBoxArray[]) const;
+							BRect boundingBoxArray[], bool asString) const;
 };
 
 

Modified: haiku/trunk/headers/private/app/ServerProtocol.h
===================================================================
--- haiku/trunk/headers/private/app/ServerProtocol.h	2007-08-02 18:32:00 UTC (rev 21796)
+++ haiku/trunk/headers/private/app/ServerProtocol.h	2007-08-02 19:10:38 UTC (rev 21797)
@@ -124,6 +124,7 @@
 	AS_GET_ESCAPEMENTS,
 	AS_GET_ESCAPEMENTS_AS_FLOATS,
 	AS_GET_BOUNDINGBOXES_CHARS,
+	AS_GET_BOUNDINGBOXES_STRING,
 	AS_GET_BOUNDINGBOXES_STRINGS,
 	AS_GET_HAS_GLYPHS,
 	AS_GET_GLYPH_SHAPES,

Modified: haiku/trunk/src/kits/interface/Font.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Font.cpp	2007-08-02 18:32:00 UTC (rev 21796)
+++ haiku/trunk/src/kits/interface/Font.cpp	2007-08-02 19:10:38 UTC (rev 21797)
@@ -1195,7 +1195,7 @@
 BFont::GetBoundingBoxesAsGlyphs(const char charArray[], int32 numChars, font_metric_mode mode,
 	BRect boundingBoxArray[]) const
 {
-	_GetBoundingBoxes(charArray, numChars, mode, false, NULL, boundingBoxArray);
+	_GetBoundingBoxes(charArray, numChars, mode, false, NULL, boundingBoxArray, false);
 }
 
 
@@ -1203,13 +1203,13 @@
 BFont::GetBoundingBoxesAsString(const char charArray[], int32 numChars, font_metric_mode mode,
 	escapement_delta *delta, BRect boundingBoxArray[]) const
 {
-	_GetBoundingBoxes(charArray, numChars, mode, true, delta, boundingBoxArray);
+	_GetBoundingBoxes(charArray, numChars, mode, true, delta, boundingBoxArray, true);
 }
 
 
 void
 BFont::_GetBoundingBoxes(const char charArray[], int32 numChars, font_metric_mode mode,
-	bool string_escapement, escapement_delta *delta, BRect boundingBoxArray[]) const
+	bool string_escapement, escapement_delta *delta, BRect boundingBoxArray[], bool asString) const
 {
 	if (!charArray || numChars < 1 || !boundingBoxArray)
 		return;
@@ -1217,7 +1217,7 @@
 	int32 code;
 	BPrivate::AppServerLink link;
 
-	link.StartMessage(AS_GET_BOUNDINGBOXES_CHARS);
+	link.StartMessage(asString ? AS_GET_BOUNDINGBOXES_STRING : AS_GET_BOUNDINGBOXES_CHARS);
 	link.Attach<uint16>(fFamilyID);
 	link.Attach<uint16>(fStyleID);
 	link.Attach<float>(fSize);

Added: haiku/trunk/src/servers/app/FontCache.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontCache.cpp	2007-08-02 18:32:00 UTC (rev 21796)
+++ haiku/trunk/src/servers/app/FontCache.cpp	2007-08-02 19:10:38 UTC (rev 21797)
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Stephan A?mus <superstippi at gmx.de>
+ */
+
+#include "FontCache.h"
+
+#include <new>
+#include <stdio.h>
+#include <string.h>
+
+#include <Entry.h>
+#include <Path.h>
+
+#include "AutoLocker.h"
+
+
+using std::nothrow;
+
+
+FontCache
+FontCache::sDefaultInstance;
+
+// #pragma mark -
+
+// constructor
+FontCache::FontCache()
+	: MultiLocker("FontCache lock")
+	, fFontCacheEntries()
+{
+}
+
+// destructor
+FontCache::~FontCache()
+{
+	FontMap::Iterator iterator = fFontCacheEntries.GetIterator();
+	while (iterator.HasNext())
+		iterator.Next().value->RemoveReference();
+}
+
+// Default
+/*static*/ FontCache*
+FontCache::Default()
+{
+	return &sDefaultInstance;
+}
+
+// SetFont
+FontCacheEntry*
+FontCache::FontCacheEntryFor(const ServerFont& font)
+{
+	char signature[512];
+	FontCacheEntry::GenerateSignature(signature, font);
+
+	AutoReadLocker readLocker(this);
+
+	FontCacheEntry* entry = fFontCacheEntries.Get(signature);
+
+	if (entry) {
+		// the entry was already there
+		entry->AddReference();
+		return entry;
+	}
+
+	readLocker.Unlock();
+
+	AutoWriteLocker locker(this);
+	if (!locker.IsLocked())
+		return NULL;
+
+	// prevent getting screwed by a race condition:
+	// when we released the readlock above, another thread might have
+	// gotten the writelock before we have, and might have already
+	// inserted a cache entry for this font. So we look again if there
+	// is an entry now, and only then create it if it's still not there,
+	// all while holding the writelock
+	entry = fFontCacheEntries.Get(signature);
+
+	if (!entry) {
+		// remove old entries, keep entries below certain count
+		_ConstrainEntryCount();
+		entry = new (nothrow) FontCacheEntry();
+		if (!entry || !entry->Init(font)
+			|| fFontCacheEntries.Put(signature, entry) < B_OK) {
+			fprintf(stderr, "FontCache::FontCacheEntryFor() - "
+				"out of memory or no font file\n");
+			delete entry;
+			return NULL;
+		}
+	}
+
+	entry->AddReference();
+	return entry;
+}
+
+// Recycle
+void
+FontCache::Recycle(FontCacheEntry* entry)
+{
+	entry->UpdateUsage();
+	entry->RemoveReference();
+}
+
+static const int32 kMaxEntryCount = 30;
+
+static inline double
+usage_index(uint64 useCount, bigtime_t age)
+{
+	return 100.0 * useCount / age;
+}
+
+// _ConstrainEntryCount
+void
+FontCache::_ConstrainEntryCount()
+{
+	// this function is only ever called with the WriteLock held
+	if (fFontCacheEntries.Size() < kMaxEntryCount)
+		return;
+//printf("FontCache::_ConstrainEntryCount()\n");
+
+	FontMap::Iterator iterator = fFontCacheEntries.GetIterator();
+
+	// NOTE: if kMaxEntryCount has a sane value, there has got to be
+	// some entries, so using the iterator like that should be ok
+	FontCacheEntry* leastUsedEntry = iterator.Next().value;
+	bigtime_t now = system_time();
+	bigtime_t age = now - leastUsedEntry->LastUsed();
+	uint64 useCount = leastUsedEntry->UsedCount();
+	double leastUsageIndex = usage_index(useCount, age);
+//printf("  leastUsageIndex: %f\n", leastUsageIndex);
+
+	while (iterator.HasNext()) {
+		FontCacheEntry* entry = iterator.Next().value;
+		age = now - entry->LastUsed();
+		useCount = entry->UsedCount();
+		double usageIndex = usage_index(useCount, age);
+//printf("  usageIndex: %f\n", usageIndex);
+		if (usageIndex < leastUsageIndex) {
+			leastUsedEntry = entry;
+			leastUsageIndex = usageIndex;
+		}
+	}
+
+	iterator = fFontCacheEntries.GetIterator();
+	while (iterator.HasNext()) {
+		if (iterator.Next().value == leastUsedEntry) {
+			iterator.Remove();
+			leastUsedEntry->RemoveReference();
+			break;
+		}
+	}
+}

Added: haiku/trunk/src/servers/app/FontCache.h
===================================================================
--- haiku/trunk/src/servers/app/FontCache.h	2007-08-02 18:32:00 UTC (rev 21796)
+++ haiku/trunk/src/servers/app/FontCache.h	2007-08-02 19:10:38 UTC (rev 21797)
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Stephan A?mus <superstippi at gmx.de>
+ */
+
+#ifndef FONT_CACHE_H
+#define FONT_CACHE_H
+
+#include "FontCacheEntry.h"
+#include "HashMap.h"
+#include "HashString.h"
+#include "MultiLocker.h"
+#include "ServerFont.h"
+
+
+class FontCache : public MultiLocker {
+ public:
+								FontCache();
+	virtual						~FontCache();
+
+	// global instance
+	static	FontCache*			Default();
+
+			FontCacheEntry*		FontCacheEntryFor(const ServerFont& font);
+			void				Recycle(FontCacheEntry* entry);
+
+ private:
+			void				_ConstrainEntryCount();
+
+	static	FontCache			sDefaultInstance;
+
+	typedef HashMap<HashString, FontCacheEntry*> FontMap;
+
+			FontMap				fFontCacheEntries;
+};
+
+#endif // FONT_CACHE_H

Added: haiku/trunk/src/servers/app/FontCacheEntry.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontCacheEntry.cpp	2007-08-02 18:32:00 UTC (rev 21796)
+++ haiku/trunk/src/servers/app/FontCacheEntry.cpp	2007-08-02 19:10:38 UTC (rev 21797)
@@ -0,0 +1,238 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Maxim Shemanarev <mcseemagg at yahoo.com>
+ *		Stephan A?mus <superstippi at gmx.de>
+ */
+
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.4
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software 
+// is granted provided this copyright notice appears in all copies. 
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem at antigrain.com
+//			mcseemagg at yahoo.com
+//			http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+
+#include "FontCacheEntry.h"
+
+#include <string.h>
+#include <agg_array.h>
+
+#include <Autolock.h>
+
+#include "utf8_functions.h"
+
+BLocker
+FontCacheEntry::sUsageUpdateLock("FontCacheEntry usage lock");
+
+
+class FontCacheEntry::GlyphCachePool {
+ public:
+	enum block_size_e { block_size = 16384-16 };
+
+	GlyphCachePool()
+		: fAllocator(block_size)
+	{
+		memset(fGlyphs, 0, sizeof(fGlyphs));
+	}
+
+	const GlyphCache* FindGlyph(uint16 glyphCode) const
+	{
+		unsigned msb = (glyphCode >> 8) & 0xFF;
+		if (fGlyphs[msb]) 
+			return fGlyphs[msb][glyphCode & 0xFF];
+		return 0;
+	}
+
+	GlyphCache* CacheGlyph(uint16 glyphCode, unsigned glyphIndex,
+		unsigned dataSize, glyph_data_type dataType, const agg::rect_i& bounds,
+		double advanceX, double advanceY)
+	{
+		unsigned msb = (glyphCode >> 8) & 0xFF;
+		if (fGlyphs[msb] == 0) {
+			fGlyphs[msb]
+				= (GlyphCache**)fAllocator.allocate(sizeof(GlyphCache*) * 256,
+						sizeof(GlyphCache*));
+			memset(fGlyphs[msb], 0, sizeof(GlyphCache*) * 256);
+		}
+
+		unsigned lsb = glyphCode & 0xFF;
+		if (fGlyphs[msb][lsb])
+			return 0; // already exists, do not overwrite
+
+		GlyphCache* glyph
+			= (GlyphCache*)fAllocator.allocate(sizeof(GlyphCache),
+					sizeof(double));
+
+		glyph->glyph_index = glyphIndex;
+		glyph->data = fAllocator.allocate(dataSize);
+		glyph->data_size = dataSize;
+		glyph->data_type = dataType;
+		glyph->bounds = bounds;
+		glyph->advance_x = advanceX;
+		glyph->advance_y = advanceY;
+
+		return fGlyphs[msb][lsb] = glyph;
+	}
+
+ private:
+	agg::block_allocator	fAllocator;
+	GlyphCache**			fGlyphs[256];
+};
+
+// #pragma mark -
+
+// constructor
+FontCacheEntry::FontCacheEntry()
+	: MultiLocker("FontCacheEntry lock")
+	, Referenceable()
+	, fGlyphCache(new GlyphCachePool())
+	, fEngine()
+	, fLastUsedTime(LONGLONG_MIN)
+	, fUseCounter(0)
+{
+}
+
+// destructor
+FontCacheEntry::~FontCacheEntry()
+{
+//printf("~FontCacheEntry()\n");
+	delete fGlyphCache;
+}
+
+// Init
+bool
+FontCacheEntry::Init(const ServerFont& font)
+{
+	glyph_rendering renderingType = glyph_ren_native_gray8;
+	if (font.Rotation() != 0.0 || font.Shear() != 90.0)
+		renderingType = glyph_ren_outline;
+
+	// TODO: encoding from font
+	FT_Encoding charMap = FT_ENCODING_NONE;
+	bool hinting = true; // TODO: font.Hinting();
+
+	if (!fEngine.Init(font.Path(), 0, font.Size(), charMap,
+			renderingType, hinting)) {
+		fprintf(stderr, "FontCacheEntry::Init() - some error loading font "
+			"file %s\n", font.Path());
+		return false;
+	}
+	return true;
+}
+
+// HasGlyphs
+bool
+FontCacheEntry::HasGlyphs(const char* utf8String, size_t length) const
+{
+	uint32 charCode;
+	const char* start = utf8String;
+	while ((charCode = UTF8ToCharCode(&utf8String))) {
+		if (!fGlyphCache->FindGlyph(charCode))
+			return false;
+		if (utf8String - start + 1 > length)
+			break;
+	}
+	return true;
+}
+
+// Glyph
+const GlyphCache*
+FontCacheEntry::Glyph(uint16 glyphCode)
+{
+	const GlyphCache* glyph = fGlyphCache->FindGlyph(glyphCode);
+	if (glyph) {
+		return glyph;
+	} else {
+		if (fEngine.PrepareGlyph(glyphCode)) {
+			glyph = fGlyphCache->CacheGlyph(glyphCode,
+				fEngine.GlyphIndex(), fEngine.DataSize(),
+				fEngine.DataType(), fEngine.Bounds(),
+				fEngine.AdvanceX(), fEngine.AdvanceY());
+
+			fEngine.WriteGlyphTo(glyph->data);
+
+			return glyph;
+		}
+	}
+	return 0;
+}
+
+// InitAdaptors
+void
+FontCacheEntry::InitAdaptors(const GlyphCache* glyph,
+	double x, double y, GlyphMonoAdapter& monoAdapter,
+	GlyphGray8Adapter& gray8Adapter, GlyphPathAdapter& pathAdapter,
+	double scale)
+{
+	if (!glyph)
+		return;
+
+	switch(glyph->data_type) {
+		case glyph_data_mono:
+			monoAdapter.init(glyph->data, glyph->data_size, x, y);
+			break;
+
+		case glyph_data_gray8:
+			gray8Adapter.init(glyph->data, glyph->data_size, x, y);
+			break;
+
+		case glyph_data_outline:
+			pathAdapter.init(glyph->data, glyph->data_size, x, y, scale);
+			break;
+
+		default:
+			break;
+	}
+}
+
+// GetKerning
+bool
+FontCacheEntry::GetKerning(uint16 glyphCode1, uint16 glyphCode2,
+	double* x, double* y)
+{
+	return fEngine.GetKerning(glyphCode1, glyphCode2, x, y);
+}
+
+// GenerateSignature
+/*static*/ void
+FontCacheEntry::GenerateSignature(char* signature, const ServerFont& font)
+{
+	glyph_rendering renderingType = glyph_ren_native_gray8;
+	if (font.Rotation() != 0.0 || font.Shear() != 90.0)
+		renderingType = glyph_ren_outline;
+
+	// TODO: read more of these from the font
+	FT_Encoding charMap = FT_ENCODING_NONE;
+	bool hinting = true; // TODO: font.Hinting();
+
+	sprintf(signature, "%ld%u%d%d%.1f%d",
+		font.GetFamilyAndStyle(), charMap,
+		font.Face(), int(renderingType), font.Size(), hinting);
+}
+
+// UpdateUsage
+void
+FontCacheEntry::UpdateUsage()
+{
+	// this is a static lock to prevent usage of too many semaphores,
+	// but on the other hand, it is not so nice to be using a lock
+	// here at all
+	// the hope is that the time is so short to hold this lock, that
+	// there is not much contention
+	BAutolock _(sUsageUpdateLock);
+
+	fLastUsedTime = system_time();
+	fUseCounter++;
+}
+

Added: haiku/trunk/src/servers/app/FontCacheEntry.h
===================================================================
--- haiku/trunk/src/servers/app/FontCacheEntry.h	2007-08-02 18:32:00 UTC (rev 21796)
+++ haiku/trunk/src/servers/app/FontCacheEntry.h	2007-08-02 19:10:38 UTC (rev 21797)
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Maxim Shemanarev <mcseemagg at yahoo.com>
+ *		Stephan A?mus <superstippi at gmx.de>
+ */
+
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.4
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software 
+// is granted provided this copyright notice appears in all copies. 
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem at antigrain.com
+//			mcseemagg at yahoo.com
+//			http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+#ifndef FONT_CACHE_ENTRY_H
+#define FONT_CACHE_ENTRY_H
+
+
+#include <Locker.h>
+
+#include <agg_conv_curve.h>
+#include <agg_conv_contour.h>
+#include <agg_conv_transform.h>
+
+#include "ServerFont.h"
+#include "FontEngine.h"
+#include "MultiLocker.h"
+#include "Referenceable.h"
+#include "Transformable.h"
+
+
+struct GlyphCache {
+	unsigned		glyph_index;
+	uint8*			data;
+	unsigned		data_size;
+	glyph_data_type	data_type;
+	agg::rect_i		bounds;
+	double			advance_x;
+	double			advance_y;
+};
+
+class FontCache;
+
+class FontCacheEntry : public MultiLocker, public Referenceable {
+ public:
+	typedef FontEngine::PathAdapter					GlyphPathAdapter;
+	typedef FontEngine::Gray8Adapter				GlyphGray8Adapter;
+	typedef GlyphGray8Adapter::embedded_scanline	GlyphGray8Scanline;
+	typedef FontEngine::MonoAdapter					GlyphMonoAdapter;
+	typedef GlyphMonoAdapter::embedded_scanline		GlyphMonoScanline;
+	typedef agg::conv_curve<GlyphPathAdapter>		CurveConverter;
+	typedef agg::conv_contour<CurveConverter>		ContourConverter;
+
+	typedef agg::conv_transform<CurveConverter, Transformable>
+													TransformedOutline;
+
+	typedef agg::conv_transform<ContourConverter, Transformable>
+													TransformedContourOutline;
+
+
+								FontCacheEntry();
+	virtual						~FontCacheEntry();
+
+			bool				Init(const ServerFont& font);
+
+			bool				HasGlyphs(const char* utf8String,
+									size_t glyphCount) const;
+
+			const GlyphCache*	Glyph(uint16 glyphCode);
+
+			void				InitAdaptors(const GlyphCache* glyph,
+									double x, double y,
+									GlyphMonoAdapter& monoAdapter,
+									GlyphGray8Adapter& gray8Adapter,
+									GlyphPathAdapter& pathAdapter,
+									double scale = 1.0);
+
+			bool				GetKerning(uint16 glyphCode1,
+									uint16 glyphCode2, double* x, double* y);
+
+	static	void				GenerateSignature(char* signature,
+									const ServerFont& font);
+
+	// private to FontCache class:
+			void				UpdateUsage();
+			bigtime_t			LastUsed() const
+									{ return fLastUsedTime; }
+			uint64				UsedCount() const
+									{ return fUseCounter; }
+
+ private:
+								FontCacheEntry(const FontCacheEntry&);
+			const FontCacheEntry& operator=(const FontCacheEntry&);
+
+			class GlyphCachePool;
+
+			GlyphCachePool*		fGlyphCache;
+			FontEngine			fEngine;
+
+	static	BLocker				sUsageUpdateLock;
+			bigtime_t			fLastUsedTime;
+			uint64				fUseCounter;
+};
+
+#endif // FONT_CACHE_ENTRY_H
+

Added: haiku/trunk/src/servers/app/FontEngine.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontEngine.cpp	2007-08-02 18:32:00 UTC (rev 21796)
+++ haiku/trunk/src/servers/app/FontEngine.cpp	2007-08-02 19:10:38 UTC (rev 21797)
@@ -0,0 +1,589 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Maxim Shemanarev <mcseemagg at yahoo.com>
+ *		Stephan A?mus <superstippi at gmx.de>
+ */
+
+//----------------------------------------------------------------------------
+// Anti-Grain Geometry - Version 2.4
+// Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+//
+// Permission to copy, use, modify, sell and distribute this software 
+// is granted provided this copyright notice appears in all copies. 
+// This software is provided "as is" without express or implied
+// warranty, and with no claim as to its suitability for any purpose.
+//
+//----------------------------------------------------------------------------
+// Contact: mcseem at antigrain.com
+//			mcseemagg at yahoo.com
+//			http://www.antigrain.com
+//----------------------------------------------------------------------------
+
+
+#include "FontEngine.h"
+
+#include <stdio.h>
+
+#include <agg_bitset_iterator.h>
+#include <agg_renderer_scanline.h>
+
+
+static const bool kFlipY = true;
+
+
+// int26p6_to_dbl
+static inline double
+int26p6_to_dbl(int p)
+{
+	return double(p) / 64.0;
+}
+
+// dbl_to_int26p6
+static inline int
+dbl_to_int26p6(double p)
+{
+	return int(p * 64.0 + 0.5);
+}
+
+
+// decompose_ft_outline
+template<class PathStorage>
+bool
+decompose_ft_outline(const FT_Outline& outline, bool flip_y, PathStorage& path)
+{   
+	typedef typename PathStorage::value_type value_type;
+
+	FT_Vector v_last;
+	FT_Vector v_control;
+	FT_Vector v_start;
+	double x1, y1, x2, y2, x3, y3;
+
+	FT_Vector* point;
+	FT_Vector* limit;
+	char* tags;
+
+	int   n;		 // index of contour in outline
+	int   first;	 // index of first point in contour
+	char  tag;	   // current point's state
+
+	first = 0;
+
+	for (n = 0; n < outline.n_contours; n++) {
+		int  last;  // index of last point in contour
+
+		last  = outline.contours[n];
+		limit = outline.points + last;
+
+		v_start = outline.points[first];
+		v_last  = outline.points[last];
+
+		v_control = v_start;
+
+		point = outline.points + first;
+		tags  = outline.tags  + first;
+		tag   = FT_CURVE_TAG(tags[0]);
+
+		// A contour cannot start with a cubic control point!
+		if (tag == FT_CURVE_TAG_CUBIC)
+			return false;
+
+		// check first point to determine origin
+		if ( tag == FT_CURVE_TAG_CONIC) {
+			// first point is conic control.  Yes, this happens.
+			if (FT_CURVE_TAG(outline.tags[last]) == FT_CURVE_TAG_ON) {
+				// start at last point if it is on the curve
+				v_start = v_last;
+				limit--;
+			} else {
+				// if both first and last points are conic,
+				// start at their middle and record its position
+				// for closure
+				v_start.x = (v_start.x + v_last.x) / 2;
+				v_start.y = (v_start.y + v_last.y) / 2;
+
+				v_last = v_start;
+			}
+			point--;
+			tags--;
+		}
+
+		x1 = int26p6_to_dbl(v_start.x);
+		y1 = int26p6_to_dbl(v_start.y);
+		if (flip_y) y1 = -y1;
+		path.move_to(value_type(dbl_to_int26p6(x1)), 
+					 value_type(dbl_to_int26p6(y1)));
+
+		while(point < limit) {
+			point++;
+			tags++;
+
+			tag = FT_CURVE_TAG(tags[0]);
+			switch(tag) {
+				case FT_CURVE_TAG_ON: { // emit a single line_to
+					x1 = int26p6_to_dbl(point->x);
+					y1 = int26p6_to_dbl(point->y);
+					if (flip_y) y1 = -y1;
+					path.line_to(value_type(dbl_to_int26p6(x1)), 
+								 value_type(dbl_to_int26p6(y1)));
+					//path.line_to(conv(point->x), flip_y ? -conv(point->y) : conv(point->y));
+					continue;
+				}
+
+				case FT_CURVE_TAG_CONIC: { // consume conic arcs
+					v_control.x = point->x;
+					v_control.y = point->y;
+
+				Do_Conic:
+					if (point < limit) {
+						FT_Vector vec;
+						FT_Vector v_middle;
+
+						point++;
+						tags++;
+						tag = FT_CURVE_TAG(tags[0]);
+
+						vec.x = point->x;
+						vec.y = point->y;
+
+						if (tag == FT_CURVE_TAG_ON) {
+							x1 = int26p6_to_dbl(v_control.x);
+							y1 = int26p6_to_dbl(v_control.y);
+							x2 = int26p6_to_dbl(vec.x);
+							y2 = int26p6_to_dbl(vec.y);
+							if (flip_y) { y1 = -y1; y2 = -y2; }
+							path.curve3(value_type(dbl_to_int26p6(x1)), 
+										value_type(dbl_to_int26p6(y1)),
+										value_type(dbl_to_int26p6(x2)), 
+										value_type(dbl_to_int26p6(y2)));
+							continue;
+						}
+
+						if (tag != FT_CURVE_TAG_CONIC)
+							return false;
+
+						v_middle.x = (v_control.x + vec.x) / 2;
+						v_middle.y = (v_control.y + vec.y) / 2;
+
+						x1 = int26p6_to_dbl(v_control.x);
+						y1 = int26p6_to_dbl(v_control.y);
+						x2 = int26p6_to_dbl(v_middle.x);
+						y2 = int26p6_to_dbl(v_middle.y);
+						if (flip_y) { y1 = -y1; y2 = -y2; }
+						path.curve3(value_type(dbl_to_int26p6(x1)), 
+									value_type(dbl_to_int26p6(y1)),
+									value_type(dbl_to_int26p6(x2)), 
+									value_type(dbl_to_int26p6(y2)));
+
+						//path.curve3(conv(v_control.x), 
+						//			flip_y ? -conv(v_control.y) : conv(v_control.y), 
+						//			conv(v_middle.x), 
+						//			flip_y ? -conv(v_middle.y) : conv(v_middle.y));
+
+						v_control = vec;
+						goto Do_Conic;
+					}
+
+					x1 = int26p6_to_dbl(v_control.x);
+					y1 = int26p6_to_dbl(v_control.y);
+					x2 = int26p6_to_dbl(v_start.x);
+					y2 = int26p6_to_dbl(v_start.y);
+					if (flip_y) { y1 = -y1; y2 = -y2; }
+					path.curve3(value_type(dbl_to_int26p6(x1)), 
+								value_type(dbl_to_int26p6(y1)),
+								value_type(dbl_to_int26p6(x2)), 
+								value_type(dbl_to_int26p6(y2)));
+
+					//path.curve3(conv(v_control.x), 
+					//			flip_y ? -conv(v_control.y) : conv(v_control.y), 
+					//			conv(v_start.x), 
+					//			flip_y ? -conv(v_start.y) : conv(v_start.y));
+					goto Close;
+				}
+
+				default: { // FT_CURVE_TAG_CUBIC
+					FT_Vector vec1, vec2;
+
+					if (point + 1 > limit || FT_CURVE_TAG(tags[1]) != FT_CURVE_TAG_CUBIC)
+						return false;
+
+					vec1.x = point[0].x; 
+					vec1.y = point[0].y;
+					vec2.x = point[1].x; 
+					vec2.y = point[1].y;
+
+					point += 2;
+					tags  += 2;
+
+					if (point <= limit) {
+						FT_Vector vec;
+
+						vec.x = point->x;
+						vec.y = point->y;
+
+						x1 = int26p6_to_dbl(vec1.x);
+						y1 = int26p6_to_dbl(vec1.y);
+						x2 = int26p6_to_dbl(vec2.x);
+						y2 = int26p6_to_dbl(vec2.y);
+						x3 = int26p6_to_dbl(vec.x);
+						y3 = int26p6_to_dbl(vec.y);
+						if (flip_y) { y1 = -y1; y2 = -y2; y3 = -y3; }
+						path.curve4(value_type(dbl_to_int26p6(x1)), 
+									value_type(dbl_to_int26p6(y1)),
+									value_type(dbl_to_int26p6(x2)), 
+									value_type(dbl_to_int26p6(y2)),
+									value_type(dbl_to_int26p6(x3)), 
+									value_type(dbl_to_int26p6(y3)));
+
+						//path.curve4(conv(vec1.x), 
+						//			flip_y ? -conv(vec1.y) : conv(vec1.y), 
+						//			conv(vec2.x), 
+						//			flip_y ? -conv(vec2.y) : conv(vec2.y),
+						//			conv(vec.x), 
+						//			flip_y ? -conv(vec.y) : conv(vec.y));
+						continue;
+					}
+
+					x1 = int26p6_to_dbl(vec1.x);
+					y1 = int26p6_to_dbl(vec1.y);
+					x2 = int26p6_to_dbl(vec2.x);
+					y2 = int26p6_to_dbl(vec2.y);
+					x3 = int26p6_to_dbl(v_start.x);
+					y3 = int26p6_to_dbl(v_start.y);
+					if (flip_y) { y1 = -y1; y2 = -y2; y3 = -y3; }
+					path.curve4(value_type(dbl_to_int26p6(x1)), 
+								value_type(dbl_to_int26p6(y1)),
+								value_type(dbl_to_int26p6(x2)), 
+								value_type(dbl_to_int26p6(y2)),
+								value_type(dbl_to_int26p6(x3)), 
+								value_type(dbl_to_int26p6(y3)));
+
+					//path.curve4(conv(vec1.x), 
+					//			flip_y ? -conv(vec1.y) : conv(vec1.y), 
+					//			conv(vec2.x), 
+					//			flip_y ? -conv(vec2.y) : conv(vec2.y),
+					//			conv(v_start.x), 
+					//			flip_y ? -conv(v_start.y) : conv(v_start.y));
+					goto Close;
+				}
+			}
+		}
+
+		path.close_polygon();
+
+   Close:
+		first = last + 1; 
+	}
+
+	return true;
+}
+
+// decompose_ft_bitmap_mono
+template<class Scanline, class ScanlineStorage>
+void
+decompose_ft_bitmap_mono(const FT_Bitmap& bitmap, int x, int y,
+	bool flip_y, Scanline& sl, ScanlineStorage& storage)
+{
+	int i;
+	const uint8* buf = (const uint8*)bitmap.buffer;
+	int pitch = bitmap.pitch;
+	sl.reset(x, x + bitmap.width);
+	storage.prepare();
+	if (flip_y) {
+		buf += bitmap.pitch * (bitmap.rows - 1);
+		y += bitmap.rows;
+		pitch = -pitch;
+	}
+	for (i = 0; i < bitmap.rows; i++) {
+		sl.reset_spans();
+		agg::bitset_iterator bits(buf, 0);
+		int j;
+		for (j = 0; j < bitmap.width; j++) {
+			if (bits.bit())
+				sl.add_cell(x + j, agg::cover_full);
+			++bits;
+		}
+		buf += pitch;
+		if (sl.num_spans()) {
+			sl.finalize(y - i - 1);
+			storage.render(sl);
+		}
+	}
+}
+
+// decompose_ft_bitmap_gray8
+template<class Scanline, class ScanlineStorage>
+void
+decompose_ft_bitmap_gray8(const FT_Bitmap& bitmap, int x, int y,
+	bool flip_y, Scanline& sl, ScanlineStorage& storage)
+{
+	int i, j;
+	const uint8* buf = (const uint8*)bitmap.buffer;
+	int pitch = bitmap.pitch;
+	sl.reset(x, x + bitmap.width);
+	storage.prepare();
+	if (flip_y) {
+		buf += bitmap.pitch * (bitmap.rows - 1);
+		y += bitmap.rows;
+		pitch = -pitch;
+	}
+	for (i = 0; i < bitmap.rows; i++) {
+		sl.reset_spans();
+		const uint8* p = buf;
+		for (j = 0; j < bitmap.width; j++) {
+			if (*p)
+				sl.add_cell(x + j, *p);
+			++p;
+		}
+		buf += pitch;
+		if (sl.num_spans()) {
+			sl.finalize(y - i - 1);
+			storage.render(sl);
+		}
+	}
+}
+
+
+// #pragma mark -
+
+
+// constructor
+FontEngine::FontEngine()
+	: fLastError(0)
+	, fLibraryInitialized(false)
+	, fLibrary(0)

[... truncated: 1785 lines follow ...]


From axeld at mail.berlios.de  Thu Aug  2 21:12:29 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 2 Aug 2007 21:12:29 +0200
Subject: [Haiku-commits] r21798 -
	haiku/trunk/src/add-ons/kernel/network/protocols/ipv4
Message-ID: <200708021912.l72JCTtm010707@sheep.berlios.de>

Author: axeld
Date: 2007-08-02 21:12:28 +0200 (Thu, 02 Aug 2007)
New Revision: 21798
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21798&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp
Log:
IPv4 now uses module_dependencies, it mustn't put the stack module manually anymore.
This fixes unloading of the stack (some fixes to the module code that let you
determine this kind of bugs earlier will be committed next).


Modified: haiku/trunk/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp	2007-08-02 19:10:38 UTC (rev 21797)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp	2007-08-02 19:12:28 UTC (rev 21798)
@@ -1673,7 +1673,6 @@
 	benaphore_destroy(&sRawSocketsLock);
 	benaphore_destroy(&sReceivingProtocolLock);
 
-	put_module(NET_STACK_MODULE_NAME);
 	return B_OK;
 }
 



From korli at mail.berlios.de  Thu Aug  2 21:32:29 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Thu, 2 Aug 2007 21:32:29 +0200
Subject: [Haiku-commits] r21799 - in
	haiku/trunk/src/add-ons/kernel/file_systems: ramfs reiserfs
	userlandfs/kernel_add_on
Message-ID: <200708021932.l72JWTqu012065@sheep.berlios.de>

Author: korli
Date: 2007-08-02 21:32:28 +0200 (Thu, 02 Aug 2007)
New Revision: 21799
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21799&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Jamfile
   haiku/trunk/src/add-ons/kernel/file_systems/reiserfs/Jamfile
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Jamfile
Log:
removed redundant TARGET_GCC_LIBGCC


Modified: haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Jamfile	2007-08-02 19:12:28 UTC (rev 21798)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Jamfile	2007-08-02 19:32:28 UTC (rev 21799)
@@ -44,5 +44,5 @@
 	  SymLink.cpp
 	  Volume.cpp
 
-	: $(TARGET_GCC_LIBGCC) $(HAIKU_LIBSUPC++)
+	: $(HAIKU_LIBSUPC++)
 ;

Modified: haiku/trunk/src/add-ons/kernel/file_systems/reiserfs/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/reiserfs/Jamfile	2007-08-02 19:12:28 UTC (rev 21798)
+++ haiku/trunk/src/add-ons/kernel/file_systems/reiserfs/Jamfile	2007-08-02 19:32:28 UTC (rev 21799)
@@ -28,5 +28,5 @@
 	VNode.cpp
 	Volume.cpp 
 
-	: $(TARGET_GCC_LIBGCC) $(HAIKU_LIBSUPC++)
+	: $(HAIKU_LIBSUPC++)
 ;

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Jamfile	2007-08-02 19:12:28 UTC (rev 21798)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Jamfile	2007-08-02 19:32:28 UTC (rev 21799)
@@ -40,5 +40,5 @@
 	  UserlandFS.cpp
 	  Volume.cpp
 
-	: $(TARGET_GCC_LIBGCC) $(HAIKU_LIBSUPC++)
+	: $(HAIKU_LIBSUPC++)
 ;



From stefano.ceccherini at gmail.com  Thu Aug  2 23:01:03 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 2 Aug 2007 23:01:03 +0200
Subject: [Haiku-commits] r21797 - in haiku/trunk: headers/os/interface
	headers/private/app src/kits/interface src/servers/app
	src/servers/app/drawing src/servers/app/drawing/Painter
	src/servers/app/drawing/Painter/font_support src/tests/servers/app
In-Reply-To: <200708021910.l72JAheH010598@sheep.berlios.de>
References: <200708021910.l72JAheH010598@sheep.berlios.de>
Message-ID: <894b9700708021401t146475aej99e61a7ee71e92d2@mail.gmail.com>

2007/8/2, stippi at BerliOS <stippi at mail.berlios.de>:
> Author: stippi
> Date: 2007-08-02 21:10:38 +0200 (Thu, 02 Aug 2007)
> New Revision: 21797
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21797&view=rev

Hi.
The build is broken for me after this change.

C++ generated/objects/haiku/x86/release/servers/app/ServerApp.o
src/servers/app/ServerApp.cpp: In method `void
ServerApp::_DispatchMessage(long int, BPrivate::LinkReceiver &)':
src/servers/app/ServerApp.cpp:1926: no matching function for call to
`ServerFont::GetBoundingBoxesAsString (char *&, int32 &,
BRect[((numChars - 1) + 1)], bool &, font_metric_mode &,
escapement_delta &)'

/home/stefano/haiku/haiku/generated/cross-tools/bin/i586-pc-beos-gcc
-c "src/servers/app/ServerApp.cpp" -O -Wall -Wno-ctor-dtor-privacy
-Woverloaded-virtual -Wpointer-arith -Wcast-align -Wsign-compare
-nostdinc -Wno-multichar -D_ZETA_USING_DEPRECATED_API_=1
-D_ZETA_TS_FIND_DIR_=1 -D__HAIKU__
-DHAIKU_DISTRO_COMPATIBILITY_DEFAULT -D__INTEL__ -DARCH_x86
-D_BEOS_R5_COMPATIBLE_ -DHAIKU_TARGET_PLATFORM_HAIKU -Isrc/servers/app
-Igenerated/objects/common/servers/app
-Igenerated/objects/linux/x86/common/servers/app
-Igenerated/objects/haiku/x86/common/servers/app
-Isrc/servers/app/drawing -Isrc/servers/app/drawing/Painter -I-
-Iheaders/libs/agg -Iheaders/libs/png -Iheaders/libs/zlib
-Iheaders/private/app -Iheaders/private/graphics
-Iheaders/private/input -Iheaders/private/interface
-Iheaders/private/kernel -Iheaders/private/shared
-Iheaders/private/storage -Iheaders/libs/freetype2 -Iheaders
-Iheaders/posix -Iheaders/gnu -Iheaders/glibc -Iheaders/os
-Iheaders/os/add-ons -Iheaders/os/add-ons/file_system
-Iheaders/os/add-ons/graphics -Iheaders/os/add-ons/input_server
-Iheaders/os/add-ons/registrar -Iheaders/os/add-ons/screen_saver
-Iheaders/os/add-ons/tracker -Iheaders/os/app -Iheaders/os/device
-Iheaders/os/drivers -Iheaders/os/game -Iheaders/os/interface
-Iheaders/os/kernel -Iheaders/os/media -Iheaders/os/mail
-Iheaders/os/midi -Iheaders/os/midi2 -Iheaders/os/net
-Iheaders/os/opengl -Iheaders/os/storage -Iheaders/os/support
-Iheaders/os/translation -Iheaders/private/. -Iheaders/cpp
-I/home/stefano/haiku/haiku/generated/cross-tools/lib/gcc-lib/i586-pc-beos/2.95.3-beos-060710/include
-o "generated/objects/haiku/x86/release/servers/app/ServerApp.o" ;

...failed C++ generated/objects/haiku/x86/release/servers/app/ServerApp.o ...
...skipped app_server for lack of <src!servers!app>ServerApp.o...
...skipped <HaikuImage>haiku.image-copy-files-dummy-beos/system/servers
for lack of app_server...
...skipped haiku.image for lack of <HaikuImage>haiku.image-copy-files...
...skipped haiku.vmdk for lack of haiku.image...
...failed updating 1 target(s)...
...skipped 4 target(s)...
...updated 64 target(s)...


From stippi at mail.berlios.de  Thu Aug  2 23:05:01 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 2 Aug 2007 23:05:01 +0200
Subject: [Haiku-commits] r21800 - haiku/trunk/src/servers/app
Message-ID: <200708022105.l72L51dl021845@sheep.berlios.de>

Author: stippi
Date: 2007-08-02 23:05:01 +0200 (Thu, 02 Aug 2007)
New Revision: 21800
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21800&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerApp.cpp
Log:
* fixes the build, forgot to include in r21797


Modified: haiku/trunk/src/servers/app/ServerApp.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerApp.cpp	2007-08-02 19:32:28 UTC (rev 21799)
+++ haiku/trunk/src/servers/app/ServerApp.cpp	2007-08-02 21:05:01 UTC (rev 21800)
@@ -1854,6 +1854,7 @@
 			break;
 		}
 		case AS_GET_BOUNDINGBOXES_CHARS:
+		case AS_GET_BOUNDINGBOXES_STRING:
 		{
 			FTRACE(("ServerApp %s: AS_GET_BOUNDINGBOXES_CHARS\n", Signature()));
 			// Attached Data:
@@ -1922,8 +1923,9 @@
 				font.SetFlags(flags);
 
 				// TODO implement for real
-				if (font.GetBoundingBoxesAsString(charArray, numChars,
-					rectArray, string_escapement, mode, delta) == B_OK) {
+				if (font.GetBoundingBoxes(charArray, numChars,
+					rectArray, string_escapement, mode, delta,
+					code == AS_GET_BOUNDINGBOXES_STRING) == B_OK) {
 					fLink.StartMessage(B_OK);
 					fLink.Attach(rectArray, sizeof(rectArray));
 					success = true;



From stippi at mail.berlios.de  Thu Aug  2 23:05:35 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 2 Aug 2007 23:05:35 +0200
Subject: [Haiku-commits] r21801 - haiku/trunk/src/servers/app/drawing/Painter
Message-ID: <200708022105.l72L5ZT6021898@sheep.berlios.de>

Author: stippi
Date: 2007-08-02 23:05:34 +0200 (Thu, 02 Aug 2007)
New Revision: 21801
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21801&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/Painter/Transformable.cpp
   haiku/trunk/src/servers/app/drawing/Painter/Transformable.h
Log:
* TransformBounds() takes a const BRect&


Modified: haiku/trunk/src/servers/app/drawing/Painter/Transformable.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/Transformable.cpp	2007-08-02 21:05:01 UTC (rev 21800)
+++ haiku/trunk/src/servers/app/drawing/Painter/Transformable.cpp	2007-08-02 21:05:34 UTC (rev 21801)
@@ -247,7 +247,7 @@
 
 // TransformBounds
 BRect
-Transformable::TransformBounds(BRect bounds) const
+Transformable::TransformBounds(const BRect& bounds) const
 {
 	if (bounds.IsValid()) {
 		BPoint lt(bounds.left, bounds.top);

Modified: haiku/trunk/src/servers/app/drawing/Painter/Transformable.h
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/Transformable.h	2007-08-02 21:05:01 UTC (rev 21800)
+++ haiku/trunk/src/servers/app/drawing/Painter/Transformable.h	2007-08-02 21:05:34 UTC (rev 21801)
@@ -51,7 +51,7 @@
 
 								// transforms the rectangle "bounds" and
 								// returns the *bounding box* of that
-			BRect				TransformBounds(BRect bounds) const;
+			BRect				TransformBounds(const BRect& bounds) const;
 
 								// some convenience functions
 	virtual	void				TranslateBy(BPoint offset);



From bonefish at mail.berlios.de  Thu Aug  2 23:14:01 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 2 Aug 2007 23:14:01 +0200
Subject: [Haiku-commits] r21802 - in haiku/trunk: . build/jam
	src/add-ons/kernel/drivers/graphics/vmware
	src/add-ons/kernel/drivers/input/usb_hid
	src/add-ons/kernel/drivers/network/stack
	src/add-ons/media/media-add-ons/esound_sink
	src/add-ons/media/media-add-ons/multi_audio
	src/add-ons/media/media-add-ons/usb_webcam
	src/apps/networkstatus src/apps/pulse src/apps/resedit
	src/apps/stylededit src/bin/bash/lib/glob
	src/bin/bash/lib/readline src/bin/bash/lib/sh
	src/bin/desklink src/bin/network/arp src/bin/network/ftp
	src/bin/network/ifconfig src/bin/network/nc
	src/bin/network/ping src/bin/network/ppp_up
	src/bin/network/pppconfig src/bin/network/route
	src/bin/network/traceroute src/bin/pcmcia-cs src/kits/support
	src/kits/textencoding src/kits/textencoding/libiconv
	src/kits/tracker src/preferences/keyboard
	src/preferences/media src/preferences/sounds
	src/preferences/virtualmemory src/tools/bfs_shell
Message-ID: <200708022114.l72LE1RE022898@sheep.berlios.de>

Author: bonefish
Date: 2007-08-02 23:13:56 +0200 (Thu, 02 Aug 2007)
New Revision: 21802
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21802&view=rev

Modified:
   haiku/trunk/build/jam/BuildSetup
   haiku/trunk/build/jam/HelperRules
   haiku/trunk/build/jam/KernelRules
   haiku/trunk/configure
   haiku/trunk/src/add-ons/kernel/drivers/graphics/vmware/Jamfile
   haiku/trunk/src/add-ons/kernel/drivers/input/usb_hid/Jamfile
   haiku/trunk/src/add-ons/kernel/drivers/network/stack/Jamfile
   haiku/trunk/src/add-ons/media/media-add-ons/esound_sink/Jamfile
   haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/Jamfile
   haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
   haiku/trunk/src/apps/networkstatus/Jamfile
   haiku/trunk/src/apps/pulse/Jamfile
   haiku/trunk/src/apps/resedit/Jamfile
   haiku/trunk/src/apps/stylededit/Jamfile
   haiku/trunk/src/bin/bash/lib/glob/Jamfile
   haiku/trunk/src/bin/bash/lib/readline/Jamfile
   haiku/trunk/src/bin/bash/lib/sh/Jamfile
   haiku/trunk/src/bin/desklink/Jamfile
   haiku/trunk/src/bin/network/arp/Jamfile
   haiku/trunk/src/bin/network/ftp/Jamfile
   haiku/trunk/src/bin/network/ifconfig/Jamfile
   haiku/trunk/src/bin/network/nc/Jamfile
   haiku/trunk/src/bin/network/ping/Jamfile
   haiku/trunk/src/bin/network/ppp_up/Jamfile
   haiku/trunk/src/bin/network/pppconfig/Jamfile
   haiku/trunk/src/bin/network/route/Jamfile
   haiku/trunk/src/bin/network/traceroute/Jamfile
   haiku/trunk/src/bin/pcmcia-cs/Jamfile
   haiku/trunk/src/kits/support/Jamfile
   haiku/trunk/src/kits/textencoding/Jamfile
   haiku/trunk/src/kits/textencoding/libiconv/Jamfile
   haiku/trunk/src/kits/tracker/Jamfile
   haiku/trunk/src/preferences/keyboard/Jamfile
   haiku/trunk/src/preferences/media/Jamfile
   haiku/trunk/src/preferences/sounds/Jamfile
   haiku/trunk/src/preferences/virtualmemory/Jamfile
   haiku/trunk/src/tools/bfs_shell/Jamfile
Log:
Added Haiku as host platform supported by the build system ("haiku_host"). 
Completely untested yet.


Modified: haiku/trunk/build/jam/BuildSetup
===================================================================
--- haiku/trunk/build/jam/BuildSetup	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/build/jam/BuildSetup	2007-08-02 21:13:56 UTC (rev 21802)
@@ -95,9 +95,10 @@
 HAIKU_DEBUG_LEVELS = 0 1 2 3 4 5 ;
 
 # BeOS, BONE, Dan0 compatible platforms
-HAIKU_BEOS_COMPATIBLE_PLATFORMS = haiku r5 bone dano ;
-HAIKU_BONE_COMPATIBLE_PLATFORMS = haiku bone dano ;
-HAIKU_DANO_COMPATIBLE_PLATFORMS = haiku dano ;
+HAIKU_BEOS_COMPATIBLE_PLATFORMS = haiku r5 bone dano haiku_host ;
+HAIKU_BONE_COMPATIBLE_PLATFORMS = haiku bone dano haiku_host ;
+HAIKU_DANO_COMPATIBLE_PLATFORMS = haiku dano haiku_host ;
+HAIKU_HAIKU_COMPATIBLE_PLATFORMS = haiku haiku_host ;
 
 
 #pragma mark -
@@ -436,6 +437,7 @@
 # debug flags
 switch $(HOST_PLATFORM) {
 	case haiku	: HOST_DEBUG_FLAGS ?= -ggdb ;
+	case haiku_host	: HOST_DEBUG_FLAGS ?= -ggdb ;
 	case linux	: HOST_DEBUG_FLAGS ?= -ggdb ;
 	case freebsd    : HOST_DEBUG_FLAGS ?= -ggdb ;
 	case darwin : HOST_DEBUG_FLAGS ?= -ggdb ;
@@ -582,7 +584,7 @@
 }
 
 # TODO: Fix the naming!
-if $(TARGET_PLATFORM) = haiku {
+if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	NETWORK_LIBS = network ;
 	SELECT_UNAME_ETC_LIB = root ;
 	NETAPI_LIB = network ;
@@ -674,6 +676,7 @@
 	case r5			: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_BEOS ;
 	case bone		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_BONE ;
 	case dano		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_DANO ;
+	case haiku_host	: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_HAIKU ;
 	case haiku		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_HAIKU ;
 	case linux		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_LINUX ;
 	case freebsd	: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_FREEBSD ;
@@ -686,7 +689,7 @@
 	case r5			: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_BEOS ;
 	case bone		: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_BONE ;
 	case dano		: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_DANO ;
-	case haiku		: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_HAIKU ;
+	case haiku_host	: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_HAIKU ;
 	case linux		: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_LINUX ;
 	case freebsd	: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_FREEBSD ;
 	case darwin		: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_DARWIN ;
@@ -699,7 +702,7 @@
 # include the HaikuBuildCompatibility.h header and link against
 # libhaikucompat.a.
 
-if $(TARGET_PLATFORM) != haiku &&  $(TARGET_PLATFORM_BEOS_COMPATIBLE) {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) && $(TARGET_PLATFORM_BEOS_COMPATIBLE) {
 	# headers and flags
 	local compatibilityHeader = -include [ FDirName $(HAIKU_TOP) headers build
 		HaikuBuildCompatibility.h ] ;

Modified: haiku/trunk/build/jam/HelperRules
===================================================================
--- haiku/trunk/build/jam/HelperRules	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/build/jam/HelperRules	2007-08-02 21:13:56 UTC (rev 21802)
@@ -156,22 +156,27 @@
 		{
 			$(varPrefix)_PLATFORM_BEOS_COMPATIBLE = true ;
 		}
-		
+	
 		case bone : 
 		{
 			$(varPrefix)_PLATFORM_BONE_COMPATIBLE = true ;
 		}
-		
+	
 		case dano :
 		{
 			$(varPrefix)_PLATFORM_DANO_COMPATIBLE = true ;
 		}
-		
+	
+		case haiku_host :
+		{
+			$(varPrefix)_PLATFORM_HAIKU_COMPATIBLE = true ;
+		}
+
 		case haiku :
 		{
 			$(varPrefix)_PLATFORM_HAIKU_COMPATIBLE = true ;
 		}
-	
+
 		case * :
 		{
 			if ! ( $(platform) in $(otherPlatforms) ) {
@@ -181,6 +186,8 @@
 	}
 
 	# set lesser flags, e.g. "DANO" for "HAIKU" and "BEOS" for "BONE"
+	$(varPrefix)_PLATFORM_HAIKU_COMPATIBLE
+		?= $($(varPrefix)_PLATFORM_HAIKU_COMPATIBLE) ;
 	$(varPrefix)_PLATFORM_DANO_COMPATIBLE
 		?= $($(varPrefix)_PLATFORM_HAIKU_COMPATIBLE) ;
 	$(varPrefix)_PLATFORM_BONE_COMPATIBLE
@@ -191,6 +198,8 @@
 	# set the machine friendly flags
 	$(varPrefix)_PLATFORM_(haiku)_COMPATIBLE
 		?= $($(varPrefix)_PLATFORM_HAIKU_COMPATIBLE) ;
+	$(varPrefix)_PLATFORM_(haiku_host)_COMPATIBLE
+		?= $($(varPrefix)_PLATFORM_HAIKU_COMPATIBLE) ;
 	$(varPrefix)_PLATFORM_(dano)_COMPATIBLE
 		?= $($(varPrefix)_PLATFORM_DANO_COMPATIBLE) ;
 	$(varPrefix)_PLATFORM_(bone)_COMPATIBLE

Modified: haiku/trunk/build/jam/KernelRules
===================================================================
--- haiku/trunk/build/jam/KernelRules	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/build/jam/KernelRules	2007-08-02 21:13:56 UTC (rev 21802)
@@ -93,6 +93,10 @@
 			kernel = <nogrist>kernel.so ;
 			beginGlue = $(HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE) ;
 			endGlue = $(HAIKU_KERNEL_ADDON_END_GLUE_CODE) ;
+		} else if $(PLATFORM) = haiku_host {
+			kernel = /boot/develop/lib/x86/kernel.so ;
+			beginGlue = $(HAIKU_KERNEL_ADDON_BEGIN_GLUE_CODE) ;
+			endGlue = $(HAIKU_KERNEL_ADDON_END_GLUE_CODE) ;
 		} else {
 			kernel = /boot/develop/lib/x86/_KERNEL_ ;
 		}

Modified: haiku/trunk/configure
===================================================================
--- haiku/trunk/configure	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/configure	2007-08-02 21:13:56 UTC (rev 21802)
@@ -290,9 +290,10 @@
 						exit 1 ;;
 			esac
 			;;
+	Darwin)	buildPlatform=darwin ;;
+	FreeBSD) buildPlatform=freebsd ;;
+	Haiku)	buildPlatform=haiku_host ;;
 	Linux)	buildPlatform=linux ;;
-	FreeBSD) buildPlatform=freebsd ;;
-	Darwin)	buildPlatform=darwin ;;
 	*)		echo Unsupported platform: ${platform}
 			exit 1 ;;
 esac

Modified: haiku/trunk/src/add-ons/kernel/drivers/graphics/vmware/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/graphics/vmware/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/add-ons/kernel/drivers/graphics/vmware/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -11,7 +11,7 @@
 	device.c
 ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	LinkAgainst vmware : $(TARGET_HAIKU_COMPATIBILITY_LIBS) ;
 }
 

Modified: haiku/trunk/src/add-ons/kernel/drivers/input/usb_hid/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/input/usb_hid/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/add-ons/kernel/drivers/input/usb_hid/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -6,7 +6,7 @@
 UsePrivateHeaders [ FDirName kernel util ] input ;
 
 local buffer_impl = ;
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	buffer_impl = ring_buffer.cpp ;
 }
 

Modified: haiku/trunk/src/add-ons/kernel/drivers/network/stack/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/stack/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/stack/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if ( $(TARGET_PLATFORM) != haiku ) {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FStandardOSHeaders ] : true ;
 		# Needed for <drivers/Select.h> and maybe other stuff.
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;

Modified: haiku/trunk/src/add-ons/media/media-add-ons/esound_sink/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/esound_sink/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/add-ons/media/media-add-ons/esound_sink/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	SubDirC++Flags -fmultiple-symbol-spaces ;
 }
 

Modified: haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/add-ons/media/media-add-ons/multi_audio/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -4,7 +4,7 @@
 
 UsePrivateHeaders media ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	SubDirC++Flags -fmultiple-symbol-spaces ;
 }
 

Modified: haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/add-ons/media/media-add-ons/usb_webcam/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -6,7 +6,7 @@
 UseLibraryHeaders usb ;
 
 # Zeta has a libusb.so, we have a USBKit.a
-if $(TARGET_PLATFORM) = haiku {
+if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	usbKitLibraryName = USBKit.a ;
 } else {
 	usbKitLibraryName = usb ;

Modified: haiku/trunk/src/apps/networkstatus/Jamfile
===================================================================
--- haiku/trunk/src/apps/networkstatus/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/apps/networkstatus/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -6,7 +6,7 @@
 UseLibraryHeaders agg icon ;
 
 local icon_libs ;
-if $(TARGET) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	icon_libs = libicon.a libagg.a ;
 }
 

Modified: haiku/trunk/src/apps/pulse/Jamfile
===================================================================
--- haiku/trunk/src/apps/pulse/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/apps/pulse/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -3,7 +3,7 @@
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders shared ;
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers os kernel ] : true ;
 }
 

Modified: haiku/trunk/src/apps/resedit/Jamfile
===================================================================
--- haiku/trunk/src/apps/resedit/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/apps/resedit/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -6,7 +6,7 @@
 
 local columnViewSources ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	columnViewSources = ColumnListView.cpp ColumnTypes.cpp ColorTools.cpp ;
 }
 

Modified: haiku/trunk/src/apps/stylededit/Jamfile
===================================================================
--- haiku/trunk/src/apps/stylededit/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/apps/stylededit/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -3,7 +3,7 @@
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders textencoding ;
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers os support ] : true ;
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 }

Modified: haiku/trunk/src/bin/bash/lib/glob/Jamfile
===================================================================
--- haiku/trunk/src/bin/bash/lib/glob/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/bin/bash/lib/glob/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 }
 

Modified: haiku/trunk/src/bin/bash/lib/readline/Jamfile
===================================================================
--- haiku/trunk/src/bin/bash/lib/readline/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/bin/bash/lib/readline/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 }
 

Modified: haiku/trunk/src/bin/bash/lib/sh/Jamfile
===================================================================
--- haiku/trunk/src/bin/bash/lib/sh/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/bin/bash/lib/sh/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 }
 

Modified: haiku/trunk/src/bin/desklink/Jamfile
===================================================================
--- haiku/trunk/src/bin/desklink/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/bin/desklink/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers os interface ] : true ;
 		# We need the public interface headers also when not compiling for Haiku.
 	UseHeaders [ FDirName $(HAIKU_TOP) headers os ] : true ;

Modified: haiku/trunk/src/bin/network/arp/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/arp/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/bin/network/arp/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 		# We need the public network headers also when not compiling for Haiku.
 		# Unfortunately we get more than we want, namely all POSIX headers.

Modified: haiku/trunk/src/bin/network/ftp/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/ftp/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/bin/network/ftp/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 		# We need the public network headers also when not compiling for Haiku.
 		# Unfortunately we get more than we want, namely all POSIX headers.

Modified: haiku/trunk/src/bin/network/ifconfig/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/ifconfig/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/bin/network/ifconfig/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src bin network ifconfig ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 		# We need the public network headers also when not compiling for Haiku.
 		# Unfortunately we get more than we want, namely all POSIX headers.

Modified: haiku/trunk/src/bin/network/nc/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/nc/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/bin/network/nc/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 		# We need the public network headers also when not compiling for Haiku.
 		# Unfortunately we get more than we want, namely all POSIX headers.

Modified: haiku/trunk/src/bin/network/ping/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/ping/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/bin/network/ping/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 		# We need the public network headers also when not compiling for Haiku.
 		# Unfortunately we get more than we want, namely all POSIX headers.

Modified: haiku/trunk/src/bin/network/ppp_up/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/ppp_up/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/bin/network/ppp_up/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 		# We need the public network headers also when not compiling for Haiku.
 		# Unfortunately we get more than we want, namely all POSIX headers.

Modified: haiku/trunk/src/bin/network/pppconfig/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/pppconfig/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/bin/network/pppconfig/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 		# We need the public network headers also when not compiling for Haiku.
 		# Unfortunately we get more than we want, namely all POSIX headers.

Modified: haiku/trunk/src/bin/network/route/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/route/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/bin/network/route/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src bin network route ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 		# We need the public network headers also when not compiling for Haiku.
 		# Unfortunately we get more than we want, namely all POSIX headers.

Modified: haiku/trunk/src/bin/network/traceroute/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/traceroute/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/bin/network/traceroute/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 		# We need the public network headers also when not compiling for Haiku.
 		# Unfortunately we get more than we want, namely all POSIX headers.

Modified: haiku/trunk/src/bin/pcmcia-cs/Jamfile
===================================================================
--- haiku/trunk/src/bin/pcmcia-cs/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/bin/pcmcia-cs/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,11 +2,11 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(TARGET_PLATFORM) != haiku {
-        UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers ] : true ;
-                # We need the public pcmcia headers also when not compiling for Haiku.
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
+	UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers ] : true ;
+		# We need the public pcmcia headers also when not compiling for Haiku.
 	UseHeaders [ FDirName $(HAIKU_TOP) headers os support ] : true ;
-                # We need Errors.h also when not compiling for Haiku.
+		# We need Errors.h also when not compiling for Haiku.
 }
 
 StdBinCommands 

Modified: haiku/trunk/src/kits/support/Jamfile
===================================================================
--- haiku/trunk/src/kits/support/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/kits/support/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -1,12 +1,6 @@
 SubDir HAIKU_TOP src kits support ;
 
 SetSubDirSupportedPlatforms haiku libbe_test ;
-#if $(TARGET_PLATFORM) != haiku {
-#	UseHeaders [ FStandardOSHeaders ] : true ;
-#	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
-#		# TODO: POSIX headers shouldn't be used. Needed for strlcpy() and
-#		# addr_t.
-#}
 
 UsePrivateHeaders shared app media ;
 

Modified: haiku/trunk/src/kits/textencoding/Jamfile
===================================================================
--- haiku/trunk/src/kits/textencoding/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/kits/textencoding/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -6,7 +6,7 @@
 UsePrivateHeaders textencoding ;
 SubDirSysHdrs [ FDirName $(SUBDIR) libiconv ] ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	# Argh! Just for <posix/iconv.h>.
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 }

Modified: haiku/trunk/src/kits/textencoding/libiconv/Jamfile
===================================================================
--- haiku/trunk/src/kits/textencoding/libiconv/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/kits/textencoding/libiconv/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -20,7 +20,7 @@
 
 SubDirSysHdrs $(SUBDIR) ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	# Argh! Just for <posix/iconv.h>.
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
 }

Modified: haiku/trunk/src/kits/tracker/Jamfile
===================================================================
--- haiku/trunk/src/kits/tracker/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/kits/tracker/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -18,7 +18,7 @@
 	;
 
 local vector_icon_libs ;
-if $(TARGET_PLATFORM) = haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	vector_icon_libs = libicon.a libagg.a ;
 }
 

Modified: haiku/trunk/src/preferences/keyboard/Jamfile
===================================================================
--- haiku/trunk/src/preferences/keyboard/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/preferences/keyboard/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
         SubDirC++Flags -DCOMPILE_FOR_R5 ;
 #        SubDirC++Flags -fmultiple-symbol-spaces ;
 }

Modified: haiku/trunk/src/preferences/media/Jamfile
===================================================================
--- haiku/trunk/src/preferences/media/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/preferences/media/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(TARGET_PLATFORM) != haiku {
+if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	SubDirC++Flags -fmultiple-symbol-spaces ;
 }
 

Modified: haiku/trunk/src/preferences/sounds/Jamfile
===================================================================
--- haiku/trunk/src/preferences/sounds/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/preferences/sounds/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
         SubDirC++Flags -fmultiple-symbol-spaces ;
 }
 

Modified: haiku/trunk/src/preferences/virtualmemory/Jamfile
===================================================================
--- haiku/trunk/src/preferences/virtualmemory/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/preferences/virtualmemory/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	DRIVER_SETTINGS = driver_settings.c ;
 }
 
@@ -16,7 +16,7 @@
 	: VirtualMemory.rdef
 	;
 
-if $(TARGET_PLATFORM) != haiku {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	SEARCH on [ FGristFiles driver_settings.c ] += 
 		[ FDirName $(HAIKU_TOP) src system libroot os ] ;
 }

Modified: haiku/trunk/src/tools/bfs_shell/Jamfile
===================================================================
--- haiku/trunk/src/tools/bfs_shell/Jamfile	2007-08-02 21:05:34 UTC (rev 21801)
+++ haiku/trunk/src/tools/bfs_shell/Jamfile	2007-08-02 21:13:56 UTC (rev 21802)
@@ -20,7 +20,7 @@
 }
 
 local libHaikuCompat ;
-if $(HOST_PLATFORM_BEOS_COMPATIBLE) && $(HOST_PLATFORM) != haiku {
+if $(HOST_PLATFORM_BEOS_COMPATIBLE) && ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
 	libHaikuCompat = libhaikucompat_build.a ;
 }
 



From axeld at mail.berlios.de  Thu Aug  2 23:44:55 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 2 Aug 2007 23:44:55 +0200
Subject: [Haiku-commits] r21803 - haiku/trunk/src/system/kernel
Message-ID: <200708022144.l72Litjv025621@sheep.berlios.de>

Author: axeld
Date: 2007-08-02 23:44:54 +0200 (Thu, 02 Aug 2007)
New Revision: 21803
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21803&view=rev

Modified:
   haiku/trunk/src/system/kernel/module.cpp
Log:
* Made the module code more robust against putting more module reference
  than you own - instead of crashing some time later, it will now panic as
  soon as it can.
* No longer put the module image for B_KEEP_LOADED modules - essentially,
  that feature was broken.
* Now use the RecursiveLocker in favour of manual locking where appropriate.
  This actually fixed two locking bugs in error code paths.
* Applied a patch by Fran?\195?\167ois Revol: open_module_list() did not work
  when the prefix was already inside a module (as opposed to a directory
  on disk). The current solution is not as efficient, but that can be
  fixed by improving the iterator code.


Modified: haiku/trunk/src/system/kernel/module.cpp
===================================================================
--- haiku/trunk/src/system/kernel/module.cpp	2007-08-02 21:13:56 UTC (rev 21802)
+++ haiku/trunk/src/system/kernel/module.cpp	2007-08-02 21:44:54 UTC (rev 21803)
@@ -9,22 +9,23 @@
 /** Manages kernel add-ons and their exported modules. */
 
 
+#include <kmodule.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
 #include <boot_device.h>
 #include <elf.h>
-#include <kmodule.h>
 #include <lock.h>
 #include <vfs.h>
-
 #include <boot/elf.h>
 #include <fs/KPath.h>
+#include <util/AutoLock.h>
 #include <util/khash.h>
 
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
 
-
 //#define TRACE_MODULE
 #ifdef TRACE_MODULE
 #	define TRACE(x) dprintf x
@@ -227,20 +228,6 @@
 }
 
 
-static inline void
-inc_module_ref_count(struct module *module)
-{
-	module->ref_count++;
-}
-
-
-static inline void
-dec_module_ref_count(struct module *module)
-{
-	module->ref_count--;
-}
-
-
 /** Try to load the module image at the specified location.
  *	If it could be loaded, it returns B_OK, and stores a pointer
  *	to the module_image object in "_moduleImage".
@@ -311,24 +298,23 @@
 {
 	TRACE(("unload_module_image(image = %p, path = %s)\n", moduleImage, path));
 
-	recursive_lock_lock(&sModulesLock);
+	RecursiveLocker locker(sModulesLock);
 
 	if (moduleImage == NULL) {
 		// if no image was specified, lookup it up in the hash table
 		moduleImage = (module_image *)hash_lookup(sModuleImagesHash, path);
-		if (moduleImage == NULL) {
-			recursive_lock_unlock(&sModulesLock);
+		if (moduleImage == NULL)
 			return B_ENTRY_NOT_FOUND;
-		}
 	}
 
 	if (moduleImage->ref_count != 0) {
-		FATAL(("Can't unload %s due to ref_cnt = %ld\n", moduleImage->path, moduleImage->ref_count));
+		FATAL(("Can't unload %s due to ref_cnt = %ld\n", moduleImage->path,
+			moduleImage->ref_count));
 		return B_ERROR;
 	}
 
 	hash_remove(sModuleImagesHash, moduleImage);
-	recursive_lock_unlock(&sModulesLock);
+	locker.Unlock();
 
 	unload_kernel_add_on(moduleImage->image);
 	free(moduleImage->path);
@@ -357,24 +343,21 @@
 {
 	struct module_image *image;
 
-	TRACE(("get_module_image(path = \"%s\", _image = %p)\n", path, _image));
+	TRACE(("get_module_image(path = \"%s\", loadIfNeeded = %d)\n", path,
+		loadIfNeeded));
 
-	recursive_lock_lock(&sModulesLock);
+	RecursiveLocker _(sModulesLock);
 
 	image = (module_image *)hash_lookup(sModuleImagesHash, path);
 	if (image == NULL) {
 		status_t status = load_module_image(path, &image);
-		if (status < B_OK) {
-			recursive_lock_unlock(&sModulesLock);
+		if (status < B_OK)
 			return status;
-		}
 	}
 
 	atomic_add(&image->ref_count, 1);
 	*_image = image;
 
-	recursive_lock_unlock(&sModulesLock);
-
 	return B_OK;
 }
 
@@ -451,7 +434,8 @@
 	module_info **info;
 	int index = 0, match = B_ENTRY_NOT_FOUND;
 
-	TRACE(("check_module_image(path = \"%s\", searchedName = \"%s\")\n", path, searchedName));
+	TRACE(("check_module_image(path = \"%s\", searchedName = \"%s\")\n", path,
+		searchedName));
 
 	if (get_module_image(path, &image) < B_OK)
 		return B_ENTRY_NOT_FOUND;
@@ -468,7 +452,8 @@
 	// The module we looked for couldn't be found, so we can unload the
 	// loaded module at this point
 	if (match != B_OK) {
-		TRACE(("check_module_file: unloading module file \"%s\" (not used yet)\n", path));
+		TRACE(("check_module_file: unloading module file \"%s\" (not used yet)\n",
+			path));
 		unload_module_image(image, path);
 	}
 
@@ -517,14 +502,15 @@
 static status_t
 put_dependent_modules(struct module *module)
 {
+	module_image *image = module->module_image;
 	module_dependency *dependencies;
-	int32 i = 0;
 
-	if (module->module_image == NULL
-		|| (dependencies = module->module_image->dependencies) == NULL)
+	// built-in modules don't have a module_image structure
+	if (image == NULL
+		|| (dependencies = image->dependencies) == NULL)
 		return B_OK;
 
-	for (; dependencies[i].name != NULL; i++) {
+	for (int32 i = 0; dependencies[i].name != NULL; i++) {
 		status_t status = put_module(dependencies[i].name);
 		if (status < B_OK)
 			return status;
@@ -537,20 +523,22 @@
 static status_t
 get_dependent_modules(struct module *module)
 {
+	module_image *image = module->module_image;
 	module_dependency *dependencies;
-	int32 i = 0;
 
 	// built-in modules don't have a module_image structure
-	if (module->module_image == NULL
-		|| (dependencies = module->module_image->dependencies) == NULL)
+	if (image == NULL
+		|| (dependencies = image->dependencies) == NULL)
 		return B_OK;
 
 	TRACE(("resolving module dependencies...\n"));
 
-	for (; dependencies[i].name != NULL; i++) {
-		status_t status = get_module(dependencies[i].name, dependencies[i].info);
+	for (int32 i = 0; dependencies[i].name != NULL; i++) {
+		status_t status = get_module(dependencies[i].name,
+			dependencies[i].info);
 		if (status < B_OK) {
-			TRACE(("loading dependent module \"%s\" failed!\n", dependencies[i].name));
+			dprintf("loading dependent module %s of %s failed!\n",
+				dependencies[i].name, module->name);
 			return status;
 		}
 	}
@@ -651,10 +639,11 @@
 				module->state = MODULE_LOADED;
 
 				put_dependent_modules(module);
-				return 0;
+				return B_OK;
 			}
 
-			FATAL(("Error unloading module %s (%s)\n", module->name, strerror(status)));
+			FATAL(("Error unloading module %s (%s)\n", module->name,
+				strerror(status)));
 
 			module->state = MODULE_ERROR;
 			module->flags |= B_KEEP_LOADED;
@@ -941,10 +930,14 @@
 		char path[B_FILE_NAME_LENGTH];
 		const char *name, *suffix;
 		if (moduleImage->info[0]
-			&& (suffix = strstr(name = moduleImage->info[0]->name, image->name)) != NULL) {
-			// even if strlcpy() is used here, it's by no means safe against buffer overflows
-			size_t length = strlcpy(path, "/boot/beos/system/add-ons/kernel/", sizeof(path));
-			strlcpy(path + length, name, strlen(image->name) + 1 + (suffix - name));
+			&& (suffix = strstr(name = moduleImage->info[0]->name,
+					image->name)) != NULL) {
+			// even if strlcpy() is used here, it's by no means safe
+			// against buffer overflows
+			size_t length = strlcpy(path, "/boot/beos/system/add-ons/kernel/",
+				sizeof(path));
+			strlcpy(path + length, name, strlen(image->name)
+				+ 1 + (suffix - name));
 
 			moduleImage->path = strdup(path);
 		} else
@@ -1070,7 +1063,8 @@
 	if (sModulesHash == NULL)
 		return B_NO_MEMORY;
 
-	sModuleImagesHash = hash_init(MODULE_HASH_SIZE, 0, module_image_compare, module_image_hash);
+	sModuleImagesHash = hash_init(MODULE_HASH_SIZE, 0, module_image_compare,
+		module_image_hash);
 	if (sModuleImagesHash == NULL)
 		return B_NO_MEMORY;
 
@@ -1082,13 +1076,16 @@
 
 	for (image = args->preloaded_images; image != NULL; image = image->next) {
 		status_t status = register_preloaded_module_image(image);
-		if (status != B_OK)
-			dprintf("Could not register image \"%s\": %s\n", image->name, strerror(status));
+		if (status != B_OK) {
+			dprintf("Could not register image \"%s\": %s\n", image->name,
+				strerror(status));
+		}
 	}
 
 	// ToDo: set sDisableUserAddOns from kernel_args!
 
-	add_debugger_command("modules", &dump_modules, "list all known & loaded modules");
+	add_debugger_command("modules", &dump_modules,
+		"list all known & loaded modules");
 
 	return B_OK;
 }
@@ -1145,6 +1142,18 @@
 			if (sDisableUserAddOns && i >= FIRST_USER_MODULE_PATH)
 				break;
 
+			// Copy base path onto the iterator stack
+			char *path = strdup(sModulePaths[i]);
+			if (path == NULL)
+				continue;
+				
+			size_t length = strlen(path);
+
+			// TODO: it would currently be nicer to use the commented
+			// version below, but the iterator won't work if the prefix
+			// is inside a module then.
+			// It works this way, but should be done better.
+#if 0
 			// Build path component: base path + '/' + prefix
 			size_t length = strlen(sModulePaths[i]);
 			char *path = (char *)malloc(length + iterator->prefix_length + 2);
@@ -1158,6 +1167,7 @@
 			path[length] = '/';
 			memcpy(path + length + 1, iterator->prefix,
 				iterator->prefix_length + 1);
+#endif
 
 			iterator_push_path_on_stack(iterator, path, length + 1);
 		}
@@ -1203,7 +1213,7 @@
 	free(iterator->prefix);
 	free(iterator);
 
-	return 0;
+	return B_OK;
 }
 
 
@@ -1235,7 +1245,8 @@
 	iterator->status = status;
 	recursive_lock_unlock(&sModulesLock);
 
-	TRACE(("read_next_module_name: finished with status %s\n", strerror(status)));
+	TRACE(("read_next_module_name: finished with status %s\n",
+		strerror(status)));
 	return status;
 }
 
@@ -1262,7 +1273,7 @@
 	status_t status = B_ENTRY_NOT_FOUND;
 	uint32 offset = *_cookie;
 
-	recursive_lock_lock(&sModulesLock);
+	RecursiveLocker _(sModulesLock);
 
 	hash_iterator iterator;
 	hash_open(sModulesHash, &iterator);
@@ -1280,7 +1291,6 @@
 	}
 
 	hash_close(sModulesHash, &iterator, false);
-	recursive_lock_unlock(&sModulesLock);
 
 	return status;
 }
@@ -1298,7 +1308,7 @@
 	if (path == NULL)
 		return B_BAD_VALUE;
 
-	recursive_lock_lock(&sModulesLock);
+	RecursiveLocker _(sModulesLock);
 
 	module = (struct module *)hash_lookup(sModulesHash, path);
 
@@ -1307,7 +1317,7 @@
 		module = search_module(path);
 		if (module == NULL) {
 			FATAL(("module: Search for %s failed.\n", path));
-			goto err;
+			return B_ENTRY_NOT_FOUND;
 		}
 	}
 
@@ -1320,7 +1330,7 @@
 		 * is unloaded).
 		 */
 		if (get_module_image(module->file, &moduleImage) < B_OK)
-			goto err;
+			return B_ENTRY_NOT_FOUND;
 
 		// (re)set in-memory data for the loaded module
 		module->info = moduleImage->info[module->offset];
@@ -1339,17 +1349,15 @@
 		status = B_OK;
 
 	if (status == B_OK) {
-		inc_module_ref_count(module);
+		if (module->ref_count < 0)
+			panic("argl %s", path);
+		module->ref_count++;
 		*_info = module->info;
-	} else if ((module->flags & B_BUILT_IN_MODULE) == 0)
+	} else if ((module->flags & B_BUILT_IN_MODULE) == 0
+		&& (module->flags & B_KEEP_LOADED) == 0)
 		put_module_image(module->module_image);
 
-	recursive_lock_unlock(&sModulesLock);
 	return status;
-
-err:
-	recursive_lock_unlock(&sModulesLock);
-	return B_ENTRY_NOT_FOUND;
 }
 
 
@@ -1360,25 +1368,23 @@
 
 	TRACE(("put_module(path = %s)\n", path));
 
-	recursive_lock_lock(&sModulesLock);
+	RecursiveLocker _(sModulesLock);
 
 	module = (struct module *)hash_lookup(sModulesHash, path);
 	if (module == NULL) {
-		FATAL(("module: We don't seem to have a reference to module %s\n", path));
-		recursive_lock_unlock(&sModulesLock);
+		FATAL(("module: We don't seem to have a reference to module %s\n",
+			path));
 		return B_BAD_VALUE;
 	}
-	
+
+	if (module->ref_count == 0)
+		panic("module %s has no references.\n", path);
+
 	if ((module->flags & B_KEEP_LOADED) == 0) {
-		dec_module_ref_count(module);
-
-		if (module->ref_count == 0)
+		if (--module->ref_count == 0)
 			uninit_module(module);
-	}
-
-	if ((module->flags & B_BUILT_IN_MODULE) == 0)
+	} else if ((module->flags & B_BUILT_IN_MODULE) == 0)
 		put_module_image(module->module_image);
 
-	recursive_lock_unlock(&sModulesLock);
 	return B_OK;
 }



From axeld at mail.berlios.de  Fri Aug  3 01:05:54 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 3 Aug 2007 01:05:54 +0200
Subject: [Haiku-commits] r21804 -
	haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3
Message-ID: <200708022305.l72N5s2L012458@sheep.berlios.de>

Author: axeld
Date: 2007-08-03 01:05:53 +0200 (Fri, 03 Aug 2007)
New Revision: 21804
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21804&view=rev

Modified:
   haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
   haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.h
Log:
* Fixed filling the log in ReceiveLine() - ie. it's not done anymore there.
* Fixed error message in Open() when the server didn't return anything.
* Made the pop3.h header self contained.


Modified: haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
===================================================================
--- haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp	2007-08-02 21:44:54 UTC (rev 21803)
+++ haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp	2007-08-02 23:05:53 UTC (rev 21804)
@@ -7,28 +7,22 @@
 
 //! POP3Protocol - implementation of the POP3 protocol
 
+#include "pop3.h"
+
+#include <errno.h>
+#include <netdb.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <stdio.h>
-#include <DataIO.h>
-#include <Alert.h>
-#include <Debug.h>
-#include <netdb.h>
-#include <errno.h>
+#include <sys/socket.h>
+#include <sys/time.h>
 #include <unistd.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#ifndef HAIKU_TARGET_PLATFORM_BEOS // These headers don't exist in BeOS R5.
+
+#ifndef HAIKU_TARGET_PLATFORM_BEOS
+	// These headers don't exist in BeOS R5.
 	#include <arpa/inet.h>
 	#include <sys/select.h>
 #endif
 
-#include <status.h>
-#include <StringList.h>
-#include <ProtocolConfigView.h>
-#include <ChainRunner.h>
-
-#include <MDRLanguage.h>
-
 #if USESSL
 	#include <openssl/ssl.h>
 	#include <openssl/rand.h>
@@ -37,8 +31,17 @@
 	#include "md5.h"
 #endif
 
-#include "pop3.h"
+#include <DataIO.h>
+#include <Alert.h>
+#include <Debug.h>
 
+#include <status.h>
+#include <StringList.h>
+#include <ProtocolConfigView.h>
+#include <ChainRunner.h>
+
+#include <MDRLanguage.h>
+
 #define POP3_RETRIEVAL_TIMEOUT 60000000
 #define CRLF	"\r\n"
 
@@ -206,8 +209,12 @@
 	}
 
 	if (strncmp(line.String(), "+OK", 3) != 0) {
-		error_msg << MDR_DIALECT_CHOICE(". The server said:\n",
-			"???????????\n") << line.String();
+		if (line.Length() > 0) {
+			error_msg << MDR_DIALECT_CHOICE(". The server said:\n",
+				"???????????\n") << line.String();
+		} else
+			error_msg << ": No reply.\n";
+
 		runner->ShowError(error_msg.String());
 		return B_ERROR;
 	}
@@ -623,15 +630,9 @@
 				line += (char)c;
 			}
 		}
-	} else {
-		status_t error = errno;
-		fLog = "POP3 ";
-		fLog << strerror(error) << ".";
+	} else
+		return errno;
 
-		runner->Stop(true);
-		return error;
-	}
-
 	return len;
 }
 

Modified: haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.h
===================================================================
--- haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.h	2007-08-02 21:44:54 UTC (rev 21803)
+++ haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.h	2007-08-02 23:05:53 UTC (rev 21804)
@@ -1,17 +1,23 @@
-#ifndef ZOIDBERG_POP3_H
-#define ZOIDBERG_POP3_H
-/* POP3Protocol - implementation of the POP3 protocol
-**
-** Copyright 2001-2002 Dr. Zoidberg Enterprises. All rights reserved.
-*/
+/* 
+ * Copyright 2001-2002 Dr. Zoidberg Enterprises. All rights reserved.
+ * Copyright 2007, Haiku Inc. All Rights Reserved.
+ *
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef POP3_H
+#define POP3_H
 
-#include <String.h>
+
 #include <map>
 
+#include <List.h>
+#include <String.h>
+
 #include "SimpleMailProtocol.h"
 
+
 class POP3Protocol : public SimpleMailProtocol {
-  public:
+public:
   	POP3Protocol(BMessage *settings, BMailChainRunner *status);
   	~POP3Protocol();
   
@@ -50,4 +56,4 @@
 #endif
 };
 
-#endif	/* ZOIDBERG_POP3_H */
+#endif	/* POP3_H */



From stippi at mail.berlios.de  Fri Aug  3 03:11:28 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Fri, 3 Aug 2007 03:11:28 +0200
Subject: [Haiku-commits] r21805 - in haiku/trunk/src/servers/app: .
	drawing/Painter
Message-ID: <200708030111.l731BSOE021025@sheep.berlios.de>

Author: stippi
Date: 2007-08-03 03:11:27 +0200 (Fri, 03 Aug 2007)
New Revision: 21805
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21805&view=rev

Added:
   haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.cpp
   haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.h
Removed:
   haiku/trunk/src/servers/app/drawing/Painter/font_support/
Modified:
   haiku/trunk/src/servers/app/FontCacheEntry.cpp
   haiku/trunk/src/servers/app/FontCacheEntry.h
   haiku/trunk/src/servers/app/FontEngine.cpp
   haiku/trunk/src/servers/app/FontEngine.h
   haiku/trunk/src/servers/app/GlyphLayoutEngine.h
   haiku/trunk/src/servers/app/ServerApp.cpp
   haiku/trunk/src/servers/app/ServerFont.cpp
   haiku/trunk/src/servers/app/drawing/Painter/Jamfile
Log:
* moved AGGTextRenderer alongside it's pal, Painter, it felt lonely,
  removed font_support folder
* ServerApp can use ServerFont::StringWidth() directly again
* more ServerFont functions implemented via GlyphLayoutEngine and
  custom consumer
* extended GlyphCache data structure to hole the left/right insets
  of the glyph shape between its advance width, took it from the earlier
  ServerFont implementation, have not tested if that gives same result
  as R5
* TODO: implement GetGylphShapes via GlyphCache, although it might not
  look as clean as it does now


Modified: haiku/trunk/src/servers/app/FontCacheEntry.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontCacheEntry.cpp	2007-08-02 23:05:53 UTC (rev 21804)
+++ haiku/trunk/src/servers/app/FontCacheEntry.cpp	2007-08-03 01:11:27 UTC (rev 21805)
@@ -56,7 +56,7 @@
 
 	GlyphCache* CacheGlyph(uint16 glyphCode, unsigned glyphIndex,
 		unsigned dataSize, glyph_data_type dataType, const agg::rect_i& bounds,
-		double advanceX, double advanceY)
+		float advanceX, float advanceY, float insetLeft, float insetRight)
 	{
 		unsigned msb = (glyphCode >> 8) & 0xFF;
 		if (fGlyphs[msb] == 0) {
@@ -81,6 +81,8 @@
 		glyph->bounds = bounds;
 		glyph->advance_x = advanceX;
 		glyph->advance_y = advanceY;
+		glyph->inset_left = insetLeft;
+		glyph->inset_right = insetRight;
 
 		return fGlyphs[msb][lsb] = glyph;
 	}
@@ -133,7 +135,7 @@
 
 // HasGlyphs
 bool
-FontCacheEntry::HasGlyphs(const char* utf8String, size_t length) const
+FontCacheEntry::HasGlyphs(const char* utf8String, ssize_t length) const
 {
 	uint32 charCode;
 	const char* start = utf8String;
@@ -158,7 +160,8 @@
 			glyph = fGlyphCache->CacheGlyph(glyphCode,
 				fEngine.GlyphIndex(), fEngine.DataSize(),
 				fEngine.DataType(), fEngine.Bounds(),
-				fEngine.AdvanceX(), fEngine.AdvanceY());
+				fEngine.AdvanceX(), fEngine.AdvanceY(),
+				fEngine.InsetLeft(), fEngine.InsetRight());
 
 			fEngine.WriteGlyphTo(glyph->data);
 

Modified: haiku/trunk/src/servers/app/FontCacheEntry.h
===================================================================
--- haiku/trunk/src/servers/app/FontCacheEntry.h	2007-08-02 23:05:53 UTC (rev 21804)
+++ haiku/trunk/src/servers/app/FontCacheEntry.h	2007-08-03 01:11:27 UTC (rev 21805)
@@ -45,8 +45,10 @@
 	unsigned		data_size;
 	glyph_data_type	data_type;
 	agg::rect_i		bounds;
-	double			advance_x;
-	double			advance_y;
+	float			advance_x;
+	float			advance_y;
+	float			inset_left;
+	float			inset_right;
 };
 
 class FontCache;
@@ -74,7 +76,7 @@
 			bool				Init(const ServerFont& font);
 
 			bool				HasGlyphs(const char* utf8String,
-									size_t glyphCount) const;
+									ssize_t glyphCount) const;
 
 			const GlyphCache*	Glyph(uint16 glyphCode);
 

Modified: haiku/trunk/src/servers/app/FontEngine.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontEngine.cpp	2007-08-02 23:05:53 UTC (rev 21804)
+++ haiku/trunk/src/servers/app/FontEngine.cpp	2007-08-03 01:11:27 UTC (rev 21805)
@@ -365,6 +365,8 @@
 	, fBounds(1, 1, 0, 0)
 	, fAdvanceX(0.0)
 	, fAdvanceY(0.0)
+	, fInsetLeft(0.0)
+	, fInsetRight(0.0)
 
 	, fPath()
 	, fCurves(fPath)
@@ -411,6 +413,12 @@
 	if (fLastError != 0)
 		return false;
 
+	fAdvanceX = int26p6_to_dbl(fFace->glyph->advance.x);
+	fAdvanceY = int26p6_to_dbl(fFace->glyph->advance.y);
+	fInsetLeft = int26p6_to_dbl(fFace->glyph->metrics.horiBearingX);
+	fInsetRight = int26p6_to_dbl(fFace->glyph->metrics.horiBearingX 
+		+ fFace->glyph->metrics.width - fFace->glyph->metrics.horiAdvance);
+
 	switch(fGlyphRendering) {
 		case glyph_ren_native_mono:
 			fLastError = FT_Render_Glyph(fFace->glyph, FT_RENDER_MODE_MONO);
@@ -428,8 +436,6 @@
 				fBounds.y2 = fScanlineStorageBin.max_y();
 				fDataSize = fScanlineStorageBin.byte_size(); 
 				fDataType = glyph_data_mono;
-				fAdvanceX = int26p6_to_dbl(fFace->glyph->advance.x);
-				fAdvanceY = int26p6_to_dbl(fFace->glyph->advance.y);
 				return true;
 			}
 			break;
@@ -451,8 +457,6 @@
 				fBounds.y2 = fScanlineStorageAA.max_y();
 				fDataSize = fScanlineStorageAA.byte_size(); 
 				fDataType = glyph_data_gray8;
-				fAdvanceX = int26p6_to_dbl(fFace->glyph->advance.x);
-				fAdvanceY = int26p6_to_dbl(fFace->glyph->advance.y);
 				return true;
 			}
 			break;
@@ -470,8 +474,6 @@
 				fBounds.y1 = int(floor(bnd.y1));
 				fBounds.x2 = int(ceil(bnd.x2));
 				fBounds.y2 = int(ceil(bnd.y2));
-				fAdvanceX = int26p6_to_dbl(fFace->glyph->advance.x);
-				fAdvanceY = int26p6_to_dbl(fFace->glyph->advance.y);
 				return true;
 			}
 			break;

Modified: haiku/trunk/src/servers/app/FontEngine.h
===================================================================
--- haiku/trunk/src/servers/app/FontEngine.h	2007-08-02 23:05:53 UTC (rev 21804)
+++ haiku/trunk/src/servers/app/FontEngine.h	2007-08-03 01:11:27 UTC (rev 21805)
@@ -95,6 +95,10 @@
 									{ return fAdvanceX; }
 			double				AdvanceY() const
 									{ return fAdvanceY; }
+			double				InsetLeft() const
+									{ return fInsetLeft; }
+			double				InsetRight() const
+									{ return fInsetRight; }
 
 			void				WriteGlyphTo(uint8* data) const;
 
@@ -123,6 +127,8 @@
 			agg::rect_i			fBounds;
 			double				fAdvanceX;
 			double				fAdvanceY;
+			double				fInsetLeft;
+			double				fInsetRight;
 
 			// these members are for caching memory allocations
 			// when rendering glyphs		

Modified: haiku/trunk/src/servers/app/GlyphLayoutEngine.h
===================================================================
--- haiku/trunk/src/servers/app/GlyphLayoutEngine.h	2007-08-02 23:05:53 UTC (rev 21804)
+++ haiku/trunk/src/servers/app/GlyphLayoutEngine.h	2007-08-03 01:11:27 UTC (rev 21805)
@@ -28,17 +28,17 @@
 									bool kerning = true,
 									uint8 spacing = B_BITMAP_SPACING);
 
+	static	bool				IsWhiteSpace(uint32 glyphCode);
+
  private:
 								GlyphLayoutEngine();
 	virtual						~GlyphLayoutEngine();
-
-	static	bool				_IsWhiteSpace(uint32 glyph);
 };
 
 
-// _IsWhiteSpace
+// IsWhiteSpace
 inline bool
-GlyphLayoutEngine::_IsWhiteSpace(uint32 charCode)
+GlyphLayoutEngine::IsWhiteSpace(uint32 charCode)
 {
 	switch (charCode) {
 		case 0x0009:	/* tab */
@@ -64,6 +64,7 @@
 	const char* utf8String, int32 length,
 	const escapement_delta* delta, bool kerning, uint8 spacing)
 {
+	// TODO: implement spacing modes
 	FontCache* cache = FontCache::Default();
 	FontCacheEntry* entry = cache->FontCacheEntryFor(font);
 
@@ -113,7 +114,7 @@
 		y += advanceY;
 
 		if (delta)
-			x += _IsWhiteSpace(charCode) ? delta->space : delta->nonspace;
+			x += IsWhiteSpace(charCode) ? delta->space : delta->nonspace;
 
 		if (!consumer.ConsumeGlyph(index, charCode, glyph, entry, x, y))
 			break;

Modified: haiku/trunk/src/servers/app/ServerApp.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerApp.cpp	2007-08-02 23:05:53 UTC (rev 21804)
+++ haiku/trunk/src/servers/app/ServerApp.cpp	2007-08-03 01:11:27 UTC (rev 21805)
@@ -1416,14 +1416,8 @@
 					if (!stringArray[i] || lengthArray[i] <= 0)
 						widthArray[i] = 0.0;
 					else {
-						widthArray[i] = fDesktop->GetDrawingEngine()->
-							StringWidth(stringArray[i], lengthArray[i], font);
-						// NOTE: The line below will return the exact same thing.
-						// However, the line above uses the AGG rendering backend,
-						// for which glyph caching actually works. It is about
-						// 20 times faster!
-//						widthArray[i] = font.StringWidth(stringArray[i],
-//							lengthArray[i]);
+						widthArray[i] = font.StringWidth(stringArray[i],
+							lengthArray[i]);
 					}
 				}
 

Modified: haiku/trunk/src/servers/app/ServerFont.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerFont.cpp	2007-08-02 23:05:53 UTC (rev 21804)
+++ haiku/trunk/src/servers/app/ServerFont.cpp	2007-08-03 01:11:27 UTC (rev 21805)
@@ -410,92 +410,171 @@
 }
 
 
-status_t
-ServerFont::GetEdges(const char charArray[], int32 numChars,
-	edge_info edgeArray[]) const
-{
-	if (!charArray || numChars <= 0 || !edgeArray)
-		return B_BAD_DATA;
-
-	FT_Face face = GetTransformedFace(false, false);
-	if (!face)
-		return B_ERROR;
-
-	const char *string = charArray;
-	for (int i = 0; i < numChars; i++) {
-		FT_Load_Char(face, UTF8ToCharCode(&string), FT_LOAD_NO_BITMAP);
-		edgeArray[i].left = float(face->glyph->metrics.horiBearingX)
-			/ 64 / fSize;
-		edgeArray[i].right = float(face->glyph->metrics.horiBearingX 
-			+ face->glyph->metrics.width - face->glyph->metrics.horiAdvance)
-			/ 64 / fSize;
+class EdgesConsumer {
+ public:
+	EdgesConsumer(edge_info* edges, float size)
+		: fEdges(edges)
+		, fSize(size)
+	{
 	}
+	void Start() {}
+	void Finish(double x, double y) {}
+	void ConsumeEmptyGlyph(int32 index, uint32 charCode, double x, double y)
+	{
+		fEdges[index].left = 0.0;
+		fEdges[index].right = 0.0;
+	}
+	bool ConsumeGlyph(int32 index, uint32 charCode, const GlyphCache* glyph,
+		FontCacheEntry* entry, double x, double y)
+	{
+		fEdges[index].left = glyph->inset_left / fSize;
+		fEdges[index].right = glyph->inset_right / fSize;
+		return true;
+	}
 
-	PutTransformedFace(face);
-	return B_OK;
-}
+ private:
+	edge_info* fEdges;
+	float fSize;
+};
 
 
 status_t
-ServerFont::GetEscapements(const char charArray[], int32 numChars,
-	escapement_delta delta, BPoint escapementArray[],
-	BPoint offsetArray[]) const
+ServerFont::GetEdges(const char* string, int32 numChars,
+	edge_info* edges) const
 {
-	if (!charArray || numChars <= 0 || !escapementArray)
+	if (!string || numChars <= 0 || !edges)
 		return B_BAD_DATA;
 
-	FT_Face face = GetTransformedFace(true, false);
-	if (!face)
-		return B_ERROR;
+	bool kerning = true; // TODO make this a property?
 
-	const char *string = charArray;
-	for (int i = 0; i < numChars; i++) {
-		uint32 charCode = UTF8ToCharCode(&string);
-		FT_Load_Char(face, charCode, FT_LOAD_NO_BITMAP);
-		escapementArray[i].x = is_white_space(charCode) ? delta.space : delta.nonspace;
-		escapementArray[i].x += float(face->glyph->advance.x) / 64;
-		escapementArray[i].y = -float(face->glyph->advance.y) / 64;
-		escapementArray[i].x /= fSize;
-		escapementArray[i].y /= fSize;
+	EdgesConsumer consumer(edges, fSize);
+	if (GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numChars,
+		NULL, kerning, fSpacing))
+		return B_OK;
 
-		if (offsetArray) {
+	return B_ERROR;
+
+//	FT_Face face = GetTransformedFace(false, false);
+//	if (!face)
+//		return B_ERROR;
+//
+//	const char *string = charArray;
+//	for (int i = 0; i < numChars; i++) {
+//		FT_Load_Char(face, UTF8ToCharCode(&string), FT_LOAD_NO_BITMAP);
+//		edgeArray[i].left = float(face->glyph->metrics.horiBearingX)
+//			/ 64 / fSize;
+//		edgeArray[i].right = float(face->glyph->metrics.horiBearingX 
+//			+ face->glyph->metrics.width - face->glyph->metrics.horiAdvance)
+//			/ 64 / fSize;
+//	}
+//
+//	PutTransformedFace(face);
+//	return B_OK;
+}
+
+
+class BPointEscapementConsumer {
+ public:
+	BPointEscapementConsumer(BPoint* escapements, BPoint* offsets, float size)
+		: fEscapements(escapements)
+		, fOffsets(offsets)
+		, fSize(size)
+	{
+	}
+	void Start() {}
+	void Finish(double x, double y) {}
+	void ConsumeEmptyGlyph(int32 index, uint32 charCode, double x, double y)
+	{
+		_Set(index, 0, 0);
+	}
+	bool ConsumeGlyph(int32 index, uint32 charCode, const GlyphCache* glyph,
+		FontCacheEntry* entry, double x, double y)
+	{
+		_Set(index, glyph->advance_x, glyph->advance_y);
+		return true;
+	}
+ private:
+	inline void _Set(int32 index, double x, double y)
+	{
+		fEscapements[index].x = x / fSize;
+		fEscapements[index].y = y / fSize;
+		if (fOffsets) {
 			// ToDo: According to the BeBook: "The offsetArray is applied by
 			// the dynamic spacing in order to improve the relative position
 			// of the character's width with relation to another character,
 			// without altering the width." So this will probably depend on
 			// the spacing mode.
-			offsetArray[i].x = 0;
-			offsetArray[i].y = 0;
+			fOffsets[index].x = 0;
+			fOffsets[index].y = 0;
 		}
 	}
 
-	PutTransformedFace(face);
-	return B_OK;
+	BPoint* fEscapements;
+	BPoint* fOffsets;
+ 	float fSize;
+};
+
+
+status_t
+ServerFont::GetEscapements(const char* string, int32 numChars,
+	escapement_delta delta, BPoint escapementArray[],
+	BPoint offsetArray[]) const
+{
+	if (!string || numChars <= 0 || !escapementArray)
+		return B_BAD_DATA;
+
+	bool kerning = true; // TODO make this a property?
+
+	BPointEscapementConsumer consumer(escapementArray, offsetArray, fSize);
+	if (GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numChars,
+		&delta, kerning, fSpacing))
+		return B_OK;
+
+	return B_ERROR;
 }
 
 
+class WidthEscapementConsumer {
+ public:
+	WidthEscapementConsumer(float* widths, float size)
+		: fWidths(widths)
+		, fSize(size)
+	{
+	}
+	void Start() {}
+	void Finish(double x, double y) {}
+	void ConsumeEmptyGlyph(int32 index, uint32 charCode, double x, double y)
+	{
+		fWidths[index] = 0.0;
+	}
+	bool ConsumeGlyph(int32 index, uint32 charCode, const GlyphCache* glyph,
+		FontCacheEntry* entry, double x, double y)
+	{
+		fWidths[index] = glyph->advance_x / fSize;
+		return true;
+	}
+
+ private:
+	float* fWidths;
+	float fSize;
+};
+
+
+
 status_t
-ServerFont::GetEscapements(const char charArray[], int32 numChars,
+ServerFont::GetEscapements(const char* string, int32 numChars,
 	escapement_delta delta, float widthArray[]) const
 {
-	if (!charArray || numChars <= 0 || !widthArray)
+	if (!string || numChars <= 0 || !widthArray)
 		return B_BAD_DATA;
 
-	FT_Face face = GetTransformedFace(false, false);
-	if (!face)
-		return B_ERROR;
+	bool kerning = true; // TODO make this a property?
 
-	const char *string = charArray;
-	for (int i = 0; i < numChars; i++) {
-		uint32 charCode = UTF8ToCharCode(&string);
-		FT_Load_Char(face, charCode, FT_LOAD_NO_BITMAP);
-		widthArray[i] = is_white_space(charCode) ? delta.space : delta.nonspace;
-		widthArray[i] += float(face->glyph->metrics.horiAdvance) / 64.0;
-		widthArray[i] /= fSize;
-	}
-
-	PutTransformedFace(face);
-	return B_OK;
+	WidthEscapementConsumer consumer(widthArray, fSize);
+	if (GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numChars,
+		&delta, kerning, fSpacing))
+		return B_OK;
+	return B_ERROR;
 }
 
 
@@ -523,18 +602,18 @@
 			const agg::rect_i& r = glyph->bounds;
 			if (fAsString) {
 				rectArray[index].left = r.x1 + x;
-				rectArray[index].top = r.y1 + y - 1;
+				rectArray[index].top = r.y1 + y;
 				rectArray[index].right = r.x2 + x + 1;
 				rectArray[index].bottom = r.y2 + y + 1;
 			} else {
 				if (rectArray) {
 					rectArray[index].left = r.x1;
-					rectArray[index].top = r.y1 - 1;
+					rectArray[index].top = r.y1;
 					rectArray[index].right = r.x2 + 1;
 					rectArray[index].bottom = r.y2 + 1;
 				} else {
 					stringBoundingBox = stringBoundingBox
-						| BRect(r.x1 + x, r.y1 + y - 1,
+						| BRect(r.x1 + x, r.y1 + y,
 							r.x2 + x + 1, r.y2 + y + 1);
 				}
 			}

Copied: haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.cpp (from rev 21798, haiku/trunk/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp)

Copied: haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.h (from rev 21798, haiku/trunk/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h)

Modified: haiku/trunk/src/servers/app/drawing/Painter/Jamfile
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/Jamfile	2007-08-02 23:05:53 UTC (rev 21804)
+++ haiku/trunk/src/servers/app/drawing/Painter/Jamfile	2007-08-03 01:11:27 UTC (rev 21805)
@@ -8,11 +8,9 @@
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter font_support ] ;
 UseFreeTypeHeaders ;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) drawing_modes ] ;
-SEARCH_SOURCE += [ FDirName $(SUBDIR) font_support ] ;
 
 StaticLibrary libpainter.a :
 	Painter.cpp



From axeld at mail.berlios.de  Fri Aug  3 03:26:37 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 3 Aug 2007 03:26:37 +0200
Subject: [Haiku-commits] r21806 - haiku/trunk/src/system/kernel/vm
Message-ID: <200708030126.l731QbbZ022323@sheep.berlios.de>

Author: axeld
Date: 2007-08-03 03:26:35 +0200 (Fri, 03 Aug 2007)
New Revision: 21806
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21806&view=rev

Modified:
   haiku/trunk/src/system/kernel/vm/vm.cpp
Log:
vfs_get_vnode_cache() was changed (read: fixed) since r18716; it was wrong
to acquire the extra vnode reference, and actually prevented unmounting from
working - which it now does again.


Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-03 01:11:27 UTC (rev 21805)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-03 01:26:35 UTC (rev 21806)
@@ -1123,13 +1123,9 @@
 }
 
 
-/**	Creates the vnode cache for the specified \a vnode.
- *	The vnode has to be marked busy when calling this function.
- *	If successful, it will also acquire an extra reference to
- *	the vnode (as the vnode store itself can't do this
- *	automatically).
- */
-
+/*!	Creates the vnode cache for the specified \a vnode.
+	The vnode has to be marked busy when calling this function.
+*/
 status_t
 vm_create_vnode_cache(void *vnode, struct vm_cache **_cache)
 {
@@ -1149,7 +1145,6 @@
 	cache->type = CACHE_TYPE_VNODE;
 
 	*_cache = cache;
-	vfs_acquire_vnode(vnode);
 	return B_OK;
 
 err1:



From mmu_man at mail.berlios.de  Fri Aug  3 03:28:21 2007
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Fri, 3 Aug 2007 03:28:21 +0200
Subject: [Haiku-commits] r21807 -
	haiku/trunk/src/add-ons/kernel/bus_managers/pci
Message-ID: <200708030128.l731SLuL022424@sheep.berlios.de>

Author: mmu_man
Date: 2007-08-03 03:28:21 +0200 (Fri, 03 Aug 2007)
New Revision: 21807
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21807&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/pci/pci.cpp
Log:
Add kdl commands (inb,ins,inw) to dump pci io ports (untested).


Modified: haiku/trunk/src/add-ons/kernel/bus_managers/pci/pci.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/pci/pci.cpp	2007-08-03 01:26:35 UTC (rev 21806)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/pci/pci.cpp	2007-08-03 01:28:21 UTC (rev 21807)
@@ -7,6 +7,7 @@
  */
 
 
+#include <string.h>
 #include <KernelExport.h>
 #define __HAIKU_PCI_BUS_MANAGER_TESTING 1
 #include <PCI.h>
@@ -122,6 +123,80 @@
 }
 
 
+// #pragma mark kernel debugger commands
+
+static int
+display_io(int argc, char **argv)
+{
+	int32 displayWidth;
+	int32 itemSize;
+	int32 num = -1;
+	int address;
+	int i = 1, j;
+
+	switch (argc) {
+	case 3:
+		num = atoi(argv[2]);
+	case 2:
+		address = strtoul(argv[1], NULL, 0);
+	default:
+		kprintf("usage: %s <address> [num]\n", argv[0]);
+		return 0;
+	}
+
+	// build the format string
+	if (strcmp(argv[0], "inb") == 0 || strcmp(argv[0], "in8") == 0) {
+		itemSize = 1;
+		displayWidth = 16;
+	} else if (strcmp(argv[0], "ins") == 0 || strcmp(argv[0], "in16") == 0) {
+		itemSize = 2;
+		displayWidth = 8;
+	} else if (strcmp(argv[0], "inw") == 0 || strcmp(argv[0], "in32") == 0) {
+		itemSize = 4;
+		displayWidth = 4;
+	} else {
+		kprintf("display_io called in an invalid way!\n");
+		return 0;
+	}
+
+	if (num <= 0)
+		num = displayWidth;
+
+	for (i = 0; i < num; i++) {
+		if ((i % displayWidth) == 0) {
+			int32 displayed = min_c(displayWidth, (num-i)) * itemSize;
+			if (i != 0)
+				kprintf("\n");
+
+			kprintf("[0x%lx]  ", address + i * itemSize);
+
+			if (num > displayWidth) {
+				// make sure the spacing in the last line is correct
+				for (j = displayed; j < displayWidth * itemSize; j++)
+					kprintf(" ");
+			}
+			kprintf("  ");
+		}
+
+		switch (itemSize) {
+			case 1:
+				kprintf(" %02x", pci_read_io_8(address + i * itemSize));
+				break;
+			case 2:
+				kprintf(" %04x", pci_read_io_16(address + i * itemSize));
+				break;
+			case 4:
+				kprintf(" %08lx", pci_read_io_32(address + i * itemSize));
+				break;
+		}
+	}
+
+	kprintf("\n");
+	return 0;
+}
+
+
+
 // #pragma mark bus manager init/uninit
 
 status_t
@@ -134,6 +209,13 @@
 		return B_ERROR;
 	}
 
+	add_debugger_command("inw", &display_io, "dump io words (32-bit)");
+	add_debugger_command("in32", &display_io, "dump io words (32-bit)");
+	add_debugger_command("ins", &display_io, "dump io shorts (16-bit)");
+	add_debugger_command("in16", &display_io, "dump io shorts (16-bit)");
+	add_debugger_command("inb", &display_io, "dump io bytes (8-bit)");
+	add_debugger_command("in8", &display_io, "dump io bytes (8-bit)");
+
 	if (pci_controller_init() != B_OK) {
 		TRACE(("PCI: pci_controller_init failed\n"));
 		return B_ERROR;
@@ -149,6 +231,12 @@
 void
 pci_uninit(void)
 {
+	remove_debugger_command("inw", &display_io);
+	remove_debugger_command("in32", &display_io);
+	remove_debugger_command("ins", &display_io);
+	remove_debugger_command("in16", &display_io);
+	remove_debugger_command("inb", &display_io);
+	remove_debugger_command("in8", &display_io);
 	delete sPCI;
 }
 



From jackburton at mail.berlios.de  Fri Aug  3 11:59:32 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Fri, 3 Aug 2007 11:59:32 +0200
Subject: [Haiku-commits] r21808 - haiku/trunk/src/apps/terminal
Message-ID: <200708030959.l739xW9f001468@sheep.berlios.de>

Author: jackburton
Date: 2007-08-03 11:59:30 +0200 (Fri, 03 Aug 2007)
New Revision: 21808
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21808&view=rev

Modified:
   haiku/trunk/src/apps/terminal/Shell.cpp
   haiku/trunk/src/apps/terminal/Shell.h
   haiku/trunk/src/apps/terminal/SmartTabView.cpp
   haiku/trunk/src/apps/terminal/TermParse.cpp
   haiku/trunk/src/apps/terminal/TermView.cpp
   haiku/trunk/src/apps/terminal/TermView.h
   haiku/trunk/src/apps/terminal/TermWindow.cpp
   haiku/trunk/src/apps/terminal/TermWindow.h
Log:
Attach/DetachShell are now private. Added a new TermView constructor 
which only specifies the rows and columns, view size is automatically 
calculated, and used it in TermWindow. Added a TermView::SetTitle() 
method, thus TermParse doesn't call Window() anymore. Some cleanups, 
scrollbar was off by one.


Modified: haiku/trunk/src/apps/terminal/Shell.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/Shell.cpp	2007-08-03 01:28:21 UTC (rev 21807)
+++ haiku/trunk/src/apps/terminal/Shell.cpp	2007-08-03 09:59:30 UTC (rev 21808)
@@ -232,14 +232,18 @@
 status_t
 Shell::GetAttr(struct termios &attr)
 {
-	return tcgetattr(fFd, &attr);
+	if (tcgetattr(fFd, &attr) < 0)
+		return errno;
+	return B_OK;
 }
 
 
 status_t
 Shell::SetAttr(struct termios &attr)
 {
-	return tcsetattr(fFd, TCSANOW, &attr);
+	if (tcsetattr(fFd, TCSANOW, &attr) < 0)
+		return errno;
+	return B_OK;
 }
 
 
@@ -378,13 +382,6 @@
 			exit(1);
 		}
 
-		struct termios tio;
-	
-		/* get tty termios (not necessary).
-		 * TODO: so why are we doing it ?
-		 */
-		tcgetattr(slave, &tio);
-
 		/* set signal default */
 		signal(SIGCHLD, SIG_DFL);
 		signal(SIGHUP, SIG_DFL);
@@ -393,6 +390,12 @@
 		signal(SIGINT, SIG_DFL);
 		signal(SIGTTOU, SIG_DFL);
 
+		struct termios tio;
+		/* get tty termios (not necessary).
+		 * TODO: so why are we doing it ?
+		 */
+		tcgetattr(slave, &tio);
+
 		/*
 		 * Set Terminal interface.
 		 */

Modified: haiku/trunk/src/apps/terminal/Shell.h
===================================================================
--- haiku/trunk/src/apps/terminal/Shell.h	2007-08-03 01:28:21 UTC (rev 21807)
+++ haiku/trunk/src/apps/terminal/Shell.h	2007-08-03 09:59:30 UTC (rev 21808)
@@ -37,8 +37,8 @@
 	status_t	GetAttr(struct termios &attr);
 	status_t	SetAttr(struct termios &attr);
 
-	int		FD() const;	
-
+	int		FD() const;
+	
 	virtual	void	ViewAttached(TermView *view);
 	virtual void	ViewDetached();
 	

Modified: haiku/trunk/src/apps/terminal/SmartTabView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/SmartTabView.cpp	2007-08-03 01:28:21 UTC (rev 21807)
+++ haiku/trunk/src/apps/terminal/SmartTabView.cpp	2007-08-03 09:59:30 UTC (rev 21808)
@@ -20,7 +20,7 @@
 {
 	// See BTabView::_InitObject() to see why we are doing this
 	ContainerView()->MoveBy(-3, -TabHeight() - 3);
-	ContainerView()->ResizeBy(9, TabHeight() + 9);
+	ContainerView()->ResizeBy(10, TabHeight() + 9);
 }
 
 

Modified: haiku/trunk/src/apps/terminal/TermParse.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermParse.cpp	2007-08-03 01:28:21 UTC (rev 21807)
+++ haiku/trunk/src/apps/terminal/TermParse.cpp	2007-08-03 09:59:30 UTC (rev 21808)
@@ -19,7 +19,6 @@
 
 #include <Beep.h>
 #include <Message.h>
-#include <Window.h>
 
 
 //////////////////////////////////////////////////////////////////////////////
@@ -851,7 +850,7 @@
 						switch (mode_char) {
 							case '0':
 							case '2':
-								fView->Window()->SetTitle(string);
+								fView->SetTitle(string);
 								break;
 							case '1':
 								break;

Modified: haiku/trunk/src/apps/terminal/TermView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-03 01:28:21 UTC (rev 21807)
+++ haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-03 09:59:30 UTC (rev 21808)
@@ -19,7 +19,6 @@
 #include "TermConst.h"
 #include "VTkeymap.h"
 
-#include <Application.h>
 #include <Alert.h>
 #include <Beep.h>
 #include <Clipboard.h>
@@ -107,12 +106,31 @@
 #define ROWS_DEFAULT 25
 #define COLUMNS_DEFAULT 80
 
+
+static property_info sPropList[] = { 
+	{ "encoding", 
+	{B_GET_PROPERTY, 0},
+	{B_DIRECT_SPECIFIER, 0},
+	"get terminal encoding"}, 
+	{ "encoding",
+	{B_SET_PROPERTY, 0},
+	{B_DIRECT_SPECIFIER, 0},
+	"set terminal encoding"}, 
+	{ "tty",
+	{B_GET_PROPERTY, 0},
+	{B_DIRECT_SPECIFIER, 0},
+	"get tty name."}, 
+	{ 0  }	     
+};
+
+
 const static uint32 kUpdateSigWinch = 'Rwin';
 
 const static rgb_color kBlackColor = { 0, 0, 0, 255 };
 const static rgb_color kWhiteColor = { 255, 255, 255, 255 };
 
 
+
 TermView::TermView(BRect frame, const char *command, int32 historySize)
 	: BView(frame, "termview", B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS | B_PULSE_NEEDED),
 	fShell(NULL),
@@ -161,6 +179,55 @@
 }
 
 
+TermView::TermView(int rows, int columns, const char *command, int32 historySize)
+	: BView(BRect(0, 0, 0, 0), "termview", B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS | B_PULSE_NEEDED),
+	fShell(NULL),
+	fFontWidth(0),
+	fFontHeight(0),
+	fFontAscent(0),
+	fUpdateFlag(false),
+	fInsertModeFlag(MODE_OVER),
+	fScrollUpCount(0),
+	fScrollBarRange(0),
+	fFrameResized(false),
+	fLastCursorTime(0),
+	fCursorDrawFlag(CURON),
+	fCursorStatus(CURON),
+	fCursorBlinkingFlag(CURON),
+	fCursorRedrawFlag(CURON),
+	fCursorHeight(0),
+	fCurPos(0, 0),
+	fCurStack(0, 0),
+	fBufferStartPos(-1),
+	fTermRows(rows),
+	fTermColumns(columns),
+	fEncoding(M_UTF8),
+	fTop(0),	
+	fTextBuffer(NULL),
+	fScrollBar(NULL),
+	fTextForeColor(kBlackColor),
+	fTextBackColor(kWhiteColor),
+	fCursorForeColor(kWhiteColor),
+	fCursorBackColor(kBlackColor),
+	fSelectForeColor(kWhiteColor),
+	fSelectBackColor(kBlackColor),
+	fScrTop(0),
+	fScrBot(fTermRows - 1),
+	fScrBufSize(historySize),
+	fScrRegionSet(0),
+	fPreviousMousePoint(0, 0),
+	fSelStart(-1, -1),
+	fSelEnd(-1, -1),
+	fMouseTracking(false),
+	fMouseThread(-1),
+	fQuitting(false),
+	fIMflag(false)	
+{	
+	_InitObject(command);
+	SetTermSize(fTermRows, fTermColumns, true);
+}
+
+
 TermView::TermView(BMessage *archive)
 	:
 	BView(archive),
@@ -235,11 +302,12 @@
 		return B_NO_MEMORY;
 	
 	status_t status = fShell->Open(fTermRows, fTermColumns,
-					command, longname2shortname(id2longname(fEncoding)));	
+					command, longname2shortname(id2longname(fEncoding)));
+	
 	if (status < B_OK)
 		return status;
 
-	status = AttachShell(fShell);
+	status = _AttachShell(fShell);
 	if (status < B_OK)
 		return status;
 
@@ -254,7 +322,7 @@
 
 TermView::~TermView()
 {
-	DetachShell();
+	_DetachShell();
 	
 	delete fTextBuffer;
 	delete fShell;
@@ -302,27 +370,6 @@
 }
 
 
-status_t
-TermView::AttachShell(Shell *shell)
-{
-	if (shell == NULL)
-		return B_BAD_VALUE;
-	
-	fShell = shell;
-	fShell->ViewAttached(this);	
-
-	return B_OK;
-}
-
-
-void
-TermView::DetachShell()
-{
-	fShell->ViewDetached();
-	fShell = NULL;
-}
-
-
 const char *
 TermView::TerminalName() const
 {
@@ -467,6 +514,16 @@
 }
 
 
+void
+TermView::SetTitle(const char *title)
+{
+	// TODO: Do something different in case we're a replicant,
+	// or in case we are inside a BTabView ?
+	if (Window())
+		Window()->SetTitle(title);
+}
+
+
 //! Print one character
 void
 TermView::PutChar(uchar *string, ushort attr, int width)
@@ -950,6 +1007,27 @@
 
 
 status_t
+TermView::_AttachShell(Shell *shell)
+{
+	if (shell == NULL)
+		return B_BAD_VALUE;
+	
+	fShell = shell;
+	fShell->ViewAttached(this);	
+
+	return B_OK;
+}
+
+
+void
+TermView::_DetachShell()
+{
+	fShell->ViewDetached();
+	fShell = NULL;
+}
+
+
+status_t
 TermView::_InitMouseThread()
 {
 	// spawn Mouse Tracking thread.
@@ -1007,9 +1085,9 @@
 					}
 					
 					if (tmppos > stpos && tmppos < edpos)
-						be_app->SetCursor(M_ADD_CURSOR);
+						SetViewCursor(M_ADD_CURSOR);
 					else 
-						be_app->SetCursor(B_HAND_CURSOR);
+						SetViewCursor(B_HAND_CURSOR);
 				}
 			}
 			snooze(50 * 1000);
@@ -1442,13 +1520,18 @@
 void
 TermView::KeyDown(const char *bytes, int32 numBytes)
 {
-	int32 key, mod;
-	Looper()->CurrentMessage()->FindInt32("modifiers", &mod);
-	Looper()->CurrentMessage()->FindInt32("key", &key);
-
 	if (fIMflag)
 		return;
 
+	int32 key, mod, rawChar;
+	BMessage *currentMessage = Looper()->CurrentMessage();
+	if (currentMessage == NULL)
+		return;
+	
+	currentMessage->FindInt32("modifiers", &mod);
+	currentMessage->FindInt32("key", &key);
+	currentMessage->FindInt32("raw_char", &rawChar);
+
 	// If bytes[0] equal intr character,
 	// send signal to shell process group.
 	struct termios tio;
@@ -1458,6 +1541,8 @@
 			fShell->Signal(SIGINT);
 	}
 
+	printf("rawKey: %c\n", (char)rawChar);
+
 	// Terminal filters RET, ENTER, F1...F12, and ARROW key code.
 	// TODO: Cleanup
 	if (numBytes == 1) {
@@ -1594,7 +1679,7 @@
 {
 	const int cols = ((int)width + 1) / fFontWidth;
 	const int rows = ((int)height + 1) / fFontHeight;
-
+	
 	int offset = 0;
 
 	if (rows < fCurPos.y + 1) {
@@ -1673,13 +1758,14 @@
 			_DoSelectAll();
 			break;
 		
-		case B_SET_PROPERTY: {
+		case B_SET_PROPERTY:
+		{
 			int32 i;
 			int32 encodingID;
-			BMessage spe;
-			msg->GetCurrentSpecifier(&i, &spe);
-			if (!strcmp("encoding", spe.FindString("property", i))){
-				msg->FindInt32 ("data",  &encodingID);
+			BMessage specifier;
+			msg->GetCurrentSpecifier(&i, &specifier);
+			if (!strcmp("encoding", specifier.FindString("property", i))){
+				msg->FindInt32 ("data", &encodingID);
 				SetEncoding(encodingID);
 				msg->SendReply(B_REPLY);
 			} else {
@@ -1688,16 +1774,16 @@
 			break;
 		}
 
-		case B_GET_PROPERTY: {
+		case B_GET_PROPERTY: 
+		{
 			int32 i;
-			BMessage spe;
-			msg->GetCurrentSpecifier(&i, &spe);
-			if (!strcmp("encoding", spe.FindString("property", i))){
+			BMessage specifier;
+			msg->GetCurrentSpecifier(&i, &specifier);
+			if (!strcmp("encoding", specifier.FindString("property", i))){
 				BMessage reply(B_REPLY);
 				reply.AddInt32("result", Encoding());
 				msg->SendReply(&reply);
-			}
-			else if (!strcmp("tty", spe.FindString("property", i))) {
+			} else if (!strcmp("tty", specifier.FindString("property", i))) {
 				BMessage reply(B_REPLY);
 				reply.AddString("result", TerminalName());
 				msg->SendReply(&reply);
@@ -1748,40 +1834,23 @@
 status_t
 TermView::GetSupportedSuites(BMessage *message) 
 { 
-	static property_info propList[] = { 
-		{ "encoding",
-		{B_GET_PROPERTY, 0},
-		{B_DIRECT_SPECIFIER, 0},
-		"get muterminal encoding"}, 
-		{ "encoding",
-		{B_SET_PROPERTY, 0},
-		{B_DIRECT_SPECIFIER, 0},
-		"set muterminal encoding"}, 
-		{ "tty",
-		{B_GET_PROPERTY, 0},
-		{B_DIRECT_SPECIFIER, 0},
-		"get tty_name."}, 
-		{ 0  }
-		     
-	};
-
-	message->AddString("suites", "suite/vnd.naan-termview"); 
-	BPropertyInfo propInfo(propList); 
+	BPropertyInfo propInfo(sPropList); 
+	message->AddString("suites", "suite/vnd.naan-termview"); 	
 	message->AddFlat("messages", &propInfo); 
 	return BView::GetSupportedSuites(message); 
 }
 
 
 BHandler*
-TermView::ResolveSpecifier(BMessage *msg, int32 index, BMessage *specifier,
-				int32 form, const char *property)
+TermView::ResolveSpecifier(BMessage *message, int32 index, BMessage *specifier,
+				int32 what, const char *property)
 {
-	if (((strcmp(property, "encode") == 0) 
-		&& ((msg->what == B_SET_PROPERTY) || (msg->what == B_GET_PROPERTY))) 
-		|| ((strcmp(property, "tty") == 0) &&  (msg->what == B_GET_PROPERTY))) 
-	return this;
-
-	return BView::ResolveSpecifier(msg, index, specifier, form, property);
+	BHandler *target = this;
+	BPropertyInfo propInfo(sPropList);
+	if (propInfo.FindMatch(message, index, specifier, what, property) < B_OK)			
+		target = BView::ResolveSpecifier(message, index, specifier, what, property);
+	
+	return target;
 }
 
 
@@ -2058,14 +2127,13 @@
 void
 TermView::_Select(CurPos start, CurPos end)
 {
-	uchar buf[4];
-	ushort attr;
-	
 	if (start.x < 0)
 		start.x = 0;
 	if (end.x >= fTermColumns)
 		end.x = fTermColumns - 1;
 	
+	uchar buf[4];
+	ushort attr;
 	if (fTextBuffer->GetChar(start.y, start.x, buf, &attr) == IN_STRING) {
 		start.x--;
 		if (start.x < 0)
@@ -2090,10 +2158,6 @@
 void
 TermView::_AddSelectRegion(CurPos pos)
 {
-	uchar buf[4];
-	ushort attr;
-	CurPos start, end, inPos;
-	
 	if (!_HasSelection())
 		return;
 	
@@ -2107,14 +2171,17 @@
 	if (pos.y < 0)
 		pos.y = 0;
 	
+	uchar buf[4];
+	ushort attr;
 	if (fTextBuffer->GetChar(pos.y, pos.x, buf, &attr) == IN_STRING) {
 		pos.x++;
 		if (pos.x >= fTermColumns)
 			pos.x = fTermColumns - 1;
 	}
 	
-	start = fSelStart;
-	end = fSelEnd;
+	CurPos start = fSelStart;
+	CurPos end = fSelEnd;
+	CurPos inPos;
 	
 	// Mouse point is same as selected line.
 	if (pos.y == fSelStart.y && pos.y == fSelEnd.y) {
@@ -2169,12 +2236,8 @@
 void
 TermView::_ResizeSelectRegion(CurPos pos)
 {
-	CurPos inPos;
-	uchar buf[4];
-	ushort attr;
+	CurPos inPos = fSelEnd;
 	
-	inPos = fSelEnd;
-	
 	// error check, and if mouse point to a plase full width character,
 	// select point decliment.
 	if (pos.x >= fTermColumns)
@@ -2185,8 +2248,9 @@
 	if (pos.y < 0)
 		pos.y = 0;
 	
-	if (fTextBuffer->GetChar(pos.y, pos.x, buf, &attr) == IN_STRING) {
-		
+	uchar buf[4];
+	ushort attr;
+	if (fTextBuffer->GetChar(pos.y, pos.x, buf, &attr) == IN_STRING) {	
 		pos.x++;
 		
 		if (pos == inPos)
@@ -2206,15 +2270,13 @@
 void
 TermView::_DeSelect(void)
 {
-	CurPos start, end;
-	
 	if (!_HasSelection())
 		return;
 	
 	fTextBuffer->DeSelect();
 	
-	start = fSelStart;
-	end = fSelEnd;
+	CurPos start = fSelStart;
+	CurPos end = fSelEnd;
 	
 	fSelStart.Set(-1, -1);
 	fSelEnd.Set(-1, -1);
@@ -2241,19 +2303,13 @@
 	fTextBuffer->Select(start, end);
 
 	if (mod & B_SHIFT_KEY) {
-	
 		if (flag) {
-		
 			if (start < fSelStart)
 				_AddSelectRegion(start);
 			else if (end > fSelEnd)
-				_AddSelectRegion(end);
-	
-		
+				_AddSelectRegion(end);		
 		} else
 			_AddSelectRegion(pos);
-
-		
 	} else {
 		_DeSelect();
 		if (flag)
@@ -2441,6 +2497,7 @@
 	return true;
 }
 
+
 //! Get the selected text and copy to str
 void
 TermView::GetSelection(BString &str)

Modified: haiku/trunk/src/apps/terminal/TermView.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.h	2007-08-03 01:28:21 UTC (rev 21807)
+++ haiku/trunk/src/apps/terminal/TermView.h	2007-08-03 09:59:30 UTC (rev 21808)
@@ -33,22 +33,21 @@
 class TermView : public BView {
 public:
 	TermView(BRect frame, const char *command = NULL, int32 historySize = 1000);
+	TermView(int rows, int columns, const char *command = NULL, int32 historySize = 1000);
 	TermView(BMessage *archive);	
 	~TermView();
 
 	static	BArchivable* Instantiate(BMessage* data);
 	virtual status_t Archive(BMessage* data, bool deep = true) const;
+	
 	virtual void GetPreferredSize(float *width, float *height);
 
-	status_t AttachShell(Shell *shell);
-	void	DetachShell();
-
 	const char *TerminalName() const;
 
 	void	SetTermFont(const BFont *halfFont, const BFont *fullFont);
 	void	GetFontSize(int *width, int *height);
 
-	BRect	SetTermSize(int rows, int cols, bool flag);
+	BRect	SetTermSize(int rows, int cols, bool resize);
 	void	SetTextColor(rgb_color fore, rgb_color back);
 	void	SetSelectColor(rgb_color fore, rgb_color back);
 	void	SetCursorColor(rgb_color fore, rgb_color back);
@@ -60,6 +59,8 @@
 	void	SetScrollBar(BScrollBar *scrbar);
 	BScrollBar  *ScrollBar() const { return fScrollBar; };
 
+	void	SetTitle(const char *title);
+	
 	// Output Charactor
 	void	PutChar(uchar *string, ushort attr, int width);
 	void	PutCR(void);
@@ -135,6 +136,9 @@
 	status_t _InitObject(const char *command);
 	status_t _InitMouseThread(void);
 
+	status_t _AttachShell(Shell *shell);
+	void _DetachShell();
+
 	void _AboutRequested();
 
 	void _DrawLines(int , int, ushort, uchar *, int, int, int, BView *);

Modified: haiku/trunk/src/apps/terminal/TermWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-03 01:28:21 UTC (rev 21807)
+++ haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-03 09:59:30 UTC (rev 21808)
@@ -33,8 +33,6 @@
 #include <ScrollBar.h>
 #include <ScrollView.h>
 #include <String.h>
-#include <TextControl.h>
-#include <WindowScreen.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -60,9 +58,7 @@
 	fEditmenu(NULL),
 	fEncodingmenu(NULL),
 	fHelpmenu(NULL),
-	fFontMenu(NULL),
 	fWindowSizeMenu(NULL),
-	fNewFontMenu(NULL),
 	fPrintSettings(NULL),
 	fPrefWindow(NULL),
 	fFindPanel(NULL),
@@ -181,28 +177,11 @@
 	fWindowSizeMenu->AddItem(new BMenuItem("132x25", new BMessage(ONETHREETWOTWENTYFIVE))); 
 	fWindowSizeMenu->AddItem(new BMenuItem("Fullscreen", new BMessage(FULLSCREEN), B_ENTER)); 
 
- 	// Considering we have this in the preferences window, this menu is not
- 	// needed and should not be shown if we are to not confuse the user
-/*  fNewFontMenu = new BMenu("Font");
-	fNewFontMenu->SetRadioMode(true);
-		int32 numFamilies1 = count_font_families();
-		for ( int32 i = 0; i < numFamilies1; i++ ) {
-			font_family family;
-			uint32 flags;
-			if ( get_font_family(i, &family, &flags) == B_OK ) {
-				fNewFontMenu->AddItem(item = new BMenuItem(family, new BMessage(MSG_FONT_CHANGED)));
-			//	if (0 ==i) item->SetMarked(true); 
-			}
-		}
-  fNewFontMenu->FindItem (PrefHandler::Default()->getString(PREF_HALF_FONT_FAMILY))->SetMarked(true);
-*/
-
 	fEncodingmenu = new BMenu("Font Encoding");
 	fEncodingmenu->SetRadioMode(true);
 	MakeEncodingMenu(fEncodingmenu, true);
 	fHelpmenu->AddItem(fWindowSizeMenu);  
 	fHelpmenu->AddItem(fEncodingmenu);
-//  fHelpmenu->AddItem(fNewFontMenu);
 	fHelpmenu->AddSeparatorItem();
 	fHelpmenu->AddItem(new BMenuItem("Preferences" B_UTF8_ELLIPSIS, new BMessage(MENU_PREF_OPEN)));
 	fHelpmenu->AddSeparatorItem();
@@ -427,7 +406,6 @@
 			break;	
 		}
 		case MSG_FONT_CHANGED: {
-	    		PrefHandler::Default()->setString (PREF_HALF_FONT_FAMILY, fNewFontMenu->FindMarked()->Label());
 	    		PostMessage(MSG_HALF_FONT_CHANGED);
 			break;
 		}
@@ -473,6 +451,9 @@
 bool
 TermWindow::QuitRequested()
 {
+	// TODO: Intercept the B_QUIT_REQUESTED message
+	// sent by the TermView, and only close one tab if there
+	// are multiple ones ? Or handle the case inside TermView itself ?
 	be_app->PostMessage(B_QUIT_REQUESTED);
 	return true;
 }
@@ -577,7 +558,9 @@
 	fullFont.SetSpacing(B_FIXED_SPACING);
 
 	// Make Terminal text view.
-	TermView *view = new TermView(BRect(0, 0, 10, 10), command);
+	TermView *view = new TermView(PrefHandler::Default()->getInt32(PREF_ROWS),
+					PrefHandler::Default()->getInt32(PREF_COLS),
+					command);
 	
 	BScrollView *scrollView = new BScrollView("scrollView", view, B_FOLLOW_ALL,
 					B_WILL_DRAW|B_FRAME_EVENTS, false, true);	
@@ -592,10 +575,6 @@
 	
 	_SetTermColors();
 	
-	BRect rect = view->SetTermSize(PrefHandler::Default()->getInt32(PREF_ROWS),
-					PrefHandler::Default()->getInt32(PREF_COLS), false);
-
-	
 	// If it's the first time we're called, setup the window
 	if (fTabView->CountTabs() == 1) {
 		int width, height;
@@ -603,12 +582,11 @@
 		SetSizeLimits(MIN_COLS * width, MAX_COLS * width,
 			MIN_COLS * height, MAX_COLS * height);
 	
-		// Add offset to baseview.
-		rect.InsetBy(-kViewOffset, -kViewOffset);
-	
+		float fWidth, fHeight;
+		view->GetPreferredSize(&fWidth, &fHeight);
+		
 		// Resize Window
-		ResizeTo(rect.Width()+ B_V_SCROLL_BAR_WIDTH,
-			rect.Height() + fMenubar->Bounds().Height());
+		ResizeTo(fWidth + B_V_SCROLL_BAR_WIDTH, fHeight + fMenubar->Bounds().Height());
 
 		// TODO: If I don't do this, the view won't show up.
 		// Bug in BTabView or in my code ?

Modified: haiku/trunk/src/apps/terminal/TermWindow.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.h	2007-08-03 01:28:21 UTC (rev 21807)
+++ haiku/trunk/src/apps/terminal/TermWindow.h	2007-08-03 09:59:30 UTC (rev 21808)
@@ -69,9 +69,7 @@
 			*fEditmenu,
 			*fEncodingmenu,
 			*fHelpmenu,
-			*fFontMenu,
-			*fWindowSizeMenu,
-			*fNewFontMenu; 
+			*fWindowSizeMenu;
 
 	BMessage	*fPrintSettings;
 	PrefWindow	*fPrefWindow;



From jackburton at mail.berlios.de  Fri Aug  3 12:47:37 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Fri, 3 Aug 2007 12:47:37 +0200
Subject: [Haiku-commits] r21809 - haiku/trunk/src/apps/terminal
Message-ID: <200708031047.l73AlbXC031776@sheep.berlios.de>

Author: jackburton
Date: 2007-08-03 12:47:27 +0200 (Fri, 03 Aug 2007)
New Revision: 21809
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21809&view=rev

Modified:
   haiku/trunk/src/apps/terminal/Shell.cpp
Log:
In case the user supplied a wrong commandline, the Terminal didn't launch 
the shell as the code would seem to do. I've disabled showing the Alert, 
since system() doesn't return the return value of "alert".


Modified: haiku/trunk/src/apps/terminal/Shell.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/Shell.cpp	2007-08-03 09:59:30 UTC (rev 21808)
+++ haiku/trunk/src/apps/terminal/Shell.cpp	2007-08-03 10:47:27 UTC (rev 21809)
@@ -557,14 +557,17 @@
 		 * Exec failed.
 		 */
 		sleep(1);
-		const char *spawnAlertMessage = "alert --stop "
+		/*const char *spawnAlertMessage = "alert --stop "
 						"'Cannot execute \"%s\":\n"
-						"\t%s\n'"
+						"\t%s' "
 						"'Use Default Shell' 'Abort'";
 		char errorMessage[256];
 		snprintf(errorMessage, sizeof(errorMessage), spawnAlertMessage, commandLine, strerror(errno));
 
-		if (system(errorMessage) == 0)
+		// TODO: I'm not sure that system should return the return value of alert.
+		// At least, it's not doing that right now.
+		int returnValue = system(errorMessage);
+		if (returnValue == 0)*/
 			execl("/bin/sh", "/bin/sh", "-login", NULL);
 
 		exit(1);



From korli at mail.berlios.de  Fri Aug  3 20:13:56 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Fri, 3 Aug 2007 20:13:56 +0200
Subject: [Haiku-commits] r21810 - in haiku/trunk: headers/posix
	src/system/libroot/posix/unistd
Message-ID: <200708031813.l73IDuUT031623@sheep.berlios.de>

Author: korli
Date: 2007-08-03 20:13:55 +0200 (Fri, 03 Aug 2007)
New Revision: 21810
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21810&view=rev

Modified:
   haiku/trunk/headers/posix/unistd.h
   haiku/trunk/src/system/libroot/posix/unistd/conf.c
Log:
added an empty implementation of confstr()


Modified: haiku/trunk/headers/posix/unistd.h
===================================================================
--- haiku/trunk/headers/posix/unistd.h	2007-08-03 10:47:27 UTC (rev 21809)
+++ haiku/trunk/headers/posix/unistd.h	2007-08-03 18:13:55 UTC (rev 21810)
@@ -111,6 +111,7 @@
 extern long		sysconf(int name);
 extern long		fpathconf(int fd, int name);
 extern long		pathconf(const char *path, int name);
+extern size_t		confstr(int name, char *buf, size_t len);
 
 /* process functions */
 extern pid_t	fork(void);

Modified: haiku/trunk/src/system/libroot/posix/unistd/conf.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/unistd/conf.c	2007-08-03 10:47:27 UTC (rev 21809)
+++ haiku/trunk/src/system/libroot/posix/unistd/conf.c	2007-08-03 18:13:55 UTC (rev 21810)
@@ -100,3 +100,12 @@
 	return fpathconf(-1, name);
 }
 
+
+size_t 
+confstr(int name, char *buf, size_t len)
+{
+	// ToDo: find out what BeOS supports here
+	errno = EINVAL;
+	return 0;
+}
+



From korli at mail.berlios.de  Fri Aug  3 21:03:00 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Fri, 3 Aug 2007 21:03:00 +0200
Subject: [Haiku-commits] r21811 - haiku/trunk/headers/private/shared
Message-ID: <200708031903.l73J30xh001883@sheep.berlios.de>

Author: korli
Date: 2007-08-03 21:02:59 +0200 (Fri, 03 Aug 2007)
New Revision: 21811
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21811&view=rev

Modified:
   haiku/trunk/headers/private/shared/HashMap.h
Log:
to please gcc4


Modified: haiku/trunk/headers/private/shared/HashMap.h
===================================================================
--- haiku/trunk/headers/private/shared/HashMap.h	2007-08-03 18:13:55 UTC (rev 21810)
+++ haiku/trunk/headers/private/shared/HashMap.h	2007-08-03 19:02:59 UTC (rev 21811)
@@ -192,8 +192,8 @@
 template<typename Key, typename Value>
 class SynchronizedHashMap : public BLocker {
 public:
-	typedef HashMap<Key, Value>::Entry Entry;
-	typedef HashMap<Key, Value>::Iterator Iterator;
+	typedef struct HashMap<Key, Value>::Entry Entry;
+	typedef struct HashMap<Key, Value>::Iterator Iterator;
 
 	SynchronizedHashMap() : BLocker("synchronized hash map")	{}
 	~SynchronizedHashMap()	{ Lock(); }
@@ -422,7 +422,7 @@
 
 // GetIterator
 template<typename Key, typename Value>
-HashMap<Key, Value>::Iterator
+struct HashMap<Key, Value>::Iterator
 HashMap<Key, Value>::GetIterator() const
 {
 	return Iterator(this);
@@ -430,7 +430,7 @@
 
 // _FindElement
 template<typename Key, typename Value>
-HashMap<Key, Value>::Element *
+struct HashMap<Key, Value>::Element *
 HashMap<Key, Value>::_FindElement(const Key& key) const
 {
 	Element* element = fTable.FindFirst(key.GetHashCode());



From korli at mail.berlios.de  Fri Aug  3 21:03:32 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Fri, 3 Aug 2007 21:03:32 +0200
Subject: [Haiku-commits] r21812 - haiku/trunk/src/preferences/media
Message-ID: <200708031903.l73J3Wst001936@sheep.berlios.de>

Author: korli
Date: 2007-08-03 21:03:31 +0200 (Fri, 03 Aug 2007)
New Revision: 21812
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21812&view=rev

Modified:
   haiku/trunk/src/preferences/media/Jamfile
Log:
logic was inversed


Modified: haiku/trunk/src/preferences/media/Jamfile
===================================================================
--- haiku/trunk/src/preferences/media/Jamfile	2007-08-03 19:02:59 UTC (rev 21811)
+++ haiku/trunk/src/preferences/media/Jamfile	2007-08-03 19:03:31 UTC (rev 21812)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	SubDirC++Flags -fmultiple-symbol-spaces ;
 }
 



From bonefish at cs.tu-berlin.de  Fri Aug  3 21:25:31 2007
From: bonefish at cs.tu-berlin.de (Ingo Weinhold)
Date: Fri, 03 Aug 2007 21:25:31 +0200
Subject: [Haiku-commits] r21812 - haiku/trunk/src/preferences/media
In-Reply-To: <200708031903.l73J3Wst001936@sheep.berlios.de>
References: <200708031903.l73J3Wst001936@sheep.berlios.de>
Message-ID: <20070803212531.750.2@cs.tu-berlin.de>


On 2007-08-03 at 21:03:32 [+0200], korli at BerliOS <korli at mail.berlios.de> 
wrote:
> Author: korli
> Date: 2007-08-03 21:03:31 +0200 (Fri, 03 Aug 2007)
> New Revision: 21812
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21812&view=rev
> 
> Modified:
>    haiku/trunk/src/preferences/media/Jamfile
> Log:
> logic was inversed
> 
> 
> Modified: haiku/trunk/src/preferences/media/Jamfile
> ===================================================================
> --- haiku/trunk/src/preferences/media/Jamfile    2007-08-03 19:02:59 UTC 
> (rev 21811)
> +++ haiku/trunk/src/preferences/media/Jamfile    2007-08-03 19:03:31 UTC 
> (rev 21812)
> @@ -2,7 +2,7 @@
>  
>  SetSubDirSupportedPlatformsBeOSCompatible ;
>  
> -if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
> +if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
>      SubDirC++Flags -fmultiple-symbol-spaces ;
>  }

Oh, that reminds me: Why is it there anyway?

CU, Ingo


From jackburton at mail.berlios.de  Fri Aug  3 22:41:05 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Fri, 3 Aug 2007 22:41:05 +0200
Subject: [Haiku-commits] r21813 - haiku/trunk/src/apps/terminal
Message-ID: <200708032041.l73Kf5Vb006553@sheep.berlios.de>

Author: jackburton
Date: 2007-08-03 22:41:04 +0200 (Fri, 03 Aug 2007)
New Revision: 21813
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21813&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermView.cpp
   haiku/trunk/src/apps/terminal/TermView.h
   haiku/trunk/src/apps/terminal/TermWindow.cpp
Log:
Made some TermView functions (Paste, Copy, etc) public. Made 
SetTitle and NotifyQuit virtual. TermWindow now uses a TermView 
subclass which closes the tab on NotifyQuit. Enabled tabbed 
terminal. There are still some small glitches, most probably related
 to BTabView bugs ?



Modified: haiku/trunk/src/apps/terminal/TermView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-03 19:03:31 UTC (rev 21812)
+++ haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-03 20:41:04 UTC (rev 21813)
@@ -132,7 +132,8 @@
 
 
 TermView::TermView(BRect frame, const char *command, int32 historySize)
-	: BView(frame, "termview", B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS | B_PULSE_NEEDED),
+	: BView(frame, "termview", B_FOLLOW_ALL,
+		B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE| B_PULSE_NEEDED),
 	fShell(NULL),
 	fFontWidth(0),
 	fFontHeight(0),
@@ -180,7 +181,8 @@
 
 
 TermView::TermView(int rows, int columns, const char *command, int32 historySize)
-	: BView(BRect(0, 0, 0, 0), "termview", B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS | B_PULSE_NEEDED),
+	: BView(BRect(0, 0, 0, 0), "termview", B_FOLLOW_ALL,
+		B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE| B_PULSE_NEEDED),
 	fShell(NULL),
 	fFontWidth(0),
 	fFontHeight(0),
@@ -408,8 +410,6 @@
 	if (resize)
 		ResizeTo(fTermColumns * fFontWidth - 1, fTermRows * fFontHeight -1);
 
-	Invalidate();
-
 	return rect;
 }
 
@@ -524,6 +524,104 @@
 }
 
 
+void
+TermView::Copy(BClipboard *clipboard)
+{
+	if (!_HasSelection())
+		return;
+
+	BString copyStr;
+	fTextBuffer->GetStringFromRegion(copyStr, fSelStart, fSelEnd);
+
+	if (clipboard->Lock()) {
+		BMessage *clipMsg = NULL;
+		clipboard->Clear();
+
+		if ((clipMsg = clipboard->Data()) != NULL) {
+			clipMsg->AddData("text/plain", B_MIME_TYPE, copyStr.String(),
+				copyStr.Length());
+			clipboard->Commit();
+		}
+		clipboard->Unlock();
+	}
+
+	// Deselecting the current selection is not the behavior that
+	// R5's Terminal app displays. We want to mimic the behavior, so we will
+	// no longer do the deselection
+//	if (!fMouseTracking)
+//		_DeSelect();
+}
+
+
+void
+TermView::Paste(BClipboard *clipboard)
+{
+	if (clipboard->Lock()) {
+		BMessage *clipMsg = clipboard->Data();
+		char *text;
+		ssize_t numBytes;
+		if (clipMsg->FindData("text/plain", B_MIME_TYPE,
+				(const void **)&text, &numBytes) == B_OK ) {
+			// Clipboard text doesn't attached EOF?
+			text[numBytes] = '\0';
+			_WritePTY((uchar *)text, numBytes);
+		}
+
+		clipboard->Unlock();
+	}
+}
+
+
+void
+TermView::SelectAll()
+{
+	int screen_top = fTop / fFontHeight;
+	int viewheight = fTermRows;
+	
+	int start_pos = screen_top -(fScrBufSize - viewheight * 2);
+	
+	CurPos start, end;
+	start.x = 0;
+	end.x = fTermColumns -1;
+	
+	if (start_pos > 0)
+		start.y = start_pos;
+	else
+		start.y = 0;
+	
+	end.y = fCurPos.y  + screen_top;
+	
+	_Select(start, end);
+}
+
+
+void
+TermView::Clear()
+{
+	_DeSelect();
+	fTextBuffer->Clear();
+	
+	fTop = 0;
+	ScrollTo(0, 0);
+	
+	if (LockLooper()) {
+		SetHighColor(fTextBackColor);
+		
+		FillRect(Bounds());
+		SetHighColor(fTextForeColor);
+		UnlockLooper();
+	}
+	
+	// reset cursor pos
+	SetCurPos(0, 0);
+	
+	if (fScrollBar) {	
+		fScrollBar->SetRange(0, 0);
+		fScrollBar->SetProportion(1);
+	}
+}
+
+
 //! Print one character
 void
 TermView::PutChar(uchar *string, ushort attr, int width)
@@ -1692,9 +1790,6 @@
 	fTermColumns = cols;
 
 	fFrameResized = true;
-	
-	// TODO: Fix this	
-	Invalidate();
 }
 
 
@@ -1743,19 +1838,19 @@
 		}
 
 		case B_COPY:
-			_DoCopy();
+			Copy(be_clipboard);
 			break;
 
 		case B_PASTE:
 		{
 			int32 code;
 			if (msg->FindInt32("index", &code) == B_OK)
-				_DoPaste();
+				Paste(be_clipboard);
 			break;
 		}
 
 		case B_SELECT_ALL:
-			_DoSelectAll();
+			SelectAll();
 			break;
 		
 		case B_SET_PROPERTY:
@@ -1794,7 +1889,7 @@
 		}
 	
 		case MENU_CLEAR_ALL:
-			_DoClearAll();
+			Clear();
 			fShell->Write(ctrl_l, 1);
 			break;
 
@@ -1867,110 +1962,6 @@
 }
 
 
-//! Copy selected text to Clipboard.
-void 
-TermView::_DoCopy()
-{
-	if (!_HasSelection())
-		return;
-
-	BString copyStr;
-	fTextBuffer->GetStringFromRegion(copyStr, fSelStart, fSelEnd);
-
-	if (be_clipboard->Lock()) {
-		BMessage *clipMsg = NULL;
-		be_clipboard->Clear();
-
-		if ((clipMsg = be_clipboard->Data()) != NULL) {
-			clipMsg->AddData("text/plain", B_MIME_TYPE, copyStr.String(),
-				copyStr.Length());
-			be_clipboard->Commit();
-		}
-		be_clipboard->Unlock();
-	}
-
-	// Deselecting the current selection is not the behavior that
-	// R5's Terminal app displays. We want to mimic the behavior, so we will
-	// no longer do the deselection
-//	if (!fMouseTracking)
-//		_DeSelect();
-}
-
-
-//! Paste clipboard text at cursor position.
-void 
-TermView::_DoPaste()
-{
-	if (be_clipboard->Lock()) {
-		BMessage *clipMsg = be_clipboard->Data();
-		char *text;
-		ssize_t numBytes;
-		if (clipMsg->FindData("text/plain", B_MIME_TYPE,
-				(const void **)&text, &numBytes) == B_OK ) {
-			// Clipboard text doesn't attached EOF?
-			text[numBytes] = '\0';
-			_WritePTY((uchar *)text, numBytes);
-		}
-
-		be_clipboard->Unlock();
-	}
-}
-
-
-//! Select all displayed text and text /in buffer.
-void 
-TermView::_DoSelectAll(void)
-{
-	CurPos start, end;
-	int screen_top;
-	int viewheight, start_pos;
-	
-	screen_top = fTop / fFontHeight;
-	viewheight = fTermRows;
-	
-	start_pos = screen_top -(fScrBufSize - viewheight * 2);
-	
-	start.x = 0;
-	end.x = fTermColumns -1;
-	
-	if (start_pos > 0)
-		start.y = start_pos;
-	else
-		start.y = 0;
-	
-	end.y = fCurPos.y  + screen_top;
-	
-	_Select(start, end);
-}
-
-// Clear display and text buffer, then moves Cursorr at home position.
-void 
-TermView::_DoClearAll(void)
-{
-	_DeSelect();
-	fTextBuffer->Clear();
-	
-	fTop = 0;
-	ScrollTo(0, 0);
-	
-	if (LockLooper()) {
-		SetHighColor(fTextBackColor);
-		
-		FillRect(Bounds());
-		SetHighColor(fTextForeColor);
-		UnlockLooper();
-	}
-	
-	// reset cursor pos
-	SetCurPos(0, 0);
-	
-	if (fScrollBar) {	
-		fScrollBar->SetRange(0, 0);
-		fScrollBar->SetProportion(1);
-	}
-}
-
-
 /*!	Write strings to PTY device. If encoding system isn't UTF8, change
 	encoding to UTF8 before writing PTY.
 */
@@ -2009,7 +2000,7 @@
 			_WritePTY((uchar *)copy.String(), copy.Length());
 		} else {
 			// copy text from clipboard.
-			_DoPaste();
+			Paste(be_clipboard);
 		}
 		return;
 	}
@@ -2123,6 +2114,13 @@
 }
 
 
+void
+TermView::MouseUp(BPoint where)
+{
+	
+}
+
+
 // Select a range of text
 void
 TermView::_Select(CurPos start, CurPos end)

Modified: haiku/trunk/src/apps/terminal/TermView.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.h	2007-08-03 19:03:31 UTC (rev 21812)
+++ haiku/trunk/src/apps/terminal/TermView.h	2007-08-03 20:41:04 UTC (rev 21813)
@@ -24,8 +24,8 @@
 #define CURON  1
 
 
+class BClipboard;
 class BMessageRunner;
-class BPopUpMenu;
 class BScrollBar;
 class BString;
 class Shell;
@@ -59,7 +59,14 @@
 	void	SetScrollBar(BScrollBar *scrbar);
 	BScrollBar  *ScrollBar() const { return fScrollBar; };
 
-	void	SetTitle(const char *title);
+	virtual void	SetTitle(const char *title);
+	virtual void	NotifyQuit(int32 reason);
+
+	// edit functions
+	void	Copy(BClipboard *clipboard);	
+	void	Paste(BClipboard *clipboard);
+	void	SelectAll();
+	void	Clear();	
 	
 	// Output Charactor
 	void	PutChar(uchar *string, ushort attr, int width);
@@ -112,8 +119,6 @@
 	bool	Find(const BString &str, bool forwardSearch, bool matchCase, bool matchWord);
 	void	GetSelection(BString &str);
 
-	void	NotifyQuit(int32 reason);
-
 protected:
 	virtual void	AttachedToWindow();
 	virtual void	DetachedFromWindow();
@@ -121,8 +126,10 @@
 	virtual void	Draw(BRect updateRect);
 	virtual void	WindowActivated(bool active);
 	virtual void	KeyDown(const char*, int32);
+	
 	virtual void	MouseDown(BPoint where);
 	virtual void	MouseMoved(BPoint, uint32, const BMessage *);
+	virtual void	MouseUp(BPoint where);
 
 	virtual void	FrameResized(float width, float height);
 	virtual void	MessageReceived(BMessage* message);
@@ -151,12 +158,6 @@
 	void _ResizeScrBarRange (void);
 	void _DoFileDrop(entry_ref &ref);
 
-	// edit menu function.
-	void _DoCopy();
-	void _DoPaste();
-	void _DoSelectAll();
-	void _DoClearAll();
-
 	void _WritePTY(const uchar *text, int num_byteses);
 
 	// Comunicate Input Method 

Modified: haiku/trunk/src/apps/terminal/TermWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-03 19:03:31 UTC (rev 21812)
+++ haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-03 20:41:04 UTC (rev 21813)
@@ -22,6 +22,7 @@
 
 #include <Alert.h>
 #include <Application.h>
+#include <Clipboard.h>
 #include <Dragger.h>
 #include <Menu.h>
 #include <MenuBar.h>
@@ -49,7 +50,17 @@
 
 const static float kViewOffset = 3;
 const static uint32 kNewTab = 'NTab';
+const static uint32 kCloseView = 'ClVw';
 
+
+class CustomTermView : public TermView {
+public:
+	CustomTermView(int32 rows, int32 columns, const char *command = NULL, int32 historySize = 1000);
+	virtual void NotifyQuit(int32 reason);
+	virtual void SetTitle(const char *title);
+};
+
+
 TermWindow::TermWindow(BRect frame, const char* title, const char *command)
 	: BWindow(frame, title, B_DOCUMENT_WINDOW, B_CURRENT_WORKSPACE|B_QUIT_ON_WINDOW_CLOSE),
 	fTabView(NULL),
@@ -135,10 +146,9 @@
 	fFilemenu->AddItem(new BMenuItem("Switch Terminals", new BMessage(MENU_SWITCH_TERM),'G'));
 	fFilemenu->AddItem(new BMenuItem("New Terminal" B_UTF8_ELLIPSIS, new BMessage(MENU_NEW_TERM), 'N'));
 	
-
 	// TODO: Tabs disabled until various problems are fixed.
 	// n. 1: calling "exit" from a tab closes the whole app.
-	//fFilemenu->AddItem(new BMenuItem("New Tab", new BMessage(kNewTab), 'T'));
+	fFilemenu->AddItem(new BMenuItem("New Tab", new BMessage(kNewTab), 'T'));
 	
 	fFilemenu->AddSeparatorItem();
 	fFilemenu->AddItem(new BMenuItem("Page Setup...", new BMessage(MENU_PAGE_SETUP)));
@@ -153,13 +163,13 @@
 	fEditmenu = new BMenu ("Edit");
 	fEditmenu->AddItem (new BMenuItem ("Copy", new BMessage (B_COPY),'C'));
 	fEditmenu->AddItem (new BMenuItem ("Paste", new BMessage (B_PASTE),'V'));
-	fEditmenu->AddSeparatorItem ();
+	fEditmenu->AddSeparatorItem();
 	fEditmenu->AddItem (new BMenuItem ("Select All", new BMessage (B_SELECT_ALL), 'A'));
 	fEditmenu->AddItem (new BMenuItem ("Clear All", new BMessage (MENU_CLEAR_ALL), 'L'));
-	fEditmenu->AddSeparatorItem ();
+	fEditmenu->AddSeparatorItem();
 	fEditmenu->AddItem (new BMenuItem ("Find" B_UTF8_ELLIPSIS, new BMessage (MENU_FIND_STRING),'F'));
 	fFindBackwardMenuItem = new BMenuItem ("Find Backward", new BMessage (MENU_FIND_BACKWARD), '[');
-	fEditmenu->AddItem (fFindBackwardMenuItem);
+	fEditmenu->AddItem(fFindBackwardMenuItem);
 	fFindBackwardMenuItem->SetEnabled(false);
 	fFindForwardMenuItem = new BMenuItem ("Find Forward", new BMessage (MENU_FIND_FORWARD), ']');
 	fEditmenu->AddItem (fFindForwardMenuItem);
@@ -202,6 +212,22 @@
 	bool findresult;
   
 	switch (message->what) {
+		case B_COPY:
+			_ActiveTermView()->Copy(be_clipboard);
+			break;
+		
+		case B_PASTE:
+			_ActiveTermView()->Paste(be_clipboard);
+			break;
+		
+		case B_SELECT_ALL:
+			_ActiveTermView()->SelectAll();
+			break;
+		
+		case MENU_CLEAR_ALL:
+			_ActiveTermView()->Clear();
+			break;	
+			
 		case MENU_SWITCH_TERM: {
 			be_app->PostMessage(MENU_SWITCH_TERM);
 			break;
@@ -210,6 +236,16 @@
 			_NewTab(NULL);
 			break;
 
+		case kCloseView:
+		{
+			// TODO: We assume that this message was sent from the current active tab.
+			// Since the implementation of BTabView uses AddChild/RemoveChild on the
+			// views, the current active tab is the only one who is attached, thus
+			// the only one which could send a message.
+			delete fTabView->RemoveTab(fTabView->Selection());
+			break;	
+		}
+
 		case MENU_NEW_TERM: {
 			app_info info;
 			be_app->GetAppInfo(&info);
@@ -558,7 +594,7 @@
 	fullFont.SetSpacing(B_FIXED_SPACING);
 
 	// Make Terminal text view.
-	TermView *view = new TermView(PrefHandler::Default()->getInt32(PREF_ROWS),
+	CustomTermView *view = new CustomTermView(PrefHandler::Default()->getInt32(PREF_ROWS),
 					PrefHandler::Default()->getInt32(PREF_COLS),
 					command);
 	
@@ -592,10 +628,6 @@
 		// Bug in BTabView or in my code ?
 		fTabView->Select(0);
 	}
-	
-	// TODO: How do I set this for the current active tab,
-	// every time a different tab is chosen ? 
-	fEditmenu->SetTargetForItems(view);
 }
 
 
@@ -608,3 +640,29 @@
 	return (TermView *)((BScrollView *)fTabView->ViewForTab(fTabView->Selection()))->Target();
 }
 
+
+// CustomTermView
+CustomTermView::CustomTermView(int32 rows, int32 columns, const char *command, int32 historySize)
+	:
+	TermView(rows, columns, command, historySize)
+{
+}
+
+
+void
+CustomTermView::NotifyQuit(int32 reason)
+{
+	if (Window()) {
+		BMessage message(kCloseView);
+		message.AddInt32("reason", reason);
+		Window()->PostMessage(&message);
+	}
+}
+
+
+void
+CustomTermView::SetTitle(const char *title)
+{
+	//Window()->SetTitle(title);
+}
+



From jackburton at mail.berlios.de  Fri Aug  3 22:50:45 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Fri, 3 Aug 2007 22:50:45 +0200
Subject: [Haiku-commits] r21814 - haiku/trunk/src/apps/terminal
Message-ID: <200708032050.l73Koj0j007056@sheep.berlios.de>

Author: jackburton
Date: 2007-08-03 22:50:41 +0200 (Fri, 03 Aug 2007)
New Revision: 21814
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21814&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermWindow.cpp
Log:
removed old comments

Modified: haiku/trunk/src/apps/terminal/TermWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-03 20:41:04 UTC (rev 21813)
+++ haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-03 20:50:41 UTC (rev 21814)
@@ -145,9 +145,6 @@
 	fFilemenu = new BMenu("Terminal");
 	fFilemenu->AddItem(new BMenuItem("Switch Terminals", new BMessage(MENU_SWITCH_TERM),'G'));
 	fFilemenu->AddItem(new BMenuItem("New Terminal" B_UTF8_ELLIPSIS, new BMessage(MENU_NEW_TERM), 'N'));
-	
-	// TODO: Tabs disabled until various problems are fixed.
-	// n. 1: calling "exit" from a tab closes the whole app.
 	fFilemenu->AddItem(new BMenuItem("New Tab", new BMessage(kNewTab), 'T'));
 	
 	fFilemenu->AddSeparatorItem();
@@ -487,11 +484,8 @@
 bool
 TermWindow::QuitRequested()
 {
-	// TODO: Intercept the B_QUIT_REQUESTED message
-	// sent by the TermView, and only close one tab if there
-	// are multiple ones ? Or handle the case inside TermView itself ?
 	be_app->PostMessage(B_QUIT_REQUESTED);
-	return true;
+	return BWindow::QuitRequested();
 }
 
 



From bonefish at mail.berlios.de  Sat Aug  4 02:24:15 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sat, 4 Aug 2007 02:24:15 +0200
Subject: [Haiku-commits] r21815 - haiku/trunk/src/system/kernel/cache
Message-ID: <200708040024.l740OFmf002703@sheep.berlios.de>

Author: bonefish
Date: 2007-08-04 02:24:13 +0200 (Sat, 04 Aug 2007)
New Revision: 21815
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21815&view=rev

Modified:
   haiku/trunk/src/system/kernel/cache/file_cache.cpp
Log:
Although probably not used ATM, cache_prefetch_vnode() should respect
busy pages.


Modified: haiku/trunk/src/system/kernel/cache/file_cache.cpp
===================================================================
--- haiku/trunk/src/system/kernel/cache/file_cache.cpp	2007-08-03 20:50:41 UTC (rev 21814)
+++ haiku/trunk/src/system/kernel/cache/file_cache.cpp	2007-08-04 00:24:13 UTC (rev 21815)
@@ -1112,6 +1112,15 @@
 	restart:
 		vm_page *page = vm_cache_lookup_page(cache, offset);
 		if (page != NULL) {
+			if (page->state == PAGE_STATE_BUSY) {
+				// if busy retry again a little later
+				mutex_unlock(&cache->lock);
+				snooze(20000);
+				mutex_lock(&cache->lock);
+
+				goto restart;
+			}
+
 			// it is, so let's satisfy in the first part of the request
 			if (lastOffset < offset) {
 				size_t requestSize = offset - lastOffset;



From bonefish at mail.berlios.de  Sat Aug  4 02:33:50 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sat, 4 Aug 2007 02:33:50 +0200
Subject: [Haiku-commits] r21816 - haiku/trunk/src/system/kernel/vm
Message-ID: <200708040033.l740XogJ003235@sheep.berlios.de>

Author: bonefish
Date: 2007-08-04 02:33:47 +0200 (Sat, 04 Aug 2007)
New Revision: 21816
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21816&view=rev

Modified:
   haiku/trunk/src/system/kernel/vm/vm.cpp
Log:
fault_find_page(): Fixed a race condition in case of reading the page
from the store into the top cache, which could lead to pages inserted
multiple times into the cache. We don't insert a dummy page in this case
anymore. Instead we mark a freshly allocated page busy and insert that
one. That's exactly the approach the file cache uses too. This does
probably make the whole dummy page special handling in the file cache
obsolete.


Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-04 00:24:13 UTC (rev 21815)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-04 00:33:47 UTC (rev 21816)
@@ -3239,59 +3239,56 @@
 
 		// The current cache does not contain the page we're looking for
 
-		// If we're at the top most cache, insert the dummy page here to keep other threads
-		// from faulting on the same address and chasing us up the cache chain
-		if (cache == topCache && dummyPage.state != PAGE_STATE_BUSY)
-			fault_insert_dummy_page(cache, dummyPage, cacheOffset);
-
 		// see if the vm_store has it
 		vm_store *store = cache->store;
-		if (store->ops->has_page != NULL && store->ops->has_page(store, cacheOffset)) {
-			size_t bytesRead;
-			iovec vec;
+		if (store->ops->has_page != NULL
+			&& store->ops->has_page(store, cacheOffset)) {
 
+			// insert a fresh page and mark it busy -- we're going to read it in
 			page = vm_page_allocate_page(PAGE_STATE_FREE);
+			page->state = PAGE_STATE_BUSY;
+			vm_cache_insert_page(cache, page, cacheOffset);
 
-			// we mark that page busy reading, so that the file cache can
-			// ignore us in case it works on the very same page
-			// (this is actually only needed if this is the topRefCache, but we
-			// do it anyway for simplicity's sake)
-			dummyPage.queue_next = page;
-			dummyPage.busy_reading = true;
-
 			mutex_unlock(&cache->lock);
 
-			map->ops->get_physical_page(page->physical_page_number * B_PAGE_SIZE,
+			// get a virtual address for the page
+			iovec vec;
+			map->ops->get_physical_page(
+				page->physical_page_number * B_PAGE_SIZE,
 				(addr_t *)&vec.iov_base, PHYSICAL_PAGE_CAN_WAIT);
-			vec.iov_len = bytesRead = B_PAGE_SIZE;
+			size_t bytesRead = vec.iov_len = B_PAGE_SIZE;
 
+			// read it in
 			status_t status = store->ops->read(store, cacheOffset, &vec, 1,
 				&bytesRead, false);
-			if (status < B_OK) {
-				// TODO: real error handling!
-				panic("reading from store %p (cache %p) returned: %s!\n",
-					store, cache, strerror(status));
-			}
+
 			map->ops->put_physical_page((addr_t)vec.iov_base);
 
 			mutex_lock(&cache->lock);
 
-			if (cache == topCache)
-				fault_remove_dummy_page(dummyPage, true);
+			if (status < B_OK) {
+				// on error remove and free the page
+				dprintf("reading page from store %p (cache %p) returned: %s!\n",
+					store, cache, strerror(status));
 
-			// We insert the queue_next here, because someone else could have
-			// replaced our page
-			vm_cache_insert_page(cache, dummyPage.queue_next, cacheOffset);
-
-			if (dummyPage.queue_next != page) {
-				// Indeed, the page got replaced by someone else - we can safely
-				// throw our page away now
+				vm_cache_remove_page(cache, page);
 				vm_page_set_state(page, PAGE_STATE_FREE);
-				page = dummyPage.queue_next;
+
+				return NULL;
 			}
+
+			// mark the page unbusy again
+			page->state = PAGE_STATE_ACTIVE;
+
 			break;
 		}
 
+		// If we're at the top most cache, insert the dummy page here to keep
+		// other threads from faulting on the same address and chasing us up the
+		// cache chain
+		if (cache == topCache && dummyPage.state != PAGE_STATE_BUSY)
+			fault_insert_dummy_page(cache, dummyPage, cacheOffset);
+
 		vm_cache *nextCache;
 		status_t status = fault_acquire_locked_source(cache, &nextCache);
 		if (status == B_BUSY) {



From bonefish at mail.berlios.de  Sat Aug  4 02:36:51 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sat, 4 Aug 2007 02:36:51 +0200
Subject: [Haiku-commits] r21817 - haiku/trunk/src/system/kernel/vm
Message-ID: <200708040036.l740apQR003370@sheep.berlios.de>

Author: bonefish
Date: 2007-08-04 02:36:50 +0200 (Sat, 04 Aug 2007)
New Revision: 21817
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21817&view=rev

Modified:
   haiku/trunk/src/system/kernel/vm/vm_cache.cpp
Log:
Paranoia: vm_cache_insert_page() does now check whether a page for the
offset of the page to insert is already in the cache. Revealed the bug
fixed with my previous commit.


Modified: haiku/trunk/src/system/kernel/vm/vm_cache.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm_cache.cpp	2007-08-04 00:33:47 UTC (rev 21816)
+++ haiku/trunk/src/system/kernel/vm/vm_cache.cpp	2007-08-04 00:36:50 UTC (rev 21817)
@@ -294,6 +294,18 @@
 	state = disable_interrupts();
 	acquire_spinlock(&sPageCacheTableLock);
 
+#if KDEBUG
+	struct page_lookup_key key;
+	key.offset = (uint32)(offset >> PAGE_SHIFT);
+	key.cache = cache;
+	vm_page* otherPage = (vm_page *)hash_lookup(sPageCacheTable, &key);
+	if (otherPage != NULL) {
+		panic("vm_cache_insert_page(): there's already page %p with cache "
+			"offset %lu in cache %p; inserting page %p", otherPage,
+			page->cache_offset, cache, page);
+	}
+#endif	// KDEBUG
+
 	hash_insert(sPageCacheTable, page);
 
 	release_spinlock(&sPageCacheTableLock);



From superstippi at gmx.de  Sat Aug  4 09:55:32 2007
From: superstippi at gmx.de (Stephan Assmus)
Date: Sat, 04 Aug 2007 09:55:32 +0200
Subject: [Haiku-commits] HaikuBuildCompatibility.h trouble
Message-ID: <20070804095532.1356.1@stippis2.1186210982.fake>

Hi,

after updating the Haiku tree on my ZETA box, it seems 
HaikuBuildCompatibility.h is no longer included when building the 
libbe_test tartet. I tried to investigate but couldn't find the source of 
the problem.

Best regards,
-Stephan


From superstippi at gmx.de  Sat Aug  4 12:16:31 2007
From: superstippi at gmx.de (Stephan Assmus)
Date: Sat, 04 Aug 2007 12:16:31 +0200
Subject: [Haiku-commits] HaikuBuildCompatibility.h trouble
In-Reply-To: <20070804095532.1356.1@stippis2.1186210982.fake>
References: <20070804095532.1356.1@stippis2.1186210982.fake>
Message-ID: <20070804121631.9957.3@stippis2.1186210982.fake>

Hi,

Stephan Assmus wrote (2007-08-04, 09:55:32 [+0200]):
> after updating the Haiku tree on my ZETA box, it seems 
> HaikuBuildCompatibility.h is no longer included when building the 
> libbe_test tartet. I tried to investigate but couldn't find the source of 
> the problem.

I've found what I need to change in order to build libbe_test on dano again:

build/jam/BuildSetup:

# TODO: Fix the naming!
-if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
+if $(TARGET_PLATFORM) = haiku {
	NETWORK_LIBS = network ;

[...]
# include the HaikuBuildCompatibility.h header and link against
# libhaikucompat.a.
  	 
-if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) && 
$(TARGET_PLATFORM_BEOS_COMPATIBLE) {
+if $(TARGET_PLATFORM) != haiku &&  $(TARGET_PLATFORM_BEOS_COMPATIBLE) {

I know these are not the "correct" fixes. libbe_test is 
TARGET_PLATFORM_HAIKU_COMPATIBLE because it is special cased in 
HelperRules, and that seems correct. I'm not sure if I compiled on R5 after 
r21802, so it may still work on R5, but I'm wondering if libbe_test defines 
should also depend more on the host platform. Like 
TARGET_PLATFORM_DANO_COMPATIBLE being defined when compiling libbe_test on 
Dano and TARGET_PLATFORM_BEOS_COMPATIBLE being defined when compiling it on 
R5. Don't know what to do about it.

Best regards,
-Stephan


From stippi at mail.berlios.de  Sat Aug  4 13:16:23 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sat, 4 Aug 2007 13:16:23 +0200
Subject: [Haiku-commits] r21818 - haiku/trunk/headers/os/interface
Message-ID: <200708041116.l74BGN7M007194@sheep.berlios.de>

Author: stippi
Date: 2007-08-04 13:16:22 +0200 (Sat, 04 Aug 2007)
New Revision: 21818
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21818&view=rev

Modified:
   haiku/trunk/headers/os/interface/Picture.h
Log:
* remove dos newlines


Modified: haiku/trunk/headers/os/interface/Picture.h
===================================================================
--- haiku/trunk/headers/os/interface/Picture.h	2007-08-04 00:36:50 UTC (rev 21817)
+++ haiku/trunk/headers/os/interface/Picture.h	2007-08-04 11:16:22 UTC (rev 21818)
@@ -1,105 +1,105 @@
-//------------------------------------------------------------------------------
-//	Copyright (c) 2001-2002, OpenBeOS
-//
-//	Permission is hereby granted, free of charge, to any person obtaining a
-//	copy of this software and associated documentation files (the "Software"),
-//	to deal in the Software without restriction, including without limitation
-//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
-//	and/or sell copies of the Software, and to permit persons to whom the
-//	Software is furnished to do so, subject to the following conditions:
-//
-//	The above copyright notice and this permission notice shall be included in
-//	all copies or substantial portions of the Software.
-//
-//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-//	DEALINGS IN THE SOFTWARE.
-//
-//	File Name:		Picture.h
-//	Author:			Marc Flerackers (mflerackers at androme.be)
-//	Description:	BPicture records a series of drawing instructions that can
-//                  be "replayed" later.
-//------------------------------------------------------------------------------
-
-#ifndef	_PICTURE_H
-#define	_PICTURE_H
-
-// Standard Includes -----------------------------------------------------------
-
-// System Includes -------------------------------------------------------------
-#include <BeBuild.h>
-#include <InterfaceDefs.h>
-#include <Rect.h>
-#include <Archivable.h>
-
-// Project Includes ------------------------------------------------------------
-
-// Local Includes --------------------------------------------------------------
-
-// Local Defines ---------------------------------------------------------------
-
-// Globals ---------------------------------------------------------------------
-
-class BView;
-struct _BPictureExtent_;
-
-// BPicture class --------------------------------------------------------------
-class BPicture : public BArchivable {
-public:
-							BPicture();
-							BPicture(const BPicture &original);
-							BPicture(BMessage *data);
-virtual						~BPicture();
-static	BArchivable			*Instantiate(BMessage *data);
-virtual	status_t			Archive(BMessage *data, bool deep = true) const;
-virtual	status_t			Perform(perform_code d, void *arg);
-
-		status_t			Play(void **callBackTable,
-								int32 tableEntries,
-								void *userData);
-
-		status_t			Flatten(BDataIO *stream);
-		status_t			Unflatten(BDataIO *stream);
-
-/*----- Private or reserved -----------------------------------------*/
-private:
-
-friend class BWindow;
-friend class BView;
-friend class BPrintJob;
-
-virtual	void				_ReservedPicture1();
-virtual	void				_ReservedPicture2();
-virtual	void				_ReservedPicture3();
-
-		BPicture			&operator=(const BPicture &);
-
-		void				init_data();
-		void				import_data(const void *data, int32 size, BPicture **subs, int32 subCount);
-		void				import_old_data(const void *data, int32 size);
-		void				set_token(int32 token);
-		bool				assert_local_copy();
-		bool				assert_old_local_copy();
-		bool				assert_server_copy();
-
-		/**Deprecated API**/
-							BPicture(const void *data, int32 size);
-		const void			*Data() const;
-		int32				DataSize() const;
-
-		void				usurp(BPicture *lameDuck);
-		BPicture			*step_down();
-
-		int32				token;
-		_BPictureExtent_	*extent;
-		BPicture			*usurped;
-		uint32				_reserved[3];
-};
-//------------------------------------------------------------------------------
-
-#endif // _PICTURE_H
+//------------------------------------------------------------------------------
+//	Copyright (c) 2001-2002, OpenBeOS
+//
+//	Permission is hereby granted, free of charge, to any person obtaining a
+//	copy of this software and associated documentation files (the "Software"),
+//	to deal in the Software without restriction, including without limitation
+//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
+//	and/or sell copies of the Software, and to permit persons to whom the
+//	Software is furnished to do so, subject to the following conditions:
+//
+//	The above copyright notice and this permission notice shall be included in
+//	all copies or substantial portions of the Software.
+//
+//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+//	DEALINGS IN THE SOFTWARE.
+//
+//	File Name:		Picture.h
+//	Author:			Marc Flerackers (mflerackers at androme.be)
+//	Description:	BPicture records a series of drawing instructions that can
+//                  be "replayed" later.
+//------------------------------------------------------------------------------
 
+#ifndef	_PICTURE_H
+#define	_PICTURE_H
+
+// Standard Includes -----------------------------------------------------------
+
+// System Includes -------------------------------------------------------------
+#include <BeBuild.h>
+#include <InterfaceDefs.h>
+#include <Rect.h>
+#include <Archivable.h>
+
+// Project Includes ------------------------------------------------------------
+
+// Local Includes --------------------------------------------------------------
+
+// Local Defines ---------------------------------------------------------------
+
+// Globals ---------------------------------------------------------------------
+
+class BView;
+struct _BPictureExtent_;
+
+// BPicture class --------------------------------------------------------------
+class BPicture : public BArchivable {
+public:
+							BPicture();
+							BPicture(const BPicture &original);
+							BPicture(BMessage *data);
+virtual						~BPicture();
+static	BArchivable			*Instantiate(BMessage *data);
+virtual	status_t			Archive(BMessage *data, bool deep = true) const;
+virtual	status_t			Perform(perform_code d, void *arg);
+
+		status_t			Play(void **callBackTable,
+								int32 tableEntries,
+								void *userData);
+
+		status_t			Flatten(BDataIO *stream);
+		status_t			Unflatten(BDataIO *stream);
+
+/*----- Private or reserved -----------------------------------------*/
+private:
+
+friend class BWindow;
+friend class BView;
+friend class BPrintJob;
+
+virtual	void				_ReservedPicture1();
+virtual	void				_ReservedPicture2();
+virtual	void				_ReservedPicture3();
+
+		BPicture			&operator=(const BPicture &);
+
+		void				init_data();
+		void				import_data(const void *data, int32 size, BPicture **subs, int32 subCount);
+		void				import_old_data(const void *data, int32 size);
+		void				set_token(int32 token);
+		bool				assert_local_copy();
+		bool				assert_old_local_copy();
+		bool				assert_server_copy();
+
+		/**Deprecated API**/
+							BPicture(const void *data, int32 size);
+		const void			*Data() const;
+		int32				DataSize() const;
+
+		void				usurp(BPicture *lameDuck);
+		BPicture			*step_down();
+
+		int32				token;
+		_BPictureExtent_	*extent;
+		BPicture			*usurped;
+		uint32				_reserved[3];
+};
+//------------------------------------------------------------------------------
+
+#endif // _PICTURE_H
+



From stippi at mail.berlios.de  Sat Aug  4 13:18:22 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sat, 4 Aug 2007 13:18:22 +0200
Subject: [Haiku-commits] r21819 - haiku/trunk/src/servers/app
Message-ID: <200708041118.l74BIMYd009861@sheep.berlios.de>

Author: stippi
Date: 2007-08-04 13:18:21 +0200 (Sat, 04 Aug 2007)
New Revision: 21819
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21819&view=rev

Modified:
   haiku/trunk/src/servers/app/DefaultDecorator.cpp
   haiku/trunk/src/servers/app/DefaultDecorator.h
Log:
* cache the tab highlight and shadow color


Modified: haiku/trunk/src/servers/app/DefaultDecorator.cpp
===================================================================
--- haiku/trunk/src/servers/app/DefaultDecorator.cpp	2007-08-04 11:16:22 UTC (rev 21818)
+++ haiku/trunk/src/servers/app/DefaultDecorator.cpp	2007-08-04 11:18:21 UTC (rev 21819)
@@ -905,12 +905,6 @@
 	if (!fTabRect.IsValid() || !invalid.Intersects(fTabRect))
 		return;
 
-	// TODO: cache these
-	RGBColor tabColorLight = RGBColor(tint_color(fTabColor.GetColor32(),
-												 (B_LIGHTEN_2_TINT + B_LIGHTEN_MAX_TINT) / 2));
-	RGBColor tabColorShadow = RGBColor(tint_color(fTabColor.GetColor32(),
-												  B_DARKEN_2_TINT));
-
 	// outer frame
 	fDrawingEngine->StrokeLine(fTabRect.LeftTop(), fTabRect.LeftBottom(), fFrameColors[0]);
 	fDrawingEngine->StrokeLine(fTabRect.LeftTop(), fTabRect.RightTop(), fFrameColors[0]);
@@ -922,17 +916,17 @@
 	// bevel
 	fDrawingEngine->StrokeLine(BPoint(fTabRect.left + 1, fTabRect.top + 1),
 		BPoint(fTabRect.left + 1, fTabRect.bottom - (fLook == kLeftTitledWindowLook ? 1 : 0)),
-		tabColorLight);
+		fTabColorLight);
 	fDrawingEngine->StrokeLine(BPoint(fTabRect.left + 1, fTabRect.top + 1),
 		BPoint(fTabRect.right - (fLook == kLeftTitledWindowLook ? 0 : 1), fTabRect.top + 1),
-		tabColorLight);
+		fTabColorLight);
 
 	if (fLook != kLeftTitledWindowLook) {
 		fDrawingEngine->StrokeLine(BPoint(fTabRect.right - 1, fTabRect.top + 2),
-			BPoint(fTabRect.right - 1, fTabRect.bottom), tabColorShadow);
+			BPoint(fTabRect.right - 1, fTabRect.bottom), fTabColorShadow);
 	} else {
 		fDrawingEngine->StrokeLine(BPoint(fTabRect.left + 2, fTabRect.bottom - 1),
-			BPoint(fTabRect.right, fTabRect.bottom - 1), tabColorShadow);
+			BPoint(fTabRect.right, fTabRect.bottom - 1), fTabColorShadow);
 	}
 
 	// fill
@@ -1045,6 +1039,11 @@
 //		fFrameColors[4].SetColor(152, 152, 152);
 //		fFrameColors[5].SetColor(96, 96, 96);
 	}
+
+	fTabColorLight = RGBColor(tint_color(fTabColor.GetColor32(),
+		(B_LIGHTEN_2_TINT + B_LIGHTEN_MAX_TINT) / 2));
+	fTabColorShadow = RGBColor(tint_color(fTabColor.GetColor32(),
+		B_DARKEN_2_TINT));
 }
 
 // _SetColors

Modified: haiku/trunk/src/servers/app/DefaultDecorator.h
===================================================================
--- haiku/trunk/src/servers/app/DefaultDecorator.h	2007-08-04 11:16:22 UTC (rev 21818)
+++ haiku/trunk/src/servers/app/DefaultDecorator.h	2007-08-04 11:18:21 UTC (rev 21819)
@@ -81,7 +81,9 @@
 			RGBColor			fButtonLowColor;
 			RGBColor			fTextColor;
 			RGBColor			fTabColor;
-	
+			RGBColor			fTabColorLight;
+			RGBColor			fTabColorShadow;
+
 			RGBColor*			fFrameColors;
 	
 			// Individual rects for handling window frame



From stippi at mail.berlios.de  Sat Aug  4 13:19:57 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sat, 4 Aug 2007 13:19:57 +0200
Subject: [Haiku-commits] r21820 - haiku/trunk/src/system/libroot/os
Message-ID: <200708041119.l74BJvg6010744@sheep.berlios.de>

Author: stippi
Date: 2007-08-04 13:19:56 +0200 (Sat, 04 Aug 2007)
New Revision: 21820
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21820&view=rev

Modified:
   haiku/trunk/src/system/libroot/os/scheduler.c
Log:
* if there is any app actually using suggest_thread_priority() it won't
  no longer use idle priority, even if an actual implementation is still
  missing


Modified: haiku/trunk/src/system/libroot/os/scheduler.c
===================================================================
--- haiku/trunk/src/system/libroot/os/scheduler.c	2007-08-04 11:18:21 UTC (rev 21819)
+++ haiku/trunk/src/system/libroot/os/scheduler.c	2007-08-04 11:19:56 UTC (rev 21820)
@@ -1,5 +1,5 @@
 /* 
-** Copyright 2004, J?r?me Duval, korli at users.sourceforge.net. All rights reserved.
+** Copyright 2004, J??r??me Duval, korli at users.sourceforge.net. All rights reserved.
 ** Distributed under the terms of the Haiku License.
 */
 
@@ -9,7 +9,7 @@
 int32 
 suggest_thread_priority(uint32 what, int32 period, bigtime_t jitter, bigtime_t length)
 {
-	return 0;
+	return 10;
 }
 
 bigtime_t 



From stippi at mail.berlios.de  Sat Aug  4 13:22:48 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sat, 4 Aug 2007 13:22:48 +0200
Subject: [Haiku-commits] r21821 - in haiku/trunk: headers/private/app
	src/kits/interface src/servers/app
Message-ID: <200708041122.l74BMmQm012087@sheep.berlios.de>

Author: stippi
Date: 2007-08-04 13:22:47 +0200 (Sat, 04 Aug 2007)
New Revision: 21821
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21821&view=rev

Modified:
   haiku/trunk/headers/private/app/ServerProtocol.h
   haiku/trunk/src/kits/interface/View.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
* use a different message code for DrawString() with escapement delta
  and DrawString() without
* this change also includes adding the penlocation to the shape to-screem
  coordinate conversion (temporarily breaks shape rendering, will be fixed
  in next commit)


Modified: haiku/trunk/headers/private/app/ServerProtocol.h
===================================================================
--- haiku/trunk/headers/private/app/ServerProtocol.h	2007-08-04 11:19:56 UTC (rev 21820)
+++ haiku/trunk/headers/private/app/ServerProtocol.h	2007-08-04 11:22:47 UTC (rev 21821)
@@ -213,6 +213,7 @@
 	AS_FILL_TRIANGLE,
 
 	AS_DRAW_STRING,
+	AS_DRAW_STRING_WITH_DELTA,
 
 	AS_SYNC,
 

Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2007-08-04 11:19:56 UTC (rev 21820)
+++ haiku/trunk/src/kits/interface/View.cpp	2007-08-04 11:22:47 UTC (rev 21821)
@@ -2424,21 +2424,17 @@
 	if (fOwner) {
 		check_lock();
 
-		fOwner->fLink->StartMessage(AS_DRAW_STRING);
+		// quite often delta will be NULL
+		if (delta)
+			fOwner->fLink->StartMessage(AS_DRAW_STRING_WITH_DELTA);
+		else
+			fOwner->fLink->StartMessage(AS_DRAW_STRING);
 		fOwner->fLink->Attach<int32>(length);
 		fOwner->fLink->Attach<BPoint>(location);
 
-		// Quite often delta will be NULL, so we have to accomodate this.
 		if (delta)
 			fOwner->fLink->Attach<escapement_delta>(*delta);
-		else {
-			escapement_delta tdelta;
-			tdelta.space = 0;
-			tdelta.nonspace = 0;
 
-			fOwner->fLink->Attach<escapement_delta>(tdelta);
-		}
-
 		fOwner->fLink->AttachString(string, length);
 
 		_FlushIfNotInTransaction();

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-04 11:19:56 UTC (rev 21820)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-04 11:22:47 UTC (rev 21821)
@@ -2241,8 +2241,13 @@
 			if (link.Read(opList, opCount * sizeof(uint32)) >= B_OK &&
 				link.Read(ptList, ptCount * sizeof(BPoint)) >= B_OK) {
 
-				for (int32 i = 0; i < ptCount; i++)
+				// this might seem a bit weird, but under R5, the shapes
+				// are always offset by the current pen location
+				BPoint penLocation = fCurrentLayer->CurrentState()->PenLocation();
+				for (int32 i = 0; i < ptCount; i++) {
+					ptList[i] += penLocation;
 					fCurrentLayer->ConvertToScreenForDrawing(&ptList[i]);
+				}
 
 				drawingEngine->DrawShape(shapeFrame, opCount, opList, ptCount, ptList,
 					code == AS_FILL_SHAPE);
@@ -2296,27 +2301,31 @@
 			break;
 		}
 		case AS_DRAW_STRING:
+		case AS_DRAW_STRING_WITH_DELTA:
 		{
 			DTRACE(("ServerWindow %s: Message AS_DRAW_STRING\n", Title()));
 			char* string;
 			int32 length;
 			BPoint location;
-			escapement_delta delta;
+			escapement_delta _delta;
+			escapement_delta* delta = NULL;
 
 			link.Read<int32>(&length);
 			link.Read<BPoint>(&location);
-			link.Read<escapement_delta>(&delta);
+			if (code == AS_DRAW_STRING_WITH_DELTA) {
+				link.Read<escapement_delta>(&_delta);
+				if (_delta.nonspace != 0.0 || _delta.space != 0.0)
+					delta = &_delta;
+			}
 			link.ReadString(&string);
 
+
 			fCurrentLayer->ConvertToScreenForDrawing(&location);
 			BPoint penLocation = drawingEngine->DrawString(string, length,
-				location, &delta);
+				location, delta);
 
 			fCurrentLayer->ConvertFromScreenForDrawing(&penLocation);
 			fCurrentLayer->CurrentState()->SetPenLocation(penLocation);
-			// pen location has changed, update DrawingEngine
-			// TODO: optimize with flags
-			_UpdateDrawState(fCurrentLayer);
 
 			free(string);
 			break;



From stippi at mail.berlios.de  Sat Aug  4 13:37:17 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sat, 4 Aug 2007 13:37:17 +0200
Subject: [Haiku-commits] r21822 - in haiku/trunk/src/servers/app: . drawing
	drawing/Painter
Message-ID: <200708041137.l74BbHtl001700@sheep.berlios.de>

Author: stippi
Date: 2007-08-04 13:37:16 +0200 (Sat, 04 Aug 2007)
New Revision: 21822
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21822&view=rev

Modified:
   haiku/trunk/src/servers/app/FontCache.cpp
   haiku/trunk/src/servers/app/FontCacheEntry.cpp
   haiku/trunk/src/servers/app/GlyphLayoutEngine.h
   haiku/trunk/src/servers/app/ProfileMessageSupport.cpp
   haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
   haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.cpp
   haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.h
   haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp
   haiku/trunk/src/servers/app/drawing/Painter/Painter.h
Log:
* after my last changes to font rendering, it was about 15% slower than
  before (although there should be much less lock contention)
* with this change, there is quite a bit of cleanup, text drawing is now
  about 20% faster than before the original changes to font caching,
  mostly due to turning off the kerning feature, which at the moment
  gives absolutely no benefit. The correct way of doing it might be to
  use kerning depending on the provided glyph spacing mode
* removed fPenLocation from Painter, the usage should be more correct now,
  since it is now consistently applied before the coordinate transformation
  from view to screen (also for DrawShape() now, before any view scaling
  and origin offset)
* Painter no longer has it's own instance of a ServerFont, instead it uses
  its AGGTextRenderer instance, which was per Painter again after the
  last change, and not global anymore, made _UpdateFont() useless
* When using GlyphLayoutEngine, it supports a second pass with the same
  FontCacheEntry through the introduction of a FontCacheReference. This
  speeds up DrawString a little, since it needs to calculate the bounding
  box for the string, and then draw the string in a second pass. This is
  now done with only one FontCacheEntry lookup
* I also tried to optimize the on-the-fly conversion of UTF8->CharCode away,
  since it was done four times per DrawString, but surprisingly, it proofed
  to be a slight slowdown.
* introduced a shortcut in DrawingEngine::DrawString() which avoids
  calculating the bounding box, we are now a tiny bit faster to figure
  out that we don't need to draw any string than Dano

In the test environment (drawing to offscreen bitmap and blitting to
screen eventually), text rendering is now about 3.7 times _faster_ than Dano
text rendering (directly to screen), for untransformed text. Unfortunately
I cannot test on the same machine in accelerant using version of the test
environment.


Modified: haiku/trunk/src/servers/app/FontCache.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontCache.cpp	2007-08-04 11:22:47 UTC (rev 21821)
+++ haiku/trunk/src/servers/app/FontCache.cpp	2007-08-04 11:37:16 UTC (rev 21822)
@@ -48,7 +48,7 @@
 	return &sDefaultInstance;
 }
 
-// SetFont
+// FontCacheEntryFor
 FontCacheEntry*
 FontCache::FontCacheEntryFor(const ServerFont& font)
 {
@@ -62,6 +62,7 @@
 	if (entry) {
 		// the entry was already there
 		entry->AddReference();
+//printf("FontCacheEntryFor(%ld): %p\n", font.GetFamilyAndStyle(), entry);
 		return entry;
 	}
 
@@ -91,6 +92,7 @@
 			return NULL;
 		}
 	}
+//printf("FontCacheEntryFor(%ld): %p (insert)\n", font.GetFamilyAndStyle(), entry);
 
 	entry->AddReference();
 	return entry;
@@ -100,6 +102,7 @@
 void
 FontCache::Recycle(FontCacheEntry* entry)
 {
+//printf("Recycle(%p)\n", entry);
 	entry->UpdateUsage();
 	entry->RemoveReference();
 }

Modified: haiku/trunk/src/servers/app/FontCacheEntry.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontCacheEntry.cpp	2007-08-04 11:22:47 UTC (rev 21821)
+++ haiku/trunk/src/servers/app/FontCacheEntry.cpp	2007-08-04 11:37:16 UTC (rev 21822)
@@ -212,8 +212,11 @@
 FontCacheEntry::GenerateSignature(char* signature, const ServerFont& font)
 {
 	glyph_rendering renderingType = glyph_ren_native_gray8;
-	if (font.Rotation() != 0.0 || font.Shear() != 90.0)
+	if (font.Rotation() != 0.0 || font.Shear() != 90.0
+		|| font.Flags() & B_DISABLE_ANTIALIASING
+		|| font.Size() > 30) {
 		renderingType = glyph_ren_outline;
+	}
 
 	// TODO: read more of these from the font
 	FT_Encoding charMap = FT_ENCODING_NONE;

Modified: haiku/trunk/src/servers/app/GlyphLayoutEngine.h
===================================================================
--- haiku/trunk/src/servers/app/GlyphLayoutEngine.h	2007-08-04 11:22:47 UTC (rev 21821)
+++ haiku/trunk/src/servers/app/GlyphLayoutEngine.h	2007-08-04 11:37:16 UTC (rev 21822)
@@ -16,6 +16,42 @@
 #include "ServerFont.h"
 
 
+class FontCacheReference {
+ public:
+								FontCacheReference()
+									: fCacheEntry(NULL)
+									, fWriteLocked(false)
+								{
+								}
+								~FontCacheReference()
+								{
+									if (fCacheEntry) {
+										if (fWriteLocked)
+											fCacheEntry->WriteUnlock();
+										else
+											fCacheEntry->ReadUnlock();
+									
+										FontCache::Default()->Recycle(
+											fCacheEntry);
+									}
+								}
+			void				SetTo(FontCacheEntry* entry,
+									bool writeLocked)
+								{
+									fCacheEntry = entry;
+									fWriteLocked = writeLocked;
+								}
+	inline	FontCacheEntry*		Entry() const
+									{ return fCacheEntry; }
+	inline	bool				WriteLocked() const
+									{ return fWriteLocked; }
+
+ private:
+			FontCacheEntry*		fCacheEntry;
+			bool				fWriteLocked;
+};
+
+
 class GlyphLayoutEngine {
  public:
 
@@ -26,7 +62,8 @@
 									int32 length,
 									const escapement_delta* delta = NULL,
 									bool kerning = true,
-									uint8 spacing = B_BITMAP_SPACING);
+									uint8 spacing = B_BITMAP_SPACING,
+									FontCacheReference* cacheReference = NULL);
 
 	static	bool				IsWhiteSpace(uint32 glyphCode);
 
@@ -62,27 +99,37 @@
 GlyphLayoutEngine::LayoutGlyphs(GlyphConsumer& consumer,
 	const ServerFont& font,
 	const char* utf8String, int32 length,
-	const escapement_delta* delta, bool kerning, uint8 spacing)
+	const escapement_delta* delta, bool kerning, uint8 spacing,
+	FontCacheReference* cacheReference)
 {
 	// TODO: implement spacing modes
-	FontCache* cache = FontCache::Default();
-	FontCacheEntry* entry = cache->FontCacheEntryFor(font);
 
-	if (!entry || !entry->ReadLock()) {
-		cache->Recycle(entry);
-		return false;
+	FontCacheEntry* entry = NULL;
+	bool needsWriteLock = false;
+	if (cacheReference) {
+		entry = cacheReference->Entry();
+		needsWriteLock = cacheReference->WriteLocked();
 	}
 
-	bool needsWriteLock
-		= !entry->HasGlyphs(utf8String, length);
-
-	if (needsWriteLock) {
-		entry->ReadUnlock();
-		if (!entry->WriteLock()) {
+	if (!entry) {
+		FontCache* cache = FontCache::Default();
+		entry = cache->FontCacheEntryFor(font);
+	
+		if (!entry || !entry->ReadLock()) {
 			cache->Recycle(entry);
 			return false;
 		}
-	}
+	
+		needsWriteLock = !entry->HasGlyphs(utf8String, length);
+	
+		if (needsWriteLock) {
+			entry->ReadUnlock();
+			if (!entry->WriteLock()) {
+				cache->Recycle(entry);
+				return false;
+			}
+		}
+	} // else the entry was already used and is still locked
 
 	consumer.Start();
 
@@ -107,8 +154,8 @@
 			continue;
 		}
 
-		if (kerning)
-			entry->GetKerning(lastCharCode, charCode, &advanceX, &advanceY);
+//		if (kerning)
+//			entry->GetKerning(lastCharCode, charCode, &advanceX, &advanceY);
 
 		x += advanceX;
 		y += advanceY;
@@ -133,12 +180,18 @@
 	y += advanceY;
 	consumer.Finish(x, y);
 
-	if (needsWriteLock)
-		entry->WriteUnlock();
-	else
-		entry->ReadUnlock();
-
-	cache->Recycle(entry);
+	if (!cacheReference) {
+		if (needsWriteLock)
+			entry->WriteUnlock();
+		else
+			entry->ReadUnlock();
+	
+		FontCache::Default()->Recycle(entry);
+	} else {
+		// the reference will take care of locking
+		if (!cacheReference->Entry())
+			cacheReference->SetTo(entry, needsWriteLock);
+	}
 	return true;
 }
 

Modified: haiku/trunk/src/servers/app/ProfileMessageSupport.cpp
===================================================================
--- haiku/trunk/src/servers/app/ProfileMessageSupport.cpp	2007-08-04 11:22:47 UTC (rev 21821)
+++ haiku/trunk/src/servers/app/ProfileMessageSupport.cpp	2007-08-04 11:37:16 UTC (rev 21822)
@@ -201,6 +201,7 @@
 		case AS_FILL_TRIANGLE: string = "AS_FILL_TRIANGLE"; break;
 
 		case AS_DRAW_STRING: string = "AS_DRAW_STRING"; break;
+		case AS_DRAW_STRING_WITH_DELTA: string = "AS_DRAW_STRING_WITH_DELTA"; break;
 
 		case AS_SYNC: string = "AS_SYNC"; break;
 

Modified: haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2007-08-04 11:22:47 UTC (rev 21821)
+++ haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2007-08-04 11:37:16 UTC (rev 21822)
@@ -185,7 +185,7 @@
 void
 DrawingEngine::SetDrawState(const DrawState* state, int32 xOffset, int32 yOffset)
 {
-	fPainter->SetDrawState(state, true, xOffset, yOffset);	
+	fPainter->SetDrawState(state, xOffset, yOffset);	
 }
 
 
@@ -665,18 +665,12 @@
 	bool cursorTouched = fGraphicsCard->HideSoftwareCursor(touched);
 
 	if (!fPainter->StraightLine(start, end, color.GetColor32())) {
-		// TODO: all this is quite expensive, but it is currently
-		// used only for the "gradient" decorator tab buttons
-		rgb_color previousColor = fPainter->HighColor();
-		drawing_mode previousMode = fPainter->DrawingMode();
 		fPainter->SetHighColor(color);
 		fPainter->SetDrawingMode(B_OP_OVER);
 		fPainter->StrokeLine(start, end);
-		fPainter->SetHighColor(previousColor);
-		fPainter->SetDrawingMode(previousMode);
-	} else {
-		fGraphicsCard->Invalidate(touched);
 	}
+
+	fGraphicsCard->Invalidate(touched);
 	if (cursorTouched)
 		fGraphicsCard->ShowSoftwareCursor();
 }
@@ -742,17 +736,12 @@
 	BRect frame = r.Frame();
 	bool cursorTouched = fGraphicsCard->HideSoftwareCursor(frame);
 
-	bool doInSoftware = true;
 	// try hardware optimized version first
 	if ((fAvailableHWAccleration & HW_ACC_FILL_REGION) != 0
 		&& frame.Width() * frame.Height() > 100) {
 		fGraphicsCard->FillRegion(r, color, fSuspendSyncLevel == 0
 											|| cursorTouched);
-		doInSoftware = false;
-	}
-
-	if (doInSoftware) {
-
+	} else {
 		int32 count = r.CountRects();
 		for (int32 i = 0; i < count; i++) {
 			fPainter->FillRectNoClipping(r.RectAt(i), color.GetColor32());
@@ -1037,6 +1026,19 @@
 
 	BPoint penLocation = pt;
 
+	// try a fast clipping path
+	float fontSize = fPainter->Font().Size();
+	BRect clippingFrame = fPainter->ClippingRegion()->Frame();
+	if (pt.x > clippingFrame.right || pt.y + fontSize < clippingFrame.top
+		|| pt.y - fontSize > clippingFrame.bottom) {
+		penLocation.x += StringWidth(string, length, delta);
+		return penLocation;
+	}
+
+	// use a FontCacheRefernece to speed up the second pass of
+	// drawing the string
+	FontCacheReference cacheReference;
+
 //bigtime_t now = system_time();
 // TODO: BoundingBox is quite slow!! Optimizing it will be beneficial.
 // Cursiously, the DrawString after it is actually faster!?!
@@ -1045,7 +1047,8 @@
 // in case we don't have one.
 // TODO: Watch out about penLocation and use Painter::PenLocation() when
 // not using BoundindBox anymore.
-	BRect b = fPainter->BoundingBox(string, length, pt, &penLocation, delta);
+	BRect b = fPainter->BoundingBox(string, length, pt, &penLocation, delta,
+		&cacheReference);
 	// stop here if we're supposed to render outside of the clipping
 	b = fPainter->ClipRect(b);
 	if (b.IsValid()) {
@@ -1053,7 +1056,8 @@
 		bool cursorTouched = fGraphicsCard->HideSoftwareCursor(b);
 
 //now = system_time();
-		BRect touched = fPainter->DrawString(string, length, pt, delta);
+		BRect touched = fPainter->DrawString(string, length, pt, delta,
+			&cacheReference);
 //printf("drawing string: %lld ?s\n", system_time() - now);
 
 		fGraphicsCard->Invalidate(touched);

Modified: haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.cpp	2007-08-04 11:22:47 UTC (rev 21821)
+++ haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.cpp	2007-08-04 11:37:16 UTC (rev 21822)
@@ -29,7 +29,8 @@
 
 
 // constructor
-AGGTextRenderer::AGGTextRenderer()
+AGGTextRenderer::AGGTextRenderer(renderer_type& solidRenderer,
+		renderer_bin_type& binRenderer, scanline_unpacked_type& scanline)
 	: fPathAdaptor()
 	, fGray8Adaptor()
 	, fGray8Scanline()
@@ -39,6 +40,11 @@
 	, fCurves(fPathAdaptor)
 	, fContour(fCurves)
 
+	, fSolidRenderer(solidRenderer)
+	, fBinRenderer(binRenderer)
+	, fScanline(scanline)
+	, fRasterizer()
+
 	, fHinted(true)
 	, fAntialias(true)
 	, fKerning(true)
@@ -101,9 +107,6 @@
 class AGGTextRenderer::StringRenderer {
  public:
 	StringRenderer(const IntRect& clippingFrame, bool dryRun,
-			renderer_type& solidRenderer,
-			renderer_bin_type& binRenderer,
-			scanline_unpacked_type& scanline,
 			FontCacheEntry::TransformedOutline& transformedGlyph,
 			FontCacheEntry::TransformedContourOutline& transformedContour,
 			const Transformable& transform,
@@ -119,10 +122,6 @@
 		, fNextCharPos(nextCharPos)
 		, fVector(false)
 
-		, fSolidRenderer(solidRenderer)
-		, fBinRenderer(binRenderer)
-		, fScanline(scanline)
-
 		, fTransformedGlyph(transformedGlyph)
 		, fTransformedContour(transformedContour)
 
@@ -137,8 +136,8 @@
 	void Finish(double x, double y)
 	{
 		if (fVector) {
-			agg::render_scanlines(fRenderer.fRasterizer, fScanline,
-				fSolidRenderer);
+			agg::render_scanlines(fRenderer.fRasterizer, fRenderer.fScanline,
+				fRenderer.fSolidRenderer);
 		}
 
 		if (fNextCharPos) {
@@ -157,7 +156,8 @@
 	{
 		// "glyphBounds" is the bounds of the glyph transformed
 		// by the x y location of the glyph along the base line,
-		// it is therefor yet "untransformed".
+		// it is therefor yet "untransformed" in case there is an
+		// embedded transformation.
 		const agg::rect_i& r = glyph->bounds;
 		IntRect glyphBounds(r.x1 + x, r.y1 + y - 1,
 			r.x2 + x + 1, r.y2 + y + 1);
@@ -211,12 +211,12 @@
 				switch (glyph->data_type) {
 					case glyph_data_mono:
 						agg::render_scanlines(fRenderer.fMonoAdaptor, 
-							fRenderer.fMonoScanline, fBinRenderer);
+							fRenderer.fMonoScanline, fRenderer.fBinRenderer);
 						break;
 
 					case glyph_data_gray8:
 						agg::render_scanlines(fRenderer.fGray8Adaptor, 
-							fRenderer.fGray8Scanline, fSolidRenderer);
+							fRenderer.fGray8Scanline, fRenderer.fSolidRenderer);
 						break;
 
 					case glyph_data_outline: {
@@ -262,9 +262,6 @@
 	BPoint*				fNextCharPos;
 	bool				fVector;
 
-	renderer_type&		fSolidRenderer;
-	renderer_bin_type&	fBinRenderer;
-	scanline_unpacked_type& fScanline;
 	FontCacheEntry::TransformedOutline& fTransformedGlyph;
 	FontCacheEntry::TransformedContourOutline& fTransformedContour;
 	AGGTextRenderer&	fRenderer;
@@ -274,14 +271,12 @@
 BRect
 AGGTextRenderer::RenderString(const char* string,
 							  uint32 length,
-							  renderer_type* solidRenderer,
-							  renderer_bin_type* binRenderer,
-							  scanline_unpacked_type& scanline,
 							  const BPoint& baseLine,
 							  const BRect& clippingFrame,
 							  bool dryRun,
 							  BPoint* nextCharPos,
-							  const escapement_delta* delta)
+							  const escapement_delta* delta,
+							  FontCacheReference* cacheReference)
 {
 //printf("RenderString(\"%s\", length: %ld, dry: %d)\n", string, length, dryRun);
 
@@ -303,12 +298,11 @@
 	transform.Transform(&transformOffset);
 
 	StringRenderer renderer(clippingFrame, dryRun,
-		*solidRenderer, *binRenderer, scanline,
 		transformedOutline, transformedContourOutline,
 		transform, transformOffset, nextCharPos, *this);
 
 	GlyphLayoutEngine::LayoutGlyphs(renderer, fFont, string, length, delta,
-		fKerning, B_BITMAP_SPACING);
+		fKerning, B_BITMAP_SPACING, cacheReference);
 
 	return transform.TransformBounds(renderer.Bounds());
 }

Modified: haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.h
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.h	2007-08-04 11:22:47 UTC (rev 21821)
+++ haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.h	2007-08-04 11:37:16 UTC (rev 21822)
@@ -1,10 +1,11 @@
 /*
- * Copyright 2005-2006, Stephan A?mus <superstippi at gmx.de>. All rights reserved.
+ * Copyright 2005-2007, Stephan A?mus <superstippi at gmx.de>. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef AGG_TEXT_RENDERER_H
 #define AGG_TEXT_RENDERER_H
 
+
 #include "defines.h"
 
 #include "FontCacheEntry.h"
@@ -16,12 +17,18 @@
 #include <agg_scanline_u.h>
 
 
+class FontCacheReference;
+
 class AGGTextRenderer {
  public:
-								AGGTextRenderer();
+								AGGTextRenderer(renderer_type& solidRenderer,
+									renderer_bin_type& binRenderer,
+									scanline_unpacked_type& scanline);
 	virtual						~AGGTextRenderer();
 
 			void				SetFont(const ServerFont &font);
+	inline	const ServerFont&	Font() const
+									{ return fFont; }
 
 			void				SetHinting(bool hinting);
 			bool				Hinting() const
@@ -37,14 +44,12 @@
 
 			BRect				RenderString(const char* utf8String,
 											 uint32 length,
-											 renderer_type* solidRenderer,
-											 renderer_bin_type* binRenderer,
-											 scanline_unpacked_type& scanline,
 											 const BPoint& baseLine,
 											 const BRect& clippingFrame,
-											 bool dryRun = false,
-											 BPoint* nextCharPos = NULL,
-											 const escapement_delta* delta = NULL);
+											 bool dryRun,
+											 BPoint* nextCharPos,
+											 const escapement_delta* delta,
+											 FontCacheReference* cacheReference);
 
  private:
 
@@ -61,6 +66,9 @@
 	FontCacheEntry::CurveConverter		fCurves;
 	FontCacheEntry::ContourConverter	fContour;
 
+	renderer_type&				fSolidRenderer;
+	renderer_bin_type&			fBinRenderer;
+	scanline_unpacked_type&		fScanline;
 	rasterizer_type				fRasterizer;
 		// NOTE: the object has it's own rasterizer object
 		// since it might be using a different gamma setting

Modified: haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp	2007-08-04 11:22:47 UTC (rev 21821)
+++ haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp	2007-08-04 11:37:16 UTC (rev 21822)
@@ -72,13 +72,12 @@
 	  fDrawingText(false),
 	  fAlphaSrcMode(B_PIXEL_ALPHA),
 	  fAlphaFncMode(B_ALPHA_OVERLAY),
-	  fPenLocation(0.0, 0.0),
 	  fLineCapMode(B_BUTT_CAP),
 	  fLineJoinMode(B_MITER_JOIN),
 	  fMiterLimit(B_DEFAULT_MITER_LIMIT),
 
 	  fPatternHandler(),
-	  fTextRenderer()
+	  fTextRenderer(fRenderer, fRendererBin, fUnpackedScanline)
 {
 	fPixelFormat.SetDrawingMode(fDrawingMode, fAlphaSrcMode, fAlphaFncMode, false);
 
@@ -122,22 +121,19 @@
 
 // SetDrawState
 void
-Painter::SetDrawState(const DrawState* data, bool updateFont,
-					  int32 xOffset, int32 yOffset)
+Painter::SetDrawState(const DrawState* data, int32 xOffset, int32 yOffset)
 {
-	// NOTE: The custom clipping in "data" is ignored, because it has already been
-	// taken into account elsewhere
+	// NOTE: The custom clipping in "data" is ignored, because it has already
+	// been taken into account elsewhere
 
 	// TODO: optimize "context switch" for speed...
 	// but for now...
 	SetPenSize(data->PenSize());
-	SetPenLocation(data->PenLocation());
 
-	if (updateFont)
-		SetFont(data->Font());
+	SetFont(data->Font());
+	fTextRenderer.SetAntialiasing(!(data->ForceFontAliasing()
+		|| data->Font().Flags() & B_DISABLE_ANTIALIASING));
 
-	fTextRenderer.SetAntialiasing(!(data->ForceFontAliasing() || data->Font().Flags() & B_DISABLE_ANTIALIASING));
-
 	fSubpixelPrecise = data->SubPixelPrecise();
 
 	// any of these conditions means we need to use a different drawing
@@ -259,18 +255,11 @@
 	}
 }
 
-// SetPenLocation
-void
-Painter::SetPenLocation(const BPoint& location)
-{
-	fPenLocation = location;
-}
-
 // SetFont
 void
 Painter::SetFont(const ServerFont& font)
 {
-	fFont = font;
+	fTextRenderer.SetFont(font);
 }
 
 // #pragma mark - drawing
@@ -524,14 +513,14 @@
 	for (int32 i = 0; i < opCount; i++) {
 		uint32 op = opList[i] & 0xFF000000;
 		if (op & OP_MOVETO) {
-			fPath.move_to(points->x + fPenLocation.x, points->y + fPenLocation.y);
+			fPath.move_to(points->x, points->y);
 			points++;
 		}
 
 		if (op & OP_LINETO) {
 			int32 count = opList[i] & 0x00FFFFFF;
 			while (count--) {
-				fPath.line_to(points->x + fPenLocation.x, points->y + fPenLocation.y);
+				fPath.line_to(points->x, points->y);
 				points++;
 			}
 		}
@@ -539,9 +528,9 @@
 		if (op & OP_BEZIERTO) {
 			int32 count = opList[i] & 0x00FFFFFF;
 			while (count) {
-				fPath.curve4(points[0].x + fPenLocation.x, points[0].y + fPenLocation.y,
-							 points[1].x + fPenLocation.x, points[1].y + fPenLocation.y,
-							 points[2].x + fPenLocation.x, points[2].y + fPenLocation.y);
+				fPath.curve4(points[0].x, points[0].y,
+							 points[1].x, points[1].y,
+							 points[2].x, points[2].y);
 				points += 3;
 				count -= 3;
 			}
@@ -972,7 +961,8 @@
 // DrawString
 BRect
 Painter::DrawString(const char* utf8String, uint32 length,
-					BPoint baseLine, const escapement_delta* delta)
+					BPoint baseLine, const escapement_delta* delta,
+					FontCacheReference* cacheReference)
 {
 	CHECK_CLIPPING
 
@@ -987,14 +977,10 @@
 	// make sure that the previous pattern is restored
 	pattern oldPattern = *fPatternHandler.GetR5Pattern();
 	SetPattern(B_SOLID_HIGH, true);
-	// make sure the text renderer is using our font (the global
-	// instance of the text renderer is used by everyone)
-	_UpdateFont();
 
 	bounds = fTextRenderer.RenderString(utf8String, length,
-		&fRenderer, &fRendererBin, fUnpackedScanline,
-		baseLine, fClippingRegion->Frame(), false,
-		&fPenLocation,  delta);
+		baseLine, fClippingRegion->Frame(), false, NULL, delta,
+		cacheReference);
 
 	SetPattern(oldPattern);
 
@@ -1005,21 +991,17 @@
 BRect
 Painter::BoundingBox(const char* utf8String, uint32 length,
 					 BPoint baseLine, BPoint* penLocation,
-					 const escapement_delta* delta) const
+					 const escapement_delta* delta,
+					 FontCacheReference* cacheReference) const
 {
 	if (!fSubpixelPrecise) {
 		baseLine.x = roundf(baseLine.x);
 		baseLine.y = roundf(baseLine.y);
 	}
 
-	// make sure the text renderer is using our font (the global
-	// instance of the text renderer is used by everyone)
-	_UpdateFont();
-
 	static BRect dummy;
 	return fTextRenderer.RenderString(utf8String, length,
-		&fRenderer, &fRendererBin, fUnpackedScanline,
-		baseLine, dummy, true, penLocation, delta);
+		baseLine, dummy, true, penLocation, delta, cacheReference);
 }
 
 // StringWidth
@@ -1027,7 +1009,7 @@
 Painter::StringWidth(const char* utf8String, uint32 length,
 	const escapement_delta* delta)
 {
-	return fFont.StringWidth(utf8String, length, delta);
+	return Font().StringWidth(utf8String, length, delta);
 }
 
 // #pragma mark -
@@ -1051,7 +1033,8 @@
 						 bitmap->Height(),
 						 bitmap->BytesPerRow());
 
-		_DrawBitmap(srcBuffer, bitmap->ColorSpace(), actualBitmapRect, bitmapRect, viewRect);
+		_DrawBitmap(srcBuffer, bitmap->ColorSpace(), actualBitmapRect,
+			bitmapRect, viewRect);
 	}
 	return touched;
 }
@@ -1131,13 +1114,6 @@
 	return BRect(rect);
 }
 
-// _UpdateFont
-void
-Painter::_UpdateFont() const
-{
-	fTextRenderer.SetFont(fFont);
-}
-
 // _UpdateDrawingMode
 void
 Painter::_UpdateDrawingMode(bool drawingText)

Modified: haiku/trunk/src/servers/app/drawing/Painter/Painter.h
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/Painter.h	2007-08-04 11:22:47 UTC (rev 21821)
+++ haiku/trunk/src/servers/app/drawing/Painter/Painter.h	2007-08-04 11:37:16 UTC (rev 21822)
@@ -27,6 +27,7 @@
 class BBitmap;
 class BRegion;
 class DrawState;
+class FontCacheReference;
 class RenderingBuffer;
 class ServerBitmap;
 class ServerFont;
@@ -47,7 +48,6 @@
 									{ return fClippingRegion; }
 
 			void				SetDrawState(const DrawState* data,
-											 bool updateFont = false,
 											 int32 xOffset = 0,
 											 int32 yOffset = 0);
 
@@ -84,12 +84,9 @@
 			void				SetBlendingMode(source_alpha srcAlpha,
 									alpha_function alphaFunc);
 
-			void				SetPenLocation(const BPoint& location);
-	inline	BPoint				PenLocation() const
-									{ return fPenLocation; }
 			void				SetFont(const ServerFont& font);
 	inline	const ServerFont&	Font() const
-									{ return fFont; }
+									{ return fTextRenderer.Font(); }
 
 								// painting functions
 
@@ -178,13 +175,15 @@
 			BRect				DrawString(		const char* utf8String,
 												uint32 length,
 												BPoint baseLine,
-												const escapement_delta* delta = NULL);
+												const escapement_delta* delta,
+												FontCacheReference* cacheReference = NULL);
 
 			BRect				BoundingBox(	const char* utf8String,
 												uint32 length,
 												BPoint baseLine,
 												BPoint* penLocation,
-												const escapement_delta* delta = NULL) const;
+												const escapement_delta* delta,
+												FontCacheReference* cacheReference = NULL) const;
 
 			float				StringWidth(	const char* utf8String,
 												uint32 length,
@@ -278,14 +277,12 @@
 	bool						fDrawingText;
 	source_alpha				fAlphaSrcMode;
 	alpha_function				fAlphaFncMode;
-	BPoint						fPenLocation;
 	cap_mode					fLineCapMode;
 	join_mode					fLineJoinMode;
 	float						fMiterLimit;
 
 	PatternHandler				fPatternHandler;
 
-	ServerFont					fFont;
 	// a class handling rendering and caching of glyphs
 	// it is setup to load from a specific Freetype supported
 	// font file which it gets from ServerFont



From michael.pfeiffer at utanet.at  Sat Aug  4 13:40:25 2007
From: michael.pfeiffer at utanet.at (Michael Pfeiffer)
Date: Sat, 4 Aug 2007 13:40:25 +0200
Subject: [Haiku-commits] r21820 - haiku/trunk/src/system/libroot/os
In-Reply-To: <200708041119.l74BJvg6010744@sheep.berlios.de>
References: <200708041119.l74BJvg6010744@sheep.berlios.de>
Message-ID: <2D14BF16-AA8A-41F4-B233-9339CA35C722@utanet.at>

Am 04.08.2007 um 13:19 schrieb stippi at BerliOS:

> @@ -9,7 +9,7 @@
>  int32
>  suggest_thread_priority(uint32 what, int32 period, bigtime_t  
> jitter, bigtime_t length)
>  {
> -	return 0;
> +	return 10;
>  }

Is it OK to implement a version that mimics behavior of BeOS R5?

- Michael


From superstippi at gmx.de  Sat Aug  4 13:54:28 2007
From: superstippi at gmx.de (Stephan Assmus)
Date: Sat, 04 Aug 2007 13:54:28 +0200
Subject: [Haiku-commits] r21820 - haiku/trunk/src/system/libroot/os
In-Reply-To: <2D14BF16-AA8A-41F4-B233-9339CA35C722@utanet.at>
References: <200708041119.l74BJvg6010744@sheep.berlios.de>
	<2D14BF16-AA8A-41F4-B233-9339CA35C722@utanet.at>
Message-ID: <20070804135428.2548.1@stippis2.1186228425.fake>


Michael Pfeiffer wrote (2007-08-04, 13:40:25 [+0200]):
> Am 04.08.2007 um 13:19 schrieb stippi at BerliOS:
> 
> > @@ -9,7 +9,7 @@
> >  int32
> >  suggest_thread_priority(uint32 what, int32 period, bigtime_t  
> > jitter, bigtime_t length)
> >  {
> > -    return 0;
> > +    return 10;
> >  }
> 
> Is it OK to implement a version that mimics behavior of BeOS R5?

Yes, of course!

Best regards,
-Stephan


From jackburton at mail.berlios.de  Sat Aug  4 16:34:48 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Sat, 4 Aug 2007 16:34:48 +0200
Subject: [Haiku-commits] r21823 - haiku/trunk/src/servers/app
Message-ID: <200708041434.l74EYm4i013578@sheep.berlios.de>

Author: jackburton
Date: 2007-08-04 16:34:47 +0200 (Sat, 04 Aug 2007)
New Revision: 21823
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21823&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Since AS_DRAW_STRING doesn't attach the escapement delta anymore, 
drawing a string inside a picture and then playing that picture 
triggered a debugger call. Fixed.


Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-04 11:37:16 UTC (rev 21822)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-04 14:34:47 UTC (rev 21823)
@@ -2545,15 +2545,17 @@
 		}
 		
 		case AS_DRAW_STRING:
+		case AS_DRAW_STRING_WITH_DELTA:
 		{
 			char* string = NULL;
 			int32 length;
 			BPoint location;
-			escapement_delta delta;
-
+			
 			link.Read<int32>(&length);
 			link.Read<BPoint>(&location);
-			link.Read<escapement_delta>(&delta);
+			escapement_delta delta = { 0, 0 };
+			if (code == AS_DRAW_STRING_WITH_DELTA)
+				link.Read<escapement_delta>(&delta);
 			link.ReadString(&string);
 
 			picture->WriteDrawString(location, string, length, delta);



From jackburton at mail.berlios.de  Sat Aug  4 16:35:38 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Sat, 4 Aug 2007 16:35:38 +0200
Subject: [Haiku-commits] r21824 - haiku/trunk/src/apps/terminal
Message-ID: <200708041435.l74EZcTS013639@sheep.berlios.de>

Author: jackburton
Date: 2007-08-04 16:35:38 +0200 (Sat, 04 Aug 2007)
New Revision: 21824
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21824&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermWindow.cpp
Log:
If there's only one tab, quit the window when TermView::NotifyQuit() is 
called.


Modified: haiku/trunk/src/apps/terminal/TermWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-04 14:34:47 UTC (rev 21823)
+++ haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-04 14:35:38 UTC (rev 21824)
@@ -239,7 +239,10 @@
 			// Since the implementation of BTabView uses AddChild/RemoveChild on the
 			// views, the current active tab is the only one who is attached, thus
 			// the only one which could send a message.
-			delete fTabView->RemoveTab(fTabView->Selection());
+			if (fTabView->CountTabs() > 1)			
+				delete fTabView->RemoveTab(fTabView->Selection());
+			else
+				PostMessage(B_QUIT_REQUESTED);			
 			break;	
 		}
 



From bonefish at cs.tu-berlin.de  Sat Aug  4 17:48:21 2007
From: bonefish at cs.tu-berlin.de (Ingo Weinhold)
Date: Sat, 04 Aug 2007 17:48:21 +0200
Subject: [Haiku-commits] HaikuBuildCompatibility.h trouble
In-Reply-To: <20070804121631.9957.3@stippis2.1186210982.fake>
References: <20070804095532.1356.1@stippis2.1186210982.fake>
	<20070804121631.9957.3@stippis2.1186210982.fake>
Message-ID: <20070804174821.958.3@cs.tu-berlin.de>


On 2007-08-04 at 12:16:31 [+0200], Stephan Assmus <superstippi at gmx.de> wrote:
> Stephan Assmus wrote (2007-08-04, 09:55:32 [+0200]):
> > after updating the Haiku tree on my ZETA box, it seems
> > HaikuBuildCompatibility.h is no longer included when building the
> > libbe_test tartet. I tried to investigate but couldn't find the source of
> > the problem.
> 
> I've found what I need to change in order to build libbe_test on dano again:
> 
> build/jam/BuildSetup:
> 
> # TODO: Fix the naming!
> -if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
> +if $(TARGET_PLATFORM) = haiku {
>     NETWORK_LIBS = network ;
> 
> [...]
> # include the HaikuBuildCompatibility.h header and link against
> # libhaikucompat.a.
>        
> -if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) &&
> $(TARGET_PLATFORM_BEOS_COMPATIBLE) {
> +if $(TARGET_PLATFORM) != haiku &&  $(TARGET_PLATFORM_BEOS_COMPATIBLE) {
> 
> I know these are not the "correct" fixes. libbe_test is
> TARGET_PLATFORM_HAIKU_COMPATIBLE because it is special cased in
> HelperRules, and that seems correct. I'm not sure if I compiled on R5 after
> r21802, so it may still work on R5, but I'm wondering if libbe_test defines
> should also depend more on the host platform. Like
> TARGET_PLATFORM_DANO_COMPATIBLE being defined when compiling libbe_test on
> Dano and TARGET_PLATFORM_BEOS_COMPATIBLE being defined when compiling it on
> R5. Don't know what to do about it.

I'll look into those later today.

CU, Ingo


From bonefish at cs.tu-berlin.de  Sat Aug  4 17:51:16 2007
From: bonefish at cs.tu-berlin.de (Ingo Weinhold)
Date: Sat, 04 Aug 2007 17:51:16 +0200
Subject: [Haiku-commits] r21822 - in haiku/trunk/src/servers/app: .
 drawing drawing/Painter
In-Reply-To: <200708041137.l74BbHtl001700@sheep.berlios.de>
References: <200708041137.l74BbHtl001700@sheep.berlios.de>
Message-ID: <20070804175116.1002.4@cs.tu-berlin.de>


On 2007-08-04 at 13:37:17 [+0200], stippi at BerliOS <stippi at mail.berlios.de> 
wrote:
> Author: stippi
> Date: 2007-08-04 13:37:16 +0200 (Sat, 04 Aug 2007)
> New Revision: 21822
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21822&view=rev
[...]
> In the test environment (drawing to offscreen bitmap and blitting to
> screen eventually), text rendering is now about 3.7 times _faster_ than Dano
> text rendering (directly to screen), for untransformed text.

Wow! :-)

CU, Ingo


From laplace at mail.berlios.de  Sat Aug  4 18:35:20 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Sat, 4 Aug 2007 18:35:20 +0200
Subject: [Haiku-commits] r21825 - haiku/trunk/src/system/libroot/os
Message-ID: <200708041635.l74GZKYT027268@sheep.berlios.de>

Author: laplace
Date: 2007-08-04 18:35:19 +0200 (Sat, 04 Aug 2007)
New Revision: 21825
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21825&view=rev

Modified:
   haiku/trunk/src/system/libroot/os/scheduler.c
Log:
* Updated copyright header.
* Initial implementation of suggest_thread_priority. It behaves like version from BeOS R5. 
* TODO take arguments 'period', 'jitter', and 'length' into account as well . 


Modified: haiku/trunk/src/system/libroot/os/scheduler.c
===================================================================
--- haiku/trunk/src/system/libroot/os/scheduler.c	2007-08-04 14:35:38 UTC (rev 21824)
+++ haiku/trunk/src/system/libroot/os/scheduler.c	2007-08-04 16:35:19 UTC (rev 21825)
@@ -1,15 +1,49 @@
 /* 
-** Copyright 2004, J?r?me Duval, korli at users.sourceforge.net. All rights reserved.
-** Distributed under the terms of the Haiku License.
-*/
+ * Copyright 2004-2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *      J?r?me Duval, korli at users.sourceforge.net.
+ *      Michael Pfeiffer, laplace at users.sourceforge.net
+ */
 
 
 #include <scheduler.h>
 
+
+static struct {
+	uint32 what;
+	int32 priority;
+} gWhatPriorityArray[] = {
+	// highest priority first
+	{B_MIDI_PROCESSING, 0x78},
+	{B_AUDIO_RECORDING | B_AUDIO_PLAYBACK, 0x73},
+	{B_LIVE_AUDIO_MANIPULATION, 0x6e},
+	{B_VIDEO_RECORDING, 0x19},
+	{B_VIDEO_PLAYBACK, 0x14},
+	{B_USER_INPUT_HANDLING, 0x0f},
+	{B_LIVE_VIDEO_MANIPULATION, 0x0e},
+	{B_LIVE_3D_RENDERING, 0x0c},
+	{B_STATUS_RENDERING, 0xa},
+	{B_OFFLINE_PROCESSING, 0x06},
+	{B_NUMBER_CRUNCHING, 0x05},
+	{(uint32)-1, -1}
+};
+
 int32 
 suggest_thread_priority(uint32 what, int32 period, bigtime_t jitter, bigtime_t length)
 {
-	return 10;
+	int32 priority = what == B_DEFAULT_MEDIA_PRIORITY ? 0x0a : 0;
+		// default priority
+	
+	for (int i = 0; gWhatPriorityArray[i].what != (uint32)-1; i ++) {
+		if ((what & gWhatPriorityArray[i].what) != 0) {
+			priority = gWhatPriorityArray[i].priority;
+			break;
+		}
+	}
+	
+	return priority;	
 }
 
 bigtime_t 



From superstippi at gmx.de  Sat Aug  4 18:30:40 2007
From: superstippi at gmx.de (Stephan Assmus)
Date: Sat, 04 Aug 2007 18:30:40 +0200
Subject: [Haiku-commits] r21823 - haiku/trunk/src/servers/app
In-Reply-To: <200708041434.l74EYm4i013578@sheep.berlios.de>
References: <200708041434.l74EYm4i013578@sheep.berlios.de>
Message-ID: <20070804183040.20531.4@stippis2.1186232374.fake>


jackburton at BerliOS wrote (2007-08-04, 16:34:48 [+0200]):
> Author: jackburton
> Date: 2007-08-04 16:34:47 +0200 (Sat, 04 Aug 2007) New Revision: 21823
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21823&view=rev
> 
> Modified:
>    haiku/trunk/src/servers/app/ServerWindow.cpp
> Log:
> Since AS_DRAW_STRING doesn't attach the escapement delta anymore, drawing 
> a string inside a picture and then playing that picture triggered a 
> debugger call. Fixed.

Oh, sorry about that. I seem to forget about BPictures all the time... :-)

Best regards,
-Stephan


From superstippi at gmx.de  Sat Aug  4 19:00:07 2007
From: superstippi at gmx.de (Stephan Assmus)
Date: Sat, 04 Aug 2007 19:00:07 +0200
Subject: [Haiku-commits] r21822 - in haiku/trunk/src/servers/app: .
 drawing drawing/Painter
In-Reply-To: <20070804175116.1002.4@cs.tu-berlin.de>
References: <200708041137.l74BbHtl001700@sheep.berlios.de>
	<20070804175116.1002.4@cs.tu-berlin.de>
Message-ID: <20070804190007.21435.7@stippis2.1186232374.fake>


Ingo Weinhold wrote (2007-08-04, 17:51:16 [+0200]):
> 
> On 2007-08-04 at 13:37:17 [+0200], stippi at BerliOS 
> <stippi at mail.berlios.de> wrote:
> > Author: stippi
> > Date: 2007-08-04 13:37:16 +0200 (Sat, 04 Aug 2007) New Revision: 21822
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21822&view=rev
> [...]
> > In the test environment (drawing to offscreen bitmap and blitting to 
> > screen eventually), text rendering is now about 3.7 times _faster_ than 
> > Dano text rendering (directly to screen), for untransformed text.
> 
> Wow! :-)

I was able to test it on the same computer running the real Haiku and 
there, text rendering was about 1.5 times slower compared to Dano.

Best regards,
-Stephan


From laplace at mail.berlios.de  Sat Aug  4 19:09:47 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Sat, 4 Aug 2007 19:09:47 +0200
Subject: [Haiku-commits] r21826 - haiku/trunk/src/system/libroot/os
Message-ID: <200708041709.l74H9lpX006342@sheep.berlios.de>

Author: laplace
Date: 2007-08-04 19:09:46 +0200 (Sat, 04 Aug 2007)
New Revision: 21826
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21826&view=rev

Modified:
   haiku/trunk/src/system/libroot/os/scheduler.c
Log:
Make C compiler happy.


Modified: haiku/trunk/src/system/libroot/os/scheduler.c
===================================================================
--- haiku/trunk/src/system/libroot/os/scheduler.c	2007-08-04 16:35:19 UTC (rev 21825)
+++ haiku/trunk/src/system/libroot/os/scheduler.c	2007-08-04 17:09:46 UTC (rev 21826)
@@ -33,10 +33,11 @@
 int32 
 suggest_thread_priority(uint32 what, int32 period, bigtime_t jitter, bigtime_t length)
 {
+	int i;
 	int32 priority = what == B_DEFAULT_MEDIA_PRIORITY ? 0x0a : 0;
 		// default priority
 	
-	for (int i = 0; gWhatPriorityArray[i].what != (uint32)-1; i ++) {
+	for (i = 0; gWhatPriorityArray[i].what != (uint32)-1; i ++) {
 		if ((what & gWhatPriorityArray[i].what) != 0) {
 			priority = gWhatPriorityArray[i].priority;
 			break;



From bonefish at cs.tu-berlin.de  Sat Aug  4 19:50:32 2007
From: bonefish at cs.tu-berlin.de (Ingo Weinhold)
Date: Sat, 04 Aug 2007 19:50:32 +0200
Subject: [Haiku-commits] r21822 - in haiku/trunk/src/servers/app: .
 drawing drawing/Painter
In-Reply-To: <20070804190007.21435.7@stippis2.1186232374.fake>
References: <200708041137.l74BbHtl001700@sheep.berlios.de>
	<20070804175116.1002.4@cs.tu-berlin.de>
	<20070804190007.21435.7@stippis2.1186232374.fake>
Message-ID: <20070804195032.2116.7@cs.tu-berlin.de>


On 2007-08-04 at 19:00:07 [+0200], Stephan Assmus <superstippi at gmx.de> wrote:
> Ingo Weinhold wrote (2007-08-04, 17:51:16 [+0200]):
> > On 2007-08-04 at 13:37:17 [+0200], stippi at BerliOS
> > <stippi at mail.berlios.de> wrote:
> > > Author: stippi
> > > Date: 2007-08-04 13:37:16 +0200 (Sat, 04 Aug 2007) New Revision: 21822
> > > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21822&view=rev
> > [...]
> > > In the test environment (drawing to offscreen bitmap and blitting to
> > > screen eventually), text rendering is now about 3.7 times _faster_ than
> > > Dano text rendering (directly to screen), for untransformed text.
> > 
> > Wow! :-)
> 
> I was able to test it on the same computer running the real Haiku and
> there, text rendering was about 1.5 times slower compared to Dano.

Given how much optimization potential our kernel has, that's still very 
promising.

CU, Ingo


From bonefish at mail.berlios.de  Sun Aug  5 03:13:29 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sun, 5 Aug 2007 03:13:29 +0200
Subject: [Haiku-commits] r21827 - in haiku/trunk: build/jam src/kits/tracker
Message-ID: <200708050113.l751DTCO010924@sheep.berlios.de>

Author: bonefish
Date: 2007-08-05 03:13:27 +0200 (Sun, 05 Aug 2007)
New Revision: 21827
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21827&view=rev

Modified:
   haiku/trunk/build/jam/HelperRules
   haiku/trunk/src/kits/tracker/Jamfile
Log:
Made the compatibility level for target libbe_test depend on the compatibility
of the host platform. The libtracker Jamfile seems to be the only one that
needs another exception.


Modified: haiku/trunk/build/jam/HelperRules
===================================================================
--- haiku/trunk/build/jam/HelperRules	2007-08-04 17:09:46 UTC (rev 21826)
+++ haiku/trunk/build/jam/HelperRules	2007-08-05 01:13:27 UTC (rev 21827)
@@ -142,7 +142,7 @@
 
 	# special case: Haiku libbe.so built for testing under BeOS
 	if $(platform) = libbe_test {
-		platform = haiku ;
+		platform = $(HOST_PLATFORM) ;
 	}
 
 	$(varPrefix)_PLATFORM_BEOS_COMPATIBLE = ;

Modified: haiku/trunk/src/kits/tracker/Jamfile
===================================================================
--- haiku/trunk/src/kits/tracker/Jamfile	2007-08-04 17:09:46 UTC (rev 21826)
+++ haiku/trunk/src/kits/tracker/Jamfile	2007-08-05 01:13:27 UTC (rev 21827)
@@ -18,7 +18,7 @@
 	;
 
 local vector_icon_libs ;
-if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) && $(TARGET_PLATFORM) != libbe_test {
 	vector_icon_libs = libicon.a libagg.a ;
 }
 



From marcusoverhagen at mail.berlios.de  Sun Aug  5 15:24:52 2007
From: marcusoverhagen at mail.berlios.de (marcusoverhagen at BerliOS)
Date: Sun, 5 Aug 2007 15:24:52 +0200
Subject: [Haiku-commits] r21828 - haiku/trunk/src/tests/misc
Message-ID: <200708051324.l75DOqBD018566@sheep.berlios.de>

Author: marcusoverhagen
Date: 2007-08-05 15:24:52 +0200 (Sun, 05 Aug 2007)
New Revision: 21828
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21828&view=rev

Added:
   haiku/trunk/src/tests/misc/writev-test.cpp
Modified:
   haiku/trunk/src/tests/misc/Jamfile
Log:
writev test application. I expected this to crash haiku, but it hasn't 
so far.


Modified: haiku/trunk/src/tests/misc/Jamfile
===================================================================
--- haiku/trunk/src/tests/misc/Jamfile	2007-08-05 01:13:27 UTC (rev 21827)
+++ haiku/trunk/src/tests/misc/Jamfile	2007-08-05 13:24:52 UTC (rev 21828)
@@ -3,5 +3,6 @@
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 SimpleTest rtti-test : rtti-test.cpp : be ;
+SimpleTest writev-test : writev-test.cpp : be ;
 
 SubInclude HAIKU_TOP src tests misc exception-test ;

Added: haiku/trunk/src/tests/misc/writev-test.cpp
===================================================================
--- haiku/trunk/src/tests/misc/writev-test.cpp	2007-08-05 01:13:27 UTC (rev 21827)
+++ haiku/trunk/src/tests/misc/writev-test.cpp	2007-08-05 13:24:52 UTC (rev 21828)
@@ -0,0 +1,44 @@
+#include <sys/uio.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <fcntl.h>
+
+int 
+main()
+{
+	int fd = open("testfile", O_CREAT | O_RDWR, 0666);
+
+	if (fd < 0) {
+		printf("file open error %s\n", strerror(errno));
+		return 1;
+	}
+
+	int dummy;
+	int ret;
+	iovec vec1 = { &dummy, sizeof(dummy) };
+	ret = writev(fd, &vec1, 0x80000001);
+
+	if (ret < 0) {
+		printf("vec 1 write error %s\n", strerror(errno));
+	}
+
+	iovec vec2 = { (void *)0x80100000, 0x1000 };
+	ret = writev(fd, &vec2, 1);
+
+	if (ret < 0) {
+		printf("vec 2 write error %s\n", strerror(errno));
+	}
+
+	iovec vec3 = { 0, 1 };
+	ret = writev(fd, &vec3, 0xfff);
+
+	if (ret < 0) {
+		printf("vec 3 write error %s\n", strerror(errno));
+	}
+
+	close(fd);
+
+	return 0;
+}



From marcusoverhagen at mail.berlios.de  Sun Aug  5 15:56:01 2007
From: marcusoverhagen at mail.berlios.de (marcusoverhagen at BerliOS)
Date: Sun, 5 Aug 2007 15:56:01 +0200
Subject: [Haiku-commits] r21829 - haiku/trunk/src/system/kernel/fs
Message-ID: <200708051356.l75Du1Qg020424@sheep.berlios.de>

Author: marcusoverhagen
Date: 2007-08-05 15:56:01 +0200 (Sun, 05 Aug 2007)
New Revision: 21829
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21829&view=rev

Modified:
   haiku/trunk/src/system/kernel/fs/vfs.cpp
Log:
FD_CLOEXEC is a flag, other bits may be set


Modified: haiku/trunk/src/system/kernel/fs/vfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs.cpp	2007-08-05 13:24:52 UTC (rev 21828)
+++ haiku/trunk/src/system/kernel/fs/vfs.cpp	2007-08-05 13:56:01 UTC (rev 21829)
@@ -4206,7 +4206,7 @@
 
 			// O_CLOEXEC is the only flag available at this time
 			mutex_lock(&context->io_mutex);
-			fd_set_close_on_exec(context, fd, argument == FD_CLOEXEC);
+			fd_set_close_on_exec(context, fd, argument & FD_CLOEXEC);
 			mutex_unlock(&context->io_mutex);
 			
 			status = B_OK;



From korli at users.berlios.de  Sun Aug  5 16:00:14 2007
From: korli at users.berlios.de (=?ISO-8859-1?Q?J=E9r=F4me_Duval?=)
Date: Sun, 5 Aug 2007 16:00:14 +0200
Subject: [Haiku-commits] r21812 - haiku/trunk/src/preferences/media
In-Reply-To: <20070803212531.750.2@cs.tu-berlin.de>
References: <200708031903.l73J3Wst001936@sheep.berlios.de>
	<20070803212531.750.2@cs.tu-berlin.de>
Message-ID: <c47b1d430708050700o761fd1dbuc40748620b70d7f8@mail.gmail.com>

2007/8/3, Ingo Weinhold <bonefish at cs.tu-berlin.de>:
>
> Oh, that reminds me: Why is it there anyway?


Hmm,  this option is only found in gcc 2.95.3 for BeOS and was added by
Oliver.  I think it allows multiple symbol spaces : it's a compatibility
option with Be's librairies, which avoids the application crash on BeOS.
Better ask Oliver for the real explanation :)

Bye,
J?r?me
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20070805/19fb7339/attachment.html>

From korli at users.berlios.de  Sun Aug  5 16:04:56 2007
From: korli at users.berlios.de (=?ISO-8859-1?Q?J=E9r=F4me_Duval?=)
Date: Sun, 5 Aug 2007 16:04:56 +0200
Subject: [Haiku-commits] r21820 - haiku/trunk/src/system/libroot/os
In-Reply-To: <200708041119.l74BJvg6010744@sheep.berlios.de>
References: <200708041119.l74BJvg6010744@sheep.berlios.de>
Message-ID: <c47b1d430708050704m62c353c1g6b3079feb83ae688@mail.gmail.com>

2007/8/4, stippi at BerliOS <stippi at mail.berlios.de>:
>
> Modified: haiku/trunk/src/system/libroot/os/scheduler.c
> ===================================================================
> --- haiku/trunk/src/system/libroot/os/scheduler.c       2007-08-04
> 11:18:21 UTC (rev 21819)
> +++ haiku/trunk/src/system/libroot/os/scheduler.c       2007-08-04
> 11:19:56 UTC (rev 21820)
> @@ -1,5 +1,5 @@
> /*
> -** Copyright 2004, J?r?me Duval, korli at users.sourceforge.net. All rights
> reserved.
> +** Copyright 2004, J?(c)r??me Duval, korli at users.sourceforge.net. All
> rights reserved.
> ** Distributed under the terms of the Haiku License.
> */


Seems my name was mixed up  by this change,

Bye,
J?r?me
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20070805/93df5d9c/attachment.html>

From superstippi at gmx.de  Sun Aug  5 16:50:03 2007
From: superstippi at gmx.de (Stephan Assmus)
Date: Sun, 05 Aug 2007 16:50:03 +0200
Subject: [Haiku-commits] r21820 - haiku/trunk/src/system/libroot/os
In-Reply-To: <c47b1d430708050704m62c353c1g6b3079feb83ae688@mail.gmail.com>
References: <200708041119.l74BJvg6010744@sheep.berlios.de>
	<c47b1d430708050704m62c353c1g6b3079feb83ae688@mail.gmail.com>
Message-ID: <20070805165003.5222.11@stippis2.1186309169.fake>

Hi J?r?me,

J?r?me Duval wrote (2007-08-05, 16:04:56 [+0200]):
> 2007/8/4, stippi at BerliOS <stippi at mail.berlios.de>:
> >
> > Modified: haiku/trunk/src/system/libroot/os/scheduler.c 
> > ===================================================================
> > --- haiku/trunk/src/system/libroot/os/scheduler.c       2007-08-04
> > 11:18:21 UTC (rev 21819)
> > +++ haiku/trunk/src/system/libroot/os/scheduler.c       2007-08-04
> > 11:19:56 UTC (rev 21820)
> > @@ -1,5 +1,5 @@
> > /*
> > -** Copyright 2004, J?r?me Duval, korli at users.sourceforge.net. All 
> > rights
> > reserved.
> > +** Copyright 2004, J?(c)r??me Duval, korli at users.sourceforge.net. All
> > rights reserved.
> > ** Distributed under the terms of the Haiku License.
> > */
> 
> 
> Seems my name was mixed up  by this change,

I think not, Pe says this file is UTF8 encoded and your name is correct 
here, I think it is just a problem with the commit message. I think I've 
seen this problem before.

Best regards,
-Stephan


From stefano.ceccherini at gmail.com  Sun Aug  5 20:58:37 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Sun, 5 Aug 2007 20:58:37 +0200
Subject: [Haiku-commits] r21823 - haiku/trunk/src/servers/app
In-Reply-To: <20070804183040.20531.4@stippis2.1186232374.fake>
References: <200708041434.l74EYm4i013578@sheep.berlios.de>
	<20070804183040.20531.4@stippis2.1186232374.fake>
Message-ID: <894b9700708051158q72cbb879p8958dafd6b5d3cb8@mail.gmail.com>

2007/8/4, Stephan Assmus <superstippi at gmx.de>:

> Oh, sorry about that. I seem to forget about BPictures all the time... :-)

Don't worry, it was an easy fix :)


From axeld at mail.berlios.de  Mon Aug  6 01:38:32 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 6 Aug 2007 01:38:32 +0200
Subject: [Haiku-commits] r21830 - haiku/trunk/src/system/kernel/fs
Message-ID: <200708052338.l75NcWG9022188@sheep.berlios.de>

Author: axeld
Date: 2007-08-06 01:38:31 +0200 (Mon, 06 Aug 2007)
New Revision: 21830
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21830&view=rev

Modified:
   haiku/trunk/src/system/kernel/fs/pipefs.cpp
Log:
mmlr+bonefish(+axeld - I put the bug in there ;-)):
* Inode::MayReleaseWriter() would release the semaphore too often; therefore,
  Inode::WriteDataToBuffer() now loops in case it still couldn't write anything
  instead of failing - this fixes a race condition (ie. a device is full message).
* In case the read request got filled two times (while adding the request, and
  after waiting for it to become filled), ReadRequest::PutBuffer() overwrote the
  output data. This fixes bug #1331.


Modified: haiku/trunk/src/system/kernel/fs/pipefs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/pipefs.cpp	2007-08-05 13:56:01 UTC (rev 21829)
+++ haiku/trunk/src/system/kernel/fs/pipefs.cpp	2007-08-05 23:38:31 UTC (rev 21830)
@@ -626,17 +626,19 @@
 	// still come in and we don't block the whole inode data transfer
 	// to prevent deadlocks from happening
 
-	if (!nonBlocking)
+	while (fBuffer.Writable() == 0) {
+		if (nonBlocking)
+			return B_WOULD_BLOCK;
+
 		benaphore_unlock(&fRequestLock);
 
-	status_t status = acquire_sem_etc(fWriteLock, 1,
-		(nonBlocking ? B_TIMEOUT : 0) | B_CAN_INTERRUPT, 0);
+		status_t status = acquire_sem_etc(fWriteLock, 1, B_CAN_INTERRUPT, 0);
 
-	if (!nonBlocking)
 		benaphore_lock(&fRequestLock);
 
-	if (status != B_OK)
-		return status;
+		if (status != B_OK)
+			return status;
+	}
 
 	// ensure that we don't write more than PIPEFS_MAX_BUFFER_SIZE
 	// into a pipe without blocking
@@ -1007,7 +1009,7 @@
 	if (length == 0)
 		return B_OK;
 
-	if (buffer.UserRead(fBuffer, length) < B_OK) {
+	if (buffer.UserRead((char*)fBuffer + fBytesRead, length) < B_OK) {
 		// if the buffer is just invalid, we release the reader as well
 		release_sem(fLock);
 		return B_BAD_ADDRESS;



From axeld at mail.berlios.de  Mon Aug  6 02:03:50 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 6 Aug 2007 02:03:50 +0200
Subject: [Haiku-commits] r21831 - haiku/trunk/docs/develop/befs
Message-ID: <200708060003.l7603oGY023485@sheep.berlios.de>

Author: axeld
Date: 2007-08-06 02:03:49 +0200 (Mon, 06 Aug 2007)
New Revision: 21831
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21831&view=rev

Modified:
   haiku/trunk/docs/develop/befs/resources.html
Log:
Brought the document up to date; triggered by an update to this document by
Kamikazow which can be seen as an attachment to bug #1356.


Modified: haiku/trunk/docs/develop/befs/resources.html
===================================================================
--- haiku/trunk/docs/develop/befs/resources.html	2007-08-05 23:38:31 UTC (rev 21830)
+++ haiku/trunk/docs/develop/befs/resources.html	2007-08-06 00:03:49 UTC (rev 21831)
@@ -1,54 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
-  <TITLE>Documentation and Resources for writing BeOS File Systems</TITLE>
+  <TITLE>Resources for the Be File System</TITLE>
 </HEAD>
 
 <BODY text="#000000" link="#0000FF" bgcolor="#FFFFFF">
 
-<H1>Hints for BeOS File System Authors</H1>
+<H1>Resources for the Be File System</H1>
 
-<P>Besides the example DOS file system that comes with the BeOS developers
-stuff, there's also a CD-ROM file system example.  If you installed the
-optional stuff on the BeOS 5.0 Pro CD-ROM (or the developer's kit from the free
-site), it's at: /boot/optional/sample-code/add-ons/iso9660
+<p>Probably the best resource for a description of the inner workings of BFS is the
+book "Practical File System Design with the Be File System" written by Dominic
+Giampaolo and published by Morgan Kaufmann Publishers. Although that book is out of
+print, it's available as a free download from
+<A HREF="http://www.letterp.com/~dbg/">Dominic's web site</A>.
 
-<P>On <A HREF="http://www.bebits.com/">BeBits</A> you can get source code
-examples from a few programs, such as AtheOS FS (<A
-HREF="http://www.bebits.com/app/2028">app 2028 on BeBits</A>).  There used to
-be a copy of NTFS too with source (<A HREF="http://www.bebits.com/app/620">app
-620 on BeBits</A>), but the site seems to be down.  There are also other file
-systems there, but source is not included (some have it available on request).
+<p>If you prefer to see how it works in code, please have a look at Haiku's BFS
+implementation - you can find that in the SVN repository under
+src/add-ons/kernel/file_systems/bfs/. This code is not mature yet, but is considered
+to be fairly stable.
 
-<P>Another useful source of information is the <A
-HREF="http://www.be.com/developers/dev_lib/index.html">BeOS developer library
-web site</A>.  It has some articles on file systems, the most relevant being
-the <A
-HREF="http://www-classic.be.com/aboutbe/benewsletter/volume_III/Issue20.html#Insight">One
-File Network File System</A>, which shows one way of combining a user space
-program with a kernel file system stub.  Another good one is <A
-HREF="http://www-classic.be.com/aboutbe/benewsletter/Issue52.html#Insight">about
-the FSP</A> (file system protocol).  The prior issue describes what <A
-HREF="http://www-classic.be.com/aboutbe/benewsletter/Issue51.html#Insight">features
-the BFS supports</A>.  There are lots of other tangentially related articles,
-such as ones on device drivers, programming in kernel mode, debugging, etc.
+<p>If you are interested in the Haiku file system API, please refer to its documentation
+as part of the Haiku book.
 
-<P>There's also the very good <CITE>Practical File System Design</CITE> book
-by Dominic Giampaolo, from <A HREF="http://www.mkp.com/">Morgan Kaufmann
-Publishers</A>, read their <A
-HREF="http://www.mkp.com/books_catalog/catalog.asp?ISBN=1-55860-497-9">catalog
-entry</A> for more info about the book.
-
-<P>Finally, there's <A
-HREF="http://www.google.com/search?q=%22Alexander+G.+M.+Smith%22">Alexander G.
-M. Smith</A>'s ongoing documentation of the file system API, condensed from all
-these sources and from his continuing experiences with trying to write a RAM
-file system.  You can get the StyledEdit text file with the <A
-HREF="http://www.achilles.net/~agmsmith/beos/FileSystemAPINotes20011018.zip">October
-18 2001 version</A> or check the <A
-HREF="http://www.achilles.net/~agmsmith/beos/">BeOS directory</A> on his site
-for newer versions.
-
-<P><FONT SIZE="-1">Last updated November 11, 2001 by AGMS.</FONT>
-
 </BODY>
 </HTML>



From bonefish at cs.tu-berlin.de  Mon Aug  6 03:05:58 2007
From: bonefish at cs.tu-berlin.de (Ingo Weinhold)
Date: Mon, 06 Aug 2007 03:05:58 +0200
Subject: [Haiku-commits] r21830 - haiku/trunk/src/system/kernel/fs
In-Reply-To: <200708052338.l75NcWG9022188@sheep.berlios.de>
References: <200708052338.l75NcWG9022188@sheep.berlios.de>
Message-ID: <20070806030558.2673.4@cs.tu-berlin.de>


On 2007-08-06 at 01:38:32 [+0200], axeld at BerliOS <axeld at mail.berlios.de> 
wrote:
> Author: axeld
> Date: 2007-08-06 01:38:31 +0200 (Mon, 06 Aug 2007)
> New Revision: 21830
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21830&view=rev
> 
> Modified:
>    haiku/trunk/src/system/kernel/fs/pipefs.cpp
> Log:
> mmlr+bonefish(+axeld - I put the bug in there ;-)):
> * Inode::MayReleaseWriter() would release the semaphore too often; 
> therefore,
>   Inode::WriteDataToBuffer() now loops in case it still couldn't write 
>   anything
>   instead of failing - this fixes a race condition (ie. a device is full 
>   message).
> * In case the read request got filled two times (while adding the request, 
> and
>   after waiting for it to become filled), ReadRequest::PutBuffer() 
>   overwrote the
>   output data. This fixes bug #1331.

After sleeping over it, I think we need to review this. read - wait - read 
for a single request sounds like we could read non-contiguous data.

CU, Ingo


From nielx at mail.berlios.de  Mon Aug  6 11:09:31 2007
From: nielx at mail.berlios.de (nielx at BerliOS)
Date: Mon, 6 Aug 2007 11:09:31 +0200
Subject: [Haiku-commits] r21832 - haiku/trunk/docs/user
Message-ID: <200708060909.l7699VZu004662@sheep.berlios.de>

Author: nielx
Date: 2007-08-06 11:09:29 +0200 (Mon, 06 Aug 2007)
New Revision: 21832
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21832&view=rev

Modified:
   haiku/trunk/docs/user/apidoc.dox
Log:
Update the API guidelines to make them more consistent with the coding 
guidelines. Three new guidelines:
- Commas between names and email adresses in header blocks.
- Indent with tabs (with lenght 4)
- Two whitelines between blocks


Modified: haiku/trunk/docs/user/apidoc.dox
===================================================================
--- haiku/trunk/docs/user/apidoc.dox	2007-08-06 00:03:49 UTC (rev 21831)
+++ haiku/trunk/docs/user/apidoc.dox	2007-08-06 09:09:29 UTC (rev 21832)
@@ -1,687 +1,707 @@
-/*
- * Copyright 2007 Haiku Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors: 
- *   Niels Sascha Reedijk <niels.reedijk at gmail.com>
- * Proofreaders:
- *   Alan Smale <ajsmale at gmail.com>
- */
-
-/*!
-  \page apidoc Documenting the API
-  
-  This article explains how to document the API. Its intended audience are the
-  Haiku developers who want to document their own classes, and also the members
-  of the API Documentation team who want to brush up the documentation.
-  
-  This document is divided into three sections. \ref formalrequirements
-  describes the demands that are made from the markup and spacing of the files.
-  \ref commands describes the subset of Doxygen commands the Haiku API
-  documentation uses, and which commands are used in which situation. \ref style
-  describes the required style and structure of the documentation.
-  
-  If you are a developer and you want to prepare the first version of the
-  documentation for the API documentation team to go over, have a good look at
-  the formal requirements and the Doxygen commands. In addition, have a quick
-  glance at how to write member and class documentation, since you'll need to
-  know which information is mandatory for the documentation. Aspiring members or
-  members of the API documentation team should read the third section carefully,
-  and should also check out some of the finished documentation to get a good
-  grip on the actual tone, style and contents of the documentation.
-  
-  \section formalrequirements Formal Requirements
-
-  This section describes formal requirements, such as location and naming of
-  the files, the header blocks of files, what blocks of documentation look like
-  and how to put delimiters to separate different 'blocks' in your source file.
-  
-  \subsection formalrequirements_location Location of the Documentation Source
-  
-  Doxygen, the tool that we use to generate the marked up documentation, has an
-  ingenious parser that is able to scan through both header and source files
-  making it possible to document the API directly in the headers or the source.
-  However, the Haiku project have decided not to put the documentation in either
-  location, and opt for the third option Doxygen provides: to put the
-  documentation into separate files.
-  
-  \note The reasons to not put the documentation in the header files are
-    twofold. First of all, it would add unnecessary cruft to the headers that
-    the compiler will needlessly have to parse. File access and speed isn't BeOS
-    and Haiku's best quality. The second reason is that the system headers are
-    included throughout the tree. It's a waste of electricity to have everybody
-    recompile the entire tree if someone fixes a typo in the documentation.
-    Likewise, the reason to not put the documentation in the source code is that
-    it unnecessarily clutters up that file. By not using direct documentation we
-    lose some advantages, like the fact that developers might be inclined to
-    update the documentation quicker if they change a method, but as you will
-    see we'll have some methods in place to prevent that to a certain extent.
-  
-  There are a few aspects to the naming and locations of files:
-  -# Most important, documentation files \b mirror header files. This not only
-    means that they get the same name, but also that the order of the methods,
-    variables, functions, etc. will have to be the same.
-  -# The root directory of the public API headers is at \c /trunk/headers/os.
-    In a similar vein, the root of the documentation files is at
-    \c /trunk/src/documentation/haiku_book. The subdirectory structure, or
-    the division of kits, will also be replicated.
-  -# The name of the files is the same as the base of the header files, with
-    the \c dox extension. So \c Something.h becomes \c Something.dox. Note
-    the case!
-  
-  \subsection formalrequirements_headerblock The Header Block
-  
-  Every documentation file will begin with the header block. It's basically a
-  copyright block, with a reference to the author(s) and against which revision 
-  the documentation was written.
-
-  \verbatim
-/*
- * Copyright 2007 Haiku Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *   Niels Sascha Reedijk <niels.reedijk at gmail.com>
- * Proofreaders:
- *   Alan Smale <ajsmale at gmail.com>
- * Corresponds to:
- *   /trunk/headers/os/support/String.h  rev 19731
- *   /trunk/src/kits/support/String.cpp  rev 19731
- */
-  \endverbatim
-  
-  The example above has a few elements that you should take note of:
-  -# The header is put in a standard C comment, which is enclosed between
-    \c /* and \c *\/.
-  -# Every line starts with a whitespace and an asterix, followed by another
-    space. If the text is part of a category, such as <tt>Authors</tt>, put
-    three spaces after the delimiter.
-  -# We start with a copyright notice. The first line is empty, then the 
-    copyright notice, then the line on \e MIT, followed by an empty line.
-  -# Then there is a label <tt>Authors:</tt>, which is followed by
-    lines with names and email addresses between brackets.
-  -# In the same vein there is the label <tt>Proofreaders:</tt> in case the
-    file has been proofread.
-  -# The final part is underneath the label <tt>Corresponds to:</tt>.
-    Underneath there is a list of files and their svn revisions that the
-    current documentation is known to correspond with.
-  -# The header block ends with the \c *\/, where the asterix is aligned with
-    the ones above it.
-  
-  \subsection formalrequirements_blocks Blocks
-  
-  Blocks are the basic units of documentation for Doxygen. At first it will feel
-  like overkill to use blocks, but realize that Doxygen was initially designed
-  to operate on header and source files, and then the blocks of documentation
-  would be before the definition or declaration of the methods, functions,
-  etcetera. Doxygen is used to operating on blocks, and that's why we need to
-  reproduce them in our \c dox files.
-  
-  Blocks should adhere to the following standards:
-  -# All blocks open with \c /*! and close with \c * /
-  -# The documentation is placed in between these markers.
-  -# All the contents in between the markers is indented by two spaces.
-  -# The maximum width of the contents between blocks is 80 columns. <em>Try not
-    to cross this limit</em>, because it will severely limit readability.
-  
-  Example:
-  \verbatim
-/*!
-  \fn bool BList::AddItem(void *item)
-  \brief Append an item to the list.
-
-  \param item The item to add.
-  \retval true The item was appended.
-  \retval false Item was not appended, since resizing the list failed.
-  \sa AddItem(void *item, int32 index)
-*/
-  \endverbatim
-  
-  \note Doxygen also allows the use of single line comments, starting with 
-    \c //!, however, we won't use these \b except for group markers, which you
-    can read more about in the next section.
-  
-  \subsection formalrequirements_delimiters Delimiters
-  
-  Many of the header files in the Haiku API just document one class or one group
-  of functions. However, there be a time when you come across a more complex
-  header and for the sake of clarity in your \c dox file you want to mark the
-  sections. Use the standard delimiter marker for this, which consists of five
-  slashes, a space, the title of the section, a space and another five slashes.
-  Like this: <tt>///// Global Functions /////</tt>.
-  
-  \note This is only for the source files and for you as documenter. It will
-    not show up in the actual generated documentation!
-  
-  \section commands Doxygen Commands
-  
-  This section describes all the Doxygen commands that will be used in the Haiku
-  API documentation. As a rule, Doxygen commands start with a backslash (\\) and
-  are followed by whitespace (such as a space or a newline), with the exception
-  of group markers; this is discussed in more detail later on. The commands can
-  be divided into several categories, which are described in the following
-  subsections.
-  
-  \note This section does not discuss which commands you should actually use
-    in documentation. See the next section on \ref style
-    for that. This section merely explains the different groupings and
-    syntaxes of commands.
-  
-  Most commands accept an argument. Arguments can be one of these three types:
-  - \<single_word\> - The argument is a single word.
-  - (until the end of the line) - The argument runs until the end of the line.
-  - {paragraph} - The argument runs for an entire paragraph. A paragraph is
-    ended by an empty line, or if another command that defines a \ref
-    commands_sections sections is found. Note that if you use commands that
-    work on a paragraph and you split it over multiple lines (because of the
-    maximum line width of 80 characters or because it looks better), you will
-    have to indent subsequent lines that belong to the paragraph with two more
-    spaces, making the total of four. This is to visually distinguish
-    paragraphs for other documenters.
-  
-  \subsection commands_definitions Block Definitions
-  
-  Because our API documentation is not done in the source, nor in the headers,
-  Doxygen needs to be helped with figuring out what the documentation in the
-  different blocks actually are about. That's why the first line in a
-  documentation block would be one of the following commands:
-  
-  - \c \\class \<name\> \n
-    Tells Doxygen that the following section is going to be on the class as
-    specified by \a name.
-  - \c \\fn (function declaration) \n
-   This block is going to be about the function that corresponds to the given
-   declaration. Please note that the declaration is what you find in the source
-   file, so if class members are declared, the classname and the scope operator,
-   \c ::, are to be added as well. Modifiers such as \c const should be
-   included.
-  - \c \\var (variable declaration) \n
-    This block is going to be about the variable indicated by the declaration.
-    This means basically that data members of a class should have the classname
-    and the scope operator as well.
-  - \c \\typedef (typedef declaration) \n
-    This block is going to be about the typedef indicated by the declaration.
-    Copy the declaration exactly, including the leading \c typedef keyword.
-  - \c \\struct \<name\> \n
-    Tells Doxygen the section is going to be on the \c struct indicated by
-    \a name. 
-  - \c \\def \<name\> \n
-    This block is going to be about the \c \#define with the identifier \a name.
-  - \c \\page \n
-    This block represents a page. See the section on \ref commands_pages for
-    detailed information on pages.
-  
-  \subsection commands_sections Sections in Member Documentation
-  
-  If you have a look at the output that Doxygen generates, you can see that
-  there are recurring sections in the documentation. Documentation that belongs
-  to a certain section should be placed after a command that marks the start
-  of that section. All the commands take a paragraph as answer. A paragraph
-  ends with a whitespace, or with a command that marks a new section. Note that
-  this list only shows the syntax of the commands. For the semantics, have a
-  look at the next section on style. In member documentation you can use the
-  following:
-  
-  - \c \\brief {brief description} \n
-    This is the only \b mandatory section. Every member should have at least
-    a brief description. 
-  - \c \\param \<parameter-name\> {parameter description} \n
-    This section describes a parameter with the name \a parameter-name. The
-    parameter name must match the function declaration, since Doxygen will
-    check if all the documented parameters exist.
-  - \c \\return {description of the return value} \n
-    This section describes the return value. This is a totally free form
-    paragraph, whereas \c \\retval has a more structured form.
-  - \c \\retval \<value\> {description} \n
-    This section describes the return value indicated by \a value. 
-  - \c \\see {references} \n
-    This section contains references to other parts of the documentation.
-  
-  There are also a number of things that can be used in pages and member
-  documentation. See the style section to find out the appropriate situations in
-  which to use them.
-  
-  - \c \\note {text}
-  - \c \\attention {text}
-  - \c \\warning {text}
-  - \c \\remarks {text}
-  
-  \subsection commands_markup Markup
-  
-  Sometimes you might require certain text to have a special markup, to make
-  words stand out, but also if you want to have example code within the
-  documentation you'll need a special markup. Doxygen defines three types of
-  commands. There are commands that work on single words, commands that work on
-  longer phrases and commands that define blocks. Basically, the single letter
-  commands are commands that work on a the next word. If you need to mark
-  multiple words or sentences, use the HTML-style commands. Finally, for blocks
-  of code or blocks of text that need to be in "typewriter" font, use the block
-  commands. Have a look at the following listing:
-  
-  - \c \\a \n
-    Use to refer to parameters or arguments in a running text, for example
-    when referring to parameters in method descriptions.
-  - <b>Bold text</b>
-    - For single words, use \c \\b.
-    - For multiple words, enclose between the \c \<b\> and \c \<\\b\> tags.
-  - <tt>Typewriter font</tt> \n
-    This can be used to refer to constants, or anything that needs to be in
-    a monospace, or typewriter, font. There are a few options
-    - \c \\c for single words.
-    - \c \<tt\> and \c \<\\tt\> for multiple words or phrases
-    - The commands \c \\verbatim and \c \\endverbatim. Everything between these
-    two commands will be put in a distinct block that stands out from the rest
-    of the text.
-    - The commands \c \\code and \c \\endcode do the same, but Doxygen will
-    parse the contents and try to mark up the code to make it look a little bit
-    nicer.
-  - <em>Emphasis</em>
-    - \c \\e for single words.
-    - \c \<em\> and \c \<\\em\> for phrases.
-  
-  \subsection commands_pages Page Commands
-  
-  Pages are a very special element of the documentation. They are not 
-  associated with any kind of module, such as files or classes, and therefore,
-  since they're not members, some of the structuring commands won't work.
-  Important to know is that a page is the complete length of the block, so
-  dividing it up in subsections by starting new blocks will not work. Instead,
-  Doxygen provides some commands to structure text on a page.
-  
-  First of all, you define a new page by using the \c \\page command. This
-  command takes two arguments: a \c \<name\> and <tt>(a title)</tt>. The name
-  is the internal identifier that can be used in linking between pages (see
-  \ref commands_miscellaneous for \c \\ref). After you've defined the block
-  to be a page, you can start writing the contents. 
-  
-  For more complicated pages,  you might want to divide the page up in sections.
-  Use the \c \\section command to define a new section. It takes the same
-  arguments as \c \\page, namely the \c \<name\> and the <tt>(title)</tt>. If
-  you need a deeper hierarchy you may use \c \\subsection and 
-  \c \\subsubsection, again, both with the same syntax. If you need to
-  distinguish between sections in subsubsections, you are able to use 
-  \c \\paragraph, which takes the same arguments.
-  
-  \note Before and after each of the commands above, you need to have an empty
-    line so as to provide readability. It is not necessary to indent sections
-    and subsections more than the normal two spaces, as long as you keep the
-    section markers clear.
-  
-  \warning If you are entering the realm of subsections and sub-subsections,
-    think about the nature of your page. Either it needs to be split up into
-    multiple pages, or what you're writing is too complex and would be better
-    off as a big tutorial on the Haiku website.
-  
-  If you are creating multiple pages that are related, you will be able to
-  structure them in a tree by using the \c \\subpage command. This will rank
-  the different pages in a tree structure. It will put a link in the place of
-  the command, so you should place it at the top of the parent place and use
-  it as an index.
-  
-  \subsection commands_grouping  Member Grouping Commands
-  
-  Doxygen makes it possible to group certain members together. It is used
-  in the BString class for example, where the members are grouped by what kind
-  of operation they perform, such as appending, finding, etc. Defining groups
-  is currently not as powerful as it could be, but if you use it inside classes,
-  you will be fine if you follow the instructions presented in this section.
-  
-  \note If you are looking on how to add classes to kits, see
-    \ref commands_miscellaneous and have a look at the \c \\ingroup command.
-  
-  Groups of members are preceded by a block that describes what the group is
-  about. You are required to give each group of members at least a name. Have
-  a look at the example: 
-  
-  \verbatim
-/*!
-  \\name Appending Methods
-  
-  These methods append things to the object.
-*/
-
-//! \@{
-
-... names of the methods ...
-
-//! \@}
-  \endverbatim
-  
-  The block preceding the block opening marker, <tt>//! \@{</tt>, contains a
-  \c \\name command and a paragraph that gives a description. The header block 
-  can be as long or short as you want, but please don't make it too long. See
-  the \ref style section on how to effectively write group headers. The
-  members that you want to belong to the group are between the group opening
-  and closing markers.
-  
-  \note Group headers don't have a \c \\brief description.
-  
-  \subsection commands_miscellaneous Miscellaneous Commands
-  
-  There are some commands that don't fit into the categories above, but that
-  you will end up using every now and then. This section will describe those
-  commands.
-  
-  The first one is \c \\n. This commands sort of belongs to the category of
-  markup commands. It basically forces a newline. Because Doxygen parses
-  paragraphs as a single contiguous entity, it's not possible to mark up the
-  text using carriage returns in the documentation. \c \\n forces a newline in
-  the output. So in HTML it will be translated into a \c \<br\\\>.
-  
-  Sometimes there are some parts of the API that you don't want to be visible.
-  Since Doxygen extracts all the public and protected members from a class,
-  and virtually every member from a file, you might want to force it to hide
-  certain things. If so, use the \c \\internal command. If you place this just
-  after the block marker, the command will be hidden from documentation. Any
-  further documentation or remarks you put inside the block will not be visible
-  in the final documentation. 
-  
-  Images can be a valuable addition to documentation. To include ones you made,
-  use the \c \\image command. It has the following prototype:
-  <tt>\\image \<format\> \<file\></tt>. The format is currently fixed at
-  \c html. The file refers to the filename relative to the location of the
-  documentation file. Any images you want to add should be in the same location
-  as the dox file, so only the file name will suffice.
-  
-  Modules are defined in the main book, and you can add classes to them by
-  using the \c \\ingroup command. This commands adds the class to the module
-  and groups it on a separate page. At this moment, the group handling has yet
-  to be finalised. For now, add the classes to the kit they belong in. In the
-  future this might change.
-  
-  Finally, it is a good idea to link between parts of the documentation. There
-  are two commands for that. The first one is \c \\ref, which enable you to refer
-  to pages, sections, etc. that you created yourself. The second one is \c \\link 
-  which refers to members. The first one is takes one word as an argument, the
-  name of the section, and it inserts a link with the name of the title. \c \\link
-  is more complex. It should always be accompanied by \c \\endlink. The first
-  word between the two commands is the object that is referred to, and the
-  rest is the link text. 
-  
-  \section style Writing Guidelines
-  
-  This final section will present guidelines for the actual writing of the
-  documentation. Both the structure of the documentation, which sections to use
-  when, and the style of the writing will be discussed. Before diverging into
-  the requirements for file and class descriptions, member descriptions and
-  pages, there are some general remarks that apply to all types of
-  documentation.
-  
-  First of all, everything you write should be in <em>proper English 
-  sentences</em>. Spelling, grammar, punctuation, make sure you adhere to the
-  standards. It also means the following:
-  - It means that every sentence should at least have a
-    subject and a verb (unless it's an imperative statement).
-  - Also use the proper terminology. Remember, you are dealing with C++
-    here, which means you should use the right names. So use \b method instead
-    of function, and data member instead of variable (where appropriate).
-  - Avoid informalism. Avoid constructs like 'if you want to disconnect the 
-    object', but rather use 'to disconnect the object'. Avoid familiarisms, or
-    jokes.
-    
-  \remarks It isn't the goal to create dry, legal-style documentation. Just
-    try to find a balance. Read through documentation that's already been
-    approved to get a hint of what you should be aiming for.
-  \remarks If you are having a problem with phrasing certain things, put it
-    down in such a way that it says everything it needs to. A proofreader might
-    then be able to rephrase it to a better style.
-  
-  Throughout the documentation you might want to provide hints, warnings or
-  remarks that might interrupt the flow of the text, or that need to visually
-  stand out from the rest. Doxygen provides commands for paragraphs that
-  display remarks, warnings, notes and points of attention. You can use these
-  commands in case you meet one or more of the following requirements:
-  - The point is for a specific audience, such as beginners in the Haiku API.
-    Notes on what to read first, or mistakes that may be made by beginners will
-    not be for the entire audience, and such should be separated. These kinds of
-    notes should be at the end of blocks.
-  - The point needs to visually stand out. This is especially the case with
-    remarks, but could also apply for other types.
-  - The point is not completely relevant to the text and therefore should be
-    separated so that it doesn't interrupt the main flow.
-  
-  This listing shows which one to use for which situation:
-  - \c \\attention
-    - Used when the developer is bound to make a mistake, when the API is
-      ambiguous. The difference between this and a warning is that warnings warn
-      about things that are the developers fault, and attention blocks warn
-      about things that might go wrong because of the way the API is structured.
-    - Used to warn for abuse of the API that might be caused by the way the
-      internals of the system are structured.
-  - \c \\warning
-    - Used to warn developers about using the API in a certain way. Warnings
-      apply especially to new developers that aren't completely familiar with
-      the API and that might want to abuse it. For example, the thread safety
-      of BString requires a warning.
-  - \c \\note
-    - Used to place references to other documentation that might not be
-      directly related to the text. For example, BLooper will have a direct
-      reference to BHandler in the class description, but BMessenger will be
-      mentioned in a note because it does not directly influence the use of
-      the class.
-    - Can also be used for useful hints or notes that somehow need to stand
-      out from the rest of the text.
-  - \c \\remarks
-    - Remarks are small notes that would interrupt the flow of the text. For
-      example, if you in a text ignore a certain condition that is so extremely
-      rare and uncommon, you can put a remark at the end of the text to tell
-      that you have been lying.
-    - Remarks interact with the text whereas notes add something unmentioned to
-      it.
-  
-  \subsection style_files File Descriptions
-  
-  The design of Doxygen makes it very file oriented, and this might come off as
-  inconvenient. At the moment, how to actually group the documentation is still
-  under debate, but it does not change the requirement that a header needs to
-  be documented before the members of that header can be documented. As such,
-  the first documentation block in your \c dox file will be the block that
-  describes the header. Examples:
-  
-  \verbatim
-/*!
-  \file String.h
-  \brief Defines the BString class and global operators and functions for 
-    handling strings.
-*/
-
-/*!
-  \file SupportDefs.h
-  \brief Defines basic types and definitions for the Haiku API.
-*/ 
-  \endverbatim
-  
-  The first statement defines what the block is about, namely the header file.
-  The second element is the \c \\brief remark on what it contains. The first
-  file defines the BString class and some global operators. You can see that
-  reflected in the description. SupportDefs.h does not define classes, but
-  rather a range of different functions and defines, so the text refers to that.
-  
-  \remarks \\brief documentation for files is about what it \e implements, as
-    header files are passive (whereas members and functions are active). Thus,
-    use the third person form of the verb.
-  
-  \subsection style_classes Class Descriptions
-  
-  Classes are the basic building blocks in the Haiku API and as such have
-  extensive documentation. This section will go over the actual class
-  description. This section will present a list of items you should think about
-  when writing the class description. This doesn't mean you'll have to include
-  every item, it merely serves as a guiding principle that helps organise your
-  thoughts. Have a look at the list:
-  
-  -# The \c \\brief description is \b obligatory. This description describes
-    what it is. For example, BDataIO: "Abstract interface for objects that
-    provide read and write access to data." Note that this description is not
-    a full sentence, but it does end with a period.
-  -# One or more paragraphs that give a broad overview of what the class can
-    do. Describe things like what it works on, when you want to use it, what
-    advantage it might give over other directly related alternatives. Also
-    describe if a class is made to be derived from, and if so, how. Make
-    sure that a developer in the first few paragraphs can judge if what he
-    wants to do can be done with this class. 
-  -# One or more paragraphs that show how this class ties in with the rest
-    of the kit or the API. What objects does it work with, how it interacts
-    with the servers, etcetera. 
-  -# One or more paragraphs that give a concrete example or use case. Keep it
-    tidy and self contained. If you use code examples, make sure your examples
-    adhere to Haiku's coding guidelines. Remember, an example can illustrate
-    better than a few paragraphs of text.
-  -# End with a list of references to other classes, functions, pages, etc. that
-   might be of interest to the reader.
-  
-  When documenting classes, don't be to exhaustive. Avoid becoming a tutorial
-  or a complete guide. This documentation is for reference only. If you want to
-  enlighten the reader on bigger subjects, consider writing a separate
-  documentation page that connects the different points you want to make.
-  
-  Also, you don't have to put in any groupings of members in class descriptions.
-  If you want to do that, physically divide the members up in groups. Look at
-  the \ref commands_grouping for the actual commands, and at \ref style_groups
-  for help on writing group headers.
-  
-  \subsection style_members Members and Functions
-  
-  Members and functions share the same basic Doxygen syntax, and they can be
-  documented in a similar way. That's why this section deals with them together.
-  Documenting members is probably the main thing you'll do when writing the
-  actual documentation. There are some guidelines as to how, but the actual
-  implementation probably differs per class. Keep the following points in mind:
-  
-  -# To repeat a very important fact, the first line is a \c \\fn line. This
-    line needs to match the declaration, which is in the source file. This
-    means that for members, also the class name and the scope indicator (::)
-    should be present. Also note that this line doesn't have to adhere to
-    the 80 column width limit.
-  -# The first command is always the \c \\brief command. Give a short and
-    clear description. The description starts with a capital letter and ends
-    with a dot. Don't write the description saying what the method does,
-    like "Starts the timer", but rather as what it will do: "Start the timer."
-  -# If the brief description doesn't cover all of what the method or function
-    does, then you can add a few paragraphs that explain it in more depth. Don't
-    be too verbose, and use an example to illustrate points. Point out any
-    potential misunderstandings or problems you expect developers to have, but
-    don't repeat the class documentation too much.
-  -# You are obliged to then document all the parameters. Use the \c \\param
-    command for that. For the description, use a short phrase such as "The 
-    offset (zero based) where to begin the move." Note the capital and the dot.
-  -# If the function is non-void, then you'll have to specify what it will
-    return. In case of fixed values, have a look at \c \\retval. You'll use
-    this one when the return type is a bool or a status_t. In case of something
-    else, use \c \\return. You can also combine these two. For example, a
-    method that returns a length (positive) or an error code (negative).
-  -# Use \c \\see if you have any references to other methods, classes or
-    global functions. At least document all the overloaded methods. Also add
-    methods that do the opposite of this method, or methods that are intimately
-    related.
-  
-  In case of overloaded members, you'll need to make a decision. If you need to
-  copy too much information, you might resort to putting it in one paragraph
-  with the text "This is an overloaded member function, and differs from
-  \<name\> only by the type of parameter it takes." That will keep the copying
-  down and will point developers right to the place where they can get more
-  documentation.
-  
-  Again, like class descriptions, you'll have to find a good middle-ground
-  between too much information, and too little. Again, write for the broadest
-  audience possible, and resort to notes and warnings for specialised 
-  audiences.
-  
-  \subsection style_variables Enumerations, Variables and Defines
-  
-  This section helps you document (member) variables and defines that define
-  constants, as well as enumerations and their values. If you need to document
-  a \c \#define macro that takes arguments, have a look at \ref style_members .
-  
-  The \c \\brief description of all these types follow a similar structure. 
-  They are a short phrase that mention what the variable contains. Example:
-  
-  \verbatim
-/*!
-  \var char* BString::fPrivateData
-  \brief BString's storage for data.
-
-  This member is deprecated and might even become \c private in future releases.
-
-  If you are planning to derive from this object and you want to manipulate the
-  raw string data, please have a look at LockBuffer() and UnlockBuffer().
-*/
-  \endverbatim
-  
-  The variables you are going to encounter are either \c public or 
-  \c protected member variables, or global variables that have a certain
-  significance. In the case of member variables, you'll need to document what
-  they mean and how the developer should manipulate them. If the class is one 
-  that is meant to be derived from, make sure that in the description of the
-  variable you mention how it interacts with the others, and how the developer
-  should make sure that the internal coherence of the data and code members of
-  the inherited class is maintained. 
-  
-  Global variables will mostly be constants. If so, document what they stand
-  for and what they might be used for, as well as which classes and functions
-  depend on that constant. If the variable is meant to be changed by the
-  developer, explain what values are valid and which functions and classes
-  depend on this variable. 
-  
-  Defines are usually used as message constants. Give a short description of
-  what the message constant stands for, and where it might be send from and
-  where it might be received.
-  
-  Enumerations can either be anonymous or named. In case of the latter, you can
-  give a description of the enumeration in a documentation block that starts
-  with an \c \\enum command, followed by the name of the enumeration. If the
-  enumeration is within the scope of a class, prepend the classname and the 
-  scope indicator. In case of an anonymous enum, you can only document the
-  individual members (which you should do for the named enumerations as well),
-  which can be done within code blocks that start with the \c \\var command.
-  Doxygen will know that it's an enumeration value, don't worry about mixups.
-  If the enumeration value is within a class, prepend the classname and scope
-  indicator. Give a short description of the value, which methods react to it, 
-  where it might be used, etcetera. Don't go as far as to copy information too 
-  much. For example, if you use an enumeration in only one class and you
-  document the possible values there, then don't do that again for the
-  enumeration documentation: rather just refer to it. That sort of documentation
-  belongs to the class description, not to the enumeration.
-  
-  \subsection style_groups Groups
-  
-  If you subdivide members of classes into groups, you have the ability to apply
-  some general information that will be listed above the listing of the members
-  in that group. See the section \ref commands_grouping on how to define groups.
-  This section is on what to put in the header block.
-  
-  First of all, it's probably a good idea to give your group a name. This name
-  will be printed as a title and will enhance the clarity of what the group
-  contains. If you put the \c \\name command as the first command of a group,
-  the rest of the words on that line will be used as the title. You should
-  choose simple titles of no more than three words.
-  
-  It's possible to add one or two paragraphs of information. These paragraphs
-  should contain some quick notes on which of the members in that group to use
-  for what purpose. See it as a quick subdivision that a developer could use as
-  a guide to see which method he actually wants to use. Don't go on describing
-  the methods in detail though, that's what the member documentation is about.
-  Have a look at the example:
-  
-  \verbatim
-/*!
-  \name Comparison Methods
-
-  There are two different comparison methods. First of all there is the whole
-  range of operators that return a boolean value, secondly there are methods
-  that return an integer value, both case sensitive and case insensitive.
-
-  There are also global comparison operators and global compare functions.
-  You might need these in case you have a sort routine that takes a generic
-  comparison function, such as BList::SortItems().
-  See the String.h documentation file to see the specifics, as they are
-  basically the same as implemented in this class.
-*/
-  \endverbatim
-  
-  Straight, to the point, gives no more information than necessary. Divides
-  the members up into two groups and refers to other functions the developer
-  might be looking for. The hard limit is two (short) paragraphs. Using more
-  will not improve clarity.
-
-*/
+/*
+ * Copyright 2007 Niels Sascha Reedijk. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *   Niels Sascha Reedijk, niels.reedijk at gmail.com
+ * Proofreaders:
+ *   Alan Smale, ajsmale at gmail.com
+ */
+
+
+/*!
+	\page apidoc Documenting the API
+	
+	This article explains how to document the API. Its intended audience are the
+	Haiku developers who want to document their own classes, and also the
+	members of the API Documentation team who want to brush up the
+	documentation.
+	
+	This document is divided into three sections. \ref formalrequirements
+	describes the demands that are made from the markup and spacing of the
+	files. \ref commands describes the subset of Doxygen commands the Haiku API
+	documentation uses, and which commands are used in which situation. \ref
+	style describes the required style and structure of the documentation. If
+	you are a developer and you want to prepare the first version of the
+	documentation for the API documentation team to go over, have a good look at
+	the formal requirements and the Doxygen commands. In addition, have a quick
+	glance at how to write member and class documentation, since you'll need to
+	know which information is mandatory for the documentation. Aspiring members
+	or members of the API documentation team should read the third section
+	carefully, and should also check out some of the finished documentation to
+	get a good grip on the actual tone, style and contents of the documentation.
+
+	\section formalrequirements Formal Requirements
+
+	This section describes formal requirements, such as location and naming of
+	the files, the header blocks of files, what blocks of documentation look
+	like and how to put delimiters to separate different 'blocks' in your source
+	file.
+
+	\subsection formalrequirements_location Location of the Documentation Source
+
+	Doxygen, the tool that we use to generate the marked up documentation, has
+	an ingenious parser that is able to scan through both header and source
+	files making it possible to document the API directly in the headers or the
+	source. However, the Haiku project have decided not to put the documentation
+	in either location, and opt for the third option Doxygen provides: to put
+	the documentation into separate files.
+
+	\note The reasons to not put the documentation in the header files are
+		twofold. First of all, it would add unnecessary cruft to the headers
+		that the compiler will needlessly have to parse. File access and speed
+		isn't BeOS and Haiku's best quality. The second reason is that the
+		system headers are included throughout the tree. It's a waste of
+		electricity to have everybody recompile the entire tree if someone fixes
+		a typo in the documentation. Likewise, the reason to not put the
+		documentation in the source code is that it unnecessarily clutters up
+		that file. By not using direct documentation we lose some advantages,
+		like the fact that developers might be inclined to update the
+		documentation quicker if they change a method, but as you will see we'll
+		have some methods in place to prevent that to a certain extent.
+		There are a few aspects to the naming and locations of files:
+		-# Most important, documentation files \b mirror header files. This
+			not only means that they get the same name, but also that the order
+			of the methods, variables, functions, etc. will have to be the same.
+		-# The root directory of the public API headers is at \c
+			/trunk/headers/os. In a similar vein, the root of the documentation
+			files is at \c /trunk/src/documentation/haiku_book. The subdirectory
+			structure, or the division of kits, will also be replicated.
+		-# The name of the files is the same as the base of the header files,
+			with the \c dox extension. So \c Something.h becomes \c
+			Something.dox. Note the case!
+
+	\subsection formalrequirements_headerblock The Header Block
+
+	Every documentation file will begin with the header block. It's basically a
+	copyright block, with a reference to the author(s) and against which
+	revision the documentation was written.
+
+	\verbatim
+/*
+* Copyright 2007 Niels Sascha Reedijk. All rights reserved.
+* Distributed under the terms of the MIT License.
+*
+* Authors:
+*   Niels Sascha Reedijk, niels.reedijk at gmail.com
+* Proofreaders:
+*   Alan Smale, ajsmale at gmail.com
+* Corresponds to:
+*   /trunk/headers/os/support/String.h  rev 19731
+*   /trunk/src/kits/support/String.cpp  rev 19731
+*/
+	\endverbatim
+
+	The example above has a few elements that you should take note of:
+	-# The header is put in a standard C comment, which is enclosed between \c
+		/* and \c *\/.
+	-# Every line starts with a whitespace and an asterix, followed by another
+		space. If the text is part of a category, such as <tt>Authors</tt>, put
+		three spaces after the delimiter. 
+	-# The first line is empty, then we get to the copyright notice. You may
+		either retain the copyright yourself, or you can attribute to to Haiku
+		Inc. It's your choice. The next line is the \e MIT licence notice,
+		followed by an empty line.
+	-# Then there is a label <tt>Authors:</tt>, which is followed by
+		lines with names and email addresses. The latter one is optional, but
+		recommended.
+	-# In the same vein there is the label <tt>Proofreaders:</tt> in case the
+		file has been proofread.
+	-# The final part is underneath the label <tt>Corresponds to:</tt>.
+		Underneath there is a list of files and their svn revisions that the
+		current documentation is known to correspond with.
+	-# The header block ends with the \c *\/, where the asterix is aligned with
+		the ones above it.
+
+	\subsection formalrequirements_blocks Blocks
+	
+	Blocks are the basic units of documentation for Doxygen. At first it will
+	feel like overkill to use blocks, but realize that Doxygen was initially
+	designed to operate on header and source files, and then the blocks of
+	documentation would be before the definition or declaration of the methods,
+	functions, etcetera. Doxygen is used to operating on blocks, and that's why
+	we need to reproduce them in our \c dox files.
+
+	Blocks should adhere to the following standards:
+	-# All blocks open with \c /*! and close with \c * /
+	-# The documentation is placed in between these markers.
+	-# All the contents in between the markers is indented by tabs. The tab
+		length should be four.
+	-# Between blocks, there should be two empty lines.
+	-# The maximum width of the contents between blocks is 80 columns. <em>Try
+		not to cross this limit</em>, because it will severely limit
+		readability.
+	
+	Example:
+	\verbatim
+/*!
+	\fn bool BList::AddItem(void *item)
+	\brief Append an item to the list.
+	
+	\param item The item to add.
+	\retval true The item was appended.
+	\retval false Item was not appended, since resizing the list failed.
+	\sa AddItem(void *item, int32 index)
+*/
+	\endverbatim
+	
+	\note Doxygen also allows the use of single line comments, starting with 
+		\c //!, however, we won't use these \b except for group markers, which
+		you can read more about in the next section.
+
+	\subsection formalrequirements_delimiters Delimiters
+
+	Many of the header files in the Haiku API just document one class or one
+	group of functions. However, there be a time when you come across a more
+	complex header and for the sake of clarity in your \c dox file you want to
+	mark the sections. Use the standard delimiter marker for this, which
+	consists of five slashes, a space, the title of the section, a space and
+	another five slashes. Like this: <tt>///// Global Functions /////</tt>.
+
+	\note This is only for the source files and for you as documenter. It will
+		not show up in the actual generated documentation!
+
+	\section commands Doxygen Commands
+
+	This section describes all the Doxygen commands that will be used in the
+	Haiku API documentation. As a rule, Doxygen commands start with a backslash
+	(\\) and are followed by whitespace (such as a space or a newline), with the
+	exception of group markers; this is discussed in more detail later on. The
+	commands can be divided into several categories, which are described in the
+	following subsections.
+
+	\note This section does not discuss which commands you should actually use
+		in documentation. See the next section on \ref style for that. This
+		section merely explains the different groupings and syntaxes of
+		commands.
+
+	Most commands accept an argument. Arguments can be one of these three types:
+	- \<single_word\> - The argument is a single word.
+	- (until the end of the line) - The argument runs until the end of the line.
+	- {paragraph} - The argument runs for an entire paragraph. A paragraph is
+		ended by an empty line, or if another command that defines a \ref
+		commands_sections sections is found. Note that if you use commands that
+		work on a paragraph and you split it over multiple lines (because of the
+		maximum line width of 80 characters or because it looks better), you
+		will have to indent subsequent lines that belong to the paragraph with
+		two more spaces, making the total of four. This is to visually
+		distinguish paragraphs for other documenters.
+
+	\subsection commands_definitions Block Definitions
+
+	Because our API documentation is not done in the source, nor in the headers,
+	Doxygen needs to be helped with figuring out what the documentation in the
+	different blocks actually are about. That's why the first line in a
+	documentation block would be one of the following commands:
+
+	- \c \\class \<name\> \n
+		Tells Doxygen that the following section is going to be on the class as
+		specified by \a name.
+	- \c \\fn (function declaration) \n
+		This block is going to be about the function that corresponds to the
+		given declaration. Please note that the declaration is what you find in
+		the source file, so if class members are declared, the classname and the
+		scope operator, \c ::, are to be added as well. Modifiers such as \c
+		const should be included.
+	- \c \\var (variable declaration) \n
+		This block is going to be about the variable indicated by the
+		declaration. This means basically that data members of a class should
+		have the classname and the scope operator as well.
+	- \c \\typedef (typedef declaration) \n
+		This block is going to be about the typedef indicated by the
+		declaration. Copy the declaration exactly, including the leading \c
+		typedef keyword.
+	- \c \\struct \<name\> \n
+		Tells Doxygen the section is going to be on the \c struct indicated by
+		\a name. 
+	- \c \\def \<name\> \n
+		This block is going to be about the \c \#define with the identifier \a
+		name. 
+	- \c \\page \n
+		This block represents a page. See the section on \ref commands_pages for
+		detailed information on pages.
+
+	\subsection commands_sections Sections in Member Documentation
+
+	If you have a look at the output that Doxygen generates, you can see that
+	there are recurring sections in the documentation. Documentation that
+	belongs to a certain section should be placed after a command that marks the
+	start of that section. All the commands take a paragraph as answer. A
+	paragraph ends with a whitespace, or with a command that marks a new
+	section. Note that this list only shows the syntax of the commands. For the
+	semantics, have a look at the next section on style. In member documentation
+	you can use the following:
+
+	- \c \\brief {brief description} \n
+		This is the only \b mandatory section. Every member should have at least
+		a brief description. 
+	- \c \\param \<parameter-name\> {parameter description} \n
+		This section describes a parameter with the name \a parameter-name. The
+		parameter name must match the function declaration, since Doxygen will
+		check if all the documented parameters exist.
+	- \c \\return {description of the return value} \n
+		This section describes the return value. This is a totally free form
+		paragraph, whereas \c \\retval has a more structured form.
+	- \c \\retval \<value\> {description} \n
+		This section describes the return value indicated by \a value. 
+	- \c \\see {references} \n
+		This section contains references to other parts of the documentation.
+
+	There are also a number of things that can be used in pages and member
+	documentation. See the style section to find out the appropriate situations
+	in which to use them.
+
+	- \c \\note {text}
+	- \c \\attention {text}
+	- \c \\warning {text}
+	- \c \\remarks {text}
+
+	\subsection commands_markup Markup
+
+	Sometimes you might require certain text to have a special markup, to make
+	words stand out, but also if you want to have example code within the
+	documentation you'll need a special markup. Doxygen defines three types of
+	commands. There are commands that work on single words, commands that work
+	on longer phrases and commands that define blocks. Basically, the single
+	letter commands are commands that work on a the next word. If you need to
+	mark multiple words or sentences, use the HTML-style commands. Finally, for
+	blocks of code or blocks of text that need to be in "typewriter" font, use
+	the block commands. Have a look at the following listing:
+
+	- \c \\a \n
+		Use to refer to parameters or arguments in a running text, for example
+		when referring to parameters in method descriptions.
+	- <b>Bold text</b>
+		- For single words, use \c \\b.
+		- For multiple words, enclose between the \c \<b\> and \c \<\\b\> tags.
+	- <tt>Typewriter font</tt> \n
+		This can be used to refer to constants, or anything that needs to be in
+		a monospace, or typewriter, font. There are a few options
+		- \c \\c for single words.
+		- \c \<tt\> and \c \<\\tt\> for multiple words or phrases
+		- The commands \c \\verbatim and \c \\endverbatim. Everything between
+			these two commands will be put in a distinct block that stands out
+			from the rest of the text.
+		- The commands \c \\code and \c \\endcode do the same, but Doxygen will
+			parse the contents and try to mark up the code to make it look a
+			little bit nicer.
+	- <em>Emphasis</em>
+		- \c \\e for single words.
+		- \c \<em\> and \c \<\\em\> for phrases.
+
+	\subsection commands_pages Page Commands
+
+	Pages are a very special element of the documentation. They are not 
+	associated with any kind of module, such as files or classes, and therefore,
+	since they're not members, some of the structuring commands won't work.
+	Important to know is that a page is the complete length of the block, so
+	dividing it up in subsections by starting new blocks will not work. Instead,
+	Doxygen provides some commands to structure text on a page.
+
+	First of all, you define a new page by using the \c \\page command. This
+	command takes two arguments: a \c \<name\> and <tt>(a title)</tt>. The name
+	is the internal identifier that can be used in linking between pages (see
+	\ref commands_miscellaneous for \c \\ref). After you've defined the block
+	to be a page, you can start writing the contents. 
+
+	For more complicated pages,  you might want to divide the page up in
+	sections. Use the \c \\section command to define a new section. It takes the

[... truncated: 400 lines follow ...]


From nielx at mail.berlios.de  Mon Aug  6 11:32:28 2007
From: nielx at mail.berlios.de (nielx at BerliOS)
Date: Mon, 6 Aug 2007 11:32:28 +0200
Subject: [Haiku-commits] r21833 - haiku/trunk/docs/user/support
Message-ID: <200708060932.l769WS9N006174@sheep.berlios.de>

Author: nielx
Date: 2007-08-06 11:32:27 +0200 (Mon, 06 Aug 2007)
New Revision: 21833
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21833&view=rev

Modified:
   haiku/trunk/docs/user/support/Archivable.dox
   haiku/trunk/docs/user/support/BlockCache.dox
   haiku/trunk/docs/user/support/List.dox
Log:
Update according to the latest guideline changes. These files already 
passed phase 3, so they wouldn't be updated during the regular process. 
I guess the other files will get that update.


Modified: haiku/trunk/docs/user/support/Archivable.dox
===================================================================
--- haiku/trunk/docs/user/support/Archivable.dox	2007-08-06 09:09:29 UTC (rev 21832)
+++ haiku/trunk/docs/user/support/Archivable.dox	2007-08-06 09:32:27 UTC (rev 21833)
@@ -1,176 +1,196 @@
-/*
- * Copyright 2007, Haiku, Inc. All Rights Reserved.
- * Distributed under the terms of the MIT License.
- *
- * Author:
- *   Niels Sascha Reedijk <niels.reedijk at gmail.com>
- *
- * Proofreader:
- *   David Weizades <ddewbofh at hotmail.com>
- *   Thom Holwerda <slakje at quicknet.nl>
- *
- * Corresponds to:
- *   /trunk/headers/os/support/Archivable.h rev 19972
- *   /trunk/src/kits/support/Archivable.cpp rev 19095
- */
-
-/*!
-  \file Archivable.h
-  \brief Provides the BArchivable interface.
-*/
-
-/*!
-  \class BArchivable
-  \ingroup support
-  \ingroup libbe
-  \brief Interface for objects that can be archived into a BMessage.
-  
-  BArchivable provides an interface for objects that can be put into message
-  archives and extracted into objects in another location. Using this you are
-  able to send objects between applications, or even between computers across
-  networks.
-  
-  BArchivable differs from BFlattenable in that BFlattenable is designed to
-  store objects into flat streams of data, the main objective being storage to
-  disk. The objective of this interface, however, is to store objects that will
-  be restored to other objects. To illustrate this point, BArchivable messages
-  know how to restore themselves whereas BFlattenables have a datatype which
-  you need to map to classes manually.
-  
-  Archiving is done with the Archive() method. If your class supports it, the
-  caller can request it to store into a deep archive, meaning that all child
-  objects in it will be stored. Extracting the archive works with the
-  Instantiate() method, which is static. Since the interface is designed to
-  extract objects without the caller knowing what kind of object it actually is,
-  the global function #instantiate_object() instantiates a message without you
-  manually having to determine the class the message is from. This adds
-  considerable flexibility and allows BArchivable to be used in combination with
-  other add-ons.
-  
-  To provide this interface in your classes you should publicly inherit this
-  class. You should implement Archive() and Instantiate(), and provide one
-  constructor that takes one BMessage argument.
-*/
-
-/*!
-  \fn BArchivable::BArchivable(BMessage* from)
-  \brief Constructor. Does nothing.
-  
-  If you inherit this interface you should provide at least one constructor that
-  takes one BMessage argument.
-*/
-
-/*!
-  \fn BArchivable::BArchivable()
-  \brief Constructor. Does nothing.
-*/
-
-/*!
-  \fn BArchivable::~BArchivable()
-  \brief Destructor. Does nothing.
-*/
-
-/*!
-  \fn virtual	status_t BArchivable::Archive(BMessage* into, bool deep = true) const
-  \brief Archive the object into a BMessage.
-  
-  You should call this method from your derived implementation as it adds the
-  data needed to instantiate your object to the message.
-  
-  \param into The message you store your object in.
-  \param deep If \c true, all children of this object should be stored as well.
-    Only pay attention to this parameter if you actually have child objects.
-  \retval B_OK The archiving succeeded.
-  \retval "error codes" The archiving did not succeed.
-*/
-
-/*!
-  \fn static BArchivable* BArchivable::Instantiate(BMessage* archive)
-  \brief Static member to restore objects from messages.
-  
-  You should always check that the \a archive argument actually corresponds to
-  your class. The automatic functions, such as #instantiate_object() will not
-  choose the wrong class but manual calls to this member might be faulty.
-  
-  \param archive The message with the data of the object to restore.
-  \retval You should return a pointer to your object, or \c NULL if you 
-    fail.
-  \warning The default implementation will always return \c NULL. Even though
-    it is possible to store plain BArchive objects, it is impossible to restore
-    them. 
-  \see instantiate_object(BMessage *from)
-*/
-
-/*!
-  \fn virtual status_t BArchivable::Perform(perform_code d, void* arg)
-  \brief Internal method.
-  \internal This method is defined in case of unforeseen binary compatibility
-    API issues. Currently nothing of interest is implemented.
-*/
-
-///// Global methods /////
-/*!
-  \addtogroup support_globals
-  @{
-*/
-
-/*!
-  \typedef typedef BArchivable* (*instantiation_func)(BMessage*)
-  \brief Internal definition of a function that can instantiate objects that
-    have been created with the BArchivable API.
-*/
-
-/*!
-  \fn BArchivable* instantiate_object(BMessage *from, image_id *id)
-  \brief Instantiate an archived object with the object being defined in a
-    different application or library.
-  
-  This function is similar to instantiate_object(BMessage *from), except that
-  it takes the \a id argument referring to an image where the object might be
-  stored. 
-  
-  \note Images are names for executable files. Image id's refer to these
-    executable files that have been loaded by your application. Have a look
-    at the kernel API for further information.
-*/
-
-/*!
-  \fn BArchivable* instantiate_object(BMessage *from)
-  \brief Instantiate an archived object.
-  
-  This global function will determine the base class, based on the \a from
-  argument, and it will call the Instantiate() function of that object to
-  restore it. 
-  
-  \param from The archived object.
-  \return The object returns a pointer to the instantiated object, or \c NULL
-    if the instantiation failed. The global \c errno variable will contain the
-    reason why it failed.
-  \see instantiate_object(BMessage *from, image_id *id)
-*/
-
-/*!
-  \fn bool validate_instantiation(BMessage* from, const char* className)
-  \brief Internal function that checks if the \a className is the same as the
-    one stored in the \a from message.
-*/
-
-/*!
-  \fn instantiation_func find_instantiation_func(const char* className,	const char* signature)
-  \brief Internal function that searches for the instantiation func with a
-    specific signature. Use instantiate_object() instead.
-*/
-
-/*!
-  \fn instantiation_func find_instantiation_func(const char* className)
-  \brief Internal function that searches for the instantiation func of a
-    specific class. Use instantiate_object() instead.
-*/
-
-/*!
-  \fn instantiation_func find_instantiation_func(BMessage* archive)
-  \brief Internal function that searches for the instantiation func that
-    works on the specified \a archive. Use instantiate_object() instead.
-*/
-
-//! @}
+/*
+ * Copyright 2007, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Author:
+ *   Niels Sascha Reedijk, niels.reedijk at gmail.com
+ *
+ * Proofreader:
+ *   David Weizades, ddewbofh at hotmail.com
+ *   Thom Holwerda, slakje at quicknet.nl
+ *
+ * Corresponds to:
+ *   /trunk/headers/os/support/Archivable.h rev 19972
+ *   /trunk/src/kits/support/Archivable.cpp rev 19095
+ */
+
+
+/*!
+	\file Archivable.h
+	\brief Provides the BArchivable interface.
+*/
+
+
+/*!
+	\class BArchivable
+	\ingroup support
+	\ingroup libbe
+	\brief Interface for objects that can be archived into a BMessage.
+
+	BArchivable provides an interface for objects that can be put into message
+	archives and extracted into objects in another location. Using this you are
+	able to send objects between applications, or even between computers across
+	networks.
+
+	BArchivable differs from BFlattenable in that BFlattenable is designed to
+	store objects into flat streams of data, the main objective being storage to
+	disk. The objective of this interface, however, is to store objects that
+	will be restored to other objects. To illustrate this point, BArchivable
+	messages know how to restore themselves whereas BFlattenables have a
+	datatype which you need to map to classes manually.
+
+	Archiving is done with the Archive() method. If your class supports it, the
+	caller can request it to store into a deep archive, meaning that all child
+	objects in it will be stored. Extracting the archive works with the
+	Instantiate() method, which is static. Since the interface is designed to
+	extract objects without the caller knowing what kind of object it actually
+	is, the global function #instantiate_object() instantiates a message without
+	you manually having to determine the class the message is from. This adds
+	considerable flexibility and allows BArchivable to be used in combination
+	with other add-ons.
+
+	To provide this interface in your classes you should publicly inherit this
+	class. You should implement Archive() and Instantiate(), and provide one
+	constructor that takes one BMessage argument.
+*/
+
+
+/*!
+	\fn BArchivable::BArchivable(BMessage* from)
+	\brief Constructor. Does nothing.
+	
+	If you inherit this interface you should provide at least one constructor
+	that takes one BMessage argument.
+*/
+
+
+/*!
+	\fn BArchivable::BArchivable()
+	\brief Constructor. Does nothing.
+*/
+
+
+/*!
+	\fn BArchivable::~BArchivable()
+	\brief Destructor. Does nothing.
+*/
+
+
+/*!
+	\fn virtual status_t BArchivable::Archive(BMessage* into,
+		 bool deep = true) const
+	\brief Archive the object into a BMessage.
+	
+	You should call this method from your derived implementation as it adds the
+	data needed to instantiate your object to the message.
+	
+	\param into The message you store your object in.
+	\param deep If \c true, all children of this object should be stored as
+		well. Only pay attention to this parameter if you actually have child
+		objects.
+	\retval B_OK The archiving succeeded.
+	\retval "error codes" The archiving did not succeed.
+*/
+
+
+/*!
+	\fn static BArchivable* BArchivable::Instantiate(BMessage* archive)
+	\brief Static member to restore objects from messages.
+	
+	You should always check that the \a archive argument actually corresponds to
+	your class. The automatic functions, such as #instantiate_object() will not
+	choose the wrong class but manual calls to this member might be faulty.
+	
+	\param archive The message with the data of the object to restore.
+	\retval You should return a pointer to your object, or \c NULL if you 
+		fail.
+	\warning The default implementation will always return \c NULL. Even though
+		it is possible to store plain BArchive objects, it is impossible to
+		restore them. 
+	\see instantiate_object(BMessage *from)
+*/
+
+
+/*!
+	\fn virtual status_t BArchivable::Perform(perform_code d, void* arg)
+	\brief Internal method.
+	\internal This method is defined in case of unforeseen binary compatibility
+		API issues. Currently nothing of interest is implemented.
+*/
+
+
+///// Global methods /////
+/*!
+	\addtogroup support_globals
+	@{
+*/
+
+
+/*!
+	\typedef typedef BArchivable* (*instantiation_func)(BMessage*)
+	\brief Internal definition of a function that can instantiate objects that
+		have been created with the BArchivable API.
+*/
+
+
+/*!
+	\fn BArchivable* instantiate_object(BMessage *from, image_id *id)
+	\brief Instantiate an archived object with the object being defined in a
+		different application or library.
+	
+	This function is similar to instantiate_object(BMessage *from), except that
+	it takes the \a id argument referring to an image where the object might be
+	stored. 
+	
+	\note Images are names for executable files. Image id's refer to these
+		executable files that have been loaded by your application. Have a look
+		at the kernel API for further information.
+*/
+
+
+/*!
+	\fn BArchivable* instantiate_object(BMessage *from)
+	\brief Instantiate an archived object.
+	
+	This global function will determine the base class, based on the \a from
+	argument, and it will call the Instantiate() function of that object to
+	restore it. 
+	
+	\param from The archived object.
+	\return The object returns a pointer to the instantiated object, or \c NULL
+		if the instantiation failed. The global \c errno variable will contain
+		the reason why it failed.
+	\see instantiate_object(BMessage *from, image_id *id)
+*/
+
+
+/*!
+	\fn bool validate_instantiation(BMessage* from, const char* className)
+	\brief Internal function that checks if the \a className is the same as the
+		one stored in the \a from message.
+*/
+
+
+/*!
+	\fn instantiation_func find_instantiation_func(const char* className,
+		const char* signature)
+	\brief Internal function that searches for the instantiation func with a
+		specific signature. Use instantiate_object() instead.
+*/
+
+
+/*!
+	\fn instantiation_func find_instantiation_func(const char* className)
+	\brief Internal function that searches for the instantiation func of a
+		specific class. Use instantiate_object() instead.
+*/
+
+
+/*!
+	\fn instantiation_func find_instantiation_func(BMessage* archive)
+	\brief Internal function that searches for the instantiation func that
+		works on the specified \a archive. Use instantiate_object() instead.
+*/
+
+
+//! @}

Modified: haiku/trunk/docs/user/support/BlockCache.dox
===================================================================
--- haiku/trunk/docs/user/support/BlockCache.dox	2007-08-06 09:09:29 UTC (rev 21832)
+++ haiku/trunk/docs/user/support/BlockCache.dox	2007-08-06 09:32:27 UTC (rev 21833)
@@ -3,124 +3,133 @@
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *   Niels Sascha Reedijk <niels.reedijk at gmail.com>
+ *   Niels Sascha Reedijk, niels.reedijk at gmail.com
  *
  * Proofreading:
- *   David Weizades <ddewbofh at hotmail.com>
- *   Thom Holwerda <slakje at quicknet.nl>
+ *   David Weizades, ddewbofh at hotmail.com
+ *   Thom Holwerda, slakje at quicknet.nl
  * 
  * Corresponds to:
  *   /trunk/headers/os/support/BlockCache.h  rev 19972
  *   /trunk/src/kits/support/BlockCache.cpp  rev 4568
  */
- 
+
+
  /*!
-  \file BlockCache.h
-  \brief Implements a mechanism to store and retrieve memory blocks.
+	\file BlockCache.h
+	\brief Implements a mechanism to store and retrieve memory blocks.
 */
 
+
 /*!
-  \var B_OBJECT_CACHE
-  \brief Used in the constructor of BBlockCache. Determines that objects will
-    be created using \c new[] and \c delete[].
+	\var B_OBJECT_CACHE
+	\brief Used in the constructor of BBlockCache. Determines that objects will
+		be created using \c new[] and \c delete[].
 */
 
+
 /*!
-  \var B_MALLOC_CACHE
-  \brief Used in the constructor of BBlockCache. Determines that objects will
-    be created using \c malloc() and \c free().
+	\var B_MALLOC_CACHE
+	\brief Used in the constructor of BBlockCache. Determines that objects will
+		be created using \c malloc() and \c free().
 */
 
+
 /*!
-  \class BBlockCache
-  \ingroup support
-  \ingroup libbe
-  \brief A class that creates and maintains a pool of memory blocks.
+	\class BBlockCache
+	\ingroup support
+	\ingroup libbe
+	\brief A class that creates and maintains a pool of memory blocks.
+	
+	In some performance critical code there might come a time where you require
+	a lot of little blocks of memory that you want to access and dispose of
+	continuously. Since allocating and freeing memory are 'expensive'
+	operations, it is better to have a pool of memory blocks at your disposal.
+	Luckily, the Haiku API provides a class that will act as the administrator
+	of your memory pool, so you will not have to reinvent the wheel every time.
+	
+	The principle is easy. The constructor takes the number of blocks you
+	want to create beforehand, the size of the blocks, and the method of
+	allocation. This can either be #B_OBJECT_CACHE or #B_MALLOC_CACHE.
+	The first one uses C++ operators \c new[] and \c delete[], while the second
+	one uses \c malloc() and \c free(). Unless you have specific demands on
+	performance or you want to take care of freeing the objects yourself, either
+	way works fine.
+	
+	As soon as you have the memory pool, you can Get() blocks. If the
+	pre-allocated memory blocks run out, BBlockCache will allocate new ones, so
+	you will not have to worry about availability. As soon as you are done you
+	can Save() the memory back into the pool. BBlockCache will make sure that no
+	more blocks will be saved than the initial number you requested when you
+	created the object, so be aware of that.
+	
+	As soon as you got a pointer from the Get() method, you own that block of
+	memory; this means that you have the liberty to dispose of it yourself. It
+	also means that when you delete your BBlockCache instance, any blocks of
+	memory that are checked out will not be destroyed. In case you might want to
+	delete your objects yourself, make sure you free the memory the right way.
+	If you created the object as #B_OBJECT_CACHE, use \c delete[] to free your
+	object. If you created the object as #B_MALLOC_CACHE, use \c free(). Please
+	note that it defeats the purpose of this class if your are going to free all
+	the objects yourself since it basically means that when the pool runs out,
+	Get() will be allocating the objects by itself.
+	
+	\note BBlockCache is thread-safe.
+*/
 
-  In some performance critical code there might come a time where you require a
-  lot of little blocks of memory that you want to access and dispose of
-  continuously. Since allocating and freeing memory are 'expensive' operations,
-  it is better to have a pool of memory blocks at your disposal. Luckily, the
-  Haiku API provides a class that will act as the administrator of your memory
-  pool, so you will not have to reinvent the wheel every time.
 
-  The principle is easy. The constructor takes the number of blocks you
-  want to create beforehand, the size of the blocks, and the method of
-  allocation. This can either be #B_OBJECT_CACHE or #B_MALLOC_CACHE.
-  The first one uses C++ operators \c new[] and \c delete[], while the second
-  one uses \c malloc() and \c free(). Unless you have specific demands on
-  performance or you want to take care of freeing the objects yourself, either
-  way works fine.
+/*!
+	\fn BBlockCache::BBlockCache(uint32 blockCount, size_t blockSize, uint32
+		allocationType)
+	\brief Allocate a new memory pool.
+	
+	\param blockCount The number of free memory blocks you want to allocate
+		initially. This number is also used as the maximum number of free blocks
+		that will be kept.
+	\param blockSize The size of the blocks.
+	\param allocationType Either #B_OBJECT_CACHE for using \c new[] and
+		\c delete[] or #B_MALLOC_CACHE for \c malloc() and \c free().
+*/
 
-  As soon as you have the memory pool, you can Get() blocks. If the
-  pre-allocated memory blocks run out, BBlockCache will allocate new ones, so
-  you will not have to worry about availability. As soon as you are done you can
-  Save() the memory back into the pool. BBlockCache will make sure that no more
-  blocks will be saved than the initial number you requested when you created
-  the object, so be aware of that.
 
-  As soon as you got a pointer from the Get() method, you own that block of
-  memory; this means that you have the liberty to dispose of it yourself. It
-  also means that when you delete your BBlockCache instance, any blocks of
-  memory that are checked out will not be destroyed. In case you might want to
-  delete your objects yourself, make sure you free the memory the right way. If
-  you created the object as #B_OBJECT_CACHE, use \c delete[] to free your
-  object. If you created the object as #B_MALLOC_CACHE, use \c free(). Please
-  note that it defeats the purpose of this class if your are going to free all
-  the objects yourself since it basically means that when the pool runs out,
-  Get() will be allocating the objects by itself.
-
-  \note BBlockCache is thread-safe.
+/*!
+	\fn BBlockCache::~BBlockCache()
+	\brief Destroy the empty blocks in the free list.
+	
+	Note that the blocks you checked out with Get() and not checked back in with
+	Save() will not be freed, since ownership belongs to you. Make sure you
+	clean up after yourself.
 */
 
-/*!
-  \fn BBlockCache::BBlockCache(uint32 blockCount, size_t blockSize, uint32 allocationType)
-  \brief Allocate a new memory pool.
 
-  \param blockCount The number of free memory blocks you want to allocate
-    initially. This number is also used as the maximum number of free blocks
-    that will be kept.
-  \param blockSize The size of the blocks.
-  \param allocationType Either #B_OBJECT_CACHE for using \c new[] and
-    \c delete[] or #B_MALLOC_CACHE for \c malloc() and \c free().
-*/
-
 /*!
-  \fn BBlockCache::~BBlockCache()
-  \brief Destroy the empty blocks in the free list.
-
-  Note that the blocks you checked out with Get() and not checked back in with
-  Save() will not be freed, since ownership belongs to you. Make sure you clean
-  up after yourself.
+	\fn void *BBlockCache::Get(size_t blockSize)
+	\brief Get a block from the pool of free blocks.
+	
+	If the pool runs out of free blocks, a new one will be allocated. Please
+	note that if the size given in the \c blockSize parameter is different from
+	the size given in the constructor, a new block of memory will be created.
+	Only sizes that match the blocks in the memory pool will come from the pool.
+	
+	\param blockSize The required size of the memory block.
+	\return Returns a pointer to a memory block, or \c NULL if locking the
+		object failed.
 */
 
-/*!
-  \fn void *BBlockCache::Get(size_t blockSize)
-  \brief Get a block from the pool of free blocks.
 
-  If the pool runs out of free blocks, a new one will be allocated. Please note
-  that if the size given in the \c blockSize parameter is different from the
-  size given in the constructor, a new block of memory will be created. Only
-  sizes that match the blocks in the memory pool will come from the pool.
-
-  \param blockSize The required size of the memory block.
-  \return Returns a pointer to a memory block, or \c NULL if locking the object
-  failed.
-*/
-
 /*!
-  \fn void BBlockCache::Save(void *pointer, size_t blockSize)
-  \brief Save a block of memory to the memory pool.
-
-  The block of memory will only be added to the pool if the \c blockSize is
-  equal to the size the object was created with and if the maximum number of
-  free blocks in the list will not be exceeded. If not, the memory will be
-  freed.
-
-  Note that it is perfectly valid to pass objects other than those you got from
-  Get(), but please note that the way it was created conforms to the way memory
-  is allocated and freed in this pool. Therefore, only feed blocks that were
-  created with \c new[] if the allocation type is #B_OBJECT_CACHE. Likewise,
-  you should only use objects allocated with \c malloc() when the allocation
-  type is #B_MALLOC_CACHE.
+	\fn void BBlockCache::Save(void *pointer, size_t blockSize)
+	\brief Save a block of memory to the memory pool.
+	
+	The block of memory will only be added to the pool if the \c blockSize is
+	equal to the size the object was created with and if the maximum number of
+	free blocks in the list will not be exceeded. If not, the memory will be
+	freed.
+	
+	Note that it is perfectly valid to pass objects other than those you got
+	from Get(), but please note that the way it was created conforms to the way
+	memory is allocated and freed in this pool. Therefore, only feed blocks that
+	were created with \c new[] if the allocation type is #B_OBJECT_CACHE.
+	Likewise, you should only use objects allocated with \c malloc() when the
+	allocation type is #B_MALLOC_CACHE.
 */

Modified: haiku/trunk/docs/user/support/List.dox
===================================================================
--- haiku/trunk/docs/user/support/List.dox	2007-08-06 09:09:29 UTC (rev 21832)
+++ haiku/trunk/docs/user/support/List.dox	2007-08-06 09:32:27 UTC (rev 21833)
@@ -3,375 +3,421 @@
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *   Niels Sascha Reedijk <niels.reedijk at gmail.com>
+ *   Niels Sascha Reedijk, niels.reedijk at gmail.com
  * 
  * Proofreading:
- *   David Weizades <ddewbofh at hotmail.com>
- *   Thom Holwerda <slakje at quicknet.nl>
- *   John Drinkwater <jdrinkwater at gmail.com>
+ *   David Weizades, ddewbofh at hotmail.com
+ *   Thom Holwerda, slakje at quicknet.nl
+ *   John Drinkwater, jdrinkwater at gmail.com
  *
  * Corresponds to:
  *   /trunk/headers/os/support/List.h  rev 19972
  *   /trunk/src/kits/support/List.cpp  rev 18649
  */
 
+
 /*!
-  \file List.h
-  \brief Defines the BList class.
+	\file List.h
+	\brief Defines the BList class.
 */
 
+
 /*!
-  \class BList
-  \ingroup support
-  \ingroup libbe
-  \brief An ordered container that is designed to hold generic \c void * 
-    objects.
+	\class BList
+	\ingroup support
+	\ingroup libbe
+	\brief An ordered container that is designed to hold generic \c void * 
+		objects.
+	
+	This class is designed to be used for a variety of tasks. Unlike similar
+	implementations in other libraries, this class is not based on templates
+	and as such is inherently not typed. So it will be the job of the programmer
+	to make sure proper data is entered since the compiler cannot check this by
+	itself.
+	
+	BList contains a list of items that will grow and shrink depending on how
+	many items are in it. So you will not have to do any of the memory
+	management nor any ordering. These properties makes it useful in a whole
+	range of situations such as the interface kit within the BListView class.
+	
+	A note on the ownership of the objects might come in handy. BList never
+	assumes ownership of the objects. As such, removing items from the list will
+	only remove the entries from the list; it will not delete the items
+	themselves. Similarly, you should also make sure that before you might
+	delete an object that is in a list, you will have to remove it from the list
+	first.
+	
+	\warning This class is not thread-safe.
+	
+	The class implements methods to add, remove, reorder, retrieve, and query
+	items as well as some advanced methods which let you perform a task on all
+	the items in the list.
+*/
 
-  This class is designed to be used for a variety of tasks. Unlike similar
-  implementations in other libraries, this class is not based on templates
-  and as such is inherently not typed. So it will be the job of the programmer
-  to make sure proper data is entered since the compiler cannot check this by
-  itself.
 
-  BList contains a list of items that will grow and shrink depending on how
-  many items are in it. So you will not have to do any of the memory management
-  nor any ordering. These properties makes it useful in a whole range of
-  situations such as the interface kit within the BListView class.
+/*!
+	\fn BList::BList(int32 count = 20)
+	\brief Create a new list with a number of empty slots.
+	
+	The memory management of this class allocates new memory per block. The
+	\c count parameter can be tweaked to determine the size of these blocks.
+	In general, if you know your list is only going to contain a certain number
+	of items at most, you can pass that value. If you expect your list to have
+	very few items, it is safe to choose a low number. This is to prevent the
+	list from taking up unneeded memory. If you expect the list to contain a
+	large number of items, choose a higher value. Every time the memory is full,
+	all the items have to be copied into a new piece of allocated memory, which
+	is an expensive operation.
+	
+	If you are unsure, you do not have to worry too much. Just make sure you do
+	not use a lot of lists, and as long as the list is not used in one of the
+	performance critical parts of the code, you are safe to go with the default
+	values.
+	
+	\param count The size of the blocks allocated in memory.
+*/
 
-  A note on the ownership of the objects might come in handy. BList never
-  assumes ownership of the objects. As such, removing items from the list will
-  only remove the entries from the list; it will not delete the items
-  themselves. Similarly, you should also make sure that before you might delete
-  an object that is in a list, you will have to remove it from the list first.
 
-  \warning This class is not thread-safe.
-
-  The class implements methods to add, remove, reorder, retrieve, and query
-  items as well as some advanced methods which let you perform a task on all the
-  items in the list.
+/*!
+	\fn BList::BList(const BList& anotherList)
+	\brief Copy constructor. Copy a complete list into this one.
 */
 
+
 /*!
-  \fn BList::BList(int32 count = 20)
-  \brief Create a new list with a number of empty slots.
+	\fn BList::~BList()
+	\brief Destroy the list.
+	
+	Please note that as BList does not assume ownership of the objects,
+	only the list will be freed, not the objects that are held in it.
+*/
 
-  The memory management of this class allocates new memory per block. The
-  \c count parameter can be tweaked to determine the size of these blocks.
-  In general, if you know your list is only going to contain a certain number of
-  items at most, you can pass that value. If you expect your list to have very
-  few items, it is safe to choose a low number. This is to prevent the list from
-  taking up unneeded memory. If you expect the list to contain a large number
-  of items, choose a higher value. Every time the memory is full, all the items
-  have to be copied into a new piece of allocated memory, which is an expensive
-  operation.
 
-  If you are unsure, you do not have to worry too much. Just make sure you do
-  not use a lot of lists, and as long as the list is not used in one of the
-  performance critical parts of the code, you are safe to go with the default
-  values.
-
-  \param count The size of the blocks allocated in memory.
+/*!
+	\fn BList& BList::operator=(const BList &list)
+	\brief Copy another list into this object.
 */
 
+
 /*!
-  \fn BList::BList(const BList& anotherList)
-  \brief Copy constructor. Copy a complete list into this one.
+	\name Adding and Removing Items
 */
 
-/*!
-  \fn BList::~BList()
-  \brief Destroy the list.
 
-  Please note that as BList does not assume ownership of the objects,
-  only the list will be freed, not the objects that are held in it.
-*/
+//! @{
 
+
 /*!
-  \fn BList& BList::operator=(const BList &list)
-  \brief Copy another list into this object.
+	\fn bool BList::AddItem(void *item, int32 index)
+	\brief Add an item at a certain position.
+	
+	\param item The item to add.
+	\param index The place in the list.
+	\retval true The item was added.
+	\retval false Item was not added. Either the index is negative or invalid,
+		or resizing the list failed.
+	\see AddItem(void *item)
 */
 
+
 /*!
-  \name Adding and Removing Items
+	\fn bool BList::AddItem(void *item)
+	\brief Append an item to the list.
+	
+	\param item The item to add.
+	\retval true The item was appended.
+	\retval false Item was not appended, since resizing the list failed.
+	\see AddItem(void *item, int32 index)
 */
 
-//! @{
 
 /*!
-  \fn bool BList::AddItem(void *item, int32 index)
-  \brief Add an item at a certain position.
-
-  \param item The item to add.
-  \param index The place in the list.
-  \retval true The item was added.
-  \retval false Item was not added. Either the index is negative or invalid,
-    or resizing the list failed.
-  \see AddItem(void *item)
+	\fn bool BList::AddList(const BList *list, int32 index)
+	\brief Add items from another list to this list at a certain position.
+	
+	Note that the \a list parameter is \c const, so the original list will not
+	be altered.
+	
+	\param list The list to be added.
+	\param index The position in the current list where the new item(s) should
+		be put.
+	\retval true The list was added. 
+	\retval false Failed to insert the list, due to the fact that resizing our
+		list failed. 
+	\see AddList(const BList *list)
 */
 
+
 /*!
-  \fn bool BList::AddItem(void *item)
-  \brief Append an item to the list.
-
-  \param item The item to add.
-  \retval true The item was appended.
-  \retval false Item was not appended, since resizing the list failed.
-  \see AddItem(void *item, int32 index)
+	\fn bool BList::AddList(const BList *list)
+	\brief Append a list to this list.
+	
+	Note that the \a list parameter is a \c const, so the original list will not
+	be altered.
+	
+	\param list The list to be appended.
+	\retval true The list was appended. 
+	\retval false Failed to append the list, due to the fact that resizing of
+		our list failed.
+	\see AddList(const BList *list, int32 index)
 */
 
+
 /*!
-  \fn bool BList::AddList(const BList *list, int32 index)
-  \brief Add items from another list to this list at a certain position.
+	\fn bool BList::RemoveItem(void *item)
+	\brief Remove an item from the list.
+	
+	\param item The item that should be removed.
+	\retval true The item was found and removed.
+	\retval false The item was not in this list and thus not removed.
+	\see RemoveItem(int32 index)
+*/
 
-  Note that the \a list parameter is \c const, so the original list will not be
-  altered.
 
-  \param list The list to be added.
-  \param index The position in the current list where the new item(s) should be
-    put.
-  \retval true The list was added. 
-  \retval false Failed to insert the list, due to the fact that resizing our
-    list failed. 
-  \see AddList(const BList *list)
+/*!
+	\fn void * BList::RemoveItem(int32 index)
+	\brief Remove the item at \a index from the list.
+	
+	\param index The item that should be removed.
+	\return The pointer to the item that was removed, or \c NULL in case the
+		index was invalid.
+	\see RemoveItem(void *item)
 */
 
+
 /*!
-  \fn bool BList::AddList(const BList *list)
-  \brief Append a list to this list.
+	\fn bool BList::RemoveItems(int32 index, int32 count)
+	\brief Remove a number of items starting at a certain position.
+	
+	If the count parameter is larger than the number of items in the list,
+	all the items from the offset to the end will be removed.
+	
+	\param index The offset in the list where removal should start.
+	\param count The number of items to remove.
+	\retval true Removal succeeded.
+	\retval false Failed to remove the items because the index was invalid.
+*/
 
-  Note that the \a list parameter is a \c const, so the original list will not
-  be altered.
 
-  \param list The list to be appended.
-  \retval true The list was appended. 
-  \retval false Failed to append the list, due to the fact that resizing of our
-    list failed.
-  \see AddList(const BList *list, int32 index)
+/*!
+	\fn bool BList::ReplaceItem(int32 index, void *newItem)
+	\brief Replace an item with another one.
+	
+	\param index The offset in the list where to put the item.
+	\param newItem The new item to put in the list.
+	\retval true Item replaced.
+	\retval false The index was invalid.
 */
 
-/*!
-  \fn bool BList::RemoveItem(void *item)
-  \brief Remove an item from the list.
 
-  \param item The item that should be removed.
-  \retval true The item was found and removed.
-  \retval false The item was not in this list and thus not removed.
-  \see RemoveItem(int32 index)
-*/
-
 /*!
-  \fn void * BList::RemoveItem(int32 index)
-  \brief Remove the item at \a index from the list.
-
-  \param index The item that should be removed.
-  \return The pointer to the item that was removed, or \c NULL in case the
-    index was invalid.
-  \see RemoveItem(void *item)
+	\fn void BList::MakeEmpty()
+	\brief Clear all the items from the list.
+	
+	Please note that this does not free the items. 
 */
 
-/*!
-  \fn bool BList::RemoveItems(int32 index, int32 count)
-  \brief Remove a number of items starting at a certain position.
 
-  If the count parameter is larger than the number of items in the list,
-  all the items from the offset to the end will be removed.
+//! @}
 
-  \param index The offset in the list where removal should start.
-  \param count The number of items to remove.
-  \retval true Removal succeeded.
-  \retval false Failed to remove the items because the index was invalid.
-*/
 
 /*!
-  \fn bool BList::ReplaceItem(int32 index, void *newItem)
-  \brief Replace an item with another one.
-
-  \param index The offset in the list where to put the item.
-  \param newItem The new item to put in the list.
-  \retval true Item replaced.
-  \retval false The index was invalid.
+	\name Reordering Items
 */
 
-/*!
-  \fn void BList::MakeEmpty()
-  \brief Clear all the items from the list.
 
-  Please note that this does not free the items. 
-*/
+//! @{
 
-//! @}
 
 /*!
-  \name Reordering Items
+	\fn void BList::SortItems(int (*compareFunc)(const void *, const void *))
+	\brief Sort the items with the use of a supplied comparison function.
+	
+	The function should take two \c const pointers as arguments and should
+	return an integer.
+	
+	For an example, see the Compare(const BString *, const BString *) function.
 */
 
-//! @{
 
 /*!
-  \fn void BList::SortItems(int (*compareFunc)(const void *, const void *))
-  \brief Sort the items with the use of a supplied comparison function.
+	\fn bool BList::SwapItems(int32 indexA, int32 indexB)
+	\brief Swap two items.
+	
+	\param indexA The first item.
+	\param indexB The second item.
+	\retval true Swap succeeded.
+	\retval false Swap failed because one of the indexes was invalid.
+*/

[... truncated: 276 lines follow ...]


From stippi at mail.berlios.de  Mon Aug  6 11:46:42 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 6 Aug 2007 11:46:42 +0200
Subject: [Haiku-commits] r21834 - haiku/trunk/src/preferences/network
Message-ID: <200708060946.l769kgZw007421@sheep.berlios.de>

Author: stippi
Date: 2007-08-06 11:46:42 +0200 (Mon, 06 Aug 2007)
New Revision: 21834
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21834&view=rev

Modified:
   haiku/trunk/src/preferences/network/EthernetSettings.cpp
   haiku/trunk/src/preferences/network/EthernetSettingsView.cpp
   haiku/trunk/src/preferences/network/EthernetSettingsWindow.cpp
   haiku/trunk/src/preferences/network/EthernetSettingsWindow.h
Log:
* patch by Andre Garzia to fix some coding style issues
* fixed a potential memory leak in EthernetSettingsView::_ShowConfiguration()
  when the ioctl didn't succeed


Modified: haiku/trunk/src/preferences/network/EthernetSettings.cpp
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettings.cpp	2007-08-06 09:32:27 UTC (rev 21833)
+++ haiku/trunk/src/preferences/network/EthernetSettings.cpp	2007-08-06 09:46:42 UTC (rev 21834)
@@ -21,13 +21,15 @@
 {
 }
 
-void EthernetSettings::ReadyToRun()
+void
+EthernetSettings::ReadyToRun()
 {
 	fEthWindow = new EthernetSettingsWindow();
 	fEthWindow->Show();
 }
 
-int main(int argc, char** argv)
+int
+main(int argc, char** argv)
 {
 	EthernetSettings app;
 	app.Run();

Modified: haiku/trunk/src/preferences/network/EthernetSettingsView.cpp
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsView.cpp	2007-08-06 09:32:27 UTC (rev 21833)
+++ haiku/trunk/src/preferences/network/EthernetSettingsView.cpp	2007-08-06 09:46:42 UTC (rev 21834)
@@ -50,7 +50,8 @@
 
 
 
-bool EthernetSettingsView::_PrepareRequest(struct ifreq& request, const char* name)
+bool
+EthernetSettingsView::_PrepareRequest(struct ifreq& request, const char* name)
 {
 	//This function is used for talking direct to the stack. 
 	//It?s used by _ShowConfiguration.
@@ -62,7 +63,9 @@
 	return true;
 }
 
-void EthernetSettingsView::_GatherInterfaces() {
+void
+EthernetSettingsView::_GatherInterfaces()
+{
 	// iterate over all interfaces and retrieve minimal status
 
 	ifconf config;
@@ -83,12 +86,13 @@
 	if (ioctl(fSocket, SIOCGIFCONF, &config, sizeof(struct ifconf)) < 0)
 		return;
 
-	ifreq *interface = (ifreq *)buffer;
+	ifreq* interface = (ifreq *)buffer;
 
 	fInterfaces.MakeEmpty();
 
 	for (uint32 i = 0; i < count; i++) {
-		if (strncmp(interface->ifr_name, "loop", 4) && interface->ifr_name[0]) {
+		if (strncmp(interface->ifr_name, "loop", 4) && interface->ifr_name[0])
+		{
 			fInterfaces.AddItem(new BString(interface->ifr_name));
 			
 		}
@@ -102,20 +106,23 @@
 }
 
 
-void EthernetSettingsView::AttachedToWindow()
+void
+EthernetSettingsView::AttachedToWindow()
 {
 	fOKButton->SetTarget(this);
 	fApplyButton->SetTarget(this);
+	fDeviceMenuField->Menu()->SetTargetForItems(this); 
 }
 
 
-void EthernetSettingsView::DetachedFromWindow()
+void
+EthernetSettingsView::DetachedFromWindow()
 {
-	close(fSocket);
 }
 
 
-EthernetSettingsView::EthernetSettingsView(BRect rect) : BView(rect, "EthernetSettingsView", B_FOLLOW_ALL, B_WILL_DRAW)
+EthernetSettingsView::EthernetSettingsView(BRect rect)
+: BView(rect, "EthernetSettingsView", B_FOLLOW_ALL, B_WILL_DRAW)
 {
 	float defaultWidth = 190;
 	float inset = ceilf(be_plain_font->Size() * 0.8);
@@ -135,8 +142,8 @@
 		info->AddString("interface", name.String());
 		BMenuItem* item = new BMenuItem(label.String(), info);
 		devmenu->AddItem(item);
-		item->SetTarget(this);
 		
+		
 	}
 
 	
@@ -146,50 +153,68 @@
 	modemenu->AddItem(modeitem);
 	
 	fDeviceMenuField = new BMenuField(frame, "networkcards", "Adapter:", devmenu);
-	fDeviceMenuField->SetDivider(fDeviceMenuField->StringWidth(fDeviceMenuField->Label()) + 8);
+	fDeviceMenuField->SetDivider(
+		fDeviceMenuField->StringWidth(fDeviceMenuField->Label()) + 8);
 	AddChild(fDeviceMenuField);
 	fDeviceMenuField->ResizeToPreferred();
 
 	
 	fTypeMenuField = new BMenuField(frame, "type", "Mode:", modemenu);
-	fTypeMenuField->SetDivider(fTypeMenuField->StringWidth(fTypeMenuField->Label()) + 8);
+	fTypeMenuField->SetDivider(
+		fTypeMenuField->StringWidth(fTypeMenuField->Label()) + 8);
 	fTypeMenuField->MoveTo(fDeviceMenuField->Frame().LeftBottom() + BPoint(0,10));
 	AddChild(fTypeMenuField);
 	fTypeMenuField->ResizeToPreferred();
 
-	fIPTextControl = new BTextControl(frame, "ip", "IP Address:", "", NULL, B_FOLLOW_TOP, B_WILL_DRAW );
-	fIPTextControl->SetDivider(fIPTextControl->StringWidth(fIPTextControl->Label()) + 8);
+	fIPTextControl = new BTextControl(frame, "ip", "IP Address:", "", NULL, 
+	B_FOLLOW_TOP, B_WILL_DRAW );
+	fIPTextControl->SetDivider(
+		fIPTextControl->StringWidth(fIPTextControl->Label()) + 8);
 	fIPTextControl->MoveTo(fTypeMenuField->Frame().LeftBottom() + BPoint(0,10));
 	fIPTextControl->ResizeToPreferred();
 	AddChild(fIPTextControl);
 
-	fNetMaskTextControl = new BTextControl(frame, "mask", "Netmask:", "", NULL, B_FOLLOW_TOP, B_WILL_DRAW );
-	fNetMaskTextControl->SetDivider(fNetMaskTextControl->StringWidth(fNetMaskTextControl->Label()) + 8);
-	fNetMaskTextControl->MoveTo(fIPTextControl->Frame().LeftBottom() + BPoint(0,10));
+	fNetMaskTextControl = new BTextControl(frame, "mask", "Netmask:", "", NULL,
+	B_FOLLOW_TOP, B_WILL_DRAW );
+	fNetMaskTextControl->SetDivider(
+		fNetMaskTextControl->StringWidth(fNetMaskTextControl->Label()) + 8);
+	fNetMaskTextControl->MoveTo(
+		fIPTextControl->Frame().LeftBottom() + BPoint(0,10));
 	AddChild(fNetMaskTextControl);
 	fNetMaskTextControl->ResizeToPreferred();
 
-	fGatewayTextControl = new BTextControl(frame, "gateway", "Gateway:", "", NULL, B_FOLLOW_TOP, B_WILL_DRAW );
-	fGatewayTextControl->SetDivider(fGatewayTextControl->StringWidth(fGatewayTextControl->Label()) + 8);
-	fGatewayTextControl->MoveTo(fNetMaskTextControl->Frame().LeftBottom() + BPoint(0,10));
+	fGatewayTextControl = new BTextControl(frame, "gateway", "Gateway:", "",
+		NULL, B_FOLLOW_TOP, B_WILL_DRAW );
+	fGatewayTextControl->SetDivider(
+		fGatewayTextControl->StringWidth(fGatewayTextControl->Label()) + 8);
+	fGatewayTextControl->MoveTo(
+		fNetMaskTextControl->Frame().LeftBottom() + BPoint(0,10));
 	AddChild(fGatewayTextControl);
 	fGatewayTextControl->ResizeToPreferred();
 	
-	fPrimaryDNSTextControl = new BTextControl(frame, "dns1", "DNS #1:", "", NULL, B_FOLLOW_TOP, B_WILL_DRAW );
-	fPrimaryDNSTextControl->SetDivider(fPrimaryDNSTextControl->StringWidth(fPrimaryDNSTextControl->Label()) + 8);
-	fPrimaryDNSTextControl->MoveTo(fGatewayTextControl->Frame().LeftBottom() + BPoint(0,10));
+	fPrimaryDNSTextControl = new BTextControl(
+		frame, "dns1", "DNS #1:", "", NULL, B_FOLLOW_TOP, B_WILL_DRAW );
+	fPrimaryDNSTextControl->SetDivider(
+		fPrimaryDNSTextControl->StringWidth(fPrimaryDNSTextControl->Label()) + 8);
+	fPrimaryDNSTextControl->MoveTo(
+		fGatewayTextControl->Frame().LeftBottom() + BPoint(0,10));
 	AddChild(fPrimaryDNSTextControl);
 	fPrimaryDNSTextControl->ResizeToPreferred();
 	
-	fSecondaryDNSTextControl = new BTextControl(frame, "dns2", "DNS #2:", "", NULL, B_FOLLOW_TOP, B_WILL_DRAW );
-	fSecondaryDNSTextControl->SetDivider(fSecondaryDNSTextControl->StringWidth(fSecondaryDNSTextControl->Label()) + 8);
-	fSecondaryDNSTextControl->MoveTo(fPrimaryDNSTextControl->Frame().LeftBottom() + BPoint(0,10));
+	fSecondaryDNSTextControl = new BTextControl(
+		frame, "dns2", "DNS #2:", "", NULL, B_FOLLOW_TOP, B_WILL_DRAW );
+	fSecondaryDNSTextControl->SetDivider(
+		fSecondaryDNSTextControl->StringWidth(
+			fSecondaryDNSTextControl->Label()) + 8);
+	fSecondaryDNSTextControl->MoveTo(
+		fPrimaryDNSTextControl->Frame().LeftBottom() + BPoint(0,10));
 	AddChild(fSecondaryDNSTextControl);
 	fSecondaryDNSTextControl->ResizeToPreferred();
 
 	fApplyButton = new BButton(frame, "apply", "Apply", new BMessage(kMsgApply));
 	fApplyButton->ResizeToPreferred();
-	fApplyButton->MoveTo(fSecondaryDNSTextControl->Frame().LeftBottom() + BPoint(0,10));
+	fApplyButton->MoveTo(
+		fSecondaryDNSTextControl->Frame().LeftBottom() + BPoint(0,10));
 	AddChild(fApplyButton);
 	
 	fOKButton = new BButton(frame, "ok", "OK", new BMessage(kMsgOK));
@@ -201,12 +226,14 @@
 
 EthernetSettingsView::~EthernetSettingsView()
 {
+	close(fSocket);
 }
 
-void EthernetSettingsView::_ShowConfiguration(BMessage* message)
+void
+EthernetSettingsView::_ShowConfiguration(BMessage* message)
 {
 	
- 	const char *name;
+ 	const char* name;
 	if (message->FindString("interface", &name) != B_OK)
 		return;
 
@@ -248,7 +275,7 @@
 	
 	// Obtain gateway
 	
-	char *gwAddress;
+	char* gwAddress;
 	ifconf config;
 	config.ifc_len = sizeof(config.ifc_value);
 	if (ioctl(fSocket, SIOCGRTSIZE, &config, sizeof(struct ifconf)) < 0)
@@ -265,8 +292,10 @@
 	config.ifc_len = size;
 	config.ifc_buf = buffer;
 	
-	if (ioctl(fSocket, SIOCGRTTABLE, &config, sizeof(struct ifconf)) < 0)
+	if (ioctl(fSocket, SIOCGRTTABLE, &config, sizeof(struct ifconf)) < 0) {
+		free(buffer);
 		return;
+	}
 		
 	ifreq *interface = (ifreq *)buffer;
 	ifreq *end = (ifreq *)((uint8 *)buffer + size);
@@ -292,11 +321,12 @@
 		if (route.gateway != NULL)
 			addressSize += route.gateway->sa_len;
 			
-		interface = (ifreq *)((addr_t)interface + IF_NAMESIZE + sizeof(route_entry) + addressSize);
+		interface = (ifreq *)((addr_t)interface + 
+			IF_NAMESIZE + sizeof(route_entry) + addressSize);
 	
 	}
 	
-	free(buffer);	
+	free(buffer);
 	
 	// Obtain DNS
 	
@@ -327,7 +357,8 @@
 	
 }
 
-void EthernetSettingsView::MessageReceived(BMessage* message)
+void
+EthernetSettingsView::MessageReceived(BMessage* message)
 {
 	switch (message->what) {
 		case kMsgInfo:

Modified: haiku/trunk/src/preferences/network/EthernetSettingsWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsWindow.cpp	2007-08-06 09:32:27 UTC (rev 21833)
+++ haiku/trunk/src/preferences/network/EthernetSettingsWindow.cpp	2007-08-06 09:46:42 UTC (rev 21834)
@@ -15,19 +15,21 @@
 #include "EthernetSettingsView.h"
 
 
-EthernetSettingsWindow::EthernetSettingsWindow() : BWindow(BRect(50, 50, 269, 302), 
-	"Ethernet Settings", B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE)
+EthernetSettingsWindow::EthernetSettingsWindow()
+: BWindow(BRect(50, 50, 269, 302), "Ethernet Settings", 
+B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS
+| B_NOT_ZOOMABLE)
 {
 			
 	fEthView = new EthernetSettingsView(Bounds());
 			
 	AddChild(fEthView);
 			
-	Show();
 }
 	
 
-void EthernetSettingsWindow::MessageReceived(BMessage* message)
+void
+EthernetSettingsWindow::MessageReceived(BMessage* message)
 {
 	switch (message->what) {
 		case kMsgInfo:
@@ -44,7 +46,8 @@
 }
 
 
-bool EthernetSettingsWindow::QuitRequested()
+bool
+EthernetSettingsWindow::QuitRequested()
 {
 	be_app->PostMessage(B_QUIT_REQUESTED);
 	return true;

Modified: haiku/trunk/src/preferences/network/EthernetSettingsWindow.h
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsWindow.h	2007-08-06 09:32:27 UTC (rev 21833)
+++ haiku/trunk/src/preferences/network/EthernetSettingsWindow.h	2007-08-06 09:46:42 UTC (rev 21834)
@@ -19,7 +19,7 @@
 		EthernetSettingsWindow();
 		virtual ~EthernetSettingsWindow();
 		virtual bool QuitRequested();
-		virtual void EthernetSettingsWindow::MessageReceived(BMessage* mesage);
+		virtual void MessageReceived(BMessage* mesage);
 
 		private:
 			EthernetSettingsView *fEthView;



From jackburton at mail.berlios.de  Mon Aug  6 13:41:19 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Mon, 6 Aug 2007 13:41:19 +0200
Subject: [Haiku-commits] r21835 - haiku/trunk/src/servers/app
Message-ID: <200708061141.l76BfJdp005795@sheep.berlios.de>

Author: jackburton
Date: 2007-08-06 13:41:18 +0200 (Mon, 06 Aug 2007)
New Revision: 21835
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21835&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Set the origin before playing the picture, so DrawPicture() with an 
offset works correctly. Drawing a BShape using a BPicture is currently 
broken. Stephan, any insight on what it's changed about shape drawing ?


Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-06 09:46:42 UTC (rev 21834)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-06 11:41:18 UTC (rev 21835)
@@ -2340,9 +2340,7 @@
 				
 				ServerPicture *picture = App()->FindPicture(token);
 				if (picture != NULL) {
-					fCurrentLayer->ConvertToScreenForDrawing(&where);
-					fCurrentLayer->CurrentState()->SetPenLocation(where);
-					// TODO: pass the location to the play method and handle it there
+					fCurrentLayer->CurrentState()->SetOrigin(where);
 					picture->Play(fCurrentLayer);
 				}
 			}



From axeld at pinc-software.de  Mon Aug  6 13:49:57 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 06 Aug 2007 13:49:57 +0200
Subject: [Haiku-commits] r21830 - haiku/trunk/src/system/kernel/fs
In-Reply-To: <20070806030558.2673.4@cs.tu-berlin.de>
Message-ID: <1452391661-BeMail@ibm>

Ingo Weinhold <bonefish at cs.tu-berlin.de> wrote:
> After sleeping over it, I think we need to review this. read - wait - 
> read 
> for a single request sounds like we could read non-contiguous data.

I'm actually not sure what you mean by that. Non-contiguous in what 
sense? There is no "message size" mechanism in a pipe, you just get 
what the other end put in there, and in that order -- at least that's 
the plan :-)

Bye,
   Axel.



From jackburton at mail.berlios.de  Mon Aug  6 13:55:30 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Mon, 6 Aug 2007 13:55:30 +0200
Subject: [Haiku-commits] r21836 - haiku/trunk/src/servers/app
Message-ID: <200708061155.l76BtUgJ006937@sheep.berlios.de>

Author: jackburton
Date: 2007-08-06 13:55:29 +0200 (Mon, 06 Aug 2007)
New Revision: 21836
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21836&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Nevermind Stephan, in the end I found it out. Fixed shape drawing inside 
a BPicture, though I'm not yet sure if I should do it there on when 
playing the picture...


Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-06 11:41:18 UTC (rev 21835)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-06 11:55:29 UTC (rev 21836)
@@ -2578,7 +2578,16 @@
 			if (opList != NULL && ptList != NULL
 				&& link.Read(opList, opCount * sizeof(uint32)) >= B_OK
 				&& link.Read(ptList, ptCount * sizeof(BPoint)) >= B_OK) {
-				
+
+				// TODO: I'm not sure If I have to do this here (when the BPicture is
+				// recorded, or inside ServerPicture, when the picture is replayed. 				
+				// This might seem a bit weird, but under R5, the shapes
+				// are always offset by the current pen location
+				BPoint penLocation = fCurrentLayer->CurrentState()->PenLocation();
+				for (int32 i = 0; i < ptCount; i++) {
+					ptList[i] += penLocation;
+					fCurrentLayer->ConvertToScreenForDrawing(&ptList[i]);
+				}
 				const bool fill = (code == AS_FILL_SHAPE);
 				picture->WriteDrawShape(opCount, opList, ptCount, ptList, fill);
 			}



From superstippi at gmx.de  Mon Aug  6 14:06:47 2007
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 06 Aug 2007 14:06:47 +0200
Subject: [Haiku-commits] r21836 - haiku/trunk/src/servers/app
In-Reply-To: <200708061155.l76BtUgJ006937@sheep.berlios.de>
References: <200708061155.l76BtUgJ006937@sheep.berlios.de>
Message-ID: <20070806140647.7761.5@stippis2.1186385870.fake>


jackburton at BerliOS wrote (2007-08-06, 13:55:30 [+0200]):
> Author: jackburton
> Date: 2007-08-06 13:55:29 +0200 (Mon, 06 Aug 2007) New Revision: 21836
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21836&view=rev
> 
> Modified:
>    haiku/trunk/src/servers/app/ServerWindow.cpp
> Log:
> Nevermind Stephan, in the end I found it out. Fixed shape drawing inside 
> a BPicture, though I'm not yet sure if I should do it there on when 
> playing the picture...

I would say do the conversion before playing. Otherwise the picture would 
display at the same position on screen even the view moved, or am I missing 
something?

Best regards,
-Stephan


From stefano.ceccherini at gmail.com  Mon Aug  6 14:08:18 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Mon, 6 Aug 2007 14:08:18 +0200
Subject: [Haiku-commits] r21836 - haiku/trunk/src/servers/app
In-Reply-To: <20070806140647.7761.5@stippis2.1186385870.fake>
References: <200708061155.l76BtUgJ006937@sheep.berlios.de>
	<20070806140647.7761.5@stippis2.1186385870.fake>
Message-ID: <894b9700708060508o259c2332jb3f2ae10ecef9d77@mail.gmail.com>

2007/8/6, Stephan Assmus <superstippi at gmx.de>:

> I would say do the conversion before playing. Otherwise the picture would
> display at the same position on screen even the view moved, or am I missing
> something?

No, that's probably correct.


From bonefish at cs.tu-berlin.de  Mon Aug  6 15:00:26 2007
From: bonefish at cs.tu-berlin.de (Ingo Weinhold)
Date: Mon, 06 Aug 2007 15:00:26 +0200
Subject: [Haiku-commits] r21830 - haiku/trunk/src/system/kernel/fs
In-Reply-To: <1452391661-BeMail@ibm>
References: <1452391661-BeMail@ibm>
Message-ID: <20070806150026.538.1@cs.tu-berlin.de>


On 2007-08-06 at 13:49:57 [+0200], Axel D?rfler <axeld at pinc-software.de> 
wrote:
> Ingo Weinhold <bonefish at cs.tu-berlin.de> wrote:
> > After sleeping over it, I think we need to review this. read - wait -
> > read
> > for a single request sounds like we could read non-contiguous data.
> 
> I'm actually not sure what you mean by that. Non-contiguous in what
> sense? There is no "message size" mechanism in a pipe, you just get
> what the other end put in there, and in that order -- at least that's
> the plan :-)

Yep, but if you read once, then wait, then read again, another reader might 
have read something while you were waiting. Thus you end up with a buffer 
that contains two parts of the data stream that might have data missing 
inbetween. A rather unlikely use of pipes, but anyway... It does also not 
seem correct, that a reader would block, if it actually already has data.

CU, Ingo


From nielx at mail.berlios.de  Mon Aug  6 16:28:41 2007
From: nielx at mail.berlios.de (nielx at BerliOS)
Date: Mon, 6 Aug 2007 16:28:41 +0200
Subject: [Haiku-commits] r21837 - in haiku/trunk/docs/user: . support
Message-ID: <200708061428.l76ESfBP021228@sheep.berlios.de>

Author: nielx
Date: 2007-08-06 16:28:40 +0200 (Mon, 06 Aug 2007)
New Revision: 21837
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21837&view=rev

Modified:
   haiku/trunk/docs/user/apidoc.dox
   haiku/trunk/docs/user/support/Archivable.dox
   haiku/trunk/docs/user/support/BlockCache.dox
   haiku/trunk/docs/user/support/List.dox
Log:


Modified: haiku/trunk/docs/user/apidoc.dox
===================================================================
--- haiku/trunk/docs/user/apidoc.dox	2007-08-06 11:55:29 UTC (rev 21836)
+++ haiku/trunk/docs/user/apidoc.dox	2007-08-06 14:28:40 UTC (rev 21837)
@@ -3,9 +3,9 @@
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *   Niels Sascha Reedijk, niels.reedijk at gmail.com
+ *		Niels Sascha Reedijk, niels.reedijk at gmail.com
  * Proofreaders:
- *   Alan Smale, ajsmale at gmail.com
+ *		Alan Smale, ajsmale at gmail.com
  */
 
 
@@ -15,7 +15,10 @@
 	This article explains how to document the API. Its intended audience are the
 	Haiku developers who want to document their own classes, and also the
 	members of the API Documentation team who want to brush up the
-	documentation.
+	documentation. The guidelines are synchronous with the Haiku Coding
+	Guidelines, which means that the formal requirements are the same where
+	applicable. If you find an inconsistency, it's usually a good idea to
+	report this on the documentation team's mailing list.
 	
 	This document is divided into three sections. \ref formalrequirements
 	describes the demands that are made from the markup and spacing of the
@@ -83,12 +86,12 @@
 * Distributed under the terms of the MIT License.
 *
 * Authors:
-*   Niels Sascha Reedijk, niels.reedijk at gmail.com
+*		Niels Sascha Reedijk, niels.reedijk at gmail.com
 * Proofreaders:
-*   Alan Smale, ajsmale at gmail.com
+*		Alan Smale, ajsmale at gmail.com
 * Corresponds to:
-*   /trunk/headers/os/support/String.h  rev 19731
-*   /trunk/src/kits/support/String.cpp  rev 19731
+*		/trunk/headers/os/support/String.h  rev 19731
+*		/trunk/src/kits/support/String.cpp  rev 19731
 */
 	\endverbatim
 
@@ -104,7 +107,7 @@
 		followed by an empty line.
 	-# Then there is a label <tt>Authors:</tt>, which is followed by
 		lines with names and email addresses. The latter one is optional, but
-		recommended.
+		recommended. Each author is preceeded by two tabs after the asterix.
 	-# In the same vein there is the label <tt>Proofreaders:</tt> in case the
 		file has been proofread.
 	-# The final part is underneath the label <tt>Corresponds to:</tt>.

Modified: haiku/trunk/docs/user/support/Archivable.dox
===================================================================
--- haiku/trunk/docs/user/support/Archivable.dox	2007-08-06 11:55:29 UTC (rev 21836)
+++ haiku/trunk/docs/user/support/Archivable.dox	2007-08-06 14:28:40 UTC (rev 21837)
@@ -3,15 +3,15 @@
  * Distributed under the terms of the MIT License.
  *
  * Author:
- *   Niels Sascha Reedijk, niels.reedijk at gmail.com
+ *		Niels Sascha Reedijk, niels.reedijk at gmail.com
  *
  * Proofreader:
- *   David Weizades, ddewbofh at hotmail.com
- *   Thom Holwerda, slakje at quicknet.nl
+ *		David Weizades, ddewbofh at hotmail.com
+ *		Thom Holwerda, slakje at quicknet.nl
  *
  * Corresponds to:
- *   /trunk/headers/os/support/Archivable.h rev 19972
- *   /trunk/src/kits/support/Archivable.cpp rev 19095
+ *		/trunk/headers/os/support/Archivable.h rev 19972
+ *		/trunk/src/kits/support/Archivable.cpp rev 19095
  */
 
 

Modified: haiku/trunk/docs/user/support/BlockCache.dox
===================================================================
--- haiku/trunk/docs/user/support/BlockCache.dox	2007-08-06 11:55:29 UTC (rev 21836)
+++ haiku/trunk/docs/user/support/BlockCache.dox	2007-08-06 14:28:40 UTC (rev 21837)
@@ -3,15 +3,15 @@
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *   Niels Sascha Reedijk, niels.reedijk at gmail.com
+ * 		Niels Sascha Reedijk, niels.reedijk at gmail.com
  *
  * Proofreading:
- *   David Weizades, ddewbofh at hotmail.com
- *   Thom Holwerda, slakje at quicknet.nl
+ * 		David Weizades, ddewbofh at hotmail.com
+ *		Thom Holwerda, slakje at quicknet.nl
  * 
  * Corresponds to:
- *   /trunk/headers/os/support/BlockCache.h  rev 19972
- *   /trunk/src/kits/support/BlockCache.cpp  rev 4568
+ *		/trunk/headers/os/support/BlockCache.h  rev 19972
+ *		/trunk/src/kits/support/BlockCache.cpp  rev 4568
  */
 
 

Modified: haiku/trunk/docs/user/support/List.dox
===================================================================
--- haiku/trunk/docs/user/support/List.dox	2007-08-06 11:55:29 UTC (rev 21836)
+++ haiku/trunk/docs/user/support/List.dox	2007-08-06 14:28:40 UTC (rev 21837)
@@ -3,16 +3,16 @@
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *   Niels Sascha Reedijk, niels.reedijk at gmail.com
+ *		Niels Sascha Reedijk, niels.reedijk at gmail.com
  * 
  * Proofreading:
- *   David Weizades, ddewbofh at hotmail.com
- *   Thom Holwerda, slakje at quicknet.nl
- *   John Drinkwater, jdrinkwater at gmail.com
+ *		David Weizades, ddewbofh at hotmail.com
+ *		Thom Holwerda, slakje at quicknet.nl
+ *		John Drinkwater, jdrinkwater at gmail.com
  *
  * Corresponds to:
- *   /trunk/headers/os/support/List.h  rev 19972
- *   /trunk/src/kits/support/List.cpp  rev 18649
+ *		/trunk/headers/os/support/List.h  rev 19972
+ *		/trunk/src/kits/support/List.cpp  rev 18649
  */
 
 



From bonefish at mail.berlios.de  Mon Aug  6 19:35:58 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Mon, 6 Aug 2007 19:35:58 +0200
Subject: [Haiku-commits] r21838 - haiku/trunk/headers/private/kernel
Message-ID: <200708061735.l76HZwrS017548@sheep.berlios.de>

Author: bonefish
Date: 2007-08-06 19:35:57 +0200 (Mon, 06 Aug 2007)
New Revision: 21838
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21838&view=rev

Modified:
   haiku/trunk/headers/private/kernel/debug.h
Log:
Added debug macros ASSERT_ALWAYS_PRINT and ASSERT_PRINT which take
additional parameters that are fed into a dprintf() before panic() is
invoked.


Modified: haiku/trunk/headers/private/kernel/debug.h
===================================================================
--- haiku/trunk/headers/private/kernel/debug.h	2007-08-06 14:28:40 UTC (rev 21837)
+++ haiku/trunk/headers/private/kernel/debug.h	2007-08-06 17:35:57 UTC (rev 21838)
@@ -24,11 +24,20 @@
 #define ASSERT_ALWAYS(x) \
 	do { if (!(x)) { panic("ASSERT FAILED (%s:%d): %s\n", __FILE__, __LINE__, #x); } } while (0)
 
+#define ASSERT_ALWAYS_PRINT(x, format...) \
+	do {																	\
+		if (!(x)) {															\
+			dprintf(format);												\
+			panic("ASSERT FAILED (%s:%d): %s\n", __FILE__, __LINE__, #x);	\
+		}																	\
+	} while (0)
+
 #if KDEBUG
-#define ASSERT(x) ASSERT_ALWAYS(x)
+#	define ASSERT(x)					ASSERT_ALWAYS(x)
+#	define ASSERT_PRINT(x, format...)	ASSERT_ALWAYS_PRINT(x, format)
 #else 
-#define ASSERT(x) \
-	do { } while(0)
+#	define ASSERT(x)					do { } while(0)
+#	define ASSERT_PRINT(x, format...)	do { } while(0)
 #endif
 
 extern int dbg_register_file[B_MAX_CPU_COUNT][14];



From korli at mail.berlios.de  Mon Aug  6 19:44:00 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Mon, 6 Aug 2007 19:44:00 +0200
Subject: [Haiku-commits] r21839 - haiku/trunk/src/tests/system/libroot/posix
Message-ID: <200708061744.l76Hi0Ak017849@sheep.berlios.de>

Author: korli
Date: 2007-08-06 19:43:59 +0200 (Mon, 06 Aug 2007)
New Revision: 21839
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21839&view=rev

Added:
   haiku/trunk/src/tests/system/libroot/posix/test_confstr.c
Log:
added a test for confstr()


Added: haiku/trunk/src/tests/system/libroot/posix/test_confstr.c
===================================================================
--- haiku/trunk/src/tests/system/libroot/posix/test_confstr.c	2007-08-06 17:35:57 UTC (rev 21838)
+++ haiku/trunk/src/tests/system/libroot/posix/test_confstr.c	2007-08-06 17:43:59 UTC (rev 21839)
@@ -0,0 +1,23 @@
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <limits.h>
+
+size_t confstr(int name, char *buf, size_t len);
+char string[512];
+
+int main()
+{
+	int i;
+	size_t size;
+	for (i=0; i<INT_MAX; i++) {
+		size = confstr(i, NULL, (size_t) 0);
+		if (errno != B_BAD_VALUE)
+			printf("%ld confstr %ld %s\n", i, size, strerror(errno));
+		if (size != 0) {
+			size = confstr(i, string, sizeof(string));
+			printf("%ld value %s\n", i, string);
+		}
+	}
+}
+



From axeld at pinc-software.de  Mon Aug  6 20:01:46 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 06 Aug 2007 20:01:46 +0200
Subject: [Haiku-commits] r21830 - haiku/trunk/src/system/kernel/fs
In-Reply-To: <20070806150026.538.1@cs.tu-berlin.de>
Message-ID: <23761724712-BeMail@ibm>

Ingo Weinhold <bonefish at cs.tu-berlin.de> wrote:
> On 2007-08-06 at 13:49:57 [+0200], Axel D?rfler <axeld at pinc-software.de> 
> > wrote:
> > I'm actually not sure what you mean by that. Non-contiguous in what
> > sense? There is no "message size" mechanism in a pipe, you just get
> > what the other end put in there, and in that order -- at least 
> > that's
> > the plan :-)
> Yep, but if you read once, then wait, then read again, another reader 
> might 
> have read something while you were waiting. Thus you end up with a 
> buffer 
> that contains two parts of the data stream that might have data 
> missing 
> inbetween. A rather unlikely use of pipes, but anyway...

It's not just unlikely, I would also go as far to say that it doesn't 
make any sense to use them in such a way :-)
That doesn't mean I would have a problem in changing that, I just don't 
see the need.

> It does also not 
> seem correct, that a reader would block, if it actually already has 
> data.

It doesn't really block, it will just try twice, but I agree that this 
is at least a bit strange :)

Bye,
   Axel.



From korli at mail.berlios.de  Mon Aug  6 20:03:53 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Mon, 6 Aug 2007 20:03:53 +0200
Subject: [Haiku-commits] r21840 - haiku/trunk/src/system/libroot/posix/unistd
Message-ID: <200708061803.l76I3r1w019317@sheep.berlios.de>

Author: korli
Date: 2007-08-06 20:03:52 +0200 (Mon, 06 Aug 2007)
New Revision: 21840
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21840&view=rev

Modified:
   haiku/trunk/src/system/libroot/posix/unistd/conf.c
Log:
now behaves like the BeOS version


Modified: haiku/trunk/src/system/libroot/posix/unistd/conf.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/unistd/conf.c	2007-08-06 17:43:59 UTC (rev 21839)
+++ haiku/trunk/src/system/libroot/posix/unistd/conf.c	2007-08-06 18:03:52 UTC (rev 21840)
@@ -101,11 +101,22 @@
 }
 
 
+#define min_c(a,b) ((a)>(b)?(b):(a))
+
 size_t 
 confstr(int name, char *buf, size_t len)
 {
-	// ToDo: find out what BeOS supports here
-	errno = EINVAL;
-	return 0;
+	size_t string_len = 1;
+	char *string = "";
+	switch (name) {
+		case 0:
+			break;
+		default:
+			errno = EINVAL;
+			return 0;
+	}
+	if (buf != NULL)
+		strncpy(buf, string, min_c(len, string_len));
+	return string_len;
 }
 



From bonefish at mail.berlios.de  Mon Aug  6 20:06:04 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Mon, 6 Aug 2007 20:06:04 +0200
Subject: [Haiku-commits] r21841 - haiku/trunk/src/system/kernel/vm
Message-ID: <200708061806.l76I64PA019521@sheep.berlios.de>

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

Modified:
   haiku/trunk/src/system/kernel/vm/vm.cpp
Log:
* Changed the signatures of fault_get_page() and fault_find_page(), so
  that an error can be propagated back to vm_soft_fault().
* Added boolean restart reference parameter to fault_find_page() which
  is set to true whenever a condition is it encountered that requires
  to start fault_find_page() from the very beginning. fault_get_page()
  checks the flag and executes fault_find_page() in a loop, now.
* Removed the panic()s+TODOs in fault_find_page() when a cache became
  busy. The restart feature is used in this case.
* fault_find_page(): If after the loop we haven't found a page yet,
  and after locking the right cache one turned up, we restart the
  function, too, thus avoiding double insertion of a page into a cache.
* Fixed potential dead-lock in fault_get_page(): After inserting a clean
  page into a cache other than the top cache (read fault on
  copy-on-write area not backed by a file (e.g. the heap)) the dummy
  page was removed from the to be locked top cache while we still held a
  lock for the lower cache, thus inverting the locking direction
  required by the cache locking policy (top -> bottom).
* fault_get_page(): In case of a write access and a readable page found
  in a lower cache, vm_cache_remove_consumer() could have replaced our
  dummy page with a real page from a collapsed lower cache while we
  had unlocked both caches. We didn't check for this condition and
  always inserted our freshly allocated page, thus potentially inserting
  a duplicate page into the top cache. We do the check now and discard our
  page, when another page turned up. Fixes bug #1359.
* fault_get_page(), same if block: Removed unused case for removal of the
  dummy page from a non-top cache. We only ever insert it into the top
  cache and it should not be moved to another cache. Added an assert.


Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-06 18:03:52 UTC (rev 21840)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-06 18:06:01 UTC (rev 21841)
@@ -3184,10 +3184,12 @@
 	otherwise, it will return the vm_cache that contains the cache.
 	It always grabs a reference to the vm_cache that it returns, and also locks it.
 */
-static inline vm_page *
+static inline status_t
 fault_find_page(vm_translation_map *map, vm_cache *topCache,
-	off_t cacheOffset, bool isWrite, vm_page &dummyPage, vm_cache **_pageCache)
+	off_t cacheOffset, bool isWrite, vm_page &dummyPage, vm_cache **_pageCache,
+	vm_page** _page, bool* _restart)
 {
+	*_restart = false;
 	vm_cache *cache = topCache;
 	vm_cache *lastCache = NULL;
 	vm_page *page = NULL;
@@ -3225,12 +3227,8 @@
 				// the top cache.
 				mutex_unlock(&cache->lock);
 				vm_cache_release_ref(cache);
-
-				cache = topCache;
-				lastCache = cache;
-				
-				vm_cache_acquire_ref(cache);
-				mutex_lock(&cache->lock);
+				*_restart = true;
+				return B_OK;
 			}
 		}
 
@@ -3274,7 +3272,7 @@
 				vm_cache_remove_page(cache, page);
 				vm_page_set_state(page, PAGE_STATE_FREE);
 
-				return NULL;
+				return status;
 			}
 
 			// mark the page unbusy again
@@ -3296,10 +3294,17 @@
 			// with his only consumer (cacheRef); since its pages are moved
 			// upwards, too, we try this cache again
 			mutex_unlock(&cache->lock);
+			thread_yield();
 			mutex_lock(&cache->lock);
-			if (cache->busy)
-				panic("fault_find_page(): cache became busy: %p\n", cache);
-					// TODO: Don't panic()!
+			if (cache->busy) {
+				// The cache became busy, which means, it is about to be
+				// removed by vm_cache_remove_consumer(). We start again with
+				// the top cache.
+				mutex_unlock(&cache->lock);
+				vm_cache_release_ref(cache);
+				*_restart = true;
+				return B_OK;
+			}
 			lastCache = NULL;
 			continue;
 		} else if (status < B_OK)
@@ -3321,9 +3326,26 @@
 				// top most cache may have direct write access.
 			vm_cache_acquire_ref(cache);
 			mutex_lock(&cache->lock);
-			if (cache->busy)
-				panic("fault_find_page(): 2. cache became busy: %p\n", cache);
-					// TOOD: Don't panic()!
+
+			if (cache->busy) {
+				// The cache became busy, which means, it is about to be
+				// removed by vm_cache_remove_consumer(). We start again with
+				// the top cache.
+				mutex_unlock(&cache->lock);
+				vm_cache_release_ref(cache);
+				*_restart = true;
+			} else {
+				vm_page* newPage = vm_cache_lookup_page(cache, cacheOffset);
+				if (newPage && newPage != &dummyPage) {
+					// A new page turned up. It could be the one we're looking
+					// for, but it could as well be a dummy page from someone
+					// else or an otherwise busy page. We can't really handle
+					// that here. Hence we completely restart this functions.
+					mutex_unlock(&cache->lock);
+					vm_cache_release_ref(cache);
+					*_restart = true;
+				}
+			}
 		}
 
 		// release the reference of the last vm_cache we still have from the loop above
@@ -3334,7 +3356,8 @@
 	}
 
 	*_pageCache = cache;
-	return page;
+	*_page = page;
+	return B_OK;
 }
 
 
@@ -3343,14 +3366,35 @@
 	It returns the owner of the page in \a sourceCache - it keeps a reference
 	to it, and has also locked it on exit.
 */
-static inline vm_page *
+static inline status_t
 fault_get_page(vm_translation_map *map, vm_cache *topCache,
 	off_t cacheOffset, bool isWrite, vm_page &dummyPage, vm_cache **_sourceCache,
-	vm_cache **_copiedSource)
+	vm_cache **_copiedSource, vm_page** _page)
 {
 	vm_cache *cache;
-	vm_page *page = fault_find_page(map, topCache, cacheOffset, isWrite,
-		dummyPage, &cache);
+	vm_page *page;
+	bool restart;
+	for (;;) {
+		status_t status = fault_find_page(map, topCache, cacheOffset, isWrite,
+			dummyPage, &cache, &page, &restart);
+		if (status != B_OK)
+			return status;
+
+		if (!restart)
+			break;
+
+		// Remove the dummy page, if it has been inserted.
+		mutex_lock(&topCache->lock);
+
+		if (dummyPage.state == PAGE_STATE_BUSY) {
+			ASSERT_PRINT(dummyPage.cache == topCache, "dummy page: %p\n",
+				&dummyPage);
+			fault_remove_dummy_page(dummyPage, true);
+		}
+
+		mutex_unlock(&topCache->lock);
+	}
+
 	if (page == NULL) {
 		// we still haven't found a page, so we allocate a clean one
 
@@ -3359,7 +3403,8 @@
 
 		// Insert the new page into our cache, and replace it with the dummy page if necessary
 
-		// if we inserted a dummy page into this cache, we have to remove it now
+		// If we inserted a dummy page into this cache (i.e. if it is the top
+		// cache), we have to remove it now
 		if (dummyPage.state == PAGE_STATE_BUSY && dummyPage.cache == cache) {
 #ifdef DEBUG_PAGE_CACHE_TRANSITIONS
 			page->debug_flags = dummyPage.debug_flags | 0x8;
@@ -3383,8 +3428,12 @@
 			}
 #endif	// DEBUG_PAGE_CACHE_TRANSITIONS
 
-			// we had inserted the dummy cache in another cache, so let's remove it from there
+			// This is not the top cache into which we inserted the dummy page,
+			// let's remove it from there. We need to temporarily unlock our
+			// cache to comply with the cache locking policy.
+			mutex_unlock(&cache->lock);
 			fault_remove_dummy_page(dummyPage, false);
+			mutex_lock(&cache->lock);
 		}
 	}
 
@@ -3392,8 +3441,11 @@
 	// sure that the area's cache can access it, too, and sees the correct data
 
 	if (page->cache != topCache && isWrite) {
-		// now we have a page that has the data we want, but in the wrong cache object
-		// so we need to copy it and stick it into the top cache
+		// Now we have a page that has the data we want, but in the wrong cache
+		// object so we need to copy it and stick it into the top cache.
+		// Note that this and the "if" before are mutual exclusive. If
+		// fault_find_page() didn't find the page, it would return the top cache
+		// for write faults.
 		vm_page *sourcePage = page;
 		void *source, *dest;
 
@@ -3431,17 +3483,41 @@
 		mutex_unlock(&cache->lock);
 		mutex_lock(&topCache->lock);
 
-		// Insert the new page into our cache, and replace it with the dummy page if necessary
+		// Since the top cache has been unlocked for a while, someone else
+		// (vm_cache_remove_consumer()) might have replaced our dummy page.
+		vm_page* newPage = NULL;
+		for (;;) {
+			newPage = vm_cache_lookup_page(topCache, cacheOffset);
+			if (newPage == NULL || newPage == &dummyPage) {
+				newPage = NULL;
+				break;
+			}
 
-		// if we inserted a dummy page into this cache, we have to remove it now
-		if (dummyPage.state == PAGE_STATE_BUSY && dummyPage.cache == topCache)
-			fault_remove_dummy_page(dummyPage, true);
+			if (newPage->state != PAGE_STATE_BUSY)
+				break;
 
-		vm_cache_insert_page(topCache, page, cacheOffset);
+			// The page is busy, wait till it becomes unbusy.
+			mutex_unlock(&topCache->lock);
+			snooze(10000);
+			mutex_lock(&topCache->lock);
+		}
 
-		if (dummyPage.state == PAGE_STATE_BUSY) {
-			// we had inserted the dummy cache in another cache, so let's remove it from there
-			fault_remove_dummy_page(dummyPage, false);
+		if (newPage) {
+			// Indeed someone else threw in a page. We free ours and are happy.
+			vm_page_set_state(page, PAGE_STATE_FREE);
+			page = newPage;
+		} else {
+			// Insert the new page into our cache and remove the dummy page, if
+			// necessary.
+
+			// if we inserted a dummy page into this cache, we have to remove it now
+			if (dummyPage.state == PAGE_STATE_BUSY) {
+				ASSERT_PRINT(dummyPage.cache == topCache, "dummy page: %p\n",
+					&dummyPage);
+				fault_remove_dummy_page(dummyPage, true);
+			}
+
+			vm_cache_insert_page(topCache, page, cacheOffset);
 		}
 
 		*_copiedSource = cache;
@@ -3451,7 +3527,8 @@
 	}
 
 	*_sourceCache = cache;
-	return page;
+	*_page = page;
+	return B_OK;
 }
 
 
@@ -3562,13 +3639,12 @@
 
 	vm_cache *copiedPageSource = NULL;
 	vm_cache *pageSource;
-	vm_page *page = fault_get_page(map, topCache, cacheOffset, isWrite,
-		dummyPage, &pageSource, &copiedPageSource);
+	vm_page *page;
+	status_t status = fault_get_page(map, topCache, cacheOffset, isWrite,
+		dummyPage, &pageSource, &copiedPageSource, &page);
 
-	status_t status = B_OK;
-
 	acquire_sem_etc(addressSpace->sem, READ_COUNT, 0, 0);
-	if (changeCount != addressSpace->change_count) {
+	if (status == B_OK && changeCount != addressSpace->change_count) {
 		// something may have changed, see if the address is still valid
 		area = vm_area_lookup(addressSpace, address);
 		if (area == NULL



From stippi at mail.berlios.de  Mon Aug  6 20:49:11 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 6 Aug 2007 20:49:11 +0200
Subject: [Haiku-commits] r21842 - haiku/trunk/src/servers/app
Message-ID: <200708061849.l76InBXN023965@sheep.berlios.de>

Author: stippi
Date: 2007-08-06 20:49:11 +0200 (Mon, 06 Aug 2007)
New Revision: 21842
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21842&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
* small cleanup


Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-06 18:06:01 UTC (rev 21841)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-06 18:49:11 UTC (rev 21842)
@@ -2080,12 +2080,8 @@
 		{
 			DTRACE(("ServerWindow %s: Message AS_STROKE_RECT\n", Title()));
 			
-			float left, top, right, bottom;
-			link.Read<float>(&left);
-			link.Read<float>(&top);
-			link.Read<float>(&right);
-			link.Read<float>(&bottom);
-			BRect rect(left,top,right,bottom);
+			BRect rect;
+			link.Read<BRect>(&rect);
 
 			fCurrentLayer->ConvertToScreenForDrawing(&rect);
 			drawingEngine->StrokeRect(rect);



From stippi at mail.berlios.de  Mon Aug  6 20:50:44 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 6 Aug 2007 20:50:44 +0200
Subject: [Haiku-commits] r21843 - haiku/trunk/src/servers/app/drawing
Message-ID: <200708061850.l76Ioi35024100@sheep.berlios.de>

Author: stippi
Date: 2007-08-06 20:50:44 +0200 (Mon, 06 Aug 2007)
New Revision: 21843
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21843&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
Log:
* in FillRegion(), check if the current drawing mode is B_OP_INVERT,
  and then use hardware acceleration... found out this is what our
  BTextView is actually using, that's why it never used hardware
  acceleration for invert rect/region before. Have not tested this on
  real hardware yet.


Modified: haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2007-08-06 18:49:11 UTC (rev 21842)
+++ haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2007-08-06 18:50:44 UTC (rev 21843)
@@ -853,6 +853,11 @@
 										  fSuspendSyncLevel == 0
 										  || cursorTouched);
 				doInSoftware = false;
+			} else if (fAvailableHWAccleration & HW_ACC_INVERT_REGION
+					   && fPainter->Pattern() == B_SOLID_HIGH
+					   && fPainter->DrawingMode() == B_OP_INVERT) {
+				r.IntersectWith(fPainter->ClippingRegion());
+				fGraphicsCard->InvertRegion(r);
 			}
 		}
 



From stippi at mail.berlios.de  Mon Aug  6 20:54:20 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 6 Aug 2007 20:54:20 +0200
Subject: [Haiku-commits] r21844 - haiku/trunk/data/artwork
Message-ID: <200708061854.l76IsK00024316@sheep.berlios.de>

Author: stippi
Date: 2007-08-06 20:54:20 +0200 (Mon, 06 Aug 2007)
New Revision: 21844
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21844&view=rev

Added:
   haiku/trunk/data/artwork/HAIKU logo - black.svg
   haiku/trunk/data/artwork/HAIKU logo - white.svg
Log:
* added the Haiku logo with white and black letters as SVG. This does not
  have the nice drop shadows, so it's only meant to be helpful to reproduce
  the logo in other graphics packages, but it's not the real logo!


Added: haiku/trunk/data/artwork/HAIKU logo - black.svg
===================================================================
--- haiku/trunk/data/artwork/HAIKU logo - black.svg	2007-08-06 18:50:44 UTC (rev 21843)
+++ haiku/trunk/data/artwork/HAIKU logo - black.svg	2007-08-06 18:54:20 UTC (rev 21844)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<svg width="735" height="181" color-interpolation="linearRGB">
+ <g>
+  <path style="fill:#010101"
+        d="M118.02 33.02v106.93h13.96v-106.93h-13.96v0z"
+  />
+  <path style="fill:#010101"
+        d="M181.02 33.02c0 35.54 0 71.39 0 106.93h13.95v-106.93h-13.95v0z"
+  />
+  <path style="fill:#010101"
+        d="M283.53 28.18l-50.43 111.77h14.1l36.32 -81.58l35.28 81.58h14.08l-49.36 -111.77v0z"
+  />
+  <path style="fill:#010101"
+        d="M371.02 33.02v106.93h13.96v-106.93h-13.96v0z"
+  />
+  <path style="fill:#010101"
+        d="M435.02 33.02v106.93h13.93v-44.5l4.49 -5.37l39.48 49.88h17.53l-47.73 -58.93l47 -48h-16.98l-43.8 46.3v-46.3h-13.93v0z"
+  />
+  <path style="fill:#010101"
+        d="M611.01 33.02v64.29c0 10.23 -2.13 18.19 -6.28 23.88c-4.14 5.68 -10.55 7.88 -19.22 7.88c-9.08 0 -15.39 -3.48 -19.21 -9.71c-3.84 -6.24 -5.33 -12.53 -5.33 -20.92v-65.42h-13.92v68.65c0 6.48 1.57 12.99 4.27 19.15c2.69 6.17 6.99 11.09 12.73 15.12c5.71 4.03 12.96 5.94 21.46 6.04c5.62 0 10.78 -0.83 15.48 -2.79c4.7 -1.98 8.75 -4.8 12.19 -8.48c3.41 -3.67 6.03 -8.03 7.88 -13.1c1.82 -5.04 2.93 -10.58 2.93 -16.61v-67.97h-12.98v0z"
+  />
+ </g>
+ <g>
+  <radialGradient id="gradient0" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.1294,-0.2357,-0.2758,-0.3164,597.2067,112.1814)">
+   <stop offset="0" stop-color="#f6a407"/>
+   <stop offset="1" stop-color="#ffe56d"/>
+  </radialGradient>
+  <path style="fill:url(#gradient0)"
+        d="M593.98 88.69c-3 15.73 0.81 27.55 8.95 36.36c0.14 -2.41 1.1 -4.13 1.89 -5.55c0.86 15.17 12.33 15.6 17.07 17.37c0.19 -1.79 -1.48 -2.74 -0.14 -6.97c1.54 3.3 2.97 5.17 4.79 7.94c2.76 0.7 5.75 2.51 8.73 2.89c3.68 0.46 8.57 0.9 12.63 1.24c-0.04 -1.87 0.5 -2.62 1.19 -3.79c0.48 1.44 1.13 2.77 1.95 3.99c4.2 -0.37 7.87 0.96 9.85 2.18c-2.2 -8.98 -8.63 -18.15 -14.44 -24.05c-3.41 -1.01 -5.89 0.69 -10.51 2.64c0.93 -2.63 2.85 -4.78 6.61 -6.03c-4.62 -3.81 -9.67 -7.14 -14.69 -10.28c-1.95 -1.22 -7.79 -3.51 -10.37 -5.38c-2.55 -0.04 -4.89 0.07 -7.04 0.31c1.47 -1.02 2.79 -2.21 4.4 -3.09c-6.63 -7.39 -11.73 -10.46 -19.63 -12.64c-7.16 -10.96 -10.43 -26.35 -8.67 -27.35l-4.14 2.35c0 0 3.68 17.09 11.55 27.84v0z"
+  />
+ </g>
+ <g>
+  <radialGradient id="gradient1" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.6662,-0.0701,0.0251,0.2389,281.9321,85.2491)">
+   <stop offset="0" stop-color="#f43d05"/>
+   <stop offset="1" stop-color="#ffaa00"/>
+  </radialGradient>
+  <path style="fill:url(#gradient1)"
+        d="M325.6 113c-8.4 -17.4 -20.6 -26.09 -34.81 -28.77c1.59 2.43 1.9 4.8 2.16 6.74c-11.74 -14.07 -23.16 -6.24 -29.03 -4.55c1.1 1.87 3.4 1.59 5.15 6.65c-3.87 -2.09 -6.6 -2.87 -10.35 -4.24c-3.18 1.3 -7.38 1.7 -10.54 3.48c-3.9 2.19 -8.96 5.28 -13.13 7.88c1.39 1.78 1.39 2.9 1.56 4.53c-1.5 -1.04 -3.09 -1.86 -4.76 -2.46c-3.8 3.38 -8.32 4.72 -11.11 4.97c8.6 7.11 21.42 11.36 31.28 12.9c4.03 -1.47 5.2 -4.9 8.28 -10.12c0.98 3.22 0.67 6.68 -2.06 10.6c7.22 0.37 14.5 -0.03 21.62 -0.6c2.77 -0.22 10.06 -2.2 13.91 -2.24c2.5 -1.79 4.68 -3.58 6.59 -5.36c-0.68 2.05 -1.11 4.15 -2.03 6.16c11.73 2.39 18.88 1.69 28.1 -1.87c14.82 5.46 29.05 18.01 28.06 20.25l2.32 -5.26c0 0 -15.86 -13.9 -31.21 -18.65v0z"
+  />
+ </g>
+ <g>
+  <radialGradient id="gradient2" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.8308,-0.3374,0.1336,0.2809,158.4185,78.0486)">
+   <stop offset="0" stop-color="#32962b"/>
+   <stop offset="1" stop-color="#a9ff00"/>
+  </radialGradient>
+  <path style="fill:url(#gradient2)"
+        d="M113.7 101.53c13.95 13.37 28.42 17.25 42.67 14.8c-2.34 -1.72 -3.45 -3.83 -4.38 -5.56c15.92 9.08 23.88 -2.23 28.79 -5.87c-1.69 -1.37 -3.75 -0.3 -7.15 -4.43c4.35 0.6 7.18 0.38 11.19 0.36c2.52 -2.33 6.32 -4.17 8.66 -6.94c2.89 -3.42 6.55 -8.08 9.55 -11.97c-1.93 -1.18 -2.32 -2.23 -3.05 -3.7c1.77 0.45 3.54 0.67 5.32 0.64c2.38 -4.5 6.14 -7.33 8.67 -8.53c-10.54 -3.66 -24.04 -3.17 -33.82 -1.16c-3.26 2.79 -3.16 6.41 -4.22 12.38c-2.05 -2.67 -2.97 -6.02 -1.76 -10.65c-6.89 2.17 -13.58 5.09 -20.04 8.12c-2.51 1.17 -8.66 5.57 -12.25 6.96c-1.71 2.55 -3.13 4.99 -4.3 7.33c-0.07 -2.16 -0.41 -4.28 -0.24 -6.49c-11.83 1.85 -18.29 5.01 -25.67 11.57c-15.8 0.05 -33.51 -6.73 -33.37 -9.17l-0.33 5.73c0 0 19.72 7.48 35.76 6.58v0z"
+  />
+ </g>
+</svg>

Added: haiku/trunk/data/artwork/HAIKU logo - white.svg
===================================================================
--- haiku/trunk/data/artwork/HAIKU logo - white.svg	2007-08-06 18:50:44 UTC (rev 21843)
+++ haiku/trunk/data/artwork/HAIKU logo - white.svg	2007-08-06 18:54:20 UTC (rev 21844)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<svg width="605" height="179" color-interpolation="linearRGB">
+ <g>
+  <path style="fill:#ffffff"
+        d="M44.02 33.02v106.93h13.96v-106.93h-13.96v0z"
+  />
+  <path style="fill:#ffffff"
+        d="M107.02 33.02c0 35.54 0 71.39 0 106.93h13.95v-106.93h-13.95v0z"
+  />
+  <path style="fill:#ffffff"
+        d="M209.53 28.18l-50.43 111.77h14.1l36.32 -81.58l35.28 81.58h14.08l-49.36 -111.77v0z"
+  />
+  <path style="fill:#ffffff"
+        d="M297.02 33.02v106.93h13.96v-106.93h-13.96v0z"
+  />
+  <path style="fill:#ffffff"
+        d="M361.02 33.02v106.93h13.93v-44.5l4.49 -5.37l39.48 49.88h17.53l-47.73 -58.93l47 -48h-16.98l-43.8 46.3v-46.3h-13.93v0z"
+  />
+  <path style="fill:#ffffff"
+        d="M537.01 33.02v64.29c0 10.23 -2.13 18.19 -6.28 23.88c-4.14 5.68 -10.55 7.88 -19.22 7.88c-9.08 0 -15.39 -3.48 -19.21 -9.71c-3.84 -6.24 -5.33 -12.53 -5.33 -20.92v-65.42h-13.92v68.65c0 6.48 1.57 12.99 4.27 19.15c2.69 6.17 6.99 11.09 12.73 15.12c5.71 4.03 12.96 5.94 21.46 6.04c5.62 0 10.78 -0.83 15.48 -2.79c4.7 -1.98 8.75 -4.8 12.19 -8.48c3.41 -3.67 6.03 -8.03 7.88 -13.1c1.82 -5.04 2.93 -10.58 2.93 -16.61v-67.97h-12.98v0z"
+  />
+ </g>
+ <g>
+  <radialGradient id="gradient0" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.2837,-0.2527,-0.3789,-0.4255,512.8769,120.2053)">
+   <stop offset="0" stop-color="#ffa600"/>
+   <stop offset="1" stop-color="#ffee9c"/>
+  </radialGradient>
+  <path style="fill:url(#gradient0)"
+        d="M519.98 88.69c-3 15.73 0.81 27.55 8.95 36.36c0.14 -2.41 1.1 -4.13 1.89 -5.55c0.86 15.17 12.33 15.6 17.07 17.37c0.19 -1.79 -1.48 -2.74 -0.14 -6.97c1.54 3.3 2.97 5.17 4.79 7.94c2.76 0.7 5.75 2.51 8.73 2.89c3.68 0.46 8.57 0.9 12.63 1.24c-0.04 -1.87 0.5 -2.62 1.19 -3.79c0.48 1.44 1.13 2.77 1.95 3.99c4.2 -0.37 7.87 0.96 9.85 2.18c-2.2 -8.98 -8.63 -18.15 -14.44 -24.05c-3.41 -1.01 -5.89 0.69 -10.51 2.64c0.93 -2.63 2.85 -4.78 6.61 -6.03c-4.62 -3.81 -9.67 -7.14 -14.69 -10.28c-1.95 -1.22 -7.79 -3.51 -10.37 -5.38c-2.55 -0.04 -4.89 0.07 -7.04 0.31c1.47 -1.02 2.79 -2.21 4.4 -3.09c-6.63 -7.39 -11.73 -10.46 -19.63 -12.64c-7.16 -10.96 -10.43 -26.35 -8.67 -27.35l-4.14 2.35c0 0 3.68 17.09 11.55 27.84v0z"
+  />
+ </g>
+ <g>
+  <radialGradient id="gradient1" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.6662,-0.0701,0.0251,0.2389,207.9321,85.2491)">
+   <stop offset="0" stop-color="#ff7200"/>
+   <stop offset="1" stop-color="#ffaa00"/>
+  </radialGradient>
+  <path style="fill:url(#gradient1)"
+        d="M251.6 113c-8.4 -17.4 -20.6 -26.09 -34.81 -28.77c1.59 2.43 1.9 4.8 2.16 6.74c-11.74 -14.07 -23.16 -6.24 -29.03 -4.55c1.1 1.87 3.4 1.59 5.15 6.65c-3.87 -2.09 -6.6 -2.87 -10.35 -4.24c-3.18 1.3 -7.38 1.7 -10.54 3.48c-3.9 2.19 -8.96 5.28 -13.13 7.88c1.39 1.78 1.39 2.9 1.56 4.53c-1.5 -1.04 -3.09 -1.86 -4.76 -2.46c-3.8 3.38 -8.32 4.72 -11.11 4.97c8.6 7.11 21.42 11.36 31.28 12.9c4.03 -1.47 5.2 -4.9 8.28 -10.12c0.98 3.22 0.67 6.68 -2.06 10.6c7.22 0.37 14.5 -0.03 21.62 -0.6c2.77 -0.22 10.06 -2.2 13.91 -2.24c2.5 -1.79 4.68 -3.58 6.59 -5.36c-0.68 2.05 -1.11 4.15 -2.03 6.16c11.73 2.39 18.88 1.69 28.1 -1.87c14.82 5.46 29.05 18.01 28.06 20.25l2.32 -5.26c0 0 -15.86 -13.9 -31.21 -18.65v0z"
+  />
+ </g>
+ <g>
+  <radialGradient id="gradient2" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.8308,-0.3374,0.1336,0.2809,69.4186,116.0486)">
+   <stop offset="0" stop-color="#33a02c"/>
+   <stop offset="1" stop-color="#a9ff00"/>
+  </radialGradient>
+  <path style="fill:url(#gradient2)"
+        d="M39.7 101.53c13.95 13.37 28.42 17.25 42.67 14.8c-2.34 -1.72 -3.45 -3.83 -4.38 -5.56c15.92 9.08 23.88 -2.23 28.79 -5.87c-1.69 -1.37 -3.75 -0.3 -7.15 -4.43c4.35 0.6 7.18 0.38 11.19 0.36c2.52 -2.33 6.32 -4.17 8.66 -6.94c2.89 -3.42 6.55 -8.08 9.55 -11.97c-1.93 -1.18 -2.32 -2.23 -3.05 -3.7c1.77 0.45 3.54 0.67 5.32 0.64c2.38 -4.5 6.14 -7.33 8.67 -8.53c-10.54 -3.66 -24.04 -3.17 -33.82 -1.16c-3.26 2.79 -3.16 6.41 -4.22 12.38c-2.05 -2.67 -2.97 -6.02 -1.76 -10.65c-6.89 2.17 -13.58 5.09 -20.04 8.12c-2.51 1.17 -8.66 5.57 -12.25 6.96c-1.71 2.55 -3.13 4.99 -4.3 7.33c-0.07 -2.16 -0.41 -4.28 -0.24 -6.49c-11.83 1.85 -18.29 5.01 -25.67 11.57c-15.8 0.05 -33.51 -6.73 -33.37 -9.17l-0.33 5.73c0 0 19.72 7.48 35.76 6.58v0z"
+  />
+ </g>
+</svg>



From korli at mail.berlios.de  Tue Aug  7 01:29:55 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Tue, 7 Aug 2007 01:29:55 +0200
Subject: [Haiku-commits] r21845 - haiku/trunk/src/preferences/devices
Message-ID: <200708062329.l76NTtt9025872@sheep.berlios.de>

Author: korli
Date: 2007-08-07 01:29:54 +0200 (Tue, 07 Aug 2007)
New Revision: 21845
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21845&view=rev

Modified:
   haiku/trunk/src/preferences/devices/usbdevs
Log:
usb devices and vendors list from NetBSD version 1.480


Modified: haiku/trunk/src/preferences/devices/usbdevs
===================================================================
--- haiku/trunk/src/preferences/devices/usbdevs	2007-08-06 18:54:20 UTC (rev 21844)
+++ haiku/trunk/src/preferences/devices/usbdevs	2007-08-06 23:29:54 UTC (rev 21845)
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.441 2006/10/11 13:02:58 gdt Exp $
+$NetBSD: usbdevs,v 1.480 2007/07/16 07:05:27 nisimura Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -93,6 +93,7 @@
 vendor DIAMOND2		0x045a	Diamond (Supra)
 vendor MICROSOFT	0x045e	Microsoft
 vendor PRIMAX		0x0461	Primax Electronics
+vendor MGE		0x0463	MGE UPS Systems
 vendor AMP		0x0464	AMP
 vendor CHERRY		0x046a	Cherry Mikroschalter
 vendor MEGATRENDS	0x046b	American Megatrends
@@ -134,9 +135,9 @@
 vendor SCANLOGIC	0x04ce	ScanLogic
 vendor MYSON		0x04cf	Myson Technology
 vendor DIGI2		0x04d0	Digi
-vendor HOLTEK		0x04d9	Holtek Semiconductor
 vendor ITTCANON		0x04d1	ITT Canon
 vendor ALTEC		0x04d2	Altec Lansing
+vendor HOLTEK		0x04d9	Holtek Semiconductor
 vendor PANASONIC	0x04da	Panasonic (Matsushita)
 vendor SHARP		0x04dd	Sharp
 vendor IIYAMA		0x04e1	Iiyama
@@ -195,6 +196,7 @@
 vendor INSYSTEM		0x05ab	In-System Design
 vendor APPLE		0x05ac	Apple Computer
 vendor DIGI		0x05c5	Digi International
+vendor QUALCOMM2	0x05c6	Qualcomm
 vendor QTRONIX		0x05c7	Qtronix
 vendor ELSA		0x05cc	ELSA
 vendor BRAINBOXES	0x05d1	Brainboxes Limited
@@ -221,17 +223,17 @@
 vendor MACALLY		0x0618	Macally
 vendor ACTLABS		0x061c	Act Labs
 vendor ALARIS		0x0620	Alaris
+vendor APEX		0x0624	Apex
 vendor CREATIVE3	0x062a	Creative Labs
-vendor APEX		0x0624	Apex
 vendor VIVITAR		0x0636	Vivitar
 vendor AVISION		0x0638	Avision
 vendor TEAC		0x0644	TEAC
-vendor ARKMICROCHIPS	0x6547	ArkMicroChips
 vendor SGI		0x065e	Silicon Graphics
 vendor SANWASUPPLY	0x0663	Sanwa Supply
 vendor LINKSYS		0x066b	Linksys
 vendor ACERSA		0x066e	Acer Semiconductor America
 vendor SIGMATEL		0x066f	Sigmatel
+vendor DRAYTEK		0x0675	DrayTek
 vendor AIWA		0x0677	Aiwa
 vendor ACARD		0x0678	ACARD Technology
 vendor PROLIFIC		0x067b	Prolific Technology
@@ -274,6 +276,7 @@
 vendor BRIMAX		0x078e	Brimax
 vendor AXIS		0x0792	Axis Communications
 vendor ABL		0x0794	ABL Electronics
+vendor SAGEM		0x079b	Sagem
 vendor SUNCOMM		0x079c	Sun Communications, Inc.
 vendor ALFADATA		0x079d	Alfadata Computer
 vendor NATIONALTECH	0x07a2	National Technical Systems
@@ -363,13 +366,14 @@
 vendor TREK		0x0a16	Trek Technology
 vendor ASAHIOPTICAL	0x0a17	Asahi Optical
 vendor BOCASYSTEMS	0x0a43	Boca Systems
+vendor SHANTOU		0x0a46  ShanTou
 vendor MEDIAGEAR	0x0a48	MediaGear
 vendor BROADCOM		0x0a5c	Broadcom
 vendor GREENHOUSE	0x0a6b	GREENHOUSE
 vendor GEOCAST		0x0a79	Geocast Network Systems
 vendor ZYDAS		0x0ace	Zydas Technology Corporation
 vendor NEODIO		0x0aec	Neodio
-vendor VODAFONE		0x0af0	Vodafone
+vendor OPTIONNV		0x0af0	Option N.V:
 vendor ASUSTEK		0x0b05	ASUSTeK Computer
 vendor TODOS		0x0b0c	Todos Data System
 vendor SIIG2		0x0b39	SIIG
@@ -381,7 +385,9 @@
 vendor ZEEVO		0x0b7a	Zeevo, Inc.
 vendor KURUSUGAWA	0x0b7e	Kurusugawa Electronics, Inc.
 vendor ASIX		0x0b95	ASIX Electronics
+vendor O2MICRO		0x0b97	O2 Micro
 vendor USR		0x0baf	U.S. Robotics
+vendor AMBIT		0x0bb2	Ambit Microsystems
 vendor REALTEK		0x0bda	Realtek
 vendor ADDONICS2	0x0bf6	Addonics Technology
 vendor AGATE		0x0c08	Agate Technologies
@@ -389,50 +395,70 @@
 vendor CHICONY2		0x0c45	Chicony Electronics
 vendor SEALEVEL		0x0c52	Sealevel System
 vendor LUWEN		0x0c76	EasyDisk
+vendor QUALCOMM_K	0x0c88	Qualcomm Kyocera
 vendor ZCOM		0x0cde	Z-Com
-vendor QUALCOMM_K	0x0c88	Qualcomm Kyocera
 vendor TANGTOP		0x0d3d	Tangtop
 vendor SMC3		0x0d5c	Standard Microsystems
 vendor PEN		0x0d7d	Pen Drive
 vendor ACDC		0x0d7e	American Computer & Digital Components
 vendor CMEDIA		0x0d8c	C-Media Electronics Inc.
 vendor MSI		0x0db0	Micro Star
+vendor ELCON		0x0db7	ELCON Systemtechnik
 vendor SITECOMEU	0x0df6	Sitecom Europe
 vendor HAWKING		0x0e66	Hawking
+vendor GMATE		0x0e7e	G.Mate, Inc
 vendor OTI		0x0ea0	Ours Technology
 vendor PILOTECH		0x0eaf	Pilotech
+vendor NOVATECH		0x0eb0	Nova Tech
 vendor EGALAX		0x0eef	eGalax
+vendor TOD		0x0ede	TOD
 vendor AIRPRIME		0x0f3d	AirPrime, Incorporated
 vendor VTECH		0x0f88	VTech
 vendor FALCOM		0x0f94	Falcom Wireless Communications GmbH
+vendor RIM		0x0fca	Research In Motion
+vendor DYNASTREAM	0x0fcf	Dynastream Innovations
 vendor QUALCOMM		0x1004	Qualcomm
 vendor GIGABYTE		0x1044	GIGABYTE
 vendor MOTOROLA		0x1063	Motorola
 vendor CCYU		0x1065	CCYU Technology
+vendor SILABS2		0x10a6	SILABS2
+vendor USI		0x10ab	USI
 vendor PLX		0x10b5	PLX
 vendor ASANTE		0x10bd	Asante
+vendor SILABS		0x10c4	Silicon Labs
 vendor JRC		0x1145	Japan Radio Company
+vendor SPHAIRON		0x114b	Sphairon Access Systems GmbH
+vendor DELORME		0x1163	DeLorme
 vendor SERVERWORKS	0x1166	ServerWorks
-vendor DELORME		0x1163	DeLorme
 vendor ACERCM		0x1189	Acer Communications & Multimedia
 vendor SIERRA		0x1199	Sierra Wireless
 vendor TOPFIELD		0x11db	Topfield Co., Ltd
+vendor NETINDEX		0x11f6	NetIndex
 vendor TSUNAMI		0x1241	Tsunami
 vendor TARGUS		0x1267	Targus
+vendor TWINMOS		0x126f	TwinMOS
 vendor CREATIVE2	0x1292	Creative Labs
 vendor BELKIN2		0x1293	Belkin Components
+vendor CYBERTAN		0x129b	CyberTAN Technology
+vendor HUAWEI		0x12d1	Huawei Technologies
 vendor AINCOMM		0x12fd	Aincomm
 vendor MOBILITY		0x1342	Mobility
 vendor DICKSMITH	0x1371	Dick Smith Electronics
+vendor BALTECH		0x13ad	Baltech
 vendor CISCOLINKSYS	0x13b1	Cisco-Linksys
 vendor SHARK		0x13d2	Shark
-vendor HUAWEI3COM	0x1472	Huawei 3Com
+vendor NOVATEL2		0x1410	Novatel
+vendor WISTRONNEWEB	0x1435	Wistron NeWeb
+vendor HUAWEI3COM	0x1472	Huawei-3Com
 vendor SILICOM		0x1485	Silicom
 vendor RALINK		0x1485	Ralink Technology
 vendor RALINK_2		0x148f	Ralink Technology
 vendor CONCEPTRONIC	0x14b2	Conceptronic
+vendor PLANEX3		0x14ea	Planex Communications
 vendor SILICONPORTALS	0x1527	Silicon Portals
 vendor OQO		0x1557	OQO
+vendor UMEDIA		0x157e	U-MEDIA Communications
+vendor FIBERLINE	0x1582	Fiberline
 vendor SOHOWARE		0x15e8	SOHOware
 vendor UMAX		0x1606	UMAX Data Systems
 vendor INSIDEOUT	0x1608	Inside Out Networks
@@ -440,6 +466,11 @@
 vendor ENTREGA		0x1645	Entrega
 vendor ACTIONTEC	0x1668	Actiontec Electronics
 vendor GIGASET		0x1690	Gigaset
+vendor ANYDATA		0x16d5	AnyDATA Inc.
+vendor JABLOTRON	0x16d6	Jablotron
+vendor LINKSYS4		0x1737	Linksys
+vendor SENAO		0x1740	Senao
+vendor AMIT		0x18c5	AMIT
 vendor QCOM		0x18e8	Qcom
 vendor LINKSYS3		0x1915	Linksys
 vendor DLINK		0x2001	D-Link
@@ -452,18 +483,21 @@
 vendor PLANEX		0x2c02	Planex Communications
 vendor VIDZMEDIA	0x3275	VidzMedia Pte Ltd
 vendor AEI		0x3334	AEI
+vendor HANK		0x3353	Hank Connection
 vendor PQI		0x3538	PQI
 vendor DAISY		0x3579	Daisy Technology
 vendor NI		0x3923	National Instruments
-vendor HANK		0x3353	Hank Connection
 vendor MICRONET		0x3980	Micronet Communications
 vendor IODATA2		0x40bb	I-O Data
 vendor IRIVER		0x4102	iRiver
 vendor DELL		0x413c	Dell
 vendor AVERATEC		0x50c2	Averatec
+vendor SWEEX		0x5173	Sweex
 vendor ONSPEC2		0x55aa	OnSpec Electronic Inc.
 vendor ZINWELL		0x5a57	Zinwell
 vendor SITECOM		0x6189	Sitecom
+vendor ARKMICROCHIPS	0x6547	ArkMicroChips
+vendor 3COM2		0x6891	3Com
 vendor INTEL		0x8086	Intel
 vendor MOSCHIP		0x9710	MosChip Semiconductor
 vendor HP2		0xf003	Hewlett Packard
@@ -480,6 +514,7 @@
 product 3COM USR56K		0x3021	U.S.Robotics 56000 Voice Faxmodem Pro
 product 3COM 3C460		0x11f8	HomeConnect 3C460
 product 3COM 3C460B		0x4601	HomeConnect 3C460B
+product 3COM2 3CRUSB10075	0xa727	3CRUSB10075
 
 product 3COMUSR OFFICECONN	0x0082	3Com OfficeConnect Analog Modem
 product 3COMUSR USRISDN		0x008f	3Com U.S. Robotics Pro ISDN TA
@@ -488,8 +523,8 @@
 
 /* ACDC products */
 product ACDC HUB		0x2315	USB Pen Drive HUB
+product ACDC SECWRITE		0x2316	USB Pen Drive Secure Write
 product ACDC PEN		0x2317	USB Pen Drive with Secure Write
-product ACDC SECWRITE		0x2316	USB Pen Drive Secure Write
 
 /* AboCom products */
 product ABOCOM XX1		0x110c	XX1
@@ -505,14 +540,27 @@
 product ABOCOM XX8		0x4102	XX8
 product ABOCOM XX9		0x4104	XX9
 product ABOCOM UFE2000		0x420a	UFE2000 USB2.0 Fast Ethernet Adapter
+product ABOCOM WL54		0x6001	WL54
 product ABOCOM XX10		0xabc1	XX10
-product ABOCOM RT2573		0xb21d	RT2573
+product ABOCOM HWU54DM		0xb21b	HWU54DM
+product ABOCOM RT2573_2		0xb21c	RT2573
+product ABOCOM RT2573_3		0xb21d	RT2573
+product ABOCOM RT2573_4		0xb21e	RT2573
+product ABOCOM WUG2700		0xb21f	WUG2700
 
 /* Accton products */
 product ACCTON USB320_EC	0x1046	USB320-EC Ethernet Adapter
 product ACCTON 111		0x3503	T-Sinus 111 WLAN
+product ACCTON SMCWUSBG		0x4505	SMCWUSB-G
 product ACCTON SS1001		0x5046	SpeedStream Ethernet Adapter
+product ACCTON ZD1211B		0xe501	ZD1211B
 
+/* Acer Communications & Multimedia products */
+product ACERCM EP1427X2		0x0893	EP-1427X-2 Ethernet
+
+/* Acer Labs products */
+product ACERLABS M5632		0x5632	USB 2.0 Data Link
+
 /* Acer Peripherals, Inc. products */
 product ACERP ACERSCAN_C310U	0x12a6	Acerscan C310U
 product ACERP ACERSCAN_320U	0x2022	Acerscan 320U
@@ -545,6 +593,7 @@
 product ADDONICS2 205		0xa001	Cable 205
 
 /* ADMtek products */
+product ADMTEK PEGASUSII_4	0x07c2	AN986A Ethernet
 product ADMTEK PEGASUS		0x0986	AN986 USB Ethernet
 product ADMTEK PEGASUSII	0x8511	AN8511 USB Ethernet
 product ADMTEK PEGASUSII_2	0x8513	AN8513 Ethernet
@@ -572,14 +621,14 @@
 product AGFA SNAPSCANE26	0x2097	SnapScan e26
 product AGFA SNAPSCANE52	0x20fd	SnapScan e52
 
-/* AirPrime products */
-product AIRPRIME PC5220		0x0112	CDMA Wireless PC Card
+/* Aincomm products */
+product AINCOMM AWU2000B	0x1001	AWU2000B
 
 /* AIPTEK International products */
 product AIPTEK2 PENCAM_MEGA_1_3 0x504a	PenCam Mega 1.3
 
-/* Aincomm products */
-product AINCOMM AWU2000B	0x1001	AWU2000B
+/* AirPrime products */
+product AIRPRIME PC5220		0x0112	CDMA Wireless PC Card
 
 /* AKS products */
 product AKS USBHASP		0x0001	USB-HASP 0.06
@@ -597,12 +646,21 @@
 product ALTEC ASC495		0xff05	ASC495 Speakers
 
 /* American Power Conversion products */
-product APC UPSPRO500		0x0002	Back-UPS Pro 500
+product APC UPS			0x0002	Uninterruptible Power Supply
 
+/* Ambit Microsystems products */
+product AMBIT NTL_250		0x6098	NTL 250 cable modem
+
+/* AMIT products */
+product AMIT CGWLUSB2GO		0x0002	CG-WLUSB2GO
+
 /* Anchor products */
 product ANCHOR EZUSB		0x2131	EZUSB
 product ANCHOR EZLINK		0x2720	EZLINK
 
+/* AnyDATA Inc. products */
+product ANYDATA ADU_E100H	0x6501	ADU-E100H
+
 /* AOX, Inc. products */
 product AOX USB101		0x0008	USB ethernet controller engine
 
@@ -613,6 +671,9 @@
 product APPLE EXT_KBD_HUB	0x1003	Hub in Apple Extended USB Keyboard
 product APPLE SPEAKERS		0x1101	Speakers
 
+/* ArkMicroChips products */
+product ARKMICROCHIPS USBSERIAL 0x0232	USB-UART Controller
+
 /* Asahi Optical products */
 product ASAHIOPTICAL OPTIO230	0x0004	PENTAX Optio230
 product ASAHIOPTICAL OPTIO330	0x0006	Digital camera
@@ -621,15 +682,23 @@
 product ASANTE EA		0x1427	Ethernet Adapter
 
 /* ASIX Electronics products */
-product ASIX AX88172		0x1720	USB 2.0 10/100 ethernet controller
+product ASIX AX88172		0x1720	AX88172 USB 2.0 10/100 Ethernet adapter
+product ASIX AX88178		0x1780	AX88178 USB 2.0 10/100 Ethernet adapter
+product ASIX AX88772		0x7720	AX88772 USB 2.0 10/100 Ethernet adapter
 
 /* ASUSTeK computer products */
 product ASUSTEK WL167G		0x1707	WL-167g USB2.0 WLAN Adapter
+product ASUSTEK WL159G		0x170c	WL-159g
+product ASUSTEK A9T_WIFI	0x171b	A9T wireless
+product ASUSTEK WL167G_2	0x1723	WL-167g USB2.0 WLAN Adapter (version 2)
+product ASUSTEK WL167G_3	0x1724	WL-167g USB2.0 WLAN Adapter (version 2)
+product ASUSTEK MYPAL_A730	0x4202	MyPal A730
 
 /* ATen products */
 product ATEN UC1284		0x2001	Parallel printer adapter
 product ATEN UC10T		0x2002	10Mbps ethernet adapter
 product ATEN UC232A		0x2008	Serial adapter
+product ATEN UC210T		0x2009	UC210T Ethernet adapter
 product ATEN DSB650C		0x4000	DSB-650C
 
 /* ATI products */
@@ -639,11 +708,10 @@
 product ATMEL UHB124		0x3301	UHB124 hub
 product ATMEL DWL900AP		0x5601	DWL-900AP Wireless access point
 product ATMEL DWL120		0x7602	DWL-120 Wireless adapter
+product ATMEL AT76C503A		0x7603	AT76C503A
 product ATMEL BW002		0x7605	BW002 Wireless adapter
-product ATMEL BW002		0x7605	BW002
 product ATMEL WL1130		0x7613	WL-1130
 product ATMEL AT76C505A		0x7614	AT76C505A
-product ATMEL AT76C503A		0x7603	AT76C503A
 
 /* Audio-Technica products */
 product AUDIOTECHNICA ATCHA4USB 0x0009	ATC-HA4USB USB headphone
@@ -657,6 +725,9 @@
 /* Avision products */
 product AVISION 1200U		0x0268	1200U scanner
 
+/* Baltech products */
+product BALTECH CARDREADER	0x9999	Card reader
+
 /* B&B Electronics products */
 product BBELECTRONICS USOTL4	0xAC01	uLinks RS-422/485
 
@@ -666,15 +737,19 @@
 product BELKIN F5D6050		0x0050	F5D6050 802.11b Wireless adapter
 product BELKIN F5U103		0x0103	F5U103 Serial adapter
 product BELKIN F5U109		0x0109	F5U109 Serial adapter
-product BELKIN F5U409		0x0409	F5U409 Serial
 product BELKIN SCSI		0x0115	SCSI Adaptor
 product BELKIN USB2LAN		0x0121	USB to LAN Converter
 product BELKIN F5U208		0x0208	F5U208 VideoBus II
 product BELKIN F5U237		0x0237	F5U237 USB 2.0 7-Port Hub
+product BELKIN F5U409		0x0409	F5U409 Serial
 product BELKIN UPS		0x0980	UPS
 product BELKIN F5U120		0x1203	F5U120-PC Hub
+product BELKIN ZD1211B		0x4050	ZD1211B
+product BELKIN F5D5055		0x5055	F5D5055 Ethernet adapter
 product BELKIN F5D7050		0x7050	F5D7050 54g USB Network Adapter
+product BELKIN F5D7051		0x7051	F5D7051 54g USB Network Adapter
 product BELKIN F5D7050A		0x705a	F5D705A 54g USB Network Adapter
+product BELKIN F5D7050C		0x705c	F5D705C 54g USB Network Adapter
 product BELKIN F5D9050V3	0x905b	F5D9050 ver 3
 
 /* Billionton products */
@@ -682,6 +757,7 @@
 product BILLIONTON USBLP100	0x0987	USB100LP
 product BILLIONTON USBEL100	0x0988	USB100EL
 product BILLIONTON USBE100	0x8511	USBE100
+product BILLIONTON USB2AR	0x90ff	USB2AR Ethernet
 
 /* Broadcom products */
 product BROADCOM BCM2033	0x2000	BCM2033
@@ -706,18 +782,19 @@
 product CANON A20		0x304e	PowerShot A20
 product CANON S200		0x3065	PowerShot S200
 product CANON EOS300D		0x3084	EOS 300D / Digital Rebel
+product CANON SD630		0x30fe	PowerShot SD630
 
+/* CASIO products */
+product CASIO QV		0x1001	QV DigitalCamera
+product CASIO BE300		0x2002	BE-300 PDA
+product CASIO NAMELAND		0x4001	CASIO Nameland EZ-USB
+
 /* CATC products */
 product CATC NETMATE		0x000a	Netmate ethernet adapter
 product CATC NETMATE2		0x000c	Netmate2 ethernet adapter
 product CATC CHIEF		0x000d	USB Chief Bus & Protocol Analyzer
 product CATC ANDROMEDA		0x1237	Andromeda hub
 
-/* CASIO products */
-product CASIO QV		0x1001	QV DigitalCamera
-product CASIO BE300		0x2002	BE-300 PDA
-product CASIO NAMELAND		0x4001	CASIO Nameland EZ-USB
-
 /* CCYU Technology products */
 product CCYU EASYDISK		0x2136	EasyDisk Portable Device
 
@@ -741,7 +818,13 @@
 product CHPRODUCTS FLIGHTYOKE	0x00ff	Flight Sim Yoke
 
 /* Cisco-Linksys products */
+product CISCOLINKSYS WUSB54G	0x000d	WUSB54G Wireless-G USB Network Adapter
+product CISCOLINKSYS WUSB54GP	0x0011	WUSB54GP Wireless-G USB Network Adapter
+product CISCOLINKSYS USB200MV2	0x0018	USB200M v2
+product CISCOLINKSYS HU200TS	0x001a	HU200-TS
 product CISCOLINKSYS WUSB54GC	0x0020	WUSB54GC
+product CISCOLINKSYS WUSB54GR	0x0023	WUSB54GR
+product CISCOLINKSYS WUSBF54G	0x0024	WUSBF54G
 
 /* Compaq products */
 product COMPAQ IPAQPOCKETPC	0x0003	iPAQ PocketPC
@@ -791,6 +874,9 @@
 /* CTX products */
 product CTX EX1300		0x9999	Ex1300 hub
 
+/* CyberTAN Technology products */
+product CYBERTAN TG54USB	0x1666	TG54USB
+
 /* Cypress Semiconductor products */
 product CYPRESS MOUSE		0x0001	mouse
 product CYPRESS THERMO		0x0002	thermometer
@@ -817,6 +903,7 @@
 
 /* DeLorme products */
 product DELORME EARTHMATE	0x0100	Earthmate GPS
+product DELORME EARTHMATE_LT20	0x0200	Earthmate LT-20 GPS
 
 /* Diamond products */
 product DIAMOND RIO500USB	0x0001	Rio 500 USB
@@ -841,6 +928,7 @@
 product DLINK DWLG122		0x3c00	AirPlus G Wireless USB Adapter
 product DLINK2 DWLG122C1	0x3c03	DWL-G122 rev C1
 product DLINK2 WUA1340		0x3c04	WUA-1340
+product DLINK DUBE100B1		0x3c05	DUB-E100 rev B1
 product DLINK DSB650C		0x4000	10Mbps ethernet adapter
 product DLINK DSB650TX1		0x4001	10/100 ethernet adapter
 product DLINK DSB650TX		0x4002	10/100 ethernet adapter
@@ -849,14 +937,20 @@
 product DLINK DSB650TX2		0x4102	10/100 ethernet adapter
 product DLINK DSB650		0xabc1	10/100 ethernet adapter
 
+/* DMI products */
+product DMI SA2_0		0xb001	Storage Adapter
+
+/* DrayTek products */
+product DRAYTEK VIGOR550	0x0550	Vigor550
+
+/* Dynastream Innovations */
+product DYNASTREAM ANTDEVBOARD	0x1003	ANT dev board
+
 /* eGalax Products */
 product EGALAX TPANEL		0x0001	Touch Panel
 product EGALAX TPANEL2		0x0002	Touch Panel
 product EGALAX2 TPANEL		0x0001	Touch Panel
 
-/* DMI products */
-product DMI SA2_0		0xb001	Storage Adapter
-
 /* Eicon Networks */
 product EICON DIVA852		0x4905	Diva 852 ISDN TA
 
@@ -864,12 +958,16 @@
 product EIZO HUB		0x0000	hub
 product EIZO MONITOR		0x0001	monitor
 
+/* ELCON Systemtechnik products */
+product ELCON PLAN		0x0002	Goldpfeil P-LAN
+
 /* Elecom products */
 product ELECOM MOUSE29UO	0x0002	mouse 29UO
 product ELECOM LDUSBTX0		0x200c	LD-USB/TX
 product ELECOM LDUSBTX1		0x4002	LD-USB/TX
 product ELECOM LDUSBLTX		0x4005	LD-USBL/TX
 product ELECOM LDUSBTX2		0x400b	LD-USB/TX
+product ELECOM LDUSB20		0x4010	LD-USB20
 product ELECOM UCSGT		0x5003	UC-SGT serial adapter
 product ELECOM UCSGT0		0x5004	UC-SGT0 Serial
 product ELECOM LDUSBTX3		0xabc1	LD-USB/TX
@@ -926,11 +1024,15 @@
 product FALCOM TWIST		0x0001	Twist GSM/GPRS modem
 product FALCOM SAMBA		0x0005	Samba 55/56 GSM/GPRS modem
 
+/* Fiberline */
+product FIBERLINE WL430U	0x6003	WL-430U
+
 /* Freecom products */
 product FREECOM DVD		0xfc01	Connector for DVD drive
 
 /* Future Technology Devices products */
 product FTDI SERIAL_8U232AM	0x6001	8U232AM Serial converter
+product FTDI SERIAL_2232C	0x6010	2232C USB FAST SERIAL ADAPTER
 product FTDI PS2KBDMS		0x8371	PS/2 Keyboard/Mouse
 product FTDI SERIAL_8U100AX	0x8372	8U100AX Serial converter
 product FTDI MHAM_KW		0xeee8	KW
@@ -970,16 +1072,24 @@
 product GENESYS GL641USB2IDE	0x0702	GL641USB USB-IDE Bridge
 
 /* GIGABYTE products */
+product GIGABYTE GN54G		0x8001	GN-54G
+product GIGABYTE GNBR402W	0x8002	GN-BR402W
+product GIGABYTE GNWLBM101	0x8003	GN-WLBM101
 product GIGABYTE GNWBKG		0x8007	GN-WBKG
 product GIGABYTE GNWB01GS	0x8008	GN-WB01GS
+product GIGABYTE GNWI05GS	0x800a	GN-WI05GS
 
 /* Gigaset products */
 product GIGASET RT2573		0x0722	RT2573
 
+/* G.Mate, Inc products */
+product GMATE YP3X00		0x1001	YP3X00 PDA
+
 /* GoHubs products */
 product GOHUBS GOCOM232		0x1001	GoCOM232 Serial converter
 
 /* Good Way Technology products */
+product GOODWAY GWUSB2E		0x6200	GWUSB2E
 product GOODWAY RT2573		0xc019	RT2573
 
 /* Gravis products */
@@ -995,6 +1105,8 @@
 /* Guillemot Corporation */
 product GUILLEMOT DALEADER	0xa300	DA Leader
 product GUILLEMOT HWGUSB254	0xe000	HWGUSB2-54 WLAN
+product GUILLEMOT HWGUSB254LB	0xe010	HWGUSB2-54-LB
+product GUILLEMOT HWGUSB254V2AP	0xe020	HWGUSB2-54V2-AP
 
 /* Hagiwara products */
 product HAGIWARA FGSM		0x0002	FlashGate SmartMedia Card Reader
@@ -1074,7 +1186,10 @@
 /* HP products */
 product HP2 C500		0x6002	PhotoSmart C500
 
-/* HUAWEI products */
+/* Huawei Technologies products */
+product HUAWEI MOBILE		0x1001	Huawei Mobile
+
+/* Huawei-3Com products */
 product HUAWEI3COM RT2573	0x0009	RT2573
 
 /* IBM Corporation */
@@ -1142,7 +1257,9 @@
 product IODATA USBETTX		0x0904	USB ETTX
 product IODATA USBETTXS		0x0913	USB ETTX
 product IODATA USBWNB11		0x0922	USB Airport WN-B11
+product IODATA ETGUS2		0x0930	ETG-US2
 product IODATA USBRSAQ		0x0a03	USB serial adapter USB-RSAQ1
+product IODATA USBRSAQ5		0x0a0e	USB serial adapter USB-RSAQ5
 product IODATA2 USB2SC		0x0a09	USB2.0-SCSI Bridge USB2-SC
 
 /* Iomega products */
@@ -1156,6 +1273,9 @@
 product IRIVER IFP_3XX		0x1103	iFP-3xx
 product IRIVER IFP_5XX		0x1105	iFP-5xx
 
+/* Jablotron products */
+product JABLOTRON PC60B		0x0001	PC-60B
+
 /* Jaton products */
 product JATON EDA		0x5704	Ethernet Device Adapter
 
@@ -1167,8 +1287,7 @@
 
 /* JVC products */
 product JVC GR_DX95		0x000a	GR-DX95
-
-/* JVC products */
+product JVC MP_PRX1		0x3008	MP-PRX1 Ethernet
 product JVC MP_XP7250_WL	0x3009	MP-XP7250 Builtin WLAN
 
 /* Kawasaki products */
@@ -1212,8 +1331,8 @@
 product KEYSPAN USA28XA		0x0115	USA-28XA serial adapter
 product KEYSPAN USA18XA_NF	0x0116	USA-18XA serial adapter (no firmware)
 product KEYSPAN USA18XA		0x0117	USA-18XA serial adapter
-product KEYSPAN USA19QW_NF	0x0118	USA-19WQ serial adapter (no firmware)
-product KEYSPAN USA19QW		0x0119	USA-19WQ serial adapter
+product KEYSPAN USA19QW_NF	0x0118	USA-19QW serial adapter (no firmware)
+product KEYSPAN USA19QW		0x0119	USA-19QW serial adapter
 product KEYSPAN UIA10		0x0201	UIA-10 remote control
 product KEYSPAN UIA11		0x0202	UIA-11 remote control
 
@@ -1244,9 +1363,9 @@
 product KYOCERA AHK3001V	0x0203	AH-K3001V
 
 /* LaCie products */
+product LACIE PKTDRV		0x0211	PocketDrive
 product LACIE HD		0xa601	Hard Disk
 product LACIE CDRW		0xa602	CD R/W
-product LACIE PKTDRV		0x0211	PocketDrive
 
 /* Lexar products */
 product LEXAR JUMPSHOT		0x0001	jumpSHOT CompactFlash Reader
@@ -1266,12 +1385,11 @@
 product LINKSYS WUSB11		0x2211	WUSB11 Wireless USB Network Adapter
 product LINKSYS WUSB11_25	0x2212	WUSB11 Wireless USB Network Adapter (version 2.5)
 product LINKSYS WUSB12_11	0x2213	WUSB12 802.11b v1.1
-product LINKSYS2 USB200M	0x2226	USB 2.0 10/100 ethernet controller
 product LINKSYS USB10TX2	0x400b	USB10TX
 product LINKSYS2 WUSB11		0x2219	WUSB11
+product LINKSYS2 USB200M	0x2226	USB 2.0 10/100 ethernet controller
 product LINKSYS3 WUSB11V28	0x2233	WUSB11-V28
-product CISCOLINKSYS WUSB54G	0x000d	WUSB54G Wireless-G USB Network Adapter
-product CISCOLINKSYS WUSB54GP	0x0011	WUSB54GP Wireless-G USB Network Adapter
+product LINKSYS4 USB1000	0x0039	USB1000
 
 /* Logitec products */
 product LOGITEC LDR_H443SU2	0x0033	DVD Multi-plus unit LDR-H443SU2
@@ -1297,11 +1415,10 @@
 product LOGITECH USBPS2MOUSE	0xc00e	USB-PS/2 Optical Mouse
 product LOGITECH MUV55A		0xc016	M-UV55a
 product LOGITECH UN58A		0xc030	iFeel Mouse
-product LOGITECH WMRPAD		0xc20a	WingMan RumblePad
-product LOGITECH WMFFGP		0xc293	WingMan Formula Force GP (GT-Force)
 product LOGITECH WMPAD		0xc208	WingMan GamePad Extreme
 product LOGITECH WMRPAD		0xc20a	WingMan RumblePad
 product LOGITECH WMJOY		0xc281	WingMan Force joystick
+product LOGITECH WMFFGP		0xc293	WingMan Formula Force GP (GT-Force)
 product LOGITECH BB13		0xc401	USB-PS/2 Trackball
 product LOGITECH BB18		0xc404	TrackMan Wheel
 product LOGITECH MARBLEMOUSE	0xc408	Marble Mouse
@@ -1344,18 +1461,27 @@
 product MELCO KG54YB		0x005e	WLI-U2-KG54-YB WLAN
 product MELCO KG54		0x0066	WLI-U2-KG54 WLAN
 product MELCO KG54AI		0x0067	WLI-U2-KG54-AI WLAN
+product MELCO NINWIFI		0x008b	Nintendo Wi-Fi
+product MELCO SG54HP		0x00d8	WLI-U2-SG54HP
+product MELCO G54HP		0x00d9	WLI-U2-G54HP
+product MELCO KG54L		0x00da	WLI-U2-KG54L
 
 /* Metricom products */
 product METRICOM RICOCHET_GS	0x0001	Ricochet GS
 
+/* MGE UPS Systems */
+product MGE UPS1		0x0001	MGE UPS SYSTEMS PROTECTIONCENTER 1
+product MGE UPS2		0xffff	MGE UPS SYSTEMS PROTECTIONCENTER 2
+
 /* Micro Star International products */
 product MSI BLUETOOTH		0x1967	Bluetooth USB Adapter
 product MSI MS6861		0x6861	MS-6861
 product MSI MS6865		0x6865	MS-6865
 product MSI MS6869		0x6869	MS-6869
-product MSI RT2573		0x6877	RT2573
-product MSI RT2573_2		0xa861	RT2573
-product MSI RT2573_3		0xa874	RT2573
+product MSI RT2573		0x6874	RT2573
+product MSI RT2573_2		0x6877	RT2573
+product MSI RT2573_3		0xa861	RT2573
+product MSI RT2573_4		0xa874	RT2573
 
 /* Micronet Communications products */
 product MICRONET SP128AR	0x0003	SP128AR EtherFast
@@ -1372,6 +1498,11 @@
 product MICROSOFT INETPRO2	0x002b	Internet Keyboard Pro
 product MICROSOFT MN510		0x006e	MN510 Wireless
 product MICROSOFT MN110		0x007a	10/100 USB NIC
+product MICROSOFT XBOX_MEMORY_UNIT	0x0280	Xbox Memory Unit
+product MICROSOFT XBOX_DVD_PLAYBACK	0x0284	Xbox DVD Movie Playback Kit
+product MICROSOFT XBOX_CONTROLLER_S10	0x0285	Xbox Controller S (1.0)
+product MICROSOFT XBOX_CONTROLLER_HUB	0x0288	Xbox Controller Hub
+product MICROSOFT XBOX_CONTROLLER_S12	0x0289	Xbox Controller S (1.2)
 
 /* Microtech products */
 product MICROTECH SCSIDB25	0x0004	USB-SCSI-DB25
@@ -1414,8 +1545,12 @@
 
 /* Mobility products */
 product MOBILITY EA		0x0204	Ethernet Adapter
+product MOBILITY EASIDOCK	0x0304	EasiDock Ethernet
 
 /* MosChip Semiconductor */
+product MOSCHIP MCS7780		0x7780	Fast IrDA Adapter
+product MOSCHIP MCS7781		0x7781	Fast IrDA Adapter
+product MOSCHIP MCS7784		0x7784	Slow IrDA Adapter
 product MOSCHIP MCS7830		0x7830	Ethernet Adapter
 
 /* Motorola products */
@@ -1423,7 +1558,14 @@
 product MOTOROLA SB4100		0x4100	SB4100 USB Cable Modem
 product MOTOROLA2 T720C		0x2822	T720c
 product MOTOROLA2 A920		0x4002	A920
+product MOTOROLA2 USBLAN	0x600c	USBLAN
+product MOTOROLA2 USBLAN2	0x6027	USBLAN
 
+/* M-Systems products */
+product MSYSTEMS DISKONKEY	0x0010	DiskOnKey
+product MSYSTEMS DISKONKEY2	0x0011	DiskOnKey
+product MSYSTEMS DISKONKEY3	0x0012	DiskOnKey
+
 /* MultiTech products */
 product MULTITECH ATLAS		0xf101	MT5634ZBA-USB modem
 
@@ -1440,11 +1582,6 @@
 product MUSTEK MDC800		0xa800	MDC-800 digital camera
 product MUSTEK DV2000		0xc441	DV2000 digital camera
 
-/* M-Systems products */
-product MSYSTEMS DISKONKEY	0x0010	DiskOnKey
-product MSYSTEMS DISKONKEY2	0x0011	DiskOnKey
-product MSYSTEMS DISKONKEY3	0x0012	DiskOnKey
-
 /* National Instruments */
 product NI GPIB_USB_A		0xc920	GPIB-USB-A
 
@@ -1471,6 +1608,7 @@
 /* NetChip Technology Products */
 product NETCHIP TURBOCONNECT	0x1080	Turbo-Connect
 product NETCHIP CLIK40		0xa140	Clik! 40
+product NETCHIP ETHERNETGADGET	0xa4a2	Linux Ethernet/RNDIS gadget on pxa210/25x/26x
 
 /* Netgear products */
 product NETGEAR EA101		0x1001	Ethernet adapter
@@ -1483,19 +1621,28 @@
 product NETGEAR2 MA101		0x4100	MA101
 product NETGEAR2 MA101B		0x4102	MA101 Rev B
 
+/* NetIndex products */
+product NETINDEX WS002IN	0x2001	Willcom WS002IN (DD)
+
+/* NHJ product */
+product NHJ CAM2		0x9120	Camera
+
 /* Nikon products */
 product NIKON E990		0x0102	Digital Camera E990
 product NIKON E880		0x0103	Digital Camera E880
 product NIKON E885		0x0105	Digital Camera E885
 
-/* NHJ product */
-product NHJ CAM2		0x9120	Camera
-
 /* Nokia products */
 product NOKIA CA42		0x0802	Mobile Phone adapter
 
+/* Nova Tech products */
+product NOVATECH NV902W		0x9020	NV-902W
+product NOVATECH RT2573		0x9021	RT2573
+
 /* NovAtel products */
 product NOVATEL FLEXPACKGPS	0x0100	NovAtel FlexPack GPS receiver
+product NOVATEL2 CDMA_MODEM	0x1110	Novatel Wireless Merlin CDMA
+product NOVATEL2 MERLINU740	0x1400	Novatel Merlin U740
 
 /* Olympus products */
 product OLYMPUS C1		0x0102	C-1 Digital Camera
@@ -1519,8 +1666,15 @@
 
 product ONSPEC2 8IN2		0xb012	8In2
 
+/* Option N.V. products */
+product OPTIONNV MC3G		0x5000	Mobile Connect 3G datacard
+product OPTIONNV QUADUMTS2	0x6000	GlobeTrotter Fusion Quad Lite UMTS/GPRS
+product OPTIONNV QUADUMTS	0x6300	GlobeTrotter Fusion Quad Lite 3D
+product OPTIONNV QUADPLUSUMTS	0x6600	GlobeTrotter 3G Quad Plus
+
 /* OQO */
 product OQO WIFI01		0x0002	model 01 WiFi interface
+product OQO ETHER01PLUS		0x7720	model 01+ Ethernet
 product OQO ETHER01		0x8150	model 01 Ethernet interface
 
 /* Ours Technology Inc. */
@@ -1574,6 +1728,7 @@
 product PHILIPS PCVC740K	0x0311	PCVC740K ToUCam Pro PC Camera
 product PHILIPS PCVC750K	0x0312	PCVC750K ToUCam Pro Scan PC Camera
 product PHILIPS DSS150		0x0471	DSS 150 Digital Speaker System
+product PHILIPS SNU5600		0x1236	SNU5600
 product PHILIPS DIVAUSB		0x1801	DIVA USB mp3 player
 
 /* Philips Semiconductor products */
@@ -1588,8 +1743,17 @@
 product PILOTECH CRW600		0x0001	CRW-600 6-in-1 Reader
 
 /* Planex Communications products */
-product PLANEX GW_US11H		0x14ea	GW-US11H WLAN
+product PLANEX	GW_US11H	0x14ea	GW-US11H WLAN
+product PLANEX2 GW_US11S	0x3220	GW-US11S WLAN
+product PLANEX2 GWUS54GXS	0x5303	GW-US54GXS
+product PLANEX2 GWUS54HP	0xab01	GW-US54HP
+product PLANEX2 GWUS54MINI2	0xab50	GW-US54Mini2
+product PLANEX2 GWUS54SG	0xc002	GW-US54SG
+product PLANEX2 GWUS54GZL	0xc007	GW-US54GZL
 product PLANEX2 GWUSMM		0xed02	GW-USMM
+product PLANEX3 GWUS54GZ	0xab10	GW-US54GZ
+product PLANEX3 GU1000T		0xab11	GU-1000T
+product PLANEX3 GWUS54MINI	0xab13	GW-US54Mini
 
 /* Plantronics products */
 product PLANTRONICS HEADSET	0x0ca1	Platronics DSP-400 Headset
@@ -1635,12 +1799,12 @@
 product PROLIFIC PL2301		0x0000	PL2301 Host-Host interface
 product PROLIFIC PL2302		0x0001	PL2302 Host-Host interface
 product PROLIFIC RSAQ2		0x04bb	PL2303 Serial adapter (IODATA USB-RSAQ2)
-product PROLIFIC RSAQ3		0xaaa2	PL2303 Serial adapter (IODATA USB-RSAQ3)
 product PROLIFIC PL2303		0x2303	PL2303 Serial adapter (ATEN/IOGEAR UC232A)
 product PROLIFIC PL2305		0x2305	Parallel printer adapter
 product PROLIFIC ATAPI4		0x2307	ATAPI-4 Bridge Controller
 product PROLIFIC PL2501		0x2501	PL2501 Host-Host interface
 product PROLIFIC PL2303X	0xaaa0	PL2303 Serial adapter (Pharos GPS)
+product PROLIFIC RSAQ3		0xaaa2	PL2303 Serial adapter (IODATA USB-RSAQ3)
 
 /* Putercom products */
 product PUTERCOM UPA100		0x047e	USB-1284 BRIDGE
@@ -1654,7 +1818,9 @@
 
 /* Qualcomm products */
 product QUALCOMM CDMA_MSM	0x6000	CDMA Technologies MSM phone
+product QUALCOMM2 CDMA_MSM	0x3196	CDMA Technologies MSM modem
 
+/* Qualcomm Kyocera products */
 product QUALCOMM_K CDMA_MSM_K	0x17da	Qualcomm Kyocera CDMA Technologies MSM
 
 /* Quickshot products */
@@ -1666,17 +1832,25 @@
 /* Ralink Technology products */
 product RALINK RT2570		0x1706	RT2570
 product RALINK RT2570_2		0x2570	RT2570
+product RALINK RT2573		0x2573	RT2573
+product RALINK RT2671		0x2671	RT2671
 product RALINK RT2570_3		0x9020	RT2570
 product RALINK_2 RT2570		0x2570	RT2570
-product RALINK RT2573		0x2573	RT2573
-product RALINK RT2671		0x2671	RT2671
+product RALINK_2 RT2573		0x2573	RT2573
 
 /* RATOC Systems products */
-product RATOC REXUSB60		0xb000	USB serial REX-USB60
+product RATOC REXUSB60		0xb000	USB serial adapter REX-USB60
 
 /* Realtek products */
-product REALTEK RTL8150L	0x8150	Realtek RTL8150L USB-Ethernet Bridge
+product REALTEK RTL8150L	0x8150	RTL8150L USB-Ethernet Bridge
+product REALTEK RTL8151		0x8151	RTL8151 PNA
 
+/* Research In Motion */
+product RIM BLACKBERRY		0x0001	BlackBerry
+
+/* Rockfire products */
+product ROCKFIRE GAMEPAD	0x2033	gamepad 203USB
+
 /* Roland products */
 product ROLAND UA100		0x0000	UA-100 USB Audio I/F
 product ROLAND UM4		0x0002	UM-4 MIDI I/F
@@ -1710,18 +1884,16 @@
 product ROLAND UA1EX		0x0096	EDIROL UA-1EX
 product ROLAND UM3		0x009A	EDIROL UM-3
 
-/* Rockfire products */
-product ROCKFIRE GAMEPAD	0x2033	gamepad 203USB
+/* Sagem products */
+product SAGEM XG760A		0x004a	XG-760A
+product SAGEM XG76NA		0x0062	XG-76NA
 
-/* RATOC Systems products */
-product RATOC REXUSB60		0xb000	USB serial adapter REX-USB60
-
 /* Saitek products */
 product SAITEK CYBORG_3D_GOLD	0x0006	Cyborg 3D Gold Joystick
 
 /* Samsung products */
+product SAMSUNG MIGHTYDRIVE	0x1623	Mighty Drive
 product SAMSUNG ML6060		0x3008	ML-6060 laser printer
-product SAMSUNG MIGHTYDRIVE	0x1623	Mighty Drive
 
 /* SanDisk products */
 product SANDISK SDDR05A		0x0001	ImageMate SDDR-05a
@@ -1729,8 +1901,8 @@
 product SANDISK SDDR05		0x0005	ImageMate SDDR-05
 product SANDISK SDDR12		0x0100	ImageMate SDDR-12
 product SANDISK SDDR09		0x0200	ImageMate SDDR-09
+product SANDISK SDDR86		0x0621	ImageMate SDDR-86
 product SANDISK SDDR75		0x0810	ImageMate SDDR-75
-product SANDISK SDDR86		0x0621	ImageMate SDDR-86
 
 /* Sanwa Supply products */
 product SANWASUPPLY JYDV9USB	0x9806	JY-DV9USB gamepad
@@ -1745,12 +1917,15 @@
 /* Sealevel products */
 product SEALEVEL USBSERIAL	0x2101	USB-Serial converter
 
-/* ArkMicroChips products */
-product ARKMICROCHIPS USBSERIAL 0x0232	USB-UART Controller
+/* Senao products */
+product SENAO NUB8301		0x2000	NUB-8301
 
 /* SGI products */
 product SGI SN1_L1_SC		0x1234	SN1 L1 System Controller
 
+/* ShanTou products */
+product SHANTOU ST268_USB_NIC	0x0268  ST268 USB NIC
+
 /* Shark products */
 product SHARK PA		0x0400	Pocket Adapter
 
@@ -1760,6 +1935,7 @@
 product SHARP SL5600		0x8006	SL5600
 product SHARP C700		0x8007	C700
 product SHARP C750		0x9031	C750
+product SHARP WS007SH		0x9123	WS007SH
 
 /* Shuttle Technology products */
 product SHUTTLE EUSB		0x0001	E-USB Bridge
@@ -1782,12 +1958,16 @@
 
 /* Siemens Info products */
 product SIEMENS2 MC75		0x0034	Wireless Modules MC75
+product SIEMENS2 WL54G		0x3c06	54g USB Network Adapter
 
 /* Sierra Wireless products */
 product SIERRA AIRCARD580	0x0112	Sierra Wireless AirCard 580
 
 /* Sigmatel products */
+product SIGMATEL SIR4116	0x4116	StIR4116 SIR
 product SIGMATEL IRDA		0x4200	IrDA
+product SIGMATEL FIR4210	0x4210	StIR4210 FIR
+product SIGMATEL VFIR4220	0x4220	StIR4220 VFIR
 product SIGMATEL I_BEAD100	0x8008	i-Bead 100 MP3 Player
 product SIGMATEL DNSSF7X	0x8020	Datum Networks SSF-7X Multi Players
 
@@ -1796,15 +1976,35 @@
 product SIIG UISDMC2S		0x0200	MULTICARDREADER
 product SIIG MULTICARDREADER	0x0201	MULTICARDREADER
 
+product SIIG2 USBTOETHER	0x0109	USB TO Ethernet
 product SIIG2 US2308		0x0421	Serial
 
 /* Silicom products */
 product SILICOM U2E		0x0001	U2E
+product SILICOM GPE		0x0002	Psion Gold Port Ethernet
 
+/* Silicon Labs products */
+product SILABS POLOLU		0x803b	Pololu Serial
+product SILABS ARGUSISP		0x8066	Argussoft ISP
+product SILABS CRUMB128		0x807a	Crumb128
+product SILABS DEGREECONT	0x80ca	Degree Controls
+product SILABS SUNNTO		0x80f6	Suunto sports
+product SILABS DESKTOPMOBILE	0x813d	Burnside Desktop mobile
+product SILABS IPLINK1220	0x815e	IP-Link 1220
+product SILABS LIPOWSKY_JTAG	0x81c8	Lipowsky Baby-JTAG
+product SILABS LIPOWSKY_LIN	0x81e2	Lipowsky Baby-LIN
+product SILABS LIPOWSKY_HARP	0x8218	Lipowsky HARP-1
+product SILABS2 DCU11CLONE	0xaa26	DCU-11 clone
+product SILABS CP210X_1		0xea60	CP210x Serial
+product SILABS CP210X_2		0xea61	CP210x Serial
+
 /* Silicon Portals Inc. */
 product SILICONPORTALS YAPPH_NF 0x0200	YAP Phone (no firmware)
 product SILICONPORTALS YAPPHONE 0x0201	YAP Phone
 
+/* Silicon Integrated Systems products */
+product SIS SIS_163U		0x0163	802.11g Wireless LAN Adapter
+
 /* Sirius Technologies products */
 product SIRIUS ROADSTER		0x0001	NetComm Roadster II 56 USB
 
@@ -1814,6 +2014,7 @@
 
 /* Sitecom Europe products */
 product SITECOMEU WL113		0x9071	WL-113
+product SITECOMEU ZD1211B	0x9075	ZD1211B
 product SITECOMEU WL172		0x90ac	WL-172
 product SITECOMEU WL113R2	0x9712	WL-113 rev 2
 
@@ -1832,6 +2033,7 @@
 
 /* SOHOware products */
 product SOHOWARE NUB100		0x9100	10/100 USB Ethernet
+product SOHOWARE NUB110		0x9110	NUB110 Ethernet
 
 /* SOLID YEAR products */
 product SOLIDYEAR KEYBOARD	0x2101	Solid Year USB keyboard
@@ -1859,9 +2061,12 @@
 product SONY CLIE_TJ25		0x0169	Sony Clie tj25
 
 /* SOURCENEXT products */
+product SOURCENEXT KEIKAI8_CHG	0x012e	KeikaiDenwa 8 with charger
 product SOURCENEXT KEIKAI8	0x039f	KeikaiDenwa 8
-product SOURCENEXT KEIKAI8_CHG	0x012e	KeikaiDenwa 8 with charger
 
+/* Sphairon Access Systems GmbH products */
+product SPHAIRON UB801R		0x0110	UB801R
+
 /* STMicroelectronics products */
 product STMICRO COMMUNICATOR	0x7554	USB Communicator
 
@@ -1885,6 +2090,13 @@
 /* XXX The above is a North American PC style keyboard possibly */
 product SUN MOUSE		0x0100	Type 6 USB mouse
 
+/* Supra products */
+product DIAMOND2 SUPRAEXPRESS56K 0x07da Supra Express 56K modem

[... truncated: 157 lines follow ...]


From axeld at mail.berlios.de  Tue Aug  7 03:24:10 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 7 Aug 2007 03:24:10 +0200
Subject: [Haiku-commits] r21846 - haiku/trunk/src/servers/app
Message-ID: <200708070124.l771OAfU032377@sheep.berlios.de>

Author: axeld
Date: 2007-08-07 03:24:09 +0200 (Tue, 07 Aug 2007)
New Revision: 21846
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21846&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerFont.cpp
Log:
rectArray can only be NULL in case fAsString is true, not the other way around; this fixes
ServerFont::GetBoundingBoxesForStrings() (ScreenSaver no longer crashes as reported by Brian
Verre on the mailing list).


Modified: haiku/trunk/src/servers/app/ServerFont.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerFont.cpp	2007-08-06 23:29:54 UTC (rev 21845)
+++ haiku/trunk/src/servers/app/ServerFont.cpp	2007-08-07 01:24:09 UTC (rev 21846)
@@ -592,6 +592,7 @@
 		, fTransform(transform)
 	{
 	}
+
 	void Start() {}
 	void Finish(double x, double y) {}
 	void ConsumeEmptyGlyph(int32 index, uint32 charCode, double x, double y) {}
@@ -601,21 +602,21 @@
 		if (glyph->data_type != glyph_data_outline) {
 			const agg::rect_i& r = glyph->bounds;
 			if (fAsString) {
-				rectArray[index].left = r.x1 + x;
-				rectArray[index].top = r.y1 + y;
-				rectArray[index].right = r.x2 + x + 1;
-				rectArray[index].bottom = r.y2 + y + 1;
-			} else {
 				if (rectArray) {
-					rectArray[index].left = r.x1;
-					rectArray[index].top = r.y1;
-					rectArray[index].right = r.x2 + 1;
-					rectArray[index].bottom = r.y2 + 1;
+					rectArray[index].left = r.x1 + x;
+					rectArray[index].top = r.y1 + y;
+					rectArray[index].right = r.x2 + x + 1;
+					rectArray[index].bottom = r.y2 + y + 1;
 				} else {
 					stringBoundingBox = stringBoundingBox
 						| BRect(r.x1 + x, r.y1 + y,
 							r.x2 + x + 1, r.y2 + y + 1);
 				}
+			} else {
+				rectArray[index].left = r.x1;
+				rectArray[index].top = r.y1;
+				rectArray[index].right = r.x2 + 1;
+				rectArray[index].bottom = r.y2 + 1;
 			}
 		} else {
 			if (fAsString) {
@@ -686,8 +687,9 @@
 
 
 status_t
-ServerFont::GetBoundingBoxesForStrings(char *charArray[], int32 lengthArray[], 
-	int32 numStrings, BRect rectArray[], font_metric_mode mode, escapement_delta deltaArray[])
+ServerFont::GetBoundingBoxesForStrings(char *charArray[], int32 lengthArray[],
+	int32 numStrings, BRect rectArray[], font_metric_mode mode,
+	escapement_delta deltaArray[])
 {
 	// TODO: The font_metric_mode is never used
 	if (!charArray || !lengthArray|| numStrings <= 0 || !rectArray || !deltaArray)



From axeld at mail.berlios.de  Tue Aug  7 03:54:11 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 7 Aug 2007 03:54:11 +0200
Subject: [Haiku-commits] r21847 - haiku/trunk/src/system/kernel
Message-ID: <200708070154.l771sBik001184@sheep.berlios.de>

Author: axeld
Date: 2007-08-07 03:54:08 +0200 (Tue, 07 Aug 2007)
New Revision: 21847
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21847&view=rev

Modified:
   haiku/trunk/src/system/kernel/thread.c
Log:
Now prints a more detailed message in case the kernel stack couldn't be created.


Modified: haiku/trunk/src/system/kernel/thread.c
===================================================================
--- haiku/trunk/src/system/kernel/thread.c	2007-08-07 01:24:09 UTC (rev 21846)
+++ haiku/trunk/src/system/kernel/thread.c	2007-08-07 01:54:08 UTC (rev 21847)
@@ -385,9 +385,11 @@
 
 	if (thread->kernel_stack_area < 0) {
 		// we're not yet part of a team, so we can just bail out
-		dprintf("create_thread: error creating kernel stack!\n");
+		status = thread->kernel_stack_area;
 
-		status = thread->kernel_stack_area;
+		dprintf("create_thread: error creating kernel stack: %s!\n",
+			strerror(status));
+
 		delete_thread_struct(thread);
 		return status;
 	}



From korli at users.berlios.de  Tue Aug  7 12:17:06 2007
From: korli at users.berlios.de (=?ISO-8859-1?Q?J=E9r=F4me_Duval?=)
Date: Tue, 7 Aug 2007 12:17:06 +0200
Subject: [Haiku-commits] r21820 - haiku/trunk/src/system/libroot/os
In-Reply-To: <20070805165003.5222.11@stippis2.1186309169.fake>
References: <200708041119.l74BJvg6010744@sheep.berlios.de>
	<c47b1d430708050704m62c353c1g6b3079feb83ae688@mail.gmail.com>
	<20070805165003.5222.11@stippis2.1186309169.fake>
Message-ID: <c47b1d430708070317m2e79e944l1122b7b0631f9bfa@mail.gmail.com>

2007/8/5, Stephan Assmus <superstippi at gmx.de>:
>
>
> I think not, Pe says this file is UTF8 encoded and your name is correct
> here, I think it is just a problem with the commit message. I think I've
> seen this problem before.


Hmm not only the commit message :
http://svn.berlios.de/viewcvs/haiku/haiku/trunk/src/system/libroot/os/scheduler.c?rev=21820&view=diff&r1=21820&r2=21819&p1=haiku/trunk/src/system/libroot/os/scheduler.c&p2=/haiku/trunk/src/system/libroot/os/scheduler.c

Anyway, Michael Pfeiffer fixed it.

Bye,
J?r?me
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20070807/06ba7359/attachment.html>

From michael.pfeiffer at utanet.at  Tue Aug  7 12:23:49 2007
From: michael.pfeiffer at utanet.at (Michael Pfeiffer)
Date: Tue, 7 Aug 2007 12:23:49 +0200
Subject: [Haiku-commits] r21820 - haiku/trunk/src/system/libroot/os
In-Reply-To: <c47b1d430708070317m2e79e944l1122b7b0631f9bfa@mail.gmail.com>
References: <200708041119.l74BJvg6010744@sheep.berlios.de>
	<c47b1d430708050704m62c353c1g6b3079feb83ae688@mail.gmail.com>
	<20070805165003.5222.11@stippis2.1186309169.fake>
	<c47b1d430708070317m2e79e944l1122b7b0631f9bfa@mail.gmail.com>
Message-ID: <64000B9C-8BFE-490B-8CC4-60E18349F28B@utanet.at>

Am 07.08.2007 um 12:17 schrieb J?r?me Duval:

> 2007/8/5, Stephan Assmus <superstippi at gmx.de>:
>
> I think not, Pe says this file is UTF8 encoded and your name is  
> correct
> here, I think it is just a problem with the commit message. I think  
> I've
> seen this problem before.
>
> Hmm not only the commit message : http://svn.berlios.de/viewcvs/ 
> haiku/haiku/trunk/src/system/libroot/os/scheduler.c? 
> rev=21820&view=diff&r1=21820&r2=21819&p1=haiku/trunk/src/system/ 
> libroot/os/scheduler.c&p2=/haiku/trunk/src/system/libroot/os/ 
> scheduler.c
>
> Anyway, Michael Pfeiffer fixed it.

Nope. It's still UTF-8 encoded. But that's OK, isn't it?

- Michael



From axeld at mail.berlios.de  Tue Aug  7 23:46:59 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 7 Aug 2007 23:46:59 +0200
Subject: [Haiku-commits] r21848 - in haiku/trunk: headers/private/kernel
	src/system/kernel/vm
Message-ID: <200708072146.l77Lkxr1028645@sheep.berlios.de>

Author: axeld
Date: 2007-08-07 23:46:58 +0200 (Tue, 07 Aug 2007)
New Revision: 21848
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21848&view=rev

Modified:
   haiku/trunk/headers/private/kernel/vm_types.h
   haiku/trunk/src/system/kernel/vm/vm.cpp
Log:
bonefish+axeld:
* Removed the ref_count from vm_areas. You now always need to have the address
  space locked (read or write, depending on what you do) when dealing with
  areas.
* Added helper classes for locking the address space: AddressSpace{Read|Write}Locker,
  and MultiAddressSpaceLocker which can lock several spaces at once and makes
  sure no dead locks can happen.
* resize_area() is now using the MultiAddressSpaceLocker instead of no locking
  at all; ie. it should now be safely to use.
* Disabled transfer_area() for now; it will be changed to work like an atomic
  clone_area()/delete_area(), that is, it will hand out a new ID for the
  transfered area.


Modified: haiku/trunk/headers/private/kernel/vm_types.h
===================================================================
--- haiku/trunk/headers/private/kernel/vm_types.h	2007-08-07 01:54:08 UTC (rev 21847)
+++ haiku/trunk/headers/private/kernel/vm_types.h	2007-08-07 21:46:58 UTC (rev 21848)
@@ -163,7 +163,6 @@
 	uint32				protection;
 	uint16				wiring;
 	uint16				memory_type;
-	vint32				ref_count;
 
 	struct vm_cache		*cache;
 	vint32				no_cache_change;

Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-07 01:54:08 UTC (rev 21847)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-07 21:46:58 UTC (rev 21848)
@@ -59,6 +59,79 @@
 #define ROUNDOWN(a, b) (((a) / (b)) * (b))
 
 
+class AddressSpaceReadLocker {
+public:
+	AddressSpaceReadLocker(team_id team);
+	AddressSpaceReadLocker();
+	~AddressSpaceReadLocker();
+
+	status_t SetTo(team_id team);
+	status_t SetFromArea(area_id areaID, vm_area*& area);
+
+	bool IsLocked() const { return fLocked; }
+	void Unlock();
+
+	void Unset();
+
+	vm_address_space* AddressSpace() { return fSpace; }
+
+private:
+	vm_address_space* fSpace;
+	bool	fLocked;
+};
+
+class AddressSpaceWriteLocker {
+public:
+	AddressSpaceWriteLocker(team_id team);
+	AddressSpaceWriteLocker();
+	~AddressSpaceWriteLocker();
+
+	status_t SetTo(team_id team);
+	status_t SetFromArea(area_id areaID, vm_area*& area);
+	status_t SetFromArea(team_id team, area_id areaID, bool allowKernel,
+		vm_area*& area);
+	status_t SetFromArea(team_id team, area_id areaID, vm_area*& area);
+
+	bool IsLocked() const { return fLocked; }
+	void Unlock();
+
+	void DegradeToReadLock();
+	void Unset();
+
+	vm_address_space* AddressSpace() { return fSpace; }
+
+private:
+	vm_address_space* fSpace;
+	bool	fLocked;
+	bool	fDegraded;
+};
+
+class MultiAddressSpaceLocker {
+public:
+	MultiAddressSpaceLocker();
+	~MultiAddressSpaceLocker();
+
+	status_t AddTeam(team_id team, vm_address_space** _space = NULL);
+	status_t AddArea(area_id area, vm_address_space** _space = NULL);
+
+	status_t Lock();
+	void Unlock();
+	bool IsLocked() const { return fLocked; }
+
+	void Unset();
+
+private:
+	bool _ResizeIfNeeded();
+	vm_address_space*& _CurrentItem() { return fSpaces[fCount]; }
+
+	static int _CompareItems(const void* _a, const void* _b);
+
+	vm_address_space** fSpaces;
+	int32		fCapacity;
+	int32		fCount;
+	bool		fLocked;
+};
+
 #define REGION_HASH_TABLE_SIZE 1024
 static area_id sNextAreaID;
 static hash_table *sAreaHash;
@@ -70,10 +143,376 @@
 static benaphore sAvailableMemoryLock;
 
 // function declarations
-static status_t vm_soft_fault(addr_t address, bool is_write, bool is_user);
-static bool vm_put_area(vm_area *area);
+static void delete_area(vm_address_space *addressSpace, vm_area *area);
+static vm_address_space *get_address_space_by_area_id(area_id id);
+static status_t vm_soft_fault(addr_t address, bool isWrite, bool isUser);
 
 
+//	#pragma mark -
+
+
+AddressSpaceReadLocker::AddressSpaceReadLocker(team_id team)
+	:
+	fSpace(NULL),
+	fLocked(false)
+{
+	SetTo(team);
+}
+
+
+AddressSpaceReadLocker::AddressSpaceReadLocker()
+	:
+	fSpace(NULL),
+	fLocked(false)
+{
+}
+
+
+AddressSpaceReadLocker::~AddressSpaceReadLocker()
+{
+	Unset();
+}
+
+
+void
+AddressSpaceReadLocker::Unset()
+{
+	Unlock();
+	if (fSpace != NULL)
+		vm_put_address_space(fSpace);
+}
+
+
+status_t
+AddressSpaceReadLocker::SetTo(team_id team)
+{
+	fSpace = vm_get_address_space_by_id(team);
+	if (fSpace == NULL)
+		return B_BAD_TEAM_ID;
+
+	acquire_sem_etc(fSpace->sem, READ_COUNT, 0, 0);
+	fLocked = true;
+	return B_OK;
+}
+
+
+status_t
+AddressSpaceReadLocker::SetFromArea(area_id areaID, vm_area*& area)
+{
+	fSpace = get_address_space_by_area_id(areaID);
+	if (fSpace == NULL)
+		return B_BAD_TEAM_ID;
+
+	acquire_sem_etc(fSpace->sem, READ_COUNT, 0, 0);
+
+	acquire_sem_etc(sAreaHashLock, READ_COUNT, 0, 0);
+	area = (vm_area *)hash_lookup(sAreaHash, &areaID);
+	release_sem_etc(sAreaHashLock, READ_COUNT, 0);
+
+	if (area == NULL || area->address_space != fSpace) {
+		release_sem_etc(fSpace->sem, READ_COUNT, 0);
+		return B_BAD_VALUE;
+	}
+
+	fLocked = true;
+	return B_OK;
+}
+
+
+void
+AddressSpaceReadLocker::Unlock()
+{
+	if (fLocked) {
+		release_sem_etc(fSpace->sem, READ_COUNT, 0);
+		fLocked = false;
+	}
+}
+
+
+//	#pragma mark -
+
+
+AddressSpaceWriteLocker::AddressSpaceWriteLocker(team_id team)
+	:
+	fSpace(NULL),
+	fLocked(false),
+	fDegraded(false)
+{
+	SetTo(team);
+}
+
+
+AddressSpaceWriteLocker::AddressSpaceWriteLocker()
+	:
+	fSpace(NULL),
+	fLocked(false),
+	fDegraded(false)
+{
+}
+
+
+AddressSpaceWriteLocker::~AddressSpaceWriteLocker()
+{
+	Unset();
+}
+
+
+void
+AddressSpaceWriteLocker::Unset()
+{
+	Unlock();
+	if (fSpace != NULL)
+		vm_put_address_space(fSpace);
+}
+
+
+status_t
+AddressSpaceWriteLocker::SetTo(team_id team)
+{
+	fSpace = vm_get_address_space_by_id(team);
+	if (fSpace == NULL)
+		return B_BAD_TEAM_ID;
+
+	acquire_sem_etc(fSpace->sem, WRITE_COUNT, 0, 0);
+	fLocked = true;
+	return B_OK;
+}
+
+
+status_t
+AddressSpaceWriteLocker::SetFromArea(area_id areaID, vm_area*& area)
+{
+	fSpace = get_address_space_by_area_id(areaID);
+	if (fSpace == NULL)
+		return B_BAD_VALUE;
+
+	acquire_sem_etc(fSpace->sem, WRITE_COUNT, 0, 0);
+
+	acquire_sem_etc(sAreaHashLock, READ_COUNT, 0, 0);
+	area = (vm_area*)hash_lookup(sAreaHash, &areaID);
+	release_sem_etc(sAreaHashLock, READ_COUNT, 0);
+
+	if (area == NULL || area->address_space != fSpace) {
+		release_sem_etc(fSpace->sem, WRITE_COUNT, 0);
+		return B_BAD_VALUE;
+	}
+
+	fLocked = true;
+	return B_OK;
+}
+
+
+status_t
+AddressSpaceWriteLocker::SetFromArea(team_id team, area_id areaID,
+	bool allowKernel, vm_area*& area)
+{
+	acquire_sem_etc(sAreaHashLock, READ_COUNT, 0, 0);
+
+	area = (vm_area *)hash_lookup(sAreaHash, &areaID);
+	if (area != NULL
+		&& (area->address_space->id == team
+			|| allowKernel && team == vm_kernel_address_space_id())) {
+		fSpace = area->address_space;
+		atomic_add(&fSpace->ref_count, 1);
+	}
+
+	release_sem_etc(sAreaHashLock, READ_COUNT, 0);
+
+	if (fSpace == NULL)
+		return B_BAD_VALUE;
+
+	// Second try to get the area -- this time with the address space
+	// write lock held
+
+	acquire_sem_etc(fSpace->sem, WRITE_COUNT, 0, 0);
+
+	acquire_sem_etc(sAreaHashLock, READ_COUNT, 0, 0);
+	area = (vm_area *)hash_lookup(sAreaHash, &areaID);
+	release_sem_etc(sAreaHashLock, READ_COUNT, 0);
+
+	if (area == NULL) {
+		release_sem_etc(fSpace->sem, WRITE_COUNT, 0);
+		return B_BAD_VALUE;
+	}
+
+	fLocked = true;
+	return B_OK;
+}
+
+
+status_t
+AddressSpaceWriteLocker::SetFromArea(team_id team, area_id areaID,
+	vm_area*& area)
+{
+	return SetFromArea(team, areaID, false, area);
+}
+
+
+void
+AddressSpaceWriteLocker::Unlock()
+{
+	if (fLocked) {
+		release_sem_etc(fSpace->sem, fDegraded ? READ_COUNT : WRITE_COUNT, 0);
+		fLocked = false;
+	}
+}
+
+
+void
+AddressSpaceWriteLocker::DegradeToReadLock()
+{
+	release_sem_etc(fSpace->sem, WRITE_COUNT - READ_COUNT, 0);
+	fDegraded = true;
+}
+
+
+//	#pragma mark -
+
+
+MultiAddressSpaceLocker::MultiAddressSpaceLocker()
+	:
+	fSpaces(NULL),
+	fCapacity(0),
+	fCount(0),
+	fLocked(false)
+{
+}
+
+
+MultiAddressSpaceLocker::~MultiAddressSpaceLocker()
+{
+	Unset();
+	free(fSpaces);
+}
+
+
+/*static*/ int
+MultiAddressSpaceLocker::_CompareItems(const void* _a, const void* _b)
+{
+	vm_address_space* a = *(vm_address_space **)_a;
+	vm_address_space* b = *(vm_address_space **)_b;
+	return a->id - b->id;
+}
+
+
+bool
+MultiAddressSpaceLocker::_ResizeIfNeeded()
+{
+	if (fCount == fCapacity) {
+		vm_address_space** items = (vm_address_space**)realloc(fSpaces,
+			(fCapacity + 4) * sizeof(void*));
+		if (items == NULL)
+			return false;
+
+		fCapacity += 4;
+		fSpaces = items;
+	}
+
+	return true;
+}
+
+
+status_t
+MultiAddressSpaceLocker::AddTeam(team_id team, vm_address_space** _space)
+{
+	if (!_ResizeIfNeeded())
+		return B_NO_MEMORY;
+
+	vm_address_space*& space = _CurrentItem();
+	space = vm_get_address_space_by_id(team);
+	if (space == NULL)
+		return B_BAD_VALUE;
+
+	fCount++;
+
+	if (_space != NULL)
+		*_space = space;
+
+	return B_OK;
+}
+
+
+status_t
+MultiAddressSpaceLocker::AddArea(area_id area, vm_address_space** _space)
+{
+	if (!_ResizeIfNeeded())
+		return B_NO_MEMORY;
+
+	vm_address_space*& space = _CurrentItem();
+	space = get_address_space_by_area_id(area);
+	if (space == NULL)
+		return B_BAD_VALUE;
+
+	// check if we have already added this address space
+	for (int32 i = 0; i < fCount; i++) {
+		if (fSpaces[i] == space) {
+			// no need to add it again
+			vm_put_address_space(space);
+			if (_space != NULL)
+				*_space = space;
+			return B_OK;
+		}
+	}
+
+	fCount++;
+
+	if (_space != NULL)
+		*_space = space;
+
+	return B_OK;
+}
+
+
+void
+MultiAddressSpaceLocker::Unset()
+{
+	Unlock();
+
+	for (int32 i = 0; i < fCount; i++) {
+		vm_put_address_space(fSpaces[i]);
+	}
+
+	fCount = 0;
+}
+
+
+status_t
+MultiAddressSpaceLocker::Lock()
+{
+	qsort(fSpaces, fCount, sizeof(void*), &_CompareItems);
+
+	for (int32 i = 0; i < fCount; i++) {
+		status_t status = acquire_sem_etc(fSpaces[i]->sem, WRITE_COUNT, 0, 0);
+		if (status < B_OK) {
+			while (--i >= 0) {
+				release_sem_etc(fSpaces[i]->sem, WRITE_COUNT, 0);
+			}
+			return status;
+		}
+	}
+
+	fLocked = true;
+	return B_OK;
+}
+
+
+void
+MultiAddressSpaceLocker::Unlock()
+{
+	if (!fLocked)
+		return;
+
+	for (int32 i = 0; i < fCount; i++) {
+		release_sem_etc(fSpaces[i]->sem, WRITE_COUNT, 0);
+	}
+
+	fLocked = false;
+}
+
+
+//	#pragma mark -
+
+
 static int
 area_compare(void *_area, const void *key)
 {
@@ -100,14 +539,34 @@
 }
 
 
+static vm_address_space *
+get_address_space_by_area_id(area_id id)
+{
+	vm_address_space* addressSpace = NULL;
+
+	acquire_sem_etc(sAreaHashLock, READ_COUNT, 0, 0);
+
+	vm_area *area = (vm_area *)hash_lookup(sAreaHash, &id);
+	if (area != NULL) {
+		addressSpace = area->address_space;
+		atomic_add(&addressSpace->ref_count, 1);
+	}
+
+	release_sem_etc(sAreaHashLock, READ_COUNT, 0);
+
+	return addressSpace;
+}
+
+
+//! You need to have the address space locked when calling this function
 static vm_area *
-vm_get_area(area_id id)
+lookup_area(vm_address_space* addressSpace, area_id id)
 {
 	acquire_sem_etc(sAreaHashLock, READ_COUNT, 0, 0);
 
 	vm_area *area = (vm_area *)hash_lookup(sAreaHash, &id);
-	if (area != NULL)
-		atomic_add(&area->ref_count, 1);
+	if (area != NULL && area->address_space != addressSpace)
+		area = NULL;
 
 	release_sem_etc(sAreaHashLock, READ_COUNT, 0);
 
@@ -158,7 +617,6 @@
 	area->protection = protection;
 	area->wiring = wiring;
 	area->memory_type = 0;
-	area->ref_count = 1;
 
 	area->cache = NULL;
 	area->no_cache_change = 0;
@@ -496,18 +954,22 @@
 }
 
 
-//! You need to hold the lock of the cache when calling this function.
+/*! You need to hold the lock of the cache and the write lock of the address
+	space when calling this function.
+*/
 static status_t
 map_backing_store(vm_address_space *addressSpace, vm_cache *cache,
 	void **_virtualAddress, off_t offset, addr_t size, uint32 addressSpec,
-	int wiring, int protection, int mapping, vm_area **_area, const char *areaName)
+	int wiring, int protection, int mapping, vm_area **_area,
+	const char *areaName)
 {
 	TRACE(("map_backing_store: aspace %p, cache %p, *vaddr %p, offset 0x%Lx, size %lu, addressSpec %ld, wiring %d, protection %d, _area %p, area_name '%s'\n",
 		addressSpace, cache, *_virtualAddress, offset, size, addressSpec,
 		wiring, protection, _area, areaName));
 	ASSERT_LOCKED_MUTEX(&cache->lock);
 
-	vm_area *area = create_area_struct(addressSpace, areaName, wiring, protection);
+	vm_area *area = create_area_struct(addressSpace, areaName, wiring,
+		protection);
 	if (area == NULL)
 		return B_NO_MEMORY;
 
@@ -521,8 +983,8 @@
 		vm_store *newStore;
 
 		// create an anonymous store object
-		newStore = vm_store_create_anonymous_noswap((protection & B_STACK_AREA) != 0,
-			0, USER_STACK_GUARD_PAGES);
+		newStore = vm_store_create_anonymous_noswap(
+			(protection & B_STACK_AREA) != 0, 0, USER_STACK_GUARD_PAGES);
 		if (newStore == NULL) {
 			status = B_NO_MEMORY;
 			goto err1;
@@ -551,19 +1013,17 @@
 	if (status != B_OK)
 		goto err2;
 
-	acquire_sem_etc(addressSpace->sem, WRITE_COUNT, 0, 0);
-
 	// check to see if this address space has entered DELETE state
 	if (addressSpace->state == VM_ASPACE_STATE_DELETION) {
 		// okay, someone is trying to delete this address space now, so we can't
 		// insert the area, so back out
 		status = B_BAD_TEAM_ID;
-		goto err3;
+		goto err2;
 	}
 
 	status = insert_area(addressSpace, _virtualAddress, addressSpec, size, area);
 	if (status < B_OK)
-		goto err3;
+		goto err2;
 
 	// attach the cache to the area
 	area->cache = cache;
@@ -582,13 +1042,9 @@
 	// grab a ref to the address space (the area holds this)
 	atomic_add(&addressSpace->ref_count, 1);
 
-	release_sem_etc(addressSpace->sem, WRITE_COUNT, 0);
-
 	*_area = area;
 	return B_OK;
 
-err3:
-	release_sem_etc(addressSpace->sem, WRITE_COUNT, 0);
 err2:
 	if (mapping == REGION_PRIVATE_MAP) {
 		// we created this cache, so we must delete it again
@@ -605,27 +1061,21 @@
 status_t
 vm_unreserve_address_range(team_id team, void *address, addr_t size)
 {
-	vm_address_space *addressSpace;
-	vm_area *area, *last = NULL;
-	status_t status = B_OK;
-
-	addressSpace = vm_get_address_space_by_id(team);
-	if (addressSpace == NULL)
+	AddressSpaceWriteLocker locker(team);
+	if (!locker.IsLocked())
 		return B_BAD_TEAM_ID;
 
-	acquire_sem_etc(addressSpace->sem, WRITE_COUNT, 0, 0);
-
 	// check to see if this address space has entered DELETE state
-	if (addressSpace->state == VM_ASPACE_STATE_DELETION) {
+	if (locker.AddressSpace()->state == VM_ASPACE_STATE_DELETION) {
 		// okay, someone is trying to delete this address space now, so we can't
 		// insert the area, so back out
-		status = B_BAD_TEAM_ID;
-		goto out;
+		return B_BAD_TEAM_ID;
 	}
 
 	// search area list and remove any matching reserved ranges
 
-	area = addressSpace->areas;
+	vm_area* area = locker.AddressSpace()->areas;
+	vm_area* last = NULL;
 	while (area) {
 		// the area must be completely part of the reserved range
 		if (area->id == RESERVED_AREA_ID && area->base >= (addr_t)address
@@ -635,10 +1085,10 @@
 			if (last)
 				last->address_space_next = reserved->address_space_next;
 			else
-				addressSpace->areas = reserved->address_space_next;
+				locker.AddressSpace()->areas = reserved->address_space_next;
 
 			area = reserved->address_space_next;
-			vm_put_address_space(addressSpace);
+			vm_put_address_space(locker.AddressSpace());
 			free(reserved);
 			continue;
 		}
@@ -646,11 +1096,8 @@
 		last = area;
 		area = area->address_space_next;
 	}
-	
-out:
-	release_sem_etc(addressSpace->sem, WRITE_COUNT, 0);
-	vm_put_address_space(addressSpace);
-	return status;
+
+	return B_OK;
 }
 
 
@@ -658,56 +1105,42 @@
 vm_reserve_address_range(team_id team, void **_address, uint32 addressSpec, 
 	addr_t size, uint32 flags)
 {
-	vm_address_space *addressSpace;
-	vm_area *area;
-	status_t status = B_OK;
-
 	if (size == 0)
 		return B_BAD_VALUE;
 
-	addressSpace = vm_get_address_space_by_id(team);
-	if (addressSpace == NULL)
+	AddressSpaceWriteLocker locker(team);
+	if (!locker.IsLocked())
 		return B_BAD_TEAM_ID;
 
-	area = create_reserved_area_struct(addressSpace, flags);
-	if (area == NULL) {
-		status = B_NO_MEMORY;
-		goto err1;
+	// check to see if this address space has entered DELETE state
+	if (locker.AddressSpace()->state == VM_ASPACE_STATE_DELETION) {
+		// okay, someone is trying to delete this address space now, so we
+		// can't insert the area, let's back out
+		return B_BAD_TEAM_ID;
 	}
 
-	acquire_sem_etc(addressSpace->sem, WRITE_COUNT, 0, 0);
+	vm_area *area = create_reserved_area_struct(locker.AddressSpace(), flags);
+	if (area == NULL)
+		return B_NO_MEMORY;
 
-	// check to see if this address space has entered DELETE state
-	if (addressSpace->state == VM_ASPACE_STATE_DELETION) {
-		// okay, someone is trying to delete this address space now, so we can't
-		// insert the area, let's back out
-		status = B_BAD_TEAM_ID;
-		goto err2;
+	status_t status = insert_area(locker.AddressSpace(), _address, addressSpec,
+		size, area);
+	if (status < B_OK) {
+		free(area);
+		return status;
 	}
 
-	status = insert_area(addressSpace, _address, addressSpec, size, area);
-	if (status < B_OK)
-		goto err2;
-
 	// the area is now reserved!
 
 	area->cache_offset = area->base;
 		// we cache the original base address here
 
-	release_sem_etc(addressSpace->sem, WRITE_COUNT, 0);
 	return B_OK;
-
-err2:
-	release_sem_etc(addressSpace->sem, WRITE_COUNT, 0);
-	free(area);
-err1:
-	vm_put_address_space(addressSpace);
-	return status;
 }
 
 
 area_id
-vm_create_anonymous_area(team_id aid, const char *name, void **address, 
+vm_create_anonymous_area(team_id team, const char *name, void **address, 
 	uint32 addressSpec, addr_t size, uint32 wiring, uint32 protection)
 {
 	vm_area *area;
@@ -716,7 +1149,6 @@
 	vm_page *page = NULL;
 	bool isStack = (protection & B_STACK_AREA) != 0;
 	bool canOvercommit = false;
-	status_t status;
 
 	TRACE(("create_anonymous_area %s: size 0x%lx\n", name, size));
 
@@ -761,20 +1193,20 @@
 			return B_BAD_VALUE;
 	}
 
-	vm_address_space *addressSpace = vm_get_address_space_by_id(aid);
-	if (addressSpace == NULL)
-		return B_BAD_TEAM_ID;
+	AddressSpaceWriteLocker locker;
+	status_t status = locker.SetTo(team);
+	if (status != NULL)
+		return status;
 
+	vm_address_space *addressSpace = locker.AddressSpace();
 	size = PAGE_ALIGN(size);
 
 	if (wiring == B_CONTIGUOUS) {
 		// we try to allocate the page run here upfront as this may easily
 		// fail for obvious reasons
 		page = vm_page_allocate_page_run(PAGE_STATE_CLEAR, size / B_PAGE_SIZE);
-		if (page == NULL) {
-			vm_put_address_space(addressSpace);
+		if (page == NULL)
 			return B_NO_MEMORY;
-		}
 	}
 
 	// create an anonymous store object
@@ -820,6 +1252,8 @@
 		goto err1;
 	}
 
+	locker.DegradeToReadLock();
+
 	switch (wiring) {
 		case B_NO_LOCK:
 		case B_LAZY_LOCK:
@@ -938,7 +1372,6 @@
 		default:
 			break;
 	}
-	vm_put_address_space(addressSpace);
 
 	TRACE(("vm_create_anonymous_area: done\n"));
 
@@ -961,31 +1394,28 @@
 		}
 	}	
 
-	vm_put_address_space(addressSpace);
 	return status;	
 }
 
 
 area_id
-vm_map_physical_memory(team_id aspaceID, const char *name, void **_address,
+vm_map_physical_memory(team_id team, const char *name, void **_address,
 	uint32 addressSpec, addr_t size, uint32 protection, addr_t physicalAddress)
 {
 	vm_area *area;
 	vm_cache *cache;
 	vm_store *store;
 	addr_t mapOffset;
-	status_t status;
 
-	TRACE(("vm_map_physical_memory(aspace = %ld, \"%s\", virtual = %p, spec = %ld,"
-		" size = %lu, protection = %ld, phys = %p)\n",
-		aspaceID, name, _address, addressSpec, size, protection,
-		(void *)physicalAddress));
+	TRACE(("vm_map_physical_memory(aspace = %ld, \"%s\", virtual = %p, "
+		"spec = %ld, size = %lu, protection = %ld, phys = %#lx)\n", team,
+		name, _address, addressSpec, size, protection, physicalAddress));
 
 	if (!arch_vm_supports_protection(protection))
 		return B_NOT_SUPPORTED;
 
-	vm_address_space *addressSpace = vm_get_address_space_by_id(aspaceID);
-	if (addressSpace == NULL)
+	AddressSpaceWriteLocker locker(team);
+	if (!locker.IsLocked())
 		return B_BAD_TEAM_ID;
 
 	// if the physical address is somewhat inside a page,
@@ -999,14 +1429,13 @@
 	// create an device store object
 
 	store = vm_store_create_device(physicalAddress);
-	if (store == NULL) {
-		status = B_NO_MEMORY;
-		goto err1;
-	}
+	if (store == NULL)
+		return B_NO_MEMORY;
+
 	cache = vm_cache_create(store);
 	if (cache == NULL) {
-		status = B_NO_MEMORY;
-		goto err2;
+		store->ops->destroy(store);
+		return B_NO_MEMORY;
 	}
 
 	// tell the page scanner to skip over this area, it's pages are special
@@ -1016,8 +1445,8 @@
 
 	mutex_lock(&cache->lock);
 
-	status = map_backing_store(addressSpace, cache, _address, 0, size,
-		addressSpec & ~B_MTR_MASK, B_FULL_LOCK, protection,
+	status_t status = map_backing_store(locker.AddressSpace(), cache, _address,
+		0, size, addressSpec & ~B_MTR_MASK, B_FULL_LOCK, protection,
 		REGION_NO_PRIVATE_MAP, &area, name);
 
 	mutex_unlock(&cache->lock);
@@ -1030,13 +1459,13 @@
 		status = arch_vm_set_memory_type(area, physicalAddress,
 			addressSpec & B_MTR_MASK);
 		if (status < B_OK)
-			vm_put_area(area);
+			delete_area(locker.AddressSpace(), area);
 	}
 
 	if (status >= B_OK) {
 		// make sure our area is mapped in completely
 
-		vm_translation_map *map = &addressSpace->translation_map;
+		vm_translation_map *map = &locker.AddressSpace()->translation_map;
 		map->ops->lock(map);
 
 		for (addr_t offset = 0; offset < size; offset += B_PAGE_SIZE) {
@@ -1047,7 +1476,6 @@
 		map->ops->unlock(map);
 	}
 
-	vm_put_address_space(addressSpace);
 	if (status < B_OK)
 		return status;
 
@@ -1057,12 +1485,6 @@
 
 	area->cache_type = CACHE_TYPE_DEVICE;
 	return area->id;
-
-err2:
-	store->ops->destroy(store);
-err1:
-	vm_put_address_space(addressSpace);
-	return status;
 }
 
 
@@ -1075,8 +1497,8 @@
 	vm_store *store;
 	status_t status;
 
-	vm_address_space *addressSpace = vm_get_address_space_by_id(team);
-	if (addressSpace == NULL)
+	AddressSpaceWriteLocker locker(team);
+	if (!locker.IsLocked())
 		return B_BAD_TEAM_ID;
 
 	size = PAGE_ALIGN(size);
@@ -1084,14 +1506,13 @@
 	// create an null store object
 
 	store = vm_store_create_null();
-	if (store == NULL) {
-		status = B_NO_MEMORY;
-		goto err1;
-	}
+	if (store == NULL)
+		return B_NO_MEMORY;
+
 	cache = vm_cache_create(store);
 	if (cache == NULL) {
-		status = B_NO_MEMORY;
-		goto err2;
+		store->ops->destroy(store);
+		return B_NO_MEMORY;
 	}
 
 	// tell the page scanner to skip over this area, no pages will be mapped here
@@ -1101,11 +1522,10 @@
 
 	mutex_lock(&cache->lock);
 
-	status = map_backing_store(addressSpace, cache, address, 0, size, addressSpec, 0,
-		B_KERNEL_READ_AREA, REGION_NO_PRIVATE_MAP, &area, name);
+	status = map_backing_store(locker.AddressSpace(), cache, address, 0, size,
+		addressSpec, 0, B_KERNEL_READ_AREA, REGION_NO_PRIVATE_MAP, &area, name);
 
 	mutex_unlock(&cache->lock);
-	vm_put_address_space(addressSpace);
 
 	if (status < B_OK) {
 		vm_cache_release_ref(cache);
@@ -1114,12 +1534,6 @@
 
 	area->cache_type = CACHE_TYPE_NULL;
 	return area->id;
-
-err2:
-	store->ops->destroy(store);
-err1:
-	vm_put_address_space(addressSpace);
-	return status;
 }
 
 
@@ -1174,11 +1588,6 @@
 	//	copy of a file at a given time, ie. later changes should not
 	//	make it into the mapped copy -- this will need quite some changes
 	//	to be done in a nice way
-
-	vm_address_space *addressSpace = vm_get_address_space_by_id(team);
-	if (addressSpace == NULL)
-		return B_BAD_TEAM_ID;
-
 	TRACE(("_vm_map_file(\"%s\", offset = %Ld, size = %lu, mapping %ld)\n",
 		path, offset, size, mapping));
 
@@ -1188,8 +1597,14 @@
 	// get the vnode for the object, this also grabs a ref to it
 	status = vfs_get_vnode_from_path(path, kernel, &vnode);
 	if (status < B_OK)
-		goto err1;
+		return status;
 
+	AddressSpaceWriteLocker locker(team);
+	if (!locker.IsLocked()) {
+		vfs_put_vnode(vnode);
+		return B_BAD_TEAM_ID;
+	}
+
 	// ToDo: this only works for file systems that use the file cache
 	status = vfs_get_vnode_cache(vnode, &cache, false);
 
@@ -1198,11 +1613,11 @@
 		// successful, the store already has a ref to it
 
 	if (status < B_OK)
-		goto err1;
+		return status;
 
 	mutex_lock(&cache->lock);
 
-	status = map_backing_store(addressSpace, cache, _address,
+	status = map_backing_store(locker.AddressSpace(), cache, _address,
 		offset, size, addressSpec, 0, protection, mapping, &area, name);
 
 	mutex_unlock(&cache->lock);
@@ -1212,21 +1627,17 @@
 		vm_cache_release_ref(cache);
 	}
 	if (status < B_OK)
-		goto err1;
+		return status;
 
-	vm_put_address_space(addressSpace);
 	area->cache_type = CACHE_TYPE_VNODE;
 	return area->id;
-
-err1:
-	vm_put_address_space(addressSpace);

[... truncated: 848 lines follow ...]


From stippi at mail.berlios.de  Wed Aug  8 11:14:39 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 8 Aug 2007 11:14:39 +0200
Subject: [Haiku-commits] r21849 - haiku/trunk/headers/posix
Message-ID: <200708080914.l789EdsI012627@sheep.berlios.de>

Author: stippi
Date: 2007-08-08 11:14:38 +0200 (Wed, 08 Aug 2007)
New Revision: 21849
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21849&view=rev

Modified:
   haiku/trunk/headers/posix/math.h
Log:
* fix ticket #1365, isinf(x) -> isinf(value)


Modified: haiku/trunk/headers/posix/math.h
===================================================================
--- haiku/trunk/headers/posix/math.h	2007-08-07 21:46:58 UTC (rev 21848)
+++ haiku/trunk/headers/posix/math.h	2007-08-08 09:14:38 UTC (rev 21849)
@@ -251,7 +251,7 @@
 		: __isnanl(value))
 
 /* returns non-zero if 'value is Inf */
-# define isinf(x) \
+# define isinf(value) \
 	(sizeof(value) == sizeof(float) ? __isinff(value)			\
 		: sizeof(value) == sizeof(double) ? __isinf(value)		\
 		: __isinfl(value))



From jackburton at mail.berlios.de  Wed Aug  8 11:50:01 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Wed, 8 Aug 2007 11:50:01 +0200
Subject: [Haiku-commits] r21850 - haiku/trunk/src/apps/terminal
Message-ID: <200708080950.l789o1sv014531@sheep.berlios.de>

Author: jackburton
Date: 2007-08-08 11:50:01 +0200 (Wed, 08 Aug 2007)
New Revision: 21850
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21850&view=rev

Modified:
   haiku/trunk/src/apps/terminal/SmartTabView.cpp
   haiku/trunk/src/apps/terminal/SmartTabView.h
   haiku/trunk/src/apps/terminal/TermWindow.cpp
   haiku/trunk/src/apps/terminal/TermWindow.h
Log:
Added a popup menu to the tabview: for now it only contains a "close 
tab" item. Note that you can also close the tab by clicking on it with 
the tertiary mouse button. Renamed some methods of TermWindow.
I'm not really happy with this code (tab creation/deletion code is 
spread between TermWindow and SmartTabView), I will need to come up with 
something better.
There are still some visual glitches when tabs are switched, created or 
deleted.


Modified: haiku/trunk/src/apps/terminal/SmartTabView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/SmartTabView.cpp	2007-08-08 09:14:38 UTC (rev 21849)
+++ haiku/trunk/src/apps/terminal/SmartTabView.cpp	2007-08-08 09:50:01 UTC (rev 21850)
@@ -8,11 +8,16 @@
 
 #include "SmartTabView.h"
 
+#include <MenuItem.h>
 #include <Message.h>
+#include <Messenger.h>
+#include <PopUpMenu.h>
 #include <Window.h>
 
 #include <stdio.h>
 
+const static uint32 kCloseTab = 'ClTb';
+
 SmartTabView::SmartTabView(BRect frame, const char *name, button_width width, 
 				uint32 resizingMode, uint32 flags)
 	:
@@ -32,28 +37,49 @@
 void
 SmartTabView::MouseDown(BPoint point)
 {
-	int32 buttons;
-	Window()->CurrentMessage()->FindInt32("buttons", &buttons);
+	bool handled = false;
 
-	if (CountTabs() > 1 && point.y <= TabHeight() && buttons & B_TERTIARY_MOUSE_BUTTON) {
-		for (int32 i = 0; i < CountTabs(); i++) {
-			if (TabFrame(i).Contains(point)) {
-				// Select another tab				
-				if (i > 0)
-					Select(i - 1);
-				else if (i < CountTabs())
-					Select(i + 1);
-				BTab *tab = RemoveTab(i);		
-				delete tab;		
-				return;
+	if (CountTabs() > 1) {
+		int32 tabIndex = _ClickedTabIndex(point);
+		if (tabIndex >= 0) {		
+			int32 buttons;
+			Window()->CurrentMessage()->FindInt32("buttons", &buttons);
+			if (buttons & B_SECONDARY_MOUSE_BUTTON) {	
+				BMessage *message = new BMessage(kCloseTab);
+				message->AddInt32("index", tabIndex);
+				
+				BPopUpMenu *popUpMenu = new BPopUpMenu("tab menu");
+				popUpMenu->AddItem(new BMenuItem("Close Tab", message));
+				popUpMenu->SetAsyncAutoDestruct(true);
+				popUpMenu->SetTargetForItems(BMessenger(this));
+
+				// TODO: I thought I'd get a "sticky" menu with this call...
+				// Bug in our implementation or I just have to use the "other"
+				// Go() method?	
+				popUpMenu->Go(ConvertToScreen(point), true, true, true);
+								
+				handled = true;		
+			} else if (buttons & B_TERTIARY_MOUSE_BUTTON) {
+				RemoveAndDeleteTab(tabIndex);
+				handled = true;
 			}
-		}
-	} else 
+		}	
+	}
+
+	if (!handled)
 		BTabView::MouseDown(point);
+		
 }
 
 
 void
+SmartTabView::AttachedToWindow()
+{
+	BTabView::AttachedToWindow();
+}
+
+
+void
 SmartTabView::AllAttached()
 {
 	BTabView::AllAttached();
@@ -61,6 +87,24 @@
 
 
 void
+SmartTabView::MessageReceived(BMessage *message)
+{
+	switch (message->what) {
+		case kCloseTab:
+		{
+			int32 tabIndex = 0;
+			if (message->FindInt32("index", &tabIndex) == B_OK)
+				RemoveAndDeleteTab(tabIndex);
+			break;
+		}		
+		default:
+			BTabView::MessageReceived(message);
+			break;	
+	}
+}
+
+
+void
 SmartTabView::Select(int32 index)
 {
 	BTabView::Select(index);
@@ -72,6 +116,21 @@
 
 
 void
+SmartTabView::RemoveAndDeleteTab(int32 index)
+{
+	// Select another tab
+	if (index == Selection()) {
+		if (index > 0)
+			Select(index - 1);
+		else if (index < CountTabs())
+			Select(index + 1);
+	}	
+	BTab *tab = RemoveTab(index);		
+	delete tab;	
+}
+
+
+void
 SmartTabView::AddTab(BView *target, BTab *tab)
 {
 	if (target == NULL)
@@ -108,3 +167,17 @@
 }
 
 
+int32
+SmartTabView::_ClickedTabIndex(const BPoint &point)
+{
+	if (point.y <= TabHeight()) {
+		for (int32 i = 0; i < CountTabs(); i++) {
+			if (TabFrame(i).Contains(point))
+				return i;
+		}
+	}
+
+	return -1;
+}
+
+

Modified: haiku/trunk/src/apps/terminal/SmartTabView.h
===================================================================
--- haiku/trunk/src/apps/terminal/SmartTabView.h	2007-08-08 09:14:38 UTC (rev 21849)
+++ haiku/trunk/src/apps/terminal/SmartTabView.h	2007-08-08 09:50:01 UTC (rev 21850)
@@ -10,6 +10,7 @@
 
 #include <TabView.h>
 
+class BPopUpMenu;
 class SmartTabView : public BTabView {
 public:
 	SmartTabView(BRect frame, const char *name,
@@ -22,13 +23,22 @@
 	
 	virtual void MouseDown(BPoint where);
 
+	virtual void AttachedToWindow();
 	virtual void AllAttached();
+
+	virtual void MessageReceived(BMessage *message);
+
 	virtual	void Select(int32 tab);
 	
+		void RemoveAndDeleteTab(int32 index);
+	
 	virtual	void AddTab(BView *target, BTab *tab = NULL);
 	virtual BTab* RemoveTab(int32 index);
 
 	virtual BRect DrawTabs();
+
+private:
+		int32 _ClickedTabIndex(const BPoint &point);	
 };
 
 #endif // __SMARTTABVIEW_H

Modified: haiku/trunk/src/apps/terminal/TermWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-08 09:14:38 UTC (rev 21849)
+++ haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-08 09:50:01 UTC (rev 21850)
@@ -116,7 +116,7 @@
 	fTabView = new SmartTabView(textFrame, "tab view");
 	AddChild(fTabView);
 	
-	_NewTab(command);
+	_AddTab(command);
 }
 
 
@@ -202,8 +202,7 @@
 void
 TermWindow::MessageReceived(BMessage *message)
 {
-	int32 coding_id;
-	BRect r;
+	int32 encodingId;
 	BFont halfFont;
 	BFont fullFont;
 	bool findresult;
@@ -225,28 +224,24 @@
 			_ActiveTermView()->Clear();
 			break;	
 			
-		case MENU_SWITCH_TERM: {
+		case MENU_SWITCH_TERM:
 			be_app->PostMessage(MENU_SWITCH_TERM);
 			break;
-		}
+
 		case kNewTab:
-			_NewTab(NULL);
+			_AddTab(NULL);
 			break;
 
 		case kCloseView:
-		{
 			// TODO: We assume that this message was sent from the current active tab.
 			// Since the implementation of BTabView uses AddChild/RemoveChild on the
 			// views, the current active tab is the only one who is attached, thus
-			// the only one which could send a message.
-			if (fTabView->CountTabs() > 1)			
-				delete fTabView->RemoveTab(fTabView->Selection());
-			else
-				PostMessage(B_QUIT_REQUESTED);			
+			// the only one which could send a message. Change this.
+			_RemoveTab(fTabView->Selection());			
 			break;	
-		}
 
-		case MENU_NEW_TERM: {
+		case MENU_NEW_TERM: 
+		{
 			app_info info;
 			be_app->GetAppInfo(&info);
 			
@@ -255,18 +250,18 @@
 				be_roster->Launch(TERM_SIGNATURE);
 			break;
 		}
-		case MENU_PREF_OPEN: {
+		case MENU_PREF_OPEN:
 			if (!fPrefWindow)
 				fPrefWindow = new PrefWindow(this);
 			else
 				fPrefWindow->Activate();
 			break;
-		}
-		case MSG_PREF_CLOSED: {
+		
+		case MSG_PREF_CLOSED:
 			fPrefWindow = NULL;
 			break;
-		}
-		case MENU_FIND_STRING: {
+	
+		case MENU_FIND_STRING:
 			if (!fFindPanel) {
 				BRect r = Frame();
 				r.left += 20;
@@ -278,8 +273,8 @@
 			else
 				fFindPanel->Activate();
 			break;
-		}
-		case MSG_FIND: {
+	
+		case MSG_FIND:
 			fFindPanel->PostMessage(B_QUIT_REQUESTED);
 			message->FindBool("findselection", &fFindSelection);
 			if (!fFindSelection) 
@@ -314,8 +309,8 @@
 			fFindBackwardMenuItem->SetEnabled(true);
 			fFindForwardMenuItem->SetEnabled(true);
 			break;
-		}
-		case MENU_FIND_FORWARD: {
+		
+		case MENU_FIND_FORWARD:
 			findresult = _ActiveTermView()->Find(fFindString, true, fMatchCase, fMatchWord);
 			if (!findresult) {
 				BAlert *alert = new BAlert("find failed", "Not Found.", "Okay", NULL,
@@ -323,8 +318,8 @@
 				alert->Go();
 			}
 			break;
-		}
-		case MENU_FIND_BACKWARD: {
+	
+		case MENU_FIND_BACKWARD:
 			findresult = _ActiveTermView()->Find(fFindString, false, fMatchCase, fMatchWord);
 			if (!findresult) {
 				BAlert *alert = new BAlert("find failed", "Not Found.", "Okay", NULL,
@@ -332,25 +327,25 @@
 				alert->Go();
 			}
 			break;
-		}
+		
 		case MSG_FIND_CLOSED:
 			fFindPanel = NULL;
 			break;
 
-		case MENU_ENCODING: {
-			message->FindInt32 ("op", &coding_id);
-			_ActiveTermView()->SetEncoding(coding_id);
+		case MENU_ENCODING:
+			if (message->FindInt32("op", &encodingId) == B_OK)
+				_ActiveTermView()->SetEncoding(encodingId);
 			break;
-		}
 		
 		// Message from Preference panel.
 		case MSG_ROWS_CHANGED:
-		case MSG_COLS_CHANGED: {
-			r = _ActiveTermView()->SetTermSize (PrefHandler::Default()->getInt32 (PREF_ROWS),
+		case MSG_COLS_CHANGED:
+		{
+			BRect rect = _ActiveTermView()->SetTermSize(PrefHandler::Default()->getInt32 (PREF_ROWS),
 										PrefHandler::Default()->getInt32 (PREF_COLS), 0);
 		
-			ResizeTo (r.Width()+ B_V_SCROLL_BAR_WIDTH + kViewOffset * 2,
-				r.Height()+fMenubar->Bounds().Height() + kViewOffset *2);
+			ResizeTo (rect.Width()+ B_V_SCROLL_BAR_WIDTH + kViewOffset * 2,
+				rect.Height()+fMenubar->Bounds().Height() + kViewOffset *2);
 		
 			BPath path;
 			if (PrefHandler::GetDefaultPath(path) == B_OK)
@@ -360,7 +355,8 @@
 		case MSG_HALF_FONT_CHANGED:
 		case MSG_FULL_FONT_CHANGED:
 		case MSG_HALF_SIZE_CHANGED:
-		case MSG_FULL_SIZE_CHANGED: {
+		case MSG_FULL_SIZE_CHANGED: 
+		{
 	
 			halfFont.SetFamilyAndStyle (PrefHandler::Default()->getString(PREF_HALF_FONT_FAMILY),NULL);
 			halfFont.SetSize (PrefHandler::Default()->getFloat(PREF_HALF_FONT_SIZE));
@@ -371,52 +367,51 @@
 			fullFont.SetSpacing (B_FIXED_SPACING);
 			
 			_ActiveTermView()->SetTermFont (&halfFont, &fullFont);
-			r = _ActiveTermView()->SetTermSize (0, 0, 0);
+			BRect rect = _ActiveTermView()->SetTermSize (0, 0, 0);
 			
 			int width, height;
+			_ActiveTermView()->GetFontSize(&width, &height);
 			
-			_ActiveTermView()->GetFontSize (&width, &height);
-			
 			SetSizeLimits (MIN_COLS * width, MAX_COLS * width,
 							MIN_COLS * height, MAX_COLS * height);
 			
-			ResizeTo (r.Width()+ B_V_SCROLL_BAR_WIDTH + kViewOffset * 2,
-			r.Height()+fMenubar->Bounds().Height() + kViewOffset * 2);
+			ResizeTo(rect.Width()+ B_V_SCROLL_BAR_WIDTH + kViewOffset * 2,
+				rect.Height()+fMenubar->Bounds().Height() + kViewOffset * 2);
 			
 			_ActiveTermView()->Invalidate();
 			break;
 		}
-		case EIGHTYTWENTYFOUR: {
+		case EIGHTYTWENTYFOUR:
 			PrefHandler::Default()->setString(PREF_COLS, "80");
 			PrefHandler::Default()->setString(PREF_ROWS, "24");
 		   	PostMessage (MSG_COLS_CHANGED);
 			break;
-		}
-		case EIGHTYTWENTYFIVE: {
+	
+		case EIGHTYTWENTYFIVE:
 			PrefHandler::Default()->setString(PREF_COLS, "80");
 			PrefHandler::Default()->setString(PREF_ROWS, "25");
 		   	PostMessage (MSG_COLS_CHANGED);
 			break;		
-		}
-		case EIGHTYFORTY: {
+	
+		case EIGHTYFORTY:
 			PrefHandler::Default()->setString(PREF_COLS, "80");
 			PrefHandler::Default()->setString(PREF_ROWS, "40");
 		   	PostMessage (MSG_COLS_CHANGED);
 			break;	
-		}
-		case ONETHREETWOTWENTYFOUR: {
+		
+		case ONETHREETWOTWENTYFOUR:
 			PrefHandler::Default()->setString(PREF_COLS, "132");
 			PrefHandler::Default()->setString(PREF_ROWS, "24");
 		   	PostMessage (MSG_COLS_CHANGED);
 			break;	
-		}
-		case ONETHREETWOTWENTYFIVE: {
+		
+		case ONETHREETWOTWENTYFIVE:
 			PrefHandler::Default()->setString(PREF_COLS, "132");
 			PrefHandler::Default()->setString(PREF_ROWS, "25");
 		   	PostMessage (MSG_COLS_CHANGED);
 			break;	
-		}
-		case FULLSCREEN: {
+		
+		case FULLSCREEN:
 			if (!fSavedFrame.IsValid()) { // go fullscreen
 				float mbHeight = fMenubar->Bounds().Height() + 1;
 				fSavedFrame = Frame();
@@ -440,39 +435,38 @@
 				fSavedFrame = BRect(0,0,-1,-1);
 			}
 			break;	
-		}
-		case MSG_FONT_CHANGED: {
+		
+		case MSG_FONT_CHANGED:
 	    		PostMessage(MSG_HALF_FONT_CHANGED);
 			break;
-		}
-		case MSG_COLOR_CHANGED: {
+		
+		case MSG_COLOR_CHANGED:
 			_SetTermColors();
 			_ActiveTermView()->Invalidate();
 			break;
-		}
-		case SAVE_AS_DEFAULT: {
+		
+		case SAVE_AS_DEFAULT: 
+		{
 			BPath path;
 			if (PrefHandler::GetDefaultPath(path) == B_OK)
 				PrefHandler::Default()->SaveAsText(path.Path(), PREFFILE_MIMETYPE);
 			break;
 		}
-		case MENU_PAGE_SETUP: {
+		case MENU_PAGE_SETUP:
 			_DoPageSetup();
 			break;
-		}
-		case MENU_PRINT: {
+		
+		case MENU_PRINT:
 			_DoPrint();
 			break;
-		}
 
-		case B_ABOUT_REQUESTED: {
+		case B_ABOUT_REQUESTED:
 			be_app->PostMessage(B_ABOUT_REQUESTED);
 			break;
-		}
-		default: {
+	
+		default:
 			BWindow::MessageReceived(message);
 			break;
-		}
 	}
 }
 
@@ -567,7 +561,7 @@
 
 
 void
-TermWindow::_NewTab(const char *command)
+TermWindow::_AddTab(const char *command)
 {
 	// Setup font.
 
@@ -628,6 +622,16 @@
 }
 
 
+void
+TermWindow::_RemoveTab(int32 index)
+{
+	if (fTabView->CountTabs() > 1)			
+		delete fTabView->RemoveTab(fTabView->Selection());
+	else
+		PostMessage(B_QUIT_REQUESTED);
+}
+
+
 TermView *
 TermWindow::_ActiveTermView()
 {

Modified: haiku/trunk/src/apps/terminal/TermWindow.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.h	2007-08-08 09:14:38 UTC (rev 21849)
+++ haiku/trunk/src/apps/terminal/TermWindow.h	2007-08-08 09:50:01 UTC (rev 21850)
@@ -59,7 +59,8 @@
 	void		_SetupMenu();
 	status_t	_DoPageSetup();
 	void		_DoPrint();
-	void		_NewTab(const char *command);
+	void		_AddTab(const char *command);
+	void		_RemoveTab(int32 index);
 	TermView*	_ActiveTermView();
 	
 	SmartTabView	*fTabView;



From nielx at mail.berlios.de  Wed Aug  8 12:29:30 2007
From: nielx at mail.berlios.de (nielx at BerliOS)
Date: Wed, 8 Aug 2007 12:29:30 +0200
Subject: [Haiku-commits] r21851 - in haiku/trunk/docs/user: . app
Message-ID: <200708081029.l78ATUrT016724@sheep.berlios.de>

Author: nielx
Date: 2007-08-08 12:29:30 +0200 (Wed, 08 Aug 2007)
New Revision: 21851
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21851&view=rev

Added:
   haiku/trunk/docs/user/app/
   haiku/trunk/docs/user/app/_app_intro.dox
Modified:
   haiku/trunk/docs/user/Doxyfile
   haiku/trunk/docs/user/book.dox
Log:
Create framework for Application Kit. 

Modified: haiku/trunk/docs/user/Doxyfile
===================================================================
--- haiku/trunk/docs/user/Doxyfile	2007-08-08 09:50:01 UTC (rev 21850)
+++ haiku/trunk/docs/user/Doxyfile	2007-08-08 10:29:30 UTC (rev 21851)
@@ -463,10 +463,12 @@
 # with spaces.
 
 INPUT                  = . \
+						 app \
                          drivers \
                          midi \
                          midi2 \
                          support \
+						 ../../headers/os/app \
                          ../../headers/os/drivers/fs_interface.h \
                          ../../headers/os/drivers/USB3.h \
                          ../../headers/os/drivers/USB_spec.h \

Added: haiku/trunk/docs/user/app/_app_intro.dox
===================================================================
--- haiku/trunk/docs/user/app/_app_intro.dox	2007-08-08 09:50:01 UTC (rev 21850)
+++ haiku/trunk/docs/user/app/_app_intro.dox	2007-08-08 10:29:30 UTC (rev 21851)
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2007, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Documentation by:
+ *		Niels Sascha Reedijk <niels.reedijk at gmail.com>
+ */
+
+
+/*!
+	\page app_intro Introduction to the Application Kit.
+  
+	The Application Kit is a kit you will have to get to know in case you
+	want to effectively write Haiku applications with a GUI. The application
+	kit does exactly as the name might inform you: it is the basis for Haiku
+	applications. It is advised to read through this document, and the
+	documents referenced before going to any other part of the API. 
+  
+	We can divide the classes in the application kit up in two categories. The
+	biggest part of the classes are in the 'messaging' classes. The following
+	are part of it:
+	- BHandler
+	- BInvoker
+	- BLooper
+	- BMessage
+	- BMessageFilter
+	- BMessageQueue
+	- BMessageRUnner
+	- BMessenger
+  
+	The second category is the 'system interaction'  category. These classes
+	provides hooks for you application to interact with the rest of the system.
+	The most important class is BApplication. This is a list of all the
+	classes:
+	- BApplication
+	- BClipboard
+	- BCursor
+	- BPropertyInfo
+	- BRoster
+*/
\ No newline at end of file

Modified: haiku/trunk/docs/user/book.dox
===================================================================
--- haiku/trunk/docs/user/book.dox	2007-08-08 09:50:01 UTC (rev 21850)
+++ haiku/trunk/docs/user/book.dox	2007-08-08 10:29:30 UTC (rev 21851)
@@ -3,6 +3,7 @@
 
   \section kits Kits and Servers
 
+  - \ref app | \link app_intro \em Introduction \endlink
   - \ref drivers
   - \ref midi1
   - \ref midi2 | \link midi2_intro \em Introduction \endlink



From stippi at mail.berlios.de  Wed Aug  8 20:29:10 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 8 Aug 2007 20:29:10 +0200
Subject: [Haiku-commits] r21852 - haiku/trunk/src/servers/app
Message-ID: <200708081829.l78ITAPB008962@sheep.berlios.de>

Author: stippi
Date: 2007-08-08 20:29:09 +0200 (Wed, 08 Aug 2007)
New Revision: 21852
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21852&view=rev

Modified:
   haiku/trunk/src/servers/app/DrawState.cpp
   haiku/trunk/src/servers/app/DrawState.h
Log:
* added a way to get the unscaled pensize (ie that of the current draw state
  of a view)


Modified: haiku/trunk/src/servers/app/DrawState.cpp
===================================================================
--- haiku/trunk/src/servers/app/DrawState.cpp	2007-08-08 10:29:30 UTC (rev 21851)
+++ haiku/trunk/src/servers/app/DrawState.cpp	2007-08-08 18:29:09 UTC (rev 21852)
@@ -496,6 +496,18 @@
 }
 
 
+//! returns the unscaled pen size
+float
+DrawState::UnscaledPenSize() const
+{
+	// NOTE: As documented in the BeBook,
+	// pen size is never smaller than 1.0.
+	// This is supposed to be the smallest
+	// possible device size.
+	return max_c(fPenSize, 1.0);
+}
+
+
 //! sets the font to be already scaled by fScale
 void
 DrawState::SetFont(const ServerFont& font, uint32 flags)

Modified: haiku/trunk/src/servers/app/DrawState.h
===================================================================
--- haiku/trunk/src/servers/app/DrawState.h	2007-08-08 10:29:30 UTC (rev 21851)
+++ haiku/trunk/src/servers/app/DrawState.h	2007-08-08 18:29:09 UTC (rev 21852)
@@ -108,6 +108,7 @@
 
 		void				SetPenSize(float size);
 		float				PenSize() const;
+		float				UnscaledPenSize() const;
 
 							// font
 		void				SetFont(const ServerFont& font,



From stippi at mail.berlios.de  Wed Aug  8 20:30:28 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 8 Aug 2007 20:30:28 +0200
Subject: [Haiku-commits] r21853 - haiku/trunk/src/servers/app/drawing
Message-ID: <200708081830.l78IUSoH009100@sheep.berlios.de>

Author: stippi
Date: 2007-08-08 20:30:28 +0200 (Wed, 08 Aug 2007)
New Revision: 21853
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21853&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
Log:
* make sure that the pattern used for line arrays is B_SOLID_HIGH
  and that the previous pattern is restored after execution


Modified: haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2007-08-08 18:29:09 UTC (rev 21852)
+++ haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2007-08-08 18:30:28 UTC (rev 21853)
@@ -1002,8 +1002,13 @@
 
 		data = (const LineArrayData *)&(linedata[0]);
 
+		// store current graphics state, we mess with the
+		// high color and pattern...
 		rgb_color oldColor = fPainter->HighColor();
+		struct pattern pattern = fPainter->Pattern();
+
 		fPainter->SetHighColor(data->color);
+		fPainter->SetPattern(B_SOLID_HIGH);
 		fPainter->StrokeLine(data->pt1, data->pt2);
 
 		for (int32 i = 1; i < numLines; i++) {
@@ -1012,8 +1017,9 @@
 			fPainter->StrokeLine(data->pt1, data->pt2);
 		}
 
-		// restore correct drawing state highcolor
+		// restore correct drawing state highcolor and pattern
 		fPainter->SetHighColor(oldColor);
+		fPainter->SetPattern(pattern);
 
 		fGraphicsCard->Invalidate(touched);
 		if (cursorTouched)



From laplace at mail.berlios.de  Wed Aug  8 20:33:59 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Wed, 8 Aug 2007 20:33:59 +0200
Subject: [Haiku-commits] r21854 - haiku/trunk/src/add-ons/print/drivers/pcl6
Message-ID: <200708081833.l78IXxmX009295@sheep.berlios.de>

Author: laplace
Date: 2007-08-08 20:33:59 +0200 (Wed, 08 Aug 2007)
New Revision: 21854
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21854&view=rev

Modified:
   haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6.cpp
Log:
Bug #1092 (PCL6: Second page upside down in duplex mode) fixed by Dr.
Hartmut Reh.


Modified: haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6.cpp
===================================================================
--- haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6.cpp	2007-08-08 18:30:28 UTC (rev 21853)
+++ haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6.cpp	2007-08-08 18:33:59 UTC (rev 21854)
@@ -233,8 +233,9 @@
 	if (getJobData()->getPrintStyle() == JobData::kSimplex) {
 		fWriter->BeginPage(orientation, mediaSize, mediaSource);
 	} else if (getJobData()->getPrintStyle() == JobData::kDuplex) {
+		// TODO move duplex binding option to UI
 		fWriter->BeginPage(orientation, mediaSize, mediaSource, 
-			PCL6Writer::kDuplexHorizontalBinding, fMediaSide);
+			PCL6Writer::kDuplexVerticalBinding, fMediaSide);
 
 		if (fMediaSide == PCL6Writer::kFrontMediaSide) {
 			fMediaSide = PCL6Writer::kBackMediaSide;



From stippi at mail.berlios.de  Wed Aug  8 20:36:23 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 8 Aug 2007 20:36:23 +0200
Subject: [Haiku-commits] r21855 - haiku/trunk/src/servers/app
Message-ID: <200708081836.l78IaNJ0009480@sheep.berlios.de>

Author: stippi
Date: 2007-08-08 20:36:23 +0200 (Wed, 08 Aug 2007)
New Revision: 21855
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21855&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerPicture.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
* convert shape coordinates to screen at the time of playing the picture
  (fixes ticket #1367, stefano I thought you knew that I meant this in an
  earlier mail)
* move_pen_by() looked wrong in ServerPicture, have not tested though
* make sure the pen location is adjusted after stroke_line() and draw_string()
  in ServerPicture
* set_pen_location() does not need to update the Painter drawing state
* ServerWindow AS_LAYER_SET_PEN_SIZE needs to set the resulting pen size of
  the drawing state stack, not the one set on the current state
* ServerWindow AS_LAYER_GET_PEN_SIZE needs to return the current state's
  size, not the result of the stack
* small cleanups


Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-08 18:33:59 UTC (rev 21854)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-08 18:36:23 UTC (rev 21855)
@@ -128,6 +128,7 @@
 		for(i = (ptCount - 1);i >= 0;i--) {
 			ptList[i] = fPtStack.top();
 			fPtStack.pop();
+			view->ConvertToScreenForDrawing(&ptList[i]);
 		}
 
 		view->Window()->GetDrawingEngine()->DrawShape(frame, opCount, opList, ptCount, ptList,
@@ -173,16 +174,24 @@
 static void
 move_pen_by(ViewLayer *view, BPoint delta)
 {
-	view->CurrentState()->SetPenLocation(delta - view->CurrentState()->PenLocation());
+//	view->CurrentState()->SetPenLocation(delta - view->CurrentState()->PenLocation()); ?!?
+	view->CurrentState()->SetPenLocation(view->CurrentState()->PenLocation() + delta);
 }
 
 
 static void
 stroke_line(ViewLayer *view, BPoint start, BPoint end)
 {
+	BPoint penPos = end;
+
 	view->ConvertToScreenForDrawing(&start);
 	view->ConvertToScreenForDrawing(&end);	
 	view->Window()->GetDrawingEngine()->StrokeLine(start, end);
+
+	view->CurrentState()->SetPenLocation(penPos);
+	// the DrawingEngine/Painter does not need to be updated, since this
+	// effects only the view->screen coord conversion, which is handled
+	// by the view only
 }
 
 
@@ -376,13 +385,20 @@
 draw_string(ViewLayer *view, const char *string, float deltaSpace,
 	float deltaNonSpace)
 {
+	// NOTE: the picture data was recorded with a "set pen location" command
+	// inserted before the "draw string" command, so we can use PenLocation()
 	BPoint location = view->CurrentState()->PenLocation();
+
 	escapement_delta delta = {deltaSpace, deltaNonSpace };
 	view->ConvertToScreenForDrawing(&location);
 	view->Window()->GetDrawingEngine()->DrawString(string, strlen(string),
 		location, &delta);
-	// TODO: Update pen location ?
-	
+
+	view->ConvertFromScreenForDrawing(&location);
+	view->CurrentState()->SetPenLocation(location);
+	// the DrawingEngine/Painter does not need to be updated, since this
+	// effects only the view->screen coord conversion, which is handled
+	// by the view only
 }
 
 
@@ -482,12 +498,9 @@
 set_pen_location(ViewLayer *view, BPoint pt)
 {
 	view->CurrentState()->SetPenLocation(pt);
-
-	// TODO: faster version
-	IntPoint p = view->ScrollingOffset();
-	p += IntPoint(view->CurrentState()->Origin());
-	view->Window()->GetDrawingEngine()->SetDrawState(
-		view->CurrentState(), p.x, p.y);
+	// the DrawingEngine/Painter does not need to be updated, since this
+	// effects only the view->screen coord conversion, which is handled
+	// by the view only
 }
 
 
@@ -546,6 +559,9 @@
 set_scale(ViewLayer *view, float scale)
 {
 	view->CurrentState()->SetScale(scale);
+	// the DrawingEngine/Painter does not need to be updated, since this
+	// effects only the view->screen coord conversion, which is handled
+	// by the view only
 }
 
 

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-08 18:33:59 UTC (rev 21854)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-08 18:36:23 UTC (rev 21855)
@@ -1550,8 +1550,6 @@
 			link.Read<float>(&y);
 
 			fCurrentLayer->CurrentState()->SetPenLocation(BPoint(x, y));
-			// TODO: is this necessary?
-			_UpdateDrawState(fCurrentLayer);
 			break;
 		}
 		case AS_LAYER_GET_PEN_LOC:
@@ -1570,15 +1568,16 @@
 			link.Read<float>(&penSize);
 
 			fCurrentLayer->CurrentState()->SetPenSize(penSize);
-			//_UpdateDrawState(fCurrentLayer);
-			fWindowLayer->GetDrawingEngine()->SetPenSize(penSize);
+			fWindowLayer->GetDrawingEngine()->SetPenSize(
+				fCurrentLayer->CurrentState()->PenSize());
 			break;
 		}
 		case AS_LAYER_GET_PEN_SIZE:
 		{
 			DTRACE(("ServerWindow %s: Message AS_LAYER_GET_PEN_SIZE: ViewLayer: %s\n", Title(), fCurrentLayer->Name()));
 			fLink.StartMessage(B_OK);
-			fLink.Attach<float>(fCurrentLayer->CurrentState()->PenSize());
+			fLink.Attach<float>(
+				fCurrentLayer->CurrentState()->UnscaledPenSize());
 			fLink.Flush();
 		
 			break;
@@ -1854,7 +1853,6 @@
 			link.Read(&c, sizeof(rgb_color));
 			
 			fCurrentLayer->CurrentState()->SetHighColor(RGBColor(c));
-//			_UpdateDrawState(fCurrentLayer);
 			fWindowLayer->GetDrawingEngine()->SetHighColor(c);
 			break;
 		}
@@ -1866,7 +1864,6 @@
 			link.Read(&c, sizeof(rgb_color));
 
 			fCurrentLayer->CurrentState()->SetLowColor(RGBColor(c));
-//			_UpdateDrawState(fCurrentLayer);
 			fWindowLayer->GetDrawingEngine()->SetLowColor(c);
 			break;
 		}
@@ -1878,7 +1875,6 @@
 			link.Read(&pat, sizeof(pattern));
 
 			fCurrentLayer->CurrentState()->SetPattern(Pattern(pat));
-//			_UpdateDrawState(fCurrentLayer);
 			fWindowLayer->GetDrawingEngine()->SetPattern(pat);
 			break;
 		}
@@ -2575,14 +2571,11 @@
 				&& link.Read(opList, opCount * sizeof(uint32)) >= B_OK
 				&& link.Read(ptList, ptCount * sizeof(BPoint)) >= B_OK) {
 
-				// TODO: I'm not sure If I have to do this here (when the BPicture is
-				// recorded, or inside ServerPicture, when the picture is replayed. 				
 				// This might seem a bit weird, but under R5, the shapes
 				// are always offset by the current pen location
 				BPoint penLocation = fCurrentLayer->CurrentState()->PenLocation();
 				for (int32 i = 0; i < ptCount; i++) {
 					ptList[i] += penLocation;
-					fCurrentLayer->ConvertToScreenForDrawing(&ptList[i]);
 				}
 				const bool fill = (code == AS_FILL_SHAPE);
 				picture->WriteDrawShape(opCount, opList, ptCount, ptList, fill);



From korli at mail.berlios.de  Wed Aug  8 22:06:44 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Wed, 8 Aug 2007 22:06:44 +0200
Subject: [Haiku-commits] r21856 - haiku/trunk/data/etc/fonts/ttfonts
Message-ID: <200708082006.l78K6iBK015138@sheep.berlios.de>

Author: korli
Date: 2007-08-08 22:06:38 +0200 (Wed, 08 Aug 2007)
New Revision: 21856
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21856&view=rev

Modified:
   haiku/trunk/data/etc/fonts/ttfonts/Konatu.ttf
   haiku/trunk/data/etc/fonts/ttfonts/KonatuTohaba.ttf
Log:
Updated to version 21 of the Konatu font.


Modified: haiku/trunk/data/etc/fonts/ttfonts/Konatu.ttf
===================================================================
(Binary files differ)

Modified: haiku/trunk/data/etc/fonts/ttfonts/KonatuTohaba.ttf
===================================================================
(Binary files differ)



From korli at mail.berlios.de  Wed Aug  8 22:10:03 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Wed, 8 Aug 2007 22:10:03 +0200
Subject: [Haiku-commits] r21857 - haiku/trunk/data/etc/fonts/ttfonts
Message-ID: <200708082010.l78KA3Px016078@sheep.berlios.de>

Author: korli
Date: 2007-08-08 22:07:40 +0200 (Wed, 08 Aug 2007)
New Revision: 21857
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21857&view=rev

Added:
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansCondensed-Bold.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansCondensed-BoldOblique.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansCondensed-Oblique.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansCondensed.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerif-BoldItalic.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerif-Italic.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerifCondensed-Bold.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerifCondensed-BoldItalic.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerifCondensed-Italic.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerifCondensed.ttf
Removed:
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerif-BoldOblique.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerif-Oblique.ttf
Modified:
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSans-Bold.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSans-BoldOblique.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSans-ExtraLight.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSans-Oblique.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSans.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansMono-Bold.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansMono-BoldOblique.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansMono-Oblique.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansMono.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerif-Bold.ttf
   haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerif.ttf
Log:
updated DejaVu fonts to to 2.19


Modified: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSans-Bold.ttf
===================================================================
(Binary files differ)

Modified: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSans-BoldOblique.ttf
===================================================================
(Binary files differ)

Modified: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSans-ExtraLight.ttf
===================================================================
(Binary files differ)

Modified: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSans-Oblique.ttf
===================================================================
(Binary files differ)

Modified: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSans.ttf
===================================================================
(Binary files differ)

Added: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansCondensed-Bold.ttf
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansCondensed-Bold.ttf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansCondensed-BoldOblique.ttf
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansCondensed-BoldOblique.ttf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansCondensed-Oblique.ttf
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansCondensed-Oblique.ttf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansCondensed.ttf
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansCondensed.ttf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansMono-Bold.ttf
===================================================================
(Binary files differ)

Modified: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansMono-BoldOblique.ttf
===================================================================
(Binary files differ)

Modified: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansMono-Oblique.ttf
===================================================================
(Binary files differ)

Modified: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSansMono.ttf
===================================================================
(Binary files differ)

Modified: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerif-Bold.ttf
===================================================================
(Binary files differ)

Added: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerif-BoldItalic.ttf
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerif-BoldItalic.ttf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerif-BoldOblique.ttf

Added: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerif-Italic.ttf
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerif-Italic.ttf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerif-Oblique.ttf

Modified: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerif.ttf
===================================================================
(Binary files differ)

Added: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerifCondensed-Bold.ttf
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerifCondensed-Bold.ttf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerifCondensed-BoldItalic.ttf
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerifCondensed-BoldItalic.ttf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerifCondensed-Italic.ttf
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerifCondensed-Italic.ttf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerifCondensed.ttf
===================================================================
(Binary files differ)


Property changes on: haiku/trunk/data/etc/fonts/ttfonts/DejaVuSerifCondensed.ttf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream



From laplace at mail.berlios.de  Wed Aug  8 22:32:47 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Wed, 8 Aug 2007 22:32:47 +0200
Subject: [Haiku-commits] r21858 - in haiku/trunk: headers/private/interface
	src/preferences/print
Message-ID: <200708082032.l78KWlC9017363@sheep.berlios.de>

Author: laplace
Date: 2007-08-08 22:32:46 +0200 (Wed, 08 Aug 2007)
New Revision: 21858
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21858&view=rev

Modified:
   haiku/trunk/headers/private/interface/pr_server.h
   haiku/trunk/src/preferences/print/AddPrinterDialog.cpp
   haiku/trunk/src/preferences/print/AddPrinterDialog.h
   haiku/trunk/src/preferences/print/JobListView.cpp
   haiku/trunk/src/preferences/print/Messages.h
   haiku/trunk/src/preferences/print/PrinterListView.cpp
   haiku/trunk/src/preferences/print/Printers.cpp
   haiku/trunk/src/preferences/print/PrintersWindow.cpp
   haiku/trunk/src/preferences/print/PrintersWindow.h
Log:
* open 'Add printer dialog' when 'addp' message is sent to Printers preflet
* style changes


Modified: haiku/trunk/headers/private/interface/pr_server.h
===================================================================
--- haiku/trunk/headers/private/interface/pr_server.h	2007-08-08 20:07:40 UTC (rev 21857)
+++ haiku/trunk/headers/private/interface/pr_server.h	2007-08-08 20:32:46 UTC (rev 21858)
@@ -49,6 +49,9 @@
 #define PSRV_PRINT_SPOOLED_JOB				'psns'
 #define PSRV_GET_DEFAULT_SETTINGS      'pdef'
 
+// messages sent to Printers preflet
+#define PRINTERS_ADD_PRINTER				'addp'
+
 // mime file types
 #define PSRV_PRINTER_FILETYPE		"application/x-vnd.Be.printer"
 #define PSRV_SPOOL_FILETYPE			"application/x-vnd.Be.printer-spool"

Modified: haiku/trunk/src/preferences/print/AddPrinterDialog.cpp
===================================================================
--- haiku/trunk/src/preferences/print/AddPrinterDialog.cpp	2007-08-08 20:07:40 UTC (rev 21857)
+++ haiku/trunk/src/preferences/print/AddPrinterDialog.cpp	2007-08-08 20:32:46 UTC (rev 21858)
@@ -12,6 +12,7 @@
 #include "PrinterListView.h"
 #include "pr_server.h"
 #include "Globals.h"
+#include "Messages.h"
 
 #include <Box.h>
 #include <Button.h>
@@ -26,17 +27,10 @@
 #include <StorageKit.h>
 
 
-status_t
-AddPrinterDialog::Start()
-{
-	new AddPrinterDialog();
-	return B_OK;
-}
-
-
-AddPrinterDialog::AddPrinterDialog()
+AddPrinterDialog::AddPrinterDialog(BWindow *parent)
 	: Inherited(BRect(78.0, 71.0, 400, 300), "Add Printer",
 		B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL, B_NOT_ZOOMABLE)
+	, fPrintersPrefletMessenger(parent)
 {
 	BuildGUI(0);
 
@@ -44,6 +38,14 @@
 }
 
 
+bool
+AddPrinterDialog::QuitRequested()
+{
+	fPrintersPrefletMessenger.SendMessage(kMsgAddPrinterClosed);
+	return Inherited::QuitRequested();
+}
+
+
 void
 AddPrinterDialog::MessageReceived(BMessage* msg)
 {

Modified: haiku/trunk/src/preferences/print/AddPrinterDialog.h
===================================================================
--- haiku/trunk/src/preferences/print/AddPrinterDialog.h	2007-08-08 20:07:40 UTC (rev 21857)
+++ haiku/trunk/src/preferences/print/AddPrinterDialog.h	2007-08-08 20:32:46 UTC (rev 21858)
@@ -23,7 +23,9 @@
 		typedef BWindow Inherited;
 	
 	public:
-		static status_t Start();
+		AddPrinterDialog(BWindow *parent);
+		
+		bool QuitRequested();
 	
 	private:
 		enum MessageKind {
@@ -32,7 +34,6 @@
 			kNameChangedMsg,
 		};
 	
-		AddPrinterDialog();
 		void MessageReceived(BMessage *msg);
 	
 		void AddPrinter(BMessage *msg);
@@ -44,6 +45,8 @@
 		void AddPortSubMenu(BMenu *menu, const char *transport, const char *port);
 		void Update();
 		
+		BMessenger fPrintersPrefletMessenger;
+
 		BTextControl *fName;
 		BPopUpMenu *fPrinter;
 		BPopUpMenu *fTransport;
@@ -52,7 +55,7 @@
 		BString fNameText;
 		BString fPrinterText;
 		BString fTransportText;
-		BString fTransportPathText;
+		BString fTransportPathText;		
 };
 
 #endif

Modified: haiku/trunk/src/preferences/print/JobListView.cpp
===================================================================
--- haiku/trunk/src/preferences/print/JobListView.cpp	2007-08-08 20:07:40 UTC (rev 21857)
+++ haiku/trunk/src/preferences/print/JobListView.cpp	2007-08-08 20:32:46 UTC (rev 21858)
@@ -50,7 +50,7 @@
 {
 	Inherited::AttachedToWindow();
 
-	SetSelectionMessage(new BMessage(MSG_JOB_SELECTED));
+	SetSelectionMessage(new BMessage(kMsgJobSelected));
 	SetTarget(Window());	
 }
 

Modified: haiku/trunk/src/preferences/print/Messages.h
===================================================================
--- haiku/trunk/src/preferences/print/Messages.h	2007-08-08 20:07:40 UTC (rev 21857)
+++ haiku/trunk/src/preferences/print/Messages.h	2007-08-08 20:32:46 UTC (rev 21858)
@@ -1,42 +1,24 @@
-/*****************************************************************************/
-// Printers Preference Application.
-//
-// This application and all source files used in its construction, except 
-// where noted, are licensed under the MIT License, and have been written 
-// and are:
-//
-// Copyright (c) 2001-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 2001-2007, Haiku.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer
+ *		Philippe Houdoin
+ */
+ 
 #ifndef MESSAGES_H
 #define MESSAGES_H
 
 #include <SupportDefs.h>
 
-const uint32 MSG_ADD_PRINTER		= 'AddP';
-const uint32 MSG_REMOVE_PRINTER		= 'RemP';
-const uint32 MSG_MKDEF_PRINTER		= 'MDfP';
-const uint32 MSG_PRINTER_SELECTED	= 'PSel';
-const uint32 MSG_CANCEL_JOB			= 'CncJ';
-const uint32 MSG_RESTART_JOB		= 'RstJ';
-const uint32 MSG_JOB_SELECTED       = 'JSel';
+const uint32 kMsgAddPrinter         = 'AddP';
+const uint32 kMsgAddPrinterClosed   = 'APCl';
+const uint32 kMsgRemovePrinter      = 'RemP';
+const uint32 kMsgMakeDefaultPrinter = 'MDfP';
+const uint32 kMsgPrinterSelected    = 'PSel';
+const uint32 kMsgCancelJob          = 'CncJ';
+const uint32 kMsgRestartJob         = 'RstJ';
+const uint32 kMsgJobSelected        = 'JSel';
 
 #endif

Modified: haiku/trunk/src/preferences/print/PrinterListView.cpp
===================================================================
--- haiku/trunk/src/preferences/print/PrinterListView.cpp	2007-08-08 20:07:40 UTC (rev 21857)
+++ haiku/trunk/src/preferences/print/PrinterListView.cpp	2007-08-08 20:32:46 UTC (rev 21858)
@@ -84,8 +84,8 @@
 {
 	Inherited::AttachedToWindow();
 
-	SetSelectionMessage(new BMessage(MSG_PRINTER_SELECTED));
-	SetInvocationMessage(new BMessage(MSG_MKDEF_PRINTER));
+	SetSelectionMessage(new BMessage(kMsgPrinterSelected));
+	SetInvocationMessage(new BMessage(kMsgMakeDefaultPrinter));
 	SetTarget(Window());	
 
 	BPath path;	

Modified: haiku/trunk/src/preferences/print/Printers.cpp
===================================================================
--- haiku/trunk/src/preferences/print/Printers.cpp	2007-08-08 20:07:40 UTC (rev 21857)
+++ haiku/trunk/src/preferences/print/Printers.cpp	2007-08-08 20:32:46 UTC (rev 21858)
@@ -28,9 +28,9 @@
 
 #include "Printers.h"
 
-#ifndef PRINTERSWINDOW_H
-	#include "PrintersWindow.h"
-#endif
+#include "pr_server.h"
+#include "Messages.h"
+#include "PrintersWindow.h"
 
 int main()
 {
@@ -51,12 +51,16 @@
 }
 
 void PrintersApp::MessageReceived(BMessage* msg) {
-	if (msg->what == B_PRINTER_CHANGED) {
+	if (msg->what == B_PRINTER_CHANGED || msg->what == PRINTERS_ADD_PRINTER) {
 			// broadcast message
+		uint32 what = msg->what;
+		if (what == PRINTERS_ADD_PRINTER)
+			what = kMsgAddPrinter;
+
 		BWindow* w;
 		for (int32 i = 0; (w = WindowAt(i)) != NULL; i ++) {
 			BMessenger msgr(NULL, w);
-			msgr.SendMessage(B_PRINTER_CHANGED);
+			msgr.SendMessage(what);
 		}
 	} else {
 		BApplication::MessageReceived(msg);

Modified: haiku/trunk/src/preferences/print/PrintersWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/print/PrintersWindow.cpp	2007-08-08 20:07:40 UTC (rev 21857)
+++ haiku/trunk/src/preferences/print/PrintersWindow.cpp	2007-08-08 20:32:46 UTC (rev 21858)
@@ -47,6 +47,7 @@
 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)
 {
 	BuildGUI();
 }
@@ -65,7 +66,7 @@
 {
 	switch(msg->what)
 	{
-		case MSG_PRINTER_SELECTED:
+		case kMsgPrinterSelected:
 			{
 				fSelectedPrinter = fPrinterListView->SelectedItem();
 				if (fSelectedPrinter)
@@ -88,18 +89,25 @@
 			}
 			break;
 
-		case MSG_ADD_PRINTER:
-			AddPrinterDialog::Start();
+		case kMsgAddPrinter:
+			if (!fAddingPrinter) {
+				fAddingPrinter = true;
+				new AddPrinterDialog(this);
+			}
 			break;
+	
+		case kMsgAddPrinterClosed:
+			fAddingPrinter = false;
+			break;
 
-		case MSG_REMOVE_PRINTER:
+		case kMsgRemovePrinter:
 			{
 				fSelectedPrinter = fPrinterListView->SelectedItem();
 				if (fSelectedPrinter) fSelectedPrinter->Remove(fPrinterListView);
 			}
 			break;
 
-		case MSG_MKDEF_PRINTER:
+		case kMsgMakeDefaultPrinter:
 			{
 				int32 prIndex = fPrinterListView->CurrentSelection();
 				if (prIndex >= 0)
@@ -121,13 +129,13 @@
 			break;
 
 
-		case MSG_CANCEL_JOB: fJobListView->CancelJob();
+		case kMsgCancelJob: fJobListView->CancelJob();
 			break;
 
-		case MSG_RESTART_JOB: fJobListView->RestartJob();
+		case kMsgRestartJob: fJobListView->RestartJob();
 			break;
 
-		case MSG_JOB_SELECTED: UpdateJobButtons();
+		case kMsgJobSelected: UpdateJobButtons();
 			break;
 
 		case B_PRINTER_CHANGED:
@@ -162,14 +170,14 @@
 	float maxWidth = 0;
 
 		// Add Button
-	BButton* addButton = new BButton(BRect(5,5,5,5), "add", "Add " B_UTF8_ELLIPSIS, new BMessage(MSG_ADD_PRINTER), B_FOLLOW_RIGHT);
+	BButton* addButton = new BButton(BRect(5,5,5,5), "add", "Add " B_UTF8_ELLIPSIS, new BMessage(kMsgAddPrinter), B_FOLLOW_RIGHT);
 	printersBox->AddChild(addButton);
 	addButton->ResizeToPreferred();
 
 	maxWidth = addButton->Bounds().Width();
 
 		// Remove button
-	fRemove = new BButton(BRect(5,30,5,30), "remove", "Remove", new BMessage(MSG_REMOVE_PRINTER), B_FOLLOW_RIGHT);
+	fRemove = new BButton(BRect(5,30,5,30), "remove", "Remove", new BMessage(kMsgRemovePrinter), B_FOLLOW_RIGHT);
 	printersBox->AddChild(fRemove);
 	fRemove->ResizeToPreferred();
 
@@ -177,7 +185,7 @@
 		maxWidth = fRemove->Bounds().Width();
 
 		// Make Default button
-	fMakeDefault = new BButton(BRect(5,60,5,60), "default", "Make Default", new BMessage(MSG_MKDEF_PRINTER), B_FOLLOW_RIGHT);
+	fMakeDefault = new BButton(BRect(5,60,5,60), "default", "Make Default", new BMessage(kMsgMakeDefaultPrinter), B_FOLLOW_RIGHT);
 	printersBox->AddChild(fMakeDefault);
 	fMakeDefault->ResizeToPreferred();
 
@@ -217,7 +225,7 @@
 	backdrop->AddChild(fJobsBox);
 
 		// Cancel Job Button
-	BButton* cancelButton = new BButton(BRect(5,5,5,5), "cancel", "Cancel Job", new BMessage(MSG_CANCEL_JOB), B_FOLLOW_RIGHT+B_FOLLOW_TOP);
+	BButton* cancelButton = new BButton(BRect(5,5,5,5), "cancel", "Cancel Job", new BMessage(kMsgCancelJob), B_FOLLOW_RIGHT+B_FOLLOW_TOP);
 	fJobsBox->AddChild(cancelButton);
 	cancelButton->ResizeToPreferred();
 	fCancel = cancelButton;
@@ -225,7 +233,7 @@
 	maxWidth = cancelButton->Bounds().Width();
 
 		// Restart Job button
-	BButton* restartButton = new BButton(BRect(5,30,5,30), "restart", "Restart Job", new BMessage(MSG_RESTART_JOB), B_FOLLOW_RIGHT+B_FOLLOW_TOP);
+	BButton* restartButton = new BButton(BRect(5,30,5,30), "restart", "Restart Job", new BMessage(kMsgRestartJob), B_FOLLOW_RIGHT+B_FOLLOW_TOP);
 	fJobsBox->AddChild(restartButton);
 	restartButton->ResizeToPreferred();
 	fRestart = restartButton;

Modified: haiku/trunk/src/preferences/print/PrintersWindow.h
===================================================================
--- haiku/trunk/src/preferences/print/PrintersWindow.h	2007-08-08 20:07:40 UTC (rev 21857)
+++ haiku/trunk/src/preferences/print/PrintersWindow.h	2007-08-08 20:32:46 UTC (rev 21858)
@@ -68,6 +68,8 @@
 	BBox*		fJobsBox;
 
 	PrinterItem* fSelectedPrinter;
+	
+	bool fAddingPrinter;
 };
 
 #endif



From stippi at mail.berlios.de  Wed Aug  8 22:33:37 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 8 Aug 2007 22:33:37 +0200
Subject: [Haiku-commits] r21859 - haiku/trunk/data/artwork
Message-ID: <200708082033.l78KXbZf017440@sheep.berlios.de>

Author: stippi
Date: 2007-08-08 22:33:36 +0200 (Wed, 08 Aug 2007)
New Revision: 21859
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21859&view=rev

Modified:
   haiku/trunk/data/artwork/HAIKU logo - black.svg
Log:
* the black SVG version now includes the dropshadows as bitmaps, which, given
  that they are blurry anyways, should give you a perfectly scalable version of
  the logo in SVG


Modified: haiku/trunk/data/artwork/HAIKU logo - black.svg
===================================================================
--- haiku/trunk/data/artwork/HAIKU logo - black.svg	2007-08-08 20:32:46 UTC (rev 21858)
+++ haiku/trunk/data/artwork/HAIKU logo - black.svg	2007-08-08 20:33:36 UTC (rev 21859)
@@ -1,50 +1,206 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<svg width="735" height="181" color-interpolation="linearRGB">
+<svg width="683" height="178" color-interpolation="linearRGB">
  <g>
   <path style="fill:#010101"
-        d="M118.02 33.02v106.93h13.96v-106.93h-13.96v0z"
+        d="M88.02 33.02v106.93h13.96v-106.93h-13.96v0z
+           M151.02 33.02c0 35.54 0 71.39 0 106.93h13.95v-106.93h-13.95v0z
+           M253.53 28.18l-50.43 111.77h14.1l36.32 -81.58l35.28 81.58h14.08l-49.36 -111.77v0z
+           M341.02 33.02v106.93h13.96v-106.93h-13.96v0z
+           M405.02 33.02v106.93h13.93v-44.5l4.49 -5.37l39.48 49.88h17.53l-47.73 -58.93l47 -48h-16.98l-43.8 46.3v-46.3h-13.93v0z
+           M581.01 33.02v64.29c0 10.23 -2.13 18.19 -6.28 23.88c-4.14 5.68 -10.55 7.88 -19.22 7.88c-9.08 0 -15.39 -3.48 -19.21 -9.71c-3.84 -6.24 -5.33 -12.53 -5.33 -20.92v-65.42h-13.92v68.65c0 6.48 1.57 12.99 4.27 19.15c2.69 6.17 6.99 11.09 12.73 15.12c5.71 4.03 12.96 5.94 21.46 6.04c5.62 0 10.78 -0.83 15.48 -2.79c4.7 -1.98 8.75 -4.8 12.19 -8.48c3.41 -3.67 6.03 -8.03 7.88 -13.1c1.82 -5.04 2.93 -10.58 2.93 -16.61v-67.97h-12.98v0z"
   />
-  <path style="fill:#010101"
-        d="M181.02 33.02c0 35.54 0 71.39 0 106.93h13.95v-106.93h-13.95v0z"
-  />
-  <path style="fill:#010101"
-        d="M283.53 28.18l-50.43 111.77h14.1l36.32 -81.58l35.28 81.58h14.08l-49.36 -111.77v0z"
-  />
-  <path style="fill:#010101"
-        d="M371.02 33.02v106.93h13.96v-106.93h-13.96v0z"
-  />
-  <path style="fill:#010101"
-        d="M435.02 33.02v106.93h13.93v-44.5l4.49 -5.37l39.48 49.88h17.53l-47.73 -58.93l47 -48h-16.98l-43.8 46.3v-46.3h-13.93v0z"
-  />
-  <path style="fill:#010101"
-        d="M611.01 33.02v64.29c0 10.23 -2.13 18.19 -6.28 23.88c-4.14 5.68 -10.55 7.88 -19.22 7.88c-9.08 0 -15.39 -3.48 -19.21 -9.71c-3.84 -6.24 -5.33 -12.53 -5.33 -20.92v-65.42h-13.92v68.65c0 6.48 1.57 12.99 4.27 19.15c2.69 6.17 6.99 11.09 12.73 15.12c5.71 4.03 12.96 5.94 21.46 6.04c5.62 0 10.78 -0.83 15.48 -2.79c4.7 -1.98 8.75 -4.8 12.19 -8.48c3.41 -3.67 6.03 -8.03 7.88 -13.1c1.82 -5.04 2.93 -10.58 2.93 -16.61v-67.97h-12.98v0z"
-  />
  </g>
  <g>
-  <radialGradient id="gradient0" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.1294,-0.2357,-0.2758,-0.3164,597.2067,112.1814)">
-   <stop offset="0" stop-color="#f6a407"/>
-   <stop offset="1" stop-color="#ffe56d"/>
+  <image x="83" y="66" width="142px" height="56px"
+         xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAI4AAAA4CAYAAAArbsBgAAAM1UlEQVR4nO2deVMbSRLFfzI3mMMH
+mFnG187GbsR+/8+yM2t7bDxebGMOYw6BBIL9I+s5s8stEFILJKyMqJBokLpFvX55vSrVGNldsFo2
+CI/RLsJjHF2dcGSDbwLEvTDGsp/zkQMoAuU8jVb2mD9vC6oRcAbXBJRxYAKYTI8a49kYS48CVWQg
+ASCCowWchXHaZpxRBNP3ixvZ4FkNA8cUMAfcT2MWmE7HJ8OIgBqjyEYyMU0EzCnQTKMBnIRxnB7r
+4Vgzve5ivB+femQdWXQ/uTsZA2aAJWAljUfAIgakGQxA0zh4IvPk7iq+9znOIgJOAwNKHThK4wD4
+BuwCX9M4TK9vjYBz8yZXMo4xh9zLOTaBLYw5HgC/An8HngOr6ZhAE5lGgBFo8kBZFuMbAUjMI8Y5
+xgCyB2wCG8CH9Hdip/MRcG7GajhYJrGJn0tjKv3NCXaHN9OxZeAl8G/gNww4C+l3OVjaASZnHD1G
+9onxTjNdxwGwlc51CuxjzCOQMwJOf03sIrDMYrHKIuaGltLxM8wVfMTcxAzwCwacf2Css5yOl7mj
+CJBO4taL7LkYqIkxTg0DTy1dWwOPb85hBJx+WMyGprDJvo+xxQPgIfAYA8IDDASHmDtopNfNAU8w
+V7WWni+m35W5oG6uMT6P4yxdzw7wGXNXu+lYk5Smj4BTnckdTeCuaB5jFYFFge7jdGwecwVfsDv9
+C8YA8xiwltPrZ6kONLmJcZoYy3wG3gH/BV6l55sYcE4ZMU5lFmstObtEsDzBAbOU/m4Km5AWBpY5
+7I7X6xcx0EzQP9Bc4CzzBVgH/gD+A7wFPmExjgL3CxgBpxeL7mgWm/hFLG1exsGygrulRbweo6C4
+hgFuCo93FtKYxeIjFfR6sTwo1rEWlobvYO7yNcY2b7GYSwF7K77ZCDjXt3sUi3PzFNllFQfM4/S7
+Bbz+oppLDZtApdRiq1r6+3kMSBMUC3ndmkCi2o2qwk2MUTYw0Mg9fcJA0yBUjGUj4HRukWHmKLLL
+EywLWsWLdUs4a0QACARqBYyn3wuAk+lRrqyqOZJLOsaAcogX/HaB/2FM8w6Lc+SefgANFV7UXTYF
+vXJJSxiTCCx/w1lGgJnH3Y9qH2W1FbUWYpW4jgfOclNVmIBTx4CyibmnXWAbY5h1zD3tYfWcUtDA
+CDhXmbKkGYw9HmMgWQOeYqBR0KuAN7qjyC5lJuDMYaDTxC5gjDbFj62DXiwGwpsYUDawoHg7DYGm
+Vf4WZiPglFsNdyH3MQYQYJ5hoFnDg14BRhXdyzQxuakv9TA9P8aYTVXiKuIbXYtc5QUGjl0MOGKZ
+Q8w9nV31ZiPgFE1uaRJ3S8s4YASaVYxl5JLyzKdThtBkTqefJ7FgVZXmyWu8VyfnUttjDAOP4p2v
+ePZ0qQ5HNgKOWSzezWCAeIQB5FesyfiMIssopY7al27PrcB5EnMR6j9F9urF8haDXJZ6U5JMXOqe
+oo2A4+l1zGxWsPjlKQaYXzEQKWidprMYphOL0goxQbvudi/WwsBRx1hGmZXimWtJSO86cKLmJXaQ
+VQST9mUWA8wqDpinOGAeU6zijoX3r/I62/2uF4sthX0sEFZcs4Ol46f85MDRBIjqVVyLYiewf5Tu
+NGlfnmJd6Jfp+S94r2iOYuGu6tJ/v5SYckvqQymT+jM9bqbjPyVwNJFSwE3h5fuZMNQoPMfusm8Y
+eKYxkPwrjZfpZ2VLVbqlmzSB5hT7vFvAX8AbDDgbWFB8ZepdZgJOrusQjXe1dOKGLAa0ki9I76Ix
+n40J7B8l7cthet0z4J9pPMWDX2UgOt+wmOZNlWL1od6k8QGr2dTpIPUuM91JUeysE0rl3lF6doMW
+xVEzmBtRU3AJm3SNxXRcjcUa5uc/pdfvp9e/wF2UBFO9Zku3bS38JtnAWOY18B6LcyST6GpudUdN
+4XfoWHpDaU9PGAwAyR2pxiKtyyMseNV4hDcWBRiV/6W0m0zveZje5xkWFEvTW1UafBumZqakqB+x
+Tvdrin0o1Wy6MgFnFq9bzKQTH2AU9w3zkRFAXZ+wC1NWJMAsYGmxZAvqE0nrEqULUdQ9jv2zxnGd
+7QkGnCgEr6o3dBvWTpT1GmOcj/QQ10QTcGYw4LzAJqCG3Y2fsKBqN12IACT96bXz/2uaOtKxKPcE
+Y4e19Cj5gnpFKswJLHlHWhVhCbXv44FwvwRTN2ExGJYo6z0GmjdY93sH8yQ9gQacktVoW8Fo+z4G
+jjUMtV/SSb/iAKrjyyUiiKoCkuIYTaw0uKqxCDQPMFBJ9KSboaz8fw8DlfS74EH1NNUIpm7DctBs
+4aBRXBOD4Z7naJziZN/DG24TeHNvJ41tjH32KGo6TrDmmMRBUsN3ExfFBuMC3it6jjHiMyxd1gK1
+CJirUmYBR4+6acROw2hyTznTvML0NevpWFf1mnamukYTX4S1h02GVg1OYdS+ioHlG76yLwLoCF82
+GpdTiI3yxexlH0CuKVZyn1MszCkemcNZotMaizJIsVm+kH+Y2Eb/P7UStBbqPQaYP7CguJJgODcF
+ikcYm6ynCzrC7vRYAJM7EAsdYYBR3+MAd2MCUQNnonaL2COIFM88wFzRC2xdkUCzgrGQJAzXLcqp
+9iNpwXW72YNisVF5grcS/sI1w29wuURbJV+3pn+kGnySQiq1lSJfEsjYDdYS0rK1x2KgOkUWEhOd
+4qsHY5Y2kc71BGOa3zDQrOEyhihhuO6EX0bTwwCeuOuEKsJ7GKu8x2s163gGdUyXRb7LLPZ2YkFN
+SzykRNOqw1gbUeai9DWKoeNidrXtGxTdWM5AtXQNS1gMI/2L6itzdMcyg2xly3KjtVv7rdBiGwPI
+OgaadxjrbOItlb5kvnnGoRhgEi/ja42zCoQClMr4ijXK9LUCU9whId+XJQdOlGgqa5JrGtZUuZ0J
+LPGG0/9Dlq//PsWXs2xgoHmLy0C3cSVfz2l3O4uZRNzBoIHRoCq1ahyqYZiDaZ5ilTYW3tQiUBYj
+WUM85wXFwFhFPLnGquSTg2gxVolJRkybYw+xgcU0mxi7rKfHz5hrqhNWXPbL2qWg7UAUd4fS/iyq
+gwhQs2EIRAJe3EkqV/7rn3RC+Q4MYrQY1N4Fiy2CPVwwrl5SdDX6OwXDH9PYSsdOqKhOc5V1UrvQ
+B2thIIp70OV6FwFKsoYImjjKNgLSo2o4i/gCN+li1EeCuwcesc4eBoZtDAzHFOtjDYxV9nCtsDYE
+6Jtryq2bolfORrEOEvekmygZ49nzsv1dlOUt4Sm5qPshrsKDuwGeKA+J7j3uS7OPF1pjFquSx/ft
+R27KqqiWxnS6SVGuGdlpLHue75oZX6cgWRR8jBcUH+GKvLuQYcWbRYmB9t47wJknbjWSlzJuXLXQ
+jzJ7vrA9Wi0bZSscBa5Z/E7LK9LLWEAe1x0NI3h0zSp8xoKoRFi72GeU0LzBAOijbkNCULaNWL4T
+ZqwDxcKhAsVcgD7s4IkMreKqguBdXJ3QsxyiKhvUxl7UyqpKGqvTYiFpg+N2IDBcAIpFQH1WpeZq
+5chV37aY7rsNumgpFscEHDFQDAhzF9iPHlQ/2hWxACjF3ibePvgT0wdv4fHNCDgdmlxaBE+MeWKl
+NcZNcTKrAlB0s2UT2Ol5YgH0DGNWaYPfYp3t33HV3pW7R9y0DQNwoLixs3bGlNsSC+W66LLVkL0A
+KN+YKDZr4/kuO090Sypn7GOZk1Yh/I5LIj7hoKm8UdmLDQtwoBw8dVxMFgEkN5aDiPDzdS2vpB9w
+PTF/WQyzg+9L8woDzCt8sVzce2+gbFCD43amoDlO4iEWG+xgZfhNfItXbXQkXVFUCnYTB8VYRExQ
+w7dDibtvxfOIrVQdrqf30IZGH7C45gPWc9rFwFmp+KpKGzbgyGLHXeyzj4FnE4sLtFPWCr76Qfvw
+RUlIrjO+CkgtvL6ygwFBexOr2SuQ6r1jSyGCRtf6EQNM3mYYiEC4zIYVOOCTkdP/Lt4A1PIZ7csX
+11upARu/daXsK3tyUAkIJ9hEb6XnEvxro0gpJ1WXkRziAAuE9VrpuL/hCwD6vXqkZxtm4Mg0KWrC
+HuEB52dsWUhctBdVjermq/Ga99AieLR4X0uExHKfMebRmq24ADAHzgkeH8WtRgSYG+85dWt3AThQ
+7OBH9tnD7mopGRfx5cFLuO5HDBF1RDl4dA65KQn1v2LgOcAmPX4rTO6qdG1RFSmGGQrAyIapwnpd
+i2vM221KoBF1RO3AI+Dkss0P+J7AzXTu2MSFH1ssUbA/0C6pnd1l4MhiX0s7W0S9kMRoUSuUrwIV
+cDT5cln6IjAJr2IWVCZSG0qQlNnPAJxosZlYphvSz2Vf65M3Z+OXgxW+dvDGPs0t2s8GnNzKtENl
+3wOVs4YAlH9z7k8BGoD/AzOfs65ZtF25AAAAAElFTkSuQmCC"
+         transform="matrix(1,0,0,1,-36,0)"
+  />
+  <radialGradient id="gradient0" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.8308,-0.3374,0.1336,0.2809,128.4185,78.0486)">
+   <stop offset="0" stop-color="#32962b"/>
+   <stop offset="1" stop-color="#a9ff00"/>
   </radialGradient>
   <path style="fill:url(#gradient0)"
-        d="M593.98 88.69c-3 15.73 0.81 27.55 8.95 36.36c0.14 -2.41 1.1 -4.13 1.89 -5.55c0.86 15.17 12.33 15.6 17.07 17.37c0.19 -1.79 -1.48 -2.74 -0.14 -6.97c1.54 3.3 2.97 5.17 4.79 7.94c2.76 0.7 5.75 2.51 8.73 2.89c3.68 0.46 8.57 0.9 12.63 1.24c-0.04 -1.87 0.5 -2.62 1.19 -3.79c0.48 1.44 1.13 2.77 1.95 3.99c4.2 -0.37 7.87 0.96 9.85 2.18c-2.2 -8.98 -8.63 -18.15 -14.44 -24.05c-3.41 -1.01 -5.89 0.69 -10.51 2.64c0.93 -2.63 2.85 -4.78 6.61 -6.03c-4.62 -3.81 -9.67 -7.14 -14.69 -10.28c-1.95 -1.22 -7.79 -3.51 -10.37 -5.38c-2.55 -0.04 -4.89 0.07 -7.04 0.31c1.47 -1.02 2.79 -2.21 4.4 -3.09c-6.63 -7.39 -11.73 -10.46 -19.63 -12.64c-7.16 -10.96 -10.43 -26.35 -8.67 -27.35l-4.14 2.35c0 0 3.68 17.09 11.55 27.84v0z"
+        d="M83.7 101.53c13.95 13.37 28.42 17.25 42.67 14.8c-2.34 -1.72 -3.45 -3.83 -4.38 -5.56c15.92 9.08 23.88 -2.23 28.79 -5.87c-1.69 -1.37 -3.75 -0.3 -7.15 -4.43c4.35 0.6 7.18 0.38 11.19 0.36c2.52 -2.33 6.32 -4.17 8.66 -6.94c2.89 -3.42 6.55 -8.08 9.55 -11.97c-1.93 -1.18 -2.32 -2.23 -3.05 -3.7c1.77 0.45 3.54 0.67 5.32 0.64c2.38 -4.5 6.14 -7.33 8.67 -8.53c-10.54 -3.66 -24.04 -3.17 -33.82 -1.16c-3.26 2.79 -3.16 6.41 -4.22 12.38c-2.05 -2.67 -2.97 -6.02 -1.76 -10.65c-6.89 2.17 -13.58 5.09 -20.04 8.12c-2.51 1.17 -8.66 5.57 -12.25 6.96c-1.71 2.55 -3.13 4.99 -4.3 7.33c-0.07 -2.16 -0.41 -4.28 -0.24 -6.49c-11.83 1.85 -18.29 5.01 -25.67 11.57c-15.8 0.05 -33.51 -6.73 -33.37 -9.17l-0.33 5.73c0 0 19.72 7.48 35.76 6.58v0z"
   />
- </g>
- <g>
-  <radialGradient id="gradient1" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.6662,-0.0701,0.0251,0.2389,281.9321,85.2491)">
+  <image x="227" y="84" width="144px" height="62px"
+         xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAJAAAAA+CAYAAADEUJImAAAL6ElEQVR4nO2d6VIjyRWFj9jF1jQ9
+43H4/V/OYbsNNEIgNWh+ZH7kqUuWQAtoqxuRISGptqxT5+5JT7slvfD3ZCVnsUUSJ3RbpJfHXh49
+e0Umkl7slfcdqGaQbQIQINm3cRD+BlhSAc1vG882AFPbHHVA0+YDyFnmII9DSUd58J7vnIUAz1jS
+SNJTHqM8nvNv/Dhs66wFc+2kbCqAAA0sA2BOKuNYBUz7ebuJEkDGSqB5lPRgY5g/+52P11Nhs54K
+gCJz7RyYNhFADpxjSX1Jp3mchXGqAqLDvA0AAECA517SnY2BErie8zEB6X4+DwfgKL8f660K3Go5
+WPUJzCE9pZt4rASSS0lXeXyTdJHHmRK4YKAag6C+hkoAupV0I+lnfj/Iv+nl/Zzmfe0pgWSkBL5H
+FdZ6ytvATFvNSusKoF5lcBP2ldjkWNK5pGtJf+ZxrQSic9XBs2f7mqjYQE8qLPR/JVACoqd83BPb
+72HefqQEsvs8Bipq8DF/v9VAWhcAOVCiJxWN157SDTxVuqHfVED0hxITnSndcNSW78cB9KKmKnrI
++7zIrzf5s2clMPL5Sd7nWHX190sFULCSA2lrZJUAirGaAzU9KYbbLXg9+0o3sZ9fsX8ulNjjTOmG
+u9oChM5mvk/2h03Vz/u7VwLKgYrK7Csx20QJIAMl0Nwpge5Gib1u8+cRSFvDRqsAUAQNQDlSuumM
+ExXvaU9Nr2eiBAxsEoASwQfz1M6BV2yqfTXP5Sjvf6Ckinoqauw0n2Mvnw8ggolulFThz/x6q2KY
+P6oY2xvPRl8JIL9ZDhh/8v3px4PC83lRidcQpznMv8Uzgk38mB85L6mp4gAUIBopgRbViWe3r2IL
+nSux07c8MOovJf0vn+eNEiMNtSVs9FUAgnEADmrnPAx3v7lRMAkAwuN5yp+xT6kA6COR5Cj8DpXp
+3t447xd3PoYFuKZ+Pn/sKAbXhmF/q8RWxJo4342TzwYQ6opg34matgpP66WK6w0DwT5EkFFhT0oA
+GqrJDDACMs8NAURuNx2oqBtAFQ1zDH9nVli0FpfiumAjGHXjQPRZAIqTCuNcKAHmuw0AxBPKBNdi
+N8ReYCICfVIBaExZLHL+7GtiIyZnXQW6bRej46hobLxDNc81pk82Qj4DQDFSjKq6VALMtaQfKjEb
+wBMjxu7GI25IE/3FqEZFwkSLRtlr+S//Lu4/2lI1VvLhANpTiXxvVAR7mQCK6qqvApwrFeD8UALS
+lYpHE9VVfLphIID5onQT3H7g+30th4U4bu39e5/FEIV7iHiWMUblwkOx9rIMALmtENUVwPlDBUBX
+SqAiqhtVVe3plppgcrBGL6ZW+7Po9S2yHYa2A6lmR0XZCBAtCiC/kagr7BxnHFiHXBVxlBirmcVj
+gpXYdmLfrYtEo9ztpGnggVHX3rBeBoAOVLwrZxxSC9f5c7wsj+1EVTXP8Wvv100iK8Y8HxKrI9fe
+O5sXQDEo2Fdilz8l/SXpn6onN2vqalekFmdCYm4ObwwgPWtNZRYARcOQoFpfyaa5lvQPSf9SAhCJ
+zUXV1TaJq7QjJUaWmuCJRWoOrrWTjwLIA2iHemswf1dRW666zlXc6kXV1baIg+g4v4dlvMSWEMVa
+F/y/ByD3HtpKRk+V1FQ0lLF3apS961JjIhgHADmIYKK1s4dqAIp1OV466rUyRI35nKpA6mVQWR14
+6uI20URp3mKdtpfLrmVRmgMoFnPFxCfuOVlmDwA6E2EsdyrrfXEQUWFJvg8QxYK0tVJlAMhtnFoy
+kMTntYqa8locbCLyPUSCO3lfPJZ2ovSgkuvzDhHKYzG210IcQOSSPAUB43y3V2wcT1zGJOKyUgm7
+InH+L1XKVh6U8mRk7YlQr4VXFhnIYzo/lDwqEp+kIC5UCstj0tKjrMsCzzS63iaAcg8oYvumBBoq
+Halm9ODiylWZe0g8AUSVKbsgFeHJz6OwbS1TvejN9brlOFF+3G0BUXTvcUwo2r/P79eqkhEPQGou
+NsCN8SpCr9HxaPI0WfTmegwkthkz1kFqAJ9HavbQlUqtdQTRylmICr7otscallp/ued1pCbzLMpA
+MTJLbCRmqFdpZ01a3rssAiSvQ/L+NW9cXDkLOYB4/UiSr02tSMu7oVQfujs7VpMd27ouPlt8DmLe
+Cpl3PuLvvQ+f9mmPUK9U9iufMSkEtTy0Hlt23+uCmAdMTBgtx25E0l7jfWRfDaBa3sorI6XFmTiC
+r5Zo5XsvwPtyiUXonpOhbJSYhEdGY5jdo6SLPIV+Do8qzXr0VP3W2/6v2kPwGcJ1wQbOjtgkSK2q
+ch6pZez5PBao+RpIcdtPkzj5sazAJ4puCAeTh9ojmJzS3Vt678Je8n7vVRr0bpWMx4ne2mafDaDo
+ZLCihzPjUOn6YzR/Gcww0VuzIRbux1ryWHv0adI2+W1GLOAZ2vgoO7Xp60jT9JvfKjXk/VRioFE+
+X28+XCaAau3OkY2fVNqYaV/+pXT91GR7vfOsAIqhC28i8DmVHYtmhNjN8iWqbdrkuzpxewjaBkAD
+TQcUF96m7nyyxnkfd0rg+a8SAw3yb3BtPR41jw3UBpbadcK8MA7AZtzl30lFpcR2JD9ePA8/h2gs
+c2xf/AovDMDGKonaglo1p2gp8l45BxdINphEHxR+pxR0/Kn2bkxvFPSL4wKZaAzne6Ub8x8lAN2p
+NPVJRU1I9bxQm3sdn+4aeJxxfDgDD1R63Yd5P/28rV/Ps96GPaZVIkbW86X3eDhZNoZ+OEBEvxkt
+VN6nz0ohtSVnFgbSRwvK3F11IPFkUtYROzFpWaZVOQLJI9ovShd4pwScfysBaagSnXWWYN2eWFRf
+Awp/x1VZeeLZp/ebjcJ7rpcbg1e4l6+RAn8eOE/31IzqCOSauvR8mDPQc96P20EEH0mEM/9xyRkH
+0sIlIrPWRDuQPLgFkHxlDV96zgcZe28k3FfxvG6VAAT7PKukV3w1sUne1lMpUS3W2KZm3zhgnioj
+3lCaAF/yHA5tn3iPtfWJYqNim60ZweNmQlRfPs+A9iR8B5BgzhjRnrsjdt6i+mjkOZDici1u5AEc
+3rsnBQP9UvG8HlXY6SF/d6R0wb9UD0P4udWAE1knrtIagTMOv+O343zcA5UnepDP3ReGcFXt6ZcY
+NnG7x4OnvpiER+MdQL6gg3e+xHothi8341n+mdloGY2FkZXwlmrdmIDKX339HzwwlorDjuBce0oT
+eWPbcQ41tvEnvM3WiQCJNcnuAPjfTPSBbTPI5+ZuNXZQbbW1tqDkSE2wRs9WetuPd6b0ULkNCoBY
+cMuB1FdzASyOM1OEe5mtzXFCPEoaAeWvvoCB63+omtUxUA83qrvvNfZpY6Bn1cEUR4y4x/hWT027
+5SFcV2SeNhvIH0BnpNq5sA37dLV6b+NSzUUrDlSaHHyxB0B2r8J0H7aNPmt1Dr95UgETNS9twTaf
+RF9OBXXDDfJa62nGc02dRe+r9hrB4sa4S8+2G+tt12kETgQQrzWAx898G+YKby+udz2wUVvAAuZy
+s+JYzeWN8bynguirFpjiKZNKxLZtUv1mMUFM0lDtKYIIoLi/acZ17fOPXhe/5frarq2W34r7mfUc
+2rzjWvwIIBE/O1N7DIl1izxxW5VVLbI5y03yJ/wjuaW22E/t9TNklmtb5jEjkDz04LXVlCTjxHgd
+vKeInI1aDeyvSkQuKtPsmWljHlbZdPF5cichrqdEHIk1lWIEu6YVNhZAncwubfGuuEJsXAQLEMWG
+0GgavG7cyfZK9IxhoGjbeEiglkuL+3sFUweg3ZBa4De2TQMiz/C7OovxtYmkSQeg3ZFoR9ZiTF5n
+5LXwAChu0wFoB6UGIl9KJharebI71nt1ANpR8fiXR+NjmiRmCUjovgYaVxUH6mT1AihiOiWmWA5V
+ot5vqhw7AO22AJJarGeiUtc0UYlMN0DWAagTTzN5CulFSVWdKrEOOTavhuwYqJNXAURDNQHEf0Ma
+qZkje5E6AHXSFAfRRAk0lM7wf9EwoDsAdVIVV2djlWi0l9q8qrBtWRqlk+UKOTD3ump1VR2AOpkq
+XsNULYX5G6Yj3fKaVm2cAAAAAElFTkSuQmCC"
+         transform="matrix(1,0,0,1,-36,0)"
+  />
+  <radialGradient id="gradient1" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.6662,-0.0701,0.0251,0.2389,251.9321,85.2491)">
    <stop offset="0" stop-color="#f43d05"/>
    <stop offset="1" stop-color="#ffaa00"/>
   </radialGradient>
   <path style="fill:url(#gradient1)"
-        d="M325.6 113c-8.4 -17.4 -20.6 -26.09 -34.81 -28.77c1.59 2.43 1.9 4.8 2.16 6.74c-11.74 -14.07 -23.16 -6.24 -29.03 -4.55c1.1 1.87 3.4 1.59 5.15 6.65c-3.87 -2.09 -6.6 -2.87 -10.35 -4.24c-3.18 1.3 -7.38 1.7 -10.54 3.48c-3.9 2.19 -8.96 5.28 -13.13 7.88c1.39 1.78 1.39 2.9 1.56 4.53c-1.5 -1.04 -3.09 -1.86 -4.76 -2.46c-3.8 3.38 -8.32 4.72 -11.11 4.97c8.6 7.11 21.42 11.36 31.28 12.9c4.03 -1.47 5.2 -4.9 8.28 -10.12c0.98 3.22 0.67 6.68 -2.06 10.6c7.22 0.37 14.5 -0.03 21.62 -0.6c2.77 -0.22 10.06 -2.2 13.91 -2.24c2.5 -1.79 4.68 -3.58 6.59 -5.36c-0.68 2.05 -1.11 4.15 -2.03 6.16c11.73 2.39 18.88 1.69 28.1 -1.87c14.82 5.46 29.05 18.01 28.06 20.25l2.32 -5.26c0 0 -15.86 -13.9 -31.21 -18.65v0z"
+        d="M295.6 113c-8.4 -17.4 -20.6 -26.09 -34.81 -28.77c1.59 2.43 1.9 4.8 2.16 6.74c-11.74 -14.07 -23.16 -6.24 -29.03 -4.55c1.1 1.87 3.4 1.59 5.15 6.65c-3.87 -2.09 -6.6 -2.87 -10.35 -4.24c-3.18 1.3 -7.38 1.7 -10.54 3.48c-3.9 2.19 -8.96 5.28 -13.13 7.88c1.39 1.78 1.39 2.9 1.56 4.53c-1.5 -1.04 -3.09 -1.86 -4.76 -2.46c-3.8 3.38 -8.32 4.72 -11.11 4.97c8.6 7.11 21.42 11.36 31.28 12.9c4.03 -1.47 5.2 -4.9 8.28 -10.12c0.98 3.22 0.67 6.68 -2.06 10.6c7.22 0.37 14.5 -0.03 21.62 -0.6c2.77 -0.22 10.06 -2.2 13.91 -2.24c2.5 -1.79 4.68 -3.58 6.59 -5.36c-0.68 2.05 -1.11 4.15 -2.03 6.16c11.73 2.39 18.88 1.69 28.1 -1.87c14.82 5.46 29.05 18.01 28.06 20.25l2.32 -5.26c0 0 -15.86 -13.9 -31.21 -18.65v0z"
   />
- </g>
- <g>
-  <radialGradient id="gradient2" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.8308,-0.3374,0.1336,0.2809,158.4185,78.0486)">
-   <stop offset="0" stop-color="#32962b"/>
-   <stop offset="1" stop-color="#a9ff00"/>
+  <image x="587" y="60" width="93px" height="100px"
+         xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAF0AAABkCAYAAADkBDymAAAJd0lEQVR4nO1cYZeqOhALunvv//+5
+d9dd3wedZwiZaUHU1SXn9ICIUNKQTofiAI8h2a44du63gTDMXAcuRB/Ntg0dGIqlbgOmhB/Ntg0N
+vNH6gCnZ/DlwxJhsYCN8FoL0ISk7TJXO5VuOt5HfgTdMlb1Llkp2EBzEb4R3QpW+ozIA2GNsMUH4
+gLHKY9tGfAecpzPxe4wt5gjgC1PLYUvaiG/AKT2Weyo7jFX+RcfQTnVDA5mnO9KBE+lBOPu7i3I2
+JHiTz5XFxPfAiez9eal3wab6BtheQOtZxxqkMuE7bGqfhSBd1VnF60y47he/3dRe4A2ecF5X8pnw
+jPgNBXa0XuVQstGqWs9GfAeCdE1gaX4llky2s5+N+A6o0qssItAmeiO8A+HRLq+iS24AR742woYE
+e1p31uGsJOAaiRtoQwK1l2+MydPPmdVklrPBgDvSXpsB+u1lI95A7SVTrtoMI/P+zWYS7OVz5uWq
+5kB1h2yEJ1Clx3JOdFIRvpFvoEoH8o6xJ5LZ7KUDmb1UUYl6ezag2qZnJMiUHsvW6JP371H2Fs3A
+kw7Ufr5GLP6ryV+i9Cq7mJE5dKz/GlRKj2WWUawSXvE9aFk1zq8iPyMdqMnUsi++6+kX+Jwvjx6l
+x7JF+t5scw1QPeb7FaiUDtRK388sFfl8Prf+UmjZiy6DLCX07VzeaT1KfK/qryKhlyUcmM57Yehg
+59usAyeCmPjw9/jt17l8Snk7L3cADrgQ/4VLOlnr8hKoSA9obkWziaHYNwB/MCU+SD/gRPIHlbhT
+lPyYL/mS5LdIrx5Y68PqPU72EsTzFGsl/R8uVvQBH+3wfMlo6DjeU2Ou0l0iy5EehPIzWCb9HSfi
+2ZL+oR7txp329OghHagJjxK+/g7gLy6EBsLXg/RoGBfZuI70G+O+4mnRSzpQXyhHNE7twIm0A6aE
+c0jpyM6ylU9L/BzSAX/xGkqGwoP46FTDYirCmfQsRcyR01Nijr0wXOzOag+bUW/vJZzP6Z5EPbXN
+zFW6QzVSZZKBk0p1hOo6zp5Hfk/7hOoa0t0okjtVVj1bDKu7shVd13N94WI3A56I/DWVXmUj+b2l
+St2xrBTMv1XCn0L5a5DOaJEfRCmyUS8wVjof64BxyuBp5t2sTbpCyQ9l83lbMwk41aB3DxPPDfCj
+yb816QGOdiJuj9do4m0QNxEV8jvuqD9xIj2I5/Kjyb8X6UCeItbMpU5Y4oQajwM+cEktMPnOdn7U
+fxhcQ3plC5myotMLIiOayX7D6g6yI1n2jmm6+ICx7USJviQb3d4VS0hXYlpku3xNQImP7zX0fKfy
+ByfiIz38SUttgMP5HOz7mji7O/lzcy9ZWKcWkZHPYJtxYNL5ydQHTsR/FCUekKj1cJjpIqS7oPWM
+lMGdGZMQ5e+5aMKrNfoEpn7P0Y4baFXPYd35dBqInpOXN8dc0l1iK0jmws9KXepWj5mtuxkHTD6f
+I3sIXjX4Q57FLlU6E89e+wfjRJcS4pSm58iUPmcGQjUFRMl39blpY8whHfBKZ7WrtTi1ZxdXjWQz
+xbdsJ5v2AUzvKlenm+Aae6mIdw8qWre48/VsJFopX/M9vXNuYD7fBEtIj1s+8/bMXjJf52PreZig
+TPW6dBajmc04Dy8ZN41mltpLpvh3TJXu1A74i3UJszmWkzWE83Wtgwsfb0L+EtI1D1IRHt/Hvtmt
+7QjOtrcawDWEu8u00bMnVatjLumAtxj1d+1EXewMTC9cz9FqmJb9OA/X42Yk38xilipd1V4Rn5He
+QzzQR74jfjDr7ngtVa8e2Vyj9ErxGsb1EJ55vJ43q0fWEK702Iezuaxus7CEdK5EFT+7p/5Z2KjH
+dut6bt0nI1i/C1TEO2H03J1dWEPprYHLnOF4tszqoXVy9cs6zOyzO8dqhAPXKZ0r4zqyLFSrbtuq
+IbJ6tH7v0OPjrcZbjKWkAzXhWRTR8mXdDvRdbGv/Kv9fXVdVv8XRzZpKzzqy1pA780/9bm69Aqrq
+LCzMxFMpfVGIeY3SA47oXrVkxDsbWgJHuHuKpaNstsie/mGW6q+1l1i2SM5Iyzy+8v1r4J5etfI5
+Gue7Y92NdEZ2W1cdW6ux1u7AuD5Zf1RFXnwNGeFxJ5V1vpb0zC56Wj7rA9a0l57zV/kaTUkD9XNi
+yD4WayudkZ04lKAXretLlJ511tlDcUe6+rkLBOZMO5lgrY7UrfcMsTXCaUU818Ldmb2hLiObBcHf
+pVhL6a5CLThbqUK0ntu6Opeet0ftc0nvsplbkN4D7dAqPwfqeTXVIKc6Z4/SswCB6+Neai7FcEvS
+W0T0Rit6MdXUaIcqLHX9SSv3rnXSOZOan5/Ua23Sswpm+7XI1ovi6XHZ7Fw9Z0a4i5x6OnFVtf5j
+a1MIj7CXinCONhzhrvT8x28P8e4uzOrk6pcpflKvR3u626aeyf8tEEudlZspno/bE/e3Ql+1F1U7
+T1DN7ry7kd4b+kXlnLoPSWHiK5vRzz1RD+/rOlC1PH0jxArh3qRX5FcK18Izcnvevrim6DGdut2S
+9wUeQHoFd5GqcJ17zoX3PcKrPiMsi0Cq7XoXxuv3Udem2u/1+gvbhvtOlRMT/d0kVA3xeN7NJ8YT
+Wt1r8XNmJagQWLlah+xhvJ7reM93jrQT4u2OdDeFwz1z5f8iCNJj3U3b1obL0hhcN70DlfwBY2GU
+8zfvSXrg+1yZIN5dWDaTwOW+9xi/ocHTtnlba15l1t+4DjRszb0FmI0B/t/n3qQfzxWIV1BiWxT2
+8WzyJ5PF0z10unY2dbt3bqPWW4XB0ZNTflbuai8BVkaQHxcUd8AXfB7ELXlmWdhL/JFP7yxioO3t
+vK5/BqfRk2J0zEeQHmCPZ+LDfrJhuX7HaueOVP/+JOsjejpUV3dWe7zTWpH/UE9naMX0DbhWYW8/
+4EK8vqzQei/JjVqBaQOoJarioxGy1MQAPJ70QFRuoCXgFZipPoiv5lS2wjk+j1vnzxpx6dvbaQ7m
+p5AecJYD+IvnO0L7Am4A9+yz1ZFmuaGK+LAXHS1PrOankc5weRJtCEf+DuOOOJtPWaVxe0mPuqni
+Ve0j4n8y6Q4ugcXqDALUeloPvjOFZ/aiateUQZmI6+mpnwHO76uBSq/C3edM7S5l4JJfx1chPVAp
+06m61XnqsVthpUuqTTKVr0a6oiK1x1KqY7n9NL80iVzwC0h36CW5tW/1uxHJsv4ynn5LZJFMD1wE
+tmFluE52gv8A/J4+FwAF8MoAAAAASUVORK5CYII="
+         transform="matrix(1,0,0,1,-36,0)"
+  />
+  <radialGradient id="gradient2" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.1294,-0.2357,-0.2758,-0.3164,567.2067,112.1814)">
+   <stop offset="0" stop-color="#f6a407"/>
+   <stop offset="1" stop-color="#ffe56d"/>
   </radialGradient>
   <path style="fill:url(#gradient2)"
-        d="M113.7 101.53c13.95 13.37 28.42 17.25 42.67 14.8c-2.34 -1.72 -3.45 -3.83 -4.38 -5.56c15.92 9.08 23.88 -2.23 28.79 -5.87c-1.69 -1.37 -3.75 -0.3 -7.15 -4.43c4.35 0.6 7.18 0.38 11.19 0.36c2.52 -2.33 6.32 -4.17 8.66 -6.94c2.89 -3.42 6.55 -8.08 9.55 -11.97c-1.93 -1.18 -2.32 -2.23 -3.05 -3.7c1.77 0.45 3.54 0.67 5.32 0.64c2.38 -4.5 6.14 -7.33 8.67 -8.53c-10.54 -3.66 -24.04 -3.17 -33.82 -1.16c-3.26 2.79 -3.16 6.41 -4.22 12.38c-2.05 -2.67 -2.97 -6.02 -1.76 -10.65c-6.89 2.17 -13.58 5.09 -20.04 8.12c-2.51 1.17 -8.66 5.57 -12.25 6.96c-1.71 2.55 -3.13 4.99 -4.3 7.33c-0.07 -2.16 -0.41 -4.28 -0.24 -6.49c-11.83 1.85 -18.29 5.01 -25.67 11.57c-15.8 0.05 -33.51 -6.73 -33.37 -9.17l-0.33 5.73c0 0 19.72 7.48 35.76 6.58v0z"
+        d="M563.98 88.69c-3 15.73 0.81 27.55 8.95 36.36c0.14 -2.41 1.1 -4.13 1.89 -5.55c0.86 15.17 12.33 15.6 17.07 17.37c0.19 -1.79 -1.48 -2.74 -0.14 -6.97c1.54 3.3 2.97 5.17 4.79 7.94c2.76 0.7 5.75 2.51 8.73 2.89c3.68 0.46 8.57 0.9 12.63 1.24c-0.04 -1.87 0.5 -2.62 1.19 -3.79c0.48 1.44 1.13 2.77 1.95 3.99c4.2 -0.37 7.87 0.96 9.85 2.18c-2.2 -8.98 -8.63 -18.15 -14.44 -24.05c-3.41 -1.01 -5.89 0.69 -10.51 2.64c0.93 -2.63 2.85 -4.78 6.61 -6.03c-4.62 -3.81 -9.67 -7.14 -14.69 -10.28c-1.95 -1.22 -7.79 -3.51 -10.37 -5.38c-2.55 -0.04 -4.89 0.07 -7.04 0.31c1.47 -1.02 2.79 -2.21 4.4 -3.09c-6.63 -7.39 -11.73 -10.46 -19.63 -12.64c-7.16 -10.96 -10.43 -26.35 -8.67 -27.35l-4.14 2.35c0 0 3.68 17.09 11.55 27.84v0z"
   />
  </g>
 </svg>



From laplace at mail.berlios.de  Wed Aug  8 22:48:06 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Wed, 8 Aug 2007 22:48:06 +0200
Subject: [Haiku-commits] r21860 - haiku/trunk/src/kits/interface
Message-ID: <200708082048.l78Km6YE018143@sheep.berlios.de>

Author: laplace
Date: 2007-08-08 22:48:06 +0200 (Wed, 08 Aug 2007)
New Revision: 21860
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21860&view=rev

Modified:
   haiku/trunk/src/kits/interface/InterfaceDefs.cpp
Log:
* Implemented run_add_printer_panel(). Opens Printers preflet and sends to
it the message for opening the 'Add printer dialog'.


Modified: haiku/trunk/src/kits/interface/InterfaceDefs.cpp
===================================================================
--- haiku/trunk/src/kits/interface/InterfaceDefs.cpp	2007-08-08 20:33:36 UTC (rev 21859)
+++ haiku/trunk/src/kits/interface/InterfaceDefs.cpp	2007-08-08 20:48:06 UTC (rev 21860)
@@ -19,6 +19,7 @@
 #include <DefaultColors.h>
 #include <InputServerTypes.h>
 #include <input_globals.h>
+#include <pr_server.h>
 #include <ServerProtocol.h>
 #include <ServerReadOnlyMemory.h>
 #include <WidthBuffer.h>
@@ -649,8 +650,11 @@
 _IMPEXP_BE void
 run_select_printer_panel()
 {
+	if (be_roster == NULL)
+		return;
+		
 	// Launches the Printer prefs app via the Roster
-	be_roster->Launch("application/x-vnd.Be-PRNT");
+	be_roster->Launch(PRNT_SIGNATURE_TYPE);
 }
 
 
@@ -659,7 +663,10 @@
 {
 	// Launches the Printer prefs app via the Roster and asks it to 
 	// add a printer
-	// TODO: Implement
+	run_select_printer_panel();
+
+	BMessenger printerPanelMessenger(PRNT_SIGNATURE_TYPE);
+	printerPanelMessenger.SendMessage(PRINTERS_ADD_PRINTER);	
 }
 
 



From mmu_man at mail.berlios.de  Wed Aug  8 23:44:30 2007
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Wed, 8 Aug 2007 23:44:30 +0200
Subject: [Haiku-commits] r21861 - haiku/trunk/src/system/kernel
Message-ID: <200708082144.l78LiUGs023430@sheep.berlios.de>

Author: mmu_man
Date: 2007-08-08 23:44:30 +0200 (Wed, 08 Aug 2007)
New Revision: 21861
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21861&view=rev

Modified:
   haiku/trunk/src/system/kernel/module.cpp
Log:
Fix building with TRACE


Modified: haiku/trunk/src/system/kernel/module.cpp
===================================================================
--- haiku/trunk/src/system/kernel/module.cpp	2007-08-08 20:48:06 UTC (rev 21860)
+++ haiku/trunk/src/system/kernel/module.cpp	2007-08-08 21:44:30 UTC (rev 21861)
@@ -343,8 +343,7 @@
 {
 	struct module_image *image;
 
-	TRACE(("get_module_image(path = \"%s\", loadIfNeeded = %d)\n", path,
-		loadIfNeeded));
+	TRACE(("get_module_image(path = \"%s\")\n", path));
 
 	RecursiveLocker _(sModulesLock);
 



From axeld at mail.berlios.de  Thu Aug  9 00:38:47 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 9 Aug 2007 00:38:47 +0200
Subject: [Haiku-commits] r21862 - haiku/trunk/src/system/kernel/vm
Message-ID: <200708082238.l78Mcl7x012397@sheep.berlios.de>

Author: axeld
Date: 2007-08-09 00:38:46 +0200 (Thu, 09 Aug 2007)
New Revision: 21862
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21862&view=rev

Modified:
   haiku/trunk/src/system/kernel/vm/vm.cpp
Log:
* get_memory_map() leaked vm_address_space references
* fixes a dead lock in vm_soft_fault() - the locking scheme enforces you to
  lock the address space before a vm_cache, not the other way, around. Since
  we need to lock the cache that has our page in fault_get_page(), we violated
  that scheme by relocking the address space in order to get access to the
  vm_area. Now, we read lock the address space during the whole page fault;
  added a TODO that explains why this might not really be desirable, if
  we can avoid it (the only way would be to reverse that locking scheme
  which would potentially cause the more busy vm_cache locks to be held
  longer).
* vm_copy_area() uses the MultiAddressSpaceLocker, but actually forget to
  call Lock() on it...
* delete_area() leaks vm_address_space references - but fixing this currently
  causes other problems to be investigated; I'll open a bug for that.


Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-08 21:44:30 UTC (rev 21861)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-08 22:38:46 UTC (rev 21862)
@@ -62,10 +62,12 @@
 class AddressSpaceReadLocker {
 public:
 	AddressSpaceReadLocker(team_id team);
+	AddressSpaceReadLocker(vm_address_space* space);
 	AddressSpaceReadLocker();
 	~AddressSpaceReadLocker();
 
 	status_t SetTo(team_id team);
+	void SetTo(vm_address_space* space);
 	status_t SetFromArea(area_id areaID, vm_area*& area);
 
 	bool IsLocked() const { return fLocked; }
@@ -123,6 +125,7 @@
 private:
 	bool _ResizeIfNeeded();
 	vm_address_space*& _CurrentItem() { return fSpaces[fCount]; }
+	bool _HasAddressSpace(vm_address_space* space) const;
 
 	static int _CompareItems(const void* _a, const void* _b);
 
@@ -160,6 +163,16 @@
 }
 
 
+//! Takes over the reference of the address space
+AddressSpaceReadLocker::AddressSpaceReadLocker(vm_address_space* space)
+	:
+	fSpace(NULL),
+	fLocked(false)
+{
+	SetTo(space);
+}
+
+
 AddressSpaceReadLocker::AddressSpaceReadLocker()
 	:
 	fSpace(NULL),
@@ -196,6 +209,16 @@
 }
 
 
+//! Takes over the reference of the address space
+void
+AddressSpaceReadLocker::SetTo(vm_address_space* space)
+{
+	fSpace = space;
+	acquire_sem_etc(fSpace->sem, READ_COUNT, 0, 0);
+	fLocked = true;
+}
+
+
 status_t
 AddressSpaceReadLocker::SetFromArea(area_id areaID, vm_area*& area)
 {
@@ -354,6 +377,7 @@
 	if (fLocked) {
 		release_sem_etc(fSpace->sem, fDegraded ? READ_COUNT : WRITE_COUNT, 0);
 		fLocked = false;
+		fDegraded = false;
 	}
 }
 
@@ -412,6 +436,18 @@
 }
 
 
+bool
+MultiAddressSpaceLocker::_HasAddressSpace(vm_address_space* space) const
+{
+	for (int32 i = 0; i < fCount; i++) {
+		if (fSpaces[i] == space)
+			return true;
+	}
+	
+	return false;
+}
+
+
 status_t
 MultiAddressSpaceLocker::AddTeam(team_id team, vm_address_space** _space)
 {
@@ -423,6 +459,15 @@
 	if (space == NULL)
 		return B_BAD_VALUE;
 
+	// check if we have already added this address space
+	if (_HasAddressSpace(space)) {
+		// no need to add it again
+		vm_put_address_space(space);
+		if (_space != NULL)
+			*_space = space;
+		return B_OK;
+	}
+
 	fCount++;
 
 	if (_space != NULL)
@@ -444,14 +489,12 @@
 		return B_BAD_VALUE;
 
 	// check if we have already added this address space
-	for (int32 i = 0; i < fCount; i++) {
-		if (fSpaces[i] == space) {
-			// no need to add it again
-			vm_put_address_space(space);
-			if (_space != NULL)
-				*_space = space;
-			return B_OK;
-		}
+	if (_HasAddressSpace(space)) {
+		// no need to add it again
+		vm_put_address_space(space);
+		if (_space != NULL)
+			*_space = space;
+		return B_OK;
 	}
 
 	fCount++;
@@ -1683,7 +1726,7 @@
 {
 	vm_area *newArea = NULL;
 	vm_area *sourceArea;
-	
+
 	MultiAddressSpaceLocker locker;
 	vm_address_space *sourceAddressSpace;
 	status_t status = locker.AddArea(sourceID, &sourceAddressSpace);
@@ -1822,6 +1865,10 @@
 
 	arch_vm_unset_memory_type(area);
 	remove_area_from_address_space(addressSpace, area);
+	// TODO: the following line fixes an address space leak - however,
+	// there seems to be something wrong with the order in which teams
+	// are torn down, and the first shell command hangs on a pipe then
+	//vm_put_address_space(addressSpace);
 
 	vm_cache_remove_area(area->cache, area);
 	vm_cache_release_ref(area->cache);
@@ -1948,25 +1995,26 @@
 vm_copy_area(team_id team, const char *name, void **_address,
 	uint32 addressSpec, uint32 protection, area_id sourceID)
 {
+	bool writableCopy = (protection & (B_KERNEL_WRITE_AREA | B_WRITE_AREA)) != 0;
+
+	if ((protection & B_KERNEL_PROTECTION) == 0) {
+		// set the same protection for the kernel as for userland
+		protection |= B_KERNEL_READ_AREA;
+		if (writableCopy)
+			protection |= B_KERNEL_WRITE_AREA;
+	}
+
 	MultiAddressSpaceLocker locker;
-
 	vm_address_space *sourceAddressSpace = NULL;
 	vm_address_space *targetAddressSpace;
 	status_t status = locker.AddTeam(team, &targetAddressSpace);
 	if (status == B_OK)
 		status = locker.AddArea(sourceID, &sourceAddressSpace);
+	if (status == B_OK)
+		status = locker.Lock();
 	if (status != B_OK)
 		return status;
 
-	bool writableCopy = (protection & (B_KERNEL_WRITE_AREA | B_WRITE_AREA)) != 0;
-
-	if ((protection & B_KERNEL_PROTECTION) == 0) {
-		// set the same protection for the kernel as for userland
-		protection |= B_KERNEL_READ_AREA;
-		if (writableCopy)
-			protection |= B_KERNEL_WRITE_AREA;
-	}
-
 	vm_area* source = lookup_area(sourceAddressSpace, sourceID);
 	if (source == NULL)
 		return B_BAD_VALUE;
@@ -3865,16 +3913,14 @@
 		return B_BAD_ADDRESS;
 	}
 
+	AddressSpaceReadLocker locker(addressSpace);
+
 	atomic_add(&addressSpace->fault_count, 1);
 
 	// Get the area the fault was in
 
-	acquire_sem_etc(addressSpace->sem, READ_COUNT, 0, 0);
-
 	vm_area *area = vm_area_lookup(addressSpace, address);
 	if (area == NULL) {
-		release_sem_etc(addressSpace->sem, READ_COUNT, 0);
-		vm_put_address_space(addressSpace);
 		dprintf("vm_soft_fault: va 0x%lx not covered by area in address space\n",
 			originalAddress);
 		return B_BAD_ADDRESS;
@@ -3882,14 +3928,10 @@
 
 	// check permissions
 	if (isUser && (area->protection & B_USER_PROTECTION) == 0) {
-		release_sem_etc(addressSpace->sem, READ_COUNT, 0);
-		vm_put_address_space(addressSpace);
 		dprintf("user access on kernel area 0x%lx at %p\n", area->id, (void *)originalAddress);
 		return B_PERMISSION_DENIED;
 	}
 	if (isWrite && (area->protection & (B_WRITE_AREA | (isUser ? 0 : B_KERNEL_WRITE_AREA))) == 0) {
-		release_sem_etc(addressSpace->sem, READ_COUNT, 0);
-		vm_put_address_space(addressSpace);
 		dprintf("write access attempted on read-only area 0x%lx at %p\n",
 			area->id, (void *)originalAddress);
 		return B_PERMISSION_DENIED;
@@ -3905,8 +3947,6 @@
 	atomic_add(&area->no_cache_change, 1);
 		// make sure the area's cache isn't replaced during the page fault
 
-	release_sem_etc(addressSpace->sem, READ_COUNT, 0);
-
 	// See if this cache has a fault handler - this will do all the work for us
 	{
 		vm_store *store = topCache->store;
@@ -3917,7 +3957,6 @@
 			status_t status = store->ops->fault(store, addressSpace, cacheOffset);
 			if (status != B_BAD_HANDLER) {
 				vm_area_put_locked_cache(topCache);
-				vm_put_address_space(addressSpace);
 				return status;
 			}
 		}
@@ -3943,22 +3982,12 @@
 	vm_cache *copiedPageSource = NULL;
 	vm_cache *pageSource;
 	vm_page *page;
+	// TODO: We keep the address space read lock during the whole operation
+	// which might be rather expensive depending on where the data has to
+	// be retrieved from.
 	status_t status = fault_get_page(map, topCache, cacheOffset, isWrite,
 		dummyPage, &pageSource, &copiedPageSource, &page);
 
-	acquire_sem_etc(addressSpace->sem, READ_COUNT, 0, 0);
-	if (status == B_OK && changeCount != addressSpace->change_count) {
-		// something may have changed, see if the address is still valid
-		area = vm_area_lookup(addressSpace, address);
-		if (area == NULL
-			|| area->cache != topCache
-			|| (address - area->base + area->cache_offset) != cacheOffset
-			|| address > area->base + (area->size - 1)) {
-			dprintf("vm_soft_fault: address space layout changed effecting ongoing soft fault\n");
-			status = B_BAD_ADDRESS;
-		}
-	}
-
 	if (status == B_OK) {
 		// All went fine, all there is left to do is to map the page into the address space
 
@@ -3979,7 +4008,6 @@
 	}
 
 	atomic_add(&area->no_cache_change, -1);
-	release_sem_etc(addressSpace->sem, READ_COUNT, 0);
 
 	mutex_unlock(&pageSource->lock);
 	vm_cache_release_ref(pageSource);
@@ -3993,7 +4021,6 @@
 	}
 
 	vm_cache_release_ref(topCache);
-	vm_put_address_space(addressSpace);
 
 	return status;
 }
@@ -4340,7 +4367,8 @@
  */
 
 long
-get_memory_map(const void *address, ulong numBytes, physical_entry *table, long numEntries)
+get_memory_map(const void *address, ulong numBytes, physical_entry *table,
+	long numEntries)
 {
 	vm_address_space *addressSpace;
 	addr_t virtualAddress = (addr_t)address;
@@ -4351,7 +4379,8 @@
 	addr_t offset = 0;
 	bool interrupts = are_interrupts_enabled();
 
-	TRACE(("get_memory_map(%p, %lu bytes, %ld entries)\n", address, numBytes, numEntries));
+	TRACE(("get_memory_map(%p, %lu bytes, %ld entries)\n", address, numBytes,
+		numEntries));
 
 	if (numEntries == 0 || numBytes == 0)
 		return B_BAD_VALUE;
@@ -4385,6 +4414,7 @@
 			break;
 		if ((flags & PAGE_PRESENT) == 0) {
 			panic("get_memory_map() called on unmapped memory!");
+			vm_put_address_space(addressSpace);
 			return B_BAD_ADDRESS;
 		}
 
@@ -4415,6 +4445,8 @@
 	if (interrupts)
 		map->ops->unlock(map);
 
+	vm_put_address_space(addressSpace);
+
 	// close the entry list
 
 	if (status == B_OK) {



From axeld at mail.berlios.de  Thu Aug  9 00:43:53 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 9 Aug 2007 00:43:53 +0200
Subject: [Haiku-commits] r21863 - in haiku/trunk: headers/os/app src/kits/app
Message-ID: <200708082243.l78Mhrer017625@sheep.berlios.de>

Author: axeld
Date: 2007-08-09 00:43:52 +0200 (Thu, 09 Aug 2007)
New Revision: 21863
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21863&view=rev

Modified:
   haiku/trunk/headers/os/app/Looper.h
   haiku/trunk/src/kits/app/Looper.cpp
Log:
Now uses the cache stack trick for a cheaper check_lock() version as suggested by stippi.


Modified: haiku/trunk/headers/os/app/Looper.h
===================================================================
--- haiku/trunk/headers/os/app/Looper.h	2007-08-08 22:38:46 UTC (rev 21862)
+++ haiku/trunk/headers/os/app/Looper.h	2007-08-08 22:43:52 UTC (rev 21863)
@@ -159,13 +159,14 @@
 			int32			fOwnerCount;
 			thread_id		fOwner;
 			thread_id		fThread;
+			addr_t			fCachedStack;
 			int32			fInitPriority;
 			BHandler*		fPreferred;
 			BList			fHandlers;
 			BList*			fCommonFilters;
 			bool			fTerminating;
 			bool			fRunCalled;
-			uint32			_reserved[12];
+			uint32			_reserved[11];
 };
 
 #endif	// _LOOPER_H

Modified: haiku/trunk/src/kits/app/Looper.cpp
===================================================================
--- haiku/trunk/src/kits/app/Looper.cpp	2007-08-08 22:38:46 UTC (rev 21862)
+++ haiku/trunk/src/kits/app/Looper.cpp	2007-08-08 22:43:52 UTC (rev 21863)
@@ -546,7 +546,6 @@
 		return false;
 	}
 
-	// Got this from Jeremy's BLocker implementation
 	return find_thread(NULL) == fOwner;
 }
 
@@ -907,7 +906,8 @@
 
 
 status_t
-BLooper::_LockComplete(BLooper *looper, int32 oldCount, thread_id thread, sem_id sem, bigtime_t timeout)
+BLooper::_LockComplete(BLooper *looper, int32 oldCount, thread_id thread,
+	sem_id sem, bigtime_t timeout)
 {
 	status_t err = B_OK;
 
@@ -922,6 +922,7 @@
 #endif
 	if (err == B_OK) {
 		looper->fOwner = thread;
+		looper->fCachedStack = (addr_t)&err & ~(B_PAGE_SIZE - 1);
 		looper->fOwnerCount = 1;
 	}
 
@@ -1332,8 +1333,12 @@
 	// This is a cheap variant of AssertLocked()
 	// It is used in situations where it's clear that the looper is valid,
 	// ie. from handlers
-	if (fOwner == -1 || fOwner != find_thread(NULL))
-		debugger("Looper must be locked.");
+	uint32 stack;
+	if (((uint32)&stack & ~(B_PAGE_SIZE - 1)) == fCachedStack
+		|| fOwner == find_thread(NULL))
+		return;
+
+	debugger("Looper must be locked.");
 }
 
 



From axeld at mail.berlios.de  Thu Aug  9 01:11:16 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 9 Aug 2007 01:11:16 +0200
Subject: [Haiku-commits] r21864 - haiku/trunk/src/kits/app
Message-ID: <200708082311.l78NBGgh016765@sheep.berlios.de>

Author: axeld
Date: 2007-08-09 01:11:13 +0200 (Thu, 09 Aug 2007)
New Revision: 21864
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21864&view=rev

Modified:
   haiku/trunk/src/kits/app/Looper.cpp
Log:
fCachedStack needs to be initialized and reset when the looper is unlocked.


Modified: haiku/trunk/src/kits/app/Looper.cpp
===================================================================
--- haiku/trunk/src/kits/app/Looper.cpp	2007-08-08 22:43:52 UTC (rev 21863)
+++ haiku/trunk/src/kits/app/Looper.cpp	2007-08-08 23:11:13 UTC (rev 21864)
@@ -522,6 +522,7 @@
 	if (fOwnerCount == 0) {
 		//	Set fOwner to invalid thread_id (< 0)
 		fOwner = -1;
+		fCachedStack = 0;
 
 #if DEBUG < 1
 		//	Decrement requested lock count (using fAtomicCount for this)
@@ -935,6 +936,7 @@
 BLooper::_InitData(const char *name, int32 priority, int32 portCapacity)
 {
 	fOwner = B_ERROR;
+	fCachedStack = 0;
 	fRunCalled = false;
 	fDirectTarget = new (std::nothrow) BPrivate::BDirectMessageTarget();
 	fCommonFilters = NULL;
@@ -1401,6 +1403,7 @@
 	fOwnerCount = 0;
 	// Nobody owns the lock now
 	fOwner = -1;
+	fCachedStack = 0;
 #if DEBUG < 1
 	// There is now one less thread holding a lock on this looper
 	int32 atomicCount = atomic_add(&fAtomicCount, -1);



From axeld at mail.berlios.de  Thu Aug  9 01:51:21 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 9 Aug 2007 01:51:21 +0200
Subject: [Haiku-commits] r21865 - haiku/trunk/src/system/kernel/vm
Message-ID: <200708082351.l78NpLcw013045@sheep.berlios.de>

Author: axeld
Date: 2007-08-09 01:51:20 +0200 (Thu, 09 Aug 2007)
New Revision: 21865
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21865&view=rev

Modified:
   haiku/trunk/src/system/kernel/vm/vm.cpp
Log:
Since get_memory_map() can run with interrupts turned off, it can't put up
it's reference to the vm_address_space - luckily, it doesn't even need a
reference, since it always runs in the current address space, which cannot
go away for obvious reasons.


Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-08 23:11:13 UTC (rev 21864)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-08 23:51:20 UTC (rev 21865)
@@ -4387,9 +4387,9 @@
 
 	// in which address space is the address to be found?	
 	if (IS_USER_ADDRESS(virtualAddress))
-		addressSpace = vm_get_current_user_address_space();
+		addressSpace = thread_get_current_thread()->team->address_space;
 	else
-		addressSpace = vm_get_kernel_address_space();
+		addressSpace = vm_kernel_address_space();
 
 	if (addressSpace == NULL)
 		return B_ERROR;
@@ -4414,7 +4414,6 @@
 			break;
 		if ((flags & PAGE_PRESENT) == 0) {
 			panic("get_memory_map() called on unmapped memory!");
-			vm_put_address_space(addressSpace);
 			return B_BAD_ADDRESS;
 		}
 
@@ -4445,8 +4444,6 @@
 	if (interrupts)
 		map->ops->unlock(map);
 
-	vm_put_address_space(addressSpace);
-
 	// close the entry list
 
 	if (status == B_OK) {



From stippi at mail.berlios.de  Thu Aug  9 02:25:59 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 9 Aug 2007 02:25:59 +0200
Subject: [Haiku-commits] r21866 - haiku/trunk/src/servers/app
Message-ID: <200708090025.l790PxdA016268@sheep.berlios.de>

Author: stippi
Date: 2007-08-09 02:25:52 +0200 (Thu, 09 Aug 2007)
New Revision: 21866
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21866&view=rev

Modified:
   haiku/trunk/src/servers/app/FontCacheEntry.cpp
   haiku/trunk/src/servers/app/FontCacheEntry.h
Log:
Didn't I have a bad feeling because of code duplication?
* fixed a bug in the font cache, the signature was generated in one way
  (rendering type) while the initialization of the font engine could
  use another way
* should fix non-antialiased straight text
* weird non-transformed text in FontDemo
* generally not using vector glyphs when it was supposed to use them (rotated
  or sheared text, or non-antialiased text)


Modified: haiku/trunk/src/servers/app/FontCacheEntry.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontCacheEntry.cpp	2007-08-08 23:51:20 UTC (rev 21865)
+++ haiku/trunk/src/servers/app/FontCacheEntry.cpp	2007-08-09 00:25:52 UTC (rev 21866)
@@ -116,9 +116,7 @@
 bool
 FontCacheEntry::Init(const ServerFont& font)
 {
-	glyph_rendering renderingType = glyph_ren_native_gray8;
-	if (font.Rotation() != 0.0 || font.Shear() != 90.0)
-		renderingType = glyph_ren_outline;
+	glyph_rendering renderingType = _RenderTypeFor(font);
 
 	// TODO: encoding from font
 	FT_Encoding charMap = FT_ENCODING_NONE;
@@ -211,18 +209,13 @@
 /*static*/ void
 FontCacheEntry::GenerateSignature(char* signature, const ServerFont& font)
 {
-	glyph_rendering renderingType = glyph_ren_native_gray8;
-	if (font.Rotation() != 0.0 || font.Shear() != 90.0
-		|| font.Flags() & B_DISABLE_ANTIALIASING
-		|| font.Size() > 30) {
-		renderingType = glyph_ren_outline;
-	}
+	glyph_rendering renderingType = _RenderTypeFor(font);
 
 	// TODO: read more of these from the font
 	FT_Encoding charMap = FT_ENCODING_NONE;
 	bool hinting = true; // TODO: font.Hinting();
 
-	sprintf(signature, "%ld%u%d%d%.1f%d",
+	sprintf(signature, "%ld,%u,%d,%d,%.1f,%d",
 		font.GetFamilyAndStyle(), charMap,
 		font.Face(), int(renderingType), font.Size(), hinting);
 }
@@ -242,3 +235,15 @@
 	fUseCounter++;
 }
 
+// _RenderTypeFor
+/*static*/ glyph_rendering
+FontCacheEntry::_RenderTypeFor(const ServerFont& font)
+{
+	glyph_rendering renderingType = glyph_ren_native_gray8;
+	if (font.Rotation() != 0.0 || font.Shear() != 90.0
+		|| font.Flags() & B_DISABLE_ANTIALIASING
+		|| font.Size() > 30) {
+		renderingType = glyph_ren_outline;
+	}
+	return renderingType;
+}

Modified: haiku/trunk/src/servers/app/FontCacheEntry.h
===================================================================
--- haiku/trunk/src/servers/app/FontCacheEntry.h	2007-08-08 23:51:20 UTC (rev 21865)
+++ haiku/trunk/src/servers/app/FontCacheEntry.h	2007-08-09 00:25:52 UTC (rev 21866)
@@ -104,6 +104,8 @@
 								FontCacheEntry(const FontCacheEntry&);
 			const FontCacheEntry& operator=(const FontCacheEntry&);
 
+	static	glyph_rendering		_RenderTypeFor(const ServerFont& font);
+
 			class GlyphCachePool;
 
 			GlyphCachePool*		fGlyphCache;



From stippi at mail.berlios.de  Thu Aug  9 02:33:51 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 9 Aug 2007 02:33:51 +0200
Subject: [Haiku-commits] r21867 - haiku/trunk/src/servers/app
Message-ID: <200708090033.l790XpSJ016844@sheep.berlios.de>

Author: stippi
Date: 2007-08-09 02:33:50 +0200 (Thu, 09 Aug 2007)
New Revision: 21867
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21867&view=rev

Modified:
   haiku/trunk/src/servers/app/WindowLayer.cpp
Log:
Fixed an interesting bug in the app_server, after beating my head against
this for a long time... what happens when the app_server has requested a
redraw, but the client sends some drawing commands before starting the
redraw session? This would be the case, for example, when TextViews got
notified of their parent window becomming active (they would invert the
selection outside of any update session). When there was an additional
expose event, the app_server would already have the background cleared, so
the lonely "invert" command would invert the freshly painted background. Then
the normal Draw() of the TextView would be called because of the expose event.
By the time the text was rendered, it was rendered on the inverted background,
then the normal Draw() contained another "invert" command to invert the
region of the selection. Thus inverting just the text, and the background
twice. Solution:
* introduced a special handling for drawing commands arriving between
  requested update session and beginning of that session: the pending
  update region is clipped from the region the client is allowed to draw in.
* fixes funny text rendering in the selected part of text views. For example
  ticket #908.


Modified: haiku/trunk/src/servers/app/WindowLayer.cpp
===================================================================
--- haiku/trunk/src/servers/app/WindowLayer.cpp	2007-08-09 00:25:52 UTC (rev 21866)
+++ haiku/trunk/src/servers/app/WindowLayer.cpp	2007-08-09 00:33:50 UTC (rev 21867)
@@ -563,7 +563,11 @@
 {
 	if (!fEffectiveDrawingRegionValid) {
 		fEffectiveDrawingRegion = VisibleContentRegion();
-		if (fInUpdate) {
+		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());
+		} else if (fInUpdate) {
 			// enforce the dirty region of the update session
 			fEffectiveDrawingRegion.IntersectWith(&fCurrentUpdateSession.DirtyRegion());
 		} else {
@@ -1828,10 +1832,16 @@
 	// this could be done smarter (clip layers from pending
 	// that have not yet been redrawn in the current update
 	// session)
-	if (fCurrentUpdateSession.IsUsed() && fCurrentUpdateSession.IsExpose()) {
-		fCurrentUpdateSession.Exclude(contentDirtyRegion);
-		fEffectiveDrawingRegionValid = false;
-	}
+	// NOTE: appearently the R5 app_server does not do that, it just
+	// keeps drawing until the screen is valid, without caring much
+	// for a consistent display while it does so, it just keeps drawing
+	// until everything settles down. Potentially, this could even give
+	// the impression of faster updates, even though they might look
+	// wrong when looked at closer, but will fix themselves shortly later
+//	if (fCurrentUpdateSession.IsUsed() && fCurrentUpdateSession.IsExpose()) {
+//		fCurrentUpdateSession.Exclude(contentDirtyRegion);
+//		fEffectiveDrawingRegionValid = false;
+//	}
 
 	if (!fUpdateRequested) {
 		// send this to client
@@ -1850,6 +1860,7 @@
 	ServerWindow()->SendMessageToClient(&message);
 
 	fUpdateRequested = true;
+	fEffectiveDrawingRegionValid = false;
 }
 
 void



From stefano.ceccherini at gmail.com  Thu Aug  9 08:17:42 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 9 Aug 2007 08:17:42 +0200
Subject: [Haiku-commits] r21867 - haiku/trunk/src/servers/app
In-Reply-To: <200708090033.l790XpSJ016844@sheep.berlios.de>
References: <200708090033.l790XpSJ016844@sheep.berlios.de>
Message-ID: <894b9700708082317q76c7b0f4m15ef1925c66626a4@mail.gmail.com>

2007/8/9, stippi at BerliOS <stippi at mail.berlios.de>:

> * fixes funny text rendering in the selected part of text views. For example
>   ticket #908.

Cool!


From stefano.ceccherini at gmail.com  Thu Aug  9 08:23:31 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 9 Aug 2007 08:23:31 +0200
Subject: [Haiku-commits] r21855 - haiku/trunk/src/servers/app
In-Reply-To: <200708081836.l78IaNJ0009480@sheep.berlios.de>
References: <200708081836.l78IaNJ0009480@sheep.berlios.de>
Message-ID: <894b9700708082323p1898588awe3bf10c78aa0825b@mail.gmail.com>

2007/8/8, stippi at BerliOS <stippi at mail.berlios.de>:

> * convert shape coordinates to screen at the time of playing the picture
>   (fixes ticket #1367, stefano I thought you knew that I meant this in an
>   earlier mail)

Actually, I had tried to make this very change. But that didn't help.
I tried so many different changes but none seemed to make any
difference. Now I see why: I was calling jam update-vmware-image with
a wrong commandline, so it wasn't really rebuilding the app_server.
*_*


From jackburton at mail.berlios.de  Thu Aug  9 11:38:20 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Thu, 9 Aug 2007 11:38:20 +0200
Subject: [Haiku-commits] r21868 - haiku/trunk/src/kits/interface
Message-ID: <200708090938.l799cKdC026132@sheep.berlios.de>

Author: jackburton
Date: 2007-08-09 11:38:19 +0200 (Thu, 09 Aug 2007)
New Revision: 21868
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21868&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
Scrolling didn't work correctly if the user didn't move the mouse all 
the time. Fixed.


Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2007-08-09 00:33:50 UTC (rev 21867)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2007-08-09 09:38:19 UTC (rev 21868)
@@ -90,23 +90,10 @@
 
 class _BTextTrackState_ {
 public:
-	_BTextTrackState_(BMessenger messenger)
-		:
-		clickOffset(0),
-		shiftDown(false),
-		anchor(0),
-		selStart(0),
-		selEnd(0),
-		fRunner(NULL)
-	{
-		BMessage message(_PING_);
-		fRunner = new (nothrow) BMessageRunner(messenger, &message, 300000);
-	}
+	_BTextTrackState_(BMessenger messenger);
+	~_BTextTrackState_();
 
-	~_BTextTrackState_()
-	{
-		delete fRunner;
-	}
+	void SimulateMouseMovement(BTextView *view);
 
 	int32 clickOffset;
 	bool shiftDown;
@@ -906,8 +893,10 @@
 					delete fClickRunner;
 					fClickRunner = NULL;
 				}
-			} else
+			} else if (fTrackingMouse) {
+				fTrackingMouse->SimulateMouseMovement(this);
 				PerformAutoScrolling();
+			}
 			break;
 		}
 
@@ -4539,3 +4528,39 @@
 	if (atomic_add(&sWidthAtom, -1) > 1)
 		release_sem(sWidthSem);
 }
+
+
+// _BTextTrackState_
+_BTextTrackState_::_BTextTrackState_(BMessenger messenger)
+	:
+	clickOffset(0),
+	shiftDown(false),
+	anchor(0),
+	selStart(0),
+	selEnd(0),
+	fRunner(NULL)
+{
+	BMessage message(_PING_);
+	fRunner = new (nothrow) BMessageRunner(messenger, &message, 300000);
+}
+
+
+_BTextTrackState_::~_BTextTrackState_()
+{
+	delete fRunner;
+}
+
+
+void
+_BTextTrackState_::SimulateMouseMovement(BTextView *textView)
+{
+	BPoint where;
+	ulong buttons;
+	// When the mouse cursor is still and outside the textview,
+	// no B_MOUSE_MOVED message are sent, obviously. But scrolling
+	// has to work neverthless, so we "fake" a MouseMoved() call here.
+	textView->GetMouse(&where, &buttons);
+	textView->PerformMouseMoved(where, B_INSIDE_VIEW);
+}
+
+



From stippi at mail.berlios.de  Thu Aug  9 11:48:28 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Thu, 9 Aug 2007 11:48:28 +0200
Subject: [Haiku-commits] r21869 - in haiku/trunk/src/servers/app: . drawing
	drawing/Painter
Message-ID: <200708090948.l799mSvK027093@sheep.berlios.de>

Author: stippi
Date: 2007-08-09 11:48:28 +0200 (Thu, 09 Aug 2007)
New Revision: 21869
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21869&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerWindow.cpp
   haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
   haiku/trunk/src/servers/app/drawing/DrawingEngine.h
   haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp
   haiku/trunk/src/servers/app/drawing/Painter/Painter.h
Log:
* added a version of SetFont() that takes a DrawState* to DrawingEngine and
  Painter, that is needed to be able to tell if anti-aliasing is to be used,
  since the flags in the font can be overruled by the flags in the view...
* fixes aliased fonts reliably, tested with FontDemo


Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-09 09:38:19 UTC (rev 21868)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-09 09:48:28 UTC (rev 21869)
@@ -1271,9 +1271,8 @@
 		{
 			DTRACE(("ServerWindow %s: Message AS_LAYER_SET_FONT_STATE: ViewLayer name: %s\n", fTitle, fCurrentLayer->Name()));
 			fCurrentLayer->CurrentState()->ReadFontFromLink(link);
-//			_UpdateDrawState(fCurrentLayer);
 			fWindowLayer->GetDrawingEngine()->SetFont(
-				fCurrentLayer->CurrentState()->Font());
+				fCurrentLayer->CurrentState());
 			break;
 		}
 		case AS_LAYER_GET_STATE:

Modified: haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2007-08-09 09:38:19 UTC (rev 21868)
+++ haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2007-08-09 09:48:28 UTC (rev 21869)
@@ -185,28 +185,28 @@
 void
 DrawingEngine::SetDrawState(const DrawState* state, int32 xOffset, int32 yOffset)
 {
-	fPainter->SetDrawState(state, xOffset, yOffset);	
+	fPainter->SetDrawState(state, xOffset, yOffset);
 }
 
 
 void
 DrawingEngine::SetHighColor(const rgb_color& color)
 {
-	fPainter->SetHighColor(color);	
+	fPainter->SetHighColor(color);
 }
 
 
 void
 DrawingEngine::SetLowColor(const rgb_color& color)
 {
-	fPainter->SetLowColor(color);	
+	fPainter->SetLowColor(color);
 }
 
 
 void
 DrawingEngine::SetPenSize(float size)
 {
-	fPainter->SetPenSize(size);	
+	fPainter->SetPenSize(size);
 }
 
 
@@ -214,38 +214,45 @@
 DrawingEngine::SetStrokeMode(cap_mode lineCap, join_mode joinMode,
 								float miterLimit)
 {
-	fPainter->SetStrokeMode(lineCap, joinMode, miterLimit);	
+	fPainter->SetStrokeMode(lineCap, joinMode, miterLimit);
 }
 
 
 void
 DrawingEngine::SetBlendingMode(source_alpha srcAlpha, alpha_function alphaFunc)
 {
-	fPainter->SetBlendingMode(srcAlpha, alphaFunc);	
+	fPainter->SetBlendingMode(srcAlpha, alphaFunc);
 }
 
 
 void
 DrawingEngine::SetPattern(const struct pattern& pattern)
 {
-	fPainter->SetPattern(pattern, false);	
+	fPainter->SetPattern(pattern, false);
 }
 
 
 void
 DrawingEngine::SetDrawingMode(drawing_mode mode)
 {
-	fPainter->SetDrawingMode(mode);	
+	fPainter->SetDrawingMode(mode);
 }
 
 
 void
 DrawingEngine::SetFont(const ServerFont& font)
 {
-	fPainter->SetFont(font);	
+	fPainter->SetFont(font);
 }
 
 
+void
+DrawingEngine::SetFont(const DrawState* state)
+{
+	fPainter->SetFont(state);
+}
+
+
 // #pragma mark -
 
 

Modified: haiku/trunk/src/servers/app/drawing/DrawingEngine.h
===================================================================
--- haiku/trunk/src/servers/app/drawing/DrawingEngine.h	2007-08-09 09:38:19 UTC (rev 21868)
+++ haiku/trunk/src/servers/app/drawing/DrawingEngine.h	2007-08-09 09:48:28 UTC (rev 21869)
@@ -79,6 +79,7 @@
 			void			SetBlendingMode(source_alpha srcAlpha,
 								alpha_function alphaFunc);
 			void			SetFont(const ServerFont& font);
+			void			SetFont(const DrawState* state);
 
 			void			SuspendAutoSync();
 			void			Sync();

Modified: haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp	2007-08-09 09:38:19 UTC (rev 21868)
+++ haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp	2007-08-09 09:48:28 UTC (rev 21869)
@@ -130,9 +130,7 @@
 	// but for now...
 	SetPenSize(data->PenSize());
 
-	SetFont(data->Font());
-	fTextRenderer.SetAntialiasing(!(data->ForceFontAliasing()
-		|| data->Font().Flags() & B_DISABLE_ANTIALIASING));
+	SetFont(data);
 
 	fSubpixelPrecise = data->SubPixelPrecise();
 
@@ -260,8 +258,19 @@
 Painter::SetFont(const ServerFont& font)
 {
 	fTextRenderer.SetFont(font);
+	fTextRenderer.SetAntialiasing(
+		!(font.Flags() & B_DISABLE_ANTIALIASING));
 }
 
+// SetFont
+void
+Painter::SetFont(const DrawState* state)
+{
+	fTextRenderer.SetFont(state->Font());
+	fTextRenderer.SetAntialiasing(!(state->ForceFontAliasing()
+		|| state->Font().Flags() & B_DISABLE_ANTIALIASING));
+}
+
 // #pragma mark - drawing
 
 // StrokeLine

Modified: haiku/trunk/src/servers/app/drawing/Painter/Painter.h
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/Painter.h	2007-08-09 09:38:19 UTC (rev 21868)
+++ haiku/trunk/src/servers/app/drawing/Painter/Painter.h	2007-08-09 09:48:28 UTC (rev 21869)
@@ -85,6 +85,7 @@
 									alpha_function alphaFunc);
 
 			void				SetFont(const ServerFont& font);
+			void				SetFont(const DrawState* state);
 	inline	const ServerFont&	Font() const
 									{ return fTextRenderer.Font(); }
 



From jackburton at mail.berlios.de  Thu Aug  9 12:35:10 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Thu, 9 Aug 2007 12:35:10 +0200
Subject: [Haiku-commits] r21870 - haiku/trunk/src/apps/terminal
Message-ID: <200708091035.l79AZAgm009914@sheep.berlios.de>

Author: jackburton
Date: 2007-08-09 12:35:08 +0200 (Thu, 09 Aug 2007)
New Revision: 21870
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21870&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermWindow.cpp
   haiku/trunk/src/apps/terminal/TermWindow.h
Log:
TermWindow didn't set the colors correctly on Terminals in a new tab. 
Now TermWindow::_SetTermColors() accepts a pointer to a TermView to fix 
that.
Spotted by Andrea Bernardi. Thanks! 


Modified: haiku/trunk/src/apps/terminal/TermWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-09 09:48:28 UTC (rev 21869)
+++ haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-09 10:35:08 UTC (rev 21870)
@@ -441,7 +441,7 @@
 			break;
 		
 		case MSG_COLOR_CHANGED:
-			_SetTermColors();
+			_SetTermColors(_ActiveTermView());
 			_ActiveTermView()->Invalidate();
 			break;
 		
@@ -487,15 +487,15 @@
 
 
 void
-TermWindow::_SetTermColors()
+TermWindow::_SetTermColors(TermView *termView)
 {
-	_ActiveTermView()->SetTextColor(PrefHandler::Default()->getRGB(PREF_TEXT_FORE_COLOR),
+	termView->SetTextColor(PrefHandler::Default()->getRGB(PREF_TEXT_FORE_COLOR),
 				PrefHandler::Default()->getRGB(PREF_TEXT_BACK_COLOR));
 
-	_ActiveTermView()->SetSelectColor(PrefHandler::Default()->getRGB(PREF_SELECT_FORE_COLOR),
+	termView->SetSelectColor(PrefHandler::Default()->getRGB(PREF_SELECT_FORE_COLOR),
 				PrefHandler::Default()->getRGB(PREF_SELECT_BACK_COLOR));
 	
-	_ActiveTermView()->SetCursorColor(PrefHandler::Default()->getRGB(PREF_CURSOR_FORE_COLOR),
+	termView->SetCursorColor(PrefHandler::Default()->getRGB(PREF_CURSOR_FORE_COLOR),
 				PrefHandler::Default()->getRGB(PREF_CURSOR_BACK_COLOR));
 }
 
@@ -600,7 +600,7 @@
 	view->SetEncoding(longname2id(PrefHandler::Default()->getString(PREF_TEXT_ENCODING)));
 	view->SetTermFont(&halfFont, &fullFont);
 	
-	_SetTermColors();
+	_SetTermColors(view);
 	
 	// If it's the first time we're called, setup the window
 	if (fTabView->CountTabs() == 1) {

Modified: haiku/trunk/src/apps/terminal/TermWindow.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.h	2007-08-09 09:48:28 UTC (rev 21869)
+++ haiku/trunk/src/apps/terminal/TermWindow.h	2007-08-09 10:35:08 UTC (rev 21870)
@@ -54,7 +54,7 @@
 
 
 private:
-	void		_SetTermColors();
+	void		_SetTermColors(TermView *termView);
 	void		_InitWindow(const char *command);
 	void		_SetupMenu();
 	status_t	_DoPageSetup();



From bonefish at mail.berlios.de  Thu Aug  9 21:40:22 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 9 Aug 2007 21:40:22 +0200
Subject: [Haiku-commits] r21871 - haiku/trunk/build/jam
Message-ID: <200708091940.l79JeMK2031856@sheep.berlios.de>

Author: bonefish
Date: 2007-08-09 21:40:19 +0200 (Thu, 09 Aug 2007)
New Revision: 21871
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21871&view=rev

Modified:
   haiku/trunk/build/jam/NetBootArchive
Log:
Remove mpu401 driver from the netboot archive.


Modified: haiku/trunk/build/jam/NetBootArchive
===================================================================
--- haiku/trunk/build/jam/NetBootArchive	2007-08-09 10:35:08 UTC (rev 21870)
+++ haiku/trunk/build/jam/NetBootArchive	2007-08-09 19:40:19 UTC (rev 21871)
@@ -38,7 +38,7 @@
 AddFilesToNetBootArchive beos system add-ons kernel file_systems
 	: $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
 AddFilesToNetBootArchive beos system add-ons kernel generic
-	: block_io fast_log ide_adapter locked_pool mpu401 scsi_periph ;
+	: block_io fast_log ide_adapter locked_pool scsi_periph ;
 AddFilesToNetBootArchive beos system add-ons kernel partitioning_systems
 	: intel session ;
 AddFilesToNetBootArchive beos system add-ons kernel interrupt_controllers
@@ -82,7 +82,7 @@
 	$(BEOS_ADD_ONS_BUS_MANAGERS)
 	ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112
 	$(BEOS_ADD_ONS_FILE_SYSTEMS)
-	block_io fast_log ide_adapter locked_pool mpu401 scsi_periph
+	block_io fast_log ide_adapter locked_pool scsi_periph
 	intel session
 	$(PPC_ONLY)openpic
 	$(X86_ONLY)generic_x86



From bonefish at mail.berlios.de  Thu Aug  9 21:42:22 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 9 Aug 2007 21:42:22 +0200
Subject: [Haiku-commits] r21872 - haiku/trunk/build/jam
Message-ID: <200708091942.l79JgMQB032074@sheep.berlios.de>

Author: bonefish
Date: 2007-08-09 21:42:21 +0200 (Thu, 09 Aug 2007)
New Revision: 21872
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21872&view=rev

Modified:
   haiku/trunk/build/jam/HeadersRules
Log:
New rule UsePrivateKernelHeaders. It adds header/private/kernel as well
as all directories that might be needed by private kernel headers (arch,
platform,... headers).


Modified: haiku/trunk/build/jam/HeadersRules
===================================================================
--- haiku/trunk/build/jam/HeadersRules	2007-08-09 19:40:19 UTC (rev 21871)
+++ haiku/trunk/build/jam/HeadersRules	2007-08-09 19:42:21 UTC (rev 21872)
@@ -338,6 +338,11 @@
 	SourceSysHdrs $(1) : [ FDirName $(HAIKU_TOP) headers legacy ] : $(2) ;
 }
 
+rule UsePrivateKernelHeaders
+{
+	UseHeaders $(TARGET_PRIVATE_KERNEL_HEADERS) : true ;
+}
+
 rule FStandardOSHeaders
 {
 	local osIncludes = add-ons add-ons/file_system add-ons/graphics



From bonefish at mail.berlios.de  Thu Aug  9 21:47:22 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 9 Aug 2007 21:47:22 +0200
Subject: [Haiku-commits] r21873 - in haiku/trunk:
	headers/private/kernel/util src/add-ons/kernel/drivers/tty
	src/add-ons/kernel/network/datalink_protocols/arp
	src/add-ons/kernel/network/devices/ethernet
	src/add-ons/kernel/network/protocols/ipv4
	src/add-ons/kernel/network/protocols/tcp
	src/add-ons/kernel/network/protocols/udp
Message-ID: <200708091947.l79JlMUs032423@sheep.berlios.de>

Author: bonefish
Date: 2007-08-09 21:47:22 +0200 (Thu, 09 Aug 2007)
New Revision: 21873
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21873&view=rev

Modified:
   haiku/trunk/headers/private/kernel/util/AutoLock.h
   haiku/trunk/src/add-ons/kernel/drivers/tty/Jamfile
   haiku/trunk/src/add-ons/kernel/network/datalink_protocols/arp/Jamfile
   haiku/trunk/src/add-ons/kernel/network/devices/ethernet/Jamfile
   haiku/trunk/src/add-ons/kernel/network/protocols/ipv4/Jamfile
   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/Jamfile
   haiku/trunk/src/add-ons/kernel/network/protocols/udp/Jamfile
Log:
* Added AutoLocker instantiations IterruptsLocker (disables/restores
  interrupts) and SpinLocker (acquires/releases spinlocks).
* Adjusted Jamfiles of components that used <util/AutoLock.h> but didn't
  add all header directories required now (<int.h> was added).



Modified: haiku/trunk/headers/private/kernel/util/AutoLock.h
===================================================================
--- haiku/trunk/headers/private/kernel/util/AutoLock.h	2007-08-09 19:42:21 UTC (rev 21872)
+++ haiku/trunk/headers/private/kernel/util/AutoLock.h	2007-08-09 19:47:22 UTC (rev 21873)
@@ -6,10 +6,14 @@
 #define KERNEL_UTIL_AUTO_LOCKER_H
 
 
-#include <lock.h>
+#include <KernelExport.h>
+
 #include <shared/AutoLocker.h>
 
+#include <int.h>
+#include <lock.h>
 
+
 namespace BPrivate {
 
 // MutexLocking
@@ -63,11 +67,60 @@
 // BenaphoreLocker
 typedef AutoLocker<benaphore, BenaphoreLocking> BenaphoreLocker;
 
+// InterruptsLocking
+class InterruptsLocking {
+public:
+	inline bool Lock(int* lockable)
+	{
+		*lockable = disable_interrupts();
+		return true;
+	}
+
+	inline void Unlock(int* lockable)
+	{
+		restore_interrupts(*lockable);
+	}
+};
+
+// InterruptsLocker
+class InterruptsLocker : AutoLocker<int, InterruptsLocking> {
+public:
+	inline InterruptsLocker(bool alreadyLocked = false,
+		bool lockIfNotLocked = true)
+		: AutoLocker<int, InterruptsLocking>(&fState, alreadyLocked,
+			lockIfNotLocked)
+	{
+	}
+
+private:
+	int	fState;
+};
+
+// SpinLocking
+class SpinLocking {
+public:
+	inline bool Lock(spinlock* lockable)
+	{
+		acquire_spinlock(lockable);
+		return true;
+	}
+
+	inline void Unlock(spinlock* lockable)
+	{
+		release_spinlock(lockable);
+	}
+};
+
+// SpinLocker
+typedef AutoLocker<spinlock, SpinLocking> SpinLocker;
+
 }	// namespace BPrivate
 
 using BPrivate::AutoLocker;
 using BPrivate::MutexLocker;
 using BPrivate::RecursiveLocker;
 using BPrivate::BenaphoreLocker;
+using BPrivate::InterruptsLocker;
+using BPrivate::SpinLocker;
 
 #endif	// KERNEL_UTIL_AUTO_LOCKER_H

Modified: haiku/trunk/src/add-ons/kernel/drivers/tty/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/tty/Jamfile	2007-08-09 19:42:21 UTC (rev 21872)
+++ haiku/trunk/src/add-ons/kernel/drivers/tty/Jamfile	2007-08-09 19:47:22 UTC (rev 21873)
@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers tty ;
 
-UsePrivateHeaders kernel ;
+UsePrivateKernelHeaders ;
 
 KernelAddon <driver>tty :
 	driver.cpp

Modified: haiku/trunk/src/add-ons/kernel/network/datalink_protocols/arp/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/datalink_protocols/arp/Jamfile	2007-08-09 19:42:21 UTC (rev 21872)
+++ haiku/trunk/src/add-ons/kernel/network/datalink_protocols/arp/Jamfile	2007-08-09 19:47:22 UTC (rev 21873)
@@ -10,7 +10,8 @@
 		# Unfortunately we get more than we want, namely all POSIX headers.
 }
 
-UsePrivateHeaders kernel net ;
+UsePrivateKernelHeaders ;
+UsePrivateHeaders net ;
 
 KernelAddon <module>arp :
 	arp.cpp

Modified: haiku/trunk/src/add-ons/kernel/network/devices/ethernet/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/devices/ethernet/Jamfile	2007-08-09 19:42:21 UTC (rev 21872)
+++ haiku/trunk/src/add-ons/kernel/network/devices/ethernet/Jamfile	2007-08-09 19:47:22 UTC (rev 21873)
@@ -10,7 +10,8 @@
 		# Unfortunately we get more than we want, namely all POSIX headers.
 }
 
-UsePrivateHeaders kernel net ;
+UsePrivateKernelHeaders ;
+UsePrivateHeaders net ;
 
 KernelAddon ethernet :
 	ethernet.cpp

Modified: haiku/trunk/src/add-ons/kernel/network/protocols/ipv4/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/ipv4/Jamfile	2007-08-09 19:42:21 UTC (rev 21872)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/ipv4/Jamfile	2007-08-09 19:47:22 UTC (rev 21873)
@@ -10,7 +10,8 @@
 		# Unfortunately we get more than we want, namely all POSIX headers.
 }
 
-UsePrivateHeaders kernel net ;
+UsePrivateKernelHeaders ;
+UsePrivateHeaders net ;
 
 KernelAddon ipv4 :
 	ipv4.cpp

Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/Jamfile	2007-08-09 19:42:21 UTC (rev 21872)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/Jamfile	2007-08-09 19:47:22 UTC (rev 21873)
@@ -10,7 +10,8 @@
 		# Unfortunately we get more than we want, namely all POSIX headers.
 }
 
-UsePrivateHeaders kernel net ;
+UsePrivateKernelHeaders ;
+UsePrivateHeaders net ;
 
 KernelAddon tcp :
 	tcp.cpp

Modified: haiku/trunk/src/add-ons/kernel/network/protocols/udp/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/udp/Jamfile	2007-08-09 19:42:21 UTC (rev 21872)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/udp/Jamfile	2007-08-09 19:47:22 UTC (rev 21873)
@@ -10,7 +10,8 @@
 		# Unfortunately we get more than we want, namely all POSIX headers.
 }
 
-UsePrivateHeaders kernel net ;
+UsePrivateKernelHeaders ;
+UsePrivateHeaders net ;
 
 KernelAddon udp :
 	udp.cpp



From korli at users.berlios.de  Thu Aug  9 21:52:11 2007
From: korli at users.berlios.de (=?ISO-8859-1?Q?J=E9r=F4me_Duval?=)
Date: Thu, 9 Aug 2007 21:52:11 +0200
Subject: [Haiku-commits] r21871 - haiku/trunk/build/jam
In-Reply-To: <200708091940.l79JeMK2031856@sheep.berlios.de>
References: <200708091940.l79JeMK2031856@sheep.berlios.de>
Message-ID: <c47b1d430708091252s1e14e8dbkd388cf2e37617d91@mail.gmail.com>

2007/8/9, bonefish at BerliOS <bonefish at mail.berlios.de>:
>
> Remove mpu401 driver from the netboot archive.


the emuxki driver will fail to load without this module. not that important
for a net boot :)

Bye,
J?r?me
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20070809/d468bca0/attachment.html>

From bonefish at mail.berlios.de  Thu Aug  9 22:03:17 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 9 Aug 2007 22:03:17 +0200
Subject: [Haiku-commits] r21874 - in haiku/trunk: headers/private/kernel
	src/system/kernel
Message-ID: <200708092003.l79K3Hpq000721@sheep.berlios.de>

Author: bonefish
Date: 2007-08-09 22:03:17 +0200 (Thu, 09 Aug 2007)
New Revision: 21874
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21874&view=rev

Added:
   haiku/trunk/headers/private/kernel/condition_variable.h
   haiku/trunk/src/system/kernel/condition_variable.cpp
Modified:
   haiku/trunk/src/system/kernel/Jamfile
Log:
Added simple condition variables to the kernel. They are a relatively
cheap means to block threads until notified explicitely.
threads 


Added: haiku/trunk/headers/private/kernel/condition_variable.h
===================================================================
--- haiku/trunk/headers/private/kernel/condition_variable.h	2007-08-09 19:47:22 UTC (rev 21873)
+++ haiku/trunk/headers/private/kernel/condition_variable.h	2007-08-09 20:03:17 UTC (rev 21874)
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2007, Ingo Weinhold, bonefish at cs.tu-berlin.de.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _KERNEL_CONDITION_VARIABLE_H
+#define _KERNEL_CONDITION_VARIABLE_H
+
+
+#include <OS.h>
+
+#ifdef __cplusplus
+
+#include <util/OpenHashTable.h>
+
+
+class PrivateConditionVariable;
+
+class PrivateConditionVariableEntry {
+protected:
+			bool				Add(const void* object);
+			void				Wait();
+			void				Wait(const void* object);
+
+protected:
+			PrivateConditionVariableEntry* fNext;
+			PrivateConditionVariable* fVariable;
+			struct thread*		fThread;
+
+			friend class PrivateConditionVariable;
+};
+
+
+struct PrivateConditionVariable
+	: protected HashTableLink<PrivateConditionVariable> {
+public:
+	static	void				ListAll();
+			void				Dump();
+
+protected:
+			void				Publish(const void* object,
+									const char* objectType);
+			void				Unpublish();
+			void				Notify();
+
+private:
+			void				_Notify();
+
+protected:
+			const void*			fObject;
+			const char*			fObjectType;
+			PrivateConditionVariableEntry* fEntries;
+
+			friend class PrivateConditionVariableEntry;
+			friend class ConditionVariableHashDefinition;
+};
+
+
+template<typename Type>
+class ConditionVariable : private PrivateConditionVariable {
+public:
+	inline	void				Publish(const Type* object,
+									const char* objectType);
+
+	inline	void				Unpublish();
+	inline	void				Notify();
+};
+
+
+template<typename Type>
+class ConditionVariableEntry : private PrivateConditionVariableEntry {
+public:
+	inline	bool				Add(const Type* object);
+	inline	void				Wait();
+	inline	void				Wait(const Type* object);
+
+private:
+			bool				fAdded;
+};
+
+
+template<typename Type>
+inline void
+ConditionVariable<Type>::Publish(const Type* object, const char* objectType)
+{
+	PrivateConditionVariable::Publish(object, objectType);
+}
+
+
+template<typename Type>
+inline void
+ConditionVariable<Type>::Unpublish()
+{
+	PrivateConditionVariable::Unpublish();
+}
+
+
+template<typename Type>
+inline void
+ConditionVariable<Type>::Notify()
+{
+	PrivateConditionVariable::Notify();
+}
+
+
+template<typename Type>
+inline bool
+ConditionVariableEntry<Type>::Add(const Type* object)
+{
+	return PrivateConditionVariableEntry::Add(object);
+}
+
+
+template<typename Type>
+inline void
+ConditionVariableEntry<Type>::Wait()
+{
+	PrivateConditionVariableEntry::Wait();
+}
+
+
+template<typename Type>
+inline void
+ConditionVariableEntry<Type>::Wait(const Type* object)
+{
+	PrivateConditionVariableEntry::Wait(object);
+}
+
+
+#if 0
+extern void publish_stack_condition_variable(condition_variable* variable,
+	const void* object, const char* objectType);
+extern void unpublish_condition_variable(const void* object);
+extern void notify_condition_variable(const void* object);
+
+extern void wait_for_condition_variable(const void* object);
+extern bool add_condition_variable_entry(const void* object,
+	condition_variable_entry* entry);
+extern void wait_for_condition_variable_entry(
+	condition_variable_entry* entry);
+#endif	// 0
+
+extern "C" {
+#endif	// __cplusplus
+
+extern void condition_variable_init();
+
+#ifdef __cplusplus
+}	// extern "C"
+#endif
+
+#endif	/* _KERNEL_CONDITION_VARIABLE_H */

Modified: haiku/trunk/src/system/kernel/Jamfile
===================================================================
--- haiku/trunk/src/system/kernel/Jamfile	2007-08-09 19:47:22 UTC (rev 21873)
+++ haiku/trunk/src/system/kernel/Jamfile	2007-08-09 20:03:17 UTC (rev 21874)
@@ -16,6 +16,7 @@
 
 KernelMergeObject kernel_core.o :
 	boot_item.cpp
+	condition_variable.cpp
 	cpu.c
 	elf.cpp
 	heap.c

Added: haiku/trunk/src/system/kernel/condition_variable.cpp
===================================================================
--- haiku/trunk/src/system/kernel/condition_variable.cpp	2007-08-09 19:47:22 UTC (rev 21873)
+++ haiku/trunk/src/system/kernel/condition_variable.cpp	2007-08-09 20:03:17 UTC (rev 21874)
@@ -0,0 +1,427 @@
+/*
+ * Copyright 2007, Ingo Weinhold, bonefish at cs.tu-berlin.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include <condition_variable.h>
+
+#include <new>
+#include <stdlib.h>
+#include <string.h>
+
+#include <debug.h>
+#include <kscheduler.h>
+#include <int.h>
+#include <thread.h>
+#include <util/AutoLock.h>
+
+
+static const int kConditionVariableHashSize = 64;
+
+
+struct ConditionVariableHashDefinition {
+	typedef const void* KeyType;
+	typedef	PrivateConditionVariable ValueType;
+
+	size_t HashKey(const void* key) const
+		{ return (size_t)key; }
+	size_t Hash(PrivateConditionVariable* variable) const
+		{ return (size_t)variable->fObject; }
+	bool Compare(const void* key, PrivateConditionVariable* variable) const
+		{ return key == variable->fObject; }
+	HashTableLink<PrivateConditionVariable>* GetLink(
+			PrivateConditionVariable* variable) const
+		{ return variable; }
+};
+
+typedef OpenHashTable<ConditionVariableHashDefinition> ConditionVariableHash;
+static ConditionVariableHash sConditionVariableHash;
+static spinlock sConditionVariablesLock;
+
+
+static int
+list_condition_variables(int argc, char** argv)
+{
+	PrivateConditionVariable::ListAll();
+	return 0;
+}
+
+
+static int
+dump_condition_variable(int argc, char** argv)
+{
+	if (argc < 2 || strlen(argv[1]) < 2
+		|| argv[1][0] != '0'
+		|| argv[1][1] != 'x') {
+		kprintf("%s: invalid argument, pass address\n", argv[0]);
+		return 0;
+	}
+
+	addr_t address = strtoul(argv[1], NULL, 0);
+	if (address == NULL)
+		return 0;
+
+	PrivateConditionVariable* variable = sConditionVariableHash.Lookup(
+		(void*)address);
+
+	if (variable == NULL) {
+		// It might be a direct pointer to a condition variable. Search the
+		// hash.
+		ConditionVariableHash::Iterator it(&sConditionVariableHash);
+		while (PrivateConditionVariable* hashVariable = it.Next()) {
+			if (hashVariable == (void*)address) {
+				variable = hashVariable;
+				break;
+			}
+		}
+	}
+
+	if (variable != NULL)
+		variable->Dump();
+	else
+		kprintf("no condition variable at or with key %p\n", (void*)address);
+
+	return 0;
+}
+
+
+// #pragma mark - PrivateConditionVariableEntry
+
+
+bool
+PrivateConditionVariableEntry::Add(const void* object)
+{
+	ASSERT(object != NULL);
+
+	fThread = thread_get_current_thread();
+
+	InterruptsLocker _;
+	SpinLocker locker(sConditionVariablesLock);
+
+	fVariable = sConditionVariableHash.Lookup(object);
+	if (fVariable) {
+		fNext = fVariable->fEntries;
+		fVariable->fEntries = this;
+	}
+
+	return (fVariable != NULL);
+}
+
+
+void
+PrivateConditionVariableEntry::Wait()
+{
+	if (!are_interrupts_enabled()) {
+		panic("wait_for_condition_variable_entry() called with interrupts "
+			"disabled");
+		return;
+	}
+
+	InterruptsLocker _;
+	SpinLocker locker(sConditionVariablesLock);
+
+	if (fVariable != NULL) {
+		struct thread* thread = thread_get_current_thread();
+		thread->next_state = B_THREAD_WAITING;
+		thread->condition_variable = fVariable;
+		thread->sem.blocking = -1;
+
+		GRAB_THREAD_LOCK();
+		locker.Unlock();
+		scheduler_reschedule();
+		RELEASE_THREAD_LOCK();
+	}
+}
+
+
+void
+PrivateConditionVariableEntry::Wait(const void* object)
+{
+	if (Add(object))
+		Wait(object);
+}
+
+
+// #pragma mark - PrivateConditionVariable
+
+
+/*static*/ void
+PrivateConditionVariable::ListAll()
+{
+	kprintf("  variable      object (type)                waiting threads\n");
+	kprintf("------------------------------------------------------------\n");
+	ConditionVariableHash::Iterator it(&sConditionVariableHash);
+	while (PrivateConditionVariable* variable = it.Next()) {
+		// count waiting threads
+		int count = 0;
+		PrivateConditionVariableEntry* entry = variable->fEntries;
+		while (entry) {
+			count++;
+			entry = entry->fNext;
+		}
+
+		kprintf("%p  %p  %-20s %15d\n", variable, variable->fObject,
+			variable->fObjectType, count);
+	}
+}
+
+
+void
+PrivateConditionVariable::Dump()
+{
+	kprintf("condition variable %p\n", this);
+	kprintf("  object:  %p (%s)\n", fObject, fObjectType);
+	kprintf("  threads:");
+	PrivateConditionVariableEntry* entry = fEntries;
+	while (entry) {
+		kprintf(" %ld", entry->fThread->id);
+		entry = entry->fNext;
+	}
+	kprintf("\n");
+}
+
+
+void
+PrivateConditionVariable::Publish(const void* object, const char* objectType)
+{
+	ASSERT(object != NULL);
+
+	fObject = object;
+	fObjectType = objectType;
+	fEntries = NULL;
+
+	InterruptsLocker _;
+	SpinLocker locker(sConditionVariablesLock);
+
+	ASSERT_PRINT(sConditionVariableHash.Lookup(object) == NULL,
+		"condition variable: %p\n", sConditionVariableHash.Lookup(object));
+
+	sConditionVariableHash.InsertUnchecked(this);
+}
+
+
+void
+PrivateConditionVariable::Unpublish()
+{
+	ASSERT(fObject != NULL);
+
+	InterruptsLocker _;
+	SpinLocker locker(sConditionVariablesLock);
+
+#if KDEBUG
+	PrivateConditionVariable* variable = sConditionVariableHash.Lookup(fObject);
+	if (variable != this) {
+		panic("Condition variable %p not published, found: %p", this, variable);
+		return;
+	}
+#endif
+
+	sConditionVariableHash.RemoveUnchecked(this);
+	fObject = NULL;
+	fObjectType = NULL;
+
+	if (fEntries)
+		_Notify();
+}
+
+
+void
+PrivateConditionVariable::Notify()
+{
+	ASSERT(fObject != NULL);
+
+	InterruptsLocker _;
+	SpinLocker locker(sConditionVariablesLock);
+
+#if KDEBUG
+	PrivateConditionVariable* variable = sConditionVariableHash.Lookup(fObject);
+	if (variable != this) {
+		panic("Condition variable %p not published, found: %p", this, variable);
+		return;
+	}
+#endif
+
+	if (fEntries)
+		_Notify();
+}
+
+
+//! Called with interrupts disabled and the condition variable spinlock held.
+void
+PrivateConditionVariable::_Notify()
+{
+	// dequeue and wake up the blocked threads
+	GRAB_THREAD_LOCK();
+
+	while (PrivateConditionVariableEntry* entry = fEntries) {
+		fEntries = entry->fNext;
+
+		entry->fNext = NULL;
+		entry->fVariable = NULL;
+
+		entry->fThread->condition_variable = NULL;
+		if (entry->fThread->state == B_THREAD_WAITING) {
+			entry->fThread->state = B_THREAD_READY;
+			scheduler_enqueue_in_run_queue(entry->fThread);
+		}
+	}
+
+	RELEASE_THREAD_LOCK();
+}
+
+
+#if 0
+
+void
+publish_stack_condition_variable(condition_variable* variable,
+	const void* object, const char* objectType)
+{
+	ASSERT(variable != NULL);
+	ASSERT(object != NULL);
+
+	variable->object = object;
+	variable->object_type = objectType;
+	variable->entries = NULL;
+
+	InterruptsLocker _;
+	SpinLocker locker(sConditionVariablesLock);
+
+	ASSERT_PRINT(sConditionVariableHash.Lookup(object) == NULL,
+		"condition variable: %p\n", sConditionVariableHash.Lookup(object));
+
+	sConditionVariableHash.InsertUnchecked(variable);
+}
+
+
+void
+unpublish_condition_variable(const void* object)
+{
+	ASSERT(object != NULL);
+
+	InterruptsLocker _;
+	SpinLocker locker(sConditionVariablesLock);
+
+	condition_variable* variable = sConditionVariableHash.Lookup(object);
+	condition_variable_entry* entries = NULL;
+	if (variable) {
+		sConditionVariableHash.RemoveUnchecked(variable);
+		entries = variable->entries;
+		variable->object = NULL;
+		variable->object_type = NULL;
+		variable->entries = NULL;
+	} else {
+		panic("No condition variable for %p\n", object);
+	}
+
+	if (entries)
+		notify_condition_variable_entries(entries);
+}
+
+
+void
+notify_condition_variable(const void* object)
+{
+	ASSERT(object != NULL);
+
+	InterruptsLocker _;
+	SpinLocker locker(sConditionVariablesLock);
+
+	condition_variable* variable = sConditionVariableHash.Lookup(object);
+	condition_variable_entry* entries = NULL;
+	if (variable) {
+		entries = variable->entries;
+		variable->entries = NULL;
+	} else {
+		panic("No condition variable for %p\n", object);
+	}
+
+	locker.Unlock();
+
+	if (entries)
+		notify_condition_variable_entries(entries);
+}
+
+
+void
+wait_for_condition_variable(const void* object)
+{
+	condition_variable_entry entry;
+	if (add_condition_variable_entry(object, &entry))
+		wait_for_condition_variable_entry(&entry);
+}
+
+
+bool
+add_condition_variable_entry(const void* object,
+	condition_variable_entry* entry)
+{
+	ASSERT(object != NULL);
+	ASSERT(entry != NULL);
+
+	entry->thread = thread_get_current_thread();
+
+	InterruptsLocker _;
+	SpinLocker locker(sConditionVariablesLock);
+
+	condition_variable* variable = sConditionVariableHash.Lookup(object);
+	if (variable) {
+		entry->variable = variable;
+		entry->next = variable->entries;
+		variable->entries = entry;
+	} else
+		entry->variable = NULL;
+
+	return (variable != NULL);
+}
+
+
+void
+wait_for_condition_variable_entry(condition_variable_entry* entry)
+{
+	ASSERT(entry != NULL);
+
+	if (!are_interrupts_enabled()) {
+		panic("wait_for_condition_variable_entry() called with interrupts "
+			"disabled");
+		return;
+	}
+
+	InterruptsLocker _;
+	SpinLocker locker(sConditionVariablesLock);
+
+	condition_variable* variable = entry->variable;
+	if (variable != NULL) {
+		struct thread* thread = thread_get_current_thread();
+		thread->next_state = B_THREAD_WAITING;
+		thread->condition_variable = variable;
+		thread->sem.blocking = -1;
+	}
+
+	if (variable != NULL) {
+		GRAB_THREAD_LOCK();
+		locker.Unlock();
+		scheduler_reschedule();
+		RELEASE_THREAD_LOCK();
+	}
+}
+#endif
+
+
+void
+condition_variable_init()
+{
+	new(&sConditionVariableHash) ConditionVariableHash(
+		kConditionVariableHashSize);
+
+	status_t error = sConditionVariableHash.InitCheck();
+	if (error != B_OK) {
+		panic("condition_variable_init(): Failed to init hash table: %s",
+			strerror(error));
+	}
+
+	add_debugger_command("condition_variable", &dump_condition_variable,
+		"Dump condition_variable");
+	add_debugger_command("condition_variables", &list_condition_variables,
+		"List condition variables");
+}
+



From bonefish at mail.berlios.de  Thu Aug  9 22:08:26 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 9 Aug 2007 22:08:26 +0200
Subject: [Haiku-commits] r21875 - in haiku/trunk: headers/private/kernel
	src/system/kernel src/system/kernel/cache src/system/kernel/vm
Message-ID: <200708092008.l79K8QeJ000943@sheep.berlios.de>

Author: bonefish
Date: 2007-08-09 22:08:25 +0200 (Thu, 09 Aug 2007)
New Revision: 21875
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21875&view=rev

Added:
   haiku/trunk/src/system/kernel/vm/vm_page.cpp
Removed:
   haiku/trunk/src/system/kernel/vm/vm_page.c
Modified:
   haiku/trunk/headers/private/kernel/thread_types.h
   haiku/trunk/headers/private/kernel/vm_types.h
   haiku/trunk/src/system/kernel/cache/file_cache.cpp
   haiku/trunk/src/system/kernel/main.c
   haiku/trunk/src/system/kernel/thread.c
   haiku/trunk/src/system/kernel/vm/Jamfile
   haiku/trunk/src/system/kernel/vm/vm.cpp
   haiku/trunk/src/system/kernel/vm/vm_cache.cpp
Log:
* Use condition variables when waiting for busy pages or busy caches.
* Removed a few instances where the page state was set busy directly after 
  allocating it. This is a no-op, since a page is always busy after 
  allocation.


Modified: haiku/trunk/headers/private/kernel/thread_types.h
===================================================================
--- haiku/trunk/headers/private/kernel/thread_types.h	2007-08-09 20:03:17 UTC (rev 21874)
+++ haiku/trunk/headers/private/kernel/thread_types.h	2007-08-09 20:08:25 UTC (rev 21875)
@@ -152,6 +152,8 @@
 		int32		flags;
 	} sem;
 
+	struct PrivateConditionVariable *condition_variable;
+
 	struct {
 		sem_id		write_sem;
 		sem_id		read_sem;

Modified: haiku/trunk/headers/private/kernel/vm_types.h
===================================================================
--- haiku/trunk/headers/private/kernel/vm_types.h	2007-08-09 20:03:17 UTC (rev 21874)
+++ haiku/trunk/headers/private/kernel/vm_types.h	2007-08-09 20:08:25 UTC (rev 21875)
@@ -133,6 +133,16 @@
 	CACHE_TYPE_NULL
 };
 
+#ifdef __cplusplus
+
+#include <condition_variable.h>
+
+struct vm_dummy_page : vm_page {
+	ConditionVariable<vm_page>	busy_condition;
+};
+
+#endif	// __cplusplus
+
 // vm_cache
 typedef struct vm_cache {
 	mutex				lock;

Modified: haiku/trunk/src/system/kernel/cache/file_cache.cpp
===================================================================
--- haiku/trunk/src/system/kernel/cache/file_cache.cpp	2007-08-09 20:03:17 UTC (rev 21874)
+++ haiku/trunk/src/system/kernel/cache/file_cache.cpp	2007-08-09 20:08:25 UTC (rev 21875)
@@ -9,13 +9,14 @@
 #include <KernelExport.h>
 #include <fs_cache.h>
 
+#include <condition_variable.h>
+#include <file_cache.h>
+#include <generic_syscall.h>
 #include <util/kernel_cpp.h>
-#include <file_cache.h>
 #include <vfs.h>
 #include <vm.h>
 #include <vm_page.h>
 #include <vm_cache.h>
-#include <generic_syscall.h>
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -30,7 +31,7 @@
 #endif
 
 // maximum number of iovecs per request
-#define MAX_IO_VECS			64	// 256 kB
+#define MAX_IO_VECS			32	// 128 kB
 #define MAX_FILE_IO_VECS	32
 #define MAX_TEMP_IO_VECS	8
 
@@ -522,10 +523,13 @@
 
 	vm_cache *cache = ref->cache;
 
+	// TODO: We're using way too much stack! Rather allocate a sufficiently
+	// large chunk on the heap.
 	iovec vecs[MAX_IO_VECS];
 	int32 vecCount = 0;
 
 	vm_page *pages[MAX_IO_VECS];
+	ConditionVariable<vm_page> busyConditions[MAX_IO_VECS];
 	int32 pageIndex = 0;
 
 	// allocate pages for the cache and mark them busy
@@ -534,7 +538,7 @@
 		if (page == NULL)
 			panic("no more pages!");
 
-		page->state = PAGE_STATE_BUSY;
+		busyConditions[pageIndex - 1].Publish(page, "page");
 
 		vm_cache_insert_page(cache, page, offset + pos);
 
@@ -569,6 +573,7 @@
 		mutex_lock(&cache->lock);
 
 		for (int32 i = 0; i < pageIndex; i++) {
+			busyConditions[i].Unpublish();
 			vm_cache_remove_page(cache, pages[i]);
 			vm_page_set_state(pages[i], PAGE_STATE_FREE);
 		}
@@ -599,8 +604,10 @@
 	mutex_lock(&cache->lock);
 
 	// make the pages accessible in the cache
-	for (int32 i = pageIndex; i-- > 0;)
+	for (int32 i = pageIndex; i-- > 0;) {
 		pages[i]->state = PAGE_STATE_ACTIVE;
+		busyConditions[i].Unpublish();
+	}
 
 	return B_OK;
 }
@@ -664,11 +671,14 @@
 write_chunk_to_cache(file_cache_ref *ref, off_t offset, size_t numBytes,
 	int32 pageOffset, addr_t buffer, size_t bufferSize)
 {
+	// TODO: We're using way too much stack! Rather allocate a sufficiently
+	// large chunk on the heap.
 	iovec vecs[MAX_IO_VECS];
 	int32 vecCount = 0;
 	vm_page *pages[MAX_IO_VECS];
 	int32 pageIndex = 0;
 	status_t status = B_OK;
+	ConditionVariable<vm_page> busyConditions[MAX_IO_VECS];
 
 	// ToDo: this should be settable somewhere
 	bool writeThrough = false;
@@ -679,7 +689,7 @@
 		//	big - shouldn't we better steal the pages directly in that case?
 		//	(a working set like approach for the file cache)
 		vm_page *page = pages[pageIndex++] = vm_page_allocate_page(PAGE_STATE_FREE);
-		page->state = PAGE_STATE_BUSY;
+		busyConditions[pageIndex - 1].Publish(page, "page");
 
 		vm_cache_insert_page(ref->cache, page, offset + pos);
 
@@ -769,6 +779,8 @@
 
 	// make the pages accessible in the cache
 	for (int32 i = pageIndex; i-- > 0;) {
+		busyConditions[i].Unpublish();
+
 		if (writeThrough)
 			pages[i]->state = PAGE_STATE_ACTIVE;
 		else
@@ -914,9 +926,10 @@
 						return B_NO_MEMORY;
 					}
 				} else {
+					ConditionVariableEntry<vm_page> entry;
+					entry.Add(page);
 					mutex_unlock(&cache->lock);
-					// ToDo: don't wait forever!
-					snooze(20000);
+					entry.Wait();
 					mutex_lock(&cache->lock);
 					goto restart;
 				}
@@ -974,9 +987,10 @@
 						// we let the other party add our page
 						currentPage->queue_next = page;
 					} else {
+						ConditionVariableEntry<vm_page> entry;
+						entry.Add(page);
 						mutex_unlock(&cache->lock);
-						// ToDo: don't wait forever!
-						snooze(20000);
+						entry.Wait();
 						mutex_lock(&cache->lock);
 						goto restart_dummy_lookup;
 					}
@@ -1113,9 +1127,11 @@
 		vm_page *page = vm_cache_lookup_page(cache, offset);
 		if (page != NULL) {
 			if (page->state == PAGE_STATE_BUSY) {
-				// if busy retry again a little later
+				// if busy retry again later
+				ConditionVariableEntry<vm_page> entry;
+				entry.Add(page);
 				mutex_unlock(&cache->lock);
-				snooze(20000);
+				entry.Wait();
 				mutex_lock(&cache->lock);
 
 				goto restart;

Modified: haiku/trunk/src/system/kernel/main.c
===================================================================
--- haiku/trunk/src/system/kernel/main.c	2007-08-09 20:03:17 UTC (rev 21874)
+++ haiku/trunk/src/system/kernel/main.c	2007-08-09 20:08:25 UTC (rev 21875)
@@ -14,6 +14,7 @@
 #include <arch/platform.h>
 #include <boot_item.h>
 #include <cbuf.h>
+#include <condition_variable.h>
 #include <cpu.h>
 #include <debug.h>
 #include <elf.h>
@@ -131,6 +132,7 @@
 
 		TRACE("init semaphores\n");
 		sem_init(&sKernelArgs);
+		condition_variable_init();
 
 		// now we can create and use semaphores
 		TRACE("init VM semaphores\n");

Modified: haiku/trunk/src/system/kernel/thread.c
===================================================================
--- haiku/trunk/src/system/kernel/thread.c	2007-08-09 20:03:17 UTC (rev 21874)
+++ haiku/trunk/src/system/kernel/thread.c	2007-08-09 20:08:25 UTC (rev 21875)
@@ -210,6 +210,7 @@
 	thread->team = NULL;
 	thread->cpu = cpu;
 	thread->sem.blocking = -1;
+	thread->condition_variable = NULL;
 	thread->fault_handler = 0;
 	thread->page_faults_allowed = 1;
 	thread->kernel_stack_area = -1;
@@ -723,6 +724,7 @@
 	kprintf("  sem.count:        0x%lx\n", thread->sem.count);
 	kprintf("  sem.acquire_status: 0x%lx\n", thread->sem.acquire_status);
 	kprintf("  sem.flags:        0x%lx\n", thread->sem.flags);
+	kprintf("condition variable: %p\n", thread->condition_variable);
 	kprintf("fault_handler:      %p\n", (void *)thread->fault_handler);
 	kprintf("args:               %p %p\n", thread->args1, thread->args2);
 	kprintf("entry:              %p\n", (void *)thread->entry);
@@ -826,7 +828,8 @@
 			kprintf("ignoring invalid team argument.\n");
 	}
 
-	kprintf("thread         id  state       sem cpu pri  stack      team  name\n");
+	kprintf("thread         id  state        sem/cv cpu pri  stack      team  "
+		"name\n");
 
 	hash_open(sThreadHash, &i);
 	while ((thread = hash_next(sThreadHash, &i)) != NULL) {
@@ -840,11 +843,14 @@
 		kprintf("%p %6lx  %-9s", thread, thread->id, state_to_text(thread,
 			thread->state));
 
-		// does it block on a semaphore?
-		if (thread->state == B_THREAD_WAITING)
-			kprintf("%6lx  ", thread->sem.blocking);
-		else
-			kprintf("     -  ");
+		// does it block on a semaphore or a condition variable?
+		if (thread->state == B_THREAD_WAITING) {
+			if (thread->condition_variable)
+				kprintf("%p  ", thread->condition_variable);
+			else
+				kprintf("%10lx  ", thread->sem.blocking);
+		} else
+			kprintf("      -     ");
 
 		// on which CPU does it run?
 		if (thread->cpu)

Modified: haiku/trunk/src/system/kernel/vm/Jamfile
===================================================================
--- haiku/trunk/src/system/kernel/vm/Jamfile	2007-08-09 20:03:17 UTC (rev 21874)
+++ haiku/trunk/src/system/kernel/vm/Jamfile	2007-08-09 20:08:25 UTC (rev 21875)
@@ -6,7 +6,7 @@
 	vm_cache.cpp
 	vm_daemons.c
 	vm_low_memory.cpp
-	vm_page.c
+	vm_page.cpp
 	vm_store_anonymous_noswap.c
 	vm_store_device.c
 	vm_store_null.c

Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-09 20:03:17 UTC (rev 21874)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-09 20:08:25 UTC (rev 21875)
@@ -22,6 +22,7 @@
 #include <vm_low_memory.h>
 #include <file_cache.h>
 #include <memheap.h>
+#include <condition_variable.h>
 #include <debug.h>
 #include <console.h>
 #include <int.h>
@@ -3496,11 +3497,13 @@
 	away by grabbing a reference to it.
 */
 static inline void
-fault_insert_dummy_page(vm_cache *cache, vm_page &dummyPage, off_t cacheOffset)
+fault_insert_dummy_page(vm_cache *cache, vm_dummy_page &dummyPage,
+	off_t cacheOffset)
 {
 	dummyPage.state = PAGE_STATE_BUSY;
 	vm_cache_acquire_ref(cache);
 	vm_cache_insert_page(cache, &dummyPage, cacheOffset);
+	dummyPage.busy_condition.Publish(&dummyPage, "page");
 }
 
 
@@ -3509,7 +3512,7 @@
 	the cache.
 */
 static inline void
-fault_remove_dummy_page(vm_page &dummyPage, bool isLocked)
+fault_remove_dummy_page(vm_dummy_page &dummyPage, bool isLocked)
 {
 	vm_cache *cache = dummyPage.cache;
 	if (!isLocked)
@@ -3518,6 +3521,7 @@
 	if (dummyPage.state == PAGE_STATE_BUSY) {
 		vm_cache_remove_page(cache, &dummyPage);
 		dummyPage.state = PAGE_STATE_INACTIVE;
+		dummyPage.busy_condition.Unpublish();
 	}
 
 	if (!isLocked)
@@ -3537,8 +3541,8 @@
 */
 static inline status_t
 fault_find_page(vm_translation_map *map, vm_cache *topCache,
-	off_t cacheOffset, bool isWrite, vm_page &dummyPage, vm_cache **_pageCache,
-	vm_page** _page, bool* _restart)
+	off_t cacheOffset, bool isWrite, vm_dummy_page &dummyPage,
+	vm_cache **_pageCache, vm_page** _page, bool* _restart)
 {
 	*_restart = false;
 	vm_cache *cache = topCache;
@@ -3560,24 +3564,36 @@
 		for (;;) {
 			page = vm_cache_lookup_page(cache, cacheOffset);
 			if (page != NULL && page->state != PAGE_STATE_BUSY) {
+				// Note: We set the page state to busy, but we don't need a
+				// condition variable here, since we keep the cache locked
+				// till we mark the page unbusy again (in fault_get_page()
+				// the source page, or in vm_soft_fault() when mapping the
+				// page), so no one will ever know the page was busy in the
+				// first place.
 				vm_page_set_state(page, PAGE_STATE_BUSY);
 				break;
 			}
 			if (page == NULL || page == &dummyPage)
 				break;
 
-			// page must be busy
-			// ToDo: don't wait forever!
-			mutex_unlock(&cache->lock);
-			thread_yield();
-			mutex_lock(&cache->lock);
+			// page must be busy -- wait for it to become unbusy
+			{
+				ConditionVariableEntry<vm_page> entry;
+				entry.Add(page);
+				mutex_unlock(&cache->lock);
+				entry.Wait();
+				mutex_lock(&cache->lock);
+			}
 
 			if (cache->busy) {
 				// The cache became busy, which means, it is about to be
 				// removed by vm_cache_remove_consumer(). We start again with
 				// the top cache.
+				ConditionVariableEntry<vm_cache> entry;
+				entry.Add(cache);
 				mutex_unlock(&cache->lock);
 				vm_cache_release_ref(cache);
+				entry.Wait();
 				*_restart = true;
 				return B_OK;
 			}
@@ -3595,9 +3611,11 @@
 
 			// insert a fresh page and mark it busy -- we're going to read it in
 			page = vm_page_allocate_page(PAGE_STATE_FREE);
-			page->state = PAGE_STATE_BUSY;
 			vm_cache_insert_page(cache, page, cacheOffset);
 
+			ConditionVariable<vm_page> busyCondition;
+			busyCondition.Publish(page, "page");
+
 			mutex_unlock(&cache->lock);
 
 			// get a virtual address for the page
@@ -3620,6 +3638,7 @@
 				dprintf("reading page from store %p (cache %p) returned: %s!\n",
 					store, cache, strerror(status));
 
+				busyCondition.Unpublish();
 				vm_cache_remove_page(cache, page);
 				vm_page_set_state(page, PAGE_STATE_FREE);
 
@@ -3628,6 +3647,7 @@
 
 			// mark the page unbusy again
 			page->state = PAGE_STATE_ACTIVE;
+			busyCondition.Unpublish();
 
 			break;
 		}
@@ -3651,8 +3671,11 @@
 				// The cache became busy, which means, it is about to be
 				// removed by vm_cache_remove_consumer(). We start again with
 				// the top cache.
+				ConditionVariableEntry<vm_cache> entry;
+				entry.Add(cache);
 				mutex_unlock(&cache->lock);
 				vm_cache_release_ref(cache);
+				entry.Wait();
 				*_restart = true;
 				return B_OK;
 			}
@@ -3682,8 +3705,11 @@
 				// The cache became busy, which means, it is about to be
 				// removed by vm_cache_remove_consumer(). We start again with
 				// the top cache.
+				ConditionVariableEntry<vm_cache> entry;
+				entry.Add(cache);
 				mutex_unlock(&cache->lock);
 				vm_cache_release_ref(cache);
+				entry.Wait();
 				*_restart = true;
 			} else {
 				vm_page* newPage = vm_cache_lookup_page(cache, cacheOffset);
@@ -3718,8 +3744,8 @@
 	to it, and has also locked it on exit.
 */
 static inline status_t
-fault_get_page(vm_translation_map *map, vm_cache *topCache,
-	off_t cacheOffset, bool isWrite, vm_page &dummyPage, vm_cache **_sourceCache,
+fault_get_page(vm_translation_map *map, vm_cache *topCache, off_t cacheOffset,
+	bool isWrite, vm_dummy_page &dummyPage, vm_cache **_sourceCache,
 	vm_cache **_copiedSource, vm_page** _page)
 {
 	vm_cache *cache;
@@ -3848,8 +3874,10 @@
 				break;
 
 			// The page is busy, wait till it becomes unbusy.
+			ConditionVariableEntry<vm_page> entry;
+			entry.Add(newPage);
 			mutex_unlock(&topCache->lock);
-			snooze(10000);
+			entry.Wait();
 			mutex_lock(&topCache->lock);
 		}
 
@@ -3968,7 +3996,7 @@
 	// already have the page we're searching for (we're going from top to bottom)
 
 	vm_translation_map *map = &addressSpace->translation_map;
-	vm_page dummyPage;
+	vm_dummy_page dummyPage;
 	dummyPage.cache = NULL;
 	dummyPage.state = PAGE_STATE_INACTIVE;
 	dummyPage.type = PAGE_TYPE_DUMMY;

Modified: haiku/trunk/src/system/kernel/vm/vm_cache.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm_cache.cpp	2007-08-09 20:03:17 UTC (rev 21874)
+++ haiku/trunk/src/system/kernel/vm/vm_cache.cpp	2007-08-09 20:08:25 UTC (rev 21875)
@@ -6,22 +6,23 @@
  * Distributed under the terms of the NewOS License.
  */
 
+#include <vm_cache.h>
 
+#include <stddef.h>
+#include <stdlib.h>
+
+#include <arch/cpu.h>
+#include <condition_variable.h>
+#include <debug.h>
+#include <int.h>
 #include <kernel.h>
+#include <lock.h>
+#include <smp.h>
+#include <util/khash.h>
 #include <vm.h>
+#include <vm_page.h>
 #include <vm_priv.h>
-#include <vm_cache.h>
-#include <vm_page.h>
-#include <int.h>
-#include <util/khash.h>
-#include <lock.h>
-#include <debug.h>
-#include <lock.h>
-#include <smp.h>
-#include <arch/cpu.h>
 
-#include <stddef.h>
-#include <stdlib.h>
 
 //#define TRACE_VM_CACHE
 #ifdef TRACE_VM_CACHE
@@ -479,9 +480,12 @@
 			}
 		}
 
+		ConditionVariable<vm_cache> busyCondition;
+
 		if (merge) {
 			// But since we need to keep the locking order upper->lower cache, we
 			// need to unlock our cache now
+			busyCondition.Publish(cache, "cache");
 			cache->busy = true;
 			mutex_unlock(&cache->lock);
 
@@ -496,6 +500,7 @@
 					"not merging it\n", cache);
 				merge = false;
 				cache->busy = false;
+				busyCondition.Unpublish();
 				mutex_unlock(&consumer->lock);
 				vm_cache_release_ref(consumer);
 			}
@@ -535,6 +540,7 @@
 //dprintf("%ld: merged busy page %p, cache %p, offset %ld\n", find_thread(NULL), page, cacheRef->cache, page->cache_offset);
 					vm_cache_remove_page(consumer, consumerPage);
 					consumerPage->state = PAGE_STATE_INACTIVE;
+					((vm_dummy_page*)consumerPage)->busy_condition.Unpublish();
 
 					vm_cache_remove_page(cache, page);
 					vm_cache_insert_page(consumer, page,
@@ -582,6 +588,9 @@
 			mutex_unlock(&consumer->lock);
 			vm_cache_release_ref(consumer);
 		}
+	
+		if (cache->busy)
+			busyCondition.Unpublish();
 	}
 
 	mutex_unlock(&cache->lock);

Deleted: haiku/trunk/src/system/kernel/vm/vm_page.c

Copied: haiku/trunk/src/system/kernel/vm/vm_page.cpp (from rev 21851, haiku/trunk/src/system/kernel/vm/vm_page.c)
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm_page.c	2007-08-08 10:29:30 UTC (rev 21851)
+++ haiku/trunk/src/system/kernel/vm/vm_page.cpp	2007-08-09 20:08:25 UTC (rev 21875)
@@ -0,0 +1,1196 @@
+/*
+ * Copyright 2002-2007, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
+ * Distributed under the terms of the NewOS License.
+ */
+
+
+#include <KernelExport.h>
+#include <OS.h>
+
+#include <arch/cpu.h>
+#include <arch/vm_translation_map.h>
+#include <boot/kernel_args.h>
+#include <condition_variable.h>
+#include <kernel.h>
+#include <thread.h>
+#include <vm.h>
+#include <vm_address_space.h>
+#include <vm_priv.h>
+#include <vm_page.h>
+#include <vm_cache.h>
+
+#include <signal.h>
+#include <string.h>
+#include <stdlib.h>
+
+//#define TRACE_VM_PAGE
+#ifdef TRACE_VM_PAGE
+#	define TRACE(x) dprintf x
+#else
+#	define TRACE(x) ;
+#endif
+
+#define SCRUB_SIZE 16
+	// this many pages will be cleared at once in the page scrubber thread
+
+typedef struct page_queue {
+	vm_page *head;
+	vm_page *tail;
+	int count;
+} page_queue;
+
+extern bool trimming_cycle;
+
+static page_queue page_free_queue;
+static page_queue page_clear_queue;
+static page_queue page_modified_queue;
+static page_queue page_active_queue;
+
+static vm_page *sPages;
+static addr_t sPhysicalPageOffset;
+static size_t sNumPages;
+
+static spinlock sPageLock;
+
+static sem_id modified_pages_available;
+
+
+/*!	Dequeues a page from the tail of the given queue */
+static vm_page *
+dequeue_page(page_queue *q)
+{
+	vm_page *page;
+
+	page = q->tail;
+	if (page != NULL) {
+		if (q->head == page)
+			q->head = NULL;
+		if (page->queue_prev != NULL)
+			page->queue_prev->queue_next = NULL;
+
+		q->tail = page->queue_prev;
+		q->count--;
+
+		#ifdef DEBUG_PAGE_QUEUE
+			if (page->queue != q) {
+				panic("dequeue_page(queue: %p): page %p thinks it is in queue "
+					"%p", q, page, page->queue);
+			}
+
+			page->queue = NULL;
+		#endif	// DEBUG_PAGE_QUEUE
+	}
+
+	return page;
+}
+
+
+/*!	Enqueues a page to the head of the given queue */
+static void
+enqueue_page(page_queue *q, vm_page *page)
+{
+	#ifdef DEBUG_PAGE_QUEUE
+		if (page->queue != NULL) {
+			panic("enqueue_page(queue: %p, page: %p): page thinks it is "
+				"already in queue %p", q, page, page->queue);
+		}
+	#endif	// DEBUG_PAGE_QUEUE
+
+	if (q->head != NULL)
+		q->head->queue_prev = page;
+	page->queue_next = q->head;
+	q->head = page;
+	page->queue_prev = NULL;
+	if (q->tail == NULL)
+		q->tail = page;
+	q->count++;
+
+	#ifdef DEBUG_PAGE_QUEUE
+		page->queue = q;
+	#endif
+
+	if (q == &page_modified_queue) {
+		if (q->count == 1)
+			release_sem_etc(modified_pages_available, 1, B_DO_NOT_RESCHEDULE);
+	}
+}
+
+
+static void
+remove_page_from_queue(page_queue *queue, vm_page *page)
+{
+	#ifdef DEBUG_PAGE_QUEUE
+		if (page->queue != queue) {
+			panic("remove_page_from_queue(queue: %p, page: %p): page thinks it "
+				"is in queue %p", queue, page, page->queue);
+		}
+	#endif	// DEBUG_PAGE_QUEUE
+
+	if (page->queue_prev != NULL)
+		page->queue_prev->queue_next = page->queue_next;
+	else
+		queue->head = page->queue_next;
+
+	if (page->queue_next != NULL)
+		page->queue_next->queue_prev = page->queue_prev;
+	else
+		queue->tail = page->queue_prev;
+
+	queue->count--;
+
+	#ifdef DEBUG_PAGE_QUEUE
+		page->queue = NULL;
+	#endif
+}
+
+
+static void
+move_page_to_queue(page_queue *fromQueue, page_queue *toQueue, vm_page *page)
+{
+	if (fromQueue != toQueue) {
+		remove_page_from_queue(fromQueue, page);
+		enqueue_page(toQueue, page);
+	}
+}
+
+
+static int
+dump_free_page_table(int argc, char **argv)
+{
+	dprintf("not finished\n");
+	return 0;
+}
+
+
+static int
+find_page(int argc, char **argv)
+{
+	struct vm_page *page;
+	addr_t address;
+	int32 index = 1;
+	int i;
+
+	struct {
+		const char*	name;
+		page_queue*	queue;
+	} pageQueueInfos[] = {
+		{ "free",		&page_free_queue },
+		{ "clear",		&page_clear_queue },
+		{ "modified",	&page_modified_queue },
+		{ "active",		&page_active_queue },
+		{ NULL, NULL }
+	};
+
+	if (argc < 2
+		|| strlen(argv[index]) <= 2
+		|| argv[index][0] != '0'
+		|| argv[index][1] != 'x') {
+		kprintf("usage: find_page <address>\n");
+		return 0;
+	}
+
+	address = strtoul(argv[index], NULL, 0);
+	page = (vm_page*)address;
+
+	for (i = 0; pageQueueInfos[i].name; i++) {
+		vm_page* p = pageQueueInfos[i].queue->head;
+		while (p) {
+			if (p == page) {
+				kprintf("found page %p in queue %p (%s)\n", page,
+					pageQueueInfos[i].queue, pageQueueInfos[i].name);
+				return 0;
+			}
+			p = p->queue_next;
+		}
+	}
+
+	kprintf("page %p isn't in any queue\n", page);
+
+	return 0;
+}
+
+
+static int
+dump_page(int argc, char **argv)
+{
+	struct vm_page *page;
+	addr_t address;
+	bool physical = false;
+	int32 index = 1;
+
+	if (argc > 2) {
+		if (!strcmp(argv[1], "-p")) {
+			physical = true;
+			index++;
+		} else if (!strcmp(argv[1], "-v"))
+			index++;
+	}
+
+	if (argc < 2
+		|| strlen(argv[index]) <= 2
+		|| argv[index][0] != '0'
+		|| argv[index][1] != 'x') {
+		kprintf("usage: page [-p|-v] <address>\n"
+			"  -v looks up a virtual address for the page, -p a physical address.\n"
+			"  Default is to look for the page structure address directly\n.");
+		return 0;
+	}
+
+	address = strtoul(argv[index], NULL, 0);
+
+	if (index == 2) {
+		if (!physical) {
+			vm_address_space *addressSpace = vm_kernel_address_space();
+			uint32 flags;
+
+			if (thread_get_current_thread()->team->address_space != NULL)
+				addressSpace = thread_get_current_thread()->team->address_space;
+
+			addressSpace->translation_map.ops->query_interrupt(
+				&addressSpace->translation_map, address, &address, &flags);
+
+		}
+		page = vm_lookup_page(address / B_PAGE_SIZE);
+	} else
+		page = (struct vm_page *)address;
+
+	kprintf("PAGE: %p\n", page);
+	kprintf("queue_next,prev: %p, %p\n", page->queue_next, page->queue_prev);
+	kprintf("hash_next:       %p\n", page->hash_next);
+	kprintf("physical_number: %lx\n", page->physical_page_number);
+	kprintf("cache:           %p\n", page->cache);
+	kprintf("cache_offset:    %ld\n", page->cache_offset);
+	kprintf("cache_next,prev: %p, %p\n", page->cache_next, page->cache_prev);
+	kprintf("type:            %d\n", page->type);
+	kprintf("state:           %d\n", page->state);
+	kprintf("wired_count:     %u\n", page->wired_count);
+	kprintf("usage_count:     %u\n", page->usage_count);
+	#ifdef DEBUG_PAGE_QUEUE
+		kprintf("queue:           %p\n", page->queue);
+	#endif
+	#ifdef DEBUG_PAGE_CACHE_TRANSITIONS
+		kprintf("debug_flags:     0x%lx\n", page->debug_flags);
+		kprintf("collided page:   %p\n", page->collided_page);
+	#endif	// DEBUG_PAGE_CACHE_TRANSITIONS
+	kprintf("area mappings:\n");
+
+	vm_page_mappings::Iterator iterator = page->mappings.GetIterator();
+	vm_page_mapping *mapping;
+	while ((mapping = iterator.Next()) != NULL) {
+		kprintf("  %p (%#lx)\n", mapping->area, mapping->area->id);
+		mapping = mapping->page_link.next;
+	}
+
+	return 0;
+}
+
+
+static int
+dump_page_queue(int argc, char **argv)
+{
+	struct page_queue *queue;
+
+	if (argc < 2) {
+		kprintf("usage: page_queue <address/name> [list]\n");
+		return 0;
+	}
+
+	if (strlen(argv[1]) >= 2 && argv[1][0] == '0' && argv[1][1] == 'x')
+		queue = (struct page_queue *)strtoul(argv[1], NULL, 16);
+	if (!strcmp(argv[1], "free"))
+		queue = &page_free_queue;
+	else if (!strcmp(argv[1], "clear"))
+		queue = &page_clear_queue;
+	else if (!strcmp(argv[1], "modified"))
+		queue = &page_modified_queue;
+	else if (!strcmp(argv[1], "active"))
+		queue = &page_active_queue;
+	else {
+		kprintf("page_queue: unknown queue \"%s\".\n", argv[1]);
+		return 0;
+	}
+
+	kprintf("queue = %p, queue->head = %p, queue->tail = %p, queue->count = %d\n", queue, queue->head, queue->tail, queue->count);
+
+	if (argc == 3) {
+		struct vm_page *page = queue->head;
+		int i;
+		
+		for (i = 0; page; i++, page = page->queue_next) {
+			kprintf("%5d. queue_next = %p, queue_prev = %p, type = %d, state = %d\n", i, page->queue_next, page->queue_prev, page->type, page->state);
+		}
+	}
+	return 0;
+}
+
+
+static int
+dump_page_stats(int argc, char **argv)
+{
+	uint32 counter[8];
+	int32 totalActive;
+	addr_t i;
+
+	memset(counter, 0, sizeof(counter));
+
+	for (i = 0; i < sNumPages; i++) {
+		if (sPages[i].state > 7)
+			panic("page %li at %p has invalid state!\n", i, &sPages[i]);
+
+		counter[sPages[i].state]++;
+	}
+
+	kprintf("page stats:\n");
+	kprintf("active: %lu\ninactive: %lu\nbusy: %lu\nunused: %lu\n",
+		counter[PAGE_STATE_ACTIVE], counter[PAGE_STATE_INACTIVE], counter[PAGE_STATE_BUSY], counter[PAGE_STATE_UNUSED]);
+	kprintf("wired: %lu\nmodified: %lu\nfree: %lu\nclear: %lu\n",
+		counter[PAGE_STATE_WIRED], counter[PAGE_STATE_MODIFIED], counter[PAGE_STATE_FREE], counter[PAGE_STATE_CLEAR]);
+
+	kprintf("\nfree_queue: %p, count = %d\n", &page_free_queue, page_free_queue.count);
+	kprintf("clear_queue: %p, count = %d\n", &page_clear_queue, page_clear_queue.count);
+	kprintf("modified_queue: %p, count = %d\n", &page_modified_queue, page_modified_queue.count);
+	kprintf("active_queue: %p, count = %d\n", &page_active_queue, page_active_queue.count);
+
+	return 0;
+}
+
+
+#if 0
+static int dump_free_page_table(int argc, char **argv)
+{
+	unsigned int i = 0;
+	unsigned int free_start = END_OF_LIST;
+	unsigned int inuse_start = PAGE_INUSE;
+
+	dprintf("dump_free_page_table():\n");
+	dprintf("first_free_page_index = %d\n", first_free_page_index);
+
+	while(i < free_page_table_size) {
+		if (free_page_table[i] == PAGE_INUSE) {
+			if (inuse_start != PAGE_INUSE) {
+				i++;
+				continue;
+			}
+			if (free_start != END_OF_LIST) {
+				dprintf("free from %d -> %d\n", free_start + free_page_table_base, i-1 + free_page_table_base);
+				free_start = END_OF_LIST;
+			}
+			inuse_start = i;
+		} else {
+			if (free_start != END_OF_LIST) {
+				i++;
+				continue;
+			}
+			if (inuse_start != PAGE_INUSE) {
+				dprintf("inuse from %d -> %d\n", inuse_start + free_page_table_base, i-1 + free_page_table_base);
+				inuse_start = PAGE_INUSE;
+			}
+			free_start = i;
+		}
+		i++;
+	}
+	if (inuse_start != PAGE_INUSE) {
+		dprintf("inuse from %d -> %d\n", inuse_start + free_page_table_base, i-1 + free_page_table_base);
+	}
+	if (free_start != END_OF_LIST) {
+		dprintf("free from %d -> %d\n", free_start + free_page_table_base, i-1 + free_page_table_base);
+	}
+/*
+	for (i = 0; i < free_page_table_size; i++) {
+		dprintf("%d->%d ", i, free_page_table[i]);
+	}
+*/
+	return 0;
+}
+#endif
+
+
+static status_t
+set_page_state_nolock(vm_page *page, int pageState)
+{
+	page_queue *from_q = NULL;
+	page_queue *to_q = NULL;
+
+	switch (page->state) {
+		case PAGE_STATE_BUSY:
+		case PAGE_STATE_ACTIVE:
+		case PAGE_STATE_INACTIVE:
+		case PAGE_STATE_WIRED:
+		case PAGE_STATE_UNUSED:
+			from_q = &page_active_queue;
+			break;
+		case PAGE_STATE_MODIFIED:
+			from_q = &page_modified_queue;
+			break;
+		case PAGE_STATE_FREE:
+			from_q = &page_free_queue;
+			break;
+		case PAGE_STATE_CLEAR:
+			from_q = &page_clear_queue;
+			break;
+		default:
+			panic("vm_page_set_state: vm_page %p in invalid state %d\n", page, page->state);
+	}
+
+	if (page->state == PAGE_STATE_CLEAR || page->state == PAGE_STATE_FREE) {
+		if (page->cache != NULL)
+			panic("free page %p has cache", page);
+	}
+	if (pageState == PAGE_STATE_CLEAR || pageState == PAGE_STATE_FREE) {
+		if (page->cache != NULL)
+			panic("to be freed page %p has cache", page);
+	}
+
+	switch (pageState) {
+		case PAGE_STATE_BUSY:
+		case PAGE_STATE_ACTIVE:
+		case PAGE_STATE_INACTIVE:
+		case PAGE_STATE_WIRED:
+		case PAGE_STATE_UNUSED:
+			to_q = &page_active_queue;
+			break;
+		case PAGE_STATE_MODIFIED:
+			to_q = &page_modified_queue;
+			break;
+		case PAGE_STATE_FREE:
+			to_q = &page_free_queue;
+			break;
+		case PAGE_STATE_CLEAR:
+			to_q = &page_clear_queue;

[... truncated: 735 lines follow ...]


From korli at mail.berlios.de  Thu Aug  9 23:02:47 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Thu, 9 Aug 2007 23:02:47 +0200
Subject: [Haiku-commits] r21876 - in haiku/vendor/mesa/current:
	glu/libnurbs/interface glu/libnurbs/nurbtess glu/libutil
	headers/public src/glapi src/main src/shader src/shader/slang
	src/shader/slang/library src/sparc src/swrast src/tnl src/vbo
	src/x86 src/x86-64
Message-ID: <200708092102.l79L2l5j004762@sheep.berlios.de>

Author: korli
Date: 2007-08-09 23:02:44 +0200 (Thu, 09 Aug 2007)
New Revision: 21876
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21876&view=rev

Added:
   haiku/vendor/mesa/current/src/shader/slang/library/slang_builtin_120_common_gc.h
   haiku/vendor/mesa/current/src/shader/slang/library/slang_builtin_120_fragment_gc.h
Removed:
   haiku/vendor/mesa/current/src/tnl/t_save_api.c
   haiku/vendor/mesa/current/src/x86-64/Makefile
   haiku/vendor/mesa/current/src/x86/Makefile
Modified:
   haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatch.cc
   haiku/vendor/mesa/current/glu/libnurbs/interface/glcurveval.h
   haiku/vendor/mesa/current/glu/libnurbs/interface/glsurfeval.cc
   haiku/vendor/mesa/current/glu/libnurbs/interface/glsurfeval.h
   haiku/vendor/mesa/current/glu/libnurbs/interface/insurfeval.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/monoTriangulation.h
   haiku/vendor/mesa/current/glu/libutil/error.c
   haiku/vendor/mesa/current/headers/public/gl.h
   haiku/vendor/mesa/current/headers/public/glu.h
   haiku/vendor/mesa/current/headers/public/glut.h
   haiku/vendor/mesa/current/src/glapi/glapitemp.h
   haiku/vendor/mesa/current/src/glapi/glprocs.h
   haiku/vendor/mesa/current/src/main/api_validate.c
   haiku/vendor/mesa/current/src/main/dlist.c
   haiku/vendor/mesa/current/src/main/glheader.h
   haiku/vendor/mesa/current/src/main/image.c
   haiku/vendor/mesa/current/src/main/imports.c
   haiku/vendor/mesa/current/src/main/imports.h
   haiku/vendor/mesa/current/src/main/points.c
   haiku/vendor/mesa/current/src/main/shaders.c
   haiku/vendor/mesa/current/src/main/texcompress_fxt1.c
   haiku/vendor/mesa/current/src/main/texenvprogram.c
   haiku/vendor/mesa/current/src/main/teximage.c
   haiku/vendor/mesa/current/src/main/version.h
   haiku/vendor/mesa/current/src/shader/program.c
   haiku/vendor/mesa/current/src/shader/shader_api.c
   haiku/vendor/mesa/current/src/shader/slang/library/slang_core.gc
   haiku/vendor/mesa/current/src/shader/slang/library/slang_core_gc.h
   haiku/vendor/mesa/current/src/shader/slang/slang_codegen.c
   haiku/vendor/mesa/current/src/shader/slang/slang_compile.c
   haiku/vendor/mesa/current/src/shader/slang/slang_emit.c
   haiku/vendor/mesa/current/src/shader/slang/slang_ir.c
   haiku/vendor/mesa/current/src/shader/slang/slang_ir.h
   haiku/vendor/mesa/current/src/shader/slang/slang_link.c
   haiku/vendor/mesa/current/src/sparc/glapi_sparc.S
   haiku/vendor/mesa/current/src/swrast/s_drawpix.c
   haiku/vendor/mesa/current/src/vbo/vbo_exec_api.c
   haiku/vendor/mesa/current/src/vbo/vbo_save_api.c
   haiku/vendor/mesa/current/src/x86-64/glapi_x86-64.S
   haiku/vendor/mesa/current/src/x86/common_x86.c
   haiku/vendor/mesa/current/src/x86/glapi_x86.S
Log:
updating mesa vendor with version 7.0.1


Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatch.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatch.cc	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatch.cc	2007-08-09 21:02:44 UTC (rev 21876)
@@ -111,8 +111,11 @@
 void bezierPatchDeleteList(bezierPatch *b)
 {
   bezierPatch *temp;
-  for(temp = b; temp != NULL; temp = temp->next)
-    bezierPatchDelete(temp);
+  while (b != NULL) {
+    temp = b;
+    b = b->next;
+    bezierPatchDelete(temp);    
+  }
 }
 
 bezierPatch* bezierPatchInsert(bezierPatch *list, bezierPatch *b)

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/glcurveval.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/glcurveval.h	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/glcurveval.h	2007-08-09 21:02:44 UTC (rev 21876)
@@ -93,7 +93,7 @@
 	output_triangles = flag;
       }
 #ifdef _WIN32
-    void               putCallBack(GLenum which, void (APIENTRY *fn)() );
+    void               putCallBack(GLenum which, void (GLAPIENTRY *fn)() );
 #else
     void               putCallBack(GLenum which, _GLUfuncptr fn );
 #endif

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/glsurfeval.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/glsurfeval.cc	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/glsurfeval.cc	2007-08-09 21:02:44 UTC (rev 21876)
@@ -1184,8 +1184,11 @@
 
 }
 
-void
-OpenGLSurfaceEvaluator::putCallBack(GLenum which, _GLUfuncptr fn )
+#ifdef _WIN32
+void OpenGLSurfaceEvaluator::putCallBack(GLenum which, void (GLAPIENTRY *fn)() )
+#else
+void OpenGLSurfaceEvaluator::putCallBack(GLenum which, _GLUfuncptr fn )
+#endif
 {
   switch(which)
     {

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/glsurfeval.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/glsurfeval.h	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/glsurfeval.h	2007-08-09 21:02:44 UTC (rev 21876)
@@ -145,7 +145,7 @@
     void		newtmeshvert( long, long );
 
 #ifdef _WIN32
-    void 	        putCallBack(GLenum which, void (APIENTRY *fn)() );
+    void 	        putCallBack(GLenum which, void (GLAPIENTRY *fn)() );
 #else
     void 	        putCallBack(GLenum which, _GLUfuncptr fn );
 #endif

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/insurfeval.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/insurfeval.cc	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/insurfeval.cc	2007-08-09 21:02:44 UTC (rev 21876)
@@ -1533,9 +1533,9 @@
     }
   //clean up 
   free(leftXYZ);
-  free(leftXYZ);
+  free(rightXYZ);
+  free(leftNormal);
   free(rightNormal);
-  free(rightNormal);
 }
 
 /*-----------------------begin evalMachine-------------------*/

Modified: haiku/vendor/mesa/current/glu/libnurbs/nurbtess/monoTriangulation.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/nurbtess/monoTriangulation.h	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/glu/libnurbs/nurbtess/monoTriangulation.h	2007-08-09 21:02:44 UTC (rev 21876)
@@ -43,10 +43,9 @@
 #include "definitions.h"
 #include "primitiveStream.h"
 #include "directedLine.h"
+#include "arc.h"
 
 class Backend;
-class Arc;
-typedef Arc *Arc_ptr;
 
 class reflexChain{
   Real2 *queue; 

Modified: haiku/vendor/mesa/current/glu/libutil/error.c
===================================================================
--- haiku/vendor/mesa/current/glu/libutil/error.c	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/glu/libutil/error.c	2007-08-09 21:02:44 UTC (rev 21876)
@@ -82,7 +82,7 @@
     if ((errorCode >= GLU_NURBS_ERROR1) && (errorCode <= GLU_NURBS_ERROR37)) {
 	return (const GLubyte *) __gluNURBSErrorString(errorCode - (GLU_NURBS_ERROR1 - 1));
     }
-    if ((errorCode >= GLU_TESS_ERROR1) && (errorCode <= GLU_TESS_ERROR8)) {
+    if ((errorCode >= GLU_TESS_ERROR1) && (errorCode <= GLU_TESS_ERROR6)) {
 	return (const GLubyte *) __gluTessErrorString(errorCode - (GLU_TESS_ERROR1 - 1));
     }
     return (const GLubyte *) 0;

Modified: haiku/vendor/mesa/current/headers/public/gl.h
===================================================================
--- haiku/vendor/mesa/current/headers/public/gl.h	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/headers/public/gl.h	2007-08-09 21:02:44 UTC (rev 21876)
@@ -84,7 +84,8 @@
 #include <windows.h>
 #endif
 
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) \
+     && !defined(OPENSTEP) && !defined(__CYGWIN__) || defined(__MINGW32__)
 #include <GL/mesa_wgl.h>
 #endif
 
@@ -2161,11 +2162,11 @@
 #define GL_DEBUG_PRINT_MESA               0x875A
 #define GL_DEBUG_ASSERT_MESA              0x875B
 
-GLAPI GLhandleARB APIENTRY glCreateDebugObjectMESA (void);
-GLAPI void APIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
-GLAPI void APIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength,
+GLAPI GLhandleARB GLAPIENTRY glCreateDebugObjectMESA (void);
+GLAPI void GLAPIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
+GLAPI void GLAPIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength,
                                          GLsizei *length, GLcharARB *debugLog);
-GLAPI GLsizei APIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
+GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
 
 #endif /* GL_MESA_shader_debug */
 

Modified: haiku/vendor/mesa/current/headers/public/glu.h
===================================================================
--- haiku/vendor/mesa/current/headers/public/glu.h	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/headers/public/glu.h	2007-08-09 21:02:44 UTC (rev 21876)
@@ -44,6 +44,19 @@
 #define GLAPIENTRYP GLAPIENTRY *
 #endif
 
+#ifdef GLAPI
+#undef GLAPI
+#endif
+
+#  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GLU32)
+#    define GLAPI __declspec(dllexport)
+#  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
+#    define GLAPI __declspec(dllimport)
+#  else /* for use with static link lib build of Win32 edition only */
+#    define GLAPI extern
+#  endif /* _STATIC_MESA support */
+
+
 #ifndef GLAPI
 #define GLAPI
 #endif

Modified: haiku/vendor/mesa/current/headers/public/glut.h
===================================================================
--- haiku/vendor/mesa/current/headers/public/glut.h	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/headers/public/glut.h	2007-08-09 21:02:44 UTC (rev 21876)
@@ -10,6 +10,10 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 
+#if defined(__MINGW32__)
+#include <GL/mesa_wgl.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -115,7 +119,7 @@
 #endif
 
 /* GLUT API entry point declarations for Win32. */
-#if defined(GLUT_BUILDING_LIB) && defined(_DLL)
+#if (defined(BUILD_GLUT32) || defined(GLUT_BUILDING_LIB)) && defined(_DLL)
 # 	define GLUTAPI __declspec(dllexport)
 #elif defined(_DLL)
 #   define GLUTAPI __declspec(dllimport)
@@ -130,9 +134,12 @@
 #		pragma message( "----: being multiply defined you should include WINDOWS.H priot to gl/glut.h" )
 #	endif
 #	define CALLBACK __stdcall
-typedef int (GLUTAPIENTRY *PROC)();
-typedef void *HGLRC;
-typedef void *HDC;
+
+#if !defined(__MINGW32__)
+	typedef int (GLUTAPIENTRY *PROC)();
+	typedef void *HGLRC;
+	typedef void *HDC;
+#endif
 typedef unsigned long COLORREF;
 #endif
 

Modified: haiku/vendor/mesa/current/src/glapi/glapitemp.h
===================================================================
--- haiku/vendor/mesa/current/src/glapi/glapitemp.h	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/src/glapi/glapitemp.h	2007-08-09 21:02:44 UTC (rev 21876)
@@ -3284,6 +3284,11 @@
    DISPATCH(VertexAttrib4NusvARB, (index, v), (F, "glVertexAttrib4NusvARB(%d, %p);\n", index, (const void *) v));
 }
 
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4bv)(GLuint index, const GLbyte * v)
+{
+   DISPATCH(VertexAttrib4bvARB, (index, v), (F, "glVertexAttrib4bv(%d, %p);\n", index, (const void *) v));
+}
+
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4bvARB)(GLuint index, const GLbyte * v)
 {
    DISPATCH(VertexAttrib4bvARB, (index, v), (F, "glVertexAttrib4bvARB(%d, %p);\n", index, (const void *) v));
@@ -3329,6 +3334,11 @@
    DISPATCH(VertexAttrib4fvARB, (index, v), (F, "glVertexAttrib4fvARB(%d, %p);\n", index, (const void *) v));
 }
 
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4iv)(GLuint index, const GLint * v)
+{
+   DISPATCH(VertexAttrib4ivARB, (index, v), (F, "glVertexAttrib4iv(%d, %p);\n", index, (const void *) v));
+}
+
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ivARB)(GLuint index, const GLint * v)
 {
    DISPATCH(VertexAttrib4ivARB, (index, v), (F, "glVertexAttrib4ivARB(%d, %p);\n", index, (const void *) v));
@@ -3354,16 +3364,31 @@
    DISPATCH(VertexAttrib4svARB, (index, v), (F, "glVertexAttrib4svARB(%d, %p);\n", index, (const void *) v));
 }
 
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ubv)(GLuint index, const GLubyte * v)
+{
+   DISPATCH(VertexAttrib4ubvARB, (index, v), (F, "glVertexAttrib4ubv(%d, %p);\n", index, (const void *) v));
+}
+
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ubvARB)(GLuint index, const GLubyte * v)
 {
    DISPATCH(VertexAttrib4ubvARB, (index, v), (F, "glVertexAttrib4ubvARB(%d, %p);\n", index, (const void *) v));
 }
 
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4uiv)(GLuint index, const GLuint * v)
+{
+   DISPATCH(VertexAttrib4uivARB, (index, v), (F, "glVertexAttrib4uiv(%d, %p);\n", index, (const void *) v));
+}
+
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4uivARB)(GLuint index, const GLuint * v)
 {
    DISPATCH(VertexAttrib4uivARB, (index, v), (F, "glVertexAttrib4uivARB(%d, %p);\n", index, (const void *) v));
 }
 
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4usv)(GLuint index, const GLushort * v)
+{
+   DISPATCH(VertexAttrib4usvARB, (index, v), (F, "glVertexAttrib4usv(%d, %p);\n", index, (const void *) v));
+}
+
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4usvARB)(GLuint index, const GLushort * v)
 {
    DISPATCH(VertexAttrib4usvARB, (index, v), (F, "glVertexAttrib4usvARB(%d, %p);\n", index, (const void *) v));
@@ -6458,12 +6483,17 @@
    TABLE_ENTRY(VertexAttrib4Nubv),
    TABLE_ENTRY(VertexAttrib4Nuiv),
    TABLE_ENTRY(VertexAttrib4Nusv),
+   TABLE_ENTRY(VertexAttrib4bv),
    TABLE_ENTRY(VertexAttrib4d),
    TABLE_ENTRY(VertexAttrib4dv),
    TABLE_ENTRY(VertexAttrib4f),
    TABLE_ENTRY(VertexAttrib4fv),
+   TABLE_ENTRY(VertexAttrib4iv),
    TABLE_ENTRY(VertexAttrib4s),
    TABLE_ENTRY(VertexAttrib4sv),
+   TABLE_ENTRY(VertexAttrib4ubv),
+   TABLE_ENTRY(VertexAttrib4uiv),
+   TABLE_ENTRY(VertexAttrib4usv),
    TABLE_ENTRY(VertexAttribPointer),
    TABLE_ENTRY(BindBuffer),
    TABLE_ENTRY(BufferData),

Modified: haiku/vendor/mesa/current/src/glapi/glprocs.h
===================================================================
--- haiku/vendor/mesa/current/src/glapi/glprocs.h	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/src/glapi/glprocs.h	2007-08-09 21:02:44 UTC (rev 21876)
@@ -957,12 +957,17 @@
     "glVertexAttrib4Nubv\0"
     "glVertexAttrib4Nuiv\0"
     "glVertexAttrib4Nusv\0"
+    "glVertexAttrib4bv\0"
     "glVertexAttrib4d\0"
     "glVertexAttrib4dv\0"
     "glVertexAttrib4f\0"
     "glVertexAttrib4fv\0"
+    "glVertexAttrib4iv\0"
     "glVertexAttrib4s\0"
     "glVertexAttrib4sv\0"
+    "glVertexAttrib4ubv\0"
+    "glVertexAttrib4uiv\0"
+    "glVertexAttrib4usv\0"
     "glVertexAttribPointer\0"
     "glBindBuffer\0"
     "glBufferData\0"
@@ -2100,142 +2105,147 @@
     NAME_FUNC_OFFSET(16268, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
     NAME_FUNC_OFFSET(16288, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
     NAME_FUNC_OFFSET(16308, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(16328, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(16345, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(16363, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(16380, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(16398, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(16415, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(16433, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(16455, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(16468, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(16481, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(16497, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(16513, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(16526, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(16549, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(16569, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(16588, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(16599, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(16611, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(16625, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(16638, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(16654, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(16665, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(16678, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(16697, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(16717, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(16730, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(16740, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(16756, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(16775, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(16793, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(16814, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(16829, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(16844, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(16858, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(16873, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(16885, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(16898, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(16910, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(16923, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(16935, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(16948, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(16960, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(16973, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(16985, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(16998, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17010, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17023, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17035, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(17048, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(17060, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(17073, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(17092, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(17111, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(17130, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(17143, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(17161, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(17182, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(17200, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(17220, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17234, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17251, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(17267, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(17286, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17304, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17325, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17347, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17366, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17388, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17411, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(17430, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(17450, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(17469, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(17489, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(17508, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(17528, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(17547, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(17567, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(17586, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(17606, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(17626, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(17647, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(17667, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(17688, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(17708, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(17729, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(17753, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(17771, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(17791, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(17809, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(17821, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(17834, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(17846, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(17859, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(17879, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(17903, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(17917, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(17934, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(17949, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(17967, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(17981, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(17998, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18013, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18031, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18045, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18062, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18077, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18095, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18109, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18126, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18141, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18159, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18173, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18190, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18205, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18223, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18237, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18254, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18269, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18287, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18301, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18318, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18333, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18351, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18365, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18382, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18397, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18415, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(18432, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(18452, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(18469, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18495, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18524, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(18539, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(18557, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(18576, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(18600, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(16328, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(16346, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(16363, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(16381, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(16398, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(16416, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(16434, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(16451, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(16469, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(16488, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(16507, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(16526, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(16548, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(16561, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(16574, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(16590, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(16606, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(16619, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(16642, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(16662, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(16681, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(16692, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(16704, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(16718, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(16731, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(16747, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(16758, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(16771, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(16790, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(16810, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(16823, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(16833, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(16849, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(16868, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(16886, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(16907, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(16922, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(16937, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(16951, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(16966, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(16978, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(16991, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(17003, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(17016, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(17028, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(17041, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(17053, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(17066, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(17078, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(17091, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(17103, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(17116, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(17128, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(17141, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(17153, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(17166, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(17185, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(17204, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(17223, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(17236, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(17254, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(17275, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(17293, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(17313, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17327, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17344, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(17360, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(17379, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17397, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17418, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17440, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17459, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17481, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17504, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(17523, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(17543, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(17562, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(17582, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(17601, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(17621, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(17640, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(17660, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(17679, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(17699, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(17719, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(17740, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(17760, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(17781, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(17801, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(17822, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(17846, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(17864, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(17884, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(17902, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(17914, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(17927, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(17939, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(17952, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(17972, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(17996, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18010, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18027, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18042, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18060, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18074, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18091, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18106, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18124, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18138, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18155, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18170, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18188, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18202, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18219, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18234, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18252, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18266, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18283, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18298, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18316, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18330, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18347, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18362, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18380, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18394, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18411, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18426, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18444, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18458, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18475, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18490, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18508, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(18525, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(18545, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(18562, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18588, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18617, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(18632, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(18650, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(18669, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(18693, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 

Modified: haiku/vendor/mesa/current/src/main/api_validate.c
===================================================================
--- haiku/vendor/mesa/current/src/main/api_validate.c	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/src/main/api_validate.c	2007-08-09 21:02:44 UTC (rev 21876)
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  7.0.1
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -100,6 +100,11 @@
                          (const GLubyte *) indices);
       }
    }
+   else {
+      /* not using a VBO */
+      if (!indices)
+         return GL_FALSE;
+   }
 
    if (ctx->Const.CheckArrayBounds) {
       /* find max array index */
@@ -170,6 +175,16 @@
        && !(ctx->VertexProgram._Enabled && ctx->Array.ArrayObj->VertexAttrib[0].Enabled))
       return GL_FALSE;
 
+   /* Vertex buffer object tests */
+   if (ctx->Array.ElementArrayBufferObj->Name) {
+      /* XXX re-use code from above? */
+   }
+   else {
+      /* not using VBO */
+      if (!indices)
+         return GL_FALSE;
+   }
+
    if (ctx->Const.CheckArrayBounds) {
       /* Find max array index.
        * We don't trust the user's start and end values.

Modified: haiku/vendor/mesa/current/src/main/dlist.c
===================================================================
--- haiku/vendor/mesa/current/src/main/dlist.c	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/src/main/dlist.c	2007-08-09 21:02:44 UTC (rev 21876)
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.1
+ * Version:  7.0.1
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -2716,22 +2716,21 @@
 }
 
 
-/*
- * Polygon stipple must have been upacked already!
- */
 static void GLAPIENTRY
 save_PolygonStipple(const GLubyte * pattern)
 {
    GET_CURRENT_CONTEXT(ctx);
+   GLvoid *image = unpack_image(2, 32, 32, 1, GL_COLOR_INDEX, GL_BITMAP,
+                                pattern, &ctx->Unpack);
    Node *n;
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
    n = ALLOC_INSTRUCTION(ctx, OPCODE_POLYGON_STIPPLE, 1);
    if (n) {
-      void *data;
-      n[1].data = _mesa_malloc(32 * 4);
-      data = n[1].data;         /* This needed for Acorn compiler */
-      MEMCPY(data, pattern, 32 * 4);
+      n[1].data = image; 
    }
+   else if (image) {
+      _mesa_free(image);
+   }
    if (ctx->ExecuteFlag) {
       CALL_PolygonStipple(ctx->Exec, ((GLubyte *) pattern));
    }
@@ -6169,7 +6168,12 @@
             CALL_PolygonMode(ctx->Exec, (n[1].e, n[2].e));
             break;
          case OPCODE_POLYGON_STIPPLE:
-            CALL_PolygonStipple(ctx->Exec, ((GLubyte *) n[1].data));
+            {
+               const struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = ctx->DefaultPacking;
+               CALL_PolygonStipple(ctx->Exec, ((GLubyte *) n[1].data));
+               ctx->Unpack = save;      /* restore */
+            }
             break;
          case OPCODE_POLYGON_OFFSET:
             CALL_PolygonOffset(ctx->Exec, (n[1].f, n[2].f));

Modified: haiku/vendor/mesa/current/src/main/glheader.h
===================================================================
--- haiku/vendor/mesa/current/src/main/glheader.h	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/src/main/glheader.h	2007-08-09 21:02:44 UTC (rev 21876)
@@ -91,6 +91,9 @@
 #  pragma disable_message(201) /* Disable unreachable code warnings */
 #endif
 
+#ifdef WGLAPI
+#	undef WGLAPI
+#endif
 
 #if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
 #  if !defined(__GNUC__) /* mingw environment */

Modified: haiku/vendor/mesa/current/src/main/image.c
===================================================================
--- haiku/vendor/mesa/current/src/main/image.c	2007-08-09 20:08:25 UTC (rev 21875)
+++ haiku/vendor/mesa/current/src/main/image.c	2007-08-09 21:02:44 UTC (rev 21876)
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.0
+ * Version:  7.0.1
  *
  * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
@@ -850,7 +850,7 @@
          return NULL;
       }
 
-      if (packing->SkipPixels == 0) {
+      if ((packing->SkipPixels & 7) == 0) {
          _mesa_memcpy( dst, src, width_in_bytes );
          if (packing->LsbFirst) {
             flip_bytes( dst, width_in_bytes );
@@ -942,7 +942,7 @@
       if (!dst)
          return;
 
-      if (packing->SkipPixels == 0) {
+      if ((packing->SkipPixels & 7) == 0) {
          _mesa_memcpy( dst, src, width_in_bytes );
          if (packing->LsbFirst) {
             flip_bytes( dst, width_in_bytes );
@@ -961,20 +961,20 @@
                if (*s & srcMask) {
                   *d |= dstMask;
                }
-               if (srcMask == 128) {
-                  srcMask = 1;
+               if (srcMask == 1) {
+                  srcMask = 128;
                   s++;
                }
                else {
-                  srcMask = srcMask << 1;
+                  srcMask = srcMask >> 1;
                }
-               if (dstMask == 1) {
-                  dstMask = 128;
+               if (dstMask == 128) {
+                  dstMask = 1;
                   d++;
                   *d = 0;
                }
                else {
-                  dstMask = dstMask >> 1;
+                  dstMask = dstMask << 1;
                }
             }
          }
@@ -3648,11 +3648,13 @@
     * Try simple cases first
     */
    if (transferOps == 0 &&
+       !ctx->Pixel.MapStencilFlag &&
        srcType == GL_UNSIGNED_BYTE &&
        dstType == GL_UNSIGNED_BYTE) {
       _mesa_memcpy(dest, source, n * sizeof(GLubyte));
    }
    else if (transferOps == 0 &&
+            !ctx->Pixel.MapStencilFlag &&
             srcType == GL_UNSIGNED_INT &&
             dstType == GL_UNSIGNED_INT &&
             !srcPacking->SwapBytes) {
@@ -3668,19 +3670,17 @@
       extract_uint_indexes(n, indexes, GL_STENCIL_INDEX, srcType, source,
                            srcPacking);
 
-      if (transferOps) {
-         if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
-            /* shift and offset indexes */
-            shift_and_offset_ci(ctx, n, indexes);
-         }
+      if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
+         /* shift and offset indexes */
+         shift_and_offset_ci(ctx, n, indexes);
+      }
 
-         if (ctx->Pixel.MapStencilFlag) {
-            /* Apply stencil lookup table */
-            GLuint mask = ctx->PixelMaps.StoS.Size - 1;
-            GLuint i;
-            for (i=0;i<n;i++) {
-               indexes[i] = ctx->PixelMaps.StoS.Map[ indexes[i] & mask ];
-            }
+      if (ctx->Pixel.MapStencilFlag) {
+         /* Apply stencil lookup table */
+         const GLuint mask = ctx->PixelMaps.StoS.Size - 1;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            indexes[i] = ctx->PixelMaps.StoS.Map[ indexes[i] & mask ];
          }
       }
 
@@ -3733,7 +3733,7 @@
 
    switch (dstType) {
    case GL_UNSIGNED_BYTE:
-      if (sizeof(GLstencil) == 8) {
+      if (sizeof(GLstencil) == 1) {
          _mesa_memcpy( dest, source, n );
       }
       else {
@@ -3745,14 +3745,11 @@
       }
       break;
    case GL_BYTE:
-      if (sizeof(GLstencil) == 8) {
-         _mesa_memcpy( dest, source, n );
-      }
-      else {
+      {
          GLbyte *dst = (GLbyte *) dest;
          GLuint i;
          for (i=0;i<n;i++) {
-            dst[i] = (GLbyte) source[i];
+            dst[i] = (GLbyte) (source[i] & 0x7f);
          }
       }
       break;
@@ -3878,10 +3875,20 @@
                     SWAP4BYTE(value);                                   \
                 }                                                       \
             }                                                           \
-            depthValues[i] = CLAMP(GLTYPE2FLOAT(value), 0.0F, 1.0F);    \
+            depthValues[i] = GLTYPE2FLOAT(value);                       \
         }                                                               \
     } while (0)
 
+
+/**
+ * Unpack a row of depth/z values from memory, returning GLushort, GLuint
+ * or GLfloat values.
+ * The glPixelTransfer (scale/bias) params will be applied.
+ *
+ * \param dstType  one of GL_UNSIGNED_SHORT, GL_UNSIGNED_INT, GL_FLOAT
+ * \param depthScale  scale factor (max value) for returned GLushort or
+ *                    GLuint values (ignored for GLfloat).
+ */
 void
 _mesa_unpack_depth_span( const GLcontext *ctx, GLuint n,
                          GLenum dstType, GLvoid *dest, GLfloat depthScale,
@@ -3889,6 +3896,7 @@
                          const struct gl_pixelstore_attrib *srcPacking )
 {
    GLfloat depthTemp[MAX_WIDTH], *depthValues;
+   GLboolean needClamp = GL_FALSE;
 
    /* Look for special cases first.
     * Not only are these faster, they're less prone to numeric conversion
@@ -3906,7 +3914,9 @@
          }
          return;
       }
-      if (srcType == GL_UNSIGNED_SHORT && dstType == GL_UNSIGNED_INT) {
+      if (srcType == GL_UNSIGNED_SHORT
+          && dstType == GL_UNSIGNED_INT
+          && depthScale == (GLfloat) 0xffffffff) {
          const GLushort *src = (const GLushort *) source;
          GLuint *dst = (GLuint *) dest;
          GLuint i;
@@ -3918,7 +3928,7 @@
       /* XXX may want to add additional cases here someday */
    }
 
-   /* general case path */
+   /* general case path follows */
 
    if (dstType == GL_FLOAT) {
       depthValues = (GLfloat *) dest;
@@ -3927,29 +3937,31 @@
       depthValues = depthTemp;
    }
 
-   /* XXX we need to obey srcPacking->SwapBytes here!!! */
-   (void) srcPacking;
-
-   /* convert incoming values to GLfloat */
+   /* Convert incoming values to GLfloat.  Some conversions will require
+    * clamping, below.
+    */
    switch (srcType) {
       case GL_BYTE:
-          DEPTH_VALUES(GLbyte, BYTE_TO_FLOAT);
-          break;
+         DEPTH_VALUES(GLbyte, BYTE_TO_FLOAT);
+         needClamp = GL_TRUE;
+         break;
       case GL_UNSIGNED_BYTE:
-          DEPTH_VALUES(GLubyte, UBYTE_TO_FLOAT);
-          break;
+         DEPTH_VALUES(GLubyte, UBYTE_TO_FLOAT);
+         break;
       case GL_SHORT:
-          DEPTH_VALUES(GLshort, SHORT_TO_FLOAT);
-          break;
+         DEPTH_VALUES(GLshort, SHORT_TO_FLOAT);
+         needClamp = GL_TRUE;
+         break;
       case GL_UNSIGNED_SHORT:
-          DEPTH_VALUES(GLushort, USHORT_TO_FLOAT);
-          break;
+         DEPTH_VALUES(GLushort, USHORT_TO_FLOAT);
+         break;
       case GL_INT:
-          DEPTH_VALUES(GLint, INT_TO_FLOAT);
-          break;
+         DEPTH_VALUES(GLint, INT_TO_FLOAT);
+         needClamp = GL_TRUE;
+         break;
       case GL_UNSIGNED_INT:
-          DEPTH_VALUES(GLuint, UINT_TO_FLOAT);
-          break;
+         DEPTH_VALUES(GLuint, UINT_TO_FLOAT);
+         break;
       case GL_UNSIGNED_INT_24_8_EXT: /* GL_EXT_packed_depth_stencil */
          if (dstType == GL_UNSIGNED_INT &&
              depthScale == (GLfloat) 0xffffff &&
@@ -3981,19 +3993,21 @@
          }
          break;
       case GL_FLOAT:
-          DEPTH_VALUES(GLfloat, 1*);
-          break;
+         DEPTH_VALUES(GLfloat, 1*);
+         needClamp = GL_TRUE;
+         break;
       case GL_HALF_FLOAT_ARB:
          {
             GLuint i;
             const GLhalfARB *src = (const GLhalfARB *) source;
             for (i = 0; i < n; i++) {
-                GLhalfARB value = src[i];
-                if (srcPacking->SwapBytes) {
-                    SWAP2BYTE(value);
-                }
+               GLhalfARB value = src[i];
+               if (srcPacking->SwapBytes) {
+                  SWAP2BYTE(value);
+               }
                depthValues[i] = _mesa_half_to_float(value);
             }
+            needClamp = GL_TRUE;
          }
          break;
       default:
@@ -4001,12 +4015,30 @@
          return;
    }
 
+   /* apply depth scale and bias */
+   {
+      const GLfloat scale = ctx->Pixel.DepthScale;
+      const GLfloat bias = ctx->Pixel.DepthBias;
+      if (scale != 1.0 || bias != 0.0) {
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            depthValues[i] = depthValues[i] * scale + bias;
+         }
+         needClamp = GL_TRUE;
+      }
+   }
 
-   /* apply depth scale and bias and clamp to [0,1] */
-   if (ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0) {
-      _mesa_scale_and_bias_depth(ctx, n, depthValues);
+   /* clamp to [0, 1] */
+   if (needClamp) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         depthValues[i] = CLAMP(depthValues[i], 0.0, 1.0);
+      }
    }
 
+   /*
+    * Convert values to dstType
+    */

[... truncated: 1036 lines follow ...]


From korli at mail.berlios.de  Thu Aug  9 23:03:38 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Thu, 9 Aug 2007 23:03:38 +0200
Subject: [Haiku-commits] r21877 - haiku/vendor/mesa
Message-ID: <200708092103.l79L3cqO004824@sheep.berlios.de>

Author: korli
Date: 2007-08-09 23:03:38 +0200 (Thu, 09 Aug 2007)
New Revision: 21877
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21877&view=rev

Added:
   haiku/vendor/mesa/7.0.1/
Log:
tagging Mesa 7.0.1


Copied: haiku/vendor/mesa/7.0.1 (from rev 21876, haiku/vendor/mesa/current)



From korli at mail.berlios.de  Thu Aug  9 23:12:35 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Thu, 9 Aug 2007 23:12:35 +0200
Subject: [Haiku-commits] r21878 - in haiku/trunk: headers/os/opengl/GL
	src/kits/opengl/glu/libnurbs/interface
	src/kits/opengl/glu/libnurbs/nurbtess
	src/kits/opengl/glu/libutil src/kits/opengl/mesa/glapi
	src/kits/opengl/mesa/main src/kits/opengl/mesa/shader
	src/kits/opengl/mesa/shader/slang
	src/kits/opengl/mesa/shader/slang/library
	src/kits/opengl/mesa/sparc src/kits/opengl/mesa/swrast
	src/kits/opengl/mesa/tnl src/kits/opengl/mesa/vbo
	src/kits/opengl/mesa/x86 src/kits/opengl/mesa/x86-64
Message-ID: <200708092112.l79LCZ1i005478@sheep.berlios.de>

Author: korli
Date: 2007-08-09 23:12:30 +0200 (Thu, 09 Aug 2007)
New Revision: 21878
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21878&view=rev

Added:
   haiku/trunk/src/kits/opengl/mesa/shader/slang/library/slang_builtin_120_common_gc.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/library/slang_builtin_120_fragment_gc.h
Removed:
   haiku/trunk/src/kits/opengl/mesa/tnl/t_save_api.c
   haiku/trunk/src/kits/opengl/mesa/x86-64/Makefile
   haiku/trunk/src/kits/opengl/mesa/x86/Makefile
Modified:
   haiku/trunk/headers/os/opengl/GL/gl.h
   haiku/trunk/headers/os/opengl/GL/glu.h
   haiku/trunk/headers/os/opengl/GL/glut.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/bezierPatch.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glcurveval.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glsurfeval.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glsurfeval.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/insurfeval.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/monoTriangulation.h
   haiku/trunk/src/kits/opengl/glu/libutil/error.c
   haiku/trunk/src/kits/opengl/mesa/glapi/glapitemp.h
   haiku/trunk/src/kits/opengl/mesa/glapi/glprocs.h
   haiku/trunk/src/kits/opengl/mesa/main/api_validate.c
   haiku/trunk/src/kits/opengl/mesa/main/dlist.c
   haiku/trunk/src/kits/opengl/mesa/main/glheader.h
   haiku/trunk/src/kits/opengl/mesa/main/image.c
   haiku/trunk/src/kits/opengl/mesa/main/imports.c
   haiku/trunk/src/kits/opengl/mesa/main/imports.h
   haiku/trunk/src/kits/opengl/mesa/main/points.c
   haiku/trunk/src/kits/opengl/mesa/main/shaders.c
   haiku/trunk/src/kits/opengl/mesa/main/texcompress_fxt1.c
   haiku/trunk/src/kits/opengl/mesa/main/texenvprogram.c
   haiku/trunk/src/kits/opengl/mesa/main/teximage.c
   haiku/trunk/src/kits/opengl/mesa/main/version.h
   haiku/trunk/src/kits/opengl/mesa/shader/program.c
   haiku/trunk/src/kits/opengl/mesa/shader/shader_api.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/library/slang_core.gc
   haiku/trunk/src/kits/opengl/mesa/shader/slang/library/slang_core_gc.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_codegen.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_compile.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_emit.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_ir.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_ir.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_link.c
   haiku/trunk/src/kits/opengl/mesa/sparc/glapi_sparc.S
   haiku/trunk/src/kits/opengl/mesa/swrast/s_drawpix.c
   haiku/trunk/src/kits/opengl/mesa/vbo/vbo_exec_api.c
   haiku/trunk/src/kits/opengl/mesa/vbo/vbo_save_api.c
   haiku/trunk/src/kits/opengl/mesa/x86-64/glapi_x86-64.S
   haiku/trunk/src/kits/opengl/mesa/x86/common_x86.c
   haiku/trunk/src/kits/opengl/mesa/x86/glapi_x86.S
Log:
updated mesa to 7.0.1


Modified: haiku/trunk/headers/os/opengl/GL/gl.h
===================================================================
--- haiku/trunk/headers/os/opengl/GL/gl.h	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/headers/os/opengl/GL/gl.h	2007-08-09 21:12:30 UTC (rev 21878)
@@ -84,7 +84,8 @@
 #include <windows.h>
 #endif
 
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) \
+     && !defined(OPENSTEP) && !defined(__CYGWIN__) || defined(__MINGW32__)
 #include <GL/mesa_wgl.h>
 #endif
 
@@ -2161,11 +2162,11 @@
 #define GL_DEBUG_PRINT_MESA               0x875A
 #define GL_DEBUG_ASSERT_MESA              0x875B
 
-GLAPI GLhandleARB APIENTRY glCreateDebugObjectMESA (void);
-GLAPI void APIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
-GLAPI void APIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength,
+GLAPI GLhandleARB GLAPIENTRY glCreateDebugObjectMESA (void);
+GLAPI void GLAPIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
+GLAPI void GLAPIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength,
                                          GLsizei *length, GLcharARB *debugLog);
-GLAPI GLsizei APIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
+GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
 
 #endif /* GL_MESA_shader_debug */
 

Modified: haiku/trunk/headers/os/opengl/GL/glu.h
===================================================================
--- haiku/trunk/headers/os/opengl/GL/glu.h	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/headers/os/opengl/GL/glu.h	2007-08-09 21:12:30 UTC (rev 21878)
@@ -44,6 +44,19 @@
 #define GLAPIENTRYP GLAPIENTRY *
 #endif
 
+#ifdef GLAPI
+#undef GLAPI
+#endif
+
+#  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GLU32)
+#    define GLAPI __declspec(dllexport)
+#  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
+#    define GLAPI __declspec(dllimport)
+#  else /* for use with static link lib build of Win32 edition only */
+#    define GLAPI extern
+#  endif /* _STATIC_MESA support */
+
+
 #ifndef GLAPI
 #define GLAPI
 #endif

Modified: haiku/trunk/headers/os/opengl/GL/glut.h
===================================================================
--- haiku/trunk/headers/os/opengl/GL/glut.h	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/headers/os/opengl/GL/glut.h	2007-08-09 21:12:30 UTC (rev 21878)
@@ -10,6 +10,10 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 
+#if defined(__MINGW32__)
+#include <GL/mesa_wgl.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -115,7 +119,7 @@
 #endif
 
 /* GLUT API entry point declarations for Win32. */
-#if defined(GLUT_BUILDING_LIB) && defined(_DLL)
+#if (defined(BUILD_GLUT32) || defined(GLUT_BUILDING_LIB)) && defined(_DLL)
 # 	define GLUTAPI __declspec(dllexport)
 #elif defined(_DLL)
 #   define GLUTAPI __declspec(dllimport)
@@ -130,9 +134,12 @@
 #		pragma message( "----: being multiply defined you should include WINDOWS.H priot to gl/glut.h" )
 #	endif
 #	define CALLBACK __stdcall
-typedef int (GLUTAPIENTRY *PROC)();
-typedef void *HGLRC;
-typedef void *HDC;
+
+#if !defined(__MINGW32__)
+	typedef int (GLUTAPIENTRY *PROC)();
+	typedef void *HGLRC;
+	typedef void *HDC;
+#endif
 typedef unsigned long COLORREF;
 #endif
 

Modified: haiku/trunk/src/kits/opengl/glu/libnurbs/interface/bezierPatch.cc
===================================================================
--- haiku/trunk/src/kits/opengl/glu/libnurbs/interface/bezierPatch.cc	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/src/kits/opengl/glu/libnurbs/interface/bezierPatch.cc	2007-08-09 21:12:30 UTC (rev 21878)
@@ -111,8 +111,11 @@
 void bezierPatchDeleteList(bezierPatch *b)
 {
   bezierPatch *temp;
-  for(temp = b; temp != NULL; temp = temp->next)
-    bezierPatchDelete(temp);
+  while (b != NULL) {
+    temp = b;
+    b = b->next;
+    bezierPatchDelete(temp);    
+  }
 }
 
 bezierPatch* bezierPatchInsert(bezierPatch *list, bezierPatch *b)

Modified: haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glcurveval.h
===================================================================
--- haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glcurveval.h	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glcurveval.h	2007-08-09 21:12:30 UTC (rev 21878)
@@ -93,7 +93,7 @@
 	output_triangles = flag;
       }
 #ifdef _WIN32
-    void               putCallBack(GLenum which, void (APIENTRY *fn)() );
+    void               putCallBack(GLenum which, void (GLAPIENTRY *fn)() );
 #else
     void               putCallBack(GLenum which, _GLUfuncptr fn );
 #endif

Modified: haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glsurfeval.cc
===================================================================
--- haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glsurfeval.cc	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glsurfeval.cc	2007-08-09 21:12:30 UTC (rev 21878)
@@ -1184,8 +1184,11 @@
 
 }
 
-void
-OpenGLSurfaceEvaluator::putCallBack(GLenum which, _GLUfuncptr fn )
+#ifdef _WIN32
+void OpenGLSurfaceEvaluator::putCallBack(GLenum which, void (GLAPIENTRY *fn)() )
+#else
+void OpenGLSurfaceEvaluator::putCallBack(GLenum which, _GLUfuncptr fn )
+#endif
 {
   switch(which)
     {

Modified: haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glsurfeval.h
===================================================================
--- haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glsurfeval.h	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glsurfeval.h	2007-08-09 21:12:30 UTC (rev 21878)
@@ -145,7 +145,7 @@
     void		newtmeshvert( long, long );
 
 #ifdef _WIN32
-    void 	        putCallBack(GLenum which, void (APIENTRY *fn)() );
+    void 	        putCallBack(GLenum which, void (GLAPIENTRY *fn)() );
 #else
     void 	        putCallBack(GLenum which, _GLUfuncptr fn );
 #endif

Modified: haiku/trunk/src/kits/opengl/glu/libnurbs/interface/insurfeval.cc
===================================================================
--- haiku/trunk/src/kits/opengl/glu/libnurbs/interface/insurfeval.cc	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/src/kits/opengl/glu/libnurbs/interface/insurfeval.cc	2007-08-09 21:12:30 UTC (rev 21878)
@@ -1533,9 +1533,9 @@
     }
   //clean up 
   free(leftXYZ);
-  free(leftXYZ);
+  free(rightXYZ);
+  free(leftNormal);
   free(rightNormal);
-  free(rightNormal);
 }
 
 /*-----------------------begin evalMachine-------------------*/

Modified: haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/monoTriangulation.h
===================================================================
--- haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/monoTriangulation.h	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/monoTriangulation.h	2007-08-09 21:12:30 UTC (rev 21878)
@@ -43,10 +43,9 @@
 #include "definitions.h"
 #include "primitiveStream.h"
 #include "directedLine.h"
+#include "arc.h"
 
 class Backend;
-class Arc;
-typedef Arc *Arc_ptr;
 
 class reflexChain{
   Real2 *queue; 

Modified: haiku/trunk/src/kits/opengl/glu/libutil/error.c
===================================================================
--- haiku/trunk/src/kits/opengl/glu/libutil/error.c	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/src/kits/opengl/glu/libutil/error.c	2007-08-09 21:12:30 UTC (rev 21878)
@@ -82,7 +82,7 @@
     if ((errorCode >= GLU_NURBS_ERROR1) && (errorCode <= GLU_NURBS_ERROR37)) {
 	return (const GLubyte *) __gluNURBSErrorString(errorCode - (GLU_NURBS_ERROR1 - 1));
     }
-    if ((errorCode >= GLU_TESS_ERROR1) && (errorCode <= GLU_TESS_ERROR8)) {
+    if ((errorCode >= GLU_TESS_ERROR1) && (errorCode <= GLU_TESS_ERROR6)) {
 	return (const GLubyte *) __gluTessErrorString(errorCode - (GLU_TESS_ERROR1 - 1));
     }
     return (const GLubyte *) 0;

Modified: haiku/trunk/src/kits/opengl/mesa/glapi/glapitemp.h
===================================================================
--- haiku/trunk/src/kits/opengl/mesa/glapi/glapitemp.h	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/src/kits/opengl/mesa/glapi/glapitemp.h	2007-08-09 21:12:30 UTC (rev 21878)
@@ -3284,6 +3284,11 @@
    DISPATCH(VertexAttrib4NusvARB, (index, v), (F, "glVertexAttrib4NusvARB(%d, %p);\n", index, (const void *) v));
 }
 
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4bv)(GLuint index, const GLbyte * v)
+{
+   DISPATCH(VertexAttrib4bvARB, (index, v), (F, "glVertexAttrib4bv(%d, %p);\n", index, (const void *) v));
+}
+
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4bvARB)(GLuint index, const GLbyte * v)
 {
    DISPATCH(VertexAttrib4bvARB, (index, v), (F, "glVertexAttrib4bvARB(%d, %p);\n", index, (const void *) v));
@@ -3329,6 +3334,11 @@
    DISPATCH(VertexAttrib4fvARB, (index, v), (F, "glVertexAttrib4fvARB(%d, %p);\n", index, (const void *) v));
 }
 
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4iv)(GLuint index, const GLint * v)
+{
+   DISPATCH(VertexAttrib4ivARB, (index, v), (F, "glVertexAttrib4iv(%d, %p);\n", index, (const void *) v));
+}
+
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ivARB)(GLuint index, const GLint * v)
 {
    DISPATCH(VertexAttrib4ivARB, (index, v), (F, "glVertexAttrib4ivARB(%d, %p);\n", index, (const void *) v));
@@ -3354,16 +3364,31 @@
    DISPATCH(VertexAttrib4svARB, (index, v), (F, "glVertexAttrib4svARB(%d, %p);\n", index, (const void *) v));
 }
 
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ubv)(GLuint index, const GLubyte * v)
+{
+   DISPATCH(VertexAttrib4ubvARB, (index, v), (F, "glVertexAttrib4ubv(%d, %p);\n", index, (const void *) v));
+}
+
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ubvARB)(GLuint index, const GLubyte * v)
 {
    DISPATCH(VertexAttrib4ubvARB, (index, v), (F, "glVertexAttrib4ubvARB(%d, %p);\n", index, (const void *) v));
 }
 
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4uiv)(GLuint index, const GLuint * v)
+{
+   DISPATCH(VertexAttrib4uivARB, (index, v), (F, "glVertexAttrib4uiv(%d, %p);\n", index, (const void *) v));
+}
+
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4uivARB)(GLuint index, const GLuint * v)
 {
    DISPATCH(VertexAttrib4uivARB, (index, v), (F, "glVertexAttrib4uivARB(%d, %p);\n", index, (const void *) v));
 }
 
+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4usv)(GLuint index, const GLushort * v)
+{
+   DISPATCH(VertexAttrib4usvARB, (index, v), (F, "glVertexAttrib4usv(%d, %p);\n", index, (const void *) v));
+}
+
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4usvARB)(GLuint index, const GLushort * v)
 {
    DISPATCH(VertexAttrib4usvARB, (index, v), (F, "glVertexAttrib4usvARB(%d, %p);\n", index, (const void *) v));
@@ -6458,12 +6483,17 @@
    TABLE_ENTRY(VertexAttrib4Nubv),
    TABLE_ENTRY(VertexAttrib4Nuiv),
    TABLE_ENTRY(VertexAttrib4Nusv),
+   TABLE_ENTRY(VertexAttrib4bv),
    TABLE_ENTRY(VertexAttrib4d),
    TABLE_ENTRY(VertexAttrib4dv),
    TABLE_ENTRY(VertexAttrib4f),
    TABLE_ENTRY(VertexAttrib4fv),
+   TABLE_ENTRY(VertexAttrib4iv),
    TABLE_ENTRY(VertexAttrib4s),
    TABLE_ENTRY(VertexAttrib4sv),
+   TABLE_ENTRY(VertexAttrib4ubv),
+   TABLE_ENTRY(VertexAttrib4uiv),
+   TABLE_ENTRY(VertexAttrib4usv),
    TABLE_ENTRY(VertexAttribPointer),
    TABLE_ENTRY(BindBuffer),
    TABLE_ENTRY(BufferData),

Modified: haiku/trunk/src/kits/opengl/mesa/glapi/glprocs.h
===================================================================
--- haiku/trunk/src/kits/opengl/mesa/glapi/glprocs.h	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/src/kits/opengl/mesa/glapi/glprocs.h	2007-08-09 21:12:30 UTC (rev 21878)
@@ -957,12 +957,17 @@
     "glVertexAttrib4Nubv\0"
     "glVertexAttrib4Nuiv\0"
     "glVertexAttrib4Nusv\0"
+    "glVertexAttrib4bv\0"
     "glVertexAttrib4d\0"
     "glVertexAttrib4dv\0"
     "glVertexAttrib4f\0"
     "glVertexAttrib4fv\0"
+    "glVertexAttrib4iv\0"
     "glVertexAttrib4s\0"
     "glVertexAttrib4sv\0"
+    "glVertexAttrib4ubv\0"
+    "glVertexAttrib4uiv\0"
+    "glVertexAttrib4usv\0"
     "glVertexAttribPointer\0"
     "glBindBuffer\0"
     "glBufferData\0"
@@ -2100,142 +2105,147 @@
     NAME_FUNC_OFFSET(16268, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
     NAME_FUNC_OFFSET(16288, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
     NAME_FUNC_OFFSET(16308, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(16328, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(16345, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(16363, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(16380, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(16398, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(16415, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(16433, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(16455, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(16468, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(16481, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(16497, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(16513, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(16526, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(16549, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(16569, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(16588, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(16599, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(16611, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(16625, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(16638, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(16654, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(16665, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(16678, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(16697, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(16717, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(16730, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(16740, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(16756, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(16775, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(16793, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(16814, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(16829, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(16844, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(16858, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(16873, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(16885, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(16898, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(16910, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(16923, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(16935, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(16948, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(16960, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(16973, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(16985, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(16998, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17010, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17023, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17035, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(17048, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(17060, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(17073, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(17092, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(17111, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(17130, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(17143, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(17161, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(17182, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(17200, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(17220, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17234, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17251, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(17267, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(17286, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17304, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17325, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17347, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17366, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17388, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17411, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(17430, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(17450, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(17469, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(17489, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(17508, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(17528, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(17547, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(17567, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(17586, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(17606, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(17626, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(17647, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(17667, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(17688, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(17708, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(17729, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(17753, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(17771, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(17791, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(17809, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(17821, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(17834, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(17846, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(17859, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(17879, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(17903, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(17917, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(17934, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(17949, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(17967, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(17981, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(17998, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18013, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18031, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18045, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18062, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18077, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18095, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18109, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18126, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18141, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18159, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18173, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18190, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18205, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18223, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18237, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18254, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18269, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18287, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18301, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18318, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18333, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18351, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18365, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18382, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18397, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18415, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(18432, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(18452, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(18469, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18495, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18524, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(18539, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(18557, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(18576, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(18600, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(16328, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(16346, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(16363, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(16381, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(16398, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(16416, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(16434, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(16451, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(16469, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(16488, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(16507, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(16526, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(16548, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(16561, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(16574, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(16590, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(16606, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(16619, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(16642, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(16662, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(16681, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(16692, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(16704, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(16718, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(16731, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(16747, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(16758, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(16771, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(16790, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(16810, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(16823, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(16833, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(16849, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(16868, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(16886, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(16907, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(16922, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(16937, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(16951, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(16966, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(16978, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(16991, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(17003, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(17016, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(17028, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(17041, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(17053, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(17066, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(17078, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(17091, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(17103, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(17116, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(17128, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(17141, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(17153, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(17166, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(17185, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(17204, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(17223, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(17236, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(17254, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(17275, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(17293, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(17313, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17327, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17344, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(17360, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(17379, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17397, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17418, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17440, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17459, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17481, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17504, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(17523, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(17543, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(17562, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(17582, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(17601, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(17621, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(17640, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(17660, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(17679, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(17699, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(17719, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(17740, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(17760, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(17781, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(17801, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(17822, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(17846, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(17864, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(17884, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(17902, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(17914, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(17927, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(17939, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(17952, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(17972, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(17996, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18010, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18027, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18042, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18060, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18074, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18091, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18106, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18124, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18138, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18155, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18170, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18188, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18202, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18219, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18234, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18252, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18266, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18283, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18298, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18316, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18330, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18347, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18362, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18380, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18394, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18411, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18426, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18444, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18458, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18475, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18490, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(18508, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(18525, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(18545, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(18562, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18588, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(18617, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(18632, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(18650, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(18669, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(18693, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 

Modified: haiku/trunk/src/kits/opengl/mesa/main/api_validate.c
===================================================================
--- haiku/trunk/src/kits/opengl/mesa/main/api_validate.c	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/src/kits/opengl/mesa/main/api_validate.c	2007-08-09 21:12:30 UTC (rev 21878)
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  7.0.1
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -100,6 +100,11 @@
                          (const GLubyte *) indices);
       }
    }
+   else {
+      /* not using a VBO */
+      if (!indices)
+         return GL_FALSE;
+   }
 
    if (ctx->Const.CheckArrayBounds) {
       /* find max array index */
@@ -170,6 +175,16 @@
        && !(ctx->VertexProgram._Enabled && ctx->Array.ArrayObj->VertexAttrib[0].Enabled))
       return GL_FALSE;
 
+   /* Vertex buffer object tests */
+   if (ctx->Array.ElementArrayBufferObj->Name) {
+      /* XXX re-use code from above? */
+   }
+   else {
+      /* not using VBO */
+      if (!indices)
+         return GL_FALSE;
+   }
+
    if (ctx->Const.CheckArrayBounds) {
       /* Find max array index.
        * We don't trust the user's start and end values.

Modified: haiku/trunk/src/kits/opengl/mesa/main/dlist.c
===================================================================
--- haiku/trunk/src/kits/opengl/mesa/main/dlist.c	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/src/kits/opengl/mesa/main/dlist.c	2007-08-09 21:12:30 UTC (rev 21878)
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.1
+ * Version:  7.0.1
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -2716,22 +2716,21 @@
 }
 
 
-/*
- * Polygon stipple must have been upacked already!
- */
 static void GLAPIENTRY
 save_PolygonStipple(const GLubyte * pattern)
 {
    GET_CURRENT_CONTEXT(ctx);
+   GLvoid *image = unpack_image(2, 32, 32, 1, GL_COLOR_INDEX, GL_BITMAP,
+                                pattern, &ctx->Unpack);
    Node *n;
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
    n = ALLOC_INSTRUCTION(ctx, OPCODE_POLYGON_STIPPLE, 1);
    if (n) {
-      void *data;
-      n[1].data = _mesa_malloc(32 * 4);
-      data = n[1].data;         /* This needed for Acorn compiler */
-      MEMCPY(data, pattern, 32 * 4);
+      n[1].data = image; 
    }
+   else if (image) {
+      _mesa_free(image);
+   }
    if (ctx->ExecuteFlag) {
       CALL_PolygonStipple(ctx->Exec, ((GLubyte *) pattern));
    }
@@ -6169,7 +6168,12 @@
             CALL_PolygonMode(ctx->Exec, (n[1].e, n[2].e));
             break;
          case OPCODE_POLYGON_STIPPLE:
-            CALL_PolygonStipple(ctx->Exec, ((GLubyte *) n[1].data));
+            {
+               const struct gl_pixelstore_attrib save = ctx->Unpack;
+               ctx->Unpack = ctx->DefaultPacking;
+               CALL_PolygonStipple(ctx->Exec, ((GLubyte *) n[1].data));
+               ctx->Unpack = save;      /* restore */
+            }
             break;
          case OPCODE_POLYGON_OFFSET:
             CALL_PolygonOffset(ctx->Exec, (n[1].f, n[2].f));

Modified: haiku/trunk/src/kits/opengl/mesa/main/glheader.h
===================================================================
--- haiku/trunk/src/kits/opengl/mesa/main/glheader.h	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/src/kits/opengl/mesa/main/glheader.h	2007-08-09 21:12:30 UTC (rev 21878)
@@ -91,6 +91,9 @@
 #  pragma disable_message(201) /* Disable unreachable code warnings */
 #endif
 
+#ifdef WGLAPI
+#	undef WGLAPI
+#endif
 
 #if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
 #  if !defined(__GNUC__) /* mingw environment */

Modified: haiku/trunk/src/kits/opengl/mesa/main/image.c
===================================================================
--- haiku/trunk/src/kits/opengl/mesa/main/image.c	2007-08-09 21:03:38 UTC (rev 21877)
+++ haiku/trunk/src/kits/opengl/mesa/main/image.c	2007-08-09 21:12:30 UTC (rev 21878)
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.0
+ * Version:  7.0.1
  *
  * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
@@ -850,7 +850,7 @@
          return NULL;
       }
 
-      if (packing->SkipPixels == 0) {
+      if ((packing->SkipPixels & 7) == 0) {
          _mesa_memcpy( dst, src, width_in_bytes );
          if (packing->LsbFirst) {
             flip_bytes( dst, width_in_bytes );
@@ -942,7 +942,7 @@
       if (!dst)
          return;
 
-      if (packing->SkipPixels == 0) {
+      if ((packing->SkipPixels & 7) == 0) {
          _mesa_memcpy( dst, src, width_in_bytes );
          if (packing->LsbFirst) {
             flip_bytes( dst, width_in_bytes );
@@ -961,20 +961,20 @@
                if (*s & srcMask) {
                   *d |= dstMask;
                }
-               if (srcMask == 128) {
-                  srcMask = 1;
+               if (srcMask == 1) {
+                  srcMask = 128;
                   s++;
                }
                else {
-                  srcMask = srcMask << 1;
+                  srcMask = srcMask >> 1;
                }
-               if (dstMask == 1) {
-                  dstMask = 128;
+               if (dstMask == 128) {
+                  dstMask = 1;
                   d++;
                   *d = 0;
                }
                else {
-                  dstMask = dstMask >> 1;
+                  dstMask = dstMask << 1;
                }
             }
          }
@@ -3648,11 +3648,13 @@
     * Try simple cases first
     */
    if (transferOps == 0 &&
+       !ctx->Pixel.MapStencilFlag &&
        srcType == GL_UNSIGNED_BYTE &&
        dstType == GL_UNSIGNED_BYTE) {
       _mesa_memcpy(dest, source, n * sizeof(GLubyte));
    }
    else if (transferOps == 0 &&
+            !ctx->Pixel.MapStencilFlag &&
             srcType == GL_UNSIGNED_INT &&
             dstType == GL_UNSIGNED_INT &&
             !srcPacking->SwapBytes) {
@@ -3668,19 +3670,17 @@
       extract_uint_indexes(n, indexes, GL_STENCIL_INDEX, srcType, source,
                            srcPacking);
 
-      if (transferOps) {
-         if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
-            /* shift and offset indexes */
-            shift_and_offset_ci(ctx, n, indexes);
-         }
+      if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
+         /* shift and offset indexes */
+         shift_and_offset_ci(ctx, n, indexes);
+      }
 
-         if (ctx->Pixel.MapStencilFlag) {
-            /* Apply stencil lookup table */
-            GLuint mask = ctx->PixelMaps.StoS.Size - 1;
-            GLuint i;
-            for (i=0;i<n;i++) {
-               indexes[i] = ctx->PixelMaps.StoS.Map[ indexes[i] & mask ];
-            }
+      if (ctx->Pixel.MapStencilFlag) {
+         /* Apply stencil lookup table */
+         const GLuint mask = ctx->PixelMaps.StoS.Size - 1;
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            indexes[i] = ctx->PixelMaps.StoS.Map[ indexes[i] & mask ];
          }
       }
 
@@ -3733,7 +3733,7 @@
 
    switch (dstType) {
    case GL_UNSIGNED_BYTE:
-      if (sizeof(GLstencil) == 8) {
+      if (sizeof(GLstencil) == 1) {
          _mesa_memcpy( dest, source, n );
       }
       else {
@@ -3745,14 +3745,11 @@
       }
       break;
    case GL_BYTE:
-      if (sizeof(GLstencil) == 8) {
-         _mesa_memcpy( dest, source, n );
-      }
-      else {
+      {
          GLbyte *dst = (GLbyte *) dest;
          GLuint i;
          for (i=0;i<n;i++) {
-            dst[i] = (GLbyte) source[i];
+            dst[i] = (GLbyte) (source[i] & 0x7f);
          }
       }
       break;
@@ -3878,10 +3875,20 @@
                     SWAP4BYTE(value);                                   \
                 }                                                       \
             }                                                           \
-            depthValues[i] = CLAMP(GLTYPE2FLOAT(value), 0.0F, 1.0F);    \
+            depthValues[i] = GLTYPE2FLOAT(value);                       \
         }                                                               \
     } while (0)
 
+
+/**
+ * Unpack a row of depth/z values from memory, returning GLushort, GLuint
+ * or GLfloat values.
+ * The glPixelTransfer (scale/bias) params will be applied.
+ *
+ * \param dstType  one of GL_UNSIGNED_SHORT, GL_UNSIGNED_INT, GL_FLOAT
+ * \param depthScale  scale factor (max value) for returned GLushort or
+ *                    GLuint values (ignored for GLfloat).
+ */
 void
 _mesa_unpack_depth_span( const GLcontext *ctx, GLuint n,
                          GLenum dstType, GLvoid *dest, GLfloat depthScale,
@@ -3889,6 +3896,7 @@
                          const struct gl_pixelstore_attrib *srcPacking )
 {
    GLfloat depthTemp[MAX_WIDTH], *depthValues;
+   GLboolean needClamp = GL_FALSE;
 
    /* Look for special cases first.
     * Not only are these faster, they're less prone to numeric conversion
@@ -3906,7 +3914,9 @@
          }
          return;
       }
-      if (srcType == GL_UNSIGNED_SHORT && dstType == GL_UNSIGNED_INT) {
+      if (srcType == GL_UNSIGNED_SHORT
+          && dstType == GL_UNSIGNED_INT
+          && depthScale == (GLfloat) 0xffffffff) {
          const GLushort *src = (const GLushort *) source;
          GLuint *dst = (GLuint *) dest;
          GLuint i;
@@ -3918,7 +3928,7 @@
       /* XXX may want to add additional cases here someday */
    }
 
-   /* general case path */
+   /* general case path follows */
 
    if (dstType == GL_FLOAT) {
       depthValues = (GLfloat *) dest;
@@ -3927,29 +3937,31 @@
       depthValues = depthTemp;
    }
 
-   /* XXX we need to obey srcPacking->SwapBytes here!!! */
-   (void) srcPacking;
-
-   /* convert incoming values to GLfloat */
+   /* Convert incoming values to GLfloat.  Some conversions will require
+    * clamping, below.
+    */
    switch (srcType) {
       case GL_BYTE:
-          DEPTH_VALUES(GLbyte, BYTE_TO_FLOAT);
-          break;
+         DEPTH_VALUES(GLbyte, BYTE_TO_FLOAT);
+         needClamp = GL_TRUE;
+         break;
       case GL_UNSIGNED_BYTE:
-          DEPTH_VALUES(GLubyte, UBYTE_TO_FLOAT);
-          break;
+         DEPTH_VALUES(GLubyte, UBYTE_TO_FLOAT);
+         break;
       case GL_SHORT:
-          DEPTH_VALUES(GLshort, SHORT_TO_FLOAT);
-          break;
+         DEPTH_VALUES(GLshort, SHORT_TO_FLOAT);
+         needClamp = GL_TRUE;
+         break;
       case GL_UNSIGNED_SHORT:
-          DEPTH_VALUES(GLushort, USHORT_TO_FLOAT);
-          break;
+         DEPTH_VALUES(GLushort, USHORT_TO_FLOAT);
+         break;
       case GL_INT:
-          DEPTH_VALUES(GLint, INT_TO_FLOAT);
-          break;
+         DEPTH_VALUES(GLint, INT_TO_FLOAT);
+         needClamp = GL_TRUE;
+         break;
       case GL_UNSIGNED_INT:
-          DEPTH_VALUES(GLuint, UINT_TO_FLOAT);
-          break;
+         DEPTH_VALUES(GLuint, UINT_TO_FLOAT);
+         break;
       case GL_UNSIGNED_INT_24_8_EXT: /* GL_EXT_packed_depth_stencil */
          if (dstType == GL_UNSIGNED_INT &&
              depthScale == (GLfloat) 0xffffff &&
@@ -3981,19 +3993,21 @@
          }
          break;
       case GL_FLOAT:
-          DEPTH_VALUES(GLfloat, 1*);
-          break;
+         DEPTH_VALUES(GLfloat, 1*);
+         needClamp = GL_TRUE;
+         break;
       case GL_HALF_FLOAT_ARB:
          {
             GLuint i;
             const GLhalfARB *src = (const GLhalfARB *) source;
             for (i = 0; i < n; i++) {
-                GLhalfARB value = src[i];
-                if (srcPacking->SwapBytes) {
-                    SWAP2BYTE(value);
-                }
+               GLhalfARB value = src[i];
+               if (srcPacking->SwapBytes) {
+                  SWAP2BYTE(value);
+               }
                depthValues[i] = _mesa_half_to_float(value);
             }
+            needClamp = GL_TRUE;
          }
          break;
       default:
@@ -4001,12 +4015,30 @@
          return;
    }
 
+   /* apply depth scale and bias */
+   {
+      const GLfloat scale = ctx->Pixel.DepthScale;
+      const GLfloat bias = ctx->Pixel.DepthBias;
+      if (scale != 1.0 || bias != 0.0) {
+         GLuint i;
+         for (i = 0; i < n; i++) {
+            depthValues[i] = depthValues[i] * scale + bias;
+         }
+         needClamp = GL_TRUE;
+      }
+   }
 
-   /* apply depth scale and bias and clamp to [0,1] */
-   if (ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0) {
-      _mesa_scale_and_bias_depth(ctx, n, depthValues);
+   /* clamp to [0, 1] */
+   if (needClamp) {
+      GLuint i;
+      for (i = 0; i < n; i++) {
+         depthValues[i] = CLAMP(depthValues[i], 0.0, 1.0);
+      }
    }
 
+   /*
+    * Convert values to dstType
+    */

[... truncated: 919 lines follow ...]


From korli at mail.berlios.de  Thu Aug  9 23:33:32 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Thu, 9 Aug 2007 23:33:32 +0200
Subject: [Haiku-commits] r21879 - in haiku/trunk:
	headers/libs/freetype2/freetype
	headers/libs/freetype2/freetype/config
	headers/libs/freetype2/freetype/internal
	headers/libs/freetype2/freetype/internal/services
	src/libs/freetype2/autofit src/libs/freetype2/base
	src/libs/freetype2/bdf src/libs/freetype2/cache
	src/libs/freetype2/cff src/libs/freetype2/cid
	src/libs/freetype2/gzip src/libs/freetype2/lzw
	src/libs/freetype2/pfr src/libs/freetype2/psaux
	src/libs/freetype2/pshinter src/libs/freetype2/psnames
	src/libs/freetype2/sfnt src/libs/freetype2/smooth
	src/libs/freetype2/truetype src/libs/freetype2/type1
	src/libs/freetype2/type42 src/libs/freetype2/winfonts
Message-ID: <200708092133.l79LXWos006784@sheep.berlios.de>

Author: korli
Date: 2007-08-09 23:33:28 +0200 (Thu, 09 Aug 2007)
New Revision: 21879
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21879&view=rev

Added:
   haiku/trunk/headers/libs/freetype2/freetype/internal/services/svttglyf.h
   haiku/trunk/src/libs/freetype2/autofit/afindic.c
   haiku/trunk/src/libs/freetype2/autofit/afindic.h
   haiku/trunk/src/libs/freetype2/autofit/aflatin2.c
   haiku/trunk/src/libs/freetype2/autofit/aflatin2.h
   haiku/trunk/src/libs/freetype2/base/ftpatent.c
Modified:
   haiku/trunk/headers/libs/freetype2/freetype/config/ftoption.h
   haiku/trunk/headers/libs/freetype2/freetype/config/ftstdlib.h
   haiku/trunk/headers/libs/freetype2/freetype/freetype.h
   haiku/trunk/headers/libs/freetype2/freetype/ftcache.h
   haiku/trunk/headers/libs/freetype2/freetype/fterrdef.h
   haiku/trunk/headers/libs/freetype2/freetype/ftmodapi.h
   haiku/trunk/headers/libs/freetype2/freetype/ftstroke.h
   haiku/trunk/headers/libs/freetype2/freetype/fttypes.h
   haiku/trunk/headers/libs/freetype2/freetype/internal/ftobjs.h
   haiku/trunk/headers/libs/freetype2/freetype/internal/ftserv.h
   haiku/trunk/headers/libs/freetype2/freetype/internal/services/svttcmap.h
   haiku/trunk/headers/libs/freetype2/freetype/tttables.h
   haiku/trunk/src/libs/freetype2/autofit/Jamfile
   haiku/trunk/src/libs/freetype2/autofit/afcjk.c
   haiku/trunk/src/libs/freetype2/autofit/afglobal.c
   haiku/trunk/src/libs/freetype2/autofit/afglobal.h
   haiku/trunk/src/libs/freetype2/autofit/afhints.c
   haiku/trunk/src/libs/freetype2/autofit/afhints.h
   haiku/trunk/src/libs/freetype2/autofit/aflatin.c
   haiku/trunk/src/libs/freetype2/autofit/afloader.c
   haiku/trunk/src/libs/freetype2/autofit/aftypes.h
   haiku/trunk/src/libs/freetype2/autofit/autofit.c
   haiku/trunk/src/libs/freetype2/autofit/rules.mk
   haiku/trunk/src/libs/freetype2/base/Jamfile
   haiku/trunk/src/libs/freetype2/base/ftcalc.c
   haiku/trunk/src/libs/freetype2/base/ftglyph.c
   haiku/trunk/src/libs/freetype2/base/ftmac.c
   haiku/trunk/src/libs/freetype2/base/ftobjs.c
   haiku/trunk/src/libs/freetype2/base/ftoutln.c
   haiku/trunk/src/libs/freetype2/bdf/bdflib.c
   haiku/trunk/src/libs/freetype2/cache/ftcbasic.c
   haiku/trunk/src/libs/freetype2/cache/ftccache.c
   haiku/trunk/src/libs/freetype2/cache/ftccache.h
   haiku/trunk/src/libs/freetype2/cache/ftccmap.c
   haiku/trunk/src/libs/freetype2/cache/ftcglyph.h
   haiku/trunk/src/libs/freetype2/cff/cffgload.c
   haiku/trunk/src/libs/freetype2/cff/cffgload.h
   haiku/trunk/src/libs/freetype2/cid/cidgload.c
   haiku/trunk/src/libs/freetype2/cid/cidparse.c
   haiku/trunk/src/libs/freetype2/gzip/adler32.c
   haiku/trunk/src/libs/freetype2/gzip/zconf.h
   haiku/trunk/src/libs/freetype2/gzip/zutil.h
   haiku/trunk/src/libs/freetype2/lzw/ftzopen.c
   haiku/trunk/src/libs/freetype2/lzw/ftzopen.h
   haiku/trunk/src/libs/freetype2/pfr/pfrcmap.c
   haiku/trunk/src/libs/freetype2/pfr/pfrgload.c
   haiku/trunk/src/libs/freetype2/pfr/pfrtypes.h
   haiku/trunk/src/libs/freetype2/psaux/afmparse.c
   haiku/trunk/src/libs/freetype2/psaux/psobjs.c
   haiku/trunk/src/libs/freetype2/psaux/t1decode.c
   haiku/trunk/src/libs/freetype2/pshinter/pshmod.c
   haiku/trunk/src/libs/freetype2/pshinter/pshrec.c
   haiku/trunk/src/libs/freetype2/psnames/psmodule.c
   haiku/trunk/src/libs/freetype2/sfnt/sfobjs.c
   haiku/trunk/src/libs/freetype2/sfnt/ttcmap.c
   haiku/trunk/src/libs/freetype2/sfnt/ttkern.c
   haiku/trunk/src/libs/freetype2/sfnt/ttmtx.c
   haiku/trunk/src/libs/freetype2/sfnt/ttsbit0.c
   haiku/trunk/src/libs/freetype2/smooth/ftgrays.c
   haiku/trunk/src/libs/freetype2/truetype/ttdriver.c
   haiku/trunk/src/libs/freetype2/truetype/ttgload.c
   haiku/trunk/src/libs/freetype2/truetype/ttinterp.c
   haiku/trunk/src/libs/freetype2/truetype/ttobjs.c
   haiku/trunk/src/libs/freetype2/truetype/ttobjs.h
   haiku/trunk/src/libs/freetype2/type1/t1load.c
   haiku/trunk/src/libs/freetype2/type1/t1objs.c
   haiku/trunk/src/libs/freetype2/type42/t42objs.c
   haiku/trunk/src/libs/freetype2/type42/t42parse.c
   haiku/trunk/src/libs/freetype2/winfonts/winfnt.c
   haiku/trunk/src/libs/freetype2/winfonts/winfnt.h
Log:
updated freetype to 2.3.5


Modified: haiku/trunk/headers/libs/freetype2/freetype/config/ftoption.h
===================================================================
--- haiku/trunk/headers/libs/freetype2/freetype/config/ftoption.h	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/headers/libs/freetype2/freetype/config/ftoption.h	2007-08-09 21:33:28 UTC (rev 21879)
@@ -302,7 +302,9 @@
   /* The size in bytes of the render pool used by the scan-line converter  */
   /* to do all of its work.                                                */
   /*                                                                       */
-  /* This must be greater than 4KByte.                                     */
+  /* This must be greater than 4KByte if you use FreeType to rasterize     */
+  /* glyphs; otherwise, you may set it to zero to avoid unnecessary        */
+  /* allocation of the render pool.                                        */
   /*                                                                       */
 #define FT_RENDER_POOL_SIZE  16384L
 
@@ -461,13 +463,48 @@
 
   /*************************************************************************/
   /*                                                                       */
-  /* Define TT_CONFIG_OPTION_UNPATENTED_HINTING (in addition to            */
-  /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER) to compile the unpatented      */
-  /* work-around hinting system.  Note that for the moment, the algorithm  */
-  /* is only used when selected at runtime through the parameter tag       */
-  /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook               */
-  /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally activated.               */
+  /* If you define TT_CONFIG_OPTION_UNPATENTED_HINTING, a special version  */
+  /* of the TrueType bytecode interpreter is used that doesn't implement   */
+  /* any of the patented opcodes and algorithms.  Note that the            */
+  /* the TT_CONFIG_OPTION_UNPATENTED_HINTING macro is *ignored* if you     */
+  /* define TT_CONFIG_OPTION_BYTECODE_INTERPRETER; with other words,       */
+  /* either define TT_CONFIG_OPTION_BYTECODE_INTERPRETER or                */
+  /* TT_CONFIG_OPTION_UNPATENTED_HINTING but not both at the same time.    */
   /*                                                                       */
+  /* This macro is only useful for a small number of font files (mostly    */
+  /* for Asian scripts) that require bytecode interpretation to properly   */
+  /* load glyphs.  For all other fonts, this produces unpleasant results,  */
+  /* thus the unpatented interpreter is never used to load glyphs from     */
+  /* TrueType fonts unless one of the following two options is used.       */
+  /*                                                                       */
+  /*   - The unpatented interpreter is explicitly activated by the user    */
+  /*     through the FT_PARAM_TAG_UNPATENTED_HINTING parameter tag         */
+  /*     when opening the FT_Face.                                         */
+  /*                                                                       */
+  /*   - FreeType detects that the FT_Face corresponds to one of the       */
+  /*     `trick' fonts (e.g., `Mingliu') it knows about.  The font engine  */
+  /*     contains a hard-coded list of font names and other matching       */
+  /*     parameters (see function `tt_face_init' in file                   */
+  /*     `src/truetype/ttobjs.c').                                         */
+  /*                                                                       */
+  /* Here a sample code snippet for using FT_PARAM_TAG_UNPATENTED_HINTING. */
+  /*                                                                       */
+  /*   {                                                                   */
+  /*     FT_Parameter  parameter;                                          */
+  /*     FT_Open_Args  open_args;                                          */
+  /*                                                                       */
+  /*                                                                       */
+  /*     parameter.tag = FT_PARAM_TAG_UNPATENTED_HINTING;                  */
+  /*                                                                       */
+  /*     open_args.flags      = FT_OPEN_PATHNAME | FT_OPEN_PARAMS;         */
+  /*     open_args.pathname   = my_font_pathname;                          */
+  /*     open_args.num_params = 1;                                         */
+  /*     open_args.params     = &parameter;                                */
+  /*                                                                       */
+  /*     error = FT_Open_Face( library, &open_args, index, &face );        */
+  /*     ...                                                               */
+  /*   }                                                                   */
+  /*                                                                       */
 #define TT_CONFIG_OPTION_UNPATENTED_HINTING
 
 
@@ -591,6 +628,11 @@
   /*                                                                       */
 #define AF_CONFIG_OPTION_CJK
 
+  /*************************************************************************/
+  /*                                                                       */
+  /* Compile autofit module with Indic script support.                     */
+  /*                                                                       */
+#define AF_CONFIG_OPTION_INDIC
 
   /* */
 

Modified: haiku/trunk/headers/libs/freetype2/freetype/config/ftstdlib.h
===================================================================
--- haiku/trunk/headers/libs/freetype2/freetype/config/ftstdlib.h	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/headers/libs/freetype2/freetype/config/ftstdlib.h	2007-08-09 21:33:28 UTC (rev 21879)
@@ -78,15 +78,6 @@
   /**********************************************************************/
 
 
-#include <ctype.h>
-
-#define ft_isalnum   isalnum
-#define ft_isdigit   isdigit
-#define ft_islower   islower
-#define ft_isupper   isupper
-#define ft_isxdigit  isxdigit
-
-
 #include <string.h>
 
 #define ft_memchr   memchr

Modified: haiku/trunk/headers/libs/freetype2/freetype/freetype.h
===================================================================
--- haiku/trunk/headers/libs/freetype2/freetype/freetype.h	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/headers/libs/freetype2/freetype/freetype.h	2007-08-09 21:33:28 UTC (rev 21879)
@@ -648,8 +648,8 @@
   {
     FT_ENC_TAG( FT_ENCODING_NONE, 0, 0, 0, 0 ),
 
-    FT_ENC_TAG( FT_ENCODING_MS_SYMBOL,  's', 'y', 'm', 'b' ),
-    FT_ENC_TAG( FT_ENCODING_UNICODE,    'u', 'n', 'i', 'c' ),
+    FT_ENC_TAG( FT_ENCODING_MS_SYMBOL, 's', 'y', 'm', 'b' ),
+    FT_ENC_TAG( FT_ENCODING_UNICODE,   'u', 'n', 'i', 'c' ),
 
     FT_ENC_TAG( FT_ENCODING_SJIS,    's', 'j', 'i', 's' ),
     FT_ENC_TAG( FT_ENCODING_GB2312,  'g', 'b', ' ', ' ' ),
@@ -2111,9 +2111,16 @@
   /*    FreeType error code.  0 means success.                             */
   /*                                                                       */
   /* <Note>                                                                */
+  /*    If either the character width or height is zero, it is set equal   */
+  /*    to the other value.                                                */
+  /*                                                                       */
   /*    If either the horizontal or vertical resolution is zero, it is set */
-  /*    to a default value of 72dpi.                                       */
+  /*    equal to the other value.                                          */
   /*                                                                       */
+  /*    A character width or height smaller than 1pt is set to 1pt; if     */
+  /*    both resolution values are zero, they are set to 72dpi.            */
+  /*                                                                       */
+
   FT_EXPORT( FT_Error )
   FT_Set_Char_Size( FT_Face     face,
                     FT_F26Dot6  char_width,
@@ -2731,8 +2738,7 @@
   /*                                                                       */
   /* <Description>                                                         */
   /*    Retrieve the ASCII name of a given glyph in a face.  This only     */
-  /*    works for those faces where @FT_HAS_GLYPH_NAMES(face) returns      */
-  /*    TRUE.                                                              */
+  /*    works for those faces where @FT_HAS_GLYPH_NAMES(face) returns 1.   */
   /*                                                                       */
   /* <Input>                                                               */
   /*    face        :: A handle to a source face object.                   */
@@ -3323,7 +3329,7 @@
    */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  3
-#define FREETYPE_PATCH  4
+#define FREETYPE_PATCH  5
 
 
   /*************************************************************************/
@@ -3361,6 +3367,62 @@
                       FT_Int      *aminor,
                       FT_Int      *apatch );
 
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Face_CheckTrueTypePatents                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Parse all bytecode instructions of a TrueType font file to check   */
+  /*    whether any of the patented opcodes are used.  This is only useful */
+  /*    if you want to be able to use the unpatented hinter with           */
+  /*    fonts that do *not* use these opcodes.                             */
+  /*                                                                       */
+  /*    Note that this function parses *all* glyph instructions in the     */
+  /*    font file, which may be slow.                                      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face :: A face handle.                                             */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    1 if this is a TrueType font that uses one of the patented         */
+  /*    opcodes, 0 otherwise.                                              */
+  /*                                                                       */
+  /* <Since>                                                               */
+  /*    2.3.5                                                              */
+  /*                                                                       */
+  FT_EXPORT( FT_Bool )
+  FT_Face_CheckTrueTypePatents( FT_Face  face );
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Face_SetUnpatentedHinting                                       */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Enable or disable the unpatented hinter for a given face.          */
+  /*    Only enable it if you have determined that the face doesn't        */
+  /*    use any patented opcodes (see @FT_Face_CheckTrueTypePatents).      */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    face  :: A face handle.                                            */
+  /*                                                                       */
+  /*    value :: New boolean setting.                                      */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The old setting value.  This will always be false if this is not   */
+  /*    a SFNT font, or if the unpatented hinter is not compiled in this   */
+  /*    instance of the library.                                           */
+  /*                                                                       */
+  /* <Since>                                                               */
+  /*    2.3.5                                                              */
+  /*                                                                       */
+  FT_EXPORT( FT_Bool )
+  FT_Face_SetUnpatentedHinting( FT_Face  face,
+                                FT_Bool  value );
+
   /* */
 
 

Modified: haiku/trunk/headers/libs/freetype2/freetype/ftcache.h
===================================================================
--- haiku/trunk/headers/libs/freetype2/freetype/ftcache.h	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/headers/libs/freetype2/freetype/ftcache.h	2007-08-09 21:33:28 UTC (rev 21879)
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType Cache subsystem (specification).                            */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by                   */
+/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by             */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -411,14 +411,14 @@
   /*                                                                       */
   /*    height  :: The character height.                                   */
   /*                                                                       */
-  /*    pixel   :: A Boolean.  If TRUE, the `width' and `height' fields    */
-  /*               are interpreted as integer pixel character sizes.       */
+  /*    pixel   :: A Boolean.  If 1, the `width' and `height' fields are   */
+  /*               interpreted as integer pixel character sizes.           */
   /*               Otherwise, they are expressed as 1/64th of points.      */
   /*                                                                       */
-  /*    x_res   :: Only used when `pixel' is FALSE to indicate the         */
+  /*    x_res   :: Only used when `pixel' is value 0 to indicate the       */
   /*               horizontal resolution in dpi.                           */
   /*                                                                       */
-  /*    y_res   :: Only used when `pixel' is FALSE to indicate the         */
+  /*    y_res   :: Only used when `pixel' is value 0 to indicate the       */
   /*               vertical resolution in dpi.                             */
   /*                                                                       */
   /* <Note>                                                                */
@@ -778,6 +778,60 @@
 
   /*************************************************************************/
   /*                                                                       */
+  /* <Function>                                                            */
+  /*    FTC_ImageCache_LookupScaler                                        */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A variant of @FTC_ImageCache_Lookup that uses an @FTC_ScalerRec    */
+  /*    to specify the face ID and its size.                               */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    cache      :: A handle to the source glyph image cache.            */
+  /*                                                                       */
+  /*    scaler     :: A pointer to a scaler descriptor.                    */
+  /*                                                                       */
+  /*    load_flags :: The corresponding load flags.                        */
+  /*                                                                       */
+  /*    gindex     :: The glyph index to retrieve.                         */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    aglyph     :: The corresponding @FT_Glyph object.  0 in case of    */
+  /*                  failure.                                             */
+  /*                                                                       */
+  /*    anode      :: Used to return the address of of the corresponding   */
+  /*                  cache node after incrementing its reference count    */
+  /*                  (see note below).                                    */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The returned glyph is owned and managed by the glyph image cache.  */
+  /*    Never try to transform or discard it manually!  You can however    */
+  /*    create a copy with @FT_Glyph_Copy and modify the new one.          */
+  /*                                                                       */
+  /*    If `anode' is _not_ NULL, it receives the address of the cache     */
+  /*    node containing the glyph image, after increasing its reference    */
+  /*    count.  This ensures that the node (as well as the @FT_Glyph) will */
+  /*    always be kept in the cache until you call @FTC_Node_Unref to      */
+  /*    `release' it.                                                      */
+  /*                                                                       */
+  /*    If `anode' is NULL, the cache node is left unchanged, which means  */
+  /*    that the @FT_Glyph could be flushed out of the cache on the next   */
+  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
+  /*    is persistent!                                                     */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FTC_ImageCache_LookupScaler( FTC_ImageCache  cache,
+                               FTC_Scaler      scaler,
+                               FT_ULong        load_flags,
+                               FT_UInt         gindex,
+                               FT_Glyph       *aglyph,
+                               FTC_Node       *anode );
+
+
+  /*************************************************************************/
+  /*                                                                       */
   /* <Type>                                                                */
   /*    FTC_SBit                                                           */
   /*                                                                       */
@@ -930,6 +984,62 @@
                         FTC_Node        *anode );
 
 
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FTC_SBitCache_LookupScaler                                         */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A variant of @FTC_SBitCache_Lookup that uses an @FTC_ScalerRec     */
+  /*    to specify the face ID and its size.                               */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    cache      :: A handle to the source sbit cache.                   */
+  /*                                                                       */
+  /*    scaler     :: A pointer to the scaler descriptor.                  */
+  /*                                                                       */
+  /*    load_flags :: The corresponding load flags.                        */
+  /*                                                                       */
+  /*    gindex     :: The glyph index.                                     */
+  /*                                                                       */
+  /* <Output>                                                              */
+  /*    sbit       :: A handle to a small bitmap descriptor.               */
+  /*                                                                       */
+  /*    anode      :: Used to return the address of of the corresponding   */
+  /*                  cache node after incrementing its reference count    */
+  /*                  (see note below).                                    */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    FreeType error code.  0 means success.                             */
+  /*                                                                       */
+  /* <Note>                                                                */
+  /*    The small bitmap descriptor and its bit buffer are owned by the    */
+  /*    cache and should never be freed by the application.  They might    */
+  /*    as well disappear from memory on the next cache lookup, so don't   */
+  /*    treat them as persistent data.                                     */
+  /*                                                                       */
+  /*    The descriptor's `buffer' field is set to 0 to indicate a missing  */
+  /*    glyph bitmap.                                                      */
+  /*                                                                       */
+  /*    If `anode' is _not_ NULL, it receives the address of the cache     */
+  /*    node containing the bitmap, after increasing its reference count.  */
+  /*    This ensures that the node (as well as the image) will always be   */
+  /*    kept in the cache until you call @FTC_Node_Unref to `release' it.  */
+  /*                                                                       */
+  /*    If `anode' is NULL, the cache node is left unchanged, which means  */
+  /*    that the bitmap could be flushed out of the cache on the next      */
+  /*    call to one of the caching sub-system APIs.  Don't assume that it  */
+  /*    is persistent!                                                     */
+  /*                                                                       */
+  FT_EXPORT( FT_Error )
+  FTC_SBitCache_LookupScaler( FTC_SBitCache  cache,
+                              FTC_Scaler     scaler,
+                              FT_ULong       load_flags,
+                              FT_UInt        gindex,
+                              FTC_SBit      *sbit,
+                              FTC_Node      *anode );
+
+
  /* */
 
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS

Modified: haiku/trunk/headers/libs/freetype2/freetype/fterrdef.h
===================================================================
--- haiku/trunk/headers/libs/freetype2/freetype/fterrdef.h	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/headers/libs/freetype2/freetype/fterrdef.h	2007-08-09 21:33:28 UTC (rev 21879)
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType error codes (specification).                                */
 /*                                                                         */
-/*  Copyright 2002, 2004, 2006 by                                          */
+/*  Copyright 2002, 2004, 2006, 2007 by                                    */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -230,6 +230,10 @@
                 "`BBX' field missing" )
   FT_ERRORDEF_( Bbx_Too_Big,                                 0xB7, \
                 "`BBX' too big" )
+  FT_ERRORDEF_( Corrupted_Font_Header,                       0xB8, \
+                "Font header corrupted or missing fields" )
+  FT_ERRORDEF_( Corrupted_Font_Glyphs,                       0xB9, \
+                "Font glyphs corrupted or missing fields" )
 
 
 /* END */

Modified: haiku/trunk/headers/libs/freetype2/freetype/ftmodapi.h
===================================================================
--- haiku/trunk/headers/libs/freetype2/freetype/ftmodapi.h	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/headers/libs/freetype2/freetype/ftmodapi.h	2007-08-09 21:33:28 UTC (rev 21879)
@@ -316,7 +316,7 @@
   /**************************************************************************
    *
    * @section:
-   *   ttengine
+   *   truetype_engine
    *
    * @title:
    *   The TrueType Engine

Modified: haiku/trunk/headers/libs/freetype2/freetype/ftstroke.h
===================================================================
--- haiku/trunk/headers/libs/freetype2/freetype/ftstroke.h	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/headers/libs/freetype2/freetype/ftstroke.h	2007-08-09 21:33:28 UTC (rev 21879)
@@ -297,8 +297,8 @@
    *     The source outline.
    *
    *   opened ::
-   *     A boolean.  If TRUE, the outline is treated as an open path
-   *     instead of a closed one.
+   *     A boolean.  If 1, the outline is treated as an open path instead
+   *     of a closed one.
    *
    * @return:
    *   FreeType error code.  0 means success.
@@ -334,7 +334,7 @@
    *     A pointer to the start vector.
    *
    *   open ::
-   *     A boolean.  If TRUE, the sub-path is treated as an open one.
+   *     A boolean.  If 1, the sub-path is treated as an open one.
    *
    * @return:
    *   FreeType error code.  0 means success.
@@ -649,7 +649,7 @@
    *     A stroker handle.
    *
    *   destroy ::
-   *     A Boolean.  If TRUE, the source glyph object is destroyed
+   *     A Boolean.  If 1, the source glyph object is destroyed
    *     on success.
    *
    * @return:
@@ -682,11 +682,11 @@
    *     A stroker handle.
    *
    *   inside ::
-   *     A Boolean.  If TRUE, return the inside border, otherwise
+   *     A Boolean.  If 1, return the inside border, otherwise
    *     the outside border.
    *
    *   destroy ::
-   *     A Boolean.  If TRUE, the source glyph object is destroyed
+   *     A Boolean.  If 1, the source glyph object is destroyed
    *     on success.
    *
    * @return:

Modified: haiku/trunk/headers/libs/freetype2/freetype/fttypes.h
===================================================================
--- haiku/trunk/headers/libs/freetype2/freetype/fttypes.h	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/headers/libs/freetype2/freetype/fttypes.h	2007-08-09 21:33:28 UTC (rev 21879)
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType simple types definitions (specification only).              */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2004, 2006 by                               */
+/*  Copyright 1996-2001, 2002, 2004, 2006, 2007 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -94,7 +94,8 @@
   /*    FT_Bool                                                            */
   /*                                                                       */
   /* <Description>                                                         */
-  /*    A typedef of unsigned char, used for simple booleans.              */
+  /*    A typedef of unsigned char, used for simple booleans.  As usual,   */
+  /*    values 1 and 0 represent true and false, respectively.             */
   /*                                                                       */
   typedef unsigned char  FT_Bool;
 
@@ -384,7 +385,7 @@
   /*************************************************************************/
   /*                                                                       */
   /* <Struct>                                                              */
-  /*    FT_Data	                                                           */
+  /*    FT_Data                                                            */
   /*                                                                       */
   /* <Description>                                                         */
   /*    Read-only binary data represented as a pointer and a length.       */

Modified: haiku/trunk/headers/libs/freetype2/freetype/internal/ftobjs.h
===================================================================
--- haiku/trunk/headers/libs/freetype2/freetype/internal/ftobjs.h	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/headers/libs/freetype2/freetype/internal/ftobjs.h	2007-08-09 21:33:28 UTC (rev 21879)
@@ -89,6 +89,25 @@
   ft_highpow2( FT_UInt32  value );
 
 
+  /*
+   *  character classification functions -- since these are used to parse
+   *  font files, we must not use those in <ctypes.h> which are
+   *  locale-dependent
+   */
+#define  ft_isdigit( x )   ( ( (unsigned)(x) - '0' ) < 10U )
+
+#define  ft_isxdigit( x )  ( ( (unsigned)(x) - '0' ) < 10U || \
+                             ( (unsigned)(x) - 'a' ) < 6U  || \
+                             ( (unsigned)(x) - 'A' ) < 6U  )
+
+  /* the next two macros assume ASCII representation */
+#define  ft_isupper( x )  ( ( (unsigned)(x) - 'A' ) < 26U )
+#define  ft_islower( x )  ( ( (unsigned)(x) - 'a' ) < 26U )
+
+#define  ft_isalpha( x )  ( ft_isupper( x ) || ft_islower( x ) )
+#define  ft_isalnum( x )  ( ft_isdigit( x ) || ft_isalpha( x ) )
+
+
   /*************************************************************************/
   /*************************************************************************/
   /*************************************************************************/

Modified: haiku/trunk/headers/libs/freetype2/freetype/internal/ftserv.h
===================================================================
--- haiku/trunk/headers/libs/freetype2/freetype/internal/ftserv.h	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/headers/libs/freetype2/freetype/internal/ftserv.h	2007-08-09 21:33:28 UTC (rev 21879)
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType services (specification only).                          */
 /*                                                                         */
-/*  Copyright 2003, 2004, 2005, 2006 by                                    */
+/*  Copyright 2003, 2004, 2005, 2006, 2007 by                              */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -315,6 +315,7 @@
 #define FT_SERVICE_TT_CMAP_H            <freetype/internal/services/svttcmap.h>
 #define FT_SERVICE_WINFNT_H             <freetype/internal/services/svwinfnt.h>
 #define FT_SERVICE_XFREE86_NAME_H       <freetype/internal/services/svxf86nm.h>
+#define FT_SERVICE_TRUETYPE_GLYF_H      <freetype/internal/services/svttglyf.h>
 
  /* */
 

Modified: haiku/trunk/headers/libs/freetype2/freetype/internal/services/svttcmap.h
===================================================================
--- haiku/trunk/headers/libs/freetype2/freetype/internal/services/svttcmap.h	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/headers/libs/freetype2/freetype/internal/services/svttcmap.h	2007-08-09 21:33:28 UTC (rev 21879)
@@ -52,6 +52,7 @@
   typedef struct  TT_CMapInfo_
   {
     FT_ULong language;
+    FT_Long  format;
 
   } TT_CMapInfo;
 

Added: haiku/trunk/headers/libs/freetype2/freetype/internal/services/svttglyf.h
===================================================================
--- haiku/trunk/headers/libs/freetype2/freetype/internal/services/svttglyf.h	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/headers/libs/freetype2/freetype/internal/services/svttglyf.h	2007-08-09 21:33:28 UTC (rev 21879)
@@ -0,0 +1,48 @@
+/***************************************************************************/
+/*                                                                         */
+/*  svttglyf.h                                                             */
+/*                                                                         */
+/*    The FreeType TrueType glyph service.                                 */
+/*                                                                         */
+/*  Copyright 2007 by David Turner.                                        */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+#ifndef __SVTTGLYF_H__
+#define __SVTTGLYF_H__
+
+#include FT_INTERNAL_SERVICE_H
+#include FT_TRUETYPE_TABLES_H
+
+
+FT_BEGIN_HEADER
+
+
+#define FT_SERVICE_ID_TT_GLYF "tt-glyf"
+
+
+  typedef FT_ULong
+  (*TT_Glyf_GetLocationFunc)( FT_Face    face,
+                              FT_UInt    gindex,
+                              FT_ULong  *psize );
+
+  FT_DEFINE_SERVICE( TTGlyf )
+  {
+    TT_Glyf_GetLocationFunc  get_location;
+  };
+
+  /* */
+
+
+FT_END_HEADER
+
+#endif /* __SVTTGLYF_H__ */
+
+
+/* END */

Modified: haiku/trunk/headers/libs/freetype2/freetype/tttables.h
===================================================================
--- haiku/trunk/headers/libs/freetype2/freetype/tttables.h	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/headers/libs/freetype2/freetype/tttables.h	2007-08-09 21:33:28 UTC (rev 21879)
@@ -595,7 +595,7 @@
   /*                                                                       */
   /*    This function is only useful to access SFNT tables that are loaded */
   /*    by the sfnt, truetype, and opentype drivers.  See @FT_Sfnt_Tag for */
-  /*    a list.                                                             */
+  /*    a list.                                                            */
   /*                                                                       */
   FT_EXPORT( void* )
   FT_Get_Sfnt_Table( FT_Face      face,
@@ -725,6 +725,26 @@
   FT_EXPORT( FT_ULong )
   FT_Get_CMap_Language_ID( FT_CharMap  charmap );
 
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Function>                                                            */
+  /*    FT_Get_CMap_Format                                                 */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    Return TrueType/sfnt specific cmap format.                         */
+  /*                                                                       */
+  /* <Input>                                                               */
+  /*    charmap ::                                                         */
+  /*      The target charmap.                                              */
+  /*                                                                       */
+  /* <Return>                                                              */
+  /*    The format of `charmap'.  If `charmap' doesn't belong to a         */
+  /*    TrueType/sfnt face, return -1.                                     */
+  /*                                                                       */
+  FT_EXPORT( FT_Long )
+  FT_Get_CMap_Format( FT_CharMap  charmap );
+
   /* */
 
 

Modified: haiku/trunk/src/libs/freetype2/autofit/Jamfile
===================================================================
--- haiku/trunk/src/libs/freetype2/autofit/Jamfile	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/src/libs/freetype2/autofit/Jamfile	2007-08-09 21:33:28 UTC (rev 21879)
@@ -21,7 +21,7 @@
 
   if $(FT2_MULTI)
   {
-    _sources = afangles afglobal afhints aflatin afloader afmodule afdummy afwarp ;
+    _sources = afangles afglobal afhints aflatin afcjk afindic afloader afmodule afdummy afwarp ;
   }
   else
   {

Modified: haiku/trunk/src/libs/freetype2/autofit/afcjk.c
===================================================================
--- haiku/trunk/src/libs/freetype2/autofit/afcjk.c	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/src/libs/freetype2/autofit/afcjk.c	2007-08-09 21:33:28 UTC (rev 21879)
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter hinting routines for CJK script (body).                  */
 /*                                                                         */
-/*  Copyright 2006 by                                                      */
+/*  Copyright 2006, 2007 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -332,7 +332,6 @@
     AF_Segment    segment_limit = segments + axis->num_segments;
     AF_Segment    seg;
 
-    AF_Direction  up_dir;
     FT_Fixed      scale;
     FT_Pos        edge_distance_threshold;
 
@@ -342,9 +341,6 @@
     scale = ( dim == AF_DIMENSION_HORZ ) ? hints->x_scale
                                          : hints->y_scale;
 
-    up_dir = ( dim == AF_DIMENSION_HORZ ) ? AF_DIR_UP
-                                          : AF_DIR_RIGHT;
-
     /*********************************************************************/
     /*                                                                   */
     /* We begin by generating a sorted table of edges for the current    */
@@ -431,7 +427,7 @@
 
         /* insert a new edge in the list and */
         /* sort according to the position    */
-        error = af_axis_hints_new_edge( axis, seg->pos, memory, &edge );
+        error = af_axis_hints_new_edge( axis, seg->pos, seg->dir, memory, &edge );
         if ( error )
           goto Exit;
 
@@ -1365,7 +1361,7 @@
     FT_UNUSED( metrics );
 
 
-    error = af_glyph_hints_reload( hints, outline );
+    error = af_glyph_hints_reload( hints, outline, 0 );
     if ( error )
       goto Exit;
 

Modified: haiku/trunk/src/libs/freetype2/autofit/afglobal.c
===================================================================
--- haiku/trunk/src/libs/freetype2/autofit/afglobal.c	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/src/libs/freetype2/autofit/afglobal.c	2007-08-09 21:33:28 UTC (rev 21879)
@@ -20,21 +20,29 @@
 #include "afdummy.h"
 #include "aflatin.h"
 #include "afcjk.h"
+#include "afindic.h"
+
 #include "aferrors.h"
 
+#ifdef FT_OPTION_AUTOFIT2
+#include "aflatin2.h"
+#endif
 
   /* populate this list when you add new scripts */
   static AF_ScriptClass const  af_script_classes[] =
   {
     &af_dummy_script_class,
+#ifdef FT_OPTION_AUTOFIT2
+    &af_latin2_script_class,
+#endif
     &af_latin_script_class,
     &af_cjk_script_class,
-
+    &af_indic_script_class, 
     NULL  /* do not remove */
   };
 
   /* index of default script in `af_script_classes' */
-#define AF_SCRIPT_LIST_DEFAULT  1
+#define AF_SCRIPT_LIST_DEFAULT  2
   /* indicates an uncovered glyph                   */
 #define AF_SCRIPT_LIST_NONE   255
 
@@ -217,12 +225,16 @@
   FT_LOCAL_DEF( FT_Error )
   af_face_globals_get_metrics( AF_FaceGlobals     globals,
                                FT_UInt            gindex,
+                               FT_UInt            options,
                                AF_ScriptMetrics  *ametrics )
   {
     AF_ScriptMetrics  metrics = NULL;
     FT_UInt           gidx;
     AF_ScriptClass    clazz;
-    FT_Error          error = AF_Err_Ok;
+    FT_UInt           script     = options & 15;
+    const FT_UInt     script_max = sizeof ( af_script_classes ) /
+                                     sizeof ( af_script_classes[0] );
+    FT_Error          error      = AF_Err_Ok;
 
 
     if ( gindex >= globals->glyph_count )
@@ -231,8 +243,14 @@
       goto Exit;
     }
 
-    gidx    = globals->glyph_scripts[gindex];
-    clazz   = af_script_classes[gidx];
+    gidx = script;
+    if ( gidx == 0 || gidx + 1 >= script_max )
+      gidx = globals->glyph_scripts[gindex];
+
+    clazz = af_script_classes[gidx];
+    if ( script == 0 )
+      script = clazz->script;
+
     metrics = globals->metrics[clazz->script];
     if ( metrics == NULL )
     {

Modified: haiku/trunk/src/libs/freetype2/autofit/afglobal.h
===================================================================
--- haiku/trunk/src/libs/freetype2/autofit/afglobal.h	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/src/libs/freetype2/autofit/afglobal.h	2007-08-09 21:33:28 UTC (rev 21879)
@@ -5,7 +5,7 @@
 /*    Auto-fitter routines to compute global hinting values                */
 /*    (specification).                                                     */
 /*                                                                         */
-/*  Copyright 2003, 2004, 2005 by                                          */
+/*  Copyright 2003, 2004, 2005, 2007 by                                    */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -50,6 +50,7 @@
   FT_LOCAL( FT_Error )
   af_face_globals_get_metrics( AF_FaceGlobals     globals,
                                FT_UInt            gindex,
+                               FT_UInt            options,
                                AF_ScriptMetrics  *ametrics );
 
   FT_LOCAL( void )

Modified: haiku/trunk/src/libs/freetype2/autofit/afhints.c
===================================================================
--- haiku/trunk/src/libs/freetype2/autofit/afhints.c	2007-08-09 21:12:30 UTC (rev 21878)
+++ haiku/trunk/src/libs/freetype2/autofit/afhints.c	2007-08-09 21:33:28 UTC (rev 21879)
@@ -54,9 +54,6 @@
     }
 
     segment = axis->segments + axis->num_segments++;
-#if 0
-    FT_ZERO( segment );
-#endif
 
   Exit:
     *asegment = segment;
@@ -67,6 +64,7 @@
   FT_LOCAL( FT_Error )
   af_axis_hints_new_edge( AF_AxisHints  axis,
                           FT_Int        fpos,
+                          AF_Direction  dir,
                           FT_Memory     memory,
                           AF_Edge      *aedge )
   {
@@ -101,8 +99,16 @@
     edges = axis->edges;
     edge  = edges + axis->num_edges;
 
-    while ( edge > edges && edge[-1].fpos > fpos )
+    while ( edge > edges )
     {
+      if ( edge[-1].fpos < fpos )
+        break;
+
+      /* we want the edge with same position and minor direction */
+      /* to appear before those in the major one in the list     */
+      if ( edge[-1].fpos == fpos && dir == axis->major_dir )
+        break;
+
       edge[0] = edge[-1];
       edge--;
     }
@@ -111,6 +117,7 @@
 
     FT_ZERO( edge );
     edge->fpos = (FT_Short)fpos;
+    edge->dir  = (FT_Char)dir;
 
   Exit:
     *aedge = edge;
@@ -187,6 +194,34 @@
   }
 
 
+  static const char*
+  af_edge_flags_to_string( AF_Edge_Flags  flags )
+  {
+    static char  temp[32];
+    int          pos = 0;
+
+
+    if ( flags & AF_EDGE_ROUND )
+    {
+      memcpy( temp + pos, "round", 5 );
+      pos += 5;
+    }
+    if ( flags & AF_EDGE_SERIF )
+    {
+      if ( pos > 0 )
+        temp[pos++] = ' ';
+      memcpy( temp + pos, "serif", 5 );
+      pos += 5;
+    }
+    if ( pos == 0 )
+      return "normal";
+
+    temp[pos] = 0;
+
+    return temp;
+  }
+
+
   /* A function to dump the array of linked segments. */
   void
   af_glyph_hints_dump_segments( AF_GlyphHints  hints )
@@ -204,19 +239,21 @@
 
       printf ( "Table of %s segments:\n",
                dimension == AF_DIMENSION_HORZ ? "vertical" : "horizontal" );
-      printf ( "  [ index |  pos |  dir  | link | serif |"
-               " height  | extra ]\n" );
+      printf ( "  [ index |  pos  |  dir  | link | serif |"
+               " height  | extra | flags    ]\n" );
 
       for ( seg = segments; seg < limit; seg++ )
       {
-        printf ( "  [ %5d | %4d | %5s | %4d | %5d | %5d | %5d ]\n",
+        printf ( "  [ %5d | %5.2g | %5s | %4d | %5d | %5d | %5d | %s ]\n",
                  seg - segments,
-                 (int)seg->pos,
+                 dimension == AF_DIMENSION_HORZ ? (int)seg->first->ox / 64.0
+                                                : (int)seg->first->oy / 64.0,
                  af_dir_str( (AF_Direction)seg->dir ),
                  AF_INDEX_NUM( seg->link, segments ),
                  AF_INDEX_NUM( seg->serif, segments ),
                  seg->height,
-                 seg->height - ( seg->max_coord - seg->min_coord ) );
+                 seg->height - ( seg->max_coord - seg->min_coord ),
+                 af_edge_flags_to_string( seg->flags ) );
       }
       printf( "\n" );
     }
@@ -243,21 +280,22 @@
        */
       printf ( "Table of %s edges:\n",
                dimension == AF_DIMENSION_HORZ ? "vertical" : "horizontal" );
-      printf ( "  [ index |  pos |  dir  | link |"
-               " serif | blue | opos  |  pos  ]\n" );
+      printf ( "  [ index |  pos  |  dir  | link |"
+               " serif | blue | opos  |  pos  | flags   ]\n" );
 
       for ( edge = edges; edge < limit; edge++ )
       {
-        printf ( "  [ %5d | %4d | %5s | %4d |"
-                 " %5d |   %c  | %5.2f | %5.2f ]\n",
+        printf ( "  [ %5d | %5.2g | %5s | %4d |"
+                 " %5d |   %c  | %5.2f | %5.2f | %s ]\n",
                  edge - edges,
-                 (int)edge->fpos,
+                 (int)edge->opos / 64.0,
                  af_dir_str( (AF_Direction)edge->dir ),
                  AF_INDEX_NUM( edge->link, edges ),
                  AF_INDEX_NUM( edge->serif, edges ),
                  edge->blue_edge ? 'y' : 'n',
                  edge->opos / 64.0,
-                 edge->pos / 64.0 );
+                 edge->pos / 64.0,
+                 af_edge_flags_to_string( edge->flags ) );
       }
       printf( "\n" );
     }
@@ -296,9 +334,6 @@
   af_direction_compute( FT_Pos  dx,
                         FT_Pos  dy )
   {
-
-#if 1
-
     FT_Pos        ll, ss;  /* long and short arm lengths */
     AF_Direction  dir;     /* candidate direction        */
 
@@ -334,45 +369,16 @@
       }
     }
 
-    ss *= 12;
-    if ( FT_ABS(ll) <= FT_ABS(ss) )
+    ss *= 14;
+    if ( FT_ABS( ll ) <= FT_ABS( ss ) )
       dir = AF_DIR_NONE;
 
     return dir;
-
-#else /* 0 */
-
-    AF_Direction  dir;
-    FT_Pos        ax = FT_ABS( dx );
-    FT_Pos        ay = FT_ABS( dy );
-
-
-    dir = AF_DIR_NONE;
-
-    /* atan(1/12) == 4.7 degrees */
-
-    /* test for vertical direction */
-    if ( ax * 12 < ay )
-    {
-      dir = dy > 0 ? AF_DIR_UP : AF_DIR_DOWN;
-    }
-    /* test for horizontal direction */
-    else if ( ay * 12 < ax )
-    {
-      dir = dx > 0 ? AF_DIR_RIGHT : AF_DIR_LEFT;
-    }
-
-    return dir;

[... truncated: 7636 lines follow ...]


From korli at mail.berlios.de  Thu Aug  9 23:53:36 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Thu, 9 Aug 2007 23:53:36 +0200
Subject: [Haiku-commits] r21880 - haiku/trunk/src/servers/app
Message-ID: <200708092153.l79Lra4U008045@sheep.berlios.de>

Author: korli
Date: 2007-08-09 23:53:36 +0200 (Thu, 09 Aug 2007)
New Revision: 21880
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21880&view=rev

Modified:
   haiku/trunk/src/servers/app/GlyphLayoutEngine.h
Log:
missing ctype.h


Modified: haiku/trunk/src/servers/app/GlyphLayoutEngine.h
===================================================================
--- haiku/trunk/src/servers/app/GlyphLayoutEngine.h	2007-08-09 21:33:28 UTC (rev 21879)
+++ haiku/trunk/src/servers/app/GlyphLayoutEngine.h	2007-08-09 21:53:36 UTC (rev 21880)
@@ -15,6 +15,7 @@
 #include "FontCacheEntry.h"
 #include "ServerFont.h"
 
+#include <ctype.h>
 
 class FontCacheReference {
  public:



From korli at mail.berlios.de  Fri Aug 10 00:31:02 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Fri, 10 Aug 2007 00:31:02 +0200
Subject: [Haiku-commits] r21881 -
	haiku/trunk/src/add-ons/input_server/devices/keyboard
Message-ID: <200708092231.l79MV21X011511@sheep.berlios.de>

Author: korli
Date: 2007-08-10 00:31:01 +0200 (Fri, 10 Aug 2007)
New Revision: 21881
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21881&view=rev

Modified:
   haiku/trunk/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
   haiku/trunk/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h
Log:
added a lock around keymap uses to avoid a reload in the middle of the key event process
this fixes bug #1177


Modified: haiku/trunk/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp	2007-08-09 21:53:36 UTC (rev 21880)
+++ haiku/trunk/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp	2007-08-09 22:31:01 UTC (rev 21881)
@@ -8,6 +8,7 @@
 #include "kb_mouse_driver.h"
 
 #include <Application.h>
+#include <Autolock.h>
 #include <Directory.h>
 #include <Entry.h>
 #include <NodeMonitor.h>
@@ -365,7 +366,8 @@
 
 KeyboardInputDevice::KeyboardInputDevice()
 	:
-	fTMWindow(NULL)
+	fTMWindow(NULL),
+	fKeymapLock("keymap lock")
 {
 #if DEBUG
 	if (sLogFile == NULL)
@@ -428,7 +430,8 @@
 
 	if (opcode == 0 
 		|| opcode == B_KEY_MAP_CHANGED 
-		|| opcode == B_KEY_LOCKS_CHANGED) {	
+		|| opcode == B_KEY_LOCKS_CHANGED) {
+		BAutolock lock(fKeymapLock);
 		fKeymap.LoadCurrent();
 		device->modifiers = fKeymap.Locks();
 		_SetLeds(device);
@@ -697,6 +700,8 @@
 			}
 		}
 
+		BAutolock lock(owner->fKeymapLock);
+
 		uint32 modifiers = keymap->Modifier(keycode);
 		if (modifiers 
 			&& (!(modifiers & (B_CAPS_LOCK | B_NUM_LOCK | B_SCROLL_LOCK)) 

Modified: haiku/trunk/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h
===================================================================
--- haiku/trunk/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h	2007-08-09 21:53:36 UTC (rev 21880)
+++ haiku/trunk/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.h	2007-08-09 22:31:01 UTC (rev 21881)
@@ -12,6 +12,7 @@
 
 #include <Handler.h>
 #include <InputServerDevice.h>
+#include <Locker.h>
 #include <List.h>
 
 #include <stdio.h>
@@ -74,6 +75,7 @@
 		BList fDevices;
 		Keymap	fKeymap;
 		TMWindow *fTMWindow;
+		BLocker	fKeymapLock;
 };
 
 extern "C" BInputServerDevice *instantiate_input_device();



From mmlr at mail.berlios.de  Fri Aug 10 09:10:20 2007
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Fri, 10 Aug 2007 09:10:20 +0200
Subject: [Haiku-commits] r21882 - haiku/trunk/src/add-ons/kernel/busses/usb
Message-ID: <200708100710.l7A7AK9D000957@sheep.berlios.de>

Author: mmlr
Date: 2007-08-10 09:10:14 +0200 (Fri, 10 Aug 2007)
New Revision: 21882
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21882&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/busses/usb/uhci.cpp
   haiku/trunk/src/add-ons/kernel/busses/usb/uhci.h
Log:
Change the way UHCI does things. Restructured processing of transfers in the finisher thread:
* Transfer removal is now done only from the finisher
* Processing is only done after the transfer has been removed from the list
* Canceling transfers only sets a flag so the finisher can remove the transfer
* The callback at cancel is done synchronously though

This fixes quite a few race conditions where transfers were processed while they where already removed. It could happen before that callbacks would have been called twice or freed descriptors/callback buffers were accessed.

Modified: haiku/trunk/src/add-ons/kernel/busses/usb/uhci.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/usb/uhci.cpp	2007-08-09 22:31:01 UTC (rev 21881)
+++ haiku/trunk/src/add-ons/kernel/busses/usb/uhci.cpp	2007-08-10 07:10:14 UTC (rev 21882)
@@ -487,6 +487,9 @@
 	Lock();
 	transfer_data *transfer = fFirstTransfer;
 	while (transfer) {
+		transfer->transfer->Finished(B_CANCELED, 0);
+		delete transfer->transfer;
+
 		transfer_data *next = transfer->link;
 		delete transfer;
 		transfer = next;
@@ -611,31 +614,20 @@
 	if (!Lock())
 		return B_ERROR;
 
-	transfer_data *last = NULL;
 	transfer_data *current = fFirstTransfer;
 	while (current) {
 		if (current->transfer->TransferPipe() == pipe) {
-			current->queue->RemoveTransfer(current->transfer_queue);
-			FreeDescriptorChain(current->first_descriptor);
-			FreeTransferQueue(current->transfer_queue);
+			// clear the active bit so the descriptors are canceled
+			uhci_td *descriptor = current->first_descriptor;
+			while (descriptor) {
+				descriptor->status &= ~TD_STATUS_ACTIVE;
+				descriptor = (uhci_td *)descriptor->link_log;
+			}
+
 			current->transfer->Finished(B_CANCELED, 0);
-			delete current->transfer;
-
-			transfer_data *next = current->link;
-			if (last)
-				last->link = next;
-			else
-				fFirstTransfer = next;
-
-			if (fLastTransfer == current)
-				fLastTransfer = last;
-
-			delete current;
-			current = next;
-		} else {
-			last = current;
-			current = current->link;
+			current->canceled = true;
 		}
+		current = current->link;
 	}
 
 	Unlock();
@@ -754,7 +746,7 @@
 	if (!transfer || !queue || !transferQueue || !firstDescriptor)
 		return B_BAD_VALUE;
 
-	transfer_data *data = new(std::nothrow) transfer_data();
+	transfer_data *data = new(std::nothrow) transfer_data;
 	if (!data)
 		return B_NO_MEMORY;
 
@@ -768,6 +760,7 @@
 	data->first_descriptor = firstDescriptor;
 	data->data_descriptor = dataDescriptor;
 	data->incoming = directionIn;
+	data->canceled = false;
 	data->link = NULL;
 
 	if (!Lock()) {
@@ -1038,23 +1031,22 @@
 		while (transfer) {
 			bool transferDone = false;
 			uhci_td *descriptor = transfer->first_descriptor;
+			status_t callbackStatus = B_OK;
 
 			while (descriptor) {
 				uint32 status = descriptor->status;
 				if (status & TD_STATUS_ACTIVE) {
+					// still in progress
 					TRACE(("usb_uhci: td (0x%08lx) still active\n", descriptor->this_phy));
-					// still in progress
 					break;
 				}
 
 				if (status & TD_ERROR_MASK) {
+					// an error occured
 					TRACE_ERROR(("usb_uhci: td (0x%08lx) error: status: 0x%08lx;"
 						" token: 0x%08lx;\n", descriptor->this_phy, status,
 						descriptor->token));
-					// an error occured. we have to remove the
-					// transfer from the queue and clean up
 
-					status_t callbackStatus = B_ERROR;
 					uint8 errorCount = status >> TD_ERROR_COUNT_SHIFT;
 					errorCount &= TD_ERROR_COUNT_MASK;
 					if (errorCount == 0) {
@@ -1089,23 +1081,49 @@
 						callbackStatus = B_DEV_STALLED;
 					}
 
-					transfer->queue->RemoveTransfer(transfer->transfer_queue);
-					FreeDescriptorChain(transfer->first_descriptor);
-					FreeTransferQueue(transfer->transfer_queue);
-					transfer->transfer->Finished(callbackStatus, 0);
 					transferDone = true;
 					break;
 				}
 
-				// either all descriptors are done, or we have a short packet
 				if ((descriptor->link_phy & TD_TERMINATE)
 					|| (descriptor->status & TD_STATUS_ACTLEN_MASK)
 					< (descriptor->token >> TD_TOKEN_MAXLEN_SHIFT)) {
+					// all descriptors are done, or we have a short packet
 					TRACE(("usb_uhci: td (0x%08lx) ok\n", descriptor->this_phy));
-					// we got through without errors so we are finished
-					transfer->queue->RemoveTransfer(transfer->transfer_queue);
+					callbackStatus = B_OK;
+					transferDone = true;
+					break;
+				}
 
-					size_t actualLength = 0;
+				descriptor = (uhci_td *)descriptor->link_log;
+			}
+
+			if (!transferDone) {
+				lastTransfer = transfer;
+				transfer = transfer->link;
+				continue;
+			}
+
+			// remove the transfer from the list first so we are sure
+			// it doesn't get canceled while we still process it
+			transfer_data *next = transfer->link;
+			if (Lock()) {
+				if (lastTransfer)
+					lastTransfer->link = transfer->link;
+
+				if (transfer == fFirstTransfer)
+					fFirstTransfer = transfer->link;
+				if (transfer == fLastTransfer)
+					fLastTransfer = lastTransfer;
+
+				transfer->link = NULL;
+				Unlock();
+			}
+
+			// if canceled the callback has already been called
+			if (!transfer->canceled) {
+				size_t actualLength = 0;
+				if (callbackStatus == B_OK) {
 					uint8 lastDataToggle = 0;
 					if (transfer->data_descriptor && transfer->incoming) {
 						// data to read out
@@ -1124,63 +1142,59 @@
 					}
 
 					transfer->transfer->TransferPipe()->SetDataToggle(lastDataToggle == 0);
-					FreeDescriptorChain(transfer->first_descriptor);
-					FreeTransferQueue(transfer->transfer_queue);
+
 					if (transfer->transfer->IsFragmented()) {
 						// this transfer may still have data left
 						TRACE(("usb_uhci: advancing fragmented transfer\n"));
 						transfer->transfer->AdvanceByFragment(actualLength);
 						if (transfer->transfer->VectorLength() > 0) {
-							TRACE(("usb_uhci: still %ld bytes left on transfer\n", transfer->transfer->VectorLength()));
+							TRACE(("usb_uhci: still %ld bytes left on transfer\n",
+								transfer->transfer->VectorLength()));
+
+							// free the used descriptors
+							transfer->queue->RemoveTransfer(transfer->transfer_queue);
+							FreeDescriptorChain(transfer->first_descriptor);
+
 							// resubmit the advanced transfer so the rest
 							// of the buffers are transmitted over the bus
 							transfer->transfer->PrepareKernelAccess();
 							status_t result = CreateFilledTransfer(transfer->transfer,
 								&transfer->first_descriptor,
 								&transfer->transfer_queue);
-							if (result < B_OK) {
-								transfer->transfer->Finished(result, 0);
-								transferDone = true;
-							};
+							transfer->data_descriptor = transfer->first_descriptor;
+							if (result == B_OK && Lock()) {
+								// reappend the transfer
+								if (fLastTransfer)
+									fLastTransfer->link = transfer;
+								if (!fFirstTransfer)
+									fFirstTransfer = transfer;
 
-							transfer->data_descriptor = transfer->first_descriptor;
-							transfer->queue->AppendTransfer(transfer->transfer_queue);
-							break;
+								fLastTransfer = transfer;
+								Unlock();
+
+								transfer->queue->AppendTransfer(transfer->transfer_queue);
+								transfer = next;
+								continue;
+							}
 						}
 
 						// the transfer is done, but we already set the
 						// actualLength with AdvanceByFragment()
 						actualLength = 0;
 					}
-
-					transfer->transfer->Finished(B_OK, actualLength);
-					transferDone = true;
-					break;
 				}
 
-				descriptor = (uhci_td *)descriptor->link_log;
+				transfer->transfer->Finished(callbackStatus, actualLength);
 			}
 
-			if (transferDone) {
-				if (Lock()) {
-					if (lastTransfer)
-						lastTransfer->link = transfer->link;
+			// remove and free the hardware queue and its descriptors
+			transfer->queue->RemoveTransfer(transfer->transfer_queue);
+			FreeDescriptorChain(transfer->first_descriptor);
+			FreeTransferQueue(transfer->transfer_queue);
 
-					if (transfer == fFirstTransfer)
-						fFirstTransfer = transfer->link;
-					if (transfer == fLastTransfer)
-						fLastTransfer = lastTransfer;
-
-					transfer_data *next = transfer->link;
-					delete transfer->transfer;
-					delete transfer;
-					transfer = next;
-					Unlock();
-				}
-			} else {
-				lastTransfer = transfer;
-				transfer = transfer->link;
-			}
+			delete transfer->transfer;
+			delete transfer;
+			transfer = next;
 		}
 	}
 }
@@ -1698,7 +1712,7 @@
 	result->link_log = NULL;
 	if (bufferSize <= 0) {
 		result->buffer_log = NULL;
-		result->buffer_phy = NULL;
+		result->buffer_phy = 0;
 		return result;
 	}
 

Modified: haiku/trunk/src/add-ons/kernel/busses/usb/uhci.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/usb/uhci.h	2007-08-09 22:31:01 UTC (rev 21881)
+++ haiku/trunk/src/add-ons/kernel/busses/usb/uhci.h	2007-08-10 07:10:14 UTC (rev 21882)
@@ -63,6 +63,7 @@
 	uhci_td			*first_descriptor;
 	uhci_td			*data_descriptor;
 	bool			incoming;
+	bool			canceled;
 	transfer_data_s	*link;
 } transfer_data;
 



From bonefish at cs.tu-berlin.de  Fri Aug 10 17:59:47 2007
From: bonefish at cs.tu-berlin.de (Ingo Weinhold)
Date: Fri, 10 Aug 2007 17:59:47 +0200
Subject: [Haiku-commits] r21871 - haiku/trunk/build/jam
In-Reply-To: <c47b1d430708091252s1e14e8dbkd388cf2e37617d91@mail.gmail.com>
References: <200708091940.l79JeMK2031856@sheep.berlios.de>
	<c47b1d430708091252s1e14e8dbkd388cf2e37617d91@mail.gmail.com>
Message-ID: <20070810175947.1886.4@cs.tu-berlin.de>


On 2007-08-09 at 21:52:11 [+0200], J?r?me Duval <korli at users.berlios.de> 
wrote:
> 2007/8/9, bonefish at BerliOS <bonefish at mail.berlios.de>:
> >
> > Remove mpu401 driver from the netboot archive.
> 
> the emuxki driver will fail to load without this module. not that important
> for a net boot :)

I think we can live without sound before the boot volume is mounted. :-) It 
usually shouldn't take more than a fraction of a second until this point 
anyway.

CU, Ingo


From korli at mail.berlios.de  Fri Aug 10 19:24:49 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Fri, 10 Aug 2007 19:24:49 +0200
Subject: [Haiku-commits] r21883 - haiku/trunk/src/bin/coreutils/src
Message-ID: <200708101724.l7AHOnhc006857@sheep.berlios.de>

Author: korli
Date: 2007-08-10 19:24:48 +0200 (Fri, 10 Aug 2007)
New Revision: 21883
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21883&view=rev

Added:
   haiku/trunk/src/bin/coreutils/src/seq-old.c
Modified:
   haiku/trunk/src/bin/coreutils/src/Jamfile
Log:
added a copy of the former seq.c well handled by gcc 2.95.3, and asked jam to use this one conditionally. this "fixes" bug #1368, unless/until someone come with something 
better.


Modified: haiku/trunk/src/bin/coreutils/src/Jamfile
===================================================================
--- haiku/trunk/src/bin/coreutils/src/Jamfile	2007-08-10 07:10:14 UTC (rev 21882)
+++ haiku/trunk/src/bin/coreutils/src/Jamfile	2007-08-10 17:24:48 UTC (rev 21883)
@@ -51,7 +51,6 @@
 	ptx.c
 	readlink.c
 	rmdir.c
-	seq.c
 	shred.c
 	shuf.c
 	split.c
@@ -103,6 +102,13 @@
 # users.c
 # who.c
 
+local seq_src = seq.c ;
+if $(HAIKU_GCC_VERSION[1]) < 3 {
+	seq_src = seq-old.c ;
+}
+
+BinCommand seq : $(seq_src) : libfetish.a : $(coreutils_rsrc) ;
+
 BinCommand "[" : lbracket.c : libfetish.a : $(coreutils_rsrc) ;
 
 BinCommand ls : 

Copied: haiku/trunk/src/bin/coreutils/src/seq-old.c (from rev 17309, haiku/trunk/src/bin/coreutils/src/seq.c)



From korli at mail.berlios.de  Fri Aug 10 20:49:34 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Fri, 10 Aug 2007 20:49:34 +0200
Subject: [Haiku-commits] r21884 - in haiku/trunk/src/kits/opengl: . mesa
Message-ID: <200708101849.l7AInYsI013837@sheep.berlios.de>

Author: korli
Date: 2007-08-10 20:49:33 +0200 (Fri, 10 Aug 2007)
New Revision: 21884
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21884&view=rev

Modified:
   haiku/trunk/src/kits/opengl/Jamfile
   haiku/trunk/src/kits/opengl/mesa/Jamfile
Log:
fixed testing for haiku target


Modified: haiku/trunk/src/kits/opengl/Jamfile
===================================================================
--- haiku/trunk/src/kits/opengl/Jamfile	2007-08-10 17:24:48 UTC (rev 21883)
+++ haiku/trunk/src/kits/opengl/Jamfile	2007-08-10 18:49:33 UTC (rev 21884)
@@ -25,7 +25,7 @@
 
 	if $(TARGET_ARCH) = x86 {
 		defines += USE_X86_ASM USE_MMX_ASM USE_3DNOW_ASM ; 
-		if $(TARGET_PLATFORM != haiku) {
+		if $(TARGET_PLATFORM) != haiku {
 			# FIXME: Remove me when Haiku SSE support will be fixed.
 			defines += USE_SSE_ASM ;
 		}

Modified: haiku/trunk/src/kits/opengl/mesa/Jamfile
===================================================================
--- haiku/trunk/src/kits/opengl/mesa/Jamfile	2007-08-10 17:24:48 UTC (rev 21883)
+++ haiku/trunk/src/kits/opengl/mesa/Jamfile	2007-08-10 18:49:33 UTC (rev 21884)
@@ -41,7 +41,7 @@
 
 	if $(TARGET_ARCH) = x86 {
 		defines += USE_X86_ASM USE_MMX_ASM USE_3DNOW_ASM ; 
-		if $(TARGET_PLATFORM != haiku) {
+		if $(TARGET_PLATFORM) != haiku {
 			# FIXME: Remove me when Haiku SSE support will be fixed.
 			defines += USE_SSE_ASM ;
 		}



From bonefish at mail.berlios.de  Sat Aug 11 02:07:53 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sat, 11 Aug 2007 02:07:53 +0200
Subject: [Haiku-commits] r21885 - haiku/trunk/src/tests/system/libroot/posix
Message-ID: <200708110007.l7B07rE3014318@sheep.berlios.de>

Author: bonefish
Date: 2007-08-11 02:07:52 +0200 (Sat, 11 Aug 2007)
New Revision: 21885
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21885&view=rev

Added:
   haiku/trunk/src/tests/system/libroot/posix/init_rld_after_fork_test.cpp
Modified:
   haiku/trunk/src/tests/system/libroot/posix/Jamfile
Log:
Test to verify that the runtime loader semaphore is not initialized
after fork().


Modified: haiku/trunk/src/tests/system/libroot/posix/Jamfile
===================================================================
--- haiku/trunk/src/tests/system/libroot/posix/Jamfile	2007-08-10 18:49:33 UTC (rev 21884)
+++ haiku/trunk/src/tests/system/libroot/posix/Jamfile	2007-08-11 00:07:52 UTC (rev 21885)
@@ -4,20 +4,24 @@
 
 SimpleTest SyslogTest
 	: SyslogTest.cpp syslog.cpp
-	;
+;
 
 SimpleTest flock_test
 	: flock_test.cpp
-	;
+;
 
 SimpleTest setjmp_test
 	: setjmp_test.c
-	;
+;
 
 SimpleTest sigsetjmp_test
 	: sigsetjmp_test.c
-	;
+;
 
+SimpleTest init_rld_after_fork_test
+	: init_rld_after_fork_test.cpp
+;
+
 # Tell Jam where to find these sources
 SEARCH on [ FGristFiles
 		syslog.cpp

Added: haiku/trunk/src/tests/system/libroot/posix/init_rld_after_fork_test.cpp
===================================================================
--- haiku/trunk/src/tests/system/libroot/posix/init_rld_after_fork_test.cpp	2007-08-10 18:49:33 UTC (rev 21884)
+++ haiku/trunk/src/tests/system/libroot/posix/init_rld_after_fork_test.cpp	2007-08-11 00:07:52 UTC (rev 21885)
@@ -0,0 +1,40 @@
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <OS.h>
+
+
+static void
+list_semaphores(const char* process)
+{
+	printf("%s (%ld) semaphores:\n", process, find_thread(NULL));
+
+	sem_info semInfo;
+	int32 cookie = 0;
+	while (get_next_sem_info(B_CURRENT_TEAM, &cookie, &semInfo) == B_OK)
+		printf("  %9ld  %s\n", semInfo.sem, semInfo.name);
+}
+
+
+int
+main()
+{
+	pid_t child = fork();
+	if (child < 0) {
+		fprintf(stderr, "Error: fork() failed: %s\n", strerror(errno));
+		exit(1);
+	}
+
+	if (child > 0) {
+		// the parent process -- wait for the child to finish
+		status_t result;
+		wait_for_thread(child, &result);
+	}
+
+	list_semaphores(child == 0 ? "child" : "parent");
+
+	return 0;
+}
\ No newline at end of file



From bonefish at mail.berlios.de  Sat Aug 11 02:14:28 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sat, 11 Aug 2007 02:14:28 +0200
Subject: [Haiku-commits] r21886 - in haiku/trunk: headers/private/kernel
	src/system/libroot/posix/unistd src/system/runtime_loader
Message-ID: <200708110014.l7B0ESfh015680@sheep.berlios.de>

Author: bonefish
Date: 2007-08-11 02:14:26 +0200 (Sat, 11 Aug 2007)
New Revision: 21886
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21886&view=rev

Modified:
   haiku/trunk/headers/private/kernel/user_runtime.h
   haiku/trunk/src/system/libroot/posix/unistd/fork.c
   haiku/trunk/src/system/runtime_loader/elf.cpp
   haiku/trunk/src/system/runtime_loader/export.c
   haiku/trunk/src/system/runtime_loader/runtime_loader_private.h
Log:
Give the runtime loader a chance to reinit its semaphore after fork().


Modified: haiku/trunk/headers/private/kernel/user_runtime.h
===================================================================
--- haiku/trunk/headers/private/kernel/user_runtime.h	2007-08-11 00:07:52 UTC (rev 21885)
+++ haiku/trunk/headers/private/kernel/user_runtime.h	2007-08-11 00:14:26 UTC (rev 21886)
@@ -39,6 +39,8 @@
 	status_t (*get_next_image_dependency)(image_id id, uint32 *cookie,
 		const char **_name);
 
+	status_t (*reinit_after_fork)();
+
 	const struct user_space_program_args *program_args;
 };
 

Modified: haiku/trunk/src/system/libroot/posix/unistd/fork.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/unistd/fork.c	2007-08-11 00:07:52 UTC (rev 21885)
+++ haiku/trunk/src/system/libroot/posix/unistd/fork.c	2007-08-11 00:14:26 UTC (rev 21886)
@@ -4,14 +4,16 @@
  */
 
 
-#include <syscalls.h>
 #include <fork.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
 
+#include <syscalls.h>
+#include <user_runtime.h>
 
+
 typedef struct fork_hook {
 	struct fork_hook *next;
 	void (*function)(void);
@@ -153,6 +155,7 @@
 		// ToDo: initialize child
 		__main_thread_id = find_thread(NULL);
 		__init_fork();
+		__gRuntimeLoader->reinit_after_fork();
 
 		call_fork_hooks(sChildHooks);
 	} else {

Modified: haiku/trunk/src/system/runtime_loader/elf.cpp
===================================================================
--- haiku/trunk/src/system/runtime_loader/elf.cpp	2007-08-11 00:07:52 UTC (rev 21885)
+++ haiku/trunk/src/system/runtime_loader/elf.cpp	2007-08-11 00:14:26 UTC (rev 21886)
@@ -1670,3 +1670,14 @@
 		sErrorMessage.SetTo(buffer, 1024, 'Rler');
 	}
 }
+
+
+status_t
+elf_reinit_after_fork()
+{
+	rld_sem = create_sem(1, "rld_lock");
+	if (rld_sem < 0)
+		return rld_sem;
+
+	return B_OK;
+}

Modified: haiku/trunk/src/system/runtime_loader/export.c
===================================================================
--- haiku/trunk/src/system/runtime_loader/export.c	2007-08-11 00:07:52 UTC (rev 21885)
+++ haiku/trunk/src/system/runtime_loader/export.c	2007-08-11 00:14:26 UTC (rev 21886)
@@ -34,7 +34,9 @@
 	get_symbol,
 	get_nth_symbol,
 	test_executable,
-	get_next_image_dependency
+	get_next_image_dependency,
+
+	elf_reinit_after_fork
 };
 
 

Modified: haiku/trunk/src/system/runtime_loader/runtime_loader_private.h
===================================================================
--- haiku/trunk/src/system/runtime_loader/runtime_loader_private.h	2007-08-11 00:07:52 UTC (rev 21885)
+++ haiku/trunk/src/system/runtime_loader/runtime_loader_private.h	2007-08-11 00:14:26 UTC (rev 21886)
@@ -44,6 +44,7 @@
 status_t elf_verify_header(void *header, int32 length);
 void rldelf_init(void);
 void rldexport_init(void);
+status_t elf_reinit_after_fork();
 
 status_t heap_init(void);
 



From bonefish at mail.berlios.de  Sat Aug 11 02:31:17 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sat, 11 Aug 2007 02:31:17 +0200
Subject: [Haiku-commits] r21887 - haiku/trunk/src/system/kernel/cache
Message-ID: <200708110031.l7B0VHnr017413@sheep.berlios.de>

Author: bonefish
Date: 2007-08-11 02:31:14 +0200 (Sat, 11 Aug 2007)
New Revision: 21887
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21887&view=rev

Modified:
   haiku/trunk/src/system/kernel/cache/file_cache.cpp
Log:
Removed special dummy page handling. It became obsolete with r21816,
since fault_find_page() does no longer insert a dummy page into a cache
that has a store from which it can read the page.


Modified: haiku/trunk/src/system/kernel/cache/file_cache.cpp
===================================================================
--- haiku/trunk/src/system/kernel/cache/file_cache.cpp	2007-08-11 00:14:26 UTC (rev 21886)
+++ haiku/trunk/src/system/kernel/cache/file_cache.cpp	2007-08-11 00:31:14 UTC (rev 21887)
@@ -892,7 +892,6 @@
 		// check if this page is already in memory
 	restart:
 		vm_page *page = vm_cache_lookup_page(cache, offset);
-		vm_page *dummyPage = NULL;
 		if (page != NULL) {
 			// The page is busy - since we need to unlock the cache sometime
 			// in the near future, we need to satisfy the request of the pages
@@ -918,21 +917,12 @@
 			}
 
 			if (page->state == PAGE_STATE_BUSY) {
-				if (page->type == PAGE_TYPE_DUMMY) {
-					dummyPage = page;
-					page = vm_page_allocate_page(PAGE_STATE_FREE);
-					if (page == NULL) {
-						mutex_unlock(&cache->lock);
-						return B_NO_MEMORY;
-					}
-				} else {
-					ConditionVariableEntry<vm_page> entry;
-					entry.Add(page);
-					mutex_unlock(&cache->lock);
-					entry.Wait();
-					mutex_lock(&cache->lock);
-					goto restart;
-				}
+				ConditionVariableEntry<vm_page> entry;
+				entry.Add(page);
+				mutex_unlock(&cache->lock);
+				entry.Wait();
+				mutex_lock(&cache->lock);
+				goto restart;
 			}
 		}
 
@@ -944,24 +934,6 @@
 			vm_get_physical_page(page->physical_page_number * B_PAGE_SIZE,
 				&virtualAddress, PHYSICAL_PAGE_CAN_WAIT);
 
-			if (dummyPage != NULL && (!doWrite || bytesInPage != B_PAGE_SIZE)) {
-				// This page is currently in-use by someone else - since we cannot
-				// know if this someone does what we want, and if it even can do
-				// what we want (we may own a lock the blocks the other request),
-				// we need to handle this case specifically
-				iovec vec;
-				vec.iov_base = (void *)virtualAddress;
-				vec.iov_len = B_PAGE_SIZE;
-
-				size_t size = B_PAGE_SIZE;
-				status_t status = pages_io(ref, offset, &vec, 1, &size, false);
-				if (status != B_OK) {
-					vm_put_physical_page(virtualAddress);
-					mutex_unlock(&cache->lock);
-					return status;
-				}
-			}
-
 			// and copy the contents of the page already in memory
 			if (doWrite) {
 				user_memcpy((void *)(virtualAddress + pageOffset), (void *)buffer, bytesInPage);
@@ -974,43 +946,6 @@
 
 			vm_put_physical_page(virtualAddress);
 
-			if (dummyPage != NULL) {
-				// check if the dummy page is still in place
-			restart_dummy_lookup:
-				vm_page *currentPage = vm_cache_lookup_page(cache, offset);
-				if (currentPage == NULL) {
-					// there is no page in place anymore, we'll put ours
-					// into it
-					vm_cache_insert_page(cache, page, offset);
-				} else if (currentPage->state == PAGE_STATE_BUSY) {
-					if (currentPage->type == PAGE_TYPE_DUMMY) {
-						// we let the other party add our page
-						currentPage->queue_next = page;
-					} else {
-						ConditionVariableEntry<vm_page> entry;
-						entry.Add(page);
-						mutex_unlock(&cache->lock);
-						entry.Wait();
-						mutex_lock(&cache->lock);
-						goto restart_dummy_lookup;
-					}
-				} else {
-					// we need to copy our new page into the old one
-					addr_t destinationAddress;
-					vm_get_physical_page(page->physical_page_number * B_PAGE_SIZE,
-						&virtualAddress, PHYSICAL_PAGE_CAN_WAIT);
-					vm_get_physical_page(currentPage->physical_page_number * B_PAGE_SIZE,
-						&destinationAddress, PHYSICAL_PAGE_CAN_WAIT);
-
-					memcpy((void *)destinationAddress, (void *)virtualAddress, B_PAGE_SIZE);
-
-					vm_put_physical_page(destinationAddress);
-					vm_put_physical_page(virtualAddress);
-
-					vm_page_set_state(page, PAGE_STATE_FREE);
-				}
-			}
-
 			if (bytesLeft <= bytesInPage) {
 				// we've read the last page, so we're done!
 				mutex_unlock(&cache->lock);



From laplace at mail.berlios.de  Sat Aug 11 10:04:52 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Sat, 11 Aug 2007 10:04:52 +0200
Subject: [Haiku-commits] r21888 - in haiku/trunk/src/tests/kits/interface: .
	flatten_picture
Message-ID: <200708110804.l7B84qGQ020630@sheep.berlios.de>

Author: laplace
Date: 2007-08-11 10:04:51 +0200 (Sat, 11 Aug 2007)
New Revision: 21888
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21888&view=rev

Added:
   haiku/trunk/src/tests/kits/interface/flatten_picture/
   haiku/trunk/src/tests/kits/interface/flatten_picture/Jamfile
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.cpp
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.h
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestApp.cpp
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestApp.h
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.h
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.h
   haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.cpp
   haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.h
Modified:
   haiku/trunk/src/tests/kits/interface/Jamfile
Log:
Added test application for testing flattening and unflattening of
BPictures.


Modified: haiku/trunk/src/tests/kits/interface/Jamfile
===================================================================
--- haiku/trunk/src/tests/kits/interface/Jamfile	2007-08-11 00:31:14 UTC (rev 21887)
+++ haiku/trunk/src/tests/kits/interface/Jamfile	2007-08-11 08:04:51 UTC (rev 21888)
@@ -130,6 +130,7 @@
 SubInclude HAIKU_TOP src tests kits interface bprintjob ;
 SubInclude HAIKU_TOP src tests kits interface bfont ;
 SubInclude HAIKU_TOP src tests kits interface bshelf ;
+SubInclude HAIKU_TOP src tests kits interface flatten_picture ;
 SubInclude HAIKU_TOP src tests kits interface layout ;
 SubInclude HAIKU_TOP src tests kits interface picture ;
 SubInclude HAIKU_TOP src tests kits interface pictureprint ;

Added: haiku/trunk/src/tests/kits/interface/flatten_picture/Jamfile
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/Jamfile	2007-08-11 00:31:14 UTC (rev 21887)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/Jamfile	2007-08-11 08:04:51 UTC (rev 21888)
@@ -0,0 +1,14 @@
+SubDir HAIKU_TOP src tests kits interface flatten_picture ;
+
+SimpleTest FlattenPictureTest :
+	PictureTest.cpp
+	PictureTestApp.cpp
+	PictureTestCases.cpp
+	PictureTestWindow.cpp
+	TestResultItem.cpp
+	;
+
+LinkAgainst FlattenPictureTest :
+	be
+	root
+	;

Added: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.cpp	2007-08-11 00:31:14 UTC (rev 21887)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.cpp	2007-08-11 08:04:51 UTC (rev 21888)
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer
+ */
+
+#include <InterfaceKit.h>
+#include <String.h>
+
+#include <stdio.h>
+
+#include "PictureTest.h"
+
+#define TEST_AND_RETURN(condition, message, result) \
+	{ \
+		if (condition) { \
+			fErrorMessage = message; \
+			return result; \
+		} \
+	}
+
+template <class T>
+class AutoDelete
+{
+public:
+	AutoDelete(T *object) : fObject(object) { }
+	~AutoDelete() { delete fObject; fObject = NULL; }
+	
+	void Release() { fObject = NULL; }
+	
+private:
+	T *fObject;
+};
+
+
+PictureTest::PictureTest()
+	: fColorSpace(B_RGBA32)
+	, fOriginalBitmap(NULL)
+	, fArchivedBitmap(NULL)
+{
+}
+
+BBitmap*
+PictureTest::GetOriginalBitmap(bool detach)
+{
+	BBitmap* bitmap = fOriginalBitmap;
+	if (detach)
+		fOriginalBitmap = NULL;
+	return bitmap;
+}
+
+
+BBitmap*
+PictureTest::GetArchivedBitmap(bool detach)
+{
+	BBitmap* bitmap = fArchivedBitmap;
+	if (detach)
+		fArchivedBitmap = NULL;
+	return bitmap;
+}
+
+
+PictureTest::~PictureTest() 
+{
+	CleanUp();
+}
+
+void
+PictureTest::CleanUp()
+{
+	delete fOriginalBitmap;
+	fOriginalBitmap = NULL;
+	delete fArchivedBitmap;
+	fArchivedBitmap = NULL;
+	fErrorMessage = "";
+}
+
+bool
+PictureTest::Test(draw_func* func, BRect frame)
+{
+	CleanUp();
+
+	BPicture *picture = RecordPicture(func, frame);
+	AutoDelete<BPicture> _picture(picture);
+	TEST_AND_RETURN(picture == NULL, "Picture could not be recorded!", false);
+		
+	BPicture *archivedPicture = SaveAndRestore(picture);
+	AutoDelete<BPicture> _archivedPicture(archivedPicture);
+	TEST_AND_RETURN(picture == NULL, "Picture could not be flattened and unflattened!", false);
+	
+	fOriginalBitmap = CreateBitmap(picture, frame);
+	TEST_AND_RETURN(fOriginalBitmap == NULL, "Could not create bitmap from original picture!", false);
+		
+	fArchivedBitmap = CreateBitmap(archivedPicture, frame);
+	TEST_AND_RETURN(fArchivedBitmap == NULL, "Could not create bitmap from archived picture!", false);
+	
+	bool result = IsSame(fOriginalBitmap, fArchivedBitmap);
+	TEST_AND_RETURN(result == false, "Bitmaps differ!", false);
+	return result;
+}
+
+
+BPicture *
+PictureTest::RecordPicture(draw_func* func, BRect frame)
+{
+	// create view for recording to picture
+	BBitmap *bitmap = new BBitmap(frame, fColorSpace, true);
+	AutoDelete<BBitmap> _bitmap(bitmap);
+	if (bitmap == NULL || bitmap->IsValid() == false || bitmap->InitCheck() != B_OK)
+		return NULL;
+	
+	BView *view = new BView(frame, "offscreen", B_FOLLOW_ALL, B_WILL_DRAW);
+	AutoDelete<BView> _view(view);
+	if (view == NULL)
+		return NULL;
+	
+	bitmap->Lock();
+	bitmap->AddChild(view);
+	
+	// R5 clears the bitmap! However Haiku does not, so clear it for now.
+	view->PushState();
+	view->SetHighColor(255, 255, 255);
+	view->FillRect(frame);
+	view->PopState();
+	
+	// record
+	BPicture *picture = new BPicture();	
+	view->BeginPicture(picture);
+	func(view, frame);
+	picture = view->EndPicture();
+	
+	// destroy view
+	view->Sync();
+	view->RemoveSelf();
+	bitmap->Unlock();
+	
+	return picture;
+}
+
+BPicture *
+PictureTest::SaveAndRestore(BPicture *picture)
+{
+	BMallocIO *data = new BMallocIO();
+	AutoDelete<BMallocIO> _data(data);
+	if (data == NULL)
+		return NULL;
+	
+	picture->Flatten(data);
+	
+	data->Seek(0, SEEK_SET);
+	BPicture *archivedPicture = new BPicture();
+	if (archivedPicture == NULL)
+		return NULL;
+	archivedPicture->Unflatten(data);
+		
+	return archivedPicture;
+}
+
+BBitmap *
+PictureTest::CreateBitmap(BPicture *picture, BRect frame)
+{
+	// create bitmap that accepts a view
+	BBitmap *bitmap = new BBitmap(frame, fColorSpace, true);
+	AutoDelete<BBitmap> _bitmap(bitmap);
+	if (bitmap == NULL || bitmap->IsValid() == false || bitmap->InitCheck() != B_OK)
+		return NULL;
+	
+	BView *view = new BView(frame, "offscreen", B_FOLLOW_ALL, B_WILL_DRAW);
+	AutoDelete<BView> _view(view);
+	if (view == NULL)
+		return NULL;
+
+	// the result bitmap that does not accept views	
+	// to save resources in the application server
+	BBitmap *result = new BBitmap(frame, fColorSpace, false);
+	if (result == NULL || result->IsValid() == false || result->InitCheck() != B_OK)
+		return NULL;
+
+	bitmap->Lock();
+	bitmap->AddChild(view);
+
+	view->DrawPicture(picture);
+	view->Sync();
+
+	// destroy view
+	view->RemoveSelf();
+	bitmap->Unlock();
+
+	memcpy(result->Bits(), bitmap->Bits(), bitmap->BitsLength());
+	
+	return result;
+}
+
+
+bool
+PictureTest::IsSame(BBitmap *bitmap1, BBitmap *bitmap2)
+{
+	if (bitmap1->ColorSpace() != bitmap2->ColorSpace())
+		return false;
+	
+	if (bitmap1->BitsLength() != bitmap2->BitsLength())
+		return false;
+	
+	return memcmp(bitmap1->Bits(), bitmap2->Bits(), bitmap1->BitsLength()) == 0;
+}

Added: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.h
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.h	2007-08-11 00:31:14 UTC (rev 21887)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.h	2007-08-11 08:04:51 UTC (rev 21888)
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer
+ */
+
+#ifndef _PICTURE_TEST_H
+#define _PICTURE_TEST_H
+
+#include <InterfaceKit.h>
+#include <String.h>
+
+typedef void (draw_func)(BView *view, BRect frame);
+
+class PictureTest {
+
+public:
+	PictureTest();
+	virtual ~PictureTest();
+	
+	void SetColorSpace(color_space colorSpace) { fColorSpace = colorSpace; }
+
+	bool Test(draw_func* func, BRect frame);
+	
+	const char *ErrorMessage() const { return fErrorMessage.String(); }
+
+	BBitmap *GetOriginalBitmap(bool detach = false);
+	BBitmap *GetArchivedBitmap(bool detach = false);
+
+private:
+	
+	void CleanUp();
+	
+	BPicture *RecordPicture(draw_func* func, BRect frame);
+	
+	BPicture *SaveAndRestore(BPicture *picture);
+	
+	BBitmap *CreateBitmap(BPicture *picture, BRect frame);
+
+	bool IsSame(BBitmap *bitmap1, BBitmap *bitmap2);
+
+	color_space fColorSpace;
+
+	BBitmap *fOriginalBitmap;
+	BBitmap *fArchivedBitmap;
+	
+	BString fErrorMessage;
+};
+
+
+
+#endif

Added: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestApp.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestApp.cpp	2007-08-11 00:31:14 UTC (rev 21887)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestApp.cpp	2007-08-11 08:04:51 UTC (rev 21888)
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer
+ */
+
+#include "PictureTestApp.h"
+#include "PictureTestWindow.h"
+
+int main()
+{
+	PictureTestApp app;
+	app.Run();
+	return 0;
+}
+
+PictureTestApp::PictureTestApp()
+	: Inherited(APPLICATION_SIGNATURE)
+{
+}
+
+void PictureTestApp::ReadyToRun()
+{
+	PictureTestWindow * window = new PictureTestWindow();
+	window->Show();
+}

Added: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestApp.h
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestApp.h	2007-08-11 00:31:14 UTC (rev 21887)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestApp.h	2007-08-11 08:04:51 UTC (rev 21888)
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer
+ */
+
+#ifndef _PICTURE_TEST_APP_H
+#define _PICTURE_TEST_APP_H
+
+#include <Application.h>
+#include <Message.h>
+#include <Rect.h>
+
+#define APPLICATION_SIGNATURE	"application/x-vnd.haiku-picturetest"
+
+class PictureTestApp : public BApplication
+{
+	typedef BApplication Inherited;
+
+public:
+	PictureTestApp();
+
+	void ReadyToRun();
+
+private:	
+};
+
+#endif

Added: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-11 00:31:14 UTC (rev 21887)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-11 08:04:51 UTC (rev 21888)
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer
+ */
+
+#include "PictureTestCases.h"
+
+void testEmptyPicture(BView *view, BRect frame)
+{
+	// no op
+}
+
+void testDrawString(BView *view, BRect frame)
+{
+	BFont font;
+	view->GetFont(&font);
+	font_height height;
+	font.GetHeight(&height);
+	float baseline = frame.bottom - height.descent;
+	// draw base line
+	view->SetHighColor(0, 255, 0);
+	view->StrokeLine(BPoint(frame.left, baseline - 1), BPoint(frame.right, baseline -1));
+
+	view->SetHighColor(0, 0, 0);
+	view->DrawString("Haiku [??????]", BPoint(frame.left, baseline));
+}
+
+void testFillRed(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	view->SetHighColor(255, 0, 0);
+	view->FillRect(frame);
+}
+
+void testStrokeRect(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	int levels = (int)(frame.Height()/2 + 1);
+	for (int i = 0; i < levels; i ++) {
+		view->SetHighColor(0, 0, 255 * (levels-i) / levels);
+		view->StrokeRect(frame);
+		frame.InsetBy(1, 1);
+	}
+}
+
+void testVerticalLine(BView *view, BRect frame)
+{
+	view->StrokeLine(BPoint(frame.left, frame.top), BPoint(frame.right, frame.bottom));
+}
+
+void testStrokeScaledRect(BView *view, BRect frame)
+{
+	view->SetScale(0.5);
+	view->StrokeRect(frame);
+}
+
+void testRecordPicture(BView *view, BRect frame)
+{
+	BPicture *picture = new BPicture();
+	view->BeginPicture(picture);
+	view->FillRect(frame);
+	view->EndPicture();
+	delete picture;
+}
+
+void testRecordAndPlayPicture(BView *view, BRect frame)
+{
+	BPicture *picture = new BPicture();
+	view->BeginPicture(picture);
+	frame.InsetBy(2, 2);
+	view->FillRect(frame);
+	view->EndPicture();
+	view->DrawPicture(picture);
+	delete picture;
+}
+
+void testRecordAndPlayPictureWithOffset(BView *view, BRect frame)
+{
+	BPicture *picture = new BPicture();
+	view->BeginPicture(picture);
+	frame.InsetBy(frame.Width() / 4, frame.Height() / 4);
+	frame.OffsetTo(0, 0);
+	view->FillRect(frame);
+	view->EndPicture();
+	
+	view->DrawPicture(picture, BPoint(10, 10));
+	// color of picture should not change
+	view->SetLowColor(0, 255, 0);
+	view->SetLowColor(255, 0, 0);
+	view->DrawPicture(picture, BPoint(0, 0));
+	delete picture;
+}
+
+void testBitmap(BView *view, BRect frame) {
+	BBitmap bitmap(frame, B_RGBA32);
+	for (int32 y = 0; y < bitmap.Bounds().IntegerHeight(); y ++) {
+		for (int32 x = 0; x < bitmap.Bounds().IntegerWidth(); x ++) {
+			char *pixel = (char*)bitmap.Bits();
+			pixel += bitmap.BytesPerRow() * y + 4 * x;
+			// fill with blue
+			pixel[0] = 255;
+			pixel[1] = 0;
+			pixel[2] = 0;
+			pixel[3] = 255;
+		}
+	}
+	view->DrawBitmap(&bitmap, BPoint(0, 0));
+}
+
+TestCase gTestCases[] = {
+	{ "Test Empty Picture", testEmptyPicture },
+	{ "Test Vertical Line", testVerticalLine },
+	{ "Test Stroke Rect", testStrokeRect },
+	{ "Test Draw String", testDrawString },
+	{ "Test Fill Red", testFillRed },
+	{ "Test Stroke Scaled Rect", testStrokeScaledRect },
+	{ "Test Record Picture", testRecordPicture },
+	{ "Test Record And Play Picture", testRecordAndPlayPicture },
+	{ "Test Record And Play Picture With Offset", testRecordAndPlayPictureWithOffset },
+	{ "Test Draw Bitmap", testBitmap },
+	{ NULL, NULL }
+};
\ No newline at end of file

Added: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.h
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.h	2007-08-11 00:31:14 UTC (rev 21887)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.h	2007-08-11 08:04:51 UTC (rev 21888)
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer
+ */
+
+#ifndef _PICTURE_TEST_CASES_H
+#define _PICTURE_TEST_CASES_H
+
+#include "PictureTest.h"
+
+typedef struct {
+	const char *name;
+	draw_func *func;
+} TestCase;
+
+// test NULL-terminated array of test cases
+extern TestCase gTestCases[];
+
+#endif

Added: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp	2007-08-11 00:31:14 UTC (rev 21887)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp	2007-08-11 08:04:51 UTC (rev 21888)
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer
+ */
+
+
+#include <Application.h>
+#include <MenuItem.h>
+#include <MenuBar.h>
+#include <StringView.h>
+#include <ListItem.h>
+#include <View.h>
+
+#include <stdio.h>
+
+#include "PictureTest.h"
+#include "PictureTestCases.h"
+#include "PictureTestWindow.h"
+#include "TestResultItem.h"
+
+PictureTestWindow::PictureTestWindow()
+	: Inherited(BRect(100,100,500,300), "Picture Tests", B_DOCUMENT_WINDOW, 0)
+{
+	BuildGUI();
+}
+
+bool PictureTestWindow::QuitRequested()
+{
+	bool isOk = Inherited::QuitRequested();
+	if (isOk) {
+		be_app->PostMessage(B_QUIT_REQUESTED);
+	}
+	
+	return isOk;
+}
+
+
+void PictureTestWindow::BuildGUI()
+{
+	BView* backdrop = new BView(Bounds(), "backdrop", B_FOLLOW_ALL, B_WILL_DRAW);
+	backdrop->SetViewColor(::ui_color(B_PANEL_BACKGROUND_COLOR));
+	AddChild(backdrop);
+	
+	BMenuBar* mb = new BMenuBar(Bounds(), "menubar");
+	BMenu* m = new BMenu("File");
+		m->AddItem(new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED), 'Q'));
+		m->SetTargetForItems(be_app_messenger);
+	mb->AddItem(m);
+
+	m = new BMenu("Tests");
+		m->AddItem(new BMenuItem("Run", new BMessage(kMsgRunTests), 'R'));
+	// not implemented
+	//	m->AddSeparatorItem();
+	//	m->AddItem(new BMenuItem("Write images", new BMessage(kMsgWriteImages), 'W'));
+	mb->AddItem(m);
+
+	backdrop->AddChild(mb);
+
+	BRect b = Bounds();
+	b.top = mb->Bounds().bottom + 1;
+	
+	BStringView *header = new BStringView(b, "header", "Picture, Unflattened Picture, Test Name, Error Message", B_FOLLOW_LEFT | B_FOLLOW_RIGHT | B_FOLLOW_TOP);
+	header->ResizeToPreferred();
+	backdrop->AddChild(header);
+	b.top = header->Frame().bottom + 1;
+	
+	
+	b.right -= B_V_SCROLL_BAR_WIDTH;
+	b.bottom -= B_H_SCROLL_BAR_HEIGHT;
+	fListView = new BListView(b, "Results", B_SINGLE_SELECTION_LIST, 
+		B_FOLLOW_ALL_SIDES, 
+		B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE);
+	backdrop->AddChild(new BScrollView("scroll_results", fListView, B_FOLLOW_ALL_SIDES, 0, true, true));	
+}
+
+void
+PictureTestWindow::MessageReceived(BMessage *msg) {
+	switch (msg->what) {
+		case kMsgRunTests:
+			RunTests();
+			break;
+	}
+	Inherited::MessageReceived(msg);
+}
+
+
+void
+PictureTestWindow::RunTests()
+{
+	color_space colorSpaces[] = {
+		B_RGBA32,
+		B_RGB32,
+		B_RGB24,
+		B_RGB16,
+		B_RGB15
+	};
+	BRect frame(0, 0, 100, 30);
+	for (uint32 csIndex = 0; csIndex < sizeof(colorSpaces)/sizeof(color_space); csIndex ++) {
+		color_space colorSpace = colorSpaces[csIndex];
+		const char *csText;
+		switch (colorSpace) {
+			case B_RGBA32:
+				csText = "B_RGB32";
+				break;
+			case B_RGB32:
+				csText = "B_RGB32";
+				break;
+			case B_RGB24:
+				csText = "B_RGB24";
+				break;
+			case B_RGB16:
+				csText = "B_RGB16";
+				break;
+			case B_RGB15:
+				csText = "B_RGB15";
+				break;
+			default:
+				csText = "Unknown";
+		}
+		
+		BString text;
+		text = "Color space: ";
+		text += csText;
+		fListView->AddItem(new BStringItem(text.String()));
+		
+		for (int i = 0; gTestCases[i].name != NULL; i ++) {
+			TestCase *testCase = &gTestCases[i];
+			PictureTest test;
+			test.SetColorSpace(colorSpace);
+			bool ok = test.Test(testCase->func, frame);
+			
+			TestResultItem *item = new TestResultItem(testCase->name, frame);
+			item->SetOk(ok);
+			item->SetErrorMessage(test.ErrorMessage());
+			item->SetOriginalBitmap(test.GetOriginalBitmap(true));
+			item->SetArchivedBitmap(test.GetArchivedBitmap(true));
+			
+			fListView->AddItem(item);
+		}
+	}
+}
\ No newline at end of file

Added: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.h
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.h	2007-08-11 00:31:14 UTC (rev 21887)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.h	2007-08-11 08:04:51 UTC (rev 21888)
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer
+ */
+
+#ifndef _PICTURE_TEST_WINDOW_H
+#define _PICTURE_TEST_WINDOW_H
+
+#include <Window.h>
+
+class PictureTestWindow : public BWindow
+{
+	typedef BWindow Inherited;
+
+public:
+	PictureTestWindow();
+	void MessageReceived(BMessage *msg);
+	bool QuitRequested();
+
+private:
+
+	enum {
+		kMsgRunTests = 'PTst',
+		kMsgWriteImages,
+	};
+
+	void BuildGUI();
+	void RunTests();
+	
+	BListView *fListView;
+	
+};
+
+#endif

Added: haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.cpp	2007-08-11 00:31:14 UTC (rev 21887)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.cpp	2007-08-11 08:04:51 UTC (rev 21888)
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer
+ */
+
+#include "TestResultItem.h"
+
+const float distance = 5;
+
+TestResultItem::TestResultItem(const char* name, BRect bitmapSize)
+	: fName(name)
+	, fBitmapSize(bitmapSize)
+	, fOk(true)
+	, fOriginalBitmap(NULL)
+	, fArchivedBitmap(NULL)
+{
+}
+
+TestResultItem::~TestResultItem()
+{
+	delete fOriginalBitmap;
+	fOriginalBitmap = NULL;
+	delete fArchivedBitmap;
+	fArchivedBitmap = NULL;	
+}
+	
+void 
+TestResultItem::DrawItem(BView *owner, BRect itemRect, bool drawEverthing)
+{
+	owner->PushState();
+	if (IsSelected()) {
+		owner->SetHighColor(128, 128, 128);
+	}
+	else {
+		owner->SetHighColor(255, 255, 255);
+	}
+	owner->StrokeRect(itemRect);
+	owner->PopState();
+	
+	itemRect.InsetBy(1, 1);
+	
+	owner->PushState();
+	if (fOk) {
+		// green background color on success
+		owner->SetHighColor(200, 255, 200);
+	}
+	else {
+		// red background color on failure
+		owner->SetHighColor(255, 200, 200);
+	}
+	owner->FillRect(itemRect);
+	owner->PopState();
+	
+	owner->MovePenTo(itemRect.left+1, itemRect.top+1);
+	if (fOriginalBitmap != NULL) {
+		owner->DrawBitmap(fOriginalBitmap);
+	}
+	owner->MovePenBy(fBitmapSize.Width() + distance, 0);
+	
+	if (fArchivedBitmap != NULL) {
+		owner->DrawBitmap(fArchivedBitmap);
+	}
+	owner->MovePenBy(fBitmapSize.Width() + distance, 0);
+
+	owner->SetDrawingMode(B_OP_OVER);	
+	BFont font;
+	owner->GetFont(&font);
+	// vertically center text 
+	float baseLine = itemRect.top + (itemRect.IntegerHeight() / 2 + font.Size() / 2);
+	owner->MovePenTo(owner->PenLocation().x, baseLine);
+	owner->DrawString(fName.String());
+
+	if (fErrorMessage.Length() == 0)
+		return;
+	owner->PushState();	
+	font.SetFace(B_ITALIC_FACE);
+	owner->SetFont(&font);
+	owner->SetHighColor(255, 0, 0);
+	owner->MovePenBy(distance, 0);
+	owner->DrawString(fErrorMessage.String());
+	owner->PopState();
+}
+
+void 
+TestResultItem::Update(BView *owner, const BFont *font)
+{
+	BListItem::Update(owner, font);
+	float width = 0.0;
+	float height = 0.0;
+
+	width += font->StringWidth(fName.String());
+	width += distance;
+	width += font->StringWidth(fErrorMessage.String());
+	
+	width += 2 * distance;
+	width += 2 * fBitmapSize.Width();
+
+	height = fBitmapSize.Height();	
+		
+	// border of two pixels
+	width += 4;
+	height += 4;
+	
+	if (width > Width())
+		SetWidth(width);
+
+	if (height > Height())
+		SetHeight(height);
+}
+

Added: haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.h
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.h	2007-08-11 00:31:14 UTC (rev 21887)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.h	2007-08-11 08:04:51 UTC (rev 21888)
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2007, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Michael Pfeiffer
+ */
+
+#ifndef _TEST_RESULT_ITEM_H
+#define _TEST_RESULT_ITEM_H
+
+#include <Bitmap.h>
+#include <ListItem.h>
+#include <String.h>
+#include <View.h>
+
+class TestResultItem : public BListItem {
+
+public:
+	TestResultItem(const char* name, BRect bitmapSize);
+	virtual ~TestResultItem();
+	
+	void DrawItem(BView *owner, BRect itemRect, bool drawEverthing);
+	void Update(BView *owner, const BFont *font);
+	
+	void SetOk(bool ok) { fOk = ok; }
+	void SetErrorMessage(const char *errorMessage) { fErrorMessage = errorMessage; }
+	void SetOriginalBitmap(BBitmap *originalBitmap) { fOriginalBitmap = originalBitmap; }
+	void SetArchivedBitmap(BBitmap *archivedBitmap) { fArchivedBitmap = archivedBitmap; }
+	
+private:
+	BString fName;
+	BRect fBitmapSize;
+	bool fOk;
+	BString fErrorMessage;
+	BBitmap *fOriginalBitmap;
+	BBitmap *fArchivedBitmap;
+};
+
+#endif



From stippi at mail.berlios.de  Sat Aug 11 15:16:09 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sat, 11 Aug 2007 15:16:09 +0200
Subject: [Haiku-commits] r21889 - haiku/trunk/src/servers/app
Message-ID: <200708111316.l7BDG956019152@sheep.berlios.de>

Author: stippi
Date: 2007-08-11 15:16:07 +0200 (Sat, 11 Aug 2007)
New Revision: 21889
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21889&view=rev

Modified:
   haiku/trunk/src/servers/app/FontCache.cpp
Log:
* this function might be called with a NULL FontCacheEntry, handle that


Modified: haiku/trunk/src/servers/app/FontCache.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontCache.cpp	2007-08-11 08:04:51 UTC (rev 21888)
+++ haiku/trunk/src/servers/app/FontCache.cpp	2007-08-11 13:16:07 UTC (rev 21889)
@@ -103,6 +103,8 @@
 FontCache::Recycle(FontCacheEntry* entry)
 {
 //printf("Recycle(%p)\n", entry);
+	if (!entry)
+		return;
 	entry->UpdateUsage();
 	entry->RemoveReference();
 }



From stippi at mail.berlios.de  Sat Aug 11 15:31:59 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sat, 11 Aug 2007 15:31:59 +0200
Subject: [Haiku-commits] r21890 - haiku/trunk/src/servers/app
Message-ID: <200708111331.l7BDVxAu019683@sheep.berlios.de>

Author: stippi
Date: 2007-08-11 15:31:59 +0200 (Sat, 11 Aug 2007)
New Revision: 21890
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21890&view=rev

Modified:
   haiku/trunk/src/servers/app/FontEngine.cpp
Log:
* minor cleanup


Modified: haiku/trunk/src/servers/app/FontEngine.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontEngine.cpp	2007-08-11 13:16:07 UTC (rev 21889)
+++ haiku/trunk/src/servers/app/FontEngine.cpp	2007-08-11 13:31:59 UTC (rev 21890)
@@ -403,9 +403,9 @@
 
 // PrepareGlyph
 bool
-FontEngine::PrepareGlyph(unsigned glyph_code)
+FontEngine::PrepareGlyph(unsigned glyphCode)
 {
-	fGlyphIndex = FT_Get_Char_Index(fFace, glyph_code);
+	fGlyphIndex = FT_Get_Char_Index(fFace, glyphCode);
 	fLastError = FT_Load_Glyph(fFace, fGlyphIndex,
 		fHinting ? FT_LOAD_DEFAULT : FT_LOAD_NO_HINTING);
 //		fHinting ? FT_LOAD_FORCE_AUTOHINT : FT_LOAD_NO_HINTING);



From stippi at mail.berlios.de  Sat Aug 11 15:34:09 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sat, 11 Aug 2007 15:34:09 +0200
Subject: [Haiku-commits] r21891 - haiku/trunk/src/servers/app
Message-ID: <200708111334.l7BDY9xw019792@sheep.berlios.de>

Author: stippi
Date: 2007-08-11 15:34:09 +0200 (Sat, 11 Aug 2007)
New Revision: 21891
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21891&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerApp.cpp
   haiku/trunk/src/servers/app/ServerFont.cpp
   haiku/trunk/src/servers/app/ServerFont.h
Log:
* fix the mixup of charCount (glyphs) versus bytes. The new font cache
  implementation takes the byte count, even though it looks like this is
  less efficient when the glyph count is already known (I tested to
  optimize it away but it was not faster)


Modified: haiku/trunk/src/servers/app/ServerApp.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerApp.cpp	2007-08-11 13:31:59 UTC (rev 21890)
+++ haiku/trunk/src/servers/app/ServerApp.cpp	2007-08-11 13:34:09 UTC (rev 21891)
@@ -1637,7 +1637,7 @@
 			status_t status = font.SetFamilyAndStyle(familyID, styleID);
 			if (status == B_OK) {
 				bool hasArray[numChars];
-				status = font.GetHasGlyphs(charArray, numChars, hasArray);
+				status = font.GetHasGlyphs(charArray, numBytes, hasArray);
 				if (status == B_OK) {
 					fLink.StartMessage(B_OK);
 					fLink.Attach(hasArray, sizeof(hasArray));
@@ -1676,7 +1676,7 @@
 			status_t status = font.SetFamilyAndStyle(familyID, styleID);
 			if (status == B_OK) {
 				edge_info edgeArray[numChars];
-				status = font.GetEdges(charArray, numChars, edgeArray);
+				status = font.GetEdges(charArray, numBytes, edgeArray);
 				if (status == B_OK) {
 					fLink.StartMessage(B_OK);
 					fLink.Attach(edgeArray, sizeof(edgeArray));
@@ -1747,7 +1747,7 @@
 				if (wantsOffsets)
 					offsets = new (nothrow) BPoint[numChars];
 
-				status = font.GetEscapements(charArray, numChars, delta,
+				status = font.GetEscapements(charArray, numBytes, delta,
 					escapements, offsets);
 
 				if (status == B_OK) {
@@ -1829,7 +1829,7 @@
 				font.SetRotation(rotation);
 				font.SetFlags(flags);
 
-				status = font.GetEscapements(charArray, numChars, delta,
+				status = font.GetEscapements(charArray, numBytes, delta,
 					escapements);
 
 				if (status == B_OK) {
@@ -1917,7 +1917,7 @@
 				font.SetFlags(flags);
 
 				// TODO implement for real
-				if (font.GetBoundingBoxes(charArray, numChars,
+				if (font.GetBoundingBoxes(charArray, numBytes,
 					rectArray, string_escapement, mode, delta,
 					code == AS_GET_BOUNDINGBOXES_STRING) == B_OK) {
 					fLink.StartMessage(B_OK);

Modified: haiku/trunk/src/servers/app/ServerFont.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerFont.cpp	2007-08-11 13:31:59 UTC (rev 21890)
+++ haiku/trunk/src/servers/app/ServerFont.cpp	2007-08-11 13:34:09 UTC (rev 21891)
@@ -390,23 +390,45 @@
 }
 
 
+class HasGlyphsConsumer {
+ public:
+	HasGlyphsConsumer(bool* hasArray)
+		: fHasArray(hasArray)
+	{
+	}
+	void Start() {}
+	void Finish(double x, double y) {}
+	void ConsumeEmptyGlyph(int32 index, uint32 charCode, double x, double y)
+	{
+		fHasArray[index] = false;
+	}
+	bool ConsumeGlyph(int32 index, uint32 charCode, const GlyphCache* glyph,
+		FontCacheEntry* entry, double x, double y)
+	{
+		fHasArray[index] = glyph->glyph_index >= 0;
+		return true;
+	}
+
+ private:
+	bool* fHasArray;
+};
+
+
 status_t
-ServerFont::GetHasGlyphs(const char charArray[], int32 numChars,
-	bool hasArray[]) const
+ServerFont::GetHasGlyphs(const char* string, int32 numBytes,
+	bool* hasArray) const
 {
-	if (!charArray || numChars <= 0 || !hasArray)
+	if (!string || numBytes <= 0 || !hasArray)
 		return B_BAD_DATA;
 
-	FT_Face face = GetTransformedFace(false, false);
-	if (!face)
-		return B_ERROR;
+	bool kerning = true; // TODO make this a property?
 
-	const char *string = charArray;
-	for (int i = 0; i < numChars; i++)
-		hasArray[i] = FT_Get_Char_Index(face, UTF8ToCharCode(&string)) > 0;
+	HasGlyphsConsumer consumer(hasArray);
+	if (GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numBytes,
+		NULL, kerning, fSpacing))
+		return B_OK;
 
-	PutTransformedFace(face);
-	return B_OK;
+	return B_ERROR;
 }
 
 
@@ -439,16 +461,16 @@
 
 
 status_t
-ServerFont::GetEdges(const char* string, int32 numChars,
+ServerFont::GetEdges(const char* string, int32 numBytes,
 	edge_info* edges) const
 {
-	if (!string || numChars <= 0 || !edges)
+	if (!string || numBytes <= 0 || !edges)
 		return B_BAD_DATA;
 
 	bool kerning = true; // TODO make this a property?
 
 	EdgesConsumer consumer(edges, fSize);
-	if (GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numChars,
+	if (GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numBytes,
 		NULL, kerning, fSpacing))
 		return B_OK;
 
@@ -516,17 +538,17 @@
 
 
 status_t
-ServerFont::GetEscapements(const char* string, int32 numChars,
+ServerFont::GetEscapements(const char* string, int32 numBytes,
 	escapement_delta delta, BPoint escapementArray[],
 	BPoint offsetArray[]) const
 {
-	if (!string || numChars <= 0 || !escapementArray)
+	if (!string || numBytes <= 0 || !escapementArray)
 		return B_BAD_DATA;
 
 	bool kerning = true; // TODO make this a property?
 
 	BPointEscapementConsumer consumer(escapementArray, offsetArray, fSize);
-	if (GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numChars,
+	if (GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numBytes,
 		&delta, kerning, fSpacing))
 		return B_OK;
 
@@ -562,16 +584,16 @@
 
 
 status_t
-ServerFont::GetEscapements(const char* string, int32 numChars,
+ServerFont::GetEscapements(const char* string, int32 numBytes,
 	escapement_delta delta, float widthArray[]) const
 {
-	if (!string || numChars <= 0 || !widthArray)
+	if (!string || numBytes <= 0 || !widthArray)
 		return B_BAD_DATA;
 
 	bool kerning = true; // TODO make this a property?
 
 	WidthEscapementConsumer consumer(widthArray, fSize);
-	if (GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numChars,
+	if (GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numBytes,
 		&delta, kerning, fSpacing))
 		return B_OK;
 	return B_ERROR;
@@ -666,12 +688,12 @@
 
 
 status_t
-ServerFont::GetBoundingBoxes(const char* string, int32 numChars,
+ServerFont::GetBoundingBoxes(const char* string, int32 numBytes,
 	BRect rectArray[], bool stringEscapement, font_metric_mode mode,
 	escapement_delta delta, bool asString)
 {
 	// TODO: The font_metric_mode is not used
-	if (!string || numChars <= 0 || !rectArray)
+	if (!string || numBytes <= 0 || !rectArray)
 		return B_BAD_DATA;
 
 	bool kerning = true; // TODO make this a property?
@@ -679,7 +701,7 @@
 	Transformable transform(EmbeddedTransformation());
 
 	BoundingBoxConsumer consumer(transform, rectArray, asString);
-	if (GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numChars,
+	if (GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numBytes,
 		stringEscapement ? &delta : NULL, kerning, fSpacing))
 		return B_OK;
 	return B_ERROR;
@@ -700,12 +722,12 @@
 	Transformable transform(EmbeddedTransformation());
 
 	for (int32 i = 0; i < numStrings; i++) {
-		int32 numChars = lengthArray[i];
+		int32 numBytes = lengthArray[i];
 		const char* string = charArray[i];
 		escapement_delta delta = deltaArray[i];
 
 		BoundingBoxConsumer consumer(transform, NULL, true);
-		if (!GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numChars,
+		if (!GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numBytes,
 			&delta, kerning, fSpacing))
 			return B_ERROR;
 
@@ -731,16 +753,16 @@
 
 
 float
-ServerFont::StringWidth(const char *string, int32 numChars,
+ServerFont::StringWidth(const char *string, int32 numBytes,
 	const escapement_delta* deltaArray) const
 {
-	if (!string || numChars <= 0)
+	if (!string || numBytes <= 0)
 		return 0.0;
 
 	bool kerning = true; // TODO make this a property?
 
 	StringWidthConsumer consumer;
-	if (!GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numChars,
+	if (!GlyphLayoutEngine::LayoutGlyphs(consumer, *this, string, numBytes,
 		deltaArray, kerning, fSpacing))
 		return 0.0;
 
@@ -791,7 +813,7 @@
 	// get the escapement of each glyph in font units
 	float *escapementArray = new float[numChars];
 	static escapement_delta delta = (escapement_delta){ 0.0, 0.0 };
-	if (GetEscapements(string, numChars, delta, escapementArray) == B_OK) {
+	if (GetEscapements(string, length, delta, escapementArray) == B_OK) {
 		truncate_string(string, mode, width, result, escapementArray, fSize,
 			ellipsisWidth, length, numChars);
 

Modified: haiku/trunk/src/servers/app/ServerFont.h
===================================================================
--- haiku/trunk/src/servers/app/ServerFont.h	2007-08-11 13:31:59 UTC (rev 21890)
+++ haiku/trunk/src/servers/app/ServerFont.h	2007-08-11 13:34:09 UTC (rev 21891)
@@ -41,8 +41,6 @@
 									{ return fDirection; }
 			uint32				Encoding() const
 									{ return fEncoding; }
-			edge_info			Edges() const
-									{ return fEdges; }
 			uint32				Flags() const
 									{ return fFlags; }
 			uint32				Spacing() const
@@ -81,8 +79,6 @@
 
 			void				SetDirection(font_direction dir)
 									{ fDirection = dir; }
-			void				SetEdges(edge_info info)
-									{ fEdges = info; }
 			void				SetEncoding(uint32 encoding)
 									{ fEncoding = encoding; }
 			void				SetFlags(uint32 value)
@@ -123,22 +119,22 @@
 									int32 numChars, BShape *shapeArray[]) const;
 
 			status_t			GetHasGlyphs(const char charArray[], 
-									int32 numChars, bool hasArray[]) const;
+									int32 numBytes, bool hasArray[]) const;
 			
-			status_t			GetEdges(const char charArray[], int32 numChars,
+			status_t			GetEdges(const char charArray[], int32 numBytes,
 									edge_info edgeArray[]) const;
 
 			status_t			GetEscapements(const char charArray[],
-									int32 numChars, escapement_delta delta,
+									int32 numBytes, escapement_delta delta,
 									BPoint escapementArray[],
 									BPoint offsetArray[]) const;
 
 			status_t			GetEscapements(const char charArray[],
-									int32 numChars, escapement_delta delta,
+									int32 numBytes, escapement_delta delta,
 									float widthArray[]) const;
 
 			status_t			GetBoundingBoxes(const char charArray[],
-									int32 numChars, BRect rectArray[],
+									int32 numBytes, BRect rectArray[],
 									bool stringEscapement,
 									font_metric_mode mode,
 									escapement_delta delta,
@@ -150,14 +146,14 @@
 									escapement_delta deltaArray[]);
 
 			float				StringWidth(const char *string,
-									int32 numChars,
+									int32 numBytes,
 									const escapement_delta* delta = NULL) const;
 
 			bool				Lock() const { return fStyle->Lock(); }
 			void				Unlock() const { fStyle->Unlock(); }
 
-			FT_Face				GetFTFace() const
-									{ return fStyle->FreeTypeFace(); };
+//			FT_Face				GetFTFace() const
+//									{ return fStyle->FreeTypeFace(); };
 	
 			BRect				BoundingBox();
 			void				GetHeight(font_height& height) const;
@@ -172,7 +168,6 @@
 	friend class FontStyle;
 
 			FontStyle*			fStyle;
-			edge_info			fEdges;
 			float				fSize;
 			float				fRotation;
 			float				fShear;



From bonefish at mail.berlios.de  Sat Aug 11 16:57:26 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sat, 11 Aug 2007 16:57:26 +0200
Subject: [Haiku-commits] r21892 - in haiku/trunk:
	headers/private/kernel/util src/system/kernel/util
Message-ID: <200708111457.l7BEvQ2H024149@sheep.berlios.de>

Author: bonefish
Date: 2007-08-11 16:57:25 +0200 (Sat, 11 Aug 2007)
New Revision: 21892
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21892&view=rev

Added:
   haiku/trunk/src/system/kernel/util/AVLTreeMap.cpp
Modified:
   haiku/trunk/headers/private/kernel/util/AVLTreeMap.h
   haiku/trunk/headers/private/kernel/util/MallocFreeAllocator.h
   haiku/trunk/src/system/kernel/util/Jamfile
Log:
Revised the AVLTreeMap code:
* Pulled the actual tree code into a non-templatized class AVLTree to
  reduce the amount of code generated each time the template is
  instantiated.
* Changed the iterator interface to Java-style.


Modified: haiku/trunk/headers/private/kernel/util/AVLTreeMap.h
===================================================================
--- haiku/trunk/headers/private/kernel/util/AVLTreeMap.h	2007-08-11 13:34:09 UTC (rev 21891)
+++ haiku/trunk/headers/private/kernel/util/AVLTreeMap.h	2007-08-11 14:57:25 UTC (rev 21892)
@@ -1,30 +1,7 @@
-// AVLTreeMap.h
-//
-// Copyright (c) 2003, Ingo Weinhold (bonefish at cs.tu-berlin.de)
-//
-// 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.
-// 
-// Except as contained in this notice, the name of a copyright holder shall
-// not be used in advertising or otherwise to promote the sale, use or other
-// dealings in this Software without prior written authorization of the
-// copyright holder.
-
+/*
+ * Copyright 2003-2007, Ingo Weinhold <bonefish at cs.tu-berlin.de>.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef _AVL_TREE_MAP_H
 #define _AVL_TREE_MAP_H
 
@@ -32,11 +9,203 @@
 #include <OS.h>
 #include <util/kernel_cpp.h>
 
-#include "MallocFreeAllocator.h"
+#include <util/MallocFreeAllocator.h>
 
+
 // maximal height of a tree
 static const int kMaxAVLTreeHeight = 32;
 
+class AVLTreeIterator;
+
+
+// AVLTreeNode
+struct AVLTreeNode {
+	AVLTreeNode*	parent;
+	AVLTreeNode*	left;
+	AVLTreeNode*	right;
+	int				balance_factor;
+};
+
+
+// AVLTreeCompare
+class AVLTreeCompare {
+public:
+	virtual						~AVLTreeCompare();
+
+	virtual	int					CompareKeyNode(const void* key,
+									const AVLTreeNode* node) = 0;
+	virtual	int					CompareNodes(const AVLTreeNode* node1,
+									const AVLTreeNode* node2) = 0;
+};
+
+
+// AVLTree
+class AVLTree {
+public:
+								AVLTree(AVLTreeCompare* compare);
+								~AVLTree();
+
+	inline	int					Count() const	{ return fNodeCount; }
+	inline	bool				IsEmpty() const	{ return (fNodeCount == 0); }
+			void				MakeEmpty();
+
+	inline	AVLTreeNode*		Root() const	{ return fRoot; }
+
+			AVLTreeNode*		LeftMost(AVLTreeNode* node) const;
+			AVLTreeNode*		RightMost(AVLTreeNode* node) const;
+
+			AVLTreeNode*		Previous(AVLTreeNode* node) const;
+			AVLTreeNode*		Next(AVLTreeNode* node) const;
+
+	inline	AVLTreeIterator		GetIterator() const;
+	inline	AVLTreeIterator		GetIterator(AVLTreeNode* node) const;
+
+			AVLTreeNode*		Find(const void* key);
+			AVLTreeNode*		FindClose(const void* key, bool less);
+
+			status_t			Insert(AVLTreeNode* element);
+			AVLTreeNode*		Remove(const void* key);
+			bool				Remove(AVLTreeNode* element);
+
+private:
+			enum {
+				NOT_FOUND		= -3,
+				DUPLICATE		= -2,
+				NO_MEMORY		= -1,
+				OK				= 0,
+				HEIGHT_CHANGED	= 1,
+	
+				LEFT			= -1,
+				BALANCED		= 0,
+				RIGHT			= 1,
+			};
+
+			// rotations
+			void				_RotateRight(AVLTreeNode** nodeP);
+			void				_RotateLeft(AVLTreeNode** nodeP);
+
+			// insert
+			int					_BalanceInsertLeft(AVLTreeNode** node);
+			int					_BalanceInsertRight(AVLTreeNode** node);
+			int					_Insert(AVLTreeNode* nodeToInsert);
+
+			// remove
+			int					_BalanceRemoveLeft(AVLTreeNode** node);
+			int					_BalanceRemoveRight(AVLTreeNode** node);
+			int					_RemoveRightMostChild(AVLTreeNode** node,
+									AVLTreeNode** foundNode);
+			int					_Remove(AVLTreeNode* node);
+
+			AVLTreeNode*		fRoot;
+			int					fNodeCount;
+			AVLTreeCompare*		fCompare;
+};
+
+
+// AVLTreeIterator
+class AVLTreeIterator {
+public:
+	inline AVLTreeIterator()
+		: fParent(NULL),
+		  fCurrent(NULL),
+		  fNext(NULL)
+	{
+	}
+
+	inline AVLTreeIterator(const AVLTreeIterator& other)
+		: fParent(other.fParent),
+		  fCurrent(other.fCurrent),
+		  fNext(other.fNext)
+	{
+	}
+
+	inline AVLTreeNode* Current() const
+	{
+		return fCurrent;
+	}
+
+	inline bool HasNext() const
+	{
+		return fNext;
+	}
+
+	inline AVLTreeNode* Next()
+	{
+		fCurrent = fNext;
+
+		if (fNext)
+			fNext = fParent->Next(fNext);
+
+		return fCurrent;
+	}
+
+	inline AVLTreeNode* Previous()
+	{
+		if (fCurrent) {
+			fNext = fCurrent;
+			fCurrent = fParent->Previous(fCurrent);
+		} else if (fNext)
+			fCurrent = fParent->Previous(fNext);
+
+		return fCurrent;
+	}
+
+	inline AVLTreeNode* Remove()
+	{
+		if (!fCurrent)
+			return NULL;
+
+		AVLTreeNode* node = fCurrent;
+		fCurrent = NULL;
+
+		return (const_cast<AVLTree*>(fParent)->Remove(node) ? node : NULL);
+	}
+
+	inline AVLTreeIterator& operator=(const AVLTreeIterator& other)
+	{
+		fParent = other.fParent;
+		fCurrent = other.fCurrent;
+		fNext = other.fNext;
+		return *this;
+	}
+
+private:
+	inline AVLTreeIterator(const AVLTree* parent, AVLTreeNode* current,
+			AVLTreeNode* next)
+		: fParent(parent),
+		  fCurrent(current),
+		  fNext(next)
+	{
+	}
+
+protected:
+	friend class AVLTree;
+
+	const AVLTree*	fParent;
+	AVLTreeNode*	fCurrent;
+	AVLTreeNode*	fNext;
+};
+
+
+// GetIterator
+inline AVLTreeIterator
+AVLTree::GetIterator() const
+{
+	return AVLTreeIterator(this, NULL, LeftMost(fRoot));
+}
+
+
+// GetIterator
+inline AVLTreeIterator
+AVLTree::GetIterator(AVLTreeNode* node) const
+{
+	return AVLTreeIterator(this, node, Next(node));
+}
+
+
+// #pragma mark - AVLTreeMap and friends
+
+
 // strategies
 namespace AVLTreeMapStrategy {
 	// key orders
@@ -49,1305 +218,457 @@
 			  template <typename> class Allocator = MallocFreeAllocator>
 	class Auto;
 
-	//! User managed node strategy (user is responsible for node allocation/deallocation)
-//	template <class Node, Node* Node::* NextMember = &Node::next>
-//	class User;		
-
-// NodeStrategy::Node must implement this interface.
-//	struct Node {
-//		Node	*parent;
-//		Node	*left;
-//		Node	*right;
-//		int		balance_factor;
-//	};
+/*!	NodeStrategy must implement this interface:
+	typename Node;
+	inline Node* Allocate(const Key& key, const Value& value)
+	inline void Free(Node* node)
+	inline Key GetKey(Node* node) const
+	inline Value& GetValue(Node* node) const
+	inline AVLTreeNode* GetAVLTreeNode(Node* node) const
+	inline Node* GetNode(AVLTreeNode* node) const
+	inline int CompareKeyNode(const Key& a, const Node* b)
+	inline int CompareNodes(const Node* a, const Node* b)
+*/
 }
 
-template<typename Parent> class AVLTreeMapIterator;
-template<typename Parent> class AVLTreeMapEntry;
-template<typename Parent> class AVLTreeMapEntryPointer;
 
 // for convenience
 #define _AVL_TREE_MAP_TEMPLATE_LIST template<typename Key, typename Value, \
-											 typename NodeStrategy>
+	typename NodeStrategy>
 #define _AVL_TREE_MAP_CLASS_NAME AVLTreeMap<Key, Value, NodeStrategy>
 
+
 // AVLTreeMap
 template<typename Key, typename Value,
 		 typename NodeStrategy = AVLTreeMapStrategy::Auto<Key, Value> >
-class AVLTreeMap {
+class AVLTreeMap : protected AVLTreeCompare {
 private:
 	typedef typename NodeStrategy::Node	Node;
 	typedef _AVL_TREE_MAP_CLASS_NAME	Class;
-	typedef AVLTreeMapEntry<Class>		Entry;
 
 public:
-	class Entry;
 	class Iterator;
 	class ConstIterator;
 
 public:
-	AVLTreeMap();
-	~AVLTreeMap();
+								AVLTreeMap(const NodeStrategy& strategy
+									= NodeStrategy());
+	virtual						~AVLTreeMap();
 
-	inline int Count() const			{ return fNodeCount; }
-	inline bool IsEmpty() const			{ return (fNodeCount == 0); }
-	void MakeEmpty();
+	inline	int					Count() const	{ return fTree.Count(); }
+	inline	bool				IsEmpty() const	{ return fTree.IsEmpty(); }
+	inline	void				MakeEmpty();
 
-	inline Iterator Begin()				{ return ++Iterator(this, NULL); }
-	inline ConstIterator Begin() const	{ return ++ConstIterator(this, NULL); }
-	inline Iterator End()				{ return Iterator(this, NULL); }
-	inline ConstIterator End() const	{ return ConstIterator(this, NULL); }
-	inline Iterator Null()				{ return Iterator(this, NULL); }
-	inline ConstIterator Null() const	{ return ConstIterator(this, NULL); }
+			Node*				RootNode() const;
 
-	Iterator Find(const Key &key);
-	Iterator FindClose(const Key &key, bool less);
+	inline	Iterator			GetIterator();
+	inline	ConstIterator		GetIterator() const;
 
-	status_t Insert(const Key &key, const Value &value, Iterator &iterator);
-	status_t Remove(const Key &key);
-	Iterator Erase(const Iterator &iterator);
+	inline	Iterator			GetIterator(Node* node);
+	inline	ConstIterator		GetIterator(Node* node) const;
 
-	// debugging
-	int Check(Node *node = NULL, int level = 0, bool levelsOnly = false) const;
+			Iterator			Find(const Key& key);
+			Iterator			FindClose(const Key& key, bool less);
 
-protected:
-	enum {
-		NOT_FOUND		= -3,
-		DUPLICATE		= -2,
-		NO_MEMORY		= -1,
-		OK				= 0,
-		HEIGHT_CHANGED	= 1,
+			status_t			Insert(const Key& key, const Value& value,
+									Iterator* iterator);
+			status_t			Remove(const Key& key);
 
-		LEFT			= -1,
-		BALANCED		= 0,
-		RIGHT			= 1,
-	};
+			const NodeStrategy&	GetNodeStrategy() const	{ return fStrategy; }
 
-	// rotations
-	void _RotateRight(Node **nodeP);
-	void _RotateLeft(Node **nodeP);
+protected:
+	// AVLTreeCompare
+	virtual	int					CompareKeyNode(const void* key,
+									const AVLTreeNode* node);
+	virtual	int					CompareNodes(const AVLTreeNode* node1,
+									const AVLTreeNode* node2);
 
-	// insert
-	int _BalanceInsertLeft(Node **node);
-	int _BalanceInsertRight(Node **node);
-	int _Insert(const Key &key, const Value &value, Node **node,
-				Iterator *iterator);
+			void				_FreeTree(AVLTreeNode* node);
 
-	// remove
-	int _BalanceRemoveLeft(Node **node);
-	int _BalanceRemoveRight(Node **node);
-	int _RemoveRightMostChild(Node **node, Node **foundNode);
-	int _Remove(const Key &key, Node **node);
-	int _Remove(Node *node);
-
-	void _FreeTree(Node *node);
-
-	// debugging
-	void _DumpNode(Node *node) const;
-
 	// strategy shortcuts
-	inline Node *Allocate(const Key &key, const Value &value);
-	inline void Free(Node *node);
-	inline Key &GetKey(Node *node) const;
-	inline Value &GetValue(Node *node) const;
-	inline int Compare(const Key &a, const Key &b);
+	inline	Node*				_Allocate(const Key& key, const Value& value);
+	inline	void				_Free(Node* node);
+	inline	Key&				_GetKey(Node* node) const;
+	inline	Value&				_GetValue(Node* node) const;
+	inline	AVLTreeNode*		_GetAVLTreeNode(const Node* node) const;
+	inline	Node*				_GetNode(const AVLTreeNode* node) const;
+	inline	int					_CompareKeyNode(const Key& a, const Node* b);
+	inline	int					_CompareNodes(const Node* a, const Node* b);
 
 protected:
-	friend class Entry;
-	friend class Iterator;
-	friend class ConstIterator;
-	friend AVLTreeMapIterator<Class>;
-	friend AVLTreeMapIterator<const Class>;
+			friend class Iterator;
+			friend class ConstIterator;
 
-	Node			*fRoot;
-	int				fNodeCount;
-	NodeStrategy	fStrategy;
+			AVLTree				fTree;
+			NodeStrategy		fStrategy;
 
+public:
 	// Iterator
-	class Iterator : public AVLTreeMapIterator<_AVL_TREE_MAP_CLASS_NAME> {
-	private:
-		typedef AVLTreeMapIterator<_AVL_TREE_MAP_CLASS_NAME> SuperClass;
-
+	// (need to implement it here, otherwise gcc 2.95.3 chokes)
+	class Iterator : public ConstIterator {
 	public:
-		inline Iterator();
-		inline Iterator(const Iterator &other);
-
-		inline Iterator &operator++();
-		inline Iterator operator++(int);
-		inline Iterator &operator--();
-		inline Iterator operator--(int);
-		inline Iterator &operator=(Iterator &other);
-
+		inline Iterator()
+			: ConstIterator()
+		{
+		}
+	
+		inline Iterator(const Iterator& other)
+			: ConstIterator(other)
+		{
+		}
+	
+		inline void Remove()
+		{
+			if (AVLTreeNode* node = ConstIterator::fTreeIterator.Remove()) {
+				_AVL_TREE_MAP_CLASS_NAME* parent
+					= const_cast<_AVL_TREE_MAP_CLASS_NAME*>(
+						ConstIterator::fParent);
+				parent->_Free(parent->_GetNode(node));
+			}
+		}
+	
 	private:
-		inline Iterator(_AVL_TREE_MAP_CLASS_NAME *parent, Node *node = NULL);
-
+		inline Iterator(_AVL_TREE_MAP_CLASS_NAME* parent,
+			const AVLTreeIterator& treeIterator)
+			: ConstIterator(parent, treeIterator)
+		{
+		}
+	
 		friend class _AVL_TREE_MAP_CLASS_NAME;
 	};
-
-	// ConstIterator
-	class ConstIterator
-		: public AVLTreeMapIterator<const _AVL_TREE_MAP_CLASS_NAME> {
-	private:
-		typedef AVLTreeMapIterator<const _AVL_TREE_MAP_CLASS_NAME> SuperClass;
-
-	public:
-		inline ConstIterator();
-		inline ConstIterator(const ConstIterator &other);
-		inline ConstIterator(const Iterator &other);
-
-		inline ConstIterator &operator++();
-		inline ConstIterator operator++(int);
-		inline ConstIterator &operator--();
-		inline ConstIterator operator--(int);
-		inline ConstIterator &operator=(ConstIterator &other);
-		inline ConstIterator &operator=(Iterator &other);
-
-	private:
-		inline ConstIterator(const _AVL_TREE_MAP_CLASS_NAME *parent,
-							 Node *node = NULL);
-
-		friend class _AVL_TREE_MAP_CLASS_NAME;
-	};
 };
 
 
-// AVLTreeMapEntry
-template<typename Parent>
-class AVLTreeMapEntry {
+// ConstIterator
+_AVL_TREE_MAP_TEMPLATE_LIST
+class _AVL_TREE_MAP_CLASS_NAME::ConstIterator {
 public:
-	AVLTreeMapEntry()
-		: fParent(NULL), fNode(NULL) {}
-	AVLTreeMapEntry(const AVLTreeMapEntry &other)
-		: fParent(other.fParent), fNode(other.fNode) {}
-
-	inline const Parent::Key &Key() const
-		{ return fParent->GetKey(fNode); }
-	inline const Parent::Value &Value() const
-		{ return fParent->GetValue(fNode); }
-
-private:
-	AVLTreeMapEntry(const Parent *parent, Parent::Node *node)
-		: fParent(parent), fNode(node) {}
-
-private:
-	friend class AVLTreeMapEntryPointer<Parent>;
-	friend class AVLTreeMapIterator<Parent>;
-	friend class AVLTreeMapIterator<const Parent>;
-
-	const Parent	*fParent;
-	Parent::Node	*fNode;
-};
-
-// AVLTreeMapEntryPointer
-template<typename Parent>
-class AVLTreeMapEntryPointer {
-public:
-	inline const Entry *operator->() const
+	inline ConstIterator()
+		: fParent(NULL),
+		  fTreeIterator()
 	{
-		return &fEntry;
 	}
 
-private:
-	AVLTreeMapEntryPointer(const Parent *parent, Parent::Node *node)
-		: fEntry(parent, node) {}
-
-	AVLTreeMapEntryPointer(const AVLTreeMapEntryPointer &);
-	AVLTreeMapEntryPointer &operator=(const AVLTreeMapEntryPointer &);
-
-private:
-	friend class AVLTreeMapIterator<Parent>;
-	friend class AVLTreeMapIterator<const Parent>;
-
-	AVLTreeMapEntry<Parent>	fEntry;
-};
-
-// AVLTreeMapIterator
-template<typename Parent>
-class AVLTreeMapIterator {
-private:
-	typedef AVLTreeMapIterator<Value, Parent>		Iterator;
-	typedef typename Parent::Node					Node;
-	typedef typename Parent::Entry					Entry;
-	typedef AVLTreeMapEntryPointer<Parent::Class>	EntryPointer;
-
-public:
-	inline bool operator==(const Iterator &other) const
+	inline ConstIterator(const ConstIterator& other)
+		: fParent(other.fParent),
+		  fTreeIterator(other.fTreeIterator)
 	{
-		return (fParent == other.fParent && fCurrent == other.fCurrent);
 	}
 
-	inline bool operator!=(const Iterator &other) const
+	inline bool HasCurrent() const
 	{
-		return !(*this == other);
+		return fTreeIterator.Current();
 	}
 
-	inline const Entry operator*() const
+	inline Key CurrentKey()
 	{
-		return Entry(fParent, fCurrent);
+		if (AVLTreeNode* node = fTreeIterator.Current())
+			return fParent->_GetKey(fParent->_GetNode(node));
+		return Key();
 	}
 
-	inline const EntryPointer operator->() const
+	inline Value Current()
 	{
-		return EntryPointer(fParent, fCurrent);
+		if (AVLTreeNode* node = fTreeIterator.Current())
+			return fParent->_GetValue(fParent->_GetNode(node));
+		return Value();
 	}
 
-protected:
-	inline AVLTreeMapIterator()
-		: fParent(NULL),
-		  fCurrent(NULL)
+	inline Value* CurrentValuePointer()
 	{
+		if (AVLTreeNode* node = fTreeIterator.Current())
+			return &fParent->_GetValue(fParent->_GetNode(node));
+		return NULL;
 	}
 
-	inline AVLTreeMapIterator(const Iterator &other)
-		: fParent(other.fParent),
-		  fCurrent(other.fCurrent)
+	inline bool HasNext() const
 	{
+		return fTreeIterator.HasNext();
 	}
 
-	inline AVLTreeMapIterator(Parent *parent, Node *node = NULL)
-		: fParent(parent),
-		  fCurrent(node)
+	inline Value Next()
 	{
+		if (AVLTreeNode* node = fTreeIterator.Next())
+			return fParent->_GetValue(fParent->_GetNode(node));
+		return Value();
 	}
 
-	inline Iterator &operator++()
+	inline Value Previous()
 	{
-		if (fCurrent)
-			fCurrent = _GetNextNode(fCurrent);
-		else if (fParent)
-			fCurrent = _GetLeftMostNode(fParent->fRoot);
-		return *this;
+		if (AVLTreeNode* node = fTreeIterator.Previous())
+			return fParent->_GetValue(fParent->_GetNode(node));
+		return Value();
 	}
 
-	inline Iterator operator++(int)
+	inline ConstIterator& operator=(const ConstIterator& other)
 	{
-		Iterator it(*this);
-		++*this;
-		return it;
-	}
-
-	inline Iterator &operator--()
-	{
-		if (fCurrent)
-			fCurrent = _GetPreviousNode(fCurrent);
-		else if (fParent)
-			fCurrent = _GetRightMostNode(fParent->fRoot);
-		return *this;
-	}
-
-	inline Iterator operator--(int)
-	{
-		Iterator it(*this);
-		--*this;
-		return it;
-	}
-
-	inline Iterator &operator=(const Iterator &other)
-	{
 		fParent = other.fParent;
-		fCurrent = other.fCurrent;
+		fTreeIterator = other.fTreeIterator;
 		return *this;
 	}
 
-	inline operator bool() const
+protected:
+	inline ConstIterator(const _AVL_TREE_MAP_CLASS_NAME* parent,
+		const AVLTreeIterator& treeIterator)
 	{
-		return fCurrent;
+		fParent = parent;
+		fTreeIterator = treeIterator;
 	}
 
-private:
-	static inline Node *_GetPreviousNode(Node *node)
-	{
-		if (node) {
-			// The previous node cannot be in the right subtree.
-			if (node->left) {
-				// We have a left subtree, so go to the right-most node.
-				node = node->left;
-				while (node->right)
-					node = node->right;
-			} else {
-				// No left subtree: Backtrack our path and stop, where we
-				// took the right branch.
-				Node *previous;
-				do {
-					previous = node;
-					node = node->parent;
-				} while (node && previous == node->left);
-			}
-		}
-		return node;
-	}
+	friend class _AVL_TREE_MAP_CLASS_NAME;
 
-	static inline Node *_GetNextNode(Node *node)
-	{
-		if (node) {
-			// The next node cannot be in the left subtree.
-			if (node->right) {
-				// We have a right subtree, so go to the left-most node.
-				node = node->right;
-				while (node->left)
-					node = node->left;
-			} else {
-				// No right subtree: Backtrack our path and stop, where we
-				// took the left branch.
-				Node *previous;
-				do {
-					previous = node;
-					node = node->parent;
-				} while (node && previous == node->right);
-			}
-		}
-		return node;
-	}
-
-	static inline Node *_GetLeftMostNode(Node *node)
-	{
-		if (node) {
-			while (node->left)
-				node = node->left;
-		}
-		return node;
-	}
-
-	static inline Node *_GetRightMostNode(Node *node)
-	{
-		if (node) {
-			while (node->right)
-				node = node->right;
-		}
-		return node;
-	}
-
-protected:
-	Parent	*fParent;
-	Node	*fCurrent;
+	const _AVL_TREE_MAP_CLASS_NAME*	fParent;
+	AVLTreeIterator					fTreeIterator;
 };
 
-// Iterator
 
+// constructor
 _AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::Iterator::Iterator()
-	: SuperClass()
+_AVL_TREE_MAP_CLASS_NAME::AVLTreeMap(const NodeStrategy& strategy)
+	: fTree(this),
+	  fStrategy(strategy)
 {
 }
 
-_AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::Iterator::Iterator(const Iterator &other)
-	: SuperClass(other)
-{
-}
 
+// destructor
 _AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::Iterator &
-_AVL_TREE_MAP_CLASS_NAME::Iterator::operator++()
+_AVL_TREE_MAP_CLASS_NAME::~AVLTreeMap()
 {
-	SuperClass::operator++();
-	return *this;
 }
 
-_AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::Iterator 
-_AVL_TREE_MAP_CLASS_NAME::Iterator::operator++(int)
-{
-	Iterator it(*this);
-	++*this;
-	return it;
-}
 
+// MakeEmpty
 _AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::Iterator &
-_AVL_TREE_MAP_CLASS_NAME::Iterator::operator--()
+inline void
+_AVL_TREE_MAP_CLASS_NAME::MakeEmpty()
 {
-	SuperClass::operator--();
-	return *this;
+	AVLTreeNode* root = fTree.Root();
+	_FreeTree(root);
 }
 
-_AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::Iterator
-_AVL_TREE_MAP_CLASS_NAME::Iterator::operator--(int)
-{
-	Iterator it(*this);
-	--*this;
-	return it;
-}
 
+// RootNode
 _AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::Iterator &
-_AVL_TREE_MAP_CLASS_NAME::Iterator::operator=(Iterator &other)
+inline typename _AVL_TREE_MAP_CLASS_NAME::Node*
+_AVL_TREE_MAP_CLASS_NAME::RootNode() const
 {
-	*(SuperClass*)this = other;
-	return *this;
+	if (AVLTreeNode* root = fTree.Root())
+		return _GetNode(root);
+	return NULL;
 }
 
-_AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::Iterator::Iterator(_AVL_TREE_MAP_CLASS_NAME *parent,
-											 Node *node)
-	: SuperClass(parent, node)
-{
-}
 
-// ConstIterator
-
+// GetIterator
 _AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator::ConstIterator()
-	: SuperClass()
+inline typename _AVL_TREE_MAP_CLASS_NAME::Iterator
+_AVL_TREE_MAP_CLASS_NAME::GetIterator()
 {
+	return Iterator(this, fTree.GetIterator());
 }
 
-_AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator::ConstIterator(
-	const ConstIterator &other)
-	: SuperClass(other)
-{
-}
 
+// GetIterator
 _AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator::ConstIterator(const Iterator &other)
-	: SuperClass(other.fParent, other.fCurrent)
+inline typename _AVL_TREE_MAP_CLASS_NAME::ConstIterator
+_AVL_TREE_MAP_CLASS_NAME::GetIterator() const
 {
+	return ConstIterator(this, fTree.GetIterator());
 }
 
-_AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator &
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator::operator++()
-{
-	SuperClass::operator++();
-	return *this;
-}
 
+// GetIterator
 _AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator::operator++(int)
+inline typename _AVL_TREE_MAP_CLASS_NAME::Iterator
+_AVL_TREE_MAP_CLASS_NAME::GetIterator(Node* node)
 {
-	ConstIterator it(*this);
-	++*this;
-	return it;
+	return Iterator(this, fTree.GetIterator(_GetAVLTreeNode(node)));
 }
 
-_AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator &
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator::operator--()
-{
-	SuperClass::operator--();
-	return *this;
-}
 
+// GetIterator
 _AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator::operator--(int)
+inline typename _AVL_TREE_MAP_CLASS_NAME::ConstIterator
+_AVL_TREE_MAP_CLASS_NAME::GetIterator(Node* node) const
 {
-	Iterator it(*this);
-	--*this;
-	return it;
+	return ConstIterator(this, fTree.GetIterator(_GetAVLTreeNode(node)));
 }
 
-_AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator &
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator::operator=(ConstIterator &other)
-{
-	*(SuperClass*)this = other;
-	return *this;
-}
 
+// Find
 _AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator &
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator::operator=(Iterator &other)
+typename _AVL_TREE_MAP_CLASS_NAME::Iterator
+_AVL_TREE_MAP_CLASS_NAME::Find(const Key& key)
 {
-	fParent = other.fParent;
-	fCurrent = other.fCurrent;
-	return *this;
+	if (AVLTreeNode* node = fTree.Find(&key))
+		return Iterator(this, fTree.GetIterator(node));
+	return Iterator();
 }
 
-_AVL_TREE_MAP_TEMPLATE_LIST
-inline
-_AVL_TREE_MAP_CLASS_NAME::ConstIterator::ConstIterator(
-	const _AVL_TREE_MAP_CLASS_NAME *parent, Node *node)
-	: SuperClass(parent, node)
-{
-}
 
-
-// AVLTreeMap
-
-// constructor
+// FindClose
 _AVL_TREE_MAP_TEMPLATE_LIST
-_AVL_TREE_MAP_CLASS_NAME::AVLTreeMap()
-	: fRoot(NULL),
-	  fNodeCount(0)
+typename _AVL_TREE_MAP_CLASS_NAME::Iterator
+_AVL_TREE_MAP_CLASS_NAME::FindClose(const Key& key, bool less)
 {
+	if (AVLTreeNode* node = fTree.FindClose(&key, less))
+		return Iterator(this, fTree.GetIterator(node));
+	return Iterator();
 }
 
-// destructor
-_AVL_TREE_MAP_TEMPLATE_LIST
-_AVL_TREE_MAP_CLASS_NAME::~AVLTreeMap()
-{
-	_FreeTree(fRoot);
-	fRoot = NULL;
-}
 
-// MakeEmpty
+// Insert
 _AVL_TREE_MAP_TEMPLATE_LIST
-void
-_AVL_TREE_MAP_CLASS_NAME::MakeEmpty()
+status_t
+_AVL_TREE_MAP_CLASS_NAME::Insert(const Key& key, const Value& value,
+	Iterator* iterator)
 {
-	_FreeTree(fRoot);
-	fRoot = NULL;
-	fNodeCount = 0;
-}
+	// allocate a node
+	Node* userNode = _Allocate(key, value);
+	if (!userNode)
+		return B_NO_MEMORY;
 
-// Find
-_AVL_TREE_MAP_TEMPLATE_LIST
-_AVL_TREE_MAP_CLASS_NAME::Iterator
-_AVL_TREE_MAP_CLASS_NAME::Find(const Key &key)
-{
-	Node *node = fRoot;
-	while (node) {
-		int cmp = Compare(key, GetKey(node));
-		if (cmp == 0)
-			return Iterator(this, node);
-		if (cmp < 0)
-			node = node->left;
-		else
-			node = node->right;
+	// insert node

[... truncated: 1503 lines follow ...]


From bonefish at mail.berlios.de  Sat Aug 11 17:02:22 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Sat, 11 Aug 2007 17:02:22 +0200
Subject: [Haiku-commits] r21893 -
	haiku/trunk/src/add-ons/kernel/file_systems/ramfs
Message-ID: <200708111502.l7BF2MRu024337@sheep.berlios.de>

Author: bonefish
Date: 2007-08-11 17:02:22 +0200 (Sat, 11 Aug 2007)
New Revision: 21893
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21893&view=rev

Removed:
   haiku/trunk/src/add-ons/kernel/file_systems/ramfs/AVLTree.h
Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/ramfs/AttributeIndexImpl.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Jamfile
   haiku/trunk/src/add-ons/kernel/file_systems/ramfs/LastModifiedIndex.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/ramfs/NameIndex.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Query.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Query.h
   haiku/trunk/src/add-ons/kernel/file_systems/ramfs/SizeIndex.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/ramfs/TwoKeyAVLTree.h
   haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Volume.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Volume.h
Log:
Removed the AVLTree implementation and used the kernel utils version
instead. Quite a few changes to account for the different interfaces.
The add-on size dropped from 438 to 302 KB, which is still quite heavy.


Deleted: haiku/trunk/src/add-ons/kernel/file_systems/ramfs/AVLTree.h

Modified: haiku/trunk/src/add-ons/kernel/file_systems/ramfs/AttributeIndexImpl.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ramfs/AttributeIndexImpl.cpp	2007-08-11 14:57:25 UTC (rev 21892)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ramfs/AttributeIndexImpl.cpp	2007-08-11 15:02:22 UTC (rev 21893)
@@ -142,12 +142,8 @@
 	AttributeTree(uint32 type)
 		: TwoKeyAVLTree<Attribute*, PrimaryKey, PrimaryKeyCompare,
 						GetPrimaryKey>(PrimaryKeyCompare(type),
-		  	GetPrimaryKey(), AVLTreeStandardCompare<Attribute*>(),
-			AVLTreeStandardGetKey<Attribute*, Attribute*>(),
-			AVLTreeStandardNodeAllocator<Attribute*,
-										 AVLTreeStandardNode<Attribute*> >(),
-			AVLTreeStandardGetValue<Attribute*,
-									AVLTreeStandardNode<Attribute*> >())
+		  	GetPrimaryKey(), TwoKeyAVLTreeStandardCompare<Attribute*>(),
+			TwoKeyAVLTreeStandardGetKey<Attribute*, Attribute*>())
 	{
 	}
 };
@@ -254,7 +250,7 @@
 						iterator->NodeRemoved(node);
 				}
 				// remove and re-insert the attribute
-				fAttributes->Remove(it);
+				it.Remove();
 			}
 		}
 		// re-insert the attribute

Modified: haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Jamfile	2007-08-11 14:57:25 UTC (rev 21892)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Jamfile	2007-08-11 15:02:22 UTC (rev 21893)
@@ -4,6 +4,8 @@
 	file_systems userlandfs ] ;
 local userlandFSIncludes = [ PrivateHeaders userlandfs ] ;
 
+UsePrivateHeaders kernel ;	# for <util/*>
+
 SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ;
 
 SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ;

Modified: haiku/trunk/src/add-ons/kernel/file_systems/ramfs/LastModifiedIndex.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ramfs/LastModifiedIndex.cpp	2007-08-11 14:57:25 UTC (rev 21892)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ramfs/LastModifiedIndex.cpp	2007-08-11 15:02:22 UTC (rev 21893)
@@ -158,7 +158,7 @@
 					iterator->NodeRemoved(node);
 			}
 			// remove and re-insert the node
-			fNodes->Remove(it);
+			it.Remove();
 			error = fNodes->Insert(node);
 
 			// udpate live queries

Modified: haiku/trunk/src/add-ons/kernel/file_systems/ramfs/NameIndex.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ramfs/NameIndex.cpp	2007-08-11 14:57:25 UTC (rev 21892)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ramfs/NameIndex.cpp	2007-08-11 15:02:22 UTC (rev 21893)
@@ -137,7 +137,7 @@
 		Entry **foundEntry
 			= fEntries->Find(NameIndexPrimaryKey(entry, oldName), entry, &it);
 		if (foundEntry && *foundEntry == entry) {
-			fEntries->Remove(it);
+			it.Remove();
 			error = fEntries->Insert(entry);
 
 			// udpate live queries

Modified: haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Query.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Query.cpp	2007-08-11 14:57:25 UTC (rev 21892)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Query.cpp	2007-08-11 15:02:22 UTC (rev 21893)
@@ -105,6 +105,19 @@
 	return error;
 }
 
+// Rewind
+status_t
+IndexIterator::Rewind()
+{
+	status_t error = B_ENTRY_NOT_FOUND;
+	if (fIndexWrapper && fIndexWrapper->fIndex) {
+		fInitialized = fIndexWrapper->fIndex->GetIterator(&fIterator);
+		if (fInitialized)
+			error = B_OK;
+	}
+	return error;
+}
+
 // GetNextEntry
 status_t
 IndexIterator::GetNextEntry(uint8 *buffer, uint16 *_keyLength,
@@ -1119,8 +1132,10 @@
 		if (fOp == OP_EQUAL && !fIsPattern)
 			return status;
 		else if (status == B_ENTRY_NOT_FOUND
-			&& (fIsPattern || fOp == OP_GREATER_THAN || fOp == OP_GREATER_THAN_OR_EQUAL))
-			return B_OK;
+			&& (fIsPattern || fOp == OP_GREATER_THAN
+				|| fOp == OP_GREATER_THAN_OR_EQUAL)) {
+			return (*iterator)->Rewind();
+		}
 
 		RETURN_ERROR(status);
 	}

Modified: haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Query.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Query.h	2007-08-11 14:57:25 UTC (rev 21892)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Query.h	2007-08-11 15:02:22 UTC (rev 21893)
@@ -57,6 +57,7 @@
 	IndexIterator(IndexWrapper *indexWrapper);
 
 	status_t Find(const uint8 *const key, size_t keyLength);
+	status_t Rewind();
 	status_t GetNextEntry(uint8 *buffer, uint16 *keyLength, size_t bufferSize,
 						  Entry **entry);
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/ramfs/SizeIndex.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ramfs/SizeIndex.cpp	2007-08-11 14:57:25 UTC (rev 21892)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ramfs/SizeIndex.cpp	2007-08-11 15:02:22 UTC (rev 21893)
@@ -157,7 +157,7 @@
 			}
 
 			// remove and re-insert the node
-			fNodes->Remove(it);
+			it.Remove();
 			error = fNodes->Insert(node);
 
 			// udpate live queries

Modified: haiku/trunk/src/add-ons/kernel/file_systems/ramfs/TwoKeyAVLTree.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ramfs/TwoKeyAVLTree.h	2007-08-11 14:57:25 UTC (rev 21892)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ramfs/TwoKeyAVLTree.h	2007-08-11 15:02:22 UTC (rev 21893)
@@ -1,35 +1,13 @@
-// TwoKeyAVLTree.h
-//
-// Copyright (c) 2003, Ingo Weinhold (bonefish at cs.tu-berlin.de)
-//
-// 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.
-// 
-// Except as contained in this notice, the name of a copyright holder shall
-// not be used in advertising or otherwise to promote the sale, use or other
-// dealings in this Software without prior written authorization of the
-// copyright holder.
-
+/*
+ * Copyright 2003-2007, Ingo Weinhold <bonefish at cs.tu-berlin.de>.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef TWO_KEY_AVL_TREE_H
 #define TWO_KEY_AVL_TREE_H
 
-#include "AVLTree.h"
+#include <util/AVLTreeMap.h>
 
+
 // TwoKeyAVLTreeKey
 template<typename PrimaryKey, typename SecondaryKey>
 class TwoKeyAVLTreeKey {
@@ -105,56 +83,172 @@
 	GetSecondaryKey	fGetSecondaryKey;
 };
 
+
+// TwoKeyAVLTreeStandardCompare
+template<typename Value>
+class TwoKeyAVLTreeStandardCompare
+{
+public:
+	inline int operator()(const Value &a, const Value &b) const
+	{
+		if (a < b)
+			return -1;
+		else if (a > b)
+			return 1;
+		return 0;
+	}
+};
+
+
+// TwoKeyAVLTreeStandardGetKey
+template<typename Value, typename Key>
+class TwoKeyAVLTreeStandardGetKey
+{
+public:
+	inline const Key &operator()(const Value &a) const
+	{
+		return a;
+	}
+
+	inline Key &operator()(Value &a) const
+	{
+		return a;
+	}
+};
+
+
+// TwoKeyAVLTreeNodeStrategy
+template <typename PrimaryKey, typename SecondaryKey, typename Value,
+	typename PrimaryKeyCompare, typename SecondaryKeyCompare,
+	typename GetPrimaryKey, typename GetSecondaryKey>
+class TwoKeyAVLTreeNodeStrategy {
+public:
+	typedef TwoKeyAVLTreeKey<PrimaryKey, SecondaryKey> Key;
+
+	TwoKeyAVLTreeNodeStrategy(
+		const PrimaryKeyCompare& primaryKeyCompare = PrimaryKeyCompare(),
+		const SecondaryKeyCompare& secondaryKeyCompare = SecondaryKeyCompare(),
+		const GetPrimaryKey& getPrimaryKey = GetPrimaryKey(),
+		const GetSecondaryKey& getSecondaryKey = GetSecondaryKey())
+		: fPrimaryKeyCompare(primaryKeyCompare),
+		  fSecondaryKeyCompare(secondaryKeyCompare),
+		  fGetPrimaryKey(getPrimaryKey),
+		  fGetSecondaryKey(getSecondaryKey)
+	{
+	}
+
+	struct Node : AVLTreeNode {
+		Node(const Value &value)
+			: AVLTreeNode(),
+			  value(value)
+		{
+		}
+
+		Value	value;
+	};
+
+	inline Node* Allocate(const Key& key, const Value& value) const
+	{
+		return new(nothrow) Node(value);
+	}
+
+	inline void Free(Node* node) const
+	{
+		delete node;
+	}
+
+	// internal use (not part of the strategy)
+	inline Key GetValueKey(const Value& value) const
+	{
+		return Key(fGetPrimaryKey(value), fGetSecondaryKey(value));
+	}
+
+	inline Key GetKey(Node* node) const
+	{
+		return GetValueKey(node->value);
+	}
+
+	inline Value& GetValue(Node* node) const
+	{
+		return node->value;
+	}
+
+	inline AVLTreeNode* GetAVLTreeNode(Node* node) const
+	{
+		return node;
+	}
+
+	inline Node* GetNode(AVLTreeNode* node) const
+	{
+		return static_cast<Node*>(node);
+	}
+
+	inline int CompareKeyNode(const Key& a, const Node* b) const
+	{
+		return _CompareKeys(a, GetKey(const_cast<Node*>(b)));
+	}
+
+	inline int CompareNodes(const Node* a, const Node* b) const
+	{
+		return _CompareKeys(GetKey(const_cast<Node*>(a)),
+			GetKey(const_cast<Node*>(b)));
+	}
+
+private:
+	inline int _CompareKeys(const Key& a, const Key& b) const
+	{
+		int result = fPrimaryKeyCompare(a.primary, b.primary);
+		if (result == 0 && a.use_secondary && b.use_secondary)
+			result = fSecondaryKeyCompare(a.secondary, b.secondary);
+		return result;
+	}
+
+	PrimaryKeyCompare	fPrimaryKeyCompare;
+	SecondaryKeyCompare	fSecondaryKeyCompare;
+	GetPrimaryKey		fGetPrimaryKey;
+	GetSecondaryKey		fGetSecondaryKey;
+};
+
+
 // for convenience
 #define TWO_KEY_AVL_TREE_TEMPLATE_LIST template<typename Value, \
 	typename PrimaryKey, typename PrimaryKeyCompare, \
-	typename GetPrimaryKey, typename SecondaryKey, typename Node, \
-	typename SecondaryKeyCompare, typename GetSecondaryKey, \
-	typename NodeAllocator, typename GetValue>
+	typename GetPrimaryKey, typename SecondaryKey, \
+	typename SecondaryKeyCompare, typename GetSecondaryKey>
 #define TWO_KEY_AVL_TREE_CLASS_NAME TwoKeyAVLTree<Value, PrimaryKey, \
-	PrimaryKeyCompare, GetPrimaryKey, SecondaryKey, Node, \
-	SecondaryKeyCompare, GetSecondaryKey, NodeAllocator, GetValue>
+	PrimaryKeyCompare, GetPrimaryKey, SecondaryKey, \
+	SecondaryKeyCompare, GetSecondaryKey>
 
+
 // TwoKeyAVLTree
 template<typename Value, typename PrimaryKey,
 		 typename PrimaryKeyCompare, typename GetPrimaryKey,
 		 typename SecondaryKey = Value,
-		 typename Node = AVLTreeStandardNode<Value>,
-		 typename SecondaryKeyCompare = AVLTreeStandardCompare<SecondaryKey>,
-		 typename GetSecondaryKey = AVLTreeStandardGetKey<Value, SecondaryKey>,
-		 typename NodeAllocator = AVLTreeStandardNodeAllocator<Value, Node>,
-		 typename GetValue = AVLTreeStandardGetValue<Value, Node> >
-class TwoKeyAVLTree : private AVLTree<Value,
-	TwoKeyAVLTreeKey<PrimaryKey, SecondaryKey>, Node,
-	TwoKeyAVLTreeKeyCompare<PrimaryKey, SecondaryKey, PrimaryKeyCompare,
-							SecondaryKeyCompare>,
-	TwoKeyAVLTreeGetKey<Value, PrimaryKey, SecondaryKey, GetPrimaryKey,
-						GetSecondaryKey>,
-	NodeAllocator, GetValue> {
-private:
+		 typename SecondaryKeyCompare
+			= TwoKeyAVLTreeStandardCompare<SecondaryKey>,
+		 typename GetSecondaryKey
+			= TwoKeyAVLTreeStandardGetKey<Value, SecondaryKey> >
+class TwoKeyAVLTree {
+public:
 	typedef TwoKeyAVLTreeKey<PrimaryKey, SecondaryKey> Key;
-	typedef TwoKeyAVLTreeKeyCompare<PrimaryKey, SecondaryKey,
-									PrimaryKeyCompare, SecondaryKeyCompare>
-			KeyCompare;
-	typedef TwoKeyAVLTreeGetKey<Value, PrimaryKey, SecondaryKey, GetPrimaryKey,
-								GetSecondaryKey>
-			GetKey;
-	typedef AVLTree<Value, Key, Node, KeyCompare, GetKey, NodeAllocator,
-					GetValue> BaseClass;
-public:
-	typedef typename BaseClass::Iterator Iterator;
+	typedef TwoKeyAVLTreeNodeStrategy<PrimaryKey, SecondaryKey, Value,
+		PrimaryKeyCompare, SecondaryKeyCompare, GetPrimaryKey,
+		GetSecondaryKey> NodeStrategy;
+	typedef AVLTreeMap<Key, Value, NodeStrategy> TreeMap;
 
-public:
+	typedef typename TreeMap::Iterator	TreeMapIterator;
+	typedef typename NodeStrategy::Node Node;
+
+	class Iterator;
+
 	TwoKeyAVLTree();
 	TwoKeyAVLTree(const PrimaryKeyCompare &primaryCompare,
 				  const GetPrimaryKey &getPrimary,
 				  const SecondaryKeyCompare &secondaryCompare,
-				  const GetSecondaryKey &getSecondary,
-				  const NodeAllocator &allocator,
-				  const GetValue &getValue);
+				  const GetSecondaryKey &getSecondary);
 	~TwoKeyAVLTree();
 
-	inline int CountItems() const	{ return BaseClass::CountItems(); }
+	inline int CountItems() const	{ return fTreeMap.Count(); }
 
 	Value *FindFirst(const PrimaryKey &key, Iterator *iterator = NULL);
 	Value *FindLast(const PrimaryKey &key, Iterator *iterator = NULL);
@@ -162,73 +256,145 @@
 					   const SecondaryKey &secondaryKey,
 					   Iterator *iterator = NULL);
 
-	inline void GetIterator(Iterator *iterator, bool reverse = false);
+	inline void GetIterator(Iterator *iterator);
 
 	inline status_t Insert(const Value &value, Iterator *iterator = NULL);
 	inline status_t Remove(const PrimaryKey &primaryKey,
 						   const SecondaryKey &secondaryKey);
-	inline void Remove(Iterator &iterator);
 
 private:
+	TreeMap				fTreeMap;
 	PrimaryKeyCompare	fPrimaryKeyCompare;
 	GetPrimaryKey		fGetPrimaryKey;
 };
 
 
+// Iterator
+TWO_KEY_AVL_TREE_TEMPLATE_LIST
+class TWO_KEY_AVL_TREE_CLASS_NAME::Iterator {
+public:
+	typedef typename TWO_KEY_AVL_TREE_CLASS_NAME::TreeMapIterator
+		TreeMapIterator;
+
+	inline Iterator()
+		: fIterator()
+	{
+	}
+
+	inline ~Iterator()
+	{
+	}
+
+	inline Value *GetCurrent()
+	{
+		return fIterator.CurrentValuePointer();
+	}
+
+	inline Value *GetNext()
+	{
+		fIterator.Next();
+		return GetCurrent();
+	}
+
+	inline Value *GetPrevious()
+	{
+		fIterator.Previous();
+		return GetCurrent();
+	}
+
+	inline void Remove()
+	{
+		fIterator.Remove();
+	}
+
+private:
+	friend class TWO_KEY_AVL_TREE_CLASS_NAME;
+
+	Iterator(const Iterator& other)
+		: fIterator(other.fIterator)
+	{
+	}
+
+	Iterator &operator=(const Iterator& other)
+	{
+		fIterator = other.fIterator;
+	}
+
+	Iterator(const TreeMapIterator &iterator)
+		: fIterator()
+	{
+	}
+
+	inline void _SetTo(const TreeMapIterator &iterator)
+	{
+		fIterator = iterator;
+	}
+
+private:
+	TWO_KEY_AVL_TREE_CLASS_NAME::TreeMapIterator fIterator;
+};
+
+
 // constructor
 TWO_KEY_AVL_TREE_TEMPLATE_LIST
 TWO_KEY_AVL_TREE_CLASS_NAME::TwoKeyAVLTree()
-	: BaseClass(KeyCompare(PrimaryKeyCompare(), SecondaryKeyCompare()),
-						   GetKey(GetPrimaryKey(), GetSecondaryKey()),
-						   NodeAllocator(), GetValue())
+	: fTreeMap(NodeStrategy(PrimaryKeyCompare(), SecondaryKeyCompare(),
+		GetPrimaryKey(), GetSecondaryKey())),
+	  fPrimaryKeyCompare(PrimaryKeyCompare()),
+	  fGetPrimaryKey(GetPrimaryKey())
 {
 }
 
+
 // constructor
 TWO_KEY_AVL_TREE_TEMPLATE_LIST
 TWO_KEY_AVL_TREE_CLASS_NAME::TwoKeyAVLTree(
 	const PrimaryKeyCompare &primaryCompare, const GetPrimaryKey &getPrimary,
 	const SecondaryKeyCompare &secondaryCompare,
-	const GetSecondaryKey &getSecondary, const NodeAllocator &allocator,
-	const GetValue &getValue)
-	: BaseClass(KeyCompare(primaryCompare, secondaryCompare),
-						   GetKey(getPrimary, getSecondary),
-						   allocator, getValue),
+	const GetSecondaryKey &getSecondary)
+	: fTreeMap(NodeStrategy(primaryCompare, secondaryCompare, getPrimary,
+		getSecondary)),
 	  fPrimaryKeyCompare(primaryCompare),
 	  fGetPrimaryKey(getPrimary)
-	  
 {
 }
 
+
 // destructor
 TWO_KEY_AVL_TREE_TEMPLATE_LIST
 TWO_KEY_AVL_TREE_CLASS_NAME::~TwoKeyAVLTree()
 {
 }
 
+
 // FindFirst
 TWO_KEY_AVL_TREE_TEMPLATE_LIST
 Value *
 TWO_KEY_AVL_TREE_CLASS_NAME::FindFirst(const PrimaryKey &key,
-									   Iterator *iterator)
+	Iterator *iterator)
 {
-	Node *node = BaseClass::fRoot;
+	const NodeStrategy& strategy = fTreeMap.GetNodeStrategy();
+	Node *node = fTreeMap.RootNode();
+
 	while (node) {
-		int cmp = fPrimaryKeyCompare(key, fGetPrimaryKey(fGetValue(node)));
+		int cmp = fPrimaryKeyCompare(key, fGetPrimaryKey(
+			strategy.GetValue(node)));
 		if (cmp == 0) {
 			// found a matching node, now get the left-most node with that key
 			while (node->left && fPrimaryKeyCompare(key,
-				   		fGetPrimaryKey(fGetValue(node->left))) == 0) {
-				node = node->left;
+				   	fGetPrimaryKey(strategy.GetValue(
+						strategy.GetNode(node->left)))) == 0) {
+				node = strategy.GetNode(node->left);
 			}
 			if (iterator)
-				_InitIterator(iterator, node);
-			return &fGetValue(node);
+				iterator->_SetTo(fTreeMap.GetIterator(node));
+			return &strategy.GetValue(node);
 		}
+
 		if (cmp < 0)
-			node = node->left;
+			node = strategy.GetNode(node->left);
 		else
-			node = node->right;
+			node = strategy.GetNode(node->right);
 	}
 	return NULL;
 }
@@ -237,25 +403,30 @@
 TWO_KEY_AVL_TREE_TEMPLATE_LIST
 Value *
 TWO_KEY_AVL_TREE_CLASS_NAME::FindLast(const PrimaryKey &key,
-									  Iterator *iterator)
+	Iterator *iterator)
 {
-	Node *node = BaseClass::fRoot;
+	const NodeStrategy& strategy = fTreeMap.GetNodeStrategy();
+	Node *node = fTreeMap.RootNode();
+
 	while (node) {
-		int cmp = fPrimaryKeyCompare(key, fGetPrimaryKey(fGetValue(node)));
+		int cmp = fPrimaryKeyCompare(key, fGetPrimaryKey(
+			strategy.GetValue(node)));
 		if (cmp == 0) {
 			// found a matching node, now get the right-most node with that key
 			while (node->right && fPrimaryKeyCompare(key,
-				   		fGetPrimaryKey(fGetValue(node->right))) == 0) {
-				node = node->right;
+				   	fGetPrimaryKey(strategy.GetValue(
+						strategy.GetNode(node->right)))) == 0) {
+				node = strategy.GetNode(node->right);
 			}
 			if (iterator)
-				_InitIterator(iterator, node);
-			return &fGetValue(node);
+				iterator->_SetTo(fTreeMap.GetIterator(node));
+			return &strategy.GetValue(node);
 		}
+
 		if (cmp < 0)
-			node = node->left;
+			node = strategy.GetNode(node->left);
 		else
-			node = node->right;
+			node = strategy.GetNode(node->right);
 	}
 	return NULL;
 }
@@ -264,18 +435,24 @@
 TWO_KEY_AVL_TREE_TEMPLATE_LIST
 Value *
 TWO_KEY_AVL_TREE_CLASS_NAME::Find(const PrimaryKey &primaryKey,
-								  const SecondaryKey &secondaryKey,
-								  Iterator *iterator)
+	const SecondaryKey &secondaryKey, Iterator *iterator)
 {
-	return BaseClass::Find(Key(primaryKey, secondaryKey), iterator);
+	
+	TreeMapIterator it = fTreeMap.Find(Key(primaryKey, secondaryKey));
+	if (iterator)
+		iterator->_SetTo(it);
+	return it.CurrentValuePointer();
 }
 
 // GetIterator
 TWO_KEY_AVL_TREE_TEMPLATE_LIST
 void
-TWO_KEY_AVL_TREE_CLASS_NAME::GetIterator(Iterator *iterator, bool reverse)
+TWO_KEY_AVL_TREE_CLASS_NAME::GetIterator(Iterator *iterator)
 {
-	BaseClass::GetIterator(iterator, reverse);
+	TreeMapIterator it = fTreeMap.GetIterator();
+	it.Next();
+		// Our iterator needs to point to the first entry already.
+	iterator->_SetTo(it);
 }
 
 // Insert
@@ -283,24 +460,25 @@
 status_t
 TWO_KEY_AVL_TREE_CLASS_NAME::Insert(const Value &value, Iterator *iterator)
 {
-	return BaseClass::Insert(value, iterator);
+	NodeStrategy& strategy
+		= const_cast<NodeStrategy&>(fTreeMap.GetNodeStrategy());
+
+	TreeMapIterator it;
+	status_t status = fTreeMap.Insert(strategy.GetValueKey(value), value, &it);
+	if (status != B_OK || !iterator)
+		return status;
+
+	iterator->_SetTo(it);
+	return B_OK;
 }
 
 // Remove
 TWO_KEY_AVL_TREE_TEMPLATE_LIST
 status_t
 TWO_KEY_AVL_TREE_CLASS_NAME::Remove(const PrimaryKey &primaryKey,
-									const SecondaryKey &secondaryKey)
+	const SecondaryKey &secondaryKey)
 {
-	return BaseClass::Remove(Key(primaryKey, secondaryKey));
+	return fTreeMap.Remove(Key(primaryKey, secondaryKey));
 }
 
-// Remove
-TWO_KEY_AVL_TREE_TEMPLATE_LIST
-void
-TWO_KEY_AVL_TREE_CLASS_NAME::Remove(Iterator &iterator)
-{
-	BaseClass::Remove(iterator);
-}
-
 #endif	// TWO_KEY_AVL_TREE_H

Modified: haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Volume.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Volume.cpp	2007-08-11 14:57:25 UTC (rev 21892)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Volume.cpp	2007-08-11 15:02:22 UTC (rev 21893)
@@ -81,10 +81,9 @@
 
 // NodeListenerTree
 typedef TwoKeyAVLTree<NodeListenerValue, Node*,
-					  AVLTreeStandardCompare<Node*>,
+					  TwoKeyAVLTreeStandardCompare<Node*>,
 					  NodeListenerGetPrimaryKey, NodeListener*,
-					  AVLTreeStandardNode<NodeListenerValue>,
-					  AVLTreeStandardCompare<NodeListener*>,
+					  TwoKeyAVLTreeStandardCompare<NodeListener*>,
 					  NodeListenerGetSecondaryKey > _NodeListenerTree;
 class NodeListenerTree : public _NodeListenerTree {};
 
@@ -118,10 +117,9 @@
 
 // EntryListenerTree
 typedef TwoKeyAVLTree<EntryListenerValue, Entry*,
-					  AVLTreeStandardCompare<Entry*>,
+					  TwoKeyAVLTreeStandardCompare<Entry*>,
 					  EntryListenerGetPrimaryKey, EntryListener*,
-					  AVLTreeStandardNode<EntryListenerValue>,
-					  AVLTreeStandardCompare<EntryListener*>,
+					  TwoKeyAVLTreeStandardCompare<EntryListener*>,
 					  EntryListenerGetSecondaryKey > _EntryListenerTree;
 class EntryListenerTree : public _EntryListenerTree {};
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Volume.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Volume.h	2007-08-11 14:57:25 UTC (rev 21892)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ramfs/Volume.h	2007-08-11 15:02:22 UTC (rev 21893)
@@ -57,6 +57,7 @@
 // NodeListenerValue
 class NodeListenerValue {
 public:
+	inline NodeListenerValue() {}
 	inline NodeListenerValue(int) {}
 	inline NodeListenerValue(NodeListener *listener, Node *node, uint32 flags)
 		: listener(listener), node(node), flags(flags) {}
@@ -73,6 +74,7 @@
 // EntryListenerValue
 class EntryListenerValue {
 public:
+	inline EntryListenerValue() {}
 	inline EntryListenerValue(int) {}
 	inline EntryListenerValue(EntryListener *listener, Entry *entry,
 							  uint32 flags)



From colacoder at mail.berlios.de  Sat Aug 11 17:03:31 2007
From: colacoder at mail.berlios.de (colacoder at BerliOS)
Date: Sat, 11 Aug 2007 17:03:31 +0200
Subject: [Haiku-commits] r21894 - in
	haiku/trunk/src/add-ons/kernel/busses/ide: . legacy_sata
Message-ID: <200708111503.l7BF3VDA024410@sheep.berlios.de>

Author: colacoder
Date: 2007-08-11 17:03:30 +0200 (Sat, 11 Aug 2007)
New Revision: 21894
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21894&view=rev

Added:
   haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/
   haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/Jamfile
   haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c
Log:
Initial work for a driver supporting the pre-AHCI SATA controllers. Currently
implemented: VIA & ALI. nForce is on the TODO list ;)



Added: haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/Jamfile	2007-08-11 15:02:22 UTC (rev 21893)
+++ haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/Jamfile	2007-08-11 15:03:30 UTC (rev 21894)
@@ -0,0 +1,8 @@
+SubDir HAIKU_TOP src add-ons kernel busses ide legacy_sata ;
+
+UsePrivateHeaders kernel ;
+
+KernelAddon legacy_sata :
+	legacy_sata.c
+	;
+

Added: haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c	2007-08-11 15:02:22 UTC (rev 21893)
+++ haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c	2007-08-11 15:03:30 UTC (rev 21894)
@@ -0,0 +1,389 @@
+/*
+ * Copyright 2007, Ithamar R. Adema. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include <KernelExport.h>
+#include <stdlib.h>
+#include <string.h>
+#include <device_manager.h>
+#include <bus/IDE.h>
+#include <bus/ide/ide_adapter.h>
+#include <block_io.h>
+
+
+#define DRIVER_PRETTY_NAME	"Legacy SATA"
+#define CONTROLLER_NAME		DRIVER_PRETTY_NAME
+#define CONTROLLER_MODULE_NAME	"busses/ide/legacy_sata/device_v1"
+#define CHANNEL_MODULE_NAME	"busses/ide/legacy_sata/channel/v1"
+
+#define TRACE(a...)		dprintf(DRIVER_PRETTY_NAME ": " a)
+#define FLOW(a...)		dprintf(DRIVER_PRETTY_NAME ": " a)
+
+#define PCI_vendor_VIA		0x1106
+#define PCI_device_VIA6420	0x3149
+#define PCI_device_VIA6421	0x3249
+#define PCI_device_VIA8237A	0x0591
+
+#define PCI_vendor_ALI		0x10b9
+#define PCI_device_ALI5289	0x5289
+#define PCI_device_ALI5287	0x5287
+#define PCI_device_ALI5281	0x5281
+
+#define ID(v,d) (((v)<< 16) | (d))
+
+/* XXX: To be moved to PCI.h */
+#define PCI_command_interrupt	0x400
+
+static ide_for_controller_interface*	ide;
+static ide_adapter_interface*		ide_adapter;
+static device_manager_info*		dm;
+
+static float
+controller_supports(device_node_handle parent, bool *_noConnection)
+{
+	uint16 vendor_id;
+	uint16 device_id;
+	status_t res;
+	char *bus;
+	
+	// get the bus (should be PCI)
+	if (dm->get_attr_string(parent, B_DRIVER_BUS, &bus, false) != B_OK)
+		return B_ERROR;
+	if (strcmp(bus, "pci") != 0) {
+		free(bus);
+		return B_ERROR;
+	}
+	free(bus);
+	
+	// get vendor and device ID
+	if ((res=dm->get_attr_uint16(parent, PCI_DEVICE_VENDOR_ID_ITEM, &vendor_id, false)) != B_OK
+		|| (res=dm->get_attr_uint16(parent, PCI_DEVICE_DEVICE_ID_ITEM, &device_id, false)) != B_OK) {
+		return res;
+	}
+
+	switch (ID(vendor_id, device_id)) {
+		/* VIA SATA chipsets */
+		case ID(PCI_vendor_VIA, PCI_device_VIA6420):
+		case ID(PCI_vendor_VIA, PCI_device_VIA6421):
+		case ID(PCI_vendor_VIA, PCI_device_VIA8237A):
+			break;
+
+		/* ALI SATA chipsets */
+		case ID(PCI_vendor_ALI, PCI_device_ALI5281):
+		case ID(PCI_vendor_ALI, PCI_device_ALI5287):
+		case ID(PCI_vendor_ALI, PCI_device_ALI5289):
+			break;
+
+		default:
+			return 0.0f;
+	}
+
+	TRACE("controller found! vendor 0x%04x, device 0x%04x\n", vendor_id, device_id);
+
+	return 0.8f;
+}
+
+
+static status_t
+controller_probe(device_node_handle parent)
+{
+        device_node_handle controller_node;
+	device_node_handle channels[2];
+	uint16 command_block_base[2];
+	uint16 control_block_base[2];
+	pci_device_module_info *pci;
+	uint8 num_channels = 2;
+	uint32 bus_master_base;
+	pci_device device;
+	uint16 device_id;
+	uint16 vendor_id;
+	uint8 int_num;
+	status_t res;
+	
+	TRACE("controller_probe\n");
+
+	if ((res=dm->init_driver(parent, NULL, (driver_module_info **)&pci, (void **)&device)) != B_OK)
+		return res;
+		
+	device_id = pci->read_pci_config(device, PCI_device_id, 2);
+	vendor_id = pci->read_pci_config(device, PCI_vendor_id, 2);
+	int_num = pci->read_pci_config(device, PCI_interrupt_line, 1);
+	bus_master_base = pci->read_pci_config(device, PCI_base_registers + 16, 4);
+	
+	/* enable PCI interrupt */
+	pci->write_pci_config(device, PCI_command,
+		pci->read_pci_config(device, PCI_command, 2) & ~PCI_command_interrupt, 2);
+
+
+	switch (ID(vendor_id, device_id)) {
+		case ID(PCI_vendor_VIA,PCI_device_VIA6421):
+			/* newer SATA chips has resources in one BAR for each channel */
+			num_channels = 4;
+			command_block_base[0] = pci->read_pci_config(device, PCI_base_registers + 0, 4 );
+			control_block_base[0] = command_block_base[0] + 8;
+			command_block_base[1] = pci->read_pci_config(device, PCI_base_registers + 4, 4);
+			control_block_base[1] = command_block_base[1] + 8;
+			command_block_base[2] = pci->read_pci_config(device, PCI_base_registers + 8, 4 );
+			control_block_base[2] = command_block_base[2] + 8;
+			command_block_base[3] = pci->read_pci_config(device, PCI_base_registers + 12, 4);
+			control_block_base[3] = command_block_base[3] + 8;
+			break;
+
+		case ID(PCI_vendor_ALI, PCI_device_ALI5287):
+			num_channels = 4;
+                        command_block_base[3] = pci->read_pci_config(device, PCI_base_registers + 0, 4 ) + 8;
+                        control_block_base[3] = pci->read_pci_config(device, PCI_base_registers + 4, 4) + 4;
+                        command_block_base[4] = pci->read_pci_config(device, PCI_base_registers + 8, 4) + 8;
+                        control_block_base[4] = pci->read_pci_config(device, PCI_base_registers + 12, 4) + 4;
+			/* Intentional fall-through */
+
+		default:
+			/* Default PCI assigments */
+			command_block_base[0] = pci->read_pci_config(device, PCI_base_registers + 0, 4 );
+			control_block_base[0] = pci->read_pci_config(device, PCI_base_registers + 4, 4);
+			command_block_base[1] = pci->read_pci_config(device, PCI_base_registers + 8, 4);
+			control_block_base[1] = pci->read_pci_config(device, PCI_base_registers + 12, 4);
+	}
+
+        res = ide_adapter->detect_controller(pci, device, parent, bus_master_base, 
+                CONTROLLER_MODULE_NAME, "" /* XXX: unused: controller_driver_type*/, CONTROLLER_NAME, true,
+                true, 1, 0xffff, 0x10000, &controller_node);
+        // don't register if controller is already registered!
+        // (happens during rescan; registering new channels would kick out old channels)
+        if (res != B_OK)
+		goto err;
+	if (controller_node == NULL) {
+		res = B_IO_ERROR;
+                goto err;
+	}
+
+        // ignore errors during registration of channels - could be a simple rescan collision
+        ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME,
+                true, command_block_base[0], control_block_base[0], bus_master_base,
+                int_num, true, "Primary Channel", &channels[0], false);
+
+        ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME,
+                true, command_block_base[1], control_block_base[1], bus_master_base,
+                int_num, false, "Secondary Channel", &channels[1], false);
+
+	if (num_channels == 4) {
+		ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME,
+			true, command_block_base[2], control_block_base[2], bus_master_base,
+			int_num, true, "Tertiary Channel", &channels[2], false);
+
+		ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME,
+			true, command_block_base[3], control_block_base[3], bus_master_base,
+			int_num, false, "Quaternary Channel", &channels[3], false);
+	}
+
+	dm->uninit_driver(parent);
+
+	TRACE("controller_probe success\n");
+	return B_OK;
+
+err:
+	dm->uninit_driver(parent);	
+	TRACE("controller_probe failed (%s)\n", strerror(res));
+	return res;
+}
+
+
+
+static status_t 
+controller_init(device_node_handle node, void *user_cookie, void **controller_cookie)
+{
+	return ide_adapter->init_controller(
+		node,user_cookie,
+		(ide_adapter_controller_info**)controller_cookie,
+		sizeof(ide_adapter_controller_info));
+}
+
+
+static status_t
+controller_uninit(void *controller_cookie)
+{
+	return ide_adapter->uninit_controller(controller_cookie);
+}
+
+static void
+controller_removed(device_node_handle node, void *controller_cookie)
+{
+	ide_adapter->controller_removed(
+		node, 
+		(ide_adapter_controller_info*)controller_cookie);
+}
+
+
+static void
+controller_get_paths(const char ***_bus, const char ***_device)
+{
+	static const char *kBus[] = { "pci", NULL };
+	static const char *kDevice[] = { "drivers/dev/disk/sata", NULL };
+
+	*_bus = kBus;
+	*_device = kDevice;
+}
+
+
+static status_t
+channel_init(device_node_handle node, void *user_cookie, void **channel_cookie)
+{
+	return ide_adapter->init_channel(
+		node,
+		user_cookie,
+		(ide_adapter_channel_info**)channel_cookie,
+		sizeof(ide_adapter_channel_info), 
+		ide_adapter->inthand);
+}
+
+
+static status_t
+channel_uninit(void *channel_cookie)
+{
+	return ide_adapter->uninit_channel(channel_cookie);
+}
+
+
+static void
+channel_removed(device_node_handle node, void *channel_cookie)
+{
+	ide_adapter->channel_removed(node,channel_cookie);
+}
+
+
+static status_t
+task_file_write(void *channel_cookie, ide_task_file *tf, ide_reg_mask mask)
+{
+	return ide_adapter->write_command_block_regs(channel_cookie,tf,mask);
+}
+
+
+static status_t
+task_file_read(void *channel_cookie, ide_task_file *tf, ide_reg_mask mask)
+{
+	return ide_adapter->read_command_block_regs(channel_cookie,tf,mask);
+}
+
+
+static uint8
+altstatus_read(void *channel_cookie)
+{
+	return ide_adapter->get_altstatus(channel_cookie);
+}
+
+
+static status_t 
+device_control_write(void *channel_cookie, uint8 val)
+{
+	return ide_adapter->write_device_control(channel_cookie,val);
+}
+
+
+static status_t
+pio_write(void *channel_cookie, uint16 *data, int count, bool force_16bit)
+{
+	return ide_adapter->write_pio(channel_cookie,data,count,force_16bit);
+}
+
+
+static status_t
+pio_read(void *channel_cookie, uint16 *data, int count, bool force_16bit)
+{
+	return ide_adapter->read_pio(channel_cookie,data,count,force_16bit);
+}
+
+
+static status_t
+dma_prepare(void *channel_cookie, const physical_entry *sg_list, size_t sg_list_count, bool write)
+{
+	return ide_adapter->prepare_dma(channel_cookie,sg_list,sg_list_count,write);
+}
+
+
+static status_t
+dma_start(void *channel_cookie)
+{
+	return ide_adapter->start_dma(channel_cookie);
+}
+
+
+static status_t
+dma_finish(void *channel_cookie)
+{
+	return ide_adapter->finish_dma(channel_cookie);
+}
+
+
+static status_t
+std_ops(int32 op, ...)
+{
+	switch (op) {
+		case B_MODULE_INIT:
+			return B_OK;
+		case B_MODULE_UNINIT:
+			return B_OK;
+
+		default:
+			return B_ERROR;
+	}
+}
+
+
+module_dependency module_dependencies[] = {
+	{ IDE_FOR_CONTROLLER_MODULE_NAME,	(module_info **)&ide },
+	{ B_DEVICE_MANAGER_MODULE_NAME,		(module_info **)&dm },
+	{ IDE_ADAPTER_MODULE_NAME,		(module_info **)&ide_adapter },
+	{}
+};
+
+static ide_controller_interface channel_interface = {
+	{
+		{
+			CHANNEL_MODULE_NAME,
+			0,
+			std_ops
+		},
+		
+		.supports_device	= NULL,
+		.register_device	= NULL,
+		.init_driver		= channel_init,
+		.uninit_driver		= channel_uninit,
+		.device_removed		= channel_removed,
+		.device_cleanup		= NULL,
+		.get_supported_paths	= NULL,
+	},
+
+	.write_command_block_regs	= task_file_write,
+	.read_command_block_regs	= task_file_read,
+	.get_altstatus			= altstatus_read,
+	.write_device_control		= device_control_write,
+	.write_pio			= pio_write,
+	.read_pio			= pio_read,
+	.prepare_dma			= dma_prepare,
+	.start_dma			= dma_start,
+	.finish_dma			= dma_finish,
+};
+
+
+static driver_module_info controller_interface = {
+	{
+		CONTROLLER_MODULE_NAME,
+		0,
+		std_ops
+	},
+
+	.supports_device	= controller_supports,
+	.register_device	= controller_probe,
+	.init_driver		= controller_init,
+	.uninit_driver		= controller_uninit,
+	.device_removed		= controller_removed,
+	.device_cleanup		= NULL,
+	.get_supported_paths	= controller_get_paths,
+};
+
+module_info *modules[] = {
+	(module_info *)&controller_interface,
+	(module_info *)&channel_interface,
+	NULL
+};



From stippi at mail.berlios.de  Sat Aug 11 17:56:39 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sat, 11 Aug 2007 17:56:39 +0200
Subject: [Haiku-commits] r21895 - haiku/trunk/src/servers/app
Message-ID: <200708111556.l7BFud4Z026715@sheep.berlios.de>

Author: stippi
Date: 2007-08-11 17:56:37 +0200 (Sat, 11 Aug 2007)
New Revision: 21895
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21895&view=rev

Modified:
   haiku/trunk/src/servers/app/BitmapManager.cpp
Log:
* view accepting bitmaps are now cleared to white


Modified: haiku/trunk/src/servers/app/BitmapManager.cpp
===================================================================
--- haiku/trunk/src/servers/app/BitmapManager.cpp	2007-08-11 15:03:30 UTC (rev 21894)
+++ haiku/trunk/src/servers/app/BitmapManager.cpp	2007-08-11 15:56:37 UTC (rev 21895)
@@ -189,7 +189,7 @@
 		bitmap->fBuffer = buffer;
 		bitmap->fToken = gTokenSpace.NewToken(kBitmapToken, bitmap);
 
-		if (flags & B_BITMAP_CLEAR_TO_WHITE) {
+		if (flags & (B_BITMAP_CLEAR_TO_WHITE | B_BITMAP_ACCEPTS_VIEWS)) {
 			if (space == B_CMAP8) {
 				// "255" is the "transparent magic" index for B_CMAP8 bitmaps
 				memset(bitmap->Bits(), 65, bitmap->BitsLength());



From korli at mail.berlios.de  Sat Aug 11 21:53:20 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Sat, 11 Aug 2007 21:53:20 +0200
Subject: [Haiku-commits] r21896 - haiku/trunk/headers/private/kernel/util
Message-ID: <200708111953.l7BJrKmQ021881@sheep.berlios.de>

Author: korli
Date: 2007-08-11 21:53:20 +0200 (Sat, 11 Aug 2007)
New Revision: 21896
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21896&view=rev

Modified:
   haiku/trunk/headers/private/kernel/util/AVLTreeMap.h
Log:
fixed gcc4 build


Modified: haiku/trunk/headers/private/kernel/util/AVLTreeMap.h
===================================================================
--- haiku/trunk/headers/private/kernel/util/AVLTreeMap.h	2007-08-11 15:56:37 UTC (rev 21895)
+++ haiku/trunk/headers/private/kernel/util/AVLTreeMap.h	2007-08-11 19:53:20 UTC (rev 21896)
@@ -579,7 +579,7 @@
 
 // _Allocate
 _AVL_TREE_MAP_TEMPLATE_LIST
-inline _AVL_TREE_MAP_CLASS_NAME::Node*
+inline typename _AVL_TREE_MAP_CLASS_NAME::Node*
 _AVL_TREE_MAP_CLASS_NAME::_Allocate(const Key& key, const Value& value)
 {
 	return fStrategy.Allocate(key, value);
@@ -624,7 +624,7 @@
 
 // _GetNode
 _AVL_TREE_MAP_TEMPLATE_LIST
-inline _AVL_TREE_MAP_CLASS_NAME::Node*
+inline typename _AVL_TREE_MAP_CLASS_NAME::Node*
 _AVL_TREE_MAP_CLASS_NAME::_GetNode(const AVLTreeNode* node) const
 {
 	return fStrategy.GetNode(const_cast<AVLTreeNode*>(node));



From mmu_man at mail.berlios.de  Sat Aug 11 23:23:48 2007
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sat, 11 Aug 2007 23:23:48 +0200
Subject: [Haiku-commits] r21897 - haiku/trunk/src/bin
Message-ID: <200708112123.l7BLNmUE026597@sheep.berlios.de>

Author: mmu_man
Date: 2007-08-11 23:23:47 +0200 (Sat, 11 Aug 2007)
New Revision: 21897
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21897&view=rev

Modified:
   haiku/trunk/src/bin/unchop.c
Log:
Fix a warning


Modified: haiku/trunk/src/bin/unchop.c
===================================================================
--- haiku/trunk/src/bin/unchop.c	2007-08-11 19:53:20 UTC (rev 21896)
+++ haiku/trunk/src/bin/unchop.c	2007-08-11 21:23:47 UTC (rev 21897)
@@ -14,6 +14,7 @@
 
 #include <OS.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>



From laplace at mail.berlios.de  Sun Aug 12 11:00:18 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Sun, 12 Aug 2007 11:00:18 +0200
Subject: [Haiku-commits] r21898 -
	haiku/trunk/src/tests/kits/interface/flatten_picture
Message-ID: <200708120900.l7C90IqK028612@sheep.berlios.de>

Author: laplace
Date: 2007-08-12 11:00:17 +0200 (Sun, 12 Aug 2007)
New Revision: 21898
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21898&view=rev

Modified:
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.cpp
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.h
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.h
   haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.cpp
   haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.h
Log:
* test archiving / unarchiving
* compare recorded / restored picture to direct drawing into bitmap
* renamed Test Vertical Line -> Test Diagonal Line


Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.cpp	2007-08-11 21:23:47 UTC (rev 21897)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.cpp	2007-08-12 09:00:17 UTC (rev 21898)
@@ -28,36 +28,132 @@
 	AutoDelete(T *object) : fObject(object) { }
 	~AutoDelete() { delete fObject; fObject = NULL; }
 	
-	void Release() { fObject = NULL; }
+	T* Release() { T* object = fObject; fObject = NULL; return object; }
 	
 private:
 	T *fObject;
 };
 
+class OffscreenBitmap {
+public:
+	OffscreenBitmap(BRect frame, color_space colorSpace);
+	virtual ~OffscreenBitmap();
+	status_t InitCheck() const { return fStatus; }
+	
+	BView *View();
+	BBitmap *Copy();
 
+private:
+	BRect fFrame;
+	color_space fColorSpace;
+	status_t fStatus;
+	
+	BBitmap *fBitmap;
+	BView *fView;
+};
+
+OffscreenBitmap::OffscreenBitmap(BRect frame, color_space colorSpace)
+	: fFrame(frame)
+	, fColorSpace(colorSpace)
+	, fStatus(B_ERROR)
+	, fBitmap(NULL)
+	, fView(NULL)
+{
+	BBitmap *bitmap = new BBitmap(frame, fColorSpace, true);
+	AutoDelete<BBitmap> _bitmap(bitmap);
+	if (bitmap == NULL || bitmap->IsValid() == false || bitmap->InitCheck() != B_OK)
+		return;
+	
+	BView *view = new BView(frame, "offscreen", B_FOLLOW_ALL, B_WILL_DRAW);
+	AutoDelete<BView> _view(view);
+	if (view == NULL)
+		return;
+	
+	bitmap->Lock();
+	bitmap->AddChild(view);
+	// bitmap is locked during the life time of this object
+	
+	fBitmap = _bitmap.Release();
+	fView = _view.Release();
+	fStatus = B_OK;
+}
+
+OffscreenBitmap::~OffscreenBitmap()
+{
+	if (fStatus != B_OK)
+		return;
+	
+	fView->RemoveSelf();
+	fBitmap->Unlock();
+	delete fView;
+	fView = NULL;
+	
+	delete fBitmap;
+	fBitmap = NULL;
+	
+	fStatus = B_ERROR;
+}
+
+BView *
+OffscreenBitmap::View()
+{
+	return fView;
+}
+
+BBitmap*
+OffscreenBitmap::Copy()
+{
+	// the result bitmap that does not accept views	
+	// to save resources in the application server
+	BBitmap *copy = new BBitmap(fFrame, fColorSpace, false);
+	AutoDelete<BBitmap> _copy(copy);
+	if (copy == NULL || copy->IsValid() == false || copy->InitCheck() != B_OK)
+		return NULL;
+
+	fView->Sync();
+	fBitmap->Unlock();
+	
+	memcpy(copy->Bits(), fBitmap->Bits(), fBitmap->BitsLength());	
+	
+	fBitmap->Lock();
+
+	return _copy.Release();
+}
+
 PictureTest::PictureTest()
 	: fColorSpace(B_RGBA32)
-	, fOriginalBitmap(NULL)
-	, fArchivedBitmap(NULL)
+	, fDirectBitmap(NULL)
+	, fBitmapFromPicture(NULL)
+	, fBitmapFromRestoredPicture(NULL)
 {
 }
 
+
 BBitmap*
-PictureTest::GetOriginalBitmap(bool detach)
+PictureTest::DirectBitmap(bool detach)
 {
-	BBitmap* bitmap = fOriginalBitmap;
+	BBitmap* bitmap = fDirectBitmap;
 	if (detach)
-		fOriginalBitmap = NULL;
+		fDirectBitmap = NULL;
 	return bitmap;
 }
 
+BBitmap*
+PictureTest::BitmapFromPicture(bool detach)
+{
+	BBitmap* bitmap = fBitmapFromPicture;
+	if (detach)
+		fBitmapFromPicture = NULL;
+	return bitmap;
+}
 
+
 BBitmap*
-PictureTest::GetArchivedBitmap(bool detach)
+PictureTest::BitmapFromRestoredPicture(bool detach)
 {
-	BBitmap* bitmap = fArchivedBitmap;
+	BBitmap* bitmap = fBitmapFromRestoredPicture;
 	if (detach)
-		fArchivedBitmap = NULL;
+		fBitmapFromRestoredPicture = NULL;
 	return bitmap;
 }
 
@@ -70,10 +166,10 @@
 void
 PictureTest::CleanUp()
 {
-	delete fOriginalBitmap;
-	fOriginalBitmap = NULL;
-	delete fArchivedBitmap;
-	fArchivedBitmap = NULL;
+	delete fBitmapFromPicture;
+	fBitmapFromPicture = NULL;
+	delete fBitmapFromRestoredPicture;
+	fBitmapFromRestoredPicture = NULL;
 	fErrorMessage = "";
 }
 
@@ -82,6 +178,9 @@
 {
 	CleanUp();
 
+	fDirectBitmap = CreateBitmap(func, frame);
+	TEST_AND_RETURN(fDirectBitmap == NULL, "Could not create direct draw bitmap!", false);
+
 	BPicture *picture = RecordPicture(func, frame);
 	AutoDelete<BPicture> _picture(picture);
 	TEST_AND_RETURN(picture == NULL, "Picture could not be recorded!", false);
@@ -90,57 +189,79 @@
 	AutoDelete<BPicture> _archivedPicture(archivedPicture);
 	TEST_AND_RETURN(picture == NULL, "Picture could not be flattened and unflattened!", false);
 	
-	fOriginalBitmap = CreateBitmap(picture, frame);
-	TEST_AND_RETURN(fOriginalBitmap == NULL, "Could not create bitmap from original picture!", false);
+	fBitmapFromPicture = CreateBitmap(picture, frame);
+	TEST_AND_RETURN(fBitmapFromPicture == NULL, "Could not create bitmap from original picture!", false);
 		
-	fArchivedBitmap = CreateBitmap(archivedPicture, frame);
-	TEST_AND_RETURN(fArchivedBitmap == NULL, "Could not create bitmap from archived picture!", false);
+	fBitmapFromRestoredPicture = CreateBitmap(archivedPicture, frame);
+	TEST_AND_RETURN(fBitmapFromRestoredPicture == NULL, "Could not create bitmap from archived picture!", false);
 	
-	bool result = IsSame(fOriginalBitmap, fArchivedBitmap);
-	TEST_AND_RETURN(result == false, "Bitmaps differ!", false);
-	return result;
+	TEST_AND_RETURN(!IsSame(fDirectBitmap, fBitmapFromPicture), "Bitmap from picture differs from direct drawing bitmap", false);
+	TEST_AND_RETURN(!IsSame(fDirectBitmap, fBitmapFromRestoredPicture), "Bitmap from picture differs from direct drawing bitmap", false);
+	return true;
 }
 
 
+BBitmap *
+PictureTest::CreateBitmap(draw_func* func, BRect frame)
+{
+	OffscreenBitmap bitmap(frame, fColorSpace);
+	if (bitmap.InitCheck() != B_OK)
+		return NULL;
+	func(bitmap.View(), frame);
+	return bitmap.Copy();
+}
+
 BPicture *
 PictureTest::RecordPicture(draw_func* func, BRect frame)
 {
-	// create view for recording to picture
-	BBitmap *bitmap = new BBitmap(frame, fColorSpace, true);
-	AutoDelete<BBitmap> _bitmap(bitmap);
-	if (bitmap == NULL || bitmap->IsValid() == false || bitmap->InitCheck() != B_OK)
+	OffscreenBitmap bitmap(frame, fColorSpace);
+	if (bitmap.InitCheck() != B_OK)
 		return NULL;
-	
-	BView *view = new BView(frame, "offscreen", B_FOLLOW_ALL, B_WILL_DRAW);
-	AutoDelete<BView> _view(view);
-	if (view == NULL)
-		return NULL;
-	
-	bitmap->Lock();
-	bitmap->AddChild(view);
-	
-	// R5 clears the bitmap! However Haiku does not, so clear it for now.
-	view->PushState();
-	view->SetHighColor(255, 255, 255);
-	view->FillRect(frame);
-	view->PopState();
-	
+		
+	BView *view = bitmap.View();
 	// record
 	BPicture *picture = new BPicture();	
 	view->BeginPicture(picture);
 	func(view, frame);
-	picture = view->EndPicture();
+	picture = view->EndPicture();	
 	
-	// destroy view
+	return picture;
+}
+
+BBitmap *
+PictureTest::CreateBitmap(BPicture *picture, BRect frame)
+{
+	OffscreenBitmap bitmap(frame, fColorSpace);
+	if (bitmap.InitCheck() != B_OK)
+		return NULL;
+
+	BView *view = bitmap.View();		
+	view->DrawPicture(picture);
 	view->Sync();
-	view->RemoveSelf();
-	bitmap->Unlock();
 	
-	return picture;
+	return bitmap.Copy();
 }
 
+
+bool
+PictureTest::IsSame(BBitmap *bitmap1, BBitmap *bitmap2)
+{
+	if (bitmap1->ColorSpace() != bitmap2->ColorSpace())
+		return false;
+	
+	if (bitmap1->BitsLength() != bitmap2->BitsLength())
+		return false;
+	
+	return memcmp(bitmap1->Bits(), bitmap2->Bits(), bitmap1->BitsLength()) == 0;
+}
+
+
+FlattenPictureTest::FlattenPictureTest()
+{
+}
+
 BPicture *
-PictureTest::SaveAndRestore(BPicture *picture)
+FlattenPictureTest::SaveAndRestore(BPicture *picture)
 {
 	BMallocIO *data = new BMallocIO();
 	AutoDelete<BMallocIO> _data(data);
@@ -158,50 +279,20 @@
 	return archivedPicture;
 }
 
-BBitmap *
-PictureTest::CreateBitmap(BPicture *picture, BRect frame)
+ArchivePictureTest::ArchivePictureTest()
 {
-	// create bitmap that accepts a view
-	BBitmap *bitmap = new BBitmap(frame, fColorSpace, true);
-	AutoDelete<BBitmap> _bitmap(bitmap);
-	if (bitmap == NULL || bitmap->IsValid() == false || bitmap->InitCheck() != B_OK)
+}
+
+BPicture *
+ArchivePictureTest::SaveAndRestore(BPicture *picture)
+{
+	BMessage archive;
+	if (picture->Archive(&archive) != B_OK)
 		return NULL;
-	
-	BView *view = new BView(frame, "offscreen", B_FOLLOW_ALL, B_WILL_DRAW);
-	AutoDelete<BView> _view(view);
-	if (view == NULL)
-		return NULL;
 
-	// the result bitmap that does not accept views	
-	// to save resources in the application server
-	BBitmap *result = new BBitmap(frame, fColorSpace, false);
-	if (result == NULL || result->IsValid() == false || result->InitCheck() != B_OK)
+	BPicture *archivedPicture = new BPicture(&archive);
+	if (archivedPicture == NULL)
 		return NULL;
 
-	bitmap->Lock();
-	bitmap->AddChild(view);
-
-	view->DrawPicture(picture);
-	view->Sync();
-
-	// destroy view
-	view->RemoveSelf();
-	bitmap->Unlock();
-
-	memcpy(result->Bits(), bitmap->Bits(), bitmap->BitsLength());
-	
-	return result;
-}
-
-
-bool
-PictureTest::IsSame(BBitmap *bitmap1, BBitmap *bitmap2)
-{
-	if (bitmap1->ColorSpace() != bitmap2->ColorSpace())
-		return false;
-	
-	if (bitmap1->BitsLength() != bitmap2->BitsLength())
-		return false;
-	
-	return memcmp(bitmap1->Bits(), bitmap2->Bits(), bitmap1->BitsLength()) == 0;
-}
+	return archivedPicture;
+}
\ No newline at end of file

Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.h
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.h	2007-08-11 21:23:47 UTC (rev 21897)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.h	2007-08-12 09:00:17 UTC (rev 21898)
@@ -26,29 +26,49 @@
 	
 	const char *ErrorMessage() const { return fErrorMessage.String(); }
 
-	BBitmap *GetOriginalBitmap(bool detach = false);
-	BBitmap *GetArchivedBitmap(bool detach = false);
+	BBitmap *DirectBitmap(bool detach = false);
+	BBitmap *BitmapFromPicture(bool detach = false);
+	BBitmap *BitmapFromRestoredPicture(bool detach = false);
 
+protected:
+	virtual BPicture *SaveAndRestore(BPicture *picture) = 0;
+
 private:
 	
 	void CleanUp();
 	
 	BPicture *RecordPicture(draw_func* func, BRect frame);
-	
-	BPicture *SaveAndRestore(BPicture *picture);
-	
+
+	BBitmap *CreateBitmap(draw_func* func, BRect frame);
 	BBitmap *CreateBitmap(BPicture *picture, BRect frame);
 
 	bool IsSame(BBitmap *bitmap1, BBitmap *bitmap2);
 
 	color_space fColorSpace;
 
-	BBitmap *fOriginalBitmap;
-	BBitmap *fArchivedBitmap;
+	BBitmap *fDirectBitmap;
+	BBitmap *fBitmapFromPicture;
+	BBitmap *fBitmapFromRestoredPicture;
 	
 	BString fErrorMessage;
 };
 
+class FlattenPictureTest : public PictureTest
+{
+public:
+	FlattenPictureTest();
 
+protected:
+	BPicture *SaveAndRestore(BPicture *picture);
+};
 
+class ArchivePictureTest : public PictureTest
+{
+public:
+	ArchivePictureTest();
+
+protected:
+	BPicture *SaveAndRestore(BPicture *picture);
+};
+
 #endif

Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-11 21:23:47 UTC (rev 21897)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-12 09:00:17 UTC (rev 21898)
@@ -46,7 +46,7 @@
 	}
 }
 
-void testVerticalLine(BView *view, BRect frame)
+void testDiagonalLine(BView *view, BRect frame)
 {
 	view->StrokeLine(BPoint(frame.left, frame.top), BPoint(frame.right, frame.bottom));
 }
@@ -112,7 +112,7 @@
 
 TestCase gTestCases[] = {
 	{ "Test Empty Picture", testEmptyPicture },
-	{ "Test Vertical Line", testVerticalLine },
+	{ "Test Diagonal Line", testDiagonalLine },
 	{ "Test Stroke Rect", testStrokeRect },
 	{ "Test Draw String", testDrawString },
 	{ "Test Fill Red", testFillRed },

Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp	2007-08-11 21:23:47 UTC (rev 21897)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp	2007-08-12 09:00:17 UTC (rev 21898)
@@ -22,7 +22,9 @@
 #include "TestResultItem.h"
 
 PictureTestWindow::PictureTestWindow()
-	: Inherited(BRect(100,100,500,300), "Picture Tests", B_DOCUMENT_WINDOW, 0)
+	: Inherited(BRect(10, 30, 630, 470), "Bitmap Drawing Tests", B_DOCUMENT_WINDOW, 0)
+	, fFailedTests(0)
+	, fNumberOfTests(0)
 {
 	BuildGUI();
 }
@@ -62,21 +64,33 @@
 	BRect b = Bounds();
 	b.top = mb->Bounds().bottom + 1;
 	
-	BStringView *header = new BStringView(b, "header", "Picture, Unflattened Picture, Test Name, Error Message", B_FOLLOW_LEFT | B_FOLLOW_RIGHT | B_FOLLOW_TOP);
-	header->ResizeToPreferred();
-	backdrop->AddChild(header);
-	b.top = header->Frame().bottom + 1;
+	fHeader = new BStringView(b, "header", 
+		"X", B_FOLLOW_LEFT | B_FOLLOW_RIGHT | B_FOLLOW_TOP);
+	float width, height;
+	fHeader->GetPreferredSize(&width, &height);
+	fHeader->ResizeTo(b.Width(), height);
+	backdrop->AddChild(fHeader);
+	b.top = fHeader->Frame().bottom + 1;
 	
-	
 	b.right -= B_V_SCROLL_BAR_WIDTH;
 	b.bottom -= B_H_SCROLL_BAR_HEIGHT;
 	fListView = new BListView(b, "Results", B_SINGLE_SELECTION_LIST, 
 		B_FOLLOW_ALL_SIDES, 
 		B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE);
 	backdrop->AddChild(new BScrollView("scroll_results", fListView, B_FOLLOW_ALL_SIDES, 0, true, true));	
+
+	UpdateHeader();
 }
 
 void
+PictureTestWindow::UpdateHeader()
+{
+	BString text("Direct Drawing, Picture Drawing, Restored Picture Drawing, Test Name, Error Message");
+	text << " (failures = " << fFailedTests << ",  tests =" << fNumberOfTests << ")";
+	fHeader->SetText(text.String());
+}
+
+void
 PictureTestWindow::MessageReceived(BMessage *msg) {
 	switch (msg->what) {
 		case kMsgRunTests:
@@ -90,6 +104,27 @@
 void
 PictureTestWindow::RunTests()
 {
+	for (int testIndex = 0; testIndex < 2; testIndex ++) {
+		BString text;
+		switch (testIndex)
+		{
+			case 0:
+				text = "Flatten Picture Test";
+				break;
+			case 1:
+				text = "Archive Picture Test";
+				break;
+			default:
+				text = "Unknown test method!";
+		}
+		fListView->AddItem(new BStringItem(text.String()));
+		RunTests(testIndex);
+	}
+}
+
+void 
+PictureTestWindow::RunTests(int32 testIndex)
+{
 	color_space colorSpaces[] = {
 		B_RGBA32,
 		B_RGB32,
@@ -97,7 +132,7 @@
 		B_RGB16,
 		B_RGB15
 	};
-	BRect frame(0, 0, 100, 30);
+	
 	for (uint32 csIndex = 0; csIndex < sizeof(colorSpaces)/sizeof(color_space); csIndex ++) {
 		color_space colorSpace = colorSpaces[csIndex];
 		const char *csText;
@@ -126,19 +161,46 @@
 		text += csText;
 		fListView->AddItem(new BStringItem(text.String()));
 		
-		for (int i = 0; gTestCases[i].name != NULL; i ++) {
-			TestCase *testCase = &gTestCases[i];
-			PictureTest test;
-			test.SetColorSpace(colorSpace);
-			bool ok = test.Test(testCase->func, frame);
-			
-			TestResultItem *item = new TestResultItem(testCase->name, frame);
-			item->SetOk(ok);
-			item->SetErrorMessage(test.ErrorMessage());
-			item->SetOriginalBitmap(test.GetOriginalBitmap(true));
-			item->SetArchivedBitmap(test.GetArchivedBitmap(true));
-			
-			fListView->AddItem(item);
+		RunTests(testIndex, colorSpace);
+	}
+}
+
+void 
+PictureTestWindow::RunTests(int32 testIndex, color_space colorSpace)
+{
+	BRect frame(0, 0, 100, 30);
+	for (int i = 0; gTestCases[i].name != NULL; i ++) {
+		TestCase *testCase = &gTestCases[i];
+		PictureTest *test;
+		switch (testIndex) {
+			case 0:
+				test = new FlattenPictureTest();
+				break;
+			case 1:
+				test = new ArchivePictureTest();
+				break;
+			default:
+				continue;
 		}
+		
+		test->SetColorSpace(colorSpace);
+		bool ok = test->Test(testCase->func, frame);
+		
+		TestResultItem *item = new TestResultItem(testCase->name, frame);
+		item->SetOk(ok);
+		item->SetErrorMessage(test->ErrorMessage());
+		item->SetDirectBitmap(test->DirectBitmap(true));
+		item->SetOriginalBitmap(test->BitmapFromPicture(true));
+		item->SetArchivedBitmap(test->BitmapFromRestoredPicture(true));
+		
+		delete test;
+		
+		fListView->AddItem(item);
+
+		fNumberOfTests ++;
+		if (!ok)
+			fFailedTests ++;
+		
+		UpdateHeader();
 	}
-}
\ No newline at end of file
+}

Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.h
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.h	2007-08-11 21:23:47 UTC (rev 21897)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.h	2007-08-12 09:00:17 UTC (rev 21898)
@@ -28,10 +28,16 @@
 	};
 
 	void BuildGUI();
+	void UpdateHeader();
 	void RunTests();
+	void RunTests(int32 testIndex);
+	void RunTests(int32 testIndex, color_space colorSpace);
 	
 	BListView *fListView;
+	BStringView *fHeader;
 	
+	int32 fFailedTests;
+	int32 fNumberOfTests;
 };
 
 #endif

Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.cpp	2007-08-11 21:23:47 UTC (rev 21897)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.cpp	2007-08-12 09:00:17 UTC (rev 21898)
@@ -14,6 +14,7 @@
 	: fName(name)
 	, fBitmapSize(bitmapSize)
 	, fOk(true)
+	, fDirectBitmap(NULL)
 	, fOriginalBitmap(NULL)
 	, fArchivedBitmap(NULL)
 {
@@ -21,6 +22,8 @@
 
 TestResultItem::~TestResultItem()
 {
+	delete fDirectBitmap;
+	fDirectBitmap = NULL;
 	delete fOriginalBitmap;
 	fOriginalBitmap = NULL;
 	delete fArchivedBitmap;
@@ -55,6 +58,11 @@
 	owner->PopState();
 	
 	owner->MovePenTo(itemRect.left+1, itemRect.top+1);
+	if (fDirectBitmap != NULL) {
+		owner->DrawBitmap(fDirectBitmap);
+	}
+	owner->MovePenBy(fBitmapSize.Width() + distance, 0);
+
 	if (fOriginalBitmap != NULL) {
 		owner->DrawBitmap(fOriginalBitmap);
 	}
@@ -95,8 +103,8 @@
 	width += distance;
 	width += font->StringWidth(fErrorMessage.String());
 	
-	width += 2 * distance;
-	width += 2 * fBitmapSize.Width();
+	width += 3 * distance;
+	width += 3 * fBitmapSize.Width();
 
 	height = fBitmapSize.Height();	
 		

Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.h
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.h	2007-08-11 21:23:47 UTC (rev 21897)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/TestResultItem.h	2007-08-12 09:00:17 UTC (rev 21898)
@@ -25,6 +25,7 @@
 	
 	void SetOk(bool ok) { fOk = ok; }
 	void SetErrorMessage(const char *errorMessage) { fErrorMessage = errorMessage; }
+	void SetDirectBitmap(BBitmap *directBitmap) { fDirectBitmap = directBitmap; }
 	void SetOriginalBitmap(BBitmap *originalBitmap) { fOriginalBitmap = originalBitmap; }
 	void SetArchivedBitmap(BBitmap *archivedBitmap) { fArchivedBitmap = archivedBitmap; }
 	
@@ -33,6 +34,7 @@
 	BRect fBitmapSize;
 	bool fOk;
 	BString fErrorMessage;
+	BBitmap *fDirectBitmap;
 	BBitmap *fOriginalBitmap;
 	BBitmap *fArchivedBitmap;
 };



From laplace at mail.berlios.de  Sun Aug 12 11:05:48 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Sun, 12 Aug 2007 11:05:48 +0200
Subject: [Haiku-commits] r21899 -
	haiku/trunk/src/tests/kits/interface/flatten_picture
Message-ID: <200708120905.l7C95ml4028770@sheep.berlios.de>

Author: laplace
Date: 2007-08-12 11:05:48 +0200 (Sun, 12 Aug 2007)
New Revision: 21899
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21899&view=rev

Modified:
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.cpp
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
Log:
* added new lines add end of file


Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.cpp	2007-08-12 09:00:17 UTC (rev 21898)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTest.cpp	2007-08-12 09:05:48 UTC (rev 21899)
@@ -295,4 +295,5 @@
 		return NULL;
 
 	return archivedPicture;
-}
\ No newline at end of file
+}
+

Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-12 09:00:17 UTC (rev 21898)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-12 09:05:48 UTC (rev 21899)
@@ -122,4 +122,5 @@
 	{ "Test Record And Play Picture With Offset", testRecordAndPlayPictureWithOffset },
 	{ "Test Draw Bitmap", testBitmap },
 	{ NULL, NULL }
-};
\ No newline at end of file
+};
+



From stippi at mail.berlios.de  Sun Aug 12 11:52:25 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sun, 12 Aug 2007 11:52:25 +0200
Subject: [Haiku-commits] r21900 - in haiku/trunk: headers/os/interface
	src/kits/interface src/servers/app
Message-ID: <200708120952.l7C9qPws031491@sheep.berlios.de>

Author: stippi
Date: 2007-08-12 11:52:25 +0200 (Sun, 12 Aug 2007)
New Revision: 21900
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21900&view=rev

Modified:
   haiku/trunk/headers/os/interface/View.h
   haiku/trunk/src/kits/interface/View.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
* there was a complete mixup of "drawing origin" and "scrolling offset" in the
  BView implementation (client side)
* introduced some private methods for _Convert*(BPoint*) methods which avoid
  doing the check_lock() thing in the recursion, also Origin() would likely
  have communicated with the app_server all the time, since the origin bit
  was needlessly invalidated, so some speedup should be achieved
* this should fix ticket #98


Modified: haiku/trunk/headers/os/interface/View.h
===================================================================
--- haiku/trunk/headers/os/interface/View.h	2007-08-12 09:05:48 UTC (rev 21899)
+++ haiku/trunk/headers/os/interface/View.h	2007-08-12 09:52:25 UTC (rev 21900)
@@ -599,6 +599,13 @@
 			void			_ResizeBy(int32 deltaWidth, int32 deltaHeight);
 			void			_ParentResizedBy(int32 x, int32 y);
 
+			void			_ConvertToScreen(BPoint* pt, bool checkLock) const;
+			void			_ConvertFromScreen(BPoint* pt, bool checkLock) const;
+
+			void			_ConvertToParent(BPoint* pt, bool checkLock) const;
+			void			_ConvertFromParent(BPoint* pt, bool checkLock) const;
+
+
 			void			_Activate(bool state);
 			void			_Attach();
 			void			_Detach();

Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2007-08-12 09:05:48 UTC (rev 21899)
+++ haiku/trunk/src/kits/interface/View.cpp	2007-08-12 09:52:25 UTC (rev 21900)
@@ -628,20 +628,24 @@
 
 
 void
-BView::ConvertToParent(BPoint *point) const
+BView::_ConvertToParent(BPoint *point, bool checkLock) const
 {
 	if (!fParent)
 		return;
 
-	check_lock_no_pick();
+	if (checkLock)
+		check_lock_no_pick();
 
-	// TODO: handle scale
+	// - our scrolling offset
+	// + our bounds location within the parent
+	point->x += -fBounds.left + fParentOffset.x;
+	point->y += -fBounds.top + fParentOffset.y;
+}
 
-	// our local coordinate transformation
-	*point -= Origin();
-
-	// our bounds location within the parent
-	*point += fParentOffset;
+void
+BView::ConvertToParent(BPoint *point) const
+{
+	_ConvertToParent(point, true);
 }
 
 
@@ -655,20 +659,24 @@
 
 
 void
-BView::ConvertFromParent(BPoint *point) const
+BView::_ConvertFromParent(BPoint *point, bool checkLock) const
 {
 	if (!fParent)
 		return;
 
-	check_lock_no_pick();
+	if (checkLock)
+		check_lock_no_pick();
 
-	// TODO: handle scale
+	// - our bounds location within the parent
+	// + our scrolling offset
+	point->x += -fParentOffset.x + fBounds.left;
+	point->y += -fParentOffset.y + fBounds.top;
+}
 
-	// our bounds location within the parent
-	*point -= fParentOffset;
-
-	// our local coordinate transformation
-	*point += Origin();
+void
+BView::ConvertFromParent(BPoint *point) const
+{
+	_ConvertFromParent(point, true);
 }
 
 
@@ -689,15 +697,10 @@
 
 	check_lock_no_pick();
 
-	// TODO: handle scale
-
-	BPoint origin = Origin();
-
-	// our local coordinate transformation
-	rect->OffsetBy(-origin.x, -origin.y);
-
-	// our bounds location within the parent
-	rect->OffsetBy(fParentOffset);
+	// - our scrolling offset
+	// + our bounds location within the parent
+	rect->OffsetBy(-fBounds.left + fParentOffset.x,
+		-fBounds.top + fParentOffset.y);
 }
 
 
@@ -718,13 +721,10 @@
 
 	check_lock_no_pick();
 
-	// TODO: handle scale
-
-	// our bounds location within the parent
-	rect->OffsetBy(-fParentOffset.x, -fParentOffset.y);
-
-	// our local coordinate transformation
-	rect->OffsetBy(Origin());
+	// - our bounds location within the parent
+	// + our scrolling offset
+	rect->OffsetBy(-fParentOffset.x + fBounds.left,
+		-fParentOffset.y + fBounds.top);
 }
 
 
@@ -738,7 +738,7 @@
 
 
 void
-BView::ConvertToScreen(BPoint *pt) const
+BView::_ConvertToScreen(BPoint *pt, bool checkLock) const
 {
 	if (!fParent) {
 		if (fOwner)
@@ -747,13 +747,21 @@
 		return;
 	}
 
-	do_owner_check_no_pick();
+	if (checkLock)
+		do_owner_check_no_pick();
 
-	ConvertToParent(pt);
-	fParent->ConvertToScreen(pt);
+	_ConvertToParent(pt, false);
+	fParent->_ConvertToScreen(pt, false);
 }
 
 
+void
+BView::ConvertToScreen(BPoint *pt) const
+{
+	_ConvertToScreen(pt, true);
+}
+
+
 BPoint
 BView::ConvertToScreen(BPoint pt) const
 {
@@ -764,7 +772,7 @@
 
 
 void
-BView::ConvertFromScreen(BPoint *pt) const
+BView::_ConvertFromScreen(BPoint *pt, bool checkLock) const
 {
 	if (!fParent) {
 		if (fOwner)
@@ -773,13 +781,20 @@
 		return;
 	}
 
-	do_owner_check_no_pick();
+	if (checkLock)
+		do_owner_check_no_pick();
 
-	ConvertFromParent(pt);
-	fParent->ConvertFromScreen(pt);
+	_ConvertFromParent(pt, false);
+	fParent->_ConvertFromScreen(pt, false);
 }
 
+void
+BView::ConvertFromScreen(BPoint *pt) const
+{
+	_ConvertFromScreen(pt, true);
+}
 
+
 BPoint
 BView::ConvertFromScreen(BPoint pt) const
 {
@@ -976,6 +991,9 @@
 		&& x == fState->origin.x && y == fState->origin.y)
 		return;
 
+	fState->origin.x = x;
+	fState->origin.y = y;
+
 	if (do_owner_check()) {
 		fOwner->fLink->StartMessage(AS_LAYER_SET_ORIGIN);
 		fOwner->fLink->Attach<float>(x);
@@ -1539,7 +1557,7 @@
 
 		fOwner->fLink->Flush();
 
-		fState->valid_flags &= ~(B_VIEW_FRAME_BIT | B_VIEW_ORIGIN_BIT);
+//		fState->valid_flags &= ~B_VIEW_FRAME_BIT;
 	}
 
 	// we modify our bounds rectangle by deltaX/deltaY coord units hor/ver.
@@ -3572,7 +3590,7 @@
 		fOwner->fLink->Attach<float>(x);
 		fOwner->fLink->Attach<float>(y);
 
-		fState->valid_flags |= B_VIEW_FRAME_BIT;
+//		fState->valid_flags |= B_VIEW_FRAME_BIT;
 
 		_FlushIfNotInTransaction();
 	}
@@ -3600,7 +3618,7 @@
 		fOwner->fLink->Attach<float>(fBounds.right + deltaWidth);
 		fOwner->fLink->Attach<float>(fBounds.bottom + deltaHeight);
 
-		fState->valid_flags |= B_VIEW_FRAME_BIT;
+//		fState->valid_flags |= B_VIEW_FRAME_BIT;
 
 		_FlushIfNotInTransaction();
 	}
@@ -4652,17 +4670,17 @@
 		return;
 
 	fState->UpdateFrom(*fOwner->fLink);
-	if (!fState->IsValid(B_VIEW_FRAME_BIT)) {
-		fOwner->fLink->StartMessage(AS_LAYER_GET_COORD);
-
-		status_t code;
-		if (fOwner->fLink->FlushWithReply(code) == B_OK
-			&& code == B_OK) {
-			fOwner->fLink->Read<BPoint>(&fParentOffset);
-			fOwner->fLink->Read<BRect>(&fBounds);
-			fState->valid_flags |= B_VIEW_FRAME_BIT;
-		}
-	}
+//	if (!fState->IsValid(B_VIEW_FRAME_BIT)) {
+//		fOwner->fLink->StartMessage(AS_LAYER_GET_COORD);
+//
+//		status_t code;
+//		if (fOwner->fLink->FlushWithReply(code) == B_OK
+//			&& code == B_OK) {
+//			fOwner->fLink->Read<BPoint>(&fParentOffset);
+//			fOwner->fLink->Read<BRect>(&fBounds);
+//			fState->valid_flags |= B_VIEW_FRAME_BIT;
+//		}
+//	}
 	
 	// update children as well
 

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-12 09:05:48 UTC (rev 21899)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-12 09:52:25 UTC (rev 21900)
@@ -1381,8 +1381,8 @@
 			STRACE(("ServerWindow %s: Message AS_LAYER_GET_COORD: ViewLayer: %s\n", Title(), fCurrentLayer->Name()));
 			fLink.StartMessage(B_OK);
 			// our offset in the parent -> will be originX and originY in BView
-			fLink.Attach<float>(fCurrentLayer->Frame().left);
-			fLink.Attach<float>(fCurrentLayer->Frame().top);
+			BPoint parentOffset = fCurrentLayer->Frame().LeftTop();
+			fLink.Attach<BPoint>(parentOffset);
 			fLink.Attach<BRect>(fCurrentLayer->Bounds());
 			fLink.Flush();
 			break;
@@ -1403,9 +1403,7 @@
 		{
 			STRACE(("ServerWindow %s: Message AS_LAYER_GET_ORIGIN: ViewLayer: %s\n", Title(), fCurrentLayer->Name()));
 			fLink.StartMessage(B_OK);
-			// TODO: rename this where it is used in the BView code!
-			// (it wants to know scrolling offset, not drawing origin)
-			fLink.Attach<BPoint>(fCurrentLayer->ScrollingOffset());
+			fLink.Attach<BPoint>(fCurrentLayer->DrawingOrigin());
 			fLink.Flush();
 			break;
 		}



From mmlr at mail.berlios.de  Sun Aug 12 12:32:22 2007
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Sun, 12 Aug 2007 12:32:22 +0200
Subject: [Haiku-commits] r21901 - in haiku/trunk: headers/private/app
	src/kits/app
Message-ID: <200708121032.l7CAWMKP008238@sheep.berlios.de>

Author: mmlr
Date: 2007-08-12 12:32:21 +0200 (Sun, 12 Aug 2007)
New Revision: 21901
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21901&view=rev

Modified:
   haiku/trunk/headers/private/app/MessageUtils.h
   haiku/trunk/src/kits/app/MessageAdapter.cpp
Log:
* Respect endiannes for item lengths inside swapped BMessages
* Also swap the flattened size when creating the read buffer
* Define specialized byte_swap()s for unsigned types too so that type_code and the like get swapped correctly

This should fix bug #1371.

Modified: haiku/trunk/headers/private/app/MessageUtils.h
===================================================================
--- haiku/trunk/headers/private/app/MessageUtils.h	2007-08-12 09:52:25 UTC (rev 21900)
+++ haiku/trunk/headers/private/app/MessageUtils.h	2007-08-12 10:32:21 UTC (rev 21901)
@@ -138,6 +138,14 @@
 
 template<>
 inline void
+byte_swap(uint64 &data)
+{
+	data = __swap_int64(data);
+}
+
+
+template<>
+inline void
 byte_swap(int32 &data)
 {
 	data = __swap_int32(data);
@@ -146,6 +154,14 @@
 
 template<>
 inline void
+byte_swap(uint32 &data)
+{
+	data = __swap_int32(data);
+}
+
+
+template<>
+inline void
 byte_swap(int16 &data)
 {
 	data = __swap_int16(data);
@@ -154,6 +170,14 @@
 
 template<>
 inline void
+byte_swap(uint16 &data)
+{
+	data = __swap_int16(data);
+}
+
+
+template<>
+inline void
 byte_swap(entry_ref &data)
 {
 	byte_swap(data.device);

Modified: haiku/trunk/src/kits/app/MessageAdapter.cpp
===================================================================
--- haiku/trunk/src/kits/app/MessageAdapter.cpp	2007-08-12 09:52:25 UTC (rev 21900)
+++ haiku/trunk/src/kits/app/MessageAdapter.cpp	2007-08-12 10:32:21 UTC (rev 21901)
@@ -43,23 +43,27 @@
 	uint8	flags;
 } _PACKED;
 
+
 struct dano_section_header {
 	uint32		code;
 	ssize_t		size;
 	uint8		data[0];
 } _PACKED;
 
+
 struct dano_message_header {
 	int32		what;
 	int32		padding;
 } _PACKED;
 
+
 typedef struct offset_table_s {
 	int32		indexTable;
 	int32		endOfData;
 	int64		padding;
 } OffsetTable;
 
+
 struct dano_single_item {
 	type_code	type;
 	ssize_t		item_size;
@@ -67,6 +71,7 @@
 	char		name[0];
 } _PACKED;
 
+
 struct dano_fixed_size_array {
 	type_code	type;
 	ssize_t		size_per_item;
@@ -171,7 +176,6 @@
 	try {
 		switch (format) {
 			case MESSAGE_FORMAT_R5:
-			case MESSAGE_FORMAT_R5_SWAPPED:
 			{
 				r5_message_header *header = (r5_message_header *)buffer;
 				BMemoryIO stream(buffer + sizeof(uint32),
@@ -179,6 +183,14 @@
 				return _UnflattenR5Message(format, into, &stream);
 			}
 
+			case MESSAGE_FORMAT_R5_SWAPPED:
+			{
+				r5_message_header *header = (r5_message_header *)buffer;
+				BMemoryIO stream(buffer + sizeof(uint32),
+					__swap_int32(header->flattened_size) - sizeof(uint32));
+				return _UnflattenR5Message(format, into, &stream);
+			}
+
 			case MESSAGE_FORMAT_DANO:
 			case MESSAGE_FORMAT_DANO_SWAPPED:
 			{
@@ -582,24 +594,50 @@
 		if (fixedSize)
 			itemSize = dataSize / itemCount;
 
-		for (int32 i = 0; i < itemCount; i++) {
-			if (!fixedSize) {
-				itemSize = *(ssize_t *)pointer;
+		if (fixedSize) {
+			for (int32 i = 0; i < itemCount; i++) {
+				// ToDo: what if we are swapped? need B_INT32_TYPEs and the
+				// like be swapped here?
+				result = into->AddData(nameBuffer, type, pointer, itemSize,
+					fixedSize, itemCount);
+
+				if (result < B_OK) {
+					free(buffer);
+					return result;
+				}
+
+				pointer += itemSize;
+			}
+		} else if (format == MESSAGE_FORMAT_R5_SWAPPED) {
+			for (int32 i = 0; i < itemCount; i++) {
+				itemSize = __swap_int32(*(ssize_t *)pointer);
 				pointer += sizeof(ssize_t);
-			}
 
-			result = into->AddData(nameBuffer, type, pointer, itemSize,
-				fixedSize, itemCount);
+				result = into->AddData(nameBuffer, type, pointer, itemSize,
+					fixedSize, itemCount);
 
-			if (result < B_OK) {
-				free(buffer);
-				return result;
+				if (result < B_OK) {
+					free(buffer);
+					return result;
+				}
+
+				pointer += pad_to_8(itemSize + sizeof(ssize_t)) - sizeof(ssize_t);
 			}
+		} else {
+			for (int32 i = 0; i < itemCount; i++) {
+				itemSize = *(ssize_t *)pointer;
+				pointer += sizeof(ssize_t);
 
-			if (fixedSize)
-				pointer += itemSize;
-			else
+				result = into->AddData(nameBuffer, type, pointer, itemSize,
+					fixedSize, itemCount);
+
+				if (result < B_OK) {
+					free(buffer);
+					return result;
+				}
+
 				pointer += pad_to_8(itemSize + sizeof(ssize_t)) - sizeof(ssize_t);
+			}
 		}
 
 		free(buffer);



From mmlr at mail.berlios.de  Sun Aug 12 12:42:41 2007
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Sun, 12 Aug 2007 12:42:41 +0200
Subject: [Haiku-commits] r21902 - haiku/trunk/src/kits/support
Message-ID: <200708121042.l7CAgfx6024532@sheep.berlios.de>

Author: mmlr
Date: 2007-08-12 12:42:40 +0200 (Sun, 12 Aug 2007)
New Revision: 21902
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21902&view=rev

Modified:
   haiku/trunk/src/kits/support/ByteOrder.cpp
Log:
* Changed swap_data() to behave like the R5 version
* Added a todo about unsafe access of the buffer
* Removed some types from is_type_swapped() to exactly mirror R5

Modified: haiku/trunk/src/kits/support/ByteOrder.cpp
===================================================================
--- haiku/trunk/src/kits/support/ByteOrder.cpp	2007-08-12 10:32:21 UTC (rev 21901)
+++ haiku/trunk/src/kits/support/ByteOrder.cpp	2007-08-12 10:42:40 UTC (rev 21902)
@@ -12,34 +12,6 @@
 status_t
 swap_data(type_code type, void *_data, size_t length, swap_action action)
 {
-	if (_data == NULL || length == 0)
-		return B_BAD_VALUE;
-
-	switch (type) {
-		// allowed types
-		case B_INT16_TYPE:
-		case B_UINT16_TYPE:
-		case B_FLOAT_TYPE:
-		case B_INT32_TYPE:
-		case B_UINT32_TYPE:
-		case B_SIZE_T_TYPE:
-		case B_SSIZE_T_TYPE:
-		case B_TIME_TYPE:
-		case B_POINTER_TYPE:
-		case B_RECT_TYPE:
-		case B_POINT_TYPE:
-		case B_DOUBLE_TYPE:
-		case B_INT64_TYPE:
-		case B_UINT64_TYPE:
-		case B_OFF_T_TYPE:
-		case B_MESSENGER_TYPE:
-			break;
-
-		default:
-			// not swappable or recognized type!
-			return B_BAD_VALUE;
-	}
-
 	// is there anything to do?
 #if B_HOST_IS_LENDIAN
 	if (action == B_SWAP_HOST_TO_LENDIAN || action == B_SWAP_LENDIAN_TO_HOST)
@@ -49,6 +21,15 @@
 		return B_OK;
 #endif
 
+	if (length == 0)
+		return B_OK;
+
+	if (_data == NULL)
+		return B_BAD_VALUE;
+
+	// ToDo: these are not safe. If the length is smaller than the size of
+	// the type to be converted, too much data may be read. R5 behaves in the
+	// same way though.
 	switch (type) {
 		// 16 bit types
 		case B_INT16_TYPE:
@@ -119,6 +100,10 @@
 			}
 			break;
 		}
+
+		default:
+			// not swappable or recognized type!
+			return B_BAD_VALUE;
 	}
 
 	return B_OK;
@@ -132,7 +117,6 @@
 	// Looks like a pretty strange function to me :)
 
 	switch (type) {
-		case B_ANY_TYPE:
 		case B_BOOL_TYPE:
 		case B_CHAR_TYPE:
 		case B_COLOR_8_BIT_TYPE:
@@ -147,12 +131,10 @@
 		case B_MESSENGER_TYPE:
 		case B_MIME_TYPE:
 		case B_MONOCHROME_1_BIT_TYPE:
-		case B_OBJECT_TYPE:
 		case B_OFF_T_TYPE:
 		case B_PATTERN_TYPE:
 		case B_POINTER_TYPE:
 		case B_POINT_TYPE:
-		case B_RAW_TYPE:
 		case B_RECT_TYPE:
 		case B_REF_TYPE:
 		case B_RGB_32_BIT_TYPE:
@@ -165,12 +147,8 @@
 		case B_UINT32_TYPE:
 		case B_UINT16_TYPE:
 		case B_UINT8_TYPE:
-		case B_MEDIA_PARAMETER_TYPE:
-		case B_MEDIA_PARAMETER_WEB_TYPE:
-		case B_MEDIA_PARAMETER_GROUP_TYPE:
 			return true;
 	}
 
 	return false;
 }
-



From mmlr at mail.berlios.de  Sun Aug 12 12:51:57 2007
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Sun, 12 Aug 2007 12:51:57 +0200
Subject: [Haiku-commits] r21903 - haiku/trunk/src/system/libroot/posix/malloc
Message-ID: <200708121051.l7CApvm2005038@sheep.berlios.de>

Author: mmlr
Date: 2007-08-12 12:51:56 +0200 (Sun, 12 Aug 2007)
New Revision: 21903
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21903&view=rev

Modified:
   haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp
Log:
Avoid a crash in realloc() if the allocation of the new block failed. Return NULL instead.
Someone please review. Should errno be set to ENOMEM here?

Modified: haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp
===================================================================
--- haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp	2007-08-12 10:42:40 UTC (rev 21902)
+++ haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp	2007-08-12 10:51:56 UTC (rev 21903)
@@ -285,6 +285,11 @@
 
 	// Allocate a new block of size sz.
 	void *buffer = malloc(size);
+	if (buffer == NULL) {
+		// Allocation failed, free old block and return
+		free(ptr);
+		return NULL;
+	}
 
 	// Copy the contents of the original object
 	// up to the size of the new block.



From mmlr at mail.berlios.de  Sun Aug 12 13:47:11 2007
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Sun, 12 Aug 2007 13:47:11 +0200
Subject: [Haiku-commits] r21904 - in haiku/trunk: headers/build/private/app
	src/build/libbe/app
Message-ID: <200708121147.l7CBlBYJ024318@sheep.berlios.de>

Author: mmlr
Date: 2007-08-12 13:47:11 +0200 (Sun, 12 Aug 2007)
New Revision: 21904
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21904&view=rev

Modified:
   haiku/trunk/headers/build/private/app/MessageUtils.h
   haiku/trunk/src/build/libbe/app/MessageAdapter.cpp
Log:
Port endian conversion fixes to build version of BMessage.

Modified: haiku/trunk/headers/build/private/app/MessageUtils.h
===================================================================
--- haiku/trunk/headers/build/private/app/MessageUtils.h	2007-08-12 10:51:56 UTC (rev 21903)
+++ haiku/trunk/headers/build/private/app/MessageUtils.h	2007-08-12 11:47:11 UTC (rev 21904)
@@ -138,6 +138,14 @@
 
 template<>
 inline void
+byte_swap(uint64 &data)
+{
+	data = __swap_int64(data);
+}
+
+
+template<>
+inline void
 byte_swap(int32 &data)
 {
 	data = __swap_int32(data);
@@ -146,6 +154,14 @@
 
 template<>
 inline void
+byte_swap(uint32 &data)
+{
+	data = __swap_int32(data);
+}
+
+
+template<>
+inline void
 byte_swap(int16 &data)
 {
 	data = __swap_int16(data);
@@ -154,6 +170,14 @@
 
 template<>
 inline void
+byte_swap(uint16 &data)
+{
+	data = __swap_int16(data);
+}
+
+
+template<>
+inline void
 byte_swap(entry_ref &data)
 {
 	byte_swap(data.device);

Modified: haiku/trunk/src/build/libbe/app/MessageAdapter.cpp
===================================================================
--- haiku/trunk/src/build/libbe/app/MessageAdapter.cpp	2007-08-12 10:51:56 UTC (rev 21903)
+++ haiku/trunk/src/build/libbe/app/MessageAdapter.cpp	2007-08-12 11:47:11 UTC (rev 21904)
@@ -43,23 +43,27 @@
 	uint8	flags;
 } _PACKED;
 
+
 struct dano_section_header {
 	uint32		code;
 	ssize_t		size;
 	uint8		data[0];
 } _PACKED;
 
+
 struct dano_message_header {
 	int32		what;
 	int32		padding;
 } _PACKED;
 
+
 typedef struct offset_table_s {
 	int32		indexTable;
 	int32		endOfData;
 	int64		padding;
 } OffsetTable;
 
+
 struct dano_single_item {
 	type_code	type;
 	ssize_t		item_size;
@@ -67,6 +71,7 @@
 	char		name[0];
 } _PACKED;
 
+
 struct dano_fixed_size_array {
 	type_code	type;
 	ssize_t		size_per_item;
@@ -161,7 +166,6 @@
 	try {
 		switch (format) {
 			case MESSAGE_FORMAT_R5:
-			case MESSAGE_FORMAT_R5_SWAPPED:
 			{
 				r5_message_header *header = (r5_message_header *)buffer;
 				BMemoryIO stream(buffer + sizeof(uint32),
@@ -169,6 +173,14 @@
 				return _UnflattenR5Message(format, into, &stream);
 			}
 
+			case MESSAGE_FORMAT_R5_SWAPPED:
+			{
+				r5_message_header *header = (r5_message_header *)buffer;
+				BMemoryIO stream(buffer + sizeof(uint32),
+					__swap_int32(header->flattened_size) - sizeof(uint32));
+				return _UnflattenR5Message(format, into, &stream);
+			}
+
 			case MESSAGE_FORMAT_DANO:
 			case MESSAGE_FORMAT_DANO_SWAPPED:
 			{
@@ -329,7 +341,7 @@
 	r5header->flags = flags;
 
 	// store the header size - used for the checksum later
-	ssize_t headerSize = (addr_t)pointer - (addr_t)buffer;
+	ssize_t headerSize = (uint32)pointer - (uint32)buffer;
 
 	// collect and add the data
 	BMessage::field_header *field = messagePrivate.GetMessageFields();
@@ -405,7 +417,7 @@
 	pointer++;
 
 	// calculate the flattened size from the pointers
-	r5header->flattened_size = (addr_t)pointer - (addr_t)buffer;
+	r5header->flattened_size = (uint32)pointer - (uint32)buffer;
 	r5header->checksum = CalculateChecksum((uint8 *)(buffer + 8),
 		headerSize - 8);
 
@@ -515,24 +527,50 @@
 		if (fixedSize)
 			itemSize = dataSize / itemCount;
 
-		for (int32 i = 0; i < itemCount; i++) {
-			if (!fixedSize) {
-				itemSize = *(ssize_t *)pointer;
+		if (fixedSize) {
+			for (int32 i = 0; i < itemCount; i++) {
+				// ToDo: what if we are swapped? need B_INT32_TYPEs and the
+				// like be swapped here?
+				result = into->AddData(nameBuffer, type, pointer, itemSize,
+					fixedSize, itemCount);
+
+				if (result < B_OK) {
+					free(buffer);
+					return result;
+				}
+
+				pointer += itemSize;
+			}
+		} else if (format == MESSAGE_FORMAT_R5_SWAPPED) {
+			for (int32 i = 0; i < itemCount; i++) {
+				itemSize = __swap_int32(*(ssize_t *)pointer);
 				pointer += sizeof(ssize_t);
-			}
 
-			result = into->AddData(nameBuffer, type, pointer, itemSize,
-				fixedSize, itemCount);
+				result = into->AddData(nameBuffer, type, pointer, itemSize,
+					fixedSize, itemCount);
 
-			if (result < B_OK) {
-				free(buffer);
-				return result;
+				if (result < B_OK) {
+					free(buffer);
+					return result;
+				}
+
+				pointer += pad_to_8(itemSize + sizeof(ssize_t)) - sizeof(ssize_t);
 			}
+		} else {
+			for (int32 i = 0; i < itemCount; i++) {
+				itemSize = *(ssize_t *)pointer;
+				pointer += sizeof(ssize_t);
 
-			if (fixedSize)
-				pointer += itemSize;
-			else
+				result = into->AddData(nameBuffer, type, pointer, itemSize,
+					fixedSize, itemCount);
+
+				if (result < B_OK) {
+					free(buffer);
+					return result;
+				}
+
 				pointer += pad_to_8(itemSize + sizeof(ssize_t)) - sizeof(ssize_t);
+			}
 		}
 
 		free(buffer);



From mmlr at mail.berlios.de  Sun Aug 12 14:04:42 2007
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Sun, 12 Aug 2007 14:04:42 +0200
Subject: [Haiku-commits] r21905 -
	haiku/trunk/src/add-ons/kernel/bus_managers/usb
Message-ID: <200708121204.l7CC4glU024978@sheep.berlios.de>

Author: mmlr
Date: 2007-08-12 14:04:41 +0200 (Sun, 12 Aug 2007)
New Revision: 21905
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21905&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/usb/Hub.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/usb/Pipe.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/usb/Stack.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/usb/usb_p.h
Log:
Change the way notify hooks and rescans are handeled. The rescans are now delayed to after all notify hooks are called (like in BeOS).
This also ensures that the rescans do not happen while the devices are not yet added or already removed.

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/usb/Hub.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/usb/Hub.cpp	2007-08-12 11:47:11 UTC (rev 21904)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/usb/Hub.cpp	2007-08-12 12:04:41 UTC (rev 21905)
@@ -106,8 +106,10 @@
 			continue;
 
 		TRACE(("USB Hub %d: removing device 0x%08lx\n", DeviceAddress(), fChildren[i]));
-		GetStack()->NotifyDeviceChange(fChildren[i], false);
+		rescan_item *rescanList = NULL;
+		GetStack()->NotifyDeviceChange(fChildren[i], &rescanList, false);
 		GetBusManager()->FreeDevice(fChildren[i]);
+		GetStack()->RescanDrivers(rescanList);
 	}
 
 	delete fInterruptPipe;
@@ -207,6 +209,7 @@
 				USB_REQUEST_CLEAR_FEATURE, C_PORT_CONNECTION, i + 1,
 				0, NULL, 0, NULL);
 
+			rescan_item *rescanList = NULL;
 			if (fPortStatus[i].status & PORT_STATUS_CONNECTION) {
 				// new device attached!
 				TRACE(("USB Hub %d: new device connected\n", DeviceAddress()));
@@ -234,13 +237,15 @@
 
 					// Remove previous device first
 					TRACE(("USB Hub %d: removing device 0x%08lx\n", DeviceAddress(), fChildren[i]));
-					GetStack()->NotifyDeviceChange(fChildren[i], false);
+					GetStack()->NotifyDeviceChange(fChildren[i], &rescanList, false);
 
 					if (Lock()) {
 						GetBusManager()->FreeDevice(fChildren[i]);
 						fChildren[i] = NULL;
 						Unlock();
 					}
+
+					GetStack()->RescanDrivers(rescanList);
 				}
 
 				usb_speed speed = USB_SPEED_FULLSPEED;
@@ -254,7 +259,8 @@
 				if (newDevice && Lock()) {
 					fChildren[i] = newDevice;
 					Unlock();
-					GetStack()->NotifyDeviceChange(fChildren[i], true);
+					GetStack()->NotifyDeviceChange(fChildren[i], &rescanList, true);
+					GetStack()->RescanDrivers(rescanList);
 				} else {
 					if (newDevice)
 						GetBusManager()->FreeDevice(newDevice);
@@ -271,13 +277,15 @@
 				TRACE(("USB Hub %d: device removed\n", DeviceAddress()));
 				if (fChildren[i]) {
 					TRACE(("USB Hub %d: removing device 0x%08lx\n", DeviceAddress(), fChildren[i]));
-					GetStack()->NotifyDeviceChange(fChildren[i], false);
+					GetStack()->NotifyDeviceChange(fChildren[i], &rescanList, false);
 
 					if (Lock()) {
 						GetBusManager()->FreeDevice(fChildren[i]);
 						fChildren[i] = NULL;
 						Unlock();
 					}
+
+					GetStack()->RescanDrivers(rescanList);
 				}
 			}
 		}

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/usb/Pipe.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/usb/Pipe.cpp	2007-08-12 11:47:11 UTC (rev 21904)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/usb/Pipe.cpp	2007-08-12 12:04:41 UTC (rev 21905)
@@ -26,6 +26,7 @@
 
 Pipe::~Pipe()
 {
+	CancelQueuedTransfers();
 	GetBusManager()->NotifyPipeChange(this, USB_CHANGE_DESTROYED);
 }
 
@@ -308,7 +309,7 @@
 		if (actualLength)
 			*actualLength = 0;
 
-		// ToDo: cancel the transfer at the bus manager
+		CancelQueuedTransfers();
 		return B_TIMED_OUT;
 	}
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/usb/Stack.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/usb/Stack.cpp	2007-08-12 11:47:11 UTC (rev 21904)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/usb/Stack.cpp	2007-08-12 12:04:41 UTC (rev 21905)
@@ -42,6 +42,7 @@
 	if (!fAllocator || fAllocator->InitCheck() < B_OK) {
 		TRACE_ERROR(("USB Stack: failed to allocate the allocator\n"));
 		delete fAllocator;
+		fAllocator = NULL;
 		return;
 	}
 
@@ -268,7 +269,7 @@
 
 
 void
-Stack::NotifyDeviceChange(Device *device, bool added)
+Stack::NotifyDeviceChange(Device *device, rescan_item **rescanList, bool added)
 {
 	TRACE(("USB Stack: device %s\n", added ? "added" : "removed"));
 
@@ -279,27 +280,46 @@
 			&element->cookies, added);
 
 		if (result >= B_OK) {
-			// the device is supported by this driver. it either got notified
-			// already by the hooks or it is not loaded at this time. in any
-			// case we will rescan the driver so it either is loaded and can
-			// scan for supported devices or its publish_devices hook will be
-			// called to expose new devices.
-			const char *name = element->driver_name;
+			rescan_item *item = new(std::nothrow) rescan_item;
+			if (!item)
+				return;
+
+			item->name = element->driver_name;
 			if (element->republish_driver_name)
-				name = element->republish_driver_name;
+				item->name = element->republish_driver_name;
 
+			item->link = *rescanList;
+			*rescanList = item;
+		}
+
+		element = element->link;
+	}
+}
+
+
+void
+Stack::RescanDrivers(rescan_item *rescanItem)
+{
+	while (rescanItem) {
+		// the device is supported by this driver. it either got notified
+		// already by the hooks or it is not loaded at this time. in any
+		// case we will rescan the driver so it either is loaded and can
+		// scan for supported devices or its publish_devices hook will be
+		// called to expose changed devices.
+
 #ifndef HAIKU_TARGET_PLATFORM_HAIKU
-			// the R5 way to republish a device in devfs
-			int devFS = open("/dev", O_WRONLY);
-			write(devFS, name, strlen(name));
-			close(devFS);
+		// the R5 way to republish a device in devfs
+		int devFS = open("/dev", O_WRONLY);
+		write(devFS, rescanItem->name, strlen(rescanItem->name));
+		close(devFS);
 #else
-			// use the private devfs API under Haiku
-			//devfs_rescan_driver(name);
+		// use the private devfs API under Haiku
+		//devfs_rescan_driver(name);
 #endif
-		}
 
-		element = element->link;
+		rescan_item *next = rescanItem->link;
+		delete rescanItem;
+		rescanItem = next;
 	}
 }
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/usb/usb_p.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/usb/usb_p.h	2007-08-12 11:47:11 UTC (rev 21904)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/usb/usb_p.h	2007-08-12 12:04:41 UTC (rev 21905)
@@ -60,6 +60,12 @@
 };
 
 
+struct rescan_item {
+	const char						*name;
+	rescan_item						*link;
+};
+
+
 typedef enum {
 	USB_SPEED_LOWSPEED = 0,
 	USB_SPEED_FULLSPEED,
@@ -113,7 +119,9 @@
 											size_t size, const char *name);
 
 		void							NotifyDeviceChange(Device *device,
+											rescan_item **rescanList,
 											bool added);
+		void							RescanDrivers(rescan_item *rescanItem);
 
 		// USB API
 		status_t						RegisterDriver(const char *driverName,



From mmlr at mail.berlios.de  Sun Aug 12 14:54:16 2007
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Sun, 12 Aug 2007 14:54:16 +0200
Subject: [Haiku-commits] r21906 - haiku/trunk/src/add-ons/kernel/busses/usb
Message-ID: <200708121254.l7CCsG9a027873@sheep.berlios.de>

Author: mmlr
Date: 2007-08-12 14:54:16 +0200 (Sun, 12 Aug 2007)
New Revision: 21906
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21906&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/busses/usb/ehci.cpp
   haiku/trunk/src/add-ons/kernel/busses/usb/ehci.h
Log:
* Apply more sane canceling logic to EHCI too
* Remove the leftover user_area - this is handeled inside the Transfer class by now

Modified: haiku/trunk/src/add-ons/kernel/busses/usb/ehci.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/usb/ehci.cpp	2007-08-12 12:04:41 UTC (rev 21905)
+++ haiku/trunk/src/add-ons/kernel/busses/usb/ehci.cpp	2007-08-12 12:54:16 UTC (rev 21906)
@@ -831,7 +831,7 @@
 EHCI::AddPendingTransfer(Transfer *transfer, ehci_qh *queueHead,
 	ehci_qtd *dataDescriptor, bool directionIn)
 {
-	transfer_data *data = new(std::nothrow) transfer_data();
+	transfer_data *data = new(std::nothrow) transfer_data;
 	if (!data)
 		return B_NO_MEMORY;
 
@@ -842,8 +842,8 @@
 	data->transfer = transfer;
 	data->queue_head = queueHead;
 	data->data_descriptor = dataDescriptor;
-	data->user_area = -1;
 	data->incoming = directionIn;
+	data->canceled = false;
 	data->link = NULL;
 
 	if (!Lock()) {
@@ -869,29 +869,21 @@
 	if (!Lock())
 		return B_ERROR;
 
-	transfer_data *last = NULL;
 	transfer_data *current = fFirstTransfer;
 	while (current) {
 		if (current->transfer->TransferPipe() == pipe) {
-			UnlinkQueueHead(current->queue_head, &fFreeListHead);
+			// clear the active bit so the descriptors are canceled
+			ehci_qtd *descriptor = (ehci_qtd *)current->queue_head->element_log;
+			while (descriptor) {
+				descriptor->token &= ~EHCI_QTD_STATUS_ACTIVE;
+				descriptor = (ehci_qtd *)descriptor->next_log;
+			}
+
 			current->transfer->Finished(B_CANCELED, 0);
-			delete current->transfer;
+			current->canceled = true;
+		}
 
-			transfer_data *next = current->link;
-			if (last)
-				last->link = next;
-			else
-				fFirstTransfer = next;
-
-			if (fLastTransfer == current)
-				fLastTransfer = last;
-
-			delete current;
-			current = next;
-		} else {
-			last = current;
-			current = current->link;
-		}
+		current = current->link;
 	}
 
 	Unlock();
@@ -954,11 +946,8 @@
 		while (transfer) {
 			bool transferDone = false;
 			ehci_qtd *descriptor = (ehci_qtd *)transfer->queue_head->element_log;
+			status_t callbackStatus = B_OK;
 
-#ifdef TRACE_USB
-			print_queue(transfer->queue_head);
-#endif
-
 			while (descriptor) {
 				uint32 status = descriptor->token;
 				if (status & EHCI_QTD_STATUS_ACTIVE) {
@@ -998,8 +987,6 @@
 						callbackStatus = B_DEV_STALLED;
 					}
 
-					UnlinkQueueHead(transfer->queue_head, &fFreeListHead);
-					transfer->transfer->Finished(callbackStatus, 0);
 					transferDone = true;
 					break;
 				}
@@ -1007,8 +994,41 @@
 				if (descriptor->next_phy & EHCI_QTD_TERMINATE) {
 					// we arrived at the last (stray) descriptor, we're done
 					TRACE(("usb_ehci: qtd (0x%08lx) done\n", descriptor->this_phy));
+					callbackStatus = B_OK;
+					transferDone = true;
+					break;
+				}
 
-					size_t actualLength = 0;
+				descriptor = (ehci_qtd *)descriptor->next_log;
+			}
+
+			if (!transferDone) {
+				lastTransfer = transfer;
+				transfer = transfer->link;
+				continue;
+			}
+
+			// remove the transfer from the list first so we are sure
+			// it doesn't get canceled while we still process it
+			transfer_data *next = transfer->link;
+			if (Lock()) {
+				if (lastTransfer)
+					lastTransfer->link = transfer->link;
+
+				if (transfer == fFirstTransfer)
+					fFirstTransfer = transfer->link;
+				if (transfer == fLastTransfer)
+					fLastTransfer = lastTransfer;
+
+				transfer->link = NULL;
+				Unlock();
+			}
+
+			// if canceled the callback has already been called
+			if (!transfer->canceled) {
+				size_t actualLength = 0;
+
+				if (callbackStatus == B_OK) {
 					bool nextDataToggle = false;
 					if (transfer->data_descriptor && transfer->incoming) {
 						// data to read out
@@ -1027,56 +1047,47 @@
 					}
 
 					transfer->transfer->TransferPipe()->SetDataToggle(nextDataToggle);
+
 					if (transfer->transfer->IsFragmented()) {
 						// this transfer may still have data left
 						transfer->transfer->AdvanceByFragment(actualLength);
 						if (transfer->transfer->VectorLength() > 0) {
 							FreeDescriptorChain(transfer->data_descriptor);
 							transfer->transfer->PrepareKernelAccess();
-							FillQueueWithData(transfer->transfer,
+							status_t result = FillQueueWithData(
+								transfer->transfer,
 								transfer->queue_head,
 								&transfer->data_descriptor, NULL);
-							break;
+
+							if (result == B_OK && Lock()) {
+								// reappend the transfer
+								if (fLastTransfer)
+									fLastTransfer->link = transfer;
+								if (!fFirstTransfer)
+									fFirstTransfer = transfer;
+
+								fLastTransfer = transfer;
+								Unlock();
+
+								transfer = next;
+								continue;
+							}
 						}
 
 						// the transfer is done, but we already set the
 						// actualLength with AdvanceByFragment()
 						actualLength = 0;
 					}
-
-					UnlinkQueueHead(transfer->queue_head, &fFreeListHead);
-					transfer->transfer->Finished(B_OK, actualLength);
-					transferDone = true;
-					break;
 				}
 
-				descriptor = (ehci_qtd *)descriptor->next_log;
+				transfer->transfer->Finished(callbackStatus, actualLength);
 			}
 
-			if (transferDone) {
-				if (Lock()) {
-					if (lastTransfer)
-						lastTransfer->link = transfer->link;
-
-					if (transfer == fFirstTransfer)
-						fFirstTransfer = transfer->link;
-					if (transfer == fLastTransfer)
-						fLastTransfer = lastTransfer;
-
-					transfer_data *next = transfer->link;
-					delete transfer->transfer;
-					delete transfer;
-					transfer = next;
-					Unlock();
-				}
-			} else {
-				if (Lock()) {
-					lastTransfer = transfer;
-					transfer = transfer->link;
-					Unlock();
-				}
-			}
-
+			// unlink hardware queue and delete the transfer
+			UnlinkQueueHead(transfer->queue_head, &fFreeListHead);
+			delete transfer->transfer;
+			delete transfer;
+			transfer = next;
 			release_sem(fCleanupSem);
 		}
 	}

Modified: haiku/trunk/src/add-ons/kernel/busses/usb/ehci.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/usb/ehci.h	2007-08-12 12:04:41 UTC (rev 21905)
+++ haiku/trunk/src/add-ons/kernel/busses/usb/ehci.h	2007-08-12 12:54:16 UTC (rev 21906)
@@ -22,8 +22,8 @@
 	Transfer		*transfer;
 	ehci_qh			*queue_head;
 	ehci_qtd		*data_descriptor;
-	area_id			user_area;
 	bool			incoming;
+	bool			canceled;
 	transfer_data_s	*link;
 } transfer_data;
 



From laplace at mail.berlios.de  Sun Aug 12 15:01:52 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Sun, 12 Aug 2007 15:01:52 +0200
Subject: [Haiku-commits] r21907 -
	haiku/trunk/src/tests/kits/interface/flatten_picture
Message-ID: <200708121301.l7CD1qLe028374@sheep.berlios.de>

Author: laplace
Date: 2007-08-12 15:01:52 +0200 (Sun, 12 Aug 2007)
New Revision: 21907
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21907&view=rev

Modified:
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.h
Log:
Added tests for basic drawing operations.


Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-12 12:54:16 UTC (rev 21906)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-12 13:01:52 UTC (rev 21907)
@@ -8,57 +8,235 @@
 
 #include "PictureTestCases.h"
 
-void testEmptyPicture(BView *view, BRect frame)
+static const rgb_color kBlack = {0, 0, 0};
+static const rgb_color kWhite = {255, 255, 255};
+static const rgb_color kRed = {255, 0, 0};
+static const rgb_color kGreen = {0, 255, 0};
+static const rgb_color kBlue = {0, 0, 255};
+
+static BPoint centerPoint(BRect rect)
 {
+	int x = (int)(rect.left + rect.IntegerWidth() / 2);
+	int y = (int)(rect.top + rect.IntegerHeight() / 2);
+	return BPoint(x, y);
+}
+
+static void testNoOp(BView *view, BRect frame)
+{
 	// no op
 }
 
-void testDrawString(BView *view, BRect frame)
+static void testDrawChar(BView *view, BRect frame)
 {
+	view->MovePenTo(frame.left, frame.bottom - 5);
+	view->DrawChar('A');
+	
+	view->DrawChar('B', BPoint(frame.left + 20, frame.bottom - 5));
+}
+
+static void testDrawString(BView *view, BRect frame)
+{
 	BFont font;
 	view->GetFont(&font);
 	font_height height;
 	font.GetHeight(&height);
 	float baseline = frame.bottom - height.descent;
 	// draw base line
-	view->SetHighColor(0, 255, 0);
+	view->SetHighColor(kGreen);
 	view->StrokeLine(BPoint(frame.left, baseline - 1), BPoint(frame.right, baseline -1));
 
-	view->SetHighColor(0, 0, 0);
+	view->SetHighColor(kBlack);
 	view->DrawString("Haiku [??????]", BPoint(frame.left, baseline));
 }
 
-void testFillRed(BView *view, BRect frame)
+static void testDrawStringWithLength(BView *view, BRect frame)
 {
+	BFont font;
+	view->GetFont(&font);
+	font_height height;
+	font.GetHeight(&height);
+	float baseline = frame.bottom - height.descent;
+	// draw base line
+	view->SetHighColor(kGreen);
+	view->StrokeLine(BPoint(frame.left, baseline - 1), BPoint(frame.right, baseline -1));
+
+	view->SetHighColor(kBlack);
+	view->DrawString("Haiku [??????]", 13, BPoint(frame.left, baseline));
+}
+
+static void testFillArc(BView *view, BRect frame)
+{
 	frame.InsetBy(2, 2);
-	view->SetHighColor(255, 0, 0);
+	view->FillArc(frame, 45, 180);
+}
+
+static void testStrokeArc(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	view->StrokeArc(frame, 45, 180);
+}
+
+static void testFillBezier(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	BPoint points[4];
+	points[0] = BPoint(frame.left, frame.bottom);
+	points[1] = BPoint(frame.left, frame.top);
+	points[1] = BPoint(frame.left, frame.top);
+	points[3] = BPoint(frame.right, frame.top);
+	view->FillBezier(points);
+}
+
+static void testStrokeBezier(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	BPoint points[4];
+	points[0] = BPoint(frame.left, frame.bottom);
+	points[1] = BPoint(frame.left, frame.top);
+	points[1] = BPoint(frame.left, frame.top);
+	points[3] = BPoint(frame.right, frame.top);
+	view->StrokeBezier(points);
+}
+
+static void testFillEllipse(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	view->FillEllipse(frame);
+
+	view->SetHighColor(kRed);
+	float r = frame.Width() / 3;
+	float s = frame.Height() / 4;
+	view->FillEllipse(centerPoint(frame), r, s);
+}
+
+static void testStrokeEllipse(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	view->StrokeEllipse(frame);
+
+	view->SetHighColor(kRed);
+	float r = frame.Width() / 3;
+	float s = frame.Height() / 4;
+	view->StrokeEllipse(centerPoint(frame), r, s);
+}
+
+static void testFillPolygon(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+
+	BPoint points[4];
+	points[0] = BPoint(frame.left, frame.top);
+	points[1] = BPoint(frame.right, frame.bottom);
+	points[2] = BPoint(frame.right, frame.top);
+	points[3] = BPoint(frame.left, frame.bottom);
+
+	view->FillPolygon(points, 4);
+}
+
+static void testStrokePolygon(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+
+	BPoint points[4];
+	points[0] = BPoint(frame.left, frame.top);
+	points[1] = BPoint(frame.right, frame.bottom);
+	points[2] = BPoint(frame.right, frame.top);
+	points[3] = BPoint(frame.left, frame.bottom);
+
+	view->StrokePolygon(points, 4);
+}
+
+static void testFillRect(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
 	view->FillRect(frame);
 }
 
-void testStrokeRect(BView *view, BRect frame)
+static void testStrokeRect(BView *view, BRect frame)
 {
 	frame.InsetBy(2, 2);
-	int levels = (int)(frame.Height()/2 + 1);
-	for (int i = 0; i < levels; i ++) {
-		view->SetHighColor(0, 0, 255 * (levels-i) / levels);
-		view->StrokeRect(frame);
-		frame.InsetBy(1, 1);
-	}
+	view->StrokeRect(frame);
 }
 
-void testDiagonalLine(BView *view, BRect frame)
+static void testFillRegion(BView *view, BRect frame)
 {
+	frame.InsetBy(2, 2);
+	BRegion region(frame);
+	frame.InsetBy(2, 2);
+	region.Exclude(frame);
+	view->FillRegion(&region);
+}
+
+static void testFillRoundRect(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	view->FillRoundRect(frame, 5, 3);
+}
+
+static void testStrokeRoundRect(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	view->StrokeRoundRect(frame, 5, 3);
+}
+
+static void testFillTriangle(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	BPoint points[3];
+	points[0] = BPoint(frame.left, frame.bottom);
+	points[1] = BPoint(centerPoint(frame).x, frame.top);
+	points[2] = BPoint(frame.right, frame.bottom);
+	view->FillTriangle(points[0], points[1], points[2]); 
+}
+
+static void testStrokeTriangle(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	BPoint points[3];
+	points[0] = BPoint(frame.left, frame.bottom);
+	points[1] = BPoint(centerPoint(frame).x, frame.top);
+	points[2] = BPoint(frame.right, frame.bottom);
+	view->StrokeTriangle(points[0], points[1], points[2]); 
+}
+
+static void testStrokeLine(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	view->StrokeLine(BPoint(frame.left, frame.top), BPoint(frame.right, frame.top));
+	
+	frame.top += 2;
+	frame.bottom -= 2;
 	view->StrokeLine(BPoint(frame.left, frame.top), BPoint(frame.right, frame.bottom));
+	
+	frame.bottom += 2;;
+	frame.top = frame.bottom;
+	view->StrokeLine(BPoint(frame.right, frame.top), BPoint(frame.left, frame.top));
 }
 
-void testStrokeScaledRect(BView *view, BRect frame)
+static void testFillShape(BView *view, BRect frame)
 {
-	view->SetScale(0.5);
-	view->StrokeRect(frame);
+	frame.InsetBy(2, 2);
+	BShape shape;
+	shape.MoveTo(BPoint(frame.left, frame.bottom));
+	shape.LineTo(BPoint(frame.right, frame.top));
+	shape.LineTo(BPoint(frame.left, frame.top));
+	shape.LineTo(BPoint(frame.right, frame.bottom));
+	view->FillShape(&shape);
 }
 
-void testRecordPicture(BView *view, BRect frame)
+static void testStrokeShape(BView *view, BRect frame)
 {
+	frame.InsetBy(2, 2);
+	BShape shape;
+	shape.MoveTo(BPoint(frame.left, frame.bottom));
+	shape.LineTo(BPoint(frame.right, frame.top));
+	shape.LineTo(BPoint(frame.left, frame.top));
+	shape.LineTo(BPoint(frame.right, frame.bottom));
+	view->StrokeShape(&shape);
+}
+
+static void testRecordPicture(BView *view, BRect frame)
+{
 	BPicture *picture = new BPicture();
 	view->BeginPicture(picture);
 	view->FillRect(frame);
@@ -66,7 +244,7 @@
 	delete picture;
 }
 
-void testRecordAndPlayPicture(BView *view, BRect frame)
+static void testRecordAndPlayPicture(BView *view, BRect frame)
 {
 	BPicture *picture = new BPicture();
 	view->BeginPicture(picture);
@@ -77,7 +255,7 @@
 	delete picture;
 }
 
-void testRecordAndPlayPictureWithOffset(BView *view, BRect frame)
+static void testRecordAndPlayPictureWithOffset(BView *view, BRect frame)
 {
 	BPicture *picture = new BPicture();
 	view->BeginPicture(picture);
@@ -88,13 +266,70 @@
 	
 	view->DrawPicture(picture, BPoint(10, 10));
 	// color of picture should not change
-	view->SetLowColor(0, 255, 0);
-	view->SetLowColor(255, 0, 0);
+	view->SetLowColor(kGreen);
+	view->SetLowColor(kRed);
 	view->DrawPicture(picture, BPoint(0, 0));
 	delete picture;
 }
 
-void testBitmap(BView *view, BRect frame) {
+static void testAppendToPicture(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	view->BeginPicture(new BPicture());
+	view->FillRect(frame);
+	BPicture* picture = view->EndPicture();
+	if (picture == NULL)
+		return;
+	
+	frame.InsetBy(2, 2);
+	view->AppendToPicture(picture);
+	view->SetHighColor(kRed);
+	view->FillRect(frame);
+	if (view->EndPicture() != picture)
+		return;
+	
+	view->DrawPicture(picture);
+	delete picture;
+}
+
+static void testLineArray(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	view->BeginLineArray(3);
+	view->AddLine(BPoint(frame.left, frame.top), BPoint(frame.right, frame.top), kBlack);
+	
+	frame.top += 2;
+	frame.bottom -= 2;
+	view->AddLine(BPoint(frame.left, frame.top), BPoint(frame.right, frame.bottom), kRed);
+	
+	frame.bottom += 2;;
+	frame.top = frame.bottom;
+	view->AddLine(BPoint(frame.right, frame.top), BPoint(frame.left, frame.top), kGreen);	
+	
+	view->EndLineArray();
+}
+
+static void testCopyBits(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	BRect leftHalf(frame);
+	leftHalf.right = centerPoint(frame).x - 1;
+	
+	BRect rightHalf(frame);
+	rightHalf.left = centerPoint(frame).x + 1;
+	
+	view->StrokeRect(leftHalf);
+	
+	view->CopyBits(leftHalf, rightHalf);
+}
+
+static void testInvertRect(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	view->InvertRect(frame);
+}
+
+static void testBitmap(BView *view, BRect frame) {
 	BBitmap bitmap(frame, B_RGBA32);
 	for (int32 y = 0; y < bitmap.Bounds().IntegerHeight(); y ++) {
 		for (int32 x = 0; x < bitmap.Bounds().IntegerWidth(); x ++) {
@@ -111,16 +346,37 @@
 }
 
 TestCase gTestCases[] = {
-	{ "Test Empty Picture", testEmptyPicture },
-	{ "Test Diagonal Line", testDiagonalLine },
-	{ "Test Stroke Rect", testStrokeRect },
+	{ "Test No Operation", testNoOp },
+	{ "Test DrawChar", testDrawChar },
 	{ "Test Draw String", testDrawString },
-	{ "Test Fill Red", testFillRed },
-	{ "Test Stroke Scaled Rect", testStrokeScaledRect },
+	{ "Test Draw String With Length", testDrawStringWithLength },
+	{ "Test FillArc", testFillArc },
+	{ "Test StrokeArc", testStrokeArc },
+	{ "Test FillBezier", testFillBezier },
+	{ "Test StrokeBezier", testStrokeBezier },
+	{ "Test FillEllipse", testFillEllipse },
+	{ "Test StrokeEllipse", testStrokeEllipse },
+	{ "Test FillPolygon", testFillPolygon },
+	{ "Test StrokePolygon", testStrokePolygon },
+	{ "Test FillRect", testFillRect },
+	{ "Test StrokeRect", testStrokeRect },
+	{ "Test FillRegion", testFillRegion },
+	{ "Test FillRoundRect", testFillRoundRect },
+	{ "Test StrokeRoundRect", testStrokeRoundRect },
+	{ "Test FillTriangle", testFillTriangle },
+	{ "Test StrokeTriangle", testStrokeTriangle },
+	{ "Test StrokeLine", testStrokeLine },
+	{ "Test FillShape", testFillShape },
+	{ "Test StrokeShape", testStrokeShape },
 	{ "Test Record Picture", testRecordPicture },
 	{ "Test Record And Play Picture", testRecordAndPlayPicture },
 	{ "Test Record And Play Picture With Offset", testRecordAndPlayPictureWithOffset },
-	{ "Test Draw Bitmap", testBitmap },
+	{ "Test AppendToPicture", testAppendToPicture },
+	{ "Test LineArray", testLineArray },
+	// does not work under R5 for pictures!
+	{ "Test CopyBits*", testCopyBits },
+	{ "Test InvertRect", testInvertRect },
+	{ "Test Bitmap", testBitmap },
 	{ NULL, NULL }
 };
 

Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp	2007-08-12 12:54:16 UTC (rev 21906)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp	2007-08-12 13:01:52 UTC (rev 21907)
@@ -54,9 +54,7 @@
 
 	m = new BMenu("Tests");
 		m->AddItem(new BMenuItem("Run", new BMessage(kMsgRunTests), 'R'));
-	// not implemented
-	//	m->AddSeparatorItem();
-	//	m->AddItem(new BMenuItem("Write images", new BMessage(kMsgWriteImages), 'W'));
+		m->AddItem(new BMenuItem("Run Color Space B_RGB32", new BMessage(kMsgRunTests1), 'S'));
 	mb->AddItem(m);
 
 	backdrop->AddChild(mb);
@@ -96,6 +94,9 @@
 		case kMsgRunTests:
 			RunTests();
 			break;
+		case kMsgRunTests1:
+			RunTests1();
+			break;
 	}
 	Inherited::MessageReceived(msg);
 }
@@ -104,6 +105,29 @@
 void
 PictureTestWindow::RunTests()
 {
+	color_space colorSpaces[] = {
+		B_RGBA32,
+		B_RGB32,
+		B_RGB24,
+		B_RGB16,
+		B_RGB15
+	};
+
+	RunTests(colorSpaces, sizeof(colorSpaces) / sizeof(color_space));	
+}
+
+void
+PictureTestWindow::RunTests1()
+{
+	color_space colorSpaces[] = {
+		B_RGBA32
+	};
+	RunTests(colorSpaces, 1);
+}
+
+void
+PictureTestWindow::RunTests(color_space *colorSpaces, int32 n)
+{
 	for (int testIndex = 0; testIndex < 2; testIndex ++) {
 		BString text;
 		switch (testIndex)
@@ -118,22 +142,14 @@
 				text = "Unknown test method!";
 		}
 		fListView->AddItem(new BStringItem(text.String()));
-		RunTests(testIndex);
+		RunTests(testIndex, colorSpaces, n);
 	}
 }
 
 void 
-PictureTestWindow::RunTests(int32 testIndex)
+PictureTestWindow::RunTests(int32 testIndex, color_space *colorSpaces, int32 n)
 {
-	color_space colorSpaces[] = {
-		B_RGBA32,
-		B_RGB32,
-		B_RGB24,
-		B_RGB16,
-		B_RGB15
-	};
-	
-	for (uint32 csIndex = 0; csIndex < sizeof(colorSpaces)/sizeof(color_space); csIndex ++) {
+	for (int32 csIndex = 0; csIndex < n; csIndex ++) {
 		color_space colorSpace = colorSpaces[csIndex];
 		const char *csText;
 		switch (colorSpace) {

Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.h
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.h	2007-08-12 12:54:16 UTC (rev 21906)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.h	2007-08-12 13:01:52 UTC (rev 21907)
@@ -24,13 +24,15 @@
 
 	enum {
 		kMsgRunTests = 'PTst',
-		kMsgWriteImages,
+		kMsgRunTests1,
 	};
 
 	void BuildGUI();
 	void UpdateHeader();
 	void RunTests();
-	void RunTests(int32 testIndex);
+	void RunTests1();
+	void RunTests(color_space *colorSpaces, int32 n);
+	void RunTests(int32 testIndex, color_space *colorSpaces, int32 n);
 	void RunTests(int32 testIndex, color_space colorSpace);
 	
 	BListView *fListView;



From laplace at mail.berlios.de  Sun Aug 12 15:05:24 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Sun, 12 Aug 2007 15:05:24 +0200
Subject: [Haiku-commits] r21908 -
	haiku/trunk/src/tests/kits/interface/flatten_picture
Message-ID: <200708121305.l7CD5OvQ028597@sheep.berlios.de>

Author: laplace
Date: 2007-08-12 15:05:24 +0200 (Sun, 12 Aug 2007)
New Revision: 21908
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21908&view=rev

Modified:
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
Log:
Disabled CopyBits test. It does not work under R5 either, so I assume
this operation is not supported when recording to a BPicture.


Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-12 13:01:52 UTC (rev 21907)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-12 13:05:24 UTC (rev 21908)
@@ -374,7 +374,8 @@
 	{ "Test AppendToPicture", testAppendToPicture },
 	{ "Test LineArray", testLineArray },
 	// does not work under R5 for pictures!
-	{ "Test CopyBits*", testCopyBits },
+	// TODO verify that CopyBits is not supported when recording to a BPicture
+	// { "Test CopyBits*", testCopyBits },
 	{ "Test InvertRect", testInvertRect },
 	{ "Test Bitmap", testBitmap },
 	{ NULL, NULL }



From stippi at mail.berlios.de  Sun Aug 12 15:07:55 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sun, 12 Aug 2007 15:07:55 +0200
Subject: [Haiku-commits] r21909 - haiku/trunk/src/kits/app
Message-ID: <200708121307.l7CD7t71028817@sheep.berlios.de>

Author: stippi
Date: 2007-08-12 15:07:55 +0200 (Sun, 12 Aug 2007)
New Revision: 21909
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21909&view=rev

Modified:
   haiku/trunk/src/kits/app/ServerLink.cpp
Log:
* fix attaching and reading empty regions


Modified: haiku/trunk/src/kits/app/ServerLink.cpp
===================================================================
--- haiku/trunk/src/kits/app/ServerLink.cpp	2007-08-12 13:05:24 UTC (rev 21908)
+++ haiku/trunk/src/kits/app/ServerLink.cpp	2007-08-12 13:07:55 UTC (rev 21909)
@@ -35,11 +35,15 @@
 ServerLink::ReadRegion(BRegion *region)
 {
 	fReceiver->Read(&region->fCount, sizeof(long));
-	fReceiver->Read(&region->fBounds, sizeof(clipping_rect));
-	if (!region->_SetSize(region->fCount))
-		return B_NO_MEMORY;
-	return fReceiver->Read(region->fData,
-		region->fCount * sizeof(clipping_rect));
+	if (region->fCount > 0) {
+		fReceiver->Read(&region->fBounds, sizeof(clipping_rect));
+		if (!region->_SetSize(region->fCount))
+			return B_NO_MEMORY;
+		return fReceiver->Read(region->fData,
+			region->fCount * sizeof(clipping_rect));
+	} else {
+		return fReceiver->Read(&region->fBounds, sizeof(clipping_rect));
+	}
 }
 
 
@@ -47,9 +51,13 @@
 ServerLink::AttachRegion(const BRegion &region)
 {
 	fSender->Attach(&region.fCount, sizeof(long));
-	fSender->Attach(&region.fBounds, sizeof(clipping_rect));
-	return fSender->Attach(region.fData,
-		region.fCount * sizeof(clipping_rect));
+	if (region.fCount > 0) {
+		fSender->Attach(&region.fBounds, sizeof(clipping_rect));
+		return fSender->Attach(region.fData,
+			region.fCount * sizeof(clipping_rect));
+	} else {
+		return fSender->Attach(&region.fBounds, sizeof(clipping_rect));
+	}
 }
 
 



From stippi at mail.berlios.de  Sun Aug 12 15:14:09 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Sun, 12 Aug 2007 15:14:09 +0200
Subject: [Haiku-commits] r21910 - in haiku/trunk/src: kits/interface
	servers/app
Message-ID: <200708121314.l7CDE9mF029226@sheep.berlios.de>

Author: stippi
Date: 2007-08-12 15:14:09 +0200 (Sun, 12 Aug 2007)
New Revision: 21910
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21910&view=rev

Modified:
   haiku/trunk/src/kits/interface/View.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
* removed code duplication in BView::check_lock() and do_owner_check(),
* revised use of check_lock() versus do_owner_check() (do_owner_check()
  is supposed to drop you into the debugger if there is no owner, otherwise
  it behaves like check_lock())
* ConstrainClippingRegion() no longer transmits empty regions to the
  app_server. I would have thought that my fix to ServerLink would have
  solved the issue I was investigating, but only this commit fixes it.
  Maybe the last commit would have fixed it if I did a "jam clean"...
* WonderBrush draws the icons again on mouse over...


Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2007-08-12 13:07:55 UTC (rev 21909)
+++ haiku/trunk/src/kits/interface/View.cpp	2007-08-12 13:14:09 UTC (rev 21910)
@@ -1011,6 +1011,8 @@
 BView::Origin() const
 {
 	if (!fState->IsValid(B_VIEW_ORIGIN_BIT)) {
+		// we don't keep graphics state information, therefor
+		// we need to ask the server for the origin after PopState()
 		do_owner_check();
 
 		fOwner->fLink->StartMessage(AS_LAYER_GET_ORIGIN);
@@ -2169,7 +2171,6 @@
 
 	if (fOwner) {
 		check_lock();
-		do_owner_check();
 
 		fState->UpdateServerFontState(*fOwner->fLink);
 	}
@@ -2260,7 +2261,8 @@
 	// changed, so it is always read from the serber
 	region->MakeEmpty();
 
-	if (fOwner && do_owner_check()) {
+	if (fOwner) {
+		check_lock();
 		fOwner->fLink->StartMessage(AS_LAYER_GET_CLIP_REGION);
 
  		int32 code;
@@ -2277,21 +2279,20 @@
 BView::ConstrainClippingRegion(BRegion* region)
 {
 	if (do_owner_check()) {
-
 		fOwner->fLink->StartMessage(AS_LAYER_SET_CLIP_REGION);
 
 		if (region) {
 			int32 count = region->CountRects();
 			fOwner->fLink->Attach<int32>(count);
-			fOwner->fLink->AttachRegion(*region);
+			if (count > 0)
+				fOwner->fLink->AttachRegion(*region);
 		} else {
 			fOwner->fLink->Attach<int32>(-1);
 			// '-1' means that in the app_server, there won't be any 'local'
 			// clipping region (it will be NULL)
 		}
 
-		// we flush here because app_server waits for all the rects
-		fOwner->fLink->Flush();
+		_FlushIfNotInTransaction();
 
 		fState->valid_flags &= ~B_VIEW_CLIP_REGION_BIT;
 		fState->archiving_flags |= B_VIEW_CLIP_REGION_BIT;
@@ -4666,6 +4667,7 @@
 void
 BView::_UpdateStateForRemove()
 {
+	// TODO: check_lock() would be good enough, no?
 	if (!do_owner_check())
 		return;
 
@@ -4767,24 +4769,13 @@
 {
 	STRACE(("BView(%s)::do_owner_check()...", Name()));
 
-	int32 serverToken = _get_object_token_(this);
-
 	if (fOwner == NULL) {
 		debugger("View method requires owner and doesn't have one.");
 		return false;
 	}
 
-	fOwner->check_lock();
+	check_lock();
 
-	if (fOwner->fLastViewToken != serverToken) {
-		STRACE(("contacting app_server... sending token: %ld\n", serverToken));
-		fOwner->fLink->StartMessage(AS_SET_CURRENT_LAYER);
-		fOwner->fLink->Attach<int32>(serverToken);
-
-		fOwner->fLastViewToken = serverToken;
-	} else
-		STRACE(("this is the lastViewToken\n"));
-
 	return true;
 }
 

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-12 13:07:55 UTC (rev 21909)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-12 13:14:09 UTC (rev 21910)
@@ -1802,7 +1802,7 @@
 			if (rectCount >= 0) {
 				// we are supposed to set the clipping region
 				BRegion region;
-				if (link.ReadRegion(&region) < B_OK)
+				if (rectCount > 0 && link.ReadRegion(&region) < B_OK)
 					break;
 				fCurrentLayer->SetUserClipping(&region);
 			} else {



From bonefish at cs.tu-berlin.de  Sun Aug 12 17:40:51 2007
From: bonefish at cs.tu-berlin.de (Ingo Weinhold)
Date: Sun, 12 Aug 2007 17:40:51 +0200
Subject: [Haiku-commits] r21903 -
 haiku/trunk/src/system/libroot/posix/malloc
In-Reply-To: <200708121051.l7CApvm2005038@sheep.berlios.de>
References: <200708121051.l7CApvm2005038@sheep.berlios.de>
Message-ID: <20070812174051.632.1@cs.tu-berlin.de>


On 2007-08-12 at 12:51:57 [+0200], mmlr at BerliOS <mmlr at mail.berlios.de> 
wrote:
> Author: mmlr
> Date: 2007-08-12 12:51:56 +0200 (Sun, 12 Aug 2007)
> New Revision: 21903
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21903&view=rev
> 
> Modified:
>    haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp
> Log:
> Avoid a crash in realloc() if the allocation of the new block failed. 
> Return NULL instead.
> Someone please review. Should errno be set to ENOMEM here?
> 
> Modified: haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp
> ===================================================================
> --- haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp    2007-08-12 
> 10:42:40 UTC (rev 21902)
> +++ haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp    2007-08-12 
> 10:51:56 UTC (rev 21903)
> @@ -285,6 +285,11 @@
>  
>      // Allocate a new block of size sz.
>      void *buffer = malloc(size);
> +    if (buffer == NULL) {
> +        // Allocation failed, free old block and return
> +        free(ptr);
> +        return NULL;
> +    }

realloc() must not free() the supplied pointer if it fails to allocate 
memory. And yes, errno must be set to ENOMEM (same holds for malloc()).

http://www.opengroup.org/onlinepubs/009695399/functions/realloc.html

CU, Ingo


From mmlr at mail.berlios.de  Sun Aug 12 18:23:55 2007
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Sun, 12 Aug 2007 18:23:55 +0200
Subject: [Haiku-commits] r21911 - haiku/trunk/src/system/libroot/posix/malloc
Message-ID: <200708121623.l7CGNtpD006188@sheep.berlios.de>

Author: mmlr
Date: 2007-08-12 18:23:55 +0200 (Sun, 12 Aug 2007)
New Revision: 21911
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21911&view=rev

Modified:
   haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp
Log:
* Changed realloc() again to leave the old block intact (obviously...)
* Check for failed allocations and set errno correspondingly in malloc(), calloc(), memalign() and realloc()

Modified: haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp
===================================================================
--- haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp	2007-08-12 13:14:09 UTC (rev 21910)
+++ haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp	2007-08-12 16:23:55 UTC (rev 21911)
@@ -26,6 +26,7 @@
 
 #include <image.h>
 
+#include <errno.h>
 #include <string.h>
 
 using namespace BPrivate;
@@ -210,9 +211,15 @@
 	static processHeap *pHeap = getAllocator();
 
 	void *addr = pHeap->getHeap(pHeap->getHeapIndex()).malloc(size);
+	if (addr == NULL) {
+		errno = B_NO_MEMORY;
+		return NULL;
+	}
+
 #if HEAP_LEAK_CHECK
 	add_address(addr, size);
 #endif
+
 	return addr;
 }
 
@@ -222,6 +229,10 @@
 {
 	static processHeap *pHeap = getAllocator();
 	void *ptr = pHeap->getHeap(pHeap->getHeapIndex()).malloc(nelem * elsize);
+	if (ptr == NULL) {
+		errno = B_NO_MEMORY;
+		return NULL;
+	}
 
 #if HEAP_LEAK_CHECK
 	add_address(ptr, nelem * elsize);
@@ -250,6 +261,11 @@
 {
 	static processHeap *pHeap = getAllocator();
 	void *addr = pHeap->getHeap(pHeap->getHeapIndex()).memalign(alignment, size);
+	if (addr == NULL) {
+		errno = B_NO_MEMORY;
+		return NULL;
+	}
+
 #if HEAP_LEAK_CHECK
 	add_address(addr, size);
 #endif
@@ -286,8 +302,8 @@
 	// Allocate a new block of size sz.
 	void *buffer = malloc(size);
 	if (buffer == NULL) {
-		// Allocation failed, free old block and return
-		free(ptr);
+		// Allocation failed, leave old block and return
+		errno = B_NO_MEMORY;
 		return NULL;
 	}
 



From mmlr at mlotz.ch  Sun Aug 12 18:26:27 2007
From: mmlr at mlotz.ch (Michael Lotz)
Date: Sun, 12 Aug 2007 18:26:27 +0200
Subject: [Haiku-commits] r21903 -
 haiku/trunk/src/system/libroot/posix/malloc
In-Reply-To: <20070812174051.632.1@cs.tu-berlin.de>
Message-ID: <1583534634-BeMail@primary>

Hi Ingo

> realloc() must not free() the supplied pointer if it fails to 
> allocate 
> memory. And yes, errno must be set to ENOMEM (same holds for 
> malloc()).

Yeah, obviously it must not free the old buffer as otherwise you're 
left with nothing ;-)
Changed that and also added the errno setting to all of the allocation 
functions. I checked with the specs and this should be correct, 
although I am not sure about memalign. It's noted that memalign is 
obsolete and replaced by posix_memalign, but for now I think this 
should work.

Regards
Michael


From korli at users.berlios.de  Sun Aug 12 18:58:25 2007
From: korli at users.berlios.de (=?ISO-8859-1?Q?J=E9r=F4me_Duval?=)
Date: Sun, 12 Aug 2007 18:58:25 +0200
Subject: [Haiku-commits] r21688 -
	haiku/trunk/src/tools/remote_disk_server
In-Reply-To: <200707230015.l6N0FjdD018070@sheep.berlios.de>
References: <200707230015.l6N0FjdD018070@sheep.berlios.de>
Message-ID: <c47b1d430708120958h2beb55a8ne6be3521d08c0fc8@mail.gmail.com>

Hi Axel,

2007/7/23, axeld at BerliOS <axeld at mail.berlios.de>:
>
> Modified: haiku/trunk/src/tools/remote_disk_server/Jamfile
> ===================================================================
> --- haiku/trunk/src/tools/remote_disk_server/Jamfile    2007-07-22
> 23:50:34 UTC (rev 21687)
> +++ haiku/trunk/src/tools/remote_disk_server/Jamfile    2007-07-23
> 00:15:45 UTC (rev 21688)
> @@ -4,5 +4,5 @@
>
> BuildPlatformMain remote_disk_server
>         : remote_disk_server.cpp
> -       : $(HOST_LIBSUPC++)
> +       : $(HOST_LIBSUPC++) $(NETWORK_LIBS)
> ;


This doesn't work on Linux anymore: NETWORK_LIBS is related to the target
platform. Something like HOST_NETWORK_LIBS would be better. I hope Ingo can
give a hand here :)

Bye,
J?r?me
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20070812/1d610d87/attachment.html>

From bonefish at mail.berlios.de  Mon Aug 13 00:15:14 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Mon, 13 Aug 2007 00:15:14 +0200
Subject: [Haiku-commits] r21912 - in haiku/trunk: build/jam
 src/add-ons/mail_daemon/inbound_protocols/imap
 src/add-ons/mail_daemon/inbound_protocols/pop3
 src/add-ons/mail_daemon/outbound_protocols/smtp
 src/add-ons/print/transports/hp_jetdirect src/add-ons/print/transports/ipp
 src/add-ons/print/transports/lpr src/add-ons/print/transports/shared
 src/apps/cdplayer src/apps/codycam src/apps/networkstatus src/bin/bash
 src/bin/coreutils/src src/bin/network/arp src/bin/network/ftp
 src/bin/network/nc src/bin/network/ping src/bin/network/tcpdump
 src/bin/network/telnet src/bin/network/telnetd src/bin/network/traceroute
 src/bin/network/wget src/bin/sharutils/src src/bin/tar/src src/bin/vim/src
 src/kits src/kits/interface src/kits/mail src/kits/network/libnetapi
 src/preferences/network src/servers/mail
 src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client
 src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/netfs_config
 src/tests/add-ons/kernel/file_systems/userlandfs/! r5/src/test/netfs/server
 src/tests/kits/net src/tests/kits/net/netperf src/tools/remote_disk_server
Message-ID: <200708122215.l7CMFEB1008217@sheep.berlios.de>

Author: bonefish
Date: 2007-08-13 00:15:10 +0200 (Mon, 13 Aug 2007)
New Revision: 21912
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21912&view=rev

Modified:
   haiku/trunk/build/jam/BuildSetup
   haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
   haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
   haiku/trunk/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
   haiku/trunk/src/add-ons/print/transports/hp_jetdirect/Jamfile
   haiku/trunk/src/add-ons/print/transports/ipp/Jamfile
   haiku/trunk/src/add-ons/print/transports/lpr/Jamfile
   haiku/trunk/src/add-ons/print/transports/shared/Jamfile
   haiku/trunk/src/apps/cdplayer/Jamfile
   haiku/trunk/src/apps/codycam/Jamfile
   haiku/trunk/src/apps/networkstatus/Jamfile
   haiku/trunk/src/bin/bash/Jamfile
   haiku/trunk/src/bin/coreutils/src/Jamfile
   haiku/trunk/src/bin/network/arp/Jamfile
   haiku/trunk/src/bin/network/ftp/Jamfile
   haiku/trunk/src/bin/network/nc/Jamfile
   haiku/trunk/src/bin/network/ping/Jamfile
   haiku/trunk/src/bin/network/tcpdump/Jamfile
   haiku/trunk/src/bin/network/telnet/Jamfile
   haiku/trunk/src/bin/network/telnetd/Jamfile
   haiku/trunk/src/bin/network/traceroute/Jamfile
   haiku/trunk/src/bin/network/wget/Jamfile
   haiku/trunk/src/bin/sharutils/src/Jamfile
   haiku/trunk/src/bin/tar/src/Jamfile
   haiku/trunk/src/bin/vim/src/Jamfile
   haiku/trunk/src/kits/Jamfile
   haiku/trunk/src/kits/interface/Jamfile
   haiku/trunk/src/kits/mail/Jamfile
   haiku/trunk/src/kits/network/libnetapi/Jamfile
   haiku/trunk/src/preferences/network/Jamfile
   haiku/trunk/src/servers/mail/Jamfile
   haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/Jamfile
   haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/netfs_config/Jamfile
   haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/Jamfile
   haiku/trunk/src/tests/kits/net/Jamfile
   haiku/trunk/src/tests/kits/net/netperf/Jamfile
   haiku/trunk/src/tools/remote_disk_server/Jamfile
Log:
* Prefixed the variables NETWORK_LIBS, NETAPI_LIB, and
  SELECT_UNAME_ETC_LIB with TARGET_ and introduced HAIKU_* and HOST_*
  counterparts.
* Use HOST_NETWORK_LIBS for building remote_disk_server.
* Also got rid of {R5,BONE,DANO,HAIKU}_COMPATIBLE.


Modified: haiku/trunk/build/jam/BuildSetup
===================================================================
--- haiku/trunk/build/jam/BuildSetup	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/build/jam/BuildSetup	2007-08-12 22:15:10 UTC (rev 21912)
@@ -282,6 +282,11 @@
 	HAIKU_LIBSUPC++ = ;
 }
 
+# network libraries
+HAIKU_NETWORK_LIBS = network ;
+HAIKU_NETAPI_LIB = network ;
+HAIKU_SELECT_UNAME_ETC_LIB = ;	# libroot, against which we link anyway
+
 # library and executable glue code
 local commonGlueCode =
 	<src!system!glue>init_term_dyn.o
@@ -534,6 +539,26 @@
 	}
 }
 
+# network libraries
+if $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
+	HOST_NETWORK_LIBS = network ;
+	HOST_NETAPI_LIB = network ;
+	HOST_SELECT_UNAME_ETC_LIB = ;	# libroot
+} else if $(HOST_PLATFORM_BONE_COMPATIBLE) {
+	HOST_NETWORK_LIBS = socket bind ;
+	HOST_NETAPI_LIB = bnetapi ;
+	HOST_SELECT_UNAME_ETC_LIB = ;	# libroot
+} else if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+	HOST_NETWORK_LIBS = net ;
+	HOST_NETAPI_LIB = netapi ;
+	HOST_SELECT_UNAME_ETC_LIB = net ;
+} else {
+	# Linux,...
+	HOST_NETWORK_LIBS = ;
+	HOST_NETAPI_LIB = ;
+	HOST_SELECT_UNAME_ETC_LIB = ;
+}
+
 # define the executable MIME type
 HOST_EXECUTABLE_MIME_TYPE = "application/x-vnd.Be-elfexecutable" ;
 
@@ -583,27 +608,6 @@
 	}
 }
 
-# TODO: Fix the naming!
-if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
-	NETWORK_LIBS = network ;
-	SELECT_UNAME_ETC_LIB = root ;
-	NETAPI_LIB = network ;
-} else if $(TARGET_PLATFORM_BONE_COMPATIBLE) {
-	NETWORK_LIBS = socket bind ;
-	NETAPI_LIB = bnetapi ;
-	SELECT_UNAME_ETC_LIB = root ;
-} else {
-	NETWORK_LIBS = net ;
-	NETAPI_LIB = netapi ;
-	SELECT_UNAME_ETC_LIB = net ;
-}
-
-# TODO: For compatibility only. Remove when no longer used.
-R5_COMPATIBLE		= $(TARGET_PLATFORM_BEOS_COMPATIBLE) ;
-BONE_COMPATIBLE		= $(TARGET_PLATFORM_BONE_COMPATIBLE) ;
-DANO_COMPATIBLE		= $(TARGET_PLATFORM_DANO_COMPATIBLE) ;
-HAIKU_COMPATIBLE	= $(TARGET_PLATFORM_HAIKU_COMPATIBLE) ;
-
 # Set TARGET_* variables either from HAIKU_* or HOST_* depending on the
 # specified TARGET_PLATFORM.
 
@@ -634,6 +638,8 @@
 
 	LIBSTDC++ LIBSUPC++
 
+	NETWORK_LIBS NETAPI_LIB SELECT_UNAME_ETC_LIB
+
 	ARCH_MACRO_DEFINE EXECUTABLE_MIME_TYPE
 
 	OBJECT_BASE_DIR COMMON_ARCH_OBJECT_DIR COMMON_DEBUG_OBJECT_DIR

Modified: haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -21,7 +21,7 @@
 	imap_config.cpp
 	NestedString.cpp ;
 
-LinkAgainst IMAP : be libmail.so $(NETWORK_LIBS) ;
+LinkAgainst IMAP : be libmail.so $(TARGET_NETWORK_LIBS) ;
 
 if $(USESSL) {
 	LinkAgainst IMAP : ssl crypto ;

Modified: haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -22,7 +22,7 @@
 	SimpleMailProtocol.cpp
 	md5c.c ;
 
-LinkAgainst POP3 : be libmail.so $(NETWORK_LIBS) ;
+LinkAgainst POP3 : be libmail.so $(TARGET_NETWORK_LIBS) ;
 
 if $(USESSL) {
 	LinkAgainst POP3 : ssl crypto ;

Modified: haiku/trunk/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -20,7 +20,7 @@
 	smtp.cpp
 	md5c.c ;
 
-LinkAgainst SMTP : be libmail.so $(NETWORK_LIBS) ;
+LinkAgainst SMTP : be libmail.so $(TARGET_NETWORK_LIBS) ;
 
 if $(USESSL) {
 	LinkAgainst SMTP : ssl crypto ;

Modified: haiku/trunk/src/add-ons/print/transports/hp_jetdirect/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/print/transports/hp_jetdirect/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/add-ons/print/transports/hp_jetdirect/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -8,7 +8,7 @@
 	print_transport.cpp 
 	HPJetDirectTransport.cpp
 	SetupWindow.cpp
-	: be $(NETAPI_LIB)
+	: be $(TARGET_NETAPI_LIB)
 ;
 
 Package haiku-printingkit-cvs :

Modified: haiku/trunk/src/add-ons/print/transports/ipp/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/print/transports/ipp/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/add-ons/print/transports/ipp/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -15,7 +15,7 @@
 	Socket.o
 	SocketStream.o
 	DbgMsg.o
-	: be $(NETWORK_LIBS) $(TARGET_LIBSTDC++)
+	: be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++)
 ;
 
 ObjectReferences

Modified: haiku/trunk/src/add-ons/print/transports/lpr/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/print/transports/lpr/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/add-ons/print/transports/lpr/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -13,7 +13,7 @@
 	Socket.o
 	SocketStream.o
 	DbgMsg.o
-	: be $(NETWORK_LIBS) $(TARGET_LIBSTDC++)
+	: be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++)
 ;
 
 ObjectReferences

Modified: haiku/trunk/src/add-ons/print/transports/shared/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/print/transports/shared/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/add-ons/print/transports/shared/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-if $(BONE_COMPATIBLE) {
+if $(TARGET_PLATFORM_BONE_COMPATIBLE) {
 	ObjectC++Flags Socket.cpp : -DHAVE_ARPA_INET -Dclosesocket=close ;
 } else {
 	ObjectC++Flags Socket.cpp : -DHAVE_ARPA_INET -DBUILDING_R5_LIBNET ;

Modified: haiku/trunk/src/apps/cdplayer/Jamfile
===================================================================
--- haiku/trunk/src/apps/cdplayer/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/apps/cdplayer/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -13,6 +13,6 @@
 	TwoStateDrawButton.cpp
 	VolumeSlider.cpp
 
-	: be $(SELECT_UNAME_ETC_LIB) $(NETAPI_LIB) translation textencoding 
+	: be $(TARGET_SELECT_UNAME_ETC_LIB) $(TARGET_NETAPI_LIB) translation textencoding 
 	: CDPlayer.rdef
 ;

Modified: haiku/trunk/src/apps/codycam/Jamfile
===================================================================
--- haiku/trunk/src/apps/codycam/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/apps/codycam/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -8,7 +8,7 @@
 	Settings.cpp
 	SettingsHandler.cpp
 	VideoConsumer.cpp
-	: be media translation $(NETAPI_LIB) $(TARGET_LIBSTDC++)
+	: be media translation $(TARGET_NETAPI_LIB) $(TARGET_LIBSTDC++)
 	: CodyCam.rdef
 ;
 

Modified: haiku/trunk/src/apps/networkstatus/Jamfile
===================================================================
--- haiku/trunk/src/apps/networkstatus/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/apps/networkstatus/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -14,6 +14,6 @@
 	NetworkStatusWindow.cpp
 	NetworkStatusView.cpp
 	NetworkStatus.cpp
-	: be $(icon_libs) $(NETWORK_LIBS)
+	: be $(icon_libs) $(TARGET_NETWORK_LIBS)
 	: NetworkStatus.rdef NetworkStatusIcons.rdef
 	;

Modified: haiku/trunk/src/bin/bash/Jamfile
===================================================================
--- haiku/trunk/src/bin/bash/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/bin/bash/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -64,7 +64,7 @@
 	list.c stringlib.c locale.c findcmd.c redir.c
 	pcomplete.c pcomplib.c syntax.c xmalloc.c test.c sig.c
 	: libreadline.a <bash>libglob.a libbuiltins.a libtilde.a libsh.a
-	  libtermcap.a $(SELECT_UNAME_ETC_LIB)
+	  libtermcap.a $(TARGET_SELECT_UNAME_ETC_LIB)
 	: bash.rdef ;
 
 # trap.c includes signames.h

Modified: haiku/trunk/src/bin/coreutils/src/Jamfile
===================================================================
--- haiku/trunk/src/bin/coreutils/src/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/bin/coreutils/src/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -82,7 +82,7 @@
 	hostname.c
 	tail.c
 	uname.c
-	: libfetish.a $(SELECT_UNAME_ETC_LIB) : $(coreutils_rsrc) ;
+	: libfetish.a $(TARGET_SELECT_UNAME_ETC_LIB) : $(coreutils_rsrc) ;
 
 #commands requiring something in libroot.so (getrlimit, fchdir...)
 

Modified: haiku/trunk/src/bin/network/arp/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/arp/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/bin/network/arp/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -13,7 +13,7 @@
 
 BinCommand arp :
 	arp.cpp
-	: $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ;
+	: $(TARGET_NETWORK_LIBS) $(TARGET_SELECT_UNAME_ETC_LIB) ;
 
 # Installation -- in the test directory for the time being
 HaikuInstall install-networking

Modified: haiku/trunk/src/bin/network/ftp/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/ftp/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/bin/network/ftp/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -21,7 +21,7 @@
 	progressbar.c
 	ruserpass.c
 	util.c
-	: libedit.a libncurses.a libutil.a libbsd.so $(NETWORK_LIBS)
+	: libedit.a libncurses.a libutil.a libbsd.so $(TARGET_NETWORK_LIBS)
 ;
 
 # Installation -- in the test directory for the time being

Modified: haiku/trunk/src/bin/network/nc/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/nc/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/bin/network/nc/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -10,7 +10,7 @@
 
 BinCommand nc :
 	netcat.c
-	: $(NETWORK_LIBS)
+	: $(TARGET_NETWORK_LIBS)
 ;
 
 HaikuInstall install-networking

Modified: haiku/trunk/src/bin/network/ping/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/ping/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/bin/network/ping/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -10,7 +10,7 @@
 
 BinCommand ping :
 	ping.c
-	: $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ;
+	: $(TARGET_NETWORK_LIBS) $(TARGET_SELECT_UNAME_ETC_LIB) ;
 
 # Installation -- in the test directory for the time being
 HaikuInstall install-networking

Modified: haiku/trunk/src/bin/network/tcpdump/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/tcpdump/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/bin/network/tcpdump/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -124,7 +124,7 @@
 	tcpdump.c
 	util.c
 	version.c
-	: libpcap.a $(NETWORK_LIBS)
+	: libpcap.a $(TARGET_NETWORK_LIBS)
 ;
 
 SubInclude HAIKU_TOP src bin network tcpdump libpcap ;

Modified: haiku/trunk/src/bin/network/telnet/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/telnet/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/bin/network/telnet/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -20,5 +20,5 @@
 	telnet.c
 	terminal.c
 	utilities.c
-	: libtermcap.a libncurses.a libtelnet.a libutil.a libbsd.so $(NETWORK_LIBS)
+	: libtermcap.a libncurses.a libtelnet.a libutil.a libbsd.so $(TARGET_NETWORK_LIBS)
 ;

Modified: haiku/trunk/src/bin/network/telnetd/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/telnetd/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/bin/network/telnetd/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -18,5 +18,5 @@
 	telnetd.c
 	termstat.c
 	utility.c
-	: libtermcap.a libtelnet.a libutil.a libbsd.so $(NETWORK_LIBS)
+	: libtermcap.a libtelnet.a libutil.a libbsd.so $(TARGET_NETWORK_LIBS)
 ;

Modified: haiku/trunk/src/bin/network/traceroute/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/traceroute/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/bin/network/traceroute/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -21,7 +21,7 @@
 	ifaddrlist.c
 	traceroute.c
 	version.c
-	: $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ;
+	: $(TARGET_NETWORK_LIBS) $(TARGET_SELECT_UNAME_ETC_LIB) ;
 
 # Installation -- in the test directory for the time being
 HaikuInstall install-networking

Modified: haiku/trunk/src/bin/network/wget/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/wget/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/bin/network/wget/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -39,5 +39,5 @@
 	utils.c
 	version.c
 	xmalloc.c
-	: $(NETWORK_LIBS)
+	: $(TARGET_NETWORK_LIBS)
 ;

Modified: haiku/trunk/src/bin/sharutils/src/Jamfile
===================================================================
--- haiku/trunk/src/bin/sharutils/src/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/bin/sharutils/src/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -9,7 +9,7 @@
 
 BinCommand shar : 
   	shar.c encode.c 
-  	: libsharutils.a $(SELECT_UNAME_ETC_LIB)
+  	: libsharutils.a $(TARGET_SELECT_UNAME_ETC_LIB)
   	: sharutils.rsrc ;
 
 BinCommand unshar : 

Modified: haiku/trunk/src/bin/tar/src/Jamfile
===================================================================
--- haiku/trunk/src/bin/tar/src/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/bin/tar/src/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -34,5 +34,5 @@
 
 BinCommand rmt :
 	rmt.c
-	: libtar.a $(NETWORK_LIBS)
+	: libtar.a $(TARGET_NETWORK_LIBS)
 	: tar.rsrc ;

Modified: haiku/trunk/src/bin/vim/src/Jamfile
===================================================================
--- haiku/trunk/src/bin/vim/src/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/bin/vim/src/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -60,7 +60,7 @@
 	os_beos.c
 	version.c
 	pathdef.c
-	: be libtermcap.a $(SELECT_UNAME_ETC_LIB)
+	: be libtermcap.a $(TARGET_SELECT_UNAME_ETC_LIB)
 	: vim.rdef ;
 
 SEARCH on [ FGristFiles pathdef.c ] = [ FDirName $(SUBDIR) auto ] ;

Modified: haiku/trunk/src/kits/Jamfile
===================================================================
--- haiku/trunk/src/kits/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/kits/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -74,7 +74,7 @@
 	libagg.a
 
 	libbeadapter.so
-	$(NETWORK_LIBS)
+	$(TARGET_NETWORK_LIBS)
 	$(TARGET_LIBSTDC++)
 ;
 

Modified: haiku/trunk/src/kits/interface/Jamfile
===================================================================
--- haiku/trunk/src/kits/interface/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/kits/interface/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -17,7 +17,7 @@
 	SubDirC++Flags $(defines) ;
 }
 
-if ! $(HAIKU_COMPATIBLE) {
+if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 	local defines = [ FDefines COMPILE_FOR_R5 ] ;
 	SubDirCcFlags $(defines) ;
 	SubDirC++Flags $(defines) ;

Modified: haiku/trunk/src/kits/mail/Jamfile
===================================================================
--- haiku/trunk/src/kits/mail/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/kits/mail/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -47,8 +47,8 @@
 	libtextencoding.so
 	tracker
 	$(TARGET_LIBSTDC++)
-	$(NETWORK_LIBS)
-	$(SELECT_UNAME_ETC_LIB)
+	$(TARGET_NETWORK_LIBS)
+	$(TARGET_SELECT_UNAME_ETC_LIB)
 ;
 
 Package haiku-maildaemon-cvs :

Modified: haiku/trunk/src/kits/network/libnetapi/Jamfile
===================================================================
--- haiku/trunk/src/kits/network/libnetapi/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/kits/network/libnetapi/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -24,7 +24,7 @@
 
 	SharedLibrary libnetapi.so :
 		$(netapi_sources)
-		: be $(NETWORK_LIBS)
+		: be $(TARGET_NETWORK_LIBS)
 	;
 
 	# Installation -- in the test directory for the time being

Modified: haiku/trunk/src/preferences/network/Jamfile
===================================================================
--- haiku/trunk/src/preferences/network/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/preferences/network/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -8,7 +8,7 @@
 	EthernetSettingsWindow.cpp
 	EthernetSettingsView.cpp
 	EthernetSettings.cpp
-	: be root $(NETWORK_LIBS)
+	: be root $(TARGET_NETWORK_LIBS)
 	;
 
 Package haiku-networksettings :

Modified: haiku/trunk/src/servers/mail/Jamfile
===================================================================
--- haiku/trunk/src/servers/mail/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/servers/mail/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -19,7 +19,7 @@
 	main.cpp
 ;
 
-LinkAgainst mail_daemon : be libmail.so tracker $(TARGET_LIBSTDC++) $(NETWORK_LIBS) ;
+LinkAgainst mail_daemon : be libmail.so tracker $(TARGET_LIBSTDC++) $(TARGET_NETWORK_LIBS) ;
 
 Package haiku-maildaemon-cvs :
 	mail_daemon :

Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/Jamfile
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -87,5 +87,5 @@
 	  VolumeManager.cpp
 
 	: <test>UserlandFSServer
-	  $(NETWORK_LIBS)
+	  $(TARGET_NETWORK_LIBS)
 ;

Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/netfs_config/Jamfile
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/netfs_config/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/netfs_config/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -28,5 +28,5 @@
 #	  Blocker.cpp
 
 	  netfs_config.cpp
-	: be # $(NETWORK_LIBS)
+	: be # $(TARGET_NETWORK_LIBS)
 ;

Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/Jamfile
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -84,5 +84,5 @@
 	  UserSecurityContext.cpp
 	  Volume.cpp
 	  VolumeManager.cpp
-	: be $(NETWORK_LIBS)
+	: be $(TARGET_NETWORK_LIBS)
 ;

Modified: haiku/trunk/src/tests/kits/net/Jamfile
===================================================================
--- haiku/trunk/src/tests/kits/net/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/tests/kits/net/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -18,12 +18,12 @@
 #UsePrivateHeaders kernel ;
 #UseArchHeaders $(TARGET_ARCH) ;
 
-SimpleTest udp_client : udp_client.c : $(NETWORK_LIBS) ;
-SimpleTest udp_echo : udp_echo.c : $(NETWORK_LIBS) ;
-SimpleTest udp_server : udp_server.c : $(NETWORK_LIBS) ;
+SimpleTest udp_client : udp_client.c : $(TARGET_NETWORK_LIBS) ;
+SimpleTest udp_echo : udp_echo.c : $(TARGET_NETWORK_LIBS) ;
+SimpleTest udp_server : udp_server.c : $(TARGET_NETWORK_LIBS) ;
 
-SimpleTest tcp_server : tcp_server.c : $(NETWORK_LIBS) ;
-SimpleTest tcp_client : tcp_client.c : $(NETWORK_LIBS) ;
+SimpleTest tcp_server : tcp_server.c : $(TARGET_NETWORK_LIBS) ;
+SimpleTest tcp_client : tcp_client.c : $(TARGET_NETWORK_LIBS) ;
 
 SimpleTest tcp_tester :
 	tcp_tester.cpp

Modified: haiku/trunk/src/tests/kits/net/netperf/Jamfile
===================================================================
--- haiku/trunk/src/tests/kits/net/netperf/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/tests/kits/net/netperf/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -2,7 +2,7 @@
 
 Depends netperf : install_netperf_scripts ;
 
-if ! $(BONE_COMPATIBLE) {
+if ! $(TARGET_PLATFORM_BONE_COMPATIBLE) {
 	SubDirCcFlags -DBUILDING_R5_LIBNET -Dclose=closesocket ;
 }
 
@@ -24,13 +24,13 @@
 SimpleTest netperf : 
 	netperf.c
 	[ FGristFiles $(net_files:S=$(SUFOBJ)) ]
-	: $(NETWORK_LIBS)
+	: $(TARGET_NETWORK_LIBS)
 ;
 
 SimpleTest netserver : 
 	netserver.c
 	[ FGristFiles $(net_files:S=$(SUFOBJ)) ]
-	: $(NETWORK_LIBS)
+	: $(TARGET_NETWORK_LIBS)
 ;
 
 HaikuInstall install_netperf_scripts : [ FDirName $(HAIKU_TEST_DIR) kits net netperf ] :

Modified: haiku/trunk/src/tools/remote_disk_server/Jamfile
===================================================================
--- haiku/trunk/src/tools/remote_disk_server/Jamfile	2007-08-12 16:23:55 UTC (rev 21911)
+++ haiku/trunk/src/tools/remote_disk_server/Jamfile	2007-08-12 22:15:10 UTC (rev 21912)
@@ -4,5 +4,5 @@
 
 BuildPlatformMain remote_disk_server
 	: remote_disk_server.cpp
-	: $(HOST_LIBSUPC++) $(NETWORK_LIBS)
+	: $(HOST_LIBSUPC++) $(HOST_NETWORK_LIBS)
 ;



From mmlr at mail.berlios.de  Mon Aug 13 00:27:26 2007
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Mon, 13 Aug 2007 00:27:26 +0200
Subject: [Haiku-commits] r21913 - haiku/trunk/src/kits/app
Message-ID: <200708122227.l7CMRQaF008919@sheep.berlios.de>

Author: mmlr
Date: 2007-08-13 00:27:25 +0200 (Mon, 13 Aug 2007)
New Revision: 21913
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21913&view=rev

Modified:
   haiku/trunk/src/kits/app/MessageAdapter.cpp
Log:
Use swap_data() when unflattening a swapped message. It fits this purpose perfectly as it does conversion based on the type code. Now known type like B_INT32_TYPE will get swapped automatically.

Modified: haiku/trunk/src/kits/app/MessageAdapter.cpp
===================================================================
--- haiku/trunk/src/kits/app/MessageAdapter.cpp	2007-08-12 22:15:10 UTC (rev 21912)
+++ haiku/trunk/src/kits/app/MessageAdapter.cpp	2007-08-12 22:27:25 UTC (rev 21913)
@@ -594,25 +594,13 @@
 		if (fixedSize)
 			itemSize = dataSize / itemCount;
 
-		if (fixedSize) {
+		if (format == MESSAGE_FORMAT_R5) {
 			for (int32 i = 0; i < itemCount; i++) {
-				// ToDo: what if we are swapped? need B_INT32_TYPEs and the
-				// like be swapped here?
-				result = into->AddData(nameBuffer, type, pointer, itemSize,
-					fixedSize, itemCount);
-
-				if (result < B_OK) {
-					free(buffer);
-					return result;
+				if (!fixedSize) {
+					itemSize = *(ssize_t *)pointer;
+					pointer += sizeof(ssize_t);
 				}
 
-				pointer += itemSize;
-			}
-		} else if (format == MESSAGE_FORMAT_R5_SWAPPED) {
-			for (int32 i = 0; i < itemCount; i++) {
-				itemSize = __swap_int32(*(ssize_t *)pointer);
-				pointer += sizeof(ssize_t);
-
 				result = into->AddData(nameBuffer, type, pointer, itemSize,
 					fixedSize, itemCount);
 
@@ -621,13 +609,19 @@
 					return result;
 				}
 
-				pointer += pad_to_8(itemSize + sizeof(ssize_t)) - sizeof(ssize_t);
+				if (fixedSize)
+					pointer += itemSize;
+				else
+					pointer += pad_to_8(itemSize + sizeof(ssize_t)) - sizeof(ssize_t);
 			}
 		} else {
 			for (int32 i = 0; i < itemCount; i++) {
-				itemSize = *(ssize_t *)pointer;
-				pointer += sizeof(ssize_t);
+				if (!fixedSize) {
+					itemSize = __swap_int32(*(ssize_t *)pointer);
+					pointer += sizeof(ssize_t);
+				}
 
+				swap_data(type, pointer, itemSize, B_SWAP_ALWAYS);
 				result = into->AddData(nameBuffer, type, pointer, itemSize,
 					fixedSize, itemCount);
 
@@ -636,7 +630,10 @@
 					return result;
 				}
 
-				pointer += pad_to_8(itemSize + sizeof(ssize_t)) - sizeof(ssize_t);
+				if (fixedSize)
+					pointer += itemSize;
+				else
+					pointer += pad_to_8(itemSize + sizeof(ssize_t)) - sizeof(ssize_t);
 			}
 		}
 



From bonefish at mail.berlios.de  Mon Aug 13 00:32:32 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Mon, 13 Aug 2007 00:32:32 +0200
Subject: [Haiku-commits] r21914 - haiku/trunk/src/system/kernel/vm
Message-ID: <200708122232.l7CMWWVp013213@sheep.berlios.de>

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

Modified:
   haiku/trunk/src/system/kernel/vm/vm.cpp
Log:
map_backing_store() would deadlock in error case for REGION_PRIVATE_MAP.
Closes #1379.


Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-12 22:27:25 UTC (rev 21913)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-12 22:32:23 UTC (rev 21914)
@@ -1000,6 +1000,7 @@
 
 /*! You need to hold the lock of the cache and the write lock of the address
 	space when calling this function.
+	Note, that in case of error your cache will be temporarily unlocked.
 */
 static status_t
 map_backing_store(vm_address_space *addressSpace, vm_cache *cache,
@@ -1022,6 +1023,7 @@
 
 	// if this is a private map, we need to create a new cache & store object
 	// pair to handle the private copies of pages as they are written to
+	vm_cache* sourceCache = cache;
 	if (mapping == REGION_PRIVATE_MAP) {
 		vm_cache *newCache;
 		vm_store *newStore;
@@ -1091,9 +1093,13 @@
 
 err2:
 	if (mapping == REGION_PRIVATE_MAP) {
-		// we created this cache, so we must delete it again
+		// We created this cache, so we must delete it again. Note, that we
+		// need to temporarily unlock the source cache or we'll otherwise
+		// deadlock, since vm_cache_remove_consumer will try to lock it too.
 		mutex_unlock(&cache->lock);
+		mutex_unlock(&sourceCache->lock);
 		vm_cache_release_ref(cache);
+		mutex_lock(&sourceCache->lock);
 	}
 err1:
 	free(area->name);



From bonefish at mail.berlios.de  Mon Aug 13 01:49:39 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Mon, 13 Aug 2007 01:49:39 +0200
Subject: [Haiku-commits] r21915 - haiku/trunk/src/servers/debug
Message-ID: <200708122349.l7CNndda028697@sheep.berlios.de>

Author: bonefish
Date: 2007-08-13 01:49:38 +0200 (Mon, 13 Aug 2007)
New Revision: 21915
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21915&view=rev

Modified:
   haiku/trunk/src/servers/debug/DebugServer.cpp
Log:
Always allow debugging a team, even if it wasn't possible to get its
executable path. It seems, gdb doesn't produce very helpful stack traces
then, though.


Modified: haiku/trunk/src/servers/debug/DebugServer.cpp
===================================================================
--- haiku/trunk/src/servers/debug/DebugServer.cpp	2007-08-12 22:32:23 UTC (rev 21914)
+++ haiku/trunk/src/servers/debug/DebugServer.cpp	2007-08-12 23:49:38 UTC (rev 21915)
@@ -441,7 +441,7 @@
 
 	// prepare the argument vector
 	char teamString[32];
-	snprintf(teamString, sizeof(teamString), "%ld", fTeam);
+	snprintf(teamString, sizeof(teamString), "--pid=%ld", fTeam);
 
 	const char *terminal = (debugInConsoled ? kConsoledPath : kTerminalPath);
 
@@ -459,8 +459,9 @@
 	}
 
 	argv[argc++] = kGDBPath;
-	argv[argc++] = fExecutablePath;
 	argv[argc++] = teamString;
+	if (strlen(fExecutablePath) > 0)
+		argv[argc++] = fExecutablePath;
 	argv[argc] = NULL;
 
 	// start the terminal
@@ -553,10 +554,9 @@
 	// ask the user whether to debug or kill the team
 	if (_IsGUIServer()) {
 		// App server, input server, or registrar. We always debug those.
-		kill = !(strlen(fExecutablePath) > 0);
+		kill = false;
 	} else if (USE_GUI && _AreGUIServersAlive() && _InitGUI() == B_OK) {
-		// normal app
-
+		// normal app -- tell the user
 		_NotifyAppServer(fTeam);
 
 		char buffer[1024];
@@ -564,18 +564,10 @@
 			"has encountered an error which prevents it from continuing. Haiku "
 			"will terminate the application and clean up.", fTeamInfo.args);
 
-		if (strlen(fExecutablePath) > 0) {
-			// we have a usable path, so we can debug the team
-			BAlert *alert = new BAlert(NULL, buffer, "Debug", "OK", NULL,
-				B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-			int32 result = alert->Go();
-			kill = (result == 1);
-		} else {
-			// no usable path
-			BAlert *alert = new BAlert(NULL, buffer, "OK", NULL, NULL,
-				B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-			alert->Go();
-		}
+		BAlert *alert = new BAlert(NULL, buffer, "Debug", "OK", NULL,
+			B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+		int32 result = alert->Go();
+		kill = (result == 1);
 	}
 
 	return kill;



From bonefish at mail.berlios.de  Mon Aug 13 01:53:48 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Mon, 13 Aug 2007 01:53:48 +0200
Subject: [Haiku-commits] r21916 -
	haiku/trunk/src/add-ons/kernel/partitioning_systems/intel
Message-ID: <200708122353.l7CNrmh4028927@sheep.berlios.de>

Author: bonefish
Date: 2007-08-13 01:53:47 +0200 (Mon, 13 Aug 2007)
New Revision: 21916
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21916&view=rev

Modified:
   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/intel.cpp
Log:
* Small readability changes to the supported types functions.
* Moved the module definition to the end of the source file, so that the
  lengthy prototype could be be removed.
* Fixed the *_supports_initializing() hooks.


Modified: haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp	2007-08-12 23:49:38 UTC (rev 21915)
+++ haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp	2007-08-12 23:53:47 UTC (rev 21916)
@@ -240,17 +240,18 @@
 /*!
 	\brief Finds next supported partition.
 */
-void
+bool
 PartitionType::FindNext()
 {
 	for (int32 i = 0; kPartitionTypes[i].name; i++) {
 		if (fType < kPartitionTypes[i].type) {
 			fType = kPartitionTypes[i].type;
 			fValid = true;
-			return;
+			return true;
 		}
 	}
 	fValid = false;
+	return false;
 }
 
 

Modified: haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h	2007-08-12 23:49:38 UTC (rev 21915)
+++ haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h	2007-08-12 23:53:47 UTC (rev 21916)
@@ -110,7 +110,7 @@
 	bool IsExtended() const	{ return is_extended_type(fType); }
 
 	uint8 Type() const		{ return fType; }
-	void FindNext();
+	bool FindNext();
 	void GetTypeString(char *buffer) const
 		{ get_partition_type_string(fType, buffer); }
 private:

Modified: haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/intel.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/intel.cpp	2007-08-12 23:49:38 UTC (rev 21915)
+++ haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/intel.cpp	2007-08-12 23:53:47 UTC (rev 21916)
@@ -65,8 +65,6 @@
 };
 
 
-#ifndef _BOOT_MODE
-
 // Maximal size of move buffer (in sectors).
 static const int32 MAX_MOVE_BUFFER = 2 * 1024 * 4;
 
@@ -91,331 +89,12 @@
 		PartitionPosition *positions);
 
 
-#endif	//!_BOOT_MODE
-
-
-// #pragma mark - Intel Partition Map Module
-
-
-// module
-static status_t pm_std_ops(int32 op, ...);
-
-// scanning
-static float pm_identify_partition(int fd, partition_data *partition,
-								   void **cookie);
-static status_t pm_scan_partition(int fd, partition_data *partition,
-								  void *cookie);
-static void pm_free_identify_partition_cookie(partition_data *partition,
-											  void *cookie);
-static void pm_free_partition_cookie(partition_data *partition);
-static void pm_free_partition_content_cookie(partition_data *partition);
-
-#ifndef _BOOT_MODE
-// querying
-static bool pm_supports_resizing(partition_data *partition);
-static bool pm_supports_resizing_child(partition_data *partition,
-									   partition_data *child);
-static bool pm_supports_moving(partition_data *partition, bool *isNoOp);
-static bool pm_supports_moving_child(partition_data *partition,
-									 partition_data *child);
-static bool pm_supports_setting_name(partition_data *partition);
-static bool pm_supports_setting_content_name(partition_data *partition);
-static bool pm_supports_setting_type(partition_data *partition);
-static bool pm_supports_initializing(partition_data *partition);
-static bool pm_supports_creating_child(partition_data *partition);
-static bool pm_supports_deleting_child(partition_data *partition,
-									   partition_data *child);
-static bool pm_is_sub_system_for(partition_data *partition);
-
-static bool pm_validate_resize(partition_data *partition, off_t *size);
-static bool pm_validate_resize_child(partition_data *partition,
-									 partition_data *child, off_t *size);
-static bool pm_validate_move(partition_data *partition, off_t *start);
-static bool pm_validate_move_child(partition_data *partition,
-								   partition_data *child, off_t *start);
-static bool pm_validate_set_type(partition_data *partition, const char *type);
-static bool pm_validate_initialize(partition_data *partition,
-								   char *name, const char *parameters);
-static bool pm_validate_create_child(partition_data *partition,
-									 off_t *start, off_t *size,
-									 const char *type, const char *parameters,
-									 int32 *index);
 static status_t pm_get_partitionable_spaces(partition_data *partition,
-											partitionable_space_data *buffer,
-											int32 count, int32 *actualCount);
-static status_t pm_get_next_supported_type(partition_data *partition,
-										   int32 *cookie, char *type);
-static status_t get_type_for_content_type(const char *contentType,
-										  char *type);
-
-// shadow partition modification
-static status_t pm_shadow_changed(partition_data *partition, uint32 operation);
-
-// writing
-static status_t pm_resize(int fd, partition_id partition, off_t size,
-						  disk_job_id job);
-static status_t pm_resize_child(int fd, partition_id partition, off_t size,
-								disk_job_id job);
-static status_t pm_move(int fd, partition_id partition, off_t offset,
-						disk_job_id job);
-static status_t pm_move_child(int fd, partition_id partition, partition_id child,
-							  off_t offset, disk_job_id job);
-static status_t pm_set_type(int fd, partition_id partition, const char *type,
-							disk_job_id job);
-static status_t pm_initialize(int fd, partition_id partition, const char *name,
-							  const char *parameters, disk_job_id job);
-static status_t pm_create_child(int fd, partition_id partition, off_t offset,
-								off_t size, const char *type,
-								const char *parameters, disk_job_id job,
-								partition_id *childID);
-static status_t pm_delete_child(int fd, partition_id partition,
-								partition_id child, disk_job_id job);
-
-#endif
-
-#ifdef _BOOT_MODE
-partition_module_info gIntelPartitionMapModule =
-#else
-static partition_module_info intel_partition_map_module =
-#endif
-{
-	{
-		INTEL_PARTITION_MODULE_NAME,
-		0,
-		pm_std_ops
-	},
-	INTEL_PARTITION_NAME,				// pretty_name
-	0,									// flags
-
-	// scanning
-	pm_identify_partition,				// identify_partition
-	pm_scan_partition,					// scan_partition
-	pm_free_identify_partition_cookie,	// free_identify_partition_cookie
-	pm_free_partition_cookie,			// free_partition_cookie
-	pm_free_partition_content_cookie,	// free_partition_content_cookie
-
-#ifndef _BOOT_MODE
-	// querying
-	NULL,								// supports_repairing
-	pm_supports_resizing,				// supports_resizing
-	pm_supports_resizing_child,			// supports_resizing_child
-	pm_supports_moving,					// supports_moving
-	pm_supports_moving_child,			// supports_moving_child
-	pm_supports_setting_name,			// supports_setting_name
-	pm_supports_setting_content_name,	// supports_setting_content_name
-	pm_supports_setting_type,			// supports_setting_type
-	NULL,								// supports_setting_parameters
-	NULL,								// supports_setting_content_parameters
-	pm_supports_initializing,			// supports_initializing
-	NULL,								// supports_initializing_child
-	pm_supports_creating_child,			// supports_creating_child
-	pm_supports_deleting_child,			// supports_deleting_child
-	pm_is_sub_system_for,				// is_sub_system_for
-
-	pm_validate_resize,					// validate_resize
-	pm_validate_resize_child,			// validate_resize_child
-	pm_validate_move,					// validate_move
-	pm_validate_move_child,				// validate_move_child
-	NULL,								// validate_set_name
-	NULL,								// validate_set_content_name
-	pm_validate_set_type,				// validate_set_type
-	NULL,								// validate_set_parameters
-	NULL,								// validate_set_content_parameters
-	pm_validate_initialize,				// validate_initialize
-	pm_validate_create_child,			// validate_create_child
-	pm_get_partitionable_spaces,		// get_partitionable_spaces
-	pm_get_next_supported_type,			// get_next_supported_type
-	get_type_for_content_type,			// get_type_for_content_type
-
-	// shadow partition modification
-	pm_shadow_changed,					// shadow_changed
-
-	// writing
-	NULL,								// repair
-	pm_resize,							// resize
-	pm_resize_child,					// resize_child
-	pm_move,							// move
-	pm_move_child,						// move_child
-	NULL,								// set_name
-	NULL,								// set_content_name
-	pm_set_type,						// set_type
-	NULL,								// set_parameters
-	NULL,								// set_content_parameters
-	pm_initialize,						// initialize
-	pm_create_child,					// create_child
-	pm_delete_child,					// delete_child
-#else
-	NULL
-#endif	// _BOOT_MODE
-};
-
-
-// #pragma mark - Intel Extended Partition Module
-
-
-// module
-static status_t ep_std_ops(int32 op, ...);
-
-// scanning
-static float ep_identify_partition(int fd, partition_data *partition,
-		void **cookie);
-static status_t ep_scan_partition(int fd, partition_data *partition,
-		void *cookie);
-static void ep_free_identify_partition_cookie(partition_data *partition,
-		void *cookie);
-static void ep_free_partition_cookie(partition_data *partition);
-static void ep_free_partition_content_cookie(partition_data *partition);
-
-#ifndef _BOOT_MODE
-// querying
-static bool ep_supports_resizing(partition_data *partition);
-static bool ep_supports_resizing_child(partition_data *partition,
-									   partition_data *child);
-static bool ep_supports_moving(partition_data *partition, bool *isNoOp);
-static bool ep_supports_moving_child(partition_data *partition,
-									 partition_data *child);
-static bool ep_supports_setting_name(partition_data *partition);
-static bool ep_supports_setting_content_name(partition_data *partition);
-static bool ep_supports_setting_type(partition_data *partition);
-static bool ep_supports_initializing(partition_data *partition);
-static bool ep_supports_creating_child(partition_data *partition);
-static bool ep_supports_deleting_child(partition_data *partition,
-									   partition_data *child);
-static bool ep_is_sub_system_for(partition_data *partition);
-
-static bool ep_validate_resize(partition_data *partition, off_t *size);
-static bool ep_validate_resize_child(partition_data *partition,
-									 partition_data *child, off_t *size);
-static bool ep_validate_move(partition_data *partition, off_t *start);
-static bool ep_validate_move_child(partition_data *partition,
-								   partition_data *child, off_t *start);
-static bool ep_validate_set_type(partition_data *partition, const char *type);
-static bool ep_validate_initialize(partition_data *partition,
-								   char *name, const char *parameters);
-static bool ep_validate_create_child(partition_data *partition,
-									 off_t *start, off_t *size,
-									 const char *type, const char *parameters,
-									 int32 *index);
+	partitionable_space_data *buffer, int32 count, int32 *actualCount);
 static status_t ep_get_partitionable_spaces(partition_data *partition,
-											partitionable_space_data *buffer,
-											int32 count, int32 *actualCount);
-static status_t ep_get_next_supported_type(partition_data *partition,
-										   int32 *cookie, char *type);
+	partitionable_space_data *buffer, int32 count, int32 *actualCount);
 
-// shadow partition modification
-static status_t ep_shadow_changed(partition_data *partition, uint32 operation);
 
-// writing
-static status_t ep_resize(int fd, partition_id partition, off_t size,
-						  disk_job_id job);
-static status_t ep_resize_child(int fd, partition_id partition, off_t size,
-								disk_job_id job);
-static status_t ep_move(int fd, partition_id partition, off_t offset,
-						disk_job_id job);
-static status_t ep_move_child(int fd, partition_id partition, partition_id child,
-							  off_t offset, disk_job_id job);
-static status_t ep_set_type(int fd, partition_id partition, const char *type,
-							disk_job_id job);
-static status_t ep_initialize(int fd, partition_id partition, const char *name,
-							  const char *parameters, disk_job_id job);
-static status_t ep_create_child(int fd, partition_id partition, off_t offset,
-								off_t size, const char *type,
-								const char *parameters, disk_job_id job,
-								partition_id *childID);
-static status_t ep_delete_child(int fd, partition_id partition,
-								partition_id child, disk_job_id job);
-
-#endif
-
-
-#ifdef _BOOT_MODE
-partition_module_info gIntelExtendedPartitionModule =
-#else
-static partition_module_info intel_extended_partition_module =
-#endif
-{
-	{
-		INTEL_EXTENDED_PARTITION_MODULE_NAME,
-		0,
-		ep_std_ops
-	},
-	INTEL_EXTENDED_PARTITION_NAME,		// pretty_name
-	0,									// flags
-
-	// scanning
-	ep_identify_partition,				// identify_partition
-	ep_scan_partition,					// scan_partition
-	ep_free_identify_partition_cookie,	// free_identify_partition_cookie
-	ep_free_partition_cookie,			// free_partition_cookie
-	ep_free_partition_content_cookie,	// free_partition_content_cookie
-
-#ifndef _BOOT_MODE
-	// querying
-	NULL,								// supports_repairing
-	ep_supports_resizing,				// supports_resizing
-	ep_supports_resizing_child,			// supports_resizing_child
-	ep_supports_moving,					// supports_moving
-	ep_supports_moving_child,			// supports_moving_child
-	ep_supports_setting_name,			// supports_setting_name
-	ep_supports_setting_content_name,	// supports_setting_content_name
-	ep_supports_setting_type,			// supports_setting_type
-	NULL,								// supports_setting_parameters
-	NULL,								// supports_setting_content_parameters
-	ep_supports_initializing,			// supports_initializing
-	NULL,								// supports_initializing_child
-	ep_supports_creating_child,			// supports_creating_child
-	ep_supports_deleting_child,			// supports_deleting_child
-	ep_is_sub_system_for,				// is_sub_system_for
-
-	ep_validate_resize,					// validate_resize
-	ep_validate_resize_child,			// validate_resize_child
-	ep_validate_move,					// validate_move
-	ep_validate_move_child,				// validate_move_child
-	NULL,								// validate_set_name
-	NULL,								// validate_set_content_name
-	ep_validate_set_type,				// validate_set_type
-	NULL,								// validate_set_parameters
-	NULL,								// validate_set_content_parameters
-	ep_validate_initialize,				// validate_initialize
-	ep_validate_create_child,			// validate_create_child
-	ep_get_partitionable_spaces,		// get_partitionable_spaces
-	ep_get_next_supported_type,			// get_next_supported_type
-	get_type_for_content_type,			// get_type_for_content_type
-
-	// shadow partition modification
-	ep_shadow_changed,					// shadow_changed
-
-	// writing
-	NULL,								// repair
-	ep_resize,							// resize
-	ep_resize_child,					// resize_child
-	ep_move,							// move
-	ep_move_child,						// move_child
-	NULL,								// set_name
-	NULL,								// set_content_name
-	ep_set_type,						// set_type
-	NULL,								// set_parameters
-	NULL,								// set_content_parameters
-	ep_initialize,						// initialize
-	ep_create_child,					// create_child
-	ep_delete_child,					// delete_child
-#else	// _BOOT_MODE
-	NULL
-#endif	// _BOOT_MODE
-};
-
-
-#ifndef _BOOT_MODE
-extern "C" partition_module_info *modules[];
-_EXPORT partition_module_info *modules[] =
-{
-	&intel_partition_map_module,
-	&intel_extended_partition_module,
-	NULL
-};
-#endif
-
-
 // #pragma mark - Intel Partition Map Module
 
 
@@ -674,10 +353,7 @@
 		partition->child_count == 0,
 		partition->content_cookie == NULL));
 
-	return (partition
-		&& !partition->content_type
-		&& partition->child_count == 0
-		&& partition->content_cookie == NULL);
+	return true;
 }
 
 // pm_supports_creating_child
@@ -1298,31 +974,38 @@
 
 // pm_get_next_supported_type
 static status_t
-pm_get_next_supported_type(partition_data *partition, int32 *cookie, char *type)
+pm_get_next_supported_type(partition_data *partition, int32 *cookie,
+	char *_type)
 {
 	TRACE(("intel: pm_get_next_supported_type\n"));
 	
 	if (!partition || !partition->content_type
 		|| strcmp(partition->content_type, kPartitionTypeIntel)
-		|| !cookie || !type) {
+		|| !cookie || !_type) {
 		return B_BAD_VALUE;
 	}
 
+	if (*cookie > 255)
+		return B_ENTRY_NOT_FOUND;
 	if (*cookie < 1)
 		*cookie = 1;
-	else if (*cookie > 255)
-		return B_BAD_INDEX;
 
-	// finding out supported type
+	uint8 type = *cookie;
+
+	// get type
 	PartitionType ptype;
-	ptype.SetType(*cookie);
+	ptype.SetType(type);
 	if (!ptype.IsValid())
-		ptype.FindNext();
-	if (!ptype.IsValid())
-		return B_BAD_INDEX;
+		return B_ENTRY_NOT_FOUND;
 
-	ptype.GetTypeString(type);
-	*cookie = ptype.Type();
+	ptype.GetTypeString(_type);
+
+	// find next type
+	if (ptype.FindNext())
+		*cookie = ptype.Type();
+	else
+		*cookie = 256;
+
 	return B_OK;
 }
 
@@ -2115,14 +1798,22 @@
 static bool
 ep_supports_initializing(partition_data *partition)
 {
-	TRACE(("intel: ep_supports_initializing(%ld: %lld, %lld, %ld, %s)\n",
-		partition->id, partition->offset, partition->size,
-		partition->block_size, partition->content_type));
-	
-	return (partition
-		&& !partition->content_type
-		&& partition->child_count == 0
-		&& partition->content_cookie == NULL);
+//	TRACE(("intel: ep_supports_initializing(%ld: %lld, %lld, %ld, %s)\n",
+//		partition->id, partition->offset, partition->size,
+//		partition->block_size, partition->content_type));
+
+	if (!partition)
+		return true;
+
+	if (partition_data* parent = get_parent_partition(partition->id)) {
+		if (partition->type
+			&& strcmp(partition->type, kPartitionTypeIntelExtended) == 0
+			&& strcmp(parent->content_type, kPartitionTypeIntel) == 0) {
+			return true;
+		}
+	}
+
+	return false;
 }
 
 // ep_supports_creating_child
@@ -2346,33 +2037,41 @@
 
 // ep_get_next_supported_type
 static status_t
-ep_get_next_supported_type(partition_data *partition, int32 *cookie, char *type)
+ep_get_next_supported_type(partition_data *partition, int32 *cookie,
+	char *_type)
 {
 	TRACE(("intel: ep_get_next_supported_type\n"));
 	
 	if (!partition || !partition->content_type
 		|| strcmp(partition->content_type, kPartitionTypeIntelExtended)
-		|| !cookie || !type) {
+		|| !cookie || !_type) {
 		return B_BAD_VALUE;
 	}
 
+	if (*cookie > 255)
+		return B_ENTRY_NOT_FOUND;
 	if (*cookie < 1)
 		*cookie = 1;
-	else if (*cookie > 255)
-		return B_BAD_INDEX;
 
-	// finding out supported type
+	uint8 type = *cookie;
+
+	// get type
 	PartitionType ptype;
-	ptype.SetType(*cookie);
-	if (!ptype.IsValid())
+	ptype.SetType(type);
+	while (ptype.IsValid() && !ptype.IsExtended())
 		ptype.FindNext();
-	while (ptype.IsValid() && ptype.IsExtended())
-		ptype.FindNext();
+
 	if (!ptype.IsValid())
-		return B_BAD_INDEX;
+		return B_ENTRY_NOT_FOUND;
 
-	ptype.GetTypeString(type);
-	*cookie = ptype.Type();
+	ptype.GetTypeString(_type);
+
+	// find next type
+	if (ptype.FindNext())
+		*cookie = ptype.Type();
+	else
+		*cookie = 256;
+
 	return B_OK;
 }
 
@@ -2866,3 +2565,171 @@
 }
 
 #endif	// !_BOOT_MODE
+
+
+// #pragma mark - modules
+
+
+#ifdef _BOOT_MODE
+partition_module_info gIntelPartitionMapModule =
+#else
+static partition_module_info intel_partition_map_module =
+#endif
+{
+	{
+		INTEL_PARTITION_MODULE_NAME,
+		0,
+		pm_std_ops
+	},
+	INTEL_PARTITION_NAME,				// pretty_name
+	0,									// flags
+
+	// scanning
+	pm_identify_partition,				// identify_partition
+	pm_scan_partition,					// scan_partition
+	pm_free_identify_partition_cookie,	// free_identify_partition_cookie
+	pm_free_partition_cookie,			// free_partition_cookie
+	pm_free_partition_content_cookie,	// free_partition_content_cookie
+
+#ifndef _BOOT_MODE
+	// querying
+	NULL,								// supports_repairing
+	pm_supports_resizing,				// supports_resizing
+	pm_supports_resizing_child,			// supports_resizing_child
+	pm_supports_moving,					// supports_moving
+	pm_supports_moving_child,			// supports_moving_child
+	pm_supports_setting_name,			// supports_setting_name
+	pm_supports_setting_content_name,	// supports_setting_content_name
+	pm_supports_setting_type,			// supports_setting_type
+	NULL,								// supports_setting_parameters
+	NULL,								// supports_setting_content_parameters
+	pm_supports_initializing,			// supports_initializing
+	NULL,								// supports_initializing_child
+	pm_supports_creating_child,			// supports_creating_child
+	pm_supports_deleting_child,			// supports_deleting_child
+	pm_is_sub_system_for,				// is_sub_system_for
+
+	pm_validate_resize,					// validate_resize
+	pm_validate_resize_child,			// validate_resize_child
+	pm_validate_move,					// validate_move
+	pm_validate_move_child,				// validate_move_child
+	NULL,								// validate_set_name
+	NULL,								// validate_set_content_name
+	pm_validate_set_type,				// validate_set_type
+	NULL,								// validate_set_parameters
+	NULL,								// validate_set_content_parameters
+	pm_validate_initialize,				// validate_initialize
+	pm_validate_create_child,			// validate_create_child
+	pm_get_partitionable_spaces,		// get_partitionable_spaces
+	pm_get_next_supported_type,			// get_next_supported_type
+	get_type_for_content_type,			// get_type_for_content_type
+
+	// shadow partition modification
+	pm_shadow_changed,					// shadow_changed
+
+	// writing
+	NULL,								// repair
+	pm_resize,							// resize
+	pm_resize_child,					// resize_child
+	pm_move,							// move
+	pm_move_child,						// move_child
+	NULL,								// set_name
+	NULL,								// set_content_name
+	pm_set_type,						// set_type
+	NULL,								// set_parameters
+	NULL,								// set_content_parameters
+	pm_initialize,						// initialize
+	pm_create_child,					// create_child
+	pm_delete_child,					// delete_child
+#else
+	NULL
+#endif	// _BOOT_MODE
+};
+
+
+#ifdef _BOOT_MODE
+partition_module_info gIntelExtendedPartitionModule =
+#else
+static partition_module_info intel_extended_partition_module =
+#endif
+{
+	{
+		INTEL_EXTENDED_PARTITION_MODULE_NAME,
+		0,
+		ep_std_ops
+	},
+	INTEL_EXTENDED_PARTITION_NAME,		// pretty_name
+	0,									// flags
+
+	// scanning
+	ep_identify_partition,				// identify_partition
+	ep_scan_partition,					// scan_partition
+	ep_free_identify_partition_cookie,	// free_identify_partition_cookie
+	ep_free_partition_cookie,			// free_partition_cookie
+	ep_free_partition_content_cookie,	// free_partition_content_cookie
+
+#ifndef _BOOT_MODE
+	// querying
+	NULL,								// supports_repairing
+	ep_supports_resizing,				// supports_resizing
+	ep_supports_resizing_child,			// supports_resizing_child
+	ep_supports_moving,					// supports_moving
+	ep_supports_moving_child,			// supports_moving_child
+	ep_supports_setting_name,			// supports_setting_name
+	ep_supports_setting_content_name,	// supports_setting_content_name
+	ep_supports_setting_type,			// supports_setting_type
+	NULL,								// supports_setting_parameters
+	NULL,								// supports_setting_content_parameters
+	ep_supports_initializing,			// supports_initializing
+	NULL,								// supports_initializing_child
+	ep_supports_creating_child,			// supports_creating_child
+	ep_supports_deleting_child,			// supports_deleting_child
+	ep_is_sub_system_for,				// is_sub_system_for
+
+	ep_validate_resize,					// validate_resize
+	ep_validate_resize_child,			// validate_resize_child
+	ep_validate_move,					// validate_move
+	ep_validate_move_child,				// validate_move_child
+	NULL,								// validate_set_name
+	NULL,								// validate_set_content_name
+	ep_validate_set_type,				// validate_set_type
+	NULL,								// validate_set_parameters
+	NULL,								// validate_set_content_parameters
+	ep_validate_initialize,				// validate_initialize
+	ep_validate_create_child,			// validate_create_child
+	ep_get_partitionable_spaces,		// get_partitionable_spaces
+	ep_get_next_supported_type,			// get_next_supported_type
+	get_type_for_content_type,			// get_type_for_content_type
+
+	// shadow partition modification
+	ep_shadow_changed,					// shadow_changed
+
+	// writing
+	NULL,								// repair
+	ep_resize,							// resize
+	ep_resize_child,					// resize_child
+	ep_move,							// move
+	ep_move_child,						// move_child
+	NULL,								// set_name
+	NULL,								// set_content_name
+	ep_set_type,						// set_type
+	NULL,								// set_parameters
+	NULL,								// set_content_parameters
+	ep_initialize,						// initialize
+	ep_create_child,					// create_child
+	ep_delete_child,					// delete_child
+#else	// _BOOT_MODE
+	NULL
+#endif	// _BOOT_MODE
+};
+
+
+#ifndef _BOOT_MODE
+extern "C" partition_module_info *modules[];
+_EXPORT partition_module_info *modules[] =
+{
+	&intel_partition_map_module,
+	&intel_extended_partition_module,
+	NULL
+};
+#endif



From bonefish at mail.berlios.de  Mon Aug 13 01:54:15 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Mon, 13 Aug 2007 01:54:15 +0200
Subject: [Haiku-commits] r21917 -
	haiku/trunk/src/system/kernel/disk_device_manager
Message-ID: <200708122354.l7CNsFd8028979@sheep.berlios.de>

Author: bonefish
Date: 2007-08-13 01:54:15 +0200 (Mon, 13 Aug 2007)
New Revision: 21917
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21917&view=rev

Modified:
   haiku/trunk/src/system/kernel/disk_device_manager/KPartitioningSystem.cpp
Log:
Fixed the documentation.


Modified: haiku/trunk/src/system/kernel/disk_device_manager/KPartitioningSystem.cpp
===================================================================
--- haiku/trunk/src/system/kernel/disk_device_manager/KPartitioningSystem.cpp	2007-08-12 23:53:47 UTC (rev 21916)
+++ haiku/trunk/src/system/kernel/disk_device_manager/KPartitioningSystem.cpp	2007-08-12 23:54:15 UTC (rev 21917)
@@ -274,7 +274,9 @@
 }
 
 // SupportsInitializingChild
-//! Check whether the add-on supports initializing a child of this partition.
+/*! Check whether the child partition managed by this partitioning system can
+	be initialized with the given disk system.
+*/
 bool
 KPartitioningSystem::SupportsInitializingChild(KPartition *child,
 	const char *diskSystem)



From stefano.ceccherini at gmail.com  Mon Aug 13 08:22:29 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Mon, 13 Aug 2007 08:22:29 +0200
Subject: [Haiku-commits] r21908 -
	haiku/trunk/src/tests/kits/interface/flatten_picture
In-Reply-To: <200708121305.l7CD5OvQ028597@sheep.berlios.de>
References: <200708121305.l7CD5OvQ028597@sheep.berlios.de>
Message-ID: <894b9700708122322n76a6b0b9m45331b133cc5e2c@mail.gmail.com>

2007/8/12, laplace at BerliOS <laplace at mail.berlios.de>:

> Modified:
>    haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
> Log:
> Disabled CopyBits test. It does not work under R5 either, so I assume
> this operation is not supported when recording to a BPicture.

Yeah, well it makes sense if you think about it. It's not just
possible to record that stuff in the BPicture.


From jackburton at mail.berlios.de  Mon Aug 13 09:20:44 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Mon, 13 Aug 2007 09:20:44 +0200
Subject: [Haiku-commits] r21918 - in haiku/trunk: headers/private/interface
	src/kits/interface src/servers/app
Message-ID: <200708130720.l7D7KiJS000431@sheep.berlios.de>

Author: jackburton
Date: 2007-08-13 09:20:43 +0200 (Mon, 13 Aug 2007)
New Revision: 21918
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21918&view=rev

Modified:
   haiku/trunk/headers/private/interface/PictureDataWriter.h
   haiku/trunk/src/kits/interface/PictureDataWriter.cpp
   haiku/trunk/src/kits/interface/PicturePlayer.cpp
   haiku/trunk/src/kits/interface/View.cpp
   haiku/trunk/src/servers/app/ServerPicture.cpp
   haiku/trunk/src/servers/app/ServerPicture.h
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Implemented the following BPicture ops: fill region, stroke/fill arc, 
stroke/fill polygon, stroke/fill bezier. some work towards drawing of 
nested pictures.


Modified: haiku/trunk/headers/private/interface/PictureDataWriter.h
===================================================================
--- haiku/trunk/headers/private/interface/PictureDataWriter.h	2007-08-12 23:54:15 UTC (rev 21917)
+++ haiku/trunk/headers/private/interface/PictureDataWriter.h	2007-08-13 07:20:43 UTC (rev 21918)
@@ -36,6 +36,10 @@
 	status_t WriteDrawEllipse(const BRect &rect, const bool &fill);
 	status_t WriteDrawArc(const BPoint &center, const BPoint &radius,
 				const float &startTheta, const float &arcTheta, const bool &fill);
+	status_t WriteDrawPolygon(const int32 &numPoints, BPoint *points,
+				const bool &isClosed, const bool &fill);
+	status_t WriteDrawBezier(const BPoint points[4], const bool &fill);
+
 	status_t WriteStrokeLine(const BPoint &start, const BPoint &end);
 	
 	status_t WriteSetHighColor(const rgb_color &color);
@@ -48,7 +52,9 @@
 	status_t WriteDrawBitmap(const BRect &srcRect, const BRect &dstRect, const int32 &width, const int32 &height,
 				const int32 &bytesPerRow, const int32 &colorSpace, const int32 &flags,
 				const void *data, const int32 &length);
-	
+
+	status_t WriteDrawPicture(const BPoint &where, const int32 &token);
+
 	status_t WriteSetFontFamily(const font_family &family);
 	status_t WriteSetFontStyle(const font_style &style);
 	status_t WriteSetFontSpacing(const int32 &spacing);

Modified: haiku/trunk/src/kits/interface/PictureDataWriter.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PictureDataWriter.cpp	2007-08-12 23:54:15 UTC (rev 21917)
+++ haiku/trunk/src/kits/interface/PictureDataWriter.cpp	2007-08-13 07:20:43 UTC (rev 21918)
@@ -222,6 +222,40 @@
 
 
 status_t
+PictureDataWriter::WriteDrawPolygon(const int32 &numPoints, BPoint *points,
+				const bool &isClosed, const bool &fill)
+{
+	try {
+		BeginOp(fill ? B_PIC_FILL_POLYGON : B_PIC_STROKE_POLYGON);
+		Write<int32>(numPoints);
+		for (int32 i = 0; i < numPoints; i++)
+			Write<BPoint>(points[i]);
+		if (!fill)
+			Write<uint8>((uint8)isClosed);
+		EndOp();
+	} catch (status_t &status) {
+		return status;	
+	}
+	return B_OK;
+}
+
+
+status_t
+PictureDataWriter::WriteDrawBezier(const BPoint points[4], const bool &fill)
+{
+	try {
+		BeginOp(fill ? B_PIC_FILL_BEZIER : B_PIC_STROKE_BEZIER);
+		for (int32 i = 0; i < 4; i++)
+			Write<BPoint>(points[i]);
+		EndOp();
+	} catch (status_t &status) {
+		return status;	
+	}
+	return B_OK;
+}
+
+
+status_t
 PictureDataWriter::WriteStrokeLine(const BPoint &start, const BPoint &end)
 {
 	try {
@@ -305,6 +339,23 @@
 
 
 status_t
+PictureDataWriter::WriteDrawPicture(const BPoint &where, const int32 &token)
+{
+	// TODO: I'm not sure about this function. I think we need to attach the picture
+	// data too. The token won't be sufficient in many cases.
+	try {
+		BeginOp(B_PIC_DRAW_PICTURE);
+		Write<BPoint>(where);
+		Write<int32>(token);	
+		EndOp();
+	} catch (status_t &status) {
+		return status;
+	}
+	return B_OK;
+}
+
+
+status_t
 PictureDataWriter::WriteSetFontFamily(const font_family &family)
 {
 	/*BeginOp(B_PIC_SET_FONT_FAMILY);
@@ -493,6 +544,6 @@
 	ssize_t result = fData->Write(data, size);
 	if (result < 0)
 		THROW_ERROR(result);
-	if (result != size)
+	if ((size_t)result != size)
 		THROW_ERROR(B_IO_ERROR); 
 }

Modified: haiku/trunk/src/kits/interface/PicturePlayer.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-12 23:54:15 UTC (rev 21917)
+++ haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-13 07:20:43 UTC (rev 21918)
@@ -38,6 +38,7 @@
 typedef void (*fnc_PBRecti)(void*, const BRect*, int32);
 typedef void (*fnc_DrawPixels)(void *, BRect, BRect, int32, int32, int32,
 							   int32, int32, const void *);
+typedef void (*fnc_DrawPicture)(void *, BPoint, int32);
 typedef void (*fnc_BShape)(void*, BShape*);
 
 
@@ -230,6 +231,9 @@
 
 			case B_PIC_DRAW_PICTURE:
 			{
+				((fnc_DrawPicture)callBackTable[19])(userData,
+					*reinterpret_cast<const BPoint *>(data),
+					*reinterpret_cast<const int32 *>(data + sizeof(BPoint)));
 				break;
 			}
 			

Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2007-08-12 23:54:15 UTC (rev 21917)
+++ haiku/trunk/src/kits/interface/View.cpp	2007-08-13 07:20:43 UTC (rev 21918)
@@ -3091,7 +3091,8 @@
 } 
 
 
-void BView::BeginPicture(BPicture *picture)
+void
+BView::BeginPicture(BPicture *picture)
 {
 	if (do_owner_check() && picture && picture->usurped == NULL) {
 		picture->usurp(cpicture);

Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-12 23:54:15 UTC (rev 21917)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-13 07:20:43 UTC (rev 21918)
@@ -10,6 +10,7 @@
 
 
 #include "DrawingEngine.h"
+#include "ServerApp.h"
 #include "ServerBitmap.h"
 #include "ServerPicture.h"
 #include "ServerTokenSpace.h"
@@ -25,6 +26,7 @@
 #include <ShapePrivate.h>
 
 #include <Bitmap.h>
+#include <List.h>
 #include <Shape.h>
 
 #include <stdio.h>
@@ -108,7 +110,7 @@
 void
 ShapePainter::Draw(ViewLayer *view, BRect frame, bool filled)
 {
-	// We're going to draw the currently iterated picture.
+	// We're going to draw the currently iterated shape.
 	int32 opCount, ptCount;
 	opCount = fOpStack.size();
 	ptCount = fPtStack.size();
@@ -136,6 +138,8 @@
 	}
 }
 
+
+// drawing functions
 static void
 get_polygon_frame(const BPoint *points, int32 numPoints, BRect *_frame)
 {
@@ -406,7 +410,6 @@
 draw_pixels(ViewLayer *view, BRect src, BRect dest, int32 width, int32 height,
 				 int32 bytesPerRow, int32 pixelFormat, int32 flags, const void *data)
 {
-	// TODO: Review this
 	UtilityBitmap bitmap(BRect(0, 0, width - 1, height - 1), (color_space)pixelFormat, flags, bytesPerRow);
 	
 	if (!bitmap.IsValid())
@@ -421,6 +424,17 @@
 
 
 static void
+draw_picture(ViewLayer *view, BPoint where, int32 token)
+{
+	ServerPicture *picture = view->Window()->ServerWindow()->App()->FindPicture(token);	
+	if (picture != NULL) {
+		view->CurrentState()->SetOrigin(where);
+		picture->Play(view);
+	}
+}
+
+
+static void
 set_clipping_rects(ViewLayer *view, const BRect *rects, uint32 numRects)
 {
 	// TODO: This is too slow, we should copy the rects directly to BRegion's internal data
@@ -667,7 +681,7 @@
 	(const void *)fill_shape,
 	(const void *)draw_string,
 	(const void *)draw_pixels,
-	(const void *)reserved,	// TODO: This is probably "draw_picture". Investigate
+	(const void *)draw_picture,
 	(const void *)set_clipping_rects,
 	(const void *)clip_to_picture,
 	(const void *)push_state,
@@ -703,7 +717,9 @@
 ServerPicture::ServerPicture()
 	:
 	PictureDataWriter(),
-	fData(NULL)
+	fData(NULL),
+	fPictures(NULL),
+	fUsurped(NULL)
 {
 	fToken = gTokenSpace.NewToken(kPictureToken, this);
 	fData = new (std::nothrow) BMallocIO();
@@ -715,7 +731,9 @@
 ServerPicture::ServerPicture(const ServerPicture &picture)
 	:
 	PictureDataWriter(),
-	fData(NULL)
+	fData(NULL),
+	fPictures(NULL),
+	fUsurped(NULL)
 {
 	fToken = gTokenSpace.NewToken(kPictureToken, this);
 
@@ -738,7 +756,9 @@
 ServerPicture::ServerPicture(const char *fileName, const int32 &offset)
 	:
 	PictureDataWriter(),
-	fData(NULL)
+	fData(NULL),
+	fPictures(NULL),
+	fUsurped(NULL)
 {
 	BPrivate::Storage::OffsetFile *file =
 		new BPrivate::Storage::OffsetFile(new BFile(fileName, B_READ_WRITE), (off_t)offset);
@@ -757,6 +777,7 @@
 {
 	delete fData;
 	gTokenSpace.RemoveToken(fToken);
+	delete fPictures;
 }
 
 
@@ -800,11 +821,41 @@
 	if (mallocIO == NULL)
 		return;
 
-	PicturePlayer player(mallocIO->Buffer(), mallocIO->BufferLength(), NULL);
+	PicturePlayer player(mallocIO->Buffer(), mallocIO->BufferLength(), fPictures);
 	player.Play(const_cast<void **>(tableEntries), sizeof(tableEntries) / sizeof(void *), view);
 }
 
 
+void
+ServerPicture::Usurp(ServerPicture *picture)
+{
+	fUsurped = picture;
+}
+
+
+ServerPicture *
+ServerPicture::StepDown()
+{
+	ServerPicture *old = fUsurped;
+	fUsurped = NULL;
+	return old;
+}
+
+
+bool
+ServerPicture::NestPicture(ServerPicture *picture)
+{
+	if (fPictures == NULL)
+		fPictures = new (std::nothrow) BList;
+	
+	if (fPictures == NULL
+		|| !fPictures->AddItem(picture))
+		return false;
+
+	return true;
+}
+
+
 off_t
 ServerPicture::DataLength() const
 {

Modified: haiku/trunk/src/servers/app/ServerPicture.h
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.h	2007-08-12 23:54:15 UTC (rev 21917)
+++ haiku/trunk/src/servers/app/ServerPicture.h	2007-08-13 07:20:43 UTC (rev 21918)
@@ -12,6 +12,7 @@
 class ServerApp;
 class ViewLayer;
 class BPrivate::LinkReceiver;
+class BList;
 class ServerPicture : public PictureDataWriter {
 public:	
 		int32		Token() { return fToken; }
@@ -22,10 +23,14 @@
 		void		EnterFontChange();
 		void		ExitFontChange();
 		
-		void		SyncState(ViewLayer *view);
-		
+		void		SyncState(ViewLayer *view);	
 		void		Play(ViewLayer *view);
 		
+		void 		Usurp(ServerPicture *newPicture);
+		ServerPicture*	StepDown();		
+		
+		bool		NestPicture(ServerPicture *picture);
+
 		off_t		DataLength() const;
 		
 		status_t	ImportData(BPrivate::LinkReceiver &link);
@@ -42,6 +47,8 @@
 		int32		fToken;
 		BPositionIO	*fData;
 		// DrawState	*fState;
+		BList		*fPictures;
+		ServerPicture	*fUsurped;
 };
 
 #endif // __SERVER_PICTURE_H

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-12 23:54:15 UTC (rev 21917)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-13 07:20:43 UTC (rev 21918)
@@ -2171,14 +2171,14 @@
 		case AS_FILL_TRIANGLE:
 		{
 			DTRACE(("ServerWindow %s: Message AS_STROKE/FILL_TRIANGLE\n", Title()));
-
-			BPoint pts[3];
+ 
+ 			BPoint pts[3];
 			BRect rect;
 
-			for (int32 i = 0; i < 3; i++) {
+ 			for (int32 i = 0; i < 3; i++) {
 				link.Read<BPoint>(&(pts[i]));
 				fCurrentLayer->ConvertToScreenForDrawing(&pts[i]);
-			}
+ 			}
 
 			link.Read<BRect>(&rect);
 
@@ -2439,6 +2439,18 @@
 			break;
 		}
 		
+		case AS_FILL_REGION:
+		{
+			// There is no B_PIC_FILL_REGION op, we have to
+			// implement it using B_PIC_FILL_RECT
+			BRegion region;
+			if (link.ReadRegion(&region) < B_OK)
+				break;
+			for (int32 i = 0; i < region.CountRects(); i++)
+				picture->WriteDrawRect(region.RectAt(i), true);
+			break;
+		}
+
 		case AS_STROKE_ROUNDRECT:
 		case AS_FILL_ROUNDRECT:
 		{
@@ -2478,6 +2490,57 @@
 			break;
 		}
 
+		case AS_STROKE_TRIANGLE:
+		case AS_FILL_TRIANGLE:
+		{
+			// There is no B_PIC_FILL/STROKE_TRIANGLE op,
+			// we implement it using B_PIC_FILL/STROKE_POLYGON
+			BPoint points[3];
+			
+			for (int32 i = 0; i < 3; i++) {
+				link.Read<BPoint>(&(points[i]));
+			}
+
+			BRect rect;
+			link.Read<BRect>(&rect);
+			
+			picture->WriteDrawPolygon(3, points,
+					true, code == AS_FILL_TRIANGLE);
+			break;
+		}
+		case AS_STROKE_POLYGON:
+		case AS_FILL_POLYGON:
+		{
+			BRect polyFrame;
+			bool isClosed = true;
+			int32 pointCount;
+			const bool fill = (code == AS_FILL_POLYGON);
+			
+			link.Read<BRect>(&polyFrame);
+			if (code == AS_STROKE_POLYGON)
+				link.Read<bool>(&isClosed);
+			link.Read<int32>(&pointCount);
+
+			BPoint* pointList = new(nothrow) BPoint[pointCount];
+			if (link.Read(pointList, pointCount * sizeof(BPoint)) >= B_OK) {
+				picture->WriteDrawPolygon(pointCount, pointList,
+					isClosed && pointCount > 2, fill);
+			}
+			delete[] pointList;
+			break;
+		}
+
+		case AS_STROKE_BEZIER:
+		case AS_FILL_BEZIER:
+		{
+			BPoint points[4];
+			for (int32 i = 0; i < 4; i++) {
+				link.Read<BPoint>(&(points[i]));
+			}
+			picture->WriteDrawBezier(points, code == AS_FILL_BEZIER);
+			break;
+		}
+
 		case AS_STROKE_LINE:
 		{
 			float x1, y1, x2, y2;
@@ -2604,6 +2667,41 @@
 
 			break;
 		}
+		
+		case AS_LAYER_DRAW_PICTURE:
+		{
+			int32 token;
+			if (link.Read<int32>(&token) == B_OK) {
+				BPoint where;
+				link.Read<BPoint>(&where);
+				picture->WriteDrawPicture(where, token);
+			}
+			break;
+		}
+
+		case AS_LAYER_BEGIN_PICTURE:
+		{
+			ServerPicture *newPicture = App()->CreatePicture();
+			newPicture->Usurp(picture);			
+			newPicture->SyncState(fCurrentLayer);
+			fCurrentLayer->SetPicture(newPicture);
+						
+			break;
+		}
+		
+		case AS_LAYER_END_PICTURE:
+		{
+			ServerPicture *steppedDown = picture->StepDown();
+			if (!steppedDown)
+				return false;
+			
+			steppedDown->NestPicture(picture);
+			fCurrentLayer->SetPicture(steppedDown);
+			fLink.StartMessage(B_OK);
+			fLink.Attach<int32>(picture->Token());
+			fLink.Flush();
+			return true;
+		}
 /*
 		case AS_LAYER_SET_BLENDING_MODE:
 		{



From jackburton at mail.berlios.de  Mon Aug 13 09:38:45 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Mon, 13 Aug 2007 09:38:45 +0200
Subject: [Haiku-commits] r21919 - haiku/trunk/src/servers/app
Message-ID: <200708130738.l7D7cjA0001721@sheep.berlios.de>

Author: jackburton
Date: 2007-08-13 09:38:44 +0200 (Mon, 13 Aug 2007)
New Revision: 21919
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21919&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerPicture.cpp
Log:
Fixed drawing of arc and ellipse in a BPicture.


Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-13 07:20:43 UTC (rev 21918)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-13 07:38:44 UTC (rev 21919)
@@ -257,8 +257,8 @@
 stroke_arc(ViewLayer *view, BPoint center, BPoint radii, float startTheta,
 			   float arcTheta)
 {
-	BRect rect(center.x - radii.x, center.y - radii.y, center.x + radii.x,
-			center.y + radii.y);
+	BRect rect(center.x - radii.x, center.y - radii.y, center.x + radii.x - 1,
+			center.y + radii.y - 1);
 	view->ConvertToScreenForDrawing(&rect);
 	view->Window()->GetDrawingEngine()->DrawArc(rect, startTheta, arcTheta, false);
 }
@@ -268,8 +268,8 @@
 fill_arc(ViewLayer *view, BPoint center, BPoint radii, float startTheta,
 			 float arcTheta)
 {
-	BRect rect(center.x - radii.x, center.y - radii.y, center.x + radii.x,
-			center.y + radii.y);
+	BRect rect(center.x - radii.x, center.y - radii.y, center.x + radii.x - 1,
+			center.y + radii.y - 1);
 	view->ConvertToScreenForDrawing(&rect);
 	view->Window()->GetDrawingEngine()->DrawArc(rect, startTheta, arcTheta, true);
 }
@@ -278,8 +278,8 @@
 static void
 stroke_ellipse(ViewLayer *view, BPoint center, BPoint radii)
 {
-	BRect rect(center.x - radii.x, center.y - radii.y, center.x + radii.x,
-			center.y + radii.y);
+	BRect rect(center.x - radii.x, center.y - radii.y, center.x + radii.x - 1,
+			center.y + radii.y - 1);
 	view->ConvertToScreenForDrawing(&rect);
 	view->Window()->GetDrawingEngine()->DrawEllipse(rect, false);
 }
@@ -288,8 +288,8 @@
 static void
 fill_ellipse(ViewLayer *view, BPoint center, BPoint radii)
 {
-	BRect rect(center.x - radii.x, center.y - radii.y, center.x + radii.x,
-			center.y + radii.y);
+	BRect rect(center.x - radii.x, center.y - radii.y, center.x + radii.x - 1,
+			center.y + radii.y - 1);
 	view->ConvertToScreenForDrawing(&rect);
 	view->Window()->GetDrawingEngine()->DrawEllipse(rect, true);
 }



From jackburton at mail.berlios.de  Mon Aug 13 11:19:30 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Mon, 13 Aug 2007 11:19:30 +0200
Subject: [Haiku-commits] r21920 - haiku/trunk/src/servers/app
Message-ID: <200708130919.l7D9JU1j016287@sheep.berlios.de>

Author: jackburton
Date: 2007-08-13 11:19:30 +0200 (Mon, 13 Aug 2007)
New Revision: 21920
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21920&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerApp.cpp
   haiku/trunk/src/servers/app/ServerPicture.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Implemented drawing of pictures inside pictures. Thanks to Marc 
Flerackers for clarifying some things.



Modified: haiku/trunk/src/servers/app/ServerApp.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerApp.cpp	2007-08-13 07:38:44 UTC (rev 21919)
+++ haiku/trunk/src/servers/app/ServerApp.cpp	2007-08-13 09:19:30 UTC (rev 21920)
@@ -2675,7 +2675,7 @@
 ServerPicture *
 ServerApp::FindPicture(const int32 &token) const
 {
-	// TODO: we need to make sure the picture is ours?!
+	// TODO: we need to make sure the picture is ours?!	
 	ServerPicture* picture;
 	if (gTokenSpace.GetToken(token, kPictureToken, (void**)&picture) == B_OK)
 		return picture;

Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-13 07:38:44 UTC (rev 21919)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-13 09:19:30 UTC (rev 21920)
@@ -777,7 +777,12 @@
 {
 	delete fData;
 	gTokenSpace.RemoveToken(fToken);
-	delete fPictures;
+	
+	if (fPictures != NULL) {
+		for (int32 i = fPictures->CountItems() - 1; i >= 0; i--)
+			delete static_cast<ServerPicture *>(fPictures->ItemAtFast(i));		
+		delete fPictures;
+	}
 }
 
 

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-13 07:38:44 UTC (rev 21919)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-13 09:19:30 UTC (rev 21920)
@@ -2674,7 +2674,15 @@
 			if (link.Read<int32>(&token) == B_OK) {
 				BPoint where;
 				link.Read<BPoint>(&where);
-				picture->WriteDrawPicture(where, token);
+				
+				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
+					ServerPicture *copy = App()->CreatePicture(pictureToDraw);
+					picture->NestPicture(copy);
+					picture->WriteDrawPicture(where, copy->Token());
+				}			
 			}
 			break;
 		}
@@ -2695,7 +2703,6 @@
 			if (!steppedDown)
 				return false;
 			
-			steppedDown->NestPicture(picture);
 			fCurrentLayer->SetPicture(steppedDown);
 			fLink.StartMessage(B_OK);
 			fLink.Attach<int32>(picture->Token());



From stippi at mail.berlios.de  Mon Aug 13 11:26:27 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 13 Aug 2007 11:26:27 +0200
Subject: [Haiku-commits] r21921 - haiku/trunk/src/servers/app/drawing
Message-ID: <200708130926.l7D9QRr1016583@sheep.berlios.de>

Author: stippi
Date: 2007-08-13 11:26:27 +0200 (Mon, 13 Aug 2007)
New Revision: 21921
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21921&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
Log:
* fixed usage of hardware accelerated inverting, of course we shouldn't do it again in software after we have done it in hardware...

Modified: haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2007-08-13 09:19:30 UTC (rev 21920)
+++ haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2007-08-13 09:26:27 UTC (rev 21921)
@@ -860,14 +860,17 @@
 										  fSuspendSyncLevel == 0
 										  || cursorTouched);
 				doInSoftware = false;
-			} else if (fAvailableHWAccleration & HW_ACC_INVERT_REGION
-					   && fPainter->Pattern() == B_SOLID_HIGH
-					   && fPainter->DrawingMode() == B_OP_INVERT) {
-				r.IntersectWith(fPainter->ClippingRegion());
-				fGraphicsCard->InvertRegion(r);
 			}
 		}
 
+		if (doInSoftware && fAvailableHWAccleration & HW_ACC_INVERT_REGION
+				   && fPainter->Pattern() == B_SOLID_HIGH
+				   && fPainter->DrawingMode() == B_OP_INVERT) {
+			r.IntersectWith(fPainter->ClippingRegion());
+			fGraphicsCard->InvertRegion(r);
+			doInSoftware = false;
+		}
+
 		if (doInSoftware) {
 
 			BRect touched = fPainter->FillRect(r.RectAt(0));



From stippi at mail.berlios.de  Mon Aug 13 11:27:19 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 13 Aug 2007 11:27:19 +0200
Subject: [Haiku-commits] r21922 - haiku/trunk/src/servers/app
Message-ID: <200708130927.l7D9RJoP016651@sheep.berlios.de>

Author: stippi
Date: 2007-08-13 11:27:18 +0200 (Mon, 13 Aug 2007)
New Revision: 21922
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21922&view=rev

Modified:
   haiku/trunk/src/servers/app/DefaultDecorator.cpp
Log:
* maybe I fixed the sometimes weird decorator buttons, I have not spotted them again with this change

Modified: haiku/trunk/src/servers/app/DefaultDecorator.cpp
===================================================================
--- haiku/trunk/src/servers/app/DefaultDecorator.cpp	2007-08-13 09:26:27 UTC (rev 21921)
+++ haiku/trunk/src/servers/app/DefaultDecorator.cpp	2007-08-13 09:27:18 UTC (rev 21922)
@@ -432,6 +432,7 @@
 
 	// We need to draw a few things: the tab, the resize thumb, the borders,
 	// and the buttons
+	fDrawingEngine->SetDrawState(&fDrawState);
 
 	_DrawFrame(update);
 	_DrawTab(update);
@@ -443,6 +444,7 @@
 {
 	// Easy way to draw everything - no worries about drawing only certain
 	// things
+	fDrawingEngine->SetDrawState(&fDrawState);
 
 	_DrawFrame(BRect(fTopBorder.LeftTop(), fBottomBorder.RightBottom()));
 	_DrawTab(fTabRect);



From axeld at pinc-software.de  Mon Aug 13 11:34:18 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 13 Aug 2007 11:34:18 +0200
Subject: [Haiku-commits] r21915 - haiku/trunk/src/servers/debug
In-Reply-To: <200708122349.l7CNndda028697@sheep.berlios.de>
Message-ID: <532018555-BeMail@ibm>

bonefish at BerliOS <bonefish at mail.berlios.de> wrote:
> Log:
> Always allow debugging a team, even if it wasn't possible to get its
> executable path. It seems, gdb doesn't produce very helpful stack 
> traces
> then, though.

That reminds me that the debug server does not really like spaces in 
the path to the executable (or its name). I should probably just open a 
bug report for this, though :-)

Bye,
   Axel.



From axeld at pinc-software.de  Mon Aug 13 11:42:29 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 13 Aug 2007 11:42:29 +0200
Subject: [Haiku-commits]
 =?iso-8859-15?q?r21688_-_haiku/trunk/src/tools/re?=
 =?iso-8859-15?q?mote=5Fdisk=5Fserver?=
In-Reply-To: <c47b1d430708120958h2beb55a8ne6be3521d08c0fc8@mail.gmail.com>
Message-ID: <1022489165-BeMail@ibm>

Hi J?r?me,

"J?r?me Duval" <korli at users.berlios.de> wrote:
> > BuildPlatformMain remote_disk_server
> >         : remote_disk_server.cpp
> > -       : $(HOST_LIBSUPC++)
> > +       : $(HOST_LIBSUPC++) $(NETWORK_LIBS)
> This doesn't work on Linux anymore: NETWORK_LIBS is related to the 
> target
> platform. Something like HOST_NETWORK_LIBS would be better. I hope 
> Ingo can
> give a hand here :)

Thanks for the note! Apparently, Ingo already fixed this in the mean 
time - thanks!

Bye,
   Axel.



From jackburton at mail.berlios.de  Mon Aug 13 15:10:00 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Mon, 13 Aug 2007 15:10:00 +0200
Subject: [Haiku-commits] r21923 - haiku/trunk/src/kits/interface
Message-ID: <200708131310.l7DDA0Mm014860@sheep.berlios.de>

Author: jackburton
Date: 2007-08-13 15:09:59 +0200 (Mon, 13 Aug 2007)
New Revision: 21923
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21923&view=rev

Modified:
   haiku/trunk/src/kits/interface/Picture.cpp
   haiku/trunk/src/kits/interface/View.cpp
Log:
AppendToPicture() now sets the correct picture to be returned from 
EndPicture() (tests have confirmed this). Although appending to a 
picture doens't work yet for some reason...


Modified: haiku/trunk/src/kits/interface/Picture.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Picture.cpp	2007-08-13 09:27:18 UTC (rev 21922)
+++ haiku/trunk/src/kits/interface/Picture.cpp	2007-08-13 13:09:59 UTC (rev 21923)
@@ -488,13 +488,13 @@
 		link.StartMessage(AS_DELETE_PICTURE);
 		link.Attach<int32>(token);
 		link.Flush();
+		
+		delete extent;
+
+		// Reinitializes the BPicture
+		init_data();
 	}
 
-	delete extent;
-
-	// Reinitializes the BPicture
-	init_data();
-
 	// Do the usurping
 	usurped = lameDuck;
 }

Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2007-08-13 09:27:18 UTC (rev 21922)
+++ haiku/trunk/src/kits/interface/View.cpp	2007-08-13 13:09:59 UTC (rev 21923)
@@ -3114,8 +3114,9 @@
 		if (token == -1) {
 			BeginPicture(picture);
 		} else {
-			picture->usurped = cpicture;
 			picture->set_token(-1);
+			picture->usurp(cpicture);
+			cpicture = picture;			
 			fOwner->fLink->StartMessage(AS_LAYER_APPEND_TO_PICTURE);
 			fOwner->fLink->Attach<int32>(token);
 		}



From jackburton at mail.berlios.de  Mon Aug 13 15:52:16 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Mon, 13 Aug 2007 15:52:16 +0200
Subject: [Haiku-commits] r21924 - haiku/trunk/src/servers/app
Message-ID: <200708131352.l7DDqGaU017826@sheep.berlios.de>

Author: jackburton
Date: 2007-08-13 15:52:16 +0200 (Mon, 13 Aug 2007)
New Revision: 21924
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21924&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerPicture.cpp
Log:
Don't delete the subpictures in the ServerPicture destructor. They are 
kept in a list by ServerApp, and deleted by its destructor.


Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-13 13:09:59 UTC (rev 21923)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-13 13:52:16 UTC (rev 21924)
@@ -778,11 +778,9 @@
 	delete fData;
 	gTokenSpace.RemoveToken(fToken);
 	
-	if (fPictures != NULL) {
-		for (int32 i = fPictures->CountItems() - 1; i >= 0; i--)
-			delete static_cast<ServerPicture *>(fPictures->ItemAtFast(i));		
-		delete fPictures;
-	}
+	// We don't delete the subpictures themselves, the ServerApp keeps
+	// them in a list and will delete them on quit.
+	delete fPictures;
 }
 
 



From jackburton at mail.berlios.de  Mon Aug 13 16:07:12 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Mon, 13 Aug 2007 16:07:12 +0200
Subject: [Haiku-commits] r21925 - in haiku/trunk: headers/private/interface
	src/kits/interface src/servers/app
Message-ID: <200708131407.l7DE7CoZ018630@sheep.berlios.de>

Author: jackburton
Date: 2007-08-13 16:07:12 +0200 (Mon, 13 Aug 2007)
New Revision: 21925
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21925&view=rev

Modified:
   haiku/trunk/headers/private/interface/PictureDataWriter.h
   haiku/trunk/src/kits/interface/PictureDataWriter.cpp
   haiku/trunk/src/servers/app/ServerPicture.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Implemented BPicture's SetPenLocation() op, also nested 
AppendToPicture() (but still doesn't work :( ). Moved some functions 
around in PictureDataWriter.h.


Modified: haiku/trunk/headers/private/interface/PictureDataWriter.h
===================================================================
--- haiku/trunk/headers/private/interface/PictureDataWriter.h	2007-08-13 13:52:16 UTC (rev 21924)
+++ haiku/trunk/headers/private/interface/PictureDataWriter.h	2007-08-13 14:07:12 UTC (rev 21925)
@@ -23,14 +23,30 @@
 	
 	status_t SetTo(BPositionIO *data);
 
+	status_t WriteSetHighColor(const rgb_color &color);
+	status_t WriteSetLowColor(const rgb_color &color);
 	status_t WriteSetOrigin(const BPoint &point);
-	status_t WriteInvertRect(const BRect &rect);
-	
 	status_t WriteSetDrawingMode(const drawing_mode &mode);
+	status_t WriteSetPenLocation(const BPoint &point);
 	status_t WriteSetPenSize(const float &penSize);
 	status_t WriteSetLineMode(const cap_mode &cap, const join_mode &join, const float &miterLimit);	
 	status_t WriteSetScale(const float &scale);
 
+	status_t WritePushState();
+	status_t WritePopState();	
+	
+	status_t WriteSetFontFamily(const font_family &family);
+	status_t WriteSetFontStyle(const font_style &style);
+	status_t WriteSetFontSpacing(const int32 &spacing);
+	status_t WriteSetFontSize(const float &size);
+	status_t WriteSetFontRotation(const float &rotation);
+	status_t WriteSetFontEncoding(const int32 &encoding);
+	status_t WriteSetFontFlags(const int32 &flags);
+	status_t WriteSetFontShear(const int32 &shear);
+	status_t WriteSetFontFace(const int32 &face);
+
+	status_t WriteStrokeLine(const BPoint &start, const BPoint &end);
+	status_t WriteInvertRect(const BRect &rect);
 	status_t WriteDrawRect(const BRect &rect, const bool &fill);
 	status_t WriteDrawRoundRect(const BRect &rect, const BPoint &radius, const bool &fill);
 	status_t WriteDrawEllipse(const BRect &rect, const bool &fill);
@@ -39,12 +55,6 @@
 	status_t WriteDrawPolygon(const int32 &numPoints, BPoint *points,
 				const bool &isClosed, const bool &fill);
 	status_t WriteDrawBezier(const BPoint points[4], const bool &fill);
-
-	status_t WriteStrokeLine(const BPoint &start, const BPoint &end);
-	
-	status_t WriteSetHighColor(const rgb_color &color);
-	status_t WriteSetLowColor(const rgb_color &color);
-	
 	status_t WriteDrawString(const BPoint &where, const char *string,
 				 const int32 &length, const escapement_delta &delta);
 	status_t WriteDrawShape(const int32 &opCount, const void *opList,
@@ -55,20 +65,6 @@
 
 	status_t WriteDrawPicture(const BPoint &where, const int32 &token);
 
-	status_t WriteSetFontFamily(const font_family &family);
-	status_t WriteSetFontStyle(const font_style &style);
-	status_t WriteSetFontSpacing(const int32 &spacing);
-	status_t WriteSetFontSize(const float &size);
-	status_t WriteSetFontRotation(const float &rotation);
-	status_t WriteSetFontEncoding(const int32 &encoding);
-	status_t WriteSetFontFlags(const int32 &flags);
-	status_t WriteSetFontShear(const int32 &shear);
-	status_t WriteSetFontFace(const int32 &face);
-
-	status_t WritePushState();
-	status_t WritePopState();	
-	
-
 protected:
 	// throw a status_t on error
 	void BeginOp(const int16 &op);

Modified: haiku/trunk/src/kits/interface/PictureDataWriter.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PictureDataWriter.cpp	2007-08-13 13:52:16 UTC (rev 21924)
+++ haiku/trunk/src/kits/interface/PictureDataWriter.cpp	2007-08-13 14:07:12 UTC (rev 21925)
@@ -89,6 +89,20 @@
 
 
 status_t
+PictureDataWriter::WriteSetPenLocation(const BPoint &point)
+{
+	try {
+		BeginOp(B_PIC_SET_PEN_LOCATION);
+		Write<BPoint>(point);
+		EndOp();
+	} catch (status_t &status) {
+		return status;	
+	}
+	return B_OK;
+}
+
+
+status_t
 PictureDataWriter::WriteSetPenSize(const float &penSize)
 {
 	try {

Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-13 13:52:16 UTC (rev 21924)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-13 14:07:12 UTC (rev 21925)
@@ -735,8 +735,6 @@
 	fPictures(NULL),
 	fUsurped(NULL)
 {
-	fToken = gTokenSpace.NewToken(kPictureToken, this);
-
 	BMallocIO *mallocIO = new (std::nothrow) BMallocIO();
 	if (mallocIO == NULL)
 		return;
@@ -747,6 +745,8 @@
 	if (mallocIO->SetSize(size) < B_OK)
 		return;
 	
+	fToken = gTokenSpace.NewToken(kPictureToken, this);
+
 	picture.fData->ReadAt(0, const_cast<void *>(mallocIO->Buffer()), size);
 		
 	PictureDataWriter::SetTo(fData);
@@ -790,7 +790,8 @@
 	// TODO: Finish this
 	BeginOp(B_PIC_ENTER_STATE_CHANGE);
 
-//	WriteSetPenLocation(view->CurrentState()->PenLocation());
+	WriteSetOrigin(view->CurrentState()->Origin());
+	WriteSetPenLocation(view->CurrentState()->PenLocation());
 	WriteSetPenSize(view->CurrentState()->PenSize());
 	WriteSetScale(view->CurrentState()->Scale());
 	WriteSetLineMode(view->CurrentState()->LineCapMode(), view->CurrentState()->LineJoinMode(),

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-13 13:52:16 UTC (rev 21924)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-13 14:07:12 UTC (rev 21925)
@@ -2400,6 +2400,14 @@
 			break;
 		}
 		
+		case AS_LAYER_SET_PEN_LOC:
+		{
+			float x, y;
+			link.Read<float>(&x);
+			link.Read<float>(&y);
+			picture->WriteSetPenLocation(BPoint(x, y));
+			break;
+		}
 		case AS_LAYER_SET_PEN_SIZE:
 		{
 			float penSize;
@@ -2697,12 +2705,23 @@
 			break;
 		}
 		
+		case AS_LAYER_APPEND_TO_PICTURE:
+		{
+			int32 pictureToken;
+			link.Read<int32>(&pictureToken);
+			ServerPicture *appendPicture = App()->FindPicture(pictureToken);
+			if (appendPicture) {
+				picture->SyncState(fCurrentLayer);
+				appendPicture->Usurp(picture);			
+			}
+			fCurrentLayer->SetPicture(appendPicture);
+				// we don't care if it's NULL
+			break;
+		}
+
 		case AS_LAYER_END_PICTURE:
 		{
 			ServerPicture *steppedDown = picture->StepDown();
-			if (!steppedDown)
-				return false;
-			
 			fCurrentLayer->SetPicture(steppedDown);
 			fLink.StartMessage(B_OK);
 			fLink.Attach<int32>(picture->Token());



From jackburton at mail.berlios.de  Mon Aug 13 16:52:02 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Mon, 13 Aug 2007 16:52:02 +0200
Subject: [Haiku-commits] r21926 - haiku/trunk/src/servers/app
Message-ID: <200708131452.l7DEq2fu022753@sheep.berlios.de>

Author: jackburton
Date: 2007-08-13 16:52:02 +0200 (Mon, 13 Aug 2007)
New Revision: 21926
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21926&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerApp.cpp
   haiku/trunk/src/servers/app/ServerPicture.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Also upload/download subpictures


Modified: haiku/trunk/src/servers/app/ServerApp.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerApp.cpp	2007-08-13 14:07:12 UTC (rev 21925)
+++ haiku/trunk/src/servers/app/ServerApp.cpp	2007-08-13 14:52:02 UTC (rev 21926)
@@ -694,9 +694,17 @@
 			STRACE(("ServerApp %s: Create Picture\n", Signature()));
 			status_t status = B_ERROR;			
 			ServerPicture *picture = CreatePicture();
-			if (picture != NULL)
+			if (picture != NULL) {
+				int32 subPicturesCount = 0;
+				link.Read<int32>(&subPicturesCount);
+				for (int32 c = 0; c < subPicturesCount; c++) {
+					int32 token = -1;
+					link.Read<int32>(&token);
+					if (ServerPicture *subPicture = FindPicture(token))
+						picture->NestPicture(subPicture);
+				}
 				status = picture->ImportData(link);
-			
+			}
 			if (status == B_OK) {
 				fLink.StartMessage(B_OK);
 				fLink.Attach<int32>(picture->Token());

Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-13 14:07:12 UTC (rev 21925)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-13 14:52:02 UTC (rev 21926)
@@ -178,7 +178,6 @@
 static void
 move_pen_by(ViewLayer *view, BPoint delta)
 {
-//	view->CurrentState()->SetPenLocation(delta - view->CurrentState()->PenLocation()); ?!?
 	view->CurrentState()->SetPenLocation(view->CurrentState()->PenLocation() + delta);
 }
 
@@ -876,13 +875,7 @@
 
 status_t
 ServerPicture::ImportData(BPrivate::LinkReceiver &link)
-{
-	int32 subPicturesCount = 0;
-	link.Read<int32>(&subPicturesCount);
-	for (int32 c = 0; c < subPicturesCount; c++) {
-		// TODO: Support nested pictures
-	} 
-	
+{	
 	int32 size = 0;
 	link.Read<int32>(&size);
 
@@ -919,7 +912,15 @@
 	fData->Seek(0, SEEK_SET);
 
 	int32 subPicturesCount = 0;
+	if (fPictures != NULL)
+		subPicturesCount = fPictures->CountItems();
 	link.Attach<int32>(subPicturesCount);
+	if (subPicturesCount > 0) {
+		for (int32 i = 0; i < subPicturesCount; i++) {
+			ServerPicture *subPic = static_cast<ServerPicture *>(fPictures->ItemAtFast(i));	
+			link.Attach<int32>(subPic->Token());		
+		}	
+	}
 
 	off_t size = 0;
 	fData->GetSize(&size);

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-13 14:07:12 UTC (rev 21925)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-13 14:52:02 UTC (rev 21926)
@@ -2711,7 +2711,7 @@
 			link.Read<int32>(&pictureToken);
 			ServerPicture *appendPicture = App()->FindPicture(pictureToken);
 			if (appendPicture) {
-				picture->SyncState(fCurrentLayer);
+				//picture->SyncState(fCurrentLayer);
 				appendPicture->Usurp(picture);			
 			}
 			fCurrentLayer->SetPicture(appendPicture);



From jackburton at mail.berlios.de  Mon Aug 13 17:28:32 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Mon, 13 Aug 2007 17:28:32 +0200
Subject: [Haiku-commits] r21927 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200708131528.l7DFSW3x025767@sheep.berlios.de>

Author: jackburton
Date: 2007-08-13 17:28:31 +0200 (Mon, 13 Aug 2007)
New Revision: 21927
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21927&view=rev

Modified:
   haiku/trunk/headers/os/interface/Picture.h
   haiku/trunk/src/kits/interface/Picture.cpp
   haiku/trunk/src/kits/interface/View.cpp
Log:
Renamed some BPicture private functions, small cleanups.


Modified: haiku/trunk/headers/os/interface/Picture.h
===================================================================
--- haiku/trunk/headers/os/interface/Picture.h	2007-08-13 14:52:02 UTC (rev 21926)
+++ haiku/trunk/headers/os/interface/Picture.h	2007-08-13 15:28:31 UTC (rev 21927)
@@ -78,24 +78,29 @@
 
 		BPicture			&operator=(const BPicture &);
 
-		void				init_data();
-		void				import_data(const void *data, int32 size, BPicture **subs, int32 subCount);
-		void				import_old_data(const void *data, int32 size);
-		void				set_token(int32 token);
-		bool				assert_local_copy();
-		bool				assert_old_local_copy();
-		bool				assert_server_copy();
+		void				_InitData();
+		void				_DisposeData();
 
+		void				_ImportData(const void *data, int32 size, BPicture **subs, int32 subCount);
+		void				_ImportOldData(const void *data, int32 size);
+		void				SetToken(int32 token);
+		bool				_AssertLocalCopy();
+		bool				_AssertOldLocalCopy();
+		bool				_AssertServerCopy();
+
+		status_t			_Upload();
+		status_t			_Download();
+
 		/**Deprecated API**/
 							BPicture(const void *data, int32 size);
 		const void			*Data() const;
 		int32				DataSize() const;
 
-		void				usurp(BPicture *lameDuck);
-		BPicture			*step_down();
+		void				Usurp(BPicture *lameDuck);
+		BPicture			*StepDown();
 
 		int32				token;
-		_BPictureExtent_	*extent;
+		_BPictureExtent_		*extent;
 		BPicture			*usurped;
 		uint32				_reserved[3];
 };

Modified: haiku/trunk/src/kits/interface/Picture.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Picture.cpp	2007-08-13 14:52:02 UTC (rev 21926)
+++ haiku/trunk/src/kits/interface/Picture.cpp	2007-08-13 15:28:31 UTC (rev 21927)
@@ -13,6 +13,8 @@
 #include <PicturePlayer.h>
 #include <ServerProtocol.h>
 
+//#define DEBUG 1
+#include <Debug.h>
 #include <ByteOrder.h>
 #include <List.h>
 #include <Message.h>
@@ -64,7 +66,7 @@
 	extent(NULL),
 	usurped(NULL)
 {
-	init_data();
+	_InitData();
 }
 
 
@@ -74,7 +76,7 @@
 	extent(NULL),
 	usurped(NULL)
 {
-	init_data();
+	_InitData();
 
 	if (otherPicture.token != -1) {
 		BPrivate::AppServerLink link;
@@ -106,7 +108,7 @@
 	extent(NULL),
 	usurped(NULL)
 {
-	init_data();
+	_InitData();
 
 	int32 version;
 	if (archive->FindInt32("_ver", &version) != B_OK)
@@ -138,7 +140,7 @@
 //		swap_data(extent->fNewData, extent->fNewSize);
 
 		if (extent->Size() > 0)
-			assert_server_copy();
+			_AssertServerCopy();
 	}
 
 	// Do we just free the data now?
@@ -153,14 +155,14 @@
 
 BPicture::BPicture(const void *data, int32 size)
 {
-	init_data();
+	_InitData();
 	// TODO: For now. We'll see if it's worth to support old style data
 	debugger("old style BPicture data is not supported");
 }
 
 
 void
-BPicture::init_data()
+BPicture::_InitData()
 {
 	token = -1;
 	usurped = NULL;
@@ -171,15 +173,24 @@
 
 BPicture::~BPicture()
 {
+	_DisposeData();
+}
+
+
+void
+BPicture::_DisposeData()
+{
 	if (token != -1) {
 		BPrivate::AppServerLink link;
 
 		link.StartMessage(AS_DELETE_PICTURE);
 		link.Attach<int32>(token);
 		link.Flush();
+		SetToken(-1);
 	}
 
 	delete extent;
+	extent = NULL;
 }
 
 
@@ -196,7 +207,7 @@
 status_t
 BPicture::Archive(BMessage *archive, bool deep) const
 {
-	if (!const_cast<BPicture*>(this)->assert_local_copy())
+	if (!const_cast<BPicture*>(this)->_AssertLocalCopy())
 		return B_ERROR;
 
 	status_t err = BArchivable::Archive(archive, deep);
@@ -238,7 +249,7 @@
 status_t
 BPicture::Play(void **callBackTable, int32 tableEntries, void *user)
 {
-	if (!assert_local_copy())
+	if (!_AssertLocalCopy())
 		return B_ERROR;
 
 	PicturePlayer player(extent->Data(), extent->Size(), extent->Pictures());
@@ -252,7 +263,7 @@
 {
 	// TODO: what about endianess?
 
-	if (!assert_local_copy())
+	if (!_AssertLocalCopy())
 		return B_ERROR;
 
 	const picture_header header = { 2, 0 };
@@ -327,7 +338,7 @@
 
 //	swap_data(extent->fNewData, extent->fNewSize);
 
-	if (!assert_server_copy())
+	if (!_AssertServerCopy())
 		return B_ERROR;
 
 	// Data is now kept server side, remove the local copy
@@ -340,7 +351,7 @@
 
 
 void
-BPicture::import_data(const void *data, int32 size, BPicture **subs,
+BPicture::_ImportData(const void *data, int32 size, BPicture **subs,
 	int32 subCount)
 {
 	/*
@@ -366,21 +377,21 @@
 
 
 void
-BPicture::import_old_data(const void *data, int32 size)
+BPicture::_ImportOldData(const void *data, int32 size)
 {
 	// TODO: We don't support old data for now
 }
 
 
 void
-BPicture::set_token(int32 _token)
+BPicture::SetToken(int32 _token)
 {
 	token = _token;
 }
 
 
 bool
-BPicture::assert_local_copy()
+BPicture::_AssertLocalCopy()
 {
 	if (extent->Data() != NULL)
 		return true;
@@ -388,36 +399,12 @@
 	if (token == -1)
 		return false;
 
-	BPrivate::AppServerLink link;
-	
-	link.StartMessage(AS_DOWNLOAD_PICTURE);
-	link.Attach<int32>(token);
-	
-	status_t status = B_ERROR;
-	if (link.FlushWithReply(status) == B_OK && status == B_OK) {
-		int32 count = 0;
-		link.Read<int32>(&count);
-		
-		// Read sub picture tokens
-		for (int32 i = 0; i < count; i++) {
-			BPicture *pic = new BPicture;
-			link.Read<int32>(&pic->token);
-			extent->AddPicture(pic);
-		}
-	
-		int32 size;
-		link.Read<int32>(&size);
-		status = extent->SetSize(size);
-		if (status == B_OK)
-			link.Read(const_cast<void *>(extent->Data()), size);
-	}
-
-	return status == B_OK;
+	return _Download() == B_OK;
 }
 
 
 bool
-BPicture::assert_old_local_copy()
+BPicture::_AssertOldLocalCopy()
 {
 	// TODO: We don't support old data for now
 
@@ -426,7 +413,7 @@
 
 
 bool
-BPicture::assert_server_copy()
+BPicture::_AssertServerCopy()
 {
 	if (token != -1)
 		return true;
@@ -435,8 +422,18 @@
 		return false;
 
 	for (int32 i = 0; i < extent->CountPictures(); i++)
-		extent->PictureAt(i)->assert_server_copy();
+		extent->PictureAt(i)->_AssertServerCopy();
 
+	return _Upload() == B_OK;
+}
+
+
+status_t
+BPicture::_Upload()
+{
+	ASSERT((token == -1));
+	ASSERT((extent->Data() != NULL));
+
 	BPrivate::AppServerLink link;
 
 	link.StartMessage(AS_CREATE_PICTURE);
@@ -455,15 +452,49 @@
 		&& status == B_OK)
 		link.Read<int32>(&token);
 
-	return token != -1;
+	return status;
 }
 
 
+status_t
+BPicture::_Download()
+{
+	ASSERT((extent->Data() == NULL));
+	ASSERT((token != -1));
+
+	BPrivate::AppServerLink link;
+	
+	link.StartMessage(AS_DOWNLOAD_PICTURE);
+	link.Attach<int32>(token);
+	
+	status_t status = B_ERROR;
+	if (link.FlushWithReply(status) == B_OK && status == B_OK) {
+		int32 count = 0;
+		link.Read<int32>(&count);
+		
+		// Read sub picture tokens
+		for (int32 i = 0; i < count; i++) {
+			BPicture *pic = new BPicture;
+			link.Read<int32>(&pic->token);
+			extent->AddPicture(pic);
+		}
+	
+		int32 size;
+		link.Read<int32>(&size);
+		status = extent->SetSize(size);
+		if (status == B_OK)
+			link.Read(const_cast<void *>(extent->Data()), size);
+	}
+
+	return status;
+}
+
+
 const void *
 BPicture::Data() const
 {
 	if (extent->Data() == NULL)
-		const_cast<BPicture*>(this)->assert_local_copy();
+		const_cast<BPicture*>(this)->_AssertLocalCopy();
 
 	return extent->Data();
 }
@@ -473,35 +504,27 @@
 BPicture::DataSize() const
 {
 	if (extent->Data() == NULL)
-		const_cast<BPicture*>(this)->assert_local_copy();
+		const_cast<BPicture*>(this)->_AssertLocalCopy();
 
 	return extent->Size();
 }
 
 
 void
-BPicture::usurp(BPicture *lameDuck)
+BPicture::Usurp(BPicture *lameDuck)
 {
-	if (token != -1) {
-		BPrivate::AppServerLink link;
+	_DisposeData();
 
-		link.StartMessage(AS_DELETE_PICTURE);
-		link.Attach<int32>(token);
-		link.Flush();
-		
-		delete extent;
+	// Reinitializes the BPicture
+	_InitData();
 
-		// Reinitializes the BPicture
-		init_data();
-	}
-
-	// Do the usurping
+	// Do the Usurping
 	usurped = lameDuck;
 }
 
 
 BPicture *
-BPicture::step_down()
+BPicture::StepDown()
 {
 	BPicture *lameDuck = usurped;
 	usurped = NULL;

Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2007-08-13 14:52:02 UTC (rev 21926)
+++ haiku/trunk/src/kits/interface/View.cpp	2007-08-13 15:28:31 UTC (rev 21927)
@@ -3095,7 +3095,7 @@
 BView::BeginPicture(BPicture *picture)
 {
 	if (do_owner_check() && picture && picture->usurped == NULL) {
-		picture->usurp(cpicture);
+		picture->Usurp(cpicture);
 		cpicture = picture;
 
 		fOwner->fLink->StartMessage(AS_LAYER_BEGIN_PICTURE);
@@ -3115,7 +3115,7 @@
 			BeginPicture(picture);
 		} else {
 			picture->set_token(-1);
-			picture->usurp(cpicture);
+			picture->Usurp(cpicture);
 			cpicture = picture;			
 			fOwner->fLink->StartMessage(AS_LAYER_APPEND_TO_PICTURE);
 			fOwner->fLink->Attach<int32>(token);
@@ -3137,8 +3137,8 @@
 			&& code == B_OK
 			&& fOwner->fLink->Read<int32>(&token) == B_OK) {
 			BPicture *picture = cpicture;
-			cpicture = picture->step_down();
-			picture->set_token(token);
+			cpicture = picture->StepDown();
+			picture->SetToken(token);
 
 			return picture;
 		}



From bonefish at cs.tu-berlin.de  Mon Aug 13 17:45:11 2007
From: bonefish at cs.tu-berlin.de (Ingo Weinhold)
Date: Mon, 13 Aug 2007 17:45:11 +0200
Subject: [Haiku-commits] r21915 - haiku/trunk/src/servers/debug
In-Reply-To: <532018555-BeMail@ibm>
References: <532018555-BeMail@ibm>
Message-ID: <20070813174511.586.2@cs.tu-berlin.de>


On 2007-08-13 at 11:34:18 [+0200], Axel D?rfler <axeld at pinc-software.de> 
wrote:
> bonefish at BerliOS <bonefish at mail.berlios.de> wrote:
> > Log:
> > Always allow debugging a team, even if it wasn't possible to get its
> > executable path. It seems, gdb doesn't produce very helpful stack
> > traces
> > then, though.
> 
> That reminds me that the debug server does not really like spaces in
> the path to the executable (or its name). I should probably just open a
> bug report for this, though :-)

Not for the debug server at least, since it's not to blame. It passes the 
correct arguments to the Terminal. The Terminal joins the argument vector 
to a single string in ArgvReceived() and later (in Shell:_Spawn()) 
disassembles the string again (splitting it at whitespaces). Even if the 
debug server would escape the argument vector strings -- which makes no 
sense, since they never goes through a shell -- it would still not work.

Either the Terminal has to escape the argument vector elements when joining 
them in ArgvReceived() and deescape in Shell::_Spawn(). Or it has to pass 
argument vectors around.

CU, Ingo


From stippi at mail.berlios.de  Mon Aug 13 19:03:55 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 13 Aug 2007 19:03:55 +0200
Subject: [Haiku-commits] r21928 - haiku/trunk/src/kits/interface
Message-ID: <200708131703.l7DH3tR1014148@sheep.berlios.de>

Author: stippi
Date: 2007-08-13 19:03:53 +0200 (Mon, 13 Aug 2007)
New Revision: 21928
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21928&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
* I am turning this back on, it seems the problems are fixed, and if not,
  I would like to fix them. Using the string width cache results in a great
  drawing speed up, for example in StyledEdit and Mail. Any app that uses a
  larger BTextView.


Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2007-08-13 15:28:31 UTC (rev 21927)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2007-08-13 17:03:53 UTC (rev 21928)
@@ -54,7 +54,7 @@
 #endif
 
 
-#define USE_WIDTHBUFFER 0
+#define USE_WIDTHBUFFER 1
 #define USE_DOUBLEBUFFERING 0
 
 



From stefano.ceccherini at gmail.com  Mon Aug 13 19:04:04 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Mon, 13 Aug 2007 19:04:04 +0200
Subject: [Haiku-commits] r21915 - haiku/trunk/src/servers/debug
In-Reply-To: <20070813174511.586.2@cs.tu-berlin.de>
References: <532018555-BeMail@ibm> <20070813174511.586.2@cs.tu-berlin.de>
Message-ID: <894b9700708131004s26df4642m51a0144210bf7dcb@mail.gmail.com>

2007/8/13, Ingo Weinhold <bonefish at cs.tu-berlin.de>:
>


> Either the Terminal has to escape the argument vector elements when joining
> them in ArgvReceived() and deescape in Shell::_Spawn(). Or it has to pass
> argument vectors around.

What do you think it's the best solution ?
Care to open a ticket ?
I guess I can handle that (if you don't do it before) since I worked
on terminal lately.


From stippi at mail.berlios.de  Mon Aug 13 19:09:23 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 13 Aug 2007 19:09:23 +0200
Subject: [Haiku-commits] r21929 - in haiku/trunk/src/servers/app/drawing: .
	Painter Painter/drawing_modes
Message-ID: <200708131709.l7DH9NZm022363@sheep.berlios.de>

Author: stippi
Date: 2007-08-13 19:09:20 +0200 (Mon, 13 Aug 2007)
New Revision: 21929
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21929&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeCopyText.h
   haiku/trunk/src/servers/app/drawing/PatternHandler.cpp
   haiku/trunk/src/servers/app/drawing/PatternHandler.h
Log:
* implemented a lock up table for drawing text in B_OP_COPY,
  maybe this is too resource hungry, feel free to critisize... :-)
* the speedup is there, but not overwhelming


Modified: haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp	2007-08-13 17:03:53 UTC (rev 21928)
+++ haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp	2007-08-13 17:09:20 UTC (rev 21929)
@@ -1147,6 +1147,8 @@
 	// are up to date for use by the solid drawing mode version.
 	fPixelFormat.SetDrawingMode(fDrawingMode, fAlphaSrcMode,
 								fAlphaFncMode, drawingText);
+	if (drawingText)
+		fPatternHandler.MakeOpCopyColorCache();
 }
 
 // _SetRendererColor

Modified: haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeCopyText.h
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeCopyText.h	2007-08-13 17:03:53 UTC (rev 21928)
+++ haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeCopyText.h	2007-08-13 17:09:20 UTC (rev 21929)
@@ -64,19 +64,24 @@
 							 agg_buffer* buffer,
 							 const PatternHandler* pattern)
 {
-	uint8* p = buffer->row_ptr(y) + (x << 2);
-	rgb_color l = pattern->LowColor().GetColor32();
+//printf("blend_solid_hspan_copy_text(%d, %d)\n", x, len);
+//	uint8* p = buffer->row_ptr(y) + (x << 2);
+	uint32* p = (uint32*)(buffer->row_ptr(y) + (x << 2));
+	const uint32* cache = (const uint32*)pattern->OpCopyColorCache();
+//	rgb_color l = pattern->LowColor().GetColor32();
 	do {
-		if (*covers) {
-			if(*covers == 255) {
-				ASSIGN_COPY(p, c.r, c.g, c.b, c.a);
-			} else {
-				BLEND_COPY(p, c.r, c.g, c.b, *covers,
-						   l.red, l.green, l.blue);
-			}
-		}
+//		if (*covers) {
+			*p = cache[*covers];
+//			if(*covers == 255) {
+//				ASSIGN_COPY(p, c.r, c.g, c.b, c.a);
+//			} else {
+//				BLEND_COPY(p, c.r, c.g, c.b, *covers,
+//						   l.red, l.green, l.blue);
+//			}
+//		}
 		covers++;
-		p += 4;
+		p++;
+//		p += 4;
 	} while(--len);
 }
 

Modified: haiku/trunk/src/servers/app/drawing/PatternHandler.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/PatternHandler.cpp	2007-08-13 17:03:53 UTC (rev 21928)
+++ haiku/trunk/src/servers/app/drawing/PatternHandler.cpp	2007-08-13 17:09:20 UTC (rev 21929)
@@ -9,6 +9,7 @@
 #include "PatternHandler.h"
 
 #include <stdio.h>
+#include <string.h>
 
 #include <Point.h>
 
@@ -30,8 +31,10 @@
 	  fHighColor(kBlack),
 	  fLowColor(kWhite),
 	  fXOffset(0),
-	  fYOffset(0)
+	  fYOffset(0),
+	  fColorsWhenCached(ULONGLONG_MAX)
 {
+	memset(fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
 }
 
 /*!
@@ -46,8 +49,10 @@
 	  fHighColor(kBlack),
 	  fLowColor(kWhite),
 	  fXOffset(0),
-	  fYOffset(0)
+	  fYOffset(0),
+	  fColorsWhenCached(ULONGLONG_MAX)
 {
+	memset(fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
 }
 
 /*!
@@ -62,8 +67,10 @@
 	  fHighColor(kBlack),
 	  fLowColor(kWhite),
 	  fXOffset(0),
-	  fYOffset(0)
+	  fYOffset(0),
+	  fColorsWhenCached(ULONGLONG_MAX)
 {
+	memset(fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
 }
 
 /*!
@@ -78,8 +85,10 @@
 	  fHighColor(kBlack),
 	  fLowColor(kWhite),
 	  fXOffset(0),
-	  fYOffset(0)
+	  fYOffset(0),
+	  fColorsWhenCached(ULONGLONG_MAX)
 {
+	memset(fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
 }
 
 /*!
@@ -93,8 +102,10 @@
 	  fHighColor(other.fHighColor),
 	  fLowColor(other.fLowColor),
 	  fXOffset(other.fXOffset),
-	  fYOffset(other.fYOffset)
+	  fYOffset(other.fYOffset),
+	  fColorsWhenCached(ULONGLONG_MAX)
 {
+	memset(fOpCopyColorCache, 255, 256 * sizeof(rgb_color));
 }
 
 //! Destructor does nothing
@@ -189,7 +200,6 @@
 PatternHandler::SetColors(const rgb_color& high, const rgb_color& low)
 {
 	fHighColor = high;
-	fLowColor = low;
 }
 
 /*!
@@ -258,3 +268,39 @@
 	fYOffset = y & 7;
 }
 
+
+void
+PatternHandler::MakeOpCopyColorCache()
+{
+	rgb_color highColor = fHighColor.GetColor32();
+	rgb_color lowColor = fLowColor.GetColor32();
+
+	uint64 t1 = *(uint32*)&highColor;
+	uint32 t2 = *(uint32*)&lowColor;
+
+	uint64 colors = (t1 << 32) | t2;
+
+	if (fColorsWhenCached == colors)
+		return;
+
+	fColorsWhenCached = colors;
+
+	// ramp from low color to high color
+	uint8 rA = fLowColor.GetColor32().red;
+	uint8 gA = fLowColor.GetColor32().green;
+	uint8 bA = fLowColor.GetColor32().blue;
+
+	uint8 rB = fHighColor.GetColor32().red;
+	uint8 gB = fHighColor.GetColor32().green;
+	uint8 bB = fHighColor.GetColor32().blue;
+
+	for (int32 i = 0; i < 256; i++) {
+		// NOTE: rgb is twisted around, since this is
+		// only used as uint32 in the end
+		fOpCopyColorCache[i].red = (((bB - bA) * i) + (bA << 8)) >> 8;
+		fOpCopyColorCache[i].green = (((gB - gA) * i) + (gA << 8)) >> 8;
+		fOpCopyColorCache[i].blue = (((rB - rA) * i) + (rA << 8)) >> 8;
+	}
+}
+
+

Modified: haiku/trunk/src/servers/app/drawing/PatternHandler.h
===================================================================
--- haiku/trunk/src/servers/app/drawing/PatternHandler.h	2007-08-13 17:03:53 UTC (rev 21928)
+++ haiku/trunk/src/servers/app/drawing/PatternHandler.h	2007-08-13 17:09:20 UTC (rev 21929)
@@ -131,6 +131,10 @@
 
 			void				SetOffsets(int32 x, int32 y);
 
+			void				MakeOpCopyColorCache();
+	inline	const rgb_color*	OpCopyColorCache() const
+									{ return fOpCopyColorCache; }
+
  private:
 			Pattern				fPattern;
 			RGBColor			fHighColor;
@@ -138,6 +142,9 @@
 
 			uint16				fXOffset;
 			uint16				fYOffset;
+
+			rgb_color			fOpCopyColorCache[256];
+			uint64				fColorsWhenCached;
 };
 
 /*!



From superstippi at gmx.de  Mon Aug 13 19:15:27 2007
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 13 Aug 2007 19:15:27 +0200
Subject: [Haiku-commits] r21929 - in
 haiku/trunk/src/servers/app/drawing: . Painter Painter/drawing_modes
In-Reply-To: <200708131709.l7DH9NZm022363@sheep.berlios.de>
References: <200708131709.l7DH9NZm022363@sheep.berlios.de>
Message-ID: <20070813191527.3602.8@stippis.WG>

> Log:
> * implemented a lock up table for drawing text in B_OP_COPY,
>   maybe this is too resource hungry, feel free to critisize... :-)

Err, in case you wondered. The purpose of a "lock up table" is to provide 
quick access to different ways to lock up the app_server/system. When drawing 
strings, the app_server will chose a different way of locking up 
spectacularily by buildig a hash over the string and chosing one of the 
methods in the table. Just wanted to clear this up.

Best regards,
-Stephan


From axeld at mail.berlios.de  Mon Aug 13 19:22:34 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 13 Aug 2007 19:22:34 +0200
Subject: [Haiku-commits] r21930 - in haiku/trunk:
	headers/private/graphics/radeon src/add-ons/accelerants/radeon
	src/add-ons/kernel/drivers/graphics/radeon
Message-ID: <200708131722.l7DHMY7L018999@sheep.berlios.de>

Author: axeld
Date: 2007-08-13 19:22:32 +0200 (Mon, 13 Aug 2007)
New Revision: 21930
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21930&view=rev

Modified:
   haiku/trunk/headers/private/graphics/radeon/fp_regs.h
   haiku/trunk/headers/private/graphics/radeon/radeon_interface.h
   haiku/trunk/src/add-ons/accelerants/radeon/ProposeDisplayMode.c
   haiku/trunk/src/add-ons/accelerants/radeon/SetDisplayMode.c
   haiku/trunk/src/add-ons/accelerants/radeon/flat_panel.c
   haiku/trunk/src/add-ons/accelerants/radeon/monitor_detection.c
   haiku/trunk/src/add-ons/accelerants/radeon/monitor_routing.c
   haiku/trunk/src/add-ons/accelerants/radeon/radeon_accelerant.h
   haiku/trunk/src/add-ons/accelerants/radeon/set_mode.h
   haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/bios.c
   haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/init.c
   haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/radeon_driver.h
Log:
Committed patch by Euan Kirkhope to improve routing problems with Radeon cards;
this should fix bug #1293.
I've tested it here on two machines, one works better now, the other stayed the
same (Radeon 9250, and a laptop FireGL (id 4c66) version). This apparently also
fixed bug #1394.


Modified: haiku/trunk/headers/private/graphics/radeon/fp_regs.h
===================================================================
--- haiku/trunk/headers/private/graphics/radeon/fp_regs.h	2007-08-13 17:09:20 UTC (rev 21929)
+++ haiku/trunk/headers/private/graphics/radeon/fp_regs.h	2007-08-13 17:22:32 UTC (rev 21930)
@@ -35,6 +35,7 @@
 #       define RADEON_FP2_PANEL_FORMAT          (1 <<  3)
 #       define RADEON_FP2_SOURCE_SEL_MASK       (3 << 10)
 #       define RADEON_FP2_SOURCE_SEL_CRTC2      (1 << 10)
+#       define RADEON_FP2_SOURCE_SEL_RMX        (2 << 10) 
 #       define RADEON_FP2_SRC_SEL_MASK          (3 << 13)
 #       define RADEON_FP2_SRC_SEL_CRTC2         (1 << 13)
 #       define RADEON_FP2_FP_POL                (1 << 16)
@@ -68,6 +69,12 @@
 #       define RADEON_VERT_STRETCH_BLEND       (1     << 26)
 #       define RADEON_VERT_AUTO_RATIO_EN       (1     << 27)
 #       define RADEON_VERT_STRETCH_RESERVED    0xf1000000
+
+#define RADEON_TMDS_PLL_CNTL                0x02a8
+#define RADEON_TMDS_TRANSMITTER_CNTL        0x02a4
+#       define RADEON_TMDS_TRANSMITTER_PLLEN  1
+#       define RADEON_TMDS_TRANSMITTER_PLLRST 2
+
 #define RADEON_FP_H_SYNC_STRT_WID           0x02c4
 #define RADEON_FP_V_SYNC_STRT_WID           0x02c8
 
@@ -80,6 +87,9 @@
 #       define RADEON_LVDS_DIGON            (1   << 18)
 #       define RADEON_LVDS_BLON             (1   << 19)
 #       define RADEON_LVDS_SEL_CRTC2        (1   << 23)
+#define RADEON_LVDS_PLL_CNTL                0x02d4
+#       define RADEON_HSYNC_DELAY_SHIFT     28
+#       define RADEON_HSYNC_DELAY_MASK      (0xf << 28)
 
 #define RADEON_FP_CRTC2_H_TOTAL_DISP        0x0350
 #define RADEON_FP_CRTC2_V_TOTAL_DISP        0x0354

Modified: haiku/trunk/headers/private/graphics/radeon/radeon_interface.h
===================================================================
--- haiku/trunk/headers/private/graphics/radeon/radeon_interface.h	2007-08-13 17:09:20 UTC (rev 21929)
+++ haiku/trunk/headers/private/graphics/radeon/radeon_interface.h	2007-08-13 17:22:32 UTC (rev 21930)
@@ -348,6 +348,11 @@
 	uint32 best_vco;			// preferred VCO frequency (0 for don't care)
 } pll_info;
 
+// info for ext tmds pll
+typedef struct {
+	uint32 freq;
+	uint32 value;
+} tmds_pll_info;
 
 // one overlay buffer
 typedef struct overlay_buffer_node {
@@ -520,24 +525,24 @@
 	uint16		device_id;		// PCI device id
 	uint8		revision;		// PCI device revision
 	
-	//bool 		has_crtc2;		// has second CRTC
 	radeon_type	asic;			// ASIC version
-	bool		is_mobility;	// mobility version
-	bool		is_igp;			//	might need to know if it's an integrated chip
+	bool		is_mobility;		// mobility version
+	bool		is_igp;			// might need to know if it's an integrated chip
 	bool		is_atombios;
-	tv_chip_type tv_chip;		// type of TV-Out encoder
+
+	tv_chip_type 	tv_chip;		// type of TV-Out encoder
 	bool		new_pll;		// r300 style PLL
-	bool		has_no_i2c; 	// I2C is broken
-	uint16		panel_pwr_delay;// delay for LCD backlight to stabilise
-	uint8		theatre_channel;// VIP channel of Rage Theatre (if applicable)
+	bool		has_no_i2c; 		// I2C is broken
+	uint16		panel_pwr_delay;	// delay for LCD backlight to stabilise
+	uint8		theatre_channel;	// VIP channel of Rage Theatre (if applicable)
 		
 	general_pll_info	pll;
-	
+	tmds_pll_info		tmds_pll[4];
+
 	area_id		regs_area;		// area of memory mapped registers
 	area_id		ROM_area;		// area of ROM
-	//area_id		fb_area;	// area of frame buffer
 	void		*framebuffer_pci;	// physical address of frame buffer (aka local memory)
-								// this is a hack needed by BeOS
+							// this is a hack needed by BeOS
 
 	crtc_info	crtc[2];		// info about each crtc
 	uint8		num_crtc;		// number of physical heads
@@ -557,6 +562,8 @@
 	uint32	active_vc;			// currently selected virtual card in terms of 2D acceleration
 		
 	uint32	dac_cntl2;			// content of dac_cntl2 register
+	uint32	tmds_pll_cntl;			// undocumented here be dragons
+	uint32	tmds_transmitter_cntl;		// undocumented here be dragons
 
 	overlay_info	pending_overlay;	// overlay to be shown
 	overlay_info	active_overlay;		// overlay shown

Modified: haiku/trunk/src/add-ons/accelerants/radeon/ProposeDisplayMode.c
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon/ProposeDisplayMode.c	2007-08-13 17:09:20 UTC (rev 21929)
+++ haiku/trunk/src/add-ons/accelerants/radeon/ProposeDisplayMode.c	2007-08-13 17:22:32 UTC (rev 21930)
@@ -148,6 +148,10 @@
 	int eff_virtual_width;
 	fp_info *flatpanel = &si->flatpanels[crtc->flatpanel_port];
 
+	SHOW_FLOW( 4, "CRTC %d, DVI %d", (crtc == &si->crtc[0]) ? 0 : 1, crtc->flatpanel_port );
+	SHOW_FLOW( 4, "X %d, virtX %d", target->timing.h_display,  target->virtual_width);
+	SHOW_FLOW( 4, "fpRes %dx%d", flatpanel->panel_xres,  flatpanel->panel_yres);
+
 	// save refresh rate - we want to leave this (artifical) value untouched
 	// don't use floating point, we are in kernel mode
 	target_refresh = 
@@ -163,7 +167,7 @@
 	// for flat panels, check maximum resolution;
 	// all the other tricks (like fixed resolution and resulting scaling)
 	// are done automagically by set_display_mode
-    if( (crtc->chosen_displays & (dd_lvds | dd_dvi | dd_dvi_ext)) != 0 ) {
+    if( (crtc->chosen_displays & (dd_lvds | dd_dvi)) != 0 ) {
 		if( target->timing.h_display > flatpanel->panel_xres )
 			target->timing.h_display = flatpanel->panel_xres;
 		
@@ -171,6 +175,17 @@
 			target->timing.v_display = flatpanel->panel_yres;
 	}
 
+	// for secondary flat panels there is no RMX unit for
+	// scaling up lower resolutions.  Until we can do centered timings
+	// we need to disable the screen unless it is the native resolution.
+	// if the DVI input has a scaler we would need to know about it somehow...
+    if( (crtc->chosen_displays & dd_dvi_ext) != 0 ) {
+		SHOW_FLOW0( 4, "external (secondary) DVI cannot support non-native resolutions" );
+		if( ( target->timing.h_display != flatpanel->panel_xres ) ||
+			( target->timing.v_display != flatpanel->panel_yres ) )
+			return B_ERROR;
+	}
+
 /*
 	// the TV-Out encoder can "only" handle up to 1024x768
 	if( (head->chosen_displays & (dd_ctv | dd_stv)) != 0 ) {
@@ -325,7 +340,7 @@
 	if( target->timing.pixel_clock / 10 > pll->max_pll_freq || 
 		target->timing.pixel_clock / 10 * 12 < pll->min_pll_freq ) 
 	{
-		SHOW_ERROR( 2, "pixel_clock (%ld) out of range (%d, %d)", target->timing.pixel_clock, 
+		SHOW_ERROR( 4, "pixel_clock (%ld) out of range (%d, %d)", target->timing.pixel_clock, 
 			pll->max_pll_freq * 10, pll->min_pll_freq / 12 );
 		return B_ERROR;
 	}
@@ -371,7 +386,7 @@
 
 	// make sure we haven't shrunk virtual height too much
 	if (target->virtual_height < target->timing.v_display) {
-		SHOW_ERROR( 2, "not enough memory for this mode (could show only %d of %d lines)", 
+		SHOW_ERROR( 4, "not enough memory for this mode (could show only %d of %d lines)", 
 			target->virtual_height, target->timing.v_display );
 		return B_ERROR;
 	}
@@ -516,11 +531,11 @@
 {
 	shared_info *si = ai->si;
 	
-	fp_info *fp_info = &si->flatpanels[0];
+	fp_info *fp_info = &si->flatpanels[0];	//todo fix the hardcoding what about ext dvi?
 	
-    if( (ai->vc->connected_displays & (dd_dvi | dd_lvds)) != 0 ) {
+    if( (ai->vc->connected_displays & (dd_dvi | dd_dvi_ext | dd_lvds)) != 0 ) {
     	display_mode mode;
-    	
+    	SHOW_FLOW0( 2, "" );
 		mode.virtual_width = mode.timing.h_display = fp_info->panel_xres;
 		mode.virtual_height = mode.timing.v_display = fp_info->panel_yres;
 		
@@ -631,14 +646,14 @@
 	Radeon_DetectMultiMode( vc, target );
 	Radeon_VerifyMultiMode( vc, si, target );
 	
-	SHOW_FLOW0( 3, "wished:" );
-	SHOW_FLOW( 3, "H: %4d %4d %4d %4d (v=%4d)", 
+	SHOW_FLOW0( 2, "wished:" );
+	SHOW_FLOW( 2, "H: %4d %4d %4d %4d (v=%4d)", 
 		target->timing.h_display, target->timing.h_sync_start, 
 		target->timing.h_sync_end, target->timing.h_total, target->virtual_width );
-	SHOW_FLOW( 3, "V: %4d %4d %4d %4d (h=%4d)", 
+	SHOW_FLOW( 2, "V: %4d %4d %4d %4d (h=%4d)", 
 		target->timing.v_display, target->timing.v_sync_start, 
 		target->timing.v_sync_end, target->timing.v_total, target->virtual_height );
-	SHOW_FLOW( 3, "clk: %ld", target->timing.pixel_clock );
+	SHOW_FLOW( 2, "clk: %ld", target->timing.pixel_clock );
 	
 	// we must assure that each ProposeMode call doesn't tweak the mode in
 	// a way that it cannot be handled by the other port anymore
@@ -659,14 +674,14 @@
 		result2 = B_OK;
 	}
 	
-	SHOW_INFO0( 4, "got:" );
-	SHOW_INFO( 4, "H: %4d %4d %4d %4d (v=%4d)", 
+	SHOW_INFO0( 2, "got:" );
+	SHOW_INFO( 2, "H: %4d %4d %4d %4d (v=%4d)", 
 		target->timing.h_display, target->timing.h_sync_start, 
 		target->timing.h_sync_end, target->timing.h_total, target->virtual_width );
-	SHOW_INFO( 4, "V: %4d %4d %4d %4d (h=%4d)", 
+	SHOW_INFO( 2, "V: %4d %4d %4d %4d (h=%4d)", 
 		target->timing.v_display, target->timing.v_sync_start, 
 		target->timing.v_sync_end, target->timing.v_total, target->virtual_height );
-	SHOW_INFO( 4, "clk: %ld", target->timing.pixel_clock );
+	SHOW_INFO( 2, "clk: %ld", target->timing.pixel_clock );
 
 	Radeon_HideMultiMode( vc, target );
 	

Modified: haiku/trunk/src/add-ons/accelerants/radeon/SetDisplayMode.c
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon/SetDisplayMode.c	2007-08-13 17:09:20 UTC (rev 21929)
+++ haiku/trunk/src/add-ons/accelerants/radeon/SetDisplayMode.c	2007-08-13 17:22:32 UTC (rev 21930)
@@ -23,11 +23,20 @@
 #include "fp_regs.h"
 #include "gpiopad_regs.h"
 
+#include "pll_regs.h"
+#include "tv_out_regs.h"
+#include "config_regs.h"
+#include "ddc_regs.h"
+#include "pll_access.h"
+#include "theatre_regs.h"
 #include "set_mode.h"
+#include "ddc.h"
 
+#include "set_mode.h"
+
 #include <string.h>
 
-void Radeon_SetMode( 
+status_t Radeon_SetMode( 
 	accelerator_info *ai, crtc_info *crtc, display_mode *mode, impactv_params *tv_params );
 
 // round virtual width up to next valid size
@@ -94,7 +103,7 @@
 
 // set display mode of one head;
 // port restrictions, like fixed-sync TFTs connected to it, are taken care of
-void Radeon_SetMode( 
+status_t Radeon_SetMode( 
 	accelerator_info *ai, crtc_info *crtc, display_mode *mode, impactv_params *tv_params )
 {
 	virtual_card *vc = ai->vc;
@@ -126,11 +135,26 @@
 	// is determined by the physical resolution; 
 	// also, all timing is fixed
 	if( (disp_devices & (dd_lvds | dd_dvi | dd_dvi_ext)) != 0 ) {
+		SHOW_FLOW0( 0, "requested resolution higher than native panel" );
 		if( mode->timing.h_display > fp_info->panel_xres )
 			mode->timing.h_display = fp_info->panel_xres;
 		if(	mode->timing.v_display > fp_info->panel_yres )
 			mode->timing.v_display = fp_info->panel_yres;
 		
+		if( (disp_devices & dd_dvi_ext) != 0 ) {
+			SHOW_FLOW0( 0, "requested resolution less than second native panel" );
+			if( mode->timing.h_display < fp_info->panel_xres )
+				mode->timing.h_display = fp_info->panel_xres;
+			if(	mode->timing.v_display < fp_info->panel_yres )
+				mode->timing.v_display = fp_info->panel_yres;
+
+			//TODO at this point we know we are going to do centered timing
+			//need to set flags to a. blank the unused memory, b.center screen
+			//for now it's in the top corner, and surrounded by garbage.
+			// although if the DVI panels are the same size and we are cloning
+			// we can switch the FP2 source to RMX, and drive both screens from
+			// the RMX unit.
+		}
 		mode->timing.h_total = mode->timing.h_display + fp_info->h_blank;
 		mode->timing.h_sync_start = mode->timing.h_display + fp_info->h_over_plus;
 		mode->timing.h_sync_end = mode->timing.h_sync_start + fp_info->h_sync_width;
@@ -254,6 +278,28 @@
 			Radeon_TheatreProgramTVRegisters( ai, &impactv_values );
 	}
 
+	// spit out some debug stuff in a radeontool stylee
+	SHOW_FLOW0( 0, "" );
+	SHOW_FLOW( 0, "RADEON_DAC_CNTL %08X ", INREG( regs, RADEON_DAC_CNTL ));
+	SHOW_FLOW( 0, "RADEON_DAC_CNTL2 %08X ", INREG( regs, RADEON_DAC_CNTL2 ));
+	SHOW_FLOW( 0, "RADEON_TV_DAC_CNTL %08X ", INREG( regs, RADEON_TV_DAC_CNTL ));
+	SHOW_FLOW( 0, "RADEON_DISP_OUTPUT_CNTL %08X ", INREG( regs, RADEON_DISP_OUTPUT_CNTL ));
+	SHOW_FLOW( 0, "RADEON_AUX_SC_CNTL %08X ", INREG( regs, RADEON_AUX_SC_CNTL ));
+	SHOW_FLOW( 0, "RADEON_CRTC_EXT_CNTL %08X ", INREG( regs, RADEON_CRTC_EXT_CNTL ));
+	SHOW_FLOW( 0, "RADEON_CRTC_GEN_CNTL %08X ", INREG( regs, RADEON_CRTC_GEN_CNTL ));
+	SHOW_FLOW( 0, "RADEON_CRTC2_GEN_CNTL %08X ", INREG( regs, RADEON_CRTC2_GEN_CNTL ));
+	SHOW_FLOW( 0, "RADEON_DISP_MISC_CNTL %08X ", INREG( regs, RADEON_DISP_MISC_CNTL ));
+	SHOW_FLOW( 0, "RADEON_FP_GEN_CNTL %08X ", INREG( regs, RADEON_FP_GEN_CNTL ));
+	SHOW_FLOW( 0, "RADEON_FP2_GEN_CNTL %08X ", INREG( regs, RADEON_FP2_GEN_CNTL ));
+	SHOW_FLOW( 0, "RADEON_LVDS_GEN_CNTL %08X ", INREG( regs, RADEON_LVDS_GEN_CNTL ));
+	SHOW_FLOW( 0, "RADEON_TMDS_PLL_CNTL %08X ", INREG( regs, RADEON_TMDS_PLL_CNTL ));
+	SHOW_FLOW( 0, "RADEON_TMDS_TRANSMITTER_CNTL %08X ", INREG( regs, RADEON_TMDS_TRANSMITTER_CNTL ));
+	SHOW_FLOW( 0, "RADEON_FP_H_SYNC_STRT_WID %08X ", INREG( regs, RADEON_FP_H_SYNC_STRT_WID ));
+	SHOW_FLOW( 0, "RADEON_FP_V_SYNC_STRT_WID %08X ", INREG( regs, RADEON_FP_V_SYNC_STRT_WID ));
+	SHOW_FLOW( 0, "RADEON_FP_H2_SYNC_STRT_WID %08X ", INREG( regs, RADEON_FP_H2_SYNC_STRT_WID ));
+	SHOW_FLOW( 0, "RADEON_FP_V2_SYNC_STRT_WID %08X ", INREG( regs, RADEON_FP_V2_SYNC_STRT_WID ));
+	// spit end
+
 	crtc->active_displays = disp_devices;
 	
 	// programming is over, so hardware can be used again
@@ -263,6 +309,8 @@
 	// TBD: this won't work if another virtual card was using it,
 	// but currently, virtual cards don't work anyway...
 	si->active_overlay.crtc_idx = -1;
+
+	return B_OK;
 }
 
 
@@ -432,6 +480,8 @@
 	{
 		routing_regs routing_values;
 		impactv_params tv_params;
+		status_t err1 , err2;
+		err1 = err2 = B_OK;
 	
 		// we first switch off all output, so the monitor(s) won't get invalid signals
 		if( vc->assigned_crtc[0] ) {
@@ -451,10 +501,14 @@
 	
 		// then change the mode
 		if( vc->used_crtc[0] )
-			Radeon_SetMode( ai, &si->crtc[0], &mode, &tv_params );
+			err1 = Radeon_SetMode( ai, &si->crtc[0], &mode, &tv_params );
 		if( vc->used_crtc[1] )
-			Radeon_SetMode( ai, &si->crtc[1], &mode, &tv_params );
+			err2 = Radeon_SetMode( ai, &si->crtc[1], &mode, &tv_params );
 			
+		
+		SHOW_FLOW( 2, "SetModes 1=%s, 2=%s", 
+			(err1 == B_OK) ? "OK" : "FAIL", (err2 == B_OK) ? "OK" : "FAIL");
+
 		// setup signal routing
 		Radeon_ReadMonitorRoutingRegs( ai, &routing_values );
 		Radeon_CalcMonitorRouting( ai, &tv_params, &routing_values );
@@ -462,9 +516,9 @@
 	   	
 		// finally, switch display(s) on
 		if( vc->used_crtc[0] )
-			Radeon_SetDPMS( ai, 0, B_DPMS_ON );
+			Radeon_SetDPMS( ai, 0, (err1 == B_OK) ? B_DPMS_ON : B_DPMS_SUSPEND );
 		if( vc->used_crtc[1] )
-			Radeon_SetDPMS( ai, 1, B_DPMS_ON );
+			Radeon_SetDPMS( ai, 1, (err2 == B_OK) ? B_DPMS_ON : B_DPMS_SUSPEND );
 			
 		OUTREGP( ai->regs, RADEON_CRTC_EXT_CNTL, 0, ~RADEON_CRTC_DISPLAY_DIS );
 	}

Modified: haiku/trunk/src/add-ons/accelerants/radeon/flat_panel.c
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon/flat_panel.c	2007-08-13 17:09:20 UTC (rev 21929)
+++ haiku/trunk/src/add-ons/accelerants/radeon/flat_panel.c	2007-08-13 17:22:32 UTC (rev 21930)
@@ -108,7 +108,7 @@
 	accelerator_info *ai, fp_regs *values )
 {
 	vuint8 *regs = ai->regs;
-
+	SHOW_FLOW0( 2, "" );
 	OUTREG( regs, RADEON_FP_HORZ_STRETCH, values->fp_horz_stretch );
 	OUTREG( regs, RADEON_FP_VERT_STRETCH, values->fp_vert_stretch );
 }
@@ -119,9 +119,11 @@
 {
 	vuint8 *regs = ai->regs;
 
-    values->fp_gen_cntl = INREG( regs, RADEON_FP_GEN_CNTL );
-    values->fp2_gen_cntl = INREG( regs, RADEON_FP2_GEN_CNTL );
-    values->lvds_gen_cntl = INREG( regs, RADEON_LVDS_GEN_CNTL );
+	values->fp_gen_cntl = INREG( regs, RADEON_FP_GEN_CNTL );
+	values->fp2_gen_cntl = INREG( regs, RADEON_FP2_GEN_CNTL );
+	values->lvds_gen_cntl = INREG( regs, RADEON_LVDS_GEN_CNTL );
+	values->tmds_pll_cntl = INREG( regs, RADEON_TMDS_PLL_CNTL );
+	values->tmds_trans_cntl = INREG( regs, RADEON_TMDS_TRANSMITTER_CNTL );
 	values->fp_h_sync_strt_wid = INREG( regs, RADEON_FP_H_SYNC_STRT_WID );
 	values->fp_v_sync_strt_wid = INREG( regs, RADEON_FP_V_SYNC_STRT_WID );
 	values->fp2_h_sync_strt_wid = INREG( regs, RADEON_FP_H2_SYNC_STRT_WID );
@@ -130,9 +132,14 @@
 	values->bios_5_scratch =  INREG( regs, RADEON_BIOS_5_SCRATCH );
 	values->bios_6_scratch =  INREG( regs, RADEON_BIOS_6_SCRATCH );
 
-    SHOW_FLOW( 2, "before: fp_gen_cntl=%08lx, horz=%08lx, vert=%08lx, lvds_gen_cntl=%08lx",
-    	values->fp_gen_cntl, values->fp_horz_stretch, values->fp_vert_stretch, 
-    	values->lvds_gen_cntl );
+	if (ai->si->asic == rt_rv280) {
+		// bit 22 of TMDS_PLL_CNTL is read-back inverted
+		values->tmds_pll_cntl ^= (1 << 22);
+	}
+
+	SHOW_FLOW( 2, "before: fp_gen_cntl=%08lx, horz=%08lx, vert=%08lx, lvds_gen_cntl=%08lx",
+    		values->fp_gen_cntl, values->fp_horz_stretch, values->fp_vert_stretch, 
+    		values->lvds_gen_cntl );
 }
 
 // calculcate flat panel crtc registers;
@@ -141,20 +148,27 @@
 	accelerator_info *ai, crtc_info *crtc, 
 	fp_info *fp_port, crtc_regs *crtc_values, fp_regs *values )
 {
+	int i;
+	uint32 tmp = values->tmds_pll_cntl & 0xfffff;
+
 	// setup synchronization position
 	// (most values are ignored according to fp_gen_cntl, but at least polarity
 	//  and pixel precise horizontal sync position are always used)
 	if( fp_port->is_fp2 ) {
+		SHOW_FLOW0( 2, "is_fp2" );
 		values->fp2_h_sync_strt_wid = crtc_values->crtc_h_sync_strt_wid;
 		values->fp2_v_sync_strt_wid = crtc_values->crtc_v_sync_strt_wid;
 	} else {
+		SHOW_FLOW0( 2, "fp1" );
 		values->fp_h_sync_strt_wid = crtc_values->crtc_h_sync_strt_wid;
 		values->fp_v_sync_strt_wid = crtc_values->crtc_v_sync_strt_wid;
 	}
 
-	if( fp_port->is_fp2 )
-		values->fp2_gen_cntl = 0;
-	else {
+	if( fp_port->is_fp2 ) {
+		// should retain POST values (esp bit 28)
+		values->fp2_gen_cntl &= (0xFFFF0000);
+
+	} else {
 		// setup magic CRTC shadowing 	
 		values->fp_gen_cntl &= 
 			~(RADEON_FP_RMX_HVSYNC_CONTROL_EN |
@@ -169,29 +183,64 @@
 			RADEON_FP_CRTC_DONT_SHADOW_HEND;
 	}
 	
+	for (i = 0; i < 4; i++) {
+		if (ai->si->tmds_pll[i].freq == 0) 
+			break;
+		if ((uint32)(fp_port->dot_clock) < ai->si->tmds_pll[i].freq) {
+			tmp = ai->si->tmds_pll[i].value ;
+			break;
+		}
+	}
+
+	if (IS_R300_VARIANT || (ai->si->asic == rt_rv280)) {
+		if (tmp & 0xfff00000) {
+			values->tmds_pll_cntl = tmp;
+		} else {
+			values->tmds_pll_cntl = ai->si->tmds_pll_cntl & 0xfff00000;
+			values->tmds_pll_cntl |= tmp;
+		}
+	} else {
+		values->tmds_pll_cntl = tmp;
+	}
+
+	values->tmds_trans_cntl = ai->si->tmds_transmitter_cntl 
+		& ~(RADEON_TMDS_TRANSMITTER_PLLRST);
+
+	if (IS_R300_VARIANT || (ai->si->asic == rt_r200) || (ai->si->num_crtc == 1))
+		values->tmds_trans_cntl &= ~(RADEON_TMDS_TRANSMITTER_PLLEN);
+	else // weird, RV chips got this bit reversed?
+		values->tmds_trans_cntl |= (RADEON_TMDS_TRANSMITTER_PLLEN);
+
+
 	// enable proper transmitter	
 	if( (crtc->chosen_displays & dd_lvds) != 0 ) {
 		// using LVDS means there cannot be a DVI monitor
+		SHOW_FLOW0( 2, "lvds" );
 		values->lvds_gen_cntl |= (RADEON_LVDS_ON | RADEON_LVDS_BLON);
 		values->fp_gen_cntl &= ~(RADEON_FP_FPON | RADEON_FP_TMDS_EN);
 		
 	} else if( !fp_port->is_fp2 ) {
 		// DVI on internal transmitter
+		SHOW_FLOW0( 2, "DVI INT" );
 		values->fp_gen_cntl |= RADEON_FP_FPON | RADEON_FP_TMDS_EN;
 		// enabling 8 bit data may be dangerous; BIOS should have taken care of that
 		values->fp_gen_cntl |= RADEON_FP_PANEL_FORMAT;
 		
 	} else {
 		// DVI on external transmitter
+		SHOW_FLOW0( 2, "DVI EXT" );
 		values->fp2_gen_cntl |= RADEON_FP2_FPON | RADEON_FP_PANEL_FORMAT;
 		values->fp2_gen_cntl &= ~RADEON_FP2_BLANK_EN;
 		
+		//hack in missing bits test...
+		//values->fp2_gen_cntl |= (1 << 22) | (1 << 28);
+
 		if( ai->si->asic >= rt_r200 )
 			values->fp2_gen_cntl |= RADEON_FP2_DV0_EN;
 	}
 		
-    SHOW_FLOW( 2, "after: fp_gen_cntl=%08lx, horz=%08lx, vert=%08lx, lvds_gen_cntl=%08lx",
-    	values->fp_gen_cntl, values->fp_horz_stretch, values->fp_vert_stretch, 
+    SHOW_FLOW( 2, "after: fp_gen_cntl=%08lx, fp2_gen_cntl=%08lx, horz=%08lx, vert=%08lx, lvds_gen_cntl=%08lx",
+    	values->fp_gen_cntl, values->fp2_gen_cntl, values->fp_horz_stretch, values->fp_vert_stretch, 
     	values->lvds_gen_cntl );
 }
 
@@ -209,11 +258,15 @@
 	OUTREGP( regs, RADEON_FP_GEN_CNTL, values->fp_gen_cntl, RADEON_FP_SEL_CRTC2 );
 
 	if( fp_port->is_fp2 ) {
+		SHOW_FLOW0( 2, "is_fp2" );
 		OUTREGP( regs, RADEON_FP2_GEN_CNTL, values->fp2_gen_cntl, 
+			~(RADEON_FP2_SOURCE_SEL_MASK | RADEON_FP2_SRC_SEL_MASK));
+		OUTREGP( regs, RADEON_FP2_GEN_CNTL, values->fp2_gen_cntl, 
 			RADEON_FP2_SOURCE_SEL_CRTC2 | RADEON_FP2_SRC_SEL_CRTC2 );
 		OUTREG( regs, RADEON_FP_H2_SYNC_STRT_WID, values->fp2_h_sync_strt_wid );
 		OUTREG( regs, RADEON_FP_V2_SYNC_STRT_WID, values->fp2_v_sync_strt_wid );
 	} else {
+		SHOW_FLOW0( 2, "is_fp1" );
 		OUTREG( regs, RADEON_FP_H_SYNC_STRT_WID, values->fp_h_sync_strt_wid );
 		OUTREG( regs, RADEON_FP_V_SYNC_STRT_WID, values->fp_v_sync_strt_wid );
 	}

Modified: haiku/trunk/src/add-ons/accelerants/radeon/monitor_detection.c
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon/monitor_detection.c	2007-08-13 17:09:20 UTC (rev 21929)
+++ haiku/trunk/src/add-ons/accelerants/radeon/monitor_detection.c	2007-08-13 17:22:32 UTC (rev 21930)
@@ -269,19 +269,19 @@
     	RADEON_DAC_FORCE_DATA_SEL_RGB |
     	(0x1b6 << RADEON_DAC_FORCE_DATA_SHIFT ));
     	
-    old_dac_cntl2 = INREG( regs, RADEON_DAC_CNTL2 );
+	old_dac_cntl2 = INREG( regs, RADEON_DAC_CNTL2 );
 
 	// enable CRT mode of TV-DAC and enable comparator    
-    tmp = old_dac_cntl2 | RADEON_DAC2_CLK_SEL_CRT | RADEON_DAC2_CMP_EN;
+	tmp = old_dac_cntl2 | RADEON_DAC2_CLK_SEL_CRT | RADEON_DAC2_CMP_EN;
     
-    OUTREG( regs, RADEON_DAC_CNTL2, tmp );
+	OUTREG( regs, RADEON_DAC_CNTL2, tmp );
     
-    snooze( 10000 );
+	snooze( 10000 );
     
-    // check connection of blue data signal to see whether there is a CRT
+	// check connection of blue data signal to see whether there is a CRT
 	found = (INREG( regs, RADEON_DAC_CNTL2 ) & RADEON_DAC2_CMP_OUT_B) != 0;
     
-    // clean up the mess
+	// clean up the mess
 	OUTREG( regs, RADEON_DAC_CNTL2, old_dac_cntl2 );
 	OUTREG( regs, RADEON_DAC_EXT_CNTL, 0 );
 	OUTREG( regs, RADEON_TV_DAC_CNTL, old_tv_dac_cntl );
@@ -289,7 +289,7 @@
 
 	OUTREGP( regs, RADEON_GPIOPAD_A, old_radeon_gpiopad_a, ~1 );
     
-    return found;
+	return found;
 }
 
 
@@ -800,9 +800,9 @@
 }
 	
 // read edid data of flat panel and setup its timing accordingly
-static status_t Radeon_StoreFPEDID( accelerator_info *ai, const edid1_info *edid )
+static status_t Radeon_StoreFPEDID( accelerator_info *ai, int port, const edid1_info *edid )
 {
-	fp_info *fp = &ai->si->flatpanels[0];
+	fp_info *fp = &ai->si->flatpanels[port];
 	uint32 max_hsize, max_vsize;
 
 	//SHOW_FLOW0( 2, "EDID data read from DVI port via DDC2:" );
@@ -954,10 +954,12 @@
 	// use DDC to detect monitors - if we can read DDC, there must be a monitor
 	for ( i = 0; i < 2; i++ )
 	{
-		if (routes->port_info[i].mon_type != mt_unknown ) {
-			SHOW_FLOW0( 2, "known type, skpping detection" );	
-			continue;
-		}
+		//TODO could skip edid reading instead if we already have it, but what
+		//if monitors have been hot swapped?  Also rely on edid for DVI-D detection
+		//if (routes->port_info[i].mon_type != mt_unknown ) {
+		//	SHOW_FLOW0( 2, "known type, skpping detection" );	
+		//	continue;
+		//}
 		
 		memset( &routes->port_info[i].edid , 0, sizeof(edid1_info) );
 		switch ( routes->port_info[i].ddc_type ) {
@@ -993,9 +995,10 @@
 				// both LDVS and TMDS are disable, we still need to treat it as a LVDS panel.
 				if ( routes->port_info[i].tmds_type == tmds_ext ){
 					// store info about DVI-connected flat-panel
-					if( Radeon_StoreFPEDID( ai, &routes->port_info[i].edid ) == B_OK ) {
+					if( Radeon_StoreFPEDID( ai, i, &routes->port_info[i].edid ) == B_OK ) {
 						SHOW_INFO0( 2, "Found Ext Laptop DVI" );
 						routes->port_info[i].mon_type = mt_dfp;
+						ai->si->flatpanels[i].is_fp2 = true;
 						displays |= dd_dvi_ext;
 					} else {
 						SHOW_ERROR0( 2, "Disabled Ext DVI - invalid EDID" );
@@ -1003,7 +1006,7 @@
 				} else {
 					if( INREG( ai->regs, RADEON_FP_GEN_CNTL) & (1 << 7) || ( !si->is_mobility ) ) {
 						// store info about DVI-connected flat-panel
-						if( Radeon_StoreFPEDID( ai, &routes->port_info[i].edid ) == B_OK ) {
+						if( Radeon_StoreFPEDID( ai, i, &routes->port_info[i].edid ) == B_OK ) {
 							SHOW_INFO0( 2, "Found DVI" );
 							routes->port_info[i].mon_type = mt_dfp;
 							displays |= dd_dvi;
@@ -1015,6 +1018,7 @@
 						routes->port_info[i].mon_type = mt_lcd;
 						displays |= dd_lvds;
 					}
+					ai->si->flatpanels[1].is_fp2 = FALSE;
 				}
 			} else {
 				// must be the analog portion of DVI
@@ -1049,7 +1053,7 @@
 		if ( si->is_mobility && (INREG( ai->regs, RADEON_FP2_GEN_CNTL) & RADEON_FP2_FPON)) {
 			SHOW_INFO0( 2, "Found Ext Laptop DVI" );
 			routes->port_info[1].mon_type = mt_dfp;
-			displays |= dd_dvi;
+			displays |= dd_dvi_ext;
 		}
 	}
 	

Modified: haiku/trunk/src/add-ons/accelerants/radeon/monitor_routing.c
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon/monitor_routing.c	2007-08-13 17:09:20 UTC (rev 21929)
+++ haiku/trunk/src/add-ons/accelerants/radeon/monitor_routing.c	2007-08-13 17:22:32 UTC (rev 21930)
@@ -634,9 +634,12 @@
 		else if( ai->si->num_crtc > 1 && (crtc2_displays & ~(dd_stv | dd_ctv)) == 0 && vc->assigned_crtc[1] )
 			crtc2_displays |= dd_tv_crt;
 	}
+
+	if( (display_devices & dd_dvi_ext) != 0 )
+		crtc2_displays |= dd_dvi_ext;
+
+	SHOW_FLOW( 2, "CRTC1: 0x%x, CRTC2: 0x%x", crtc1_displays, crtc2_displays );
 	
-	SHOW_FLOW( 3, "CRTC1: 0x%x, CRTC2: 0x%x", crtc1_displays, crtc2_displays );
-	
 	*crtc1 = crtc1_displays;
 	*crtc2 = crtc2_displays;
 }
@@ -651,7 +654,7 @@
 	shared_info *si = ai->si;
 	display_device_e display_devices = vc->connected_displays;
 
-	if (ai->si->settings.force_lcd) {	
+	if (ai->si->settings.force_lcd) {
 		use_laptop_panel = true;
 		SHOW_FLOW0( 2, 	"LCD Forced Used by Kernel Settings");
 	}

Modified: haiku/trunk/src/add-ons/accelerants/radeon/radeon_accelerant.h
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon/radeon_accelerant.h	2007-08-13 17:09:20 UTC (rev 21929)
+++ haiku/trunk/src/add-ons/accelerants/radeon/radeon_accelerant.h	2007-08-13 17:22:32 UTC (rev 21930)
@@ -32,7 +32,7 @@
 
 #define DEBUG_MSG_PREFIX "Radeon - "
 
-#define DEBUG_MAX_LEVEL_FLOW 2
+#define DEBUG_MAX_LEVEL_FLOW 3
 
 #include "debug_ext.h"
 

Modified: haiku/trunk/src/add-ons/accelerants/radeon/set_mode.h
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon/set_mode.h	2007-08-13 17:09:20 UTC (rev 21929)
+++ haiku/trunk/src/add-ons/accelerants/radeon/set_mode.h	2007-08-13 17:22:32 UTC (rev 21930)
@@ -98,17 +98,19 @@
 typedef struct {
 	uint32		fp_gen_cntl;
 	uint32		fp_panel_cntl;
-    uint32		lvds_gen_cntl;
+	uint32		lvds_gen_cntl;
+	uint32		tmds_pll_cntl;
+	uint32		tmds_trans_cntl;
 	uint32		fp_h_sync_strt_wid;
 	uint32		fp_v_sync_strt_wid;
 	uint32		fp2_gen_cntl;
     
-    uint32		fp2_h_sync_strt_wid;
+	uint32		fp2_h_sync_strt_wid;
 	uint32		fp2_v_sync_strt_wid;
 	
 	// RMX registers
 	uint32		fp_horz_stretch;
-    uint32		fp_vert_stretch;
+	uint32		fp_vert_stretch;
 
 	// Bios values used by Mobility Asics
 	uint32		bios_4_scratch;

Modified: haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/bios.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/bios.c	2007-08-13 17:09:20 UTC (rev 21929)
+++ haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/bios.c	2007-08-13 17:22:32 UTC (rev 21930)
@@ -31,14 +31,33 @@
 
 #define RADEON_BIOS8(v) 	 (di->rom.rom_ptr[v])
 #define RADEON_BIOS16(v) 	((di->rom.rom_ptr[v]) | \
-						  	 (di->rom.rom_ptr[(v) + 1] << 8))
+				(di->rom.rom_ptr[(v) + 1] << 8))
 #define RADEON_BIOS32(v) 	((di->rom.rom_ptr[v]) | \
-							 (di->rom.rom_ptr[(v) + 1] << 8) \
-							 (di->rom.rom_ptr[(v) + 2] << 16) \
-							 (di->rom.rom_ptr[(v) + 3] << 24))
+				(di->rom.rom_ptr[(v) + 1] << 8) | \
+				(di->rom.rom_ptr[(v) + 2] << 16) | \
+				(di->rom.rom_ptr[(v) + 3] << 24))
 
 static const char ati_rom_sig[] = "761295520";
 
+static const tmds_pll_info default_tmds_pll[14][4] =
+{
+    {{12000, 0xa1b}, {0xffffffff, 0xa3f}, {0, 0}, {0, 0}},			// r100
+    {{12000, 0xa1b}, {0xffffffff, 0xa3f}, {0, 0}, {0, 0}},			// rv100
+    {{0, 0}, {0, 0}, {0, 0}, {0, 0}},						// rs100
+    {{15000, 0xa1b}, {0xffffffff, 0xa3f}, {0, 0}, {0, 0}},			// rv200
+    {{12000, 0xa1b}, {0xffffffff, 0xa3f}, {0, 0}, {0, 0}},			// rs200
+    {{15000, 0xa1b}, {0xffffffff, 0xa3f}, {0, 0}, {0, 0}},			// r200
+    {{15500, 0x81b}, {0xffffffff, 0x83f}, {0, 0}, {0, 0}},			// rv250
+    {{0, 0}, {0, 0}, {0, 0}, {0, 0}},						// rs300
+    {{13000, 0x400f4}, {15000, 0x400f7}, {0xffffffff, 0x40111}, {0, 0}}, 	// rv280
+    {{0xffffffff, 0xb01cb}, {0, 0}, {0, 0}, {0, 0}},				// r300
+    {{0xffffffff, 0xb01cb}, {0, 0}, {0, 0}, {0, 0}},				// r350
+    {{15000, 0xb0155}, {0xffffffff, 0xb01cb}, {0, 0}, {0, 0}},			// rv350
+    {{15000, 0xb0155}, {0xffffffff, 0xb01cb}, {0, 0}, {0, 0}},			// rv380
+    {{0xffffffff, 0xb01cb}, {0, 0}, {0, 0}, {0, 0}},				// r420
+};
+
+
 // find address of ROM;
 // this code is really nasty as maintaining the radeon signatures
 // is almost impossible (the signatures provided by ATI are always out-dated);
@@ -691,7 +710,109 @@
 		>> RADEON_CRTC_V_SYNC_WID_SHIFT);
 }
 
+//snaffled from X.org hope it works...
+static void Radeon_GetTMDSInfoFromBios( device_info *di )
+{
+    uint32 tmp, maxfreq;
+    uint32 found = FALSE;
+    int i, n;
+    uint16 bios_header;
 
+    bios_header = RADEON_BIOS16( 0x48 );
+
+	for (i = 0; i < 4; i++) {
+        di->tmds_pll[i].value = 0;
+        di->tmds_pll[i].freq = 0;
+    }
+    
+	if (di->is_atombios)
+	{
+		int master_data_start;
+		master_data_start = RADEON_BIOS16( bios_header + 32 );
+		
+		if((tmp = RADEON_BIOS16 (master_data_start + 18))) {
+	
+		    maxfreq = RADEON_BIOS16(tmp + 4);
+		    
+		    for (i = 0; i < 4; i++) {
+				di->tmds_pll[i].freq = RADEON_BIOS16(tmp + i * 6 + 6);
+				// This assumes each field in TMDS_PLL has 6 bit as in R300/R420
+				di->tmds_pll[i].value = ((RADEON_BIOS8(tmp + i * 6 + 8) & 0x3f) |
+				   ((RADEON_BIOS8(tmp + i * 6 + 10) & 0x3f) << 6) |
+				   ((RADEON_BIOS8(tmp + i * 6 +  9) & 0xf) << 12) |
+				   ((RADEON_BIOS8(tmp + i * 6 + 11) & 0xf) << 16));
+				SHOW_ERROR( 2, "TMDS PLL from BIOS: %ld %lx", 
+				   di->tmds_pll[i].freq, di->tmds_pll[i].value);
+				       
+				if (maxfreq == di->tmds_pll[i].freq) {
+				    di->tmds_pll[i].freq = 0xffffffff;
+				    break;
+				}
+		    }
+		    found = TRUE;
+		}
+    } else {
+
+		tmp = RADEON_BIOS16(bios_header + 0x34);
+		if (tmp) {
+		    SHOW_ERROR( 2, "DFP table revision: %d", RADEON_BIOS8(tmp));
+		    if (RADEON_BIOS8(tmp) == 3) {
+				n = RADEON_BIOS8(tmp + 5) + 1;
+				if (n > 4) 
+					n = 4;
+				for (i = 0; i < n; i++) {
+					di->tmds_pll[i].value = RADEON_BIOS32(tmp + i * 10 + 0x08);
+					di->tmds_pll[i].freq = RADEON_BIOS16(tmp + i * 10 + 0x10);
+				}
+				found = TRUE;
+		    } else if (RADEON_BIOS8(tmp) == 4) {
+		        int stride = 0;
+				n = RADEON_BIOS8(tmp + 5) + 1;
+				if (n > 4) 
+					n = 4;
+				for (i = 0; i < n; i++) {
+				    di->tmds_pll[i].value = RADEON_BIOS32(tmp + stride + 0x08);
+				    di->tmds_pll[i].freq = RADEON_BIOS16(tmp + stride + 0x10);
+				    if (i == 0) 
+				    	stride += 10;
+				    else 
+				    	stride += 6;
+				}
+				found = TRUE;
+		    }
+	
+		    // revision 4 has some problem as it appears in RV280, 
+		    // comment it off for now, use default instead    
+			/*
+				else if (RADEON_BIOS8(tmp) == 4) {
+				int stride = 0;
+				n = RADEON_BIOS8(tmp + 5) + 1;
+				if (n > 4) n = 4;
+				for (i = 0; i < n; i++) {
+					di->tmds_pll[i].value = RADEON_BIOS32(tmp + stride + 0x08);
+					di->tmds_pll[i].freq = RADEON_BIOS16(tmp + stride + 0x10);
+					if (i == 0) 
+						stride += 10;
+					else 
+						stride += 6;
+				}
+				found = TRUE;
+			}
+			*/
+		    
+		}
+    }
+    
+    if (found == FALSE) {
+    	for (i = 0; i < 4; i++) {
+	        di->tmds_pll[i].value = default_tmds_pll[di->asic][i].value;
+	        di->tmds_pll[i].freq = default_tmds_pll[di->asic][i].freq;
+	        SHOW_ERROR( 2, "TMDS PLL from DEFAULTS: %ld %lx", 
+				di->tmds_pll[i].freq, di->tmds_pll[i].value);
+    	}
+    }
+}
+
 /*
 // get everything in terms of monitors connected to the card
 static void Radeon_GetBIOSMon( device_info *di )
@@ -964,6 +1085,12 @@
 	di->routing.port_info[0].dac_type = dac_unknown;
 	di->routing.port_info[0].tmds_type = tmds_unknown;
 	di->routing.port_info[0].connector_type = connector_none;
+
+	di->routing.port_info[1].mon_type = mt_unknown;
+	di->routing.port_info[1].ddc_type = ddc_none_detected;
+	di->routing.port_info[1].dac_type = dac_unknown;
+	di->routing.port_info[1].tmds_type = tmds_unknown;
+	di->routing.port_info[1].connector_type = connector_none;
 	
 	if ( !Radeon_GetConnectorInfoFromBIOS( di ) )
 	{
@@ -981,6 +1108,7 @@
 
 	}
 	Radeon_GetFPData( di );
+	Radeon_GetTMDSInfoFromBios( di );
 	Radeon_DetectRAM( di );
 	
 	Radeon_UnmapDevice( di );

Modified: haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/init.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/init.c	2007-08-13 17:09:20 UTC (rev 21929)
+++ haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/init.c	2007-08-13 17:22:32 UTC (rev 21930)
@@ -15,6 +15,7 @@
 */
 
 #include "dac_regs.h"
+#include "tv_out_regs.h"
 #include "fp_regs.h"
 #include "mmio.h"
 #include "radeon_driver.h"
@@ -266,20 +267,17 @@
 	// so we let the first accelerant take care of it
 	si->theatre_channel = -1;
 	
-/*	si->ports[0].disp_type = di->disp_type[0];
-	si->ports[1].disp_type = di->disp_type[1];*/
 	si->crtc[0].crtc_idx = 0;
 	si->crtc[0].flatpanel_port = 0;
 	si->crtc[1].crtc_idx = 1;
 	si->crtc[1].flatpanel_port = 1;
 	si->num_crtc = di->num_crtc;
 	
-	si->flatpanels[0] = di->fp_info;
+	if (di->is_mobility)
+		si->flatpanels[0] = di->fp_info;
+
 	si->pll = di->pll;
-/*	si->ram = di->ram;
-	strcpy( si->ram_type, di->ram_type );*/
-	//si->local_mem_size = di->local_mem_size;
-		
+
 	// create virtual card info; don't allow access by apps -
 	// they'll clone it 
 	sprintf( buffer, "%04X_%04X_%02X%02X%02X virtual card 0",
@@ -306,7 +304,7 @@
 	di->vc->assigned_crtc[0] = true;
 	di->vc->assigned_crtc[1] = si->num_crtc > 1;
 	di->vc->controlled_displays = 
-		dd_tv_crt | dd_crt | dd_lvds | dd_dvi | dd_ctv | dd_stv;
+		dd_tv_crt | dd_crt | dd_lvds | dd_dvi | dd_dvi_ext | dd_ctv | dd_stv;
 
 	di->vc->fb_mem_handle = 0;
 	di->vc->cursor.mem_handle = 0;
@@ -324,13 +322,21 @@
 	if( di->asic == rt_rv100 && di->is_mobility)
 		di->dac2_cntl = INREG( di->regs, RADEON_DAC_CNTL2 );
 	
+	memcpy(&si->tmds_pll, &di->tmds_pll, sizeof(di->tmds_pll));
+	si->tmds_pll_cntl = INREG( di->regs, RADEON_TMDS_PLL_CNTL);
+	si->tmds_transmitter_cntl = INREG( di->regs, RADEON_TMDS_TRANSMITTER_CNTL);
+
 	// print these out to capture bios status...
-	if ( di->is_mobility ) {
-		SHOW_INFO0( 4, "Copy of Laptop Display Regs for Reference:");
-		SHOW_INFO( 4, "LVDS CNTL = %8lx", INREG( di->regs, RADEON_LVDS_GEN_CNTL ));
-		SHOW_INFO( 4, "FP1  CNTL = %8lx", INREG( di->regs, RADEON_FP_GEN_CNTL ));
-		SHOW_INFO( 4, "FP2  CNTL = %8lx", INREG( di->regs, RADEON_FP2_GEN_CNTL ));
-	}
+//	if ( di->is_mobility ) {
+		SHOW_INFO0( 2, "Copy of Laptop Display Regs for Reference:");
+		SHOW_INFO( 2, "LVDS GEN = %8lx", INREG( di->regs, RADEON_LVDS_GEN_CNTL ));
+		SHOW_INFO( 2, "LVDS PLL = %8lx", INREG( di->regs, RADEON_LVDS_PLL_CNTL ));
+		SHOW_INFO( 2, "TMDS PLL = %8lx", INREG( di->regs, RADEON_TMDS_PLL_CNTL ));
+		SHOW_INFO( 2, "TMDS TRANS = %8lx", INREG( di->regs, RADEON_TMDS_TRANSMITTER_CNTL ));
+		SHOW_INFO( 2, "FP1 GEN = %8lx", INREG( di->regs, RADEON_FP_GEN_CNTL ));
+		SHOW_INFO( 2, "FP2 GEN = %8lx", INREG( di->regs, RADEON_FP2_GEN_CNTL ));
+		SHOW_INFO( 2, "TV DAC = %8lx", INREG( di->regs, RADEON_TV_DAC_CNTL )); //not setup right when ext dvi
+//	}
 	
 	result = Radeon_InitPCIGART( di );
 	if( result < 0 )

Modified: haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/radeon_driver.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/radeon_driver.h	2007-08-13 17:09:20 UTC (rev 21929)
+++ haiku/trunk/src/add-ons/kernel/drivers/graphics/radeon/radeon_driver.h	2007-08-13 17:22:32 UTC (rev 21930)
@@ -116,6 +116,7 @@
 	disp_entity	routing;
 	
 	general_pll_info pll;
+	tmds_pll_info 	 tmds_pll[4];
 	ram_info	ram;	
 	char		ram_type[32];	// human-readable name of ram type
 	uint32		local_mem_size;



From laplace at mail.berlios.de  Mon Aug 13 19:39:21 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Mon, 13 Aug 2007 19:39:21 +0200
Subject: [Haiku-commits] r21931 -
	haiku/trunk/src/tests/kits/interface/flatten_picture
Message-ID: <200708131739.l7DHdLB2020113@sheep.berlios.de>

Author: laplace
Date: 2007-08-13 19:39:21 +0200 (Mon, 13 Aug 2007)
New Revision: 21931
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21931&view=rev

Modified:
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp
Log:
Added graphics state related tests.
BTW two tests reveal bugs in BeOS :-p


Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-13 17:22:32 UTC (rev 21930)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-13 17:39:21 UTC (rev 21931)
@@ -309,20 +309,6 @@
 	view->EndLineArray();
 }
 
-static void testCopyBits(BView *view, BRect frame)
-{
-	frame.InsetBy(2, 2);
-	BRect leftHalf(frame);
-	leftHalf.right = centerPoint(frame).x - 1;
-	
-	BRect rightHalf(frame);
-	rightHalf.left = centerPoint(frame).x + 1;
-	
-	view->StrokeRect(leftHalf);
-	
-	view->CopyBits(leftHalf, rightHalf);
-}
-
 static void testInvertRect(BView *view, BRect frame)
 {
 	frame.InsetBy(2, 2);
@@ -345,6 +331,220 @@
 	view->DrawBitmap(&bitmap, BPoint(0, 0));
 }
 
+static void testConstrainClippingRegion(BView *view, BRect frame) 
+{
+	frame.InsetBy(2, 2);
+	// draw background
+	view->SetHighColor(kRed);
+	view->FillRect(frame);
+	
+	frame.InsetBy(1, 1);
+	BRegion region(frame);
+	BRect r(frame);
+	r.InsetBy(r.IntegerWidth() / 4, r.IntegerHeight() / 4);
+	region.Exclude(r);
+	view->ConstrainClippingRegion(&region);
+	
+	frame.InsetBy(-1, -1);
+	view->SetHighColor(kBlack);
+	view->FillRect(frame);
+	// a filled black rectangle with a red one pixel border
+	// and inside a red rectangle should be drawn.
+}
+
+static void testClipToPicture(BView *view, BRect frame) 
+{
+	frame.InsetBy(2, 2);
+	
+	view->BeginPicture(new BPicture());
+	view->FillEllipse(frame);
+	BPicture *picture = view->EndPicture();
+	if (picture == NULL)
+		return;
+	
+	view->ClipToPicture(picture);
+	delete picture;
+	
+	view->FillRect(frame);
+	// black ellipse should be drawn
+}
+
+static void testClipToInversePicture(BView *view, BRect frame) 
+{
+	frame.InsetBy(2, 2);
+	
+	view->BeginPicture(new BPicture());
+	view->FillEllipse(frame);
+	BPicture *picture = view->EndPicture();
+	if (picture == NULL)
+		return;
+	
+	view->ClipToInversePicture(picture);
+	delete picture;
+	
+	view->FillRect(frame);
+	// white ellipse inside a black rectangle
+}
+
+static void testSetPenSize(BView *view, BRect frame)
+{
+	frame.InsetBy(8, 2);
+	float x = centerPoint(frame).x;
+	
+	view->StrokeLine(BPoint(frame.left, frame.top), BPoint(frame.right, frame.top));
+	
+	frame.OffsetBy(0, 5);
+	view->SetPenSize(1);
+	view->StrokeLine(BPoint(frame.left, frame.top), BPoint(x, frame.top));
+	view->SetPenSize(0);
+	view->StrokeLine(BPoint(x+1, frame.top), BPoint(frame.right, frame.top));
+
+	frame.OffsetBy(0, 5);
+	view->SetPenSize(1);
+	view->StrokeLine(BPoint(frame.left, frame.top), BPoint(x, frame.top));
+	view->SetPenSize(2);
+	view->StrokeLine(BPoint(x+1, frame.top), BPoint(frame.right, frame.top));
+
+	frame.OffsetBy(0, 5);
+	view->SetPenSize(1);
+	view->StrokeLine(BPoint(frame.left, frame.top), BPoint(x, frame.top));
+	view->SetPenSize(3);
+	view->StrokeLine(BPoint(x+1, frame.top), BPoint(frame.right, frame.top));
+
+	frame.OffsetBy(0, 5);
+	view->SetPenSize(1);
+	view->StrokeLine(BPoint(frame.left, frame.top), BPoint(x, frame.top));
+	view->SetPenSize(4);
+	view->StrokeLine(BPoint(x+1, frame.top), BPoint(frame.right, frame.top));
+}
+
+static void testSetPenSize2(BView *view, BRect frame)
+{
+	// test if pen size is scaled too
+	frame.InsetBy(2, 2);
+	frame.OffsetBy(0, 5);
+	view->SetPenSize(4);
+	view->StrokeLine(BPoint(frame.left, frame.top), BPoint(frame.right, frame.top));
+	view->SetScale(0.5);
+	view->StrokeLine(BPoint(frame.left + 2, frame.bottom), BPoint(frame.right + 2, frame.bottom));	
+	
+	// black line from left to right, 4 pixel size
+	// below black line with half the length of the first one
+	// and 2 pixel size
+}
+
+static void testPattern(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	int x = frame.IntegerWidth() / 3;
+	frame.right = frame.left + x - 2;
+		// -2 for an empty pixel row between 
+		// filled rectangles
+
+	view->SetLowColor(kGreen);
+	view->SetHighColor(kRed);
+	
+	view->FillRect(frame, B_SOLID_HIGH);
+	
+	frame.OffsetBy(x, 0);
+	view->FillRect(frame, B_MIXED_COLORS);
+	
+	frame.OffsetBy(x, 0);
+	view->FillRect(frame, B_SOLID_LOW);
+}
+
+static void testSetOrigin(BView *view, BRect frame)
+{
+	BPoint origin = view->Origin();
+	BPoint center = centerPoint(frame);
+	view->SetOrigin(center);
+
+	BRect r(0, 0, center.x, center.y);
+	view->SetHighColor(kBlue);
+	view->FillRect(r);
+	
+	view->SetOrigin(origin);
+	view->SetHighColor(kRed);
+	view->FillRect(r);
+	
+	// red rectangle in left, top corner
+	// blue rectangle in right, bottom corner
+	// the red rectangle overwrites the
+	// top, left pixel of the blue rectangle
+}
+
+static void testSetOrigin2(BView *view, BRect frame)
+{
+	BPoint center = centerPoint(frame);
+	BRect r(0, 0, center.x, center.y);
+	view->SetOrigin(center);
+	view->PushState();
+		view->SetOrigin(BPoint(-center.x, 0));
+		view->FillRect(r);
+	view->PopState();	
+	// black rectangle in left, bottom corner
+}
+
+static void testSetScale(BView *view, BRect frame)
+{
+	view->SetScale(0.5);
+	view->FillRect(frame);
+	// black rectangle in left, top corner
+}
+
+static void testSetScale2(BView *view, BRect frame)
+{
+	view->SetScale(0.5);
+	view->PushState();
+		view->SetScale(0.5);
+		view->FillRect(frame);
+	view->PopState();	
+	// black rectangle in left, top corner
+	// with half the size of the rectangle
+	// from test testSetScaling
+}
+
+static void testSetScale3(BView *view, BRect frame)
+{
+	view->SetScale(0.5);
+	view->PushState();
+		// if the second scale value differs slightly
+		// the bug under BeOS R5 in testSetScale2 
+		// does not occur
+		view->SetScale(0.5000001);
+		view->FillRect(frame);
+	view->PopState();	
+	// black rectangle in left, top corner
+	// with half the size of the rectangle
+	// from test testSetScaling
+}
+
+static void testSetFontSize(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	int size = frame.IntegerHeight() / 3;
+	
+	frame.OffsetBy(0, size);
+	view->MovePenTo(BPoint(frame.left, frame.top));
+	view->SetFontSize(size);
+	view->DrawString("Haiku");
+	
+	size *= 2;	
+	frame.OffsetBy(0, size);
+	view->MovePenTo(BPoint(frame.left, frame.top));
+	view->SetFontSize(size);
+	view->DrawString("Haiku");	
+}
+
+// TODO
+// - drawing mode
+// - blending mode
+// - line mode
+// - push/pop state
+// - move pen
+// - set font
+
+
 TestCase gTestCases[] = {
 	{ "Test No Operation", testNoOp },
 	{ "Test DrawChar", testDrawChar },
@@ -352,6 +552,8 @@
 	{ "Test Draw String With Length", testDrawStringWithLength },
 	{ "Test FillArc", testFillArc },
 	{ "Test StrokeArc", testStrokeArc },
+	// testFillBezier fails under BeOS because the
+	// direct draw version is not correct
 	{ "Test FillBezier", testFillBezier },
 	{ "Test StrokeBezier", testStrokeBezier },
 	{ "Test FillEllipse", testFillEllipse },
@@ -373,11 +575,22 @@
 	{ "Test Record And Play Picture With Offset", testRecordAndPlayPictureWithOffset },
 	{ "Test AppendToPicture", testAppendToPicture },
 	{ "Test LineArray", testLineArray },
-	// does not work under R5 for pictures!
-	// TODO verify that CopyBits is not supported when recording to a BPicture
-	// { "Test CopyBits*", testCopyBits },
 	{ "Test InvertRect", testInvertRect },
 	{ "Test Bitmap", testBitmap },
+	{ "Test ConstrainClippingRegion", testConstrainClippingRegion }, 
+	{ "Test ClipToPicture", testClipToPicture },
+	{ "Test ClipToInversePicture", testClipToInversePicture },
+	{ "Test SetPenSize", testSetPenSize },
+	{ "Test SetPenSize2", testSetPenSize2 },
+	{ "Test Pattern", testPattern },
+	{ "Test SetOrigin", testSetOrigin },
+	{ "Test SetOrigin2", testSetOrigin2 },
+	{ "Test SetScale", testSetScale },
+	// testSetScale2 fails under BeOS. The picture versions of the
+	// rectangle are twice as large as the direct draw version
+	{ "Test SetScale2*", testSetScale2 },
+	{ "Test SetScale3", testSetScale3 },
+	{ "Test SetFontSize", testSetFontSize },
 	{ NULL, NULL }
 };
 

Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp	2007-08-13 17:22:32 UTC (rev 21930)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestWindow.cpp	2007-08-13 17:39:21 UTC (rev 21931)
@@ -144,6 +144,8 @@
 		fListView->AddItem(new BStringItem(text.String()));
 		RunTests(testIndex, colorSpaces, n);
 	}
+		
+	UpdateHeader();
 }
 
 void 
@@ -216,7 +218,5 @@
 		fNumberOfTests ++;
 		if (!ok)
 			fFailedTests ++;
-		
-		UpdateHeader();
 	}
 }



From korli at mail.berlios.de  Mon Aug 13 19:40:38 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Mon, 13 Aug 2007 19:40:38 +0200
Subject: [Haiku-commits] r21932 - haiku/trunk/src/build/libbe/app
Message-ID: <200708131740.l7DHecRL020203@sheep.berlios.de>

Author: korli
Date: 2007-08-13 19:40:37 +0200 (Mon, 13 Aug 2007)
New Revision: 21932
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21932&view=rev

Modified:
   haiku/trunk/src/build/libbe/app/MessageAdapter.cpp
Log:
x86-64 build


Modified: haiku/trunk/src/build/libbe/app/MessageAdapter.cpp
===================================================================
--- haiku/trunk/src/build/libbe/app/MessageAdapter.cpp	2007-08-13 17:39:21 UTC (rev 21931)
+++ haiku/trunk/src/build/libbe/app/MessageAdapter.cpp	2007-08-13 17:40:37 UTC (rev 21932)
@@ -341,7 +341,7 @@
 	r5header->flags = flags;
 
 	// store the header size - used for the checksum later
-	ssize_t headerSize = (uint32)pointer - (uint32)buffer;
+	ssize_t headerSize = (addr_t)pointer - (addr_t)buffer;
 
 	// collect and add the data
 	BMessage::field_header *field = messagePrivate.GetMessageFields();
@@ -417,7 +417,7 @@
 	pointer++;
 
 	// calculate the flattened size from the pointers
-	r5header->flattened_size = (uint32)pointer - (uint32)buffer;
+	r5header->flattened_size = (addr_t)pointer - (addr_t)buffer;
 	r5header->checksum = CalculateChecksum((uint8 *)(buffer + 8),
 		headerSize - 8);
 



From korli at mail.berlios.de  Mon Aug 13 19:54:46 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Mon, 13 Aug 2007 19:54:46 +0200
Subject: [Haiku-commits] r21933 - haiku/trunk/src/kits/interface
Message-ID: <200708131754.l7DHskxI021367@sheep.berlios.de>

Author: korli
Date: 2007-08-13 19:54:45 +0200 (Mon, 13 Aug 2007)
New Revision: 21933
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21933&view=rev

Modified:
   haiku/trunk/src/kits/interface/View.cpp
Log:
fixed build


Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2007-08-13 17:40:37 UTC (rev 21932)
+++ haiku/trunk/src/kits/interface/View.cpp	2007-08-13 17:54:45 UTC (rev 21933)
@@ -3114,7 +3114,7 @@
 		if (token == -1) {
 			BeginPicture(picture);
 		} else {
-			picture->set_token(-1);
+			picture->SetToken(-1);
 			picture->Usurp(cpicture);
 			cpicture = picture;			
 			fOwner->fLink->StartMessage(AS_LAYER_APPEND_TO_PICTURE);



From superstippi at gmx.de  Mon Aug 13 20:10:22 2007
From: superstippi at gmx.de (Stephan Assmus)
Date: Mon, 13 Aug 2007 20:10:22 +0200
Subject: [Haiku-commits] r21930 - in haiku/trunk:
 headers/private/graphics/radeon src/add-ons/accelerants/radeon
 src/add-ons/kernel/drivers/graphics/radeon
In-Reply-To: <200708131722.l7DHMY7L018999@sheep.berlios.de>
References: <200708131722.l7DHMY7L018999@sheep.berlios.de>
Message-ID: <20070813201022.3808.9@stippis.WG>

Hi Axel,

> Log:
> Committed patch by Euan Kirkhope to improve routing problems with Radeon 
> cards;
> this should fix bug #1293.
> I've tested it here on two machines, one works better now, the other stayed 
> the
> same (Radeon 9250, and a laptop FireGL (id 4c66) version). This apparently 
> also fixed bug #1394.

By "better" do you mean the DVI connector on your T40p docking station 
started working? :-)

BTW, thanks a lot Euan!

Best regards,
-Stephan


From axeld at pinc-software.de  Mon Aug 13 21:07:32 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 13 Aug 2007 21:07:32 +0200
Subject: [Haiku-commits] r21930 - in haiku/trunk:
 headers/private/graphics/radeon src/add-ons/accelerants/radeon
 src/add-ons/kernel/drivers/graphics/radeon
In-Reply-To: <20070813201022.3808.9@stippis.WG>
Message-ID: <8319391801-BeMail@ibm>

Hi Stephan,

Stephan Assmus <superstippi at gmx.de> wrote:
> > Committed patch by Euan Kirkhope to improve routing problems with 
> > Radeon 
> > cards;
> > this should fix bug #1293.
> > I've tested it here on two machines, one works better now, the 
> > other stayed 
> > the
> > same (Radeon 9250, and a laptop FireGL (id 4c66) version). This 
> > apparently 
> > also fixed bug #1394.
> By "better" do you mean the DVI connector on your T40p docking 
> station 
> started working? :-)

No, actually, my desktop machine is now routing the graphics output to 
DVI (which it didn't do before, anymore). The T40p situation hasn't 
changed: internal is working, external VGA is working, TV is working, 
but the DVI connector from the docking station is not.

Bye,
   Axel.



From axeld at pinc-software.de  Mon Aug 13 21:15:13 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 13 Aug 2007 21:15:13 +0200
Subject: [Haiku-commits] r21929 - in
 haiku/trunk/src/servers/app/drawing: . Painter Painter/drawing_modes
In-Reply-To: <20070813191527.3602.8@stippis.WG>
Message-ID: <8780506405-BeMail@ibm>

Stephan Assmus <superstippi at gmx.de> wrote:
> > Log:
> > * implemented a lock up table for drawing text in B_OP_COPY,
> >   maybe this is too resource hungry, feel free to critisize... :-)
> Err, in case you wondered. The purpose of a "lock up table" is to 
> provide 
> quick access to different ways to lock up the app_server/system. When 
> drawing 
> strings, the app_server will chose a different way of locking up 
> spectacularily by buildig a hash over the string and chosing one of 
> the 
> methods in the table. Just wanted to clear this up.

Hehe :-)

Bye,
   Axel.



From mmlr at mail.berlios.de  Mon Aug 13 21:27:18 2007
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Mon, 13 Aug 2007 21:27:18 +0200
Subject: [Haiku-commits] r21934 - haiku/trunk/src/apps/fontdemo
Message-ID: <200708131927.l7DJRI9I028901@sheep.berlios.de>

Author: mmlr
Date: 2007-08-13 21:27:17 +0200 (Mon, 13 Aug 2007)
New Revision: 21934
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21934&view=rev

Modified:
   haiku/trunk/src/apps/fontdemo/ControlView.cpp
Log:
Fix off by one error in FontDemo. Should fix bug #1393.

Modified: haiku/trunk/src/apps/fontdemo/ControlView.cpp
===================================================================
--- haiku/trunk/src/apps/fontdemo/ControlView.cpp	2007-08-13 17:54:45 UTC (rev 21933)
+++ haiku/trunk/src/apps/fontdemo/ControlView.cpp	2007-08-13 19:27:17 UTC (rev 21934)
@@ -339,7 +339,7 @@
 		 		else {
 		 			fFontStyleindex = 0;
 
-		 			if (familyindex < count_font_families())
+		 			if (familyindex < count_font_families() - 1)
 				 		familyindex++;
 				 	else
 			 			familyindex = 0;



From axeld at pinc-software.de  Mon Aug 13 21:29:43 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Mon, 13 Aug 2007 21:29:43 +0200
Subject: [Haiku-commits] r21915 - haiku/trunk/src/servers/debug
In-Reply-To: <894b9700708131004s26df4642m51a0144210bf7dcb@mail.gmail.com>
Message-ID: <9650407619-BeMail@ibm>

"Stefano Ceccherini" <stefano.ceccherini at gmail.com> wrote:
> 2007/8/13, Ingo Weinhold <bonefish at cs.tu-berlin.de>:
> > Either the Terminal has to escape the argument vector elements when 
> > joining
> > them in ArgvReceived() and deescape in Shell::_Spawn(). Or it has 
> > to pass
> > argument vectors around.
> What do you think it's the best solution ?

I wouldn't care about parsing the argument vector a second time, but 
just copy it over; clean, simple, and pretty much error proof.

> Care to open a ticket ?

Done!

> I guess I can handle that (if you don't do it before) since I worked
> on terminal lately.

Great! :-)

Bye,
   Axel.



From korli at mail.berlios.de  Mon Aug 13 21:49:30 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Mon, 13 Aug 2007 21:49:30 +0200
Subject: [Haiku-commits] r21935 -
	haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich
Message-ID: <200708131949.l7DJnUVj030801@sheep.berlios.de>

Author: korli
Date: 2007-08-13 21:49:29 +0200 (Mon, 13 Aug 2007)
New Revision: 21935
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21935&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c
   haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.h
Log:
patch from ul1984 (bug #1395)
added nForce3 250Gb device id


Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c	2007-08-13 19:27:17 UTC (rev 21934)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c	2007-08-13 19:49:29 UTC (rev 21935)
@@ -551,6 +551,7 @@
 			(info.device_id == NVIDIA_nForce_AC97_DEVICE_ID
 			|| info.device_id == NVIDIA_nForce2_AC97_DEVICE_ID
 			|| info.device_id == NVIDIA_nForce3_AC97_DEVICE_ID
+			|| info.device_id == NVIDIA_nF3_250_AC97_DEVICE_ID
 			)) 
 		|| (info.vendor_id == AMD_VENDOR_ID &&
 			(info.device_id == AMD_AMD8111_AC97_DEVICE_ID
@@ -792,6 +793,7 @@
 			(info.device_id == NVIDIA_nForce_AC97_DEVICE_ID
 			|| info.device_id == NVIDIA_nForce2_AC97_DEVICE_ID
 			|| info.device_id == NVIDIA_nForce3_AC97_DEVICE_ID
+			|| info.device_id == NVIDIA_nF3_250_AC97_DEVICE_ID
 			)) 
 		|| (info.vendor_id == AMD_VENDOR_ID &&
 			(info.device_id == AMD_AMD8111_AC97_DEVICE_ID

Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.h	2007-08-13 19:27:17 UTC (rev 21934)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.h	2007-08-13 19:49:29 UTC (rev 21935)
@@ -62,6 +62,7 @@
 #define NVIDIA_nForce_AC97_DEVICE_ID	0x01B1
 #define NVIDIA_nForce2_AC97_DEVICE_ID	0x006A
 #define NVIDIA_nForce3_AC97_DEVICE_ID	0x00DA
+#define NVIDIA_nF3_250_AC97_DEVICE_ID	0x00EA
 #define AMD_VENDOR_ID		0x1022	/* Amd */
 #define AMD_AMD8111_AC97_DEVICE_ID	0x764d
 #define AMD_AMD768_AC97_DEVICE_ID	0x7445	



From bonefish at mail.berlios.de  Tue Aug 14 01:34:07 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Tue, 14 Aug 2007 01:34:07 +0200
Subject: [Haiku-commits] r21936 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200708132334.l7DNY7hu029169@sheep.berlios.de>

Author: bonefish
Date: 2007-08-14 01:34:06 +0200 (Tue, 14 Aug 2007)
New Revision: 21936
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21936&view=rev

Modified:
   haiku/trunk/headers/os/interface/StatusBar.h
   haiku/trunk/src/kits/interface/StatusBar.cpp
Log:
Patch by ?\197?\129ukasz 'Sil2100' Zemczak: Made BStatusBar layout friendly.


Modified: haiku/trunk/headers/os/interface/StatusBar.h
===================================================================
--- haiku/trunk/headers/os/interface/StatusBar.h	2007-08-13 19:49:29 UTC (rev 21935)
+++ haiku/trunk/headers/os/interface/StatusBar.h	2007-08-13 23:34:06 UTC (rev 21936)
@@ -14,6 +14,8 @@
 	public:
 		BStatusBar(BRect frame, const char* name, const char* label = NULL,
 			const char* trailingLabel = NULL);
+		BStatusBar(const char* name, const char* label = NULL,
+			const char* trailingLabel = NULL);
 		BStatusBar(BMessage* archive);
 		virtual ~BStatusBar();
 
@@ -69,6 +71,11 @@
 
 		virtual status_t Perform(perform_code d, void* arg);
 
+		// Layout methods
+		virtual BSize MinSize();
+		virtual BSize MaxSize();
+		virtual BSize PreferredSize();
+
 	private:
 		virtual	void _ReservedStatusBar2();
 		virtual	void _ReservedStatusBar3();

Modified: haiku/trunk/src/kits/interface/StatusBar.cpp
===================================================================
--- haiku/trunk/src/kits/interface/StatusBar.cpp	2007-08-13 19:49:29 UTC (rev 21935)
+++ haiku/trunk/src/kits/interface/StatusBar.cpp	2007-08-13 23:34:06 UTC (rev 21936)
@@ -13,6 +13,9 @@
 #include <Region.h>
 #include <StatusBar.h>
 
+#include <Layout.h>
+#include <LayoutUtils.h>
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -30,6 +33,17 @@
 }
 
 
+BStatusBar::BStatusBar(const char *name, const char *label,
+					   const char *trailingLabel)
+	: BView(BRect(0, 0, -1, -1), name, B_FOLLOW_LEFT | B_FOLLOW_TOP, 
+			B_WILL_DRAW | B_SUPPORTS_LAYOUT),
+	fLabel(label),
+	fTrailingLabel(trailingLabel)
+{
+	_InitObject();
+}
+
+
 BStatusBar::BStatusBar(BMessage *archive)
 	: BView(archive)
 {
@@ -580,6 +594,37 @@
 }
 
 
+BSize
+BStatusBar::MinSize()
+{
+	float width, height;
+	GetPreferredSize(&width, &height);
+
+	return BLayoutUtils::ComposeSize(ExplicitMaxSize(), BSize(width, height));
+}
+
+
+BSize
+BStatusBar::MaxSize()
+{
+	float width, height;
+	GetPreferredSize(&width, &height);
+
+	return BLayoutUtils::ComposeSize(ExplicitMaxSize(), 
+			BSize(B_SIZE_UNLIMITED, height));
+}
+
+
+BSize
+BStatusBar::PreferredSize()
+{
+	float width, height;
+	GetPreferredSize(&width, &height);
+
+	return BLayoutUtils::ComposeSize(ExplicitMaxSize(), BSize(width, height));
+}
+
+
 status_t
 BStatusBar::Perform(perform_code d, void* arg)
 {



From revol at free.fr  Tue Aug 14 02:19:10 2007
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Tue, 14 Aug 2007 02:19:10 +0200 CEST
Subject: [Haiku-commits] r21922 - haiku/trunk/src/servers/app
In-Reply-To: <200708130927.l7D9RJoP016651@sheep.berlios.de>
Message-ID: <698338473-BeMail@laptop>

> Author: stippi
> Date: 2007-08-13 11:27:18 +0200 (Mon, 13 Aug 2007)
> New Revision: 21922
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21922&view=rev
> 
> Modified:
>    haiku/trunk/src/servers/app/DefaultDecorator.cpp
> Log:
> * maybe I fixed the sometimes weird decorator buttons, I have not 
> spotted them again with this change

Are you sure ?
I wonder if those decor issues are related with what happens with icons 
in Cortex, they sometimes look as if drawn on a black bg and quite 
dark...
Could be worth taking a look.

Fran?ois.


From jackburton at mail.berlios.de  Tue Aug 14 08:39:38 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Tue, 14 Aug 2007 08:39:38 +0200
Subject: [Haiku-commits] r21937 - in haiku/trunk: headers/private/interface
	src/kits/interface src/servers/app
Message-ID: <200708140639.l7E6dcAA006742@sheep.berlios.de>

Author: jackburton
Date: 2007-08-14 08:39:37 +0200 (Tue, 14 Aug 2007)
New Revision: 21937
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21937&view=rev

Modified:
   haiku/trunk/headers/private/interface/PictureDataWriter.h
   haiku/trunk/src/kits/interface/PictureDataWriter.cpp
   haiku/trunk/src/servers/app/ServerPicture.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Implemented SetPattern op. Reduced the buffer size to 4096 again.


Modified: haiku/trunk/headers/private/interface/PictureDataWriter.h
===================================================================
--- haiku/trunk/headers/private/interface/PictureDataWriter.h	2007-08-13 23:34:06 UTC (rev 21936)
+++ haiku/trunk/headers/private/interface/PictureDataWriter.h	2007-08-14 06:39:37 UTC (rev 21937)
@@ -31,6 +31,7 @@
 	status_t WriteSetPenSize(const float &penSize);
 	status_t WriteSetLineMode(const cap_mode &cap, const join_mode &join, const float &miterLimit);	
 	status_t WriteSetScale(const float &scale);
+	status_t WriteSetPattern(const pattern &pat);
 
 	status_t WritePushState();
 	status_t WritePopState();	

Modified: haiku/trunk/src/kits/interface/PictureDataWriter.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PictureDataWriter.cpp	2007-08-13 23:34:06 UTC (rev 21936)
+++ haiku/trunk/src/kits/interface/PictureDataWriter.cpp	2007-08-14 06:39:37 UTC (rev 21937)
@@ -147,6 +147,20 @@
 
 
 status_t
+PictureDataWriter::WriteSetPattern(const pattern &pat)
+{
+	try {
+		BeginOp(B_PIC_SET_STIPLE_PATTERN);
+		Write<pattern>(pat);
+		EndOp();
+	} catch (status_t &status) {
+		return status;
+	}
+	return B_OK;
+}
+
+
+status_t
 PictureDataWriter::WriteSetHighColor(const rgb_color &color)
 {
 	try {

Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-13 23:34:06 UTC (rev 21936)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 06:39:37 UTC (rev 21937)
@@ -777,8 +777,8 @@
 	delete fData;
 	gTokenSpace.RemoveToken(fToken);
 	
-	// We don't delete the subpictures themselves, the ServerApp keeps
-	// them in a list and will delete them on quit.
+	// We only delete the subpictures list, not the subpictures themselves,
+	// since the ServerApp keeps them in a list and will delete them on quit.
 	delete fPictures;
 }
 
@@ -795,19 +795,9 @@
 	WriteSetScale(view->CurrentState()->Scale());
 	WriteSetLineMode(view->CurrentState()->LineCapMode(), view->CurrentState()->LineJoinMode(),
 			view->CurrentState()->MiterLimit());
-	
-/*
-	BeginOp(B_PIC_SET_STIPLE_PATTERN);
-	AddData(view->CurrentState()->GetPattern().GetInt8(), sizeof(pattern));
-	EndOp();
-*/
+	//WriteSetPattern(*view->CurrentState()->GetPattern().GetInt8());
 	WriteSetDrawingMode(view->CurrentState()->GetDrawingMode());
 	
-	/*BeginOp(B_PIC_SET_BLENDING_MODE);
-	AddInt16((int16)view->CurrentState()->AlphaSrcMode());
-	AddInt16((int16)view->CurrentState()->AlphaFncMode());
-	EndOp();
-*/
 	WriteSetHighColor(view->CurrentState()->HighColor().GetColor32());
 	WriteSetLowColor(view->CurrentState()->LowColor().GetColor32());
 

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-13 23:34:06 UTC (rev 21936)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-14 06:39:37 UTC (rev 21937)
@@ -2437,6 +2437,14 @@
 			break;
 		}
 
+		case AS_LAYER_SET_PATTERN:
+		{
+			pattern pat;
+			link.Read(&pat, sizeof(pattern));
+			picture->WriteSetPattern(pat);
+			break;
+		}
+
 		case AS_FILL_RECT:
 		case AS_STROKE_RECT:
 		{



From jackburton at mail.berlios.de  Tue Aug 14 09:37:51 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Tue, 14 Aug 2007 09:37:51 +0200
Subject: [Haiku-commits] r21938 - haiku/trunk/src/servers/app
Message-ID: <200708140737.l7E7bpOJ013191@sheep.berlios.de>

Author: jackburton
Date: 2007-08-14 09:37:51 +0200 (Tue, 14 Aug 2007)
New Revision: 21938
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21938&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerPicture.cpp
   haiku/trunk/src/servers/app/ServerPicture.h
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Also set the font properties for BPictures. Some of them, at least.


Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 06:39:37 UTC (rev 21937)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 07:37:51 UTC (rev 21938)
@@ -805,7 +805,77 @@
 
 }
 
+void
+ServerPicture::SetFontFromLink(BPrivate::LinkReceiver& link)
+{
+	BeginOp(B_PIC_ENTER_STATE_CHANGE);
 
+	uint16 mask;
+	link.Read<uint16>(&mask);
+
+	if (mask & B_FONT_FAMILY_AND_STYLE) {
+		uint32 fontID;
+		link.Read<uint32>(&fontID);
+		//uint16 style = fontID & 0xFFFF;
+		//uint16 family = (fontID & 0xFFFF0000) >> 16;		
+		// TODO: WriteSetFamily() and WriteSetStyle()
+		// accept font_family and font_style parameters, not uint16		
+		//WriteSetFontFamily(family);
+		//WriteSetFontStyle(style);
+	}
+
+	if (mask & B_FONT_SIZE) {
+		float size;
+		link.Read<float>(&size);
+		WriteSetFontSize(size);
+	}
+	
+	if (mask & B_FONT_SHEAR) {
+		float shear;
+		link.Read<float>(&shear);
+		WriteSetFontShear(shear);
+	}
+
+	if (mask & B_FONT_ROTATION) {
+		float rotation;
+		link.Read<float>(&rotation);
+		WriteSetFontRotation(rotation);
+	}
+
+	if (mask & B_FONT_FALSE_BOLD_WIDTH) {
+		float falseBoldWidth;
+		link.Read<float>(&falseBoldWidth);
+		//SetFalseBoldWidth(falseBoldWidth);
+	}
+
+	if (mask & B_FONT_SPACING) {
+		uint8 spacing;
+		link.Read<uint8>(&spacing);
+		WriteSetFontSpacing(spacing);
+	}
+
+	if (mask & B_FONT_ENCODING) {
+		uint8 encoding;
+		link.Read<uint8>((uint8*)&encoding);
+		WriteSetFontEncoding(encoding);
+	}
+
+	if (mask & B_FONT_FACE) {
+		uint16 face;
+		link.Read<uint16>(&face);
+		WriteSetFontFace(face);
+	}
+
+	if (mask & B_FONT_FLAGS) {
+		uint32 flags;
+		link.Read<uint32>(&flags);
+		WriteSetFontFlags(flags);
+	}
+
+	EndOp();
+}
+
+
 void
 ServerPicture::Play(ViewLayer *view)
 {

Modified: haiku/trunk/src/servers/app/ServerPicture.h
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.h	2007-08-14 06:39:37 UTC (rev 21937)
+++ haiku/trunk/src/servers/app/ServerPicture.h	2007-08-14 07:37:51 UTC (rev 21938)
@@ -23,7 +23,9 @@
 		void		EnterFontChange();
 		void		ExitFontChange();
 		
-		void		SyncState(ViewLayer *view);	
+		void		SyncState(ViewLayer *view);
+		void		SetFontFromLink(BPrivate::LinkReceiver& link);	
+		
 		void		Play(ViewLayer *view);
 		
 		void 		Usurp(ServerPicture *newPicture);

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-14 06:39:37 UTC (rev 21937)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-14 07:37:51 UTC (rev 21938)
@@ -2445,6 +2445,12 @@
 			break;
 		}
 
+		case AS_LAYER_SET_FONT_STATE:
+		{
+			picture->SetFontFromLink(link);
+			break;
+		}
+
 		case AS_FILL_RECT:
 		case AS_STROKE_RECT:
 		{



From marcusoverhagen at arcor.de  Tue Aug 14 09:52:45 2007
From: marcusoverhagen at arcor.de (Marcus Overhagen)
Date: Tue, 14 Aug 2007 09:52:45 +0200 (CEST)
Subject: [Haiku-commits] r21938 - haiku/trunk/src/servers/app
In-Reply-To: <200708140737.l7E7bpOJ013191@sheep.berlios.de>
References: <200708140737.l7E7bpOJ013191@sheep.berlios.de>
Message-ID: <4316048.1187077965710.JavaMail.ngmail@webmail14>

jackburton at BerliOS <jackburton at mail.berlios.de> wrote:
> +		uint32 fontID;
> +		link.Read<uint32>(&fontID);
> +		//uint16 family = (fontID & 0xFFFF0000) >> 16;		

I think it's enough to use:
		uint16 style = (uint16)fontID;
		uint16 family = fontID >> 16;

> +		// TODO: WriteSetFamily() and WriteSetStyle()
> +		// accept font_family and font_style parameters, not uint16		
> +		//WriteSetFontFamily(family);
> +		//WriteSetFontStyle(style);
doesn't a typecast work? Try:

		WriteSetFontFamily((font_family)family);
		WriteSetFontStyle((font_style)style);

> +	}


regards
Marcus

Viel oder wenig? Schnell oder langsam? Unbegrenzt surfen + telefonieren
ohne Zeit- und Volumenbegrenzung? DAS TOP ANGEBOT F?R ALLE NEUEINSTEIGER
Jetzt bei Arcor: g?nstig und schnell mit DSL - das All-Inclusive-Paket
f?r clevere Doppel-Sparer, nur  34,95 ?  inkl. DSL- und ISDN-Grundgeb?hr!
http://www.arcor.de/rd/emf-dsl-2


From stefano.ceccherini at gmail.com  Tue Aug 14 09:56:20 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Tue, 14 Aug 2007 09:56:20 +0200
Subject: [Haiku-commits] r21938 - haiku/trunk/src/servers/app
In-Reply-To: <4316048.1187077965710.JavaMail.ngmail@webmail14>
References: <200708140737.l7E7bpOJ013191@sheep.berlios.de>
	<4316048.1187077965710.JavaMail.ngmail@webmail14>
Message-ID: <894b9700708140056o4756cd22qa1dde82f64d17e10@mail.gmail.com>

2007/8/14, Marcus Overhagen <marcusoverhagen at arcor.de>:

> doesn't a typecast work? Try:
>
>                 WriteSetFontFamily((font_family)family);
>                 WriteSetFontStyle((font_style)style);

Unfortunately font_family is a char array, which contains the name of the font.


From jackburton at mail.berlios.de  Tue Aug 14 10:05:06 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Tue, 14 Aug 2007 10:05:06 +0200
Subject: [Haiku-commits] r21939 - in haiku/trunk/src: kits/interface
	servers/app
Message-ID: <200708140805.l7E8568T014924@sheep.berlios.de>

Author: jackburton
Date: 2007-08-14 10:05:05 +0200 (Tue, 14 Aug 2007)
New Revision: 21939
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21939&view=rev

Modified:
   haiku/trunk/src/kits/interface/PicturePlayer.cpp
   haiku/trunk/src/servers/app/ServerPicture.cpp
Log:
Implement more bpicture font methods, now PicturePlayer checks the size 
of the function table, so if someone passes a smaller table, we avoid
 
calling invalid pointers.


Modified: haiku/trunk/src/kits/interface/PicturePlayer.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-14 07:37:51 UTC (rev 21938)
+++ haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-14 08:05:05 UTC (rev 21939)
@@ -58,9 +58,14 @@
 status_t
 PicturePlayer::Play(void **callBackTable, int32 tableEntries, void *userData)
 {
-	// TODO: we should probably check if the functions in the table are not NULL
-	//       before calling them.
+	// We don't check if the functions in the table are NULL, but we
+	// check the tableEntries to see if the table is big enough.
+	// If an application supplies the wrong size or an invalid pointer,
+	// it's its own fault.
 
+	// TODO: Call the exit_font_state_change and exit_state_change hooks.
+	// there are no ops for them, so we need to keep track of the size of the data block,
+	// and call them when we are at the end.
 	const char *data = reinterpret_cast<const char *>(fData);
 	size_t pos = 0;
 
@@ -76,6 +81,8 @@
 		switch (op) {
 			case B_PIC_MOVE_PEN_BY:
 			{
+				if (tableEntries <= 1)
+					break;
 				((fnc_BPoint)callBackTable[1])(userData,
 					*reinterpret_cast<const BPoint *>(data)); /* where */
 				break;
@@ -83,6 +90,8 @@
 
 			case B_PIC_STROKE_LINE:
 			{
+				if (tableEntries <= 2)
+					break;
 				((fnc_BPointBPoint)callBackTable[2])(userData, 
 					*reinterpret_cast<const BPoint *>(data), /* start */
 					*reinterpret_cast<const BPoint *>(data + sizeof(BPoint))); /* end */
@@ -91,6 +100,8 @@
 
 			case B_PIC_STROKE_RECT:
 			{
+				if (tableEntries <= 3)
+					break;
 				((fnc_BRect)callBackTable[3])(userData,
 					*reinterpret_cast<const BRect *>(data)); /* rect */
 				break;
@@ -98,6 +109,8 @@
 
 			case B_PIC_FILL_RECT:
 			{
+				if (tableEntries <= 4)
+					break;
 				((fnc_BRect)callBackTable[4])(userData,
 					*reinterpret_cast<const BRect *>(data)); /* rect */
 				break;
@@ -105,6 +118,8 @@
 
 			case B_PIC_STROKE_ROUND_RECT:
 			{
+				if (tableEntries <= 5)
+					break;
 				((fnc_BRectBPoint)callBackTable[5])(userData,
 					*reinterpret_cast<const BRect *>(data), /* rect */
 					*reinterpret_cast<const BPoint *>(data + sizeof(BRect))); /* radii */
@@ -113,6 +128,8 @@
 
 			case B_PIC_FILL_ROUND_RECT:
 			{
+				if (tableEntries <= 6)
+					break;
 				((fnc_BRectBPoint)callBackTable[6])(userData,
 					*reinterpret_cast<const BRect *>(data), /* rect */
 					*reinterpret_cast<const BPoint *>(data + sizeof(BRect))); /* radii */
@@ -121,6 +138,8 @@
 
 			case B_PIC_STROKE_BEZIER:
 			{
+				if (tableEntries <= 7)
+					break;
 				((fnc_PBPoint)callBackTable[7])(userData,
 					reinterpret_cast<const BPoint *>(data));
 				break;
@@ -128,6 +147,8 @@
 
 			case B_PIC_FILL_BEZIER:
 			{
+				if (tableEntries <= 8)
+					break;
 				((fnc_PBPoint)callBackTable[8])(userData,
 					reinterpret_cast<const BPoint *>(data));
 				break;
@@ -135,6 +156,8 @@
 
 			case B_PIC_STROKE_ARC:
 			{
+				if (tableEntries <= 9)
+					break;
 				((fnc_BPointBPointff)callBackTable[9])(userData, 
 					*reinterpret_cast<const BPoint *>(data), /* center */
 					*reinterpret_cast<const BPoint *>(data + sizeof(BPoint)), /* radii */
@@ -145,6 +168,8 @@
 
 			case B_PIC_FILL_ARC:
 			{
+				if (tableEntries <= 10)
+					break;
 				((fnc_BPointBPointff)callBackTable[10])(userData,
 					*reinterpret_cast<const BPoint *>(data), /* center */
 					*reinterpret_cast<const BPoint *>(data + sizeof(BPoint)), /* radii */
@@ -155,6 +180,8 @@
 
 			case B_PIC_STROKE_ELLIPSE:
 			{
+				if (tableEntries <= 11)
+					break;
 				const BRect *rect = reinterpret_cast<const BRect *>(data);
 				BPoint radii((rect->Width() + 1) / 2.0f, (rect->Height() + 1) / 2.0f);
 				BPoint center = rect->LeftTop() + radii;
@@ -164,6 +191,8 @@
 
 			case B_PIC_FILL_ELLIPSE:
 			{
+				if (tableEntries <= 12)
+					break;
 				const BRect *rect = reinterpret_cast<const BRect *>(data);
 				BPoint radii((rect->Width() + 1) / 2.0f, (rect->Height() + 1) / 2.0f);
 				BPoint center = rect->LeftTop() + radii;
@@ -173,6 +202,8 @@
 
 			case B_PIC_STROKE_POLYGON:
 			{
+				if (tableEntries <= 13)
+					break;
 				int32 numPoints = *reinterpret_cast<const int32 *>(data);
 				((fnc_iPBPointb)callBackTable[13])(userData, 
 					numPoints,
@@ -183,6 +214,8 @@
 
 			case B_PIC_FILL_POLYGON:
 			{
+				if (tableEntries <= 14)
+					break;
 				((fnc_iPBPoint)callBackTable[14])(userData, 
 					*reinterpret_cast<const int32 *>(data), /* numPoints */
 					reinterpret_cast<const BPoint *>(data + sizeof(int32))); /* points */
@@ -192,6 +225,10 @@
 			case B_PIC_STROKE_SHAPE:
 			case B_PIC_FILL_SHAPE:
 			{
+				const bool stroke = (op == B_PIC_STROKE_SHAPE);							
+				if (tableEntries <= 16 || (stroke && tableEntries <= 15))
+					break;
+
 				int32 opCount = *reinterpret_cast<const int32 *>(data);
 				int32 ptCount = *reinterpret_cast<const int32 *>(data + sizeof(int32));
 				const uint32 *opList = reinterpret_cast<const uint32 *>(data + 2 * sizeof(int32));
@@ -201,13 +238,15 @@
 				BShape shape; 
 				shape.SetData(opCount, ptCount, opList, ptList);
 
-				const int32 tableIndex = (op == B_PIC_STROKE_SHAPE) ? 15 : 16;
+				const int32 tableIndex = stroke ? 15 : 16;
 				((fnc_BShape)callBackTable[tableIndex])(userData, &shape);
 				break;
 			}
 			
 			case B_PIC_DRAW_STRING:
 			{
+				if (tableEntries <= 17)
+					break;
 				((fnc_Pcff)callBackTable[17])(userData, 
 					reinterpret_cast<const char *>(data + 2 * sizeof(float)), /* string */
 					*reinterpret_cast<const float *>(data), /* escapement.space */
@@ -217,6 +256,8 @@
 
 			case B_PIC_DRAW_PIXELS:
 			{
+				if (tableEntries <= 18)
+					break;
 				((fnc_DrawPixels)callBackTable[18])(userData,
 					*reinterpret_cast<const BRect *>(data), /* src */
 					*reinterpret_cast<const BRect *>(data + 1 * sizeof(BRect)), /* dst */
@@ -231,6 +272,8 @@
 
 			case B_PIC_DRAW_PICTURE:
 			{
+				if (tableEntries <= 19)
+					break;
 				((fnc_DrawPicture)callBackTable[19])(userData,
 					*reinterpret_cast<const BPoint *>(data),
 					*reinterpret_cast<const int32 *>(data + sizeof(BPoint)));
@@ -239,46 +282,62 @@
 			
 			case B_PIC_SET_CLIPPING_RECTS:
 			{
+				if (tableEntries <= 20)
+					break;
 				break;
 			}
 
 			case B_PIC_CLEAR_CLIPPING_RECTS:
 			{
+				if (tableEntries <= 20)
+					break;
 				((fnc_PBRecti)callBackTable[20])(userData, NULL, 0);
 				break;
 			}
 
 			case B_PIC_CLIP_TO_PICTURE:
 			{
+				if (tableEntries <= 21)
+					break;
 				break;
 			}
 
 			case B_PIC_PUSH_STATE:
 			{
+				if (tableEntries <= 22)
+					break;
 				((fnc)callBackTable[22])(userData);
 				break;
 			}
 
 			case B_PIC_POP_STATE:
 			{
+				if (tableEntries <= 23)
+					break;
 				((fnc)callBackTable[23])(userData);
 				break;
 			}
 
 			case B_PIC_ENTER_STATE_CHANGE:
 			{
+				if (tableEntries <= 24)
+					break;
 				((fnc)callBackTable[24])(userData);
 				break;
 			}
 
 			case B_PIC_ENTER_FONT_STATE:
 			{
+				if (tableEntries <= 26)
+					break;
 				((fnc)callBackTable[26])(userData);
 				break;
 			}
 
 			case B_PIC_SET_ORIGIN:
 			{
+				if (tableEntries <= 28)
+					break;
 				((fnc_BPoint)callBackTable[28])(userData,
 					*reinterpret_cast<const BPoint *>(data)); /* origin */
 				break;
@@ -286,6 +345,8 @@
 
 			case B_PIC_SET_PEN_LOCATION:
 			{
+				if (tableEntries <= 29)
+					break;
 				((fnc_BPoint)callBackTable[29])(userData,
 					*reinterpret_cast<const BPoint *>(data)); /* location */
 				break;
@@ -293,6 +354,8 @@
 
 			case B_PIC_SET_DRAWING_MODE:
 			{
+				if (tableEntries <= 30)
+					break;
 				((fnc_s)callBackTable[30])(userData,
 					*reinterpret_cast<const int16 *>(data)); /* mode */
 				break;
@@ -300,6 +363,8 @@
 
 			case B_PIC_SET_LINE_MODE:
 			{
+				if (tableEntries <= 31)
+					break;
 				((fnc_ssf)callBackTable[31])(userData,
 					*reinterpret_cast<const int16 *>(data), /* cap-mode */
 					*reinterpret_cast<const int16 *>(data + 1 * sizeof(int16)), /* join-mode */
@@ -309,6 +374,8 @@
 
 			case B_PIC_SET_PEN_SIZE:
 			{
+				if (tableEntries <= 32)
+					break;
 				((fnc_f)callBackTable[32])(userData,
 					*reinterpret_cast<const float *>(data)); /* size */
 				break;
@@ -316,13 +383,17 @@
 
 			case B_PIC_SET_FORE_COLOR:
 			{			
+				if (tableEntries <= 33)
+					break;
 				((fnc_Color)callBackTable[33])(userData,
 					*reinterpret_cast<const rgb_color *>(data)); /* color */
 				break;
 			}
 
 			case B_PIC_SET_BACK_COLOR:
-			{			
+			{		
+				if (tableEntries <= 34)
+					break;	
 				((fnc_Color)callBackTable[34])(userData,
 					*reinterpret_cast<const rgb_color *>(data)); /* color */
 				break;
@@ -330,6 +401,8 @@
 
 			case B_PIC_SET_STIPLE_PATTERN:
 			{
+				if (tableEntries <= 35)
+					break;
 				((fnc_Pattern)callBackTable[35])(userData,
 					*reinterpret_cast<const pattern *>(data)); /* pattern */
 				break;
@@ -337,6 +410,8 @@
 
 			case B_PIC_SET_SCALE:
 			{
+				if (tableEntries <= 36)
+					break;
 				((fnc_f)callBackTable[36])(userData,
 					*reinterpret_cast<const float *>(data)); /* scale */
 				break;
@@ -344,7 +419,8 @@
 
 			case B_PIC_SET_FONT_FAMILY:
 			{
-				debugger("B_PIC_SET_FONT_FAMILY"); // TODO: is this unused?
+				if (tableEntries <= 37)
+					break;
 				((fnc_Pc)callBackTable[37])(userData,
 					reinterpret_cast<const char *>(data)); /* string */
 				break;
@@ -352,7 +428,8 @@
 
 			case B_PIC_SET_FONT_STYLE:
 			{
-				debugger("B_PIC_SET_FONT_STYLE"); // TODO: is this unused?
+				if (tableEntries <= 38)
+					break;
 				((fnc_Pc)callBackTable[38])(userData,
 					reinterpret_cast<const char *>(data)); /* string */
 				break;
@@ -360,6 +437,8 @@
 
 			case B_PIC_SET_FONT_SPACING:
 			{
+				if (tableEntries <= 39)
+					break;
 				((fnc_i)callBackTable[39])(userData,
 					*reinterpret_cast<const int32 *>(data)); /* spacing */
 				break;
@@ -367,6 +446,8 @@
 
 			case B_PIC_SET_FONT_SIZE:
 			{
+				if (tableEntries <= 40)
+					break;
 				((fnc_f)callBackTable[40])(userData,
 					*reinterpret_cast<const float *>(data)); /* size */
 				break;
@@ -374,6 +455,8 @@
 
 			case B_PIC_SET_FONT_ROTATE:
 			{
+				if (tableEntries <= 41)
+					break;
 				((fnc_f)callBackTable[41])(userData,
 					*reinterpret_cast<const float *>(data)); /* rotation */
 				break;
@@ -381,6 +464,8 @@
 
 			case B_PIC_SET_FONT_ENCODING:
 			{
+				if (tableEntries <= 42)
+					break;
 				((fnc_i)callBackTable[42])(userData,
 					*reinterpret_cast<const int32 *>(data)); /* encoding */
 				break;
@@ -388,6 +473,8 @@
 
 			case B_PIC_SET_FONT_FLAGS:
 			{
+				if (tableEntries <= 43)
+					break;
 				((fnc_i)callBackTable[43])(userData,
 					*reinterpret_cast<const int32 *>(data)); /* flags */
 				break;
@@ -395,6 +482,8 @@
 			
 			case B_PIC_SET_FONT_SHEAR:
 			{
+				if (tableEntries <= 44)
+					break;
 				((fnc_f)callBackTable[44])(userData,
 					*reinterpret_cast<const float *>(data)); /* shear */
 				break;
@@ -402,16 +491,17 @@
 
 			case B_PIC_SET_FONT_FACE:
 			{
+				if (tableEntries <= 46)
+					break;
 				((fnc_i)callBackTable[46])(userData,
 					*reinterpret_cast<const int32 *>(data)); /* flags */
 				break;
 			}
 
-			// TODO: Looks like R5 function table only exports 47 functions...
-			// I added this here as a temporary workaround, because there seems to be
-			// no room for this op, although it's obviously implemented in some way...
 			case B_PIC_SET_BLENDING_MODE:
 			{
+				if (tableEntries <= 47)
+					break;
 				((fnc_ss)callBackTable[47])(userData,
 					*reinterpret_cast<const int16 *>(data), /* alphaSrcMode */
 					*reinterpret_cast<const int16 *>(data + sizeof(int16))); /* alphaFncMode */

Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 07:37:51 UTC (rev 21938)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 08:05:05 UTC (rev 21939)
@@ -595,7 +595,10 @@
 static void
 set_font_spacing(ViewLayer *view, int32 spacing)
 {
-	printf("SetFontSpacing(%ld)\n", spacing);
+	ServerFont font;
+	font.SetSpacing(spacing);
+	view->CurrentState()->SetFont(font, B_FONT_SPACING);
+	view->Window()->GetDrawingEngine()->SetFont(view->CurrentState()->Font());
 }
 
 
@@ -622,28 +625,40 @@
 static void
 set_font_encoding(ViewLayer *view, int32 encoding)
 {
-	printf("SetFontEncoding(%ld)\n", encoding);
+	ServerFont font;
+	font.SetEncoding(encoding);
+	view->CurrentState()->SetFont(font, B_FONT_ENCODING);
+	view->Window()->GetDrawingEngine()->SetFont(view->CurrentState()->Font());
 }
 
 
 static void
 set_font_flags(ViewLayer *view, int32 flags)
 {
-	printf("SetFontFlags(%ld)\n", flags);
+	ServerFont font;
+	font.SetFlags(flags);
+	view->CurrentState()->SetFont(font, B_FONT_FLAGS);
+	view->Window()->GetDrawingEngine()->SetFont(view->CurrentState()->Font());
 }
 
 
 static void
 set_font_shear(ViewLayer *view, float shear)
 {
-	printf("SetFontShear(%.2f)\n", shear);
+	ServerFont font;
+	font.SetShear(shear);
+	view->CurrentState()->SetFont(font, B_FONT_SHEAR);
+	view->Window()->GetDrawingEngine()->SetFont(view->CurrentState()->Font());
 }
 
 
 static void
-set_font_face(ViewLayer *view, int32 flags)
+set_font_face(ViewLayer *view, int32 face)
 {
-	printf("SetFontFace(%ld)\n", flags);
+	ServerFont font;
+	font.SetFace(face);
+	view->CurrentState()->SetFont(font, B_FONT_FACE);
+	view->Window()->GetDrawingEngine()->SetFont(view->CurrentState()->Font());
 }
 
 
@@ -707,7 +722,7 @@
 	(const void *)set_font_flags,
 	(const void *)set_font_shear,
 	(const void *)reserved,		// TODO: Marc Flerackers calls this "set_font_bpp". Investigate
-	(const void *)set_font_face, // TODO: R5 function table ends here... how is set blending mode implemented there ?
+	(const void *)set_font_face,
 	(const void *)set_blending_mode 
 };
 



From jackburton at mail.berlios.de  Tue Aug 14 10:40:13 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Tue, 14 Aug 2007 10:40:13 +0200
Subject: [Haiku-commits] r21940 - in haiku/trunk/src: kits/interface
	servers/app
Message-ID: <200708140840.l7E8eDi8019678@sheep.berlios.de>

Author: jackburton
Date: 2007-08-14 10:40:13 +0200 (Tue, 14 Aug 2007)
New Revision: 21940
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21940&view=rev

Modified:
   haiku/trunk/src/kits/interface/PicturePlayer.cpp
   haiku/trunk/src/servers/app/ServerPicture.cpp
Log:
My last commit broke setting fonts in BPictures. Added a comment in 
PicturePlayer to explain what we need to do. Don't write the 
B_PIC_ENTER_STATE_CHANGE and B_PIC_ENTER_FONT_STATE ops until we fix the 
problem (we don't care about them in our server side 
implementation anyway). Font changes and state syncing work again.


Modified: haiku/trunk/src/kits/interface/PicturePlayer.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-14 08:05:05 UTC (rev 21939)
+++ haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-14 08:40:13 UTC (rev 21940)
@@ -512,6 +512,12 @@
 				break;
 		}
 
+		// TODO: This is not correct. B_PIC_ENTER_STATE_CHANGE and
+		// B_PIC_ENTER_FONT_STATE ops include other ops. We should just advance
+		// the buffer by the size of these ops, not the size of the whole block,
+		// otherwise the nested ops won't be executed. I disabled them in
+		// ServerPicture::SyncState() and ServerPicture::SetFontFromLink()
+		// until we handle them correctly here.
 		pos += size;
 		data += size;
 

Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 08:05:05 UTC (rev 21939)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 08:40:13 UTC (rev 21940)
@@ -802,7 +802,7 @@
 ServerPicture::SyncState(ViewLayer *view)
 {
 	// TODO: Finish this
-	BeginOp(B_PIC_ENTER_STATE_CHANGE);
+	//BeginOp(B_PIC_ENTER_STATE_CHANGE);
 
 	WriteSetOrigin(view->CurrentState()->Origin());
 	WriteSetPenLocation(view->CurrentState()->PenLocation());
@@ -816,14 +816,14 @@
 	WriteSetHighColor(view->CurrentState()->HighColor().GetColor32());
 	WriteSetLowColor(view->CurrentState()->LowColor().GetColor32());
 
-	EndOp();
+	//EndOp();
 
 }
 
 void
 ServerPicture::SetFontFromLink(BPrivate::LinkReceiver& link)
 {
-	BeginOp(B_PIC_ENTER_STATE_CHANGE);
+	//BeginOp(B_PIC_ENTER_STATE_CHANGE);
 
 	uint16 mask;
 	link.Read<uint16>(&mask);
@@ -887,7 +887,7 @@
 		WriteSetFontFlags(flags);
 	}
 
-	EndOp();
+	//EndOp();
 }
 
 



From jackburton at mail.berlios.de  Tue Aug 14 11:17:21 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Tue, 14 Aug 2007 11:17:21 +0200
Subject: [Haiku-commits] r21941 - in haiku/trunk: headers/private/interface
	src/kits/interface src/servers/app
Message-ID: <200708140917.l7E9HLWQ023960@sheep.berlios.de>

Author: jackburton
Date: 2007-08-14 11:17:21 +0200 (Tue, 14 Aug 2007)
New Revision: 21941
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21941&view=rev

Modified:
   haiku/trunk/headers/private/interface/PictureDataWriter.h
   haiku/trunk/src/kits/interface/PictureDataWriter.cpp
   haiku/trunk/src/servers/app/ServerPicture.cpp
Log:
Implemented WriteSetFontFamily() and WriteSetFontStyle(). Only the 
server side functions are missing.


Modified: haiku/trunk/headers/private/interface/PictureDataWriter.h
===================================================================
--- haiku/trunk/headers/private/interface/PictureDataWriter.h	2007-08-14 08:40:13 UTC (rev 21940)
+++ haiku/trunk/headers/private/interface/PictureDataWriter.h	2007-08-14 09:17:21 UTC (rev 21941)
@@ -36,8 +36,8 @@
 	status_t WritePushState();
 	status_t WritePopState();	
 	
-	status_t WriteSetFontFamily(const font_family &family);
-	status_t WriteSetFontStyle(const font_style &style);
+	status_t WriteSetFontFamily(const font_family family);
+	status_t WriteSetFontStyle(const font_style style);
 	status_t WriteSetFontSpacing(const int32 &spacing);
 	status_t WriteSetFontSize(const float &size);
 	status_t WriteSetFontRotation(const float &rotation);

Modified: haiku/trunk/src/kits/interface/PictureDataWriter.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PictureDataWriter.cpp	2007-08-14 08:40:13 UTC (rev 21940)
+++ haiku/trunk/src/kits/interface/PictureDataWriter.cpp	2007-08-14 09:17:21 UTC (rev 21941)
@@ -18,6 +18,9 @@
 
 #define THROW_ERROR(error) throw (status_t)(error)
 
+// TODO: Review writing of strings. AFAIK in the picture data format
+// They are not supposed to be NULL terminated (at least, it's not mandatory)
+// and we should write their size.
 PictureDataWriter::PictureDataWriter()
 	:
 	fData(NULL)
@@ -384,21 +387,31 @@
 
 
 status_t
-PictureDataWriter::WriteSetFontFamily(const font_family &family)
+PictureDataWriter::WriteSetFontFamily(const font_family family)
 {
-	/*BeginOp(B_PIC_SET_FONT_FAMILY);
-	Write(
-	EndOp();*/
+	try {
+		BeginOp(B_PIC_SET_FONT_FAMILY);
+		WriteData(family, strlen(family));
+		Write<int8>(0);
+		EndOp();
+	} catch (status_t &status) {
+		return status;
+	}	
 	return B_OK;
 }
 
 
 status_t
-PictureDataWriter::WriteSetFontStyle(const font_style &style)
+PictureDataWriter::WriteSetFontStyle(const font_style style)
 {
-	/*BeginOp(B_PIC_SET_FONT_STYLE);
-	Write(
-	EndOp();*/
+	try {
+		BeginOp(B_PIC_SET_FONT_STYLE);
+		WriteData(style, strlen(style));
+		Write<int8>(0);
+		EndOp();
+	} catch (status_t &status) {
+		return status;
+	}
 	return B_OK;
 }
 

Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 08:40:13 UTC (rev 21940)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 09:17:21 UTC (rev 21941)
@@ -12,6 +12,7 @@
 #include "DrawingEngine.h"
 #include "ServerApp.h"
 #include "ServerBitmap.h"
+#include "ServerFont.h"
 #include "ServerPicture.h"
 #include "ServerTokenSpace.h"
 #include "ViewLayer.h"
@@ -581,14 +582,16 @@
 static void
 set_font_family(ViewLayer *view, const char *family)
 {
-	printf("SetFontFamily(%s)\n", family);
+	// TODO: Implement
+	// Can we have a ServerFont::SetFamily() which accepts a string ?
 }
 
 
 static void
 set_font_style(ViewLayer *view, const char *style)
 {
-	printf("SetFontStyle(%s)\n", style);
+	// TODO: Implement
+	// Can we have a ServerFont::SetStyle() which accepts a string ?
 }
 
 
@@ -831,12 +834,10 @@
 	if (mask & B_FONT_FAMILY_AND_STYLE) {
 		uint32 fontID;
 		link.Read<uint32>(&fontID);
-		//uint16 style = fontID & 0xFFFF;
-		//uint16 family = (fontID & 0xFFFF0000) >> 16;		
-		// TODO: WriteSetFamily() and WriteSetStyle()
-		// accept font_family and font_style parameters, not uint16		
-		//WriteSetFontFamily(family);
-		//WriteSetFontStyle(style);
+		ServerFont font;
+		font.SetFamilyAndStyle(fontID);
+		WriteSetFontFamily((font_family)font.Family());
+		WriteSetFontStyle((font_style)font.Style());
 	}
 
 	if (mask & B_FONT_SIZE) {



From jackburton at mail.berlios.de  Tue Aug 14 11:43:19 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Tue, 14 Aug 2007 11:43:19 +0200
Subject: [Haiku-commits] r21942 - haiku/trunk/src/servers/app
Message-ID: <200708140943.l7E9hJsO026066@sheep.berlios.de>

Author: jackburton
Date: 2007-08-14 11:43:19 +0200 (Tue, 14 Aug 2007)
New Revision: 21942
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21942&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerPicture.cpp
Log:
Disabled writing the font shear, since this results in missing font in 
Chart's BPictureButton. Needs some investigation.


Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 09:17:21 UTC (rev 21941)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 09:43:19 UTC (rev 21942)
@@ -849,7 +849,9 @@
 	if (mask & B_FONT_SHEAR) {
 		float shear;
 		link.Read<float>(&shear);
-		WriteSetFontShear(shear);
+		// TODO: For some reason writing the font shear
+		// results in missing font in Chart's BPictureButtons. Investigate.		
+		//WriteSetFontShear(shear);
 	}
 
 	if (mask & B_FONT_ROTATION) {



From jackburton at mail.berlios.de  Tue Aug 14 14:45:43 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Tue, 14 Aug 2007 14:45:43 +0200
Subject: [Haiku-commits] r21943 - in haiku/trunk/src: kits/interface
	servers/app
Message-ID: <200708141245.l7ECjhCn023855@sheep.berlios.de>

Author: jackburton
Date: 2007-08-14 14:45:42 +0200 (Tue, 14 Aug 2007)
New Revision: 21943
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21943&view=rev

Modified:
   haiku/trunk/src/kits/interface/PictureDataWriter.cpp
   haiku/trunk/src/kits/interface/PicturePlayer.cpp
   haiku/trunk/src/servers/app/ServerPicture.cpp
   haiku/trunk/src/servers/app/ServerPicture.h
Log:
Implement calling the exit_xxx hooks. Thanks to Marc Flerackers for the 
help.


Modified: haiku/trunk/src/kits/interface/PictureDataWriter.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PictureDataWriter.cpp	2007-08-14 09:43:19 UTC (rev 21942)
+++ haiku/trunk/src/kits/interface/PictureDataWriter.cpp	2007-08-14 12:45:42 UTC (rev 21943)
@@ -392,7 +392,7 @@
 	try {
 		BeginOp(B_PIC_SET_FONT_FAMILY);
 		WriteData(family, strlen(family));
-		Write<int8>(0);
+		Write<uint8>(0);
 		EndOp();
 	} catch (status_t &status) {
 		return status;
@@ -407,7 +407,7 @@
 	try {
 		BeginOp(B_PIC_SET_FONT_STYLE);
 		WriteData(style, strlen(style));
-		Write<int8>(0);
+		Write<uint8>(0);
 		EndOp();
 	} catch (status_t &status) {
 		return status;

Modified: haiku/trunk/src/kits/interface/PicturePlayer.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-14 09:43:19 UTC (rev 21942)
+++ haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-14 12:45:42 UTC (rev 21943)
@@ -69,6 +69,9 @@
 	const char *data = reinterpret_cast<const char *>(fData);
 	size_t pos = 0;
 
+	int32 fontStateBlockSize = -1;
+	int32 stateBlockSize = -1;
+
 	while ((pos + 6) <= fSize) {
 		int16 op = *reinterpret_cast<const int16 *>(data);
 		int32 size = *reinterpret_cast<const int32 *>(data + 2);
@@ -284,6 +287,7 @@
 			{
 				if (tableEntries <= 20)
 					break;
+				// TODO: Implement
 				break;
 			}
 
@@ -299,6 +303,7 @@
 			{
 				if (tableEntries <= 21)
 					break;
+				// TODO: Implement
 				break;
 			}
 
@@ -320,17 +325,17 @@
 
 			case B_PIC_ENTER_STATE_CHANGE:
 			{
-				if (tableEntries <= 24)
-					break;
-				((fnc)callBackTable[24])(userData);
+				if (tableEntries > 24)
+					((fnc)callBackTable[24])(userData);
+				stateBlockSize = size;
 				break;
 			}
 
 			case B_PIC_ENTER_FONT_STATE:
 			{
-				if (tableEntries <= 26)
-					break;
-				((fnc)callBackTable[26])(userData);
+				if (tableEntries > 26)
+					((fnc)callBackTable[26])(userData);
+				fontStateBlockSize = size;				
 				break;
 			}
 
@@ -512,15 +517,31 @@
 				break;
 		}
 
-		// TODO: This is not correct. B_PIC_ENTER_STATE_CHANGE and
-		// B_PIC_ENTER_FONT_STATE ops include other ops. We should just advance
-		// the buffer by the size of these ops, not the size of the whole block,
-		// otherwise the nested ops won't be executed. I disabled them in
-		// ServerPicture::SyncState() and ServerPicture::SetFontFromLink()
-		// until we handle them correctly here.
-		pos += size;
-		data += size;
-
+		// Skip the already handled block unless it's one of these two, 
+		// since they can contain other nested ops.
+		if (op != B_PIC_ENTER_STATE_CHANGE && op != B_PIC_ENTER_FONT_STATE) {		
+			pos += size;
+			data += size;
+			if (stateBlockSize > 0)
+				stateBlockSize -= size + 6;
+			if (fontStateBlockSize > 0)
+				fontStateBlockSize -= size + 6;
+		}
+		
+		// call the exit_state_change hook if needed
+		if (stateBlockSize == 0) {
+			if (tableEntries > 25)
+				((fnc)callBackTable[25])(userData);
+			stateBlockSize = -1;		
+		}
+		
+		// call the exit_font_state hook if needed
+		if (fontStateBlockSize == 0) {
+			if (tableEntries > 27)
+				((fnc)callBackTable[27])(userData);
+			fontStateBlockSize = -1;		
+		}
+		
 		// TODO: what if too much was read, should we return B_ERROR?
 	}
 

Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 09:43:19 UTC (rev 21942)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 12:45:42 UTC (rev 21943)
@@ -473,31 +473,30 @@
 }
 
 
+// TODO: Be smart and actually take advantage of these methods:
+// only apply state changes when they are called
 static void
 enter_state_change(ViewLayer *view)
 {
-	printf("EnterStateChange\n");
 }
 
 
 static void
 exit_state_change(ViewLayer *view)
 {
-	printf("ExitStateChange\n");
 }
 
 
 static void 
 enter_font_state(ViewLayer *view)
 {
-	printf("EnterFontState\n");
 }
 
 
 static void
 exit_font_state(ViewLayer *view)
 {
-	printf("ExitFontState\n");
+	view->Window()->GetDrawingEngine()->SetFont(view->CurrentState()->Font());
 }
 
 
@@ -601,7 +600,6 @@
 	ServerFont font;
 	font.SetSpacing(spacing);
 	view->CurrentState()->SetFont(font, B_FONT_SPACING);
-	view->Window()->GetDrawingEngine()->SetFont(view->CurrentState()->Font());
 }
 
 
@@ -611,7 +609,6 @@
 	ServerFont font;
 	font.SetSize(size);
 	view->CurrentState()->SetFont(font, B_FONT_SIZE);
-	view->Window()->GetDrawingEngine()->SetFont(view->CurrentState()->Font());
 }
 
 
@@ -621,7 +618,6 @@
 	ServerFont font;
 	font.SetRotation(rotation);
 	view->CurrentState()->SetFont(font, B_FONT_ROTATION);
-	view->Window()->GetDrawingEngine()->SetFont(view->CurrentState()->Font());
 }
 
 
@@ -631,7 +627,6 @@
 	ServerFont font;
 	font.SetEncoding(encoding);
 	view->CurrentState()->SetFont(font, B_FONT_ENCODING);
-	view->Window()->GetDrawingEngine()->SetFont(view->CurrentState()->Font());
 }
 
 
@@ -641,7 +636,6 @@
 	ServerFont font;
 	font.SetFlags(flags);
 	view->CurrentState()->SetFont(font, B_FONT_FLAGS);
-	view->Window()->GetDrawingEngine()->SetFont(view->CurrentState()->Font());
 }
 
 
@@ -651,7 +645,6 @@
 	ServerFont font;
 	font.SetShear(shear);
 	view->CurrentState()->SetFont(font, B_FONT_SHEAR);
-	view->Window()->GetDrawingEngine()->SetFont(view->CurrentState()->Font());
 }
 
 
@@ -661,7 +654,6 @@
 	ServerFont font;
 	font.SetFace(face);
 	view->CurrentState()->SetFont(font, B_FONT_FACE);
-	view->Window()->GetDrawingEngine()->SetFont(view->CurrentState()->Font());
 }
 
 
@@ -802,10 +794,24 @@
 
 
 void
+ServerPicture::EnterStateChange()
+{
+	BeginOp(B_PIC_ENTER_STATE_CHANGE);
+}
+
+
+void
+ServerPicture::ExitStateChange()
+{
+	EndOp();
+}
+
+
+void
 ServerPicture::SyncState(ViewLayer *view)
 {
 	// TODO: Finish this
-	//BeginOp(B_PIC_ENTER_STATE_CHANGE);
+	EnterStateChange();
 
 	WriteSetOrigin(view->CurrentState()->Origin());
 	WriteSetPenLocation(view->CurrentState()->PenLocation());
@@ -819,14 +825,13 @@
 	WriteSetHighColor(view->CurrentState()->HighColor().GetColor32());
 	WriteSetLowColor(view->CurrentState()->LowColor().GetColor32());
 
-	//EndOp();
-
+	ExitStateChange();
 }
 
 void
 ServerPicture::SetFontFromLink(BPrivate::LinkReceiver& link)
 {
-	//BeginOp(B_PIC_ENTER_STATE_CHANGE);
+	BeginOp(B_PIC_ENTER_FONT_STATE);
 
 	uint16 mask;
 	link.Read<uint16>(&mask);
@@ -890,7 +895,7 @@
 		WriteSetFontFlags(flags);
 	}
 
-	//EndOp();
+	EndOp();
 }
 
 

Modified: haiku/trunk/src/servers/app/ServerPicture.h
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.h	2007-08-14 09:43:19 UTC (rev 21942)
+++ haiku/trunk/src/servers/app/ServerPicture.h	2007-08-14 12:45:42 UTC (rev 21943)
@@ -19,9 +19,6 @@
 		
 		void		EnterStateChange();
 		void		ExitStateChange();
-
-		void		EnterFontChange();
-		void		ExitFontChange();
 		
 		void		SyncState(ViewLayer *view);
 		void		SetFontFromLink(BPrivate::LinkReceiver& link);	



From jackburton at mail.berlios.de  Tue Aug 14 14:46:33 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Tue, 14 Aug 2007 14:46:33 +0200
Subject: [Haiku-commits] r21944 - haiku/trunk/src/kits/interface
Message-ID: <200708141246.l7ECkXas023899@sheep.berlios.de>

Author: jackburton
Date: 2007-08-14 14:46:33 +0200 (Tue, 14 Aug 2007)
New Revision: 21944
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21944&view=rev

Modified:
   haiku/trunk/src/kits/interface/PicturePlayer.cpp
Log:
Removed a no longer true TODO


Modified: haiku/trunk/src/kits/interface/PicturePlayer.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-14 12:45:42 UTC (rev 21943)
+++ haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-14 12:46:33 UTC (rev 21944)
@@ -63,9 +63,6 @@
 	// If an application supplies the wrong size or an invalid pointer,
 	// it's its own fault.
 
-	// TODO: Call the exit_font_state_change and exit_state_change hooks.
-	// there are no ops for them, so we need to keep track of the size of the data block,
-	// and call them when we are at the end.
 	const char *data = reinterpret_cast<const char *>(fData);
 	size_t pos = 0;
 



From bonefish at mail.berlios.de  Tue Aug 14 16:54:09 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Tue, 14 Aug 2007 16:54:09 +0200
Subject: [Haiku-commits] r21945 - in haiku/trunk:
	headers/private/kernel/boot/net src/tools/remote_disk_server
Message-ID: <200708141454.l7EEs9HV001604@sheep.berlios.de>

Author: bonefish
Date: 2007-08-14 16:54:09 +0200 (Tue, 14 Aug 2007)
New Revision: 21945
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21945&view=rev

Modified:
   haiku/trunk/headers/private/kernel/boot/net/RemoteDiskDefs.h
   haiku/trunk/src/tools/remote_disk_server/remote_disk_server.cpp
Log:
Made the remote_disk_server build under R5.


Modified: haiku/trunk/headers/private/kernel/boot/net/RemoteDiskDefs.h
===================================================================
--- haiku/trunk/headers/private/kernel/boot/net/RemoteDiskDefs.h	2007-08-14 12:46:33 UTC (rev 21944)
+++ haiku/trunk/headers/private/kernel/boot/net/RemoteDiskDefs.h	2007-08-14 14:54:09 UTC (rev 21945)
@@ -1,13 +1,14 @@
 /*
- * Copyright 2005, Ingo Weinhold <bonefish at cs.tu-berlin.de>.
+ * Copyright 2005-2007, Ingo Weinhold <bonefish at cs.tu-berlin.de>.
  * All rights reserved. Distributed under the terms of the MIT License.
  */
-
 #ifndef _BOOT_REMOTE_DISK_DEFS_H
 #define _BOOT_REMOTE_DISK_DEFS_H
 
-#include <stdint.h>
 
+#include <inttypes.h>
+
+
 enum {
 	REMOTE_DISK_SERVER_PORT	= 8765,
 	REMOTE_DISK_BLOCK_SIZE	= 1024,

Modified: haiku/trunk/src/tools/remote_disk_server/remote_disk_server.cpp
===================================================================
--- haiku/trunk/src/tools/remote_disk_server/remote_disk_server.cpp	2007-08-14 12:46:33 UTC (rev 21944)
+++ haiku/trunk/src/tools/remote_disk_server/remote_disk_server.cpp	2007-08-14 14:54:09 UTC (rev 21945)
@@ -6,6 +6,7 @@
 #include <endian.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -16,11 +17,9 @@
 
 #include <boot/net/RemoteDiskDefs.h>
 
+
 #if defined(__BEOS__) && !defined(__HAIKU__)
-#	include <limits.h>
 typedef int socklen_t;
-#else
-#	include <stdint.h>
 #endif
 
 
@@ -91,7 +90,7 @@
 			// short package?
 			if (bytesRead < (ssize_t)sizeof(remote_disk_header)) {
 				fprintf(stderr, "Dropping short request package (%d bytes).\n",
-					bytesRead);
+					(int)bytesRead);
 				continue;
 			}
 



From bonefish at mail.berlios.de  Tue Aug 14 17:12:04 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Tue, 14 Aug 2007 17:12:04 +0200
Subject: [Haiku-commits] r21946 - haiku/trunk/build/jam
Message-ID: <200708141512.l7EFC4TV002979@sheep.berlios.de>

Author: bonefish
Date: 2007-08-14 17:12:04 +0200 (Tue, 14 Aug 2007)
New Revision: 21946
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21946&view=rev

Modified:
   haiku/trunk/build/jam/HeadersRules
Log:
PublicHeaders always added the header/os directory too. Let's see, what
removing it will break...


Modified: haiku/trunk/build/jam/HeadersRules
===================================================================
--- haiku/trunk/build/jam/HeadersRules	2007-08-14 14:54:09 UTC (rev 21945)
+++ haiku/trunk/build/jam/HeadersRules	2007-08-14 15:12:04 UTC (rev 21946)
@@ -123,7 +123,7 @@
 	# <group list>.
 
 	local list = $(1) ;
-	local dirs = [ FDirName $(HAIKU_TOP) headers os ] ;
+	local dirs ;
 
 	for i in $(list) {
 		dirs += [ FDirName $(HAIKU_TOP) headers os $(i) ] ;



From jackburton at mail.berlios.de  Tue Aug 14 17:21:16 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Tue, 14 Aug 2007 17:21:16 +0200
Subject: [Haiku-commits] r21947 - in haiku/trunk: headers/private/interface
	src/kits/interface src/servers/app
Message-ID: <200708141521.l7EFLG6Z003768@sheep.berlios.de>

Author: jackburton
Date: 2007-08-14 17:21:15 +0200 (Tue, 14 Aug 2007)
New Revision: 21947
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21947&view=rev

Modified:
   haiku/trunk/headers/private/interface/PictureDataWriter.h
   haiku/trunk/src/kits/interface/PictureDataWriter.cpp
   haiku/trunk/src/kits/interface/PicturePlayer.cpp
   haiku/trunk/src/servers/app/ServerPicture.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Implemented SetClipping op, but it's not working yet (looks like it's 
never written into the data stream)


Modified: haiku/trunk/headers/private/interface/PictureDataWriter.h
===================================================================
--- haiku/trunk/headers/private/interface/PictureDataWriter.h	2007-08-14 15:12:04 UTC (rev 21946)
+++ haiku/trunk/headers/private/interface/PictureDataWriter.h	2007-08-14 15:21:15 UTC (rev 21947)
@@ -32,6 +32,8 @@
 	status_t WriteSetLineMode(const cap_mode &cap, const join_mode &join, const float &miterLimit);	
 	status_t WriteSetScale(const float &scale);
 	status_t WriteSetPattern(const pattern &pat);
+	status_t WriteSetClipping(/*const */BRegion &region);
+	status_t WriteClearClipping();
 
 	status_t WritePushState();
 	status_t WritePopState();	

Modified: haiku/trunk/src/kits/interface/PictureDataWriter.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PictureDataWriter.cpp	2007-08-14 15:12:04 UTC (rev 21946)
+++ haiku/trunk/src/kits/interface/PictureDataWriter.cpp	2007-08-14 15:21:15 UTC (rev 21947)
@@ -13,6 +13,7 @@
 #include <DataIO.h>
 #include <Point.h>
 #include <Rect.h>
+#include <Region.h>
 
 #include <PictureProtocol.h>
 
@@ -164,6 +165,40 @@
 
 
 status_t
+PictureDataWriter::WriteSetClipping(/*const */BRegion &region)
+{
+	// TODO: I don't know if it's compatible with R5's BPicture version
+	try {
+		const int32 numRects = region.CountRects();
+		if (numRects > 0 && region.Frame().IsValid()) {	
+			BeginOp(B_PIC_SET_CLIPPING_RECTS);
+			Write<int32>(numRects);
+			for (int32 i = 0; i < numRects; i++)
+				Write<BRect>(region.RectAt(i));			
+			EndOp();
+		} else
+			WriteClearClipping();
+	} catch (status_t &status) {
+		return status;
+	}
+	return B_OK;
+}
+
+
+status_t
+PictureDataWriter::WriteClearClipping()
+{
+	try {
+		BeginOp(B_PIC_CLEAR_CLIPPING_RECTS);
+		EndOp();
+	} catch (status_t &status) {
+		return status;
+	}
+	return B_OK;
+}
+
+
+status_t
 PictureDataWriter::WriteSetHighColor(const rgb_color &color)
 {
 	try {

Modified: haiku/trunk/src/kits/interface/PicturePlayer.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-14 15:12:04 UTC (rev 21946)
+++ haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-14 15:21:15 UTC (rev 21947)
@@ -35,7 +35,7 @@
 typedef void (*fnc_Color)(void*, rgb_color);
 typedef void (*fnc_Pattern)(void*, pattern);
 typedef void (*fnc_ss)(void *, int16, int16);
-typedef void (*fnc_PBRecti)(void*, const BRect*, int32);
+typedef void (*fnc_PBRecti)(void*, const BRect*, uint32);
 typedef void (*fnc_DrawPixels)(void *, BRect, BRect, int32, int32, int32,
 							   int32, int32, const void *);
 typedef void (*fnc_DrawPicture)(void *, BPoint, int32);
@@ -283,15 +283,18 @@
 			case B_PIC_SET_CLIPPING_RECTS:
 			{
 				if (tableEntries <= 20)
-					break;
-				// TODO: Implement
+					break;			
+				// TODO: Not sure if it's compatible with R5's BPicture version
+				((fnc_PBRecti)callBackTable[20])(userData,
+					reinterpret_cast<const BRect *>(data + sizeof(uint32)),
+					*reinterpret_cast<const uint32 *>(data));
 				break;
 			}
 
 			case B_PIC_CLEAR_CLIPPING_RECTS:
 			{
 				if (tableEntries <= 20)
-					break;
+					break;		
 				((fnc_PBRecti)callBackTable[20])(userData, NULL, 0);
 				break;
 			}

Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 15:12:04 UTC (rev 21946)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 15:21:15 UTC (rev 21947)
@@ -437,7 +437,8 @@
 static void
 set_clipping_rects(ViewLayer *view, const BRect *rects, uint32 numRects)
 {
-	// TODO: This is too slow, we should copy the rects directly to BRegion's internal data
+	// TODO: This might be too slow, we should copy the rects
+	// directly to BRegion's internal data
 	BRegion region;
 	for (uint32 c = 0; c < numRects; c++)
 		region.Include(rects[c]);

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-14 15:12:04 UTC (rev 21946)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-14 15:21:15 UTC (rev 21947)
@@ -2709,6 +2709,31 @@
 			break;
 		}
 
+		case AS_LAYER_SET_CLIP_REGION:
+		{
+			int32 rectCount;
+			status_t status = link.Read<int32>(&rectCount);
+				// a negative count means no
+				// region for the current draw state,
+				// but an *empty* region is actually valid!
+				// even if it means no drawing is allowed
+
+			if (status < B_OK)
+				break;
+
+			if (rectCount >= 0) {
+				// we are supposed to set the clipping region
+				BRegion region;
+				if (rectCount > 0 && link.ReadRegion(&region) < B_OK)
+					break;
+				picture->WriteSetClipping(region);
+			} else {
+				// we are supposed to clear the clipping region
+				picture->WriteClearClipping();
+			}
+
+			break;
+		}
 		case AS_LAYER_BEGIN_PICTURE:
 		{
 			ServerPicture *newPicture = App()->CreatePicture();



From bonefish at mail.berlios.de  Tue Aug 14 17:23:52 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Tue, 14 Aug 2007 17:23:52 +0200
Subject: [Haiku-commits] r21948 - haiku/trunk/build/jam
Message-ID: <200708141523.l7EFNqAr003915@sheep.berlios.de>

Author: bonefish
Date: 2007-08-14 17:23:52 +0200 (Tue, 14 Aug 2007)
New Revision: 21948
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21948&view=rev

Modified:
   haiku/trunk/build/jam/HeadersRules
Log:
Added the headers/os dir to FStandardOSHeaders and FStandardHeaders.


Modified: haiku/trunk/build/jam/HeadersRules
===================================================================
--- haiku/trunk/build/jam/HeadersRules	2007-08-14 15:21:15 UTC (rev 21947)
+++ haiku/trunk/build/jam/HeadersRules	2007-08-14 15:23:52 UTC (rev 21948)
@@ -352,7 +352,8 @@
 					   kernel media mail midi midi2 net opengl storage support
 					   translation ;
 	
-	return [ PublicHeaders $(osIncludes) ] ;
+	return [ FDirName $(HAIKU_TOP) headers os ]
+		[ PublicHeaders $(osIncludes) ] ;
 }
 
 rule FStandardHeaders
@@ -377,6 +378,7 @@
 	headers += [ FDirName $(HAIKU_TOP) headers glibc ] ;
 
 	# Use public OS header directories
+	headers += [ FDirName $(HAIKU_TOP) headers os ] ;
 	headers += [ PublicHeaders $(osIncludes) ] ;
 
 	# Use the root of the private headers -- not so nice, but simplifies things.



From colacoder at mail.berlios.de  Tue Aug 14 19:12:16 2007
From: colacoder at mail.berlios.de (colacoder at BerliOS)
Date: Tue, 14 Aug 2007 19:12:16 +0200
Subject: [Haiku-commits] r21949 - in haiku/trunk: build/jam
	src/add-ons/kernel/busses/ide
	src/add-ons/kernel/busses/ide/legacy_sata
Message-ID: <200708141712.l7EHCG9T022941@sheep.berlios.de>

Author: colacoder
Date: 2007-08-14 19:12:08 +0200 (Tue, 14 Aug 2007)
New Revision: 21949
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21949&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/src/add-ons/kernel/busses/ide/Jamfile
   haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c
Log:
Fixes for legacy_sata driver. It now:
	* boots Haiku successfully on 2 different test boxes here
	* no longer screws up when trying to write to PCI config space :)
	* Supports nVidia nForce chipsets
TODO:
	* Make 4 channel SATA controllers work (currently only recognizes first 2)
	* SATA PHY initialisation (needed for some BIOSes who might not do it)

Feel free to test this, and assign any problems with this driver to me.



Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2007-08-14 15:23:52 UTC (rev 21948)
+++ haiku/trunk/build/jam/HaikuImage	2007-08-14 17:12:08 UTC (rev 21949)
@@ -129,7 +129,7 @@
 AddFilesToHaikuImage beos system add-ons kernel bus_managers
 	: $(BEOS_ADD_ONS_BUS_MANAGERS) ;
 AddFilesToHaikuImage beos system add-ons kernel busses ide
-	: ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ;
+	: ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata ;
 AddFilesToHaikuImage beos system add-ons kernel busses usb
 	: <usb>uhci <usb>ohci <usb>ehci ;
 AddFilesToHaikuImage beos system add-ons kernel console : vga_text ;
@@ -346,7 +346,7 @@
 AddBootModuleSymlinksToHaikuImage config_manager bfs block_io fast_log
 	generic_ide_pci $(X86_ONLY)isa ide ide_adapter $(X86_ONLY)ide_isa intel
 	locked_pool $(PPC_ONLY)openpic pci scsi scsi_cd scsi_dsk scsi_periph
-	ahci silicon_image_3112
+	ahci silicon_image_3112 legacy_sata
 ;
 
 # add-ons

Modified: haiku/trunk/src/add-ons/kernel/busses/ide/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/ide/Jamfile	2007-08-14 15:23:52 UTC (rev 21948)
+++ haiku/trunk/src/add-ons/kernel/busses/ide/Jamfile	2007-08-14 17:12:08 UTC (rev 21949)
@@ -5,3 +5,4 @@
 SubInclude HAIKU_TOP src add-ons kernel busses ide ide_isa ;
 SubInclude HAIKU_TOP src add-ons kernel busses ide promise_tx2 ;
 SubInclude HAIKU_TOP src add-ons kernel busses ide silicon_image_3112 ;
+SubInclude HAIKU_TOP src add-ons kernel busses ide legacy_sata ;

Modified: haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c	2007-08-14 15:23:52 UTC (rev 21948)
+++ haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c	2007-08-14 17:12:08 UTC (rev 21949)
@@ -30,6 +30,22 @@
 #define PCI_device_ALI5287	0x5287
 #define PCI_device_ALI5281	0x5281
 
+#define PCI_vendor_NVIDIA	0x10de
+#define PCI_device_NF2PROS1	0x008e
+#define PCI_device_NF3PROS1	0x00e3
+#define PCI_device_NF3PROS2	0x00ee
+#define PCI_device_MCP4S1	0x0036
+#define PCI_device_MCP4S2	0x003e
+#define PCI_device_CK804S1	0x0054
+#define PCI_device_CK804S2	0x0055
+#define PCI_device_MCP51S1	0x0266
+#define PCI_device_MCP51S2	0x0267
+#define PCI_device_MCP55S1	0x037e
+#define PCI_device_MCP55S2	0x037f
+#define PCI_device_MCP61S1	0x03e7
+#define PCI_device_MCP61S2	0x03f6
+#define PCI_device_MCP61S3	0x03f7
+
 #define ID(v,d) (((v)<< 16) | (d))
 
 /* XXX: To be moved to PCI.h */
@@ -75,6 +91,23 @@
 		case ID(PCI_vendor_ALI, PCI_device_ALI5289):
 			break;
 
+		/* NVidia NForce chipsets */
+		case ID(PCI_vendor_NVIDIA, PCI_device_NF2PROS1):
+		case ID(PCI_vendor_NVIDIA, PCI_device_NF3PROS1):
+		case ID(PCI_vendor_NVIDIA, PCI_device_NF3PROS2):
+		case ID(PCI_vendor_NVIDIA, PCI_device_MCP4S1):
+		case ID(PCI_vendor_NVIDIA, PCI_device_MCP4S2):
+		case ID(PCI_vendor_NVIDIA, PCI_device_CK804S1):
+		case ID(PCI_vendor_NVIDIA, PCI_device_CK804S2):
+		case ID(PCI_vendor_NVIDIA, PCI_device_MCP51S1):
+		case ID(PCI_vendor_NVIDIA, PCI_device_MCP51S2):
+		case ID(PCI_vendor_NVIDIA, PCI_device_MCP55S1):
+		case ID(PCI_vendor_NVIDIA, PCI_device_MCP55S2):
+		case ID(PCI_vendor_NVIDIA, PCI_device_MCP61S1):
+		case ID(PCI_vendor_NVIDIA, PCI_device_MCP61S2):
+		case ID(PCI_vendor_NVIDIA, PCI_device_MCP61S3):
+			break;
+
 		default:
 			return 0.0f;
 	}
@@ -110,11 +143,22 @@
 	vendor_id = pci->read_pci_config(device, PCI_vendor_id, 2);
 	int_num = pci->read_pci_config(device, PCI_interrupt_line, 1);
 	bus_master_base = pci->read_pci_config(device, PCI_base_registers + 16, 4);
-	
+
+	/* Default PCI assigments */
+	command_block_base[0] = pci->read_pci_config(device, PCI_base_registers + 0, 4 );
+	control_block_base[0] = pci->read_pci_config(device, PCI_base_registers + 4, 4);
+	command_block_base[1] = pci->read_pci_config(device, PCI_base_registers + 8, 4);
+	control_block_base[1] = pci->read_pci_config(device, PCI_base_registers + 12, 4);
+
 	/* enable PCI interrupt */
-	pci->write_pci_config(device, PCI_command,
-		pci->read_pci_config(device, PCI_command, 2) & ~PCI_command_interrupt, 2);
+	pci->write_pci_config(device, PCI_command, 2,
+		pci->read_pci_config(device, PCI_command, 2) & ~PCI_command_interrupt);
 
+	if (vendor_id == PCI_vendor_NVIDIA) {
+		/* enable control access */
+		pci->write_pci_config(device, 0x50, 1,
+			pci->read_pci_config(device, 0x50, 1) | 0x04);
+	}
 
 	switch (ID(vendor_id, device_id)) {
 		case ID(PCI_vendor_VIA,PCI_device_VIA6421):
@@ -136,14 +180,7 @@
                         control_block_base[3] = pci->read_pci_config(device, PCI_base_registers + 4, 4) + 4;
                         command_block_base[4] = pci->read_pci_config(device, PCI_base_registers + 8, 4) + 8;
                         control_block_base[4] = pci->read_pci_config(device, PCI_base_registers + 12, 4) + 4;
-			/* Intentional fall-through */
-
-		default:
-			/* Default PCI assigments */
-			command_block_base[0] = pci->read_pci_config(device, PCI_base_registers + 0, 4 );
-			control_block_base[0] = pci->read_pci_config(device, PCI_base_registers + 4, 4);
-			command_block_base[1] = pci->read_pci_config(device, PCI_base_registers + 8, 4);
-			control_block_base[1] = pci->read_pci_config(device, PCI_base_registers + 12, 4);
+			break;
 	}
 
         res = ide_adapter->detect_controller(pci, device, parent, bus_master_base, 



From fekdahl at gmail.com  Tue Aug 14 19:38:45 2007
From: fekdahl at gmail.com (Fredrik Ekdahl)
Date: Tue, 14 Aug 2007 19:38:45 +0200
Subject: [Haiku-commits] r21949 - in haiku/trunk: build/jam
	src/add-ons/kernel/busses/ide
	src/add-ons/kernel/busses/ide/legacy_sata
In-Reply-To: <200708141712.l7EHCG9T022941@sheep.berlios.de>
References: <200708141712.l7EHCG9T022941@sheep.berlios.de>
Message-ID: <200708141938.45377.fekdahl@gmail.com>

On Tuesday 14 August 2007 19.12.16 colacoder at BerliOS wrote:
> Author: colacoder
> Date: 2007-08-14 19:12:08 +0200 (Tue, 14 Aug 2007)
> New Revision: 21949
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21949&view=rev
>
> Modified:
> ? ?haiku/trunk/build/jam/HaikuImage
> ? ?haiku/trunk/src/add-ons/kernel/busses/ide/Jamfile
> ? ?haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c
> Log:
> Fixes for legacy_sata driver. It now:
> ????????* boots Haiku successfully on 2 different test boxes here
> ????????* no longer screws up when trying to write to PCI config space :)
> ????????* Supports nVidia nForce chipsets
> TODO:
> ????????* Make 4 channel SATA controllers work (currently only recognizes
> first 2) * SATA PHY initialisation (needed for some BIOSes who might not do
> it)
>
> Feel free to test this, and assign any problems with this driver to me.


Wow! Thanks a lot! I've been waiting for this.

This commit fixes ticket #1095, if it works :)

Gonna try this on my nVidia MCP51 as soon as I manage to install Haiku on real 
hardware from Kubuntu.

BTW, what's the recommended/safest way of doing that?

1) Build an image and dd

2) Letting the build system do it with 
    'HAIKU_INSTALL_DIR=/dev/sdaX jam install-haiku'

3) ....

Is there a guide?

/Fredrik Ekdahl


From colacoder at mail.berlios.de  Tue Aug 14 20:38:48 2007
From: colacoder at mail.berlios.de (colacoder at BerliOS)
Date: Tue, 14 Aug 2007 20:38:48 +0200
Subject: [Haiku-commits] r21950 - haiku/trunk/src/servers/app
Message-ID: <200708141838.l7EIcmTQ003429@sheep.berlios.de>

Author: colacoder
Date: 2007-08-14 20:38:47 +0200 (Tue, 14 Aug 2007)
New Revision: 21950
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21950&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerPicture.cpp
Log:
Fix GCC4 compilation issue.



Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 17:12:08 UTC (rev 21949)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-14 18:38:47 UTC (rev 21950)
@@ -842,8 +842,8 @@
 		link.Read<uint32>(&fontID);
 		ServerFont font;
 		font.SetFamilyAndStyle(fontID);
-		WriteSetFontFamily((font_family)font.Family());
-		WriteSetFontStyle((font_style)font.Style());
+		WriteSetFontFamily(font.Family());
+		WriteSetFontStyle(font.Style());
 	}
 
 	if (mask & B_FONT_SIZE) {



From colacoder at mail.berlios.de  Tue Aug 14 22:19:59 2007
From: colacoder at mail.berlios.de (colacoder at BerliOS)
Date: Tue, 14 Aug 2007 22:19:59 +0200
Subject: [Haiku-commits] r21951 -
	haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata
Message-ID: <200708142019.l7EKJxtB011866@sheep.berlios.de>

Author: colacoder
Date: 2007-08-14 22:19:58 +0200 (Tue, 14 Aug 2007)
New Revision: 21951
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21951&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c
Log:
Initial fixes to makee 4-port SATA work. Big ide_adapter commit will follow...



Modified: haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c	2007-08-14 18:38:47 UTC (rev 21950)
+++ haiku/trunk/src/add-ons/kernel/busses/ide/legacy_sata/legacy_sata.c	2007-08-14 20:19:58 UTC (rev 21951)
@@ -122,9 +122,9 @@
 controller_probe(device_node_handle parent)
 {
         device_node_handle controller_node;
-	device_node_handle channels[2];
-	uint16 command_block_base[2];
-	uint16 control_block_base[2];
+	device_node_handle channels[4];
+	uint16 command_block_base[4];
+	uint16 control_block_base[4];
 	pci_device_module_info *pci;
 	uint8 num_channels = 2;
 	uint32 bus_master_base;
@@ -145,7 +145,7 @@
 	bus_master_base = pci->read_pci_config(device, PCI_base_registers + 16, 4);
 
 	/* Default PCI assigments */
-	command_block_base[0] = pci->read_pci_config(device, PCI_base_registers + 0, 4 );
+	command_block_base[0] = pci->read_pci_config(device, PCI_base_registers + 0, 4);
 	control_block_base[0] = pci->read_pci_config(device, PCI_base_registers + 4, 4);
 	command_block_base[1] = pci->read_pci_config(device, PCI_base_registers + 8, 4);
 	control_block_base[1] = pci->read_pci_config(device, PCI_base_registers + 12, 4);
@@ -164,11 +164,11 @@
 		case ID(PCI_vendor_VIA,PCI_device_VIA6421):
 			/* newer SATA chips has resources in one BAR for each channel */
 			num_channels = 4;
-			command_block_base[0] = pci->read_pci_config(device, PCI_base_registers + 0, 4 );
+			command_block_base[0] = pci->read_pci_config(device, PCI_base_registers + 0, 4);
 			control_block_base[0] = command_block_base[0] + 8;
 			command_block_base[1] = pci->read_pci_config(device, PCI_base_registers + 4, 4);
 			control_block_base[1] = command_block_base[1] + 8;
-			command_block_base[2] = pci->read_pci_config(device, PCI_base_registers + 8, 4 );
+			command_block_base[2] = pci->read_pci_config(device, PCI_base_registers + 8, 4);
 			control_block_base[2] = command_block_base[2] + 8;
 			command_block_base[3] = pci->read_pci_config(device, PCI_base_registers + 12, 4);
 			control_block_base[3] = command_block_base[3] + 8;
@@ -176,10 +176,10 @@
 
 		case ID(PCI_vendor_ALI, PCI_device_ALI5287):
 			num_channels = 4;
-                        command_block_base[3] = pci->read_pci_config(device, PCI_base_registers + 0, 4 ) + 8;
-                        control_block_base[3] = pci->read_pci_config(device, PCI_base_registers + 4, 4) + 4;
-                        command_block_base[4] = pci->read_pci_config(device, PCI_base_registers + 8, 4) + 8;
-                        control_block_base[4] = pci->read_pci_config(device, PCI_base_registers + 12, 4) + 4;
+                        command_block_base[2] = pci->read_pci_config(device, PCI_base_registers + 0, 4) + 8;
+                        control_block_base[2] = pci->read_pci_config(device, PCI_base_registers + 4, 4) + 4;
+                        command_block_base[3] = pci->read_pci_config(device, PCI_base_registers + 8, 4) + 8;
+                        control_block_base[3] = pci->read_pci_config(device, PCI_base_registers + 12, 4) + 4;
 			break;
 	}
 
@@ -196,22 +196,30 @@
 	}
 
         // ignore errors during registration of channels - could be a simple rescan collision
-        ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME,
+        res = ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME,
                 true, command_block_base[0], control_block_base[0], bus_master_base,
                 int_num, true, "Primary Channel", &channels[0], false);
 
-        ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME,
+	dprintf("Primary Channel: %s\n", strerror(res));
+
+        res = ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME,
                 true, command_block_base[1], control_block_base[1], bus_master_base,
                 int_num, false, "Secondary Channel", &channels[1], false);
 
+	dprintf("Secondary Channel: %s\n", strerror(res));
+
 	if (num_channels == 4) {
-		ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME,
+		res = ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME,
 			true, command_block_base[2], control_block_base[2], bus_master_base,
 			int_num, true, "Tertiary Channel", &channels[2], false);
 
-		ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME,
+		dprintf("Tertiary Channel: %s\n", strerror(res));
+
+		res = ide_adapter->detect_channel(pci, device, controller_node, CHANNEL_MODULE_NAME,
 			true, command_block_base[3], control_block_base[3], bus_master_base,
 			int_num, false, "Quaternary Channel", &channels[3], false);
+
+		dprintf("Quaternary Channel: %s\n", strerror(res));
 	}
 
 	dm->uninit_driver(parent);



From axeld at mail.berlios.de  Wed Aug 15 00:45:50 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 15 Aug 2007 00:45:50 +0200
Subject: [Haiku-commits] r21952 - haiku/trunk/src/bin/unrar
Message-ID: <200708142245.l7EMjooF014152@sheep.berlios.de>

Author: axeld
Date: 2007-08-15 00:45:34 +0200 (Wed, 15 Aug 2007)
New Revision: 21952
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21952&view=rev

Modified:
   haiku/trunk/src/bin/unrar/archive.cpp
   haiku/trunk/src/bin/unrar/archive.hpp
   haiku/trunk/src/bin/unrar/arcread.cpp
   haiku/trunk/src/bin/unrar/cmddata.cpp
   haiku/trunk/src/bin/unrar/compress.hpp
   haiku/trunk/src/bin/unrar/consio.cpp
   haiku/trunk/src/bin/unrar/crc.cpp
   haiku/trunk/src/bin/unrar/crypt.cpp
   haiku/trunk/src/bin/unrar/dll.cpp
   haiku/trunk/src/bin/unrar/dll.hpp
   haiku/trunk/src/bin/unrar/extract.cpp
   haiku/trunk/src/bin/unrar/extract.hpp
   haiku/trunk/src/bin/unrar/filcreat.cpp
   haiku/trunk/src/bin/unrar/filefn.cpp
   haiku/trunk/src/bin/unrar/filefn.hpp
   haiku/trunk/src/bin/unrar/filestr.cpp
   haiku/trunk/src/bin/unrar/filestr.hpp
   haiku/trunk/src/bin/unrar/find.cpp
   haiku/trunk/src/bin/unrar/getbits.hpp
   haiku/trunk/src/bin/unrar/headers.hpp
   haiku/trunk/src/bin/unrar/list.cpp
   haiku/trunk/src/bin/unrar/loclang.hpp
   haiku/trunk/src/bin/unrar/match.cpp
   haiku/trunk/src/bin/unrar/options.hpp
   haiku/trunk/src/bin/unrar/os.hpp
   haiku/trunk/src/bin/unrar/pathfn.cpp
   haiku/trunk/src/bin/unrar/pathfn.hpp
   haiku/trunk/src/bin/unrar/rar.cpp
   haiku/trunk/src/bin/unrar/rar.hpp
   haiku/trunk/src/bin/unrar/rarvm.cpp
   haiku/trunk/src/bin/unrar/rarvm.hpp
   haiku/trunk/src/bin/unrar/rawread.cpp
   haiku/trunk/src/bin/unrar/rdwrfn.cpp
   haiku/trunk/src/bin/unrar/readme.txt
   haiku/trunk/src/bin/unrar/recvol.cpp
   haiku/trunk/src/bin/unrar/scantree.cpp
   haiku/trunk/src/bin/unrar/smallfn.cpp
   haiku/trunk/src/bin/unrar/smallfn.hpp
   haiku/trunk/src/bin/unrar/strfn.cpp
   haiku/trunk/src/bin/unrar/strfn.hpp
   haiku/trunk/src/bin/unrar/strlist.cpp
   haiku/trunk/src/bin/unrar/system.cpp
   haiku/trunk/src/bin/unrar/timefn.cpp
   haiku/trunk/src/bin/unrar/unicode.cpp
   haiku/trunk/src/bin/unrar/unicode.hpp
   haiku/trunk/src/bin/unrar/unpack.cpp
   haiku/trunk/src/bin/unrar/unpack.hpp
   haiku/trunk/src/bin/unrar/unpack15.cpp
   haiku/trunk/src/bin/unrar/unrar.rdef
   haiku/trunk/src/bin/unrar/version.hpp
   haiku/trunk/src/bin/unrar/volume.cpp
   haiku/trunk/src/bin/unrar/win32stm.cpp
Log:
Patch by Ioan Molnar: update unrar from version 3.67 to 3.76 - thanks!


Modified: haiku/trunk/src/bin/unrar/archive.cpp
===================================================================
--- haiku/trunk/src/bin/unrar/archive.cpp	2007-08-14 20:19:58 UTC (rev 21951)
+++ haiku/trunk/src/bin/unrar/archive.cpp	2007-08-14 22:45:34 UTC (rev 21952)
@@ -197,6 +197,10 @@
 #ifdef RARDLL
   SilentOpen=true;
 #endif
+
+  //if not encrypted, we'll check it below
+  NotFirstVolume=Encrypted && (NewMhd.Flags & MHD_FIRSTVOLUME)==0;
+
   if (!SilentOpen || !Encrypted)
   {
     SaveFilePos SavePos(*this);
@@ -226,6 +230,12 @@
     CurBlockPos=SaveCurBlockPos;
     NextBlockPos=SaveNextBlockPos;
   }
+  if (!Volume || !NotFirstVolume)
+  {
+    strcpy(FirstVolumeName,FileName);
+    strcpyw(FirstVolumeNameW,FileNameW);
+  }
+
   return(true);
 }
 

Modified: haiku/trunk/src/bin/unrar/archive.hpp
===================================================================
--- haiku/trunk/src/bin/unrar/archive.hpp	2007-08-14 20:19:58 UTC (rev 21951)
+++ haiku/trunk/src/bin/unrar/archive.hpp	2007-08-14 22:45:34 UTC (rev 21952)
@@ -10,11 +10,9 @@
   private:
     bool IsSignature(byte *D);
     void UpdateLatestTime(FileHeader *CurBlock);
-    void Protect(int RecSectors);
     void ConvertNameCase(char *Name);
     void ConvertNameCase(wchar *Name);
     void ConvertUnknownHeader();
-    bool AddArcComment(char *NameToShow);
     int ReadOldHeader();
     void PrepareExtraTime(FileHeader *hd,EXTTIME_MODE etm,EXTTIME_MODE etc,EXTTIME_MODE eta,EXTTIME_MODE etarc,Array<byte> &TimeData);
 

Modified: haiku/trunk/src/bin/unrar/arcread.cpp
===================================================================
--- haiku/trunk/src/bin/unrar/arcread.cpp	2007-08-14 20:19:58 UTC (rev 21951)
+++ haiku/trunk/src/bin/unrar/arcread.cpp	2007-08-14 22:45:34 UTC (rev 21952)
@@ -162,8 +162,7 @@
         Raw.Get((byte *)FileName,NameSize);
         FileName[NameSize]=0;
 
-        strncpy(hd->FileName,FileName,sizeof(hd->FileName));
-        hd->FileName[sizeof(hd->FileName)-1]=0;
+        strncpyz(hd->FileName,FileName,ASIZE(hd->FileName));
 
         if (hd->HeadType==NEWSUB_HEAD)
         {

Modified: haiku/trunk/src/bin/unrar/cmddata.cpp
===================================================================
--- haiku/trunk/src/bin/unrar/cmddata.cpp	2007-08-14 20:19:58 UTC (rev 21951)
+++ haiku/trunk/src/bin/unrar/cmddata.cpp	2007-08-14 22:45:34 UTC (rev 21952)
@@ -55,10 +55,10 @@
   else
     if (*Command==0)
     {
-      strncpy(Command,Arg,sizeof(Command));
+      strncpyz(Command,Arg,ASIZE(Command));
       if (ArgW!=NULL)
         strncpyw(CommandW,ArgW,sizeof(CommandW)/sizeof(CommandW[0]));
-      if (toupper(*Command)=='S')
+      if (etoupper(*Command)=='S')
       {
         const char *SFXName=Command[1] ? Command+1:DefSFXName;
         if (PointToName(SFXName)!=SFXName || FileExist(SFXName))
@@ -67,7 +67,7 @@
           GetConfigName(SFXName,SFXModule,true);
       }
 #ifndef GUI
-      *Command=toupper(*Command);
+      *Command=etoupper(*Command);
       if (*Command!='I' && *Command!='S')
         strupper(Command);
 #endif
@@ -75,19 +75,23 @@
     else
       if (*ArcName==0)
       {
-        strncpy(ArcName,Arg,sizeof(ArcName));
+        strncpyz(ArcName,Arg,ASIZE(ArcName));
         if (ArgW!=NULL)
-          strncpyw(ArcNameW,ArgW,sizeof(ArcNameW)/sizeof(ArcNameW[0]));
+          strncpyzw(ArcNameW,ArgW,ASIZE(ArcNameW));
       }
       else
       {
         int Length=strlen(Arg);
         char EndChar=Arg[Length-1];
-        char CmdChar=toupper(*Command);
+        char CmdChar=etoupper(*Command);
         bool Add=strchr("AFUM",CmdChar)!=NULL;
         bool Extract=CmdChar=='X' || CmdChar=='E';
         if ((IsDriveDiv(EndChar) || IsPathDiv(EndChar)) && !Add)
-          strcpy(ExtrPath,Arg);
+        {
+          strncpyz(ExtrPath,Arg,ASIZE(ExtrPath));
+          if (ArgW!=NULL)
+            strncpyzw(ExtrPathW,ArgW,ASIZE(ExtrPathW));
+        }
         else
           if ((Add || CmdChar=='T') && *Arg!='@')
             FileArgs->AddString(Arg);
@@ -98,7 +102,18 @@
             if (!Found && *Arg=='@' && !IsWildcard(Arg))
             {
               FileLists=true;
-              ReadTextFile(Arg+1,FileArgs,false,true,true,true,true);
+
+              RAR_CHARSET Charset=FilelistCharset;
+
+#if defined(_WIN_32) && !defined(GUI)
+              // for compatibility reasons we use OEM encoding
+              // in Win32 console version by default
+
+              if (Charset==RCH_DEFAULT)
+                Charset=RCH_OEM;
+#endif
+
+              ReadTextFile(Arg+1,FileArgs,false,true,Charset,true,true);
             }
             else
               if (Found && FileData.IsDir && Extract && *ExtrPath==0)
@@ -118,7 +133,7 @@
 {
   if (FileArgs->ItemsCount()==0 && !FileLists)
     FileArgs->AddString(MASKALL);
-  char CmdChar=toupper(*Command);
+  char CmdChar=etoupper(*Command);
   bool Extract=CmdChar=='X' || CmdChar=='E';
   if (Test && Extract)
     Test=false;
@@ -136,7 +151,11 @@
 #endif
 
 
-#if !defined(GUI) && !defined(SFX_MODULE)
+
+// return 'false' if -cfg- is present and preprocess switches
+// which must be processed before the rest of command line
+
+#ifndef SFX_MODULE
 bool CommandData::IsConfigEnabled(int argc,char *argv[])
 {
   bool ConfigEnabled=true;
@@ -145,11 +164,20 @@
     {
       if (stricomp(&argv[I][1],"cfg-")==0)
         ConfigEnabled=false;
+#ifndef GUI
       if (strnicomp(&argv[I][1],"ilog",4)==0)
       {
+        // ensure that correct log file name is already set
+        // if we need to report an error when processing the command line
         ProcessSwitch(&argv[I][1]);
         InitLogOptions(LogName);
       }
+#endif
+      if (strnicomp(&argv[I][1],"sc",2)==0)
+      {
+        // process -cs before reading any file lists
+        ProcessSwitch(&argv[I][1]);
+      }
     }
   return(ConfigEnabled);
 }
@@ -201,12 +229,12 @@
 void CommandData::ProcessSwitch(char *Switch)
 {
 
-  switch(toupper(Switch[0]))
+  switch(etoupper(Switch[0]))
   {
     case 'I':
       if (strnicomp(&Switch[1],"LOG",3)==0)
       {
-        strncpy(LogName,Switch[4] ? Switch+4:DefLogName,sizeof(LogName));
+        strncpyz(LogName,Switch[4] ? Switch+4:DefLogName,ASIZE(LogName));
         break;
       }
       if (stricomp(&Switch[1],"SND")==0)
@@ -221,7 +249,7 @@
       }
       if (strnicomp(&Switch[1],"EML",3)==0)
       {
-        strncpy(EmailTo,Switch[4] ? Switch+4:"@",sizeof(EmailTo));
+        strncpyz(EmailTo,Switch[4] ? Switch+4:"@",ASIZE(EmailTo));
         EmailTo[sizeof(EmailTo)-1]=0;
         break;
       }
@@ -230,10 +258,10 @@
         MsgStream=MSG_NULL;
         break;
       }
-      if (toupper(Switch[1])=='D')
+      if (etoupper(Switch[1])=='D')
       {
         for (int I=2;Switch[I]!=0;I++)
-          switch(toupper(Switch[I]))
+          switch(etoupper(Switch[I]))
           {
             case 'Q':
               MsgStream=MSG_ERRONLY;
@@ -257,7 +285,7 @@
       }
       break;
     case 'T':
-      switch(toupper(Switch[1]))
+      switch(etoupper(Switch[1]))
       {
         case 'K':
           ArcTime=ARCTIME_KEEP;
@@ -293,7 +321,7 @@
                 Mode=(EXTTIME_MODE)(Switch[3]-'0');
               if (Switch[3]=='-')
                 Mode=EXTTIME_NONE;
-              switch(toupper(Switch[2]))
+              switch(etoupper(Switch[2]))
               {
                 case 'M':
                   xmtime=Mode;
@@ -323,7 +351,7 @@
       }
       break;
     case 'A':
-      switch(toupper(Switch[1]))
+      switch(etoupper(Switch[1]))
       {
         case 'C':
           ClearArc=true;
@@ -337,7 +365,7 @@
           else
           {
             GenerateArcName=true;
-            strncpy(GenerateMask,Switch+2,sizeof(GenerateMask));
+            strncpyz(GenerateMask,Switch+2,ASIZE(GenerateMask));
           }
           break;
         case 'N': //reserved for archive name
@@ -351,11 +379,14 @@
         case 'S':
           SyncFiles=true;
           break;
+        default:
+          BadSwitch(Switch);
+          break;
       }
       break;
     case 'D':
       if (Switch[2]==0)
-        switch(toupper(Switch[1]))
+        switch(etoupper(Switch[1]))
         {
           case 'S':
             DisableSortSolid=true;
@@ -369,7 +400,7 @@
         }
       break;
     case 'O':
-      switch(toupper(Switch[1]))
+      switch(etoupper(Switch[1]))
       {
         case '+':
           Overwrite=OVERWRITE_ALL;
@@ -402,7 +433,7 @@
       }
       break;
     case 'R':
-      switch(toupper(Switch[1]))
+      switch(etoupper(Switch[1]))
       {
         case 0:
           Recurse=RECURSE_ALWAYS;
@@ -435,16 +466,28 @@
     case 'N':
     case 'X':
       if (Switch[1]!=0)
-      {
-        StringList *Args=toupper(Switch[0])=='N' ? InclArgs:ExclArgs;
+      {      
+        StringList *Args=etoupper(Switch[0])=='N' ? InclArgs:ExclArgs;
         if (Switch[1]=='@' && !IsWildcard(Switch))
-          ReadTextFile(Switch+2,Args,false,true,true,true,true);
+        {
+          RAR_CHARSET Charset=FilelistCharset;
+
+#if defined(_WIN_32) && !defined(GUI)
+          // for compatibility reasons we use OEM encoding
+          // in Win32 console version by default
+
+          if (Charset==RCH_DEFAULT)
+            Charset=RCH_OEM;
+#endif
+
+          ReadTextFile(Switch+2,Args,false,true,Charset,true,true);
+        }
         else
           Args->AddString(Switch+1);
       }
       break;
     case 'E':
-      switch(toupper(Switch[1]))
+      switch(etoupper(Switch[1]))
       {
         case 'P':
           switch(Switch[2])
@@ -490,14 +533,14 @@
         eprintf("\n");
       }
       else
-        strncpy(Password,Switch+1,sizeof(Password));
+        strncpyz(Password,Switch+1,ASIZE(Password));
       break;
     case 'H':
-      if (toupper(Switch[1])=='P')
+      if (etoupper(Switch[1])=='P')
       {
         EncryptHeaders=true;
         if (Switch[2]!=0)
-          strncpy(Password,Switch+2,sizeof(Password));
+          strncpyz(Password,Switch+2,ASIZE(Password));
         else
           if (*Password==0)
           {
@@ -507,11 +550,10 @@
       }
       break;
     case 'Z':
-      strncpy(CommentFile,Switch[1]!=0 ? Switch+1:"stdin",sizeof(CommentFile)-1);
-      CommentFile[sizeof(CommentFile)-1]=0;
+      strncpyz(CommentFile,Switch[1]!=0 ? Switch+1:"stdin",ASIZE(CommentFile));
       break;
     case 'M':
-      switch(toupper(Switch[1]))
+      switch(etoupper(Switch[1]))
       {
         case 'C':
           {
@@ -537,7 +579,7 @@
                   while (isdigit(*Str))
                     Str++;
                 }
-                switch(toupper(*(Str++)))
+                switch(etoupper(*(Str++)))
                 {
                   case 'T': Type=FILTER_PPM;         break;
                   case 'E': Type=FILTER_E8;          break;
@@ -560,7 +602,7 @@
         case 'D':
           {
             if ((WinSize=atoi(&Switch[2]))==0)
-              WinSize=0x10000<<(toupper(Switch[2])-'A');
+              WinSize=0x10000<<(etoupper(Switch[2])-'A');
             else
               WinSize*=1024;
             if (!CheckWinSize())
@@ -612,7 +654,7 @@
       }
       break;
     case 'V':
-      switch(toupper(Switch[1]))
+      switch(etoupper(Switch[1]))
       {
 #ifdef _WIN_32
         case 'D':
@@ -626,7 +668,7 @@
           VolumePause=true;
           break;
         case 'E':
-          if (toupper(Switch[2])=='R')
+          if (etoupper(Switch[2])=='R')
             VersionControl=atoi(Switch+3)+1;
           break;
         case '-':
@@ -695,30 +737,19 @@
       }
       break;
     case 'F':
-      switch(toupper(Switch[1]))
-      {
-        case 0:
-          FreshFiles=true;
-          break;
-        case 'C':
-          if (toupper(Switch[2])=='U')
-          {
-            UnicodeComment=true;
-            if (*CommentFile==0 || Switch[3]!=0)
-            {
-              strncpy(CommentFile,Switch[3]!=0 ? Switch+3:"stdin",sizeof(CommentFile)-1);
-              CommentFile[sizeof(CommentFile)-1]=0;
-            }
-          }
-          break;
-      }
+      if (Switch[1]==0)
+        FreshFiles=true;
+      else
+        BadSwitch(Switch);
       break;
     case 'U':
       if (Switch[1]==0)
         UpdateFiles=true;
+      else
+        BadSwitch(Switch);
       break;
     case 'W':
-      strncpy(TempPath,&Switch[1],sizeof(TempPath)-1);
+      strncpyz(TempPath,&Switch[1],ASIZE(TempPath));
       AddEndSlash(TempPath);
       break;
     case 'S':
@@ -736,7 +767,7 @@
         SolidCount=atoi(&Switch[1]);
       }
       else
-        switch(toupper(Switch[1]))
+        switch(etoupper(Switch[1]))
         {
           case 0:
             Solid|=SOLID_NORMAL;
@@ -761,11 +792,48 @@
             if (isdigit(Switch[2]))
               FileSizeMore=atoil(Switch+2);
             break;
+          case 'C':
+            {
+              RAR_CHARSET rch;
+              switch(etoupper(Switch[2]))
+              {
+                case 'A':
+                  rch=RCH_ANSI;
+                  break;
+                case 'O':
+                  rch=RCH_OEM;
+                  break;
+                case 'U':
+                  rch=RCH_UNICODE;
+                  break;
+                default :
+                  BadSwitch(Switch);
+                  break;
+              };
+              if (Switch[3]==0)
+                CommentCharset=FilelistCharset=rch;
+              else
+                for (int I=3;Switch[I]!=0;I++)
+                  switch(etoupper(Switch[I]))
+                  {
+                    case 'C':
+                      CommentCharset=rch;
+                      break;
+                    case 'L':
+                      FilelistCharset=rch;
+                      break;
+                    default:
+                      BadSwitch(Switch);
+                      break;
+                  }
+            }
+            break;
+
         }
       break;
     case 'C':
       if (Switch[2]==0)
-        switch(toupper(Switch[1]))
+        switch(etoupper(Switch[1]))
         {
           case '-':
             DisableComment=true;
@@ -779,7 +847,7 @@
         }
       break;
     case 'K':
-      switch(toupper(Switch[1]))
+      switch(etoupper(Switch[1]))
       {
         case 'B':
           KeepBroken=true;
@@ -866,17 +934,17 @@
     MCHelpSwAO,MCHelpSwAP,MCHelpSwAS,MCHelpSwAV,MCHelpSwAVm,MCHelpSwCm,
     MCHelpSwCFGm,MCHelpSwCL,MCHelpSwCU,MCHelpSwDF,MCHelpSwDH,MCHelpSwDS,
     MCHelpSwEa,MCHelpSwED,MCHelpSwEE,MCHelpSwEN,MCHelpSwEP,MCHelpSwEP1,
-    MCHelpSwEP2,MCHelpSwEP3,MCHelpSwF,MCHelpSwFCU,MCHelpSwHP,MCHelpSwIDP,
+    MCHelpSwEP2,MCHelpSwEP3,MCHelpSwF,MCHelpSwHP,MCHelpSwIDP,
     MCHelpSwIEML,MCHelpSwIERR,MCHelpSwILOG,MCHelpSwINUL,MCHelpSwIOFF,
     MCHelpSwISND,MCHelpSwK,MCHelpSwKB,MCHelpSwMn,MCHelpSwMC,MCHelpSwMD,
     MCHelpSwMS,MCHelpSwMT,MCHelpSwN,MCHelpSwNa,MCHelpSwNal,MCHelpSwOp,
     MCHelpSwOm,MCHelpSwOC,MCHelpSwOL,MCHelpSwOR,MCHelpSwOS,MCHelpSwOW,
     MCHelpSwP,MCHelpSwPm,MCHelpSwR,MCHelpSwR0,MCHelpSwRI,MCHelpSwRR,
-    MCHelpSwRV,MCHelpSwS,MCHelpSwSm,MCHelpSwSFX,MCHelpSwSI,MCHelpSwSL,
-    MCHelpSwSM,MCHelpSwT,MCHelpSwTA,MCHelpSwTB,MCHelpSwTK,MCHelpSwTL,
-    MCHelpSwTN,MCHelpSwTO,MCHelpSwTS,MCHelpSwU,MCHelpSwV,MCHelpSwVn,
-    MCHelpSwVD,MCHelpSwVER,MCHelpSwVN,MCHelpSwVP,MCHelpSwW,MCHelpSwX,
-    MCHelpSwXa,MCHelpSwXal,MCHelpSwY,MCHelpSwZ
+    MCHelpSwRV,MCHelpSwS,MCHelpSwSm,MCHelpSwSC,MCHelpSwSFX,MCHelpSwSI,
+    MCHelpSwSL,MCHelpSwSM,MCHelpSwT,MCHelpSwTA,MCHelpSwTB,MCHelpSwTK,
+    MCHelpSwTL,MCHelpSwTN,MCHelpSwTO,MCHelpSwTS,MCHelpSwU,MCHelpSwV,
+    MCHelpSwVn,MCHelpSwVD,MCHelpSwVER,MCHelpSwVN,MCHelpSwVP,MCHelpSwW,
+    MCHelpSwX,MCHelpSwXa,MCHelpSwXal,MCHelpSwY,MCHelpSwZ
 #endif
   };
 
@@ -1079,7 +1147,9 @@
 void CommandData::ProcessCommand()
 {
 #ifndef SFX_MODULE
-  if (Command[1] && strchr("FUADPXETK",*Command)!=NULL || *ArcName==0)
+
+  const char *SingleCharCommands="FUADPXETK";
+  if (Command[1] && strchr(SingleCharCommands,*Command)!=NULL || *ArcName==0)
     OutHelp();
 
 #ifdef _UNIX
@@ -1163,7 +1233,7 @@
   {
     uint Attr;
     for (Attr=0;*Str;Str++)
-      switch(toupper(*Str))
+      switch(etoupper(*Str))
       {
 #ifdef _UNIX
         case 'D':

Modified: haiku/trunk/src/bin/unrar/compress.hpp
===================================================================
--- haiku/trunk/src/bin/unrar/compress.hpp	2007-08-14 20:19:58 UTC (rev 21951)
+++ haiku/trunk/src/bin/unrar/compress.hpp	2007-08-14 22:45:34 UTC (rev 21952)
@@ -29,7 +29,7 @@
 
 enum FilterType {
   FILTER_NONE, FILTER_PPM /*dummy*/, FILTER_E8, FILTER_E8E9,
-  FILTER_UPCASETOLOW, FILTER_AUDIO, FILTER_RGB,  FILTER_DELTA,
+  FILTER_UPCASETOLOW, FILTER_AUDIO, FILTER_RGB, FILTER_DELTA,
   FILTER_ITANIUM, FILTER_E8E9V2
 };
 

Modified: haiku/trunk/src/bin/unrar/consio.cpp
===================================================================
--- haiku/trunk/src/bin/unrar/consio.cpp	2007-08-14 20:19:58 UTC (rev 21951)
+++ haiku/trunk/src/bin/unrar/consio.cpp	2007-08-14 22:45:34 UTC (rev 21952)
@@ -124,8 +124,9 @@
 #elif defined(_EMX) || defined(_BEOS) || defined(__sparc) || defined(sparc) || defined (__VMS)
   fgets(Str,MaxLength-1,stdin);
 #else
-  strncpy(Str,getpass(""),MaxLength-1);
+  strncpyz(Str,getpass(""),MaxLength);
 #endif
+  Str[MaxLength-1]=0;
   RemoveLF(Str);
 }
 #endif
@@ -159,7 +160,7 @@
   Alarm();
   while (true)
   {
-    char PromptStr[256];
+    char PromptStr[NM+256];
 #if defined(_EMX) || defined(_BEOS)
     strcpy(PromptStr,St(MAskPswEcho));
 #else
@@ -168,7 +169,9 @@
     if (Type!=PASSWORD_GLOBAL)
     {
       strcat(PromptStr,St(MFor));
-      strcat(PromptStr,PointToName(FileName));
+      char *NameOnly=PointToName(FileName);
+      if (strlen(PromptStr)+strlen(NameOnly)<ASIZE(PromptStr))
+        strcat(PromptStr,NameOnly);
     }
     eprintf("\n%s: ",PromptStr);
     GetPasswordText(Password,MaxLength);
@@ -176,19 +179,12 @@
       return(false);
     if (Type==PASSWORD_GLOBAL)
     {
-      strcpy(PromptStr,St(MReAskPsw));
-      eprintf(PromptStr);
-      char CmpStr[256];
-      GetPasswordText(CmpStr,sizeof(CmpStr));
+      eprintf(St(MReAskPsw));
+      char CmpStr[MAXPASSWORD];
+      GetPasswordText(CmpStr,ASIZE(CmpStr));
       if (*CmpStr==0 || strcmp(Password,CmpStr)!=0)
       {
-        strcpy(PromptStr,St(MNotMatchPsw));
-/*
-#ifdef _WIN_32
-        CharToOem(PromptStr,PromptStr);
-#endif
-*/
-        eprintf(PromptStr);
+        eprintf(St(MNotMatchPsw));
         memset(Password,0,MaxLength);
         memset(CmpStr,0,sizeof(CmpStr));
         continue;
@@ -212,7 +208,7 @@
   for (const char *NextItem=AskStr;NextItem!=NULL;NextItem=strchr(NextItem+1,'_'))
   {
     char *CurItem=Item[NumItems];
-    strncpy(CurItem,NextItem+1,sizeof(Item[0]));
+    strncpyz(CurItem,NextItem+1,ASIZE(Item[0]));
     char *EndItem=strchr(CurItem,'_');
     if (EndItem!=NULL)
       *EndItem=0;

Modified: haiku/trunk/src/bin/unrar/crc.cpp
===================================================================
--- haiku/trunk/src/bin/unrar/crc.cpp	2007-08-14 20:19:58 UTC (rev 21951)
+++ haiku/trunk/src/bin/unrar/crc.cpp	2007-08-14 22:45:34 UTC (rev 21952)
@@ -42,7 +42,7 @@
     Size-=8;
   }
 #endif
-  for (uint I=0;I<Size;I++)
+  for (int I=0;I<Size;I++)
     StartCRC=CRCTab[(byte)(StartCRC^Data[I])]^(StartCRC>>8);
   return(StartCRC);
 }
@@ -51,7 +51,7 @@
 ushort OldCRC(ushort StartCRC,const void *Addr,uint Size)
 {
   byte *Data=(byte *)Addr;
-  for (uint I=0;I<Size;I++)
+  for (int I=0;I<Size;I++)
   {
     StartCRC=(StartCRC+Data[I])&0xffff;
     StartCRC=((StartCRC<<1)|(StartCRC>>15))&0xffff;

Modified: haiku/trunk/src/bin/unrar/crypt.cpp
===================================================================
--- haiku/trunk/src/bin/unrar/crypt.cpp	2007-08-14 20:19:58 UTC (rev 21951)
+++ haiku/trunk/src/bin/unrar/crypt.cpp	2007-08-14 22:45:34 UTC (rev 21952)
@@ -204,7 +204,7 @@
 #if defined(_WIN_32) && !defined(GUI)
     CharToOemBuff(Password,(char*)Psw,strlen(Password));
 #else
-    strncpy((char *)Psw,Password,MAXPASSWORD-1);
+    strncpyz((char *)Psw,Password,ASIZE(Psw));
 #endif
     int PswLength=strlen(Password);
     memcpy(SubstTable,InitSubstTable,sizeof(SubstTable));
@@ -223,7 +223,7 @@
   }
 
   bool Cached=false;
-  for (uint I=0;I<sizeof(Cache)/sizeof(Cache[0]);I++)
+  for (int I=0;I<sizeof(Cache)/sizeof(Cache[0]);I++)
     if (strcmp(Cache[I].Password,Password)==0 &&
         (Salt==NULL && !Cache[I].SaltPresent || Salt!=NULL &&
         Cache[I].SaltPresent && memcmp(Cache[I].Salt,Salt,SALT_SIZE)==0) &&

Modified: haiku/trunk/src/bin/unrar/dll.cpp
===================================================================
--- haiku/trunk/src/bin/unrar/dll.cpp	2007-08-14 20:19:58 UTC (rev 21951)
+++ haiku/trunk/src/bin/unrar/dll.cpp	2007-08-14 22:45:34 UTC (rev 21952)
@@ -110,6 +110,7 @@
           (Data->Arc.EndArcHead.Flags & EARC_NEXT_VOLUME))
         if (MergeArchive(Data->Arc,NULL,false,'L'))
         {
+          Data->Extract.SignatureFound=false;
           Data->Arc.Seek(Data->Arc.CurBlockPos,SEEK_SET);
           return(RARReadHeader(hArcData,D));
         }
@@ -125,8 +126,8 @@
       else
         return(Code);
     }
-    strncpy(D->ArcName,Data->Arc.FileName,sizeof(D->ArcName));
-    strncpy(D->FileName,Data->Arc.NewLhd.FileName,sizeof(D->FileName));
+    strncpyz(D->ArcName,Data->Arc.FileName,ASIZE(D->ArcName));
+    strncpyz(D->FileName,Data->Arc.NewLhd.FileName,ASIZE(D->FileName));
     D->Flags=Data->Arc.NewLhd.Flags;
     D->PackSize=Data->Arc.NewLhd.PackSize;
     D->UnpSize=Data->Arc.NewLhd.UnpSize;
@@ -158,6 +159,7 @@
           (Data->Arc.EndArcHead.Flags & EARC_NEXT_VOLUME))
         if (MergeArchive(Data->Arc,NULL,false,'L'))
         {
+          Data->Extract.SignatureFound=false;
           Data->Arc.Seek(Data->Arc.CurBlockPos,SEEK_SET);
           return(RARReadHeaderEx(hArcData,D));
         }
@@ -173,12 +175,12 @@
       else
         return(Code);
     }
-    strncpy(D->ArcName,Data->Arc.FileName,sizeof(D->ArcName));
+    strncpyz(D->ArcName,Data->Arc.FileName,ASIZE(D->ArcName));
     if (*Data->Arc.FileNameW)
       strncpyw(D->ArcNameW,Data->Arc.FileNameW,sizeof(D->ArcNameW));
     else
       CharToWide(Data->Arc.FileName,D->ArcNameW);
-    strncpy(D->FileName,Data->Arc.NewLhd.FileName,sizeof(D->FileName));
+    strncpyz(D->FileName,Data->Arc.NewLhd.FileName,ASIZE(D->FileName));
     if (*Data->Arc.NewLhd.FileNameW)
       strncpyw(D->FileNameW,Data->Arc.NewLhd.FileNameW,sizeof(D->FileNameW));
     else
@@ -226,6 +228,7 @@
           (Data->Arc.NewLhd.Flags & LHD_SPLIT_AFTER)!=0)
         if (MergeArchive(Data->Arc,NULL,false,'L'))
         {
+          Data->Extract.SignatureFound=false;
           Data->Arc.Seek(Data->Arc.CurBlockPos,SEEK_SET);
           return(0);
         }
@@ -327,7 +330,7 @@
 void PASCAL RARSetPassword(HANDLE hArcData,char *Password)
 {
   DataSet *Data=(DataSet *)hArcData;
-  strncpy(Data->Cmd.Password,Password,sizeof(Data->Cmd.Password));
+  strncpyz(Data->Cmd.Password,Password,ASIZE(Data->Cmd.Password));
 }
 
 

Modified: haiku/trunk/src/bin/unrar/dll.hpp
===================================================================
--- haiku/trunk/src/bin/unrar/dll.hpp	2007-08-14 20:19:58 UTC (rev 21951)
+++ haiku/trunk/src/bin/unrar/dll.hpp	2007-08-14 22:45:34 UTC (rev 21952)
@@ -1,18 +1,19 @@
 #ifndef _UNRAR_DLL_
 #define _UNRAR_DLL_
 
-#define ERAR_END_ARCHIVE     10
-#define ERAR_NO_MEMORY       11
-#define ERAR_BAD_DATA        12
-#define ERAR_BAD_ARCHIVE     13
-#define ERAR_UNKNOWN_FORMAT  14
-#define ERAR_EOPEN           15
-#define ERAR_ECREATE         16
-#define ERAR_ECLOSE          17
-#define ERAR_EREAD           18
-#define ERAR_EWRITE          19
-#define ERAR_SMALL_BUF       20
-#define ERAR_UNKNOWN         21
+#define ERAR_END_ARCHIVE        10
+#define ERAR_NO_MEMORY          11
+#define ERAR_BAD_DATA           12
+#define ERAR_BAD_ARCHIVE        13
+#define ERAR_UNKNOWN_FORMAT     14
+#define ERAR_EOPEN              15
+#define ERAR_ECREATE            16
+#define ERAR_ECLOSE             17
+#define ERAR_EREAD              18
+#define ERAR_EWRITE             19
+#define ERAR_SMALL_BUF          20
+#define ERAR_UNKNOWN            21
+#define ERAR_MISSING_PASSWORD   22
 
 #define RAR_OM_LIST           0
 #define RAR_OM_EXTRACT        1

Modified: haiku/trunk/src/bin/unrar/extract.cpp
===================================================================
--- haiku/trunk/src/bin/unrar/extract.cpp	2007-08-14 20:19:58 UTC (rev 21951)
+++ haiku/trunk/src/bin/unrar/extract.cpp	2007-08-14 22:45:34 UTC (rev 21952)
@@ -357,7 +357,7 @@
 
   if (ExactMatch || (SkipSolid=Arc.Solid)!=0)
   {
-    if (Arc.NewLhd.Flags & LHD_PASSWORD)
+    if ((Arc.NewLhd.Flags & LHD_PASSWORD)!=0)
 #ifndef RARDLL
       if (*Password==0)
 #endif
@@ -410,7 +410,7 @@
 #ifndef SFX_MODULE
     if (Cmd->AppendArcNameToPath)
     {
-      strcat(DestFileName,PointToName(Arc.FileName));
+      strcat(DestFileName,PointToName(Arc.FirstVolumeName));
       SetExt(DestFileName,NULL);
       AddEndSlash(DestFileName);
     }
@@ -443,7 +443,7 @@
     else
       strcat(DestFileName,ExtrName);
 
-    char DiskLetter=toupper(DestFileName[0]);
+    char DiskLetter=etoupper(DestFileName[0]);
 
     if (AbsPaths && DestFileName[1]=='_' && IsPathDiv(DestFileName[2]) &&
         DiskLetter>='A' && DiskLetter<='Z')
@@ -469,10 +469,10 @@
       if (Cmd->AppendArcNameToPath)
       {
         wchar FileNameW[NM];
-        if (*Arc.FileNameW!=0)
-          strcpyw(FileNameW,Arc.FileNameW);
+        if (*Arc.FirstVolumeNameW!=0)
+          strcpyw(FileNameW,Arc.FirstVolumeNameW);
         else
-          CharToWide(Arc.FileName,FileNameW);
+          CharToWide(Arc.FirstVolumeName,FileNameW);
         strcatw(DestFileNameW,PointToName(FileNameW));
         SetExt(DestFileNameW,NULL);
         AddEndSlash(DestFileNameW);
@@ -505,7 +505,8 @@
     else
       *DestFileNameW=0;
 
-    ExtrFile=!SkipSolid && !EmptyName && (Arc.NewLhd.Flags & LHD_SPLIT_BEFORE)==0/* && *ExtrName*/;
+    ExtrFile=!SkipSolid && !EmptyName && (Arc.NewLhd.Flags & LHD_SPLIT_BEFORE)==0;
+
     if ((Cmd->FreshFiles || Cmd->UpdateFiles) && (Command=='E' || Command=='X'))
     {
       struct FindData FD;
@@ -519,17 +520,27 @@
           ExtrFile=false;
     }
 
+    // skip encrypted file if no password is specified
+    if ((Arc.NewLhd.Flags & LHD_PASSWORD)!=0 && *Password==0)
+    {
+      ErrHandler.SetErrorCode(WARNING);
 #ifdef RARDLL
+      Cmd->DllError=ERAR_MISSING_PASSWORD;
+#endif
+      ExtrFile=false;
+    }
+
+#ifdef RARDLL
     if (*Cmd->DllDestName)
     {
-      strncpy(DestFileName,Cmd->DllDestName,sizeof(DestFileName));
+      strncpyz(DestFileName,Cmd->DllDestName,ASIZE(DestFileName));
       *DestFileNameW=0;
       if (Cmd->DllOpMode!=RAR_EXTRACT)
         ExtrFile=false;
     }
     if (*Cmd->DllDestNameW)
     {
-      strncpyw(DestFileNameW,Cmd->DllDestNameW,sizeof(DestFileNameW)/sizeof(DestFileNameW[0]));
+      strncpyzw(DestFileNameW,Cmd->DllDestNameW,ASIZE(DestFileNameW));
       DestNameW=DestFileNameW;
       if (Cmd->DllOpMode!=RAR_EXTRACT)
         ExtrFile=false;
@@ -655,8 +666,7 @@
               {
                 Log(Arc.FileName,St(MCorrectingName));
                 char OrigName[sizeof(DestFileName)];
-                strncpy(OrigName,DestFileName,sizeof(OrigName)-1);
-                OrigName[sizeof(OrigName)-1]=0;
+                strncpyz(OrigName,DestFileName,ASIZE(OrigName));
 
                 MakeNameUsable(DestFileName,true);
                 CreatePath(DestFileName,NULL,true);
@@ -799,6 +809,10 @@
 #if defined(_WIN_32) || defined(_EMX)
         if (Cmd->ClearArc)
           Arc.NewLhd.FileAttr&=~FA_ARCH;
+/*
+        else
+          Arc.NewLhd.FileAttr|=FA_ARCH; //set archive bit for unpacked files (file is not backed up)
+*/
 #endif
         if (!BrokenFile || Cmd->KeepBroken)
         {

Modified: haiku/trunk/src/bin/unrar/extract.hpp
===================================================================
--- haiku/trunk/src/bin/unrar/extract.hpp	2007-08-14 20:19:58 UTC (rev 21951)
+++ haiku/trunk/src/bin/unrar/extract.hpp	2007-08-14 22:45:34 UTC (rev 21952)
@@ -24,7 +24,6 @@
     char Password[MAXPASSWORD];
     bool PasswordAll;
     bool PrevExtracted;
-    bool SignatureFound;
     char DestFileName[NM];
     wchar DestFileNameW[NM];
     bool PasswordCancelled;
@@ -36,6 +35,8 @@
     bool ExtractCurrentFile(CommandData *Cmd,Archive &Arc,int HeaderSize,
                             bool &Repeat);
     static void UnstoreFile(ComprDataIO &DataIO,Int64 DestUnpSize);
+
+    bool SignatureFound;
 };
 
 #endif

Modified: haiku/trunk/src/bin/unrar/filcreat.cpp
===================================================================
--- haiku/trunk/src/bin/unrar/filcreat.cpp	2007-08-14 20:19:58 UTC (rev 21951)
+++ haiku/trunk/src/bin/unrar/filcreat.cpp	2007-08-14 22:45:34 UTC (rev 21952)
@@ -139,7 +139,7 @@
   char NewName[NM];
   for (int I=0;I<10000;I+=123)
   {
-    strncpy(NewName,Name,sizeof(NewName));
+    strncpyz(NewName,Name,ASIZE(NewName));
     sprintf(PointToName(NewName),"rtmp%d",I);
     if (!FileExist(NewName))
       break;
@@ -147,7 +147,7 @@
   if (FileExist(NewName))
     return(false);
   char FullName[NM];
-  strncpy(FullName,Name,sizeof(FullName));
+  strncpyz(FullName,Name,ASIZE(FullName));
   strcpy(PointToName(FullName),PointToName(fd.Name));
   if (!MoveFile(FullName,NewName))
     return(false);

Modified: haiku/trunk/src/bin/unrar/filefn.cpp
===================================================================
--- haiku/trunk/src/bin/unrar/filefn.cpp	2007-08-14 20:19:58 UTC (rev 21951)
+++ haiku/trunk/src/bin/unrar/filefn.cpp	2007-08-14 22:45:34 UTC (rev 21952)
@@ -41,7 +41,7 @@
 }
 
 
-void CreatePath(const char *Path,const wchar *PathW,bool SkipLastName)
+bool CreatePath(const char *Path,const wchar *PathW,bool SkipLastName)
 {
 #ifdef _WIN_32
   uint DirAttr=0;
@@ -54,6 +54,7 @@
   bool Wide=false;
 #endif
   bool IgnoreAscii=false;
+  bool Success=true;
 
   const char *s=Path;
   for (int PosW=0;;PosW++)
@@ -95,12 +96,16 @@
         mprintf(" %s",St(MOk));
 #endif
       }
+      else
+        Success=false;
     }
     if (!IgnoreAscii)
       s=charnext(s);
   }
   if (!SkipLastName && !IsPathDiv(*PointToLastChar(Path)))
-    MakeDir(Path,PathW,DirAttr);
+    if (MakeDir(Path,PathW,DirAttr)!=MKDIR_SUCCESS)
+      Success=false;
+  return(Success);
 }
 
 
@@ -148,7 +153,7 @@
   int Type=GetDriveType(*Root ? Root:NULL);
   return(Type==DRIVE_REMOVABLE || Type==DRIVE_CDROM);
 #elif defined(_EMX)
-  char Drive=toupper(Name[0]);
+  char Drive=etoupper(Name[0]);
   return((Drive=='A' || Drive=='B') && Name[1]==':');
 #else
   return(false);
@@ -176,7 +181,7 @@
   }
   if (pGetDiskFreeSpaceEx!=NULL)
   {
-    GetFilePath(Name,Root);
+    GetFilePath(Name,Root,ASIZE(Root));
     ULARGE_INTEGER uiTotalSize,uiTotalFree,uiUserFree;
     uiUserFree.u.LowPart=uiUserFree.u.HighPart=0;
     if (pGetDiskFreeSpaceEx(*Root ? Root:NULL,&uiUserFree,&uiTotalSize,&uiTotalFree) &&
@@ -192,7 +197,7 @@
   return(FreeSize);
 #elif defined(_BEOS)
   char Root[NM];
-  GetFilePath(Name,Root);
+  GetFilePath(Name,Root,ASIZE(Root));
   dev_t Dev=dev_for_path(*Root ? Root:".");
   if (Dev<0)
     return(1457664);
@@ -205,7 +210,7 @@
 #elif defined(_UNIX)
   return(1457664);
 #elif defined(_EMX)
-  int Drive=(!isalpha(Name[0]) || Name[1]!=':') ? 0:toupper(Name[0])-'A'+1;
+  int Drive=(!isalpha(Name[0]) || Name[1]!=':') ? 0:etoupper(Name[0])-'A'+1;
   if (_osmode == OS2_MODE)
   {
     FSALLOCATE fsa;
@@ -465,7 +470,7 @@
 
 
 #ifndef SFX_MODULE
-uint CalcFileCRC(File *SrcFile,Int64 Size)
+uint CalcFileCRC(File *SrcFile,Int64 Size,CALCCRC_SHOWMODE ShowMode)

[... truncated: 1892 lines follow ...]


From bonefish at mail.berlios.de  Wed Aug 15 01:36:54 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 15 Aug 2007 01:36:54 +0200
Subject: [Haiku-commits] r21953 - haiku/trunk/src/kits/interface
Message-ID: <200708142336.l7ENasam006548@sheep.berlios.de>

Author: bonefish
Date: 2007-08-15 01:36:53 +0200 (Wed, 15 Aug 2007)
New Revision: 21953
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21953&view=rev

Modified:
   haiku/trunk/src/kits/interface/Window.cpp
Log:
Added TODO.


Modified: haiku/trunk/src/kits/interface/Window.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Window.cpp	2007-08-14 22:45:34 UTC (rev 21952)
+++ haiku/trunk/src/kits/interface/Window.cpp	2007-08-14 23:36:53 UTC (rev 21953)
@@ -2367,6 +2367,7 @@
 
 	if (title == NULL)
 		title = "";
+// TODO: Where's da "w>"?
 	fTitle = strdup(title);
 	SetName(title);
 



From axeld at mail.berlios.de  Wed Aug 15 01:55:25 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 15 Aug 2007 01:55:25 +0200
Subject: [Haiku-commits] r21954 - haiku/trunk/src/apps/deskbar
Message-ID: <200708142355.l7ENtPLg007171@sheep.berlios.de>

Author: axeld
Date: 2007-08-15 01:55:24 +0200 (Wed, 15 Aug 2007)
New Revision: 21954
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21954&view=rev

Modified:
   haiku/trunk/src/apps/deskbar/BarApp.cpp
   haiku/trunk/src/apps/deskbar/BarApp.h
   haiku/trunk/src/apps/deskbar/BarView.cpp
   haiku/trunk/src/apps/deskbar/BarView.h
   haiku/trunk/src/apps/deskbar/BeMenu.cpp
Log:
Added an auto-raise feature.


Modified: haiku/trunk/src/apps/deskbar/BarApp.cpp
===================================================================
--- haiku/trunk/src/apps/deskbar/BarApp.cpp	2007-08-14 23:36:53 UTC (rev 21953)
+++ haiku/trunk/src/apps/deskbar/BarApp.cpp	2007-08-14 23:55:24 UTC (rev 21954)
@@ -204,6 +204,7 @@
 		fSettingsFile->Write(&fSettings.sortRunningApps, sizeof(bool));
 		fSettingsFile->Write(&fSettings.superExpando, sizeof(bool));
 		fSettingsFile->Write(&fSettings.expandNewTeams, sizeof(bool));
+		fSettingsFile->Write(&fSettings.autoRaise, sizeof(bool));
 	}
 }
 
@@ -232,6 +233,7 @@
 	settings.sortRunningApps = false;
 	settings.superExpando = false;
 	settings.expandNewTeams = false;
+	settings.autoRaise = true;
 
 	BPath dirPath;
 	const char *settingsFileName = "Deskbar_settings";
@@ -250,10 +252,10 @@
 		}
 
 		if (fSettingsFile->InitCheck() == B_OK) {
-			off_t theSize = 0;
-			fSettingsFile->GetSize(&theSize);
-			
-			if (theSize >= kValidSettingsSize1) {
+			off_t size = 0;
+			fSettingsFile->GetSize(&size);
+
+			if (size >= kValidSettingsSize1) {
 				fSettingsFile->Seek(0, SEEK_SET);
 				fSettingsFile->Read(&settings.vertical, sizeof(bool));
 				fSettingsFile->Read(&settings.left, sizeof(bool));
@@ -263,32 +265,34 @@
 				fSettingsFile->Read(&settings.width, sizeof(float));
 				fSettingsFile->Read(&settings.showTime, sizeof(bool));
 			}
-			if (theSize >= kValidSettingsSize2)
+			if (size >= kValidSettingsSize2)
 				fSettingsFile->Read(&settings.switcherLoc, sizeof(BPoint));
-			if (theSize >= kValidSettingsSize3) {
+			if (size >= kValidSettingsSize3) {
 				fSettingsFile->Read(&settings.recentAppsCount, sizeof(int32));
 				fSettingsFile->Read(&settings.recentDocsCount, sizeof(int32));
 			}
-			if (theSize >= kValidSettingsSize4) {
+			if (size >= kValidSettingsSize4) {
 				fSettingsFile->Read(&settings.timeShowSeconds, sizeof(bool));						
 				fSettingsFile->Read(&settings.timeShowMil, sizeof(bool));
 			}
-			if (theSize >= kValidSettingsSize5)
+			if (size >= kValidSettingsSize5)
 				fSettingsFile->Read(&settings.recentFoldersCount, sizeof(int32));
-			if (theSize >= kValidSettingsSize6) {
+			if (size >= kValidSettingsSize6) {
 				fSettingsFile->Read(&settings.timeShowEuro, sizeof(bool));
 				fSettingsFile->Read(&settings.alwaysOnTop, sizeof(bool));
 			}
-			if (theSize >= kValidSettingsSize7)
+			if (size >= kValidSettingsSize7)
 				fSettingsFile->Read(&settings.timeFullDate, sizeof(bool));
-			if (theSize >= kValidSettingsSize8) {
+			if (size >= kValidSettingsSize8) {
 				fSettingsFile->Read(&settings.trackerAlwaysFirst, sizeof(bool));
 				fSettingsFile->Read(&settings.sortRunningApps, sizeof(bool));
 			}
-			if (theSize >= kValidSettingsSize9) {
+			if (size >= kValidSettingsSize9) {
 				fSettingsFile->Read(&settings.superExpando, sizeof(bool));
 				fSettingsFile->Read(&settings.expandNewTeams, sizeof(bool));
 			}
+			if (size >= kValidSettingsSize10)
+				fSettingsFile->Read(&settings.autoRaise, sizeof(bool));
 		}
 	}
 
@@ -416,6 +420,17 @@
  				B_FLOATING_ALL_WINDOW_FEEL : B_NORMAL_WINDOW_FEEL);
  			break;
 
+		case msg_AutoRaise:
+		{
+			fSettings.autoRaise = !fSettings.autoRaise;
+
+			TBarView *barView = static_cast<TBarApp *>(be_app)->BarView();
+			fBarWindow->Lock();
+			barView->UpdateAutoRaise();
+			fBarWindow->Unlock();
+			break;
+		}
+
 		case msg_trackerFirst:
 		{
 			fSettings.trackerAlwaysFirst = !fSettings.trackerAlwaysFirst;

Modified: haiku/trunk/src/apps/deskbar/BarApp.h
===================================================================
--- haiku/trunk/src/apps/deskbar/BarApp.h	2007-08-14 23:36:53 UTC (rev 21953)
+++ haiku/trunk/src/apps/deskbar/BarApp.h	2007-08-14 23:55:24 UTC (rev 21954)
@@ -77,6 +77,7 @@
 const uint32 msg_sortRunningApps = 'SAps';
 const uint32 msg_superExpando = 'SprE';
 const uint32 msg_expandNewTeams = 'ExTm';
+const uint32 msg_AutoRaise = 'AtRs';
 
 // from roster_private.h
 const uint32 CMD_SHUTDOWN_SYSTEM = 301;
@@ -109,6 +110,7 @@
 	bool sortRunningApps;
 	bool superExpando;			// version 9
 	bool expandNewTeams;
+	bool autoRaise;				// version 10
 };
 
 // the following structures are defined to compute
@@ -123,6 +125,7 @@
 const uint32 kValidSettingsSize7 = sizeof(bool) + kValidSettingsSize6;
 const uint32 kValidSettingsSize8 = 2 * sizeof(bool) + kValidSettingsSize7;
 const uint32 kValidSettingsSize9 = 2 * sizeof(bool) + kValidSettingsSize8;
+const uint32 kValidSettingsSize10 = sizeof(bool) + kValidSettingsSize9;
 
 class TBarView;
 class BFile;

Modified: haiku/trunk/src/apps/deskbar/BarView.cpp
===================================================================
--- haiku/trunk/src/apps/deskbar/BarView.cpp	2007-08-14 23:36:53 UTC (rev 21953)
+++ haiku/trunk/src/apps/deskbar/BarView.cpp	2007-08-14 23:55:24 UTC (rev 21954)
@@ -117,6 +117,7 @@
 	if (fTrayLocation != 0)
 		AddChild(fDragRegion);
 
+	UpdateAutoRaise();
 	UpdatePlacement();
 
 	fTrackingHookData.fTrackingHook = MenuTrackingHook;
@@ -175,6 +176,26 @@
 
 
 void
+TBarView::MouseMoved(BPoint where, uint32 transit, const BMessage* dragMessage)
+{
+	if (Window() == NULL || EventMask() == 0)
+		return;
+
+	// Auto-Raise
+
+	where = ConvertToScreen(where);
+	BScreen screen(Window());
+	BRect frame = screen.Frame();
+	if (where.x == frame.left || where.x == frame.right
+		|| where.y == frame.top || where.y == frame.bottom) {
+		// cursor is on screen edge
+		if (Window()->Frame().Contains(where))
+			Window()->Activate();
+	}
+}
+
+
+void
 TBarView::PlaceBeMenu()
 {
 	// top or bottom, full
@@ -389,6 +410,16 @@
 
 
 void
+TBarView::UpdateAutoRaise()
+{
+	if (((TBarApp*)be_app)->Settings()->autoRaise)
+		SetEventMask(B_POINTER_EVENTS, B_NO_POINTER_HISTORY);
+	else
+		SetEventMask(0);
+}
+
+
+void
 TBarView::UpdatePlacement()
 {
 	ChangeState(fState, fVertical, fLeft, fTop);	

Modified: haiku/trunk/src/apps/deskbar/BarView.h
===================================================================
--- haiku/trunk/src/apps/deskbar/BarView.h	2007-08-14 23:36:53 UTC (rev 21953)
+++ haiku/trunk/src/apps/deskbar/BarView.h	2007-08-14 23:55:24 UTC (rev 21954)
@@ -72,10 +72,13 @@
 		~TBarView();
 
 		virtual void AttachedToWindow();
-		virtual void Draw(BRect);
-		virtual void MessageReceived(BMessage *);
+		virtual void Draw(BRect updateRect);
+		virtual void MessageReceived(BMessage* message);
+		virtual void MouseMoved(BPoint where, uint32 transit,
+			const BMessage* dragMessage);
 
 		void SaveSettings();
+		void UpdateAutoRaise();
 		void UpdatePlacement();
 		void ChangeState(int32 state, bool vertical, bool left, bool top);
 

Modified: haiku/trunk/src/apps/deskbar/BeMenu.cpp
===================================================================
--- haiku/trunk/src/apps/deskbar/BeMenu.cpp	2007-08-14 23:36:53 UTC (rev 21953)
+++ haiku/trunk/src/apps/deskbar/BeMenu.cpp	2007-08-14 23:55:24 UTC (rev 21954)
@@ -285,6 +285,11 @@
 	 	item->SetMarked((window->Feel() & B_FLOATING_ALL_WINDOW_FEEL) != 0);
  	subMenu->AddItem(item);
 
+	item = new BMenuItem("Auto Raise", new BMessage(msg_AutoRaise));
+ 	item->SetTarget(be_app);
+	item->SetMarked(static_cast<TBarApp *>(be_app)->Settings()->autoRaise);
+ 	subMenu->AddItem(item);
+
 	item = new BMenuItem("Sort Running Applications", new BMessage(msg_sortRunningApps));
 	item->SetTarget(be_app);
 	item->SetMarked(static_cast<TBarApp *>(be_app)->Settings()->sortRunningApps);



From axeld at mail.berlios.de  Wed Aug 15 01:56:52 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 15 Aug 2007 01:56:52 +0200
Subject: [Haiku-commits] r21955 - haiku/trunk/src/apps/workspaces
Message-ID: <200708142356.l7ENuqAW007226@sheep.berlios.de>

Author: axeld
Date: 2007-08-15 01:56:52 +0200 (Wed, 15 Aug 2007)
New Revision: 21955
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21955&view=rev

Modified:
   haiku/trunk/src/apps/workspaces/Workspaces.cpp
Log:
Added an auto-raise feature - works only, if the workspaces window is at a screen edge.
You can turn this feature on via the command line (--autoraise).


Modified: haiku/trunk/src/apps/workspaces/Workspaces.cpp
===================================================================
--- haiku/trunk/src/apps/workspaces/Workspaces.cpp	2007-08-14 23:55:24 UTC (rev 21954)
+++ haiku/trunk/src/apps/workspaces/Workspaces.cpp	2007-08-14 23:56:52 UTC (rev 21955)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006, Haiku, Inc.
+ * Copyright 2002-2007, Haiku, Inc.
  * Copyright 2002, Fran?ois Revol, revol at free.fr.
  * This file is distributed under the terms of the MIT License.
  *
@@ -56,6 +56,15 @@
 		BRect	fWindowFrame, fScreenFrame;
 };
 
+class WorkspacesView : public BView {
+	public:
+		WorkspacesView(BRect frame);
+		~WorkspacesView();
+
+		virtual void MouseMoved(BPoint where, uint32 transit,
+			const BMessage* dragMessage);
+};
+
 class WorkspacesWindow : public BWindow {
 	public:
 		WorkspacesWindow(WorkspacesPreferences *fPreferences);
@@ -69,6 +78,8 @@
 		virtual void MessageReceived(BMessage *msg);
 		virtual bool QuitRequested();
 
+		void SetAutoRaise();
+
 	private:
 		WorkspacesPreferences *fPreferences;
 		BRect	fPreviousFrame;
@@ -86,7 +97,7 @@
 		void Usage(const char *programName);
 
 	private:
-		BWindow		*fWindow;
+		WorkspacesWindow*	fWindow;
 };
 
 
@@ -188,6 +199,41 @@
 //	#pragma mark -
 
 
+WorkspacesView::WorkspacesView(BRect frame)
+	: BView(frame, "workspaces", 0, B_FOLLOW_NONE)
+{
+}
+
+
+WorkspacesView::~WorkspacesView()
+{
+}
+
+
+void
+WorkspacesView::MouseMoved(BPoint where, uint32 transit,
+	const BMessage* dragMessage)
+{
+	if (Window() == NULL || EventMask() == 0)
+		return;
+
+	// Auto-Raise
+
+	where = ConvertToScreen(where);
+	BScreen screen(Window());
+	BRect frame = screen.Frame();
+	if (where.x == frame.left || where.x == frame.right
+		|| where.y == frame.top || where.y == frame.bottom) {
+		// cursor is on screen edge
+		if (Window()->Frame().Contains(where))
+			Window()->Activate();
+	}
+}
+
+
+//	#pragma mark -
+
+
 WorkspacesWindow::WorkspacesWindow(WorkspacesPreferences *preferences)
 	: BWindow(preferences->WindowFrame(), "Workspaces", B_TITLED_WINDOW_LOOK,
  			B_NORMAL_WINDOW_FEEL,
@@ -195,6 +241,7 @@
  			B_ALL_WORKSPACES),
  	fPreferences(preferences)
 {
+	AddChild(new WorkspacesView(BRect(-10, -10, -5, -5)));
 	fPreviousFrame = Frame();
 }
 
@@ -271,6 +318,13 @@
 }
 
 
+void
+WorkspacesWindow::SetAutoRaise()
+{
+	ChildAt(0)->SetEventMask(B_POINTER_EVENTS, B_NO_POINTER_HISTORY);
+}
+
+
 //	#pragma mark -
 
 
@@ -292,7 +346,7 @@
 	BAlert *alert = new BAlert("about", "Workspaces\n"
 		"\twritten by Fran?ois Revol, Axel D?rfler,\n"
 		"\t\tand Matt Madia.\n"
-		"\tCopyright 2002-2006, Haiku.\n", "Ok");
+		"\tCopyright 2002-2007, Haiku.\n", "Ok");
 	BTextView *view = alert->TextView();
 	BFont font;
 
@@ -317,6 +371,7 @@
 		"  --avoidfocus\t\tprevents the window from being the target of keyboard events.\n"
 		"  --alwaysontop\t\tkeeps window on top\n"
 		"  --notmovable\t\twindow can't be moved around\n"
+		"  --autoraise\t\tauto-raise the workspace window when it's at the screen corner\n"
 		"  --help\t\tdisplay this help and exit\n"
 		"and \"workspace\" is the number of the Workspace to which to switch (0-31)\n",
 		programName);
@@ -343,6 +398,8 @@
 				fWindow->SetFlags(fWindow->Flags() | B_NOT_MOVABLE);
 			else if (!strcmp(argv[i], "--alwaysontop"))
 				fWindow->SetFeel(B_FLOATING_ALL_WINDOW_FEEL);
+			else if (!strcmp(argv[i], "--autoraise"))
+				fWindow->SetAutoRaise();
 			else {
 				const char *programName = strrchr(argv[0], '/');
 				programName = programName ? programName + 1 : argv[0];



From axeld at mail.berlios.de  Wed Aug 15 02:06:43 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 15 Aug 2007 02:06:43 +0200
Subject: [Haiku-commits] r21956 - haiku/trunk/src/apps/terminal
Message-ID: <200708150006.l7F06hhE007770@sheep.berlios.de>

Author: axeld
Date: 2007-08-15 02:06:42 +0200 (Wed, 15 Aug 2007)
New Revision: 21956
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21956&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermView.cpp
Log:
Disabled somewhat annoying debug output.


Modified: haiku/trunk/src/apps/terminal/TermView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-14 23:56:52 UTC (rev 21955)
+++ haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-15 00:06:42 UTC (rev 21956)
@@ -1639,7 +1639,7 @@
 			fShell->Signal(SIGINT);
 	}
 
-	printf("rawKey: %c\n", (char)rawChar);
+	//printf("rawKey: %c\n", (char)rawChar);
 
 	// Terminal filters RET, ENTER, F1...F12, and ARROW key code.
 	// TODO: Cleanup



From bonefish at mail.berlios.de  Wed Aug 15 02:10:37 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 15 Aug 2007 02:10:37 +0200
Subject: [Haiku-commits] r21957 - haiku/trunk/src/kits/interface
Message-ID: <200708150010.l7F0Ab8d008286@sheep.berlios.de>

Author: bonefish
Date: 2007-08-15 02:10:37 +0200 (Wed, 15 Aug 2007)
New Revision: 21957
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21957&view=rev

Modified:
   haiku/trunk/src/kits/interface/Window.cpp
Log:
Added another TODO.


Modified: haiku/trunk/src/kits/interface/Window.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Window.cpp	2007-08-15 00:06:42 UTC (rev 21956)
+++ haiku/trunk/src/kits/interface/Window.cpp	2007-08-15 00:10:37 UTC (rev 21957)
@@ -2212,7 +2212,7 @@
 BWindow::Show()
 {
 	if (!fRunCalled) {
-		// this is the fist time Show() is called, which implicetly runs the looper
+		// this is the fist time Show() is called, which implicitly runs the looper
 		if (fLink->SenderPort() < B_OK) {
 			// We don't have valid app_server connection; there is no point
 			// in starting our looper
@@ -2445,6 +2445,11 @@
 	// we'll lock the be_app to be sure we're the only one writing at BApplication's server port
 	bool locked = false;
 	if (!be_app->IsLocked()) {
+// TODO: This doesn't look good. If a window is created in the message handling
+// code of another window, then the lock of that other window is already being
+// held. So, if the application tries to lock that window from its message
+// handling code, we get a beautiful deadlock. Start Icon-O-Matic, quit it, and
+// start it a second time to see that in action.
 		be_app->Lock();
 		locked = true; 
 	}



From axeld at mail.berlios.de  Wed Aug 15 02:18:21 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 15 Aug 2007 02:18:21 +0200
Subject: [Haiku-commits] r21958 - haiku/trunk/src/apps/deskbar
Message-ID: <200708150018.l7F0ILRK009993@sheep.berlios.de>

Author: axeld
Date: 2007-08-15 02:18:13 +0200 (Wed, 15 Aug 2007)
New Revision: 21958
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21958&view=rev

Modified:
   haiku/trunk/src/apps/deskbar/BarWindow.cpp
Log:
* Found out what the overridden DispatchMessage() is supposed to do.
* Disabled activating the window on mouse click when auto-raise is active, as that
  doesn't work well in combination.


Modified: haiku/trunk/src/apps/deskbar/BarWindow.cpp
===================================================================
--- haiku/trunk/src/apps/deskbar/BarWindow.cpp	2007-08-15 00:10:37 UTC (rev 21957)
+++ haiku/trunk/src/apps/deskbar/BarWindow.cpp	2007-08-15 00:18:13 UTC (rev 21958)
@@ -92,8 +92,10 @@
 void
 TBarWindow::DispatchMessage(BMessage *message, BHandler *handler)
 {
-	// ToDo: check if the two following lines are doing anything...
-	if (message->what == B_MOUSE_DOWN) 
+	// Activate the window when you click on it (ie. on the tray area,
+	// the menu part will do this automatically)
+	if (message->what == B_MOUSE_DOWN
+		&& !((TBarApp *)be_app)->Settings()->autoRaise) 
 		Activate(true);
 
 	BWindow::DispatchMessage(message, handler);



From axeld at mail.berlios.de  Wed Aug 15 03:06:21 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 15 Aug 2007 03:06:21 +0200
Subject: [Haiku-commits] r21959 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200708150106.l7F16LFH012161@sheep.berlios.de>

Author: axeld
Date: 2007-08-15 03:06:20 +0200 (Wed, 15 Aug 2007)
New Revision: 21959
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21959&view=rev

Modified:
   haiku/trunk/headers/os/interface/Window.h
   haiku/trunk/src/kits/interface/Window.cpp
Log:
* Fixed the TODO added by Ingo in r21957: locking the application didn't even make any
  sense. Instead, we now lock its app_server connection only. The deadlock as exposed
  by starting Icon-O-Matic twice is now gone, at last.
* Fixed the TODO added by Ingo in r21953: moved the thread/handler renaming code in a
  dedicated method _SetName() which is now called from _InitData() and SetTitle(); the
  "w>" is no longer lost.
* Unlike the BeBook states, BMessageQueue::RemoveMessage() is indeed not supposed to
  delete the message it removes.


Modified: haiku/trunk/headers/os/interface/Window.h
===================================================================
--- haiku/trunk/headers/os/interface/Window.h	2007-08-15 00:18:13 UTC (rev 21958)
+++ haiku/trunk/headers/os/interface/Window.h	2007-08-15 01:06:20 UTC (rev 21959)
@@ -335,6 +335,7 @@
 			void				_AdoptResize();
 			void				_SetFocus(BView* focusView,
 										  bool notifyIputServer = false);
+			void				_SetName(const char* title);
 
 			Shortcut*			_FindShortcut(uint32 key, uint32 modifiers);
 			BView*				_FindView(BView* view, BPoint point) const;

Modified: haiku/trunk/src/kits/interface/Window.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Window.cpp	2007-08-15 00:18:13 UTC (rev 21958)
+++ haiku/trunk/src/kits/interface/Window.cpp	2007-08-15 01:06:20 UTC (rev 21959)
@@ -25,6 +25,7 @@
 #include <input_globals.h>
 #include <AppMisc.h>
 #include <ApplicationPrivate.h>
+#include <AppServerLink.h>
 #include <DirectMessageTarget.h>
 #include <InputServerTypes.h>
 #include <MenuPrivate.h>
@@ -268,7 +269,7 @@
 
 
 BWindow::BWindow(BRect frame, const char* title, window_type type,
-	uint32 flags, uint32 workspace)
+		uint32 flags, uint32 workspace)
 	: BLooper(title, B_DISPLAY_PRIORITY)
 {
 	window_look look;
@@ -279,8 +280,8 @@
 }
 
 
-BWindow::BWindow(BRect frame, const char* title, window_look look, window_feel feel,
-	uint32 flags, uint32 workspace)
+BWindow::BWindow(BRect frame, const char* title, window_look look,
+		window_feel feel, uint32 flags, uint32 workspace)
 	: BLooper(title, B_DISPLAY_PRIORITY)
 {
 	_InitData(frame, title, look, feel, flags, workspace);
@@ -852,10 +853,9 @@
 							height = nextHeight;
 
 						MessageQueue()->RemoveMessage(pendingMessage);
-						// TODO: the BeBook says that MessageQueue::RemoveMessage() deletes the message!
 						delete pendingMessage;
-						// this deletes the first *additional* message
-						// fCurrentMessage is safe
+							// this deletes the first *additional* message
+							// fCurrentMessage is safe
 					} else {
 						MessageQueue()->RemoveMessage(pendingMessage);
 					}
@@ -1798,26 +1798,8 @@
 	free(fTitle);
 	fTitle = strdup(title);
 
-	// we will change BWindow's thread name to "w>window title"	
+	_SetName(title);
 
-	char threadName[B_OS_NAME_LENGTH];
-	strcpy(threadName, "w>");
-#ifdef __HAIKU__
-	strlcat(threadName, title, B_OS_NAME_LENGTH);
-#else
-	int32 length = strlen(title);
-	length = min_c(length, B_OS_NAME_LENGTH - 3);
-	memcpy(threadName + 2, title, length);
-	threadName[length + 2] = '\0';
-#endif
-
-	// change the handler's name
-	SetName(threadName);
-
-	// if the message loop has been started...
-	if (Thread() >= B_OK)
-		rename_thread(Thread(), threadName);
-
 	// we notify the app_server so we can actually see the change
 	if (Lock()) {
 		fLink->StartMessage(AS_SET_WINDOW_TITLE);
@@ -2367,10 +2349,11 @@
 
 	if (title == NULL)
 		title = "";
-// TODO: Where's da "w>"?
+
 	fTitle = strdup(title);
-	SetName(title);
 
+	_SetName(title);
+
 	fFeel = feel;
 	fLook = look;
 	fFlags = flags;
@@ -2441,64 +2424,56 @@
 
 	STRACE(("BWindow::InitData(): contacting app_server...\n"));
 
-	// HERE we are in BApplication's thread, so for locking we use be_app variable
-	// we'll lock the be_app to be sure we're the only one writing at BApplication's server port
-	bool locked = false;
-	if (!be_app->IsLocked()) {
-// TODO: This doesn't look good. If a window is created in the message handling
-// code of another window, then the lock of that other window is already being
-// held. So, if the application tries to lock that window from its message
-// handling code, we get a beautiful deadlock. Start Icon-O-Matic, quit it, and
-// start it a second time to see that in action.
-		be_app->Lock();
-		locked = true; 
-	}
-
 	// let app_server know that a window has been created.
 	fLink = new BPrivate::PortLink(
 		BApplication::Private::ServerLink()->SenderPort(), receivePort);
 
-	if (bitmapToken < 0) {
-		fLink->StartMessage(AS_CREATE_WINDOW);
-	} else {
-		fLink->StartMessage(AS_CREATE_OFFSCREEN_WINDOW);
-		fLink->Attach<int32>(bitmapToken);
-	}
+	{
+		BPrivate::AppServerLink lockLink;
+			// we're talking to the server application using our own 
+			// communication channel (fLink) - we better make sure no one
+			// interferes by locking that channel (which AppServerLink does
+			// implicetly)
 
-	fLink->Attach<BRect>(fFrame);
-	fLink->Attach<uint32>((uint32)fLook);
-	fLink->Attach<uint32>((uint32)fFeel);
-	fLink->Attach<uint32>(fFlags);
-	fLink->Attach<uint32>(workspace);
-	fLink->Attach<int32>(_get_object_token_(this));
-	fLink->Attach<port_id>(receivePort);
-	fLink->Attach<port_id>(fMsgPort);
-	fLink->AttachString(title);
+		if (bitmapToken < 0) {
+			fLink->StartMessage(AS_CREATE_WINDOW);
+		} else {
+			fLink->StartMessage(AS_CREATE_OFFSCREEN_WINDOW);
+			fLink->Attach<int32>(bitmapToken);
+		}
 
-	port_id sendPort;
-	int32 code;
-	if (fLink->FlushWithReply(code) == B_OK
-		&& code == B_OK
-		&& fLink->Read<port_id>(&sendPort) == B_OK) {
-		// read the frame size and its limits that were really
-		// enforced on the server side
+		fLink->Attach<BRect>(fFrame);
+		fLink->Attach<uint32>((uint32)fLook);
+		fLink->Attach<uint32>((uint32)fFeel);
+		fLink->Attach<uint32>(fFlags);
+		fLink->Attach<uint32>(workspace);
+		fLink->Attach<int32>(_get_object_token_(this));
+		fLink->Attach<port_id>(receivePort);
+		fLink->Attach<port_id>(fMsgPort);
+		fLink->AttachString(title);
 
-		fLink->Read<BRect>(&fFrame);
-		fLink->Read<float>(&fMinWidth);
-		fLink->Read<float>(&fMaxWidth);
-		fLink->Read<float>(&fMinHeight);
-		fLink->Read<float>(&fMaxHeight);
+		port_id sendPort;
+		int32 code;
+		if (fLink->FlushWithReply(code) == B_OK
+			&& code == B_OK
+			&& fLink->Read<port_id>(&sendPort) == B_OK) {
+			// read the frame size and its limits that were really
+			// enforced on the server side
 
-		fMaxZoomWidth = fMaxWidth;
-		fMaxZoomHeight = fMaxHeight;
-	} else
-		sendPort = -1;
+			fLink->Read<BRect>(&fFrame);
+			fLink->Read<float>(&fMinWidth);
+			fLink->Read<float>(&fMaxWidth);
+			fLink->Read<float>(&fMinHeight);
+			fLink->Read<float>(&fMaxHeight);
 
-	// Redirect our link to the new window connection
-	fLink->SetSenderPort(sendPort);
+			fMaxZoomWidth = fMaxWidth;
+			fMaxZoomHeight = fMaxHeight;
+		} else
+			sendPort = -1;
 
-	if (locked)
-		be_app->Unlock();
+		// Redirect our link to the new window connection
+		fLink->SetSenderPort(sendPort);
+	}
 
 	STRACE(("Server says that our send port is %ld\n", sendPort));
 	STRACE(("Window locked?: %s\n", IsLocked() ? "True" : "False"));
@@ -2507,6 +2482,35 @@
 }
 
 
+//! Rename the handler and its thread
+void
+BWindow::_SetName(const char *title)
+{
+	if (title == NULL)
+		title = "";
+
+	// we will change BWindow's thread name to "w>window title"	
+
+	char threadName[B_OS_NAME_LENGTH];
+	strcpy(threadName, "w>");
+#ifdef __HAIKU__
+	strlcat(threadName, title, B_OS_NAME_LENGTH);
+#else
+	int32 length = strlen(title);
+	length = min_c(length, B_OS_NAME_LENGTH - 3);
+	memcpy(threadName + 2, title, length);
+	threadName[length + 2] = '\0';
+#endif
+
+	// change the handler's name
+	SetName(threadName);
+
+	// if the message loop has been started...
+	if (Thread() >= B_OK)
+		rename_thread(Thread(), threadName);
+}
+
+
 //!	Reads all pending messages from the window port and put them into the queue.
 void
 BWindow::_DequeueAll()



From axeld at mail.berlios.de  Wed Aug 15 04:02:47 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 15 Aug 2007 04:02:47 +0200
Subject: [Haiku-commits] r21960 - haiku/trunk/src/apps/deskbar
Message-ID: <200708150202.l7F22lc0014178@sheep.berlios.de>

Author: axeld
Date: 2007-08-15 04:02:45 +0200 (Wed, 15 Aug 2007)
New Revision: 21960
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21960&view=rev

Modified:
   haiku/trunk/src/apps/deskbar/BarWindow.cpp
Log:
Fixed the auto-raise "menus don't work anymore" bug.


Modified: haiku/trunk/src/apps/deskbar/BarWindow.cpp
===================================================================
--- haiku/trunk/src/apps/deskbar/BarWindow.cpp	2007-08-15 01:06:20 UTC (rev 21959)
+++ haiku/trunk/src/apps/deskbar/BarWindow.cpp	2007-08-15 02:02:45 UTC (rev 21960)
@@ -137,6 +137,10 @@
 	sBeMenu->NeedsToRebuild();
 	sBeMenu->ResetTargets();
 
+	fBarView->SetEventMask(0);
+		// This works around a BeOS bug - the menu is quit with every
+		// B_MOUSE_DOWN the window receives...
+
 	BWindow::MenusBeginning();
 }
 
@@ -151,6 +155,8 @@
 		sBeMenu->RemoveItems(0, sBeMenu->CountItems(), true);
 		sBeMenu->UnlockLooper();
 	}
+
+	fBarView->UpdateAutoRaise();
 }
 
 



From axeld at mail.berlios.de  Wed Aug 15 04:12:11 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 15 Aug 2007 04:12:11 +0200
Subject: [Haiku-commits] r21961 - haiku/trunk/src/kits/interface
Message-ID: <200708150212.l7F2CBVc014804@sheep.berlios.de>

Author: axeld
Date: 2007-08-15 04:12:05 +0200 (Wed, 15 Aug 2007)
New Revision: 21961
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21961&view=rev

Modified:
   haiku/trunk/src/kits/interface/Window.cpp
Log:
The bug worked around in r21960 also affected Haiku. Now, a menu is only quit if the click
into its "controlling" window targeted the preferred handler - ie. is a standard click that
is not sent because of an event mask.


Modified: haiku/trunk/src/kits/interface/Window.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Window.cpp	2007-08-15 02:02:45 UTC (rev 21960)
+++ haiku/trunk/src/kits/interface/Window.cpp	2007-08-15 02:12:05 UTC (rev 21961)
@@ -1008,9 +1008,11 @@
 		{
 			BView *view = dynamic_cast<BView *>(target);
 			
-			// Close an eventually opened menu, unless the target is the menu itself
+			// Close an eventually opened menu, if this click targets the
+			// preferred handler, and unless the target is the menu itself
 			BMenu *menu = dynamic_cast<BMenu *>(fFocus);
-			if (menu != NULL && menu != view && menu->State() != MENU_STATE_CLOSED) {
+			if (menu != NULL && menu != view && PreferredHandler() == target
+				&& menu->State() != MENU_STATE_CLOSED) {
 				menu->QuitTracking();
 				return;			
 			}



From korli at mail.berlios.de  Wed Aug 15 12:40:54 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Wed, 15 Aug 2007 12:40:54 +0200
Subject: [Haiku-commits] r21962 -
	haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich
Message-ID: <200708151040.l7FAesh0010627@sheep.berlios.de>

Author: korli
Date: 2007-08-15 12:40:50 +0200 (Wed, 15 Aug 2007)
New Revision: 21962
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21962&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c
   haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.h
Log:
added ids for nforce2 400, nforce4 and nforce430, untested


Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c	2007-08-15 02:12:05 UTC (rev 21961)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c	2007-08-15 10:40:50 UTC (rev 21962)
@@ -550,8 +550,11 @@
 		|| (info.vendor_id == NVIDIA_VENDOR_ID &&
 			(info.device_id == NVIDIA_nForce_AC97_DEVICE_ID
 			|| info.device_id == NVIDIA_nForce2_AC97_DEVICE_ID
+			|| info.device_id == NVIDIA_nForce2_400_AC97_DEVICE_ID
 			|| info.device_id == NVIDIA_nForce3_AC97_DEVICE_ID
-			|| info.device_id == NVIDIA_nF3_250_AC97_DEVICE_ID
+			|| info.device_id == NVIDIA_nForce3_250_AC97_DEVICE_ID
+			|| info.device_id == NVIDIA_nForce4_AC97_DEVICE_ID
+			|| info.device_id == NVIDIA_nForce430_AC97_DEVICE_ID
 			)) 
 		|| (info.vendor_id == AMD_VENDOR_ID &&
 			(info.device_id == AMD_AMD8111_AC97_DEVICE_ID
@@ -792,8 +795,11 @@
 		|| (info.vendor_id == NVIDIA_VENDOR_ID &&
 			(info.device_id == NVIDIA_nForce_AC97_DEVICE_ID
 			|| info.device_id == NVIDIA_nForce2_AC97_DEVICE_ID
+			|| info.device_id == NVIDIA_nForce2_400_AC97_DEVICE_ID
 			|| info.device_id == NVIDIA_nForce3_AC97_DEVICE_ID
-			|| info.device_id == NVIDIA_nF3_250_AC97_DEVICE_ID
+			|| info.device_id == NVIDIA_nForce3_250_AC97_DEVICE_ID
+			|| info.device_id == NVIDIA_nForce4_AC97_DEVICE_ID
+			|| info.device_id == NVIDIA_nForce430_AC97_DEVICE_ID
 			)) 
 		|| (info.vendor_id == AMD_VENDOR_ID &&
 			(info.device_id == AMD_AMD8111_AC97_DEVICE_ID

Modified: haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.h	2007-08-15 02:12:05 UTC (rev 21961)
+++ haiku/trunk/src/add-ons/kernel/drivers/audio/ac97/auich/auich.h	2007-08-15 10:40:50 UTC (rev 21962)
@@ -61,8 +61,11 @@
 #define NVIDIA_VENDOR_ID		0x10DE	/* Nvidia */
 #define NVIDIA_nForce_AC97_DEVICE_ID	0x01B1
 #define NVIDIA_nForce2_AC97_DEVICE_ID	0x006A
+#define NVIDIA_nForce2_400_AC97_DEVICE_ID	0x008A
 #define NVIDIA_nForce3_AC97_DEVICE_ID	0x00DA
-#define NVIDIA_nF3_250_AC97_DEVICE_ID	0x00EA
+#define NVIDIA_nForce3_250_AC97_DEVICE_ID	0x00EA
+#define NVIDIA_nForce4_AC97_DEVICE_ID	0x0059
+#define NVIDIA_nForce430_AC97_DEVICE_ID	0x026b
 #define AMD_VENDOR_ID		0x1022	/* Amd */
 #define AMD_AMD8111_AC97_DEVICE_ID	0x764d
 #define AMD_AMD768_AC97_DEVICE_ID	0x7445	



From korli at mail.berlios.de  Wed Aug 15 13:33:37 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Wed, 15 Aug 2007 13:33:37 +0200
Subject: [Haiku-commits] r21963 - haiku/trunk/src/preferences/devices
Message-ID: <200708151133.l7FBXbmr010150@sheep.berlios.de>

Author: korli
Date: 2007-08-15 13:33:31 +0200 (Wed, 15 Aug 2007)
New Revision: 21963
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21963&view=rev

Modified:
   haiku/trunk/src/preferences/devices/pci.ids
Log:
update pci ids


Modified: haiku/trunk/src/preferences/devices/pci.ids
===================================================================
--- haiku/trunk/src/preferences/devices/pci.ids	2007-08-15 10:40:50 UTC (rev 21962)
+++ haiku/trunk/src/preferences/devices/pci.ids	2007-08-15 11:33:31 UTC (rev 21963)
@@ -11,7 +11,7 @@
 #	This file can be distributed under either the GNU General Public License
 #	(version 2 or higher) or the 3-clause BSD License.
 #
-#	Daily snapshot on Wed 2007-01-17 02:05:01
+#	Daily snapshot on Wed 2007-08-15 01:05:02
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -23,11 +23,28 @@
 
 0000  Gammagraphx, Inc.
 001a  Ascend Communications, Inc.
+001c  PEAK-System Technik GmbH
+	0001  PCAN-PCI CAN-Bus controller
 0033  Paradyne corp.
 003d  Lockheed Martin-Marietta Corp
 # Real TJN ID is e159, but they got it wrong several times --mj
 0059  Tiger Jet Network Inc. (Wrong ID)
 0070  Hauppauge computer works Inc.
+	0003  WinTV PVR-250
+	0009  WinTV PVR-150
+	0801  WinTV PVR-150
+	0807  WinTV PVR-150
+	4000  WinTV PVR-350
+	4001  WinTV PVR-250 (v1)
+	4009  WinTV PVR-250
+	4800  WinTV PVR-350
+	4801  WinTV PVR-250 MCE
+	4803  WinTV PVR-250
+	8003  WinTV PVR-150
+	8801  WinTV PVR-150
+	c801  WinTV PVR-150
+	e807  WinTV PVR-500 MCE (1st tuner)
+	e817  WinTV PVR-500 MCE (2nd tuner)
 0071  Nebula Electronics Ltd.
 0095  Silicon Image, Inc. (Wrong ID)
 	0680  Ultra ATA/133 IDE RAID CONTROLLER CARD
@@ -48,9 +65,11 @@
 # SpeedStream is Efficient Networks, Inc, a Siemens Company
 02ac  SpeedStream
 	1012  1012 PCMCIA 10/100 Ethernet Card [RTL81xx]
+02e0  XFX Pine Group Inc
 0315  SK-Electronics Co., Ltd.
 0357  TTTech AG
 	000a  TTP-Monitoring Card V2.0
+0403  Future Technology Devices International Ltd
 0432  SCM Microsystems, Inc.
 	0001  Pluto2 DVB-T Receiver for PCMCIA [EasyWatch MobilSet]
 045e  Microsoft
@@ -63,6 +82,9 @@
 	001a  FSD7000 802.11g PCI Wireless card
 	0109  F5U409-CU USB/Serial Portable Adapter
 	7050  F5D7050 802.11g Wireless USB Adapter
+	705c  F5D7050 v4
+058f  Alcor Micro Corporation
+	9254  AU9254 (4-port USB hub)
 05a9  OmniVision
 	8519  OV519 series
 05e3  CyberDoor
@@ -78,23 +100,43 @@
 067b  Prolific Technology, Inc.
 	2303  PL-2303 USB-to-Serial Converter
 	3507  PL-3507 Hi-Speed USB & IEEE 1394 Combo to IDE Bridge Controller
+069d  Hughes Network Systems (HNS)
 0721  Sapphire, Inc.
+07ca  AVerMedia Technologies Inc.
+	b808  AVerTV DVB-T Volar (USB 2.0)
 07e2  ELMEG Communication Systems GmbH
+0842  NPG, Personal Grand Technology
+08ff  AuthenTec
+	afe4  [Anchor] AF-S2 FingerLoc Sensor Module
 # Wrong ID used in subsystem ID of VIA USB controllers.
 0925  VIA Technologies, Inc. (Wrong ID)
 093a  PixArt Imaging Inc.
+	010e  Innovage Mini Digital Camera
+	010f  SDC-300 Webcam
+	2468  CIF Single Chip
+	2600  PAC7311
+	2603  Philips Webcam SPC500NC
+	2608  Maxell MaxCam RotaWeb
 09c1  Arris
 	0704  CM 200E Cable Modem
 0a89  BREA Technologies Inc
+0ace  ZyDAS
+	1211  ZD1211 IEEE 802.11b+g USB Adapter
 0b0b  Rhino Equiment Corp.
 	0105  Rhino R1T1
 	0205  Rhino R4FXO
+	0206  RCB4FXO 4-channel FXO analog telphony card
 	0305  Rhino R4T1
 	0405  Rhino R8FXX
+	0406  RCB8FXX 8-channel modular analog telphony card
 	0505  Rhino R24FXX
-	0506  Rhino R2T1
+	0506  RCB24FXS 24-Channel FXS analog telphony card
 	0605  Rhino R2T1
 	0705  Rhino R24FXS
+	0706  RCB24FXO 24-Channel FXO analog telphony card
+	0905  R1T3 Single T3 Digital Telephony Card
+	0906  RCB24FXX 24-channel modular analog telphony card
+	0a06  RCB672FXX 672-channel modular analog telphony card
 0b49  ASCII Corporation
 	064f  Trance Vibrator
 0ccd  TerraTec Electronic GmbH
@@ -103,6 +145,7 @@
 	0001  PCI to EISA Bridge
 	0002  PCI to ISA Bridge
 	0046  Smart Array 64xx
+		0e11 4091  Smart Array 6i
 		0e11 409a  Smart Array 641
 		0e11 409b  Smart Array 642
 		0e11 409c  Smart Array 6400
@@ -274,6 +317,7 @@
 		1028 014a  PowerEdge 1750
 		1028 016c  PowerEdge 1850 MPT Fusion SCSI/RAID (Perc 4)
 		1028 0183  PowerEdge 1800
+		1028 018a  PERC 4/IM
 		1028 1010  LSI U320 SCSI Controller
 		103c 12c5  Ultra320 SCSI [A7173A]
 		124b 1170  PMC-USCSI320
@@ -287,17 +331,56 @@
 		1000 0066  MegaRAID SCSI 320-2XRWS
 	0041  53C1035ZC PCI-X Fusion-MPT Dual Ultra320 SCSI
 	0050  SAS1064 PCI-X Fusion-MPT SAS
+		1028 1f04  SAS 5/E
+		1028 1f09  SAS 5i/R
 	0054  SAS1068 PCI-X Fusion-MPT SAS
-	0056  SAS1064E PCI-Express Fusion-MPT SAS
+		1028 1f04  SAS 5/E Adapter Controller
+		1028 1f05  SAS 5/i Adapter Controller
+		1028 1f06  SAS 5/i Integrated Controller
+		1028 1f07  SAS 5/iR Integrated RAID Controller
+		1028 1f08  SAS 5/iR Integrated RAID Controller
+		1028 1f09  SAS 5/iR Adapter RAID Controller
+	0055  SAS1068 PCI-X Fusion-MPT SAS
+		1033 8336  SAS1068
+	0056  SAS1064ET PCI-Express Fusion-MPT SAS
+	0057  M1064E MegaRAID SAS
 	0058  SAS1068E PCI-Express Fusion-MPT SAS
+		1028 021d  SAS 6/iR Integrated Workstations RAID Controller
+		1028 1f0e  SAS 6/iR Adapter RAID Controller
+		1028 1f0f  SAS 6/iR Integrated Blades RAID Controller
+		1028 1f10  SAS 6/iR Integrated RAID Controller
 	005a  SAS1066E PCI-Express Fusion-MPT SAS
 	005c  SAS1064A PCI-X Fusion-MPT SAS
 	005e  SAS1066 PCI-X Fusion-MPT SAS
 	0060  MegaRAID SAS 1078
+		1000 1006  MegaRAID SAS 8888ELP
+		1000 100a  MegaRAID SAS 8708ELP
+		1000 100e  MegaRAID SAS 8884E
+		1000 100f  MegaRAID SAS 8708E
+		1000 1010  MegaRAID SATA 350-8ELP
+		1000 1011  MegaRAID SATA 350-4ELP
+		1000 1012  MegaRAID SAS 8704ELP
+		1000 1016  MegaRAID SAS 8880EM2
+		1014 0363  MegaRAID SAS PCI Express ROMB
+		1014 0364  SystemX MegaRAID SAS 8808E
+		1014 0365  SystemX MegaRAID SAS 8884E
+		1014 0379  SystemX MegaRAID SAS 8880EM2
 		1028 1f0a  PERC 6/E Adapter RAID Controller
 		1028 1f0b  PERC 6/i Adapter RAID Controller
 		1028 1f0c  PERC 6/i Integrated RAID Controller
-		1028 1f0d  PERC 6/i Enhanced RAID Controller
+		1028 1f0d  CERC 6/i Adapter RAID Controller
+		1028 1f11  CERC 6/i Integrated RAID Controller
+		1033 835a  MegaRAID SAS PCI Express ROMB
+		1043 824d  MegaRAID SAS PCI Express ROMB
+		1170 002f  MegaRAID SAS PCI Express ROMB
+		1170 0036  MegaRAID SAS PCI Express ROMB
+		15d9 c080  MegaRAID SAS PCI Express ROMB
+		17aa 6b7c  MegaRAID SAS PCI Express ROMB
+		8086 1006  RAID Controller SRCSAS28EP
+		8086 100a  RAID Controller SRCSAS28EV
+		8086 1010  RAID Controller SRCSATA28E
+		8086 34cc  Integrated RAID Controller SROMBSAS28E
+		8086 34cd  Integrated RAID Controller SROMBSAS28E
 	0062  SAS1078 PCI-Express Fusion-MPT SAS
 		1000 0062  SAS1078 PCI-Express Fusion-MPT SAS
 	008f  53c875J
@@ -317,6 +400,9 @@
 		1025 004d  MegaRAID ACER ROMB-2E RAID Controller
 		1028 0001  PowerEdge RAID Controller PERC4e/SC
 		1028 0002  PowerEdge RAID Controller PERC4e/DC
+		1028 0012  PowerEdge RAID Controller RAC4
+		1028 0015  PowerEdge RAID Controller PERC5
+		1028 1f03  PowerEdge RAID Controller PERC5
 		1734 1065  FSC MegaRAID PCI Express ROMB
 		8086 0002  MegaRAID Intel RAID Controller SRCU42E
 	0409  MegaRAID
@@ -330,6 +416,7 @@
 		1000 1002  MegaRAID SAS 8480E
 		1000 1003  MegaRAID SAS 8344ELP
 		1000 1004  MegaRAID SAS 8308ELP
+		1000 1008  MegaRAID SAS 84016E
 		1000 100c  MegaRAID SATA 300-12E
 		1000 100d  MegaRAID SATA 300-16E
 		1000 2004  MegaRAID SATA 300-8ELP
@@ -338,8 +425,8 @@
 		1054 3016  MegaRAID SAS RoMB Server
 		1734 1081  MegaRAID SAS PCI Express ROMB
 		1734 10a3  MegaRAID SAS PCI Express ROMB
-		8086 1001  SRCSAS18E RAID Controller
-		8086 1003  SRCSAS144E RAID Controller
+		8086 1001  RAID Controller SRCSAS18E
+		8086 1003  RAID Controller SRCSAS144E
 		8086 3500  SROMBSAS18E RAID Controller
 		8086 3501  SROMBSAS18E RAID Controller
 		8086 3504  SROMBSAS18E RAID Controller
@@ -393,11 +480,13 @@
 	9100  INI-9100/9100W SCSI Host
 1002  ATI Technologies Inc
 	3150  M24 1P [Radeon Mobility X600]
+	3151  M24 [FireMV 2400]
 	3152  M22 [Radeon Mobility X300]
-	3154  M24 1T [FireGL M24 GL]
+	3154  M24GL [Mobility FireGL V3200]
+	3171  M24 [FireMV 2400] (Secondary)
 	3e50  RV380 0x3e50 [Radeon X600]
 	3e54  RV380 0x3e54 [FireGL V3200]
-	3e70  RV380 [Radeon X600] Secondary
+	3e70  RV380 [Radeon X600] (Secondary)
 	4136  Radeon IGP 320 M
 	4137  Radeon IGP330/340/350
 	4144  R300 AD [Radeon 9500 Pro]
@@ -407,18 +496,18 @@
 	4148  R350 AH [Radeon 9800]
 	4149  R350 AI [Radeon 9800]
 	414a  R350 AJ [Radeon 9800]
-	414b  R350 AK [Fire GL X2]
+	414b  R350 AK [FireGL X2]
 	4150  RV350 AP [Radeon 9600]
 		1002 0002  R9600 Pro primary (Asus OEM for HP)
 		1002 0003  R9600 Pro secondary (Asus OEM for HP)
 		1002 4722  All-in-Wonder 2006 AGP Edition
-		1458 4024  Giga-Byte GV-R96128D Primary
+		1458 4024  Giga-Byte GV-R96128D (Primary)
 		148c 2064  PowerColor R96A-C3N
 		148c 2066  PowerColor R96A-C3N
 		174b 7c19  Sapphire Atlantis Radeon 9600 Pro
-		174b 7c29  GC-R9600PRO Primary [Sapphire]
+		174b 7c29  GC-R9600PRO [Sapphire] (Primary)
 		17ee 2002  Radeon 9600 256Mb Primary
-		18bc 0101  GC-R9600PRO Primary
+		18bc 0101  GC-R9600PRO (Primary)
 	4151  RV350 AQ [Radeon 9600]
 		1043 c004  A9600SE
 	4152  RV350 AR [Radeon 9600]
@@ -431,10 +520,10 @@
 	4153  RV350 AS [Radeon 9550]
 		1043 010c  A9550GE/TD
 		1462 932c  865PE Neo2-V (MS-6788) mainboard
-	4154  RV350 AT [Fire GL T2]
-	4155  RV350 AU [Fire GL T2]
-	4156  RV350 AV [Fire GL T2]
-	4157  RV350 AW [Fire GL T2]
+	4154  RV350 AT [FireGL T2]
+	4155  RV350 AU [FireGL T2]
+	4156  RV350 AV [FireGL T2]
+	4157  RV350 AW [FireGL T2]
 	4158  68800AX [Mach32]
 	4164  R300 AD [Radeon 9500 Pro] (Secondary)
 	4165  R300 AE [Radeon 9700 Pro] (Secondary)
@@ -443,11 +532,11 @@
 	4170  RV350 AP [Radeon 9600] (Secondary)
 		1002 0003  R9600 Pro secondary (Asus OEM for HP)
 		1002 4723  All-in-Wonder 2006 AGP Edition (Secondary)
-		1458 4025  Giga-Byte GV-R96128D Secondary
+		1458 4025  Giga-Byte GV-R96128D (Secondary)
 		148c 2067  PowerColor R96A-C3N (Secondary)
-		174b 7c28  GC-R9600PRO Secondary [Sapphire]
-		17ee 2003  Radeon 9600 256Mb Secondary
-		18bc 0100  GC-R9600PRO Secondary
+		174b 7c28  GC-R9600PRO [Sapphire] (Secondary)
+		17ee 2003  Radeon 9600 256Mb (Secondary)
+		18bc 0100  GC-R9600PRO (Secondary)
 	4171  RV350 AQ [Radeon 9600] (Secondary)
 		1043 c005  A9600SE (Secondary)
 	4172  RV350 AR [Radeon 9600] (Secondary)
@@ -474,16 +563,18 @@
 	4345  EHCI USB Controller
 	4347  OHCI USB Controller #1
 	4348  OHCI USB Controller #2
-	4349  ATI Dual Channel Bus Master PCI IDE Controller
+	4349  Dual Channel Bus Master PCI IDE Controller
 	434d  IXP AC'97 Modem
-	4353  ATI SMBus
+	4353  SMBus
 	4354  215CT [Mach64 CT]
 	4358  210888CX [Mach64 CX]
-	4363  ATI SMBus
-	436e  ATI 436E Serial ATA Controller
+	4363  SMBus
+	436e  436E Serial ATA Controller
 	4370  IXP SB400 AC'97 Audio Controller
 		1025 0079  Aspire 5024WLMMi
+		1025 0091  Aspire 5032WXMi
 		103c 308b  MX6125
+		105b 0c81  Realtek ALC 653
 		107b 0300  MX6421
 	4371  IXP SB400 PCI-PCI Bridge
 		103c 308b  MX6125
@@ -498,18 +589,23 @@
 	4375  IXP SB400 USB Host Controller
 		1025 0080  Aspire 5024WLMMi
 		103c 308b  MX6125
-	4376  Standard Dual Channel PCI IDE Controller ATI
+	4376  Standard Dual Channel PCI IDE Controller
 		1025 0080  Aspire 5024WLMMi
 		103c 308b  MX6125
 	4377  IXP SB400 PCI-ISA Bridge
 		1025 0080  Aspire 5024WLMi
 		103c 308b  MX6125
-	4378  ATI SB400 - AC'97 Modem Controller
+	4378  SB400 AC'97 Modem Controller
 		1025 0080  Aspire 5024WLMMi
 		103c 308b  MX6125
-	4379  ATI 4379 Serial ATA Controller
-	437a  ATI 437A Serial ATA Controller
+	4379  4379 Serial ATA Controller
+	437a  437A Serial ATA Controller
+		1002 4379  4379 Serial ATA Controller
+		1002 437a  437A Serial ATA Controller
+		14f1 8800  Leadtek WinFast TV2000XP Expert
 	437b  SB450 HDA Audio
+		10cf 1326  Fujitsu Lifebook A3040
+		1734 10b8  Realtek High Definition Audio
 	4380  SB600 Non-Raid-5 SATA
 	4381  SB600 Raid-5 SATA
 	4382  SB600 AC97 Audio
@@ -525,6 +621,18 @@
 	438c  SB600 IDE
 	438d  SB600 PCI to LPC Bridge
 	438e  SB600 AC97 Modem
+	4390  SB700 SATA Controller [IDE mode]
+	4391  SB700 SATA Controller [AHCI mode]
+	4392  SB700 SATA Controller [Non-RAID5 mode]
+	4393  SB700 SATA Controller [RAID5 mode]
+	4394  SB700 SATA Controller [SATA and FC Enabled]
+	4395  SB700 SMBus
+	4396  SB700 USB EHCI Controller
+	4397  SB700 USB OHCI0 Controller
+	4398  SB700 USB OHCI1 Controller
+	4399  SB700 USB OHCI2 Controller
+	439c  SB700 IDE
+	439d  SB700 LPC host controller
 	4437  Radeon Mobility 7000 IGP
 	4554  210888ET [Mach64 ET]
 	4654  Mach64 VT
@@ -579,11 +687,13 @@
 		1028 00d1  PowerEdge 2550
 		1028 00d9  PowerEdge 2500
 		1028 0134  PowerEdge 600SC
+		1028 0165  PowerEdge 750
 		103c 10e1  NetServer Rage XL
 		107b 6400  6400 Server
 		1734 007a  Primergy RX300
 		8086 3411  SDS2 Mainboard
 		8086 3427  S875WP1-E mainboard
+		8086 5744  S845WD1-E mainboard
 	4753  Rage XC
 		1002 4753  Rage XC
 	4754  3D Rage I/II 215GT [Mach64 GT]
@@ -648,6 +758,8 @@
 	4c44  3D Rage LT Pro AGP-66
 	4c45  Rage Mobility M3 AGP
 	4c46  Rage Mobility M3 AGP 2x
+		1002 0155  IBM Thinkpad A22p
+		1014 0155  IBM Thinkpad A22p
 		1028 00b1  Latitude C600
 	4c47  3D Rage LT-G 215LG
 	4c49  3D Rage LT Pro
@@ -677,6 +789,7 @@
 		1014 0517  ThinkPad T30
 		1028 00e6  Radeon Mobility M7 LW (Dell Inspiron 8100)
 		1028 012a  Latitude C640
+		1043 1622  Mobility Radeon M7 (L3C/S)
 		144d c006  Radeon Mobility M7 LW in vpr Matrix 170B4
 	4c58  Radeon RV200 LX [Mobility FireGL 7800 M7]
 	4c59  Radeon Mobility M6 LY
@@ -687,14 +800,16 @@
 		104d 8140  PCG-Z1SP laptop
 		1509 1930  Medion MD9703
 	4c5a  Radeon Mobility M6 LZ
-	4c64  Radeon R250 Ld [Radeon Mobility 9000 M9]
-	4c65  Radeon R250 Le [Radeon Mobility 9000 M9]
-	4c66  Radeon R250 [Mobility FireGL 9000]
-	4c67  Radeon R250 Lg [Radeon Mobility 9000 M9]
+	4c64  Radeon RV250 Ld [Radeon Mobility 9000 M9]
+	4c65  Radeon RV250 Le [Radeon Mobility 9000 M9]
+	4c66  Radeon RV250 [Mobility FireGL 9000]
+		1014 054d  Thinkpad T41
+	4c67  Radeon RV250 Lg [Radeon Mobility 9000 M9]
 # Secondary chip to the Lf
-	4c6e  Radeon R250 Ln [Radeon Mobility 9000 M9] [Secondary]
+	4c6e  Radeon RV250 Ln [Radeon Mobility 9000 M9] (Secondary)
 	4d46  Rage Mobility M4 AGP
 	4d4c  Rage Mobility M4 AGP
+	4d52  Theater 550 PRO PCI [ATI TV Wonder 550]
 	4e44  Radeon R300 ND [Radeon 9700 Pro]
 		1002 515e  Radeon ES1000
 		1002 5965  Radeon ES1000
@@ -706,15 +821,17 @@
 	4e48  Radeon R350 [Radeon 9800 Pro]
 	4e49  Radeon R350 [Radeon 9800]
 	4e4a  RV350 NJ [Radeon 9800 XT]
-	4e4b  R350 NK [Fire GL X2]
+	4e4b  R350 NK [FireGL X2]
 	4e50  RV350 [Mobility Radeon 9600 M10]
 		1025 005a  TravelMate 290
 		103c 088c  NC8000 laptop
 		103c 0890  NC6000 laptop
+		144d c00c  P35 notebook
 		1462 0311  MSI M510A
 		1734 1055  Amilo M1420W
 	4e51  M10 NQ [Radeon Mobility 9600]
 	4e52  RV350 [Mobility Radeon 9600 M10]
+		144d c00c  P35 notebook
 	4e53  M10 NS [Radeon Mobility 9600]
 	4e54  M10 NT [FireGL Mobility T2]
 	4e56  M11 NV [FireGL Mobility T2e]
@@ -727,7 +844,7 @@
 	4e68  Radeon R350 [Radeon 9800 Pro] (Secondary)
 	4e69  Radeon R350 [Radeon 9800] (Secondary)
 	4e6a  RV350 NJ [Radeon 9800 XT] (Secondary)
-		1002 4e71  ATI Technologies Inc M10 NQ [Radeon Mobility 9600]
+		1002 4e71  M10 NQ [Radeon Mobility 9600]
 	4e71  M10 NQ [Radeon Mobility 9600] (Secondary)
 	4f72  RV250 [Radeon 9000 Series]
 	4f73  Radeon RV250 [Radeon 9000 Series] (Secondary)
@@ -825,7 +942,7 @@
 		1002 0908  XVR-100 (supplied by Sun)
 # The IBM card doubles as an ATI PCI video adapter
 		1014 029a  Remote Supervisor Adapter II (RSA2)
-		1014 02c8  IBM eServer xSeries server mainboard
+		1014 02c8  eServer xSeries server mainboard
 		1028 019a  PowerEdge SC1425
 		103c 1292  Radeon 7000
 		1458 4002  RV100 QY [RADEON 7000 PRO MAYA AV Series]
@@ -890,7 +1007,8 @@
 	5453  Rage 128 Pro Ultra TS
 	5454  Rage 128 Pro Ultra TT
 	5455  Rage 128 Pro Ultra TU
-	5460  M22 [Radeon Mobility M300]
+	5460  M22 [Mobility Radeon X300]
+		1775 1100  CR11/VR11 Single Board Computer
 	5462  M24 [Radeon Mobility X600]
 	5464  M22 [FireGL GL]
 	5548  R423 UH [Radeon X800 (PCIE)]
@@ -899,21 +1017,22 @@
 	554b  R423 UK [Radeon X800SE (PCIE)]
 	554d  R430 [Radeon X800 XL] (PCIe)
 	554f  R430 [Radeon X800 (PCIE)]
-	5550  R423 [Fire GL V7100]
-	5551  R423 UQ [FireGL V7200 (PCIE)]
+	5550  R423 [FireGL V7100]
+	5551  R423 [FireGL V5100 (PCIE)]
 	5552  R423 UR [FireGL V5100 (PCIE)]
 	5554  R423 UT [FireGL V7100 (PCIE)]
-	5569  R423 UI [Radeon X800PRO (PCIE)] Secondary
+	5569  R423 UI [Radeon X800PRO (PCIE)] (Secondary)
 	556b  Radeon R423 UK (PCIE) [X800 SE] (Secondary)
-	556d  R430 [Radeon X800 XL] (PCIe) Secondary
-	556f  R430 [Radeon X800 (PCIE) Secondary]
-	5571  R423GL-SE ATI FIREGL V5100 PCI-EX Secondary
+	556d  R430 [Radeon X800 XL] (PCIe) (Secondary)
+	556f  R430 [Radeon X800] (PCIE) (Secondary)
+	5571  R423GL-SE [FireGL V5100 (PCIE)] (Secondary)
 	564a  M26 [Mobility FireGL V5000]
 	564b  M26 [Mobility FireGL V5000]
-	564f  M26 [Radeon Mobility X700 XL] (PCIE)
+	564f  M26 [Radeon Mobility X700 XL (PCIE)]
 	5652  M26 [Radeon Mobility X700]
 	5653  Radeon Mobility X700 (PCIE)
 		1025 0080  Aspire 5024WLMi
+		103c 0940  HP Compaq NW8240 Mobile Workstation
 	5654  264VT [Mach64 VT]
 		1002 5654  Mach64VT Reference
 	5655  264VT3 [Mach64 VT3]
@@ -926,6 +1045,7 @@
 	5835  RS300M AGP [Radeon Mobility 9100IGP]
 	5838  Radeon 9100 IGP AGP Bridge
 	5940  RV280 [Radeon 9200 PRO] (Secondary)
+		17af 2021  Excalibur Radeon 9250 (Secondary)
 	5941  RV280 [Radeon 9200] (Secondary)
 		1458 4019  Gigabyte Radeon 9200
 		174b 7c12  Sapphire Radeon 9200
@@ -935,13 +1055,18 @@
 	5950  RS480 Host Bridge
 		1025 0080  Aspire 5024WLMMi
 		103c 308b  MX6125
-	5951  ATI Radeon Xpress 200 (RS480/RS482/RX480/RX482) Chipset - Host bridge
+	5951  Radeon Xpress 200 (RS480/RS482/RX480/RX482) Chipset - Host bridge
+	5952  RD580 [CrossFire Xpress 3200] Chipset Host Bridge
 	5954  RS480 [Radeon Xpress 200G Series]
 		1002 5954  RV370 [Radeon Xpress 200G Series]
-	5955  ATI Radeon XPRESS 200M 5955 (PCIE)
-		1002 5955  RS480 0x5955 [ATI Radeon XPRESS 200M 5955 (PCIE)]
+	5955  Radeon XPRESS 200M 5955 (PCIE)
+		1002 5955  RS480 0x5955 [Radeon XPRESS 200M 5955 (PCIE)]
 		103c 308b  MX6125
+	5956  RD790 Northbridge only dual slot PCI-e_GFX and HT3 K8 part
+	5957  RX790 Northbridge only single slot PCI-e_GFX and HT3 K8 part
+	5958  RD780 Northbridge only dual slot PCI-e_GFX and HT1 K8 part
 	5960  RV280 [Radeon 9200 PRO]
+		17af 2020  Excalibur Radeon 9250
 	5961  RV280 [Radeon 9200]
 		1002 2f72  All-in-Wonder 9200 Series
 		1019 4c30  Radeon 9200 VIVO
@@ -954,6 +1079,7 @@
 		18bc 0053  Radeon 9200 Game Buster VIVO
 	5962  RV280 [Radeon 9200]
 	5964  RV280 [Radeon 9200 SE]
+		1002 5964  Radeon 9200 SE, 64-bit 128MB DDR, 200/166MHz
 		1043 c006  ASUS Radeon 9200 SE / TD / 128M
 		1458 4018  Radeon 9200 SE
 		1458 4032  Radeon 9200 SE 128MB
@@ -966,11 +1092,39 @@
 		18bc 0173  GC-R9200L(SE)-C3H [Radeon 9200 Game Buster]
 	5969  ES1000
 	5974  RS482 [Radeon Xpress 200]
-	5975  RS482 [Radeon Xpress 200M]
+	5975  RS485 [Radeon Xpress 1100 IGP]
+	5978  RD790 PCI to PCI bridge (external gfx0 port A)
+	5979  RD790 PCI to PCI bridge (external gfx0 port B)
+	597a  RD790 PCI to PCI bridge (PCI express gpp port A)
+	597b  RD790 PCI to PCI bridge (PCI express gpp port B)
+	597c  RD790 PCI to PCI bridge (PCI express gpp port C)
+	597d  RD790 PCI to PCI bridge (PCI express gpp port D)
+	597e  RD790 PCI to PCI bridge (PCI express gpp port E)
+	597f  RD790 PCI to PCI bridge (PCI express gpp port F)
+	5980  RD790 PCI to PCI bridge (external gfx1 port A)
+	5981  RD790 PCI to PCI bridge (external gfx1 port B)
+	5982  RD790 PCI to PCI bridge (NB-SB link)
+	5a10  RD890 Northbridge only dual slot (2x16) PCI-e GFX Hydra part
+	5a11  RD890 Northbridge only single slot PCI-e GFX Hydra part
+	5a12  RD890 Northbridge only dual slot (2x8) PCI-e GFX Hydra part
+	5a13  RD890 PCI to PCI bridge (external gfx0 port A)
+	5a14  RD890 PCI to PCI bridge (external gfx0 port B)
+	5a15  RD890 PCI to PCI bridge (PCI express gpp port A)
+	5a16  RD890 PCI to PCI bridge (PCI express gpp port B)
+	5a17  RD890 PCI to PCI bridge (PCI express gpp port C)
+	5a18  RD890 PCI to PCI bridge (PCI express gpp port D)
+	5a19  RD890 PCI to PCI bridge (PCI express gpp port E)
+	5a1a  RD890 PCI to PCI bridge (PCI express gpp port F)
+	5a1b  RD890 PCI to PCI bridge (PCI express gpp port G)
+	5a1c  RD890 PCI to PCI bridge (PCI express gpp port H)
+	5a1d  RD890 PCI to PCI bridge (external gfx1 port A)
+	5a1e  RD890 PCI to PCI bridge (external gfx1 port B)
+	5a1f  RD890 PCI to PCI bridge (NB-SB link)
 	5a33  Radeon Xpress 200 Host Bridge
 	5a34  RS480 PCI-X Root Port
 # Comes in pair with 5a3f
 	5a36  RS480 PCI Bridge
+	5a37  RS480 PCI Bridge
 	5a38  RS480 PCI Bridge
 # Comes in pair with 5a38
 	5a39  RS480 PCI Bridge
@@ -982,6 +1136,7 @@
 	5b60  RV370 5B60 [Radeon X300 (PCIE)]
 		1043 002a  Extreme AX300SE-X
 		1043 032e  Extreme AX300/TD
+		1458 2102  GV-RX30S128D (X300SE)
 		1462 0400  RX300SE-TD128E (MS-8940 REV:200)
 		1462 0402  RX300SE-TD128E (MS-8940)
 		196d 1086  X300SE HM
@@ -998,9 +1153,11 @@
 	5c61  M9+ 5C61 [Radeon Mobility 9200 (AGP)]
 	5c63  M9+ 5C63 [Radeon Mobility 9200 (AGP)]
 		1002 5c63  Apple iBook G4 2004
+		144d c00c  P30 notebook
 	5d44  RV280 [Radeon 9200 SE] (Secondary)
 		1458 4019  Radeon 9200 SE (Secondary)
 		1458 4032  Radeon 9200 SE 128MB
+		147b 6190  R9200SE-DT (Secondary)
 		174b 7c12  Sapphire Radeon 9200 SE (Secondary)
 		1787 5965  Excalibur 9200SE VIVO 128M (Secondary)
 		17af 2013  Radeon 9200 SE Excalibur (Secondary)
@@ -1012,8 +1169,8 @@
 	5d4d  R480 [Radeon X850XT Platinum (PCIE)]
 	5d4f  R480 [Radeon X800 GTO (PCIE)]
 	5d52  R480 [Radeon X850XT (PCIE)] (Primary)
-		1002 0b12  PowerColor X850XT PCIe Primary
-		1002 0b13  PowerColor X850XT PCIe Secondary
+		1002 0b12  PowerColor X850XT PCIe (Primary)
+		1002 0b13  PowerColor X850XT PCIe (Secondary)
 	5d57  R423 5F57 [Radeon X800XT (PCIE)]
 	5d6d  R480 [Radeon X850XT Platinum (PCIE)] (Secondary)
 	5d6f  R480 [Radeon X800 GTO (PCIE)] (Secondary)
@@ -1027,7 +1184,7 @@
 	5e4d  RV410 [Radeon X700 (PCIE)]
 		148c 2116  PowerColor Bravo X700
 	5e4f  RV410 [Radeon X700]
-	5e6b  RV410 [Radeon X700 Pro (PCIE)] Secondary
+	5e6b  RV410 [Radeon X700 Pro (PCIE)] (Secondary)
 	5e6d  RV410 [Radeon X700 (PCIE)] (Secondary)
 		148c 2117  PowerColor Bravo X700
 	5f57  R423 [Radeon X800XT (PCIE)]
@@ -1036,7 +1193,7 @@
 	7100  R520 [Radeon X1800]
 	7102  M58 [Radeon Mobility X1800]
 	7103  M58 [Mobility FireGL V7200]
-	7104  R520 GL ATI FireGL V7200 Primary
+	7104  R520GL [FireGL V7200] (Primary)
 	7105  R520 [FireGL]
 	7106  M58 [Mobility FireGL V7100]
 	7108  M58 [Radeon Mobility X1800]
@@ -1047,45 +1204,72 @@
 	710b  R520 [Radeon X1800]
 	710c  R520 [Radeon X1800]
 	7120  R520 [Radeon X1800] (Secondary)
-	7124  R520 GL ATI FireGL V7200 Secondary
+	7124  R520GL [FireGL V7200] (Secondary)
 	7129  R520 [Radeon X1800] (Secondary)
 		1002 0323  All-in-Wonder X1800XL (Secondary)
 		1002 0d03  Radeon X1800 CrossFire Edition (Secondary)
 	7140  RV515 [Radeon X1600]
-	7142  RV515 [Radeon X1300]
+	7142  RV515 PRO [Radeon X1300/X1550 Series]
 		1002 0322  All-in-Wonder 2006 PCI-E Edition
+	7143  RV505 [Radeon X1550 Series]
 	7145  Radeon Mobility X1400
 	7146  RV515 [Radeon X1300]
 		1002 0322  All-in-Wonder 2006 PCI-E Edition
-	7149  M52 [ATI Mobility Radeon X1300]
-	714a  M52 [ATI Mobility Radeon X1300]
-	714b  M52 [ATI Mobility Radeon X1300]
-	714c  M52 [ATI Mobility Radeon X1300]
+		1545 1996  Radeon X1300 512MB PCI-e
+	7147  RV505 [Radeon X1550 64-bit]
+	7149  M52 [Mobility Radeon X1300]
+	714a  M52 [Mobility Radeon X1300]
+	714b  M52 [Mobility Radeon X1300]
+	714c  M52 [Mobility Radeon X1300]
 	714d  RV515 [Radeon X1300]
-	714e  RV515 [Radeon X1300]
-	7152  RV515 GL ATI FireGL V3300 Primary
+	714e  RV515LE [Radeon X1300]
+	7152  RV515GL [FireGL V3300] (Primary)
+	7153  RV515GL [FireGL V3350]
 	715e  RV515 [Radeon X1300]
-	7162  RV515 [Radeon X1300] (Secondary)
+	715f  RV505 CE [Radeon X1550 64-bit]
+	7162  RV515 PRO [Radeon X1300/X1550 Series] (Secondary)
 		1002 0323  All-in-Wonder 2006 PCI-E Edition (Secondary)
 	7166  RV515 [Radeon X1300] (Secondary)
 		1002 0323  All-in-Wonder 2006 PCI-E Edition (Secondary)
-	7172  RV515 GL ATI FireGL V3300 Secondary
-	7180  RV516 Radeon X1300 Series Primary
-	7181  RV516 XT Radeon X1600 Series Primary
-	71a0  RV516 Radeon X1300 Series Secondary
-	71a1  RV516 XT Radeon X1600 Series Secondary
+		1545 1997  Radeon X1300 512MB PCI-e (Secondary)
+	716e  RV515LE [Radeon X1300] Secondary
+	7172  RV515GL [FireGL V3300] (Secondary)
+	7173  RV515GL [FireGL V3350] (Secondary)
+	7180  RV516 [Radeon X1300/X1550 Series]
+	7181  RV516 XT Radeon X1600 Series (Primary)
+	7183  RV516 [Radeon X1300/X1550 Series]
+	7186  RV515 [Radeon Mobility X1450]
+	7187  RV516 [Radeon X1300/X1550 Series]
+	7188  M64-S [Mobility Radeon X2300]
+	718a  Mobility Radeon X2300
+	718c  M62CSP64 [Mobility Radeon X1350]
+	718d  M64CSP128 [Mobility Radeon X1450]
+	7193  RV516 [Radeon X1550 Series]
+	719b  FireMV 2250
+	719f  RV516LE [Radeon X1550 64-bit]
+	71a0  RV516 [Radeon X1300/X1550 Series] (Secondary)
+	71a1  RV516 XT Radeon X1600 Series (Secondary)
+	71a3  RV516 [Radeon X1300 Pro] (Secondary)
+	71a7  RV516 [Radeon X1300/X1550 Series] (Secondary)
+	71bb  FireMV 2250 (Secondary)
 	71c0  RV530 [Radeon X1600]
 	71c2  RV530 [Radeon X1600]
-	71c4  M56GL [ATI Mobility FireGL V5200]
+	71c4  M56GL [Mobility FireGL V5200]
 		17aa 2007  ThinkPad T60p
 	71c5  M56P [Radeon Mobility X1600]
-	71c6  RV530LE [Radeon X1600]
+	71c6  RV530LE [Radeon X1600/X1650 PRO]
+	71c7  RV535 [Radeon X1650 Series]
 	71ce  RV530LE [Radeon X1600]
-	71d5  M66-P ATI Mobility Radeon X1700
-	71d6  M66-XT ATI Mobility Radeon X1700
+	71d4  M56GL [Mobility FireGL V5250]
+	71d5  M66-P [Mobility Radeon X1700]
+	71d6  M66-XT [Mobility Radeon X1700]
 	71de  RV530LE [Radeon X1600]
 	71e0  RV530 [Radeon X1600] (Secondary)
 	71e2  RV530 [Radeon X1600] (Secondary)
+	71e6  RV530LE [Radeon X1650 PRO] (Secondary)
+	71e7  RV535 [Radeon X1650 Series]
+	7210  M71 [Mobility Radeon X2100]
+	7211  M71 [Mobility Radeon X2100] (Secondary)
 	7240  R580 [Radeon X1900]
 	7241  R580 [Radeon X1900]
 	7242  R580 [Radeon X1900]
@@ -1095,18 +1279,37 @@
 	7246  R580 [Radeon X1900]
 	7247  R580 [Radeon X1900]
 	7248  R580 [Radeon X1900]
-	7249  R580 [Radeon X1900 XT] Primary
+	7249  R580 [Radeon X1900 XT] (Primary)
 	724a  R580 [Radeon X1900]
 	724b  R580 [Radeon X1900]
+		1002 0b12  Radeon X1900 (Primary)
+		1002 0b13  Radeon X1900 (Secondary)
 	724c  R580 [Radeon X1900]
 	724d  R580 [Radeon X1900]
-	724e  R580 [FireGL V7300/V7350] Primary (PCIE)
-	7269  R580 [Radeon X1900 XT] Secondary
-	726e  R580 [FireGL V7300/V7350] Secondary (PCIE)
+	724e  R580 [AMD Stream Processor]
+	7269  R580 [Radeon X1900 XT] (Secondary)
+	726b  R580 [Radeon X1900]
+	726e  R580 [AMD Stream Processor] (Secondary)
+	7280  RV570 [Radeon X1950 Pro]
+	7288  Radeon X1950 GT
+	7291  Radeon X1650 XT (Primary) (PCIE)
+	7293  Radeon X1650 Series
+	72a0  RV570 [Radeon X1950 Pro] (secondary)
+	72a8  Radeon X1950 GT (Secondary)
+	72b1  Radeon X1650 XT (Secondary) (PCIE)
+	72b3  Radeon X1650 Series (Secondary)
 	7833  Radeon 9100 IGP Host Bridge
 	7834  Radeon 9100 PRO IGP
 	7835  Radeon Mobility 9200 IGP
 	7838  Radeon 9100 IGP PCI/AGP Bridge
+	7910  RS690 Host Bridge
+	7912  RS690 PCI to PCI Bridge (Internal gfx)
+	7916  RS690 PCI to PCI Bridge (PCI Express Port 2)
+	7917  RS690 PCI to PCI Bridge (PCI Express Port 3)
+	7919  Radeon X1200 Series Audio Controller
+	791e  Radeon X1200 Series
+	791f  Radeon X1200 Series
+	793f  Radeon X1200 Series (Secondary)
 	7c37  RV350 AQ [Radeon 9600 SE]
 	cab0  AGP Bridge [IGP 320M]
 	cab2  RS200/RS200M AGP Bridge [IGP 340M]
@@ -1180,13 +1383,18 @@
 	0035  DP83065 [Saturn] 10/100/1000 Ethernet Controller
 	0500  SCx200 Bridge
 	0501  SCx200 SMI
-	0502  SCx200 IDE
-	0503  SCx200 Audio
+	0502  SCx200, SC1100 IDE controller
+		100b 0502  IDE Controller
+	0503  SCx200, SC1100 Audio Controller
+		100b 0503  XpressAudio controller
 	0504  SCx200 Video
 	0505  SCx200 XBus
 	0510  SC1100 Bridge
-	0511  SC1100 SMI
+		100b 0500  GPIO and LPC support bridge
+	0511  SC1100 SMI & ACPI
+		100b 0501  SC1100 SMI & ACPI bridge
 	0515  SC1100 XBus
+		100b 0505  SC1100 PCI to XBus bridge
 	d001  87410 IDE
 100c  Tseng Labs Inc
 	3202  ET4000/W32p rev A
@@ -1355,25 +1563,25 @@
 		14c0 000c  Crystal CS4281 PCI Audio
 1014  IBM
 	0002  PCI to MCA Bridge
-	0005  Alta Lite
-	0007  Alta MP
-	000a  Fire Coral
+	0005  Processor to I/O Controller [Alta Lite]
+	0007  Processor to I/O Controller [Alta MP]
+	000a  PCI to ISA Bridge (IBM27-82376) [Fire Coral]
 	0017  CPU to PCI Bridge
 	0018  TR Auto LANstreamer
 	001b  GXT-150P
 	001c  Carrera
-	001d  82G2675
+	001d  SCSI-2 FAST PCI Adapter (82G2675)
 	0020  GXT1000 Graphics Adapter
-	0022  IBM27-82351
-	002d  Python
+	0022  PCI to PCI Bridge (IBM27-82351)
+	002d  Processor to I/O Controller [Python]
 	002e  SCSI RAID Adapter [ServeRAID]
 		1014 002e  ServeRAID-3x
 		1014 022e  ServeRAID-4H
 	0031  2 Port Serial Adapter
 # AS400 iSeries PCI sync serial card
 		1014 0031  2721 WAN IOA - 2 Port Sync Serial Adapter
-	0036  Miami
-	0037  82660 CPU to PCI Bridge
+	0036  PCI to 32-bit LocalBus Bridge [Miami]
+	0037  PowerPC to PCI Bridge (IBM27-82660)
 	003a  CPU to PCI Bridge
 	003c  GXT250P/GXT255P Graphics Adapter
 	003e  16/4 Token ring UTP/STP controller
@@ -1413,7 +1621,7 @@
 	009f  PCI 4758 Cryptographic Accelerator
 	00a5  ATM Controller (1410a500)
 	00a6  ATM 155MBPS MM Controller (1410a600)
-	00b7  256-bit Graphics Rasterizer [Fire GL1]
+	00b7  256-bit Graphics Rasterizer [FireGL1]
 		1092 00b8  FireGL1 AGP 32Mb
 	00b8  GXT2000P Graphics Adapter
 	00be  ATM 622MBPS Controller (1410be00)
@@ -1447,6 +1655,9 @@
 		1014 0259  ServeRAID-5i
 	01c1  64bit/66MHz PCI ATM 155 UTP
 	01e6  Cryptographic Accelerator
+	01ef  PowerPC 440GP PCI Bridge
+		1734 102b  PCEAS PCI-X Dual Port ESCON Adapter
+		1734 10f8  PCEAT PCI-Express Dual Port ESCON Adapter
 	01ff  10/100 Mbps Ethernet
 	0219  Multiport Serial Adapter
 		1014 021a  Dual RVX
@@ -1467,9 +1678,14 @@
 	02bd  Obsidian chipset SCSI controller
 		1014 02c1  PCI-X DDR 3Gb SAS Adapter (572A/572C)
 		1014 02c2  PCI-X DDR 3Gb SAS RAID Adapter (572B/571D)
+		1014 0338  PCI-X DDR Auxiliary Cache Adapter (575C)
 	0302  Winnipeg PCI-X Host Bridge
 	0308  CalIOC2 PCI-E Root Port
 	0314  ZISC 036 Neural accelerator card
+	0339  Obsidian-E PCI-E SCSI controller
+		1014 030a  PCIe 3Gb SAS RAID Adapter (574E)
+		1014 033a  PCIe 3Gb SAS Adapter (57B3)
+		1014 0360  PCI-E Auxiliary Cache Adapter (57B7)
 	3022  QLA3022 Network Adapter
 	4022  QLA3022 Network Adapter
 	ffff  MPIC-2 interrupt controller
@@ -1481,6 +1697,10 @@
 1019  Elitegroup Computer Systems
 101a  AT&T GIS (NCR)
 	0005  100VG ethernet
+	1dc1  Bynet
+		101a 0019  BIC2M
+		101a 001f  BIC4M
+		101a 0ece  BYA4M
 101b  Vitesse Semiconductor
 101c  Western Digital
 	0193  33C193A
@@ -1527,6 +1747,16 @@
 	1101  K8 [Athlon64/Opteron] Address Map
 	1102  K8 [Athlon64/Opteron] DRAM Controller
 	1103  K8 [Athlon64/Opteron] Miscellaneous Control
+	1200  Family 10h [Opteron, Athlon64, Sempron] HyperTransport Configuration
+	1201  Family 10h [Opteron, Athlon64, Sempron] Address Map
+	1202  Family 10h [Opteron, Athlon64, Sempron] DRAM Controller
+	1203  Family 10h [Opteron, Athlon64, Sempron] Miscellaneous Control
+	1204  Family 10h [Opteron, Athlon64, Sempron] Link Control
+	1300  Family 11h HyperTransport Configuration
+	1301  Family 11h Address Map
+	1302  Family 11h DRAM Controller
+	1303  Family 11h Miscellaneous Control
+	1304  Family 11h Link Control
 	2000  79c970 [PCnet32 LANCE]
 		1014 2000  NetFinity 10/100 Fast Ethernet
 		1022 2000  PCnet - Fast 79C971
@@ -1556,6 +1786,7 @@
 	2003  Am 1771 MBW [Alchemy]
 	2020  53c974 [PCscsi]
 	2040  79c974
+	2080  CS5536 [Geode companion] Host Bridge
 	2081  Geode LX Video
 	2082  Geode LX AES Security Block
 	208f  CS5536 GeodeLink PCI South Bridge
@@ -1742,13 +1973,21 @@
 		1028 0001  PowerEdge 2400
 	0002  PowerEdge Expandable RAID Controller 3/Di
 		1028 0002  PowerEdge 4400
+		1028 00d1  PERC 3/DiV [Viper]
+		1028 00d9  PERC 3/DiL [Lexus]
 	0003  PowerEdge Expandable RAID Controller 3/Si
 		1028 0003  PowerEdge 2450
+# PowerEdge Codename Iguana
+	0004  PowerEdge Expandable RAID Controller 3/Di [Iguana]
+		1028 0004  PERC 3/DiF [Iguana]
 	0006  PowerEdge Expandable RAID Controller 3/Di
 	0007  Remote Access Card III
 	0008  Remote Access Card III
 	0009  Remote Access Card III: BMC/SMIC device not present
 	000a  PowerEdge Expandable RAID Controller 3/Di
+		1028 0106  PERC 3/DiJ [Jaguar]
+		1028 011b  PERC 3/DiD [Dagger]
+		1028 0121  PERC 3/DiB [Boxster]
 	000c  Embedded Remote Access or ERA/O
 	000d  Embedded Remote Access: BMC/SMIC device
 	000e  PowerEdge Expandable RAID controller 4/Di
@@ -1764,6 +2003,9 @@
 		1028 0170  PowerEdge Expandable RAID Controller 4e/Di
 	0014  Remote Access Card 4 Daughter Card SMIC interface
 	0015  PowerEdge Expandable RAID controller 5i
+		1028 1f01  PERC 5/E Adapter RAID Controller
+		1028 1f02  PERC 5/i Adapter RAID Controller
+		1028 1f03  PERC 5/i Adapter RAID Controller
 1029  Siemens Nixdorf IS
 102a  LSI Logic
 	0000  HYDRA
@@ -1919,6 +2161,7 @@
 	2538  Millenium P650 PCIe
 		102b 08c7  Millennium P650 PCIe 128MB
 		102b 0907  Millennium P650 PCIe 64MB
+		102b 0947  Parhelia APVe
 		102b 1047  Millennium P650 LP PCIe 128MB
 		102b 1087  Millennium P650 LP PCIe 64MB
 		102b 2538  Parhelia APVe
@@ -1964,6 +2207,7 @@
 		102f 00f8  ATM Meteor 155
 	0030  TC35815CF PCI 10/100 Mbit Ethernet Controller
 	0031  TC35815CF PCI 10/100 Mbit Ethernet Controller with WOL
+	0032  TC35815CF PCI 10/100 Mbit Ethernet Controller on TX4939
 	0105  TC86C001 [goku-s] IDE
 	0106  TC86C001 [goku-s] USB 1.1 Host
 	0107  TC86C001 [goku-s] USB Device Controller
@@ -2060,6 +2304,7 @@
 	0180  RAID bus controller 180 SATA/PATA  [SiS]
 	0181  SATA
 	0182  182 SATA/RAID Controller
+		1734 1095  D2030-A1
 	0186  AHCI Controller (0106)
 	0190  190 Gigabit Ethernet Adapter
 	0191  191 Gigabit Ethernet Adapter
@@ -2093,6 +2338,7 @@
 	0660  660 Host
 	0661  661FX/M661FX/M661MX Host
 	0662  662 Host
+	0671  671MX
 	0730  730 Host
 	0733  733 Host
 	0735  735 Host
@@ -2103,10 +2349,12 @@
 	0755  755 Host
 	0760  760/M760 Host
 	0761  761/M761 Host
+		1734 1099  D2030-A1 Motherboard
 	0900  SiS900 PCI Fast Ethernet
 		1019 0a14  K7S5A motherboard
 		1039 0900  SiS900 10/100 Ethernet Adapter
 		1043 8035  CUSI-FX motherboard
+		1462 0900  MS-6701 motherboard
 	0961  SiS961 [MuTIOL Media IO]
 	0962  SiS962 [MuTIOL Media IO]
 	0963  SiS963 [MuTIOL Media IO]
@@ -2129,6 +2377,8 @@
 		1019 0970  P6STP-FL motherboard
 		1039 5513  SiS5513 EIDE Controller (A,B step)
 		1043 8035  CUSI-FX motherboard
+		1462 7010  MS-6701 motherboard
+		1734 1095  D2030-A1 Motherboard
 	5517  5517
 	5571  5571
 	5581  5581 Pentium Chipset
@@ -2155,17 +2405,27 @@
 		1569 6326  SiS6326 GUI Accelerator
 	6330  661/741/760 PCI/AGP or 662/761Gx PCIE VGA Display Adapter
 		1039 6330  [M]661xX/[M]741[GX]/[M]760 PCI/AGP VGA Adapter
+		1043 8113  SiS Real 256E (ASUS P5S800-VM motherboard)
+		1458 d000  SiS661FX GUI 2D/3D Accelerator
+		1734 1099  D2030-A1
 	6350  770/670 PCIE VGA Display Adapter
 	6351  771/671 PCIE VGA Display Adapter
 	7001  USB 1.0 Controller
 		1019 0a14  K7S5A motherboard
 		1039 7000  Onboard USB Controller
 		1462 5470  K7SOM+ 5.2C Motherboard
+		1462 7010  MS-6701 motherboard
+		1734 1095  D2030-A1 Motherboard
 	7002  USB 2.0 Controller
+		1462 7010  MS-6701 motherboard
 		1509 7002  Onboard USB Controller
+		1734 1095  D2030-A1
 	7007  FireWire Controller
+		1462 701d  MS-6701
 	7012  AC'97 Sound Controller
+		1462 7010  MS-6701 motherboard
 		15bd 1001  DFI 661FX motherboard
+		1734 109f  D2030-A1 Motherboard
 # There are may be different modem codecs here (Intel537 compatible and incompatible)
 	7013  AC'97 Modem Controller
 	7016  SiS7016 PCI Fast Ethernet Adapter
@@ -2177,6 +2437,7 @@
 		1025 000e  SiS PCI Audio Accelerator
 		1025 0018  SiS PCI Audio Accelerator
 		1039 7018  SiS PCI Audio Accelerator
+		1043 1453  SiS PCI Audio Accelerator
 		1043 800b  SiS PCI Audio Accelerator
 		1054 7018  SiS PCI Audio Accelerator
 		107d 5330  SiS PCI Audio Accelerator
@@ -2252,13 +2513,29 @@
 	12ee  PCI-X 2.0 Local Bus Adapter
 	12f8  Broadcom BCM4306 802.11b/g Wireless LAN
 	12fa  BCM4306 802.11b/g Wireless LAN Controller
+	1302  RMP-3 Shared Memory Driver
+	1303  RMP-3 (Remote Management Processor)
+	1361  BCM4312 802.11a/b/g WLAN Controller
 	2910  E2910A PCIBus Exerciser

[... truncated: 4770 lines follow ...]


From korli at mail.berlios.de  Wed Aug 15 13:57:36 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Wed, 15 Aug 2007 13:57:36 +0200
Subject: [Haiku-commits] r21964 - haiku/trunk/src/apps/tv
Message-ID: <200708151157.l7FBvaSA011487@sheep.berlios.de>

Author: korli
Date: 2007-08-15 13:57:36 +0200 (Wed, 15 Aug 2007)
New Revision: 21964
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21964&view=rev

Modified:
   haiku/trunk/src/apps/tv/VideoNode.cpp
Log:
fix warning


Modified: haiku/trunk/src/apps/tv/VideoNode.cpp
===================================================================
--- haiku/trunk/src/apps/tv/VideoNode.cpp	2007-08-15 11:33:31 UTC (rev 21963)
+++ haiku/trunk/src/apps/tv/VideoNode.cpp	2007-08-15 11:57:36 UTC (rev 21964)
@@ -429,7 +429,7 @@
 		printf("VideoNode::CreateBuffers failed\n");
 		return B_ERROR;
 	}
-	printf("overlay bitmap: got: bytes per row: %d\n", fBitmap->BytesPerRow());
+	printf("overlay bitmap: got: bytes per row: %ld\n", fBitmap->BytesPerRow());
 	fOverlayActive = overlay;
 	UnlockBitmap();
 	printf("VideoNode::CreateBuffers success\n");



From stippi at mail.berlios.de  Wed Aug 15 20:52:51 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 15 Aug 2007 20:52:51 +0200
Subject: [Haiku-commits] r21965 - in haiku/trunk/headers/private/kernel: .
	disk_device_manager
Message-ID: <200708151852.l7FIqpM3000566@sheep.berlios.de>

Author: stippi
Date: 2007-08-15 20:52:50 +0200 (Wed, 15 Aug 2007)
New Revision: 21965
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21965&view=rev

Modified:
   haiku/trunk/headers/private/kernel/disk_device_manager/ddm_userland_interface.h
   haiku/trunk/headers/private/kernel/syscalls.h
Log:
* fixed libbe_test build, I guess this was caused by Ingo's recent change
  to the header path variable?


Modified: haiku/trunk/headers/private/kernel/disk_device_manager/ddm_userland_interface.h
===================================================================
--- haiku/trunk/headers/private/kernel/disk_device_manager/ddm_userland_interface.h	2007-08-15 11:57:36 UTC (rev 21964)
+++ haiku/trunk/headers/private/kernel/disk_device_manager/ddm_userland_interface.h	2007-08-15 18:52:50 UTC (rev 21965)
@@ -5,7 +5,7 @@
 
 #include <OS.h>
 
-#include <storage/DiskDeviceDefs.h>
+#include <DiskDeviceDefs.h>
 
 #include <disk_device_manager.h>
 

Modified: haiku/trunk/headers/private/kernel/syscalls.h
===================================================================
--- haiku/trunk/headers/private/kernel/syscalls.h	2007-08-15 11:57:36 UTC (rev 21964)
+++ haiku/trunk/headers/private/kernel/syscalls.h	2007-08-15 18:52:50 UTC (rev 21965)
@@ -9,7 +9,7 @@
 #include <arch_config.h>
 #include <image.h>
 #include <OS.h>
-#include <storage/DiskDeviceDefs.h>
+#include <DiskDeviceDefs.h>
 
 #include <signal.h>
 



From stippi at mail.berlios.de  Wed Aug 15 21:06:12 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 15 Aug 2007 21:06:12 +0200
Subject: [Haiku-commits] r21966 - haiku/trunk/src/servers/app/drawing
Message-ID: <200708151906.l7FJ6CoP001615@sheep.berlios.de>

Author: stippi
Date: 2007-08-15 21:06:11 +0200 (Wed, 15 Aug 2007)
New Revision: 21966
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21966&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/HWInterface.cpp
Log:
* it should be better to lock before accessing the data, even if reading only
* after this change, I have not spotted "left behind" cursors again, but it
  might just be bad luck...


Modified: haiku/trunk/src/servers/app/drawing/HWInterface.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/HWInterface.cpp	2007-08-15 18:52:50 UTC (rev 21965)
+++ haiku/trunk/src/servers/app/drawing/HWInterface.cpp	2007-08-15 19:06:11 UTC (rev 21966)
@@ -382,18 +382,20 @@
 bool
 HWInterface::HideSoftwareCursor(const BRect& area)
 {
+	if (!fSoftwareCursorLock.Lock())
+		return false;
 	if (fCursorAreaBackup && !fCursorAreaBackup->cursor_hidden) {
 		BRect backupArea(fCursorAreaBackup->left,
 						 fCursorAreaBackup->top,
 						 fCursorAreaBackup->right,
 						 fCursorAreaBackup->bottom);
 		if (area.Intersects(backupArea)) {
-			fSoftwareCursorLock.Lock();
 			_RestoreCursorArea();
 			// do not unlock the cursor lock
 			return true;
 		}
 	}
+	fSoftwareCursorLock.Unlock();
 	return false;
 }
 



From stippi at mail.berlios.de  Wed Aug 15 22:38:30 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 15 Aug 2007 22:38:30 +0200
Subject: [Haiku-commits] r21967 - haiku/trunk/src/kits/interface
Message-ID: <200708152038.l7FKcUSv007435@sheep.berlios.de>

Author: stippi
Date: 2007-08-15 22:38:29 +0200 (Wed, 15 Aug 2007)
New Revision: 21967
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21967&view=rev

Modified:
   haiku/trunk/src/kits/interface/BMCPrivate.cpp
   haiku/trunk/src/kits/interface/MenuBar.cpp
   haiku/trunk/src/kits/interface/MenuItem.cpp
   haiku/trunk/src/kits/interface/SeparatorItem.cpp
Log:
* setting a different menu color with the menu preflet gives now visually
  agreeable results (I hope)


Modified: haiku/trunk/src/kits/interface/BMCPrivate.cpp
===================================================================
--- haiku/trunk/src/kits/interface/BMCPrivate.cpp	2007-08-15 19:06:11 UTC (rev 21966)
+++ haiku/trunk/src/kits/interface/BMCPrivate.cpp	2007-08-15 20:38:29 UTC (rev 21967)
@@ -146,7 +146,7 @@
 	bounds.bottom += 1.0;
 
 	// prepare some colors
-	rgb_color normalNoTint = ui_color(B_MENU_BACKGROUND_COLOR);
+	rgb_color normalNoTint = LowColor();
 	rgb_color noTint = tint_color(normalNoTint, 0.74);
 	rgb_color darken4;
 	rgb_color normalDarken4;

Modified: haiku/trunk/src/kits/interface/MenuBar.cpp
===================================================================
--- haiku/trunk/src/kits/interface/MenuBar.cpp	2007-08-15 19:06:11 UTC (rev 21966)
+++ haiku/trunk/src/kits/interface/MenuBar.cpp	2007-08-15 20:38:29 UTC (rev 21967)
@@ -152,15 +152,17 @@
 	// Restore the background of the previously selected menuitem
 	DrawBackground(bounds & updateRect);
 
-	SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), B_LIGHTEN_2_TINT));
+	rgb_color noTint = LowColor();
+
+	SetHighColor(tint_color(noTint, B_LIGHTEN_2_TINT));
 	StrokeLine(BPoint(0.0f, bounds.bottom - 2.0f), BPoint(0.0f, 0.0f));
 	StrokeLine(BPoint(bounds.right, 0.0f));
 
-	SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), B_DARKEN_1_TINT));
+	SetHighColor(tint_color(noTint, B_DARKEN_1_TINT));
 	StrokeLine(BPoint(1.0f, bounds.bottom - 1.0f),
 		BPoint(bounds.right, bounds.bottom - 1.0f));
 
-	SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), B_DARKEN_2_TINT));
+	SetHighColor(tint_color(noTint, B_DARKEN_2_TINT));
 	StrokeLine(BPoint(0.0f, bounds.bottom), BPoint(bounds.right, bounds.bottom));
 	StrokeLine(BPoint(bounds.right, 0.0f), BPoint(bounds.right, bounds.bottom));
 

Modified: haiku/trunk/src/kits/interface/MenuItem.cpp
===================================================================
--- haiku/trunk/src/kits/interface/MenuItem.cpp	2007-08-15 19:06:11 UTC (rev 21966)
+++ haiku/trunk/src/kits/interface/MenuItem.cpp	2007-08-15 20:38:29 UTC (rev 21967)
@@ -442,12 +442,17 @@
 	bool enabled = IsEnabled();
 	bool selected = IsSelected();
 
-	rgb_color noTint = ui_color(B_MENU_BACKGROUND_COLOR);
+//	rgb_color noTint = ui_color(B_MENU_BACKGROUND_COLOR);
+// TODO: the above is currently broken, because ui_color is
+// not informed of changes to the app_server palette yet
+	rgb_color noTint = fSuper->LowColor();
 	rgb_color bgColor = noTint;
 
 	// set low color and fill background if selected
 	if (selected && (enabled || Submenu()) /*&& fSuper->fRedrawAfterSticky*/) {
-		bgColor = ui_color(B_MENU_SELECTED_BACKGROUND_COLOR);
+//		bgColor = ui_color(B_MENU_SELECTED_BACKGROUND_COLOR);
+// see above
+		bgColor = tint_color(bgColor, B_DARKEN_3_TINT);
 		fSuper->SetLowColor(bgColor);
 		fSuper->FillRect(Frame(), B_SOLID_LOW);
 	} else
@@ -478,6 +483,8 @@
 		if (Submenu())
 			_DrawSubmenuSymbol(bgColor);
 	}
+
+	fSuper->SetLowColor(noTint);
 }
 
 
@@ -699,7 +706,7 @@
 	BFont font;
 	menu->GetFont(&font);
 	BPoint where = ContentLocation();
-	where.x = fBounds.right - font.Size();	
+	where.x = fBounds.right - font.Size();
 	if (menu->fSubmenus)
 		where.x -= fBounds.Height() - 4;
 

Modified: haiku/trunk/src/kits/interface/SeparatorItem.cpp
===================================================================
--- haiku/trunk/src/kits/interface/SeparatorItem.cpp	2007-08-15 19:06:11 UTC (rev 21966)
+++ haiku/trunk/src/kits/interface/SeparatorItem.cpp	2007-08-15 20:38:29 UTC (rev 21967)
@@ -12,6 +12,7 @@
 
 
 #include <SeparatorItem.h>
+#include <Font.h>
 
 
 BSeparatorItem::BSeparatorItem()
@@ -61,10 +62,14 @@
 BSeparatorItem::GetContentSize(float* _width, float* _height)
 {
 	if (_width != NULL)
-		*_width = 2.0f;
+		*_width = 2.0;
 
-	if (_height != NULL)
-		*_height = 8.0f;
+	if (_height != NULL) {
+		BFont font(be_plain_font);
+		if (Menu())
+			Menu()->GetFont(&font);
+		*_height = floorf(font.Size() * 0.8);
+	}
 }
 
 
@@ -77,11 +82,14 @@
 
 	BRect bounds = Frame();
 	rgb_color oldColor = menu->HighColor();
+	rgb_color lowColor = menu->LowColor();
 
-	menu->SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), B_DARKEN_1_TINT));
-	menu->StrokeLine(BPoint(bounds.left + 1.0f, bounds.top + 4.0f), BPoint(bounds.right - 1.0f, bounds.top + 4.0f));
-	menu->SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), B_LIGHTEN_2_TINT));
-	menu->StrokeLine(BPoint(bounds.left + 1.0f, bounds.top + 5.0f), BPoint(bounds.right - 1.0f, bounds.top + 5.0f));
+	menu->SetHighColor(tint_color(lowColor, B_DARKEN_1_TINT));
+	menu->StrokeLine(BPoint(bounds.left + 1.0f, bounds.top + 4.0f),
+		BPoint(bounds.right - 1.0f, bounds.top + 4.0f));
+	menu->SetHighColor(tint_color(lowColor, B_LIGHTEN_2_TINT));
+	menu->StrokeLine(BPoint(bounds.left + 1.0f, bounds.top + 5.0f),
+		BPoint(bounds.right - 1.0f, bounds.top + 5.0f));
 
 	menu->SetHighColor(oldColor);
 }



From marcusoverhagen at mail.berlios.de  Wed Aug 15 23:19:07 2007
From: marcusoverhagen at mail.berlios.de (marcusoverhagen at BerliOS)
Date: Wed, 15 Aug 2007 23:19:07 +0200
Subject: [Haiku-commits] r21968 - in haiku/trunk: build/jam
	src/add-ons/kernel/busses/ide src/add-ons/kernel/busses/scsi
	src/add-ons/kernel/busses/scsi/ahci
Message-ID: <200708152119.l7FLJ75l009930@sheep.berlios.de>

Author: marcusoverhagen
Date: 2007-08-15 23:19:06 +0200 (Wed, 15 Aug 2007)
New Revision: 21968
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21968&view=rev

Added:
   haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/
   haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/Jamfile
   haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci.h
   haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.c
Removed:
   haiku/trunk/src/add-ons/kernel/busses/ide/ahci/
Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/src/add-ons/kernel/busses/ide/Jamfile
   haiku/trunk/src/add-ons/kernel/busses/scsi/Jamfile
Log:
remove ide/ahci and put reuseable stuff into scsi/ahci


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2007-08-15 20:38:29 UTC (rev 21967)
+++ haiku/trunk/build/jam/HaikuImage	2007-08-15 21:19:06 UTC (rev 21968)
@@ -129,7 +129,7 @@
 AddFilesToHaikuImage beos system add-ons kernel bus_managers
 	: $(BEOS_ADD_ONS_BUS_MANAGERS) ;
 AddFilesToHaikuImage beos system add-ons kernel busses ide
-	: ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata ;
+	: generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata ;
 AddFilesToHaikuImage beos system add-ons kernel busses usb
 	: <usb>uhci <usb>ohci <usb>ehci ;
 AddFilesToHaikuImage beos system add-ons kernel console : vga_text ;
@@ -346,7 +346,7 @@
 AddBootModuleSymlinksToHaikuImage config_manager bfs block_io fast_log
 	generic_ide_pci $(X86_ONLY)isa ide ide_adapter $(X86_ONLY)ide_isa intel
 	locked_pool $(PPC_ONLY)openpic pci scsi scsi_cd scsi_dsk scsi_periph
-	ahci silicon_image_3112 legacy_sata
+	silicon_image_3112 legacy_sata
 ;
 
 # add-ons

Modified: haiku/trunk/src/add-ons/kernel/busses/ide/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/ide/Jamfile	2007-08-15 20:38:29 UTC (rev 21967)
+++ haiku/trunk/src/add-ons/kernel/busses/ide/Jamfile	2007-08-15 21:19:06 UTC (rev 21968)
@@ -1,6 +1,5 @@
 SubDir HAIKU_TOP src add-ons kernel busses ide ;
 
-SubInclude HAIKU_TOP src add-ons kernel busses ide ahci ;
 SubInclude HAIKU_TOP src add-ons kernel busses ide generic_ide_pci ;
 SubInclude HAIKU_TOP src add-ons kernel busses ide ide_isa ;
 SubInclude HAIKU_TOP src add-ons kernel busses ide promise_tx2 ;

Modified: haiku/trunk/src/add-ons/kernel/busses/scsi/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/scsi/Jamfile	2007-08-15 20:38:29 UTC (rev 21967)
+++ haiku/trunk/src/add-ons/kernel/busses/scsi/Jamfile	2007-08-15 21:19:06 UTC (rev 21968)
@@ -1,5 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel busses scsi ; 
 
+SubInclude HAIKU_TOP src add-ons kernel busses scsi 53c8xx ;
+# SubInclude HAIKU_TOP src add-ons kernel busses scsi ahci ;
+SubInclude HAIKU_TOP src add-ons kernel busses scsi buslogic ;
 SubInclude HAIKU_TOP src add-ons kernel busses scsi usb ;
-SubInclude HAIKU_TOP src add-ons kernel busses scsi buslogic ;
-SubInclude HAIKU_TOP src add-ons kernel busses scsi 53c8xx ;

Added: haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/Jamfile	2007-08-15 20:38:29 UTC (rev 21967)
+++ haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/Jamfile	2007-08-15 21:19:06 UTC (rev 21968)
@@ -0,0 +1,5 @@
+SubDir HAIKU_TOP src add-ons kernel busses scsi ahci ;
+
+KernelAddon ahci_scsi :
+	ahci_sim.c
+;

Copied: haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci.h (from rev 21966, haiku/trunk/src/add-ons/kernel/busses/ide/ahci/ahci.h)
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/ide/ahci/ahci.h	2007-08-15 19:06:11 UTC (rev 21966)
+++ haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci.h	2007-08-15 21:19:06 UTC (rev 21968)
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2007, Marcus Overhagen. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+#ifndef _AHCI_H
+#define _AHCI_H
+
+typedef struct
+{
+	uint32		clb;			// Command List Base Address
+	uint32		clbu;			// Command List Base Address Upper 32-Bits
+	uint32		fb;				// FIS Base Address
+	uint32		fbu;			// FIS Base Address Upper 32-Bits
+	uint32		is;				// Interrupt Status
+	uint32		ie;				// Interrupt Enable
+	uint32		cmd;			// Command and Status
+	uint32 		res1;			// Reserved
+	uint32		tfd;			// Task File Data
+	uint32		sig;			// Signature
+	uint32		ssts;			// Serial ATA Status (SCR0: SStatus)
+	uint32		sctl;			// Serial ATA Control (SCR2: SControl)
+	uint32		serr;			// Serial ATA Error (SCR1: SError)
+	uint32		sact;			// Serial ATA Active (SCR3: SActive)
+	uint32		ci;				// Command Issue
+	uint32		sntf;			// SNotification
+	uint32		res2;			// Reserved for FIS-based Switching Definition
+	uint32		res[11];		// Reserved
+	uint32		vendor[2];		// Vendor Specific
+} ahci_port;
+
+
+typedef struct
+{
+	uint32		cap;			// Host Capabilities
+	uint32		ghc;			// Global Host Control
+	uint32		is;				// Interrupt Status
+	uint32		pi;				// Ports Implemented
+	uint32		vs;				// Version
+	uint32		ccc_ctl;		// Command Completion Coalescing Control
+	uint32		ccc_ports;		// Command Completion Coalsecing Ports
+	uint32		em_loc;			// Enclosure Management Location
+	uint32		em_ctl;			// Enclosure Management Control
+	uint32		res[31];		// Reserved
+	uint32		vendor[24];		// Vendor Specific registers
+	ahci_port	port[32];
+} ahci_hba;
+
+#endif

Added: haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.c	2007-08-15 20:38:29 UTC (rev 21967)
+++ haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.c	2007-08-15 21:19:06 UTC (rev 21968)
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2007, Marcus Overhagen. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+#define TRACE(a...) dprintf("ahci: " a)
+#define FLOW(a...)	dprintf("ahci: " a)
+
+#if 0
+	uint16 vendor_id;
+	uint16 device_id;
+	uint8 base_class;
+	uint8 sub_class;
+	uint8 class_api;
+	status_t res;
+
+	if (base_class != PCI_mass_storage || sub_class != PCI_sata || class_api != PCI_sata_ahci)
+		return 0.0f;
+
+	TRACE("controller found! vendor 0x%04x, device 0x%04x\n", vendor_id, device_id);
+	
+	res = pci->find_pci_capability(device, PCI_cap_id_sata, &cap_ofs);
+	if (res == B_OK) {
+		uint32 satacr0;
+		uint32 satacr1;
+		TRACE("PCI SATA capability found at offset 0x%x\n", cap_ofs);
+		satacr0 = pci->read_pci_config(device, cap_ofs, 4);
+		satacr1 = pci->read_pci_config(device, cap_ofs + 4, 4);
+		TRACE("satacr0 = 0x%08x, satacr1 = 0x%08x\n", satacr0, satacr1);
+	}
+#endif



From marcusoverhagen at mail.berlios.de  Wed Aug 15 23:56:44 2007
From: marcusoverhagen at mail.berlios.de (marcusoverhagen at BerliOS)
Date: Wed, 15 Aug 2007 23:56:44 +0200
Subject: [Haiku-commits] r21969 - haiku/trunk/src/add-ons/kernel/busses/scsi
Message-ID: <200708152156.l7FLuib9012412@sheep.berlios.de>

Author: marcusoverhagen
Date: 2007-08-15 23:56:44 +0200 (Wed, 15 Aug 2007)
New Revision: 21969
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21969&view=rev

Removed:
   haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/
Modified:
   haiku/trunk/src/add-ons/kernel/busses/scsi/Jamfile
Log:
purged


Modified: haiku/trunk/src/add-ons/kernel/busses/scsi/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/scsi/Jamfile	2007-08-15 21:19:06 UTC (rev 21968)
+++ haiku/trunk/src/add-ons/kernel/busses/scsi/Jamfile	2007-08-15 21:56:44 UTC (rev 21969)
@@ -1,6 +1,5 @@
 SubDir HAIKU_TOP src add-ons kernel busses scsi ; 
 
 SubInclude HAIKU_TOP src add-ons kernel busses scsi 53c8xx ;
-# SubInclude HAIKU_TOP src add-ons kernel busses scsi ahci ;
 SubInclude HAIKU_TOP src add-ons kernel busses scsi buslogic ;
 SubInclude HAIKU_TOP src add-ons kernel busses scsi usb ;



From stippi at mail.berlios.de  Wed Aug 15 23:57:41 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 15 Aug 2007 23:57:41 +0200
Subject: [Haiku-commits] r21970 - haiku/trunk/src/preferences/network
Message-ID: <200708152157.l7FLvfA4012476@sheep.berlios.de>

Author: stippi
Date: 2007-08-15 23:57:41 +0200 (Wed, 15 Aug 2007)
New Revision: 21970
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21970&view=rev

Added:
   haiku/trunk/src/preferences/network/settings.cpp
   haiku/trunk/src/preferences/network/settings.h
Modified:
   haiku/trunk/src/preferences/network/EthernetSettingsView.cpp
   haiku/trunk/src/preferences/network/EthernetSettingsView.h
   haiku/trunk/src/preferences/network/Jamfile
Log:
patch by Andre Garzia:
* extracted a settings class from the view, now a dynamic number of ethernet
  devices is handled at the same time
* resolv.conf is parsed to extract the nameservers


Modified: haiku/trunk/src/preferences/network/EthernetSettingsView.cpp
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsView.cpp	2007-08-15 21:56:44 UTC (rev 21969)
+++ haiku/trunk/src/preferences/network/EthernetSettingsView.cpp	2007-08-15 21:57:41 UTC (rev 21970)
@@ -10,6 +10,7 @@
  */
 
 #include "EthernetSettingsView.h"
+#include "settings.h"
 
 #include <Application.h>
 #include <Alert.h>
@@ -64,8 +65,7 @@
 }
 
 void
-EthernetSettingsView::_GatherInterfaces()
-{
+EthernetSettingsView::_GatherInterfaces() {
 	// iterate over all interfaces and retrieve minimal status
 
 	ifconf config;
@@ -94,6 +94,7 @@
 		if (strncmp(interface->ifr_name, "loop", 4) && interface->ifr_name[0])
 		{
 			fInterfaces.AddItem(new BString(interface->ifr_name));
+			fSettings.AddItem(new Settings(interface->ifr_name));
 			
 		}
 
@@ -130,6 +131,7 @@
 	
 	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 	
+	fSettings.MakeEmpty();
 	fSocket = socket(AF_INET, SOCK_DGRAM, 0);
 	_GatherInterfaces();
 	
@@ -236,123 +238,37 @@
  	const char* name;
 	if (message->FindString("interface", &name) != B_OK)
 		return;
-
-	ifreq request;
-	if (!_PrepareRequest(request, name))
-		return;
-
-	BString text = "dummy";
-	char address[32];
-	sockaddr_in* inetAddress = NULL;
 	
-	// Obtain IP.	
-	if (ioctl(fSocket, SIOCGIFADDR, &request,
-			sizeof(request)) < 0) {
-		return;
-	}
-
-	inetAddress = (sockaddr_in*)&request.ifr_addr;
-	if (inet_ntop(AF_INET, &inetAddress->sin_addr, address,
-				sizeof(address)) == NULL) {
+	int i;
+	for (i=0; i<fSettings.CountItems();i++) {
+		if (strcmp(fSettings.ItemAt(i)->GetName(), name) == 0) {
+			fIPTextControl->SetText(fSettings.ItemAt(i)->GetIP());
+			fGatewayTextControl->SetText(fSettings.ItemAt(i)->GetGateway());
+			fNetMaskTextControl->SetText(fSettings.ItemAt(i)->GetNetmask());
+			
+			
+			
+			if (fSettings.ItemAt(i)->fNameservers.CountItems() == 2) {
+				fSecondaryDNSTextControl->SetText(
+					fSettings.ItemAt(i)->fNameservers.ItemAt(1)->String());
+			} 
+			
+			if (fSettings.ItemAt(i)->fNameservers.CountItems() >= 1) {
+				fPrimaryDNSTextControl->SetText(
+						fSettings.ItemAt(i)->fNameservers.ItemAt(0)->String());
+			}
+		} else {
 			return;
 		}
-		
-	fIPTextControl->SetText(address);
-	
-	// Obtain netmask.
-	if (ioctl(fSocket, SIOCGIFNETMASK, &request,
-			sizeof(request)) < 0) {
-		return;
 	}
 	
-	inetAddress = (sockaddr_in*)&request.ifr_mask;
-	if (inet_ntop(AF_INET, &inetAddress->sin_addr, address,
-				sizeof(address)) == NULL) {
-			return;
-		}
-		
-	fNetMaskTextControl->SetText(address);
 	
-	// Obtain gateway
-	
-	char* gwAddress;
-	ifconf config;
-	config.ifc_len = sizeof(config.ifc_value);
-	if (ioctl(fSocket, SIOCGRTSIZE, &config, sizeof(struct ifconf)) < 0)
-		return;
-		
-	uint32 size = (uint32)config.ifc_value;
-	if (size == 0)
-		return;
-	
-	void *buffer = malloc(size);
-	if (buffer == NULL)
-		return;
-	
-	config.ifc_len = size;
-	config.ifc_buf = buffer;
-	
-	if (ioctl(fSocket, SIOCGRTTABLE, &config, sizeof(struct ifconf)) < 0) {
-		free(buffer);
-		return;
-	}
-		
-	ifreq *interface = (ifreq *)buffer;
-	ifreq *end = (ifreq *)((uint8 *)buffer + size);
-	
-	
-	while (interface < end) {
-		route_entry& route = interface->ifr_route;
-	
-		
-		if (route.flags & RTF_GATEWAY) {
-			inetAddress = (sockaddr_in *)route.gateway;
-					
-			
-			gwAddress = inet_ntoa(inetAddress->sin_addr);
-			fGatewayTextControl->SetText(gwAddress);
-		}
-		
-		int32 addressSize = 0;
-		if (route.destination != NULL)
-			addressSize += route.destination->sa_len;
-		if (route.mask != NULL)
-			addressSize += route.mask->sa_len;
-		if (route.gateway != NULL)
-			addressSize += route.gateway->sa_len;
-			
-		interface = (ifreq *)((addr_t)interface + 
-			IF_NAMESIZE + sizeof(route_entry) + addressSize);
-	
-	}
-	
-	free(buffer);
-	
 	// Obtain DNS
 	
-	//resolv.conf is always actual.
-	BFile file;
-	BString* line;
-	int i = 0;
-	char* ch = "0";
 	
-	if (file.SetTo("/etc/resolv.conf", B_READ_ONLY) != B_OK)
-		return;
-		
-	off_t length;
 	
-	file.GetSize(&length);
+
 	
-	/* 
-	The idea here is to iterate over resolv.conf
-	and look for the nameservers.
-	
-	Both netserver and DHCPClient will write to resolv.conf
-	so we can trust that the information on the file is actual.
-	
-	I need help with this routine :$
-	*/
-	
 
 	
 }

Modified: haiku/trunk/src/preferences/network/EthernetSettingsView.h
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsView.h	2007-08-15 21:56:44 UTC (rev 21969)
+++ haiku/trunk/src/preferences/network/EthernetSettingsView.h	2007-08-15 21:57:41 UTC (rev 21970)
@@ -11,6 +11,7 @@
 #ifndef ETHERNET_SETTINGS_VIEW_H
 #define ETHERNET_SETTINGS_VIEW_H
 
+#include "settings.h"
 #include <ObjectList.h>
 #include <View.h>
 
@@ -46,6 +47,8 @@
 		BTextControl* fPrimaryDNSTextControl;
 		BTextControl* fSecondaryDNSTextControl;
 		BObjectList<BString> fInterfaces;
+		BObjectList<Settings> fSettings;
+
 		int32	fStatus;
 		int		fSocket;
 		void	_GatherInterfaces();

Modified: haiku/trunk/src/preferences/network/Jamfile
===================================================================
--- haiku/trunk/src/preferences/network/Jamfile	2007-08-15 21:56:44 UTC (rev 21969)
+++ haiku/trunk/src/preferences/network/Jamfile	2007-08-15 21:57:41 UTC (rev 21970)
@@ -6,9 +6,10 @@
 
 Preference Network :
 	EthernetSettingsWindow.cpp
+	settings.cpp
 	EthernetSettingsView.cpp
 	EthernetSettings.cpp
-	: be root $(TARGET_NETWORK_LIBS)
+	: be root $(HAIKU_NETWORK_LIBS)
 	;
 
 Package haiku-networksettings :

Added: haiku/trunk/src/preferences/network/settings.cpp
===================================================================
--- haiku/trunk/src/preferences/network/settings.cpp	2007-08-15 21:56:44 UTC (rev 21969)
+++ haiku/trunk/src/preferences/network/settings.cpp	2007-08-15 21:57:41 UTC (rev 21970)
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2004-2007 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Author:
+ *		Andre Alves Garzia, andre at andregarzia.com
+ */
+ 
+#include "settings.h"
+
+#include <String.h>
+#include <File.h>
+#include <Path.h>
+ 
+#include <SupportDefs.h>
+#include <AutoDeleter.h>
+
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+Settings::Settings(const char *name)
+{
+	fSocket = socket(AF_INET, SOCK_DGRAM, 0);
+	fName = name;
+	ReadConfiguration();	
+}
+
+Settings::~Settings()
+{
+	close(fSocket);
+	
+}
+
+bool
+Settings::_PrepareRequest(struct ifreq& request)
+{
+	//This function is used for talking direct to the stack. 
+	//It?s used by _ShowConfiguration.
+	
+	const char* name = fName.String();
+	
+	if (strlen(name) > IF_NAMESIZE)
+		return false;
+
+	strcpy(request.ifr_name, name);
+	return true;
+}
+
+
+void
+Settings::ReadConfiguration() 
+{
+	
+	ifreq request;
+	if (!_PrepareRequest(request))
+		return;
+		
+	BString text = "dummy";
+	char address[32];
+	sockaddr_in* inetAddress = NULL;
+	
+	// Obtain IP.	
+	if (ioctl(fSocket, SIOCGIFADDR, &request,
+			sizeof(request)) < 0) {
+		return;
+	}
+
+	inetAddress = (sockaddr_in*)&request.ifr_addr;
+	if (inet_ntop(AF_INET, &inetAddress->sin_addr, address,
+				sizeof(address)) == NULL) {
+			return;
+		}
+		
+	fIP = address;
+	
+	// Obtain netmask.
+	if (ioctl(fSocket, SIOCGIFNETMASK, &request,
+			sizeof(request)) < 0) {
+		return;
+	}
+	
+	inetAddress = (sockaddr_in*)&request.ifr_mask;
+	if (inet_ntop(AF_INET, &inetAddress->sin_addr, address,
+				sizeof(address)) == NULL) {
+			return;
+		}
+		
+	fNetmask = address;
+	
+	// Obtain gateway
+	
+	char* gwAddress;
+	ifconf config;
+	config.ifc_len = sizeof(config.ifc_value);
+	if (ioctl(fSocket, SIOCGRTSIZE, &config, sizeof(struct ifconf)) < 0)
+		return;
+		
+	uint32 size = (uint32)config.ifc_value;
+	if (size == 0)
+		return;
+	
+	void *buffer = malloc(size);
+	if (buffer == NULL)
+		return;
+	
+	MemoryDeleter bufferDeleter(buffer);
+	config.ifc_len = size;
+	config.ifc_buf = buffer;
+	
+	if (ioctl(fSocket, SIOCGRTTABLE, &config, sizeof(struct ifconf)) < 0)
+		return;
+		
+	ifreq *interface = (ifreq *)buffer;
+	ifreq *end = (ifreq *)((uint8 *)buffer + size);
+	
+	
+	while (interface < end) {
+		route_entry& route = interface->ifr_route;
+	
+		
+		if (route.flags & RTF_GATEWAY) {
+			inetAddress = (sockaddr_in *)route.gateway;
+					
+			
+			gwAddress = inet_ntoa(inetAddress->sin_addr);
+			fGateway = gwAddress;
+		}
+		
+		int32 addressSize = 0;
+		if (route.destination != NULL)
+			addressSize += route.destination->sa_len;
+		if (route.mask != NULL)
+			addressSize += route.mask->sa_len;
+		if (route.gateway != NULL)
+			addressSize += route.gateway->sa_len;
+			
+		interface = (ifreq *)((addr_t)interface + 
+			IF_NAMESIZE + sizeof(route_entry) + addressSize);
+	
+	}
+	
+	bufferDeleter.Detach();
+	free(buffer);	
+	
+	// Now that silly DNS problem...
+	fNameservers.MakeEmpty();
+
+#define	MATCH(line, name) \
+	(!strncmp(line, name, sizeof(name) - 1) && \
+	(line[sizeof(name) - 1] == ' ' || \
+	 line[sizeof(name) - 1] == '\t'))
+
+		
+	int nserv = 0;
+	char buf[1024];
+	register FILE *fp;
+	register char *cp, **pp;
+	register int n;
+	int MAXNS = 2;
+	
+	if ((fp = fopen("/etc/resolv.conf", "r")) != NULL) {
+	    /* read the config file */
+	    while (fgets(buf, sizeof(buf), fp) != NULL) {
+			/* skip comments */
+			if (*buf == ';' || *buf == '#')
+				continue;
+			
+		    /* read nameservers to query */
+			if (MATCH(buf, "nameserver") && nserv < MAXNS) {
+				char sbuf[2];
+
+				cp = buf + sizeof("nameserver") - 1;
+				while (*cp == ' ' || *cp == '\t')
+					cp++;
+				cp[strcspn(cp, ";# \t\n")] = '\0';
+				if ((*cp != '\0') && (*cp != '\n')) {
+					fNameservers.AddItem(new BString(cp));
+					nserv++;
+				}
+			}
+			continue;
+		}
+		fclose(fp);
+	}
+}

Added: haiku/trunk/src/preferences/network/settings.h
===================================================================
--- haiku/trunk/src/preferences/network/settings.h	2007-08-15 21:56:44 UTC (rev 21969)
+++ haiku/trunk/src/preferences/network/settings.h	2007-08-15 21:57:41 UTC (rev 21970)
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2004-2007 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Author:
+ *		Andre Alves Garzia, andre at andregarzia.com
+ */
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include <ObjectList.h>
+#include <String.h>
+
+class Settings {
+	public:
+		Settings(const char* name);
+		virtual ~Settings();
+
+		void SetName(BString name);
+		void SetIP(BString ip);
+		void SetGateway(BString ip);
+		void SetNetmask(BString ip);
+		void SetAutoConfigure(bool t);
+		
+		const char* GetIP()  {return fIP.String(); }
+		const char* GetGateway()  {return fGateway.String(); }		
+		const char* GetNetmask()  {return fNetmask.String(); }
+		const char* GetName()  {return fName.String(); }
+		bool GetAutoConfigure() const {return fAuto; }
+		BObjectList<BString> fNameservers;
+
+		void SaveProfile(BString profileName);
+		void LoadProfile(BString profileName);
+		void SaveConfiguration();
+		void ReadConfiguration();
+		
+	private:
+		bool _PrepareRequest(struct ifreq& request);
+		BString fIP;
+		BString fGateway;
+		BString fNetmask;
+		BString fName;
+		int fSocket;
+		bool fAuto;
+};
+
+#endif /* SETTINGS_H */



From axeld at mail.berlios.de  Thu Aug 16 01:11:17 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 16 Aug 2007 01:11:17 +0200
Subject: [Haiku-commits] r21971 - haiku/trunk/src/system/kernel/vm
Message-ID: <200708152311.l7FNBHou030617@sheep.berlios.de>

Author: axeld
Date: 2007-08-16 01:11:15 +0200 (Thu, 16 Aug 2007)
New Revision: 21971
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21971&view=rev

Modified:
   haiku/trunk/src/system/kernel/vm/vm.cpp
   haiku/trunk/src/system/kernel/vm/vm_cache.cpp
Log:
* vm_soft_fault() no longer sets all pages it touches to "active"; instead, it now honours
  if the page was already in the "modified" list before. Also, the source page (which is
  either mapped directly or copied to the target page) is no longer marked busy before its
  final destiny is decided (it didn't have any effect, anyway, since we had its cache
  locked for the whole time, but it now preserves the modified state). This fixes bug #1369.
* vm_cache_write_modified() now filters out temporary caches (it's currently called on area
  deletion).


Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-15 21:57:41 UTC (rev 21970)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-15 23:11:15 UTC (rev 21971)
@@ -2389,7 +2389,9 @@
 
 	map->ops->unlock(map);
 
-	vm_page_set_state(page, PAGE_STATE_ACTIVE);
+	if (page->state != PAGE_STATE_MODIFIED)
+		vm_page_set_state(page, PAGE_STATE_ACTIVE);
+
 	return B_OK;
 }
 
@@ -3570,13 +3572,7 @@
 		for (;;) {
 			page = vm_cache_lookup_page(cache, cacheOffset);
 			if (page != NULL && page->state != PAGE_STATE_BUSY) {
-				// Note: We set the page state to busy, but we don't need a
-				// condition variable here, since we keep the cache locked
-				// till we mark the page unbusy again (in fault_get_page()
-				// the source page, or in vm_soft_fault() when mapping the
-				// page), so no one will ever know the page was busy in the
-				// first place.
-				vm_page_set_state(page, PAGE_STATE_BUSY);
+				// we found the page
 				break;
 			}
 			if (page == NULL || page == &dummyPage)
@@ -3861,7 +3857,8 @@
 		map->ops->put_physical_page((addr_t)source);
 		map->ops->put_physical_page((addr_t)dest);
 
-		vm_page_set_state(sourcePage, PAGE_STATE_ACTIVE);
+		if (sourcePage->state != PAGE_STATE_MODIFIED)
+			vm_page_set_state(sourcePage, PAGE_STATE_ACTIVE);
 
 		mutex_unlock(&cache->lock);
 		mutex_lock(&topCache->lock);

Modified: haiku/trunk/src/system/kernel/vm/vm_cache.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm_cache.cpp	2007-08-15 21:57:41 UTC (rev 21970)
+++ haiku/trunk/src/system/kernel/vm/vm_cache.cpp	2007-08-15 23:11:15 UTC (rev 21971)
@@ -362,6 +362,9 @@
 
 	TRACE(("vm_cache_write_modified(cache = %p)\n", cache));
 
+	if (cache->temporary)
+		return B_OK;
+
 	mutex_lock(&cache->lock);
 	status = vm_page_write_modified(cache, fsReenter);
 	mutex_unlock(&cache->lock);



From jackburton at mail.berlios.de  Thu Aug 16 11:14:04 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Thu, 16 Aug 2007 11:14:04 +0200
Subject: [Haiku-commits] r21972 - in haiku/trunk: headers/private/interface
	src/kits/interface src/servers/app
Message-ID: <200708160914.l7G9E42n018254@sheep.berlios.de>

Author: jackburton
Date: 2007-08-16 11:14:03 +0200 (Thu, 16 Aug 2007)
New Revision: 21972
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21972&view=rev

Modified:
   haiku/trunk/headers/private/interface/PictureProtocol.h
   haiku/trunk/src/kits/interface/PictureDataWriter.cpp
   haiku/trunk/src/kits/interface/PicturePlayer.cpp
   haiku/trunk/src/servers/app/ServerPicture.cpp
Log:
Added some debug output to PicturePlayer. Since checking the table size for every op is very slow, now we do that only at the beginning, and use a custom op table if needed. The best case (which is the one used when drawing a picture with BView::DrawPicture()) is very fast since it only requires one check.

Modified: haiku/trunk/headers/private/interface/PictureProtocol.h
===================================================================
--- haiku/trunk/headers/private/interface/PictureProtocol.h	2007-08-15 23:11:15 UTC (rev 21971)
+++ haiku/trunk/headers/private/interface/PictureProtocol.h	2007-08-16 09:14:03 UTC (rev 21972)
@@ -53,5 +53,9 @@
 	B_PIC_SET_FONT_FACE		= 0x0389,
 };
 
+
+const static uint32 kOpsTableSize = 48;
+
+
 #endif
 

Modified: haiku/trunk/src/kits/interface/PictureDataWriter.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PictureDataWriter.cpp	2007-08-15 23:11:15 UTC (rev 21971)
+++ haiku/trunk/src/kits/interface/PictureDataWriter.cpp	2007-08-16 09:14:03 UTC (rev 21972)
@@ -172,15 +172,17 @@
 		const int32 numRects = region.CountRects();
 		if (numRects > 0 && region.Frame().IsValid()) {	
 			BeginOp(B_PIC_SET_CLIPPING_RECTS);
-			Write<int32>(numRects);
-			for (int32 i = 0; i < numRects; i++)
+			Write<uint32>(numRects); 
+			for (int32 i = 0; i < numRects; i++) {
 				Write<BRect>(region.RectAt(i));			
+			}			
 			EndOp();
 		} else
 			WriteClearClipping();
 	} catch (status_t &status) {
 		return status;
 	}
+
 	return B_OK;
 }
 

Modified: haiku/trunk/src/kits/interface/PicturePlayer.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-15 23:11:15 UTC (rev 21971)
+++ haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-16 09:14:03 UTC (rev 21972)
@@ -4,11 +4,11 @@
  *
  * Authors:
  *		Marc Flerackers (mflerackers at androme.be)
- *		Stefano Ceccherini (burton666 at libero.it)
+ *		Stefano Ceccherini (stefano.ceccherini at gmail.com)
  *		Marcus Overhagen (marcus at overhagen.de)
  */
 
-/**	PicturePlayer is used to create and play picture data. */
+/**	PicturePlayer is used to play picture data. */
 
 #include <stdio.h>
 
@@ -17,6 +17,8 @@
 
 #include <Shape.h>
 
+#define DEBUG 3
+
 typedef void (*fnc)(void*);
 typedef void (*fnc_BPoint)(void*, BPoint);
 typedef void (*fnc_BPointBPoint)(void*, BPoint, BPoint);
@@ -42,6 +44,127 @@
 typedef void (*fnc_BShape)(void*, BShape*);
 
 
+static void
+nop()
+{
+}
+
+
+static void *
+kDummyTable[kOpsTableSize] = {
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop,
+	nop
+};
+
+
+#if DEBUG
+static const char *
+PictureOpToString(int op)
+{
+	#define RETURN_STRING(x) case x: return #x
+
+	switch(op) {
+		RETURN_STRING(B_PIC_MOVE_PEN_BY);
+		RETURN_STRING(B_PIC_STROKE_LINE);
+		RETURN_STRING(B_PIC_STROKE_RECT);
+		RETURN_STRING(B_PIC_FILL_RECT);
+		RETURN_STRING(B_PIC_STROKE_ROUND_RECT);
+		RETURN_STRING(B_PIC_FILL_ROUND_RECT);
+		RETURN_STRING(B_PIC_STROKE_BEZIER);
+		RETURN_STRING(B_PIC_FILL_BEZIER);
+		RETURN_STRING(B_PIC_STROKE_POLYGON);
+		RETURN_STRING(B_PIC_FILL_POLYGON);
+		RETURN_STRING(B_PIC_STROKE_SHAPE);
+		RETURN_STRING(B_PIC_FILL_SHAPE);
+		RETURN_STRING(B_PIC_DRAW_STRING);
+		RETURN_STRING(B_PIC_DRAW_PIXELS);
+		RETURN_STRING(B_PIC_DRAW_PICTURE);
+		RETURN_STRING(B_PIC_STROKE_ARC);
+		RETURN_STRING(B_PIC_FILL_ARC);
+		RETURN_STRING(B_PIC_STROKE_ELLIPSE);
+		RETURN_STRING(B_PIC_FILL_ELLIPSE);
+
+		RETURN_STRING(B_PIC_ENTER_STATE_CHANGE);
+		RETURN_STRING(B_PIC_SET_CLIPPING_RECTS);
+		RETURN_STRING(B_PIC_CLIP_TO_PICTURE);
+		RETURN_STRING(B_PIC_PUSH_STATE);
+		RETURN_STRING(B_PIC_POP_STATE);
+		RETURN_STRING(B_PIC_CLEAR_CLIPPING_RECTS);
+
+		RETURN_STRING(B_PIC_SET_ORIGIN);
+		RETURN_STRING(B_PIC_SET_PEN_LOCATION);
+		RETURN_STRING(B_PIC_SET_DRAWING_MODE);
+		RETURN_STRING(B_PIC_SET_LINE_MODE);
+		RETURN_STRING(B_PIC_SET_PEN_SIZE);
+		RETURN_STRING(B_PIC_SET_SCALE);
+		RETURN_STRING(B_PIC_SET_FORE_COLOR);
+		RETURN_STRING(B_PIC_SET_BACK_COLOR);
+		RETURN_STRING(B_PIC_SET_STIPLE_PATTERN);
+		RETURN_STRING(B_PIC_ENTER_FONT_STATE);
+		RETURN_STRING(B_PIC_SET_BLENDING_MODE);
+		RETURN_STRING(B_PIC_SET_FONT_FAMILY);
+		RETURN_STRING(B_PIC_SET_FONT_STYLE);
+		RETURN_STRING(B_PIC_SET_FONT_SPACING);
+		RETURN_STRING(B_PIC_SET_FONT_ENCODING);
+		RETURN_STRING(B_PIC_SET_FONT_FLAGS);
+		RETURN_STRING(B_PIC_SET_FONT_SIZE);
+		RETURN_STRING(B_PIC_SET_FONT_ROTATE);
+		RETURN_STRING(B_PIC_SET_FONT_SHEAR);
+		RETURN_STRING(B_PIC_SET_FONT_BPP);
+		RETURN_STRING(B_PIC_SET_FONT_FACE);
+		default: return "Unknown op";	
+	}
+	#undef RETURN_STRING
+}
+#endif
+
+
 PicturePlayer::PicturePlayer(const void *data, size_t size, BList *pictures)
 	:	fData(data),
 		fSize(size),
@@ -62,6 +185,22 @@
 	// check the tableEntries to see if the table is big enough.
 	// If an application supplies the wrong size or an invalid pointer,
 	// it's its own fault.
+#if DEBUG
+	FILE *file = fopen("/var/log/PicturePlayer.log", "a");
+	fprintf(file, "Start rendering BPicture...\n");
+	bigtime_t startTime = system_time();
+	int32 numOps = 0;
+#endif
+	// If the caller supplied a function table smaller than needed,
+	// we use our dummy table, and copy the supported ops from the supplied one.
+	void **functionTable = callBackTable;
+	if ((uint32)tableEntries < kOpsTableSize) {
+#if DEBUG
+		fprintf(file, "A smaller than needed function table was supplied.\n");
+#endif
+		functionTable = kDummyTable;
+		memcpy(functionTable, callBackTable, (kOpsTableSize - tableEntries) * sizeof(void *));		
+	}
 
 	const char *data = reinterpret_cast<const char *>(fData);
 	size_t pos = 0;
@@ -78,21 +217,21 @@
 		if (pos + size > fSize)
 			debugger("PicturePlayer::Play: buffer overrun\n");
 
+#if DEBUG > 1
+		bigtime_t startOpTime = system_time();
+		fprintf(file, "Op %s ", PictureOpToString(op));
+#endif
 		switch (op) {
 			case B_PIC_MOVE_PEN_BY:
 			{
-				if (tableEntries <= 1)
-					break;
-				((fnc_BPoint)callBackTable[1])(userData,
+				((fnc_BPoint)functionTable[1])(userData,
 					*reinterpret_cast<const BPoint *>(data)); /* where */
 				break;
 			}
 
 			case B_PIC_STROKE_LINE:
 			{
-				if (tableEntries <= 2)
-					break;
-				((fnc_BPointBPoint)callBackTable[2])(userData, 
+				((fnc_BPointBPoint)functionTable[2])(userData, 
 					*reinterpret_cast<const BPoint *>(data), /* start */
 					*reinterpret_cast<const BPoint *>(data + sizeof(BPoint))); /* end */
 				break;
@@ -100,27 +239,21 @@
 
 			case B_PIC_STROKE_RECT:
 			{
-				if (tableEntries <= 3)
-					break;
-				((fnc_BRect)callBackTable[3])(userData,
+				((fnc_BRect)functionTable[3])(userData,
 					*reinterpret_cast<const BRect *>(data)); /* rect */
 				break;
 			}
 
 			case B_PIC_FILL_RECT:
 			{
-				if (tableEntries <= 4)
-					break;
-				((fnc_BRect)callBackTable[4])(userData,
+				((fnc_BRect)functionTable[4])(userData,
 					*reinterpret_cast<const BRect *>(data)); /* rect */
 				break;
 			}
 
 			case B_PIC_STROKE_ROUND_RECT:
 			{
-				if (tableEntries <= 5)
-					break;
-				((fnc_BRectBPoint)callBackTable[5])(userData,
+				((fnc_BRectBPoint)functionTable[5])(userData,
 					*reinterpret_cast<const BRect *>(data), /* rect */
 					*reinterpret_cast<const BPoint *>(data + sizeof(BRect))); /* radii */
 				break;
@@ -128,9 +261,7 @@
 
 			case B_PIC_FILL_ROUND_RECT:
 			{
-				if (tableEntries <= 6)
-					break;
-				((fnc_BRectBPoint)callBackTable[6])(userData,
+				((fnc_BRectBPoint)functionTable[6])(userData,
 					*reinterpret_cast<const BRect *>(data), /* rect */
 					*reinterpret_cast<const BPoint *>(data + sizeof(BRect))); /* radii */
 				break;
@@ -138,27 +269,21 @@
 
 			case B_PIC_STROKE_BEZIER:
 			{
-				if (tableEntries <= 7)
-					break;
-				((fnc_PBPoint)callBackTable[7])(userData,
+				((fnc_PBPoint)functionTable[7])(userData,
 					reinterpret_cast<const BPoint *>(data));
 				break;
 			}
 
 			case B_PIC_FILL_BEZIER:
 			{
-				if (tableEntries <= 8)
-					break;
-				((fnc_PBPoint)callBackTable[8])(userData,
+				((fnc_PBPoint)functionTable[8])(userData,
 					reinterpret_cast<const BPoint *>(data));
 				break;
 			}
 
 			case B_PIC_STROKE_ARC:
 			{
-				if (tableEntries <= 9)
-					break;
-				((fnc_BPointBPointff)callBackTable[9])(userData, 
+				((fnc_BPointBPointff)functionTable[9])(userData, 
 					*reinterpret_cast<const BPoint *>(data), /* center */
 					*reinterpret_cast<const BPoint *>(data + sizeof(BPoint)), /* radii */
 					*reinterpret_cast<const float *>(data + 2 * sizeof(BPoint)), /* startTheta */
@@ -168,9 +293,7 @@
 
 			case B_PIC_FILL_ARC:
 			{
-				if (tableEntries <= 10)
-					break;
-				((fnc_BPointBPointff)callBackTable[10])(userData,
+				((fnc_BPointBPointff)functionTable[10])(userData,
 					*reinterpret_cast<const BPoint *>(data), /* center */
 					*reinterpret_cast<const BPoint *>(data + sizeof(BPoint)), /* radii */
 					*reinterpret_cast<const float *>(data + 2 * sizeof(BPoint)), /* startTheta */
@@ -180,32 +303,26 @@
 
 			case B_PIC_STROKE_ELLIPSE:
 			{
-				if (tableEntries <= 11)
-					break;
 				const BRect *rect = reinterpret_cast<const BRect *>(data);
 				BPoint radii((rect->Width() + 1) / 2.0f, (rect->Height() + 1) / 2.0f);
 				BPoint center = rect->LeftTop() + radii;
-				((fnc_BPointBPoint)callBackTable[11])(userData, center, radii);
+				((fnc_BPointBPoint)functionTable[11])(userData, center, radii);
 				break;
 			}
 
 			case B_PIC_FILL_ELLIPSE:
 			{
-				if (tableEntries <= 12)
-					break;
 				const BRect *rect = reinterpret_cast<const BRect *>(data);
 				BPoint radii((rect->Width() + 1) / 2.0f, (rect->Height() + 1) / 2.0f);
 				BPoint center = rect->LeftTop() + radii;
-				((fnc_BPointBPoint)callBackTable[12])(userData, center, radii);
+				((fnc_BPointBPoint)functionTable[12])(userData, center, radii);
 				break;
 			}
 
 			case B_PIC_STROKE_POLYGON:
 			{
-				if (tableEntries <= 13)
-					break;
 				int32 numPoints = *reinterpret_cast<const int32 *>(data);
-				((fnc_iPBPointb)callBackTable[13])(userData, 
+				((fnc_iPBPointb)functionTable[13])(userData, 
 					numPoints,
 					reinterpret_cast<const BPoint *>(data + sizeof(int32)), /* points */
 					*reinterpret_cast<const uint8 *>(data + sizeof(int32) + numPoints * sizeof(BPoint))); /* is-closed */
@@ -214,9 +331,7 @@
 
 			case B_PIC_FILL_POLYGON:
 			{
-				if (tableEntries <= 14)
-					break;
-				((fnc_iPBPoint)callBackTable[14])(userData, 
+				((fnc_iPBPoint)functionTable[14])(userData, 
 					*reinterpret_cast<const int32 *>(data), /* numPoints */
 					reinterpret_cast<const BPoint *>(data + sizeof(int32))); /* points */
 				break;
@@ -226,9 +341,6 @@
 			case B_PIC_FILL_SHAPE:
 			{
 				const bool stroke = (op == B_PIC_STROKE_SHAPE);							
-				if (tableEntries <= 16 || (stroke && tableEntries <= 15))
-					break;
-
 				int32 opCount = *reinterpret_cast<const int32 *>(data);
 				int32 ptCount = *reinterpret_cast<const int32 *>(data + sizeof(int32));
 				const uint32 *opList = reinterpret_cast<const uint32 *>(data + 2 * sizeof(int32));
@@ -239,15 +351,13 @@
 				shape.SetData(opCount, ptCount, opList, ptList);
 
 				const int32 tableIndex = stroke ? 15 : 16;
-				((fnc_BShape)callBackTable[tableIndex])(userData, &shape);
+				((fnc_BShape)functionTable[tableIndex])(userData, &shape);
 				break;
 			}
 			
 			case B_PIC_DRAW_STRING:
 			{
-				if (tableEntries <= 17)
-					break;
-				((fnc_Pcff)callBackTable[17])(userData, 
+				((fnc_Pcff)functionTable[17])(userData, 
 					reinterpret_cast<const char *>(data + 2 * sizeof(float)), /* string */
 					*reinterpret_cast<const float *>(data), /* escapement.space */
 					*reinterpret_cast<const float *>(data + sizeof(float))); /* escapement.nonspace */
@@ -256,9 +366,7 @@
 
 			case B_PIC_DRAW_PIXELS:
 			{
-				if (tableEntries <= 18)
-					break;
-				((fnc_DrawPixels)callBackTable[18])(userData,
+				((fnc_DrawPixels)functionTable[18])(userData,
 					*reinterpret_cast<const BRect *>(data), /* src */
 					*reinterpret_cast<const BRect *>(data + 1 * sizeof(BRect)), /* dst */
 					*reinterpret_cast<const int32 *>(data + 2 * sizeof(BRect)), /* width */
@@ -272,9 +380,7 @@
 
 			case B_PIC_DRAW_PICTURE:
 			{
-				if (tableEntries <= 19)
-					break;
-				((fnc_DrawPicture)callBackTable[19])(userData,
+				((fnc_DrawPicture)functionTable[19])(userData,
 					*reinterpret_cast<const BPoint *>(data),
 					*reinterpret_cast<const int32 *>(data + sizeof(BPoint)));
 				break;
@@ -282,10 +388,8 @@
 			
 			case B_PIC_SET_CLIPPING_RECTS:
 			{
-				if (tableEntries <= 20)
-					break;			
 				// TODO: Not sure if it's compatible with R5's BPicture version
-				((fnc_PBRecti)callBackTable[20])(userData,
+				((fnc_PBRecti)functionTable[20])(userData,
 					reinterpret_cast<const BRect *>(data + sizeof(uint32)),
 					*reinterpret_cast<const uint32 *>(data));
 				break;
@@ -293,84 +397,66 @@
 
 			case B_PIC_CLEAR_CLIPPING_RECTS:
 			{
-				if (tableEntries <= 20)
-					break;		
-				((fnc_PBRecti)callBackTable[20])(userData, NULL, 0);
+				((fnc_PBRecti)functionTable[20])(userData, NULL, 0);
 				break;
 			}
 
 			case B_PIC_CLIP_TO_PICTURE:
 			{
-				if (tableEntries <= 21)
-					break;
 				// TODO: Implement
 				break;
 			}
 
 			case B_PIC_PUSH_STATE:
 			{
-				if (tableEntries <= 22)
-					break;
-				((fnc)callBackTable[22])(userData);
+				((fnc)functionTable[22])(userData);
 				break;
 			}
 
 			case B_PIC_POP_STATE:
 			{
-				if (tableEntries <= 23)
-					break;
-				((fnc)callBackTable[23])(userData);
+				((fnc)functionTable[23])(userData);
 				break;
 			}
 
 			case B_PIC_ENTER_STATE_CHANGE:
 			{
-				if (tableEntries > 24)
-					((fnc)callBackTable[24])(userData);
+				((fnc)functionTable[24])(userData);
 				stateBlockSize = size;
 				break;
 			}
 
 			case B_PIC_ENTER_FONT_STATE:
 			{
-				if (tableEntries > 26)
-					((fnc)callBackTable[26])(userData);
+				((fnc)functionTable[26])(userData);
 				fontStateBlockSize = size;				
 				break;
 			}
 
 			case B_PIC_SET_ORIGIN:
 			{
-				if (tableEntries <= 28)
-					break;
-				((fnc_BPoint)callBackTable[28])(userData,
+				((fnc_BPoint)functionTable[28])(userData,
 					*reinterpret_cast<const BPoint *>(data)); /* origin */
 				break;
 			}
 
 			case B_PIC_SET_PEN_LOCATION:
 			{
-				if (tableEntries <= 29)
-					break;
-				((fnc_BPoint)callBackTable[29])(userData,
+				((fnc_BPoint)functionTable[29])(userData,
 					*reinterpret_cast<const BPoint *>(data)); /* location */
 				break;
 			}
 
 			case B_PIC_SET_DRAWING_MODE:
 			{
-				if (tableEntries <= 30)
-					break;
-				((fnc_s)callBackTable[30])(userData,
+				((fnc_s)functionTable[30])(userData,
 					*reinterpret_cast<const int16 *>(data)); /* mode */
 				break;
 			}
 
 			case B_PIC_SET_LINE_MODE:
 			{
-				if (tableEntries <= 31)
-					break;
-				((fnc_ssf)callBackTable[31])(userData,
+				((fnc_ssf)functionTable[31])(userData,
 					*reinterpret_cast<const int16 *>(data), /* cap-mode */
 					*reinterpret_cast<const int16 *>(data + 1 * sizeof(int16)), /* join-mode */
 					*reinterpret_cast<const float *>(data + 2 * sizeof(int16))); /* miter-limit */
@@ -379,135 +465,105 @@
 
 			case B_PIC_SET_PEN_SIZE:
 			{
-				if (tableEntries <= 32)
-					break;
-				((fnc_f)callBackTable[32])(userData,
+				((fnc_f)functionTable[32])(userData,
 					*reinterpret_cast<const float *>(data)); /* size */
 				break;
 			}
 
 			case B_PIC_SET_FORE_COLOR:
 			{			
-				if (tableEntries <= 33)
-					break;
-				((fnc_Color)callBackTable[33])(userData,
+				((fnc_Color)functionTable[33])(userData,
 					*reinterpret_cast<const rgb_color *>(data)); /* color */
 				break;
 			}
 
 			case B_PIC_SET_BACK_COLOR:
 			{		
-				if (tableEntries <= 34)
-					break;	
-				((fnc_Color)callBackTable[34])(userData,
+				((fnc_Color)functionTable[34])(userData,
 					*reinterpret_cast<const rgb_color *>(data)); /* color */
 				break;
 			}
 
 			case B_PIC_SET_STIPLE_PATTERN:
 			{
-				if (tableEntries <= 35)
-					break;
-				((fnc_Pattern)callBackTable[35])(userData,
+				((fnc_Pattern)functionTable[35])(userData,
 					*reinterpret_cast<const pattern *>(data)); /* pattern */
 				break;
 			}
 
 			case B_PIC_SET_SCALE:
 			{
-				if (tableEntries <= 36)
-					break;
-				((fnc_f)callBackTable[36])(userData,
+				((fnc_f)functionTable[36])(userData,
 					*reinterpret_cast<const float *>(data)); /* scale */
 				break;
 			}
 
 			case B_PIC_SET_FONT_FAMILY:
 			{
-				if (tableEntries <= 37)
-					break;
-				((fnc_Pc)callBackTable[37])(userData,
+				((fnc_Pc)functionTable[37])(userData,
 					reinterpret_cast<const char *>(data)); /* string */
 				break;
 			}
 
 			case B_PIC_SET_FONT_STYLE:
 			{
-				if (tableEntries <= 38)
-					break;
-				((fnc_Pc)callBackTable[38])(userData,
+				((fnc_Pc)functionTable[38])(userData,
 					reinterpret_cast<const char *>(data)); /* string */
 				break;
 			}
 
 			case B_PIC_SET_FONT_SPACING:
 			{
-				if (tableEntries <= 39)
-					break;
-				((fnc_i)callBackTable[39])(userData,
+				((fnc_i)functionTable[39])(userData,
 					*reinterpret_cast<const int32 *>(data)); /* spacing */
 				break;
 			}
 
 			case B_PIC_SET_FONT_SIZE:
 			{
-				if (tableEntries <= 40)
-					break;
-				((fnc_f)callBackTable[40])(userData,
+				((fnc_f)functionTable[40])(userData,
 					*reinterpret_cast<const float *>(data)); /* size */
 				break;
 			}
 
 			case B_PIC_SET_FONT_ROTATE:
 			{
-				if (tableEntries <= 41)
-					break;
-				((fnc_f)callBackTable[41])(userData,
+				((fnc_f)functionTable[41])(userData,
 					*reinterpret_cast<const float *>(data)); /* rotation */
 				break;
 			}
 
 			case B_PIC_SET_FONT_ENCODING:
 			{
-				if (tableEntries <= 42)
-					break;
-				((fnc_i)callBackTable[42])(userData,
+				((fnc_i)functionTable[42])(userData,
 					*reinterpret_cast<const int32 *>(data)); /* encoding */
 				break;
 			}
 
 			case B_PIC_SET_FONT_FLAGS:
 			{
-				if (tableEntries <= 43)
-					break;
-				((fnc_i)callBackTable[43])(userData,
+				((fnc_i)functionTable[43])(userData,
 					*reinterpret_cast<const int32 *>(data)); /* flags */
 				break;
 			}
 			
 			case B_PIC_SET_FONT_SHEAR:
 			{
-				if (tableEntries <= 44)
-					break;
-				((fnc_f)callBackTable[44])(userData,
+				((fnc_f)functionTable[44])(userData,
 					*reinterpret_cast<const float *>(data)); /* shear */
 				break;
 			}
 
 			case B_PIC_SET_FONT_FACE:
 			{
-				if (tableEntries <= 46)
-					break;
-				((fnc_i)callBackTable[46])(userData,
+				((fnc_i)functionTable[46])(userData,
 					*reinterpret_cast<const int32 *>(data)); /* flags */
 				break;
 			}
 
 			case B_PIC_SET_BLENDING_MODE:
 			{
-				if (tableEntries <= 47)
-					break;
-				((fnc_ss)callBackTable[47])(userData,
+				((fnc_ss)functionTable[47])(userData,
 					*reinterpret_cast<const int16 *>(data), /* alphaSrcMode */
 					*reinterpret_cast<const int16 *>(data + sizeof(int16))); /* alphaFncMode */
 				break;
@@ -530,20 +586,27 @@
 		
 		// call the exit_state_change hook if needed
 		if (stateBlockSize == 0) {
-			if (tableEntries > 25)
-				((fnc)callBackTable[25])(userData);
+			((fnc)functionTable[25])(userData);
 			stateBlockSize = -1;		
 		}
 		
 		// call the exit_font_state hook if needed
 		if (fontStateBlockSize == 0) {
-			if (tableEntries > 27)
-				((fnc)callBackTable[27])(userData);
+			((fnc)functionTable[27])(userData);
 			fontStateBlockSize = -1;		
 		}
-		
+#if DEBUG
+		numOps++;
+#if DEBUG > 1
+		fprintf(file, "executed in %lld usecs\n", system_time() - startOpTime);
+#endif
+#endif		
 		// TODO: what if too much was read, should we return B_ERROR?
 	}
 
+#if DEBUG
+	fprintf(file, "Done! %ld ops, rendering completed in %lld usecs.\n", numOps, system_time() - startTime);
+	fclose(file);
+#endif
 	return B_OK;
 }

Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-15 23:11:15 UTC (rev 21971)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-16 09:14:03 UTC (rev 21972)
@@ -671,7 +671,7 @@
 }
 
 
-const void *tableEntries[] = {
+const static void *kTableEntries[] = {
 	(const void *)nop,
 	(const void *)move_pen_by,
 	(const void *)stroke_line,
@@ -909,7 +909,7 @@
 		return;
 
 	PicturePlayer player(mallocIO->Buffer(), mallocIO->BufferLength(), fPictures);
-	player.Play(const_cast<void **>(tableEntries), sizeof(tableEntries) / sizeof(void *), view);
+	player.Play(const_cast<void **>(kTableEntries), sizeof(kTableEntries) / sizeof(void *), view);
 }
 
 



From jackburton at mail.berlios.de  Thu Aug 16 11:14:51 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Thu, 16 Aug 2007 11:14:51 +0200
Subject: [Haiku-commits] r21973 - haiku/trunk/src/kits/interface
Message-ID: <200708160914.l7G9Epcv018345@sheep.berlios.de>

Author: jackburton
Date: 2007-08-16 11:14:50 +0200 (Thu, 16 Aug 2007)
New Revision: 21973
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21973&view=rev

Modified:
   haiku/trunk/src/kits/interface/PicturePlayer.cpp
Log:
Debug was enabled by default.


Modified: haiku/trunk/src/kits/interface/PicturePlayer.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-16 09:14:03 UTC (rev 21972)
+++ haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-16 09:14:50 UTC (rev 21973)
@@ -17,8 +17,6 @@
 
 #include <Shape.h>
 
-#define DEBUG 3
-
 typedef void (*fnc)(void*);
 typedef void (*fnc_BPoint)(void*, BPoint);
 typedef void (*fnc_BPointBPoint)(void*, BPoint, BPoint);



From korli at mail.berlios.de  Thu Aug 16 11:19:56 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Thu, 16 Aug 2007 11:19:56 +0200
Subject: [Haiku-commits] r21974 - in haiku/trunk: headers/posix
	src/system/libroot/posix/malloc
Message-ID: <200708160919.l7G9JuOR018632@sheep.berlios.de>

Author: korli
Date: 2007-08-16 11:19:56 +0200 (Thu, 16 Aug 2007)
New Revision: 21974
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21974&view=rev

Modified:
   haiku/trunk/headers/posix/stdlib.h
   haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp
Log:
added posix_memalign()


Modified: haiku/trunk/headers/posix/stdlib.h
===================================================================
--- haiku/trunk/headers/posix/stdlib.h	2007-08-16 09:14:50 UTC (rev 21973)
+++ haiku/trunk/headers/posix/stdlib.h	2007-08-16 09:19:56 UTC (rev 21974)
@@ -49,6 +49,7 @@
 extern void		free(void *pointer);
 extern void		*malloc(size_t size);
 extern void		*realloc(void * ptr, size_t size);
+extern int 		posix_memalign(void **memptr, size_t alignment, size_t size);
 
 /* process termination */
 extern void		abort(void);

Modified: haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp
===================================================================
--- haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp	2007-08-16 09:14:50 UTC (rev 21973)
+++ haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp	2007-08-16 09:19:56 UTC (rev 21974)
@@ -274,6 +274,18 @@
 }
 
 
+extern "C" int
+posix_memalign(void **memptr, size_t alignment, size_t size)
+{
+	if (!memptr)
+		return EINVAL;
+	*memptr = memalign(alignment, size);
+	if (memptr == NULL)
+		return ENOMEM;
+	return 0;
+}
+
+
 extern "C" void *
 valloc(size_t size)
 {



From marcusoverhagen at arcor.de  Thu Aug 16 11:31:05 2007
From: marcusoverhagen at arcor.de (Marcus Overhagen)
Date: Thu, 16 Aug 2007 11:31:05 +0200 (CEST)
Subject: [Haiku-commits] r21974 - in haiku/trunk:
	headers/posix	src/system/libroot/posix/malloc
In-Reply-To: <200708160919.l7G9JuOR018632@sheep.berlios.de>
References: <200708160919.l7G9JuOR018632@sheep.berlios.de>
Message-ID: <15620830.1187256665678.JavaMail.ngmail@webmail11>

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

> +	*memptr = memalign(alignment, size);
> +	if (memptr == NULL)

That should be

             if (*memptr == NULL)

regards
Marcus


Viel oder wenig? Schnell oder langsam? Unbegrenzt surfen + telefonieren
ohne Zeit- und Volumenbegrenzung? DAS TOP ANGEBOT F?R ALLE NEUEINSTEIGER
Jetzt bei Arcor: g?nstig und schnell mit DSL - das All-Inclusive-Paket
f?r clevere Doppel-Sparer, nur  34,95 ?  inkl. DSL- und ISDN-Grundgeb?hr!
http://www.arcor.de/rd/emf-dsl-2


From marcusoverhagen at arcor.de  Thu Aug 16 11:35:17 2007
From: marcusoverhagen at arcor.de (Marcus Overhagen)
Date: Thu, 16 Aug 2007 11:35:17 +0200 (CEST)
Subject: [Haiku-commits] r21972 - in haiku/trunk:
 headers/private/interface	src/kits/interface src/servers/app
In-Reply-To: <200708160914.l7G9E42n018254@sheep.berlios.de>
References: <200708160914.l7G9E42n018254@sheep.berlios.de>
Message-ID: <31423511.1187256917054.JavaMail.ngmail@webmail11>

 jackburton at BerliOS wrote:


> Added some debug output to PicturePlayer. Since checking the table size for
> every op is very slow, now we do that only at the beginning, and use a
> custom op table if needed. The best case (which is the one used when drawing
Thats a interesting idea,

> +
> +static void *
> +kDummyTable[kOpsTableSize] = {
> +	nop,

but a static table is not thread save.

regards
Marcus

Viel oder wenig? Schnell oder langsam? Unbegrenzt surfen + telefonieren
ohne Zeit- und Volumenbegrenzung? DAS TOP ANGEBOT F?R ALLE NEUEINSTEIGER
Jetzt bei Arcor: g?nstig und schnell mit DSL - das All-Inclusive-Paket
f?r clevere Doppel-Sparer, nur  34,95 ?  inkl. DSL- und ISDN-Grundgeb?hr!
http://www.arcor.de/rd/emf-dsl-2


From stefano.ceccherini at gmail.com  Thu Aug 16 11:43:59 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 16 Aug 2007 11:43:59 +0200
Subject: [Haiku-commits] r21972 - in haiku/trunk:
	headers/private/interface src/kits/interface src/servers/app
In-Reply-To: <31423511.1187256917054.JavaMail.ngmail@webmail11>
References: <200708160914.l7G9E42n018254@sheep.berlios.de>
	<31423511.1187256917054.JavaMail.ngmail@webmail11>
Message-ID: <894b9700708160243v43ea6bxe6e4e2d88fb0cc31@mail.gmail.com>

2007/8/16, Marcus Overhagen <marcusoverhagen at arcor.de>:

> > +
> > +static void *
> > +kDummyTable[kOpsTableSize] = {
> > +     nop,
>
> but a static table is not thread save.
>

Ouch. Thats' right.


From stefano.ceccherini at gmail.com  Thu Aug 16 11:58:15 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 16 Aug 2007 11:58:15 +0200
Subject: [Haiku-commits] r21972 - in haiku/trunk:
	headers/private/interface src/kits/interface src/servers/app
In-Reply-To: <894b9700708160243v43ea6bxe6e4e2d88fb0cc31@mail.gmail.com>
References: <200708160914.l7G9E42n018254@sheep.berlios.de>
	<31423511.1187256917054.JavaMail.ngmail@webmail11>
	<894b9700708160243v43ea6bxe6e4e2d88fb0cc31@mail.gmail.com>
Message-ID: <894b9700708160258h466c43c2y261fd5c2584f40a0@mail.gmail.com>

2007/8/16, Stefano Ceccherini <stefano.ceccherini at gmail.com>:
> 2007/8/16, Marcus Overhagen <marcusoverhagen at arcor.de>:
>
> > > +
> > > +static void *
> > > +kDummyTable[kOpsTableSize] = {
> > > +     nop,
> >
> > but a static table is not thread save.
> >
>
> Ouch. Thats' right.

Possible solutions:
- put the table local inside PicturePlayer::Play() (better)
- I use a lock (benaphore). It will only be used in rare cases anyway.
- other ?


From axeld at mail.berlios.de  Thu Aug 16 12:04:45 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 16 Aug 2007 12:04:45 +0200
Subject: [Haiku-commits] r21975 - in haiku/trunk: headers/posix
	src/system/libroot/posix/malloc
Message-ID: <200708161004.l7GA4j2M022559@sheep.berlios.de>

Author: axeld
Date: 2007-08-16 12:04:44 +0200 (Thu, 16 Aug 2007)
New Revision: 21975
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21975&view=rev

Modified:
   haiku/trunk/headers/posix/stdlib.h
   haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp
Log:
Even though Korli beat me, I've updated the posix_memalign() function to be more standards
compliant:
* it now checks the alignment is a multiple of 4 (needs to be changed for 64 bit architectures)
* it no longer sets errno.


Modified: haiku/trunk/headers/posix/stdlib.h
===================================================================
--- haiku/trunk/headers/posix/stdlib.h	2007-08-16 09:19:56 UTC (rev 21974)
+++ haiku/trunk/headers/posix/stdlib.h	2007-08-16 10:04:44 UTC (rev 21975)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006, Haiku Inc. All Rights Reserved.
+ * Copyright 2002-2007, Haiku Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _STDLIB_H_
@@ -45,11 +45,11 @@
 #endif
 
 /* memory allocation (see malloc.h for additional defines & prototypes) */
-extern void		*calloc(size_t nmemb, size_t size);
+extern void		*calloc(size_t numElements, size_t size);
 extern void		free(void *pointer);
 extern void		*malloc(size_t size);
-extern void		*realloc(void * ptr, size_t size);
-extern int 		posix_memalign(void **memptr, size_t alignment, size_t size);
+extern int		posix_memalign(void **_pointer, size_t alignment, size_t size);
+extern void		*realloc(void *oldPointer, size_t newSize);
 
 /* process termination */
 extern void		abort(void);

Modified: haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp
===================================================================
--- haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp	2007-08-16 09:19:56 UTC (rev 21974)
+++ haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp	2007-08-16 10:04:44 UTC (rev 21975)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006, Haiku Inc.
+ * Copyright 2002-2007, Haiku Inc.
  * Distributed under the terms of the MIT License.
  */
 
@@ -260,7 +260,8 @@
 memalign(size_t alignment, size_t size)
 {
 	static processHeap *pHeap = getAllocator();
-	void *addr = pHeap->getHeap(pHeap->getHeapIndex()).memalign(alignment, size);
+	void *addr = pHeap->getHeap(pHeap->getHeapIndex()).memalign(alignment,
+		size);
 	if (addr == NULL) {
 		errno = B_NO_MEMORY;
 		return NULL;
@@ -275,14 +276,23 @@
 
 
 extern "C" int
-posix_memalign(void **memptr, size_t alignment, size_t size)
+posix_memalign(void **_pointer, size_t alignment, size_t size)
 {
-	if (!memptr)
-		return EINVAL;
-	*memptr = memalign(alignment, size);
-	if (memptr == NULL)
-		return ENOMEM;
-	return 0;
+	if ((alignment & 3) != 0 || _pointer == NULL)
+		return B_BAD_VALUE;
+
+	static processHeap *pHeap = getAllocator();
+	void *pointer = pHeap->getHeap(pHeap->getHeapIndex()).memalign(alignment,
+		size);
+	if (pointer == NULL)
+		return NULL;
+
+#if HEAP_LEAK_CHECK
+	add_address(pointer, size);
+#endif
+
+	*_pointer = pointer;
+	return 0;	
 }
 
 



From marcusoverhagen at arcor.de  Thu Aug 16 12:15:29 2007
From: marcusoverhagen at arcor.de (Marcus Overhagen)
Date: Thu, 16 Aug 2007 12:15:29 +0200 (CEST)
Subject: [Haiku-commits] r21975 - in haiku/trunk:
	headers/posix	src/system/libroot/posix/malloc
In-Reply-To: <200708161004.l7GA4j2M022559@sheep.berlios.de>
References: <200708161004.l7GA4j2M022559@sheep.berlios.de>
Message-ID: <19157712.1187259329217.JavaMail.ngmail@webmail11>

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

> +	if ((alignment & 3) != 0 || _pointer == NULL)
> +		return B_BAD_VALUE;

for 32 and 64 bit compatiblity, you could check for 

if (alignment % sizeof(void *))
or 
if (alignment & (sizeof(void *) - 1)

I think we should keep the posix memptr name instead of using _pointer

> +	static processHeap *pHeap = getAllocator();
> +	void *pointer = pHeap->getHeap(pHeap->getHeapIndex()).memalign(alignment,
> +		size);
> +	if (pointer == NULL)
> +		return NULL;

Thats broken. Returning 0 indicated success.

	if (pointer == NULL)
		return B_NO_MEMORY;

regards
Marcus

Viel oder wenig? Schnell oder langsam? Unbegrenzt surfen + telefonieren
ohne Zeit- und Volumenbegrenzung? DAS TOP ANGEBOT F?R ALLE NEUEINSTEIGER
Jetzt bei Arcor: g?nstig und schnell mit DSL - das All-Inclusive-Paket
f?r clevere Doppel-Sparer, nur  34,95 ?  inkl. DSL- und ISDN-Grundgeb?hr!
http://www.arcor.de/rd/emf-dsl-2


From bonefish at cs.tu-berlin.de  Thu Aug 16 12:38:07 2007
From: bonefish at cs.tu-berlin.de (Ingo Weinhold)
Date: Thu, 16 Aug 2007 12:38:07 +0200
Subject: [Haiku-commits] r21975 - in haiku/trunk: headers/posix
 src/system/libroot/posix/malloc
In-Reply-To: <200708161004.l7GA4j2M022559@sheep.berlios.de>
References: <200708161004.l7GA4j2M022559@sheep.berlios.de>
Message-ID: <20070816123807.4564.4@cs.tu-berlin.de>


On 2007-08-16 at 12:04:45 [+0200], axeld at BerliOS <axeld at mail.berlios.de> 
wrote:
>  
>  extern "C" int
> -posix_memalign(void **memptr, size_t alignment, size_t size)
> +posix_memalign(void **_pointer, size_t alignment, size_t size)
>  {
> -    if (!memptr)
> -        return EINVAL;
> -    *memptr = memalign(alignment, size);
> -    if (memptr == NULL)
> -        return ENOMEM;
> -    return 0;
> +    if ((alignment & 3) != 0 || _pointer == NULL)
> +        return B_BAD_VALUE;

Why not "(sizeof(void*) - 1)" instead of the hardcoded 3?

CU, Ingo


From axeld at pinc-software.de  Thu Aug 16 12:46:34 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Thu, 16 Aug 2007 12:46:34 +0200 CEST
Subject: [Haiku-commits] r21975 - in haiku/trunk: headers/posix
 src/system/libroot/posix/malloc
In-Reply-To: <20070816123807.4564.4@cs.tu-berlin.de>
Message-ID: <4448049111-BeMail@zon>

Ingo Weinhold <bonefish at cs.tu-berlin.de> wrote:
> > +    if ((alignment & 3) != 0 || _pointer == NULL)
> > +        return B_BAD_VALUE;
> Why not "(sizeof(void*) - 1)" instead of the hardcoded 3?

Yes, indeed - maybe I shouldn't code before breakfast :-))

Bye,
   Axel.



From axeld at mail.berlios.de  Thu Aug 16 12:49:28 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 16 Aug 2007 12:49:28 +0200
Subject: [Haiku-commits] r21976 - haiku/trunk/src/system/libroot/posix/malloc
Message-ID: <200708161049.l7GAnSsY025496@sheep.berlios.de>

Author: axeld
Date: 2007-08-16 12:49:19 +0200 (Thu, 16 Aug 2007)
New Revision: 21976
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21976&view=rev

Modified:
   haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp
Log:
Shouldn't code before breakfast:
* check against sizeof(void*)-1 instead of hardcoded 3.
* return B_NO_MEMORY instead of NULL if the allocation failed...
Thanks to Marcus and Ingo for proofreading :-)


Modified: haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp
===================================================================
--- haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp	2007-08-16 10:04:44 UTC (rev 21975)
+++ haiku/trunk/src/system/libroot/posix/malloc/wrapper.cpp	2007-08-16 10:49:19 UTC (rev 21976)
@@ -278,14 +278,14 @@
 extern "C" int
 posix_memalign(void **_pointer, size_t alignment, size_t size)
 {
-	if ((alignment & 3) != 0 || _pointer == NULL)
+	if ((alignment & (sizeof(void *) - 1)) != 0 || _pointer == NULL)
 		return B_BAD_VALUE;
 
 	static processHeap *pHeap = getAllocator();
 	void *pointer = pHeap->getHeap(pHeap->getHeapIndex()).memalign(alignment,
 		size);
 	if (pointer == NULL)
-		return NULL;
+		return B_NO_MEMORY;
 
 #if HEAP_LEAK_CHECK
 	add_address(pointer, size);



From axeld at pinc-software.de  Thu Aug 16 12:51:07 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Thu, 16 Aug 2007 12:51:07 +0200 CEST
Subject: [Haiku-commits]
 =?iso-8859-15?q?r21975_-_in_haiku/trunk=3A_header?=
 =?iso-8859-15?q?s/posix_src/system/libroot/posix/malloc?=
In-Reply-To: <19157712.1187259329217.JavaMail.ngmail@webmail11>
Message-ID: <4721374408-BeMail@zon>

Marcus Overhagen <marcusoverhagen at arcor.de> wrote:
> I think we should keep the posix memptr name instead of using 
> _pointer

Why should we?

> > +	static processHeap *pHeap = getAllocator();
> > +	void *pointer = pHeap->getHeap(pHeap->
> > getHeapIndex()).memalign(alignment,
> > +		size);
> > +	if (pointer == NULL)
> > +		return NULL;
> Thats broken. Returning 0 indicated success.

Wow, I must have been completely dumb when I wrote that... reminds me 
of the early pipefs version :-)
Thanks!

Bye,
   Axel.



From korli at mail.berlios.de  Thu Aug 16 12:56:46 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Thu, 16 Aug 2007 12:56:46 +0200
Subject: [Haiku-commits] r21977 - haiku/trunk/src/kits/interface
Message-ID: <200708161056.l7GAukWM029561@sheep.berlios.de>

Author: korli
Date: 2007-08-16 12:56:45 +0200 (Thu, 16 Aug 2007)
New Revision: 21977
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21977&view=rev

Modified:
   haiku/trunk/src/kits/interface/PicturePlayer.cpp
Log:
fix gcc4 build 


Modified: haiku/trunk/src/kits/interface/PicturePlayer.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-16 10:49:19 UTC (rev 21976)
+++ haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-16 10:56:45 UTC (rev 21977)
@@ -11,6 +11,7 @@
 /**	PicturePlayer is used to play picture data. */
 
 #include <stdio.h>
+#include <string.h>
 
 #include <PicturePlayer.h>
 #include <PictureProtocol.h>
@@ -50,54 +51,54 @@
 
 static void *
 kDummyTable[kOpsTableSize] = {
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop,
-	nop
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop,
+	(void *)nop
 };
 
 



From revol at free.fr  Thu Aug 16 13:30:17 2007
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Thu, 16 Aug 2007 13:30:17 +0200 CEST
Subject: [Haiku-commits] r21954 - haiku/trunk/src/apps/deskbar
In-Reply-To: <200708142355.l7ENtPLg007171@sheep.berlios.de>
Message-ID: <1619858992-BeMail@laptop>

> Author: axeld
> Date: 2007-08-15 01:55:24 +0200 (Wed, 15 Aug 2007)
> New Revision: 21954
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21954&view=rev
> 
> Modified:
>    haiku/trunk/src/apps/deskbar/BarApp.cpp
>    haiku/trunk/src/apps/deskbar/BarApp.h
>    haiku/trunk/src/apps/deskbar/BarView.cpp
>    haiku/trunk/src/apps/deskbar/BarView.h
>    haiku/trunk/src/apps/deskbar/BeMenu.cpp
> Log:
> Added an auto-raise feature.

Hey, you're killing 3rd party opportunities !!
http://bebits.com/app/2934

Actually I never thought of implementing it this way...
(but it only works when the mouse is inside the window, not on the 
decor.)

Fran?ois.



From laplace at mail.berlios.de  Thu Aug 16 13:49:38 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Thu, 16 Aug 2007 13:49:38 +0200
Subject: [Haiku-commits] r21978 -
	haiku/trunk/src/tests/kits/interface/flatten_picture
Message-ID: <200708161149.l7GBnckv015009@sheep.berlios.de>

Author: laplace
Date: 2007-08-16 13:49:37 +0200 (Thu, 16 Aug 2007)
New Revision: 21978
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21978&view=rev

Modified:
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
Log:
Added testSetOriginAndScale as a use case for a rendering bug.
It seems scaling ignores the origin.
The test does not fail, but the rendered image is wrong.


Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-16 10:56:45 UTC (rev 21977)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-16 11:49:37 UTC (rev 21978)
@@ -355,7 +355,6 @@
 static void testClipToPicture(BView *view, BRect frame) 
 {
 	frame.InsetBy(2, 2);
-	
 	view->BeginPicture(new BPicture());
 	view->FillEllipse(frame);
 	BPicture *picture = view->EndPicture();
@@ -519,6 +518,20 @@
 	// from test testSetScaling
 }
 
+static void testSetOriginAndScale(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	BPoint center = centerPoint(frame);
+	
+	BRect r(0, 0, frame.IntegerWidth() / 2, frame.IntegerHeight() / 2);
+	view->SetOrigin(center);
+	view->FillRect(r);
+	
+	view->SetScale(0.5);
+	view->SetHighColor(kRed);
+	view->FillRect(r);
+}
+
 static void testSetFontSize(BView *view, BRect frame)
 {
 	frame.InsetBy(2, 2);
@@ -590,6 +603,7 @@
 	// rectangle are twice as large as the direct draw version
 	{ "Test SetScale2*", testSetScale2 },
 	{ "Test SetScale3", testSetScale3 },
+	{ "Test SetOriginAndScale", testSetOriginAndScale },
 	{ "Test SetFontSize", testSetFontSize },
 	{ NULL, NULL }
 };



From marcusoverhagen at arcor.de  Thu Aug 16 13:54:52 2007
From: marcusoverhagen at arcor.de (Marcus Overhagen)
Date: Thu, 16 Aug 2007 13:54:52 +0200 (CEST)
Subject: [Haiku-commits] r21975 - in haiku/trunk: headers/posix
 src/system/libroot/posix/malloc
In-Reply-To: <4721374408-BeMail@zon>
References: <4721374408-BeMail@zon>
Message-ID: <13231203.1187265292149.JavaMail.ngmail@webmail11>

Axel D?rfler  <axeld at pinc-software.de> wrote:

> Marcus Overhagen <marcusoverhagen at arcor.de> wrote:
> > I think we should keep the posix memptr name instead of using 
> > _pointer
> 
> Why should we?
> 

Because in all documentation i've seen, it's using this prototype,
and I think refereing to the name from documentation makes it 
better.

int posix_memalign(void **memptr, size_t alignment, size_t size);


regards
Marcus

Viel oder wenig? Schnell oder langsam? Unbegrenzt surfen + telefonieren
ohne Zeit- und Volumenbegrenzung? DAS TOP ANGEBOT F?R ALLE NEUEINSTEIGER
Jetzt bei Arcor: g?nstig und schnell mit DSL - das All-Inclusive-Paket
f?r clevere Doppel-Sparer, nur  34,95 ?  inkl. DSL- und ISDN-Grundgeb?hr!
http://www.arcor.de/rd/emf-dsl-2


From leavengood at gmail.com  Thu Aug 16 14:00:52 2007
From: leavengood at gmail.com (Ryan Leavengood)
Date: Thu, 16 Aug 2007 08:00:52 -0400
Subject: [Haiku-commits] r21972 - in haiku/trunk:
	headers/private/interface src/kits/interface src/servers/app
In-Reply-To: <894b9700708160258h466c43c2y261fd5c2584f40a0@mail.gmail.com>
References: <200708160914.l7G9E42n018254@sheep.berlios.de>
	<31423511.1187256917054.JavaMail.ngmail@webmail11>
	<894b9700708160243v43ea6bxe6e4e2d88fb0cc31@mail.gmail.com>
	<894b9700708160258h466c43c2y261fd5c2584f40a0@mail.gmail.com>
Message-ID: <a4855ac50708160500n6d3b9709ge20dd64ca2dc787e@mail.gmail.com>

On 8/16/07, Stefano Ceccherini <stefano.ceccherini at gmail.com> wrote:
>
> Possible solutions:
> - put the table local inside PicturePlayer::Play() (better)
> - I use a lock (benaphore). It will only be used in rare cases anyway.
> - other ?

Thread Local Storage?

Ryan


From axeld at pinc-software.de  Thu Aug 16 14:53:31 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Thu, 16 Aug 2007 14:53:31 +0200 CEST
Subject: [Haiku-commits] r21954 - haiku/trunk/src/apps/deskbar
In-Reply-To: <1619858992-BeMail@laptop>
Message-ID: <12065308182-BeMail@zon>

"Fran?ois Revol" <revol at free.fr> wrote:
> > Author: axeld
> > Log:
> > Added an auto-raise feature.
> Hey, you're killing 3rd party opportunities !!
> http://bebits.com/app/2934

:-)
But your's does a lot more, so it's not really killing it...

> Actually I never thought of implementing it this way...
> (but it only works when the mouse is inside the window, not on the 
> decor.)

That's true; for the Deskbar, though, this is not a problem - for 
Workspaces it is. I guess we should have a method to ask for the actual 
window bounds (ie. a BWindow::GetOnScreenRegion(BRegion&) or something 
like that). Suggestions are welcome.

Bye,
   Axel.



From axeld at pinc-software.de  Thu Aug 16 14:54:16 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Thu, 16 Aug 2007 14:54:16 +0200 CEST
Subject: [Haiku-commits]
 =?iso-8859-15?q?r21972_-_in_haiku/trunk=3A_header?=
 =?iso-8859-15?q?s/private/interface_src/kits/interface_src/servers/app?=
In-Reply-To: <a4855ac50708160500n6d3b9709ge20dd64ca2dc787e@mail.gmail.com>
Message-ID: <12110038063-BeMail@zon>

"Ryan Leavengood" <leavengood at gmail.com> wrote:
> On 8/16/07, Stefano Ceccherini <stefano.ceccherini at gmail.com> wrote:
> > Possible solutions:
> > - put the table local inside PicturePlayer::Play() (better)
> > - I use a lock (benaphore). It will only be used in rare cases 
> > anyway.
> > - other ?
> Thread Local Storage?

Did I understand correctly that this is only used for debugging? If so, 
a BLocker seems like a good choice to me.

Bye,
   Axel.



From jackburton at mail.berlios.de  Thu Aug 16 15:11:01 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Thu, 16 Aug 2007 15:11:01 +0200
Subject: [Haiku-commits] r21979 - haiku/trunk/src/apps/terminal
Message-ID: <200708161311.l7GDB1Hi021715@sheep.berlios.de>

Author: jackburton
Date: 2007-08-16 15:11:00 +0200 (Thu, 16 Aug 2007)
New Revision: 21979
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21979&view=rev

Added:
   haiku/trunk/src/apps/terminal/Arguments.cpp
   haiku/trunk/src/apps/terminal/Arguments.h
Modified:
   haiku/trunk/src/apps/terminal/Jamfile
   haiku/trunk/src/apps/terminal/Shell.cpp
   haiku/trunk/src/apps/terminal/Shell.h
   haiku/trunk/src/apps/terminal/TermApp.cpp
   haiku/trunk/src/apps/terminal/TermApp.h
   haiku/trunk/src/apps/terminal/TermView.cpp
   haiku/trunk/src/apps/terminal/TermView.h
   haiku/trunk/src/apps/terminal/TermWindow.cpp
   haiku/trunk/src/apps/terminal/TermWindow.h
Log:
Stolen Ingo's Arguments class from Miniterminal and used it in place of 
GPL'd code in TermApp (slightly modified, and bugfixed, even :P).
TermView now accepts an argument vector instead of a commandline. Same 
thing for Shell.
Temporarily(?) removed some commandline options.
This also fixes bug #1396 (tested)


Added: haiku/trunk/src/apps/terminal/Arguments.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/Arguments.cpp	2007-08-16 11:49:37 UTC (rev 21978)
+++ haiku/trunk/src/apps/terminal/Arguments.cpp	2007-08-16 13:11:00 UTC (rev 21979)
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2005, Ingo Weinhold, bonefish at users.sf.net.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "Arguments.h"
+
+
+Arguments::Arguments()
+	: fUsageRequested(false),
+	  fBounds(50, 50, 630, 435),
+	  fStandardShell(true),
+	  fFullScreen(false),
+	  fShellArgumentCount(0),
+	  fShellArguments(NULL),
+	  fTitle(NULL)
+{
+	const char *argv[] = { "/bin/sh", "--login" };
+
+	_SetShellArguments(2, argv);
+}
+
+
+Arguments::~Arguments()
+{
+	_SetShellArguments(0, NULL);
+}
+
+
+void
+Arguments::Parse(int argc, const char *const *argv)
+{
+	int argi = 1;
+	while (argi < argc) {
+		const char *arg = argv[argi++];
+
+		if (*arg == '-') {
+			if (strcmp(arg, "-h") == 0 || strcmp(arg, "--help") == 0) {
+				fUsageRequested = true;
+			
+			/*} else if (strcmp(arg, "-l") == 0) {
+				// location
+				float x, y;
+				if (argi + 1 >= argc
+					|| sscanf(argv[argi++], "%f", &x) != 1
+					|| sscanf(argv[argi++], "%f", &y) != 1) {
+					print_usage_and_exit(true);
+				}
+
+				fBounds.OffsetTo(x, y);
+
+			} else if (strcmp(arg, "-s") == 0) {
+				// size
+				float width, height;
+				if (argi + 1 >= argc
+					|| sscanf(argv[argi++], "%f", &width) != 1
+					|| sscanf(argv[argi++], "%f", &height) != 1) {
+					print_usage_and_exit(true);
+				}
+
+				fBounds.right = fBounds.left + width;
+				fBounds.bottom = fBounds.top + height;
+*/
+			} else if (strcmp(arg, "-t") == 0 || strcmp(arg, "--title") == 0) {
+				// title
+				if (argi >= argc)
+					fUsageRequested = true;
+				else
+					fTitle = argv[argi++];
+
+			} else if (strcmp(arg, "-f") == 0 || strcmp(arg, "--fullscreen") == 0) {
+				fFullScreen = true;				
+				argi++;			
+			} else {
+				// illegal option
+				fprintf(stderr, "Unrecognized option \"%s\"\n", arg);
+				fUsageRequested = true;
+			}
+
+		} else {
+			// no option, so the remainder is the shell program with arguments
+			_SetShellArguments(argc - argi + 1, argv + argi - 1);
+			argi = argc;
+			fStandardShell = false;
+		}
+	}
+}
+
+
+void
+Arguments::GetShellArguments(int &argc, const char *const *&argv) const
+{
+	argc = fShellArgumentCount;
+	argv = fShellArguments;
+}
+
+
+void
+Arguments::_SetShellArguments(int argc, const char *const *argv)
+{
+	// delete old arguments
+	for (int32 i = 0; i < fShellArgumentCount; i++)
+		free((void *)fShellArguments[i]);
+	delete[] fShellArguments;
+
+	fShellArguments = NULL;
+	fShellArgumentCount = 0;
+
+	// copy new ones
+	if (argc > 0 && argv) {
+		fShellArguments = new const char*[argc + 1];
+		for (int i = 0; i < argc; i++)
+			fShellArguments[i] = strdup(argv[i]);
+
+		fShellArguments[argc] = NULL;
+		fShellArgumentCount = argc;
+	}
+}
+

Added: haiku/trunk/src/apps/terminal/Arguments.h
===================================================================
--- haiku/trunk/src/apps/terminal/Arguments.h	2007-08-16 11:49:37 UTC (rev 21978)
+++ haiku/trunk/src/apps/terminal/Arguments.h	2007-08-16 13:11:00 UTC (rev 21979)
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2005, Ingo Weinhold, bonefish at users.sf.net.
+ * Distributed under the terms of the MIT License.
+ */
+
+#ifndef ARGUMENTS_H
+#define ARGUMENTS_H
+
+#include <Rect.h>
+
+class Arguments {
+public:
+	Arguments();
+	~Arguments();
+
+	void Parse(int argc, const char *const *argv);
+
+	BRect Bounds() const		{ return fBounds; }
+	const char *Title() const	{ return fTitle; }
+	bool StandardShell() const	{ return fStandardShell; }
+	bool FullScreen() const		{ return fFullScreen; }
+	bool UsageRequested() const	{ return fUsageRequested; }
+	void GetShellArguments(int &argc, const char *const *&argv) const;
+
+private:
+	void _SetShellArguments(int argc, const char *const *argv);
+
+	bool		fUsageRequested;
+	BRect		fBounds;
+	bool		fStandardShell;
+	bool		fFullScreen;
+	int		fShellArgumentCount;
+	const char	**fShellArguments;
+	const char	*fTitle;
+};
+
+
+#endif	// ARGUMENTS_H

Modified: haiku/trunk/src/apps/terminal/Jamfile
===================================================================
--- haiku/trunk/src/apps/terminal/Jamfile	2007-08-16 11:49:37 UTC (rev 21978)
+++ haiku/trunk/src/apps/terminal/Jamfile	2007-08-16 13:11:00 UTC (rev 21979)
@@ -6,6 +6,7 @@
 
 Application Terminal : 
 	AppearPrefView.cpp
+	Arguments.cpp
 	CodeConv.cpp
 	Coding.cpp
 	CurPos.cpp

Modified: haiku/trunk/src/apps/terminal/Shell.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/Shell.cpp	2007-08-16 11:49:37 UTC (rev 21978)
+++ haiku/trunk/src/apps/terminal/Shell.cpp	2007-08-16 13:11:00 UTC (rev 21979)
@@ -80,7 +80,7 @@
 #define	RDEL	0xFF
 
 /* default shell command and options. */
-#define SHELL_COMMAND "/bin/sh -login"
+const char *kDefaultShellCommand = { "/bin/sh" "-login" };
 
 
 /*
@@ -149,12 +149,12 @@
 
 
 status_t
-Shell::Open(int row, int col, const char *command, const char *encoding)
+Shell::Open(int row, int col, const char *encoding, int argc, const char **argv)
 {
 	if (fFd >= 0)
 		return B_ERROR;
 
-	status_t status = _Spawn(row, col, command, encoding);
+	status_t status = _Spawn(row, col, encoding, argc, argv);
 	if (status < B_OK)
 		return status;
 
@@ -295,7 +295,7 @@
 
 
 status_t
-Shell::_Spawn(int row, int col, const char *command, const char *encoding)
+Shell::_Spawn(int row, int col, const char *encoding, int argc, const char **argv)
 {
 	signal(SIGTTOU, SIG_IGN);
 	
@@ -504,56 +504,12 @@
 		setenv("TERM", "beterm", true);
 		setenv("TTY", ttyName, true);
 		setenv("TTYPE", encoding, true);
+		setenv("SHELL", *argv, true);
 
-		/*
-		 * If don't set command args, exec SHELL_COMMAND.
-		 */
-		if (command == NULL)
-			command = SHELL_COMMAND;
-		
-		/*
-		 * split up the arguments in the command into an artv-like structure.
-		 */
-		char commandLine[256];
-		memcpy(commandLine, command, 256);
-		char *ptr = commandLine;
-		char *args[16];
-		int i = 0;
-		while (*ptr) {
-			/* Skip white space */
-			while ((*ptr == ' ') || (*ptr == '\t'))
-				*ptr++ = 0;
-				args[i++] = ptr;
 
-			/* Skip over this word to next white space. */
-			while ((*ptr != 0) && (*ptr != ' ') && (*ptr != '\t'))
-			ptr++;
-		}
+		execve(*argv, (char * const *)argv, environ);
 
-		args[i] = NULL;
-
-		setenv("SHELL", *args, true);
-
-#if 0
 		/*
-		 * Print Welcome Message.
-		 * (But, Only print message when MuTerminal coding is UTF8.)
-		 */
-		
-		time_t now_time_t = time(NULL);
-		struct tm *now_time = localtime (&now_time_t);
-		int now_hour = 0;
-		if (now_time->tm_hour >= 5 && now_time->tm_hour < 11) {
-			now_hour = 0;
-		} else if (now_time->tm_hour >= 11 && now_time->tm_hour <= 18 ) {
-			now_hour = 1;
-		} else {
-			now_hour = 2;
-		}
-#endif
-		execve(*args, args, environ);
-
-		/*
 		 * Exec failed.
 		 */
 		sleep(1);

Modified: haiku/trunk/src/apps/terminal/Shell.h
===================================================================
--- haiku/trunk/src/apps/terminal/Shell.h	2007-08-16 11:49:37 UTC (rev 21978)
+++ haiku/trunk/src/apps/terminal/Shell.h	2007-08-16 13:11:00 UTC (rev 21979)
@@ -23,7 +23,7 @@
 			Shell();
 	virtual		~Shell();
 
-	status_t	Open(int row, int col, const char *command, const char *coding);
+	status_t	Open(int row, int col, const char *encoding, int argc, const char **argv);
 	void		Close();
 	
 	const char *	TTYName() const;
@@ -48,7 +48,7 @@
 	TermParse	*fTermParse;
 	bool		fAttached;
 
-	status_t	_Spawn(int row, int col, const char *command, const char *coding);
+	status_t	_Spawn(int row, int col, const char *encoding, int argc, const char **argv);
 };
 
 #endif // _SHELL_H

Modified: haiku/trunk/src/apps/terminal/TermApp.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermApp.cpp	2007-08-16 11:49:37 UTC (rev 21978)
+++ haiku/trunk/src/apps/terminal/TermApp.cpp	2007-08-16 13:11:00 UTC (rev 21979)
@@ -9,6 +9,7 @@
 
 #include "TermApp.h"
 
+#include "Arguments.h"
 #include "CodeConv.h"
 #include "PrefHandler.h"
 #include "TermWindow.h"
@@ -31,26 +32,7 @@
 static bool sUsageRequested = false;
 static bool sGeometryRequested = false;
 
-struct standard_args {
-	char *name;
-	char *longname;
-	int priority;
-	int nargs;
-	const char *prefname;
-};
 
-struct standard_args standard_args[] = {
-	{ "-h", "--help", 90, 0, NULL },
-	{ "-f", "--fullscreen", 30, 0, NULL },
-	{ "-p", "--preference", 80, 1, NULL },
-	{ "-t", "--title", 70, 1, NULL },
-	{ "-geom", "--geometry", 50, 1, NULL },
-};
-
-int argmatch(char **, int, char *, char *, int, char **, int *);
-void sort_args(int, char **);
-
-
 const ulong MSG_ACTIVATE_TERM = 'msat';
 const ulong MSG_TERM_IS_MINIMIZE = 'mtim';
 
@@ -59,8 +41,11 @@
 	: BApplication(TERM_SIGNATURE),
 	fStartFullscreen(false),
 	fWindowNumber(-1),
-	fTermWindow(NULL)
+	fTermWindow(NULL),
+	fArgs(NULL)
 {
+	fArgs = new Arguments();
+
 	fWindowTitle = "Terminal";
 	_RegisterTerminal();
 
@@ -78,6 +63,7 @@
 
 TermApp::~TermApp()
 {
+	delete fArgs;
 }
 
 
@@ -167,73 +153,19 @@
 void
 TermApp::ArgvReceived(int32 argc, char **argv)
 {
-	int skip_args = 0;
-	char *value = 0;
-
-	if (argc < 2)
-		return;
-
-	sort_args(argc, argv);
-	argc = 0;
-	while (argv[argc])
-		argc++;
-
-	// Print usage
-	if (argmatch(argv, argc, "-help", "--help", 3, NULL, &skip_args)) {
+	fArgs->Parse(argc, argv);
+	
+	if (fArgs->UsageRequested()) {
 		_Usage(argv[0]);
 		sUsageRequested = true;
 		PostMessage(B_QUIT_REQUESTED);
+		return;	
 	}
+	
+	if (fArgs->Title() != NULL)
+		fWindowTitle = fArgs->Title();
 
-	// Start fullscreen
-	if (argmatch(argv, argc, "-f", "--fullscreen", 4, NULL, &skip_args))
-		fStartFullscreen = true;
-
-	// Load preference file
-	if (argmatch(argv, argc, "-p", "--preference", 4, &value, &skip_args))
-		PrefHandler::Default()->Open(value);
-
-	// Set window title
-	if (argmatch(argv ,argc, "-t", "--title", 3, &value, &skip_args))
-		fWindowTitle = value;
-
-    	// Set window geometry
-    	if (argmatch(argv, argc, "-geom", "--geometry", 4, &value, &skip_args)) {
-		int width, height, xpos, ypos;
-
-		sscanf(value, "%dx%d+%d+%d", &width, &height, &xpos, &ypos);
-		if (width < 0 || height < 0 || xpos < 0 || ypos < 0
-			|| width >= 256 || height >= 256 || xpos >= 2048 || ypos >= 2048) {
-			fprintf(stderr, "%s: invalid geometry format or value.\n", argv[0]);
-			fprintf(stderr, "Try `%s --help' for more information.\n", argv[0]);
-			sUsageRequested = true;
-			PostMessage(B_QUIT_REQUESTED);
-		}
-		PrefHandler::Default()->setInt32(PREF_COLS, width);
-		PrefHandler::Default()->setInt32(PREF_ROWS, height);
-
-		fTermFrame.Set(xpos, ypos, xpos + 50, ypos + 50);
-		sGeometryRequested = true;
-   	 }
-
-	skip_args++;
-
-	if (skip_args < argc) {
-		// Check invalid options
-
-		if (*argv[skip_args] == '-') {
-			fprintf(stderr, "%s: invalid option `%s'\n", argv[0], argv[skip_args]);
-			fprintf(stderr, "Try `%s --help' for more information.\n", argv[0]);
-			sUsageRequested = true;
-			PostMessage(B_QUIT_REQUESTED);
-		}
-
-		fCommandLine += argv[skip_args++];
-		while (skip_args < argc) {
-			fCommandLine += ' ';
-			fCommandLine += argv[skip_args++];
-		}
-	}
+	fStartFullscreen = fArgs->FullScreen();
 }
 
 
@@ -277,14 +209,8 @@
 status_t
 TermApp::_MakeTermWindow(BRect &frame)
 {
-	const char *command = NULL;
-	if (fCommandLine.Length() > 0)
-		command = fCommandLine.String();
-	else
-		command = PrefHandler::Default()->getString(PREF_SHELL);
-
 	try {
-		fTermWindow = new TermWindow(frame, fWindowTitle.String(), command);
+		fTermWindow = new TermWindow(frame, fWindowTitle.String(), new Arguments(*fArgs));
 	} catch (int error) {
 		return (status_t)error;	
 	} catch (...) {
@@ -556,217 +482,13 @@
 		"\n"
 		"Usage: %s [OPTION] [SHELL]\n", name);
 
-	fprintf(stderr, "  -p,     --preference         load preference file\n"
+	fprintf(stderr,
+		"  -h,     --help               print this help\n"    
+		//"  -p,     --preference         load preference file\n"
 		"  -t,     --title              set window title\n"
-		"  -geom,  --geometry           set window geometry\n"
-		"                               An example of geometry is \"80x25+100+100\"\n");
+		"  -f,     --fullscreen         start fullscreen\n"		
+		//"  -geom,  --geometry           set window geometry\n"
+		//"                               An example of geometry is \"80x25+100+100\"\n"
+		);
 }
 
-
-
-// This routine copy from GNU Emacs.
-// TODO: This might be a GPL licensing issue here. Investigate.
-int
-argmatch(char **argv, int argc, char *sstr, char *lstr,
-	int minlen, char **valptr, int *skipptr)
-{
-	char *p = 0;
-	int arglen;
-	char *arg;
-
-	// Don't access argv[argc]; give up in advance
-	if (argc <= *skipptr + 1)
-		return 0;
-
-	arg = argv[*skipptr+1];
-	if (arg == NULL)
-		return 0;
-
-	if (strcmp(arg, sstr) == 0) {
-		if(valptr != NULL) {
-			*valptr = argv[*skipptr+2];
-			*skipptr += 2;
-		} else
-			*skipptr += 1;
-		return 1;
-	}
-
-	arglen =(valptr != NULL &&(p = strchr(arg, '=')) != NULL
-			? p - arg : strlen(arg));
-	
-	if(lstr == 0 || arglen < minlen || strncmp(arg, lstr, arglen) != 0)
-		return 0;
-	else
-	if(valptr == NULL)
-	{
-		*skipptr += 1;
-		return 1;
-	}
-	else
-	if(p != NULL)
-	{
-		*valptr = p+1;
-		*skipptr += 1;
-		return 1;
-	}
-	else
-	if(argv[*skipptr+2] != NULL)
-	{
-		*valptr = argv[*skipptr+2];
-		*skipptr += 2;
-		return 1;
-	}
-	else
-	{
-		return 0;
-	}
-}
-
-// This routine copy from GNU Emacs.
-// TODO: This might be a GPL licensing issue here. Investigate.
-void
-sort_args(int argc, char **argv)
-{
-	/*
-		For each element of argv,
-		the corresponding element of options is:
-		0 for an option that takes no arguments,
-		1 for an option that takes one argument, etc.
-		-1 for an ordinary non-option argument.
-	*/
-	
-	char **newargv =(char **) malloc(sizeof(char *) * argc);
-	
-	int *options =(int *) malloc(sizeof(int) * argc);
-	int *priority =(int *) malloc(sizeof(int) * argc);
-	int to = 1;
-	int incoming_used = 1;
-	int from;
-	int i;
-	//int end_of_options = argc;
-	
-	// Categorize all the options,
-	// and figure out which argv elts are option arguments
-	for(from = 1; from < argc; from++)
-	{
-		options[from] = -1;
-		priority[from] = 0;
-		if(argv[from][0] == '-')
-		{
-			int match, thislen;
-			char *equals;
-			
-			// If we have found "--", don't consider any more arguments as options
-			if(argv[from][1] == '-' && argv[from][2] == 0)
-			{
-				// Leave the "--", and everything following it, at the end.
-				for(; from < argc; from++)
-				{
-					priority[from] = -100;
-					options[from] = -1;
-				}
-				break;
-			}
-			
-			// Look for a match with a known old-fashioned option.
-			for(i = 0; i <(int)(sizeof(standard_args) / sizeof(standard_args[0])); i++)
-				if(!strcmp(argv[from], standard_args[i].name))
-				{
-					options[from] = standard_args[i].nargs;
-					priority[from] = standard_args[i].priority;
-					if(from + standard_args[i].nargs >= argc)
-						fprintf(stderr, "Option `%s' requires an argument\n", argv[from]);
-					from += standard_args[i].nargs;
-					goto done;
-				}
-			
-			/*
-				Look for a match with a known long option.
-				MATCH is -1 if no match so far, -2 if two or more matches so far,
-				>= 0(the table index of the match) if just one match so far.
-			*/
-			if(argv[from][1] == '-')
-			{
-				match = -1;
-				thislen = strlen(argv[from]);
-				equals = strchr(argv[from], '=');
-				if(equals != 0)
-					thislen = equals - argv[from];
-				
-				for(i = 0;i <(int )(sizeof(standard_args) / sizeof(standard_args[0])); i++)
-					if(standard_args[i].longname 
-						&& !strncmp(argv[from], standard_args[i].longname, thislen))
-					{
-						if(match == -1)
-							match = i;
-						else
-							match = -2;
-					}
-					
-					// If we found exactly one match, use that
-					if(match >= 0)
-					{
-						options[from] = standard_args[match].nargs;
-						priority[from] = standard_args[match].priority;
-						
-						// If --OPTION=VALUE syntax is used,
-						// this option uses just one argv element
-						if(equals != 0)
-							options[from] = 0;
-						if(from + options[from] >= argc)
-							fprintf(stderr, "Option `%s' requires an argument\n", argv[from]);
-						from += options[from];
-					}
-			}
-			done: ;
-		}
-	}
-	
-	// Copy the arguments, in order of decreasing priority, to NEW
-	newargv[0] = argv[0];
-	while (incoming_used < argc) {
-		int best = -1;
-		int best_priority = -9999;
-
-		// Find the highest priority remaining option.
-		// If several have equal priority, take the first of them.
-		for (from = 1; from < argc; from++) {
-			if (argv[from] != 0 && priority[from] > best_priority) {
-				best_priority = priority[from];
-				best = from;
-			}
-			
-			// Skip option arguments--they are tied to the options.
-			if (options[from] > 0)
-				from += options[from];
-		}
-		
-		if (best < 0)
-			abort();
-		
-		// Copy the highest priority remaining option, with its args, to NEW.
-		// Unless it is a duplicate of the previous one
-		if (!(options[best] == 0 && ! strcmp(newargv[to - 1], argv[best]))) {
-			newargv[to++] = argv[best];
-			for(i = 0; i < options[best]; i++)
-				newargv[to++] = argv[best + i + 1];
-		}
-		
-		incoming_used += 1 +(options[best] > 0 ? options[best] : 0);
-		
-		// Clear out this option in ARGV
-		argv[best] = 0;
-		for (i = 0; i < options[best]; i++)
-			argv[best + i + 1] = 0;
-	}
-	
-	// If duplicate options were deleted, fill up extra space with null ptrs
-	while (to < argc)
-		newargv[to++] = 0;
-	
-	memcpy(argv, newargv, sizeof(char *) * argc);
-	
-	free(options);
-	free(newargv);
-	free(priority);
-}

Modified: haiku/trunk/src/apps/terminal/TermApp.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermApp.h	2007-08-16 11:49:37 UTC (rev 21978)
+++ haiku/trunk/src/apps/terminal/TermApp.h	2007-08-16 13:11:00 UTC (rev 21979)
@@ -35,6 +35,7 @@
 #include <Application.h>
 #include <String.h>
 
+class Arguments;
 class BRect;
 class BWindow;
 class TermApp : public BApplication {
@@ -70,7 +71,7 @@
 		
 		BWindow*	fTermWindow;
 		BRect		fTermFrame;
-		BString		fCommandLine;
+		Arguments	*fArgs;
 };
 
 #endif	// TERM_APP_H

Modified: haiku/trunk/src/apps/terminal/TermView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-16 11:49:37 UTC (rev 21978)
+++ haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-16 13:11:00 UTC (rev 21979)
@@ -131,7 +131,7 @@
 
 
 
-TermView::TermView(BRect frame, const char *command, int32 historySize)
+TermView::TermView(BRect frame, int32 argc, const char **argv, int32 historySize)
 	: BView(frame, "termview", B_FOLLOW_ALL,
 		B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE| B_PULSE_NEEDED),
 	fShell(NULL),
@@ -176,11 +176,11 @@
 	fQuitting(false),
 	fIMflag(false)	
 {	
-	_InitObject(command);
+	_InitObject(argc, argv);
 }
 
 
-TermView::TermView(int rows, int columns, const char *command, int32 historySize)
+TermView::TermView(int rows, int columns, int32 argc, const char **argv, int32 historySize)
 	: BView(BRect(0, 0, 0, 0), "termview", B_FOLLOW_ALL,
 		B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE| B_PULSE_NEEDED),
 	fShell(NULL),
@@ -225,7 +225,7 @@
 	fQuitting(false),
 	fIMflag(false)	
 {	
-	_InitObject(command);
+	_InitObject(argc, argv);
 	SetTermSize(fTermRows, fTermColumns, true);
 }
 
@@ -282,16 +282,15 @@
 	if (archive->FindInt32("rows", (int32 *)&fTermRows) < B_OK)
 		fTermRows = 25;
 	
-	const char *command = NULL;
-	archive->FindString("command", &command);
+	const char *argv[] = { "/bin/sh", "--login" };
 
-	// TODO: Retrieve colors, history size, etc. from archive
-	_InitObject(command);
+	// TODO: Retrieve arguments, colors, history size, etc. from archive
+	_InitObject(2, argv);
 }
 
 
 status_t
-TermView::_InitObject(const char *command)
+TermView::_InitObject(int32 argc, const char **argv)
 {
 	SetTermFont(be_fixed_font, be_fixed_font);
 
@@ -304,7 +303,7 @@
 		return B_NO_MEMORY;
 	
 	status_t status = fShell->Open(fTermRows, fTermColumns,
-					command, longname2shortname(id2longname(fEncoding)));
+					longname2shortname(id2longname(fEncoding)), argc, argv);
 	
 	if (status < B_OK)
 		return status;

Modified: haiku/trunk/src/apps/terminal/TermView.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.h	2007-08-16 11:49:37 UTC (rev 21978)
+++ haiku/trunk/src/apps/terminal/TermView.h	2007-08-16 13:11:00 UTC (rev 21979)
@@ -32,8 +32,8 @@
 class TermBuffer;
 class TermView : public BView {
 public:
-	TermView(BRect frame, const char *command = NULL, int32 historySize = 1000);
-	TermView(int rows, int columns, const char *command = NULL, int32 historySize = 1000);
+	TermView(BRect frame, int32 argc, const char **argv, int32 historySize = 1000);
+	TermView(int rows, int columns, int32 argc, const char **argv, int32 historySize = 1000);
 	TermView(BMessage *archive);	
 	~TermView();
 
@@ -140,7 +140,7 @@
 						const char *property);
 
 private:
-	status_t _InitObject(const char *command);
+	status_t _InitObject(int32 argc, const char **argv);
 	status_t _InitMouseThread(void);
 
 	status_t _AttachShell(Shell *shell);

Modified: haiku/trunk/src/apps/terminal/TermWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-16 11:49:37 UTC (rev 21978)
+++ haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-16 13:11:00 UTC (rev 21979)
@@ -9,6 +9,7 @@
 
 #include "TermWindow.h"
 
+#include "Arguments.h"
 #include "Coding.h"
 #include "ColorWindow.h"
 #include "MenuUtil.h"
@@ -55,13 +56,13 @@
 
 class CustomTermView : public TermView {
 public:
-	CustomTermView(int32 rows, int32 columns, const char *command = NULL, int32 historySize = 1000);
+	CustomTermView(int32 rows, int32 columns, int32 argc, const char **argv, int32 historySize = 1000);
 	virtual void NotifyQuit(int32 reason);
 	virtual void SetTitle(const char *title);
 };
 
 
-TermWindow::TermWindow(BRect frame, const char* title, const char *command)
+TermWindow::TermWindow(BRect frame, const char* title, Arguments *args)
 	: BWindow(frame, title, B_DOCUMENT_WINDOW, B_CURRENT_WORKSPACE|B_QUIT_ON_WINDOW_CLOSE),
 	fTabView(NULL),
 	fMenubar(NULL),
@@ -82,7 +83,8 @@
 	fMatchCase(false),
 	fMatchWord(false)
 {
-	_InitWindow(command);
+	_InitWindow();
+	_AddTab(args);
 }
 
 
@@ -105,7 +107,7 @@
 
 /** Initialize Window object. */
 void
-TermWindow::_InitWindow(const char *command)
+TermWindow::_InitWindow()
 {
 	// make menu bar
 	_SetupMenu();
@@ -115,8 +117,6 @@
 
 	fTabView = new SmartTabView(textFrame, "tab view");
 	AddChild(fTabView);
-	
-	_AddTab(command);
 }
 
 
@@ -561,7 +561,7 @@
 
 
 void
-TermWindow::_AddTab(const char *command)
+TermWindow::_AddTab(Arguments *args)
 {
 	// Setup font.
 
@@ -585,9 +585,16 @@
 	fullFont.SetSpacing(B_FIXED_SPACING);
 
 	// Make Terminal text view.
+	int argc;
+	const char *const *argv = NULL;
+	args->GetShellArguments(argc, argv);
+	
+	// Note: I don't pass the Arguments class directly to the termview,
+	// only to avoid adding it as a dependency: in other words, to keep
+	// the TermView class as agnostic as possible about the surrounding world.
 	CustomTermView *view = new CustomTermView(PrefHandler::Default()->getInt32(PREF_ROWS),
 					PrefHandler::Default()->getInt32(PREF_COLS),
-					command);
+					argc, (const char **)argv);
 	
 	BScrollView *scrollView = new BScrollView("scrollView", view, B_FOLLOW_ALL,
 					B_WILL_DRAW|B_FRAME_EVENTS, false, true);	
@@ -643,9 +650,9 @@
 
 
 // CustomTermView
-CustomTermView::CustomTermView(int32 rows, int32 columns, const char *command, int32 historySize)
+CustomTermView::CustomTermView(int32 rows, int32 columns, int32 argc, const char **argv, int32 historySize)
 	:
-	TermView(rows, columns, command, historySize)
+	TermView(rows, columns, argc, argv, historySize)
 {
 }
 

Modified: haiku/trunk/src/apps/terminal/TermWindow.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.h	2007-08-16 11:49:37 UTC (rev 21978)
+++ haiku/trunk/src/apps/terminal/TermWindow.h	2007-08-16 13:11:00 UTC (rev 21979)
@@ -35,6 +35,7 @@
 #include <Window.h>
 
 
+class Arguments;
 class BMenu;
 class BMenuBar;
 class FindWindow;
@@ -43,7 +44,7 @@
 class SmartTabView;
 class TermWindow : public BWindow {
 public:
-	TermWindow(BRect frame, const char* title, const char *command);
+	TermWindow(BRect frame, const char* title, Arguments *args);
 	virtual ~TermWindow();
 
 protected:
@@ -55,11 +56,11 @@
 
 private:
 	void		_SetTermColors(TermView *termView);
-	void		_InitWindow(const char *command);
+	void		_InitWindow();
 	void		_SetupMenu();
 	status_t	_DoPageSetup();
 	void		_DoPrint();
-	void		_AddTab(const char *command);
+	void		_AddTab(Arguments *args);
 	void		_RemoveTab(int32 index);
 	TermView*	_ActiveTermView();
 	



From stefano.ceccherini at gmail.com  Thu Aug 16 15:13:10 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 16 Aug 2007 15:13:10 +0200
Subject: [Haiku-commits] r21972 - in haiku/trunk:
	headers/private/interface src/kits/interface src/servers/app
In-Reply-To: <12110038063-BeMail@zon>
References: <a4855ac50708160500n6d3b9709ge20dd64ca2dc787e@mail.gmail.com>
	<12110038063-BeMail@zon>
Message-ID: <894b9700708160613p592b52eal9038557a77acdeb4@mail.gmail.com>

2007/8/16, Axel D?rfler <axeld at pinc-software.de>:

> Did I understand correctly that this is only used for debugging? If so,

No it's not. Although it's only used when BPicture::Play() is called
(basically, when the user wants to provide its own function table of
rendering BPictures) AND that table has less ops than needed. For
example, the user might want only to implement some functions.


From jackburton at mail.berlios.de  Thu Aug 16 15:17:00 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Thu, 16 Aug 2007 15:17:00 +0200
Subject: [Haiku-commits] r21980 - haiku/trunk/src/apps/terminal
Message-ID: <200708161317.l7GDH0vA022137@sheep.berlios.de>

Author: jackburton
Date: 2007-08-16 15:17:00 +0200 (Thu, 16 Aug 2007)
New Revision: 21980
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21980&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermApp.cpp
Log:
Removed leak


Modified: haiku/trunk/src/apps/terminal/TermApp.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermApp.cpp	2007-08-16 13:11:00 UTC (rev 21979)
+++ haiku/trunk/src/apps/terminal/TermApp.cpp	2007-08-16 13:17:00 UTC (rev 21980)
@@ -210,7 +210,7 @@
 TermApp::_MakeTermWindow(BRect &frame)
 {
 	try {
-		fTermWindow = new TermWindow(frame, fWindowTitle.String(), new Arguments(*fArgs));
+		fTermWindow = new TermWindow(frame, fWindowTitle.String(), fArgs);
 	} catch (int error) {
 		return (status_t)error;	
 	} catch (...) {



From revol at free.fr  Thu Aug 16 15:27:01 2007
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Thu, 16 Aug 2007 15:27:01 +0200 CEST
Subject: [Haiku-commits]
 =?windows-1252?q?r21972_-_in_haiku/trunk=3A_heade?=
 =?windows-1252?q?rs/private/interface_src/kits/interface_src/servers/app?=
In-Reply-To: <a4855ac50708160500n6d3b9709ge20dd64ca2dc787e@mail.gmail.com>
Message-ID: <498394638-BeMail@laptop>

> On 8/16/07, Stefano Ceccherini <stefano.ceccherini at gmail.com> wrote:
> >
> > Possible solutions:
> > - put the table local inside PicturePlayer::Play() (better)
> > - I use a lock (benaphore). It will only be used in rare cases 
> > anyway.
> > - other ?
> 
> Thread Local Storage?

Not something you can waste...

Fran?ois.


From korli at users.berlios.de  Thu Aug 16 15:21:10 2007
From: korli at users.berlios.de (=?ISO-8859-1?Q?J=E9r=F4me_Duval?=)
Date: Thu, 16 Aug 2007 15:21:10 +0200
Subject: [Haiku-commits] r21972 - in haiku/trunk:
	headers/private/interface src/kits/interface src/servers/app
In-Reply-To: <894b9700708160258h466c43c2y261fd5c2584f40a0@mail.gmail.com>
References: <200708160914.l7G9E42n018254@sheep.berlios.de>
	<31423511.1187256917054.JavaMail.ngmail@webmail11>
	<894b9700708160243v43ea6bxe6e4e2d88fb0cc31@mail.gmail.com>
	<894b9700708160258h466c43c2y261fd5c2584f40a0@mail.gmail.com>
Message-ID: <c47b1d430708160621t3420785bp8c0ed427dd267b89@mail.gmail.com>

2007/8/16, Stefano Ceccherini <stefano.ceccherini at gmail.com>:
>
> 2007/8/16, Stefano Ceccherini <stefano.ceccherini at gmail.com>:
> > 2007/8/16, Marcus Overhagen <marcusoverhagen at arcor.de >:
> >
> > > > +
> > > > +static void *
> > > > +kDummyTable[kOpsTableSize] = {
> > > > +     nop,
> > >
> > > but a static table is not thread save.
> > >
> >
> > Ouch. Thats' right.
>
> Possible solutions:
> - put the table local inside PicturePlayer::Play() (better)
> - I use a lock (benaphore). It will only be used in rare cases anyway.
> - other ?


Keep it local to the function, and eventually malloc it if you think it's
too much for the stack.

Bye,
J?r?me
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20070816/00ead8d5/attachment.html>

From stefano.ceccherini at gmail.com  Thu Aug 16 15:45:17 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Thu, 16 Aug 2007 15:45:17 +0200
Subject: [Haiku-commits] r21972 - in haiku/trunk:
	headers/private/interface src/kits/interface src/servers/app
In-Reply-To: <c47b1d430708160621t3420785bp8c0ed427dd267b89@mail.gmail.com>
References: <200708160914.l7G9E42n018254@sheep.berlios.de>
	<31423511.1187256917054.JavaMail.ngmail@webmail11>
	<894b9700708160243v43ea6bxe6e4e2d88fb0cc31@mail.gmail.com>
	<894b9700708160258h466c43c2y261fd5c2584f40a0@mail.gmail.com>
	<c47b1d430708160621t3420785bp8c0ed427dd267b89@mail.gmail.com>
Message-ID: <894b9700708160645s7dcf02dci9f391b12db7a4742@mail.gmail.com>

2007/8/16, J?r?me Duval <korli at users.berlios.de>:

> Keep it local to the function, and eventually malloc it if you think it's
> too much for the stack.

It's 48 x 4, shouldn't be so much.


From marcusoverhagen at arcor.de  Thu Aug 16 16:13:18 2007
From: marcusoverhagen at arcor.de (Marcus Overhagen)
Date: Thu, 16 Aug 2007 16:13:18 +0200 (CEST)
Subject: [Haiku-commits] r21972 - in haiku/trunk:
 headers/private/interface src/kits/interface src/servers/app
In-Reply-To: <12110038063-BeMail@zon>
References: <12110038063-BeMail@zon>
Message-ID: <20054371.1187273598377.JavaMail.ngmail@webmail11>

Axel D?rfler  <axeld at pinc-software.de> wrote:

> "Ryan Leavengood" <leavengood at gmail.com> wrote:
> > On 8/16/07, Stefano Ceccherini <stefano.ceccherini at gmail.com> wrote:
> > > Possible solutions:
> > > - put the table local inside PicturePlayer::Play() (better)
> > > - I use a lock (benaphore). It will only be used in rare cases 
> > > anyway.
> > > - other ?
> > Thread Local Storage?
> 
> Did I understand correctly that this is only used for debugging? If so, 
no you didn't ;)

> a BLocker seems like a good choice to me.

I think it's save to put it as a local variable on the stack. It's only 192 bytes.

regards
Marcus

Viel oder wenig? Schnell oder langsam? Unbegrenzt surfen + telefonieren
ohne Zeit- und Volumenbegrenzung? DAS TOP ANGEBOT F?R ALLE NEUEINSTEIGER
Jetzt bei Arcor: g?nstig und schnell mit DSL - das All-Inclusive-Paket
f?r clevere Doppel-Sparer, nur  34,95 ?  inkl. DSL- und ISDN-Grundgeb?hr!
http://www.arcor.de/rd/emf-dsl-2


From jackburton at mail.berlios.de  Thu Aug 16 16:17:20 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Thu, 16 Aug 2007 16:17:20 +0200
Subject: [Haiku-commits] r21981 - haiku/trunk/src/apps/terminal
Message-ID: <200708161417.l7GEHKLi026313@sheep.berlios.de>

Author: jackburton
Date: 2007-08-16 16:17:19 +0200 (Thu, 16 Aug 2007)
New Revision: 21981
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21981&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermView.cpp
   haiku/trunk/src/apps/terminal/TermWindow.cpp
Log:
Creating a new tab made the app crash since r21979. Use "Terminal" as 
tab label instead of "scrollView". Setting Terminal to fullscreen also 
resizes and moves the TermView a bit.


Modified: haiku/trunk/src/apps/terminal/TermView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-16 13:17:00 UTC (rev 21980)
+++ haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-16 14:17:19 UTC (rev 21981)
@@ -282,16 +282,21 @@
 	if (archive->FindInt32("rows", (int32 *)&fTermRows) < B_OK)
 		fTermRows = 25;
 	
-	const char *argv[] = { "/bin/sh", "--login" };
-
 	// TODO: Retrieve arguments, colors, history size, etc. from archive
-	_InitObject(2, argv);
+	_InitObject(0, NULL);
 }
 
 
 status_t
 TermView::_InitObject(int32 argc, const char **argv)
 {
+	const char *defaultArgv[] = { "/bin/sh", "--login" };
+
+	if (argc == 0 || argv == NULL) {
+		argc = 2;
+		argv = defaultArgv;	
+	}
+	
 	SetTermFont(be_fixed_font, be_fixed_font);
 
 	fTextBuffer = new (std::nothrow) TermBuffer(fTermRows, fTermColumns, fScrBufSize);

Modified: haiku/trunk/src/apps/terminal/TermWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-16 13:17:00 UTC (rev 21980)
+++ haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-16 14:17:19 UTC (rev 21981)
@@ -418,7 +418,8 @@
 				BScreen screen(this);
 				_ActiveTermView()->ScrollBar()->Hide();
 				fMenubar->Hide();
-				_ActiveTermView()->ResizeBy(B_V_SCROLL_BAR_WIDTH, mbHeight);
+				fTabView->ResizeBy(0, mbHeight);
+				fTabView->MoveBy(0, -mbHeight);
 				fSavedLook = Look();
 				// done before ResizeTo to work around a Dano bug (not erasing the decor)
 				SetLook(B_NO_BORDER_WINDOW_LOOK);
@@ -430,7 +431,8 @@
 				_ActiveTermView()->ScrollBar()->Show();
 				ResizeTo(fSavedFrame.Width(), fSavedFrame.Height());
 				MoveTo(fSavedFrame.left, fSavedFrame.top);
-				_ActiveTermView()->ResizeBy(-B_V_SCROLL_BAR_WIDTH, -mbHeight);
+				fTabView->ResizeBy(0, -mbHeight);
+				fTabView->MoveBy(0, mbHeight);
 				SetLook(fSavedLook);
 				fSavedFrame = BRect(0,0,-1,-1);
 			}
@@ -585,9 +587,10 @@
 	fullFont.SetSpacing(B_FIXED_SPACING);
 
 	// Make Terminal text view.
-	int argc;
+	int argc = 0;
 	const char *const *argv = NULL;
-	args->GetShellArguments(argc, argv);
+	if (args != NULL)
+		args->GetShellArguments(argc, argv);
 	
 	// Note: I don't pass the Arguments class directly to the termview,
 	// only to avoid adding it as a dependency: in other words, to keep
@@ -598,7 +601,13 @@
 	
 	BScrollView *scrollView = new BScrollView("scrollView", view, B_FOLLOW_ALL,
 					B_WILL_DRAW|B_FRAME_EVENTS, false, true);	
-	fTabView->AddTab(scrollView);
+	
+	BTab *tab = new BTab;
+	// TODO: Use a better name. For example, do like MacOsX's Terminal
+	// and update the title using the last executed command ?
+	// Or like Gnome's Terminal and use the current path ?
+	fTabView->AddTab(scrollView, tab);
+	tab->SetLabel("Terminal");
 	view->SetScrollBar(scrollView->ScrollBar(B_VERTICAL));
 	
 	// TODO: Resize the vertical scrollbar to take the window gripping handle into account



From jackburton at mail.berlios.de  Thu Aug 16 16:40:04 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Thu, 16 Aug 2007 16:40:04 +0200
Subject: [Haiku-commits] r21982 - in haiku/trunk: headers/os/interface
	headers/private/interface src/kits/interface src/servers/app
Message-ID: <200708161440.l7GEe4c4029194@sheep.berlios.de>

Author: jackburton
Date: 2007-08-16 16:40:03 +0200 (Thu, 16 Aug 2007)
New Revision: 21982
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21982&view=rev

Modified:
   haiku/trunk/headers/os/interface/Shape.h
   haiku/trunk/headers/private/interface/PicturePlayer.h
   haiku/trunk/src/kits/interface/Picture.cpp
   haiku/trunk/src/kits/interface/PicturePlayer.cpp
   haiku/trunk/src/servers/app/ServerPicture.cpp
Log:
Moved the dummy table local to the PicturePlayer::Play() function since, 
as Marcus pointed out, having it outside wasn't thread safe. Moved 
PicturePlayer into the BPrivate namespace.


Modified: haiku/trunk/headers/os/interface/Shape.h
===================================================================
--- haiku/trunk/headers/os/interface/Shape.h	2007-08-16 14:17:19 UTC (rev 21981)
+++ haiku/trunk/headers/os/interface/Shape.h	2007-08-16 14:40:03 UTC (rev 21982)
@@ -11,6 +11,7 @@
 
 namespace BPrivate {
 	class ServerLink;
+	class PicturePlayer;
 };
 
 
@@ -75,9 +76,9 @@
 virtual	void			_ReservedShape4();
 
 		friend class	BShapeIterator;
-		friend class	PicturePlayer;
 		friend class	BView;
 		friend class	BFont;
+		friend class	BPrivate::PicturePlayer;
 		friend class	BPrivate::ServerLink;
 
 		void			GetData(int32 *opCount, int32 *ptCount, uint32 **opList, BPoint **ptList);

Modified: haiku/trunk/headers/private/interface/PicturePlayer.h
===================================================================
--- haiku/trunk/headers/private/interface/PicturePlayer.h	2007-08-16 14:17:19 UTC (rev 21981)
+++ haiku/trunk/headers/private/interface/PicturePlayer.h	2007-08-16 14:40:03 UTC (rev 21982)
@@ -4,14 +4,14 @@
  *
  * Authors:
  *		Marc Flerackers (mflerackers at androme.be)
- *		Stefano Ceccherini (burton666 at libero.it)
+ *		Stefano Ceccherini (stefano.ceccherini at gmail.com)
  *		Marcus Overhagen (marcus at overhagen.de)
  */
 
 /**	PicturePlayer is used to play picture data. */
 
-#ifndef	_TPICTURE_H
-#define	_TPICTURE_H
+#ifndef	_PICTUREPLAYER_H
+#define	_PICTUREPLAYER_H
 
 
 #include <GraphicsDefs.h>
@@ -20,21 +20,14 @@
 #include <DataIO.h>
 
 
+namespace BPrivate {
+
 class PicturePlayer {
 public:
 					PicturePlayer();
 					PicturePlayer(const void *data, size_t size, BList *pictures);
 virtual				~PicturePlayer();
 
-		void		BeginOp(int32);
-		void		EndOp();
-
-		void		EnterStateChange();
-		void		ExitStateChange();
-
-		void		EnterFontChange();
-		void		ExitFontChange();
-
 		status_t	Play(void **callBackTable, int32 tableEntries,
 						void *userData);
 
@@ -44,4 +37,6 @@
 		BList		*fPictures;
 };
 
-#endif // _TPICTURE_H
+}; // namespace BPrivate
+
+#endif // _PICTUREPLAYER_H

Modified: haiku/trunk/src/kits/interface/Picture.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Picture.cpp	2007-08-16 14:17:19 UTC (rev 21981)
+++ haiku/trunk/src/kits/interface/Picture.cpp	2007-08-16 14:40:03 UTC (rev 21982)
@@ -252,7 +252,7 @@
 	if (!_AssertLocalCopy())
 		return B_ERROR;
 
-	PicturePlayer player(extent->Data(), extent->Size(), extent->Pictures());
+	BPrivate::PicturePlayer player(extent->Data(), extent->Size(), extent->Pictures());
 
 	return player.Play(callBackTable, tableEntries, user);
 }

Modified: haiku/trunk/src/kits/interface/PicturePlayer.cpp
===================================================================
--- haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-16 14:17:19 UTC (rev 21981)
+++ haiku/trunk/src/kits/interface/PicturePlayer.cpp	2007-08-16 14:40:03 UTC (rev 21982)
@@ -18,6 +18,8 @@
 
 #include <Shape.h>
 
+using BPrivate::PicturePlayer;
+
 typedef void (*fnc)(void*);
 typedef void (*fnc_BPoint)(void*, BPoint);
 typedef void (*fnc_BPointBPoint)(void*, BPoint, BPoint);
@@ -49,59 +51,6 @@
 }
 
 
-static void *
-kDummyTable[kOpsTableSize] = {
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop,
-	(void *)nop
-};
-
-
 #if DEBUG
 static const char *
 PictureOpToString(int op)
@@ -193,11 +142,26 @@
 	// If the caller supplied a function table smaller than needed,
 	// we use our dummy table, and copy the supported ops from the supplied one.
 	void **functionTable = callBackTable;
+	void *dummyTable[kOpsTableSize] = {
+		(void *)nop, (void *)nop, (void *)nop, (void *)nop,
+		(void *)nop, (void *)nop, (void *)nop, (void *)nop,
+		(void *)nop, (void *)nop, (void *)nop, (void *)nop,
+		(void *)nop, (void *)nop, (void *)nop, (void *)nop,
+		(void *)nop, (void *)nop, (void *)nop, (void *)nop,
+		(void *)nop, (void *)nop, (void *)nop, (void *)nop,
+		(void *)nop, (void *)nop, (void *)nop, (void *)nop,
+		(void *)nop, (void *)nop, (void *)nop, (void *)nop,
+		(void *)nop, (void *)nop, (void *)nop, (void *)nop,
+		(void *)nop, (void *)nop, (void *)nop, (void *)nop,
+		(void *)nop, (void *)nop, (void *)nop, (void *)nop,
+		(void *)nop, (void *)nop, (void *)nop, (void *)nop
+	};
+
 	if ((uint32)tableEntries < kOpsTableSize) {
 #if DEBUG
 		fprintf(file, "A smaller than needed function table was supplied.\n");
 #endif
-		functionTable = kDummyTable;
+		functionTable = dummyTable;
 		memcpy(functionTable, callBackTable, (kOpsTableSize - tableEntries) * sizeof(void *));		
 	}
 

Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-16 14:17:19 UTC (rev 21981)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-16 14:40:03 UTC (rev 21982)
@@ -908,7 +908,7 @@
 	if (mallocIO == NULL)
 		return;
 
-	PicturePlayer player(mallocIO->Buffer(), mallocIO->BufferLength(), fPictures);
+	BPrivate::PicturePlayer player(mallocIO->Buffer(), mallocIO->BufferLength(), fPictures);
 	player.Play(const_cast<void **>(kTableEntries), sizeof(kTableEntries) / sizeof(void *), view);
 }
 



From axeld at mail.berlios.de  Thu Aug 16 17:11:59 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 16 Aug 2007 17:11:59 +0200
Subject: [Haiku-commits] r21983 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200708161511.l7GFBxmf032047@sheep.berlios.de>

Author: axeld
Date: 2007-08-16 17:11:58 +0200 (Thu, 16 Aug 2007)
New Revision: 21983
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21983&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_thread.c
Log:
* arch_restore_signal_frame() accessed user memory unsafely; it now also copies the (pretty
  large) vregs structure to the stack.
* Introduced a get_signal_stack() function that arch_setup_signal_frame() now uses to setup
  the signal frame - it currently only returns the default user thread stack. Also made
  sure arch_setup_signal_frame() is independent from the user stack.
* Minor cleanup.


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_thread.c
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_thread.c	2007-08-16 14:40:03 UTC (rev 21982)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_thread.c	2007-08-16 15:11:58 UTC (rev 21983)
@@ -155,6 +155,16 @@
 }
 
 
+static uint32 *
+get_signal_stack(struct thread *thread, struct iframe *frame, int signal)
+{
+	return (uint32 *)frame->user_esp;
+}
+
+
+//	#pragma mark -
+
+
 status_t
 arch_team_init_team_struct(struct team *p, bool kernel)
 {
@@ -351,33 +361,37 @@
 
 
 status_t
-arch_setup_signal_frame(struct thread *t, struct sigaction *sa, int sig, int sig_mask)
+arch_setup_signal_frame(struct thread *thread, struct sigaction *sa,
+	int signal, int signalMask)
 {
 	struct iframe *frame = i386_get_current_iframe();
-	uint32 *stack_ptr = (uint32 *)frame->user_esp;
-	uint32 *code_ptr;
-	uint32 *regs_ptr;
+	uint32 *userStack = (uint32 *)frame->user_esp;
+	uint32 *signalCode;
+	uint32 *userRegs;
 	struct vregs regs;
-	uint32 stack_buf[6];
+	uint32 buffer[6];
 	status_t status;
 
 	if (frame->orig_eax >= 0) {
 		// we're coming from a syscall
-		if ((status_t)frame->eax == EINTR && (sa->sa_flags & SA_RESTART) != 0) {
-			TRACE(("### restarting syscall %d after signal %d\n", frame->orig_eax, sig));
+		if ((status_t)frame->eax == EINTR
+			&& (sa->sa_flags & SA_RESTART) != 0) {
+			TRACE(("### restarting syscall %d after signal %d\n",
+				frame->orig_eax, sig));
 			frame->eax = frame->orig_eax;
 			frame->edx = frame->orig_edx;
 			frame->eip -= 2;
-				// undos the "int $99" syscall interrupt (so that it'll be called again)
+				// undos the "int $99" syscall interrupt
+				// (so that it'll be called again)
 		}
 	}
 
 	// start stuffing stuff on the user stack
-	stack_ptr = (uint32 *)frame->user_esp;
+	userStack = get_signal_stack(thread, frame, signal);
 
 	// store the saved regs onto the user stack
-	stack_ptr -= ROUNDUP(sizeof(struct vregs) / 4, 4);
-	regs_ptr = stack_ptr;
+	userStack -= ROUNDUP(sizeof(struct vregs) / 4, 4);
+	userRegs = userStack;
 	regs.eip = frame->eip;
 	regs.eflags = frame->flags;
 	regs.eax = frame->eax;
@@ -390,34 +404,36 @@
 	regs._reserved_2[2] = frame->ebp;
 	i386_fnsave((void *)(&regs.xregs));
 	
-	status = user_memcpy(stack_ptr, &regs, sizeof(regs));
+	status = user_memcpy(userRegs, &regs, sizeof(regs));
 	if (status < B_OK)
 		return status;
 
 	// now store a code snippet on the stack
-	stack_ptr -= ((uint32)i386_end_return_from_signal - (uint32)i386_return_from_signal) / 4;
-	code_ptr = stack_ptr;
-	status = user_memcpy(code_ptr, i386_return_from_signal,
-		((uint32)i386_end_return_from_signal - (uint32)i386_return_from_signal));
-	if (status < 0)
+	userStack -= ((uint32)i386_end_return_from_signal
+		- (uint32)i386_return_from_signal) / 4;
+	signalCode = userStack;
+	status = user_memcpy(signalCode, i386_return_from_signal,
+		((uint32)i386_end_return_from_signal
+			- (uint32)i386_return_from_signal));
+	if (status < B_OK)
 		return status;
 
 	// now set up the final part
-	stack_buf[0] = (uint32)code_ptr;	// return address when sa_handler done
-	stack_buf[1] = sig;					// first argument to sa_handler
-	stack_buf[2] = (uint32)sa->sa_userdata;// second argument to sa_handler
-	stack_buf[3] = (uint32)regs_ptr;	// third argument to sa_handler
+	buffer[0] = (uint32)signalCode;	// return address when sa_handler done
+	buffer[1] = signal;				// first argument to sa_handler
+	buffer[2] = (uint32)sa->sa_userdata; // second argument to sa_handler
+	buffer[3] = (uint32)userRegs;	// third argument to sa_handler
 
-	stack_buf[4] = sig_mask;			// Old signal mask to restore
-	stack_buf[5] = (uint32)regs_ptr;	// Int frame + extra regs to restore
+	buffer[4] = signalMask;			// Old signal mask to restore
+	buffer[5] = (uint32)userRegs;	// Int frame + extra regs to restore
 
-	stack_ptr -= sizeof(stack_buf) / 4;
+	userStack -= sizeof(buffer) / 4;
 
-	status = user_memcpy(stack_ptr, stack_buf, sizeof(stack_buf));
-	if (status < 0)
+	status = user_memcpy(userStack, buffer, sizeof(buffer));
+	if (status < B_OK)
 		return status;
 
-	frame->user_esp = (uint32)stack_ptr;
+	frame->user_esp = (uint32)userStack;
 	frame->eip = (uint32)sa->sa_handler;
 
 	return B_OK;
@@ -429,28 +445,33 @@
 {
 	struct thread *thread = thread_get_current_thread();
 	struct iframe *frame = i386_get_current_iframe();
-	uint32 *stack;
-	struct vregs *regs;
+	int32 signalMask;
+	uint32 *userStack;
+	struct vregs regs;
 
 	TRACE(("### arch_restore_signal_frame: entry\n"));
 
-	stack = (uint32 *)frame->user_esp;
-	atomic_set(&thread->sig_block_mask, stack[0]);
-	regs = (struct vregs *)stack[1];
+	userStack = (uint32 *)frame->user_esp;
+	if (user_memcpy(&signalMask, &userStack[0], sizeof(int32)) < B_OK
+		|| user_memcpy(&regs, (struct vregs *)userStack[1],
+				sizeof(vregs)) < B_OK)
+		return B_BAD_ADDRESS;
 
-	frame->eip = regs->eip;
-	frame->flags = regs->eflags;
-	frame->eax = regs->eax;
-	frame->ecx = regs->ecx;
-	frame->edx = regs->edx;
-	frame->esp = regs->esp;
-	frame->user_esp = regs->_reserved_1;
-	frame->edi = regs->_reserved_2[0];
-	frame->esi = regs->_reserved_2[1];
-	frame->ebp = regs->_reserved_2[2];
+	atomic_set(&thread->sig_block_mask, signalMask);
 
-	i386_frstor((void *)(&regs->xregs));
+	frame->eip = regs.eip;
+	frame->flags = regs.eflags;
+	frame->eax = regs.eax;
+	frame->ecx = regs.ecx;
+	frame->edx = regs.edx;
+	frame->esp = regs.esp;
+	frame->user_esp = regs._reserved_1;
+	frame->edi = regs._reserved_2[0];
+	frame->esi = regs._reserved_2[1];
+	frame->ebp = regs._reserved_2[2];
 
+	i386_frstor((void *)(&regs.xregs));
+
 	TRACE(("### arch_restore_signal_frame: exit\n"));
 
 	frame->orig_eax = -1;	/* disable syscall checks */



From jackburton at mail.berlios.de  Thu Aug 16 17:32:10 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Thu, 16 Aug 2007 17:32:10 +0200
Subject: [Haiku-commits] r21984 - haiku/trunk/src/apps/terminal
Message-ID: <200708161532.l7GFWArb001055@sheep.berlios.de>

Author: jackburton
Date: 2007-08-16 17:32:09 +0200 (Thu, 16 Aug 2007)
New Revision: 21984
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21984&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermWindow.cpp
   haiku/trunk/src/apps/terminal/TermWindow.h
Log:
Use a try { } catch block in TermWindow::_AddTab(). Note that this 
doesn't fix bug #1392, since TermView::_InitObject() use std::nothrow 
for allocations. Added TermWindow::_GetPreferredFonts() and moved some 
code in there.


Modified: haiku/trunk/src/apps/terminal/TermWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-16 15:11:58 UTC (rev 21983)
+++ haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-16 15:32:09 UTC (rev 21984)
@@ -200,6 +200,28 @@
 
 
 void
+TermWindow::_GetPreferredFonts(BFont &fullFont, BFont &halfFont)
+{
+	const char *family = PrefHandler::Default()->getString(PREF_HALF_FONT_FAMILY);
+
+	halfFont.SetFamilyAndStyle(family, NULL);
+	float size = PrefHandler::Default()->getFloat(PREF_HALF_FONT_SIZE);
+	if (size < 6.0f)
+		size = 6.0f;
+	halfFont.SetSize(size);
+	
+	family = PrefHandler::Default()->getString(PREF_FULL_FONT_FAMILY);
+
+	fullFont.SetFamilyAndStyle(family, NULL);
+	size = PrefHandler::Default()->getFloat(PREF_FULL_FONT_SIZE);
+	if (size < 6.0f)
+		size = 6.0f;
+	fullFont.SetSize(size);
+	fullFont.SetSpacing(B_FIXED_SPACING);
+}
+
+
+void
 TermWindow::MessageReceived(BMessage *message)
 {
 	int32 encodingId;
@@ -565,79 +587,66 @@
 void
 TermWindow::_AddTab(Arguments *args)
 {
-	// Setup font.
-
-	const char *family = PrefHandler::Default()->getString(PREF_HALF_FONT_FAMILY);
-
-	BFont halfFont;
-	halfFont.SetFamilyAndStyle(family, NULL);
-	float size = PrefHandler::Default()->getFloat(PREF_HALF_FONT_SIZE);
-	if (size < 6.0f)
-		size = 6.0f;
-	halfFont.SetSize(size);
-	
-	family = PrefHandler::Default()->getString(PREF_FULL_FONT_FAMILY);
-
-	BFont fullFont;
-	fullFont.SetFamilyAndStyle(family, NULL);
-	size = PrefHandler::Default()->getFloat(PREF_FULL_FONT_SIZE);
-	if (size < 6.0f)
-		size = 6.0f;
-	fullFont.SetSize(size);
-	fullFont.SetSpacing(B_FIXED_SPACING);
-
-	// Make Terminal text view.
 	int argc = 0;
 	const char *const *argv = NULL;
 	if (args != NULL)
 		args->GetShellArguments(argc, argv);
 	
-	// Note: I don't pass the Arguments class directly to the termview,
-	// only to avoid adding it as a dependency: in other words, to keep
-	// the TermView class as agnostic as possible about the surrounding world.
-	CustomTermView *view = new CustomTermView(PrefHandler::Default()->getInt32(PREF_ROWS),
-					PrefHandler::Default()->getInt32(PREF_COLS),
-					argc, (const char **)argv);
+	try {
+		// Note: I don't pass the Arguments class directly to the termview,
+		// only to avoid adding it as a dependency: in other words, to keep
+		// the TermView class as agnostic as possible about the surrounding world.
+		CustomTermView *view = 
+			new CustomTermView(PrefHandler::Default()->getInt32(PREF_ROWS),
+							PrefHandler::Default()->getInt32(PREF_COLS),
+							argc, (const char **)argv);
+		
+		BScrollView *scrollView = new BScrollView("scrollView", view, B_FOLLOW_ALL,
+									B_WILL_DRAW|B_FRAME_EVENTS, false, true);	
+		
+		BTab *tab = new BTab;
+		// TODO: Use a better name. For example, do like MacOsX's Terminal
+		// and update the title using the last executed command ?
+		// Or like Gnome's Terminal and use the current path ?
+		fTabView->AddTab(scrollView, tab);
+		tab->SetLabel("Terminal");
+		view->SetScrollBar(scrollView->ScrollBar(B_VERTICAL));
+		
+		// Resize the vertical scrollbar to take the window gripping handle into account
+		// TODO: shouldn't this be done in BScrollView itself ? At least BScrollBar does that.	
+		scrollView->ScrollBar(B_VERTICAL)->ResizeBy(0, -13);
+		
+		view->SetEncoding(longname2id(PrefHandler::Default()->getString(PREF_TEXT_ENCODING)));
+		
+		BFont fullFont, halfFont;
+		_GetPreferredFonts(fullFont, halfFont);	
+		view->SetTermFont(&halfFont, &fullFont);
+		
+		_SetTermColors(view);
+		
+		// If it's the first time we're called, setup the window
+		if (fTabView->CountTabs() == 1) {
+			int width, height;
+			view->GetFontSize(&width, &height);
+			SetSizeLimits(MIN_COLS * width, MAX_COLS * width,
+				MIN_COLS * height, MAX_COLS * height);
+		
+			float fWidth, fHeight;
+			view->GetPreferredSize(&fWidth, &fHeight);
+			
+			// Resize Window
+			ResizeTo(fWidth + B_V_SCROLL_BAR_WIDTH, fHeight + fMenubar->Bounds().Height());
 	
-	BScrollView *scrollView = new BScrollView("scrollView", view, B_FOLLOW_ALL,
-					B_WILL_DRAW|B_FRAME_EVENTS, false, true);	
+			// TODO: If I don't do this, the view won't show up.
+			// Bug in BTabView or in my code ?
+			fTabView->Select(0);
+		}
+	} catch (...) {
+		// most probably out of memory. That's bad.
+		// TODO: Should cleanup, I guess
+	}
+}	
 	
-	BTab *tab = new BTab;
-	// TODO: Use a better name. For example, do like MacOsX's Terminal
-	// and update the title using the last executed command ?
-	// Or like Gnome's Terminal and use the current path ?
-	fTabView->AddTab(scrollView, tab);
-	tab->SetLabel("Terminal");
-	view->SetScrollBar(scrollView->ScrollBar(B_VERTICAL));
-	
-	// TODO: Resize the vertical scrollbar to take the window gripping handle into account
-	// (shouldn't this be done in BScrollView itself ? At least BScrollBar does that).	
-	scrollView->ScrollBar(B_VERTICAL)->ResizeBy(0, -13);
-	view->SetEncoding(longname2id(PrefHandler::Default()->getString(PREF_TEXT_ENCODING)));
-	view->SetTermFont(&halfFont, &fullFont);
-	
-	_SetTermColors(view);
-	
-	// If it's the first time we're called, setup the window
-	if (fTabView->CountTabs() == 1) {
-		int width, height;
-		view->GetFontSize(&width, &height);
-		SetSizeLimits(MIN_COLS * width, MAX_COLS * width,
-			MIN_COLS * height, MAX_COLS * height);
-	
-		float fWidth, fHeight;
-		view->GetPreferredSize(&fWidth, &fHeight);
-		
-		// Resize Window
-		ResizeTo(fWidth + B_V_SCROLL_BAR_WIDTH, fHeight + fMenubar->Bounds().Height());
-
-		// TODO: If I don't do this, the view won't show up.
-		// Bug in BTabView or in my code ?
-		fTabView->Select(0);
-	}
-}
-
-
 void
 TermWindow::_RemoveTab(int32 index)
 {

Modified: haiku/trunk/src/apps/terminal/TermWindow.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.h	2007-08-16 15:11:58 UTC (rev 21983)
+++ haiku/trunk/src/apps/terminal/TermWindow.h	2007-08-16 15:32:09 UTC (rev 21984)
@@ -58,6 +58,7 @@
 	void		_SetTermColors(TermView *termView);
 	void		_InitWindow();
 	void		_SetupMenu();
+	void		_GetPreferredFonts(BFont &full, BFont &half);
 	status_t	_DoPageSetup();
 	void		_DoPrint();
 	void		_AddTab(Arguments *args);



From jackburton at mail.berlios.de  Thu Aug 16 17:36:43 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Thu, 16 Aug 2007 17:36:43 +0200
Subject: [Haiku-commits] r21985 - haiku/trunk/src/apps/terminal
Message-ID: <200708161536.l7GFah2t001711@sheep.berlios.de>

Author: jackburton
Date: 2007-08-16 17:36:42 +0200 (Thu, 16 Aug 2007)
New Revision: 21985
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21985&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermWindow.cpp
Log:
Also use _GetPreferredFonts() in the other place when we read the fonts 
from the preferences


Modified: haiku/trunk/src/apps/terminal/TermWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-16 15:32:09 UTC (rev 21984)
+++ haiku/trunk/src/apps/terminal/TermWindow.cpp	2007-08-16 15:36:42 UTC (rev 21985)
@@ -209,7 +209,8 @@
 	if (size < 6.0f)
 		size = 6.0f;
 	halfFont.SetSize(size);
-	
+	halfFont.SetSpacing(B_FIXED_SPACING);
+
 	family = PrefHandler::Default()->getString(PREF_FULL_FONT_FAMILY);
 
 	fullFont.SetFamilyAndStyle(family, NULL);
@@ -225,8 +226,6 @@
 TermWindow::MessageReceived(BMessage *message)
 {
 	int32 encodingId;
-	BFont halfFont;
-	BFont fullFont;
 	bool findresult;
   
 	switch (message->what) {
@@ -379,17 +378,10 @@
 		case MSG_HALF_SIZE_CHANGED:
 		case MSG_FULL_SIZE_CHANGED: 
 		{
-	
-			halfFont.SetFamilyAndStyle (PrefHandler::Default()->getString(PREF_HALF_FONT_FAMILY),NULL);
-			halfFont.SetSize (PrefHandler::Default()->getFloat(PREF_HALF_FONT_SIZE));
-			halfFont.SetSpacing (B_FIXED_SPACING);
-			
-			fullFont.SetFamilyAndStyle (PrefHandler::Default()->getString(PREF_FULL_FONT_FAMILY),NULL);
-			fullFont.SetSize (PrefHandler::Default()->getFloat(PREF_FULL_FONT_SIZE));
-			fullFont.SetSpacing (B_FIXED_SPACING);
-			
+			BFont halfFont, fullFont;
+			_GetPreferredFonts(fullFont, halfFont);			
 			_ActiveTermView()->SetTermFont (&halfFont, &fullFont);
-			BRect rect = _ActiveTermView()->SetTermSize (0, 0, 0);
+			BRect rect = _ActiveTermView()->SetTermSize(0, 0, 0);
 			
 			int width, height;
 			_ActiveTermView()->GetFontSize(&width, &height);



From leavengood at gmail.com  Thu Aug 16 18:03:54 2007
From: leavengood at gmail.com (Ryan Leavengood)
Date: Thu, 16 Aug 2007 12:03:54 -0400
Subject: [Haiku-commits] r21975 - in haiku/trunk: headers/posix
	src/system/libroot/posix/malloc
In-Reply-To: <13231203.1187265292149.JavaMail.ngmail@webmail11>
References: <4721374408-BeMail@zon>
	<13231203.1187265292149.JavaMail.ngmail@webmail11>
Message-ID: <a4855ac50708160903n7ee363d6y24a14930812e812c@mail.gmail.com>

On 8/16/07, Marcus Overhagen <marcusoverhagen at arcor.de> wrote:
>
> Because in all documentation i've seen, it's using this prototype,
> and I think refereing to the name from documentation makes it
> better.
>
> int posix_memalign(void **memptr, size_t alignment, size_t size);

I agree with Marcus.

In addition, I think korli's original use of EINVAL and ENOMEM is more
standard too. Unless B_BAD_VALUE and B_NO_MEMORY have the same values.
Some references:

http://www.opengroup.org/onlinepubs/000095399/functions/posix_memalign.html
http://linux.die.net/man/3/posix_memalign

Regards,
Ryan


From axeld at pinc-software.de  Thu Aug 16 18:55:44 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Thu, 16 Aug 2007 18:55:44 +0200 CEST
Subject: [Haiku-commits]
 =?iso-8859-15?q?r21975_-_in_haiku/trunk=3A_header?=
 =?iso-8859-15?q?s/posix_src/system/libroot/posix/malloc?=
In-Reply-To: <a4855ac50708160903n7ee363d6y24a14930812e812c@mail.gmail.com>
Message-ID: <26598364635-BeMail@zon>

"Ryan Leavengood" <leavengood at gmail.com> wrote:
> On 8/16/07, Marcus Overhagen <marcusoverhagen at arcor.de> wrote:
> > Because in all documentation i've seen, it's using this prototype,
> > and I think refereing to the name from documentation makes it
> > better.
> I agree with Marcus.

Well, I don't; I don't see any advantage in copying their naming 
scheme. It's just one source of documentation, anyway.

> In addition, I think korli's original use of EINVAL and ENOMEM is 
> more
> standard too. Unless B_BAD_VALUE and B_NO_MEMORY have the same 
> values.

Of course they have the same values, but thanks for the note :-)

Bye,
   Axel.



From axeld at mail.berlios.de  Thu Aug 16 19:05:15 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 16 Aug 2007 19:05:15 +0200
Subject: [Haiku-commits] r21986 - haiku/trunk/headers/posix
Message-ID: <200708161705.l7GH5FDx016277@sheep.berlios.de>

Author: axeld
Date: 2007-08-16 19:05:14 +0200 (Thu, 16 Aug 2007)
New Revision: 21986
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21986&view=rev

Modified:
   haiku/trunk/headers/posix/signal.h
Log:
Cleanup.


Modified: haiku/trunk/headers/posix/signal.h
===================================================================
--- haiku/trunk/headers/posix/signal.h	2007-08-16 15:36:42 UTC (rev 21985)
+++ haiku/trunk/headers/posix/signal.h	2007-08-16 17:05:14 UTC (rev 21986)
@@ -1,8 +1,9 @@
+/*
+ * Copyright 2002-2007, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef _SIGNAL_H_
 #define _SIGNAL_H_
-/* 
-** Distributed under the terms of the OpenBeOS License.
-*/
 
 
 #include <sys/types.h>
@@ -16,7 +17,7 @@
 
 
 typedef union sigval {
-	int	sival_int;
+	int		sival_int;
 	void	*sival_ptr;
 } sigval_t;
 
@@ -31,7 +32,7 @@
 	void	*si_addr;	/* address of faulting instruction */
 	int		si_status;	/* exit value or signal */
 	long	si_band;	/* band event for SIGPOLL */
-	union sigval  	si_value;	/* signal value */
+	union sigval si_value;	/* signal value */
 } siginfo_t;
 
 
@@ -59,28 +60,24 @@
 };
 
 
-/*
- * values for sa_flags
- */
-#define SA_NOCLDSTOP  0x01
-#define SA_ONESHOT    0x02
-#define SA_NOMASK     0x04
-#define SA_NODEFER    SA_NOMASK
-#define SA_RESTART    0x08
-#define SA_STACK	0x10
-#define SA_ONSTACK      SA_STACK
+/* values for sa_flags */
+#define SA_NOCLDSTOP	0x01
+#define SA_ONESHOT		0x02
+#define SA_NOMASK		0x04
+#define SA_NODEFER		SA_NOMASK
+#define SA_RESTART		0x08
+#define SA_STACK		0x10
+#define SA_ONSTACK		SA_STACK
 #define SA_RESETHAND	0x20
-#define SA_SIGINFO	0x40
+#define SA_SIGINFO		0x40
 #define SA_NOCLDWAIT	0x80
 
-/*
- * values for ss_flags
- */
-#define SS_ONSTACK	0x1
-#define SS_DISABLE	0x2
+/* values for ss_flags */
+#define SS_ONSTACK		0x1
+#define SS_DISABLE		0x2
 
-#define MINSIGSTKSZ	4096
-#define SIGSTKSZ	16384
+#define MINSIGSTKSZ		4096
+#define SIGSTKSZ		16384
 
 /*
  * for signals using an alternate stack
@@ -88,7 +85,7 @@
 typedef struct stack_t {
 	void	*ss_sp;
 	size_t	ss_size;
-	int	ss_flags;
+	int		ss_flags;
 } stack_t;
 
 typedef struct sigstack {
@@ -96,14 +93,11 @@
 	void	*ss_sp;
 } sigstack;
 
-/*
- * for the 'how' arg of sigprocmask()
- */
+/* for the 'how' arg of sigprocmask() */
 #define SIG_BLOCK    1
 #define SIG_UNBLOCK  2
 #define SIG_SETMASK  3
 
-
 /*
  * The list of all defined signals:
  *
@@ -141,9 +135,8 @@
 #define SIGXCPU		28	/* CPU time limit exceeded */
 #define SIGXFSZ		29	/* File size limit exceeded */
 
-#define SIGBUS     SIGSEGV /* for old style code */
+#define SIGBUS		SIGSEGV /* for old style code */
 
-
 /*
  * Signal numbers 30-32 are currently free but may be used in future
  * releases.  Use them at your own peril (if you do use them, at least
@@ -181,13 +174,11 @@
 
 const char *strsignal(int sig);
 
-void        set_signal_stack(void *ptr, size_t size);
-int         sigaltstack(const stack_t *ss, stack_t *oss);         /* XXXdbg */
+void	set_signal_stack(void *ptr, size_t size);
+int		sigaltstack(const stack_t *ss, stack_t *oss);
 
-/* 
- * pthread extension : equivalent of sigprocmask() 
- */
-extern int pthread_sigmask(int how, const sigset_t *set, sigset_t *oset); 
+/* pthread extension : equivalent of sigprocmask()  */
+int		pthread_sigmask(int how, const sigset_t *set, sigset_t *oset); 
 
 extern inline int
 sigismember(const sigset_t *set, int sig)
@@ -253,7 +244,7 @@
  *
  * The two additional arguments available to the signal handler are extensions
  * to the Posix standard. This feature was introduced by the BeOS and retained
- * by OpenBeOS. However, to remain compatible with Posix and ANSI C, the type
+ * by Haiku. However, to remain compatible with Posix and ANSI C, the type
  * of the sa_handler field is defined as 'sig_func_t'. This requires the handler
  * to be cast when assigned to the sa_handler field, as in the example above.
  *
@@ -261,7 +252,7 @@
  * This is because they expect a "this" pointer as the first argument.
  *
  *
- * The 3 arguments that OpenBeOS provides to signal handlers are as follows:
+ * The 3 arguments that Haiku provides to signal handlers are as follows:
  *
  *  - The first argument is the (usual) signal number.
  *
@@ -287,6 +278,7 @@
 
 typedef struct vregs vregs;
 
+// TODO: move those into an architecture specific header
 #if __POWERPC__
 struct vregs
 {



From korli at mail.berlios.de  Thu Aug 16 19:36:59 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Thu, 16 Aug 2007 19:36:59 +0200
Subject: [Haiku-commits] r21987 - haiku/trunk/src/kits/app
Message-ID: <200708161736.l7GHax03029162@sheep.berlios.de>

Author: korli
Date: 2007-08-16 19:36:58 +0200 (Thu, 16 Aug 2007)
New Revision: 21987
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21987&view=rev

Modified:
   haiku/trunk/src/kits/app/Roster.cpp
Log:
Tracker seems to launch applications with a B_REFS_RECEIVED message in the initial message list.
Now checks if such a message is present and avoids sending B_SILENT_RELAUNCH in this case, and also in the standard case with a ref.
This fixes bug #1387


Modified: haiku/trunk/src/kits/app/Roster.cpp
===================================================================
--- haiku/trunk/src/kits/app/Roster.cpp	2007-08-16 17:05:14 UTC (rev 21986)
+++ haiku/trunk/src/kits/app/Roster.cpp	2007-08-16 17:36:58 UTC (rev 21987)
@@ -2378,32 +2378,32 @@
 		BMessenger messenger;
 		BMessenger::Private(messenger).SetTo(team, info.port,
 			B_PREFERRED_TOKEN);
+		bool listContainsRefs = false;
 
 		// send messages from the list
 		if (messageList) {
 			for (int32 i = 0;
 				 BMessage *message = (BMessage*)messageList->ItemAt(i);
 				 i++) {
+				listContainsRefs |= message->what == B_REFS_RECEIVED;
 				messenger.SendMessage(message);
 			}
 		}
 
-		// send B_ARGV_RECEIVED or B_SILENT_RELAUNCH (if already running)
+		// send B_ARGV_RECEIVED or B_REFS_RECEIVED or B_SILENT_RELAUNCH (if already running)
 		if (args && argc > 1) {
 			BMessage message(B_ARGV_RECEIVED);
 			message.AddInt32("argc", argc);
 			for (int32 i = 0; i < argc; i++)
 				message.AddString("argv", args[i]);
 			messenger.SendMessage(&message);
-		} else if (alreadyRunning)
-			messenger.SendMessage(B_SILENT_RELAUNCH);
-
-		// send B_REFS_RECEIVED
-		if (ref) {
+		} else if (ref) { 
+			printf("_SendToRunning : B_REFS_RECEIVED\n");
 			BMessage message(B_REFS_RECEIVED);
 			message.AddRef("refs", ref);
 			messenger.SendMessage(&message);
-		}
+		} else if (alreadyRunning && !listContainsRefs)
+			messenger.SendMessage(B_SILENT_RELAUNCH);
 
 		// send B_READY_TO_RUN
 		if (!alreadyRunning)



From axeld at pinc-software.de  Thu Aug 16 19:50:52 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Thu, 16 Aug 2007 19:50:52 +0200 CEST
Subject: [Haiku-commits] r21987 - haiku/trunk/src/kits/app
In-Reply-To: <200708161736.l7GHax03029162@sheep.berlios.de>
Message-ID: <29906086045-BeMail@zon>

korli at BerliOS <korli at mail.berlios.de> wrote:
> Log:
> Tracker seems to launch applications with a B_REFS_RECEIVED message 
> in the initial
> message list.
> Now checks if such a message is present and avoids sending 
> B_SILENT_RELAUNCH
> in this case, and also in the standard case with a ref.
> This fixes bug #1387

I guess that this is how BeOS does it? :-)

Bye,
   Axel.



From axeld at mail.berlios.de  Thu Aug 16 20:01:22 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 16 Aug 2007 20:01:22 +0200
Subject: [Haiku-commits] r21988 -
	haiku/trunk/src/add-ons/kernel/drivers/random
Message-ID: <200708161801.l7GI1LMY031192@sheep.berlios.de>

Author: axeld
Date: 2007-08-16 20:01:21 +0200 (Thu, 16 Aug 2007)
New Revision: 21988
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21988&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/random/driver.c
Log:
Reverted back to an older random version that did not yet use thread_yield().


Modified: haiku/trunk/src/add-ons/kernel/drivers/random/driver.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/random/driver.c	2007-08-16 17:36:58 UTC (rev 21987)
+++ haiku/trunk/src/add-ons/kernel/drivers/random/driver.c	2007-08-16 18:01:21 UTC (rev 21988)
@@ -191,7 +191,9 @@
 
 	for (j = initTimes; j; j--) {
 		for (i = NK * initTimes; i; i--) {
-			thread_yield();
+			//thread_yield();
+			snooze(100);
+				// TODO: Our thread_yield() currently waits too long for emulators...
 
 			y.Q[0] += system_time();
 			attach(&x, &y, 0x52437EFFU, 0x026A4CEBU, 0xD9E66AC9U, 0x56E5A975U);



From axeld at mail.berlios.de  Thu Aug 16 20:01:50 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 16 Aug 2007 20:01:50 +0200
Subject: [Haiku-commits] r21989 - in haiku/trunk: headers/private/kernel
	headers/private/kernel/arch src/system/kernel
	src/system/kernel/arch/ppc src/system/kernel/arch/x86
	src/system/libroot/posix/signal
Message-ID: <200708161801.l7GI1o2S031272@sheep.berlios.de>

Author: axeld
Date: 2007-08-16 20:01:47 +0200 (Thu, 16 Aug 2007)
New Revision: 21989
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21989&view=rev

Added:
   haiku/trunk/src/system/libroot/posix/signal/set_signal_stack.c
   haiku/trunk/src/system/libroot/posix/signal/sigaltstack.c
Modified:
   haiku/trunk/headers/private/kernel/arch/thread.h
   haiku/trunk/headers/private/kernel/ksignal.h
   haiku/trunk/headers/private/kernel/syscalls.h
   haiku/trunk/headers/private/kernel/thread.h
   haiku/trunk/headers/private/kernel/thread_types.h
   haiku/trunk/src/system/kernel/arch/ppc/arch_thread.c
   haiku/trunk/src/system/kernel/arch/x86/arch_thread.c
   haiku/trunk/src/system/kernel/signal.c
   haiku/trunk/src/system/kernel/team.c
   haiku/trunk/src/system/kernel/thread.c
   haiku/trunk/src/system/libroot/posix/signal/Jamfile
Log:
* Implemented sigaltstack() and set_signal_stack(), thus closing bug #1401.
* On exec() the new function thread_reset_for_exec() is called which clears the signals
  and cancels an eventually set alarm. Both things weren't done before...
* Some minor cleanups.


Modified: haiku/trunk/headers/private/kernel/arch/thread.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/thread.h	2007-08-16 18:01:21 UTC (rev 21988)
+++ haiku/trunk/headers/private/kernel/arch/thread.h	2007-08-16 18:01:47 UTC (rev 21989)
@@ -21,10 +21,13 @@
 status_t arch_thread_init_thread_struct(struct thread *t);
 status_t arch_thread_init_tls(struct thread *thread);
 void arch_thread_context_switch(struct thread *t_from, struct thread *t_to);
-status_t arch_thread_init_kthread_stack(struct thread *t, int (*start_func)(void), void (*entry_func)(void), void (*exit_func)(void));
+status_t arch_thread_init_kthread_stack(struct thread *t,
+	int (*start_func)(void), void (*entry_func)(void), void (*exit_func)(void));
 void arch_thread_dump_info(void *info);
-status_t arch_thread_enter_userspace(struct thread *t, addr_t entry, void *args1, void *args2);
-void arch_thread_switch_kstack_and_call(struct thread *t, addr_t new_kstack, void (*func)(void *), void *arg);
+status_t arch_thread_enter_userspace(struct thread *t, addr_t entry,
+	void *args1, void *args2);
+void arch_thread_switch_kstack_and_call(struct thread *t, addr_t new_kstack,
+	void (*func)(void *), void *arg);
 
 // ToDo: doing this this way is an ugly hack - please fix me!
 //		(those functions are "static inline" for x86 - since
@@ -34,7 +37,9 @@
 void arch_thread_set_current_thread(struct thread *t);
 #endif
 
-status_t arch_setup_signal_frame(struct thread *t, struct sigaction *sa, int sig, int sig_mask);
+bool arch_on_signal_stack(struct thread *thread);
+status_t arch_setup_signal_frame(struct thread *t, struct sigaction *sa,
+	int signal, int signalMask);
 int64 arch_restore_signal_frame(void);
 void arch_check_syscall_restart(struct thread *t);
 

Modified: haiku/trunk/headers/private/kernel/ksignal.h
===================================================================
--- haiku/trunk/headers/private/kernel/ksignal.h	2007-08-16 18:01:21 UTC (rev 21988)
+++ haiku/trunk/headers/private/kernel/ksignal.h	2007-08-16 18:01:47 UTC (rev 21989)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2005, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2003-2007, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _KERNEL_SIGNAL_H
@@ -22,15 +22,18 @@
 extern int has_signals_pending(void *_thread);
 
 extern int sigaction_etc(thread_id threadID, int signal,
-				const struct sigaction *act, struct sigaction *oldAction);
+	const struct sigaction *newAction, struct sigaction *oldAction);
 
-extern int _user_send_signal(pid_t tid, uint sig);
-extern int _user_sigprocmask(int how, const sigset_t *set, sigset_t *oldSet);
-extern int _user_sigaction(int sig, const struct sigaction *action,
-				struct sigaction *oldAction);
+extern status_t _user_send_signal(pid_t tid, uint sig);
+extern status_t _user_sigprocmask(int how, const sigset_t *set,
+	sigset_t *oldSet);
+extern status_t _user_sigaction(int sig, const struct sigaction *newAction,
+	struct sigaction *oldAction);
 extern bigtime_t _user_set_alarm(bigtime_t time, uint32 mode);
-extern int _user_sigsuspend(const sigset_t *mask);
-extern int _user_sigpending(sigset_t *set);
+extern status_t _user_sigsuspend(const sigset_t *mask);
+extern status_t _user_sigpending(sigset_t *set);
+extern status_t _user_set_signal_stack(const stack_t *newUserStack,
+	stack_t *oldUserStack);
 
 #ifdef __cplusplus
 }

Modified: haiku/trunk/headers/private/kernel/syscalls.h
===================================================================
--- haiku/trunk/headers/private/kernel/syscalls.h	2007-08-16 18:01:21 UTC (rev 21988)
+++ haiku/trunk/headers/private/kernel/syscalls.h	2007-08-16 18:01:47 UTC (rev 21989)
@@ -110,12 +110,16 @@
 extern status_t		_kern_get_team_usage_info(team_id team, int32 who, team_usage_info *info, size_t size);
 
 // signal functions
-extern int		_kern_send_signal(pid_t tid, uint sig);
-extern int		_kern_sigprocmask(int how, const sigset_t *set, sigset_t *oldSet);
-extern int		_kern_sigaction(int sig, const struct sigaction *action, struct sigaction *oldAction);
+extern status_t		_kern_send_signal(pid_t tid, uint sig);
+extern status_t		_kern_sigprocmask(int how, const sigset_t *set,
+						sigset_t *oldSet);
+extern status_t		_kern_sigaction(int sig, const struct sigaction *action,
+						struct sigaction *oldAction);
 extern bigtime_t	_kern_set_alarm(bigtime_t time, uint32 mode);
-extern int		_kern_sigsuspend(const sigset_t *mask);
-extern int		_kern_sigpending(sigset_t *set);
+extern status_t		_kern_sigsuspend(const sigset_t *mask);
+extern status_t		_kern_sigpending(sigset_t *set);
+extern status_t		_kern_set_signal_stack(const stack_t *newStack,
+						stack_t *oldStack);
 
 // image functions
 extern image_id		_kern_register_image(image_info *info, size_t size);

Modified: haiku/trunk/headers/private/kernel/thread.h
===================================================================
--- haiku/trunk/headers/private/kernel/thread.h	2007-08-16 18:01:21 UTC (rev 21988)
+++ haiku/trunk/headers/private/kernel/thread.h	2007-08-16 18:01:47 UTC (rev 21989)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2002-2007, Axel D?rfler, axeld at pinc-software.de.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -23,11 +23,12 @@
 void thread_enqueue(struct thread *t, struct thread_queue *q);
 struct thread *thread_lookat_queue(struct thread_queue *q);
 struct thread *thread_dequeue(struct thread_queue *q);
-struct thread *thread_dequeue_id(struct thread_queue *q, thread_id thr_id);
+struct thread *thread_dequeue_id(struct thread_queue *q, thread_id id);
 
 void thread_at_kernel_entry(void);
 	// called when the thread enters the kernel on behalf of the thread
 void thread_at_kernel_exit(void);
+void thread_reset_for_exec(void);
 
 status_t thread_init(struct kernel_args *args);
 status_t thread_preboot_init_percpu(struct kernel_args *args, int32 cpuNum);

Modified: haiku/trunk/headers/private/kernel/thread_types.h
===================================================================
--- haiku/trunk/headers/private/kernel/thread_types.h	2007-08-16 18:01:21 UTC (rev 21988)
+++ haiku/trunk/headers/private/kernel/thread_types.h	2007-08-16 18:01:47 UTC (rev 21989)
@@ -140,6 +140,9 @@
 	sigset_t		sig_pending;
 	sigset_t		sig_block_mask;
 	struct sigaction sig_action[32];
+	addr_t			signal_stack_base;
+	size_t			signal_stack_size;
+	bool			signal_stack_enabled;
 
 	bool			in_kernel;
 	bool			was_yielded;

Modified: haiku/trunk/src/system/kernel/arch/ppc/arch_thread.c
===================================================================
--- haiku/trunk/src/system/kernel/arch/ppc/arch_thread.c	2007-08-16 18:01:21 UTC (rev 21988)
+++ haiku/trunk/src/system/kernel/arch/ppc/arch_thread.c	2007-08-16 18:01:47 UTC (rev 21989)
@@ -214,6 +214,13 @@
 }
 
 
+bool
+arch_on_signal_stack(struct thread *thread)
+{
+	return false;
+}
+
+
 status_t
 arch_setup_signal_frame(struct thread *thread, struct sigaction *sa, int sig, int sigMask)
 {

Modified: haiku/trunk/src/system/kernel/arch/x86/arch_thread.c
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_thread.c	2007-08-16 18:01:21 UTC (rev 21988)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_thread.c	2007-08-16 18:01:47 UTC (rev 21989)
@@ -76,29 +76,30 @@
 }
 
 
-/**	Returns the current iframe structure of the running thread.
- *	This function must only be called in a context where it's actually
- *	sure that such iframe exists; ie. from syscalls, but usually not
- *	from standard kernel threads.
- */
-
+/*!
+	Returns the current iframe structure of the running thread.
+	This function must only be called in a context where it's actually
+	sure that such iframe exists; ie. from syscalls, but usually not
+	from standard kernel threads.
+*/
 static struct iframe *
-i386_get_current_iframe(void)
+get_current_iframe(void)
 {
 	struct thread *thread = thread_get_current_thread();
 
 	ASSERT(thread->arch_info.iframes.index >= 0);
-	return thread->arch_info.iframes.frames[thread->arch_info.iframes.index - 1];
+	return thread->arch_info.iframes.frames[
+		thread->arch_info.iframes.index - 1];
 }
 
 
-/**	\brief Returns the current thread's topmost (i.e. most recent)
- *	userland->kernel transition iframe (usually the first one, save for
- *	interrupts in signal handlers).
- *	\return The iframe, or \c NULL, if there is no such iframe (e.g. when
- *			the thread is a kernel thread).
- */
-
+/*!
+	\brief Returns the current thread's topmost (i.e. most recent)
+	userland->kernel transition iframe (usually the first one, save for
+	interrupts in signal handlers).
+	\return The iframe, or \c NULL, if there is no such iframe (e.g. when
+			the thread is a kernel thread).
+*/
 struct iframe *
 i386_get_user_iframe(void)
 {
@@ -158,6 +159,16 @@
 static uint32 *
 get_signal_stack(struct thread *thread, struct iframe *frame, int signal)
 {
+	// use the alternate signal stack if we should and can
+	if (thread->signal_stack_enabled
+		&& (thread->sig_action[signal].sa_flags & SA_ONSTACK) != 0
+		&& (frame->user_esp < thread->signal_stack_base
+			|| frame->user_esp > thread->signal_stack_base
+				+ thread->signal_stack_size)) {
+		return (uint32 *)(thread->signal_stack_base
+			+ thread->signal_stack_size);
+	}
+
 	return (uint32 *)frame->user_esp;
 }
 
@@ -360,11 +371,22 @@
 }
 
 
+bool
+arch_on_signal_stack(struct thread *thread)
+{
+	struct iframe *frame = get_current_iframe();
+	
+	return frame->user_esp >= thread->signal_stack_base
+		&& frame->user_esp < thread->signal_stack_base
+			+ thread->signal_stack_size;
+}
+
+
 status_t
 arch_setup_signal_frame(struct thread *thread, struct sigaction *sa,
 	int signal, int signalMask)
 {
-	struct iframe *frame = i386_get_current_iframe();
+	struct iframe *frame = get_current_iframe();
 	uint32 *userStack = (uint32 *)frame->user_esp;
 	uint32 *signalCode;
 	uint32 *userRegs;
@@ -444,7 +466,7 @@
 arch_restore_signal_frame(void)
 {
 	struct thread *thread = thread_get_current_thread();
-	struct iframe *frame = i386_get_current_iframe();
+	struct iframe *frame = get_current_iframe();
 	int32 signalMask;
 	uint32 *userStack;
 	struct vregs regs;
@@ -483,7 +505,7 @@
 void
 arch_check_syscall_restart(struct thread *thread)
 {
-	struct iframe *frame = i386_get_current_iframe();
+	struct iframe *frame = get_current_iframe();
 	if (frame == NULL) {
 		// this thread is obviously new; we didn't come from an interrupt
 		return;
@@ -506,7 +528,7 @@
 void
 arch_store_fork_frame(struct arch_fork_arg *arg)
 {
-	struct iframe *frame = i386_get_current_iframe();
+	struct iframe *frame = get_current_iframe();
 
 	// we need to copy the threads current iframe
 	arg->iframe = *frame;

Modified: haiku/trunk/src/system/kernel/signal.c
===================================================================
--- haiku/trunk/src/system/kernel/signal.c	2007-08-16 18:01:21 UTC (rev 21988)
+++ haiku/trunk/src/system/kernel/signal.c	2007-08-16 18:01:47 UTC (rev 21989)
@@ -591,44 +591,51 @@
 }
 
 
-int
+status_t
 _user_send_signal(pid_t team, uint signal)
 {
 	return send_signal_etc(team, signal, B_CHECK_PERMISSION);
 }
 
 
-int
+status_t
 _user_sigprocmask(int how, const sigset_t *userSet, sigset_t *userOldSet)
 {
 	sigset_t set, oldSet;
 	status_t status;
 
 	if ((userSet != NULL && user_memcpy(&set, userSet, sizeof(sigset_t)) < B_OK)
-		|| (userOldSet != NULL && user_memcpy(&oldSet, userOldSet, sizeof(sigset_t)) < B_OK))
+		|| (userOldSet != NULL && user_memcpy(&oldSet, userOldSet,
+				sizeof(sigset_t)) < B_OK))
 		return B_BAD_ADDRESS;
 
-	status = sigprocmask(how, userSet ? &set : NULL, userOldSet ? &oldSet : NULL);
+	status = sigprocmask(how, userSet ? &set : NULL,
+		userOldSet ? &oldSet : NULL);
 
 	// copy old set if asked for
-	if (status >= B_OK && userOldSet != NULL && user_memcpy(userOldSet, &oldSet, sizeof(sigset_t)) < B_OK)
+	if (status >= B_OK && userOldSet != NULL
+		&& user_memcpy(userOldSet, &oldSet, sizeof(sigset_t)) < B_OK)
 		return B_BAD_ADDRESS;
 
 	return status;
 }
 
 
-int
-_user_sigaction(int signal, const struct sigaction *userAction, struct sigaction *userOldAction)
+status_t
+_user_sigaction(int signal, const struct sigaction *userAction,
+	struct sigaction *userOldAction)
 {
 	struct sigaction act, oact;
 	status_t status;
 
-	if ((userAction != NULL && user_memcpy(&act, userAction, sizeof(struct sigaction)) < B_OK)
-		|| (userOldAction != NULL && user_memcpy(&oact, userOldAction, sizeof(struct sigaction)) < B_OK))
+	if ((userAction != NULL && user_memcpy(&act, userAction,
+				sizeof(struct sigaction)) < B_OK)
+		|| (userOldAction != NULL && user_memcpy(&oact, userOldAction,
+				sizeof(struct sigaction)) < B_OK))
 		return B_BAD_ADDRESS;
 
-	status = sigaction(signal, userAction ? &act : NULL, userOldAction ? &oact : NULL);
+	status = sigaction(signal, userAction ? &act : NULL,
+		userOldAction ? &oact : NULL);
 
 	// only copy the old action if a pointer has been given
 	if (status >= B_OK && userOldAction != NULL
@@ -639,7 +646,7 @@
 }
 
 
-int
+status_t
 _user_sigsuspend(const sigset_t *userMask)
 {
 	sigset_t mask;
@@ -653,7 +660,7 @@
 }
 
 
-int
+status_t
 _user_sigpending(sigset_t *userSet)
 {
 	sigset_t set;
@@ -672,3 +679,59 @@
 	return status;
 }
 
+
+status_t
+_user_set_signal_stack(const stack_t *newUserStack, stack_t *oldUserStack)
+{
+	struct thread *thread = thread_get_current_thread();
+	struct stack_t newStack, oldStack;
+	bool onStack = false;
+
+	if ((newUserStack != NULL && user_memcpy(&newStack, newUserStack,
+				sizeof(stack_t)) < B_OK)
+		|| (oldUserStack != NULL && user_memcpy(&oldStack, oldUserStack,
+				sizeof(stack_t)) < B_OK))
+		return B_BAD_ADDRESS;
+
+	if (thread->signal_stack_enabled) {
+		// determine wether or not the user thread is currently
+		// on the active signal stack
+		onStack = arch_on_signal_stack(thread);
+	}
+
+	if (oldUserStack != NULL) {
+		oldStack.ss_sp = (void *)thread->signal_stack_base;
+		oldStack.ss_size = thread->signal_stack_size;
+		oldStack.ss_flags = (thread->signal_stack_enabled ? 0 : SS_DISABLE)
+			| (onStack ? SS_ONSTACK : 0);
+	}
+
+	if (newUserStack != NULL) {
+		// no flags other than SS_DISABLE are allowed
+		if ((newStack.ss_flags & ~SS_DISABLE) != 0)
+			return B_BAD_VALUE;
+
+		if ((newStack.ss_flags & SS_DISABLE) == 0) {
+			// check if the size is valid
+			if (newStack.ss_size < MINSIGSTKSZ)
+				return B_NO_MEMORY;
+			if (onStack)
+				return B_NOT_ALLOWED;
+			if (!IS_USER_ADDRESS(newStack.ss_sp))
+				return B_BAD_VALUE;
+
+			thread->signal_stack_base = (addr_t)newStack.ss_sp;
+			thread->signal_stack_size = newStack.ss_size;
+			thread->signal_stack_enabled = true;
+		} else
+			thread->signal_stack_enabled = false;
+	}
+
+	// only copy the old stack info if a pointer has been given
+	if (oldUserStack != NULL
+		&& user_memcpy(oldUserStack, &oldStack, sizeof(stack_t)) < B_OK)
+		return B_BAD_ADDRESS;
+
+	return B_OK;
+}
+

Modified: haiku/trunk/src/system/kernel/team.c
===================================================================
--- haiku/trunk/src/system/kernel/team.c	2007-08-16 18:01:21 UTC (rev 21988)
+++ haiku/trunk/src/system/kernel/team.c	2007-08-16 18:01:47 UTC (rev 21989)
@@ -984,7 +984,8 @@
 	struct thread *thread;
 	thread_id nubThreadID = -1;
 
-	TRACE(("exec_team(path = \"%s\", argc = %ld, envCount = %ld): team %lx\n", args[0], argCount, envCount, team->id));
+	TRACE(("exec_team(path = \"%s\", argc = %ld, envCount = %ld): team %lx\n",
+		args[0], argCount, envCount, team->id));
 
 	// switching the kernel at run time is probably not a good idea :)
 	if (team == team_get_kernel_team())
@@ -1031,9 +1032,10 @@
 	teamArgs->args[0] = strdup(path);
 
 	// ToDo: remove team resources if there are any left
-	// alarm, signals
 	// thread_atkernel_exit() might not be called at all
 
+	thread_reset_for_exec();
+
 	user_debug_prepare_for_exec();
 
 	vm_delete_areas(team->address_space);

Modified: haiku/trunk/src/system/kernel/thread.c
===================================================================
--- haiku/trunk/src/system/kernel/thread.c	2007-08-16 18:01:21 UTC (rev 21988)
+++ haiku/trunk/src/system/kernel/thread.c	2007-08-16 18:01:47 UTC (rev 21989)
@@ -166,6 +166,18 @@
 }
 
 
+static void
+reset_signals(struct thread *thread)
+{
+	thread->sig_pending = 0;
+	thread->sig_block_mask = 0;
+	memset(thread->sig_action, 0, 32 * sizeof(struct sigaction));
+	thread->signal_stack_base = 0;
+	thread->signal_stack_size = 0;
+	thread->signal_stack_enabled = false;
+}
+
+
 /*!
 	Allocates and fills in thread structure (or reuses one from the
 	dead queue).
@@ -224,9 +236,7 @@
 	thread->priority = thread->next_priority = -1;
 	thread->args1 = NULL;  thread->args2 = NULL;
 	thread->alarm.period = 0;
-	thread->sig_pending = 0;
-	thread->sig_block_mask = 0;
-	memset(thread->sig_action, 0, 32 * sizeof(struct sigaction));
+	reset_signals(thread);
 	thread->in_kernel = true;
 	thread->was_yielded = false;
 	thread->user_time = 0;
@@ -499,6 +509,143 @@
 }
 
 
+/*!
+	Finds a free death stack for us and allocates it.
+	Must be called with interrupts enabled.
+*/
+static uint32
+get_death_stack(void)
+{
+	cpu_status state;
+	uint32 bit;
+	int32 i;
+
+	acquire_sem(sDeathStackSem);
+
+	state = disable_interrupts();
+
+	// grap the thread lock, find a free spot and release
+	GRAB_THREAD_LOCK();
+	bit = sDeathStackBitmap;
+	bit = (~bit) & ~((~bit) - 1);
+	sDeathStackBitmap |= bit;
+	RELEASE_THREAD_LOCK();
+
+	restore_interrupts(state);
+
+	// sanity checks
+	if (!bit)
+		panic("get_death_stack: couldn't find free stack!\n");
+
+	if (bit & (bit - 1))
+		panic("get_death_stack: impossible bitmap result!\n");
+
+	// bit to number
+	for (i = -1; bit; i++) {
+		bit >>= 1;
+	}
+
+	TRACE(("get_death_stack: returning 0x%lx\n", sDeathStacks[i].address));
+
+	return (uint32)i;
+}
+
+
+/*!	Returns the thread's death stack to the pool. */
+static void
+put_death_stack(uint32 index)
+{
+	cpu_status state;
+
+	TRACE(("put_death_stack...: passed %lu\n", index));
+
+	if (index >= sNumDeathStacks)
+		panic("put_death_stack: passed invalid stack index %ld\n", index);
+
+	if (!(sDeathStackBitmap & (1 << index)))
+		panic("put_death_stack: passed invalid stack index %ld\n", index);
+
+	state = disable_interrupts();
+
+	GRAB_THREAD_LOCK();
+	sDeathStackBitmap &= ~(1 << index);
+	RELEASE_THREAD_LOCK();
+
+	restore_interrupts(state);
+
+	release_sem_etc(sDeathStackSem, 1, B_DO_NOT_RESCHEDULE);
+		// we must not have acquired the thread lock when releasing a semaphore
+}
+
+
+static void
+thread_exit2(void *_args)
+{
+	struct thread_exit_args args;
+
+	// copy the arguments over, since the source is probably on the kernel
+	// stack we're about to delete
+	memcpy(&args, _args, sizeof(struct thread_exit_args));
+
+	// we can't let the interrupts disabled at this point
+	enable_interrupts();
+
+	TRACE(("thread_exit2, running on death stack 0x%lx\n", args.death_stack));
+
+	// delete the old kernel stack area
+	TRACE(("thread_exit2: deleting old kernel stack id 0x%lx for thread 0x%lx\n",
+		args.old_kernel_stack, args.thread->id));
+
+	delete_area(args.old_kernel_stack);
+
+	// remove this thread from all of the global lists
+	TRACE(("thread_exit2: removing thread 0x%lx from global lists\n",
+		args.thread->id));
+
+	disable_interrupts();
+	GRAB_TEAM_LOCK();
+
+	remove_thread_from_team(team_get_kernel_team(), args.thread);
+
+	RELEASE_TEAM_LOCK();
+	enable_interrupts();
+		// needed for the debugger notification below
+
+	TRACE(("thread_exit2: done removing thread from lists\n"));
+
+	if (args.death_sem >= 0)
+		release_sem_etc(args.death_sem, 1, B_DO_NOT_RESCHEDULE);	
+
+	// notify the debugger
+	if (args.original_team_id >= 0
+		&& args.original_team_id != team_get_kernel_team_id()) {
+		user_debug_thread_deleted(args.original_team_id, args.thread->id);
+	}
+
+	disable_interrupts();
+
+	// Set the next state to be gone: this will cause the thread structure
+	// to be returned to a ready pool upon reschedule.
+	// Note, we need to have disabled interrupts at this point, or else
+	// we could get rescheduled too early.
+	args.thread->next_state = THREAD_STATE_FREE_ON_RESCHED;
+
+	// return the death stack and reschedule one last time
+
+	put_death_stack(args.death_stack);
+
+	GRAB_THREAD_LOCK();
+	scheduler_reschedule();
+		// requires thread lock to be held
+
+	// never get to here
+	panic("thread_exit2: made it where it shouldn't have!\n");
+}
+
+
+//	#pragma mark - debugger calls
+
+
 static int
 make_thread_unreal(int argc, char **argv)
 {
@@ -927,140 +1074,9 @@
 }
 
 
-/*!
-	Finds a free death stack for us and allocates it.
-	Must be called with interrupts enabled.
-*/
-static uint32
-get_death_stack(void)
-{
-	cpu_status state;
-	uint32 bit;
-	int32 i;
+//	#pragma mark - private kernel API
 
-	acquire_sem(sDeathStackSem);
 
-	state = disable_interrupts();
-
-	// grap the thread lock, find a free spot and release
-	GRAB_THREAD_LOCK();
-	bit = sDeathStackBitmap;
-	bit = (~bit) & ~((~bit) - 1);
-	sDeathStackBitmap |= bit;
-	RELEASE_THREAD_LOCK();
-
-	restore_interrupts(state);
-
-	// sanity checks
-	if (!bit)
-		panic("get_death_stack: couldn't find free stack!\n");
-
-	if (bit & (bit - 1))
-		panic("get_death_stack: impossible bitmap result!\n");
-
-	// bit to number
-	for (i = -1; bit; i++) {
-		bit >>= 1;
-	}
-
-	TRACE(("get_death_stack: returning 0x%lx\n", sDeathStacks[i].address));
-
-	return (uint32)i;
-}
-
-
-/*!	Returns the thread's death stack to the pool. */
-static void
-put_death_stack(uint32 index)
-{
-	cpu_status state;
-
-	TRACE(("put_death_stack...: passed %lu\n", index));
-
-	if (index >= sNumDeathStacks)
-		panic("put_death_stack: passed invalid stack index %ld\n", index);
-
-	if (!(sDeathStackBitmap & (1 << index)))
-		panic("put_death_stack: passed invalid stack index %ld\n", index);
-
-	state = disable_interrupts();
-
-	GRAB_THREAD_LOCK();
-	sDeathStackBitmap &= ~(1 << index);
-	RELEASE_THREAD_LOCK();
-
-	restore_interrupts(state);
-
-	release_sem_etc(sDeathStackSem, 1, B_DO_NOT_RESCHEDULE);
-		// we must not have acquired the thread lock when releasing a semaphore
-}
-
-
-static void
-thread_exit2(void *_args)
-{
-	struct thread_exit_args args;
-
-	// copy the arguments over, since the source is probably on the kernel
-	// stack we're about to delete
-	memcpy(&args, _args, sizeof(struct thread_exit_args));
-
-	// we can't let the interrupts disabled at this point
-	enable_interrupts();
-
-	TRACE(("thread_exit2, running on death stack 0x%lx\n", args.death_stack));
-
-	// delete the old kernel stack area
-	TRACE(("thread_exit2: deleting old kernel stack id 0x%lx for thread 0x%lx\n",
-		args.old_kernel_stack, args.thread->id));
-
-	delete_area(args.old_kernel_stack);
-
-	// remove this thread from all of the global lists
-	TRACE(("thread_exit2: removing thread 0x%lx from global lists\n",
-		args.thread->id));
-
-	disable_interrupts();
-	GRAB_TEAM_LOCK();
-
-	remove_thread_from_team(team_get_kernel_team(), args.thread);
-
-	RELEASE_TEAM_LOCK();
-	enable_interrupts();
-		// needed for the debugger notification below
-
-	TRACE(("thread_exit2: done removing thread from lists\n"));
-
-	if (args.death_sem >= 0)
-		release_sem_etc(args.death_sem, 1, B_DO_NOT_RESCHEDULE);	
-
-	// notify the debugger
-	if (args.original_team_id >= 0
-		&& args.original_team_id != team_get_kernel_team_id()) {
-		user_debug_thread_deleted(args.original_team_id, args.thread->id);
-	}
-
-	disable_interrupts();
-
-	// Set the next state to be gone: this will cause the thread structure
-	// to be returned to a ready pool upon reschedule.
-	// Note, we need to have disabled interrupts at this point, or else
-	// we could get rescheduled too early.
-	args.thread->next_state = THREAD_STATE_FREE_ON_RESCHED;
-
-	// return the death stack and reschedule one last time
-
-	put_death_stack(args.death_stack);
-
-	GRAB_THREAD_LOCK();
-	scheduler_reschedule();
-		// requires thread lock to be held
-
-	// never get to here
-	panic("thread_exit2: made it where it shouldn't have!\n");
-}
-
-
 void
 thread_exit(void)
 {
@@ -1358,9 +1374,16 @@
 }
 
 
-//	#pragma mark - private kernel API
+void
+thread_reset_for_exec(void)
+{
+	struct thread *thread = thread_get_current_thread();
 
+	cancel_timer(&thread->alarm);
+	reset_signals(thread);
+}
 
+
 /*! Insert a thread to the tail of a queue */
 void
 thread_enqueue(struct thread *thread, struct thread_queue *queue)

Modified: haiku/trunk/src/system/libroot/posix/signal/Jamfile
===================================================================
--- haiku/trunk/src/system/libroot/posix/signal/Jamfile	2007-08-16 18:01:21 UTC (rev 21988)
+++ haiku/trunk/src/system/libroot/posix/signal/Jamfile	2007-08-16 18:01:47 UTC (rev 21989)
@@ -6,7 +6,9 @@
 	kill.c
 	raise.c
 	send_signal.c
+	set_signal_stack.c
 	sigaction.c
+	sigaltstack.c
 	signal.c
 	sigpending.c
 	sigprocmask.c

Added: haiku/trunk/src/system/libroot/posix/signal/set_signal_stack.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/signal/set_signal_stack.c	2007-08-16 18:01:21 UTC (rev 21988)
+++ haiku/trunk/src/system/libroot/posix/signal/set_signal_stack.c	2007-08-16 18:01:47 UTC (rev 21989)
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2007, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include <errno.h>
+#include <signal.h>
+
+#include <syscalls.h>
+
+
+void
+set_signal_stack(void *ptr, size_t size)
+{
+	stack_t alternateStack;
+	status_t status;
+
+	alternateStack.ss_sp = ptr;
+	alternateStack.ss_size = size;
+	alternateStack.ss_flags = 0;
+
+	status = _kern_set_signal_stack(&alternateStack, NULL);
+	if (status < B_OK)
+		errno = status;
+}
+
+

Added: haiku/trunk/src/system/libroot/posix/signal/sigaltstack.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/signal/sigaltstack.c	2007-08-16 18:01:21 UTC (rev 21988)
+++ haiku/trunk/src/system/libroot/posix/signal/sigaltstack.c	2007-08-16 18:01:47 UTC (rev 21989)
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2007, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include <errno.h>
+#include <signal.h>
+
+#include <syscalls.h>
+
+
+int
+sigaltstack(const stack_t *alternateStack, stack_t *oldAlternateStack)
+{
+	status_t status =_kern_set_signal_stack(alternateStack, oldAlternateStack);
+	if (status < B_OK) {
+		errno = status;
+		return -1;
+	}
+
+	return 0;
+}



From korli at users.berlios.de  Thu Aug 16 20:38:33 2007
From: korli at users.berlios.de (=?ISO-8859-1?Q?J=E9r=F4me_Duval?=)
Date: Thu, 16 Aug 2007 20:38:33 +0200
Subject: [Haiku-commits] r21987 - haiku/trunk/src/kits/app
In-Reply-To: <29906086045-BeMail@zon>
References: <200708161736.l7GHax03029162@sheep.berlios.de>
	<29906086045-BeMail@zon>
Message-ID: <c47b1d430708161138q6e46d1f9he29bac99d7c918a1@mail.gmail.com>

2007/8/16, Axel D?rfler <axeld at pinc-software.de>:
>
> korli at BerliOS <korli at mail.berlios.de> wrote:
> > Log:
> > Tracker seems to launch applications with a B_REFS_RECEIVED message
> > in the initial
> > message list.
> > Now checks if such a message is present and avoids sending
> > B_SILENT_RELAUNCH
> > in this case, and also in the standard case with a ref.
> > This fixes bug #1387
>
> I guess that this is how BeOS does it? :-)


I tested with a shrunk down StyledEdit : I launched it, then opened a file
with it through Tracker, and this was the observed behavior. Though I'm not
sure that, on BeOS, B_SILENT_RELAUNCH is sent with a non B_REFS_RECEIVED
message in the initial message list.

Bye,
J?r?me
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20070816/2217b217/attachment.html>

From bonefish at cs.tu-berlin.de  Thu Aug 16 20:48:49 2007
From: bonefish at cs.tu-berlin.de (Ingo Weinhold)
Date: Thu, 16 Aug 2007 20:48:49 +0200
Subject: [Haiku-commits] r21987 - haiku/trunk/src/kits/app
In-Reply-To: <c47b1d430708161138q6e46d1f9he29bac99d7c918a1@mail.gmail.com>
References: <200708161736.l7GHax03029162@sheep.berlios.de>
	<29906086045-BeMail@zon>
	<c47b1d430708161138q6e46d1f9he29bac99d7c918a1@mail.gmail.com>
Message-ID: <20070816204849.11563.12@cs.tu-berlin.de>


On 2007-08-16 at 20:38:33 [+0200], J?r?me Duval <korli at users.berlios.de> 
wrote:
> 2007/8/16, Axel D?rfler <axeld at pinc-software.de>:
> >
> > korli at BerliOS <korli at mail.berlios.de> wrote:
> > > Log:
> > > Tracker seems to launch applications with a B_REFS_RECEIVED message
> > > in the initial
> > > message list.
> > > Now checks if such a message is present and avoids sending
> > > B_SILENT_RELAUNCH
> > > in this case, and also in the standard case with a ref.
> > > This fixes bug #1387
> >
> > I guess that this is how BeOS does it? :-)
> 
> 
> I tested with a shrunk down StyledEdit : I launched it, then opened a file
> with it through Tracker, and this was the observed behavior. Though I'm not
> sure that, on BeOS, B_SILENT_RELAUNCH is sent with a non B_REFS_RECEIVED
> message in the initial message list.

I just checked, it it's not. Any initial message seems to suppress 
B_SILENT_RELAUNCH.

CU, Ingo


From korli at mail.berlios.de  Thu Aug 16 21:03:46 2007
From: korli at mail.berlios.de (korli at BerliOS)
Date: Thu, 16 Aug 2007 21:03:46 +0200
Subject: [Haiku-commits] r21990 - haiku/trunk/src/kits/app
Message-ID: <200708161903.l7GJ3k7h003548@sheep.berlios.de>

Author: korli
Date: 2007-08-16 21:03:45 +0200 (Thu, 16 Aug 2007)
New Revision: 21990
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21990&view=rev

Modified:
   haiku/trunk/src/kits/app/Roster.cpp
Log:
actually don't send B_SILENT_RELAUNCH for any message in the initial message list


Modified: haiku/trunk/src/kits/app/Roster.cpp
===================================================================
--- haiku/trunk/src/kits/app/Roster.cpp	2007-08-16 18:01:47 UTC (rev 21989)
+++ haiku/trunk/src/kits/app/Roster.cpp	2007-08-16 19:03:45 UTC (rev 21990)
@@ -2378,14 +2378,12 @@
 		BMessenger messenger;
 		BMessenger::Private(messenger).SetTo(team, info.port,
 			B_PREFERRED_TOKEN);
-		bool listContainsRefs = false;
 
 		// send messages from the list
 		if (messageList) {
 			for (int32 i = 0;
 				 BMessage *message = (BMessage*)messageList->ItemAt(i);
 				 i++) {
-				listContainsRefs |= message->what == B_REFS_RECEIVED;
 				messenger.SendMessage(message);
 			}
 		}
@@ -2402,7 +2400,7 @@
 			BMessage message(B_REFS_RECEIVED);
 			message.AddRef("refs", ref);
 			messenger.SendMessage(&message);
-		} else if (alreadyRunning && !listContainsRefs)
+		} else if (alreadyRunning && (!messageList || messageList->IsEmpty()))
 			messenger.SendMessage(B_SILENT_RELAUNCH);
 
 		// send B_READY_TO_RUN



From revol at free.fr  Thu Aug 16 21:46:43 2007
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Thu, 16 Aug 2007 21:46:43 +0200 CEST
Subject: [Haiku-commits] r21987 - haiku/trunk/src/kits/app
In-Reply-To: <c47b1d430708161138q6e46d1f9he29bac99d7c918a1@mail.gmail.com>
Message-ID: <5476612957-BeMail@laptop>

> 2007/8/16, Axel D?rfler <axeld at pinc-software.de>:
> >
> > korli at BerliOS <korli at mail.berlios.de> wrote:
> > > Log:
> > > Tracker seems to launch applications with a B_REFS_RECEIVED 
> > > message
> > > in the initial
> > > message list.
> > > Now checks if such a message is present and avoids sending
> > > B_SILENT_RELAUNCH
> > > in this case, and also in the standard case with a ref.
> > > This fixes bug #1387
> >
> > I guess that this is how BeOS does it? :-)
> 
> 
> I tested with a shrunk down StyledEdit : I launched it, then opened a 
> file
> with it through Tracker, and this was the observed behavior. Though 
> I'm not
> sure that, on BeOS, B_SILENT_RELAUNCH is sent with a non 
> B_REFS_RECEIVED
> message in the initial message list.

You might want to try with spybmessage :p

Fran?ois.


From axeld at mail.berlios.de  Thu Aug 16 23:37:33 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 16 Aug 2007 23:37:33 +0200
Subject: [Haiku-commits] r21991 - haiku/trunk/build/jam
Message-ID: <200708162137.l7GLbX7a014168@sheep.berlios.de>

Author: axeld
Date: 2007-08-16 23:37:33 +0200 (Thu, 16 Aug 2007)
New Revision: 21991
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21991&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
The vlance driver is apparently broken, and call acquire_sem() from an interrupt routine.
Therefore, I've removed it from the image for now.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2007-08-16 19:03:45 UTC (rev 21990)
+++ haiku/trunk/build/jam/HaikuImage	2007-08-16 21:37:33 UTC (rev 21991)
@@ -115,7 +115,7 @@
 ;
 BEOS_ADD_ONS_DRIVERS_MIDI = emuxki ;
 BEOS_ADD_ONS_DRIVERS_NET = etherpci ipro1000 rtl8139 rtl8169 sis900
-	via-rhine wb840 net_stack vlance
+	via-rhine wb840 net_stack #vlance
 	$(GPL_ONLY)bcm440x $(GPL_ONLY)bcm570x
 ;
 #BEOS_ADD_ONS_DRIVERS_ACPI = $(X86_ONLY)acpi_button ;



From leavengood at mail.berlios.de  Fri Aug 17 05:45:39 2007
From: leavengood at mail.berlios.de (leavengood at BerliOS)
Date: Fri, 17 Aug 2007 05:45:39 +0200
Subject: [Haiku-commits] r21992 - in haiku/trunk/src/preferences: fonts
	keyboard mouse virtualmemory
Message-ID: <200708170345.l7H3jd0n019412@sheep.berlios.de>

Author: leavengood
Date: 2007-08-17 05:45:37 +0200 (Fri, 17 Aug 2007)
New Revision: 21992
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21992&view=rev

Modified:
   haiku/trunk/src/preferences/fonts/FontSelectionView.cpp
   haiku/trunk/src/preferences/fonts/FontSelectionView.h
   haiku/trunk/src/preferences/fonts/FontView.cpp
   haiku/trunk/src/preferences/fonts/FontView.h
   haiku/trunk/src/preferences/fonts/MainWindow.cpp
   haiku/trunk/src/preferences/fonts/MainWindow.h
   haiku/trunk/src/preferences/keyboard/KeyboardSettings.cpp
   haiku/trunk/src/preferences/keyboard/KeyboardSettings.h
   haiku/trunk/src/preferences/keyboard/KeyboardWindow.cpp
   haiku/trunk/src/preferences/mouse/MouseSettings.cpp
   haiku/trunk/src/preferences/mouse/MouseSettings.h
   haiku/trunk/src/preferences/mouse/MouseWindow.cpp
   haiku/trunk/src/preferences/mouse/MouseWindow.h
   haiku/trunk/src/preferences/virtualmemory/Settings.cpp
   haiku/trunk/src/preferences/virtualmemory/Settings.h
   haiku/trunk/src/preferences/virtualmemory/SettingsWindow.cpp
   haiku/trunk/src/preferences/virtualmemory/SettingsWindow.h
Log:
Committing patch by Justin O'Dell to fix the Defaults buttons on several
preferences apps. This fixes most of bug #254.

This is his first contribution to Haiku, and hopefully the first of many.

Thanks Justin!


Modified: haiku/trunk/src/preferences/fonts/FontSelectionView.cpp
===================================================================
--- haiku/trunk/src/preferences/fonts/FontSelectionView.cpp	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/fonts/FontSelectionView.cpp	2007-08-17 03:45:37 UTC (rev 21992)
@@ -392,6 +392,29 @@
 
 
 bool
+FontSelectionView::IsDefaultable()
+{
+	font_family default_family;
+	font_style default_style;
+	float default_size;
+
+	if (_get_system_default_font_(Name(), default_family, default_style, &default_size) != B_OK)
+		return false;
+
+	font_family current_family;
+	font_style current_style;
+	float current_size;
+
+	fCurrentFont.GetFamilyAndStyle(&current_family, &current_style);
+	current_size = fCurrentFont.Size();
+
+	return strcmp(current_family, default_family) != 0
+		|| strcmp(current_style, default_style) != 0
+		|| current_size != default_size;
+}
+
+
+bool
 FontSelectionView::IsRevertable()
 {
 	return fCurrentFont != fSavedFont;

Modified: haiku/trunk/src/preferences/fonts/FontSelectionView.h
===================================================================
--- haiku/trunk/src/preferences/fonts/FontSelectionView.h	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/fonts/FontSelectionView.h	2007-08-17 03:45:37 UTC (rev 21992)
@@ -34,6 +34,7 @@
 
 		void			SetDefaults();
 		void			Revert();
+		bool			IsDefaultable();
 		bool			IsRevertable();
 
 		void			UpdateFontsMenu();

Modified: haiku/trunk/src/preferences/fonts/FontView.cpp
===================================================================
--- haiku/trunk/src/preferences/fonts/FontView.cpp	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/fonts/FontView.cpp	2007-08-17 03:45:37 UTC (rev 21992)
@@ -93,6 +93,13 @@
 	fFixedView->RelayoutIfNeeded();
 }
 
+bool
+FontView::IsDefaultable()
+{
+	return fPlainView->IsDefaultable()
+		|| fBoldView->IsDefaultable()
+		|| fFixedView->IsDefaultable();
+}
 
 bool
 FontView::IsRevertable()

Modified: haiku/trunk/src/preferences/fonts/FontView.h
===================================================================
--- haiku/trunk/src/preferences/fonts/FontView.h	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/fonts/FontView.h	2007-08-17 03:45:37 UTC (rev 21992)
@@ -25,6 +25,7 @@
 		void	UpdateFonts();
 		void	RelayoutIfNeeded();
 
+		bool	IsDefaultable();
 		bool	IsRevertable();
 
 	private:

Modified: haiku/trunk/src/preferences/fonts/MainWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/fonts/MainWindow.cpp	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/fonts/MainWindow.cpp	2007-08-17 03:45:37 UTC (rev 21992)
@@ -35,15 +35,16 @@
 
 	rect.left = 10;
 	rect.top = rect.bottom - 10;
-	BButton *button = new BButton(rect, "defaults", "Defaults",
+	fDefaultsButton = new BButton(rect, "defaults", "Defaults",
 		new BMessage(kMsgSetDefaults), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM, B_WILL_DRAW);
-	button->ResizeToPreferred();
-	float buttonHeight = button->Bounds().Height();
-	button->MoveBy(0, -buttonHeight);
-	view->AddChild(button);
+	fDefaultsButton->ResizeToPreferred();
+	fDefaultsButton->SetEnabled(false);
+	float buttonHeight = fDefaultsButton->Bounds().Height();
+	fDefaultsButton->MoveBy(0, -buttonHeight);
+	view->AddChild(fDefaultsButton);
 
-	rect = button->Frame();
-	rect.OffsetBy(button->Bounds().Width() + 10, 0);
+	rect = fDefaultsButton->Frame();
+	rect.OffsetBy(fDefaultsButton->Bounds().Width() + 10, 0);
 
 	fRevertButton = new BButton(rect, "revert", "Revert",
 		new BMessage(kMsgRevert), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM, B_WILL_DRAW);
@@ -99,6 +100,8 @@
 
 	fRunner = new BMessageRunner(this, new BMessage(kMsgCheckFonts), 3000000);
 		// every 3 seconds
+
+	fDefaultsButton->SetEnabled(fFontsView->IsDefaultable());
 }
 
 
@@ -123,16 +126,19 @@
 {
 	switch (message->what) {
 		case kMsgUpdate:
+			fDefaultsButton->SetEnabled(fFontsView->IsDefaultable());
 			fRevertButton->SetEnabled(fFontsView->IsRevertable());
 			break;
 
 		case kMsgSetDefaults:
 			fFontsView->SetDefaults();
+			fDefaultsButton->SetEnabled(false);
 			fRevertButton->SetEnabled(fFontsView->IsRevertable());
 			break;
 
 		case kMsgRevert:
 			fFontsView->Revert();
+			fDefaultsButton->SetEnabled(fFontsView->IsDefaultable());
 			fRevertButton->SetEnabled(false);
 			break;
 

Modified: haiku/trunk/src/preferences/fonts/MainWindow.h
===================================================================
--- haiku/trunk/src/preferences/fonts/MainWindow.h	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/fonts/MainWindow.h	2007-08-17 03:45:37 UTC (rev 21992)
@@ -33,6 +33,7 @@
 
 		BMessageRunner*	fRunner;
 		FontView*		fFontsView;
+		BButton*		fDefaultsButton;
 		BButton*		fRevertButton;
 
 		FontsSettings	fSettings;

Modified: haiku/trunk/src/preferences/keyboard/KeyboardSettings.cpp
===================================================================
--- haiku/trunk/src/preferences/keyboard/KeyboardSettings.cpp	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/keyboard/KeyboardSettings.cpp	2007-08-17 03:45:37 UTC (rev 21992)
@@ -117,3 +117,11 @@
 	SetKeyboardRepeatDelay(kb_default_key_repeat_delay);
 	SetKeyboardRepeatRate(kb_default_key_repeat_rate);
 }
+
+
+bool
+KeyboardSettings::IsDefaultable()
+{
+	return fSettings.key_repeat_delay != kb_default_key_repeat_delay
+		|| fSettings.key_repeat_rate != kb_default_key_repeat_rate;
+}

Modified: haiku/trunk/src/preferences/keyboard/KeyboardSettings.h
===================================================================
--- haiku/trunk/src/preferences/keyboard/KeyboardSettings.h	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/keyboard/KeyboardSettings.h	2007-08-17 03:45:37 UTC (rev 21992)
@@ -21,6 +21,7 @@
 	void Dump();
 	void Revert();
 	void Defaults();
+	bool IsDefaultable();
 	
 	BPoint WindowCorner() const { return fCorner; }
 	void SetWindowCorner(BPoint corner);

Modified: haiku/trunk/src/preferences/keyboard/KeyboardWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/keyboard/KeyboardWindow.cpp	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/keyboard/KeyboardWindow.cpp	2007-08-17 03:45:37 UTC (rev 21992)
@@ -39,6 +39,10 @@
 	if (slider !=NULL) 
 		slider->SetValue(fSettings.KeyboardRepeatDelay());
 	
+	BButton *button = (BButton *)FindView("keyboard_defaults");
+	if (button !=NULL)
+		button->SetEnabled(fSettings.IsDefaultable());
+
 #ifdef DEBUG
 	fSettings.Dump();	
 #endif
@@ -78,6 +82,10 @@
 				slider = (BSlider *)FindView("delay_until_key_repeat");
 				if (slider !=NULL) 
 					slider->SetValue(fSettings.KeyboardRepeatDelay());
+
+				button = (BButton *)FindView("keyboard_defaults");
+				if (button !=NULL)
+					button->SetEnabled(false);
 				
 				button = (BButton *)FindView("keyboard_revert");
 		  		if (button !=NULL) 
@@ -95,6 +103,10 @@
 				if (slider !=NULL) 
 					slider->SetValue(fSettings.KeyboardRepeatDelay());	    		
 				
+				button = (BButton *)FindView("keyboard_defaults");
+				if (button !=NULL)
+					button->SetEnabled(fSettings.IsDefaultable());
+
 				button = (BButton *)FindView("keyboard_revert");
 		  		if (button !=NULL) 
 		  			button->SetEnabled(false);
@@ -106,6 +118,10 @@
 					break;
 				fSettings.SetKeyboardRepeatRate(rate);
 				
+				button = (BButton *)FindView("keyboard_defaults");
+				if (button !=NULL)
+					button->SetEnabled(fSettings.IsDefaultable());
+
 				button = (BButton *)FindView("keyboard_revert");
 		  		if (button !=NULL) 
 	  				button->SetEnabled(true);
@@ -133,6 +149,10 @@
 				if (slider !=NULL) 
 					slider->SetValue(delay);
 
+				button = (BButton *)FindView("keyboard_defaults");
+				if (button !=NULL)
+					button->SetEnabled(fSettings.IsDefaultable());
+
 				button = (BButton *)FindView("keyboard_revert");
 	  			if (button !=NULL) 
 	  				button->SetEnabled(true);

Modified: haiku/trunk/src/preferences/mouse/MouseSettings.cpp
===================================================================
--- haiku/trunk/src/preferences/mouse/MouseSettings.cpp	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/mouse/MouseSettings.cpp	2007-08-17 03:45:37 UTC (rev 21992)
@@ -191,6 +191,23 @@
 }
 
 
+/** Checks if the settings are different then the system defaults
+ */
+
+bool
+MouseSettings::IsDefaultable()
+{
+	return fSettings.click_speed != kDefaultClickSpeed
+		|| fSettings.accel.speed != kDefaultMouseSpeed
+		|| fSettings.type != kDefaultMouseType
+		|| fSettings.accel.accel_factor != kDefaultAccelerationFactor
+		|| fMode != B_NORMAL_MOUSE
+		|| fSettings.map.button[0] != B_PRIMARY_MOUSE_BUTTON
+		|| fSettings.map.button[1] != B_SECONDARY_MOUSE_BUTTON
+		|| fSettings.map.button[2] != B_TERTIARY_MOUSE_BUTTON;
+}
+
+
 /**	Reverts to the active settings at program startup
  */
 

Modified: haiku/trunk/src/preferences/mouse/MouseSettings.h
===================================================================
--- haiku/trunk/src/preferences/mouse/MouseSettings.h	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/mouse/MouseSettings.h	2007-08-17 03:45:37 UTC (rev 21992)
@@ -30,6 +30,7 @@
 
 		void Revert();
 		void Defaults();
+		bool IsDefaultable();
 		void Dump();
 
 		BPoint WindowPosition() const { return fWindowPosition; }

Modified: haiku/trunk/src/preferences/mouse/MouseWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/mouse/MouseWindow.cpp	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/mouse/MouseWindow.cpp	2007-08-17 03:45:37 UTC (rev 21992)
@@ -48,12 +48,13 @@
 	// Add the "Default" button
 	BRect rect(kBorderSpace, fSettingsView->Frame().bottom + kItemSpace + 2,
 		kBorderSpace + 75, fSettingsView->Frame().bottom + 20);
-	BButton *button = new BButton(rect, "defaults", "Defaults", new BMessage(kMsgDefaults));
-	button->ResizeToPreferred();
-	view->AddChild(button);
+	fDefaultsButton = new BButton(rect, "defaults", "Defaults", new BMessage(kMsgDefaults));
+	fDefaultsButton->ResizeToPreferred();
+	fDefaultsButton->SetEnabled(fSettings.IsDefaultable());
+	view->AddChild(fDefaultsButton);
 
 	// Add the "Revert" button
-	rect.OffsetBy(button->Bounds().Width() + kItemSpace, 0);
+	rect.OffsetBy(fDefaultsButton->Bounds().Width() + kItemSpace, 0);
 	fRevertButton = new BButton(rect, "revert", "Revert", new BMessage(kMsgRevert));
 	fRevertButton->SetEnabled(false);
 	fRevertButton->ResizeToPreferred();
@@ -64,7 +65,7 @@
 		// buttons and draw the selected imagery
 
 	ResizeTo(fSettingsView->Frame().right + kBorderSpace,
-		button->Frame().bottom + kBorderSpace - 1);
+		fRevertButton->Frame().bottom + kBorderSpace - 1);
 
 	// check if the window is on screen
 
@@ -105,7 +106,8 @@
 			fSettings.Defaults();
 			fSettingsView->UpdateFromSettings();
 
-			SetRevertable(true);
+			fDefaultsButton->SetEnabled(false);
+			fRevertButton->SetEnabled(true);
 			break;
 		}
 
@@ -114,7 +116,8 @@
 			fSettings.Revert();
 			fSettingsView->UpdateFromSettings();
 
-			SetRevertable(false);
+			fDefaultsButton->SetEnabled(fSettings.IsDefaultable());
+			fRevertButton->SetEnabled(false);
 			break;
 		}
 
@@ -124,7 +127,8 @@
 			if (message->FindInt32("index", &type) == B_OK) {
 				fSettings.SetMouseType(++type);
 				fSettingsView->SetMouseType(type);
-				SetRevertable(true);
+				fDefaultsButton->SetEnabled(fSettings.IsDefaultable());
+				fRevertButton->SetEnabled(true);
 			}
 			break;
 		}
@@ -134,7 +138,8 @@
 			int32 mode;
 			if (message->FindInt32("mode", &mode) == B_OK) {
 				fSettings.SetMouseMode((mode_mouse)mode);
-				SetRevertable(true);
+				fDefaultsButton->SetEnabled(fSettings.IsDefaultable());
+				fRevertButton->SetEnabled(true);
 			}
 			break;
 		}
@@ -145,7 +150,8 @@
 			if (message->FindInt32("be:value", &value) == B_OK) {
 				// slow = 1000000, fast = 0
 				fSettings.SetClickSpeed(value * 1000);
-				SetRevertable(true);
+				fDefaultsButton->SetEnabled(fSettings.IsDefaultable());
+				fRevertButton->SetEnabled(true);
 			}
 			break;
 		}
@@ -156,7 +162,8 @@
 			if (message->FindInt32("be:value", &value) == B_OK) {
 				// slow = 8192, fast = 524287
 				fSettings.SetMouseSpeed((int32)pow(2, value * 6 / 1000) * 8192);
-				SetRevertable(true);
+				fDefaultsButton->SetEnabled(fSettings.IsDefaultable());
+				fRevertButton->SetEnabled(true);
 			}
 			break;
 		}
@@ -167,7 +174,8 @@
 			if (message->FindInt32("be:value", &value) == B_OK) {
 				// slow = 0, fast = 262144
 				fSettings.SetAccelerationFactor((int32)pow(value * 4 / 1000, 2) * 16384);
-				SetRevertable(true);
+				fDefaultsButton->SetEnabled(fSettings.IsDefaultable());
+				fRevertButton->SetEnabled(true);
 			}
 			break;
 		}
@@ -189,7 +197,8 @@
 				}
 
 				fSettings.SetMapping(button, mapping);
-				SetRevertable(true);
+				fDefaultsButton->SetEnabled(fSettings.IsDefaultable());
+				fRevertButton->SetEnabled(true);
 				fSettingsView->MouseMapUpdated();
 			}
 			break;
@@ -201,10 +210,3 @@
 	}
 }
 
-
-void 
-MouseWindow::SetRevertable(bool revertable)
-{
-	fRevertButton->SetEnabled(revertable);
-}
-

Modified: haiku/trunk/src/preferences/mouse/MouseWindow.h
===================================================================
--- haiku/trunk/src/preferences/mouse/MouseWindow.h	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/mouse/MouseWindow.h	2007-08-17 03:45:37 UTC (rev 21992)
@@ -33,10 +33,9 @@
 		virtual bool QuitRequested();
 		virtual void MessageReceived(BMessage *message);
 
-		void SetRevertable(bool revertable);
-
 	private:
 		MouseSettings	fSettings;
+		BButton			*fDefaultsButton;
 		BButton			*fRevertButton;
 		SettingsView	*fSettingsView;
 };

Modified: haiku/trunk/src/preferences/virtualmemory/Settings.cpp
===================================================================
--- haiku/trunk/src/preferences/virtualmemory/Settings.cpp	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/virtualmemory/Settings.cpp	2007-08-17 03:45:37 UTC (rev 21992)
@@ -205,6 +205,14 @@
 
 
 bool
+Settings::IsDefaultable()
+{
+	return fSwapEnabled != fInitialSwapEnabled
+		|| fSwapSize != fInitialSwapSize;
+}
+
+
+bool
 Settings::SwapChanged()
 {
 	return fSwapEnabled != fInitialSwapEnabled

Modified: haiku/trunk/src/preferences/virtualmemory/Settings.h
===================================================================
--- haiku/trunk/src/preferences/virtualmemory/Settings.h	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/virtualmemory/Settings.h	2007-08-17 03:45:37 UTC (rev 21992)
@@ -27,6 +27,7 @@
 
 		void SetSwapDefaults();
 		void RevertSwapChanges();
+		bool IsDefaultable();
 		bool SwapChanged();
 
 	private:

Modified: haiku/trunk/src/preferences/virtualmemory/SettingsWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/virtualmemory/SettingsWindow.cpp	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/virtualmemory/SettingsWindow.cpp	2007-08-17 03:45:37 UTC (rev 21992)
@@ -196,17 +196,19 @@
 	// Add "Defaults" and "Revert" buttons
 
 	rect.top = box->Frame().bottom + 10;
-	BButton* button = new BButton(rect, "defaults", "Defaults", new BMessage(kMsgDefaults));
-	button->ResizeToPreferred();
-	view->AddChild(button);
+	fDefaultsButton = new BButton(rect, "defaults", "Defaults", new BMessage(kMsgDefaults));
+	fDefaultsButton->ResizeToPreferred();
+	fDefaultsButton->SetEnabled(fSettings.IsDefaultable());
+	view->AddChild(fDefaultsButton);
 
-	rect = button->Frame();
+	rect = fDefaultsButton->Frame();
 	rect.OffsetBy(rect.Width() + 10, 0);
 	fRevertButton = new BButton(rect, "revert", "Revert", new BMessage(kMsgRevert));
-	button->ResizeToPreferred();
+	fRevertButton->ResizeToPreferred();
+	fRevertButton->SetEnabled(false);
 	view->AddChild(fRevertButton);
 
-	view->ResizeTo(view->Frame().Width(), button->Frame().bottom + 10);
+	view->ResizeTo(view->Frame().Width(), fRevertButton->Frame().bottom + 10);
 	ResizeTo(view->Bounds().Width(), view->Bounds().Height());
 	AddChild(view);
 		// add view after resizing the window, so that the view's resizing
@@ -266,6 +268,8 @@
 
 	// ToDo: set volume
 
+	fDefaultsButton->SetEnabled(fSettings.IsDefaultable());
+
 	bool changed = fSettings.SwapChanged();
 	if (fRevertButton->IsEnabled() != changed) {
 		fRevertButton->SetEnabled(changed);

Modified: haiku/trunk/src/preferences/virtualmemory/SettingsWindow.h
===================================================================
--- haiku/trunk/src/preferences/virtualmemory/SettingsWindow.h	2007-08-16 21:37:33 UTC (rev 21991)
+++ haiku/trunk/src/preferences/virtualmemory/SettingsWindow.h	2007-08-17 03:45:37 UTC (rev 21992)
@@ -30,6 +30,7 @@
 
 		BCheckBox*		fSwapEnabledCheckBox;
 		BSlider*		fSizeSlider;
+		BButton*		fDefaultsButton;
 		BButton*		fRevertButton;
 		BStringView*	fWarningStringView;
 



From laplace at mail.berlios.de  Fri Aug 17 09:04:46 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Fri, 17 Aug 2007 09:04:46 +0200
Subject: [Haiku-commits] r21993 - haiku/trunk/src/servers/app
Message-ID: <200708170704.l7H74kkB013967@sheep.berlios.de>

Author: laplace
Date: 2007-08-17 09:04:46 +0200 (Fri, 17 Aug 2007)
New Revision: 21993
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21993&view=rev

Modified:
   haiku/trunk/src/servers/app/DrawState.cpp
Log:
Bug fixes:
* origin is given in "outer" coordinate system therefore if there is a
 previous state it has to be transformed. Please review if this is
 required in OffsetOrigin() too.
* in Transform() we have to scale relative to the view origin not (0 /
  0).

- optimized SetScale: saved one division


Modified: haiku/trunk/src/servers/app/DrawState.cpp
===================================================================
--- haiku/trunk/src/servers/app/DrawState.cpp	2007-08-17 03:45:37 UTC (rev 21992)
+++ haiku/trunk/src/servers/app/DrawState.cpp	2007-08-17 07:04:46 UTC (rev 21993)
@@ -7,6 +7,7 @@
  *		Adi Oanca <adioanca at mymail.ro>
  *		Stephan A?mus <superstippi at gmx.de>
  *		Axel D?rfler, axeld at pinc-software.de
+ *		Michael Pfeiffer <laplace at users.sourceforge.net>
  */
 
 /**	Data classes for working with BView states and draw parameters */
@@ -281,14 +282,27 @@
 void
 DrawState::SetOrigin(const BPoint& origin)
 {
-	fOrigin = fPreviousState ? fPreviousState->fOrigin + origin : origin;
+	fOrigin = origin;
+	// origin is given as a point in the
+	// "outer" coordinate system, therefore
+	// it has to be transformed
+	if (PreviousState() != NULL)
+		PreviousState()->Transform(&fOrigin);
 }
 
 
 void
 DrawState::OffsetOrigin(const BPoint& offset)
 {
-	fOrigin += offset;
+	if (PreviousState() == NULL)
+		fOrigin += offset;
+	else {
+		// TODO this is necessary only if offset 
+		// is in the "outer" coordinate system
+		float scale = PreviousState()->Scale();
+		fOrigin.x += offset.x * scale;
+		fOrigin.y += offset.y * scale;
+	}		
 }
 
 
@@ -296,14 +310,12 @@
 DrawState::SetScale(float scale)
 {
 	// the scale is multiplied with the scale of the previous state if any
-	float localScale = fScale;
+	float localScale = scale;
 	if (PreviousState() != NULL)
-		localScale /= PreviousState()->Scale();
+		localScale *= PreviousState()->Scale();
 
-	if (localScale != scale) {
-		fScale = scale;
-		if (PreviousState() != NULL)
-			fScale *= PreviousState()->Scale();
+	if (fScale != localScale) {
+		fScale = localScale;
 
 		// update font size
 		// (pen size is currently calulated on the fly)
@@ -315,10 +327,13 @@
 void
 DrawState::Transform(float* x, float* y) const
 {
+	// scale relative to origin, therefore
+	// scale first then translate to
+	// origin
+	*x *= fScale;
+	*y *= fScale;
 	*x += fOrigin.x;
 	*y += fOrigin.y;
-	*x *= fScale;
-	*y *= fScale;
 }
 
 // InverseTransform
@@ -326,10 +341,10 @@
 DrawState::InverseTransform(float* x, float* y) const
 {
 	// TODO: watch out for fScale = 0?
+	*x -= fOrigin.x;
+	*y -= fOrigin.y;
 	*x /= fScale;
 	*y /= fScale;
-	*x -= fOrigin.x;
-	*y -= fOrigin.y;
 }
 
 // Transform



From laplace at mail.berlios.de  Fri Aug 17 09:14:16 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Fri, 17 Aug 2007 09:14:16 +0200
Subject: [Haiku-commits] r21994 -
	haiku/trunk/src/tests/kits/interface/flatten_picture
Message-ID: <200708170714.l7H7EGgF014622@sheep.berlios.de>

Author: laplace
Date: 2007-08-17 09:14:15 +0200 (Fri, 17 Aug 2007)
New Revision: 21994
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21994&view=rev

Modified:
   haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
Log:
Added more tests.


Modified: haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-17 07:04:46 UTC (rev 21993)
+++ haiku/trunk/src/tests/kits/interface/flatten_picture/PictureTestCases.cpp	2007-08-17 07:14:15 UTC (rev 21994)
@@ -532,6 +532,89 @@
 	view->FillRect(r);
 }
 
+static void testSetOriginAndScale2(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	BPoint center = centerPoint(frame);
+	
+	BRect r(0, 0, frame.IntegerWidth() / 2, frame.IntegerHeight() / 2);
+	view->SetOrigin(center);
+	view->FillRect(r);
+	
+	view->SetScale(0.5);
+	view->SetHighColor(kRed);
+	view->FillRect(r);
+	
+	view->SetOrigin(0, 0);
+	view->SetHighColor(kGreen);
+	view->FillRect(r);
+}
+
+static void testSetOriginAndScale3(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	BPoint center = centerPoint(frame);
+	
+	BRect r(0, 0, frame.IntegerWidth() / 2, frame.IntegerHeight() / 2);
+	view->SetOrigin(center);
+	view->FillRect(r);
+	
+	view->SetScale(0.5);
+	view->SetHighColor(kRed);
+	view->FillRect(r);
+	
+	view->SetScale(0.25);
+	view->SetHighColor(kGreen);
+	view->FillRect(r);
+}
+
+static void testSetOriginAndScale4(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	BPoint center = centerPoint(frame);
+	
+	BRect r(0, 0, frame.IntegerWidth() / 2, frame.IntegerHeight() / 2);
+	view->SetOrigin(center);
+	view->FillRect(r);
+	
+	view->SetScale(0.5);
+	view->SetHighColor(kRed);
+	view->FillRect(r);
+	
+	view->PushState();
+		// 
+		view->SetOrigin(center.x+1, center.y);
+			// +1 to work around BeOS bug
+			// where setting the origin has no
+			// effect if it is the same as
+			// the previous value althou
+			// it is from the "outer" coordinate
+			// system
+		view->SetHighColor(kGreen);
+		view->FillRect(r);
+	view->PopState();
+}
+
+static void testSetOriginAndScale5(BView *view, BRect frame)
+{
+	frame.InsetBy(2, 2);
+	BPoint center = centerPoint(frame);
+	
+	BRect r(0, 0, frame.IntegerWidth() / 2, frame.IntegerHeight() / 2);
+	view->SetOrigin(center);
+	view->FillRect(r);
+	
+	view->SetScale(0.5);
+	view->SetHighColor(kRed);
+	view->FillRect(r);
+	
+	view->PushState();
+		view->SetScale(0.75);
+		view->SetHighColor(kGreen);
+		view->FillRect(r);
+	view->PopState();
+}
+
 static void testSetFontSize(BView *view, BRect frame)
 {
 	frame.InsetBy(2, 2);
@@ -604,6 +687,10 @@
 	{ "Test SetScale2*", testSetScale2 },
 	{ "Test SetScale3", testSetScale3 },
 	{ "Test SetOriginAndScale", testSetOriginAndScale },
+	{ "Test SetOriginAndScale2", testSetOriginAndScale2 },
+	{ "Test SetOriginAndScale3", testSetOriginAndScale3 },
+	{ "Test SetOriginAndScale4", testSetOriginAndScale4 },
+	{ "Test SetOriginAndScale5", testSetOriginAndScale5 },
 	{ "Test SetFontSize", testSetFontSize },
 	{ NULL, NULL }
 };



From laplace at mail.berlios.de  Fri Aug 17 10:33:39 2007
From: laplace at mail.berlios.de (laplace at BerliOS)
Date: Fri, 17 Aug 2007 10:33:39 +0200
Subject: [Haiku-commits] r21995 -
	haiku/trunk/src/add-ons/print/drivers/preview
Message-ID: <200708170833.l7H8Xd7J021179@sheep.berlios.de>

Author: laplace
Date: 2007-08-17 10:33:38 +0200 (Fri, 17 Aug 2007)
New Revision: 21995
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21995&view=rev

Modified:
   haiku/trunk/src/add-ons/print/drivers/preview/Preview.cpp
Log:
Bug in app_server prevents text drawing inside clipping region.
Don't constrain clipping region until bug has been fixed.
Printing to Preview printer driver works now again from StyledEdit.


Modified: haiku/trunk/src/add-ons/print/drivers/preview/Preview.cpp
===================================================================
--- haiku/trunk/src/add-ons/print/drivers/preview/Preview.cpp	2007-08-17 07:14:15 UTC (rev 21994)
+++ haiku/trunk/src/add-ons/print/drivers/preview/Preview.cpp	2007-08-17 08:33:38 UTC (rev 21995)
@@ -165,7 +165,10 @@
 	BRect r(PrintableRect());
 	r.OffsetBy(kPreviewLeftMargin, kPreviewTopMargin);
 	BRegion clip(r);
-	ConstrainClippingRegion(&clip);	
+	// Text drawing does not work if clipping region
+	// is constraint.
+	// TODO enable after app_server bug has been fixed
+	// ConstrainClippingRegion(&clip);	
 
 	// draw page contents
 	PushState();
@@ -177,8 +180,10 @@
 	
 	SetScale(ZoomFactor());
 	
-	fCachedPage->Draw(this);
-	
+		PushState();
+		fCachedPage->Draw(this);
+		PopState();
+		
 	PopState();
 }
 



From axeld at pinc-software.de  Fri Aug 17 10:39:19 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Fri, 17 Aug 2007 10:39:19 +0200 CEST
Subject: [Haiku-commits]
 =?iso-8859-15?q?r21992_-_in_haiku/trunk/src/prefe?=
 =?iso-8859-15?q?rences=3A_fonts_keyboard_mouse_virtualmemory?=
In-Reply-To: <200708170345.l7H3jd0n019412@sheep.berlios.de>
Message-ID: <1312837225-BeMail@zon>

leavengood at BerliOS <leavengood at mail.berlios.de> wrote:
>  bool
> +FontSelectionView::IsDefaultable()
> +{
> +	font_family default_family;
> +	font_style default_style;
> +	float default_size;

Just a minor thing: following our coding style, the variables should 
have been called defaultFamily, defaultStyle, and defaultSize.
Anyway, thanks!

Bye,
   Axel.



From jackburton at mail.berlios.de  Fri Aug 17 10:51:40 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Fri, 17 Aug 2007 10:51:40 +0200
Subject: [Haiku-commits] r21996 - haiku/trunk/src/kits/interface
Message-ID: <200708170851.l7H8pedS022455@sheep.berlios.de>

Author: jackburton
Date: 2007-08-17 10:51:39 +0200 (Fri, 17 Aug 2007)
New Revision: 21996
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21996&view=rev

Modified:
   haiku/trunk/src/kits/interface/Shelf.cpp
Log:
call RemoveSelf() on the replicant before deleting them. Fixes bug #1405


Modified: haiku/trunk/src/kits/interface/Shelf.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Shelf.cpp	2007-08-17 08:33:38 UTC (rev 21995)
+++ haiku/trunk/src/kits/interface/Shelf.cpp	2007-08-17 08:51:39 UTC (rev 21996)
@@ -1067,16 +1067,17 @@
 
 	int32 index = replicant_data::IndexOf(&fReplicants, item->message);
 
-	// TODO: Test if it's ok here
 	ReplicantDeleted(index, item->message, view);
+	
+	fReplicants.RemoveItem(item);	
 
-	fReplicants.RemoveItem(item);
-
 	if (loadedImage && item->image >= 0)
 		unload_add_on(item->image);
 
 	delete item;
 
+	// TODO: Should we also delete the view ?
+
 	return B_OK;
 }
 
@@ -1195,11 +1196,15 @@
 			// the view has not been accepted
 
 			if (relation == BDragger::TARGET_IS_PARENT
-				|| relation == BDragger::TARGET_IS_SIBLING)
-				delete replicant;
+				|| relation == BDragger::TARGET_IS_SIBLING) {
+				replicant->RemoveSelf();				
+				delete replicant;			
+			}
 			if (relation == BDragger::TARGET_IS_CHILD
-				|| relation == BDragger::TARGET_IS_SIBLING)
+				|| relation == BDragger::TARGET_IS_SIBLING) {
+				dragger->RemoveSelf();			
 				delete dragger;
+			}
 
 			return send_reply(data, B_ERROR, uniqueID);
 		}



From jackburton at mail.berlios.de  Fri Aug 17 11:54:32 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Fri, 17 Aug 2007 11:54:32 +0200
Subject: [Haiku-commits] r21997 - haiku/trunk/src/apps/terminal
Message-ID: <200708170954.l7H9sWhG026175@sheep.berlios.de>

Author: jackburton
Date: 2007-08-17 11:54:32 +0200 (Fri, 17 Aug 2007)
New Revision: 21997
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21997&view=rev

Modified:
   haiku/trunk/src/apps/terminal/Shell.cpp
   haiku/trunk/src/apps/terminal/TermParse.cpp
   haiku/trunk/src/apps/terminal/TermView.cpp
Log:
The Shell destructor was never called. Calling it showed that 
the PtyReader thread in TermParse hanged in read(). There's even a 
comment in there (by Axel) that read() is never interrupted. Switched to 
kill_thread() in TermParse::StopPtyReader() until this problem is fixed. 
At least we don't leave running apps around anymore. :)


Modified: haiku/trunk/src/apps/terminal/Shell.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/Shell.cpp	2007-08-17 08:51:39 UTC (rev 21996)
+++ haiku/trunk/src/apps/terminal/Shell.cpp	2007-08-17 09:54:32 UTC (rev 21997)
@@ -31,7 +31,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#define MAXPTTYS 16 * 4
 
 #ifndef CEOF
 #define CEOF ('D'&037)
@@ -55,29 +54,6 @@
 #define CSWTCH 0
 #endif
 
-/*
- * ANSI emulation.
- */
-#define INQ	0x05
-#define	FF	0x0C			/* C0, C1 control names		*/
-#define	LS1	0x0E
-#define	LS0	0x0F
-#define	CAN	0x18
-#define	SUB	0x1A
-#define	ESC	0x1B
-#define US	0x1F
-#define	DEL	0x7F
-#define HTS     ('H'+0x40)
-#define	SS2	0x8E
-#define	SS3	0x8F
-#define	DCS	0x90
-#define	OLDID	0x9A			/* ESC Z			*/
-#define	CSI	0x9B
-#define	ST	0x9C
-#define	OSC	0x9D
-#define	PM	0x9E
-#define	APC	0x9F
-#define	RDEL	0xFF
 
 /* default shell command and options. */
 const char *kDefaultShellCommand = { "/bin/sh" "-login" };
@@ -460,7 +436,7 @@
 		/*
 		 * set terminal interface.
 		 */
-		if (tcsetattr (0, TCSANOW, &tio) == -1) {
+		if (tcsetattr(0, TCSANOW, &tio) == -1) {
 			handshake.status = PTY_NG;
 			snprintf(handshake.msg, sizeof(handshake.msg),
 				"failed set terminal interface (TERMIOS).");
@@ -506,7 +482,6 @@
 		setenv("TTYPE", encoding, true);
 		setenv("SHELL", *argv, true);
 
-
 		execve(*argv, (char * const *)argv, environ);
 
 		/*

Modified: haiku/trunk/src/apps/terminal/TermParse.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermParse.cpp	2007-08-17 08:51:39 UTC (rev 21996)
+++ haiku/trunk/src/apps/terminal/TermParse.cpp	2007-08-17 09:54:32 UTC (rev 21997)
@@ -102,9 +102,6 @@
 
 	fQuitting = true;
 
-	//suspend_thread(fReaderThread);
-		// TODO: interrupt read() - doesn't work for whatever reason
-
 	StopPtyReader();
 	StopTermParse();
 	
@@ -229,7 +226,11 @@
 
 	if (fReaderThread >= 0) {
 		status_t dummy;
-		wait_for_thread(fReaderThread, &dummy);
+		//suspend_thread(fReaderThread);
+		// TODO: interrupt read() - doesn't work for whatever reason
+		//wait_for_thread(fReaderThread, &dummy);
+		kill_thread(fReaderThread);
+	
 		fReaderThread = -1;	
 	}
 }

Modified: haiku/trunk/src/apps/terminal/TermView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-17 08:51:39 UTC (rev 21996)
+++ haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-17 09:54:32 UTC (rev 21997)
@@ -328,10 +328,13 @@
 
 TermView::~TermView()
 {
+	Shell *shell = fShell;
+		// _DetachShell sets fShell to NULL
+	printf("TermView::~TermView()\n");
 	_DetachShell();
 	
 	delete fTextBuffer;
-	delete fShell;
+	delete shell;
 
 	fQuitting = true;
 	kill_thread(fMouseThread);



From jackburton at mail.berlios.de  Fri Aug 17 11:57:28 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Fri, 17 Aug 2007 11:57:28 +0200
Subject: [Haiku-commits] r21998 - haiku/trunk/src/apps/terminal
Message-ID: <200708170957.l7H9vSsN026326@sheep.berlios.de>

Author: jackburton
Date: 2007-08-17 11:57:28 +0200 (Fri, 17 Aug 2007)
New Revision: 21998
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21998&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermView.cpp
Log:
Removed debug leftover


Modified: haiku/trunk/src/apps/terminal/TermView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-17 09:54:32 UTC (rev 21997)
+++ haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-17 09:57:28 UTC (rev 21998)
@@ -330,7 +330,7 @@
 {
 	Shell *shell = fShell;
 		// _DetachShell sets fShell to NULL
-	printf("TermView::~TermView()\n");
+	
 	_DetachShell();
 	
 	delete fTextBuffer;



From axeld at mail.berlios.de  Fri Aug 17 13:01:11 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 17 Aug 2007 13:01:11 +0200
Subject: [Haiku-commits] r21999 - in haiku/trunk: headers/posix
	src/system/kernel/arch/x86 src/system/libroot/posix/signal
	src/tests/system/libroot/posix
Message-ID: <200708171101.l7HB1BFJ003392@sheep.berlios.de>

Author: axeld
Date: 2007-08-17 13:01:09 +0200 (Fri, 17 Aug 2007)
New Revision: 21999
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=21999&view=rev

Added:
   haiku/trunk/src/tests/system/libroot/posix/signal_test.cpp
Modified:
   haiku/trunk/headers/posix/signal.h
   haiku/trunk/src/system/kernel/arch/x86/arch_thread.c
   haiku/trunk/src/system/libroot/posix/signal/sigaction.c
   haiku/trunk/src/system/libroot/posix/signal/signal.c
   haiku/trunk/src/system/libroot/posix/signal/sigset.c
   haiku/trunk/src/system/libroot/posix/signal/strsignal.c
   haiku/trunk/src/tests/system/libroot/posix/Jamfile
Log:
Some more work on the signal code:
* get_signal_stack() checked the wrong sig_action field (index is signal-1), also,
  it had an off-by-one error in the stack range check.
* factored out a restart_syscall() function to avoid code duplication
* arch_setup_signal_frame() relied on the fact that vregs and the signal stack code
  is a multiple of 4 bytes in size.
* Fixed sigaction(): it did return the error code directly instead of setting errno.
* signal() actually had a work-around for the broken sigaction()...
* Replaced the sig_func_t typedef with a sighandler_t typedef - this is non-standard
  anyway, but now we're at least compatible with the GNU world instead of introducing
  our own solution (BSD seems to use sig_t here, BTW).
* Removed now unused sigval structure from the header; it should be added again as
  soon as we start supporting it.
* SA_RESETHAND and SA_ONESHOT are the same thing; the former did not work before.
* Made the non-standard SA_* flags refer to the standard ones instead of the other
  way around.
* Added a test application for various signal features - works fine under Haiku,
  tested also under Linux and BeOS (the latter fails as it does not support SA_RESTART).
  More tests should be added, though.
* Cleanup.


Modified: haiku/trunk/headers/posix/signal.h
===================================================================
--- haiku/trunk/headers/posix/signal.h	2007-08-17 09:57:28 UTC (rev 21998)
+++ haiku/trunk/headers/posix/signal.h	2007-08-17 11:01:09 UTC (rev 21999)
@@ -12,17 +12,20 @@
 typedef int	sig_atomic_t;
 typedef long sigset_t;
 
-typedef void (*sig_func_t)(int);
-typedef void (*__signal_func_ptr)(int);  /* deprecated, for compatibility with BeOS only */
+typedef void (*sighandler_t)(int);
+	/* GNU-like signal handler typedef */
 
+typedef void (*__signal_func_ptr)(int);
+	/* deprecated, for compatibility with BeOS only */
 
-typedef union sigval {
-	int		sival_int;
-	void	*sival_ptr;
-} sigval_t;
 
+/* macros defining the standard signal handling behavior */
+#define SIG_DFL		((sighandler_t)0)	/* "default" signal behaviour */
+#define SIG_IGN		((sighandler_t)1)	/* ignore signal */
+#define SIG_ERR		((sighandler_t)-1)	/* an error occurred during signal processing */
+#define SIG_HOLD	((sighandler_t)3)	/* the signal was hold */
 
-// ToDo: actually make use of this structure!
+// TODO: support this structure!
 typedef struct {
 	int		si_signo;	/* signal number */
 	int		si_code;	/* signal code */
@@ -32,45 +35,32 @@
 	void	*si_addr;	/* address of faulting instruction */
 	int		si_status;	/* exit value or signal */
 	long	si_band;	/* band event for SIGPOLL */
-	union sigval si_value;	/* signal value */
 } siginfo_t;
 
-
 /*
- * macros defining the standard signal handling behavior
- */
-#define SIG_DFL	((sig_func_t) 0)   /* the signal was treated in the "default" manner */
-#define SIG_IGN	((sig_func_t) 1)   /* the signal was ignored */
-#define SIG_ERR	((sig_func_t)-1)   /* an error occurred during signal processing */
-#define SIG_HOLD ((sig_func_t) 3)  /* the signal was hold */
-
-
-/*
  * structure used by sigaction()
  *
- * Note: the 'sa_userdata' field is a non-Posix extension.
- * See the SPECIAL NOTES below for an explanation of this.
- * 
+ * Note: the 'sa_userdata' field is a non-POSIX extension.
+ * See the documentation for more info on this.
  */
 struct sigaction {
-	sig_func_t	sa_handler;
+	sighandler_t sa_handler;
 	sigset_t	sa_mask;
 	int			sa_flags;
 	void		*sa_userdata;  /* will be passed to the signal handler */
 };
 
-
 /* values for sa_flags */
 #define SA_NOCLDSTOP	0x01
-#define SA_ONESHOT		0x02
-#define SA_NOMASK		0x04
-#define SA_NODEFER		SA_NOMASK
-#define SA_RESTART		0x08
-#define SA_STACK		0x10
-#define SA_ONSTACK		SA_STACK
-#define SA_RESETHAND	0x20
+#define SA_NOCLDWAIT	0x02
+#define SA_RESETHAND	0x04
+#define SA_NODEFER		0x08
+#define SA_RESTART		0x10
+#define SA_ONSTACK		0x20
 #define SA_SIGINFO		0x40
-#define SA_NOCLDWAIT	0x80
+#define SA_NOMASK		SA_NODEFER
+#define SA_STACK		SA_ONSTACK
+#define SA_ONESHOT		SA_RESETHAND
 
 /* values for ss_flags */
 #define SS_ONSTACK		0x1
@@ -94,14 +84,14 @@
 } sigstack;
 
 /* for the 'how' arg of sigprocmask() */
-#define SIG_BLOCK    1
-#define SIG_UNBLOCK  2
-#define SIG_SETMASK  3
+#define SIG_BLOCK		1
+#define SIG_UNBLOCK		2
+#define SIG_SETMASK		3
 
 /*
  * The list of all defined signals:
  *
- * The numbering of signals for OpenBeOS attempts to maintain 
+ * The numbering of signals for Haiku attempts to maintain 
  * some consistency with UN*X conventions so that things 
  * like "kill -9" do what you expect.
  */
@@ -142,9 +132,10 @@
  * releases.  Use them at your own peril (if you do use them, at least
  * be smart and use them backwards from signal 32).
  */
-#define MAX_SIGNO     32       /* the most signals that a single thread can reference */
-#define __signal_max  29       /* the largest signal number that is actually defined */
-#define NSIG (__signal_max+1)  /* the number of defined signals */
+#define MAX_SIGNO		32	/* the most signals that a single thread can reference */
+#define __signal_max	29	/* the largest signal number that is actually defined */
+#define NSIG			(__signal_max+1)
+	/* the number of defined signals */
 
 
 /* the global table of text strings containing descriptions for each signal */
@@ -155,7 +146,7 @@
 extern "C" {
 #endif
 
-sig_func_t signal(int sig, sig_func_t signal_handler);
+sighandler_t signal(int sig, sighandler_t signalHandler);
 int     raise(int sig);
 int     kill(pid_t pid, int sig);
 int     send_signal(pid_t tid, unsigned int sig);
@@ -205,7 +196,7 @@
 }
 #endif
 
-/*
+/* TODO: move this into the documentation!
  * ==================================================
  * !!! SPECIAL NOTES CONCERNING NON-POSIX EXTENSIONS:
  * ==================================================
@@ -226,7 +217,7 @@
  * handling. It also allows an opportunity, via the 'sigaction' struct, to
  * enable additional data to be passed to the handler. For example:
  *    void
- *    my_signal_handler(int sig, char *somedata, vregs regs)
+ *    my_signal_handler(int sig, char *userData, vregs regs)
  *    {
  *    . . .
  *    }
@@ -234,10 +225,9 @@
  *    struct sigaction sa;
  *    char data_buffer[32];
  *
- *    sa.sa_handler = (sig_func_t) my_signal_handler;
+ *    sa.sa_handler = (sighandler_t)my_signal_handler;
  *    sigemptyset(&sa.sa_mask);
- *    sigaddset(&sa.sa_mask, SIGINT);
- *    sa.sa_userdata = data_buffer;
+ *    sa.sa_userdata = userData;
  *
  *    // install the handler
  *    sigaction(SIGINT, &sa, NULL);
@@ -245,29 +235,21 @@
  * The two additional arguments available to the signal handler are extensions
  * to the Posix standard. This feature was introduced by the BeOS and retained
  * by Haiku. However, to remain compatible with Posix and ANSI C, the type
- * of the sa_handler field is defined as 'sig_func_t'. This requires the handler
+ * of the sa_handler field is defined as 'sighandler_t'. This requires the handler
  * to be cast when assigned to the sa_handler field, as in the example above.
  *
- * NOTE: C++ member functions can not be signal handlers!
- * This is because they expect a "this" pointer as the first argument.
- *
- *
  * The 3 arguments that Haiku provides to signal handlers are as follows:
+ * 1) The first argument is the (usual) signal number.
  *
- *  - The first argument is the (usual) signal number.
- *
- *  - The second argument is whatever value is put in the sa_userdata field
+ * 2) The second argument is whatever value is put in the sa_userdata field
  *    of the sigaction struct.
  *
- *  - The third argument is a pointer to a vregs struct (defined below).
+ * 3) The third argument is a pointer to a vregs struct (defined below).
  *    The vregs struct contains the contents of the volatile registers at
  *    the time the signal was delivered to your thread. You can change the fields
  *    of the structure. After your signal handler completes, the OS uses this struct
  *    to reload the registers for your thread (privileged registers are not loaded
  *    of course). The vregs struct is of course terribly machine dependent.
- *    If you use it, you should expect to have to re-work your code when new
- *    processors come out. Nonetheless, the ability to change the registers does
- *    open some interesting programming possibilities.
  */
 
 /*

Modified: haiku/trunk/src/system/kernel/arch/x86/arch_thread.c
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_thread.c	2007-08-17 09:57:28 UTC (rev 21998)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_thread.c	2007-08-17 11:01:09 UTC (rev 21999)
@@ -156,14 +156,25 @@
 }
 
 
+static inline void
+restart_syscall(struct iframe *frame)
+{
+	frame->eax = frame->orig_eax;
+	frame->edx = frame->orig_edx;
+	frame->eip -= 2;
+		// undos the "int $99" syscall interrupt
+		// (so that it'll be called again)
+}
+
+
 static uint32 *
 get_signal_stack(struct thread *thread, struct iframe *frame, int signal)
 {
 	// use the alternate signal stack if we should and can
 	if (thread->signal_stack_enabled
-		&& (thread->sig_action[signal].sa_flags & SA_ONSTACK) != 0
+		&& (thread->sig_action[signal - 1].sa_flags & SA_ONSTACK) != 0
 		&& (frame->user_esp < thread->signal_stack_base
-			|| frame->user_esp > thread->signal_stack_base
+			|| frame->user_esp >= thread->signal_stack_base
 				+ thread->signal_stack_size)) {
 		return (uint32 *)(thread->signal_stack_base
 			+ thread->signal_stack_size);
@@ -193,7 +204,8 @@
 
 
 status_t
-arch_thread_init_kthread_stack(struct thread *t, int (*start_func)(void), void (*entry_func)(void), void (*exit_func)(void))
+arch_thread_init_kthread_stack(struct thread *t, int (*start_func)(void),
+	void (*entry_func)(void), void (*exit_func)(void))
 {
 	addr_t *kstack = (addr_t *)t->kernel_stack_base;
 	addr_t *kstack_top = kstack + KERNEL_STACK_SIZE / sizeof(addr_t);
@@ -222,7 +234,8 @@
 	kstack_top--;
 	*kstack_top = (unsigned int)start_func;
 
-	// set the return address to be the start of the entry (thread setup) function
+	// set the return address to be the start of the entry (thread setup)
+	// function
 	kstack_top--;
 	*kstack_top = (unsigned int)entry_func;
 
@@ -256,7 +269,8 @@
 	uint32 tls[TLS_THREAD_ID_SLOT + 1];
 	int32 i;
 
-	thread->user_local_storage = thread->user_stack_base + thread->user_stack_size;
+	thread->user_local_storage = thread->user_stack_base
+		+ thread->user_stack_size;
 
 	// initialize default TLS fields
 	tls[TLS_BASE_ADDRESS_SLOT] = thread->user_local_storage;
@@ -267,7 +281,8 @@
 
 
 void
-arch_thread_switch_kstack_and_call(struct thread *t, addr_t new_kstack, void (*func)(void *), void *arg)
+arch_thread_switch_kstack_and_call(struct thread *t, addr_t new_kstack,
+	void (*func)(void *), void *arg)
 {
 	i386_switch_stack_and_call(new_kstack, func, arg);
 }
@@ -328,7 +343,8 @@
  */
 
 status_t
-arch_thread_enter_userspace(struct thread *t, addr_t entry, void *args1, void *args2)
+arch_thread_enter_userspace(struct thread *t, addr_t entry, void *args1,
+	void *args2)
 {
 	addr_t stackTop = t->user_stack_base + t->user_stack_size;
 	uint32 codeSize = (addr_t)x86_end_userspace_thread_exit
@@ -375,7 +391,7 @@
 arch_on_signal_stack(struct thread *thread)
 {
 	struct iframe *frame = get_current_iframe();
-	
+
 	return frame->user_esp >= thread->signal_stack_base
 		&& frame->user_esp < thread->signal_stack_base
 			+ thread->signal_stack_size;
@@ -383,7 +399,7 @@
 
 
 status_t
-arch_setup_signal_frame(struct thread *thread, struct sigaction *sa,
+arch_setup_signal_frame(struct thread *thread, struct sigaction *action,
 	int signal, int signalMask)
 {
 	struct iframe *frame = get_current_iframe();
@@ -397,14 +413,10 @@
 	if (frame->orig_eax >= 0) {
 		// we're coming from a syscall
 		if ((status_t)frame->eax == EINTR
-			&& (sa->sa_flags & SA_RESTART) != 0) {
+			&& (action->sa_flags & SA_RESTART) != 0) {
 			TRACE(("### restarting syscall %d after signal %d\n",
 				frame->orig_eax, sig));
-			frame->eax = frame->orig_eax;
-			frame->edx = frame->orig_edx;
-			frame->eip -= 2;
-				// undos the "int $99" syscall interrupt
-				// (so that it'll be called again)
+			restart_syscall(frame);
 		}
 	}
 
@@ -412,8 +424,6 @@
 	userStack = get_signal_stack(thread, frame, signal);
 
 	// store the saved regs onto the user stack
-	userStack -= ROUNDUP(sizeof(struct vregs) / 4, 4);
-	userRegs = userStack;
 	regs.eip = frame->eip;
 	regs.eflags = frame->flags;
 	regs.eax = frame->eax;
@@ -426,12 +436,14 @@
 	regs._reserved_2[2] = frame->ebp;
 	i386_fnsave((void *)(&regs.xregs));
 	
+	userStack -= ROUNDUP((sizeof(struct vregs) + 3) / 4, 4);
+	userRegs = userStack;
 	status = user_memcpy(userRegs, &regs, sizeof(regs));
 	if (status < B_OK)
 		return status;
 
 	// now store a code snippet on the stack
-	userStack -= ((uint32)i386_end_return_from_signal
+	userStack -= ((uint32)i386_end_return_from_signal + 3
 		- (uint32)i386_return_from_signal) / 4;
 	signalCode = userStack;
 	status = user_memcpy(signalCode, i386_return_from_signal,
@@ -442,9 +454,9 @@
 
 	// now set up the final part
 	buffer[0] = (uint32)signalCode;	// return address when sa_handler done
-	buffer[1] = signal;				// first argument to sa_handler
-	buffer[2] = (uint32)sa->sa_userdata; // second argument to sa_handler
-	buffer[3] = (uint32)userRegs;	// third argument to sa_handler
+	buffer[1] = signal;				// arguments to sa_handler
+	buffer[2] = (uint32)action->sa_userdata;
+	buffer[3] = (uint32)userRegs;
 
 	buffer[4] = signalMask;			// Old signal mask to restore
 	buffer[5] = (uint32)userRegs;	// Int frame + extra regs to restore
@@ -456,7 +468,7 @@
 		return status;
 
 	frame->user_esp = (uint32)userStack;
-	frame->eip = (uint32)sa->sa_handler;
+	frame->eip = (uint32)action->sa_handler;
 
 	return B_OK;
 }
@@ -511,12 +523,8 @@
 		return;
 	}
 
-	if ((status_t)frame->orig_eax >= 0 && (status_t)frame->eax == EINTR) {
-		frame->eax = frame->orig_eax;
-		frame->edx = frame->orig_edx;
-		frame->eip -= 2;
-			// undoes the "int $99" syscall interrupt (so that it'll be called again)
-	}
+	if ((status_t)frame->orig_eax >= 0 && (status_t)frame->eax == EINTR)
+		restart_syscall(frame);
 }
 
 

Modified: haiku/trunk/src/system/libroot/posix/signal/sigaction.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/signal/sigaction.c	2007-08-17 09:57:28 UTC (rev 21998)
+++ haiku/trunk/src/system/libroot/posix/signal/sigaction.c	2007-08-17 11:01:09 UTC (rev 21999)
@@ -1,19 +1,27 @@
 /*
- *  Copyright (c) 2002-2004, Haiku Project. All rights reserved.
- *  Distributed under the terms of the Haiku license.
+ * Copyright 2002-2007, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT license.
  *
- *  Author(s):
- *  Daniel Reinhold (danielre at users.sf.net)
+ * Author:
+ *		Daniel Reinhold (danielre at users.sf.net)
  */
 
 
-#include <syscalls.h>
+#include <errno.h>
 #include <signal.h>
 
+#include <syscalls.h>
 
+
 int
 sigaction(int sig, const struct sigaction *action, struct sigaction *oldAction)
 {
-	return _kern_sigaction(sig, action, oldAction);
+	status_t status = _kern_sigaction(sig, action, oldAction);
+	if (status < B_OK) {
+		errno = status;
+		return -1;
+	}
+
+	return 0;
 }
 

Modified: haiku/trunk/src/system/libroot/posix/signal/signal.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/signal/signal.c	2007-08-17 09:57:28 UTC (rev 21998)
+++ haiku/trunk/src/system/libroot/posix/signal/signal.c	2007-08-17 11:01:09 UTC (rev 21999)
@@ -1,35 +1,28 @@
 /*
- *  Copyright (c) 2002-2004, Haiku Project. All rights reserved.
- *  Distributed under the terms of the Haiku license.
+ * Copyright 2002-2007, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT license.
  *
- *  Author(s):
- *  Daniel Reinhold (danielre at users.sf.net)
+ * Author:
+ *		Daniel Reinhold (danielre at users.sf.net)
  */
 
 
-#include <stdio.h>
 #include <signal.h>
-#include <errno.h>
+#include <stdio.h>
 
 
-sig_func_t
-signal(int sig, sig_func_t signalHandler)
+sighandler_t
+signal(int sig, sighandler_t signalHandler)
 {
 	struct sigaction newAction, oldAction;
-	int err;
 
 	// setup the replacement sigaction
 	newAction.sa_handler = signalHandler;
 	newAction.sa_mask = 0;
 	newAction.sa_flags = 0;
 
-	// install the replacement sigaction for the signal 'sig' into
-	// the current thread (the original is copied into the last param)
-	err = sigaction(sig, &newAction, &oldAction);
-	if (err < B_OK) {
-		errno = err;
+	if (sigaction(sig, &newAction, &oldAction) != 0)
 		return SIG_ERR;
-	}
 
 	// success, return the original handler
 	return oldAction.sa_handler;

Modified: haiku/trunk/src/system/libroot/posix/signal/sigset.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/signal/sigset.c	2007-08-17 09:57:28 UTC (rev 21998)
+++ haiku/trunk/src/system/libroot/posix/signal/sigset.c	2007-08-17 11:01:09 UTC (rev 21999)
@@ -1,28 +1,17 @@
-#include <syscalls.h>
-#include <signal.h>
-
 /*
- *  Copyright (c) 2002, OpenBeOS Project. All rights reserved.
- *  Distributed under the terms of the OpenBeOS license.
+ * Copyright 2002-2007, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT license.
  *
- *
- *  sigset.c:
- *  implements two sigset functions:
- *    sigemptyset() and sigfillset()
- *
- *  the other three sigset functions
- *    sigaddset(), sigdelset(), and sigismember()
- *  are inlined in the <signal.h> header file
- *  (I have no idea why there is a distinction between
- *   some being inlined and others not)
- *
- *
- *  Author(s):
- *  Daniel Reinhold (danielre at users.sf.net)
- *
+ * Author:
+ *		Daniel Reinhold (danielre at users.sf.net)
  */
 
 
+#include <signal.h>
+
+#include <syscalls.h>
+
+
 int
 sigemptyset(sigset_t *set)	
 {

Modified: haiku/trunk/src/system/libroot/posix/signal/strsignal.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/signal/strsignal.c	2007-08-17 09:57:28 UTC (rev 21998)
+++ haiku/trunk/src/system/libroot/posix/signal/strsignal.c	2007-08-17 11:01:09 UTC (rev 21999)
@@ -1,22 +1,17 @@
-#include <stdio.h>
-#include <signal.h>
-#include <errno.h>
-
 /*
- *  Copyright (c) 2002, OpenBeOS Project. All rights reserved.
- *  Distributed under the terms of the OpenBeOS license.
+ * Copyright 2002-2007, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT license.
  *
- *
- *  strsignal.c:
- *  implements the signal function strsignal()
- *
- *
- *  Author(s):
- *  Daniel Reinhold (danielre at users.sf.net)
- *
+ * Author:
+ *		Daniel Reinhold (danielre at users.sf.net)
  */
 
 
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+
+
 const char * const
 sys_siglist[NSIG] = {
 	/*  0              */  "Signal 0",
@@ -56,13 +51,13 @@
 strsignal(int sig)
 {
 	const char *s = NULL;
-	
+
 	if (sig < 0 || sig > MAX_SIGNO)
 		return "Bogus signal number";
-	
+
 	if (sig < NSIG)
 		s = sys_siglist[sig];
-	
+
 	if (s)
 		return s;
 	else {

Modified: haiku/trunk/src/tests/system/libroot/posix/Jamfile
===================================================================
--- haiku/trunk/src/tests/system/libroot/posix/Jamfile	2007-08-17 09:57:28 UTC (rev 21998)
+++ haiku/trunk/src/tests/system/libroot/posix/Jamfile	2007-08-17 11:01:09 UTC (rev 21999)
@@ -10,6 +10,10 @@
 	: flock_test.cpp
 ;
 
+SimpleTest signal_test
+	: signal_test.cpp
+;
+
 SimpleTest setjmp_test
 	: setjmp_test.c
 ;

Added: haiku/trunk/src/tests/system/libroot/posix/signal_test.cpp
===================================================================
--- haiku/trunk/src/tests/system/libroot/posix/signal_test.cpp	2007-08-17 09:57:28 UTC (rev 21998)
+++ haiku/trunk/src/tests/system/libroot/posix/signal_test.cpp	2007-08-17 11:01:09 UTC (rev 21999)
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2007, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+
+#if defined(__BEOS__) && !defined(__HAIKU__)
+typedef void (*sighandler_t)(int);
+#	define SIGSTKSZ		16384
+#	define SA_ONESHOT	0
+#	define SA_ONSTACK	0
+#	define SA_RESTART	0
+#	define ualarm(usec, interval) alarm(1)
+#endif
+
+const void* kUserDataMagic = (void *)0x12345678;
+
+static char sAlternateStack[SIGSTKSZ];
+
+
+bool
+is_alternate(void* pointer)
+{
+	return (char*)pointer > &sAlternateStack[0]
+		&& (char*)pointer <= &sAlternateStack[0] + SIGSTKSZ;
+}
+
+
+void
+sigHandler(int signal, void *userData, vregs *regs)
+{
+#ifdef __BEOS__
+	if (userData != kUserDataMagic)
+		fprintf(stderr, "FAILED: user data not correct: %p\n", userData);
+#endif
+
+	printf("signal handler called with signal %i on %s stack\n",
+		signal, is_alternate(&signal) ? "alternate" : "standard");
+}
+
+
+void
+wait_for_key()
+{
+	char buffer[100];
+	if (fgets(buffer, sizeof(buffer), stdin) == NULL
+		|| buffer[0] == 'q') {
+		if (errno == EINTR)
+			puts("interrupted");
+		else
+			exit(0);
+	}
+}
+
+int
+main()
+{
+	puts("-- 1 (should block) --");
+
+	struct sigaction newAction;
+	newAction.sa_handler = (sighandler_t)sigHandler;
+	newAction.sa_mask = 0;
+	newAction.sa_flags = SA_ONESHOT | SA_ONSTACK | SA_RESTART;
+#ifdef __BEOS__
+	newAction.sa_userdata = (void*)kUserDataMagic;
+#endif
+	sigaction(SIGALRM, &newAction, NULL);
+
+	ualarm(10000, 0);
+	wait_for_key();
+
+	puts("-- 2 (does not block, should call handler twice) --");
+
+	newAction.sa_flags = 0;
+	sigaction(SIGALRM, &newAction, NULL);
+
+	ualarm(0, 50000);
+	wait_for_key();
+	wait_for_key();
+
+	ualarm(0, 0);
+
+	puts("-- 3 (alternate stack, should block) --");
+
+#if defined(__BEOS__) && !defined(__HAIKU__)
+	set_signal_stack(sAlternateStack, SIGSTKSZ);
+#else
+	stack_t newStack;
+	newStack.ss_sp = sAlternateStack;
+	newStack.ss_size = SIGSTKSZ;
+	newStack.ss_flags = 0;
+	if (sigaltstack(&newStack, NULL) != 0)
+		fprintf(stderr, "sigaltstack() failed: %s\n", strerror(errno));
+#endif
+
+	newAction.sa_flags = SA_RESTART | SA_ONSTACK;
+	sigaction(SIGALRM, &newAction, NULL);
+
+	ualarm(10000, 0);
+	wait_for_key();
+
+	puts("-- end --");
+	return 0;
+}



From stefano.ceccherini at gmail.com  Fri Aug 17 13:07:09 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Fri, 17 Aug 2007 13:07:09 +0200
Subject: [Haiku-commits] r21999 - in haiku/trunk: headers/posix
	src/system/kernel/arch/x86 src/system/libroot/posix/signal
	src/tests/system/libroot/posix
In-Reply-To: <200708171101.l7HB1BFJ003392@sheep.berlios.de>
References: <200708171101.l7HB1BFJ003392@sheep.berlios.de>
Message-ID: <894b9700708170407n7af89430k86d0604a793f99f7@mail.gmail.com>

2007/8/17, axeld at BerliOS <axeld at mail.berlios.de>:

>  More tests should be added, though.

We do have some in
src/tests/system/libroot/posix/posixtestsuit/conformance/interfaces.
The posix test suite has many more signal tests which can be added if
needed.


From stippi at mail.berlios.de  Fri Aug 17 13:17:32 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Fri, 17 Aug 2007 13:17:32 +0200
Subject: [Haiku-commits] r22000 - in haiku/trunk: headers/os/interface
	headers/private/interface src/kits/interface
Message-ID: <200708171117.l7HBHWn8023559@sheep.berlios.de>

Author: stippi
Date: 2007-08-17 13:17:29 +0200 (Fri, 17 Aug 2007)
New Revision: 22000
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22000&view=rev

Modified:
   haiku/trunk/headers/os/interface/Shape.h
   haiku/trunk/headers/private/interface/ShapePrivate.h
   haiku/trunk/src/kits/interface/Shape.cpp
Log:
* fix weird Shape op/point allocation
* handle out of memory situations
* don't try to copy (and assign op!) in SetData if opCount/ptCount is 0
-> FontDemo doesn't crash anymore eventually when cycling fonts in outline
mode


Modified: haiku/trunk/headers/os/interface/Shape.h
===================================================================
--- haiku/trunk/headers/os/interface/Shape.h	2007-08-17 11:01:09 UTC (rev 21999)
+++ haiku/trunk/headers/os/interface/Shape.h	2007-08-17 11:17:29 UTC (rev 22000)
@@ -84,8 +84,8 @@
 		void			GetData(int32 *opCount, int32 *ptCount, uint32 **opList, BPoint **ptList);
 		void			SetData(int32 opCount, int32 ptCount, const uint32 *opList, const BPoint *ptList);
 		void			InitData();
-		void			AllocatePts(int32 count);
-		void			AllocateOps(int32 count);
+		bool			AllocatePts(int32 count);
+		bool			AllocateOps(int32 count);
 
 		uint32			fState;
 		uint32			fBuildingOp;

Modified: haiku/trunk/headers/private/interface/ShapePrivate.h
===================================================================
--- haiku/trunk/headers/private/interface/ShapePrivate.h	2007-08-17 11:01:09 UTC (rev 21999)
+++ haiku/trunk/headers/private/interface/ShapePrivate.h	2007-08-17 11:17:29 UTC (rev 22000)
@@ -19,11 +19,9 @@
 	uint32	*opList;
 	int32	opCount;
 	int32	opSize;
-	int32	opBlockSize;
 	BPoint	*ptList;
 	int32	ptCount;
 	int32	ptSize;
-	int32	ptBlockSize;
 };
 
 #endif

Modified: haiku/trunk/src/kits/interface/Shape.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Shape.cpp	2007-08-17 11:01:09 UTC (rev 21999)
+++ haiku/trunk/src/kits/interface/Shape.cpp	2007-08-17 11:17:29 UTC (rev 22000)
@@ -130,7 +130,8 @@
 	int32 count = 0;
 	type_code type = 0;
 	archive->GetInfo("ops", &type, &count);
-	AllocateOps(count);
+	if (!AllocateOps(count))
+		return;
 
 	int32 i = 0;
 	const uint32 *opPtr;
@@ -138,7 +139,10 @@
 		data->opList[data->opCount++] = *opPtr;
 
 	archive->GetInfo("pts", &type, &count);
-	AllocatePts(count);
+	if (!AllocatePts(count)) {
+		Clear();
+		return;
+	}
 
 	i = 0;
 	const BPoint *ptPtr;
@@ -263,12 +267,13 @@
 	shape_data *data = (shape_data*)fPrivateData;
 	shape_data *otherData = (shape_data*)otherShape->fPrivateData;
 
-	AllocateOps(otherData->opCount);
+	if (!AllocateOps(otherData->opCount) || !AllocatePts(otherData->ptCount))
+		return B_NO_MEMORY;
+
 	memcpy(data->opList + data->opCount * sizeof(uint32), otherData->opList,
 		otherData->opCount * sizeof(uint32));
 	data->opCount += otherData->opCount;
 
-	AllocatePts(otherData->ptCount);
 	memcpy(data->ptList + data->ptCount * sizeof(BPoint), otherData->ptList,
 		otherData->ptCount * sizeof(BPoint));
 	data->ptCount += otherData->ptCount;
@@ -290,14 +295,15 @@
 		return B_OK;
 	}
 
+	if (!AllocateOps(1) || !AllocatePts(1))
+		return B_NO_MEMORY;
+
 	fBuildingOp = OP_MOVETO;
 
 	// Add op
-	AllocateOps(1);
 	data->opList[data->opCount++] = fBuildingOp;
 
 	// Add point
-	AllocatePts(1);
 	data->ptList[data->ptCount++] = point;
 
 	return B_OK;
@@ -307,6 +313,9 @@
 status_t
 BShape::LineTo(BPoint point)
 {
+	if (!AllocatePts(1))
+		return B_NO_MEMORY;
+
 	shape_data *data = (shape_data*)fPrivateData;
 
 	// If the last op is MoveTo, replace the op and set the count
@@ -317,13 +326,13 @@
 		fBuildingOp += 1;
 		data->opList[data->opCount - 1] = fBuildingOp;
 	} else {
+		if (!AllocateOps(1))
+			return B_NO_MEMORY;
 		fBuildingOp = OP_LINETO + 1;
-		AllocateOps(1);
 		data->opList[data->opCount++] = fBuildingOp;
 	}
 
 	// Add point
-	AllocatePts(1);
 	data->ptList[data->ptCount++] = point;
 
 	return B_OK;
@@ -333,6 +342,9 @@
 status_t
 BShape::BezierTo(BPoint controlPoints[3])
 {
+	if (!AllocatePts(3))
+		return B_NO_MEMORY;
+
 	shape_data *data = (shape_data*)fPrivateData;
 
 	// If the last op is MoveTo, replace the op and set the count
@@ -343,13 +355,13 @@
 		fBuildingOp += 3;
 		data->opList[data->opCount - 1] = fBuildingOp;
 	} else {
+		if (!AllocateOps(1))
+			return B_NO_MEMORY;
 		fBuildingOp = OP_BEZIERTO + 3;
-		AllocateOps(1);
 		data->opList[data->opCount++] = fBuildingOp;
 	}
 
 	// Add points
-	AllocatePts(3);
 	data->ptList[data->ptCount++] = controlPoints[0];
 	data->ptList[data->ptCount++] = controlPoints[1];
 	data->ptList[data->ptCount++] = controlPoints[2];
@@ -361,13 +373,15 @@
 status_t
 BShape::Close()
 {
-	shape_data *data = (shape_data*)fPrivateData;
-
 	// If the last op is Close or MoveTo, ignore this
 	if (fBuildingOp == OP_CLOSE || fBuildingOp == OP_MOVETO)
 		return B_OK;
 
+	if (!AllocateOps(1))
+		return B_NO_MEMORY;
 
+	shape_data *data = (shape_data*)fPrivateData;
+
 	// ToDo: Decide about that, it's not BeOS compatible
 	// If there was any op before we can attach the close to it
 	/*if (fBuildingOp) {
@@ -377,7 +391,6 @@
 	}*/
 
 	fBuildingOp = OP_CLOSE;
-	AllocateOps(1);
 	data->opList[data->opCount++] = fBuildingOp;
 
 	return B_OK;
@@ -416,19 +429,27 @@
 {
 	Clear();
 
+	if (opCount == 0)
+		return;
+
 	shape_data *data = (shape_data*)fPrivateData;
 
-	AllocateOps(opCount);
+	if (!AllocateOps(opCount) || !AllocatePts(ptCount))
+		return;
+
 	memcpy(data->opList, opList, opCount * sizeof(uint32));
 	data->opCount = opCount;
 	fBuildingOp = data->opList[data->opCount - 1];
 
-	AllocatePts(ptCount);
-	memcpy(data->ptList, ptList, ptCount * sizeof(BPoint));
-	data->ptCount = ptCount;
+	if (ptCount > 0) {
+		memcpy(data->ptList, ptList, ptCount * sizeof(BPoint));
+		data->ptCount = ptCount;
+	}
 }
 
 
+
+
 void
 BShape::InitData()
 {
@@ -441,41 +462,47 @@
 	data->opList = NULL;
 	data->opCount = 0;
 	data->opSize = 0;
-	data->opBlockSize = 255;
 	data->ptList = NULL;
 	data->ptCount = 0;
 	data->ptSize = 0;
-	data->ptBlockSize = 255;
 }
 
 
-inline void
+inline bool
 BShape::AllocateOps(int32 count)
 {
 	shape_data *data = (shape_data*)fPrivateData;
 
-	while (data->opSize < data->opCount + count) {
-		int32 new_size = ((data->opCount + data->opBlockSize) /
-			data->opBlockSize) * data->opBlockSize;
-		data->opList = (uint32*)realloc(data->opList, new_size * sizeof(uint32));
-		data->opSize = new_size;
-		count -= data->opBlockSize;
+	int32 newSize = (data->opCount + count + 255) / 256 * 256;
+	if (data->opSize >= newSize)
+		return true;
+
+	uint32* resizedArray = (uint32*)realloc(data->opList, newSize * sizeof(uint32));
+	if (resizedArray) {
+		data->opList = resizedArray;
+		data->opSize = newSize;
+		return true;
 	}
+	return false;
 }
 
 
-inline void
+inline bool
 BShape::AllocatePts(int32 count)
 {
 	shape_data *data = (shape_data*)fPrivateData;
 
-	while (data->ptSize < data->ptCount + count) {
-		int32 new_size = ((data->ptCount + data->ptBlockSize) /
-			data->ptBlockSize) * data->ptBlockSize;
-		data->ptList = (BPoint*)realloc(data->ptList, new_size * sizeof(BPoint));
-		data->ptSize = new_size;
-		count -= data->ptBlockSize;
+	int32 newSize = (data->ptCount + count + 255) / 256 * 256;
+	if (data->ptSize >= newSize)
+		return true;
+
+	BPoint* resizedArray = (BPoint*)realloc(data->ptList, newSize * sizeof(BPoint));
+	if (resizedArray) {
+		data->ptList = resizedArray;
+		data->ptSize = newSize;
+		return true;
 	}
+	return false;
 }
 
 



From axeld at pinc-software.de  Fri Aug 17 13:44:23 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Fri, 17 Aug 2007 13:44:23 +0200 CEST
Subject: [Haiku-commits]
 =?iso-8859-15?q?r21999_-_in_haiku/trunk=3A_header?=
 =?iso-8859-15?q?s/posix_src/system/kernel/arch/x86__src/system/libroot/po?=
 =?iso-8859-15?q?six/signal_src/tests/system/libroot/posix?=
In-Reply-To: <894b9700708170407n7af89430k86d0604a793f99f7@mail.gmail.com>
Message-ID: <12416775217-BeMail@zon>

"Stefano Ceccherini" <stefano.ceccherini at gmail.com> wrote:
> 2007/8/17, axeld at BerliOS <axeld at mail.berlios.de>:
> >  More tests should be added, though.
> We do have some in
> src/tests/system/libroot/posix/posixtestsuit/conformance/interfaces.
> The posix test suite has many more signal tests which can be added if
> needed.

Oh, that would be great! Is there a source where we get that suite 
from? And what version are we using?

Bye,
   Axel.



From axeld at mail.berlios.de  Fri Aug 17 14:12:47 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 17 Aug 2007 14:12:47 +0200
Subject: [Haiku-commits] r22001 - haiku/trunk/src/apps/terminal
Message-ID: <200708171212.l7HCClhM022748@sheep.berlios.de>

Author: axeld
Date: 2007-08-17 14:12:46 +0200 (Fri, 17 Aug 2007)
New Revision: 22001
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22001&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermWindow.h
Log:
* Fixed build under Dano
* Some cleanup.


Modified: haiku/trunk/src/apps/terminal/TermWindow.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.h	2007-08-17 11:17:29 UTC (rev 22000)
+++ haiku/trunk/src/apps/terminal/TermWindow.h	2007-08-17 12:12:46 UTC (rev 22001)
@@ -31,17 +31,20 @@
 #ifndef __TERMWINDOW_H
 #define __TERMWINDOW_H
 
+
 #include <String.h>
 #include <Window.h>
 
 
 class Arguments;
+class BFont;
 class BMenu;
 class BMenuBar;
 class FindWindow;
 class PrefWindow;
 class TermView;
 class SmartTabView;
+
 class TermWindow : public BWindow {
 public:
 	TermWindow(BRect frame, const char* title, Arguments *args);
@@ -55,39 +58,39 @@
 
 
 private:
-	void		_SetTermColors(TermView *termView);
-	void		_InitWindow();
-	void		_SetupMenu();
-	void		_GetPreferredFonts(BFont &full, BFont &half);
-	status_t	_DoPageSetup();
-	void		_DoPrint();
-	void		_AddTab(Arguments *args);
-	void		_RemoveTab(int32 index);
-	TermView*	_ActiveTermView();
+	void			_SetTermColors(TermView *termView);
+	void			_InitWindow();
+	void			_SetupMenu();
+	void			_GetPreferredFonts(BFont &full, BFont &half);
+	status_t		_DoPageSetup();
+	void			_DoPrint();
+	void			_AddTab(Arguments *args);
+	void			_RemoveTab(int32 index);
+	TermView*		_ActiveTermView();
 	
 	SmartTabView	*fTabView;
-	TermView	*fTermView;
-	BMenuBar	*fMenubar;
-	BMenu		*fFilemenu,
-			*fEditmenu,
-			*fEncodingmenu,
-			*fHelpmenu,
-			*fWindowSizeMenu;
+	TermView		*fTermView;
+	BMenuBar		*fMenubar;
+	BMenu			*fFilemenu;
+	BMenu			*fEditmenu;
+	BMenu			*fEncodingmenu;
+	BMenu			*fHelpmenu;
+	BMenu			*fWindowSizeMenu;
 
-	BMessage	*fPrintSettings;
-	PrefWindow	*fPrefWindow;
-	FindWindow	*fFindPanel;
-	BRect		fSavedFrame;
-	window_look	fSavedLook;
-	
-	//Saved search parameters
-	BString	fFindString;
-	BMenuItem	*fFindForwardMenuItem;
-	BMenuItem 	*fFindBackwardMenuItem;
-	bool		fFindSelection;
-	bool		fForwardSearch;
-	bool		fMatchCase;
-	bool		fMatchWord;
+	BMessage		*fPrintSettings;
+	PrefWindow		*fPrefWindow;
+	FindWindow		*fFindPanel;
+	BRect			fSavedFrame;
+	window_look		fSavedLook;
+
+	// Saved search parameters
+	BString			fFindString;
+	BMenuItem		*fFindForwardMenuItem;
+	BMenuItem 		*fFindBackwardMenuItem;
+	bool			fFindSelection;
+	bool			fForwardSearch;
+	bool			fMatchCase;
+	bool			fMatchWord;
 };
 
 #endif // __TERMWINDOW_H



From leavengood at mail.berlios.de  Fri Aug 17 14:13:33 2007
From: leavengood at mail.berlios.de (leavengood at BerliOS)
Date: Fri, 17 Aug 2007 14:13:33 +0200
Subject: [Haiku-commits] r22002 - haiku/trunk/src/preferences/fonts
Message-ID: <200708171213.l7HCDXRr022901@sheep.berlios.de>

Author: leavengood
Date: 2007-08-17 14:13:32 +0200 (Fri, 17 Aug 2007)
New Revision: 22002
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22002&view=rev

Modified:
   haiku/trunk/src/preferences/fonts/FontSelectionView.cpp
Log:
Fixed some coding style issues.


Modified: haiku/trunk/src/preferences/fonts/FontSelectionView.cpp
===================================================================
--- haiku/trunk/src/preferences/fonts/FontSelectionView.cpp	2007-08-17 12:12:46 UTC (rev 22001)
+++ haiku/trunk/src/preferences/fonts/FontSelectionView.cpp	2007-08-17 12:13:32 UTC (rev 22002)
@@ -394,23 +394,23 @@
 bool
 FontSelectionView::IsDefaultable()
 {
-	font_family default_family;
-	font_style default_style;
-	float default_size;
+	font_family defaultFamily;
+	font_style defaultStyle;
+	float defaultSize;
 
-	if (_get_system_default_font_(Name(), default_family, default_style, &default_size) != B_OK)
+	if (_get_system_default_font_(Name(), defaultFamily, defaultStyle, &defaultSize) != B_OK)
 		return false;
 
-	font_family current_family;
-	font_style current_style;
-	float current_size;
+	font_family currentFamily;
+	font_style currentStyle;
+	float currentSize;
 
-	fCurrentFont.GetFamilyAndStyle(&current_family, &current_style);
-	current_size = fCurrentFont.Size();
+	fCurrentFont.GetFamilyAndStyle(&currentFamily, &currentStyle);
+	currentSize = fCurrentFont.Size();
 
-	return strcmp(current_family, default_family) != 0
-		|| strcmp(current_style, default_style) != 0
-		|| current_size != default_size;
+	return strcmp(currentFamily, defaultFamily) != 0
+		|| strcmp(currentStyle, defaultStyle) != 0
+		|| currentSize != defaultSize;
 }
 
 



From stippi at mail.berlios.de  Fri Aug 17 14:56:24 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Fri, 17 Aug 2007 14:56:24 +0200
Subject: [Haiku-commits] r22003 - in haiku/trunk/src/servers/app: . drawing
	drawing/Painter drawing/Painter/drawing_modes
Message-ID: <200708171256.l7HCuOcQ026706@sheep.berlios.de>

Author: stippi
Date: 2007-08-17 14:56:20 +0200 (Fri, 17 Aug 2007)
New Revision: 22003
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22003&view=rev

Modified:
   haiku/trunk/src/servers/app/Decorator.cpp
   haiku/trunk/src/servers/app/Decorator.h
   haiku/trunk/src/servers/app/DefaultDecorator.cpp
   haiku/trunk/src/servers/app/DefaultDecorator.h
   haiku/trunk/src/servers/app/Desktop.cpp
   haiku/trunk/src/servers/app/DrawState.cpp
   haiku/trunk/src/servers/app/DrawState.h
   haiku/trunk/src/servers/app/ServerApp.cpp
   haiku/trunk/src/servers/app/ServerBitmap.h
   haiku/trunk/src/servers/app/ServerPicture.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
   haiku/trunk/src/servers/app/ViewLayer.cpp
   haiku/trunk/src/servers/app/ViewLayer.h
   haiku/trunk/src/servers/app/WindowLayer.cpp
   haiku/trunk/src/servers/app/WindowLayer.h
   haiku/trunk/src/servers/app/Workspace.cpp
   haiku/trunk/src/servers/app/Workspace.h
   haiku/trunk/src/servers/app/WorkspacePrivate.h
   haiku/trunk/src/servers/app/WorkspacesLayer.cpp
   haiku/trunk/src/servers/app/WorkspacesLayer.h
   haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.cpp
   haiku/trunk/src/servers/app/drawing/AccelerantHWInterface.h
   haiku/trunk/src/servers/app/drawing/DWindowHWInterface.cpp
   haiku/trunk/src/servers/app/drawing/DWindowHWInterface.h
   haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
   haiku/trunk/src/servers/app/drawing/DrawingEngine.h
   haiku/trunk/src/servers/app/drawing/HWInterface.h
   haiku/trunk/src/servers/app/drawing/Overlay.cpp
   haiku/trunk/src/servers/app/drawing/Overlay.h
   haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp
   haiku/trunk/src/servers/app/drawing/Painter/Painter.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeAdd.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeAlphaCC.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeAlphaCO.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeAlphaCOSolid.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeAlphaPC.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeAlphaPO.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeBlend.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeCopy.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeCopyText.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeErase.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeMax.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeMin.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeOver.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeSelect.h
   haiku/trunk/src/servers/app/drawing/Painter/drawing_modes/DrawingModeSubtract.h
   haiku/trunk/src/servers/app/drawing/PatternHandler.cpp
   haiku/trunk/src/servers/app/drawing/PatternHandler.h
Log:
* get rid of RGBColor usage where it is not needed, this simplified many things,
  possibly making them a little faster too
* mess with decorator button size calculation to make the whole layout scale
  more agreeable with the font size (no more fixed offsets/insets), but it
  is work in progress
* DefaultDecorator no longer allocated the border color array, it is part of
  the object now
* small memory footprint optimizations in ViewLayer, Decorator and WindowLayer


Modified: haiku/trunk/src/servers/app/Decorator.cpp
===================================================================
--- haiku/trunk/src/servers/app/Decorator.cpp	2007-08-17 12:13:32 UTC (rev 22002)
+++ haiku/trunk/src/servers/app/Decorator.cpp	2007-08-17 12:56:20 UTC (rev 22003)
@@ -482,7 +482,7 @@
 }
 
 
-RGBColor
+rgb_color
 Decorator::UIColor(color_which which)
 {
 	// TODO: for now - calling ui_color() from within the app_server

Modified: haiku/trunk/src/servers/app/Decorator.h
===================================================================
--- haiku/trunk/src/servers/app/Decorator.h	2007-08-17 12:13:32 UTC (rev 22002)
+++ haiku/trunk/src/servers/app/Decorator.h	2007-08-17 12:56:20 UTC (rev 22003)
@@ -116,7 +116,7 @@
 	virtual	void				DrawTitle();
 	virtual	void				DrawZoom();
 
-			RGBColor			UIColor(color_which which);
+			rgb_color			UIColor(color_which which);
 
  protected:
 			int32				_TitleWidth() const
@@ -149,11 +149,11 @@
 			BRect				fBorderRect;
 
  private:
-			bool				fClosePressed;
-			bool				fZoomPressed;
-			bool				fMinimizePressed;
+			bool				fClosePressed : 1;
+			bool				fZoomPressed : 1;
+			bool				fMinimizePressed : 1;
 
-			bool				fIsFocused;
+			bool				fIsFocused : 1;
 
 			BString				fTitle;
 };

Modified: haiku/trunk/src/servers/app/DefaultDecorator.cpp
===================================================================
--- haiku/trunk/src/servers/app/DefaultDecorator.cpp	2007-08-17 12:13:32 UTC (rev 22002)
+++ haiku/trunk/src/servers/app/DefaultDecorator.cpp	2007-08-17 12:56:20 UTC (rev 22003)
@@ -17,7 +17,6 @@
 #include "DrawState.h"
 #include "FontManager.h"
 #include "PatternHandler.h"
-#include "RGBColor.h"
 
 #include <WindowPrivate.h>
 
@@ -90,13 +89,12 @@
 {
 	DefaultDecorator::SetLook(settings, look);
 
-	fFrameColors = new RGBColor[6];
-	fFrameColors[0].SetColor(152, 152, 152);
-	fFrameColors[1].SetColor(255, 255, 255);
-	fFrameColors[2].SetColor(216, 216, 216);
-	fFrameColors[3].SetColor(136, 136, 136);
-	fFrameColors[4].SetColor(152, 152, 152);
-	fFrameColors[5].SetColor(96, 96, 96);
+	fFrameColors[0] = (rgb_color){ 152, 152, 152, 255 };
+	fFrameColors[1] = (rgb_color){ 255, 255, 255, 255 };
+	fFrameColors[2] = (rgb_color){ 216, 216, 216, 255 };
+	fFrameColors[3] = (rgb_color){ 136, 136, 136, 255 };
+	fFrameColors[4] = (rgb_color){ 152, 152, 152, 255 };
+	fFrameColors[5] = (rgb_color){ 96, 96, 96, 255 };
 
 	// Set appropriate colors based on the current focus value. In this case, each decorator
 	// defaults to not having the focus.
@@ -116,7 +114,6 @@
 DefaultDecorator::~DefaultDecorator()
 {
 	STRACE(("DefaultDecorator: ~DefaultDecorator()\n"));
-	delete [] fFrameColors;
 }
 
 
@@ -605,21 +602,23 @@
 	if (hasTab) {
 		// distance from one item of the tab bar to another.
 		// In this case the text and close/zoom rects
-		fTextOffset = (fLook == B_FLOATING_WINDOW_LOOK || fLook == kLeftTitledWindowLook)
-			? 10 : 18;
+		fTextOffset = (fLook == B_FLOATING_WINDOW_LOOK
+			|| fLook == kLeftTitledWindowLook) ? 10 : 18;
 
 		font_height fontHeight;
 		fDrawState.Font().GetHeight(fontHeight);
 
 		if (fLook != kLeftTitledWindowLook) {
 			fTabRect.Set(fFrame.left - fBorderWidth,
-				fFrame.top - fBorderWidth - ceilf(fontHeight.ascent + fontHeight.descent + 7.0),
+				fFrame.top - fBorderWidth
+					- ceilf(fontHeight.ascent + fontHeight.descent + 7.0),
 				((fFrame.right - fFrame.left) < 35.0 ?
 					fFrame.left + 35.0 : fFrame.right) + fBorderWidth,
 				fFrame.top - fBorderWidth);
 		} else {
-			fTabRect.Set(fFrame.left - fBorderWidth - ceilf(fontHeight.ascent + fontHeight.descent + 5.0),
-				fFrame.top - fBorderWidth, fFrame.left - fBorderWidth,
+			fTabRect.Set(fFrame.left - fBorderWidth
+				- ceilf(fontHeight.ascent + fontHeight.descent + 5.0),
+					fFrame.top - fBorderWidth, fFrame.left - fBorderWidth,
 				fFrame.bottom + fBorderWidth);
 		}
 
@@ -631,10 +630,11 @@
 
 		float offset;
 		float size;
-		_GetButtonSizeAndOffset(fTabRect, &offset, &size);
+		float inset;
+		_GetButtonSizeAndOffset(fTabRect, &offset, &size, &inset);
 
 		// fMinTabSize contains just the room for the buttons
-		fMinTabSize = 4.0 + fTextOffset;
+		fMinTabSize = inset * 2 + fTextOffset;
 		if ((fFlags & B_NOT_CLOSABLE) == 0)
 			fMinTabSize += offset + size;
 		if ((fFlags & B_NOT_ZOOMABLE) == 0)
@@ -701,8 +701,10 @@
 		if (fTabOffset < 0)
 			fTabOffset = 0;
 		if (fTabLocation != 0.0
-			&& fTabOffset > (fRightBorder.right - fLeftBorder.left - fTabRect.Width()))
-			fTabOffset = uint32(fRightBorder.right - fLeftBorder.left - fTabRect.Width());
+			&& fTabOffset > (fRightBorder.right - fLeftBorder.left
+				- fTabRect.Width()))
+			fTabOffset = uint32(fRightBorder.right - fLeftBorder.left
+				- fTabRect.Width());
 		fTabRect.OffsetBy(fTabOffset, 0);
 
 		// finally, layout the buttons and text within the tab rect
@@ -737,38 +739,38 @@
 			if (invalid.Intersects(fTopBorder)) {
 				for (int8 i = 0; i < 5; i++) {
 					fDrawingEngine->StrokeLine(BPoint(r.left + i, r.top + i),
-										BPoint(r.right - i, r.top + i),
-										fFrameColors[i]);
+						BPoint(r.right - i, r.top + i), fFrameColors[i]);
 				}
 				if (fTabRect.IsValid()) {
-					// grey along the bottom of the tab (overwrites "white" from frame)
-					fDrawingEngine->StrokeLine(BPoint(fTabRect.left + 2, fTabRect.bottom + 1),
-										BPoint(fTabRect.right - 2, fTabRect.bottom + 1),
-										fFrameColors[2]);
+					// grey along the bottom of the tab
+					// (overwrites "white" from frame)
+					fDrawingEngine->StrokeLine(
+						BPoint(fTabRect.left + 2, fTabRect.bottom + 1),
+						BPoint(fTabRect.right - 2, fTabRect.bottom + 1),
+						fFrameColors[2]);
 				}
 			}
 			// left
 			if (invalid.Intersects(fLeftBorder.InsetByCopy(0, -fBorderWidth))) {
 				for (int8 i = 0; i < 5; i++) {
 					fDrawingEngine->StrokeLine(BPoint(r.left + i, r.top + i),
-										BPoint(r.left + i, r.bottom - i),
-										fFrameColors[i]);
+						BPoint(r.left + i, r.bottom - i), fFrameColors[i]);
 				}
 			}
 			// bottom
 			if (invalid.Intersects(fBottomBorder)) {
 				for (int8 i = 0; i < 5; i++) {
 					fDrawingEngine->StrokeLine(BPoint(r.left + i, r.bottom - i),
-										BPoint(r.right - i, r.bottom - i),
-										fFrameColors[(4 - i) == 4 ? 5 : (4 - i)]);
+						BPoint(r.right - i, r.bottom - i),
+						fFrameColors[(4 - i) == 4 ? 5 : (4 - i)]);
 				}
 			}
 			// right
 			if (invalid.Intersects(fRightBorder.InsetByCopy(0, -fBorderWidth))) {
 				for (int8 i = 0; i < 5; i++) {
 					fDrawingEngine->StrokeLine(BPoint(r.right - i, r.top + i),
-										BPoint(r.right - i, r.bottom - i),
-										fFrameColors[(4 - i) == 4 ? 5 : (4 - i)]);
+						BPoint(r.right - i, r.bottom - i),
+						fFrameColors[(4 - i) == 4 ? 5 : (4 - i)]);
 				}
 			}
 			break;
@@ -781,44 +783,46 @@
 			if (invalid.Intersects(fTopBorder)) {
 				for (int8 i = 0; i < 3; i++) {
 					fDrawingEngine->StrokeLine(BPoint(r.left + i, r.top + i),
-										BPoint(r.right - i, r.top + i),
-										fFrameColors[i * 2]);
+						BPoint(r.right - i, r.top + i), fFrameColors[i * 2]);
 				}
 				if (fTabRect.IsValid() && fLook != kLeftTitledWindowLook) {
-					// grey along the bottom of the tab (overwrites "white" from frame)
-					fDrawingEngine->StrokeLine(BPoint(fTabRect.left + 2, fTabRect.bottom + 1),
-										BPoint(fTabRect.right - 2, fTabRect.bottom + 1),
-										fFrameColors[2]);
+					// grey along the bottom of the tab
+					// (overwrites "white" from frame)
+					fDrawingEngine->StrokeLine(
+						BPoint(fTabRect.left + 2, fTabRect.bottom + 1),
+						BPoint(fTabRect.right - 2, fTabRect.bottom + 1),
+						fFrameColors[2]);
 				}
 			}
 			// left
 			if (invalid.Intersects(fLeftBorder.InsetByCopy(0, -fBorderWidth))) {
 				for (int8 i = 0; i < 3; i++) {
 					fDrawingEngine->StrokeLine(BPoint(r.left + i, r.top + i),
-										BPoint(r.left + i, r.bottom - i),
-										fFrameColors[i * 2]);
+						BPoint(r.left + i, r.bottom - i), fFrameColors[i * 2]);
 				}
 				if (fLook == kLeftTitledWindowLook && fTabRect.IsValid()) {
-					// grey along the right side of the tab (overwrites "white" from frame)
-					fDrawingEngine->StrokeLine(BPoint(fTabRect.right + 1, fTabRect.top + 2),
-										BPoint(fTabRect.right + 1, fTabRect.bottom - 2),
-										fFrameColors[2]);
+					// grey along the right side of the tab
+					// (overwrites "white" from frame)
+					fDrawingEngine->StrokeLine(
+						BPoint(fTabRect.right + 1, fTabRect.top + 2),
+						BPoint(fTabRect.right + 1, fTabRect.bottom - 2),
+						fFrameColors[2]);
 				}
 			}
 			// bottom
 			if (invalid.Intersects(fBottomBorder)) {
 				for (int8 i = 0; i < 3; i++) {
 					fDrawingEngine->StrokeLine(BPoint(r.left + i, r.bottom - i),
-										BPoint(r.right - i, r.bottom - i),
-										fFrameColors[(2 - i) == 2 ? 5 : (2 - i) * 2]);
+						BPoint(r.right - i, r.bottom - i),
+						fFrameColors[(2 - i) == 2 ? 5 : (2 - i) * 2]);
 				}
 			}
 			// right
 			if (invalid.Intersects(fRightBorder.InsetByCopy(0, -fBorderWidth))) {
 				for (int8 i = 0; i < 3; i++) {
 					fDrawingEngine->StrokeLine(BPoint(r.right - i, r.top + i),
-										BPoint(r.right - i, r.bottom - i),
-										fFrameColors[(2 - i) == 2 ? 5 : (2 - i) * 2]);
+						BPoint(r.right - i, r.bottom - i),
+						fFrameColors[(2 - i) == 2 ? 5 : (2 - i) * 2]);
 				}
 			}
 			break;
@@ -846,23 +850,24 @@
 				float x = r.right - 3;
 				float y = r.bottom - 3;
 
-				fDrawingEngine->FillRect(BRect(x - 13, y - 13, x, y), fFrameColors[2]);
-				fDrawingEngine->StrokeLine(BPoint(x - 15, y - 15), BPoint(x - 15, y - 2),
-					fFrameColors[0]);
-				fDrawingEngine->StrokeLine(BPoint(x - 14, y - 14), BPoint(x - 14, y - 1),
-					fFrameColors[1]);
-				fDrawingEngine->StrokeLine(BPoint(x - 15, y - 15), BPoint(x - 2, y - 15),
-					fFrameColors[0]);
-				fDrawingEngine->StrokeLine(BPoint(x - 14, y - 14), BPoint(x - 1, y - 14),
-					fFrameColors[1]);
+				fDrawingEngine->FillRect(BRect(x - 13, y - 13, x, y),
+					fFrameColors[2]);
+				fDrawingEngine->StrokeLine(BPoint(x - 15, y - 15),
+					BPoint(x - 15, y - 2), fFrameColors[0]);
+				fDrawingEngine->StrokeLine(BPoint(x - 14, y - 14),
+					BPoint(x - 14, y - 1), fFrameColors[1]);
+				fDrawingEngine->StrokeLine(BPoint(x - 15, y - 15),
+					BPoint(x - 2, y - 15), fFrameColors[0]);
+				fDrawingEngine->StrokeLine(BPoint(x - 14, y - 14),
+					BPoint(x - 1, y - 14), fFrameColors[1]);
 
 				if (!IsFocus())
 					break;
 
 				for (int8 i = 1; i <= 4; i++) {
 					for (int8 j = 1; j <= i; j++) {
-						BPoint		pt1(x - (3 * j) + 1, y - (3 * (5 - i)) + 1);
-						BPoint		pt2(x - (3 * j) + 2, y - (3 * (5 - i)) + 2);
+						BPoint pt1(x - (3 * j) + 1, y - (3 * (5 - i)) + 1);
+						BPoint pt2(x - (3 * j) + 2, y - (3 * (5 - i)) + 2);
 						fDrawingEngine->StrokePoint(pt1, fFrameColors[0]);
 						fDrawingEngine->StrokePoint(pt2, fFrameColors[1]);
 					}
@@ -876,16 +881,18 @@
 			case kLeftTitledWindowLook:
 			{
 				if (!invalid.Intersects(BRect(fRightBorder.right - 22,
-						fBottomBorder.bottom - 22, fRightBorder.right - 1,
-						fBottomBorder.bottom - 1)))
+					fBottomBorder.bottom - 22, fRightBorder.right - 1,
+					fBottomBorder.bottom - 1)))
 					break;
 		
-				fDrawingEngine->StrokeLine(BPoint(fRightBorder.left, fBottomBorder.bottom - 22),
-									BPoint(fRightBorder.right - 1, fBottomBorder.bottom - 22),
-									fFrameColors[0]);
-				fDrawingEngine->StrokeLine(BPoint(fRightBorder.right - 22, fBottomBorder.top),
-									BPoint(fRightBorder.right - 22, fBottomBorder.bottom - 1),
-									fFrameColors[0]);
+				fDrawingEngine->StrokeLine(
+					BPoint(fRightBorder.left, fBottomBorder.bottom - 22),
+					BPoint(fRightBorder.right - 1, fBottomBorder.bottom - 22),
+					fFrameColors[0]);
+				fDrawingEngine->StrokeLine(
+					BPoint(fRightBorder.right - 22, fBottomBorder.top),
+					BPoint(fRightBorder.right - 22, fBottomBorder.bottom - 1),
+					fFrameColors[0]);
 				break;
 			}
 
@@ -908,26 +915,34 @@
 		return;
 
 	// outer frame
-	fDrawingEngine->StrokeLine(fTabRect.LeftTop(), fTabRect.LeftBottom(), fFrameColors[0]);
-	fDrawingEngine->StrokeLine(fTabRect.LeftTop(), fTabRect.RightTop(), fFrameColors[0]);
-	if (fLook != kLeftTitledWindowLook)
-		fDrawingEngine->StrokeLine(fTabRect.RightTop(),fTabRect.RightBottom(), fFrameColors[5]);
-	else
-		fDrawingEngine->StrokeLine(fTabRect.LeftBottom(),fTabRect.RightBottom(), fFrameColors[5]);
+	fDrawingEngine->StrokeLine(fTabRect.LeftTop(), fTabRect.LeftBottom(),
+		fFrameColors[0]);
+	fDrawingEngine->StrokeLine(fTabRect.LeftTop(), fTabRect.RightTop(),
+		fFrameColors[0]);
+	if (fLook != kLeftTitledWindowLook) {
+		fDrawingEngine->StrokeLine(fTabRect.RightTop(), fTabRect.RightBottom(),
+			fFrameColors[5]);
+	} else {
+		fDrawingEngine->StrokeLine(fTabRect.LeftBottom(),
+			fTabRect.RightBottom(), fFrameColors[5]);
+	}
 
 	// bevel
 	fDrawingEngine->StrokeLine(BPoint(fTabRect.left + 1, fTabRect.top + 1),
-		BPoint(fTabRect.left + 1, fTabRect.bottom - (fLook == kLeftTitledWindowLook ? 1 : 0)),
+		BPoint(fTabRect.left + 1,
+			fTabRect.bottom - (fLook == kLeftTitledWindowLook ? 1 : 0)),
 		fTabColorLight);
 	fDrawingEngine->StrokeLine(BPoint(fTabRect.left + 1, fTabRect.top + 1),
-		BPoint(fTabRect.right - (fLook == kLeftTitledWindowLook ? 0 : 1), fTabRect.top + 1),
+		BPoint(fTabRect.right - (fLook == kLeftTitledWindowLook ? 0 : 1),
+			fTabRect.top + 1),
 		fTabColorLight);
 
 	if (fLook != kLeftTitledWindowLook) {
 		fDrawingEngine->StrokeLine(BPoint(fTabRect.right - 1, fTabRect.top + 2),
 			BPoint(fTabRect.right - 1, fTabRect.bottom), fTabColorShadow);
 	} else {
-		fDrawingEngine->StrokeLine(BPoint(fTabRect.left + 2, fTabRect.bottom - 1),
+		fDrawingEngine->StrokeLine(
+			BPoint(fTabRect.left + 2, fTabRect.bottom - 1),
 			BPoint(fTabRect.right, fTabRect.bottom - 1), fTabColorShadow);
 	}
 
@@ -964,8 +979,8 @@
 {
 	STRACE(("_DrawTitle(%f,%f,%f,%f)\n", r.left, r.top, r.right, r.bottom));
 
-	fDrawingEngine->SetHighColor(fTextColor.GetColor32());
-	fDrawingEngine->SetLowColor(fTabColor.GetColor32());
+	fDrawingEngine->SetHighColor(fTextColor);
+	fDrawingEngine->SetLowColor(fTabColor);
 	fDrawingEngine->SetFont(fDrawState.Font());
 
 	// figure out position of text
@@ -976,11 +991,13 @@
 	if (fLook != kLeftTitledWindowLook) {
 		titlePos.x = fCloseRect.IsValid() ? fCloseRect.right + fTextOffset
 			: fTabRect.left + fTextOffset;
-		titlePos.y = floorf(((fTabRect.top + 2.0) + fTabRect.bottom + fontHeight.ascent
-			+ fontHeight.descent) / 2.0 - fontHeight.descent + 0.5);
+		titlePos.y = floorf(((fTabRect.top + 2.0) + fTabRect.bottom
+			+ fontHeight.ascent + fontHeight.descent) / 2.0
+			- fontHeight.descent + 0.5);
 	} else {
-		titlePos.x = floorf(((fTabRect.left + 2.0) + fTabRect.right + fontHeight.ascent
-			+ fontHeight.descent) / 2.0 - fontHeight.descent + 0.5);
+		titlePos.x = floorf(((fTabRect.left + 2.0) + fTabRect.right
+			+ fontHeight.ascent + fontHeight.descent) / 2.0
+			- fontHeight.descent + 0.5);
 		titlePos.y = fZoomRect.IsValid() ? fZoomRect.top - fTextOffset
 			: fTabRect.bottom - fTextOffset;
 	}
@@ -1015,37 +1032,30 @@
 	// SetFocus() performs necessary duties for color swapping and
 	// other things when a window is deactivated or activated.
 	
-	if (IsFocus() || ((fLook == B_FLOATING_WINDOW_LOOK || fLook == kLeftTitledWindowLook)
-			&& (fFlags & B_AVOID_FOCUS) != 0)) {
+	if (IsFocus()
+		|| ((fLook == B_FLOATING_WINDOW_LOOK || fLook == kLeftTitledWindowLook)
+		&& (fFlags & B_AVOID_FOCUS) != 0)) {
 		fTabColor = UIColor(B_WINDOW_TAB_COLOR);
 		fTextColor = UIColor(B_WINDOW_TEXT_COLOR);
-		fButtonHighColor.SetColor(tint_color(fTabColor.GetColor32(), B_LIGHTEN_2_TINT));
-		fButtonLowColor.SetColor(tint_color(fTabColor.GetColor32(), B_DARKEN_1_TINT));
+		fButtonHighColor = tint_color(fTabColor, B_LIGHTEN_2_TINT);
+		fButtonLowColor = tint_color(fTabColor, B_DARKEN_1_TINT);
 
-//		fFrameColors[0].SetColor(152, 152, 152);
-//		fFrameColors[1].SetColor(255, 255, 255);
-		fFrameColors[2].SetColor(216, 216, 216);
-		fFrameColors[3].SetColor(136, 136, 136);
-//		fFrameColors[4].SetColor(152, 152, 152);
-//		fFrameColors[5].SetColor(96, 96, 96);
+		fFrameColors[2] = (rgb_color){ 216, 216, 216, 255 };
+		fFrameColors[3] = (rgb_color){ 136, 136, 136, 255 };
 	} else {
 		fTabColor = UIColor(B_WINDOW_INACTIVE_TAB_COLOR);
 		fTextColor = UIColor(B_WINDOW_INACTIVE_TEXT_COLOR);
-		fButtonHighColor.SetColor(tint_color(fTabColor.GetColor32(), B_LIGHTEN_2_TINT));
-		fButtonLowColor.SetColor(tint_color(fTabColor.GetColor32(), B_DARKEN_1_TINT));
+		fButtonHighColor = tint_color(fTabColor, B_LIGHTEN_2_TINT);
+		fButtonLowColor = tint_color(fTabColor, B_DARKEN_1_TINT);
 
-//		fFrameColors[0].SetColor(152, 152, 152);
-//		fFrameColors[1].SetColor(255, 255, 255);
-		fFrameColors[2].SetColor(232, 232, 232);
-		fFrameColors[3].SetColor(148, 148, 148);
-//		fFrameColors[4].SetColor(152, 152, 152);
-//		fFrameColors[5].SetColor(96, 96, 96);
+		fFrameColors[2] = (rgb_color){ 232, 232, 232, 255 };
+		fFrameColors[3] = (rgb_color){ 148, 148, 148, 255 };
 	}
 
-	fTabColorLight = RGBColor(tint_color(fTabColor.GetColor32(),
-		(B_LIGHTEN_2_TINT + B_LIGHTEN_MAX_TINT) / 2));
-	fTabColorShadow = RGBColor(tint_color(fTabColor.GetColor32(),
-		B_DARKEN_2_TINT));
+	fTabColorLight = tint_color(fTabColor,
+		(B_LIGHTEN_2_TINT + B_LIGHTEN_MAX_TINT) / 2);
+	fTabColorShadow = tint_color(fTabColor,
+		B_DARKEN_2_TINT);
 }
 
 // _SetColors
@@ -1067,18 +1077,18 @@
 	int32 w = r.IntegerWidth();
 	int32 h = r.IntegerHeight();
 
-	RGBColor temprgbcol;
+	rgb_color tempColor;
 	rgb_color halfColor, startColor, endColor;
 	float rstep, gstep, bstep;
 
 	int steps = w < h ? w : h;
 
 	if (down) {
-		startColor = fButtonLowColor.GetColor32();
-		endColor = fButtonHighColor.GetColor32();
+		startColor = fButtonLowColor;
+		endColor = fButtonHighColor;
 	} else {
-		startColor = fButtonHighColor.GetColor32();
-		endColor = fButtonLowColor.GetColor32();
+		startColor = fButtonHighColor;
+		endColor = fButtonLowColor;
 	}
 
 	halfColor = make_blend_color(startColor, endColor, 0.5);
@@ -1088,19 +1098,19 @@
 	bstep = float(startColor.blue - halfColor.blue) / steps;
 
 	for (int32 i = 0; i <= steps; i++) {
-		temprgbcol.SetColor(uint8(startColor.red - (i * rstep)),
-							uint8(startColor.green - (i * gstep)),
-							uint8(startColor.blue - (i * bstep)));
+		tempColor.red = uint8(startColor.red - (i * rstep));
+		tempColor.green = uint8(startColor.green - (i * gstep));
+		tempColor.blue = uint8(startColor.blue - (i * bstep));
 		
 		fDrawingEngine->StrokeLine(BPoint(r.left, r.top + i),
-							BPoint(r.left + i, r.top), temprgbcol);
+			BPoint(r.left + i, r.top), tempColor);
 
-		temprgbcol.SetColor(uint8(halfColor.red - (i * rstep)),
-							uint8(halfColor.green - (i * gstep)),
-							uint8(halfColor.blue - (i * bstep)));
+		tempColor.red = uint8(halfColor.red - (i * rstep));
+		tempColor.green = uint8(halfColor.green - (i * gstep));
+		tempColor.blue = uint8(halfColor.blue - (i * bstep));
 
 		fDrawingEngine->StrokeLine(BPoint(r.left + steps, r.top + i),
-							BPoint(r.left + i, r.top + steps), temprgbcol);
+			BPoint(r.left + i, r.top + steps), tempColor);
 	}
 	fDrawingEngine->StrokeRect(r, fFrameColors[3]);
 }
@@ -1108,16 +1118,23 @@
 // _GetButtonSizeAndOffset
 void
 DefaultDecorator::_GetButtonSizeAndOffset(const BRect& tabRect, float* _offset,
-	float* _size) const
+	float* _size, float* _inset) const
 {
-	*_offset = fLook == B_FLOATING_WINDOW_LOOK || fLook == kLeftTitledWindowLook ? 4.0 : 5.0;
+	float tabSize = fLook == kLeftTitledWindowLook ?
+		tabRect.Width() : tabRect.Height();
 
+	bool smallTab = fLook == B_FLOATING_WINDOW_LOOK
+		|| fLook == kLeftTitledWindowLook;
+
+	*_offset = smallTab ? floorf(fDrawState.Font().Size() / 2.5)
+		: floorf(fDrawState.Font().Size() / 2.0);
+	*_inset = smallTab ? floorf(fDrawState.Font().Size() / 5.0)
+		: floorf(fDrawState.Font().Size() / 6.0);
+printf("");
+
 	// "+ 2" so that the rects are centered within the solid area
 	// (without the 2 pixels for the top border)
-	if (fLook != kLeftTitledWindowLook)
-		*_size = tabRect.Height() - 2.0 * *_offset + 2.0f;
-	else
-		*_size = tabRect.Width() - 2.0 * *_offset + 2.0f;
+	*_size = tabSize - *_inset * *_offset + *_inset;
 }
 
 // _LayoutTabItems
@@ -1126,7 +1143,8 @@
 {
 	float offset;
 	float size;
-	_GetButtonSizeAndOffset(tabRect, &offset, &size);
+	float inset;
+	_GetButtonSizeAndOffset(tabRect, &offset, &size, &inset);
 
 	// calulate close rect based on the tab rectangle
 	if (fLook != kLeftTitledWindowLook) {
@@ -1160,9 +1178,9 @@
 	//	truncated for no apparent reason - OTOH the title does
 	//	also not appear perfectly in the middle
 	if (fLook != kLeftTitledWindowLook)
-		size = (fZoomRect.left - fCloseRect.right) - fTextOffset * 2 + 2;
+		size = (fZoomRect.left - fCloseRect.right) - fTextOffset * 2 + inset;
 	else
-		size = (fZoomRect.top - fCloseRect.bottom) - fTextOffset * 2 + 2;
+		size = (fZoomRect.top - fCloseRect.bottom) - fTextOffset * 2 + inset;
 
 	fTruncatedTitle = Title();
 	fDrawState.Font().TruncateString(&fTruncatedTitle, B_TRUNCATE_END, size);

Modified: haiku/trunk/src/servers/app/DefaultDecorator.h
===================================================================
--- haiku/trunk/src/servers/app/DefaultDecorator.h	2007-08-17 12:13:32 UTC (rev 22002)
+++ haiku/trunk/src/servers/app/DefaultDecorator.h	2007-08-17 12:56:20 UTC (rev 22003)
@@ -19,43 +19,40 @@
 class DefaultDecorator: public Decorator {
  public:
 								DefaultDecorator(DesktopSettings& settings,
-												 BRect frame,
-												 window_look look,
-												 uint32 flags);
+									BRect frame, window_look look,
+									uint32 flags);
 	virtual						~DefaultDecorator();
 
 	virtual	void				SetTitle(const char* string,
-										 BRegion* updateRegion = NULL);
+									BRegion* updateRegion = NULL);
 	virtual void				SetLook(DesktopSettings& settings,
-										window_look look,
-										BRegion* updateRegion = NULL);
+									window_look look,
+									BRegion* updateRegion = NULL);
 	virtual void				SetFlags(uint32 flags,
-										 BRegion* updateRegion = NULL);
+									BRegion* updateRegion = NULL);
 
 	virtual	void				MoveBy(BPoint offset);
 	virtual	void				ResizeBy(BPoint offset, BRegion* dirty);
 
 	virtual bool				SetTabLocation(float location,
-											   BRegion* updateRegion = NULL);
+									BRegion* updateRegion = NULL);
 	virtual float				TabLocation() const
 									{ return (float)fTabOffset; }
 
 	virtual	bool				SetSettings(const BMessage& settings,
-											BRegion* updateRegion = NULL);
+									BRegion* updateRegion = NULL);
 	virtual	bool				GetSettings(BMessage* settings) const;
 
 	virtual	void				Draw(BRect updateRect);
 	virtual	void				Draw();
 
-	virtual	void				GetSizeLimits(int32* minWidth,
-											  int32* minHeight,
-											  int32* maxWidth,
-											  int32* maxHeight) const;
+	virtual	void				GetSizeLimits(int32* minWidth, int32* minHeight,
+									int32* maxWidth, int32* maxHeight) const;
 
 	virtual	void				GetFootprint(BRegion* region);
 
 	virtual	click_type			Clicked(BPoint pt, int32 buttons,
-										int32 modifiers);
+									int32 modifiers);
 
  protected:
 	virtual void				_DoLayout();
@@ -73,18 +70,18 @@
  private:
 			void				_DrawBlendedRect(BRect r, bool down);
 			void				_GetButtonSizeAndOffset(const BRect& tabRect,
-														float* offset,
-														float*size) const;
+									float* offset, float* size,
+									float* inset) const;
 			void				_LayoutTabItems(const BRect& tabRect);
 
-			RGBColor			fButtonHighColor;
-			RGBColor			fButtonLowColor;
-			RGBColor			fTextColor;
-			RGBColor			fTabColor;
-			RGBColor			fTabColorLight;
-			RGBColor			fTabColorShadow;
+			rgb_color			fButtonHighColor;
+			rgb_color			fButtonLowColor;
+			rgb_color			fTextColor;
+			rgb_color			fTabColor;
+			rgb_color			fTabColorLight;
+			rgb_color			fTabColorShadow;
 
-			RGBColor*			fFrameColors;
+			rgb_color			fFrameColors[6];
 	
 			// Individual rects for handling window frame
 			// rendering the proper way

Modified: haiku/trunk/src/servers/app/Desktop.cpp
===================================================================
--- haiku/trunk/src/servers/app/Desktop.cpp	2007-08-17 12:13:32 UTC (rev 22002)
+++ haiku/trunk/src/servers/app/Desktop.cpp	2007-08-17 12:56:20 UTC (rev 22003)
@@ -799,7 +799,7 @@
 Desktop::_SetWorkspace(int32 index)
 {
 	int32 previousIndex = fCurrentWorkspace;
-	RGBColor previousColor = fWorkspaces[fCurrentWorkspace].Color();
+	rgb_color previousColor = fWorkspaces[fCurrentWorkspace].Color();
 	bool movedMouseEventWindow = false;
 
 	if (fMouseEventWindow != NULL) {

Modified: haiku/trunk/src/servers/app/DrawState.cpp
===================================================================
--- haiku/trunk/src/servers/app/DrawState.cpp	2007-08-17 12:13:32 UTC (rev 22002)
+++ haiku/trunk/src/servers/app/DrawState.cpp	2007-08-17 12:56:20 UTC (rev 22003)
@@ -27,8 +27,8 @@
 	: fOrigin(0.0, 0.0),
 	  fScale(1.0),
 	  fClippingRegion(NULL),
-	  fHighColor(0, 0, 0, 255),
-	  fLowColor(255, 255, 255, 255),
+	  fHighColor((rgb_color){ 0, 0, 0, 255 }),
+	  fLowColor((rgb_color){ 255, 255, 255, 255 }),
 	  fPattern(kSolidHigh),
 	  fDrawingMode(B_OP_COPY),
 	  fAlphaSrcMode(B_PIXEL_ALPHA),
@@ -253,8 +253,8 @@
 	// Attach view state
 	link.Attach<BPoint>(fPenLocation);
 	link.Attach<float>(fPenSize);
-	link.Attach<rgb_color>(fHighColor.GetColor32());
-	link.Attach<rgb_color>(fLowColor.GetColor32());
+	link.Attach<rgb_color>(fHighColor);
+	link.Attach<rgb_color>(fLowColor);
 	link.Attach<uint64>(fPattern.GetInt64());
 	link.Attach<BPoint>(fOrigin);
 	link.Attach<uint8>((uint8)fDrawingMode);
@@ -434,14 +434,14 @@
 
 
 void
-DrawState::SetHighColor(const RGBColor& color)
+DrawState::SetHighColor(const rgb_color& color)
 {
 	fHighColor = color;
 }
 
 
 void
-DrawState::SetLowColor(const RGBColor& color)
+DrawState::SetLowColor(const rgb_color& color)
 {
 	fLowColor = color;
 }
@@ -606,8 +606,10 @@
 	printf("\t Pen Location and Size: (%.1f, %.1f) - %.2f (%.2f)\n",
 		   fPenLocation.x, fPenLocation.y, PenSize(), fPenSize);
 
-	printf("\t HighColor: "); fHighColor.PrintToStream();
-	printf("\t LowColor: "); fLowColor.PrintToStream();
+	printf("\t HighColor: r=%d g=%d b=%d a=%d\n",
+		fHighColor.red, fHighColor.green, fHighColor.blue, fHighColor.alpha);
+	printf("\t LowColor: r=%d g=%d b=%d a=%d\n",
+		fLowColor.red, fLowColor.green, fLowColor.blue, fLowColor.alpha);
 	printf("\t Pattern: %llu\n", fPattern.GetInt64());
 
 	printf("\t DrawMode: %lu\n", (uint32)fDrawingMode);

Modified: haiku/trunk/src/servers/app/DrawState.h
===================================================================
--- haiku/trunk/src/servers/app/DrawState.h	2007-08-17 12:13:32 UTC (rev 22002)
+++ haiku/trunk/src/servers/app/DrawState.h	2007-08-17 12:56:20 UTC (rev 22003)
@@ -17,7 +17,6 @@
 #include <Point.h>
 #include <View.h> // for B_FONT_ALL
 
-#include "RGBColor.h"
 #include "FontManager.h"
 #include "ServerFont.h"
 #include "PatternHandler.h"
@@ -78,12 +77,12 @@
 	inline	BRect				ClippingRectAt(int32 index) const;*/
 
 							// color
-		void				SetHighColor(const RGBColor& color);
-		const RGBColor&		HighColor() const
+		void				SetHighColor(const rgb_color& color);
+		const rgb_color&	HighColor() const
 								{ return fHighColor; }
 
-		void				SetLowColor(const RGBColor& color);
-		const RGBColor&		LowColor() const
+		void				SetLowColor(const rgb_color& color);
+		const rgb_color&		LowColor() const
 								{ return fLowColor; }
 
 		void				SetPattern(const Pattern& pattern);
@@ -147,8 +146,8 @@
 
 		BRegion*			fClippingRegion;
 
-		RGBColor			fHighColor;
-		RGBColor			fLowColor;
+		rgb_color			fHighColor;
+		rgb_color			fLowColor;
 		Pattern				fPattern;
 
 		drawing_mode		fDrawingMode;

Modified: haiku/trunk/src/servers/app/ServerApp.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerApp.cpp	2007-08-17 12:13:32 UTC (rev 22002)
+++ haiku/trunk/src/servers/app/ServerApp.cpp	2007-08-17 12:56:20 UTC (rev 22003)
@@ -2231,7 +2231,7 @@
 				index = fDesktop->CurrentWorkspace();
 
 			Workspace workspace(*fDesktop, index);
-			fLink.Attach<rgb_color>(workspace.Color().GetColor32());
+			fLink.Attach<rgb_color>(workspace.Color());
 
 			fDesktop->Unlock();
 			fLink.Flush();

Modified: haiku/trunk/src/servers/app/ServerBitmap.h
===================================================================
--- haiku/trunk/src/servers/app/ServerBitmap.h	2007-08-17 12:13:32 UTC (rev 22002)
+++ haiku/trunk/src/servers/app/ServerBitmap.h	2007-08-17 12:56:20 UTC (rev 22003)
@@ -10,8 +10,6 @@
 #define SERVER_BITMAP_H
 
 
-#include "RGBColor.h"
-
 #include <GraphicsDefs.h>
 #include <Rect.h>
 #include <OS.h>

Modified: haiku/trunk/src/servers/app/ServerPicture.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-17 12:13:32 UTC (rev 22002)
+++ haiku/trunk/src/servers/app/ServerPicture.cpp	2007-08-17 12:56:20 UTC (rev 22003)
@@ -548,7 +548,7 @@
 static void
 set_fore_color(ViewLayer *view, rgb_color color)
 {
-	view->CurrentState()->SetHighColor(RGBColor(color));
+	view->CurrentState()->SetHighColor(color);
 	view->Window()->GetDrawingEngine()->SetHighColor(color);
 }
 
@@ -556,7 +556,7 @@
 static void
 set_back_color(ViewLayer *view, rgb_color color)
 {
-	view->CurrentState()->SetLowColor(RGBColor(color));
+	view->CurrentState()->SetLowColor(color);
 	view->Window()->GetDrawingEngine()->SetLowColor(color);
 }
 
@@ -823,8 +823,8 @@
 	//WriteSetPattern(*view->CurrentState()->GetPattern().GetInt8());
 	WriteSetDrawingMode(view->CurrentState()->GetDrawingMode());
 	
-	WriteSetHighColor(view->CurrentState()->HighColor().GetColor32());
-	WriteSetLowColor(view->CurrentState()->LowColor().GetColor32());
+	WriteSetHighColor(view->CurrentState()->HighColor());
+	WriteSetLowColor(view->CurrentState()->LowColor());
 
 	ExitStateChange();
 }

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-17 12:13:32 UTC (rev 22002)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-17 12:56:20 UTC (rev 22003)
@@ -1586,7 +1586,7 @@
 			
 			link.Read(&c, sizeof(rgb_color));
 
-			fCurrentLayer->SetViewColor(RGBColor(c));
+			fCurrentLayer->SetViewColor(c);
 			break;
 		}
 
@@ -1595,7 +1595,7 @@
 				Title(), fCurrentLayer->Name()));
 
 			fLink.StartMessage(B_OK);
-			fLink.Attach<rgb_color>(fCurrentLayer->CurrentState()->HighColor().GetColor32());
+			fLink.Attach<rgb_color>(fCurrentLayer->CurrentState()->HighColor());
 			fLink.Flush();
 			break;
 
@@ -1604,7 +1604,7 @@
 				Title(), fCurrentLayer->Name()));
 
 			fLink.StartMessage(B_OK);
-			fLink.Attach<rgb_color>(fCurrentLayer->CurrentState()->LowColor().GetColor32());
+			fLink.Attach<rgb_color>(fCurrentLayer->CurrentState()->LowColor());
 			fLink.Flush();
 			break;
 
@@ -1613,7 +1613,7 @@
 				Title(), fCurrentLayer->Name()));
 
 			fLink.StartMessage(B_OK);
-			fLink.Attach<rgb_color>(fCurrentLayer->ViewColor().GetColor32());
+			fLink.Attach<rgb_color>(fCurrentLayer->ViewColor());
 			fLink.Flush();
 			break;
 
@@ -1699,7 +1699,7 @@
 
 					if (bitmap != NULL && bitmap->Overlay() != NULL) {
 						bitmap->Overlay()->SetFlags(options);
-						colorKey = bitmap->Overlay()->Color().GetColor32();
+						colorKey = bitmap->Overlay()->Color();
 					}
 				} else
 					status = B_BAD_VALUE;
@@ -1849,7 +1849,7 @@
 			rgb_color c;
 			link.Read(&c, sizeof(rgb_color));
 			
-			fCurrentLayer->CurrentState()->SetHighColor(RGBColor(c));
+			fCurrentLayer->CurrentState()->SetHighColor(c);
 			fWindowLayer->GetDrawingEngine()->SetHighColor(c);
 			break;
 		}
@@ -1860,7 +1860,7 @@
 			rgb_color c;
 			link.Read(&c, sizeof(rgb_color));
 
-			fCurrentLayer->CurrentState()->SetLowColor(RGBColor(c));
+			fCurrentLayer->CurrentState()->SetLowColor(c);
 			fWindowLayer->GetDrawingEngine()->SetLowColor(c);
 			break;
 		}

Modified: haiku/trunk/src/servers/app/ViewLayer.cpp
===================================================================
--- haiku/trunk/src/servers/app/ViewLayer.cpp	2007-08-17 12:13:32 UTC (rev 22002)
+++ haiku/trunk/src/servers/app/ViewLayer.cpp	2007-08-17 12:56:20 UTC (rev 22003)
@@ -80,7 +80,7 @@
 	fFrame(frame),
 	fScrollingOffset(scrollingOffset),
 
-	fViewColor(RGBColor(255, 255, 255)),
+	fViewColor((rgb_color){ 255, 255, 255, 255 }),
 	fDrawState(new (nothrow) DrawState),
 	fViewBitmap(NULL),
 
@@ -1175,7 +1175,7 @@
 		return;
 	}
 
-	if (fViewBitmap != NULL || !fViewColor.IsTransparentMagic()) {
+	if (fViewBitmap != NULL || fViewColor != B_TRANSPARENT_COLOR) {
 		// we can only draw within our own area
 		BRegion* redraw = fWindow->GetRegion(ScreenClipping(windowContentClipping));
 		if (!redraw)
@@ -1265,7 +1265,7 @@
 
 		}
 
-		if (!fViewColor.IsTransparentMagic()) {
+		if (fViewColor != B_TRANSPARENT_COLOR) {
 			// fill visible region with view color,
 			// this version of FillRegion ignores any
 			// clipping, that's why "redraw" needs to

Modified: haiku/trunk/src/servers/app/ViewLayer.h
===================================================================
--- haiku/trunk/src/servers/app/ViewLayer.h	2007-08-17 12:13:32 UTC (rev 22002)
+++ haiku/trunk/src/servers/app/ViewLayer.h	2007-08-17 12:56:20 UTC (rev 22003)
@@ -13,7 +13,6 @@
 #define VIEW_LAYER_H
 
 
-#include "RGBColor.h"
 #include "IntRect.h"
 
 #include <GraphicsDefs.h>
@@ -157,10 +156,8 @@
 
 			const BRegion&	LocalClipping() const { return fLocalClipping; }
 
-			const RGBColor&	ViewColor() const
+			const rgb_color& ViewColor() const
 								{ return fViewColor; }
-			void			SetViewColor(const RGBColor& color)
-								{ fViewColor = color; }
 			void			SetViewColor(const rgb_color& color)
 								{ fViewColor = color; }
 
@@ -246,7 +243,7 @@
 			// scrolling offset
 			IntPoint		fScrollingOffset;
 
-			RGBColor		fViewColor;
+			rgb_color		fViewColor;
 			DrawState*		fDrawState;
 			ServerBitmap*	fViewBitmap;
 			IntRect			fBitmapSource;
@@ -256,10 +253,10 @@
 
 			uint32			fResizeMode;
 			uint32			fFlags;
-			bool			fHidden;
-			bool			fVisible;
-			bool			fBackgroundDirty;
-			bool			fIsDesktopBackground;
+			bool			fHidden : 1;
+			bool			fVisible : 1;
+			bool			fBackgroundDirty : 1;
+			bool			fIsDesktopBackground : 1;
 
 			uint32			fEventMask;
 			uint32			fEventOptions;

Modified: haiku/trunk/src/servers/app/WindowLayer.cpp
===================================================================
--- haiku/trunk/src/servers/app/WindowLayer.cpp	2007-08-17 12:13:32 UTC (rev 22002)
+++ haiku/trunk/src/servers/app/WindowLayer.cpp	2007-08-17 12:56:20 UTC (rev 22003)
@@ -374,7 +374,7 @@
 	if (fDecorator) {
 		fDecorator->ResizeBy(x, y, dirtyRegion);
 //if (dirtyRegion) {
-//fDrawingEngine->FillRegion(*dirtyRegion, RGBColor(255, 255, 0, 255));
+//fDrawingEngine->FillRegion(*dirtyRegion, (rgb_color){ 255, 255, 0, 255 });
 //snooze(40000);
 //}
 	}
@@ -385,7 +385,7 @@
 	}
 
 //if (dirtyRegion)
-//fDrawingEngine->FillRegion(*dirtyRegion, RGBColor(0, 255, 255, 255));
+//fDrawingEngine->FillRegion(*dirtyRegion, (rgb_color){ 0, 255, 255, 255 });
 
 	// send a message to the client informing about the changed size
 	BRect frame(Frame());
@@ -412,7 +412,7 @@
 
 	view->ScrollBy(dx, dy, dirty);
 
-//fDrawingEngine->FillRegion(dirty, RGBColor(255, 0, 255, 255));
+//fDrawingEngine->FillRegion(dirty, rgb_color{ 255, 0, 255, 255 });
 //snooze(2000);
 
 	if (IsVisible() && view->IsVisible()) {
@@ -715,7 +715,7 @@
 		if (layerRegion.CountRects() > 0) {
 			layerRegion.IntersectWith(&layer->ScreenClipping(&fContentRegion));
 
-//fDrawingEngine->FillRegion(layerRegion, RGBColor(0, 255, 0, 255));
+//fDrawingEngine->FillRegion(layerRegion, rgb_color{ 0, 255, 0, 255 });
 //snooze(10000);
 			fDirtyCause |= UPDATE_REQUEST;
 			_TriggerContentRedraw(layerRegion);
@@ -1817,7 +1817,7 @@

[... truncated: 1845 lines follow ...]


From axeld at mail.berlios.de  Fri Aug 17 15:08:25 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 17 Aug 2007 15:08:25 +0200
Subject: [Haiku-commits] r22004 - in haiku/trunk/src: apps/terminal
	system/kernel
Message-ID: <200708171308.l7HD8P02027367@sheep.berlios.de>

Author: axeld
Date: 2007-08-17 15:08:24 +0200 (Fri, 17 Aug 2007)
New Revision: 22004
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22004&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermParse.cpp
   haiku/trunk/src/system/kernel/signal.c
   haiku/trunk/src/system/kernel/thread.c
Log:
* Fixed the kernel bug that prevented SIGCONT from working properly: the problem
  occured if SIGSTOP was already delivered but not yet handled when SIGCONT was
  sent. Now, SIGCONT will clear all stop signals from the pending signals.
* SIGTSTP, SIGTTIN, and SIGTTOU are supposed to suspend the thread as well, adapted
  the default behaviour to respect that.
* Removed the work-around from r21997 TermParse.cpp for this exact problem.


Modified: haiku/trunk/src/apps/terminal/TermParse.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermParse.cpp	2007-08-17 12:56:20 UTC (rev 22003)
+++ haiku/trunk/src/apps/terminal/TermParse.cpp	2007-08-17 13:08:24 UTC (rev 22004)
@@ -225,12 +225,11 @@
 	}
 
 	if (fReaderThread >= 0) {
-		status_t dummy;
-		//suspend_thread(fReaderThread);
-		// TODO: interrupt read() - doesn't work for whatever reason
-		//wait_for_thread(fReaderThread, &dummy);
-		kill_thread(fReaderThread);
-	
+		suspend_thread(fReaderThread);
+
+		status_t status;
+		wait_for_thread(fReaderThread, &status);
+
 		fReaderThread = -1;	
 	}
 }

Modified: haiku/trunk/src/system/kernel/signal.c
===================================================================
--- haiku/trunk/src/system/kernel/signal.c	2007-08-17 12:56:20 UTC (rev 22003)
+++ haiku/trunk/src/system/kernel/signal.c	2007-08-17 13:08:24 UTC (rev 22004)
@@ -32,8 +32,12 @@
 
 #define SIGNAL_TO_MASK(signal)	(1LL << (signal - 1))
 #define BLOCKABLE_SIGNALS		(~(KILL_SIGNALS | SIGNAL_TO_MASK(SIGSTOP)))
+#define STOP_SIGNALS \
+	(SIGNAL_TO_MASK(SIGSTOP) | SIGNAL_TO_MASK(SIGTSTP) \
+	| SIGNAL_TO_MASK(SIGTTIN) | SIGNAL_TO_MASK(SIGTTOU))
 #define DEFAULT_IGNORE_SIGNALS \
-	(SIGNAL_TO_MASK(SIGCHLD) | SIGNAL_TO_MASK(SIGWINCH) | SIGNAL_TO_MASK(SIGCONT))
+	(SIGNAL_TO_MASK(SIGCHLD) | SIGNAL_TO_MASK(SIGWINCH) \
+	| SIGNAL_TO_MASK(SIGCONT))
 
 
 const char * const sigstr[NSIG] = {
@@ -128,9 +132,6 @@
 			switch (signal) {
 				case SIGCHLD:
 				case SIGWINCH:
-				case SIGTSTP:
-				case SIGTTIN:
-				case SIGTTOU:
 				case SIGCONT:
 				case SIGURG:
 					// notify the debugger
@@ -139,6 +140,9 @@
 					continue;
 
 				case SIGSTOP:
+				case SIGTSTP:
+				case SIGTTIN:
+				case SIGTTOU:
 					// notify the debugger
 					if (debugSignal
 						&& !notify_debugger(thread, signal, handler, false))
@@ -212,7 +216,8 @@
 bool
 is_kill_signal_pending(void)
 {
-	return (atomic_get(&thread_get_current_thread()->sig_pending) & KILL_SIGNALS) != 0;
+	return (atomic_get(&thread_get_current_thread()->sig_pending)
+		& KILL_SIGNALS) != 0;
 }
 
 
@@ -267,16 +272,21 @@
 			} else if (thread->state == B_THREAD_WAITING)
 				sem_interrupt_thread(thread);
 			break;
+
 		case SIGCONT:
 			// Wake up thread if it was suspended
 			if (thread->state == B_THREAD_SUSPENDED) {
 				thread->state = thread->next_state = B_THREAD_READY;
 				scheduler_enqueue_in_run_queue(thread);
 			}
+
+			atomic_and(&thread->sig_pending, ~STOP_SIGNALS);
+				// remove any pending stop signals
 			break;
 
 		default:
-			if (thread->sig_pending & (~thread->sig_block_mask | SIGNAL_TO_MASK(SIGCHLD))) {
+			if (thread->sig_pending
+				& (~thread->sig_block_mask | SIGNAL_TO_MASK(SIGCHLD))) {
 				// Interrupt thread if it was waiting
 				if (thread->state == B_THREAD_WAITING)
 					sem_interrupt_thread(thread);

Modified: haiku/trunk/src/system/kernel/thread.c
===================================================================
--- haiku/trunk/src/system/kernel/thread.c	2007-08-17 12:56:20 UTC (rev 22003)
+++ haiku/trunk/src/system/kernel/thread.c	2007-08-17 13:08:24 UTC (rev 22004)
@@ -1529,7 +1529,7 @@
 
 	if (thread == NULL) {
 		// we couldn't find this thread - maybe it's already gone, and we'll
-		// find its death entry
+		// find its death entry in our team
 		GRAB_TEAM_LOCK();
 
 		status = team_get_death_entry(thread_get_current_thread()->team,



From axeld at pinc-software.de  Fri Aug 17 15:09:43 2007
From: axeld at pinc-software.de (Axel =?iso-8859-15?q?D=F6rfler?=)
Date: Fri, 17 Aug 2007 15:09:43 +0200 CEST
Subject: [Haiku-commits] r21997 - haiku/trunk/src/apps/terminal
In-Reply-To: <200708170954.l7H9sWhG026175@sheep.berlios.de>
Message-ID: <17536357996-BeMail@zon>

jackburton at BerliOS <jackburton at mail.berlios.de> wrote:
> Log:
> The Shell destructor was never called. Calling it showed that 
> the PtyReader thread in TermParse hanged in read(). There's even a 
> comment in there (by Axel) that read() is never interrupted. Switched 
> to 
> kill_thread() in TermParse::StopPtyReader() until this problem is 
> fixed. 

Thanks for the reminder, it's now fixed in r22004 :-)
(I knew I should have opened a bug report for this back then)

Bye,
   Axel.



From stippi at mail.berlios.de  Fri Aug 17 18:24:01 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Fri, 17 Aug 2007 18:24:01 +0200
Subject: [Haiku-commits] r22005 - haiku/trunk/src/servers/app
Message-ID: <200708171624.l7HGO1Hd011237@sheep.berlios.de>

Author: stippi
Date: 2007-08-17 18:24:01 +0200 (Fri, 17 Aug 2007)
New Revision: 22005
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22005&view=rev

Modified:
   haiku/trunk/src/servers/app/DefaultDecorator.cpp
Log:
* more pleasing insets/offsets and the proportion of the zoom button scales
  with the font size


Modified: haiku/trunk/src/servers/app/DefaultDecorator.cpp
===================================================================
--- haiku/trunk/src/servers/app/DefaultDecorator.cpp	2007-08-17 13:08:24 UTC (rev 22004)
+++ haiku/trunk/src/servers/app/DefaultDecorator.cpp	2007-08-17 16:24:01 UTC (rev 22005)
@@ -1011,17 +1011,19 @@
 DefaultDecorator::_DrawZoom(BRect r)
 {
 	STRACE(("_DrawZoom(%f,%f,%f,%f)\n", r.left, r.top, r.right, r.bottom));
-	// If this has been implemented, then the decorator has a Zoom button
-	// which should be drawn based on the state of the member zoomstate
 
+	float inset = floorf(r.Width() / 4.0);
+
 	BRect zr(r);
-	zr.left += 3.0;
-	zr.top += 3.0;
+	zr.left += inset;
+	zr.top += inset;
 	_DrawBlendedRect(zr, GetZoom());
 
+	inset = floorf(r.Width() / 2.1);
+
 	zr = r;
-	zr.right -= 5.0;
-	zr.bottom -= 5.0;
+	zr.right -= inset;
+	zr.bottom -= inset;
 	_DrawBlendedRect(zr, GetZoom());
 }
 
@@ -1126,15 +1128,14 @@
 	bool smallTab = fLook == B_FLOATING_WINDOW_LOOK
 		|| fLook == kLeftTitledWindowLook;
 
-	*_offset = smallTab ? floorf(fDrawState.Font().Size() / 2.5)
-		: floorf(fDrawState.Font().Size() / 2.0);
+	*_offset = smallTab ? floorf(fDrawState.Font().Size() / 2.6)
+		: floorf(fDrawState.Font().Size() / 2.3);
 	*_inset = smallTab ? floorf(fDrawState.Font().Size() / 5.0)
 		: floorf(fDrawState.Font().Size() / 6.0);
-printf("");
 
 	// "+ 2" so that the rects are centered within the solid area
 	// (without the 2 pixels for the top border)
-	*_size = tabSize - *_inset * *_offset + *_inset;
+	*_size = tabSize - 2 * *_offset + *_inset;
 }
 
 // _LayoutTabItems



From stippi at mail.berlios.de  Fri Aug 17 18:24:46 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Fri, 17 Aug 2007 18:24:46 +0200
Subject: [Haiku-commits] r22006 - haiku/trunk/src/kits/interface
Message-ID: <200708171624.l7HGOkQU011410@sheep.berlios.de>

Author: stippi
Date: 2007-08-17 18:24:43 +0200 (Fri, 17 Aug 2007)
New Revision: 22006
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22006&view=rev

Modified:
   haiku/trunk/src/kits/interface/Region.cpp
Log:
* don't leak the rect data in case of failed realloc()


Modified: haiku/trunk/src/kits/interface/Region.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Region.cpp	2007-08-17 16:24:01 UTC (rev 22005)
+++ haiku/trunk/src/kits/interface/Region.cpp	2007-08-17 16:24:43 UTC (rev 22006)
@@ -471,9 +471,15 @@
 		if (fData == &fBounds) {
 			fData = (clipping_rect*)malloc(newSize * sizeof(clipping_rect));
 			fData[0] = fBounds;
-		} else if (fData)
-			fData = (clipping_rect*)realloc(fData, newSize * sizeof(clipping_rect));
-		else
+		} else if (fData) {
+			clipping_rect* resizedData = (clipping_rect*)realloc(fData,
+				newSize * sizeof(clipping_rect));
+			if (!resizedData) {
+				free(fData);
+				fData = NULL;
+			} else
+				fData = resizedData;
+		} else
 			fData = (clipping_rect*)malloc(newSize * sizeof(clipping_rect));
 	} else {
 		// just an empty region, but no error



From stippi at mail.berlios.de  Fri Aug 17 18:36:14 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Fri, 17 Aug 2007 18:36:14 +0200
Subject: [Haiku-commits] r22007 - haiku/trunk/src/preferences/network
Message-ID: <200708171636.l7HGaERP020832@sheep.berlios.de>

Author: stippi
Date: 2007-08-17 18:36:13 +0200 (Fri, 17 Aug 2007)
New Revision: 22007
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22007&view=rev

Modified:
   haiku/trunk/src/preferences/network/EthernetSettingsView.cpp
   haiku/trunk/src/preferences/network/EthernetSettingsView.h
   haiku/trunk/src/preferences/network/settings.cpp
   haiku/trunk/src/preferences/network/settings.h
Log:
patch by Andre Garzia:
* it gets all the configuration and it saves it back but for some reason,
  the net_server is not noticing the changes yet


Modified: haiku/trunk/src/preferences/network/EthernetSettingsView.cpp
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsView.cpp	2007-08-17 16:24:43 UTC (rev 22006)
+++ haiku/trunk/src/preferences/network/EthernetSettingsView.cpp	2007-08-17 16:36:13 UTC (rev 22007)
@@ -33,6 +33,11 @@
 
 #include <SupportDefs.h>
 
+#include <Directory.h>
+#include <FindDirectory.h>
+#include <fs_interface.h>
+#include <Path.h>
+
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <net/if_dl.h>
@@ -113,6 +118,13 @@
 	fOKButton->SetTarget(this);
 	fApplyButton->SetTarget(this);
 	fDeviceMenuField->Menu()->SetTargetForItems(this); 
+	
+	// Display first adapter by default.
+	
+	BMessage* info = new BMessage(kMsgInfo);
+	info->AddString("interface", fSettings.ItemAt(0)->GetName());
+	_ShowConfiguration(info);
+	
 }
 
 
@@ -151,8 +163,10 @@
 	
 	
 	BPopUpMenu* modemenu = new  BPopUpMenu("modes");
-	BMenuItem* modeitem = new BMenuItem("dummy", NULL);
-	modemenu->AddItem(modeitem);
+	BMenuItem* staticitem = new BMenuItem("Static", NULL);
+	modemenu->AddItem(staticitem);
+	BMenuItem* dhcpitem = new BMenuItem("DHCP", NULL);
+	modemenu->AddItem(dhcpitem);
 	
 	fDeviceMenuField = new BMenuField(frame, "networkcards", "Adapter:", devmenu);
 	fDeviceMenuField->SetDivider(
@@ -242,12 +256,24 @@
 	int i;
 	for (i=0; i<fSettings.CountItems();i++) {
 		if (strcmp(fSettings.ItemAt(i)->GetName(), name) == 0) {
+			fDeviceMenuField->Menu()->FindItem(name)->SetMarked(true);
 			fIPTextControl->SetText(fSettings.ItemAt(i)->GetIP());
 			fGatewayTextControl->SetText(fSettings.ItemAt(i)->GetGateway());
 			fNetMaskTextControl->SetText(fSettings.ItemAt(i)->GetNetmask());
 			
+			if (fSettings.ItemAt(i)->GetAutoConfigure() == true) {
+				fTypeMenuField->Menu()->FindItem("DHCP")->SetMarked(true);
+				fTypeMenuField->Menu()->FindItem("Static")->SetMarked(false);
+
+			} else {
+				fTypeMenuField->Menu()->FindItem("Static")->SetMarked(true);
+				fTypeMenuField->Menu()->FindItem("DHCP")->SetMarked(false);
+
+			}
+			fTypeMenuField->Menu()->SetLabelFromMarked(true);
+			fDeviceMenuField->Menu()->SetLabelFromMarked(true);
+
 			
-			
 			if (fSettings.ItemAt(i)->fNameservers.CountItems() == 2) {
 				fSecondaryDNSTextControl->SetText(
 					fSettings.ItemAt(i)->fNameservers.ItemAt(1)->String());
@@ -263,7 +289,6 @@
 	}
 	
 	
-	// Obtain DNS
 	
 	
 	
@@ -274,12 +299,127 @@
 }
 
 void
+EthernetSettingsView::_ApplyControlsToConfiguration()
+{
+	if (strcmp(fTypeMenuField->Menu()->FindMarked()->Label(), "Static") == 0) {
+		printf("we?re in!\n");
+		int i;
+		for (i = 0; i < fSettings.CountItems(); i++) {
+		
+
+			if (strcmp(fSettings.ItemAt(i)->
+				GetName(), fDeviceMenuField->Menu()->FindMarked()->Label()) == 0) {
+					printf("changing settings for %s", fSettings.ItemAt(i)->GetName());
+					fSettings.ItemAt(i)->
+						SetIP(fIPTextControl->Text());
+					fSettings.ItemAt(i)->
+						SetNetmask(fNetMaskTextControl->Text());
+					fSettings.ItemAt(i)->
+						SetGateway(fGatewayTextControl->Text());
+					fSettings.ItemAt(i)->SetAutoConfigure(false);
+					
+					fSettings.ItemAt(i)->fNameservers.MakeEmpty();
+					fSettings.ItemAt(i)->fNameservers.AddItem(new BString(
+						fPrimaryDNSTextControl->Text()));
+					fSettings.ItemAt(i)->fNameservers.AddItem(new BString(
+						fSecondaryDNSTextControl->Text()));
+						
+			}
+		}
+	} 
+}
+
+void
+EthernetSettingsView::_SaveConfiguration()
+{
+	_ApplyControlsToConfiguration();
+	_SaveDNSConfiguration();
+	_SaveAdaptersConfiguration();
+}
+
+void
+EthernetSettingsView::_SaveDNSConfiguration()
+{
+	FILE* fp;
+	if ((fp = fopen("/etc/resolv.conf", "w")) != NULL) {
+		fprintf(fp, "# Generated by Network Preflet\n");
+		int i;
+		for (i = 0; i < fSettings.CountItems(); i++) {
+			// loop all the adapters.
+			int j;
+			for (j = 0; j < fSettings.ItemAt(i)->fNameservers.CountItems(); j++) {
+				fprintf(fp, "nameserver\t%s\n", 
+					fSettings.ItemAt(i)->fNameservers.ItemAt(j)->String());
+				}
+			}
+		fclose(fp);	
+	}
+	
+}
+
+void
+EthernetSettingsView::_SaveAdaptersConfiguration()
+{
+	BPath path;
+	status_t status = _GetPath("interfaces", path);
+	if (status < B_OK)
+		return;	
+		
+	FILE* fp;
+	bool isOpen = false;
+	int i;
+	for (i = 0; i < fSettings.CountItems(); i++) {
+			// loop all the adapters.
+		if (fSettings.ItemAt(i)->GetAutoConfigure() == false) {
+			if (isOpen == false) {
+				if ((fp = fopen(path.Path(), "w")) == NULL)
+					return;
+				isOpen = true;
+			}
+			fprintf(fp, 
+				"device %s {\n\t\taddress {\n", fSettings.ItemAt(i)->GetName());
+			fprintf(fp, "\t\t\tfamily\tinet\n");
+			fprintf(fp, "\t\t\taddress\t%s\n", 
+				fSettings.ItemAt(i)->GetIP());
+			fprintf(fp, "\t\t\tgateway\t%s\n", 
+				fSettings.ItemAt(i)->GetGateway());
+			fprintf(fp, "\t\t\tmask\t%s\n", 
+				fSettings.ItemAt(i)->GetNetmask());
+			fprintf(fp, "\t\t}\n}\n\n");
+		
+		
+		}	
+		if (isOpen) {
+			printf("%s saved.\n", path.Path());
+			fclose(fp);
+		}	
+	}
+}
+
+status_t
+EthernetSettingsView::_GetPath(const char* name, BPath& path)
+{
+	if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path, true) != B_OK)
+		return B_ERROR;
+
+	path.Append("network");
+	create_directory(path.Path(), 0755);
+
+	if (name != NULL)
+		path.Append(name);
+	return B_OK;
+}
+
+void
 EthernetSettingsView::MessageReceived(BMessage* message)
 {
 	switch (message->what) {
 		case kMsgInfo:
 			_ShowConfiguration(message);
 			break;
+		case kMsgApply:
+			_SaveConfiguration();
+			break;
 		default:
 			BView::MessageReceived(message);
 	}

Modified: haiku/trunk/src/preferences/network/EthernetSettingsView.h
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsView.h	2007-08-17 16:24:43 UTC (rev 22006)
+++ haiku/trunk/src/preferences/network/EthernetSettingsView.h	2007-08-17 16:36:13 UTC (rev 22007)
@@ -34,6 +34,8 @@
 		virtual void AttachedToWindow();
 		virtual void DetachedFromWindow();
 		
+		void SaveProfile(BString profileName);
+		void LoadProfile(BString profileName);
 	private:
 		
 		BButton* fCloseButton;
@@ -54,7 +56,13 @@
 		void	_GatherInterfaces();
 		bool	_PrepareRequest(struct ifreq& request, const char* name);
 		void 	_ShowConfiguration(BMessage* message);
+		void 	_SaveConfiguration();
+		void 	_SaveDNSConfiguration();
+		void 	_SaveAdaptersConfiguration();
+		void	_ApplyControlsToConfiguration();
+		status_t _GetPath(const char* name, BPath& path);
 
+
 };
 
 #endif /* ETHERNET_SETTINGS_VIEW_H */

Modified: haiku/trunk/src/preferences/network/settings.cpp
===================================================================
--- haiku/trunk/src/preferences/network/settings.cpp	2007-08-17 16:24:43 UTC (rev 22006)
+++ haiku/trunk/src/preferences/network/settings.cpp	2007-08-17 16:36:13 UTC (rev 22007)
@@ -154,7 +154,16 @@
 	bufferDeleter.Detach();
 	free(buffer);	
 	
-	// Now that silly DNS problem...
+	uint32 flags = 0;
+	if (ioctl(fSocket, SIOCGIFFLAGS, &request, sizeof(struct ifreq)) == 0)
+		flags = request.ifr_flags;
+		
+	if ((flags & IFF_AUTO_CONFIGURED) != 0)
+		fAuto = true;
+	else
+		fAuto = false;
+	
+	// read resolv.conf for the dns.
 	fNameservers.MakeEmpty();
 
 #define	MATCH(line, name) \
@@ -173,25 +182,27 @@
 	if ((fp = fopen("/etc/resolv.conf", "r")) != NULL) {
 	    /* read the config file */
 	    while (fgets(buf, sizeof(buf), fp) != NULL) {
-			/* skip comments */
-			if (*buf == ';' || *buf == '#')
-				continue;
+		/* skip comments */
+		if (*buf == ';' || *buf == '#')
+			continue;
 			
-		    /* read nameservers to query */
-			if (MATCH(buf, "nameserver") && nserv < MAXNS) {
-				char sbuf[2];
+	    /* read nameservers to query */
+		if (MATCH(buf, "nameserver") && nserv < MAXNS) {
+		    char sbuf[2];
+		    
 
-				cp = buf + sizeof("nameserver") - 1;
-				while (*cp == ' ' || *cp == '\t')
-					cp++;
-				cp[strcspn(cp, ";# \t\n")] = '\0';
-				if ((*cp != '\0') && (*cp != '\n')) {
-					fNameservers.AddItem(new BString(cp));
-					nserv++;
-				}
-			}
-			continue;
+		    cp = buf + sizeof("nameserver") - 1;
+		    while (*cp == ' ' || *cp == '\t')
+			cp++;
+		    cp[strcspn(cp, ";# \t\n")] = '\0';
+		    if ((*cp != '\0') && (*cp != '\n')) {
+				fNameservers.AddItem(new BString(cp));
+			    nserv++;
+		    }
 		}
-		fclose(fp);
+		    continue; 
+		}
+	fclose(fp);
+	
 	}
 }

Modified: haiku/trunk/src/preferences/network/settings.h
===================================================================
--- haiku/trunk/src/preferences/network/settings.h	2007-08-17 16:24:43 UTC (rev 22006)
+++ haiku/trunk/src/preferences/network/settings.h	2007-08-17 16:36:13 UTC (rev 22007)
@@ -17,22 +17,19 @@
 		virtual ~Settings();
 
 		void SetName(BString name);
-		void SetIP(BString ip);
-		void SetGateway(BString ip);
-		void SetNetmask(BString ip);
-		void SetAutoConfigure(bool t);
+		void SetIP(BString ip) {fIP = ip; }
+		void SetGateway(BString ip) {fGateway = ip; }
+		void SetNetmask(BString ip) {fNetmask = ip; }
+		void SetAutoConfigure(bool t) {fAuto = t; }
 		
 		const char* GetIP()  {return fIP.String(); }
 		const char* GetGateway()  {return fGateway.String(); }		
 		const char* GetNetmask()  {return fNetmask.String(); }
 		const char* GetName()  {return fName.String(); }
-		bool GetAutoConfigure() const {return fAuto; }
+		bool GetAutoConfigure() {return fAuto; }
 		BObjectList<BString> fNameservers;
-
-		void SaveProfile(BString profileName);
-		void LoadProfile(BString profileName);
-		void SaveConfiguration();
 		void ReadConfiguration();
+
 		
 	private:
 		bool _PrepareRequest(struct ifreq& request);



From stefano.ceccherini at gmail.com  Fri Aug 17 22:23:13 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Fri, 17 Aug 2007 22:23:13 +0200
Subject: [Haiku-commits] r22004 - in haiku/trunk/src: apps/terminal
	system/kernel
In-Reply-To: <200708171308.l7HD8P02027367@sheep.berlios.de>
References: <200708171308.l7HD8P02027367@sheep.berlios.de>
Message-ID: <894b9700708171323s36361d86s6d4b0c7181a65b35@mail.gmail.com>

2007/8/17, axeld at BerliOS <axeld at mail.berlios.de>:

> * Fixed the kernel bug that prevented SIGCONT from working properly: the problem
>   occured if SIGSTOP was already delivered but not yet handled when SIGCONT was
>   sent. Now, SIGCONT will clear all stop signals from the pending signals.
> * SIGTSTP, SIGTTIN, and SIGTTOU are supposed to suspend the thread as well, adapted
>   the default behaviour to respect that.
> * Removed the work-around from r21997 TermParse.cpp for this exact problem.

Nice one! :)


From mmlr at mail.berlios.de  Sat Aug 18 20:39:30 2007
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Sat, 18 Aug 2007 20:39:30 +0200
Subject: [Haiku-commits] r22008 - haiku/trunk/src/bin
Message-ID: <200708181839.l7IIdUW5008390@sheep.berlios.de>

Author: mmlr
Date: 2007-08-18 20:39:29 +0200 (Sat, 18 Aug 2007)
New Revision: 22008
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22008&view=rev

Modified:
   haiku/trunk/src/bin/usb_dev_info.cpp
Log:
Correct printing generic descriptors (the length includes the two other struct fields). Fixed warnings.

Modified: haiku/trunk/src/bin/usb_dev_info.cpp
===================================================================
--- haiku/trunk/src/bin/usb_dev_info.cpp	2007-08-17 16:36:13 UTC (rev 22007)
+++ haiku/trunk/src/bin/usb_dev_info.cpp	2007-08-18 18:39:29 UTC (rev 22008)
@@ -21,12 +21,12 @@
 	printf("    Protocol ........... %d\n", interface->Protocol());
 	printf("    Interface String ... \"%s\"\n", interface->InterfaceString());
 
-	for (int32 i = 0; i < interface->CountEndpoints(); i++) {
+	for (uint32 i = 0; i < interface->CountEndpoints(); i++) {
 		const BUSBEndpoint *endpoint = interface->EndpointAt(i);
 		if (!endpoint)
 			continue;
 
-		printf("      [Endpoint %d]\n", i);
+		printf("      [Endpoint %lu]\n", i);
 		printf("      MaxPacketSize .... %d\n", endpoint->MaxPacketSize());
 		printf("      Interval ......... %d\n", endpoint->Interval());
 
@@ -47,12 +47,12 @@
 
 	char buffer[256];
 	usb_descriptor *generic = (usb_descriptor *)buffer;
-	for (int32 i = 0; interface->OtherDescriptorAt(i, generic, 256) == B_OK; i++) {
-		printf("      [Descriptor %d]\n", i);
+	for (uint32 i = 0; interface->OtherDescriptorAt(i, generic, 256) == B_OK; i++) {
+		printf("      [Descriptor %lu]\n", i);
 		printf("      Type ............. 0x%02x\n", generic->generic.descriptor_type);
-
 		printf("      Data ............. ");
-		for(int32 j = 0; j < generic->generic.length; j++)
+		// the length includes the length and descriptor_type field
+		for(int32 j = 0; j < generic->generic.length - 2; j++)
 			printf("%02x ", generic->generic.data[j]);
 		printf("\n");
 	}
@@ -66,8 +66,8 @@
 		return;
 
 	printf("  Configuration String . \"%s\"\n", configuration->ConfigurationString());
-	for (int32 i = 0; i < configuration->CountInterfaces(); i++) {
-		printf("    [Interface %d]\n", i);
+	for (uint32 i = 0; i < configuration->CountInterfaces(); i++) {
+		printf("    [Interface %lu]\n", i);
 		DumpInterface(configuration->InterfaceAt(i));
 	}
 }
@@ -89,8 +89,8 @@
 	printf("Product String ......... \"%s\"\n", device.ProductString());
 	printf("Serial Number .......... \"%s\"\n", device.SerialNumberString());
 
-	for (int32 i = 0; i < device.CountConfigurations(); i++) {
-		printf("  [Configuration %d]\n", i);
+	for (uint32 i = 0; i < device.CountConfigurations(); i++) {
+		printf("  [Configuration %lu]\n", i);
 		DumpConfiguration(device.ConfigurationAt(i));
 	}
 }



From mmlr at mail.berlios.de  Sat Aug 18 20:45:49 2007
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Sat, 18 Aug 2007 20:45:49 +0200
Subject: [Haiku-commits] r22009 - haiku/trunk/src/bin
Message-ID: <200708181845.l7IIjnYu008878@sheep.berlios.de>

Author: mmlr
Date: 2007-08-18 20:45:49 +0200 (Sat, 18 Aug 2007)
New Revision: 22009
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22009&view=rev

Modified:
   haiku/trunk/src/bin/usb_dev_info.cpp
Log:
Print class, subclass and protocol field as hex numbers. This fits general usage and documentation.

Modified: haiku/trunk/src/bin/usb_dev_info.cpp
===================================================================
--- haiku/trunk/src/bin/usb_dev_info.cpp	2007-08-18 18:39:29 UTC (rev 22008)
+++ haiku/trunk/src/bin/usb_dev_info.cpp	2007-08-18 18:45:49 UTC (rev 22009)
@@ -16,9 +16,9 @@
 	if (!interface)
 		return;
 
-	printf("    Class .............. %d\n", interface->Class());
-	printf("    Subclass ........... %d\n", interface->Subclass());
-	printf("    Protocol ........... %d\n", interface->Protocol());
+	printf("    Class .............. 0x%02x\n", interface->Class());
+	printf("    Subclass ........... 0x%02x\n", interface->Subclass());
+	printf("    Protocol ........... 0x%02x\n", interface->Protocol());
 	printf("    Interface String ... \"%s\"\n", interface->InterfaceString());
 
 	for (uint32 i = 0; i < interface->CountEndpoints(); i++) {
@@ -77,9 +77,9 @@
 DumpInfo(BUSBDevice &device)
 {
 	printf("[Device]\n");
-	printf("Class .................. %d\n", device.Class());
-	printf("Subclass ............... %d\n", device.Subclass());
-	printf("Protocol ............... %d\n", device.Protocol());
+	printf("Class .................. 0x%02x\n", device.Class());
+	printf("Subclass ............... 0x%02x\n", device.Subclass());
+	printf("Protocol ............... 0x%02x\n", device.Protocol());
 	printf("Max Endpoint 0 Packet .. %d\n", device.MaxEndpoint0PacketSize());
 	printf("USB Version ............ 0x%04x\n", device.USBVersion());
 	printf("Vendor ID .............. 0x%04x\n", device.VendorID());



From leavengood at mail.berlios.de  Sun Aug 19 07:23:32 2007
From: leavengood at mail.berlios.de (leavengood at BerliOS)
Date: Sun, 19 Aug 2007 07:23:32 +0200
Subject: [Haiku-commits] r22010 - haiku/trunk/src/preferences/sounds
Message-ID: <200708190523.l7J5NWUs009525@sheep.berlios.de>

Author: leavengood
Date: 2007-08-19 07:23:31 +0200 (Sun, 19 Aug 2007)
New Revision: 22010
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22010&view=rev

Modified:
   haiku/trunk/src/preferences/sounds/HWindow.cpp
Log:
Two fixes:
- One from Justin O'Dell which properly enables and disables the play and stop
	buttons.
- One from me which doesn't crash Sounds if you try to open a file which has no
	MIME type set. It previously assumed the super type would always exist.


Modified: haiku/trunk/src/preferences/sounds/HWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/sounds/HWindow.cpp	2007-08-18 18:45:49 UTC (rev 22009)
+++ haiku/trunk/src/preferences/sounds/HWindow.cpp	2007-08-19 05:23:31 UTC (rev 22010)
@@ -139,6 +139,7 @@
 						,new BMessage(M_STOP_MESSAGE)
 						,B_FOLLOW_RIGHT | B_FOLLOW_TOP);
 	button->ResizeToPreferred();
+	button->SetEnabled(false);
 	button->MoveTo(box->Bounds().right - button->Bounds().Width() - 15, rect.top);
 	box->AddChild(button);
 	
@@ -153,6 +154,7 @@
 								,new BMessage(M_PLAY_MESSAGE)
 								,B_FOLLOW_RIGHT | B_FOLLOW_TOP);
 	button->ResizeToPreferred();
+	button->SetEnabled(false);
 	button->MoveTo(rect.left - button->Bounds().Width() - 15, rect.top);
 	box->AddChild(button);
 	
@@ -212,7 +214,7 @@
 				BMimeType mtype(type);
 				BMimeType superType;
 				mtype.GetSupertype(&superType);
-				if(strcmp(superType.Type(),"audio") != 0) {
+				if (superType.Type() == NULL || strcmp(superType.Type(), "audio") != 0) {
 					beep();
 					(new BAlert("","This is not a audio file.","OK",NULL,NULL,
 							B_WIDTH_AS_USUAL,B_STOP_ALERT))->Go();
@@ -408,9 +410,16 @@
 	
 	if(!menufield)
 		return;
+
 	if(sel >=0) {
 		menufield->SetEnabled(true);
-		button->SetEnabled(true);
+
+		HEventItem *item = cast_as(fEventList->ItemAt(sel),HEventItem);
+		const char* path = item->Path();
+		if (path && strcmp(path, ""))
+			button->SetEnabled(true);
+		else
+			button->SetEnabled(false);
 	} else {
 		menufield->SetEnabled(false);
 		button->SetEnabled(false);



From leavengood at mail.berlios.de  Sun Aug 19 21:55:29 2007
From: leavengood at mail.berlios.de (leavengood at BerliOS)
Date: Sun, 19 Aug 2007 21:55:29 +0200
Subject: [Haiku-commits] r22011 - haiku/trunk/src/kits/interface
Message-ID: <200708191955.l7JJtTdS022959@sheep.berlios.de>

Author: leavengood
Date: 2007-08-19 21:55:26 +0200 (Sun, 19 Aug 2007)
New Revision: 22011
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22011&view=rev

Modified:
   haiku/trunk/src/kits/interface/Menu.cpp
Log:
A fix to bug #1154 by Justin O'Dell. Basically the settings for menus
default to having no accelerators, but that setting was not ever read
properly. So in fact the meny pref was correct, but the menus were wrong.
This fixes that.

If the default setting is supposed to be accelerators on then the settings
should be changed.


Modified: haiku/trunk/src/kits/interface/Menu.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Menu.cpp	2007-08-19 05:23:31 UTC (rev 22010)
+++ haiku/trunk/src/kits/interface/Menu.cpp	2007-08-19 19:55:26 UTC (rev 22011)
@@ -1204,6 +1204,8 @@
 	SetLowColor(sMenuInfo.background_color);
 	SetViewColor(sMenuInfo.background_color);
 
+	fTriggerEnabled = sMenuInfo.triggers_always_shown;
+
 	if (data != NULL) {
 		data->FindInt32("_layout", (int32 *)&fLayout);
 		data->FindBool("_rsize_to_fit", &fResizeToFit);



From jackburton at mail.berlios.de  Sun Aug 19 21:59:09 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Sun, 19 Aug 2007 21:59:09 +0200
Subject: [Haiku-commits] r22012 - in haiku/trunk: headers/private/shared
	src/kits/support
Message-ID: <200708191959.l7JJx9H6023520@sheep.berlios.de>

Author: jackburton
Date: 2007-08-19 21:59:09 +0200 (Sun, 19 Aug 2007)
New Revision: 22012
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22012&view=rev

Removed:
   haiku/trunk/headers/private/shared/DataBuffer.h
   haiku/trunk/src/kits/support/DataBuffer.cpp
Modified:
   haiku/trunk/src/kits/support/Jamfile
Log:
Removed unused DataBuffer class


Deleted: haiku/trunk/headers/private/shared/DataBuffer.h

Deleted: haiku/trunk/src/kits/support/DataBuffer.cpp

Modified: haiku/trunk/src/kits/support/Jamfile
===================================================================
--- haiku/trunk/src/kits/support/Jamfile	2007-08-19 19:55:26 UTC (rev 22011)
+++ haiku/trunk/src/kits/support/Jamfile	2007-08-19 19:59:09 UTC (rev 22012)
@@ -9,7 +9,6 @@
 	Beep.cpp
 	BlockCache.cpp
 	ByteOrder.cpp
-	DataBuffer.cpp
 	DataIO.cpp
 	BufferIO.cpp
 	Flattenable.cpp
@@ -19,5 +18,4 @@
 	Referenceable.cpp
 	StopWatch.cpp
 	String.cpp
-#	StreamIO.cpp
 ;



From jackburton at mail.berlios.de  Sun Aug 19 22:14:52 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Sun, 19 Aug 2007 22:14:52 +0200
Subject: [Haiku-commits] r22013 - haiku/trunk/src/apps/glteapot
Message-ID: <200708192014.l7JKEq8r024772@sheep.berlios.de>

Author: jackburton
Date: 2007-08-19 22:14:48 +0200 (Sun, 19 Aug 2007)
New Revision: 22013
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22013&view=rev

Modified:
   haiku/trunk/src/apps/glteapot/FPS.cpp
   haiku/trunk/src/apps/glteapot/FPS.h
   haiku/trunk/src/apps/glteapot/GLObject.cpp
   haiku/trunk/src/apps/glteapot/GLObject.h
   haiku/trunk/src/apps/glteapot/ObjectView.cpp
   haiku/trunk/src/apps/glteapot/ObjectView.h
   haiku/trunk/src/apps/glteapot/ResScroll.h
   haiku/trunk/src/apps/glteapot/error.cpp
   haiku/trunk/src/apps/glteapot/error.h
   haiku/trunk/src/apps/glteapot/teapot.h
   haiku/trunk/src/apps/glteapot/teapot_main.cpp
   haiku/trunk/src/apps/glteapot/util.h
Log:
Some style cleanups by Fredrik Ekdahl. Thanks!


Modified: haiku/trunk/src/apps/glteapot/FPS.cpp
===================================================================
--- haiku/trunk/src/apps/glteapot/FPS.cpp	2007-08-19 19:59:09 UTC (rev 22012)
+++ haiku/trunk/src/apps/glteapot/FPS.cpp	2007-08-19 20:14:48 UTC (rev 22013)
@@ -18,20 +18,20 @@
 FPS::drawChar(GLfloat x, GLfloat y, GLint number)
 {
 	static bool numbers[13][7] = {
-		{ true, true, true, true, true, true, false }, 		/* 0 */
-		{ false, true, true, false, false, false, false },	/* 1 */
-		{ true, true, false, true, true, false, true },		/* 2 */
-		{ true, true, true, true, false, false, true },		/* 3 */
-		{ false, true, true, false, false, true, true },	/* 4 */
-		{ true, false, true, true, false, true, true },		/* 5 */
-		{ true, false, true, true, true, true, true },		/* 6 */
-		{ true, true, true, false, false, false, false },	/* 7 */
-		{ true, true, true, true, true, true, true },		/* 8 */
-		{ true, true, true, false, false, true, true },		/* 9 */
+		{true, true, true, true, true, true, false},	/* 0 */
+		{false, true, true, false, false, false, false},/* 1 */
+		{true, true, false, true, true, false, true},	/* 2 */
+		{true, true, true, true, false, false, true},	/* 3 */
+		{false, true, true, false, false, true, true},	/* 4 */
+		{true, false, true, true, false, true, true},	/* 5 */
+		{true, false, true, true, true, true, true},	/* 6 */
+		{true, true, true, false, false, false, false},	/* 7 */
+		{true, true, true, true, true, true, true},		/* 8 */
+		{true, true, true, false, false, true, true},	/* 9 */
 
-		{ true, false, false, false, true, true, true },	/* F */
-		{ true, true, false, false, true, true, true },		/* P */
-		{ true, false, true, true, false, true, true },		/* S */
+		{true, false, false, false, true, true, true},	/* F */
+		{true, true, false, false, true, true, true},	/* P */
+		{true, false, true, true, false, true, true},	/* S */
 	};
 
 	static GLfloat gap = 0.03;

Modified: haiku/trunk/src/apps/glteapot/FPS.h
===================================================================
--- haiku/trunk/src/apps/glteapot/FPS.h	2007-08-19 19:59:09 UTC (rev 22012)
+++ haiku/trunk/src/apps/glteapot/FPS.h	2007-08-19 20:14:48 UTC (rev 22013)
@@ -5,16 +5,14 @@
 
 #include <GL/gl.h>
 
-class FPS
-{
-public:
-	FPS();
-	~FPS();
+class FPS {
+	public:
+		FPS();
+		~FPS();
+		
+		static void drawCounter(GLfloat frameRate);
 	
-	static void drawCounter( GLfloat frameRate );
-
-private:
-	static void drawChar( GLfloat x, GLfloat y, GLint number );
-
+	private:
+		static void drawChar(GLfloat x, GLfloat y, GLint number);
 };
 

Modified: haiku/trunk/src/apps/glteapot/GLObject.cpp
===================================================================
--- haiku/trunk/src/apps/glteapot/GLObject.cpp	2007-08-19 19:59:09 UTC (rev 22012)
+++ haiku/trunk/src/apps/glteapot/GLObject.cpp	2007-08-19 20:14:48 UTC (rev 22013)
@@ -3,22 +3,17 @@
 	This file may be used under the terms of the Be Sample Code License.
 */
 
+#include "GLObject.h"
+#include <GL/gl.h>
 #include <stdlib.h>
-#include <GL/gl.h>
-
 #include <InterfaceKit.h>
-
-#include "GLObject.h"
 #include "glob.h"
 
 struct material {
-	float ambient[3],diffuse[3],specular[3];
+	float ambient[3], diffuse[3], specular[3];
 };
 
-float *colors[] =
-{
-	NULL,white,yellow,blue,red,green
-};
+float *colors[] = {NULL, white, yellow, blue, red, green};
 
 material materials[] = {
 	// Null
@@ -61,25 +56,34 @@
 
 #define USE_QUAD_STRIPS 1
 
-extern long 	setEvent(sem_id event);
+extern long setEvent(sem_id event);
 
+
 GLObject::GLObject(ObjectView *ov)
+	: rotX(0),
+	rotY(0),
+	lastRotX(0),
+	lastRotY(0),
+	spinX(2),
+	spinY(2),
+	x(0),
+	y(0),
+	z(-2.0),
+	color(4),
+	solidity(0),
+	changed(false),
+	objView(ov)
 {
-	rotX = rotY = lastRotX = lastRotY = 0;
-	spinX = spinY = 2;
-	x = y = 0;
-	z = -2.0;
-	color = 4;
-	solidity = 0;
-	changed = false;
-	objView = ov;
 };
 
+
 GLObject::~GLObject()
 {
 };
 
-void GLObject::MenuInvoked(BPoint point)
+
+void
+GLObject::MenuInvoked(BPoint point)
 {
 	BPopUpMenu *m = new BPopUpMenu("Object",false,false);
 	BMenuItem *i;
@@ -126,7 +130,9 @@
 	setEvent(objView->drawEvent);
 };
 
-bool GLObject::SpinIt()
+
+bool
+GLObject::SpinIt()
 {
 	rotX += spinX;
 	rotY += spinY;
@@ -138,7 +144,9 @@
 	return c;
 };
 
-void GLObject::Draw(bool forID, float IDcolor[])
+
+void
+GLObject::Draw(bool forID, float IDcolor[])
 {
 	glPushMatrix();
 		glTranslatef(x, y, z);
@@ -156,6 +164,7 @@
 	changed = false;
 };
 
+
 TriangleObject::TriangleObject(ObjectView *ov, char *filename)
 	: 	GLObject(ov), 
 		points(100,100),
@@ -247,6 +256,7 @@
 	fclose(f);
 };
 
+
 TriangleObject::~TriangleObject()
 {
 	for (int i=0;i<qs.num_items;i++) {
@@ -254,7 +264,9 @@
 	};
 };
 
-void TriangleObject::DoDrawing(bool forID)
+
+void
+TriangleObject::DoDrawing(bool forID)
 {
 	if (!forID) {
 		float c[3][4];

Modified: haiku/trunk/src/apps/glteapot/GLObject.h
===================================================================
--- haiku/trunk/src/apps/glteapot/GLObject.h	2007-08-19 19:59:09 UTC (rev 22012)
+++ haiku/trunk/src/apps/glteapot/GLObject.h	2007-08-19 20:14:48 UTC (rev 22013)
@@ -2,8 +2,11 @@
 	Copyright 1999, Be Incorporated.   All Rights Reserved.
 	This file may be used under the terms of the Be Sample Code License.
 */
+#ifndef GL_OBJECT_H
+#define GL_OBJECT_H
 
 #include "ObjectView.h"
+#include "util.h"
 
 struct point {
 	float x,y,z;
@@ -20,35 +23,35 @@
 	int *pts;
 };
 
-#include "util.h"
 
 class GLObject {
-public:
-float 				rotX,rotY,spinX,spinY,lastRotX,lastRotY;
-float				x,y,z;
-int					color;
-int					solidity;
-bool				changed;
-ObjectView *		objView;
+	public:
+						GLObject(ObjectView *ov);
+		virtual			~GLObject();
 
-					GLObject(ObjectView *ov);
-virtual				~GLObject();
+		virtual void	Draw(bool forID, float IDcolor[]);
+		virtual bool	SpinIt();
+		virtual void	MenuInvoked(BPoint point);
+		virtual void	DoDrawing(bool forID) {};
 
-virtual void		Draw(bool forID, float IDcolor[]);
-virtual bool		SpinIt();
-virtual void		MenuInvoked(BPoint point);
-
-virtual void		DoDrawing(bool forID) {};
+		float 			rotX,rotY,spinX,spinY,lastRotX,lastRotY;
+		float			x,y,z;
+		int				color;
+		int				solidity;
+		bool			changed;
+		ObjectView *	objView;
 };
 
 class TriangleObject : public GLObject {
-public:
-BufferArray<point>		points;
-BufferArray<tri>		triangles;
-BufferArray<quadStrip>	qs;
+	public:
+							TriangleObject(ObjectView *ov, char *filename);
+		virtual				~TriangleObject();
+		
+		virtual void		DoDrawing(bool forID);
 
-					TriangleObject(ObjectView *ov, char *filename);
-virtual				~TriangleObject();
+		BufferArray<point>		points;
+		BufferArray<tri>		triangles;
+		BufferArray<quadStrip>	qs;
+};
 
-virtual void		DoDrawing(bool forID);
-};
+#endif // GL_OBJECT_H

Modified: haiku/trunk/src/apps/glteapot/ObjectView.cpp
===================================================================
--- haiku/trunk/src/apps/glteapot/ObjectView.cpp	2007-08-19 19:59:09 UTC (rev 22012)
+++ haiku/trunk/src/apps/glteapot/ObjectView.cpp	2007-08-19 20:14:48 UTC (rev 22013)
@@ -3,16 +3,17 @@
 	This file may be used under the terms of the Be Sample Code License.
 */
 
+#include "ObjectView.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <InterfaceKit.h>
 #include <FindDirectory.h>
 
-#include "ObjectView.h"
+#include "FPS.h"
+#include "GLObject.h"
 #include "ResScroll.h"
-#include "GLObject.h"
-#include "FPS.h"
 
 #define teapotData "teapot.data"
 char teapotPath[PATH_MAX];
@@ -35,22 +36,26 @@
 
 float *bgColor = black;
 
+
 struct light {
 	float *ambient;
 	float *diffuse;
 	float *specular;
 };
 
+
 light lights[] = {
-	{NULL,NULL,NULL},
-	{dimWhite,white,white},
-	{dimWhite,yellow,yellow},
-	{dimWhite,red,red},
-	{dimWhite,blue,blue},
-	{dimWhite,green,green}
+	{NULL, NULL, NULL},
+	{dimWhite, white, white},
+	{dimWhite, yellow, yellow},
+	{dimWhite, red, red},
+	{dimWhite, blue, blue},
+	{dimWhite, green, green}
 };
 
-long signalEvent(sem_id event)
+
+long
+signalEvent(sem_id event)
 {
 	long c;
 	get_sem_count(event,&c);
@@ -60,7 +65,9 @@
 	return 0;
 };
 
-long setEvent(sem_id event)
+
+long
+setEvent(sem_id event)
 {
 	long c;
 	get_sem_count(event,&c);
@@ -71,7 +78,8 @@
 };
 
 
-long waitEvent(sem_id event)
+long
+waitEvent(sem_id event)
 {
 	acquire_sem(event);
 
@@ -83,7 +91,9 @@
 	return 0;
 };
 
-long simonThread(ObjectView *ov)
+
+long
+simonThread(ObjectView *ov)
 {
     int noPause=0;
     while (acquire_sem_etc(ov->quittingSem,1,B_TIMEOUT,0) == B_NO_ERROR) {
@@ -101,6 +111,7 @@
 	return 0;
 };
 
+
 ObjectView::ObjectView(BRect r, char *name, ulong resizingMode, ulong options)
 	: BGLView(r,name,resizingMode,0,options)
 {
@@ -130,13 +141,16 @@
 	objListLock.Unlock();
 };
 
+
 ObjectView::~ObjectView()
 {
 	delete_sem(quittingSem);
 	delete_sem(drawEvent);
 };
 
-void ObjectView::AttachedToWindow()
+
+void
+ObjectView::AttachedToWindow()
 {
 	float position[] = {0.0, 3.0, 3.0, 0.0};
 	float position1[] = {-3.0, -3.0, 3.0, 0.0};
@@ -204,7 +218,9 @@
 	setEvent(drawEvent);
 };
 
-void ObjectView::DetachedFromWindow()
+
+void
+ObjectView::DetachedFromWindow()
 {
 	BGLView::DetachedFromWindow();
 
@@ -224,7 +240,9 @@
 	while (locks--) Window()->Lock();
 };
 
-void ObjectView::Pulse()
+
+void
+ObjectView::Pulse()
 {
   Window()->Lock();
   BRect p = Parent()->Bounds();
@@ -237,7 +255,9 @@
   Window()->Unlock();
 };
 
-void ObjectView::MessageReceived(BMessage *msg)
+
+void
+ObjectView::MessageReceived(BMessage *msg)
 {
 	BMenuItem *i;
 	bool *b;
@@ -320,7 +340,9 @@
 	};		
 };
 
-int ObjectView::ObjectAtPoint(BPoint p)
+
+int
+ObjectView::ObjectAtPoint(BPoint p)
 {
 	LockGL();
 	glShadeModel(GL_FLAT);
@@ -347,7 +369,9 @@
 	return objNum;
 };
 
-void ObjectView::MouseDown(BPoint p)
+
+void
+ObjectView::MouseDown(BPoint p)
 {
 	BPoint op=p,np=p;
 	BRect bounds = Bounds();
@@ -441,7 +465,9 @@
 	setEvent(drawEvent);
 };
 
-void ObjectView::FrameResized(float w, float h)
+
+void
+ObjectView::FrameResized(float w, float h)
 {
 	LockGL();
 
@@ -481,7 +507,9 @@
 	setEvent(drawEvent);
 }
 
-bool ObjectView::RepositionView()
+
+bool
+ObjectView::RepositionView()
 {
 	if (!(persp != lastPersp) &&
 		!(lastObjectDistance != objectDistance) &&
@@ -516,7 +544,9 @@
 	return true;
 };
 
-void ObjectView::EnforceState()
+
+void
+ObjectView::EnforceState()
 {
 	glShadeModel(gouraud?GL_SMOOTH:GL_FLAT);
 	if (zbuf) glEnable(GL_DEPTH_TEST); else glDisable(GL_DEPTH_TEST);
@@ -542,7 +572,9 @@
 	};
 };
 
-bool ObjectView::SpinIt()
+
+bool
+ObjectView::SpinIt()
 {
 	bool changed = false;
 
@@ -615,7 +647,9 @@
 	return changed;
 };
 
-void ObjectView::DrawFrame(bool noPause)
+
+void
+ObjectView::DrawFrame(bool noPause)
 {
 	LockGL();
 	glClear(GL_COLOR_BUFFER_BIT|(zbuf?GL_DEPTH_BUFFER_BIT:0));

Modified: haiku/trunk/src/apps/glteapot/ObjectView.h
===================================================================
--- haiku/trunk/src/apps/glteapot/ObjectView.h	2007-08-19 19:59:09 UTC (rev 22012)
+++ haiku/trunk/src/apps/glteapot/ObjectView.h	2007-08-19 20:14:48 UTC (rev 22013)
@@ -3,8 +3,8 @@
 	This file may be used under the terms of the Be Sample Code License.
 */
 
-#ifndef ObjectView_h
-#define ObjectView_h
+#ifndef OBJECT_VIEW_H
+#define OBJECT_VIEW_H
 
 #include <GL/glu.h>
 #include <GLView.h>
@@ -33,47 +33,49 @@
 #define HISTSIZE 10
 
 class ResScroll;
+
 class ObjectView : public BGLView {
-public:
-sem_id			drawEvent;
-sem_id			quittingSem;
-thread_id		drawThread;
-ResScroll *		resScroll;
+	public:
+						ObjectView(BRect r, char *name, 
+							ulong resizingMode, ulong options);
+						~ObjectView();
 
-BList			objects;
-BLocker         objListLock;
+		virtual	void	MouseDown(BPoint p);
+		virtual	void	MessageReceived(BMessage *msg);
+		virtual	void	AttachedToWindow();
+		virtual	void	DetachedFromWindow();
+		virtual	void	FrameResized(float width, float height);
+				bool	SpinIt();
+				int		ObjectAtPoint(BPoint p);
+		virtual	void	DrawFrame(bool noPause);
+		virtual	void	Pulse();
+				void	EnforceState();
+				bool	RepositionView();
 
-float           yxRatio,lastYXRatio;
-uint64          lastFrame;
-float           fpsHistory[HISTSIZE];
-int32           histEntries,oldestEntry;
-bool            fps;
-bool			gouraud, lastGouraud;
-bool			zbuf,lastZbuf;
-bool			culling,lastCulling;
-bool			lighting,lastLighting;
-bool			filled,lastFilled;
-bool			persp,lastPersp;
-bool			lastTextured,textured;
-bool			lastFog,fog;
-bool			forceRedraw;
-float			objectDistance,lastObjectDistance;
+		sem_id			drawEvent;
+		sem_id			quittingSem;
+		thread_id		drawThread;
+		ResScroll *		resScroll;
+		
+		BList			objects;
+		BLocker         objListLock;
+		
+		float           yxRatio,lastYXRatio;
+		uint64          lastFrame;
+		float           fpsHistory[HISTSIZE];
+		int32           histEntries,oldestEntry;
+		bool            fps;
+		bool			gouraud, lastGouraud;
+		bool			zbuf,lastZbuf;
+		bool			culling,lastCulling;
+		bool			lighting,lastLighting;
+		bool			filled,lastFilled;
+		bool			persp,lastPersp;
+		bool			lastTextured,textured;
+		bool			lastFog,fog;
+		bool			forceRedraw;
+		float			objectDistance,lastObjectDistance;
 
-				ObjectView(BRect r, char *name, 
-					ulong resizingMode, ulong options);
-				~ObjectView();
-
-virtual	void	MouseDown(BPoint p);
-virtual	void	MessageReceived(BMessage *msg);
-virtual	void	AttachedToWindow();
-virtual	void	DetachedFromWindow();
-virtual	void	FrameResized(float width, float height);
-		bool	SpinIt();
-		int		ObjectAtPoint(BPoint p);
-virtual	void	DrawFrame(bool noPause);
-virtual	void	Pulse();
-		void	EnforceState();
-		bool	RepositionView();
 };
 
-#endif
+#endif // OBJECT_VIEW_H

Modified: haiku/trunk/src/apps/glteapot/ResScroll.h
===================================================================
--- haiku/trunk/src/apps/glteapot/ResScroll.h	2007-08-19 19:59:09 UTC (rev 22012)
+++ haiku/trunk/src/apps/glteapot/ResScroll.h	2007-08-19 20:14:48 UTC (rev 22013)
@@ -3,21 +3,20 @@
 	This file may be used under the terms of the Be Sample Code License.
 */
 
-#ifndef ResScroll_h
-#define ResScroll_h
+#ifndef RESSCROLL_H
+#define RESSCROLL_H
 
 #include <interface/ScrollBar.h>
 
 class ObjectView;
 
 class ResScroll : public BScrollBar {
-public:
-		ObjectView *	objectView;
-		
-						ResScroll(BRect r, const char *name,
-							ObjectView *target, orientation posture);
-virtual	void			ValueChanged(float value);
-
+	public:
+			ObjectView *	objectView;
+			
+							ResScroll(BRect r, const char *name,
+								ObjectView *target, orientation posture);
+			virtual	void	ValueChanged(float value);
 };
 
 #endif

Modified: haiku/trunk/src/apps/glteapot/error.cpp
===================================================================
--- haiku/trunk/src/apps/glteapot/error.cpp	2007-08-19 19:59:09 UTC (rev 22012)
+++ haiku/trunk/src/apps/glteapot/error.cpp	2007-08-19 20:14:48 UTC (rev 22013)
@@ -5,7 +5,8 @@
 
 #include "error.h"
 
-void fatalerror(char *s)
+void
+fatalerror(char *s)
 {
   printf("FATAL ERROR: %s\n",s);
 };

Modified: haiku/trunk/src/apps/glteapot/error.h
===================================================================
--- haiku/trunk/src/apps/glteapot/error.h	2007-08-19 19:59:09 UTC (rev 22012)
+++ haiku/trunk/src/apps/glteapot/error.h	2007-08-19 20:14:48 UTC (rev 22013)
@@ -3,8 +3,8 @@
 	This file may be used under the terms of the Be Sample Code License.
 */
 
-#ifndef error_h
-#define error_h
+#ifndef ERROR_H
+#define ERROR_H
 
 #include <stdio.h>
 
@@ -28,4 +28,4 @@
 
 #endif //DEBUGGING
 
-#endif
+#endif // ERROR_H

Modified: haiku/trunk/src/apps/glteapot/teapot.h
===================================================================
--- haiku/trunk/src/apps/glteapot/teapot.h	2007-08-19 19:59:09 UTC (rev 22012)
+++ haiku/trunk/src/apps/glteapot/teapot.h	2007-08-19 20:14:48 UTC (rev 22013)
@@ -3,7 +3,7 @@
 	This file may be used under the terms of the Be Sample Code License.
 */
 
-#include "GL/gl.h"
+#include <GL/gl.h>
 
 void auxSolidTeapot(GLdouble scale);
 void auxWireTeapot(GLdouble scale);

Modified: haiku/trunk/src/apps/glteapot/teapot_main.cpp
===================================================================
--- haiku/trunk/src/apps/glteapot/teapot_main.cpp	2007-08-19 19:59:09 UTC (rev 22012)
+++ haiku/trunk/src/apps/glteapot/teapot_main.cpp	2007-08-19 20:14:48 UTC (rev 22013)
@@ -3,42 +3,48 @@
 	This file may be used under the terms of the Be Sample Code License.
 */
 
+#include <stdio.h>
 #include <InterfaceKit.h>
-#include <stdio.h>
 #include "ObjectView.h"
 
-class QuitWindow : public BDirectWindow
-{
-public:
-	QuitWindow(BRect r, char *name, window_type wt, ulong something);
-	
-	virtual bool QuitRequested();
-	virtual void DirectConnected( direct_buffer_info *info );
-	ObjectView *bgl;
+class QuitWindow : public BDirectWindow {
+	public:
+		QuitWindow(BRect r, char *name, window_type wt, ulong something);
+		
+		virtual bool QuitRequested();
+		virtual void DirectConnected( direct_buffer_info *info );
 
+		ObjectView *bgl;
 };
 
+
 QuitWindow::QuitWindow(BRect r, char *name, window_type wt, ulong something)
 	: BDirectWindow(r,name,wt,something)
 { 
 }
 
-bool QuitWindow::QuitRequested()
+
+bool
+QuitWindow::QuitRequested()
 {
-printf( "closing \n" );
+	printf("closing \n");
 	bgl->EnableDirectMode( false );
 	be_app->PostMessage(B_QUIT_REQUESTED);
 	return true;
 };
 
-void QuitWindow::DirectConnected( direct_buffer_info *info )
+
+void
+QuitWindow::DirectConnected(direct_buffer_info *info)
 {
-	if( bgl )
+	if (bgl)
 		bgl->DirectConnected( info );	
 	bgl->EnableDirectMode( true );
 }
 
-int main(int argc, char **argv)
+
+int
+main(int argc, char **argv)
 {
 	GLenum type = BGL_RGB | BGL_DEPTH | BGL_DOUBLE;
     //GLenum type = BGL_RGB | BGL_DEPTH | BGL_SINGLE;

Modified: haiku/trunk/src/apps/glteapot/util.h
===================================================================
--- haiku/trunk/src/apps/glteapot/util.h	2007-08-19 19:59:09 UTC (rev 22012)
+++ haiku/trunk/src/apps/glteapot/util.h	2007-08-19 20:14:48 UTC (rev 22013)
@@ -3,15 +3,14 @@
 	This file may be used under the terms of the Be Sample Code License.
 */
 
-#ifndef list_h
-#define list_h
+#ifndef UTIL_H
+#define UTIL_H
 
 #include <memory.h>
 #include "error.h"
 
 template <class contents>
-struct LispNode
-{
+struct LispNode {
   contents *car;
   LispNode *cdr;
 
@@ -31,89 +30,100 @@
 
 
 template <class contents>
-struct LispList
-{
-  LispNode<contents> *first;
+struct LispList {
+	LispNode<contents> *first;
 
 
-  /* -------- List creation --------------- */
-	  /* Create an empty list */
-	  inline LispList()
-	    { first = 0; }
+	/* -------- List creation --------------- */
+	/* Create an empty list */
+	inline LispList()
+	{
+		first = 0;
+	}
 
-	  /* Create a list pointing to the specified node */
-	  inline LispList(LispNode<contents> *_first)
-	    { first = _first; }
+	/* Create a list pointing to the specified node */
+	inline LispList(LispNode<contents> *_first)
+	{
+		first = _first;
+	}
 
-	  /* ?? */
-	  inline LispList(LispList &init)
-	    { first = init.first; }
+	/* ?? */
+	inline LispList(LispList &init)
+	{
+		first = init.first;
+	}
 
-  /* ---------- List queries ------------- */
-	  inline int is_empty()
-	    { return first == 0; }
+	/* ---------- List queries ------------- */
+	inline int is_empty()
+	{
+		return first == 0;
+	}
 
 	/* Determines if a thing is on the list */
-	  inline int is_present(contents *element)
-	    {
-	      for (LispNode<contents> *node = first; node; node = node->cdr)
-		if (node->car == element)
-		  return 1;
-	      return 0;
-	    }
+	inline int is_present(contents *element)
+	{
+		for (LispNode<contents> *node = first; node; node = node->cdr)
+			if (node->car == element)
+			return 1;
+		return 0;
+	}
 
 	/* Returns the length of the list */
-	  inline int count()
-	    {
-	      int n = 0;
-	      for (LispNode<contents> *node = first; node; node = node->cdr)
-		n++;
-	      return n;
-	    }
+	inline int count()
+	{
+		int n = 0;
+		for (LispNode<contents> *node = first; node; node = node->cdr)
+			n++;
+	    return n;
+	}
 
-  /* ----------- Adding "nodes" to the list ------------ */
-	  /* Add a specified node to the head of the list.  */
-	  inline void add_head(LispNode<contents> *new_element)
-	    {
-	      new_element->cdr = first;
-	      first = new_element;
-	    }
+	/* ----------- Adding "nodes" to the list ------------ */
+	/* Add a specified node to the head of the list.  */
+	inline void add_head(LispNode<contents> *new_element)
+	{
+		new_element->cdr = first;
+		first = new_element;
+	}
 
-	  /* Add a specified node anywhere on the list */
-	  inline void add(LispNode<contents> *new_element)
-	    {
-	      add_head (new_element);
-	    }
+	/* Add a specified node anywhere on the list */
+	inline void add(LispNode<contents> *new_element)
+	{
+		add_head (new_element);
+	}
 
 	inline void add_tail(LispNode<contents> *new_element)
 	{
 		LispNode<contents>** pred = &first;
-		while( *pred )
+		while(*pred)
 			pred = &(*pred)->cdr;
 		*pred = new_element;
 		new_element->cdr = 0;
 	}
 
-  /* ----------- Adding "contents" to the list ------------ */
-  /* -----  (Which in my opinion is far more useful) ------ */
-	  /* Create new node pointing to thing, & add to head of list. */
-	  inline void add_head_new(contents *new_element)
-	    {
-	      first = new LispNode<contents>(new_element, first);
-	    }
-	  inline void add_head(contents *new_element)
-	    { add_head_new(new_element); }
+	/* ----------- Adding "contents" to the list ------------ */
+	/* -----  (Which in my opinion is far more useful) ------ */
+	/* Create new node pointing to thing, & add to head of list. */
+	inline void add_head_new(contents *new_element)
+	{
+		first = new LispNode<contents>(new_element, first);
+	}
+	inline void add_head(contents *new_element)
+	{
+		add_head_new(new_element);
+	}
 
-	  /* Create new node pointing to thing, & add to end of list. */
-	  inline void add_tail_new(contents *new_element)
-	    {
-	      LispNode< contents > **pred = &first;
-	      while (*pred)
-		pred = &(*pred)->cdr;
-	      *pred = new LispNode< contents >(new_element);
-	    }
-	  inline void add_tail(contents *new_element)
-	    { add_tail_new(new_element); }
+	/* Create new node pointing to thing, & add to end of list. */
+	inline void add_tail_new(contents *new_element)
+	{
+		LispNode< contents > **pred = &first;
+		while (*pred)
+			pred = &(*pred)->cdr;
+		*pred = new LispNode< contents >(new_element);
+	}
+	inline void add_tail(contents *new_element)
+	{
+		add_tail_new(new_element);
+	}
 
 	  /* Create new node pointing to thing, & add anywhere on list */
 	  inline void add_new(contents *new_element)
@@ -226,156 +236,162 @@
 	    }
 #endif
 
-	  /* Take the first thing off the list */
-	  inline contents *get_head()
-	    {
-	      contents *c = 0;
-	      if(first)
-	      {
-		c = first->car;
-		delete rem_head();
-	      }
-	      return c;
-	    }
-	    
-	  /* Take something off the list */
-	  inline contents *get()
-	    { return(get_head()); }
+	/* Take the first thing off the list */
+	inline contents *get_head()
+	{
+		contents *c = 0;
+		if(first) {
+			c = first->car;
+			delete rem_head();
+		}
+		return c;
+	}
+	
+	/* Take something off the list */
+	inline contents *get()
+	{
+		return(get_head());
+	}
 
-	  /* XXX inline contents *get_tail() { } */
+	/* XXX inline contents *get_tail() { } */
 
-  /* -------- Stack simulation (by j.h.) ------------ */
-	  /* Put a thing onto the head of the list */
-	  inline void push( contents *c )
-	    { put_head( c ); }
+	/* -------- Stack simulation (by j.h.) ------------ */
+	/* Put a thing onto the head of the list */
+	inline void push(contents *c)
+	{
+		put_head(c);
+	}
 
-	  /* Remove a thing from the head of the list */
-	  inline contents *pop()
-	    { return(get_head()); }
+	/* Remove a thing from the head of the list */
+	inline contents *pop()
+	{
+		return(get_head());

[... truncated: 235 lines follow ...]


From mmlr at mlotz.ch  Mon Aug 20 06:12:28 2007
From: mmlr at mlotz.ch (Michael Lotz)
Date: Mon, 20 Aug 2007 06:12:28 +0200
Subject: [Haiku-commits] r22013 - haiku/trunk/src/apps/glteapot
In-Reply-To: <200708192014.l7JKEq8r024772@sheep.berlios.de>
References: <200708192014.l7JKEq8r024772@sheep.berlios.de>
Message-ID: <20070820040946.M11424@mlotz.ch>

> Some style cleanups by Fredrik Ekdahl. Thanks!
> 
> Modified: haiku/trunk/src/apps/glteapot/FPS.cpp

Could the FPS.cpp change be reverted again? I've cleaned this up when doing
the FPS fix recently. I've put in the spaces in that array and think they
should stay.

Regards
Michael



From jackburton at mail.berlios.de  Mon Aug 20 14:07:13 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Mon, 20 Aug 2007 14:07:13 +0200
Subject: [Haiku-commits] r22014 - haiku/trunk/src/apps/glteapot
Message-ID: <200708201207.l7KC7Dpm004952@sheep.berlios.de>

Author: jackburton
Date: 2007-08-20 14:07:13 +0200 (Mon, 20 Aug 2007)
New Revision: 22014
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22014&view=rev

Modified:
   haiku/trunk/src/apps/glteapot/FPS.cpp
Log:
Reverted FPS.cpp to previous version, as Michael's request


Modified: haiku/trunk/src/apps/glteapot/FPS.cpp
===================================================================
--- haiku/trunk/src/apps/glteapot/FPS.cpp	2007-08-19 20:14:48 UTC (rev 22013)
+++ haiku/trunk/src/apps/glteapot/FPS.cpp	2007-08-20 12:07:13 UTC (rev 22014)
@@ -18,20 +18,20 @@
 FPS::drawChar(GLfloat x, GLfloat y, GLint number)
 {
 	static bool numbers[13][7] = {
-		{true, true, true, true, true, true, false},	/* 0 */
-		{false, true, true, false, false, false, false},/* 1 */
-		{true, true, false, true, true, false, true},	/* 2 */
-		{true, true, true, true, false, false, true},	/* 3 */
-		{false, true, true, false, false, true, true},	/* 4 */
-		{true, false, true, true, false, true, true},	/* 5 */
-		{true, false, true, true, true, true, true},	/* 6 */
-		{true, true, true, false, false, false, false},	/* 7 */
-		{true, true, true, true, true, true, true},		/* 8 */
-		{true, true, true, false, false, true, true},	/* 9 */
+		{ true, true, true, true, true, true, false }, 		/* 0 */
+		{ false, true, true, false, false, false, false },	/* 1 */
+		{ true, true, false, true, true, false, true },		/* 2 */
+		{ true, true, true, true, false, false, true },		/* 3 */
+		{ false, true, true, false, false, true, true },	/* 4 */
+		{ true, false, true, true, false, true, true },		/* 5 */
+		{ true, false, true, true, true, true, true },		/* 6 */
+		{ true, true, true, false, false, false, false },	/* 7 */
+		{ true, true, true, true, true, true, true },		/* 8 */
+		{ true, true, true, false, false, true, true },		/* 9 */
 
-		{true, false, false, false, true, true, true},	/* F */
-		{true, true, false, false, true, true, true},	/* P */
-		{true, false, true, true, false, true, true},	/* S */
+		{ true, false, false, false, true, true, true },	/* F */
+		{ true, true, false, false, true, true, true },		/* P */
+		{ true, false, true, true, false, true, true },		/* S */
 	};
 
 	static GLfloat gap = 0.03;



From stefano.ceccherini at gmail.com  Mon Aug 20 14:07:43 2007
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Mon, 20 Aug 2007 14:07:43 +0200
Subject: [Haiku-commits] r22013 - haiku/trunk/src/apps/glteapot
In-Reply-To: <20070820040946.M11424@mlotz.ch>
References: <200708192014.l7JKEq8r024772@sheep.berlios.de>
	<20070820040946.M11424@mlotz.ch>
Message-ID: <894b9700708200507q1f03b5fch8f7ae13a13e872c2@mail.gmail.com>

2007/8/20, Michael Lotz <mmlr at mlotz.ch>:
> > Some style cleanups by Fredrik Ekdahl. Thanks!
> >
> > Modified: haiku/trunk/src/apps/glteapot/FPS.cpp
>
> Could the FPS.cpp change be reverted again? I've cleaned this up when doing
> the FPS fix recently. I've put in the spaces in that array and think they
> should stay.

Done.


From axeld at mail.berlios.de  Mon Aug 20 16:08:52 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 20 Aug 2007 16:08:52 +0200
Subject: [Haiku-commits] r22015 - haiku/trunk/src/kits/storage
Message-ID: <200708201408.l7KE8qCc019122@sheep.berlios.de>

Author: axeld
Date: 2007-08-20 16:08:51 +0200 (Mon, 20 Aug 2007)
New Revision: 22015
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22015&view=rev

Modified:
   haiku/trunk/src/kits/storage/AppFileInfo.cpp
Log:
BAppFileInfo would crash if the resources failed to initialize, but SetInfoLocation()
forced it to use them. Now, it will filter out B_USE_RESOURCES when the resources
are invalid.
Also, _WriteData() and _RemoveData() will now fail if neither source is specified
with B_NO_INIT.


Modified: haiku/trunk/src/kits/storage/AppFileInfo.cpp
===================================================================
--- haiku/trunk/src/kits/storage/AppFileInfo.cpp	2007-08-20 12:07:13 UTC (rev 22014)
+++ haiku/trunk/src/kits/storage/AppFileInfo.cpp	2007-08-20 14:08:51 UTC (rev 22015)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006, Haiku Inc.
+ * Copyright 2002-2007, Haiku Inc.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -72,8 +72,8 @@
 /*!	\brief Creates an uninitialized BAppFileInfo object.
 */
 BAppFileInfo::BAppFileInfo()
-			: fResources(NULL),
-			  fWhere(B_USE_BOTH_LOCATIONS)
+	: fResources(NULL),
+	fWhere(B_USE_BOTH_LOCATIONS)
 {
 }
 
@@ -88,8 +88,8 @@
 	\param file The file the object shall be initialized to.
 */
 BAppFileInfo::BAppFileInfo(BFile *file)
-			: fResources(NULL),
-			  fWhere(B_USE_BOTH_LOCATIONS)
+	: fResources(NULL),
+	fWhere(B_USE_BOTH_LOCATIONS)
 {
 	SetTo(file);
 }
@@ -101,8 +101,7 @@
 */
 BAppFileInfo::~BAppFileInfo()
 {
-	if (fResources)
-		delete fResources;
+	delete fResources;
 }
 
 // SetTo
@@ -1166,6 +1165,10 @@
 void
 BAppFileInfo::SetInfoLocation(info_location location)
 {
+	// if the resources failed to initialize, we must not use them
+	if (fResources == NULL)
+		location = info_location(location & ~B_USE_RESOURCES);
+
 	fWhere = location;
 }
 
@@ -1178,7 +1181,7 @@
 bool
 BAppFileInfo::IsUsingAttributes() const
 {
-	return (fWhere & B_USE_ATTRIBUTES);
+	return (fWhere & B_USE_ATTRIBUTES) != 0;
 }
 
 // IsUsingResources
@@ -1190,7 +1193,7 @@
 bool
 BAppFileInfo::IsUsingResources() const
 {
-	return (fWhere & B_USE_RESOURCES);
+	return (fWhere & B_USE_RESOURCES) != 0;
 }
 
 // FBC
@@ -1384,9 +1387,13 @@
 BAppFileInfo::_WriteData(const char *name, int32 id, type_code type,
 						 const void *buffer, size_t bufferSize, bool findID)
 {
+	if (!IsUsingAttributes() && !IsUsingResources())
+		return B_NO_INIT;
+
 	status_t error = B_OK;
+
 	// write to attribute
-	if (IsUsingAttributes() && error == B_OK) {
+	if (IsUsingAttributes()) {
 		ssize_t written = fNode->WriteAttr(name, type, 0, buffer, bufferSize);
 		if (written < 0)
 			error = written;
@@ -1428,9 +1435,13 @@
 status_t
 BAppFileInfo::_RemoveData(const char *name, type_code type)
 {
+	if (!IsUsingAttributes() && !IsUsingResources())
+		return B_NO_INIT;
+
 	status_t error = B_OK;
+
 	// remove the attribute
-	if (IsUsingAttributes() && error == B_OK) {
+	if (IsUsingAttributes()) {
 		error = fNode->RemoveAttr(name);
 		// It's no error, if there has been no attribute.
 		if (error == B_ENTRY_NOT_FOUND)



From axeld at mail.berlios.de  Mon Aug 20 16:27:12 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 20 Aug 2007 16:27:12 +0200
Subject: [Haiku-commits] r22016 - haiku/trunk/src/system/kernel/vm
Message-ID: <200708201427.l7KERCQE020873@sheep.berlios.de>

Author: axeld
Date: 2007-08-20 16:27:11 +0200 (Mon, 20 Aug 2007)
New Revision: 22016
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22016&view=rev

Modified:
   haiku/trunk/src/system/kernel/vm/vm.cpp
Log:
Fixed bug #1413:
* vm_soft_fault() no longer touches the page source cache in case fault_get_page() failed.
* fault_find_page() now unlocks and releases the cache if reading in a page failed.


Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-20 14:08:51 UTC (rev 22015)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp	2007-08-20 14:27:11 UTC (rev 22016)
@@ -3610,7 +3610,6 @@
 		vm_store *store = cache->store;
 		if (store->ops->has_page != NULL
 			&& store->ops->has_page(store, cacheOffset)) {
-
 			// insert a fresh page and mark it busy -- we're going to read it in
 			page = vm_page_allocate_page(PAGE_STATE_FREE);
 			vm_cache_insert_page(cache, page, cacheOffset);
@@ -3644,13 +3643,14 @@
 				vm_cache_remove_page(cache, page);
 				vm_page_set_state(page, PAGE_STATE_FREE);
 
+				mutex_unlock(&cache->lock);
+				vm_cache_release_ref(cache);
 				return status;
 			}
 
 			// mark the page unbusy again
 			page->state = PAGE_STATE_ACTIVE;
 			busyCondition.Unpublish();
-
 			break;
 		}
 
@@ -4036,12 +4036,13 @@
 			newProtection &= ~(B_WRITE_AREA | B_KERNEL_WRITE_AREA);
 
 		vm_map_page(area, page, address, newProtection);
+
+		mutex_unlock(&pageSource->lock);
+		vm_cache_release_ref(pageSource);
 	}
 
 	atomic_add(&area->no_cache_change, -1);
 
-	mutex_unlock(&pageSource->lock);
-	vm_cache_release_ref(pageSource);
 	if (copiedPageSource)
 		vm_cache_release_ref(copiedPageSource);
 



From mmu_man at mail.berlios.de  Mon Aug 20 17:24:55 2007
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Mon, 20 Aug 2007 17:24:55 +0200
Subject: [Haiku-commits] r22017 - haiku/trunk/src/apps/cdplayer
Message-ID: <200708201524.l7KFOtN2024802@sheep.berlios.de>

Author: mmu_man
Date: 2007-08-20 17:24:54 +0200 (Mon, 20 Aug 2007)
New Revision: 22017
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22017&view=rev

Modified:
   haiku/trunk/src/apps/cdplayer/CDPlayer.h
Log:
Fix dano build


Modified: haiku/trunk/src/apps/cdplayer/CDPlayer.h
===================================================================
--- haiku/trunk/src/apps/cdplayer/CDPlayer.h	2007-08-20 14:27:11 UTC (rev 22016)
+++ haiku/trunk/src/apps/cdplayer/CDPlayer.h	2007-08-20 15:24:54 UTC (rev 22017)
@@ -13,6 +13,7 @@
 #include "VolumeSlider.h"
 
 #include <Application.h>
+#include <Box.h>
 #include <Button.h>
 #include <StringView.h>
 #include <TextControl.h>



From stippi at mail.berlios.de  Mon Aug 20 19:40:49 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Mon, 20 Aug 2007 19:40:49 +0200
Subject: [Haiku-commits] r22018 - haiku/trunk/src/preferences/network
Message-ID: <200708201740.l7KHenpa020763@sheep.berlios.de>

Author: stippi
Date: 2007-08-20 19:40:48 +0200 (Mon, 20 Aug 2007)
New Revision: 22018
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22018&view=rev

Added:
   haiku/trunk/src/preferences/network/NetworkApp.cpp
   haiku/trunk/src/preferences/network/NetworkApp.h
   haiku/trunk/src/preferences/network/NetworkWindow.cpp
   haiku/trunk/src/preferences/network/NetworkWindow.h
Removed:
   haiku/trunk/src/preferences/network/EthernetSettings.cpp
   haiku/trunk/src/preferences/network/EthernetSettings.h
   haiku/trunk/src/preferences/network/EthernetSettingsWindow.cpp
   haiku/trunk/src/preferences/network/EthernetSettingsWindow.h
Modified:
   haiku/trunk/src/preferences/network/EthernetSettingsView.cpp
   haiku/trunk/src/preferences/network/EthernetSettingsView.h
   haiku/trunk/src/preferences/network/Jamfile
   haiku/trunk/src/preferences/network/settings.cpp
Log:
patch by Andre Garzia:
* reading/writing interface configuration data is now working properly
* at boot, net_server will overwrite the configuration with settings retrieved
  via DHCP, though
* refactoring/renaming

changes by myself:
* fixed warnings and cleaned up in Settings::ReadConfiguration(), when the
  nameservers are parsed
* fixed warning in EthernetSettingsView::_SaveAdaptersConfiguration(), changed
  the loop to do without "isOpen", I think it was broken in two ways before:
  - it would use the fp pointer after closing the file (isOpen was not
  maintained), and if that would have worked, it would have overwritten the
  interface configuration saved in an earlier loop iteration, now it should
  write all interfaces that are not set to autoconfigure


Deleted: haiku/trunk/src/preferences/network/EthernetSettings.cpp

Deleted: haiku/trunk/src/preferences/network/EthernetSettings.h

Modified: haiku/trunk/src/preferences/network/EthernetSettingsView.cpp
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsView.cpp	2007-08-20 15:24:54 UTC (rev 22017)
+++ haiku/trunk/src/preferences/network/EthernetSettingsView.cpp	2007-08-20 17:40:48 UTC (rev 22018)
@@ -115,7 +115,6 @@
 void
 EthernetSettingsView::AttachedToWindow()
 {
-	fOKButton->SetTarget(this);
 	fApplyButton->SetTarget(this);
 	fDeviceMenuField->Menu()->SetTargetForItems(this); 
 	
@@ -167,6 +166,8 @@
 	modemenu->AddItem(staticitem);
 	BMenuItem* dhcpitem = new BMenuItem("DHCP", NULL);
 	modemenu->AddItem(dhcpitem);
+	BMenuItem* offitem = new BMenuItem("Disconnected", NULL);
+	modemenu->AddItem(offitem);
 	
 	fDeviceMenuField = new BMenuField(frame, "networkcards", "Adapter:", devmenu);
 	fDeviceMenuField->SetDivider(
@@ -233,10 +234,6 @@
 		fSecondaryDNSTextControl->Frame().LeftBottom() + BPoint(0,10));
 	AddChild(fApplyButton);
 	
-	fOKButton = new BButton(frame, "ok", "OK", new BMessage(kMsgOK));
-	fOKButton->ResizeToPreferred();
-	fOKButton->MoveTo(fApplyButton->Frame().RightTop() + BPoint(10,0));
-	AddChild(fOKButton);
 	
 }
 
@@ -249,6 +246,16 @@
 EthernetSettingsView::_ShowConfiguration(BMessage* message)
 {
 	
+
+			
+	// Clear the inputs.
+	fIPTextControl->SetText("");
+	fGatewayTextControl->SetText("");
+	fNetMaskTextControl->SetText("");
+	fPrimaryDNSTextControl->SetText("");
+	fSecondaryDNSTextControl->SetText("");
+	
+	
  	const char* name;
 	if (message->FindString("interface", &name) != B_OK)
 		return;
@@ -283,33 +290,21 @@
 				fPrimaryDNSTextControl->SetText(
 						fSettings.ItemAt(i)->fNameservers.ItemAt(0)->String());
 			}
-		} else {
-			return;
-		}
-	}
-	
-	
-	
-	
-	
-
-	
-
-	
+		} 
+	}	
 }
 
 void
 EthernetSettingsView::_ApplyControlsToConfiguration()
 {
+			
 	if (strcmp(fTypeMenuField->Menu()->FindMarked()->Label(), "Static") == 0) {
-		printf("we?re in!\n");
 		int i;
 		for (i = 0; i < fSettings.CountItems(); i++) {
 		
 
 			if (strcmp(fSettings.ItemAt(i)->
 				GetName(), fDeviceMenuField->Menu()->FindMarked()->Label()) == 0) {
-					printf("changing settings for %s", fSettings.ItemAt(i)->GetName());
 					fSettings.ItemAt(i)->
 						SetIP(fIPTextControl->Text());
 					fSettings.ItemAt(i)->
@@ -348,8 +343,11 @@
 			// loop all the adapters.
 			int j;
 			for (j = 0; j < fSettings.ItemAt(i)->fNameservers.CountItems(); j++) {
-				fprintf(fp, "nameserver\t%s\n", 
-					fSettings.ItemAt(i)->fNameservers.ItemAt(j)->String());
+				if (strcmp(
+					fSettings.ItemAt(i)->fNameservers.ItemAt(j)->String(), "") != 0) {
+						fprintf(fp, "nameserver\t%s\n", 
+							fSettings.ItemAt(i)->fNameservers.ItemAt(j)->String());
+					}
 				}
 			}
 		fclose(fp);	
@@ -363,37 +361,39 @@
 	BPath path;
 	status_t status = _GetPath("interfaces", path);
 	if (status < B_OK)
-		return;	
+		return;
 		
-	FILE* fp;
-	bool isOpen = false;
-	int i;
-	for (i = 0; i < fSettings.CountItems(); i++) {
-			// loop all the adapters.
-		if (fSettings.ItemAt(i)->GetAutoConfigure() == false) {
-			if (isOpen == false) {
-				if ((fp = fopen(path.Path(), "w")) == NULL)
-					return;
-				isOpen = true;
+	FILE* fp = NULL;
+	// loop over all adapters. open the settings file only once,
+	// append the settins of each non-autoconfiguring adapter
+	for (int i = 0; i < fSettings.CountItems(); i++) {
+		if (fSettings.ItemAt(i)->GetAutoConfigure())
+			continue;
+
+		if (fp == NULL) {
+			fp = fopen(path.Path(), "w");
+			if (fp == NULL) {
+				fprintf(stderr, "failed to open file %s to write "
+					"configuration: %s\n", path.Path(), strerror(errno));
+				return;
 			}
-			fprintf(fp, 
-				"device %s {\n\t\taddress {\n", fSettings.ItemAt(i)->GetName());
-			fprintf(fp, "\t\t\tfamily\tinet\n");
-			fprintf(fp, "\t\t\taddress\t%s\n", 
-				fSettings.ItemAt(i)->GetIP());
-			fprintf(fp, "\t\t\tgateway\t%s\n", 
-				fSettings.ItemAt(i)->GetGateway());
-			fprintf(fp, "\t\t\tmask\t%s\n", 
-				fSettings.ItemAt(i)->GetNetmask());
-			fprintf(fp, "\t\t}\n}\n\n");
-		
-		
-		}	
-		if (isOpen) {
-			printf("%s saved.\n", path.Path());
-			fclose(fp);
-		}	
+		}
+
+		fprintf(fp, "interface %s {\n\t\taddress {\n",
+			fSettings.ItemAt(i)->GetName());
+		fprintf(fp, "\t\t\tfamily\tinet\n");
+		fprintf(fp, "\t\t\taddress\t%s\n", 
+			fSettings.ItemAt(i)->GetIP());
+		fprintf(fp, "\t\t\tgateway\t%s\n", 
+			fSettings.ItemAt(i)->GetGateway());
+		fprintf(fp, "\t\t\tmask\t%s\n", 
+			fSettings.ItemAt(i)->GetNetmask());
+		fprintf(fp, "\t\t}\n}\n\n");
 	}
+	if (fp) {
+		printf("%s saved.\n", path.Path());
+		fclose(fp);
+	}	
 }
 
 status_t

Modified: haiku/trunk/src/preferences/network/EthernetSettingsView.h
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsView.h	2007-08-20 15:24:54 UTC (rev 22017)
+++ haiku/trunk/src/preferences/network/EthernetSettingsView.h	2007-08-20 17:40:48 UTC (rev 22018)
@@ -21,7 +21,6 @@
 
 static const uint32 kMsgApply = 'aply';
 static const uint32 kMsgClose = 'clse';
-static const uint32 kMsgOK = 'okok';
 static const uint32 kMsgField = 'fild';
 static const uint32 kMsgInfo = 'info';
 
@@ -40,7 +39,6 @@
 		
 		BButton* fCloseButton;
 		BButton* fApplyButton;
-		BButton* fOKButton;
 		BMenuField* fDeviceMenuField;
 		BMenuField* fTypeMenuField;
 		BTextControl* fIPTextControl;

Deleted: haiku/trunk/src/preferences/network/EthernetSettingsWindow.cpp

Deleted: haiku/trunk/src/preferences/network/EthernetSettingsWindow.h

Modified: haiku/trunk/src/preferences/network/Jamfile
===================================================================
--- haiku/trunk/src/preferences/network/Jamfile	2007-08-20 15:24:54 UTC (rev 22017)
+++ haiku/trunk/src/preferences/network/Jamfile	2007-08-20 17:40:48 UTC (rev 22018)
@@ -5,10 +5,10 @@
 UsePrivateHeaders shared ;
 
 Preference Network :
-	EthernetSettingsWindow.cpp
+	NetworkApp.cpp
+	NetworkWindow.cpp
+	EthernetSettingsView.cpp
 	settings.cpp
-	EthernetSettingsView.cpp
-	EthernetSettings.cpp
 	: be root $(HAIKU_NETWORK_LIBS)
 	;
 

Copied: haiku/trunk/src/preferences/network/NetworkApp.cpp (from rev 22000, haiku/trunk/src/preferences/network/EthernetSettings.cpp)
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettings.cpp	2007-08-17 11:17:29 UTC (rev 22000)
+++ haiku/trunk/src/preferences/network/NetworkApp.cpp	2007-08-20 17:40:48 UTC (rev 22018)
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2004-2007 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Author:
+ *		Andre Alves Garzia, andre at andregarzia.com
+ * With code from:
+ *		Axel D?rfler
+ *		Hugo Santos
+ */
+
+#include "NetworkApp.h"
+#include "NetworkWindow.h"
+
+NetworkApp::NetworkApp()
+	: BApplication("application/x-vnd.Haiku-Network")
+{
+}
+
+NetworkApp::~NetworkApp()
+{
+}
+
+void
+NetworkApp::ReadyToRun()
+{
+	fEthWindow = new NetworkWindow();
+	fEthWindow->Show();
+}
+
+int
+main(int argc, char** argv)
+{
+	NetworkApp app;
+	app.Run();
+	
+	return 0;
+}

Copied: haiku/trunk/src/preferences/network/NetworkApp.h (from rev 22000, haiku/trunk/src/preferences/network/EthernetSettings.h)
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettings.h	2007-08-17 11:17:29 UTC (rev 22000)
+++ haiku/trunk/src/preferences/network/NetworkApp.h	2007-08-20 17:40:48 UTC (rev 22018)
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2004-2007 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Author:
+ *		Andre Alves Garzia, andre at andregarzia.com
+ * With code from:
+ *		Axel Dorfler
+ *		Hugo Santos
+ */
+
+#ifndef NETWORK_APP_H
+#define NETWORK_APP_H
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <Application.h>
+
+#include "NetworkWindow.h"
+
+class NetworkApp : public BApplication {
+	public:
+		NetworkApp();
+		virtual ~NetworkApp();
+		
+		virtual void ReadyToRun();
+	private:
+		NetworkWindow	*fEthWindow;
+};
+
+
+#endif /* NETWORK_APP_H */

Copied: haiku/trunk/src/preferences/network/NetworkWindow.cpp (from rev 22000, haiku/trunk/src/preferences/network/EthernetSettingsWindow.cpp)
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsWindow.cpp	2007-08-17 11:17:29 UTC (rev 22000)
+++ haiku/trunk/src/preferences/network/NetworkWindow.cpp	2007-08-20 17:40:48 UTC (rev 22018)
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2004-2007 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Author:
+ *		Andre Alves Garzia, andre at andregarzia.com
+ * With code from:
+ *		Axel Dorfler
+ *		Hugo Santos
+ */
+
+#include <Application.h>
+
+#include "NetworkWindow.h"
+#include "EthernetSettingsView.h"
+
+
+NetworkWindow::NetworkWindow()
+: BWindow(BRect(50, 50, 269, 302), "Network", 
+B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS
+| B_NOT_ZOOMABLE)
+{
+			
+	fEthView = new EthernetSettingsView(Bounds());
+			
+	AddChild(fEthView);
+			
+}
+	
+
+void
+NetworkWindow::MessageReceived(BMessage* message)
+{
+	switch (message->what) {
+		case kMsgInfo:
+		fEthView->MessageReceived(message);
+		break;
+	default:
+		BWindow::MessageReceived(message);
+	}
+
+}
+
+NetworkWindow::~NetworkWindow()
+{
+}
+
+
+bool
+NetworkWindow::QuitRequested()
+{
+	be_app->PostMessage(B_QUIT_REQUESTED);
+	return true;
+}

Copied: haiku/trunk/src/preferences/network/NetworkWindow.h (from rev 22000, haiku/trunk/src/preferences/network/EthernetSettingsWindow.h)
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsWindow.h	2007-08-17 11:17:29 UTC (rev 22000)
+++ haiku/trunk/src/preferences/network/NetworkWindow.h	2007-08-20 17:40:48 UTC (rev 22018)
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2004-2007 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Author:
+ *		Andre Alves Garzia, andre at andregarzia.com
+ * With code from:
+ *		Axel Dorfler
+ *		Hugo Santos
+ */
+#ifndef NETWORK_WINDOW_H
+#define NETWORK_WINDOW_H
+
+#include <Window.h>
+#include "EthernetSettingsView.h"
+
+class NetworkWindow : public BWindow {
+	public:
+		NetworkWindow();
+		virtual ~NetworkWindow();
+		virtual bool QuitRequested();
+		virtual void MessageReceived(BMessage* mesage);
+
+		private:
+			EthernetSettingsView *fEthView;
+			
+};
+
+
+#endif /* NETWORK_WINDOW_H */

Modified: haiku/trunk/src/preferences/network/settings.cpp
===================================================================
--- haiku/trunk/src/preferences/network/settings.cpp	2007-08-20 15:24:54 UTC (rev 22017)
+++ haiku/trunk/src/preferences/network/settings.cpp	2007-08-20 17:40:48 UTC (rev 22018)
@@ -60,7 +60,7 @@
 
 
 void
-Settings::ReadConfiguration() 
+Settings::ReadConfiguration()
 {
 	
 	ifreq request;
@@ -172,37 +172,39 @@
 	 line[sizeof(name) - 1] == '\t'))
 
 		
+	register FILE *fp = fopen("/etc/resolv.conf", "r");
+	if (fp == NULL) {
+		fprintf(stderr, "failed to open '/etc/resolv.conf' to "
+			"read nameservers: %s\n", strerror(errno));
+		return;
+	}
+
 	int nserv = 0;
 	char buf[1024];
-	register FILE *fp;
-	register char *cp, **pp;
-	register int n;
+	register char *cp; //, **pp;
+//	register int n;
 	int MAXNS = 2;
 	
-	if ((fp = fopen("/etc/resolv.conf", "r")) != NULL) {
-	    /* read the config file */
-	    while (fgets(buf, sizeof(buf), fp) != NULL) {
-		/* skip comments */
+	// read the config file
+	while (fgets(buf, sizeof(buf), fp) != NULL) {
+		// skip comments
 		if (*buf == ';' || *buf == '#')
 			continue;
-			
-	    /* read nameservers to query */
+
+		// read nameservers to query
 		if (MATCH(buf, "nameserver") && nserv < MAXNS) {
-		    char sbuf[2];
-		    
-
-		    cp = buf + sizeof("nameserver") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			cp++;
-		    cp[strcspn(cp, ";# \t\n")] = '\0';
-		    if ((*cp != '\0') && (*cp != '\n')) {
+//			char sbuf[2];
+			cp = buf + sizeof("nameserver") - 1;
+			while (*cp == ' ' || *cp == '\t')
+				cp++;
+			cp[strcspn(cp, ";# \t\n")] = '\0';
+			if ((*cp != '\0') && (*cp != '\n')) {
 				fNameservers.AddItem(new BString(cp));
-			    nserv++;
-		    }
+				nserv++;
+			}
 		}
-		    continue; 
-		}
+		continue; 
+	}
+
 	fclose(fp);
-	
-	}
 }



From stippi at mail.berlios.de  Tue Aug 21 00:23:18 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Tue, 21 Aug 2007 00:23:18 +0200
Subject: [Haiku-commits] r22019 - haiku/trunk/src/apps/cortex/RouteApp
Message-ID: <200708202223.l7KMNIaN014494@sheep.berlios.de>

Author: stippi
Date: 2007-08-21 00:23:18 +0200 (Tue, 21 Aug 2007)
New Revision: 22019
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22019&view=rev

Modified:
   haiku/trunk/src/apps/cortex/RouteApp/StatusView.cpp
Log:
* fixed broken invalidation on resizing the status view


Modified: haiku/trunk/src/apps/cortex/RouteApp/StatusView.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/RouteApp/StatusView.cpp	2007-08-20 17:40:48 UTC (rev 22018)
+++ haiku/trunk/src/apps/cortex/RouteApp/StatusView.cpp	2007-08-20 22:23:18 UTC (rev 22019)
@@ -236,7 +236,9 @@
 		}
 		ResizeBy(x, 0.0);
 		BRect r(Bounds());
-		r.left = r.right - 10.0;
+		r.left = r.right - 5.0;
+		if (x > 0)
+			r.left -= x;
 		m_dirty = true;
 		Invalidate(r);
 		if (m_scrollBar) {



From axeld at mail.berlios.de  Tue Aug 21 00:46:36 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 21 Aug 2007 00:46:36 +0200
Subject: [Haiku-commits] r22020 - in haiku/trunk/src/tests/servers/app: .
	no_pointer_history
Message-ID: <200708202246.l7KMkaS7006810@sheep.berlios.de>

Author: axeld
Date: 2007-08-21 00:46:34 +0200 (Tue, 21 Aug 2007)
New Revision: 22020
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22020&view=rev

Added:
   haiku/trunk/src/tests/servers/app/no_pointer_history/
   haiku/trunk/src/tests/servers/app/no_pointer_history/Jamfile
   haiku/trunk/src/tests/servers/app/no_pointer_history/NoPointerHistory.cpp
Modified:
   haiku/trunk/src/tests/servers/app/Jamfile
Log:
Imported B_NO_POINTER_HISTORY test app from bug #1415, applied our coding
style, cleaned it up, and made it a bit more evident.


Modified: haiku/trunk/src/tests/servers/app/Jamfile
===================================================================
--- haiku/trunk/src/tests/servers/app/Jamfile	2007-08-20 22:23:18 UTC (rev 22019)
+++ haiku/trunk/src/tests/servers/app/Jamfile	2007-08-20 22:46:34 UTC (rev 22020)
@@ -167,11 +167,12 @@
 SubInclude HAIKU_TOP src tests servers app event_mask ;
 SubInclude HAIKU_TOP src tests servers app following ;
 SubInclude HAIKU_TOP src tests servers app look_and_feel ;
+SubInclude HAIKU_TOP src tests servers app no_pointer_history ;
 SubInclude HAIKU_TOP src tests servers app painter ;
 SubInclude HAIKU_TOP src tests servers app playground ;
+SubInclude HAIKU_TOP src tests servers app regularapps ;
 SubInclude HAIKU_TOP src tests servers app resize_limits ;
 SubInclude HAIKU_TOP src tests servers app scrolling ;
 SubInclude HAIKU_TOP src tests servers app stress_test ;
 SubInclude HAIKU_TOP src tests servers app textview ;
-SubInclude HAIKU_TOP src tests servers app regularapps ;
 SubInclude HAIKU_TOP src tests servers app view_state ;

Added: haiku/trunk/src/tests/servers/app/no_pointer_history/Jamfile
===================================================================
--- haiku/trunk/src/tests/servers/app/no_pointer_history/Jamfile	2007-08-20 22:23:18 UTC (rev 22019)
+++ haiku/trunk/src/tests/servers/app/no_pointer_history/Jamfile	2007-08-20 22:46:34 UTC (rev 22020)
@@ -0,0 +1,18 @@
+SubDir HAIKU_TOP src tests servers app no_pointer_history ;
+
+SetSubDirSupportedPlatformsBeOSCompatible ;
+AddSubDirSupportedPlatforms libbe_test ;
+
+UseHeaders [ FDirName os app ] ;
+UseHeaders [ FDirName os interface ] ;
+
+Application NoPointerHistory :
+	NoPointerHistory.cpp
+	: be $(TARGET_LIBSTDC++)
+;
+
+if $(TARGET_PLATFORM) = libbe_test {
+	HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : NoPointerHistory
+		: tests!apps ;
+}
+

Added: haiku/trunk/src/tests/servers/app/no_pointer_history/NoPointerHistory.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/no_pointer_history/NoPointerHistory.cpp	2007-08-20 22:23:18 UTC (rev 22019)
+++ haiku/trunk/src/tests/servers/app/no_pointer_history/NoPointerHistory.cpp	2007-08-20 22:46:34 UTC (rev 22020)
@@ -0,0 +1,71 @@
+
+#include <Application.h>
+#include <View.h>
+#include <Window.h>
+
+
+class MouseView : public BView {
+public:
+	MouseView(BRect frame, bool noHistory);
+	~MouseView();
+
+	virtual void AttachedToWindow();
+	virtual void MouseMoved(BPoint point, uint32 transit,
+		const BMessage *message);
+
+private:
+	bool	fNoHistory;
+};
+
+
+MouseView::MouseView(BRect frame, bool noHistory)
+	: BView(frame, "MouseView", B_FOLLOW_ALL, B_WILL_DRAW),
+	fNoHistory(noHistory)
+{
+	SetViewColor(255, 255, 200);
+	if (noHistory)
+		SetHighColor(200, 0, 0);
+	else
+		SetHighColor(0, 200, 0);
+}
+
+
+MouseView::~MouseView()
+{
+}
+
+
+void
+MouseView::AttachedToWindow()
+{
+	if (fNoHistory)
+		SetEventMask(0, B_NO_POINTER_HISTORY);
+}
+
+
+void
+MouseView::MouseMoved(BPoint point, uint32 transit, const BMessage *message)
+{
+	FillRect(BRect(point - BPoint(1, 1), point + BPoint(1, 1)));
+	snooze(25000);
+}
+
+
+//	#pragma mark -
+
+
+int
+main(int argc, char** argv)
+{
+	BApplication app("application/x-vnd.Simon-NoPointerHistory");
+
+	BWindow* window = new BWindow(BRect(100, 100, 700, 400), "Window",
+		B_TITLED_WINDOW, B_QUIT_ON_WINDOW_CLOSE);
+	window->AddChild(new MouseView(BRect(10, 10, 295, 290), true));
+	window->AddChild(new MouseView(BRect(305, 10, 590, 290), false));
+	window->Show();
+
+	app.Run();
+	return 0;
+}
+



From axeld at mail.berlios.de  Tue Aug 21 00:51:57 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 21 Aug 2007 00:51:57 +0200
Subject: [Haiku-commits] r22021 - haiku/trunk/src/kits/interface
Message-ID: <200708202251.l7KMpvNL015467@sheep.berlios.de>

Author: axeld
Date: 2007-08-21 00:51:46 +0200 (Tue, 21 Aug 2007)
New Revision: 22021
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22021&view=rev

Modified:
   haiku/trunk/src/kits/interface/Window.cpp
Log:
The server is too fast sending the messages; we now filter out old mouse events
client side in case B_NO_POINTER_HISTORY is set.
This fixes bug #1415.


Modified: haiku/trunk/src/kits/interface/Window.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Window.cpp	2007-08-20 22:46:34 UTC (rev 22020)
+++ haiku/trunk/src/kits/interface/Window.cpp	2007-08-20 22:51:46 UTC (rev 22021)
@@ -1042,6 +1042,22 @@
 		case B_MOUSE_MOVED:
 		{
 			if (BView *view = dynamic_cast<BView *>(target)) {
+				if (view->fEventOptions & B_NO_POINTER_HISTORY) {
+					// filter out older mouse moved messages in the queue
+					_DequeueAll();
+					BMessageQueue *queue = MessageQueue();
+					queue->Lock();
+
+					BMessage *moved;
+					for (int32 i = 0; (moved = queue->FindMessage(i)) != NULL; i++) {
+						if (moved != msg && moved->what == B_MOUSE_MOVED) {
+							queue->Unlock();
+							return;
+						}
+					}
+					queue->Unlock();
+				}
+
 				BPoint where;
 				uint32 buttons;
 				uint32 transit;



From axeld at mail.berlios.de  Tue Aug 21 01:24:34 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 21 Aug 2007 01:24:34 +0200
Subject: [Haiku-commits] r22022 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200708202324.l7KNOYUX023370@sheep.berlios.de>

Author: axeld
Date: 2007-08-21 01:24:26 +0200 (Tue, 21 Aug 2007)
New Revision: 22022
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22022&view=rev

Modified:
   haiku/trunk/headers/os/interface/View.h
   haiku/trunk/src/kits/interface/View.cpp
   haiku/trunk/src/kits/interface/Window.cpp
Log:
The client-side implementation of B_NO_POINTER_HISTORY did only work for SetEventMask(),
but not for SetMouseEventMask(). We now track the value of that mask in a dedicated
member variable.


Modified: haiku/trunk/headers/os/interface/View.h
===================================================================
--- haiku/trunk/headers/os/interface/View.h	2007-08-20 22:51:46 UTC (rev 22021)
+++ haiku/trunk/headers/os/interface/View.h	2007-08-20 23:24:26 UTC (rev 22022)
@@ -654,10 +654,11 @@
 			BShelf*			fShelf;
 			uint32			fEventMask;
 			uint32			fEventOptions;
+			uint32			fMouseEventOptions;
 
 			LayoutData*		fLayoutData;
 
-			uint32			_reserved[8];
+			uint32			_reserved[7];
 };
 
 

Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2007-08-20 22:51:46 UTC (rev 22021)
+++ haiku/trunk/src/kits/interface/View.cpp	2007-08-20 23:24:26 UTC (rev 22022)
@@ -318,7 +318,6 @@
 
 
 struct BView::LayoutData {
-
 	LayoutData()
 		: fMinSize(),
 		  fMaxSize(),
@@ -1104,8 +1103,7 @@
 }
 
 
-//	#pragma mark -
-// Hook Functions
+//	#pragma mark - Hook Functions
 
 
 void
@@ -1267,8 +1265,7 @@
 }
 
 
-//	#pragma mark -
-//	Input Functions
+//	#pragma mark - Input Functions
 
 
 void
@@ -1619,10 +1616,11 @@
 		&& fOwner->CurrentMessage() != NULL
 		&& fOwner->CurrentMessage()->what == B_MOUSE_DOWN) {
 		check_lock();
+		fMouseEventOptions = options;
+
 		fOwner->fLink->StartMessage(AS_LAYER_SET_MOUSE_EVENT_MASK);
 		fOwner->fLink->Attach<uint32>(mask);
 		fOwner->fLink->Attach<uint32>(options);
-
 		return B_OK;
 	}
 
@@ -1630,8 +1628,7 @@
 }
 
 
-//	#pragma mark -
-//	Graphic State Functions
+//	#pragma mark - Graphic State Functions
 
 
 void
@@ -3361,8 +3358,7 @@
 }
 
 
-//	#pragma mark -
-//	View Hierarchy Functions
+//	#pragma mark - View Hierarchy Functions
 
 
 void
@@ -3644,8 +3640,7 @@
 }
 
 
-//	#pragma mark -
-//	Inherited Methods (from BHandler)
+//	#pragma mark - Inherited Methods (from BHandler)
 
 
 status_t
@@ -4172,8 +4167,7 @@
 }
 
 
-//	#pragma mark -
-//	Private Functions
+//	#pragma mark - Private Functions
 
 
 void
@@ -4219,6 +4213,7 @@
 
 	fEventMask = 0;
 	fEventOptions = 0;
+	fMouseEventOptions = 0;
 
 	fLayoutData = new LayoutData;
 }

Modified: haiku/trunk/src/kits/interface/Window.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Window.cpp	2007-08-20 22:51:46 UTC (rev 22021)
+++ haiku/trunk/src/kits/interface/Window.cpp	2007-08-20 23:24:26 UTC (rev 22022)
@@ -1032,6 +1032,7 @@
 			if (BView *view = dynamic_cast<BView *>(target)) {
 				BPoint where;
 				msg->FindPoint("be:view_where", &where);
+				view->fMouseEventOptions = 0;
 				view->MouseUp(where);
 			} else
 				target->MessageReceived(msg);
@@ -1042,7 +1043,8 @@
 		case B_MOUSE_MOVED:
 		{
 			if (BView *view = dynamic_cast<BView *>(target)) {
-				if (view->fEventOptions & B_NO_POINTER_HISTORY) {
+				if (((view->fEventOptions | view->fMouseEventOptions)
+						& B_NO_POINTER_HISTORY) != 0) {
 					// filter out older mouse moved messages in the queue
 					_DequeueAll();
 					BMessageQueue *queue = MessageQueue();



From axeld at mail.berlios.de  Tue Aug 21 01:34:35 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 21 Aug 2007 01:34:35 +0200
Subject: [Haiku-commits] r22023 -
	haiku/trunk/src/add-ons/kernel/file_systems/cdda
Message-ID: <200708202334.l7KNYZ0x005492@sheep.berlios.de>

Author: axeld
Date: 2007-08-21 01:34:34 +0200 (Tue, 21 Aug 2007)
New Revision: 22023
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22023&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp
Log:
Data tracks are now filtered out. This should fix bug #1345 - but I did not yet test it.


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	2007-08-20 23:24:26 UTC (rev 22022)
+++ haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp	2007-08-20 23:34:34 UTC (rev 22023)
@@ -444,6 +444,27 @@
 }
 
 
+bool
+is_data_track(const scsi_toc_track& track)
+{
+	return (track.control & 4) != 0;
+}
+
+
+uint32
+count_audio_tracks(scsi_toc_toc* toc)
+{
+	uint32 lastTrack = toc->last_track + 1 - toc->first_track;
+	uint32 count = 0;
+	for (uint32 i = 0; i < lastTrack; i++) {
+		if (!is_data_track(toc->tracks[i]))
+			count++;
+	}
+
+	return count;
+}
+
+
 //	#pragma mark - Volume class
 
 
@@ -520,6 +541,11 @@
 		return B_NO_MEMORY;
 
 	status_t status = read_table_of_contents(fDevice, toc, 1024);
+
+	// there has to be at least one audio track
+	if (status == B_OK && count_audio_tracks(toc) == 0)
+		status = B_BAD_TYPE;
+
 	if (status < B_OK) {
 		free(toc);
 		return status;
@@ -558,6 +584,11 @@
 			+ next.second * kFramesPerSecond + next.frame
 			- startFrame;
 
+		totalFrames += frames;
+
+		if (is_data_track(toc->tracks[i]))
+			continue;
+
 		if (text.titles[i] != NULL) {
 			if (text.artists[i] != NULL) {
 				snprintf(title, sizeof(title), "%02ld. %s - %s.wav", track,
@@ -577,8 +608,6 @@
 				title[j] = ' ';
 		}
 
-		totalFrames += frames;
-
 		Inode *inode = _CreateNode(fRootNode, title, startFrame, frames,
 			S_IFREG | 0444);
 		if (inode == NULL)
@@ -1218,6 +1247,11 @@
 		return B_NO_MEMORY;
 
 	status_t status = read_table_of_contents(fd, toc, 1024);
+
+	// there has to be at least a single audio track
+	if (status == B_OK && count_audio_tracks(toc) == 0)
+		status = B_BAD_TYPE;
+
 	if (status < B_OK) {
 		free(toc);
 		return status;



From axeld at mail.berlios.de  Tue Aug 21 02:18:36 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 21 Aug 2007 02:18:36 +0200
Subject: [Haiku-commits] r22024 -
	haiku/trunk/src/tests/servers/app/no_pointer_history
Message-ID: <200708210018.l7L0Ia7n008960@sheep.berlios.de>

Author: axeld
Date: 2007-08-21 02:18:32 +0200 (Tue, 21 Aug 2007)
New Revision: 22024
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22024&view=rev

Modified:
   haiku/trunk/src/tests/servers/app/no_pointer_history/NoPointerHistory.cpp
Log:
Added a test case for SetMouseEventMask() as well.


Modified: haiku/trunk/src/tests/servers/app/no_pointer_history/NoPointerHistory.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/no_pointer_history/NoPointerHistory.cpp	2007-08-20 23:34:34 UTC (rev 22023)
+++ haiku/trunk/src/tests/servers/app/no_pointer_history/NoPointerHistory.cpp	2007-08-21 00:18:32 UTC (rev 22024)
@@ -12,6 +12,8 @@
 	virtual void AttachedToWindow();
 	virtual void MouseMoved(BPoint point, uint32 transit,
 		const BMessage *message);
+	virtual void MouseDown(BPoint point);
+	virtual void MouseUp(BPoint point);
 
 private:
 	bool	fNoHistory;
@@ -44,6 +46,24 @@
 
 
 void
+MouseView::MouseDown(BPoint point)
+{
+	SetMouseEventMask(0, B_NO_POINTER_HISTORY);
+	SetHighColor(0, 0, 200);
+}
+
+
+void
+MouseView::MouseUp(BPoint point)
+{
+	if (fNoHistory)
+		SetHighColor(200, 0, 0);
+	else
+		SetHighColor(0, 200, 0);
+}
+
+
+void
 MouseView::MouseMoved(BPoint point, uint32 transit, const BMessage *message)
 {
 	FillRect(BRect(point - BPoint(1, 1), point + BPoint(1, 1)));



From axeld at mail.berlios.de  Tue Aug 21 03:43:19 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 21 Aug 2007 03:43:19 +0200
Subject: [Haiku-commits] r22025 - haiku/trunk/src/kits/tracker
Message-ID: <200708210143.l7L1hJL5013813@sheep.berlios.de>

Author: axeld
Date: 2007-08-21 03:43:17 +0200 (Tue, 21 Aug 2007)
New Revision: 22025
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22025&view=rev

Modified:
   haiku/trunk/src/kits/tracker/PoseView.cpp
   haiku/trunk/src/kits/tracker/TitleView.cpp
   haiku/trunk/src/kits/tracker/TitleView.h
Log:
* BTitleView now resizes its columns asynchronously. As a side-effect, this
  also solves the slow resizing part of bug #160 under Haiku (where GetMouse()
  obviously gets a lot more messages).
* Rearranged the interaction between BTitleView and ColumnTrackState a bit,
  removed some unused cruft.
* PoseView::ResizeColumn() had obviously required code to redraw the resizing
  lines on enlarging the column excluded for whatever reason.
* Minor cleanup.


Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2007-08-21 00:18:32 UTC (rev 22024)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2007-08-21 01:43:17 UTC (rev 22025)
@@ -8518,7 +8518,6 @@
 	BRect columnDrawRect(sourceRect);
 		// we will use columnDrawRect to draw the actual resized column
 
-
 	bool shrinking = newSize < column->Width();
 	columnDrawRect.left = column->Offset();
 	columnDrawRect.right = column->Offset() + kTitleColumnRightExtraMargin
@@ -8550,8 +8549,9 @@
 		CopyBits(sourceRect, destRect);
 		if (drawLineFunc) {
 			ASSERT(lastLineDrawPos);
-			(drawLineFunc)(this, BPoint(destRect.left + kRoomForLine, destRect.top),
-				 BPoint(destRect.left + kRoomForLine, destRect.bottom));
+			(drawLineFunc)(this, BPoint(destRect.left + kRoomForLine,
+					destRect.top),
+				BPoint(destRect.left + kRoomForLine, destRect.bottom));
 			*lastLineDrawPos = destRect.left + kRoomForLine;
 		}
 	} else {
@@ -8563,10 +8563,9 @@
 		}
 		if (drawLineFunc) {
 			ASSERT(lastLineDrawPos);
-#if 0
-			(drawLineFunc)(this, BPoint(destRect.left + kRoomForLine, destRect.top),
-				 BPoint(destRect.left + kRoomForLine, destRect.bottom));
-#endif
+			(drawLineFunc)(this, BPoint(destRect.left + kRoomForLine,
+					destRect.top),
+				BPoint(destRect.left + kRoomForLine, destRect.bottom));
 			*lastLineDrawPos = destRect.left + kRoomForLine;
 		}
 		ColumnRedraw(columnDrawRect);

Modified: haiku/trunk/src/kits/tracker/TitleView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/TitleView.cpp	2007-08-21 00:18:32 UTC (rev 22024)
+++ haiku/trunk/src/kits/tracker/TitleView.cpp	2007-08-21 01:43:17 UTC (rev 22025)
@@ -105,7 +105,8 @@
 	fPoseView(view),
 	fTitleList(10, true),
 	fHorizontalResizeCursor(kHorizontalResizeCursor),
-	fPreviouslyClickedColumnTitle(0)
+	fPreviouslyClickedColumnTitle(0),
+	fTrackingState(NULL)
 {
 	sTitleBackground = tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), 0.88f); // 216 -> 220
 	sDarkTitleBackground = tint_color(sTitleBackground, B_DARKEN_1_TINT);
@@ -132,6 +133,7 @@
 
 BTitleView::~BTitleView()
 {
+	delete fTrackingState;
 }
 
 
@@ -139,6 +141,7 @@
 BTitleView::Reset()
 {
 	fTitleList.MakeEmpty();
+
 	for (int32 index = 0; ; index++) {
 		BColumn *column = fPoseView->ColumnAt(index);
 		if (!column)
@@ -156,7 +159,7 @@
 	if (after) {
 		for (index = 0; index < count; index++) {
 			BColumn *titleColumn = fTitleList.ItemAt(index)->Column();
-			
+
 			if (after == titleColumn) {
 				index++;
 				break;
@@ -194,23 +197,21 @@
 
 
 void 
-BTitleView::Draw(BRect, bool useOffscreen, bool updateOnly,
+BTitleView::Draw(BRect /*updateRect*/, bool useOffscreen, bool updateOnly,
 	const BColumnTitle *pressedColumn,
 	void (*trackRectBlitter)(BView *, BRect), BRect passThru)
 {
 	BRect bounds(Bounds());
-
 	BView *view;
 
 	if (useOffscreen) {
-		ASSERT(offscreen);
+		ASSERT(sOffscreen);
 		BRect frame(bounds);
 		frame.right += frame.left;
 			// this is kind of messy way of avoiding being clipped by the ammount the
 			// title is scrolled to the left
-			// ToDo:
-			//		fix this
-		view = offscreen->BeginUsing(frame);
+			// ToDo: fix this
+		view = sOffscreen->BeginUsing(frame);
 		view->SetOrigin(-bounds.left, 0);
 		view->SetLowColor(LowColor());
 		view->SetHighColor(HighColor());
@@ -265,8 +266,8 @@
 		if (trackRectBlitter)
 			(trackRectBlitter)(view, passThru);
 		view->Sync();
-		DrawBitmap(offscreen->Bitmap());
-		offscreen->DoneUsing();
+		DrawBitmap(sOffscreen->Bitmap());
+		sOffscreen->DoneUsing();
 	} else if (trackRectBlitter)
 		(trackRectBlitter)(view, passThru);
 }
@@ -280,13 +281,13 @@
 		Window()->Activate();
 		return;
 	}
-	
+
 	// finish any pending edits
 	fPoseView->CommitActivePose();
 
 	BColumnTitle *title = FindColumnTitle(where);
 	BColumnTitle *resizedTitle = InColumnResizeArea(where);
-	
+
 	uint32 buttons;
 	GetMouse(&where, &buttons);
 
@@ -326,52 +327,43 @@
 	} else if (!title)
 		return;
 
-	ColumnTrackState *trackState;
-	if (resizedTitle)
-		trackState = new ColumnResizeState(this, resizedTitle, where);
-	else
-		trackState = new ColumnDragState(this, title, where);
+	SetMouseEventMask(B_POINTER_EVENTS, B_NO_POINTER_HISTORY | B_LOCK_WINDOW_FOCUS);
 
 	// track the mouse
-	// - if it is pressed shortly and not moved, it is a click 
-	//	all else is a track
-	bigtime_t pastClickTime = system_time() + doubleClickSpeed;
-	bool pastClick = false;
-	for (;;) {
-		BPoint old(where);
+	if (resizedTitle) {
+		fTrackingState = new ColumnResizeState(this, resizedTitle, where,
+			system_time() + doubleClickSpeed);
+	} else {
+		fTrackingState = new ColumnDragState(this, title, where,
+			system_time() + doubleClickSpeed);
+	}
+}
 
-		GetMouse(&where, &buttons);
 
-		if (!buttons) {
-			if (!pastClick)
-				trackState->Clicked(where, buttons);
-			else
-				trackState->Done(where);
-			break;
-		}
+void
+BTitleView::MouseUp(BPoint where)
+{
+	if (fTrackingState == NULL)
+		return;
 
-		BRect oldMarging(old, old);
-		oldMarging.InsetBy(-1, -1);
+	fTrackingState->MouseUp(where);
 
-		if ((pastClick && where != old) || !oldMarging.Contains(where)) {
-			// if not pressing yet, use a margin to start, else
-			// call moved on any mouse movement
-			pastClick = true;
-			trackState->MouseMoved(where, buttons);
-		}
-		if (!pastClick && system_time() > pastClickTime) 
-			pastClick = true;
-
-		snooze(15000);
-	}
-
-	delete trackState;
+	delete fTrackingState;
+	fTrackingState = NULL;
 }
 
 
-void 
+void
 BTitleView::MouseMoved(BPoint where, uint32 code, const BMessage *message)
 {
+	if (fTrackingState != NULL) {
+		int32 buttons = 0;
+		if (Looper() != NULL && Looper()->CurrentMessage() != NULL)
+			Looper()->CurrentMessage()->FindInt32("buttons", &buttons);
+		fTrackingState->MouseMoved(where, buttons);
+		return;
+	}
+
 	switch (code) {
 		default:
 			if (InColumnResizeArea(where) && Window()->IsActive())
@@ -535,23 +527,42 @@
 
 
 ColumnTrackState::ColumnTrackState(BTitleView *view, BColumnTitle *title,
-	BPoint where)
+		BPoint where, bigtime_t pastClickTime)
 	:
 	fTitleView(view),
 	fTitle(title),
-	fLastPos(where)
+	fFirstClickPoint(where),
+	fPastClickTime(pastClickTime),
+	fHasMoved(false)
 {
 }
 
 
-void 
+void
+ColumnTrackState::MouseUp(BPoint where)
+{
+	// if it is pressed shortly and not moved, it is a click 
+	// all else is a track
+	if (system_time() <= fPastClickTime) 
+		Clicked(where);
+	else
+		Done(where);
+}
+
+
+void
 ColumnTrackState::MouseMoved(BPoint where, uint32 buttons)
 {
-	if (!ValueChanged(where))
-		return;
-	
+	if (!fHasMoved && system_time() < fPastClickTime) {
+		BRect moveMargin(fFirstClickPoint, fFirstClickPoint);
+		moveMargin.InsetBy(-1, -1);
+
+		if (moveMargin.Contains(where))
+			return;
+	}
+
 	Moved(where, buttons);
-	fLastPos = where;
+	fHasMoved = true;
 }
 
 
@@ -559,8 +570,8 @@
 
 
 ColumnResizeState::ColumnResizeState(BTitleView *view, BColumnTitle *title,
-	BPoint where)
-	: ColumnTrackState(view, title, where),
+		BPoint where, bigtime_t pastClickTime)
+	: ColumnTrackState(view, title, where, pastClickTime),
 	fLastLineDrawPos(-1),
 	fInitialTrackOffset((title->fColumn->Offset() + title->fColumn->Width()) - where.x)
 {
@@ -568,7 +579,7 @@
 }
 
 
-bool 
+bool
 ColumnResizeState::ValueChanged(BPoint where)
 {
 	float newWidth = where.x + fInitialTrackOffset - fTitle->fColumn->Offset();
@@ -579,7 +590,7 @@
 }
 
 
-void 
+void
 ColumnResizeState::Moved(BPoint where, uint32)
 {
 	float newWidth = where.x + fInitialTrackOffset - fTitle->fColumn->Offset();
@@ -589,34 +600,34 @@
 	BPoseView *poseView = fTitleView->PoseView();
 
 //	bool shrink = (newWidth < fTitle->fColumn->Width());
-	
+
 	// resize the column 
 	poseView->ResizeColumn(fTitle->fColumn, newWidth, &fLastLineDrawPos,
 		_DrawLine, _UndrawLine);
 
 	BRect bounds(fTitleView->Bounds());
 	bounds.left = fTitle->fColumn->Offset();
-	
+
 	// force title redraw
 	fTitleView->Draw(bounds, true, false); 
 }
 
 
-void 
-ColumnResizeState::Done(BPoint)
+void
+ColumnResizeState::Done(BPoint /*where*/)
 {
 	UndrawLine();
 }
 
 
-void 
-ColumnResizeState::Clicked(BPoint, uint32)
+void
+ColumnResizeState::Clicked(BPoint /*where*/)
 {
 	UndrawLine();
 }
 
 
-void 
+void
 ColumnResizeState::DrawLine()
 {
 	BPoseView *poseView = fTitleView->PoseView();
@@ -632,7 +643,7 @@
 }
 
 
-void 
+void
 ColumnResizeState::UndrawLine()
 {
 	if (fLastLineDrawPos < 0)
@@ -640,7 +651,7 @@
 
 	BRect poseViewBounds(fTitleView->PoseView()->Bounds());
 	poseViewBounds.left = fLastLineDrawPos;
-	
+
 	_UndrawLine(fTitleView->PoseView(), poseViewBounds.LeftTop(),
 		poseViewBounds.LeftBottom());
 }
@@ -650,8 +661,8 @@
 
 
 ColumnDragState::ColumnDragState(BTitleView *view, BColumnTitle *columnTitle,
-	BPoint where)
-	: ColumnTrackState(view, columnTitle, where),
+		BPoint where, bigtime_t pastClickTime)
+	: ColumnTrackState(view, columnTitle, where, pastClickTime),
 	fInitialMouseTrackOffset(where.x),
 	fTrackingRemovedColumn(false)
 {
@@ -666,7 +677,7 @@
 // Autoscroll when dragging column left/right
 // fix dragging back a column before the first column (now adds as last)
 // make column swaps/adds not invalidate/redraw columns to the left
-void 
+void
 ColumnDragState::Moved(BPoint where, uint32)
 {
 	// figure out where we are with the mouse
@@ -741,8 +752,8 @@
 }
 
 
-void 
-ColumnDragState::Done(BPoint)
+void
+ColumnDragState::Done(BPoint /*where*/)
 {
 	if (fTrackingRemovedColumn)
 		fTitleView->EndRectTracking();
@@ -750,8 +761,8 @@
 }
 
 
-void 
-ColumnDragState::Clicked(BPoint, uint32)
+void
+ColumnDragState::Clicked(BPoint /*where*/)
 {
 	BPoseView *poseView = fTitleView->PoseView();
 	uint32 hash = fTitle->Column()->AttrHash();
@@ -789,27 +800,21 @@
 }
 
 
-void 
-ColumnDragState::Pressing(BPoint, uint32)
-{
-}
-
-
-bool 
+bool
 ColumnDragState::ValueChanged(BPoint)
 {
 	return true;
 }
 
 
-void 
+void
 ColumnDragState::DrawPressNoOutline()
 {
 	fTitleView->Draw(fTitleView->Bounds(), true, false, fTitle);
 }
 
 
-void 
+void
 ColumnDragState::DrawOutline(float pos)
 {
 	BRect outline(fTitle->Bounds());
@@ -825,4 +830,4 @@
 }
 
 
-OffscreenBitmap *BTitleView::offscreen = new OffscreenBitmap;
+OffscreenBitmap *BTitleView::sOffscreen = new OffscreenBitmap;

Modified: haiku/trunk/src/kits/tracker/TitleView.h
===================================================================
--- haiku/trunk/src/kits/tracker/TitleView.h	2007-08-21 00:18:32 UTC (rev 22024)
+++ haiku/trunk/src/kits/tracker/TitleView.h	2007-08-21 01:43:17 UTC (rev 22025)
@@ -46,6 +46,7 @@
 class BPoseView;
 class BColumn;
 class BColumnTitle;
+class ColumnTrackState;
 class OffscreenBitmap;
 
 const int32 kTitleViewHeight = 16;
@@ -58,14 +59,16 @@
 const int32 kRemoveTitleMargin = 10;
 const int32 kColumnStart = 40;
 
+
 class BTitleView : public BView {
 public:
 	BTitleView(BRect, BPoseView *);
 	virtual ~BTitleView();
-	
-	virtual	void MouseDown(BPoint);
-	virtual	void Draw(BRect);
 
+	virtual	void MouseDown(BPoint where);
+	virtual	void MouseUp(BPoint where);
+	virtual	void Draw(BRect updateRect);
+
 	void Draw(BRect, bool useOffscreen = false,
 		bool updateOnly = true,
 		const BColumnTitle *pressedColumn = 0,
@@ -92,8 +95,9 @@
 	
 	BColumnTitle *fPreviouslyClickedColumnTitle;
 	bigtime_t fPreviousLeftClickTime;
+	ColumnTrackState* fTrackingState;
 
-	static OffscreenBitmap *offscreen;
+	static OffscreenBitmap *sOffscreen;
 	
 	typedef BView _inherited;
 
@@ -124,35 +128,35 @@
 // Utility classes to handle dragging state
 class ColumnTrackState {
 public:
-	ColumnTrackState(BTitleView *, BColumnTitle *, BPoint where);
+	ColumnTrackState(BTitleView *titleView, BColumnTitle *columnTitle,
+		BPoint where, bigtime_t pastClickTime);
 	virtual ~ColumnTrackState() {}
 
 	void MouseMoved(BPoint where, uint32 buttons);
+	void MouseUp(BPoint where);
 
+protected:
 	virtual void Moved(BPoint where, uint32 buttons) = 0;
-	virtual void Clicked(BPoint where, uint32 buttons) = 0;
-	virtual void Pressing(BPoint where, uint32 buttons) = 0;
-		// called if mouse held down too long for click but hasn't
-		// been moved a bit
+	virtual void Clicked(BPoint where) = 0;
 	virtual void Done(BPoint where) = 0;
-
-protected:
 	virtual bool ValueChanged(BPoint where) = 0; 
 
 	BTitleView *fTitleView;
 	BColumnTitle *fTitle;
-	BPoint fLastPos;
+	BPoint fFirstClickPoint;
+	bigtime_t fPastClickTime;
+	bool fHasMoved;
 };
 
 class ColumnResizeState : public ColumnTrackState {
 public:
-	ColumnResizeState(BTitleView *, BColumnTitle *, BPoint);
+	ColumnResizeState(BTitleView* titleView, BColumnTitle* columnTitle,
+		BPoint where, bigtime_t pastClickTime);
 
 protected:
-	virtual void Moved(BPoint, uint32 buttons);
-	virtual void Done(BPoint);
-	virtual void Clicked(BPoint, uint32 buttons);
-	virtual void Pressing(BPoint, uint32) {}
+	virtual void Moved(BPoint where, uint32 buttons);
+	virtual void Done(BPoint where);
+	virtual void Clicked(BPoint where);
 	virtual bool ValueChanged(BPoint); 
 
 	void DrawLine();
@@ -167,13 +171,13 @@
 
 class ColumnDragState : public ColumnTrackState {
 public:
-	ColumnDragState(BTitleView *, BColumnTitle *, BPoint where);
+	ColumnDragState(BTitleView* titleView, BColumnTitle* columnTitle,
+		BPoint where, bigtime_t pastClickTime);
 
 protected:
-	virtual void Moved(BPoint, uint32 buttons);
-	virtual void Done(BPoint);
-	virtual void Clicked(BPoint, uint32 buttons);
-	virtual void Pressing(BPoint, uint32 buttons);
+	virtual void Moved(BPoint where, uint32 buttons);
+	virtual void Done(BPoint where);
+	virtual void Clicked(BPoint where);
 	virtual bool ValueChanged(BPoint); 
 	
 	void DrawOutline(float);
@@ -200,9 +204,8 @@
 	return fPoseView;
 }
 
-
 } // namespace BPrivate
 
 using namespace BPrivate;
 
-#endif
+#endif	// _TITLE_VIEW_H



From axeld at mail.berlios.de  Tue Aug 21 12:26:54 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 21 Aug 2007 12:26:54 +0200
Subject: [Haiku-commits] r22026 - haiku/trunk/src/system/kernel/arch/x86
Message-ID: <200708211026.l7LAQsK1026064@sheep.berlios.de>

Author: axeld
Date: 2007-08-21 12:26:54 +0200 (Tue, 21 Aug 2007)
New Revision: 22026
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22026&view=rev

Modified:
   haiku/trunk/src/system/kernel/arch/x86/arch_debug.c
Log:
Fixed dumping the stack trace for the current thread by ID - that should have
been a warning (at least in C++ it is).


Modified: haiku/trunk/src/system/kernel/arch/x86/arch_debug.c
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_debug.c	2007-08-21 01:43:17 UTC (rev 22025)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_debug.c	2007-08-21 10:26:54 UTC (rev 22026)
@@ -172,7 +172,7 @@
 			// read %ebp from the thread's stack stored by a pushad
 			ebp = thread->arch_info.current_stack.esp[2];
 		} else
-			thread == NULL;
+			thread = NULL;
 	} else if (argc > 2) {
 		kprintf("usage: %s [thread id]\n", argv[0]);
 		return 0;



From axeld at mail.berlios.de  Tue Aug 21 12:32:46 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 21 Aug 2007 12:32:46 +0200
Subject: [Haiku-commits] r22027 - haiku/trunk/src/preferences/keyboard
Message-ID: <200708211032.l7LAWktV001236@sheep.berlios.de>

Author: axeld
Date: 2007-08-21 12:32:45 +0200 (Tue, 21 Aug 2007)
New Revision: 22027
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22027&view=rev

Modified:
   haiku/trunk/src/preferences/keyboard/KeyboardMessages.h
   haiku/trunk/src/preferences/keyboard/KeyboardWindow.cpp
Log:
* Added B_ASYNCHRONOUS_CONTROLS to the window flags (smooth slider).
* Put local headers at the top, and fixed self-containment.
* Minor cleanup.


Modified: haiku/trunk/src/preferences/keyboard/KeyboardMessages.h
===================================================================
--- haiku/trunk/src/preferences/keyboard/KeyboardMessages.h	2007-08-21 10:26:54 UTC (rev 22026)
+++ haiku/trunk/src/preferences/keyboard/KeyboardMessages.h	2007-08-21 10:32:45 UTC (rev 22027)
@@ -1,15 +1,19 @@
 /*
- * Copyright 2004-2006, the Haiku project. All rights reserved.
+ * Copyright 2004-2007, Haiku. All rights reserved.
  * Distributed under the terms of the Haiku License.
  *
- * Authors in chronological order:
- *  mccall at digitalparadise.co.uk
- *  J?r?me Duval
- *  Marcus Overhagen
-*/
+ * Authors:
+ *		Andrew McCall, mccall at digitalparadise.co.uk
+ *		J?r?me Duval
+ *		Marcus Overhagen
+ */
 #ifndef KEYBOARD_MESSAGES_H
 #define KEYBOARD_MESSAGES_H
 
+
+#include <SupportDefs.h>
+
+
 const uint32 BUTTON_DEFAULTS			= 'BTde';
 const uint32 BUTTON_REVERT				= 'BTre';
 const uint32 SLIDER_REPEAT_RATE			= 'SLrr';
@@ -17,4 +21,4 @@
 
 const uint32 ERROR_DETECTED				= 'ERor';
 
-#endif
+#endif	// KEYBOARD_MESSAGES_H

Modified: haiku/trunk/src/preferences/keyboard/KeyboardWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/keyboard/KeyboardWindow.cpp	2007-08-21 10:26:54 UTC (rev 22026)
+++ haiku/trunk/src/preferences/keyboard/KeyboardWindow.cpp	2007-08-21 10:32:45 UTC (rev 22027)
@@ -1,44 +1,50 @@
 /*
- * Copyright 2004-2006, the Haiku project. All rights reserved.
+ * Copyright 2004-2007, Haiku. All rights reserved.
  * Distributed under the terms of the Haiku License.
  *
- * Authors in chronological order:
- *  mccall at digitalparadise.co.uk
- *  J?r?me Duval
- *  Marcus Overhagen
-*/
+ * Authors:
+ *		Andrew McCall, mccall at digitalparadise.co.uk
+ *		J?r?me Duval
+ *		Marcus Overhagen
+ */
+
+
+#include "KeyboardMessages.h"
+#include "KeyboardView.h"
+#include "KeyboardWindow.h"
+
 #include <Button.h>
 #include <Message.h>
 #include <Screen.h>
 #include <Slider.h>
 #include <TextControl.h>
 
-#include "KeyboardMessages.h"
-#include "KeyboardWindow.h"
-#include "KeyboardView.h"
 
 KeyboardWindow::KeyboardWindow()
- :	BWindow(BRect(0,0,200,200), "Keyboard", B_TITLED_WINDOW,
- 			B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
+	: BWindow(BRect(0, 0, 200, 200), "Keyboard", B_TITLED_WINDOW,
+ 		B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS)
 {	
 	MoveTo(fSettings.WindowCorner());
 
-	// Code to make sure that the window doesn't get drawn off screen...
+	// center window if it would be off-screen
 	BScreen screen;
-	if (!(screen.Frame().right >= Frame().right && screen.Frame().bottom >= Frame().bottom))
-		MoveTo((screen.Frame().right-Bounds().right)*.5,(screen.Frame().bottom-Bounds().bottom)*.5);
-	
+	if (screen.Frame().right < Frame().right
+		|| screen.Frame().bottom < Frame().bottom) {
+		MoveTo((screen.Frame().right - Bounds().right) / 2,
+			(screen.Frame().bottom - Bounds().bottom) / 2);
+	}
+
 	fView = new KeyboardView(Bounds());
 	AddChild(fView);
 
 	BSlider *slider = (BSlider *)FindView("key_repeat_rate");
 	if (slider !=NULL) 
 		slider->SetValue(fSettings.KeyboardRepeatRate());
-	
+
 	slider = (BSlider *)FindView("delay_until_key_repeat");
 	if (slider !=NULL) 
 		slider->SetValue(fSettings.KeyboardRepeatDelay());
-	
+
 	BButton *button = (BButton *)FindView("keyboard_defaults");
 	if (button !=NULL)
 		button->SetEnabled(fSettings.IsDefaultable());
@@ -55,109 +61,115 @@
 KeyboardWindow::QuitRequested()
 {
 	fSettings.SetWindowCorner(Frame().LeftTop());
-	
+
 #ifdef DEBUG
 	fSettings.Dump();	
 #endif
-	
+
 	be_app->PostMessage(B_QUIT_REQUESTED);
-	
-	return(true);
+	return true;
 }
 
+
 void
-KeyboardWindow::MessageReceived(BMessage *message)
+KeyboardWindow::MessageReceived(BMessage* message)
 {
-	BSlider *slider=NULL;
-	BButton *button=NULL;
-			
-	switch(message->what) {
-		case BUTTON_DEFAULTS:{
-				fSettings.Defaults();
-				
-				slider = (BSlider *)FindView("key_repeat_rate");
-				if (slider !=NULL) 
-					slider->SetValue(fSettings.KeyboardRepeatRate());
-				
-				slider = (BSlider *)FindView("delay_until_key_repeat");
-				if (slider !=NULL) 
-					slider->SetValue(fSettings.KeyboardRepeatDelay());
+	BSlider* slider = NULL;
+	BButton* button = NULL;
 
-				button = (BButton *)FindView("keyboard_defaults");
-				if (button !=NULL)
-					button->SetEnabled(false);
-				
-				button = (BButton *)FindView("keyboard_revert");
-		  		if (button !=NULL) 
-		  			button->SetEnabled(true);
-			}
+	switch (message->what) {
+		case BUTTON_DEFAULTS:
+		{
+			fSettings.Defaults();
+
+			slider = (BSlider *)FindView("key_repeat_rate");
+			if (slider !=NULL) 
+				slider->SetValue(fSettings.KeyboardRepeatRate());
+
+			slider = (BSlider *)FindView("delay_until_key_repeat");
+			if (slider !=NULL) 
+				slider->SetValue(fSettings.KeyboardRepeatDelay());
+
+			button = (BButton *)FindView("keyboard_defaults");
+			if (button !=NULL)
+				button->SetEnabled(false);
+
+			button = (BButton *)FindView("keyboard_revert");
+	  		if (button !=NULL) 
+	  			button->SetEnabled(true);
 			break;
-		case BUTTON_REVERT:{
-				fSettings.Revert();
-				
-				slider = (BSlider *)FindView("key_repeat_rate");
-				if (slider !=NULL) 
-					slider->SetValue(fSettings.KeyboardRepeatRate());	    		
-		    			
-				slider = (BSlider *)FindView("delay_until_key_repeat");
-				if (slider !=NULL) 
-					slider->SetValue(fSettings.KeyboardRepeatDelay());	    		
-				
-				button = (BButton *)FindView("keyboard_defaults");
-				if (button !=NULL)
-					button->SetEnabled(fSettings.IsDefaultable());
+		}
+		case BUTTON_REVERT:
+		{
+			fSettings.Revert();
+			
+			slider = (BSlider *)FindView("key_repeat_rate");
+			if (slider !=NULL) 
+				slider->SetValue(fSettings.KeyboardRepeatRate());	    		
 
-				button = (BButton *)FindView("keyboard_revert");
-		  		if (button !=NULL) 
-		  			button->SetEnabled(false);
-	  		}
+			slider = (BSlider *)FindView("delay_until_key_repeat");
+			if (slider !=NULL) 
+				slider->SetValue(fSettings.KeyboardRepeatDelay());	    		
+
+			button = (BButton *)FindView("keyboard_defaults");
+			if (button !=NULL)
+				button->SetEnabled(fSettings.IsDefaultable());
+
+			button = (BButton *)FindView("keyboard_revert");
+	  		if (button !=NULL) 
+	  			button->SetEnabled(false);
 			break;
-		case SLIDER_REPEAT_RATE:{
-				int32 rate;
-				if (message->FindInt32("be:value", &rate)!=B_OK)
-					break;
-				fSettings.SetKeyboardRepeatRate(rate);
-				
-				button = (BButton *)FindView("keyboard_defaults");
-				if (button !=NULL)
-					button->SetEnabled(fSettings.IsDefaultable());
+  		}
+		case SLIDER_REPEAT_RATE:
+		{
+			int32 rate;
+			if (message->FindInt32("be:value", &rate) != B_OK)
+				break;
+			fSettings.SetKeyboardRepeatRate(rate);
 
-				button = (BButton *)FindView("keyboard_revert");
-		  		if (button !=NULL) 
-	  				button->SetEnabled(true);
-			}
+			button = (BButton *)FindView("keyboard_defaults");
+			if (button !=NULL)
+				button->SetEnabled(fSettings.IsDefaultable());
+
+			button = (BButton *)FindView("keyboard_revert");
+	  		if (button !=NULL) 
+  				button->SetEnabled(true);
 			break;
-		case SLIDER_DELAY_RATE:{
-				int32 delay;
-				if (message->FindInt32("be:value", &delay)!=B_OK)
-					break;
-				// We need to look at the value from the slider and make it "jump"
-				// to the next notch along. Setting the min and max values of the
-				// slider to 1 and 4 doesn't work like the real Keyboard app.
-				if (delay < 375000)
-					delay = 250000;
-				if ((delay >= 375000)&&(delay < 625000))
-					delay = 500000;
-				if ((delay >= 625000)&&(delay < 875000))
-					delay = 750000;
-				if (delay >= 875000)
-					delay = 1000000;
-				
-				fSettings.SetKeyboardRepeatDelay(delay);
-				
-				slider = (BSlider *)FindView("delay_until_key_repeat");
-				if (slider !=NULL) 
-					slider->SetValue(delay);
+		}
+		case SLIDER_DELAY_RATE:
+		{
+			int32 delay;
+			if (message->FindInt32("be:value", &delay) != B_OK)
+				break;
 
-				button = (BButton *)FindView("keyboard_defaults");
-				if (button !=NULL)
-					button->SetEnabled(fSettings.IsDefaultable());
+			// We need to look at the value from the slider and make it "jump"
+			// to the next notch along. Setting the min and max values of the
+			// slider to 1 and 4 doesn't work like the real Keyboard app.
+			if (delay < 375000)
+				delay = 250000;
+			if (delay >= 375000 && delay < 625000)
+				delay = 500000;
+			if (delay >= 625000 && delay < 875000)
+				delay = 750000;
+			if (delay >= 875000)
+				delay = 1000000;
 
-				button = (BButton *)FindView("keyboard_revert");
-	  			if (button !=NULL) 
-	  				button->SetEnabled(true);
-	  		}
+			fSettings.SetKeyboardRepeatDelay(delay);
+
+			slider = (BSlider *)FindView("delay_until_key_repeat");
+			if (slider !=NULL) 
+				slider->SetValue(delay);
+
+			button = (BButton *)FindView("keyboard_defaults");
+			if (button !=NULL)
+				button->SetEnabled(fSettings.IsDefaultable());
+
+			button = (BButton *)FindView("keyboard_revert");
+  			if (button !=NULL) 
+  				button->SetEnabled(true);
 			break;
+  		}
+
 		default:
 			BWindow::MessageReceived(message);
 			break;



From axeld at mail.berlios.de  Tue Aug 21 19:47:53 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 21 Aug 2007 19:47:53 +0200
Subject: [Haiku-commits] r22028 - haiku/trunk/build/jam
Message-ID: <200708211747.l7LHlrFT027039@sheep.berlios.de>

Author: axeld
Date: 2007-08-21 19:47:53 +0200 (Tue, 21 Aug 2007)
New Revision: 22028
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22028&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
Added the Network preferences application in its early state to the image; it's
already a helpful addition.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2007-08-21 10:32:45 UTC (rev 22027)
+++ haiku/trunk/build/jam/HaikuImage	2007-08-21 17:47:53 UTC (rev 22028)
@@ -52,8 +52,8 @@
 	Terminal TV Workspaces
 ;
 BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail FileTypes
-	Fonts Keyboard Keymap Media Menu Mouse Printers Screen ScreenSaver Sounds
-	Time VirtualMemory
+	Fonts Keyboard Keymap Media Menu Mouse Network Printers Screen ScreenSaver
+	Sounds Time VirtualMemory
 ;
 BEOS_DEMOS = BitmapDrawing Chart Clock $(X86_ONLY)Cortex FontDemo
 	$(X86_ONLY)GLDirectMode $(X86_ONLY)GLTeapot Mandelbrot PictureTest



From marcusoverhagen at mail.berlios.de  Tue Aug 21 20:44:56 2007
From: marcusoverhagen at mail.berlios.de (marcusoverhagen at BerliOS)
Date: Tue, 21 Aug 2007 20:44:56 +0200
Subject: [Haiku-commits] r22029 - haiku/trunk/src/kits/media
Message-ID: <200708211844.l7LIiuWn030285@sheep.berlios.de>

Author: marcusoverhagen
Date: 2007-08-21 20:44:55 +0200 (Tue, 21 Aug 2007)
New Revision: 22029
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22029&view=rev

Modified:
   haiku/trunk/src/kits/media/DataExchange.cpp
   haiku/trunk/src/kits/media/MediaNode.cpp
   haiku/trunk/src/kits/media/MediaRoster.cpp
   haiku/trunk/src/kits/media/TimeSource.cpp
Log:
debugging instrumentation for Cortex lockup bug (some weeks old already)


Modified: haiku/trunk/src/kits/media/DataExchange.cpp
===================================================================
--- haiku/trunk/src/kits/media/DataExchange.cpp	2007-08-21 17:47:53 UTC (rev 22028)
+++ haiku/trunk/src/kits/media/DataExchange.cpp	2007-08-21 18:44:55 UTC (rev 22029)
@@ -74,6 +74,13 @@
 }
 
 
+static void check(int code)
+{
+	static int rep = 0;
+	if(code == 0x204 && rep++ == 200)
+		debugger("scheisse!");
+}
+
 status_t
 request_data::SendReply(status_t result, reply_data *reply, int replysize) const
 {
@@ -138,6 +145,7 @@
 status_t SendToPort(port_id sendport, int32 msgcode, command_data *msg, int size)
 {
 	status_t rv;
+	check(msgcode);
 	rv = write_port_etc(sendport, msgcode, msg, size, B_RELATIVE_TIMEOUT, TIMEOUT);
 	if (rv != B_OK) {
 		ERROR("SendToPort: write_port failed, msgcode 0x%lx, port %ld, error %#lx (%s)\n", msgcode, sendport, rv, strerror(rv));
@@ -150,6 +158,7 @@
 		} else {
 			return rv;
 		}
+	check(msgcode);
 		rv = write_port_etc(sendport, msgcode, msg, size, B_RELATIVE_TIMEOUT, TIMEOUT);
 		if (rv != B_OK) {
 			ERROR("SendToPort: retrying write_port failed, msgcode 0x%lx, port %ld, error %#lx (%s)\n", msgcode, sendport, rv, strerror(rv));
@@ -167,6 +176,7 @@
 
 	request->reply_port = _PortPool->GetPort();
 
+	check(msgcode);
 	rv = write_port_etc(requestport, msgcode, request, requestsize, B_RELATIVE_TIMEOUT, TIMEOUT);
 	
 	if (rv != B_OK) {
@@ -181,6 +191,7 @@
 			_PortPool->PutPort(request->reply_port);
 			return rv;
 		}
+	check(msgcode);
 		rv = write_port_etc(requestport, msgcode, request, requestsize, B_RELATIVE_TIMEOUT, TIMEOUT);
 		if (rv != B_OK) {
 			ERROR("QueryPort: retrying write_port failed, msgcode 0x%lx, port %ld, error %#lx (%s)\n", msgcode, requestport, rv, strerror(rv));

Modified: haiku/trunk/src/kits/media/MediaNode.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaNode.cpp	2007-08-21 17:47:53 UTC (rev 22028)
+++ haiku/trunk/src/kits/media/MediaNode.cpp	2007-08-21 18:44:55 UTC (rev 22029)
@@ -26,7 +26,7 @@
  * THE SOFTWARE.
  *
  */
-
+//#define DEBUG 7
 #include <MediaRoster.h>
 #include <MediaNode.h>
 #include <TimeSource.h>
@@ -47,6 +47,15 @@
 using std::nothrow;
 using std::nothrow_t;
 
+#undef TRACE
+//#define TRACE_MEDIA_NODE
+#ifdef TRACE_MEDIA_NODE
+  #define TRACE printf
+#else
+  #define TRACE(x...)
+#endif
+
+
 // don't rename this one, it's used and exported for binary compatibility
 int32 BMediaNode::_m_changeTag = 0;
 
@@ -347,7 +356,7 @@
 						   uint32 flags,
 						   void *_reserved_)
 {
-	PRINT(6, "CALLED BMediaNode::WaitForMessage()\n");
+	TRACE("entering: BMediaNode::WaitForMessage()\n");
 
 	// This function waits until either real time specified by 
 	// waitUntil or a message is received on the control port.
@@ -364,10 +373,10 @@
 		return size;	// return the error code
 	}
 
-	PRINT(7, "BMediaNode::WaitForMessage %#lx, node %ld, this %p\n", message, fNodeID, this);
+	TRACE("BMediaNode::WaitForMessage request is: %#lx, node %ld, this %p\n", message, fNodeID, this);
 
 	if (message > NODE_MESSAGE_START && message < NODE_MESSAGE_END) {
-		PRINT(4, "BMediaNode::WaitForMessage calling BMediaNode\n");
+		TRACE("BMediaNode::WaitForMessage calling BMediaNode\n");
 		if (B_OK == BMediaNode::HandleMessage(message, data, size))
 			return B_OK;
 	}
@@ -375,7 +384,7 @@
 	if (message > PRODUCER_MESSAGE_START && message < PRODUCER_MESSAGE_END) {
 		if (!fProducerThis)
 			fProducerThis = dynamic_cast<BBufferProducer *>(this);
-		PRINT(4, "BMediaNode::WaitForMessage calling BBufferProducer %p\n", fProducerThis);
+		TRACE("BMediaNode::WaitForMessage calling BBufferProducer %p\n", fProducerThis);
 		if (fProducerThis && B_OK == fProducerThis->BBufferProducer::HandleMessage(message, data, size))
 			return B_OK;
 	}
@@ -383,7 +392,7 @@
 	if (message > CONSUMER_MESSAGE_START && message < CONSUMER_MESSAGE_END) {
 		if (!fConsumerThis)
 			fConsumerThis = dynamic_cast<BBufferConsumer *>(this);
-		PRINT(4, "BMediaNode::WaitForMessage calling BBufferConsumer %p\n", fConsumerThis);
+		TRACE("BMediaNode::WaitForMessage calling BBufferConsumer %p\n", fConsumerThis);
 		if (fConsumerThis && B_OK == fConsumerThis->BBufferConsumer::HandleMessage(message, data, size))
 			return B_OK;
 	}
@@ -391,7 +400,7 @@
 	if (message > FILEINTERFACE_MESSAGE_START && message < FILEINTERFACE_MESSAGE_END) {
 		if (!fFileInterfaceThis)
 			fFileInterfaceThis = dynamic_cast<BFileInterface *>(this);
-		PRINT(4, "BMediaNode::WaitForMessage calling BFileInterface %p\n", fFileInterfaceThis);
+		TRACE("BMediaNode::WaitForMessage calling BFileInterface %p\n", fFileInterfaceThis);
 		if (fFileInterfaceThis && B_OK == fFileInterfaceThis->BFileInterface::HandleMessage(message, data, size))
 			return B_OK;
 	}
@@ -399,7 +408,7 @@
 	if (message > CONTROLLABLE_MESSAGE_START && message < CONTROLLABLE_MESSAGE_END) {
 		if (!fControllableThis)
 			fControllableThis = dynamic_cast<BControllable *>(this);
-		PRINT(4, "BMediaNode::WaitForMessage calling BControllable %p\n", fControllableThis);
+		TRACE("BMediaNode::WaitForMessage calling BControllable %p\n", fControllableThis);
 		if (fControllableThis && B_OK == fControllableThis->BControllable::HandleMessage(message, data, size))
 			return B_OK;
 	}
@@ -407,12 +416,12 @@
 	if (message > TIMESOURCE_MESSAGE_START && message < TIMESOURCE_MESSAGE_END) {
 		if (!fTimeSourceThis)
 			fTimeSourceThis = dynamic_cast<BTimeSource *>(this);
-		PRINT(4, "BMediaNode::WaitForMessage calling BTimeSource %p\n", fTimeSourceThis);
+		TRACE("BMediaNode::WaitForMessage calling BTimeSource %p\n", fTimeSourceThis);
 		if (fTimeSourceThis && B_OK == fTimeSourceThis->BTimeSource::HandleMessage(message, data, size))
 			return B_OK;
 	}
 
-	PRINT(4, "BMediaNode::WaitForMessage calling default\n");
+	TRACE("BMediaNode::WaitForMessage calling default HandleMessage\n");
 	if (B_OK == HandleMessage(message, data, size))
 		return B_OK;
 
@@ -522,7 +531,7 @@
 						  const void *data,
 						  size_t size)
 {
-	PRINT(4, "BMediaNode::HandleMessage %#lx, node %ld\n", message, fNodeID);
+	TRACE("BMediaNode::HandleMessage %#lx, node %ld\n", message, fNodeID);
 	switch (message) {
 		case NODE_FINAL_RELEASE:
 		{
@@ -546,7 +555,7 @@
 		case NODE_START:
 		{
 			const node_start_command *command = static_cast<const node_start_command *>(data);
-			printf("NODE_START, node %ld\n", fNodeID);
+			TRACE("BMediaNode::HandleMessage NODE_START, node %ld\n", fNodeID);
 			Start(command->performance_time);
 			return B_OK;
 		}
@@ -554,7 +563,7 @@
 		case NODE_STOP:
 		{
 			const node_stop_command *command = static_cast<const node_stop_command *>(data);
-			printf("NODE_STOP, node %ld\n", fNodeID);
+			TRACE("BMediaNode::HandleMessage NODE_STOP, node %ld\n", fNodeID);
 			Stop(command->performance_time, command->immediate);
 			return B_OK;
 		}
@@ -562,7 +571,7 @@
 		case NODE_SEEK:
 		{
 			const node_seek_command *command = static_cast<const node_seek_command *>(data);
-			printf("NODE_SEEK, node %ld\n", fNodeID);
+			TRACE("BMediaNode::HandleMessage NODE_SEEK, node %ld\n", fNodeID);
 			Seek(command->media_time, command->performance_time);
 			return B_OK;
 		}
@@ -570,6 +579,7 @@
 		case NODE_SET_RUN_MODE:
 		{
 			const node_set_run_mode_command *command = static_cast<const node_set_run_mode_command *>(data);
+			TRACE("BMediaNode::HandleMessage NODE_SET_RUN_MODE, node %ld\n", fNodeID);
 			// when changing this, also change PRODUCER_SET_RUN_MODE_DELAY
 			fRunMode = command->mode;
 			SetRunMode(fRunMode);
@@ -579,12 +589,14 @@
 		case NODE_TIME_WARP:
 		{
 			const node_time_warp_command *command = static_cast<const node_time_warp_command *>(data);
+			TRACE("BMediaNode::HandleMessage NODE_TIME_WARP, node %ld\n", fNodeID);
 			TimeWarp(command->at_real_time, command->to_performance_time);
 			return B_OK;
 		}
 
 		case NODE_PREROLL:
 		{
+			TRACE("BMediaNode::HandleMessage NODE_PREROLL, node %ld\n", fNodeID);
 			Preroll();
 			return B_OK;
 		}
@@ -593,7 +605,7 @@
 		{
 			const node_set_timesource_command *command = static_cast<const node_set_timesource_command *>(data);
 
-			TRACE("NODE_SET_TIMESOURCE, node %ld, timesource %ld enter\n", fNodeID, command->timesource_id);
+			TRACE("BMediaNode::HandleMessage NODE_SET_TIMESOURCE, node %ld, timesource %ld enter\n", fNodeID, command->timesource_id);
 			
 			fTimeSourceID = command->timesource_id;
 			
@@ -613,7 +625,7 @@
 			// any derived class
 			SetTimeSource(fTimeSource);
 
-			TRACE("NODE_SET_TIMESOURCE, node %ld, timesource %ld leave\n", fNodeID, command->timesource_id);
+			TRACE("BMediaNode::HandleMessage NODE_SET_TIMESOURCE, node %ld, timesource %ld leave\n", fNodeID, command->timesource_id);
 
 			return B_OK;
 		}
@@ -621,6 +633,7 @@
 		case NODE_GET_TIMESOURCE:
 		{
 			const node_get_timesource_request *request = static_cast<const node_get_timesource_request *>(data);
+			TRACE("BMediaNode::HandleMessage NODE_GET_TIMESOURCE, node %ld\n", fNodeID);
 			node_get_timesource_reply reply;
 			reply.timesource_id = fTimeSourceID;
 			request->SendReply(B_OK, &reply, sizeof(reply));
@@ -630,6 +643,7 @@
 		case NODE_REQUEST_COMPLETED:
 		{
 			const node_request_completed_command *command = static_cast<const node_request_completed_command *>(data);
+			TRACE("BMediaNode::HandleMessage NODE_REQUEST_COMPLETED, node %ld\n", fNodeID);
 			RequestCompleted(command->info);
 			return B_OK;
 		}

Modified: haiku/trunk/src/kits/media/MediaRoster.cpp
===================================================================
--- haiku/trunk/src/kits/media/MediaRoster.cpp	2007-08-21 17:47:53 UTC (rev 22028)
+++ haiku/trunk/src/kits/media/MediaRoster.cpp	2007-08-21 18:44:55 UTC (rev 22029)
@@ -30,6 +30,7 @@
 /* to comply with the license above, do not remove the following line */
 char __dont_remove_copyright_from_binary[] = "Copyright (c) 2002-2006 Marcus Overhagen <Marcus at Overhagen.de>";
 
+//#define DEBUG 7
 #include <MediaRoster.h>
 #include <Locker.h>
 #include <Message.h>
@@ -1204,7 +1205,7 @@
 BMediaRoster::SetRunModeNode(const media_node & node,
 							 BMediaNode::run_mode mode)
 {
-	CALLED();
+	TRACE("BMediaRoster::SetRunModeNode, node %ld, mode %d\n", node.node, mode);
 	if (IS_INVALID_NODE(node))
 		return B_MEDIA_BAD_NODE;
 
@@ -1243,7 +1244,7 @@
 									  bigtime_t delay,
 									  BMediaNode::run_mode mode)
 {
-	CALLED();
+	TRACE("BMediaRoster::SetProducerRunModeDelay, node %ld, delay %Ld, mode %d\n", node.node, delay, mode);
 	if (IS_INVALID_NODE(node))
 		return B_MEDIA_BAD_NODE;
 	if ((node.kind & B_BUFFER_PRODUCER) == 0)

Modified: haiku/trunk/src/kits/media/TimeSource.cpp
===================================================================
--- haiku/trunk/src/kits/media/TimeSource.cpp	2007-08-21 17:47:53 UTC (rev 22028)
+++ haiku/trunk/src/kits/media/TimeSource.cpp	2007-08-21 18:44:55 UTC (rev 22029)
@@ -477,6 +477,8 @@
 		cmd.node = node->Node();
 		SendToPort(fControlPort, TIMESOURCE_ADD_SLAVE_NODE, &cmd, sizeof(cmd));
 	} else {
+		if (this == dynamic_cast<BTimeSource *>(node))
+			debugger("fuck you!");
 		DirectAddMe(node->Node());
 	}
 	return B_OK;



From marcusoverhagen at mail.berlios.de  Tue Aug 21 20:46:02 2007
From: marcusoverhagen at mail.berlios.de (marcusoverhagen at BerliOS)
Date: Tue, 21 Aug 2007 20:46:02 +0200
Subject: [Haiku-commits] r22030 - haiku/trunk/src/apps/terminal
Message-ID: <200708211846.l7LIk29M030372@sheep.berlios.de>

Author: marcusoverhagen
Date: 2007-08-21 20:46:01 +0200 (Tue, 21 Aug 2007)
New Revision: 22030
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22030&view=rev

Modified:
   haiku/trunk/src/apps/terminal/PrefHandler.cpp
Log:
increase history size to a useful value


Modified: haiku/trunk/src/apps/terminal/PrefHandler.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/PrefHandler.cpp	2007-08-21 18:44:55 UTC (rev 22029)
+++ haiku/trunk/src/apps/terminal/PrefHandler.cpp	2007-08-21 18:46:01 UTC (rev 22030)
@@ -51,7 +51,7 @@
 	{ PREF_IM_SELECT_COLOR,		"255, 152, 152" },
 
 	{ PREF_SHELL,				"/bin/sh -login" },
-	{ PREF_HISTORY_SIZE,		"500" },
+	{ PREF_HISTORY_SIZE,		"10000" },
 
 	{ PREF_TEXT_ENCODING,		"UTF-8" },
 



From marcusoverhagen at mail.berlios.de  Tue Aug 21 21:07:11 2007
From: marcusoverhagen at mail.berlios.de (marcusoverhagen at BerliOS)
Date: Tue, 21 Aug 2007 21:07:11 +0200
Subject: [Haiku-commits] r22031 - in haiku/trunk: headers/posix
	src/system/kernel/fs
Message-ID: <200708211907.l7LJ7BS1031427@sheep.berlios.de>

Author: marcusoverhagen
Date: 2007-08-21 21:07:10 +0200 (Tue, 21 Aug 2007)
New Revision: 22031
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22031&view=rev

Modified:
   haiku/trunk/headers/posix/limits.h
   haiku/trunk/src/system/kernel/fs/fd.c
Log:
Don't trust the user, and enforce the iovec limit.
Also check for negative positions smaller -1
(as -1 means using current address).


Modified: haiku/trunk/headers/posix/limits.h
===================================================================
--- haiku/trunk/headers/posix/limits.h	2007-08-21 18:46:01 UTC (rev 22030)
+++ haiku/trunk/headers/posix/limits.h	2007-08-21 19:07:10 UTC (rev 22031)
@@ -27,7 +27,7 @@
 #define ARG_MAX			 		(32768)
 #define ATEXIT_MAX			 	(32)	 /* XXXdbg */
 #define CHILD_MAX				(1024)
-#define IOV_MAX					(256)	/* really there is no limit */
+#define IOV_MAX					(1024)
 #define FILESIZEBITS			(64)
 #define LINK_MAX				(1)
 #define LOGIN_NAME_MAX			(32)	 /* XXXdbg */

Modified: haiku/trunk/src/system/kernel/fs/fd.c
===================================================================
--- haiku/trunk/src/system/kernel/fs/fd.c	2007-08-21 18:46:01 UTC (rev 22030)
+++ haiku/trunk/src/system/kernel/fs/fd.c	2007-08-21 19:07:10 UTC (rev 22031)
@@ -481,6 +481,9 @@
 	if (!IS_USER_ADDRESS(buffer))
 		return B_BAD_ADDRESS;
 
+	if (pos < -1)
+		return B_BAD_VALUE;
+
 	descriptor = get_fd(get_current_io_context(false), fd);
 	if (!descriptor)
 		return B_FILE_ERROR;
@@ -523,6 +526,13 @@
 	if (!IS_USER_ADDRESS(userVecs))
 		return B_BAD_ADDRESS;
 
+	if (pos < -1)
+		return B_BAD_VALUE;
+
+	/* prevent integer overflow exploit in malloc() */
+	if (count > IOV_MAX)
+		return B_BAD_VALUE;
+
 	descriptor = get_fd(get_current_io_context(false), fd);
 	if (!descriptor)
 		return B_FILE_ERROR;
@@ -554,7 +564,7 @@
 				break;
 			}
 
-			if ((uint32)bytesRead + length > SSIZE_MAX)
+			if ((uint64)bytesRead + length > SSIZE_MAX)
 				bytesRead = SSIZE_MAX;
 			else
 				bytesRead += (ssize_t)length;
@@ -584,6 +594,9 @@
 	if (IS_KERNEL_ADDRESS(buffer))
 		return B_BAD_ADDRESS;
 
+	if (pos < -1)
+		return B_BAD_VALUE;
+
 	descriptor = get_fd(get_current_io_context(false), fd);
 	if (!descriptor)
 		return B_FILE_ERROR;
@@ -626,6 +639,13 @@
 	if (!IS_USER_ADDRESS(userVecs))
 		return B_BAD_ADDRESS;
 
+	if (pos < -1)
+		return B_BAD_VALUE;
+
+	/* prevent integer overflow exploit in malloc() */
+	if (count > IOV_MAX)
+		return B_BAD_VALUE;
+
 	descriptor = get_fd(get_current_io_context(false), fd);
 	if (!descriptor)
 		return B_FILE_ERROR;
@@ -657,7 +677,7 @@
 				break;
 			}
 
-			if ((uint32)bytesWritten + length > SSIZE_MAX)
+			if ((uint64)bytesWritten + length > SSIZE_MAX)
 				bytesWritten = SSIZE_MAX;
 			else
 				bytesWritten += (ssize_t)length;
@@ -795,6 +815,9 @@
 	struct file_descriptor *descriptor;
 	ssize_t bytesRead;
 
+	if (pos < -1)
+		return B_BAD_VALUE;
+
 	descriptor = get_fd(get_current_io_context(true), fd);
 	if (!descriptor)
 		return B_FILE_ERROR;
@@ -832,6 +855,9 @@
 	status_t status;
 	uint32 i;
 
+	if (pos < -1)
+		return B_BAD_VALUE;
+
 	descriptor = get_fd(get_current_io_context(true), fd);
 	if (!descriptor)
 		return B_FILE_ERROR;
@@ -852,7 +878,7 @@
 				break;
 			}
 
-			if ((uint32)bytesRead + length > SSIZE_MAX)
+			if ((uint64)bytesRead + length > SSIZE_MAX)
 				bytesRead = SSIZE_MAX;
 			else
 				bytesRead += (ssize_t)length;
@@ -874,6 +900,9 @@
 	struct file_descriptor *descriptor;
 	ssize_t bytesWritten;
 
+	if (pos < -1)
+		return B_BAD_VALUE;
+
 	descriptor = get_fd(get_current_io_context(true), fd);
 	if (descriptor == NULL)
 		return B_FILE_ERROR;
@@ -911,6 +940,9 @@
 	status_t status;
 	uint32 i;
 
+	if (pos < -1)
+		return B_BAD_VALUE;
+
 	descriptor = get_fd(get_current_io_context(true), fd);
 	if (!descriptor)
 		return B_FILE_ERROR;
@@ -931,7 +963,7 @@
 				break;
 			}
 
-			if ((uint32)bytesWritten + length > SSIZE_MAX)
+			if ((uint64)bytesWritten + length > SSIZE_MAX)
 				bytesWritten = SSIZE_MAX;
 			else
 				bytesWritten += (ssize_t)length;



From axeld at mail.berlios.de  Tue Aug 21 21:10:51 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Tue, 21 Aug 2007 21:10:51 +0200
Subject: [Haiku-commits] r22032 - haiku/trunk/src/kits/tracker
Message-ID: <200708211910.l7LJApmc031838@sheep.berlios.de>

Author: axeld
Date: 2007-08-21 21:10:50 +0200 (Tue, 21 Aug 2007)
New Revision: 22032
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22032&view=rev

Modified:
   haiku/trunk/src/kits/tracker/TitleView.cpp
Log:
If Moved() has been called, Clicked() can't be called anymore; this actually
fixes a crashing bug when dropping a column too fast.


Modified: haiku/trunk/src/kits/tracker/TitleView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/TitleView.cpp	2007-08-21 19:07:10 UTC (rev 22031)
+++ haiku/trunk/src/kits/tracker/TitleView.cpp	2007-08-21 19:10:50 UTC (rev 22032)
@@ -543,7 +543,7 @@
 {
 	// if it is pressed shortly and not moved, it is a click 
 	// all else is a track
-	if (system_time() <= fPastClickTime) 
+	if (system_time() <= fPastClickTime && !fHasMoved) 
 		Clicked(where);
 	else
 		Done(where);



From marcusoverhagen at mail.berlios.de  Tue Aug 21 22:11:33 2007
From: marcusoverhagen at mail.berlios.de (marcusoverhagen at BerliOS)
Date: Tue, 21 Aug 2007 22:11:33 +0200
Subject: [Haiku-commits] r22033 - in haiku/trunk: build/jam
	src/add-ons/kernel/drivers/disk src/add-ons/kernel/drivers/disk/ahci
Message-ID: <200708212011.l7LKBXgO003248@sheep.berlios.de>

Author: marcusoverhagen
Date: 2007-08-21 22:11:32 +0200 (Tue, 21 Aug 2007)
New Revision: 22033
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22033&view=rev

Added:
   haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/
   haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/Jamfile
   haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci.c
   haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci_defs.h
   haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci_sim.c
Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/src/add-ons/kernel/drivers/disk/Jamfile
Log:
driver interface for ahci


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2007-08-21 19:10:50 UTC (rev 22032)
+++ haiku/trunk/build/jam/HaikuImage	2007-08-21 20:11:32 UTC (rev 22033)
@@ -153,7 +153,7 @@
 AddDriversToHaikuImage audio hmulti	: $(BEOS_ADD_ONS_DRIVERS_AUDIO) ;
 AddDriversToHaikuImage midi			: $(BEOS_ADD_ONS_DRIVERS_MIDI) ;
 AddDriversToHaikuImage bus			: usb_raw ;
-AddDriversToHaikuImage disk scsi	: scsi_cd scsi_dsk ;
+AddDriversToHaikuImage disk scsi	: ahci scsi_cd scsi_dsk ;
 AddDriversToHaikuImage disk virtual	: nbd ;
 AddDriversToHaikuImage dvb			: cx23882 ;
 AddDriversToHaikuImage graphics		: $(BEOS_ADD_ONS_DRIVERS_GRAPHICS) ;
@@ -346,7 +346,7 @@
 AddBootModuleSymlinksToHaikuImage config_manager bfs block_io fast_log
 	generic_ide_pci $(X86_ONLY)isa ide ide_adapter $(X86_ONLY)ide_isa intel
 	locked_pool $(PPC_ONLY)openpic pci scsi scsi_cd scsi_dsk scsi_periph
-	silicon_image_3112 legacy_sata
+	silicon_image_3112 legacy_sata ahci
 ;
 
 # add-ons

Modified: haiku/trunk/src/add-ons/kernel/drivers/disk/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/Jamfile	2007-08-21 19:10:50 UTC (rev 22032)
+++ haiku/trunk/src/add-ons/kernel/drivers/disk/Jamfile	2007-08-21 20:11:32 UTC (rev 22033)
@@ -1,5 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel drivers disk ;
 
+SubInclude HAIKU_TOP src add-ons kernel drivers disk acpi_loader ;
+SubInclude HAIKU_TOP src add-ons kernel drivers disk ahci ;
 SubInclude HAIKU_TOP src add-ons kernel drivers disk scsi ;
-SubInclude HAIKU_TOP src add-ons kernel drivers disk acpi_loader ;
 SubInclude HAIKU_TOP src add-ons kernel drivers disk virtual ;

Added: haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/Jamfile	2007-08-21 19:10:50 UTC (rev 22032)
+++ haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/Jamfile	2007-08-21 20:11:32 UTC (rev 22033)
@@ -0,0 +1,7 @@
+SubDir HAIKU_TOP src add-ons kernel drivers disk ahci ;
+
+
+KernelAddon ahci :
+	ahci.c
+	ahci_sim.c
+	;

Added: haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci.c	2007-08-21 19:10:50 UTC (rev 22032)
+++ haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci.c	2007-08-21 20:11:32 UTC (rev 22033)
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2007, Marcus Overhagen. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include <KernelExport.h>
+#include <device_manager.h>
+
+
+#define TRACE(a...) dprintf("ahci: " a)
+#define FLOW(a...)	dprintf("ahci: " a)
+
+static float
+ahci_supports_device(device_node_handle parent, bool *_noConnection)
+{
+	TRACE("ahci_supports_device\n");
+
+#if 0
+	uint16 vendor_id;
+	uint16 device_id;
+	uint8 base_class;
+	uint8 sub_class;
+	uint8 class_api;
+	status_t res;
+
+	if (base_class != PCI_mass_storage || sub_class != PCI_sata || class_api != PCI_sata_ahci)
+		return 0.0f;
+
+	TRACE("controller found! vendor 0x%04x, device 0x%04x\n", vendor_id, device_id);
+	
+	res = pci->find_pci_capability(device, PCI_cap_id_sata, &cap_ofs);
+	if (res == B_OK) {
+		uint32 satacr0;
+		uint32 satacr1;
+		TRACE("PCI SATA capability found at offset 0x%x\n", cap_ofs);
+		satacr0 = pci->read_pci_config(device, cap_ofs, 4);
+		satacr1 = pci->read_pci_config(device, cap_ofs + 4, 4);
+		TRACE("satacr0 = 0x%08x, satacr1 = 0x%08x\n", satacr0, satacr1);
+	}
+#endif
+
+
+	return 0.0;
+}
+
+
+static status_t
+ahci_register_device(device_node_handle parent)
+{
+	TRACE("ahci_register_device\n");
+	return B_OK;
+}
+
+
+static status_t
+ahci_init_driver(device_node_handle node, void *user_cookie, void **_cookie)
+{
+	TRACE("ahci_init_driver\n");
+	return B_OK;
+}
+
+
+static status_t
+ahci_uninit_driver(void *cookie)
+{
+	TRACE("ahci_uninit_driver\n");
+	return B_OK;
+}
+
+
+static void
+ahci_device_removed(device_node_handle node, void *cookie)
+{
+	TRACE("ahci_device_removed\n");
+}
+
+
+static void
+ahci_device_cleanup(device_node_handle node)
+{
+	TRACE("ahci_device_cleanup\n");
+}
+
+
+static void
+ahci_get_supported_paths(const char ***_busses, const char ***_devices)
+{
+	TRACE("ahci_get_supported_paths\n");
+}
+
+
+static status_t
+std_ops(int32 op, ...)
+{
+	switch (op) {
+		case B_MODULE_INIT:
+		case B_MODULE_UNINIT:
+			return B_OK;
+
+		default:
+			return B_ERROR;
+	}
+}
+
+
+driver_module_info ahci_driver = {
+	{
+		"ahci",
+		0,
+		std_ops
+	},
+	ahci_supports_device,
+	ahci_register_device,
+	ahci_init_driver,
+	ahci_uninit_driver,
+	ahci_device_removed,
+	ahci_device_cleanup,
+	ahci_get_supported_paths,
+};
+
+
+module_info *modules[] = {
+	(module_info *)&ahci_driver,
+	NULL
+};

Added: haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci_defs.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci_defs.h	2007-08-21 19:10:50 UTC (rev 22032)
+++ haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci_defs.h	2007-08-21 20:11:32 UTC (rev 22033)
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2007, Marcus Overhagen. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+#ifndef _AHCI_DEFS_H
+#define _AHCI_DEFS_H
+
+#include <SupportDefs.h>
+
+typedef struct
+{
+	uint32		clb;			// Command List Base Address
+	uint32		clbu;			// Command List Base Address Upper 32-Bits
+	uint32		fb;				// FIS Base Address
+	uint32		fbu;			// FIS Base Address Upper 32-Bits
+	uint32		is;				// Interrupt Status
+	uint32		ie;				// Interrupt Enable
+	uint32		cmd;			// Command and Status
+	uint32 		res1;			// Reserved
+	uint32		tfd;			// Task File Data
+	uint32		sig;			// Signature
+	uint32		ssts;			// Serial ATA Status (SCR0: SStatus)
+	uint32		sctl;			// Serial ATA Control (SCR2: SControl)
+	uint32		serr;			// Serial ATA Error (SCR1: SError)
+	uint32		sact;			// Serial ATA Active (SCR3: SActive)
+	uint32		ci;				// Command Issue
+	uint32		sntf;			// SNotification
+	uint32		res2;			// Reserved for FIS-based Switching Definition
+	uint32		res[11];		// Reserved
+	uint32		vendor[2];		// Vendor Specific
+} ahci_port;
+
+
+typedef struct
+{
+	uint32		cap;			// Host Capabilities
+	uint32		ghc;			// Global Host Control
+	uint32		is;				// Interrupt Status
+	uint32		pi;				// Ports Implemented
+	uint32		vs;				// Version
+	uint32		ccc_ctl;		// Command Completion Coalescing Control
+	uint32		ccc_ports;		// Command Completion Coalsecing Ports
+	uint32		em_loc;			// Enclosure Management Location
+	uint32		em_ctl;			// Enclosure Management Control
+	uint32		res[31];		// Reserved
+	uint32		vendor[24];		// Vendor Specific registers
+	ahci_port	port[32];
+} ahci_hba;
+
+#endif

Added: haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci_sim.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci_sim.c	2007-08-21 19:10:50 UTC (rev 22032)
+++ haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci_sim.c	2007-08-21 20:11:32 UTC (rev 22033)
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2007, Marcus Overhagen. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include <KernelExport.h>
+#include <bus/SCSI.h>
+
+#define TRACE(a...) dprintf("ahci: " a)
+#define FLOW(a...)	dprintf("ahci: " a)
+
+
+
+/*
+
+// SIM interface
+// SCSI controller drivers must provide this interface
+typedef struct scsi_sim_interface {
+	driver_module_info info;
+
+	// execute request
+	void (*scsi_io)( scsi_sim_cookie cookie, scsi_ccb *ccb );
+	// abort request
+	uchar (*abort)( scsi_sim_cookie cookie, scsi_ccb *ccb_to_abort );
+	// reset device
+	uchar (*reset_device)( scsi_sim_cookie cookie, uchar target_id, uchar target_lun );
+	// terminate request
+	uchar (*term_io)( scsi_sim_cookie cookie, scsi_ccb *ccb_to_terminate );
+
+	// get information about bus
+	uchar (*path_inquiry)( scsi_sim_cookie cookie, scsi_path_inquiry *inquiry_data );
+	// scan bus
+	// this is called immediately before the SCSI bus manager scans the bus
+	uchar (*scan_bus)( scsi_sim_cookie cookie );
+	// reset bus
+	uchar (*reset_bus)( scsi_sim_cookie cookie );
+	
+	// get restrictions of one device 
+	// (used for non-SCSI transport protocols and bug fixes)
+	void (*get_restrictions)(
+		scsi_sim_cookie 	cookie,
+		uchar				target_id,		// target id
+		bool				*is_atapi, 		// set to true if this is an ATAPI device that
+											// needs some commands emulated
+		bool				*no_autosense,	// set to true if there is no autosense;
+											// the SCSI bus manager will request sense on
+											// SCSI_REQ_CMP_ERR/SCSI_DEVICE_CHECK_CONDITION
+		uint32 				*max_blocks );	// maximum number of blocks per transfer if > 0;
+											// used for buggy devices that cannot handle
+											// large transfers (read: ATAPI ZIP drives)
+
+	status_t (*ioctl)(scsi_sim_cookie, uint8 targetID, uint32 op, void *buffer, size_t length);
+} scsi_sim_interface;
+
+*/



From mmu_man at mail.berlios.de  Wed Aug 22 12:33:24 2007
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Wed, 22 Aug 2007 12:33:24 +0200
Subject: [Haiku-commits] r22034 - haiku/trunk/src/bin
Message-ID: <200708221033.l7MAXO4t001971@sheep.berlios.de>

Author: mmu_man
Date: 2007-08-22 12:33:23 +0200 (Wed, 22 Aug 2007)
New Revision: 22034
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22034&view=rev

Modified:
   haiku/trunk/src/bin/sysinfo.c
Log:
This should work correctly with 3Go now :)


Modified: haiku/trunk/src/bin/sysinfo.c
===================================================================
--- haiku/trunk/src/bin/sysinfo.c	2007-08-21 20:11:32 UTC (rev 22033)
+++ haiku/trunk/src/bin/sysinfo.c	2007-08-22 10:33:23 UTC (rev 22034)
@@ -517,10 +517,10 @@
 static void
 dump_mem(system_info *info)
 {
-	printf("%10ld bytes free      (used/max %10ld / %10ld)\n",
-		B_PAGE_SIZE * (info->max_pages - info->used_pages),
-		B_PAGE_SIZE * info->used_pages,
-		B_PAGE_SIZE * info->max_pages);
+	printf("%10lu bytes free      (used/max %10lu / %10lu)\n",
+		B_PAGE_SIZE * (uint32)(info->max_pages - info->used_pages)),
+		B_PAGE_SIZE * (uint32)info->used_pages,
+		B_PAGE_SIZE * (uint32)info->max_pages);
 }
 
 



From bga at mail.berlios.de  Wed Aug 22 15:03:48 2007
From: bga at mail.berlios.de (bga at BerliOS)
Date: Wed, 22 Aug 2007 15:03:48 +0200
Subject: [Haiku-commits] r22035 - haiku/trunk/src/bin
Message-ID: <200708221303.l7MD3m4T025734@sheep.berlios.de>

Author: bga
Date: 2007-08-22 15:03:47 +0200 (Wed, 22 Aug 2007)
New Revision: 22035
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22035&view=rev

Modified:
   haiku/trunk/src/bin/sysinfo.c
Log:
- Fix build.



Modified: haiku/trunk/src/bin/sysinfo.c
===================================================================
--- haiku/trunk/src/bin/sysinfo.c	2007-08-22 10:33:23 UTC (rev 22034)
+++ haiku/trunk/src/bin/sysinfo.c	2007-08-22 13:03:47 UTC (rev 22035)
@@ -518,7 +518,7 @@
 dump_mem(system_info *info)
 {
 	printf("%10lu bytes free      (used/max %10lu / %10lu)\n",
-		B_PAGE_SIZE * (uint32)(info->max_pages - info->used_pages)),
+		B_PAGE_SIZE * (uint32)(info->max_pages - info->used_pages),
 		B_PAGE_SIZE * (uint32)info->used_pages,
 		B_PAGE_SIZE * (uint32)info->max_pages);
 }
@@ -642,4 +642,3 @@
 	}
 	return 0;
 }
-



From revol at free.fr  Wed Aug 22 15:13:46 2007
From: revol at free.fr (=?windows-1252?q?Fran=E7ois?= Revol)
Date: Wed, 22 Aug 2007 15:13:46 +0200 CEST
Subject: [Haiku-commits] r22035 - haiku/trunk/src/bin
In-Reply-To: <200708221303.l7MD3m4T025734@sheep.berlios.de>
Message-ID: <25372285727-BeMail@laptop>

> Author: bga
> Date: 2007-08-22 15:03:47 +0200 (Wed, 22 Aug 2007)
> New Revision: 22035
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22035&view=rev
> 
> Modified:
>    haiku/trunk/src/bin/sysinfo.c
> Log:
> - Fix build.

Oopsy, I get the dunce cap today C:-)

Fran?ois.


From stippi at mail.berlios.de  Wed Aug 22 16:14:31 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 22 Aug 2007 16:14:31 +0200
Subject: [Haiku-commits] r22036 - haiku/trunk/src/servers/app
Message-ID: <200708221414.l7MEEVJd004126@sheep.berlios.de>

Author: stippi
Date: 2007-08-22 16:14:30 +0200 (Wed, 22 Aug 2007)
New Revision: 22036
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22036&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
* clarified comment


Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-22 13:03:47 UTC (rev 22035)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2007-08-22 14:14:30 UTC (rev 22036)
@@ -1345,7 +1345,7 @@
 
 			// TODO: think about how to avoid this hack:
 			// the parent clipping needs to be updated, it is not
-			// done in MoveBy() since it would need to avoid
+			// done in MoveBy() since it would cause
 			// too much computations when children are resized because
 			// follow modes
 			if (ViewLayer* parent = fCurrentLayer->Parent())



From stippi at mail.berlios.de  Wed Aug 22 16:15:07 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 22 Aug 2007 16:15:07 +0200
Subject: [Haiku-commits] r22037 - haiku/trunk/src/servers/app
Message-ID: <200708221415.l7MEF7K4004199@sheep.berlios.de>

Author: stippi
Date: 2007-08-22 16:15:07 +0200 (Wed, 22 Aug 2007)
New Revision: 22037
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22037&view=rev

Modified:
   haiku/trunk/src/servers/app/FontCacheEntry.cpp
Log:
* reenabled implementation of "false bold width" font feature


Modified: haiku/trunk/src/servers/app/FontCacheEntry.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontCacheEntry.cpp	2007-08-22 14:14:30 UTC (rev 22036)
+++ haiku/trunk/src/servers/app/FontCacheEntry.cpp	2007-08-22 14:15:07 UTC (rev 22037)
@@ -241,6 +241,7 @@
 {
 	glyph_rendering renderingType = glyph_ren_native_gray8;
 	if (font.Rotation() != 0.0 || font.Shear() != 90.0
+		|| font.FalseBoldWidth() != 0.0
 		|| font.Flags() & B_DISABLE_ANTIALIASING
 		|| font.Size() > 30) {
 		renderingType = glyph_ren_outline;



From stippi at mail.berlios.de  Wed Aug 22 16:52:32 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 22 Aug 2007 16:52:32 +0200
Subject: [Haiku-commits] r22038 - haiku/trunk/src/kits/interface
Message-ID: <200708221452.l7MEqWZj008993@sheep.berlios.de>

Author: stippi
Date: 2007-08-22 16:52:31 +0200 (Wed, 22 Aug 2007)
New Revision: 22038
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22038&view=rev

Modified:
   haiku/trunk/src/kits/interface/MenuItem.cpp
Log:
* use a darker text color for disabled yet selected looking menu items


Modified: haiku/trunk/src/kits/interface/MenuItem.cpp
===================================================================
--- haiku/trunk/src/kits/interface/MenuItem.cpp	2007-08-22 14:15:07 UTC (rev 22037)
+++ haiku/trunk/src/kits/interface/MenuItem.cpp	2007-08-22 14:52:31 UTC (rev 22038)
@@ -461,11 +461,8 @@
 	// set high color
 	if (enabled)
 		fSuper->SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR));
-	else if (selected)
-		fSuper->SetHighColor(tint_color(noTint,
-			B_LIGHTEN_1_TINT));
 	else
-		fSuper->SetHighColor(tint_color(noTint,
+		fSuper->SetHighColor(tint_color(bgColor,
 			B_DISABLED_LABEL_TINT));
 
 	// draw content



From stippi at mail.berlios.de  Wed Aug 22 16:53:25 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 22 Aug 2007 16:53:25 +0200
Subject: [Haiku-commits] r22039 - haiku/trunk/src/kits/interface
Message-ID: <200708221453.l7MErP84009108@sheep.berlios.de>

Author: stippi
Date: 2007-08-22 16:53:24 +0200 (Wed, 22 Aug 2007)
New Revision: 22039
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22039&view=rev

Modified:
   haiku/trunk/src/kits/interface/View.cpp
Log:
* resizing scrolled views should have definitely been broken


Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2007-08-22 14:52:31 UTC (rev 22038)
+++ haiku/trunk/src/kits/interface/View.cpp	2007-08-22 14:53:24 UTC (rev 22039)
@@ -3601,8 +3601,6 @@
 void
 BView::ResizeBy(float deltaWidth, float deltaHeight)
 {
-	// TODO: this doesn't look like it would work correctly with scrolled views
-
 	// BeBook says we should do this. And it makes sense.
 	deltaWidth = roundf(deltaWidth);
 	deltaHeight = roundf(deltaHeight);
@@ -3614,8 +3612,8 @@
 		check_lock();
 		fOwner->fLink->StartMessage(AS_LAYER_RESIZE_TO);
 
-		fOwner->fLink->Attach<float>(fBounds.right + deltaWidth);
-		fOwner->fLink->Attach<float>(fBounds.bottom + deltaHeight);
+		fOwner->fLink->Attach<float>(fBounds.Width() + deltaWidth);
+		fOwner->fLink->Attach<float>(fBounds.Height() + deltaHeight);
 
 //		fState->valid_flags |= B_VIEW_FRAME_BIT;
 



From stippi at mail.berlios.de  Wed Aug 22 17:01:40 2007
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Wed, 22 Aug 2007 17:01:40 +0200
Subject: [Haiku-commits] r22040 - in haiku/trunk/src: kits/tracker
	preferences/backgrounds
Message-ID: <200708221501.l7MF1epQ010230@sheep.berlios.de>

Author: stippi
Date: 2007-08-22 17:01:38 +0200 (Wed, 22 Aug 2007)
New Revision: 22040
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22040&view=rev

Modified:
   haiku/trunk/src/kits/tracker/Background.h
   haiku/trunk/src/kits/tracker/BackgroundImage.cpp
   haiku/trunk/src/kits/tracker/BackgroundImage.h
   haiku/trunk/src/kits/tracker/Pose.cpp
   haiku/trunk/src/kits/tracker/PoseView.cpp
   haiku/trunk/src/kits/tracker/PoseView.h
   haiku/trunk/src/kits/tracker/TextWidget.cpp
   haiku/trunk/src/kits/tracker/TextWidget.h
   haiku/trunk/src/kits/tracker/Tracker.cpp
   haiku/trunk/src/kits/tracker/TrackerInitialState.cpp
   haiku/trunk/src/preferences/backgrounds/BackgroundImage.cpp
   haiku/trunk/src/preferences/backgrounds/BackgroundImage.h
   haiku/trunk/src/preferences/backgrounds/BackgroundsView.cpp
   haiku/trunk/src/preferences/backgrounds/BackgroundsView.h
Log:
changed the meaning of the "icon view label background" Tracker setting:
* it is replaced by a "icon view label outline" feature that renders a black
  or white outline around the text of a label under an icon. This can be used
  for background images that have a lot of contrast and is visually more
  pleasing (IMHO) than the text box in the workspace color (but the outline
  could of course still be improved as well)
  the outline or "false bold width" feature is a new BFont feature in Haiku
* Tracker appeared to have a disabled feature to install default background
  images, I enabled this feature and rewrote it a bit to use our big logo
  from the artwork folder, the placement is for 800x600, so not optimal for
  larger desktops, but at least it is shown by default on new installations
  or rather "fresh" images
* changed the way the dotted underline is rendered under links, accidentally,
  this fixes the bug that it was not dotted at all since a while, which is
  a bug in app_server or BView not tracking the need to update the drawing
  pattern in certain situations (this bug needs to be fixed too of course)


Modified: haiku/trunk/src/kits/tracker/Background.h
===================================================================
--- haiku/trunk/src/kits/tracker/Background.h	2007-08-22 14:53:24 UTC (rev 22039)
+++ haiku/trunk/src/kits/tracker/Background.h	2007-08-22 15:01:38 UTC (rev 22040)
@@ -45,11 +45,12 @@
 /*----------------------------------------------------------------*/
 /*-----  Tracker background BMessage entries  --------------------*/
 
-#define B_BACKGROUND_IMAGE		"be:bgndimginfopath"		// string path
-#define B_BACKGROUND_MODE		"be:bgndimginfomode"		// int32, the enum below
-#define B_BACKGROUND_ORIGIN		"be:bgndimginfooffset"		// BPoint
-#define B_BACKGROUND_ERASE_TEXT	"be:bgndimginfoerasetext"	// bool
-#define B_BACKGROUND_WORKSPACES	"be:bgndimginfoworkspaces"	// uint32
+#define B_BACKGROUND_IMAGE			"be:bgndimginfopath"		// string path
+#define B_BACKGROUND_MODE			"be:bgndimginfomode"		// int32, the enum below
+#define B_BACKGROUND_ORIGIN			"be:bgndimginfooffset"		// BPoint
+#define B_BACKGROUND_TEXT_OUTLINE	"be:bgndimginfoerasetext"	// bool
+	// NOTE: the actual attribute name is kept for backwards compatible settings
+#define B_BACKGROUND_WORKSPACES		"be:bgndimginfoworkspaces"	// uint32
 
 /*----------------------------------------------------------------*/
 /*-----  Background mode values  ---------------------------------*/

Modified: haiku/trunk/src/kits/tracker/BackgroundImage.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/BackgroundImage.cpp	2007-08-22 14:53:24 UTC (rev 22039)
+++ haiku/trunk/src/kits/tracker/BackgroundImage.cpp	2007-08-22 15:01:38 UTC (rev 22040)
@@ -44,17 +44,19 @@
 #include <fs_attr.h>
 
 #include "BackgroundImage.h"
+
+#include "Background.h"
 #include "Commands.h"
 #include "PoseView.h"
 
 namespace BPrivate {
 
-const char *kBackgroundImageInfo 			= "be:bgndimginfo";
-const char *kBackgroundImageInfoOffset 		= "be:bgndimginfooffset";
-const char *kBackgroundImageInfoEraseText	= "be:bgndimginfoerasetext";
-const char *kBackgroundImageInfoMode 		= "be:bgndimginfomode";
-const char *kBackgroundImageInfoWorkspaces 	= "be:bgndimginfoworkspaces";
-const char *kBackgroundImageInfoPath 		= "be:bgndimginfopath";
+const char *kBackgroundImageInfo 			= B_BACKGROUND_INFO;
+const char *kBackgroundImageInfoOffset 		= B_BACKGROUND_ORIGIN;
+const char *kBackgroundImageInfoTextOutline	= B_BACKGROUND_TEXT_OUTLINE;
+const char *kBackgroundImageInfoMode 		= B_BACKGROUND_MODE;
+const char *kBackgroundImageInfoWorkspaces 	= B_BACKGROUND_WORKSPACES;
+const char *kBackgroundImageInfoPath 		= B_BACKGROUND_IMAGE;
 
 }
 
@@ -82,7 +84,7 @@
 		const char *path;
 		uint32 workspaces = B_ALL_WORKSPACES;
 		Mode mode = kTiled;
-		bool eraseTextWidgetBackground = true;
+		bool textWidgetLabelOutline = false;
 		BPoint offset;
 		
 		if (container.FindString(kBackgroundImageInfoPath, index, &path) != B_OK)
@@ -96,12 +98,12 @@
 		
 		container.FindInt32(kBackgroundImageInfoWorkspaces, index, (int32 *)&workspaces);
 		container.FindInt32(kBackgroundImageInfoMode, index, (int32 *)&mode);
-		container.FindBool(kBackgroundImageInfoEraseText, index, &eraseTextWidgetBackground);
+		container.FindBool(kBackgroundImageInfoTextOutline, index, &textWidgetLabelOutline);
 		container.FindPoint(kBackgroundImageInfoOffset, index, &offset);
 		
 		BackgroundImage::BackgroundImageInfo *imageInfo = new
 			BackgroundImage::BackgroundImageInfo(workspaces, bitmap, mode, offset,
-				eraseTextWidgetBackground);
+				textWidgetLabelOutline);
 
 		if (!result) 
 			result = new BackgroundImage(node, isDesktop);
@@ -113,12 +115,12 @@
 
 
 BackgroundImage::BackgroundImageInfo::BackgroundImageInfo(uint32 workspaces,
-	BBitmap *bitmap, Mode mode, BPoint offset, bool eraseTextWidget)
+	BBitmap *bitmap, Mode mode, BPoint offset, bool textWidgetOutline)
 	:	fWorkspace(workspaces),
 		fBitmap(bitmap),
 		fMode(mode),
 		fOffset(offset),
-		fEraseTextWidgetBackground(eraseTextWidget)
+		fTextWidgetOutline(textWidgetOutline)
 {
 }
 
@@ -158,7 +160,7 @@
 	if (info) {
 		BPoseView *poseView = dynamic_cast<BPoseView *>(fView);
 		if (poseView)
-			poseView->SetEraseWidgetTextBackground(info->fEraseTextWidgetBackground);
+			poseView->SetWidgetTextOutline(info->fTextWidgetOutline);
 		Show(info, fView);
 	}
 }
@@ -205,7 +207,7 @@
 	
 	BPoseView *poseView = dynamic_cast<BPoseView *>(view);
 	if (poseView)
-		poseView->SetEraseWidgetTextBackground(info->fEraseTextWidgetBackground);
+		poseView->SetWidgetTextOutline(info->fTextWidgetOutline);
 	
 	// switch to the bitmap and force a redraw
 	view->SetViewBitmap(info->fBitmap, bitmapBounds, destinationBitmapBounds,
@@ -224,7 +226,7 @@
 		BPoseView *poseView = dynamic_cast<BPoseView *>(fView);
 		// make sure text widgets draw the default way, erasing their background
 		if (poseView)
-			poseView->SetEraseWidgetTextBackground(true);
+			poseView->SetWidgetTextOutline(true);
 	}
 	fShowingBitmap = NULL;
 }
@@ -271,7 +273,7 @@
 			Show(info, view);
 		else {
 			if (BPoseView *poseView = dynamic_cast<BPoseView *>(view))
-				poseView->SetEraseWidgetTextBackground(true);
+				poseView->SetWidgetTextOutline(true);
 			view->ClearViewBitmap();
 			view->Invalidate();
 		}

Modified: haiku/trunk/src/kits/tracker/BackgroundImage.h
===================================================================
--- haiku/trunk/src/kits/tracker/BackgroundImage.h	2007-08-22 14:53:24 UTC (rev 22039)
+++ haiku/trunk/src/kits/tracker/BackgroundImage.h	2007-08-22 15:01:38 UTC (rev 22040)
@@ -52,7 +52,7 @@
 
 extern const char *kBackgroundImageInfo;
 extern const char *kBackgroundImageInfoOffset;
-extern const char *kBackgroundImageInfoEraseText;
+extern const char *kBackgroundImageInfoTextOutline;
 extern const char *kBackgroundImageInfoMode;
 extern const char *kBackgroundImageInfoWorkspaces;
 extern const char *kBackgroundImageInfoPath;
@@ -77,14 +77,14 @@
 		// element of the per-workspace list
 	public:
 		BackgroundImageInfo(uint32 workspace, BBitmap *bitmap, Mode mode, BPoint offset,
-			bool eraseTextWidget);
+			bool textWidgetOutline);
 		~BackgroundImageInfo();
 
 		uint32 fWorkspace;
 		BBitmap *fBitmap;
 		Mode fMode;
 		BPoint fOffset;
-		bool fEraseTextWidgetBackground;
+		bool fTextWidgetOutline;
 	};
 
 	static BackgroundImage *GetBackgroundImage(const BNode *, bool isDesktop);

Modified: haiku/trunk/src/kits/tracker/Pose.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/Pose.cpp	2007-08-22 14:53:24 UTC (rev 22039)
+++ haiku/trunk/src/kits/tracker/Pose.cpp	2007-08-22 15:01:38 UTC (rev 22040)
@@ -581,7 +581,7 @@
 						widget->RecalculateText(poseView);
 					
 					bool selectDuringDraw = directDraw && selected
-						&& (windowActive && !poseView->EraseWidgetTextBackground());
+						&& (windowActive && !poseView->WidgetTextOutline());
 					
 					if (index == 0 && selectDuringDraw) {
 						//draw with dark background to select text
@@ -638,7 +638,7 @@
 
 		bool selectDuringDraw = directDraw && selected
 			&& (poseView->IsDesktopWindow()
-			|| (windowActive && !poseView->EraseWidgetTextBackground()));
+			|| (windowActive && !poseView->WidgetTextOutline()));
 			
 		if (selectDuringDraw) {
 			// draw with dark background to select text

Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2007-08-22 14:53:24 UTC (rev 22039)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2007-08-22 15:01:38 UTC (rev 22040)
@@ -196,7 +196,7 @@
 	fRefFilter(NULL),
 	fAutoScrollInc(20),
 	fAutoScrollState(kAutoScrollOff),
-	fEraseWidgetBackground(true),
+	fWidgetTextOutline(false),
 	fSelectionPivotPose(NULL),
 	fRealPivotPose(NULL),
 	fKeyRunner(NULL),
@@ -2873,7 +2873,7 @@
 						|| bounds.Contains(poseRect.LeftBottom())
 						|| bounds.Contains(poseRect.RightBottom())
 						|| bounds.Contains(poseRect.RightTop())) {
-						if (!EraseWidgetTextBackground()
+						if (!WidgetTextOutline()
 							|| clipNode->moveMode == kMoveSelectionTo)
 							Invalidate(poseRect);
 						else
@@ -3432,7 +3432,7 @@
 				poseRect = pose->CalcRect(loc, this);
 
 			if (bounds.Intersects(poseRect)) {
-				if (EraseWidgetTextBackground())
+				if (WidgetTextOutline())
 					Invalidate(poseRect);
 				else
 					pose->Draw(poseRect, this, false);
@@ -6871,7 +6871,7 @@
 										// using a vector class instead of BList
 
 			if ((selected != pose->IsSelected()) && poseRect.Intersects(bounds)) {
-				if (pose->IsSelected() || EraseWidgetTextBackground())
+				if (pose->IsSelected() || WidgetTextOutline())
 					pose->Draw(poseRect, this, false);
 				else
 					Invalidate(poseRect);
@@ -6900,7 +6900,7 @@
 			BRect poseRect(pose->CalcRect(loc, this));
 
 			if (poseRect.Intersects(bounds)) {
-				if (pose->IsSelected() || EraseWidgetTextBackground())
+				if (pose->IsSelected() || WidgetTextOutline())
 					pose->Draw(poseRect, this, false);
 				else
 					Invalidate(poseRect);
@@ -6939,7 +6939,7 @@
 				newList->AddItem((void *)index);
 
 				if ((selected != pose->IsSelected()) && poseRect.Intersects(bounds)) {
-					if (pose->IsSelected() || EraseWidgetTextBackground())
+					if (pose->IsSelected() || WidgetTextOutline())
 						pose->Draw(poseRect, this, false);
 					else
 						Invalidate(poseRect);
@@ -6967,7 +6967,7 @@
 			BRect poseRect(pose->CalcRect(this));
 
 			if (poseRect.Intersects(bounds)) {
-				if (pose->IsSelected() || EraseWidgetTextBackground())
+				if (pose->IsSelected() || WidgetTextOutline())
 					pose->Draw(poseRect, this, false);
 				else
 					Invalidate(poseRect);
@@ -7725,7 +7725,7 @@
 				if (pose->IsSelected()) {
 					pose->Select(false);
 					BRect poseRect(pose->CalcRect(loc, this, false));
-					if (EraseWidgetTextBackground())
+					if (WidgetTextOutline())
 						pose->Draw(poseRect, this, false);
 					else
 						Invalidate(poseRect);
@@ -7744,7 +7744,7 @@
 					if (pose->IsSelected()) {
 						pose->Select(false);
 						BRect poseRect(pose->CalcRect(this));
-						if (EraseWidgetTextBackground())
+						if (WidgetTextOutline())
 							pose->Draw(poseRect, this, false);
 						else
 							Invalidate(poseRect);
@@ -7807,7 +7807,7 @@
 						if (pose->IsSelected() != show || fShowSelectionWhenInactive) {
 							if (!fShowSelectionWhenInactive)
 								pose->Select(show);
-							if (show && EraseWidgetTextBackground())
+							if (show && WidgetTextOutline())
 								pose->Draw(pose->CalcRect(this), this, false);
 							else
 								Invalidate(pose->CalcRect(this));
@@ -7850,7 +7850,7 @@
 	pose->Select(select);
 
 	// update display
-	if (EraseWidgetTextBackground())
+	if (WidgetTextOutline())
 		DrawPose(pose, index, false);
 	else
 		Invalidate(pose->CalcRect(this));
@@ -8887,7 +8887,7 @@
 			BPose *pose = fVSPoseList->ItemAt(index);
 			if (pose) {
 				if (pose == fDropTarget) {
-					if (!hiliteState && !EraseWidgetTextBackground())
+					if (!hiliteState && !WidgetTextOutline())
 						// deselecting an icon with widget drawn over background
 						// have to be a little tricky here - draw just the icon,
 						// invalidate the widget
@@ -9210,16 +9210,16 @@
 
 
 bool
-BPoseView::EraseWidgetTextBackground() const
+BPoseView::WidgetTextOutline() const
 {
-	return fEraseWidgetBackground;
+	return fWidgetTextOutline;
 }
 
 
 void
-BPoseView::SetEraseWidgetTextBackground(bool on)
+BPoseView::SetWidgetTextOutline(bool on)
 {
-	fEraseWidgetBackground = on;
+	fWidgetTextOutline = on;
 }
 
 

Modified: haiku/trunk/src/kits/tracker/PoseView.h
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.h	2007-08-22 14:53:24 UTC (rev 22039)
+++ haiku/trunk/src/kits/tracker/PoseView.h	2007-08-22 15:01:38 UTC (rev 22040)
@@ -207,8 +207,8 @@
 		rgb_color DeskTextColor() const;
 		rgb_color DeskTextBackColor() const;
 
-		bool EraseWidgetTextBackground() const;
-		void SetEraseWidgetTextBackground(bool);
+		bool WidgetTextOutline() const;
+		void SetWidgetTextOutline(bool);
 			// used to not erase when we have a background image and
 			// invalidate instead
 
@@ -627,7 +627,7 @@
 		float fAutoScrollInc;
 		int32 fAutoScrollState;
 		std::set<thread_id> fAddPosesThreads;
-		bool fEraseWidgetBackground;
+		bool fWidgetTextOutline;
 		const BPose *fSelectionPivotPose;
 		const BPose *fRealPivotPose;
 		BMessageRunner *fKeyRunner;

Modified: haiku/trunk/src/kits/tracker/TextWidget.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/TextWidget.cpp	2007-08-22 14:53:24 UTC (rev 22039)
+++ haiku/trunk/src/kits/tracker/TextWidget.cpp	2007-08-22 15:01:38 UTC (rev 22040)
@@ -477,12 +477,22 @@
 BTextWidget::Draw(BRect eraseRect, BRect textRect, float, BPoseView *view,
 	BView *drawView, bool selected, uint32 clipboardMode, BPoint offset, bool direct)
 {
+	textRect.OffsetBy(offset);
+
 	if (direct) {
+#if __HAIKU__
+		// draw selection box if selected
+		if (selected) {
+#else
 		// erase area we're going to draw in
-		if (view->EraseWidgetTextBackground() || selected) {
+		// NOTE: WidgetTextOutline() is reused for
+		// erasing background on R5 here
+		if (view->WidgetTextOutline() || selected) {
+#endif
 			drawView->SetDrawingMode(B_OP_COPY);
 			eraseRect.OffsetBy(offset);
-			drawView->FillRect(eraseRect, B_SOLID_LOW);
+//			drawView->FillRect(eraseRect, B_SOLID_LOW);
+			drawView->FillRect(textRect, B_SOLID_LOW);
 		} else
 			drawView->SetDrawingMode(B_OP_OVER);	
 
@@ -493,34 +503,74 @@
 				highColor = kWhite;
 			else
 				highColor = view->DeskTextColor();
-		} else if (selected && view->Window()->IsActive() && !view->EraseWidgetTextBackground()) {
+		} else if (selected && view->Window()->IsActive()) {
 			highColor = kWhite;
 		} else
 			highColor = kBlack;
 
 		if (clipboardMode == kMoveSelectionTo && !selected) {
-			view->SetDrawingMode(B_OP_ALPHA);
-			view->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
+			drawView->SetDrawingMode(B_OP_ALPHA);
+			drawView->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
 			highColor.alpha = 64;
 		}
 		drawView->SetHighColor(highColor);
 	}
 
 	BPoint loc;
-	textRect.OffsetBy(offset);
-
 	loc.y = textRect.bottom - view->FontInfo().descent;
 	loc.x = textRect.left + 1;
 
-	drawView->MovePenTo(loc);
-	drawView->DrawString(fText->FittingText(view));
+	const char* fittingText = fText->FittingText(view);
 
+#if __HAIKU__
+	if (!selected && view->WidgetTextOutline()) {
+		// draw a halo around the text by using the "false bold"
+		// feature for text rendering. Either black or white is used for
+		// the glow (whatever acts as contrast) with a some alpha value,
+		// two passes are used to achive a blur effect
+		drawView->SetDrawingMode(B_OP_ALPHA);
+		drawView->SetBlendingMode(B_CONSTANT_ALPHA, B_ALPHA_OVERLAY);
+
+		BFont font;
+		drawView->GetFont(&font);
+// NOTE: commented out first pass for halo, since just a plain
+// outline looks better IMHO -stippi
+//		font.SetFalseBoldWidth(2.0);
+//		drawView->SetFont(&font, B_FONT_FALSE_BOLD_WIDTH);
+		rgb_color textColor = drawView->HighColor();
+		rgb_color glow = textColor.red
+			+ textColor.green + textColor.blue > 128 * 3 ? kBlack : kWhite;
+//		glow.alpha = 40;
+//		drawView->SetHighColor(glow);
+
+//		drawView->DrawString(fittingText, loc);
+
+		font.SetFalseBoldWidth(1.0);
+		drawView->SetFont(&font, B_FONT_FALSE_BOLD_WIDTH);
+		glow.alpha = 220;
+		drawView->SetHighColor(glow);
+
+		drawView->DrawString(fittingText, loc);
+
+		font.SetFalseBoldWidth(0.0);
+		drawView->SetFont(&font, B_FONT_FALSE_BOLD_WIDTH);
+		drawView->SetHighColor(textColor);
+	}
+#endif // __HAIKU__
+
+	drawView->DrawString(fittingText, loc);
+
 	if (fSymLink && (fAttrHash == view->FirstColumn()->AttrHash())) {
 		// ToDo:
 		// this should be exported to the WidgetAttribute class, probably
 		// by having a per widget kind style
-		if (direct) 
-			drawView->SetHighColor(125, 125, 125);
+		if (direct) {
+			rgb_color underlineColor = drawView->HighColor();
+			underlineColor.alpha = 180;
+			drawView->SetHighColor(underlineColor);
+			drawView->SetDrawingMode(B_OP_ALPHA);
+			drawView->SetBlendingMode(B_CONSTANT_ALPHA, B_ALPHA_OVERLAY);
+		}
 
 		textRect.right = textRect.left + fText->Width(view);
 			// only underline text part

Modified: haiku/trunk/src/kits/tracker/TextWidget.h
===================================================================
--- haiku/trunk/src/kits/tracker/TextWidget.h	2007-08-22 14:53:24 UTC (rev 22039)
+++ haiku/trunk/src/kits/tracker/TextWidget.h	2007-08-22 15:01:38 UTC (rev 22040)
@@ -86,7 +86,7 @@
 	void SetActive(bool);
 	
 	const char *Text() const;
-		// returns the untrucated version of the text
+		// returns the untruncated version of the text
 	float TextWidth(const BPoseView *) const;
 	float PreferredWidth(const BPoseView *) const;
 	int	Compare(const BTextWidget &, BPoseView *) const;

Modified: haiku/trunk/src/kits/tracker/Tracker.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/Tracker.cpp	2007-08-22 14:53:24 UTC (rev 22039)
+++ haiku/trunk/src/kits/tracker/Tracker.cpp	2007-08-22 15:01:38 UTC (rev 22040)
@@ -1280,6 +1280,7 @@
 	InitMimeTypes();
 	InstallDefaultTemplates();
 	InstallIndices();
+	InstallTemporaryBackgroundImages();
 	
 	HideVarDir();
 

Modified: haiku/trunk/src/kits/tracker/TrackerInitialState.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/TrackerInitialState.cpp	2007-08-22 14:53:24 UTC (rev 22039)
+++ haiku/trunk/src/kits/tracker/TrackerInitialState.cpp	2007-08-22 15:01:38 UTC (rev 22040)
@@ -41,6 +41,7 @@
 #include <Message.h>
 #include <Node.h>
 #include <Path.h>
+#include <Screen.h>
 #include <VolumeRoster.h>
 
 #include <fs_attr.h>
@@ -429,24 +430,24 @@
 
 static void
 AddTemporaryBackgroundImages(BMessage *message, const char *imagePath,
-	BackgroundImage::Mode mode, BPoint offset, uint32 workspaces, bool eraseTextWidgets)
+	BackgroundImage::Mode mode, BPoint offset, uint32 workspaces, bool textWidgetOutlines)
 {
 	message->AddString(kBackgroundImageInfoPath, imagePath);
 	message->AddInt32(kBackgroundImageInfoWorkspaces, (int32)workspaces);
 	message->AddInt32(kBackgroundImageInfoMode, mode);
-	message->AddBool(kBackgroundImageInfoEraseText, eraseTextWidgets);
+	message->AddBool(kBackgroundImageInfoTextOutline, textWidgetOutlines);
 	message->AddPoint(kBackgroundImageInfoOffset, offset);
 }
 
 static void
 InstallTemporaryBackgroundImagesIfNeeded(BNode *node, const char *imagePath,
-	BackgroundImage::Mode mode, BPoint offset, uint32 workspaces, bool eraseTextWidgets)
+	BackgroundImage::Mode mode, BPoint offset, uint32 workspaces, bool textWidgetOutlines)
 {
 	attr_info info;
 	if (node->GetAttrInfo(kBackgroundImageInfo, &info) != B_OK) {
 		BMessage message;
 		AddTemporaryBackgroundImages(&message, imagePath, mode, offset, workspaces,
-			eraseTextWidgets);
+			textWidgetOutlines);
 		InstallTemporaryBackgroundImages(node, &message);
 	}
 }
@@ -454,97 +455,39 @@
 void 
 TTracker::InstallTemporaryBackgroundImages()
 {
-	// TODO: make the large Haiku Logo the default background
+	// make the large Haiku Logo the default background
 
-	BPath path;
-	FSFindTrackerSettingsDir(&path, false);
-	BString defaultFolderPath(path.Path());
-	defaultFolderPath << '/' << kDefaultFolderTemplate << '/';
-	
+//	BPath path;
+	BPath path("/boot/beos/etc/artwork");
+//	FSFindTrackerSettingsDir(&path, false);
+//	path.Append(kDefaultFolderTemplate);
+
+	BString defaultBackgroundImage("/HAIKU logo - white on blue - big.png");
+	BString defaultBackgroundTexture("/backgroundTexture.tga");
+
 	BNode node;
-	if (BContainerWindow::DefaultStateSourceNode(kDefaultFolderTemplate, &node, true))
+	if (BContainerWindow::DefaultStateSourceNode(kDefaultFolderTemplate, &node, true)) {
+		// install a default background texture for folders in icon view mode
 		InstallTemporaryBackgroundImagesIfNeeded(&node,
-			(BString(defaultFolderPath) << "backgroundTexture.tga").String(),
+			(BString(path.Path()) << defaultBackgroundTexture).String(),
 			BackgroundImage::kTiled,
 			BPoint(0, 0), 0xffffffff, false);
+	}
 
 	BDirectory dir;
 	if (FSGetBootDeskDir(&dir) == B_OK) {
+		// install a default background if there is no background defined yet
 		attr_info info;
 		if (dir.GetAttrInfo(kBackgroundImageInfo, &info) != B_OK) {
+			BScreen screen(B_MAIN_SCREEN_ID);
+			BPoint logoPos;
+			logoPos.x = floorf((screen.Frame().Width() - 605) * (sqrtf(5) - 1) / 2);
+			logoPos.y = floorf((screen.Frame().Height() - 190) * 0.9);
 			BMessage message;
 			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bgdefault.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0xffffffff, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg1.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00000001, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg2.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00000002, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg3.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00000004, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg4.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00000008, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg5.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00000010, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg6.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00000020, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg7.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00000040, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg8.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00000080, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg9.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00000100, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg10.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00000200, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg11.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00000400, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg12.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00000800, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg12.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00001000, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg13.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00002000, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg14.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00002000, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg15.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00004000, true);
-			AddTemporaryBackgroundImages(&message,
-				(BString(defaultFolderPath) << "bg16.tga").String(),
-				BackgroundImage::kScaledToFit,
-				BPoint(0, 0), 0x00008000, true);
+				(BString(path.Path()) << defaultBackgroundImage).String(),
+				BackgroundImage::kAtOffset,
+				logoPos, 0xffffffff, false);
 			::InstallTemporaryBackgroundImages(&dir, &message);
 		}
 	}

Modified: haiku/trunk/src/preferences/backgrounds/BackgroundImage.cpp
===================================================================
--- haiku/trunk/src/preferences/backgrounds/BackgroundImage.cpp	2007-08-22 14:53:24 UTC (rev 22039)
+++ haiku/trunk/src/preferences/backgrounds/BackgroundImage.cpp	2007-08-22 15:01:38 UTC (rev 22040)
@@ -57,7 +57,11 @@
 
 const char *kBackgroundImageInfo 			= "be:bgndimginfo";
 const char *kBackgroundImageInfoOffset 		= "be:bgndimginfooffset";
-const char *kBackgroundImageInfoEraseText	= "be:bgndimginfoerasetext";
+//const char *kBackgroundImageInfoTextOutline	= "be:bgndimginfotextoutline";
+const char *kBackgroundImageInfoTextOutline	= "be:bgndimginfoerasetext";
+// NOTE: the attribute keeps the old name for backwards compatibility,
+// just in case some users spend time configuring a few windows with
+// this feature on or off...
 const char *kBackgroundImageInfoMode 		= "be:bgndimginfomode";
 const char *kBackgroundImageInfoWorkspaces 	= "be:bgndimginfoworkspaces";
 const char *kBackgroundImageInfoPath 		= "be:bgndimginfopath";
@@ -107,7 +111,7 @@
 		const char *path;
 		uint32 workspaces = B_ALL_WORKSPACES;
 		Mode mode = kTiled;
-		bool eraseTextWidgetBackground = true;
+		bool textWidgetLabelOutline = false;
 		BPoint offset;
 		uint32 imageSet = 0;
 		uint32 cacheMode = 0;
@@ -122,8 +126,8 @@
 		container.FindInt32(kBackgroundImageInfoWorkspaces, index,
 			(int32 *)&workspaces);
 		container.FindInt32(kBackgroundImageInfoMode, index, (int32 *)&mode);
-		container.FindBool(kBackgroundImageInfoEraseText, index,
-			&eraseTextWidgetBackground);
+		container.FindBool(kBackgroundImageInfoTextOutline, index,
+			&textWidgetLabelOutline);
 		container.FindPoint(kBackgroundImageInfoOffset, index, &offset);
 
 		if (isDesktop) {
@@ -135,7 +139,7 @@
 
 		BackgroundImage::BackgroundImageInfo *imageInfo = new
 			BackgroundImage::BackgroundImageInfo(workspaces, imageIndex,
-				mode, offset, eraseTextWidgetBackground, imageSet, cacheMode);
+				mode, offset, textWidgetLabelOutline, imageSet, cacheMode);
 
 		//imageInfo->UnloadBitmap(globalCacheMode);
 
@@ -159,14 +163,14 @@
 
 
 BackgroundImage::BackgroundImageInfo::BackgroundImageInfo(uint32 workspaces,
-	int32 imageIndex, Mode mode, BPoint offset, bool eraseTextWidget,
+	int32 imageIndex, Mode mode, BPoint offset, bool textWidgetLabelOutline,
 	uint32 imageSet, uint32 cacheMode)
 	:
 	fWorkspace(workspaces),
 	fImageIndex(imageIndex),
 	fMode(mode),
 	fOffset(offset),
-	fEraseTextWidgetBackground(eraseTextWidget),
+	fTextWidgetLabelOutline(textWidgetLabelOutline),
 	fImageSet(imageSet),
 	fCacheMode(cacheMode)
 {
@@ -239,7 +243,7 @@
 	if (info) {
 		/*BPoseView *poseView = dynamic_cast<BPoseView *>(fView);
 		if (poseView)
-			poseView->SetEraseWidgetTextBackground(info->fEraseTextWidgetBackground);*/
+			poseView->SetEraseWidgetTextBackground(info->fTextWidgetLabelOutline);*/
 		Show(info, fView);
 	}
 }
@@ -425,8 +429,8 @@
 		if (fBackgroundsView->GetImage(info->fImageIndex) == NULL)
 			continue;
 
-		container.AddBool(kBackgroundImageInfoEraseText,
-			info->fEraseTextWidgetBackground);
+		container.AddBool(kBackgroundImageInfoTextOutline,
+			info->fTextWidgetLabelOutline);
 		container.AddString(kBackgroundImageInfoPath,
 			fBackgroundsView->GetImage(info->fImageIndex)->GetPath().Path());
 		container.AddInt32(kBackgroundImageInfoWorkspaces, info->fWorkspace);

Modified: haiku/trunk/src/preferences/backgrounds/BackgroundImage.h
===================================================================
--- haiku/trunk/src/preferences/backgrounds/BackgroundImage.h	2007-08-22 14:53:24 UTC (rev 22039)
+++ haiku/trunk/src/preferences/backgrounds/BackgroundImage.h	2007-08-22 15:01:38 UTC (rev 22040)
@@ -83,7 +83,7 @@
 				// element of the per-workspace list
 			public:
 				BackgroundImageInfo(uint32 workspace, int32 imageIndex, Mode mode,
-					BPoint offset, bool eraseTextWidget, uint32 imageSet,
+					BPoint offset, bool textWidgetLabelOutline, uint32 imageSet,
 					uint32 cacheMode);
 				~BackgroundImageInfo();
 
@@ -94,7 +94,7 @@
 				int32 fImageIndex;
 				Mode fMode;
 				BPoint fOffset;
-				bool fEraseTextWidgetBackground;
+				bool fTextWidgetLabelOutline;
 				uint32 fImageSet;
 				uint32 fCacheMode;		// image cache strategy (0 cache , 1 no cache)
 		};

Modified: haiku/trunk/src/preferences/backgrounds/BackgroundsView.cpp
===================================================================
--- haiku/trunk/src/preferences/backgrounds/BackgroundsView.cpp	2007-08-22 14:53:24 UTC (rev 22039)
+++ haiku/trunk/src/preferences/backgrounds/BackgroundsView.cpp	2007-08-22 15:01:38 UTC (rev 22040)
@@ -42,7 +42,7 @@
 static const uint32 kMsgManualPlacement = 'mnpl';
 static const uint32 kMsgScalePlacement = 'scpl';
 static const uint32 kMsgTilePlacement = 'tlpl';
-static const uint32 kMsgIconLabelBackground = 'ilcb';
+static const uint32 kMsgIconLabelOutline = 'ilol';
 
 static const uint32 kMsgImagePlacement = 'xypl';
 static const uint32 kMsgUpdatePreviewPlacement = 'pvpl';
@@ -207,18 +207,18 @@
 	rightbox->AddChild(placementMenuField);
 
 	rect.OffsetBy(offset, placementMenuField->Bounds().Height() + 5);
-	fIconLabelBackground = new BCheckBox(rect, "iconLabelBackground",
-		"Icon label background", new BMessage(kMsgIconLabelBackground));
-	fIconLabelBackground->SetValue(B_CONTROL_ON);
-	fIconLabelBackground->ResizeToPreferred();
-	rightbox->AddChild(fIconLabelBackground);
+	fIconLabelOutline = new BCheckBox(rect, "iconLabelOutline",
+		"Icon label outline", new BMessage(kMsgIconLabelOutline));
+	fIconLabelOutline->SetValue(B_CONTROL_OFF);
+	fIconLabelOutline->ResizeToPreferred();
+	rightbox->AddChild(fIconLabelOutline);
 
-	rect.top += fIconLabelBackground->Bounds().Height() + 15;
+	rect.top += fIconLabelOutline->Bounds().Height() + 15;
 	fPicker = new BColorControl(BPoint(10, rect.top), B_CELLS_32x8, 5.0, "Picker",
 		new BMessage(kMsgUpdateColor));
 	rightbox->AddChild(fPicker);
 
-	float xDelta = max_c(fIconLabelBackground->Frame().right, fPicker->Frame().right)
+	float xDelta = max_c(fIconLabelOutline->Frame().right, fPicker->Frame().right)
 		+ 10.0f - rightbox->Bounds().Width();
 	delta = fPicker->Frame().bottom + 10.0f - rightbox->Bounds().Height();
 
@@ -273,7 +273,7 @@
 	fWorkspaceMenu->SetTargetForItems(this);
 	fXPlacementText->SetTarget(this);
 	fYPlacementText->SetTarget(this);
-	fIconLabelBackground->SetTarget(this);
+	fIconLabelOutline->SetTarget(this);
 	fPicker->SetTarget(this);
 	fApply->SetTarget(this);
 	fRevert->SetTarget(this);
@@ -326,7 +326,7 @@
 			UpdateButtons();
 			break;
 
-		case kMsgIconLabelBackground:
+		case kMsgIconLabelOutline:
 			UpdateButtons();
 			break;
 
@@ -507,8 +507,9 @@
 	if (!fCurrentInfo) {
 		fImageMenu->FindItem(kMsgNoImage)->SetMarked(true);
 		fPlacementMenu->FindItem(kMsgManualPlacement)->SetMarked(true);
+		fIconLabelOutline->SetValue(B_CONTROL_OFF);
 	} else {
-		fIconLabelBackground->SetValue(fCurrentInfo->fEraseTextWidgetBackground
+		fIconLabelOutline->SetValue(fCurrentInfo->fTextWidgetLabelOutline
 			? B_CONTROL_ON : B_CONTROL_OFF);
 
 		BString xtext, ytext;
@@ -557,18 +558,18 @@
 void
 BackgroundsView::Save()
 {
-	bool eraseTextWidgetBackground =
-		fIconLabelBackground->Value() == B_CONTROL_ON;
+	bool textWidgetLabelOutline =
+		fIconLabelOutline->Value() == B_CONTROL_ON;
 	BackgroundImage::Mode mode = FindPlacementMode();
 	BPoint offset(atoi(fXPlacementText->Text()), atoi(fYPlacementText->Text()));
 
 	if (!fCurrent->IsDesktop()) {
 		if (fCurrentInfo == NULL) {
 			fCurrentInfo = new BackgroundImage::BackgroundImageInfo(B_ALL_WORKSPACES,
-				fLastImageIndex, mode, offset, eraseTextWidgetBackground, 0, 0);
+				fLastImageIndex, mode, offset, textWidgetLabelOutline, 0, 0);
 			fCurrent->Add(fCurrentInfo);
 		} else {
-			fCurrentInfo->fEraseTextWidgetBackground = eraseTextWidgetBackground;
+			fCurrentInfo->fTextWidgetLabelOutline = textWidgetLabelOutline;
 			fCurrentInfo->fMode = mode;
 			if (fCurrentInfo->fMode == BackgroundImage::kAtOffset)
 				fCurrentInfo->fOffset = offset;
@@ -588,14 +589,14 @@
 					if (fLastImageIndex > -1) {
 						fCurrentInfo = new BackgroundImage::BackgroundImageInfo(
 							workspaceMask, fLastImageIndex, mode, offset,
-							eraseTextWidgetBackground, fCurrentInfo->fImageSet,
+							textWidgetLabelOutline, fCurrentInfo->fImageSet,
 							fCurrentInfo->fCacheMode);
 						fCurrent->Add(fCurrentInfo);
 					}
 				} else {
 					if (fLastImageIndex > -1) {
-						fCurrentInfo->fEraseTextWidgetBackground =
-							eraseTextWidgetBackground;
+						fCurrentInfo->fTextWidgetLabelOutline =
+							textWidgetLabelOutline;
 						fCurrentInfo->fMode = mode;
 						if (fCurrentInfo->fMode == BackgroundImage::kAtOffset)
 							fCurrentInfo->fOffset = offset;
@@ -610,7 +611,7 @@
 				fCurrent->RemoveAll();
 				fCurrentInfo = new BackgroundImage::BackgroundImageInfo(
 					B_ALL_WORKSPACES, fLastImageIndex, mode, offset,
-					eraseTextWidgetBackground, fCurrent->GetShowingImageSet(),
+					textWidgetLabelOutline, fCurrent->GetShowingImageSet(),
 					fCurrentInfo->fCacheMode);
 				fCurrent->Add(fCurrentInfo);
 			}
@@ -618,12 +619,12 @@
 			if (fWorkspaceMenu->FindItem(kMsgCurrentWorkspace)->IsMarked()) {
 				fCurrentInfo = new BackgroundImage::BackgroundImageInfo(
 					workspaceMask, fLastImageIndex, mode, offset,
-					eraseTextWidgetBackground, fCurrent->GetShowingImageSet(), 0);
+					textWidgetLabelOutline, fCurrent->GetShowingImageSet(), 0);
 			} else {
 				fCurrent->RemoveAll();
 				fCurrentInfo = new BackgroundImage::BackgroundImageInfo(
 					B_ALL_WORKSPACES, fLastImageIndex, mode, offset,
-					eraseTextWidgetBackground, fCurrent->GetShowingImageSet(), 0);
+					textWidgetLabelOutline, fCurrent->GetShowingImageSet(), 0);
 			}
 			fCurrent->Add(fCurrentInfo);
 		}
@@ -836,8 +837,8 @@
 	bool imageEnabled = !(fImageMenu->FindItem(kMsgNoImage)->IsMarked());
 	if (fPlacementMenu->IsEnabled() ^ imageEnabled)
 		fPlacementMenu->SetEnabled(imageEnabled);
-	if (fIconLabelBackground->IsEnabled() ^ imageEnabled)
-		fIconLabelBackground->SetEnabled(imageEnabled);
+	if (fIconLabelOutline->IsEnabled() ^ imageEnabled)
+		fIconLabelOutline->SetEnabled(imageEnabled);
 
 	bool textEnabled = (fPlacementMenu->FindItem(kMsgManualPlacement)->IsMarked())
 		&& imageEnabled;
@@ -870,7 +871,7 @@
 				new BackgroundImage::BackgroundImageInfo(0, index,
 					FindPlacementMode(), BPoint(atoi(fXPlacementText->Text()),
 						atoi(fYPlacementText->Text())),
-					fIconLabelBackground->Value() == B_CONTROL_ON, 0, 0);
+					fIconLabelOutline->Value() == B_CONTROL_ON, 0, 0);
 			if (info->fMode == BackgroundImage::kAtOffset) {
 				fPreView->SetEnabled(true);
 				fPreView->fPoint.x = atoi(fXPlacementText->Text());
@@ -923,8 +924,8 @@
 		&& fPicker->ValueAsColor() != BScreen().DesktopColor()) {
 		hasChanged = true;
 	} else if (fCurrentInfo) {
-		if ((fIconLabelBackground->Value() == B_CONTROL_ON) ^
-			fCurrentInfo->fEraseTextWidgetBackground) {
+		if ((fIconLabelOutline->Value() == B_CONTROL_ON) ^
+			fCurrentInfo->fTextWidgetLabelOutline) {
 			hasChanged = true;
 		} else if (FindPlacementMode() != fCurrentInfo->fMode) {
 			hasChanged = true;

Modified: haiku/trunk/src/preferences/backgrounds/BackgroundsView.h
===================================================================
--- haiku/trunk/src/preferences/backgrounds/BackgroundsView.h	2007-08-22 14:53:24 UTC (rev 22039)
+++ haiku/trunk/src/preferences/backgrounds/BackgroundsView.h	2007-08-22 15:01:38 UTC (rev 22040)
@@ -118,7 +118,7 @@
 
 		BColorControl *fPicker;			// color picker
 		BButton *fApply, *fRevert;		// apply and revert buttons
-		BCheckBox *fIconLabelBackground;	// label ckeckbox
+		BCheckBox *fIconLabelOutline;	// label ckeckbox
 		BMenu* fPlacementMenu, *fImageMenu, *fWorkspaceMenu;	// the three comboboxes
 		BTextControl *fXPlacementText, *fYPlacementText;		// x and y textboxes
 		PreView *fPreView;				// the view for previewing the result



From axeld at mail.berlios.de  Wed Aug 22 20:44:39 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Wed, 22 Aug 2007 20:44:39 +0200
Subject: [Haiku-commits] r22041 - in haiku/trunk: build/jam
	src/add-ons/kernel/drivers/disk/ahci
Message-ID: <200708221844.l7MIidUr015980@sheep.berlios.de>

Author: axeld
Date: 2007-08-22 20:44:38 +0200 (Wed, 22 Aug 2007)
New Revision: 22041
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22041&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci.c
Log:
* Fixes to let the device manager try to use the driver:
  - module name didn't have the "/device_v1" suffix (which is used to
    differentiate device modules, as they can be everywhere in the path).
  - ahci_get_supported_paths() now tells the device manager that it
    exports a PCI disk device.
* Moved ahci out of the "scsi" sub-directory.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2007-08-22 15:01:38 UTC (rev 22040)
+++ haiku/trunk/build/jam/HaikuImage	2007-08-22 18:44:38 UTC (rev 22041)
@@ -153,7 +153,8 @@
 AddDriversToHaikuImage audio hmulti	: $(BEOS_ADD_ONS_DRIVERS_AUDIO) ;
 AddDriversToHaikuImage midi			: $(BEOS_ADD_ONS_DRIVERS_MIDI) ;
 AddDriversToHaikuImage bus			: usb_raw ;
-AddDriversToHaikuImage disk scsi	: ahci scsi_cd scsi_dsk ;
+AddDriversToHaikuImage disk			: ahci ;
+AddDriversToHaikuImage disk scsi	: scsi_cd scsi_dsk ;
 AddDriversToHaikuImage disk virtual	: nbd ;
 AddDriversToHaikuImage dvb			: cx23882 ;
 AddDriversToHaikuImage graphics		: $(BEOS_ADD_ONS_DRIVERS_GRAPHICS) ;
@@ -175,7 +176,7 @@
 AddSymlinkToHaikuImage beos system lib : libnetwork.so : libbnetapi.so ;
 # libGL.so have GLUT built-in
 if $(TARGET_ARCH) = x86 {
-AddSymlinkToHaikuImage beos system lib : $(X86_ONLY)libGL.so : libglut.so ;
+	AddSymlinkToHaikuImage beos system lib : $(X86_ONLY)libGL.so : libglut.so ;
 }
 
 # servers

Modified: haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci.c	2007-08-22 15:01:38 UTC (rev 22040)
+++ haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci.c	2007-08-22 18:44:38 UTC (rev 22041)
@@ -7,7 +7,7 @@
 #include <device_manager.h>
 
 
-#define TRACE(a...) dprintf("ahci: " a)
+#define TRACE(a...) dprintf("\33[35mahci:\33[30m " a)
 #define FLOW(a...)	dprintf("ahci: " a)
 
 static float
@@ -39,7 +39,6 @@
 	}
 #endif
 
-
 	return 0.0;
 }
 
@@ -85,7 +84,13 @@
 static void
 ahci_get_supported_paths(const char ***_busses, const char ***_devices)
 {
+	static const char *kBus[] = { "pci", NULL };
+	static const char *kDevice[] = { "drivers/dev/disk/sata", NULL };
+
 	TRACE("ahci_get_supported_paths\n");
+
+	*_busses = kBus;
+	*_devices = kDevice;
 }
 
 
@@ -105,7 +110,7 @@
 
 driver_module_info ahci_driver = {
 	{
-		"ahci",
+		"ahci/device_v1",
 		0,
 		std_ops
 	},



From jackburton at mail.berlios.de  Wed Aug 22 22:29:41 2007
From: jackburton at mail.berlios.de (jackburton at BerliOS)
Date: Wed, 22 Aug 2007 22:29:41 +0200
Subject: [Haiku-commits] r22042 - haiku/trunk/src/apps/terminal
Message-ID: <200708222029.l7MKTfvW023771@sheep.berlios.de>

Author: jackburton
Date: 2007-08-22 22:29:40 +0200 (Wed, 22 Aug 2007)
New Revision: 22042
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22042&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermParse.cpp
   haiku/trunk/src/apps/terminal/TermView.cpp
   haiku/trunk/src/apps/terminal/TermView.h
Log:
Removed CURON/CUROFF constants. Use a boolean instead.


Modified: haiku/trunk/src/apps/terminal/TermParse.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermParse.cpp	2007-08-22 18:44:38 UTC (rev 22041)
+++ haiku/trunk/src/apps/terminal/TermParse.cpp	2007-08-22 20:29:40 UTC (rev 22042)
@@ -125,7 +125,7 @@
 		fView->UpdateLine();
 
 		// Reset cursor blinking time and turn on cursor blinking.
-		fView->SetCurDraw(CURON);
+		fView->SetCurDraw(true);
 
 		// wait new input from pty.
 		do {
@@ -146,7 +146,7 @@
 			release_sem(fReaderLocker);
 	}
 
-	fView->SetCurDraw(CUROFF);
+	fView->SetCurDraw(false);
 	return B_OK;
 }
 

Modified: haiku/trunk/src/apps/terminal/TermView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-22 18:44:38 UTC (rev 22041)
+++ haiku/trunk/src/apps/terminal/TermView.cpp	2007-08-22 20:29:40 UTC (rev 22042)
@@ -144,10 +144,10 @@
 	fScrollBarRange(0),
 	fFrameResized(false),
 	fLastCursorTime(0),
-	fCursorDrawFlag(CURON),
-	fCursorStatus(CURON),
-	fCursorBlinkingFlag(CURON),
-	fCursorRedrawFlag(CURON),
+	fCursorDrawFlag(true),
+	fCursorStatus(true),
+	fCursorBlinkingFlag(true),
+	fCursorRedrawFlag(true),
 	fCursorHeight(0),
 	fCurPos(0, 0),
 	fCurStack(0, 0),
@@ -193,10 +193,10 @@
 	fScrollBarRange(0),
 	fFrameResized(false),
 	fLastCursorTime(0),
-	fCursorDrawFlag(CURON),
-	fCursorStatus(CURON),
-	fCursorBlinkingFlag(CURON),
-	fCursorRedrawFlag(CURON),
+	fCursorDrawFlag(true),
+	fCursorStatus(true),
+	fCursorBlinkingFlag(true),
+	fCursorRedrawFlag(true),
 	fCursorHeight(0),
 	fCurPos(0, 0),
 	fCurStack(0, 0),
@@ -243,10 +243,10 @@
 	fScrollBarRange(0),
 	fFrameResized(false),
 	fLastCursorTime(0),
-	fCursorDrawFlag(CURON),
-	fCursorStatus(CURON),
-	fCursorBlinkingFlag(CURON),
-	fCursorRedrawFlag(CURON),
+	fCursorDrawFlag(true),
+	fCursorStatus(true),
+	fCursorBlinkingFlag(true),
+	fCursorRedrawFlag(true),
 	fCursorHeight(0),
 	fCurPos(0, 0),
 	fCurStack(0, 0),
@@ -1006,15 +1006,15 @@
 void
 TermView::BlinkCursor()
 {
-	if (fCursorDrawFlag == CURON
-		&& fCursorBlinkingFlag == CURON
+	if (fCursorDrawFlag
+		&& fCursorBlinkingFlag
 		&& Window()->IsActive()) {
-		if (fCursorStatus == CURON)
+		if (fCursorStatus)
 			_TermDraw(fCurPos, fCurPos);
 		else
 			DrawCursor();
 
-		fCursorStatus = fCursorStatus == CURON ? CUROFF : CURON;
+		fCursorStatus = !fCursorStatus;
 		fLastCursorTime = system_time();
 	}
 }
@@ -1024,16 +1024,16 @@
 void
 TermView::SetCurDraw(bool flag)
 {
-	if (flag == CUROFF) {
-		if (fCursorStatus == CURON)
+	if (!flag) {
+		if (fCursorStatus)
 			_TermDraw(fCurPos, fCurPos);
 
-		fCursorStatus = CUROFF;
-		fCursorDrawFlag = CUROFF;
+		fCursorStatus = false;
+		fCursorDrawFlag = false;
 	} else {
-		if (fCursorDrawFlag == CUROFF) {
-			fCursorDrawFlag = CURON;
-			fCursorStatus = CURON;
+		if (!fCursorDrawFlag) {
+			fCursorDrawFlag = true;
+			fCursorStatus = true;
 
 			if (LockLooper()) {
 				DrawCursor();
@@ -1561,7 +1561,7 @@
 		}
 	}
 
-	if (fCursorStatus == CURON)
+	if (fCursorStatus)
 		DrawCursor();
 
 	Window()->EndViewTransaction();

Modified: haiku/trunk/src/apps/terminal/TermView.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.h	2007-08-22 18:44:38 UTC (rev 22041)
+++ haiku/trunk/src/apps/terminal/TermView.h	2007-08-22 20:29:40 UTC (rev 22042)
@@ -19,11 +19,7 @@
 #include <String.h>
 #include <View.h>
 
-/* Cursor Blinking flag */
-#define CUROFF 0
-#define CURON  1
 
-
 class BClipboard;
 class BMessageRunner;
 class BScrollBar;



From bonefish at mail.berlios.de  Wed Aug 22 23:21:38 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 22 Aug 2007 23:21:38 +0200
Subject: [Haiku-commits] r22043 - in haiku/trunk: headers/os/drivers
	headers/os/storage headers/private/fs_shell
	headers/private/kernel/disk_device_manager
	src/add-ons/kernel/file_systems/bfs
	src/add-ons/kernel/file_systems/cdda
	src/add-ons/kernel/file_systems/dos
	src/add-ons/kernel/file_systems/googlefs
	src/add-ons/kernel/file_systems/iso9660
	src/add-ons/kernel/file_systems/nfs
	src/add-ons/kernel/file_systems/ntfs
	src/add-ons/kernel/file_systems/ramfs
	src/add-ons/kernel/file_systems/reiserfs
	src/add-ons/kernel/file_systems/userlandfs/kernel_add_on
	src/add-ons/kernel/partitioning_systems/intel
	src/add-ons/kernel/partitioning_systems/session
	src/system/kernel/disk_device_manager src/system/kernel/fs
	src/tools/fs_shell
Message-ID: <200708222121.l7MLLcMt027999@sheep.berlios.de>

Author: bonefish
Date: 2007-08-22 23:21:30 +0200 (Wed, 22 Aug 2007)
New Revision: 22043
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22043&view=rev

Modified:
   haiku/trunk/headers/os/drivers/fs_interface.h
   haiku/trunk/headers/os/storage/DiskDeviceDefs.h
   haiku/trunk/headers/private/fs_shell/fssh_api_wrapper.h
   haiku/trunk/headers/private/fs_shell/fssh_disk_device_defs.h
   haiku/trunk/headers/private/fs_shell/fssh_fs_interface.h
   haiku/trunk/headers/private/kernel/disk_device_manager/KDiskSystem.h
   haiku/trunk/headers/private/kernel/disk_device_manager/KFileSystem.h
   haiku/trunk/headers/private/kernel/disk_device_manager/KPartitioningSystem.h
   haiku/trunk/headers/private/kernel/disk_device_manager/ddm_modules.h
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/dos/dosfs.c
   haiku/trunk/src/add-ons/kernel/file_systems/googlefs/googlefs.c
   haiku/trunk/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/nfs/nfs_add_on.c
   haiku/trunk/src/add-ons/kernel/file_systems/ntfs/kernel_interface.c
   haiku/trunk/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/reiserfs/kernel_interface.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/kernel_interface.cpp
   haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/intel.cpp
   haiku/trunk/src/add-ons/kernel/partitioning_systems/session/session.cpp
   haiku/trunk/src/system/kernel/disk_device_manager/KDiskSystem.cpp
   haiku/trunk/src/system/kernel/disk_device_manager/KFileSystem.cpp
   haiku/trunk/src/system/kernel/disk_device_manager/KPartitioningSystem.cpp
   haiku/trunk/src/system/kernel/disk_device_manager/ddm_operation_validation.cpp
   haiku/trunk/src/system/kernel/disk_device_manager/ddm_userland_interface.cpp
   haiku/trunk/src/system/kernel/fs/devfs.cpp
   haiku/trunk/src/system/kernel/fs/pipefs.cpp
   haiku/trunk/src/system/kernel/fs/rootfs.c
   haiku/trunk/src/tools/fs_shell/rootfs.cpp
Log:
* Added disk system flags for whether a partition name and partition
  content name are supported.
* Added file_system_module_info::flags (analogously to
  partition_module_info::flags) which indicate which disk device
  features the FS supports.
* Replaced the
  file_system_module_info/partition_module_info::supports_*()
  hooks by a get_supported_operations() hook and for partitioning
  systems additionally a get_supported_child_operations() hook.
* Updated file and partitioning systems accordingly.
* Updated fs_shell accordingly.
* Updated the DDM accordingly. The syscall interface remains unchanged,
  though.
* _user_supports_initializing_partition() also checks whether the parent
  partitioning system is content now.


Modified: haiku/trunk/headers/os/drivers/fs_interface.h
===================================================================
--- haiku/trunk/headers/os/drivers/fs_interface.h	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/headers/os/drivers/fs_interface.h	2007-08-22 21:21:30 UTC (rev 22043)
@@ -55,7 +55,8 @@
 
 typedef struct file_system_module_info {
 	struct module_info	info;
-	const char			*pretty_name;
+	const char*			pretty_name;
+	uint32				flags;	// DDM flags
 
 	/* scanning (the device is write locked) */
 	float (*identify_partition)(int fd, partition_data *partition,
@@ -205,19 +206,7 @@
 	status_t (*rewind_query)(fs_volume fs, fs_cookie cookie);
 
 	/* capability querying (the device is read locked) */
-	// ToDo: this will probably be combined to a single call
-	bool (*supports_defragmenting)(partition_data *partition,
-				bool *whileMounted);
-	bool (*supports_repairing)(partition_data *partition,
-				bool checkOnly, bool *whileMounted);
-	bool (*supports_resizing)(partition_data *partition,
-				bool *whileMounted);
-	bool (*supports_moving)(partition_data *partition, bool *isNoOp);
-	bool (*supports_setting_content_name)(partition_data *partition,
-				bool *whileMounted);
-	bool (*supports_setting_content_parameters)(partition_data *partition, 
-				bool *whileMounted);
-	bool (*supports_initializing)(partition_data *partition);
+	uint32 (*get_supported_operations)(partition_data* partition, uint32 mask);
 
 	bool (*validate_resize)(partition_data *partition, off_t *size);
 	bool (*validate_move)(partition_data *partition, off_t *start);

Modified: haiku/trunk/headers/os/storage/DiskDeviceDefs.h
===================================================================
--- haiku/trunk/headers/os/storage/DiskDeviceDefs.h	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/headers/os/storage/DiskDeviceDefs.h	2007-08-22 21:21:30 UTC (rev 22043)
@@ -67,35 +67,37 @@
 
 // disk system flags
 enum {
-	B_DISK_SYSTEM_IS_FILE_SYSTEM								= 0x0001,
+	B_DISK_SYSTEM_IS_FILE_SYSTEM								= 0x000001,
 
 	// flags common for both file and partitioning systems
-	B_DISK_SYSTEM_SUPPORTS_CHECKING								= 0x0002,
-	B_DISK_SYSTEM_SUPPORTS_REPAIRING							= 0x0004,
-	B_DISK_SYSTEM_SUPPORTS_RESIZING								= 0x0008,
-	B_DISK_SYSTEM_SUPPORTS_MOVING								= 0x0010,
-	B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME					= 0x0020,
-	B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS			= 0x0040,
+	B_DISK_SYSTEM_SUPPORTS_CHECKING								= 0x000002,
+	B_DISK_SYSTEM_SUPPORTS_REPAIRING							= 0x000004,
+	B_DISK_SYSTEM_SUPPORTS_RESIZING								= 0x000008,
+	B_DISK_SYSTEM_SUPPORTS_MOVING								= 0x000010,
+	B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME					= 0x000020,
+	B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS			= 0x000040,
+	B_DISK_SYSTEM_SUPPORTS_INITIALIZING							= 0x000080,
+	B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME							= 0x000100,
 
 	// file system specific flags
-	B_DISK_SYSTEM_SUPPORTS_DEFRAGMENTING						= 0x0100,
-	B_DISK_SYSTEM_SUPPORTS_DEFRAGMENTING_WHILE_MOUNTED			= 0x0200,
-	B_DISK_SYSTEM_SUPPORTS_CHECKING_WHILE_MOUNTED				= 0x0400,
-	B_DISK_SYSTEM_SUPPORTS_REPAIRING_WHILE_MOUNTED				= 0x0800,
-	B_DISK_SYSTEM_SUPPORTS_RESIZING_WHILE_MOUNTED				= 0x1000,
-	B_DISK_SYSTEM_SUPPORTS_MOVING_WHILE_MOUNTED					= 0x2000,
-	B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME_WHILE_MOUNTED	= 0x4000,
-	B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS_WHILE_MOUNTED	= 0x8000,
+	B_DISK_SYSTEM_SUPPORTS_DEFRAGMENTING						= 0x001000,
+	B_DISK_SYSTEM_SUPPORTS_DEFRAGMENTING_WHILE_MOUNTED			= 0x002000,
+	B_DISK_SYSTEM_SUPPORTS_CHECKING_WHILE_MOUNTED				= 0x004000,
+	B_DISK_SYSTEM_SUPPORTS_REPAIRING_WHILE_MOUNTED				= 0x008000,
+	B_DISK_SYSTEM_SUPPORTS_RESIZING_WHILE_MOUNTED				= 0x010000,
+	B_DISK_SYSTEM_SUPPORTS_MOVING_WHILE_MOUNTED					= 0x020000,
+	B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME_WHILE_MOUNTED	= 0x040000,
+	B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS_WHILE_MOUNTED	= 0x080000,
 
 	// partitioning system specific flags
-	B_DISK_SYSTEM_SUPPORTS_RESIZING_CHILD						= 0x0100,
-	B_DISK_SYSTEM_SUPPORTS_MOVING_CHILD							= 0x0200,
-	B_DISK_SYSTEM_SUPPORTS_SETTING_NAME							= 0x0400,
-	B_DISK_SYSTEM_SUPPORTS_SETTING_TYPE							= 0x0800,
-	B_DISK_SYSTEM_SUPPORTS_SETTING_PARAMETERS					= 0x1000,
-	B_DISK_SYSTEM_SUPPORTS_CREATING_CHILD						= 0x2000,
-	B_DISK_SYSTEM_SUPPORTS_DELETING_CHILD						= 0x4000,
-	B_DISK_SYSTEM_SUPPORTS_INITIALIZING							= 0x8000,
+	B_DISK_SYSTEM_SUPPORTS_RESIZING_CHILD						= 0x001000,
+	B_DISK_SYSTEM_SUPPORTS_MOVING_CHILD							= 0x002000,
+	B_DISK_SYSTEM_SUPPORTS_SETTING_NAME							= 0x004000,
+	B_DISK_SYSTEM_SUPPORTS_SETTING_TYPE							= 0x008000,
+	B_DISK_SYSTEM_SUPPORTS_SETTING_PARAMETERS					= 0x010000,
+	B_DISK_SYSTEM_SUPPORTS_CREATING_CHILD						= 0x020000,
+	B_DISK_SYSTEM_SUPPORTS_DELETING_CHILD						= 0x040000,
+	B_DISK_SYSTEM_SUPPORTS_NAME									= 0x080000,
 };
 
 // disk device job types

Modified: haiku/trunk/headers/private/fs_shell/fssh_api_wrapper.h
===================================================================
--- haiku/trunk/headers/private/fs_shell/fssh_api_wrapper.h	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/headers/private/fs_shell/fssh_api_wrapper.h	2007-08-22 21:21:30 UTC (rev 22043)
@@ -229,6 +229,8 @@
 #define B_DISK_SYSTEM_SUPPORTS_MOVING						FSSH_B_DISK_SYSTEM_SUPPORTS_MOVING
 #define B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME			FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME
 #define B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS
+#define B_DISK_SYSTEM_SUPPORTS_INITIALIZING					FSSH_B_DISK_SYSTEM_SUPPORTS_INITIALIZING
+#define B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME					FSSH_B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME
 
 // file system specific flags
 #define B_DISK_SYSTEM_SUPPORTS_DEFRAGMENTING							FSSH_B_DISK_SYSTEM_SUPPORTS_DEFRAGMENTING
@@ -248,7 +250,7 @@
 #define B_DISK_SYSTEM_SUPPORTS_SETTING_PARAMETERS	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_PARAMETERS
 #define B_DISK_SYSTEM_SUPPORTS_CREATING_CHILD		FSSH_B_DISK_SYSTEM_SUPPORTS_CREATING_CHILD
 #define B_DISK_SYSTEM_SUPPORTS_DELETING_CHILD		FSSH_B_DISK_SYSTEM_SUPPORTS_DELETING_CHILD
-#define B_DISK_SYSTEM_SUPPORTS_INITIALIZING			FSSH_B_DISK_SYSTEM_SUPPORTS_INITIALIZING
+#define B_DISK_SYSTEM_SUPPORTS_NAME					FSSH_B_DISK_SYSTEM_SUPPORTS_NAME
 
 // disk device job types
 #define B_DISK_DEVICE_JOB_BAD_TYPE				FSSH_B_DISK_DEVICE_JOB_BAD_TYPE

Modified: haiku/trunk/headers/private/fs_shell/fssh_disk_device_defs.h
===================================================================
--- haiku/trunk/headers/private/fs_shell/fssh_disk_device_defs.h	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/headers/private/fs_shell/fssh_disk_device_defs.h	2007-08-22 21:21:30 UTC (rev 22043)
@@ -67,35 +67,37 @@
 
 // disk system flags
 enum {
-	FSSH_B_DISK_SYSTEM_IS_FILE_SYSTEM							= 0x0001,
+	FSSH_B_DISK_SYSTEM_IS_FILE_SYSTEM								= 0x000001,
 
 	// flags common for both file and partitioning systems
-	FSSH_B_DISK_SYSTEM_SUPPORTS_CHECKING							= 0x0002,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_REPAIRING							= 0x0004,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_RESIZING							= 0x0008,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_MOVING								= 0x0010,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME				= 0x0020,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS			= 0x0040,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_CHECKING							= 0x000002,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_REPAIRING							= 0x000004,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_RESIZING							= 0x000008,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_MOVING								= 0x000010,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME				= 0x000020,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS			= 0x000040,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_INITIALIZING						= 0x000080,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME						= 0x000100,
 
 	// file system specific flags
-	FSSH_B_DISK_SYSTEM_SUPPORTS_DEFRAGMENTING						= 0x0100,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_DEFRAGMENTING_WHILE_MOUNTED			= 0x0200,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_CHECKING_WHILE_MOUNTED				= 0x0400,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_REPAIRING_WHILE_MOUNTED				= 0x0800,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_RESIZING_WHILE_MOUNTED				= 0x1000,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_MOVING_WHILE_MOUNTED				= 0x2000,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME_WHILE_MOUNTED	= 0x4000,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS_WHILE_MOUNTED	= 0x8000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_DEFRAGMENTING						= 0x001000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_DEFRAGMENTING_WHILE_MOUNTED			= 0x002000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_CHECKING_WHILE_MOUNTED				= 0x004000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_REPAIRING_WHILE_MOUNTED				= 0x008000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_RESIZING_WHILE_MOUNTED				= 0x010000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_MOVING_WHILE_MOUNTED				= 0x020000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME_WHILE_MOUNTED	= 0x040000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS_WHILE_MOUNTED	= 0x080000,
 
 	// partitioning system specific flags
-	FSSH_B_DISK_SYSTEM_SUPPORTS_RESIZING_CHILD						= 0x0100,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_MOVING_CHILD						= 0x0200,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_NAME						= 0x0400,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_TYPE						= 0x0800,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_PARAMETERS					= 0x1000,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_CREATING_CHILD						= 0x2000,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_DELETING_CHILD						= 0x4000,
-	FSSH_B_DISK_SYSTEM_SUPPORTS_INITIALIZING						= 0x8000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_RESIZING_CHILD						= 0x001000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_MOVING_CHILD						= 0x002000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_NAME						= 0x004000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_TYPE						= 0x008000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_SETTING_PARAMETERS					= 0x010000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_CREATING_CHILD						= 0x020000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_DELETING_CHILD						= 0x040000,
+	FSSH_B_DISK_SYSTEM_SUPPORTS_NAME								= 0x080000,
 };
 
 // disk device job types

Modified: haiku/trunk/headers/private/fs_shell/fssh_fs_interface.h
===================================================================
--- haiku/trunk/headers/private/fs_shell/fssh_fs_interface.h	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/headers/private/fs_shell/fssh_fs_interface.h	2007-08-22 21:21:30 UTC (rev 22043)
@@ -54,7 +54,8 @@
 
 typedef struct fssh_file_system_module_info {
 	struct fssh_module_info	info;
-	const char				*pretty_name;
+	const char*				pretty_name;
+	uint32_t				flags;	// DDM flags
 
 	/* scanning (the device is write locked) */
 	float (*identify_partition)(int fd, fssh_partition_data *partition,
@@ -239,19 +240,8 @@
 	fssh_status_t (*rewind_query)(fssh_fs_volume fs, fssh_fs_cookie cookie);
 
 	/* capability querying (the device is read locked) */
-	// ToDo: this will probably be combined to a single call
-	bool (*supports_defragmenting)(fssh_partition_data *partition,
-				bool *whileMounted);
-	bool (*supports_repairing)(fssh_partition_data *partition,
-				bool checkOnly, bool *whileMounted);
-	bool (*supports_resizing)(fssh_partition_data *partition,
-				bool *whileMounted);
-	bool (*supports_moving)(fssh_partition_data *partition, bool *isNoOp);
-	bool (*supports_setting_content_name)(fssh_partition_data *partition,
-				bool *whileMounted);
-	bool (*supports_setting_content_parameters)(fssh_partition_data *partition, 
-				bool *whileMounted);
-	bool (*supports_initializing)(fssh_partition_data *partition);
+	uint32_t (*get_supported_operations)(fssh_partition_data* partition,
+				uint32_t mask);
 
 	bool (*validate_resize)(fssh_partition_data *partition, fssh_off_t *size);
 	bool (*validate_move)(fssh_partition_data *partition, fssh_off_t *start);

Modified: haiku/trunk/headers/private/kernel/disk_device_manager/KDiskSystem.h
===================================================================
--- haiku/trunk/headers/private/kernel/disk_device_manager/KDiskSystem.h	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/headers/private/kernel/disk_device_manager/KDiskSystem.h	2007-08-22 21:21:30 UTC (rev 22043)
@@ -54,26 +54,19 @@
 	// Querying
 	// Device must be read locked.
 
-	virtual bool SupportsDefragmenting(KPartition *partition,
-									   bool *whileMounted);
-	virtual bool SupportsRepairing(KPartition *partition, bool checkOnly,
-								   bool *whileMounted);
-	virtual bool SupportsResizing(KPartition *partition, bool *whileMounted);
-	virtual bool SupportsResizingChild(KPartition *child);
-	virtual bool SupportsMoving(KPartition *partition, bool *isNoOp);
-	virtual bool SupportsMovingChild(KPartition *child);
-	virtual bool SupportsSettingName(KPartition *partition);
-	virtual bool SupportsSettingContentName(KPartition *partition,
-											bool *whileMounted);
-	virtual bool SupportsSettingType(KPartition *partition);
-	virtual bool SupportsSettingParameters(KPartition *partition);
-	virtual bool SupportsSettingContentParameters(KPartition *partition,
-												  bool *whileMounted);
-	virtual bool SupportsInitializing(KPartition *partition);
+	virtual uint32 GetSupportedOperations(KPartition* partition, uint32 mask);
+	virtual uint32 GetSupportedChildOperations(KPartition* child, uint32 mask);
+
+	// for convenience
+	bool SupportsOperations(KPartition* partition, uint32 operations)
+		{ return (GetSupportedOperations(partition, operations) & operations)
+			== operations; }
+	bool SupportsChildOperations(KPartition* child, uint32 operations)
+		{ return (GetSupportedChildOperations(child, operations) & operations)
+			== operations; }
+
 	virtual bool SupportsInitializingChild(KPartition *child,
-										   const char *diskSystem);
-	virtual bool SupportsCreatingChild(KPartition *partition);
-	virtual bool SupportsDeletingChild(KPartition *child);
+		const char *diskSystem);
 	virtual bool IsSubSystemFor(KPartition *partition);
 
 	virtual bool ValidateResize(KPartition *partition, off_t *size);

Modified: haiku/trunk/headers/private/kernel/disk_device_manager/KFileSystem.h
===================================================================
--- haiku/trunk/headers/private/kernel/disk_device_manager/KFileSystem.h	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/headers/private/kernel/disk_device_manager/KFileSystem.h	2007-08-22 21:21:30 UTC (rev 22043)
@@ -35,17 +35,7 @@
 
 	// Querying
 
-	virtual bool SupportsDefragmenting(KPartition *partition,
-									   bool *whileMounted);
-	virtual bool SupportsRepairing(KPartition *partition, bool checkOnly,
-								   bool *whileMounted);
-	virtual bool SupportsResizing(KPartition *partition, bool *whileMounted);
-	virtual bool SupportsMoving(KPartition *partition, bool *isNoOp);
-	virtual bool SupportsSettingContentName(KPartition *partition,
-											bool *whileMounted);
-	virtual bool SupportsSettingContentParameters(KPartition *partition,
-												  bool *whileMounted);
-	virtual bool SupportsInitializing(KPartition *partition);
+	virtual uint32 GetSupportedOperations(KPartition* partition, uint32 mask);
 
 	virtual bool ValidateResize(KPartition *partition, off_t *size);
 	virtual bool ValidateMove(KPartition *partition, off_t *start);

Modified: haiku/trunk/headers/private/kernel/disk_device_manager/KPartitioningSystem.h
===================================================================
--- haiku/trunk/headers/private/kernel/disk_device_manager/KPartitioningSystem.h	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/headers/private/kernel/disk_device_manager/KPartitioningSystem.h	2007-08-22 21:21:30 UTC (rev 22043)
@@ -29,9 +29,7 @@
 
 	// Scanning
 
-	//! Try to identify a given partition
 	virtual float Identify(KPartition *partition, void **cookie);
-	//! Scan the partition
 	virtual status_t Scan(KPartition *partition, void *cookie);
 	virtual void FreeIdentifyCookie(KPartition *partition, void *cookie);
 	virtual void FreeCookie(KPartition *partition);
@@ -39,132 +37,75 @@
 
 	// Querying
 
-	//! Check whether the add-on supports repairing this partition.
-	virtual bool SupportsRepairing(KPartition *partition, bool checkOnly,
-								   bool *whileMounted);
-	//! Check whether the add-on supports resizing this partition.
-	virtual bool SupportsResizing(KPartition *partition, bool *whileMounted);
-	//! Check whether the add-on supports resizing children of this partition.
-	virtual bool SupportsResizingChild(KPartition *child);
-	//! Check whether the add-on supports moving this partition.
-	virtual bool SupportsMoving(KPartition *partition, bool *isNoOp);
-	//! Check whether the add-on supports moving children of this partition.
-	virtual bool SupportsMovingChild(KPartition *child);
-	//! Check whether the add-on supports setting name of this partition.
-	virtual bool SupportsSettingName(KPartition *partition);
-	//! Check whether the add-on supports setting name to content of this partition.
-	virtual bool SupportsSettingContentName(KPartition *partition,
-											bool *whileMounted);
-	//! Check whether the add-on supports setting type of this partition.
-	virtual bool SupportsSettingType(KPartition *partition);
-	//! Check whether the add-on supports setting parameters of this partition.
-	virtual bool SupportsSettingParameters(KPartition *partition);
-	//! Check whether the add-on supports setting parameters to content of this partition.
-	virtual bool SupportsSettingContentParameters(KPartition *partition,
-												  bool *whileMounted);
-	//! Check whether the add-on supports initializing this partition.
-	virtual bool SupportsInitializing(KPartition *partition);
-	//! Check whether the add-on supports initializing a child of this partition.
+	virtual uint32 GetSupportedOperations(KPartition* partition, uint32 mask);
+	virtual uint32 GetSupportedChildOperations(KPartition* child, uint32 mask);
+
 	virtual bool SupportsInitializingChild(KPartition *child,
-										   const char *diskSystem);
-	//! Check whether the add-on supports creating children of this partition.
-	virtual bool SupportsCreatingChild(KPartition *partition);
-	//! Check whether the add-on supports deleting children of this partition.
-	virtual bool SupportsDeletingChild(KPartition *child);
-	//! Check whether the add-on is a subsystem for a given partition.
+		const char *diskSystem);
 	virtual bool IsSubSystemFor(KPartition *partition);
 
-	//! Validates parameters for resizing a partition
 	virtual bool ValidateResize(KPartition *partition, off_t *size);
-	//! Validates parameters for resizing a child partition
 	virtual bool ValidateResizeChild(KPartition *child, off_t *size);
-	//! Validates parameters for moving a partition
 	virtual bool ValidateMove(KPartition *partition, off_t *start);
-	//! Validates parameters for moving a child partition
 	virtual bool ValidateMoveChild(KPartition *child, off_t *start);
-	//! Validates parameters for setting name of a partition
 	virtual bool ValidateSetName(KPartition *partition, char *name);
-	//! Validates parameters for setting name to content of a partition
 	virtual bool ValidateSetContentName(KPartition *partition, char *name);
-	//! Validates parameters for setting type of a partition
 	virtual bool ValidateSetType(KPartition *partition, const char *type);
-	//! Validates parameters for setting parameters of a partition
 	virtual bool ValidateSetParameters(KPartition *partition,
 									   const char *parameters);
-	//! Validates parameters for setting parameters to content of a partition
 	virtual bool ValidateSetContentParameters(KPartition *parameters,
 											  const char *parameters);
-	//! Validates parameters for initializing a partition
 	virtual bool ValidateInitialize(KPartition *partition, char *name,
 									const char *parameters);
-	//! Validates parameters for creating child of a partition
 	virtual bool ValidateCreateChild(KPartition *partition, off_t *start,
 									 off_t *size, const char *type,
 									 const char *parameters, int32 *index);
-	//! Counts partitionable spaces on a partition
 	virtual int32 CountPartitionableSpaces(KPartition *partition);
-	//! Retrieves a list of partitionable spaces on a partition
 	virtual status_t GetPartitionableSpaces(KPartition *partition,
 											partitionable_space_data *buffer,
 											int32 count,
 											int32 *actualCount = NULL);
 
-	//! Iterates through supported partition types
 	virtual status_t GetNextSupportedType(KPartition *partition, int32 *cookie,
 										  char *type);
-	//! Translates the "pretty" content type to an internal type
 	virtual status_t GetTypeForContentType(const char *contentType,
 										   char *type);
 
 	// Shadow partition modification
 
-	//! Calls for additional modifications when shadow partition is changed
 	virtual status_t ShadowPartitionChanged(KPartition *partition,
 											uint32 operation);
 
 	// Writing
 
-	//! Repairs a partition
 	virtual status_t Repair(KPartition *partition, bool checkOnly,
 							KDiskDeviceJob *job);
-	//! Resizes a partition
 	virtual status_t Resize(KPartition *partition, off_t size,
 							KDiskDeviceJob *job);
-	//! Resizes child of a partition
 	virtual status_t ResizeChild(KPartition *child, off_t size,
 								 KDiskDeviceJob *job);
-	//! Moves a partition
 	virtual status_t Move(KPartition *partition, off_t offset,
 						  KDiskDeviceJob *job);
-	//! Moves child of a partition
 	virtual status_t MoveChild(KPartition *child, off_t offset,
 							   KDiskDeviceJob *job);
-	//! Sets name of a partition
 	virtual status_t SetName(KPartition *partition, char *name,
 							 KDiskDeviceJob *job);
-	//! Sets name of the content of a partition
 	virtual status_t SetContentName(KPartition *partition, char *name,
 									KDiskDeviceJob *job);
-	//! Sets type of a partition
 	virtual status_t SetType(KPartition *partition, char *type,
 							 KDiskDeviceJob *job);
-	//! Sets parameters of a partition
 	virtual status_t SetParameters(KPartition *partition,
 								   const char *parameters,
 								   KDiskDeviceJob *job);
-	//! Sets parameters to content of a partition
 	virtual status_t SetContentParameters(KPartition *partition,
 										  const char *parameters,
 										  KDiskDeviceJob *job);
-	//! Creates a child partition
 	virtual status_t CreateChild(KPartition *partition, off_t offset,
 								 off_t size, const char *type,
 								 const char *parameters, KDiskDeviceJob *job,
 								 KPartition **child = NULL,
 								 partition_id childID = -1);
-	//! Deletes a child partition
 	virtual status_t DeleteChild(KPartition *child, KDiskDeviceJob *job);
-	//! Initializes a partition with this partitioning system
 	virtual status_t Initialize(KPartition *partition, const char *name,
 								const char *parameters, KDiskDeviceJob *job);
 

Modified: haiku/trunk/headers/private/kernel/disk_device_manager/ddm_modules.h
===================================================================
--- haiku/trunk/headers/private/kernel/disk_device_manager/ddm_modules.h	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/headers/private/kernel/disk_device_manager/ddm_modules.h	2007-08-22 21:21:30 UTC (rev 22043)
@@ -1,6 +1,6 @@
 // ddm_modules.h
 //
-// Interface to be implemented by partition modules.
+// Interface to be implemented by partitioning modules.
 
 #ifndef _K_DISK_DEVICE_MODULES_H
 #define _K_DISK_DEVICE_MODULES_H
@@ -9,180 +9,99 @@
 #include <module.h>
 #include <SupportDefs.h>
 
-// partition module interface
 
-// scanning
-// (the device is write locked)
-typedef float (*partition_identify_partition)(int fd,
-	partition_data *partition, void **cookie);
-typedef status_t (*partition_scan_partition)(int fd,
-	partition_data *partition, void *identifyCookie);
-typedef void (*partition_free_identify_partition_cookie)(
-	partition_data *partition, void *cookie);
-typedef void (*partition_free_partition_cookie)(partition_data *partition);
-typedef void (*partition_free_partition_content_cookie)(
-	partition_data *partition);
-
-// querying
-// (the device is read locked)
-typedef bool (*partition_supports_repairing)(partition_data *partition,
-	bool checkOnly);
-typedef bool (*partition_supports_resizing)(partition_data *partition);
-typedef bool (*partition_supports_resizing_child)(partition_data *partition,
-	partition_data *child);
-typedef bool (*partition_supports_moving)(partition_data *partition,
-	bool *isNoOp);
-typedef bool (*partition_supports_moving_child)(partition_data *partition,
-	partition_data *child);
-typedef bool (*partition_supports_setting_name)(partition_data *partition);
-typedef bool (*partition_supports_setting_content_name)(
-	partition_data *partition);
-typedef bool (*partition_supports_setting_type)(partition_data *partition);
-typedef bool (*partition_supports_setting_parameters)(
-	partition_data *partition);
-typedef bool (*partition_supports_setting_content_parameters)(
-	partition_data *partition);
-typedef bool (*partition_supports_initializing)(partition_data *partition);
-typedef bool (*partition_supports_initializing_child)(
-	partition_data *partition, const char *system);
-typedef bool (*partition_supports_creating_child)(partition_data *partition);
-typedef bool (*partition_supports_deleting_child)(partition_data *partition,
-	partition_data *child);
-typedef bool (*partition_is_sub_system_for)(partition_data *partition);
-
-typedef bool (*partition_validate_resize)(partition_data *partition,
-	off_t *size);
-typedef bool (*partition_validate_resize_child)(partition_data *partition,
-	partition_data *child, off_t *size);
-typedef bool (*partition_validate_move)(partition_data *partition,
-	off_t *start);
-typedef bool (*partition_validate_move_child)(partition_data *partition,
-	partition_data *child, off_t *start);
-typedef bool (*partition_validate_set_name)(partition_data *partition,
-											char *name);
-typedef bool (*partition_validate_set_content_name)(partition_data *partition,
-													char *name);
-typedef bool (*partition_validate_set_type)(partition_data *partition,
-											const char *type);
-typedef bool (*partition_validate_set_parameters)(partition_data *partition,
-	const char *parameters);
-typedef bool (*partition_validate_set_content_parameters)(
-	partition_data *partition, const char *parameters);
-typedef bool (*partition_validate_initialize)(partition_data *partition,
-	char *name, const char *parameters);
-typedef bool (*partition_validate_create_child)(partition_data *partition,
-	off_t *start, off_t *size, const char *type, const char *parameters,
-	int32 *index);
-typedef status_t (*partition_get_partitionable_spaces)(
-	partition_data *partition, partitionable_space_data *buffer, int32 count,
-	int32 *actualCount);
-	// When not implemented, a standard algorithm is used.
-
-typedef status_t (*partition_get_next_supported_type)(
-	partition_data *partition, int32 *cookie, char *type);
-typedef status_t (*partition_get_type_for_content_type)(
-	const char *contentType, char *type);
-
-// shadow partition modification
-// (device is write locked)
-typedef status_t (*partition_shadow_changed)(partition_data *partition,
-	uint32 operation);
-
-// writing
-// (device is NOT locked)
-typedef status_t (*partition_repair)(int fd, partition_id partition,
-	bool checkOnly, disk_job_id job);
-typedef status_t (*partition_resize)(int fd, partition_id partition,
-	off_t size, disk_job_id job);
-typedef status_t (*partition_resize_child)(int fd, partition_id partition,
-	off_t size, disk_job_id job);
-typedef status_t (*partition_move)(int fd, partition_id partition,
-	off_t offset, disk_job_id job);
-typedef status_t (*partition_move_child)(int fd, partition_id partition,
-	partition_id child, off_t offset, disk_job_id job);
-typedef status_t (*partition_set_name)(int fd, partition_id partition,
-	const char *name, disk_job_id job);
-typedef status_t (*partition_set_content_name)(int fd, partition_id partition,
-	const char *name, disk_job_id job);
-typedef status_t (*partition_set_type)(int fd, partition_id partition,
-	const char *type, disk_job_id job);
-typedef status_t (*partition_set_parameters)(int fd, partition_id partition,
-	const char *parameters, disk_job_id job);
-typedef status_t (*partition_set_content_parameters)(int fd,
-	partition_id partition, const char *parameters, disk_job_id job);
-typedef status_t (*partition_initialize)(int fd, partition_id partition,
-	const char *name, const char *parameters, disk_job_id job);
-typedef status_t (*partition_create_child)(int fd, partition_id partition,
-	off_t offset, off_t size, const char *type, const char *parameters,
-	disk_job_id job, partition_id *childID);
-	// childID is used for the return value, but is also an optional input
-	// parameter -- -1 to be ignored
-typedef status_t (*partition_delete_child)(int fd, partition_id partition,
-	partition_id child, disk_job_id job);
-
 typedef struct partition_module_info {
 	module_info									module;
-	const char									*pretty_name;
+	const char*									pretty_name;
 	uint32										flags;
 
 	// scanning
-	partition_identify_partition				identify_partition;
-	partition_scan_partition					scan_partition;
-	partition_free_identify_partition_cookie	free_identify_partition_cookie;
-	partition_free_partition_cookie				free_partition_cookie;
-	partition_free_partition_content_cookie		free_partition_content_cookie;
+	// (the device is write locked)
+	float (*identify_partition)(int fd, partition_data* partition,
+				void** cookie);
+	status_t (*scan_partition)(int fd, partition_data* partition,
+				void* identifyCookie);
+	void (*free_identify_partition_cookie)(partition_data* partition,
+				void* cookie);
+	void (*free_partition_cookie)(partition_data* partition);
+	void (*free_partition_content_cookie)(partition_data* partition);
 
+
 	// querying
-	partition_supports_repairing				supports_repairing;
-	partition_supports_resizing					supports_resizing;
-	partition_supports_resizing_child			supports_resizing_child;
-	partition_supports_moving					supports_moving;
-	partition_supports_moving_child				supports_moving_child;
-	partition_supports_setting_name				supports_setting_name;
-	partition_supports_setting_content_name		supports_setting_content_name;
-	partition_supports_setting_type				supports_setting_type;
-	partition_supports_setting_parameters		supports_setting_parameters;
-	partition_supports_setting_content_parameters
-			supports_setting_content_parameters;
-	partition_supports_initializing				supports_initializing;
-	partition_supports_initializing_child		supports_initializing_child;
-	partition_supports_creating_child			supports_creating_child;
-	partition_supports_deleting_child			supports_deleting_child;
-	partition_is_sub_system_for					is_sub_system_for;
+	// (the device is read locked)
+	uint32 (*get_supported_operations)(partition_data* partition, uint32 mask);
+	uint32 (*get_supported_child_operations)(partition_data* partition,
+				partition_data* child, uint32 mask);
 
-	partition_validate_resize					validate_resize;
-	partition_validate_resize_child				validate_resize_child;
-	partition_validate_move						validate_move;
-	partition_validate_move_child				validate_move_child;
-	partition_validate_set_name					validate_set_name;
-	partition_validate_set_content_name			validate_set_content_name;
-	partition_validate_set_type					validate_set_type;
-	partition_validate_set_parameters			validate_set_parameters;
-	partition_validate_set_content_parameters
-			validate_set_content_parameters;
-	partition_validate_initialize				validate_initialize;
-	partition_validate_create_child				validate_create_child;
-	partition_get_partitionable_spaces			get_partitionable_spaces;
-	partition_get_next_supported_type			get_next_supported_type;
-	partition_get_type_for_content_type			get_type_for_content_type;
+	bool (*supports_initializing_child)(partition_data* partition,
+				const char* system);
+	bool (*is_sub_system_for)(partition_data* partition);
 
+	bool (*validate_resize)(partition_data* partition, off_t* size);
+	bool (*validate_resize_child)(partition_data* partition,
+				partition_data* child, off_t* size);
+	bool (*validate_move)(partition_data* partition, off_t* start);
+	bool (*validate_move_child)(partition_data* partition,
+				partition_data* child, off_t* start);
+	bool (*validate_set_name)(partition_data* partition, char* name);
+	bool (*validate_set_content_name)(partition_data* partition, char* name);
+	bool (*validate_set_type)(partition_data* partition, const char* type);
+	bool (*validate_set_parameters)(partition_data* partition,
+				const char* parameters);
+
+	bool (*validate_set_content_parameters)(partition_data* partition,
+				const char* parameters);
+	bool (*validate_initialize)(partition_data* partition, char* name,
+				const char* parameters);
+	bool (*validate_create_child)(partition_data* partition, off_t* start,
+				off_t* size, const char* type, const char* parameters,
+				int32* index);
+	status_t (*get_partitionable_spaces)(partition_data* partition,
+				partitionable_space_data* buffer, int32 count,
+				int32* actualCount);
+		// When not implemented, a standard algorithm is used.
+
+	status_t (*get_next_supported_type)(partition_data* partition,
+				int32* cookie, char* type);
+	status_t (*get_type_for_content_type)(const char* contentType, char* type);
+
+
 	// shadow partition modification
-	partition_shadow_changed					shadow_changed;
+	// (device is write locked)
+	status_t (*shadow_changed)(partition_data* partition, uint32 operation);
 
+
 	// writing
-	partition_repair							repair;
-	partition_resize							resize;
-	partition_resize_child						resize_child;
-	partition_move								move;
-	partition_move_child						move_child;
-	partition_set_name							set_name;
-	partition_set_content_name					set_content_name;
-	partition_set_type							set_type;
-	partition_set_parameters					set_parameters;
-	partition_set_content_parameters			set_content_parameters;
-	partition_initialize						initialize;
-	partition_create_child						create_child;
-	partition_delete_child						delete_child;
+	// (device is NOT locked)
+	status_t (*repair)(int fd, partition_id partition, bool checkOnly,
+				disk_job_id job);
+	status_t (*resize)(int fd, partition_id partition, off_t size,
+				disk_job_id job);
+	status_t (*resize_child)(int fd, partition_id partition, off_t size,
+				disk_job_id job);
+	status_t (*move)(int fd, partition_id partition, off_t offset,
+				disk_job_id job);
+	status_t (*move_child)(int fd, partition_id partition, partition_id child,
+				off_t offset, disk_job_id job);
+	status_t (*set_name)(int fd, partition_id partition, const char* name,
+				disk_job_id job);
+	status_t (*set_content_name)(int fd, partition_id partition,
+				const char* name, disk_job_id job);
+	status_t (*set_type)(int fd, partition_id partition, const char* type,
+				disk_job_id job);
+	status_t (*set_parameters)(int fd, partition_id partition,
+				const char* parameters, disk_job_id job);
+	status_t (*set_content_parameters)(int fd, partition_id partition,
+				const char* parameters, disk_job_id job);
+	status_t (*initialize)(int fd, partition_id partition, const char* name,
+				const char *parameters, disk_job_id job);
+	status_t (*create_child)(int fd, partition_id partition, off_t offset,
+				off_t size, const char* type, const char* parameters,
+				disk_job_id job, partition_id* childID);
+		// childID is used for the return value, but is also an optional input
+		// parameter -- -1 to be ignored
+	status_t (*delete_child)(int fd, partition_id partition, partition_id child,
+				disk_job_id job);
 } partition_module_info;
 
 #endif	// _K_DISK_DEVICE_MODULES_H

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	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp	2007-08-22 21:21:30 UTC (rev 22043)
@@ -2020,15 +2020,16 @@
 //	#pragma mark -
 
 
-bool
-bfs_supports_initializing(partition_data *partition)
+static uint32
+bfs_get_supported_operations(partition_data* partition, uint32 mask)
 {
 	// TODO: We should at least check the partition size.
-	return true;
+	return B_DISK_SYSTEM_SUPPORTS_INITIALIZING
+		| B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME;
 }
 
 
-bool
+static bool
 bfs_validate_initialize(partition_data *partition, char *name,
 	const char *parameters)
 {
@@ -2037,7 +2038,7 @@
 }
 
 
-status_t
+static status_t
 bfs_initialize(int fd, partition_id partition, const char *name,
 	const char *parameters, disk_job_id job)
 {
@@ -2125,6 +2126,26 @@
 
 	"Be File System",
 
+	// DDM flags
+	0
+//	| B_DISK_SYSTEM_SUPPORTS_CHECKING
+//	| B_DISK_SYSTEM_SUPPORTS_REPAIRING
+//	| B_DISK_SYSTEM_SUPPORTS_RESIZING
+//	| 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_CONTENT_NAME
+//	| B_DISK_SYSTEM_SUPPORTS_DEFRAGMENTING
+//	| B_DISK_SYSTEM_SUPPORTS_DEFRAGMENTING_WHILE_MOUNTED
+//	| B_DISK_SYSTEM_SUPPORTS_CHECKING_WHILE_MOUNTED
+//	| B_DISK_SYSTEM_SUPPORTS_REPAIRING_WHILE_MOUNTED
+//	| B_DISK_SYSTEM_SUPPORTS_RESIZING_WHILE_MOUNTED
+//	| B_DISK_SYSTEM_SUPPORTS_MOVING_WHILE_MOUNTED
+//	| B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_NAME_WHILE_MOUNTED
+//	| B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS_WHILE_MOUNTED
+	,
+
 	// scanning
 	bfs_identify_partition,
 	bfs_scan_partition,
@@ -2224,13 +2245,7 @@
 	&bfs_rewind_query,
 
 	/* capability querying operations */
-	NULL,	// supports_defragmenting
-	NULL,	// supports_repairing
-	NULL,	// supports_resizing
-	NULL,	// supports_moving
-	NULL,	// supports_setting_content_name
-	NULL,	// supports_setting_content_parameters
-	&bfs_supports_initializing,
+	&bfs_get_supported_operations,
 
 	NULL,	// validate_resize
 	NULL,	// validate_move

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	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp	2007-08-22 21:21:30 UTC (rev 22043)
@@ -2007,6 +2007,7 @@
 	},
 
 	"CDDA File System",
+	0,	// DDM flags
 
 	cdda_identify_partition,
 	cdda_scan_partition,

Modified: haiku/trunk/src/add-ons/kernel/file_systems/dos/dosfs.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/dos/dosfs.c	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/src/add-ons/kernel/file_systems/dos/dosfs.c	2007-08-22 21:21:30 UTC (rev 22043)
@@ -1192,6 +1192,7 @@
 	},
 
 	"FAT32 File System",
+	0,	// DDM flags
 
 	// scanning
 	dosfs_identify_partition,

Modified: haiku/trunk/src/add-ons/kernel/file_systems/googlefs/googlefs.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/googlefs/googlefs.c	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/src/add-ons/kernel/file_systems/googlefs/googlefs.c	2007-08-22 21:21:30 UTC (rev 22043)
@@ -1620,6 +1620,7 @@
 	},
 
 	GOOGLEFS_PRETTY_NAME,
+	0,	// DDM flags
 
 	// scanning
 	NULL,	// fs_identify_partition,

Modified: haiku/trunk/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp	2007-08-22 21:21:30 UTC (rev 22043)
@@ -972,6 +972,7 @@
 	},
 
 	"ISO9660 File System",
+	0,	// DDM flags
 
 	// scanning
 	fs_identify_partition,

Modified: haiku/trunk/src/add-ons/kernel/file_systems/nfs/nfs_add_on.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/nfs/nfs_add_on.c	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/src/add-ons/kernel/file_systems/nfs/nfs_add_on.c	2007-08-22 21:21:30 UTC (rev 22043)
@@ -2430,6 +2430,7 @@
 	},
 
 	"Network File System v2",
+	0,	// DDM flags
 
 	// scanning
 	NULL,	// fs_identify_partition,

Modified: haiku/trunk/src/add-ons/kernel/file_systems/ntfs/kernel_interface.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ntfs/kernel_interface.c	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ntfs/kernel_interface.c	2007-08-22 21:21:30 UTC (rev 22043)
@@ -85,6 +85,7 @@
 	},
 
 	"ntfs File System",
+	0,	// DDM flags
 
 	// scanning
 	fs_identify_partition,

Modified: haiku/trunk/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp	2007-08-22 21:21:30 UTC (rev 22043)
@@ -2070,6 +2070,7 @@
 	},
 
 	"RAM File System",
+	0,	// DDM flags
 
 	// scanning
 	NULL,	// identify_partition()

Modified: haiku/trunk/src/add-ons/kernel/file_systems/reiserfs/kernel_interface.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/reiserfs/kernel_interface.cpp	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/src/add-ons/kernel/file_systems/reiserfs/kernel_interface.cpp	2007-08-22 21:21:30 UTC (rev 22043)
@@ -650,6 +650,7 @@
 	},
 
 	"Reiser File System",
+	0,	// DDM flags
 
 	// scanning
 	NULL,	// identify_partition()

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/kernel_interface.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/kernel_interface.cpp	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/kernel_interface.cpp	2007-08-22 21:21:30 UTC (rev 22043)
@@ -1034,6 +1034,7 @@
 	},
 
 	"Userland File System",
+	0,	// DDM flags
 
 	// scanning
 	NULL,	// identify_partition()

Modified: haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/intel.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/intel.cpp	2007-08-22 20:29:40 UTC (rev 22042)
+++ haiku/trunk/src/add-ons/kernel/partitioning_systems/intel/intel.cpp	2007-08-22 21:21:30 UTC (rev 22043)
@@ -264,129 +264,40 @@
 // #pragma mark - Intel Partition Map - support functions
 
 
-// pm_supports_resizing
-static bool
-pm_supports_resizing(partition_data *partition)
+// pm_get_supported_operations
+static uint32
+pm_get_supported_operations(partition_data* partition, uint32 mask = ~0)
 {
-	TRACE(("intel: pm_supports_resizing(%ld: %lld, %lld, %ld, %s)\n",
-		partition->id, partition->offset, partition->size,
-		partition->block_size, partition->content_type));
-	
-	return (partition && partition->content_type
-		&& !strcmp(partition->content_type, kPartitionTypeIntel));
-}
+	uint32 flags = B_DISK_SYSTEM_SUPPORTS_RESIZING
+		| B_DISK_SYSTEM_SUPPORTS_MOVING
+		| B_DISK_SYSTEM_SUPPORTS_SETTING_CONTENT_PARAMETERS
+		| B_DISK_SYSTEM_SUPPORTS_INITIALIZING;
 
-// pm_supports_resizing_child
-static bool
-pm_supports_resizing_child(partition_data *partition, partition_data *child)
-{
-	TRACE(("intel: pm_supports_resizing_child(%ld: %lld, %lld, %ld, %s)\n",
-		partition->id, partition->offset, partition->size,
-		partition->block_size, partition->content_type));
-	
-	return (partition && child && partition->content_type
-			&& !strcmp(partition->content_type, kPartitionTypeIntel));
-}
+	// creating child
+	int32 countSpaces = 0;
+	if (partition->child_count < 4
+		// free space check
+		&& pm_get_partitionable_spaces(partition, NULL, 0, &countSpaces) == B_OK
+		&& countSpaces > 0) {
+		flags |= B_DISK_SYSTEM_SUPPORTS_CREATING_CHILD;
+	}
 
-// pm_supports_moving
-static bool
-pm_supports_moving(partition_data *partition, bool *isNoOp)
-{
-	TRACE(("intel: pm_supports_moving(%ld: %lld, %lld, %ld, %s)\n",
-		partition->id, partition->offset, partition->size,
-		partition->block_size, partition->content_type));
-	
-	*isNoOp = true;
-	return (partition && partition->content_type
-		&& !strcmp(partition->content_type, kPartitionTypeIntel));
+	return flags;
 }
 
-// pm_supports_moving_child
-static bool
-pm_supports_moving_child(partition_data *partition, partition_data *child)
-{
-	TRACE(("intel: pm_supports_moving_child(%ld: %lld, %lld, %ld, %s)\n",
-		partition->id, partition->offset, partition->size,
-		partition->block_size, partition->content_type));
-	
-	return (partition && child && partition->content_type
-		&& !strcmp(partition->content_type, kPartitionTypeIntel));
-}
 
-// pm_supports_setting_name
-static bool
-pm_supports_setting_name(partition_data *partition)
+// pm_get_supported_child_operations
+static uint32
+pm_get_supported_child_operations(partition_data* partition,
+	partition_data* child, uint32 mask = ~0)
 {
-	return false;
+	return B_DISK_SYSTEM_SUPPORTS_RESIZING_CHILD
+		| B_DISK_SYSTEM_SUPPORTS_MOVING_CHILD

[... truncated: 2354 lines follow ...]


From bonefish at mail.berlios.de  Wed Aug 22 23:22:30 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 22 Aug 2007 23:22:30 +0200
Subject: [Haiku-commits] r22044 - in haiku/trunk: headers/private/storage
	src/kits/storage
Message-ID: <200708222122.l7MLMUYi028058@sheep.berlios.de>

Author: bonefish
Date: 2007-08-22 23:22:29 +0200 (Wed, 22 Aug 2007)
New Revision: 22044
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22044&view=rev

Modified:
   haiku/trunk/headers/private/storage/DiskSystem.h
   haiku/trunk/src/kits/storage/DiskSystem.cpp
Log:
Added Supports[Content]Name() methods.


Modified: haiku/trunk/headers/private/storage/DiskSystem.h
===================================================================
--- haiku/trunk/headers/private/storage/DiskSystem.h	2007-08-22 21:21:30 UTC (rev 22043)
+++ haiku/trunk/headers/private/storage/DiskSystem.h	2007-08-22 21:22:29 UTC (rev 22044)
@@ -29,6 +29,8 @@
 	bool SupportsResizingChild() const;
 	bool SupportsMoving(bool *whileMounted) const;
 	bool SupportsMovingChild() const;
+	bool SupportsName() const;
+	bool SupportsContentName() const;
 	bool SupportsSettingName() const;
 	bool SupportsSettingContentName(bool *whileMounted) const;
 	bool SupportsSettingType() const;

Modified: haiku/trunk/src/kits/storage/DiskSystem.cpp
===================================================================
--- haiku/trunk/src/kits/storage/DiskSystem.cpp	2007-08-22 21:21:30 UTC (rev 22043)
+++ haiku/trunk/src/kits/storage/DiskSystem.cpp	2007-08-22 21:22:29 UTC (rev 22044)
@@ -140,6 +140,22 @@
 			&& (fFlags & B_DISK_SYSTEM_SUPPORTS_MOVING_CHILD));
 }
 
+// SupportsName
+bool
+BDiskSystem::SupportsName() const
+{
+	return (InitCheck() == B_OK && IsPartitioningSystem()
+			&& (fFlags & B_DISK_SYSTEM_SUPPORTS_NAME));
+}
+
+// SupportsContentName
+bool
+BDiskSystem::SupportsContentName() const
+{
+	return (InitCheck() == B_OK
+		&& (fFlags & B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME));
+}
+
 // SupportsSettingName
 bool
 BDiskSystem::SupportsSettingName() const



From bonefish at mail.berlios.de  Wed Aug 22 23:30:45 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 22 Aug 2007 23:30:45 +0200
Subject: [Haiku-commits] r22045 - buildtools/trunk/jam
Message-ID: <200708222130.l7MLUj1R028633@sheep.berlios.de>

Author: bonefish
Date: 2007-08-22 23:30:45 +0200 (Wed, 22 Aug 2007)
New Revision: 22045
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22045&view=rev

Modified:
   buildtools/trunk/jam/jam.h
Log:
Patch by Samuel Rodriguez Perez: Define OSPLAT=X86 for AMD 64.


Modified: buildtools/trunk/jam/jam.h
===================================================================
--- buildtools/trunk/jam/jam.h	2007-08-22 21:22:29 UTC (rev 22044)
+++ buildtools/trunk/jam/jam.h	2007-08-22 21:30:45 UTC (rev 22045)
@@ -416,6 +416,7 @@
 
 # if defined( _i386_ ) || \
      defined( __i386__ ) || \
+     defined( __amd64__ ) || \
      defined( _M_IX86 )
 # if !defined( OS_OS2 ) && \
      !defined( OS_AS400 )



From bonefish at mail.berlios.de  Thu Aug 23 00:07:03 2007
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 23 Aug 2007 00:07:03 +0200
Subject: [Haiku-commits] r22046 - in haiku/trunk: . build/jam
Message-ID: <200708222207.l7MM73Fu031329@sheep.berlios.de>

Author: bonefish
Date: 2007-08-23 00:07:03 +0200 (Thu, 23 Aug 2007)
New Revision: 22046
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22046&view=rev

Modified:
   haiku/trunk/build/jam/BuildSetup
   haiku/trunk/build/jam/MainBuildRules
   haiku/trunk/configure
Log:
Patch by Samuel Rodriguez Perez, slightly modified by myself: New
configure flag "--use-32bit" enabling 32 bit builds with a 64 bit host
compiler.


Modified: haiku/trunk/build/jam/BuildSetup
===================================================================
--- haiku/trunk/build/jam/BuildSetup	2007-08-22 21:30:45 UTC (rev 22045)
+++ haiku/trunk/build/jam/BuildSetup	2007-08-22 22:07:03 UTC (rev 22046)
@@ -346,6 +346,12 @@
 
 # host platform settings
 
+# enable GCC -m32 option, if requested
+if $(HAIKU_HOST_USE_32BIT) = 1 {
+	HOST_GCC_BASE_FLAGS = -m32 ;
+}
+
+
 # save jam's variables for the build platform
 HOST_AR				?= $(AR) ;
 HOST_CC				?= $(CC) ;
@@ -355,13 +361,14 @@
 HOST_OBJCOPY		?= objcopy ;	#
 HOST_RANLIB			?= $(RANLIB) ;
 HOST_CPPFLAGS		?= $(CPPFLAGS) ;
-HOST_CCFLAGS		?= $(CCFLAGS) ;
-HOST_C++FLAGS		?= $(C++FLAGS) ;
-HOST_LDFLAGS		?= $(LDFLAGS) ;
-HOST_LINKFLAGS		?= $(LINKFLAGS) ;
+HOST_CCFLAGS		?= $(HOST_GCC_BASE_FLAGS) $(CCFLAGS) ;
+HOST_C++FLAGS		?= $(HOST_GCC_BASE_FLAGS) $(C++FLAGS) ;
+HOST_LDFLAGS		?= $(HOST_GCC_BASE_FLAGS) $(LDFLAGS) ;
+HOST_LINKFLAGS		?= $(HOST_GCC_BASE_FLAGS) $(LINKFLAGS) ;
 HOST_DEFINES		?= $(DEFINES) ;
 HOST_HDRS			?= $(HDRS) ;
 
+
 # split up HOST_AR into the command name and flags
 HOST_AR				= [ Match "([^ ]*) *(.*)" : $(HOST_AR[1]) ]
 					  $(HOST_AR[2-]) ;
@@ -415,10 +422,10 @@
 HOST_PIC_CCFLAGS += -fPIC ;
 HOST_PIC_C++FLAGS += -fPIC ;
 
-HOST_KERNEL_CCFLAGS += -finline -fno-builtin
+HOST_KERNEL_CCFLAGS += $(HOST_GCC_BASE_FLAGS) -finline -fno-builtin
 	-DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) -D_KERNEL_MODE ;
-HOST_KERNEL_C++FLAGS += -finline -fno-builtin -fno-exceptions
-	-DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) -D_KERNEL_MODE ;
+HOST_KERNEL_C++FLAGS += $(HOST_GCC_BASE_FLAGS) -finline -fno-builtin
+	-fno-exceptions -DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) -D_KERNEL_MODE ;
 
 HOST_KERNEL_PIC_CCFLAGS = -fno-pic ;
 HOST_KERNEL_PIC_LINKFLAGS = ;
@@ -465,6 +472,11 @@
 	HOST_KERNEL_DEBUG_$(level)_C++FLAGS	= $(flags) ;
 }
 
+# ld flags
+if $(HOST_ARCH) = x86 && $(HAIKU_HOST_USE_32BIT) = 1 {
+	HOST_LDFLAGS += -melf_i386 ;
+}
+
 # private kernel headers do be used when compiling kernel code
 HOST_PRIVATE_KERNEL_HEADERS = ;
 
@@ -517,8 +529,8 @@
 	} else if $(HOST_PLATFORM) = darwin {
 		HOST_LIBROOT += /opt/local/lib/libgnuregex.dylib ;
 	}
-  
 
+
 	# The BeOS compilers define __INTEL__ respectively __POWERPC__. On the
 	# build platform we need to make sure, this is also defined.
 	if $(HOST_CPU) = x86 {

Modified: haiku/trunk/build/jam/MainBuildRules
===================================================================
--- haiku/trunk/build/jam/MainBuildRules	2007-08-22 21:30:45 UTC (rev 22045)
+++ haiku/trunk/build/jam/MainBuildRules	2007-08-22 22:07:03 UTC (rev 22046)
@@ -2,7 +2,7 @@
 rule AddSharedObjectGlueCode
 {
 	# AddSharedObjectGlueCode <target> : <isExecutable> ;
-	
+
 	# we link with -nostdlib and add the required libs manually, when building
 	# for Haiku
 	local platform ;
@@ -94,7 +94,7 @@
 rule Server
 {
 	# Server <name> : <sources> : <libraries> : <res> ;
-	
+
 	Executable $(1) : $(2) : $(3) : $(4) ;
 }
 
@@ -141,7 +141,7 @@
 	# <lib>: The static library to be built.
 	# <sources>: List of source files.
 	# <otherObjects>: List of additional object files.
-	#	
+	#
 	local lib = $(1) ;
 	local sources = [ FGristFiles $(2) ] ;
 	local otherObjects = $(3) ;
@@ -192,12 +192,12 @@
 		NEEDLIBS on $(target) = $(NEEDLIBS) ;
 		LINKLIBS on $(target) = $(LINKLIBS) ;
 	}
-		
+
 	LocalClean clean : $(target) ;
 	LocalDepends all : $(target) ;
 	Depends $(target) : $(objects) ;
 
-	MakeLocateDebug $(target) ; 
+	MakeLocateDebug $(target) ;
 }
 
 actions Ld
@@ -224,8 +224,10 @@
 
 		if $(PLATFORM) = host {
 			LINK on $(1) = $(HOST_LD) ;
+			LINKFLAGS on $(target) = $(HOST_LDFLAGS) ;
 		} else {
 			LINK on $(1) = $(TARGET_LD) ;
+			LINKFLAGS on $(target) = $(TARGET_LDFLAGS) ;
 		}
 	}
 
@@ -238,7 +240,7 @@
 
 actions MergeObjectFromObjects1
 {
-	$(LINK) -r $(2) -o $(1) ;
+	$(LINK) $(LINKFLAGS) -r $(2) -o $(1) ;
 }
 
 rule MergeObject
@@ -362,7 +364,7 @@
 				linkLibs += $(i) ;
 			}
 		}
-	
+
 		NEEDLIBS on $(1) = $(NEEDLIBS) $(needLibs) ;
 		LINKLIBS on $(1) = $(LINKLIBS) -l$(linkLibs) ;
 
@@ -403,10 +405,10 @@
 {
 	# Usage BuildPlatformObjects <sources> ;
 	# <sources> The sources.
-	# 
+	#
 	local sources = [ FGristFiles $(1) ] ;
 	local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
-	
+
 	PLATFORM on $(objects) = host ;
 	SUPPORTED_PLATFORMS on $(objects) = host ;
 
@@ -419,7 +421,7 @@
 	# <target> The executable/library.
 	# <sources> The sources.
 	# <libraries> Libraries to link against.
-	# 
+	#
 	local target = $(1) ;
 	local sources = $(2) ;
 	local libs = $(3) ;
@@ -440,7 +442,7 @@
 			NEEDLIBS on $(target) += $(HOST_LIBROOT) ;
 		}
 	}
-		
+
 	Main $(target) : $(sources) ;
 	LinkAgainst $(target) : $(libs) ;
 }
@@ -455,7 +457,7 @@
 	local target = $(1) ;
 	local sources = $(2) ;
 	local libs = $(3) ;
-	
+
 	BuildPlatformMain $(target) : $(sources) : $(libs) ;
 
 	if $(HOST_PLATFORM) = darwin {
@@ -467,8 +469,8 @@
 	}
 
     local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
-	CCFLAGS on $(objects) += $(HOST_PIC_CCFLAGS) ; 
-	C++FLAGS on $(objects) += $(HOST_PIC_C++FLAGS) ; 
+	CCFLAGS on $(objects) += $(HOST_PIC_CCFLAGS) ;
+	C++FLAGS on $(objects) += $(HOST_PIC_C++FLAGS) ;
 }
 
 rule BuildPlatformMergeObject
@@ -484,7 +486,7 @@
 	local sources = $(2) ;
 	local otherObjects = $(3) ;
 	local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
-	
+
 	PLATFORM on $(target) = host ;
 	SUPPORTED_PLATFORMS on $(target) = host ;
 
@@ -520,11 +522,11 @@
 	# Creates a static library from sources.
 	# <lib>: The library.
 	# <sources>: List of source files.
-	
+
 	local lib = $(1) ;
 	local sources = $(2) ;
 	local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
-	
+
 	PLATFORM on $(lib) = host ;
 	SUPPORTED_PLATFORMS on $(lib) = host ;
 

Modified: haiku/trunk/configure
===================================================================
--- haiku/trunk/configure	2007-08-22 21:30:45 UTC (rev 22045)
+++ haiku/trunk/configure	2007-08-22 22:07:03 UTC (rev 22046)
@@ -12,7 +12,7 @@
 
 Usage: $0 <options>
 options:
-  --bochs-debug               Enables bochs serial debug emulation (activated 
+  --bochs-debug               Enables bochs serial debug emulation (activated
                               via kernel settings file).
   --build-cross-tools <build tools dir>
                               Assume cross compilation. <build tools dir>
@@ -47,6 +47,7 @@
                               valid targets=r5,bone,dano,haiku
   --use-gcc-pipe              Build with GCC option -pipe. Speeds up the build
                               process, but uses more memory.
+  --use-32bit                 Use -m32 flag on 64bit host gcc compiler.
   --use-xattr                 Use Linux xattr support for BeOS attribute
                               emulation. Warning: Make sure your file system
                               supports sufficient attribute sizes (4 KB per
@@ -105,7 +106,7 @@
 
 	haikuGCCVersion=`$HAIKU_CC -dumpversion`
 	haikuGCCMachine=`$HAIKU_CC -dumpmachine`
-	
+
 	HAIKU_GCC_LIB_DIR=${gccdir}
 	HAIKU_GCC_LIBGCC=${gccdir}/libgcc.a
 	HAIKU_GCC_GLUE_CODE="crtbegin.o crtend.o"
@@ -131,8 +132,8 @@
 					$headers/$d"
 			done
 
-			
-			# when not building the crosscompiler, to use cpp headers from 
+
+			# when not building the crosscompiler, to use cpp headers from
 			# tree first, but fallback to local C++ system headers (like <new>)
 			# if [ "$buildCrossTools" = "" ]; then
 			#	haikuCxxHeadersDir="headers/cpp $haikuCxxHeadersDir"
@@ -181,7 +182,7 @@
 	local var="HAIKU_$1"
 	local tool=$2
 	local path="${crossToolsPrefix}$tool"
-	
+
 	if [ -f "$path" ]; then
 		# get absolute path
 		local oldPwd=$(pwd)
@@ -194,7 +195,7 @@
 			exit 1
 		}
 	fi
-	
+
 	eval "$var=$path"
 }
 
@@ -220,6 +221,7 @@
 distroCompatibility=default
 target=haiku
 use_gcc_pipe=0
+use_32bit=0
 use_xattr=0
 crossToolsPrefix=
 buildCrossTools=
@@ -273,6 +275,7 @@
 						shift 2;;
 		--target=*)     target=`echo $1 | cut -d'=' -f2-`; shift 1;;
 		--use-gcc-pipe)	use_gcc_pipe=1; shift 1;;
+		--use-32bit)	use_32bit=1; shift 1;;
 		--use-xattr)	use_xattr=1; shift 1;;
 		*)				echo Invalid argument: \`$1\'; exit 1;;
 	esac
@@ -350,6 +353,7 @@
 INCLUDE_GPL_ADDONS			?= "${include_gpl_addons}" ;
 HAIKU_DISTRO_COMPATIBILITY	?= "${distroCompatibility}" ;
 HAIKU_USE_GCC_PIPE			?= "${use_gcc_pipe}" ;
+HAIKU_HOST_USE_32BIT		?= "${use_32bit}" ;
 HAIKU_HOST_USE_XATTR		?= "${use_xattr}" ;
 
 HAIKU_GCC_RAW_VERSION		?= ${haikuGCCVersion} ;



From mmlr at mail.berlios.de  Thu Aug 23 23:17:45 2007
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Thu, 23 Aug 2007 23:17:45 +0200
Subject: [Haiku-commits] r22047 - haiku/trunk/src/kits/app
Message-ID: <200708232117.l7NLHjCw004358@sheep.berlios.de>

Author: mmlr
Date: 2007-08-23 23:17:44 +0200 (Thu, 23 Aug 2007)
New Revision: 22047
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22047&view=rev

Modified:
   haiku/trunk/src/kits/app/Message.cpp
Log:
* Don't leak buffers when reallocs fail
* Always check the return of the resize function
* Handle resize errors gracefully and ensure that the message stays intact
* Don't crash when printing a message that contains a field with no items (unlikely but possible in low memory situations)
* Fixed renaming fields - was completely broken and would have missed up field names and contents
* Some cleanup

Modified: haiku/trunk/src/kits/app/Message.cpp
===================================================================
--- haiku/trunk/src/kits/app/Message.cpp	2007-08-22 22:07:03 UTC (rev 22046)
+++ haiku/trunk/src/kits/app/Message.cpp	2007-08-23 21:17:44 UTC (rev 22047)
@@ -410,12 +410,11 @@
 	for (int32 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)
+		if ((field->flags & FIELD_FLAG_FIXED_SIZE) && 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 (int32 j = 0; j < field->count; j++) {
 			if (field->count == 1) {
 				printf("%s        %s = ", indent,
 					(char *)(fData + field->offset));
@@ -541,10 +540,14 @@
 				nextField = &fFields[*nextField].next_field;
 			*nextField = index;
 
-			int32 oldLength = field->name_length;
-			field->name_length = strlen(newEntry) + 1;
-			_ResizeData(field->offset, field->name_length - oldLength);
-			memcpy(fData + field->offset, newEntry, field->name_length);
+			int32 newLength = strlen(newEntry) + 1;
+			status_t result = _ResizeData(field->offset + 1,
+				newLength - field->name_length);
+			if (result < B_OK)
+				return result;
+
+			memcpy(fData + field->offset, newEntry, newLength);
+			field->name_length = newLength;
 			return B_OK;
 		}
 
@@ -1329,10 +1332,11 @@
 		size = min_c(size, fHeader->data_size + MAX_DATA_PREALLOCATION);
 		size = max_c(size, fHeader->data_size + change);
 
-		fData = (uint8 *)realloc(fData, size);
-		if (!fData)
+		uint8 *newData = (uint8 *)realloc(fData, size);
+		if (size > 0 && !newData)
 			return B_NO_MEMORY;
 
+		fData = newData;
 		if (offset < fHeader->data_size) {
 			memmove(fData + offset + change, fData + offset,
 				fHeader->data_size - offset);
@@ -1350,10 +1354,14 @@
 
 		if (fHeader->data_available > MAX_DATA_PREALLOCATION) {
 			ssize_t available = MAX_DATA_PREALLOCATION / 2;
-			fData = (uint8 *)realloc(fData, fHeader->data_size + available);
-			if (!fData)
-				return B_NO_MEMORY;
+			ssize_t size = fHeader->data_size + available;
+			uint8 *newData = (uint8 *)realloc(fData, size);
+			if (size > 0 && !newData) {
+				// this is strange, but not really fatal
+				return B_OK;
+			}
 
+			fData = newData;
 			fHeader->data_available = available;
 		}
 	}
@@ -1420,15 +1428,16 @@
 		int32 count = fHeader->field_count * 2 + 1;
 		count = min_c(count, fHeader->field_count + MAX_FIELD_PREALLOCATION);
 
-		fFields = (field_header *)realloc(fFields, count * sizeof(field_header));
-		if (!fFields)
+		field_header *newFields = (field_header *)realloc(fFields,
+			count * sizeof(field_header));
+		if (count > 0 && !newFields)
 			return B_NO_MEMORY;
 
+		fFields = newFields;
 		fHeader->fields_available = count - fHeader->field_count;
 	}
 
 	uint32 hash = _HashName(name) % fHeader->hash_table_size;
-
 	int32 *nextField = &fHeader->hash_table[hash];
 	while (*nextField >= 0)
 		nextField = &fFields[*nextField].next_field;
@@ -1436,18 +1445,20 @@
 
 	field_header *field = &fFields[fHeader->field_count];
 	field->type = type;
-	field->flags = FIELD_FLAG_VALID;
-	if (isFixedSize)
-		field->flags |= FIELD_FLAG_FIXED_SIZE;
-
 	field->count = 0;
 	field->data_size = 0;
 	field->allocated = 0;
 	field->next_field = -1;
 	field->offset = fHeader->data_size;
 	field->name_length = strlen(name) + 1;
-	_ResizeData(field->offset, field->name_length);
+	status_t status = _ResizeData(field->offset, field->name_length);
+	if (status < B_OK)
+		return status;
+
 	memcpy(fData + field->offset, name, field->name_length);
+	field->flags = FIELD_FLAG_VALID;
+	if (isFixedSize)
+		field->flags |= FIELD_FLAG_FIXED_SIZE;
 
 	fHeader->fields_available--;
 	fHeader->fields_size += sizeof(field_header);
@@ -1460,6 +1471,11 @@
 status_t
 BMessage::_RemoveField(field_header *field)
 {
+	status_t result = _ResizeData(field->offset, -(field->data_size
+		+ field->name_length));
+	if (result < B_OK)
+		return result;
+
 	int32 index = ((uint8 *)field - (uint8 *)fFields) / sizeof(field_header);
 	int32 nextField = field->next_field;
 	if (nextField > index)
@@ -1481,8 +1497,6 @@
 			other->next_field = nextField;
 	}
 
-	_ResizeData(field->offset, -(field->data_size + field->name_length));
-
 	ssize_t size = fHeader->fields_size - (index + 1) * sizeof(field_header);
 	memmove(fFields + index, fFields + index + 1, size);
 	fHeader->fields_size -= sizeof(field_header);
@@ -1491,11 +1505,14 @@
 
 	if (fHeader->fields_available > MAX_FIELD_PREALLOCATION) {
 		ssize_t available = MAX_FIELD_PREALLOCATION / 2;
-		fFields = (field_header *)realloc(fFields, fHeader->fields_size
-			+ available * sizeof(field_header));
-		if (!fFields)
-			return B_NO_MEMORY;
+		size = fHeader->fields_size + available * sizeof(field_header);
+		field_header *newFields = (field_header *)realloc(fFields, size);
+		if (size > 0 && !newFields) {
+			// this is strange, but not really fatal
+			return B_OK;
+		}
 
+		fFields = newFields;
 		fHeader->fields_available = available;
 	}
 
@@ -1519,9 +1536,12 @@
 	if (result == B_NAME_NOT_FOUND)
 		result = _AddField(name, type, isFixedSize, &field);
 
-	if (result < B_OK || !field)
+	if (result < B_OK)
 		return result;
 
+	if (!field)
+		return B_ERROR;
+
 	uint32 offset = field->offset + field->name_length + field->data_size;
 	if (field->flags & FIELD_FLAG_FIXED_SIZE) {
 		if (field->count) {
@@ -1530,12 +1550,24 @@
 				return B_BAD_VALUE;
 		}
 
-		_ResizeData(offset, numBytes);
+		result = _ResizeData(offset, numBytes);
+		if (result < B_OK) {
+			if (field->count == 0)
+				_RemoveField(field);
+			return result;
+		}
+
 		memcpy(fData + offset, data, numBytes);
 		field->data_size += numBytes;
 	} else {
 		int32 change = numBytes + sizeof(numBytes);
-		_ResizeData(offset, change);
+		result = _ResizeData(offset, change);
+		if (result < B_OK) {
+			if (field->count == 0)
+				_RemoveField(field);
+			return result;
+		}
+
 		memcpy(fData + offset, &numBytes, sizeof(numBytes));
 		memcpy(fData + offset + sizeof(numBytes), data, numBytes);
 		field->data_size += change;
@@ -1574,7 +1606,10 @@
 	uint32 offset = field->offset + field->name_length;
 	if (field->flags & FIELD_FLAG_FIXED_SIZE) {
 		ssize_t size = field->data_size / field->count;
-		_ResizeData(offset + index * size, -size);
+		result = _ResizeData(offset + index * size, -size);
+		if (result < B_OK)
+			return result;
+
 		field->data_size -= size;
 	} else {
 		uint8 *pointer = fData + offset;
@@ -1585,7 +1620,10 @@
 		}
 
 		ssize_t currentSize = *(ssize_t *)pointer + sizeof(ssize_t);
-		_ResizeData(offset, -currentSize);
+		result = _ResizeData(offset, -currentSize);
+		if (result < B_OK)
+			return result;
+
 		field->data_size -= currentSize;
 	}
 
@@ -1703,7 +1741,10 @@
 
 		ssize_t currentSize = *(ssize_t *)pointer;
 		int32 change = numBytes - currentSize;
-		_ResizeData(offset, change);
+		result = _ResizeData(offset, change);
+		if (result < B_OK)
+			return result;
+
 		memcpy(fData + offset, &numBytes, sizeof(numBytes));
 		memcpy(fData + offset + sizeof(numBytes), data, numBytes);
 		field->data_size += change;



From axeld at mail.berlios.de  Fri Aug 24 01:29:09 2007
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 24 Aug 2007 01:29:09 +0200
Subject: [Haiku-commits] r22048 - in haiku/trunk: build/jam
	src/add-ons/kernel/busses/scsi src/add-ons/kernel/busses/scsi/ahci
	src/add-ons/kernel/drivers/disk
Message-ID: <200708232329.l7NNT9cx028038@sheep.berlios.de>

Author: axeld
Date: 2007-08-24 01:29:08 +0200 (Fri, 24 Aug 2007)
New Revision: 22048
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22048&view=rev

Added:
   haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/
Removed:
   haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/
Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/src/add-ons/kernel/busses/scsi/Jamfile
   haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/Jamfile
   haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci.c
   haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci_defs.h
   haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.c
   haiku/trunk/src/add-ons/kernel/drivers/disk/Jamfile
Log:
* SCSI SIM module driver shell for the AHCI driver for Marcus.
  It is loaded on boot, and the SCSI bus manager tries to scan its bus which
  of course fails at the moment. Hope that helps :-)
* Moved the driver to its new location; it's a SCSI bus controller, so it
  should be placed in busses/scsi.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2007-08-23 21:17:44 UTC (rev 22047)
+++ haiku/trunk/build/jam/HaikuImage	2007-08-23 23:29:08 UTC (rev 22048)
@@ -130,6 +130,8 @@
 	: $(BEOS_ADD_ONS_BUS_MANAGERS) ;
 AddFilesToHaikuImage beos system add-ons kernel busses ide
 	: generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata ;
+AddFilesToHaikuImage beos system add-ons kernel busses scsi
+	: ahci ;
 AddFilesToHaikuImage beos system add-ons kernel busses usb
 	: <usb>uhci <usb>ohci <usb>ehci ;
 AddFilesToHaikuImage beos system add-ons kernel console : vga_text ;
@@ -153,7 +155,6 @@
 AddDriversToHaikuImage audio hmulti	: $(BEOS_ADD_ONS_DRIVERS_AUDIO) ;
 AddDriversToHaikuImage midi			: $(BEOS_ADD_ONS_DRIVERS_MIDI) ;
 AddDriversToHaikuImage bus			: usb_raw ;
-AddDriversToHaikuImage disk			: ahci ;
 AddDriversToHaikuImage disk scsi	: scsi_cd scsi_dsk ;
 AddDriversToHaikuImage disk virtual	: nbd ;
 AddDriversToHaikuImage dvb			: cx23882 ;

Modified: haiku/trunk/src/add-ons/kernel/busses/scsi/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/scsi/Jamfile	2007-08-23 21:17:44 UTC (rev 22047)
+++ haiku/trunk/src/add-ons/kernel/busses/scsi/Jamfile	2007-08-23 23:29:08 UTC (rev 22048)
@@ -1,5 +1,6 @@
 SubDir HAIKU_TOP src add-ons kernel busses scsi ; 
 
+SubInclude HAIKU_TOP src add-ons kernel busses scsi ahci ;
 SubInclude HAIKU_TOP src add-ons kernel busses scsi 53c8xx ;
 SubInclude HAIKU_TOP src add-ons kernel busses scsi buslogic ;
 SubInclude HAIKU_TOP src add-ons kernel busses scsi usb ;

Copied: haiku/trunk/src/add-ons/kernel/busses/scsi/ahci (from rev 22041, haiku/trunk/src/add-ons/kernel/drivers/disk/ahci)

Modified: haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/Jamfile	2007-08-22 18:44:38 UTC (rev 22041)
+++ haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/Jamfile	2007-08-23 23:29:08 UTC (rev 22048)
@@ -1,6 +1,5 @@
-SubDir HAIKU_TOP src add-ons kernel drivers disk ahci ;
+SubDir HAIKU_TOP src add-ons kernel busses scsi ahci ;
 
-
 KernelAddon ahci :
 	ahci.c
 	ahci_sim.c

Modified: haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci.c	2007-08-22 18:44:38 UTC (rev 22041)
+++ haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci.c	2007-08-23 23:29:08 UTC (rev 22048)
@@ -3,31 +3,106 @@
  * Distributed under the terms of the MIT License.
  */
 
-#include <KernelExport.h>
-#include <device_manager.h>
+#include "ahci_defs.h"
 
+#include <stdlib.h>
+#include <string.h>
 
+#include <block_io.h>
+
+
 #define TRACE(a...) dprintf("\33[35mahci:\33[30m " a)
 #define FLOW(a...)	dprintf("ahci: " a)
 
+#define AHCI_ID_GENERATOR "ahci/id"
+#define AHCI_ID_ITEM "ahci/id"
+
+static device_manager_info *sDeviceManager;
+static pci_device *sPCIDevice;
+
+
+static status_t
+register_sim(device_node_handle parent)
+{
+	int32 id = sDeviceManager->create_id(AHCI_ID_GENERATOR);
+	if (id < 0)
+		return id;
+
+	{
+		device_attr attrs[] = {
+			{ B_DRIVER_MODULE, B_STRING_TYPE,
+				{ string: AHCI_SIM_MODULE_NAME }},
+			{ B_DRIVER_FIXED_CHILD, B_STRING_TYPE,
+				{ string: SCSI_FOR_SIM_MODULE_NAME }},
+
+			{ SCSI_DESCRIPTION_CONTROLLER_NAME, B_STRING_TYPE, 
+				{ string: AHCI_DEVICE_MODULE_NAME }},
+			{ B_BLOCK_DEVICE_MAX_BLOCKS_ITEM, B_UINT32_TYPE, { ui32: 255 }},
+			{ AHCI_ID_ITEM, B_UINT32_TYPE, { ui32: id }},
+			{ PNP_MANAGER_ID_GENERATOR, B_STRING_TYPE,
+				{ string: AHCI_ID_GENERATOR }},
+			{ PNP_MANAGER_AUTO_ID, B_UINT32_TYPE, { ui32: id }},
+
+			{ NULL }
+		};
+
+		device_node_handle node;
+		status_t status = sDeviceManager->register_device(parent, attrs, NULL,
+			&node);
+		if (status < B_OK)
+			sDeviceManager->free_id(AHCI_ID_GENERATOR, id);
+
+		return status;
+	}
+}
+
+
+//	#pragma mark -
+
+
 static float
 ahci_supports_device(device_node_handle parent, bool *_noConnection)
 {
+	uint8 baseClass, subClass, classAPI;
+	uint16 vendorID;
+	uint16 deviceID;
+	char *bus;
+
 	TRACE("ahci_supports_device\n");
 
-#if 0
-	uint16 vendor_id;
-	uint16 device_id;
-	uint8 base_class;
-	uint8 sub_class;
-	uint8 class_api;
-	status_t res;
+	// make sure parent is an PCI IDE mass storage host adapter device node
+	if (sDeviceManager->get_attr_string(parent, B_DRIVER_BUS, &bus,
+				false) != B_OK
+		|| sDeviceManager->get_attr_uint8(parent,
+				PCI_DEVICE_BASE_CLASS_ID_ITEM, &baseClass, false) != B_OK
+		|| sDeviceManager->get_attr_uint8(parent,
+				PCI_DEVICE_SUB_CLASS_ID_ITEM, &subClass, false) != B_OK
+		|| sDeviceManager->get_attr_uint8(parent,
+				PCI_DEVICE_API_ID_ITEM, &classAPI, false) != B_OK
+		|| sDeviceManager->get_attr_uint16(parent,
+				PCI_DEVICE_VENDOR_ID_ITEM, &vendorID, false) != B_OK
+		|| sDeviceManager->get_attr_uint16(parent,
+			PCI_DEVICE_DEVICE_ID_ITEM, &deviceID, false) != B_OK)
+		return B_ERROR;
 
-	if (base_class != PCI_mass_storage || sub_class != PCI_sata || class_api != PCI_sata_ahci)
+#if 1
+	if (strcmp(bus, "pci") || baseClass != PCI_mass_storage
+		|| subClass != PCI_sata || classAPI != PCI_sata_ahci) {
+		free(bus);
 		return 0.0f;
+	}
+#else
+	if (strcmp(bus, "pci") || baseClass != PCI_mass_storage
+		|| subClass != PCI_ide) {
+		free(bus);
+		return 0.0;
+	}
+#endif
 
-	TRACE("controller found! vendor 0x%04x, device 0x%04x\n", vendor_id, device_id);
-	
+	TRACE("controller found! vendor 0x%04x, device 0x%04x\n",
+		vendorID, deviceID);
+
+#if 0
 	res = pci->find_pci_capability(device, PCI_cap_id_sata, &cap_ofs);
 	if (res == B_OK) {
 		uint32 satacr0;
@@ -39,20 +114,57 @@
 	}
 #endif
 
-	return 0.0;
+	free(bus);
+	return 0.5;
 }
 
 
 static status_t
 ahci_register_device(device_node_handle parent)
 {
+	device_node_handle node;
+	status_t status;
+
+	device_attr attrs[] = {
+		// info about ourself and our consumer
+		{ B_DRIVER_MODULE, B_STRING_TYPE, { string: AHCI_DEVICE_MODULE_NAME }},
+
+		// DMA properties
+		// data must be word-aligned; 
+		{ B_BLOCK_DEVICE_DMA_ALIGNMENT, B_UINT32_TYPE,
+			{ ui32: 1 }},
+		// one S/G block must not cross 64K boundary
+		{ B_BLOCK_DEVICE_DMA_BOUNDARY, B_UINT32_TYPE,
+			{ ui32: 0xffff }},
+		// max size of S/G block is 16 bits with zero being 64K
+		{ B_BLOCK_DEVICE_MAX_SG_BLOCK_SIZE, B_UINT32_TYPE,
+			{ ui32: 0x10000 }},
+		// see definition of MAX_SG_COUNT
+		{ B_BLOCK_DEVICE_MAX_SG_BLOCKS, B_UINT32_TYPE,
+			{ ui32: 32 /* whatever... */ }},
+		{ NULL }
+	};
+
 	TRACE("ahci_register_device\n");
-	return B_OK;
+
+	// initialize parent (the bus) to get the PCI interface and device
+	status = sDeviceManager->init_driver(parent, NULL,
+			(driver_module_info **)&gPCI, (void **)&sPCIDevice);
+	if (status != B_OK)
+		return status;
+
+	status = sDeviceManager->register_device(parent, attrs,
+		NULL, &node); 
+	if (status < B_OK)
+		return status;
+
+	// TODO: register SIM for every controller we find!
+	return register_sim(node);
 }
 
 
 static status_t
-ahci_init_driver(device_node_handle node, void *user_cookie, void **_cookie)
+ahci_init_driver(device_node_handle node, void *userCookie, void **_cookie)
 {
 	TRACE("ahci_init_driver\n");
 	return B_OK;
@@ -108,9 +220,9 @@
 }
 
 
-driver_module_info ahci_driver = {
+driver_module_info sAHCIDevice = {
 	{
-		"ahci/device_v1",
+		AHCI_DEVICE_MODULE_NAME,
 		0,
 		std_ops
 	},
@@ -123,8 +235,14 @@
 	ahci_get_supported_paths,
 };
 
+module_dependency module_dependencies[] = {
+	{ B_DEVICE_MANAGER_MODULE_NAME, (module_info **)&sDeviceManager },
+	{ SCSI_FOR_SIM_MODULE_NAME, (module_info **)&gSCSI },
+	{}
+};
 
 module_info *modules[] = {
-	(module_info *)&ahci_driver,
+	(module_info *)&sAHCIDevice,
+	(module_info *)&gAHCISimInterface,
 	NULL
 };

Modified: haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci_defs.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci_defs.h	2007-08-22 18:44:38 UTC (rev 22041)
+++ haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci_defs.h	2007-08-23 23:29:08 UTC (rev 22048)
@@ -2,14 +2,17 @@
  * Copyright 2007, Marcus Overhagen. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
-
 #ifndef _AHCI_DEFS_H
 #define _AHCI_DEFS_H
 
-#include <SupportDefs.h>
+#include <bus/PCI.h>
+#include <bus/SCSI.h>
 
-typedef struct
-{
+#define AHCI_DEVICE_MODULE_NAME "busses/scsi/ahci/device_v1"
+#define AHCI_SIM_MODULE_NAME "busses/scsi/ahci/sim/v1"
+
+
+typedef struct {
 	uint32		clb;			// Command List Base Address
 	uint32		clbu;			// Command List Base Address Upper 32-Bits
 	uint32		fb;				// FIS Base Address
@@ -32,8 +35,7 @@
 } ahci_port;
 
 
-typedef struct
-{
+typedef struct {
 	uint32		cap;			// Host Capabilities
 	uint32		ghc;			// Global Host Control
 	uint32		is;				// Interrupt Status
@@ -48,4 +50,8 @@
 	ahci_port	port[32];
 } ahci_hba;
 
-#endif
+extern scsi_sim_interface gAHCISimInterface;
+extern pci_device_module_info *gPCI;
+extern scsi_for_sim_interface *gSCSI;
+
+#endif	/* _AHCI_DEFS_H */

Modified: haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/ahci/ahci_sim.c	2007-08-22 18:44:38 UTC (rev 22041)
+++ haiku/trunk/src/add-ons/kernel/busses/scsi/ahci/ahci_sim.c	2007-08-23 23:29:08 UTC (rev 22048)
@@ -3,53 +3,177 @@
  * Distributed under the terms of the MIT License.
  */
 
+#include "ahci_defs.h"
+
 #include <KernelExport.h>
-#include <bus/SCSI.h>
 
-#define TRACE(a...) dprintf("ahci: " a)
+#define TRACE(a...) dprintf("\33[34mahci:\33[30m " a)
 #define FLOW(a...)	dprintf("ahci: " a)
 
 
+pci_device_module_info *gPCI;
+scsi_for_sim_interface *gSCSI;
 
-/*
 
-// SIM interface
-// SCSI controller drivers must provide this interface
-typedef struct scsi_sim_interface {
-	driver_module_info info;
+//	#pragma mark - SIM module interface
 
-	// execute request
-	void (*scsi_io)( scsi_sim_cookie cookie, scsi_ccb *ccb );
-	// abort request
-	uchar (*abort)( scsi_sim_cookie cookie, scsi_ccb *ccb_to_abort );
-	// reset device
-	uchar (*reset_device)( scsi_sim_cookie cookie, uchar target_id, uchar target_lun );
-	// terminate request
-	uchar (*term_io)( scsi_sim_cookie cookie, scsi_ccb *ccb_to_terminate );
 
-	// get information about bus
-	uchar (*path_inquiry)( scsi_sim_cookie cookie, scsi_path_inquiry *inquiry_data );
-	// scan bus
-	// this is called immediately before the SCSI bus manager scans the bus
-	uchar (*scan_bus)( scsi_sim_cookie cookie );
-	// reset bus
-	uchar (*reset_bus)( scsi_sim_cookie cookie );
-	
-	// get restrictions of one device 
-	// (used for non-SCSI transport protocols and bug fixes)
-	void (*get_restrictions)(
-		scsi_sim_cookie 	cookie,
-		uchar				target_id,		// target id
-		bool				*is_atapi, 		// set to true if this is an ATAPI device that
-											// needs some commands emulated
-		bool				*no_autosense,	// set to true if there is no autosense;
-											// the SCSI bus manager will request sense on
-											// SCSI_REQ_CMP_ERR/SCSI_DEVICE_CHECK_CONDITION
-		uint32 				*max_blocks );	// maximum number of blocks per transfer if > 0;
-											// used for buggy devices that cannot handle
-											// large transfers (read: ATAPI ZIP drives)
+//! execute request
+static void
+ahci_scsi_io(scsi_sim_cookie cookie, scsi_ccb *request)
+{
+	TRACE("ahci_scsi_io()\n");
 
-	status_t (*ioctl)(scsi_sim_cookie, uint8 targetID, uint32 op, void *buffer, size_t length);
-} scsi_sim_interface;
+	request->subsys_status = SCSI_NO_HBA;
+	gSCSI->finished(request, 1);
+}
 
+
+//! abort request
+static uchar
+ahci_abort_io(scsi_sim_cookie cookie, scsi_ccb *request)
+{
+	TRACE("ahci_abort_io()\n");
+
+	return SCSI_REQ_CMP;
+}
+
+
+static uchar
+ahci_reset_device(scsi_sim_cookie cookie, uchar targetID, uchar targetLUN)
+{
+	TRACE("ahci_reset_device()\n");
+
+	return SCSI_REQ_CMP;
+}
+
+
+//! terminate request
+static uchar
+ahci_terminate_io(scsi_sim_cookie cookie, scsi_ccb *request)
+{
+	TRACE("ahci_terminate_io()\n");
+
+	return SCSI_NO_HBA;
+}
+
+
+//! get information about bus
+static uchar
+ahci_path_inquiry(scsi_sim_cookie cookie, scsi_path_inquiry *info)
+{
+	TRACE("ahci_path_inquiry()\n");
+
+	return SCSI_NO_HBA;
+}
+
+
+//! this is called immediately before the SCSI bus manager scans the bus
+static uchar
+ahci_scan_bus(scsi_sim_cookie cookie)
+{
+	TRACE("ahci_scan_bus()\n");
+
+	return SCSI_NO_HBA;
+}
+
+
+static uchar
+ahci_reset_bus(scsi_sim_cookie cookie)
+{
+	TRACE("ahci_reset_bus()\n");
+
+	return SCSI_NO_HBA;
+}
+
+
+/*!	Get restrictions of one device 
+	(used for non-SCSI transport protocols and bug fixes)
 */
+static void
+ahci_get_restrictions(scsi_sim_cookie cookie, uchar targetID, bool *isATAPI,
+	bool *noAutoSense, uint32 *maxBlocks)
+{
+	TRACE("ahci_get_restrictions()\n");
+
+	*isATAPI = false;
+	*noAutoSense = false;
+	*maxBlocks = 255;
+}
+
+
+static status_t
+ahci_ioctl(scsi_sim_cookie cookie, uint8 targetID, uint32 op, void *buffer,
+	size_t length)
+{
+	TRACE("ahci_ioctl()\n");
+	return B_BAD_VALUE;
+}
+
+
+//	#pragma mark -
+
+
+static status_t
+ahci_sim_init_bus(device_node_handle node, void *user_cookie, void **_cookie)
+{
+	TRACE("ahci_sim_init_bus\n");
+	return B_OK;
+}
+
+
+static status_t
+ahci_sim_uninit_bus(void *cookie)
+{
+	TRACE("ahci_sim_uninit_bus\n");
+	return B_OK;
+}
+
+
+static void
+ahci_sim_bus_removed(device_node_handle node, void *cookie)
+{
+	TRACE("ahci_sim_bus_removed\n");
+}
+
+
+static status_t
+std_ops(int32 op, ...)
+{
+	switch (op) {
+		case B_MODULE_INIT:
+		case B_MODULE_UNINIT:
+			return B_OK;
+
+		default:
+			return B_ERROR;
+	}
+}
+
+
+scsi_sim_interface gAHCISimInterface = {
+	{
+		{
+			AHCI_SIM_MODULE_NAME,
+			0,
+			std_ops
+		},
+		NULL,	// supported devices				
+		NULL,	// register node
+		ahci_sim_init_bus,
+		ahci_sim_uninit_bus,
+		ahci_sim_bus_removed,
+		NULL,	// device cleanup
+		NULL,	// get supported paths
+	},
+	ahci_scsi_io,
+	ahci_abort_io,
+	ahci_reset_device,
+	ahci_terminate_io,
+	ahci_path_inquiry,
+	ahci_scan_bus,
+	ahci_reset_bus,
+	ahci_get_restrictions,
+	ahci_ioctl
+};
+

Modified: haiku/trunk/src/add-ons/kernel/drivers/disk/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/Jamfile	2007-08-23 21:17:44 UTC (rev 22047)
+++ haiku/trunk/src/add-ons/kernel/drivers/disk/Jamfile	2007-08-23 23:29:08 UTC (rev 22048)
@@ -1,6 +1,5 @@
 SubDir HAIKU_TOP src add-ons kernel drivers disk ;
 
 SubInclude HAIKU_TOP src add-ons kernel drivers disk acpi_loader ;
-SubInclude HAIKU_TOP src add-ons kernel drivers disk ahci ;
 SubInclude HAIKU_TOP src add-ons kernel drivers disk scsi ;
 SubInclude HAIKU_TOP src add-ons kernel drivers disk virtual ;



From leavengood at mail.berlios.de  Fri Aug 24 03:17:20 2007
From: leavengood at mail.berlios.de (leavengood at BerliOS)
Date: Fri, 24 Aug 2007 03:17:20 +0200
Subject: [Haiku-commits] r22049 - in haiku/trunk/src: kits/tracker
	preferences/appearance preferences/menu
Message-ID: <200708240117.l7O1HK8E006247@sheep.berlios.de>

Author: leavengood
Date: 2007-08-24 03:17:18 +0200 (Fri, 24 Aug 2007)
New Revision: 22049
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=22049&view=rev

Modified:
   haiku/trunk/src/kits/tracker/SettingsViews.cpp
   haiku/trunk/src/kits/tracker/SettingsViews.h
   haiku/trunk/src/kits/tracker/TrackerSettingsWindow.cpp
   haiku/trunk/src/preferences/appearance/APRView.cpp
   haiku/trunk/src/preferences/appearance/ColorSet.cpp
   haiku/trunk/src/preferences/appearance/ColorSet.h
   haiku/trunk/src/preferences/menu/MenuSettings.cpp
   haiku/trunk/src/preferences/menu/MenuSettings.h
   haiku/trunk/src/preferences/menu/MenuWindow.cpp
   haiku/trunk/src/preferences/menu/MenuWindow.h
Log:
Patch from Justin O'Dell for bug #254, fixing the Defaults button behavior
for the Appearance and Menu prefs, and Tracker's settings.


Modified: haiku/trunk/src/kits/tracker/SettingsViews.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/SettingsViews.cpp	2007-08-23 23:29:08 UTC (rev 22048)
+++ haiku/trunk/src/kits/tracker/SettingsViews.cpp	2007-08-24 01:17:18 UTC (rev 22049)
@@ -93,6 +93,19 @@
 
 
 /*!
+	This function is used by the window to tell whether
+	it can ghost the defaults button or not. It doesn't
+	shows the default settings, this function should
+	return true.
+*/
+bool
+SettingsView::IsDefaultable() const
+{
+	return true;
+}
+
+
+/*!
 	The inherited functions should set the values that was
 	active when the settings window opened. It should also
 	update the UI widgets accordingly, preferrable by calling
@@ -317,6 +330,19 @@
 }
 
 
+bool
+DesktopSettingsView::IsDefaultable() const
+{
+	TrackerSettings settings;
+
+	return settings.ShowDisksIcon() != false
+		|| settings.MountVolumesOntoDesktop() != true
+		|| settings.MountSharedVolumesOntoDesktop() != true
+		|| settings.IntegrateNonBootBeOSDesktops() != false
+		|| settings.EjectWhenUnmounting() != true;
+}
+
+
 void
 DesktopSettingsView::Revert()
 {
@@ -570,6 +596,19 @@
 }
 
 
+bool
+WindowsSettingsView::IsDefaultable() const
+{
+	TrackerSettings settings;
+
+	return settings.ShowFullPathInTitleBar() != false
+		|| settings.SingleWindowBrowse() != false
+		|| settings.ShowNavigator() != false
+		|| settings.TransparentSelection() != true
+		|| settings.SortFolderNamesFirst() != true;
+}
+
+
 void
 WindowsSettingsView::Revert()
 {
@@ -843,6 +882,17 @@
 }
 
 
+bool
+TimeFormatSettingsView::IsDefaultable() const
+{
+	TrackerSettings settings;
+
+	return settings.TimeFormatSeparator() != kSlashSeparator
+		|| settings.DateOrderFormat() != kMDYFormat
+		|| settings.ClockIs24Hr() != false;
+}
+
+
 void
 TimeFormatSettingsView::Revert()
 {
@@ -1146,6 +1196,18 @@
 }
 
 
+bool
+SpaceBarSettingsView::IsDefaultable() const
+{
+	TrackerSettings settings;
+
+	return settings.ShowVolumeSpaceBar() != false
+		|| settings.UsedSpaceColor() != Color(0, 203, 0, 192)
+		|| settings.FreeSpaceColor() != Color(255, 255, 255, 192)
+		|| settings.WarningSpaceColor() != Color(203, 0, 0, 192);
+}
+
+
 void
 SpaceBarSettingsView::Revert()
 {
@@ -1307,6 +1369,16 @@
 }
 
 
+bool
+TrashSettingsView::IsDefaultable() const
+{
+	TrackerSettings settings;
+
+	return settings.DontMoveFilesToTrash() != false
+		|| settings.AskBeforeDeleteFile() != true;
+}
+
+
 void
 TrashSettingsView::Revert()
 {

Modified: haiku/trunk/src/kits/tracker/SettingsViews.h
===================================================================
--- haiku/trunk/src/kits/tracker/SettingsViews.h	2007-08-23 23:29:08 UTC (rev 22048)
+++ haiku/trunk/src/kits/tracker/SettingsViews.h	2007-08-24 01:17:18 UTC (rev 22049)
@@ -57,6 +57,7 @@
 		virtual ~SettingsView();
 
 		virtual void SetDefaults();
+		virtual bool IsDefaultable() const;
 		virtual void Revert();
 		virtual void ShowCurrentSettings();
 		virtual void RecordRevertSettings();
@@ -75,6 +76,7 @@
 		virtual void GetPreferredSize(float *_width, float *_height);
 
 		virtual void SetDefaults();
+		virtual bool IsDefaultable() const;
 		virtual void Revert();
 		virtual void ShowCurrentSettings();
 		virtual void RecordRevertSettings();
@@ -108,6 +110,7 @@
 		virtual void GetPreferredSize(float *_width, float *_height);
 
 		virtual void SetDefaults();
+		virtual bool IsDefaultable() const;
 		virtual void Revert();
 		virtual void ShowCurrentSettings();
 		virtual void RecordRevertSettings();
@@ -139,6 +142,7 @@
 		virtual void GetPreferredSize(float *_width, float *_height);
 
 		virtual void SetDefaults();
+		virtual bool IsDefaultable() const;
 		virtual void Revert();
 		virtual void ShowCurrentSettings();
 		virtual void RecordRevertSettings();
@@ -178,6 +182,7 @@
 		virtual void GetPreferredSize(float *_width, float *_height);
 
 		virtual void SetDefaults();
+		virtual bool IsDefaultable() const;
 		virtual void Revert();
 		virtual void ShowCurrentSettings();
 		virtual void RecordRevertSettings();
@@ -206,6 +211,7 @@
 		virtual void GetPreferredSize(float *_width, float *_height);
 
 		virtual void SetDefaults();
+		virtual bool IsDefaultable() const;
 		virtual void Revert();
 		virtual void ShowCurrentSettings();
 		virtual void RecordRevertSettings();

Modified: haiku/trunk/src/kits/tracker/TrackerSettingsWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/TrackerSettingsWindow.cpp	2007-08-23 23:29:08 UTC (rev 22048)
+++ haiku/trunk/src/kits/tracker/TrackerSettingsWindow.cpp	2007-08-24 01:17:18 UTC (rev 22049)
@@ -88,6 +88,7 @@
 	fDefaultsButton = new BButton(rect, "Defaults", "Defaults",
 		new BMessage(kDefaultsButtonPressed), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
 	fDefaultsButton->ResizeToPreferred();
+	fDefaultsButton->SetEnabled(false);
 	fDefaultsButton->MoveBy(0, -fDefaultsButton->Bounds().Height());
 	topView->AddChild(fDefaultsButton);
 
@@ -240,13 +241,16 @@
 {
 	int32 itemCount = fSettingsTypeListView->CountItems();
 
+	bool defaultable = false;
 	bool revertable = false;
 
 	for (int32 i = 0; i < itemCount; i++) {
+		defaultable |= _ViewAt(i)->IsDefaultable();
 		revertable |= _ViewAt(i)->IsRevertable();
 	}
 
-	fSettingsTypeListView->Invalidate();	
+	fSettingsTypeListView->Invalidate();
+	fDefaultsButton->SetEnabled(defaultable);
 	fRevertButton->SetEnabled(revertable);
 
 	TrackerSettings().SaveSettings(false);
@@ -258,8 +262,10 @@
 {
 	int32 itemCount = fSettingsTypeListView->CountItems();
 	
-	for (int32 i = 0; i < itemCount; i++)
-		_ViewAt(i)->SetDefaults();
+	for (int32 i = 0; i < itemCount; i++) {
+		if (_ViewAt(i)->IsDefaultable())
+			_ViewAt(i)->SetDefaults();
+	}
 
 	_HandleChangedContents();
 }

Modified: haiku/trunk/src/preferences/appearance/APRView.cpp
===================================================================
--- haiku/trunk/src/preferences/appearance/APRView.cpp	2007-08-23 23:29:08 UTC (rev 22048)
+++ haiku/trunk/src/preferences/appearance/APRView.cpp	2007-08-24 01:17:18 UTC (rev 22049)
@@ -146,7 +146,8 @@
 	fDefaults = new BButton(BRect(0,0,1,1),"DefaultsButton","Defaults",
 							new BMessage(DEFAULT_SETTINGS),
 							B_FOLLOW_LEFT |B_FOLLOW_TOP, B_WILL_DRAW | B_NAVIGABLE);
-	fDefaults->ResizeToPreferred(); 
+	fDefaults->ResizeToPreferred();
+	fDefaults->SetEnabled(false);
 	fDefaults->MoveTo((fPicker->Frame().right-(fDefaults->Frame().Width()*2)-20)/2,fPicker->Frame().bottom+20);
 	AddChild(fDefaults);
 	
@@ -157,8 +158,8 @@
 	fRevert = new BButton(cvrect,"RevertButton","Revert", 
 						new BMessage(REVERT_SETTINGS),
 						B_FOLLOW_LEFT |B_FOLLOW_TOP, B_WILL_DRAW | B_NAVIGABLE);
+	fRevert->SetEnabled(false);
 	AddChild(fRevert);
-	fRevert->SetEnabled(false);
 	
 }
 
@@ -185,6 +186,8 @@
 					   fDefaults->Frame().bottom + 10);
 	LoadSettings();
 	fAttrList->Select(0);
+	
+	fDefaults->SetEnabled(fCurrentSet.IsDefaultable());
 }
 
 void
@@ -221,6 +224,7 @@
 			// Update current fAttribute in the settings
 			fCurrentSet.SetColor(fAttrString.String(),col);
 			
+			fDefaults->SetEnabled(fCurrentSet.IsDefaultable());
 			fRevert->SetEnabled(true);
 			
 			break;
@@ -236,6 +240,8 @@
 			
 			fAttrString=whichitem->Text();
 			UpdateControlsFromAttr(whichitem->Text());
+
+			fDefaults->SetEnabled(fCurrentSet.IsDefaultable());
 			break;
 		}
 		case REVERT_SETTINGS: {
@@ -248,6 +254,7 @@
 		}
 		case DEFAULT_SETTINGS: {
 			fCurrentSet.SetToDefaults();
+			fDefaults->SetEnabled(false);
 			
 			UpdateControlsFromAttr(fAttrString.String());
 			BMenuItem *item = fDecorMenu->FindItem("Default");

Modified: haiku/trunk/src/preferences/appearance/ColorSet.cpp
===================================================================
--- haiku/trunk/src/preferences/appearance/ColorSet.cpp	2007-08-23 23:29:08 UTC (rev 22048)
+++ haiku/trunk/src/preferences/appearance/ColorSet.cpp	2007-08-24 01:17:18 UTC (rev 22049)
@@ -26,6 +26,15 @@
 }
 
 
+static bool
+match_rgb_color(rgb_color& color, uint8 red, uint8 green, uint8 blue)
+{
+	return color.red == red
+		&& color.green == green
+		&& color.blue == blue;
+}
+
+
 //	#pragma mark -
 
 
@@ -173,6 +182,40 @@
 }
 
 /*!
+	\brief Checks if the ColorSet can be set to defaults.
+*/
+bool
+ColorSet::IsDefaultable()
+{
+	// TODO: Move all the default color values into constants
+	return !match_rgb_color(panel_background, 216, 216, 216)
+		|| !match_rgb_color(panel_text, 0, 0, 0)
+		|| !match_rgb_color(document_background, 255, 255, 255)
+		|| !match_rgb_color(document_text, 0, 0, 0)
+		|| !match_rgb_color(control_background, 245, 245, 245)
+		|| !match_rgb_color(control_text, 0, 0, 0)
+		|| !match_rgb_color(control_border, 0, 0, 0)
+		|| !match_rgb_color(control_highlight, 102, 152, 203)
+		|| !match_rgb_color(keyboard_navigation_base, 0, 0, 229)
+		|| !match_rgb_color(keyboard_navigation_pulse, 0, 0, 0)
+		|| !match_rgb_color(shine, 255, 255, 255)
+		|| !match_rgb_color(shadow, 0, 0, 0)
+		|| !match_rgb_color(menu_background, 216, 216, 216)
+		|| !match_rgb_color(menu_selected_background, 115, 120, 184)
+		|| !match_rgb_color(menu_text, 0, 0, 0)
+		|| !match_rgb_color(menu_selected_text, 255, 255, 255)
+		|| !match_rgb_color(menu_selected_border, 0, 0, 0)
+		|| !match_rgb_color(tooltip_background, 255, 255, 0)
+		|| !match_rgb_color(tooltip_text, 0, 0, 0)
+		|| !match_rgb_color(success, 0, 255, 0)
+		|| !match_rgb_color(failure, 255, 0, 0)
+		|| !match_rgb_color(window_tab, 255, 203, 0)
+		|| !match_rgb_color(window_tab_text, 0, 0, 0)
+		|| !match_rgb_color(inactive_window_tab, 232, 232, 232)
+		|| !match_rgb_color(inactive_window_tab_text, 80, 80, 80);
+}
+
+/*!
 	\brief Attaches the color set's members as data to the given BMessage
 	\param msg The message to receive the attributes
 */

Modified: haiku/trunk/src/preferences/appearance/ColorSet.h
===================================================================
--- haiku/trunk/src/preferences/appearance/ColorSet.h	2007-08-23 23:29:08 UTC (rev 22048)
+++ haiku/trunk/src/preferences/appearance/ColorSet.h	2007-08-24 01:17:18 UTC (rev 22049)
@@ -32,6 +32,7 @@
 		bool		ConvertFromMessage(const BMessage *msg);
 
 		void		SetToDefaults(void);
+		bool		IsDefaultable(void);
 
 		rgb_color 	StringToColor(const char *string);
 		rgb_color	AttributeToColor(int32 which);

Modified: haiku/trunk/src/preferences/menu/MenuSettings.cpp
===================================================================
--- haiku/trunk/src/preferences/menu/MenuSettings.cpp	2007-08-23 23:29:08 UTC (rev 22048)
+++ haiku/trunk/src/preferences/menu/MenuSettings.cpp	2007-08-24 01:17:18 UTC (rev 22049)
@@ -74,3 +74,17 @@
 	set_menu_info(&fDefaultSettings);
 }
 
+
+bool
+MenuSettings::IsDefaultable()
+{
+	menu_info info;
+	get_menu_info(&info);
+
+	return info.font_size !=  fDefaultSettings.font_size
+		|| info.background_color != fDefaultSettings.background_color
+		|| info.separator != fDefaultSettings.separator
+		|| info.click_to_open != fDefaultSettings.click_to_open
+		|| info.triggers_always_shown != fDefaultSettings.triggers_always_shown;
+}
+

Modified: haiku/trunk/src/preferences/menu/MenuSettings.h
===================================================================
--- haiku/trunk/src/preferences/menu/MenuSettings.h	2007-08-23 23:29:08 UTC (rev 22048)
+++ haiku/trunk/src/preferences/menu/MenuSettings.h	2007-08-24 01:17:18 UTC (rev 22049)
@@ -21,6 +21,7 @@
 
 		void Revert();
 		void ResetToDefaults();
+		bool IsDefaultable();
 
 	private:
 		MenuSettings();

Modified: haiku/trunk/src/preferences/menu/MenuWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/menu/MenuWindow.cpp	2007-08-23 23:29:08 UTC (rev 22048)
+++ haiku/trunk/src/preferences/menu/MenuWindow.cpp	2007-08-24 01:17:18 UTC (rev 22049)
@@ -31,7 +31,6 @@
 		B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE)
 {
 	fColorWindow = NULL;
-	fRevert = false;
 
 	BView* topView = new BView(Bounds(), "menuView", B_FOLLOW_ALL_SIDES,
 		B_WILL_DRAW);
@@ -48,10 +47,11 @@
 	BRect buttonFrame(menuBarFrame.left, menuBarFrame.bottom + 10, 
 		menuBarFrame.left + 75, menuBarFrame.bottom + 30);
 
-	BButton* defaultButton = new BButton(buttonFrame, "Default", "Defaults",
+	fDefaultsButton = new BButton(buttonFrame, "Default", "Defaults",
 		new BMessage(MENU_DEFAULT), B_FOLLOW_H_CENTER | B_FOLLOW_BOTTOM,
 		B_WILL_DRAW | B_NAVIGABLE);
-	topView->AddChild(defaultButton);
+	fDefaultsButton->SetEnabled(false);
+	topView->AddChild(fDefaultsButton);
 
 	buttonFrame.OffsetBy(buttonFrame.Width() + 20, 0);
 	fRevertButton = new BButton(buttonFrame, "Revert", "Revert", new BMessage(MENU_REVERT),
@@ -60,8 +60,7 @@
 	topView->AddChild(fRevertButton);
 
 	topView->MakeFocus();
-
-	Update();	
+	fMenuBar->Update();
 }
 
 
@@ -73,25 +72,27 @@
 
 	switch (msg->what) {
 		case MENU_REVERT:
-			fRevert = false;
 			settings->Revert();
-			Update();
+
+			fRevertButton->SetEnabled(false);
+			fDefaultsButton->SetEnabled(settings->IsDefaultable());
+			fMenuBar->Update();
 			break;
 
 		case MENU_DEFAULT:
-			fRevert = true;
 			settings->ResetToDefaults();
-			Update();
+
+			fDefaultsButton->SetEnabled(false);
+			fMenuBar->Update();
 			break;
 
 		case UPDATE_WINDOW:
-			Update();
+			fMenuBar->Update();
 			break;
 
 		case MENU_FONT_FAMILY:
 		case MENU_FONT_STYLE:
 		{
-			fRevert = true;
 			const font_family *family;
 			msg->FindString("family", (const char **)&family);
 			const font_style *style;
@@ -101,40 +102,49 @@
 			strlcpy(info.f_family, (const char *)family, B_FONT_FAMILY_LENGTH);
 			strlcpy(info.f_style, (const char *)style, B_FONT_STYLE_LENGTH);
 			settings->Set(info);
-			Update();
+
+			fRevertButton->SetEnabled(true);
+			fDefaultsButton->SetEnabled(settings->IsDefaultable());
+			fMenuBar->Update();
 			break;
 		}
 
 		case MENU_FONT_SIZE:
-			fRevert = true;
 			settings->Get(info);
 			msg->FindFloat("size", &info.font_size);
 			settings->Set(info);
-			Update();
+
+			fRevertButton->SetEnabled(true);
+			fDefaultsButton->SetEnabled(settings->IsDefaultable());
+			fMenuBar->Update();
 			break;
 
 		case ALLWAYS_TRIGGERS_MSG:
-			fRevert = true;
 			settings->Get(info);
 			info.triggers_always_shown = !info.triggers_always_shown;
 			settings->Set(info);
+
+			fRevertButton->SetEnab