From koki at haikuzone.net  Wed Apr  1 00:44:00 2009
From: koki at haikuzone.net (Jorge G. Mare)
Date: Tue, 31 Mar 2009 15:44:00 -0700
Subject: [Haiku-commits] r29815 - in haiku/trunk/src/apps: . charactermap
In-Reply-To: <52877500018-BeMail@zon>
References: <52877500018-BeMail@zon>
Message-ID: <49D29CB0.6060207@haikuzone.net>

Hi Axel,

Axel D?rfler wrote:
> "Jorge G. Mare" <koki at haikuzone.net> wrote:
>   
>> This is very nice indeed! It would be nice if double-clicking a
>> character would copy it to the clipboard; would be useful to get to
>> those special characters that are not accessible from the keyboard. 
>> ;)
>>     
>
> Would Command-C and maybe a right-click menu for that work as well? I'm 
> not sure if double clicking isn't a bit weird to alter the clipboard.
>   

I thought a double-click would be the fastest way, but you are right
that it is a non-standard (and therefore an unintuitive) method of
copying to the clipboard.

A right-click menu would definitely work; but if you feel like it bloats
the app (or you are not convinced about adding it for whatever reason),
then Command-C alone should work just fine.

Thanks!

Jorge



From bonefish at mail.berlios.de  Wed Apr  1 02:11:35 2009
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Wed, 1 Apr 2009 02:11:35 +0200
Subject: [Haiku-commits] r29844 -
	haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse
Message-ID: <200904010011.n310BZHu015278@sheep.berlios.de>

Author: bonefish
Date: 2009-04-01 02:11:34 +0200 (Wed, 01 Apr 2009)
New Revision: 29844
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29844&view=rev

Added:
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.h
Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_api.h
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp
Log:
Parse the FUSE library options. They aren't used yet, though.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp	2009-03-31 21:48:56 UTC (rev 29843)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp	2009-04-01 00:11:34 UTC (rev 29844)
@@ -237,8 +237,8 @@
 
 
 status_t
-FUSEFileSystem::FinishInitClientFS(const fuse_operations* ops, size_t opSize,
-	void* userData)
+FUSEFileSystem::FinishInitClientFS(fuse_config* config,
+	const fuse_operations* ops, size_t opSize, void* userData)
 {
 PRINT(("FUSEFileSystem::FinishInitClientFS()\n"));
 	fExitStatus = B_ERROR;

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h	2009-03-31 21:48:56 UTC (rev 29843)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h	2009-04-01 00:11:34 UTC (rev 29844)
@@ -10,6 +10,9 @@
 #include "fuse_api.h"
 
 
+struct fuse_config;
+
+
 namespace UserlandFS {
 
 class FUSEFileSystem : public FileSystem {
@@ -38,8 +41,9 @@
 			status_t			InitClientFS(const char* parameters);
 			void				ExitClientFS(status_t status);
 
-			status_t			FinishInitClientFS(const fuse_operations* ops,
-									size_t opSize, void* userData);
+			status_t			FinishInitClientFS(fuse_config* config,
+									const fuse_operations* ops, size_t opSize,
+									void* userData);
 
 private:
 			class ArgumentVector;

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile	2009-03-31 21:48:56 UTC (rev 29843)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile	2009-04-01 00:11:34 UTC (rev 29844)
@@ -21,6 +21,7 @@
 # the library providing the FUSE interface for add-ons
 SharedLibrary libuserlandfs_fuse.so
 	:
+	fuse_config.c
 	fuse_fs.cpp
 	fuse_main.cpp
 	fuse_opt.c

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_api.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_api.h	2009-03-31 21:48:56 UTC (rev 29843)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_api.h	2009-04-01 00:11:34 UTC (rev 29844)
@@ -9,5 +9,6 @@
 
 #include <fuse.h>
 #include <fuse_lowlevel.h>
+#include <fuse_opt.h>
 
 #endif	// USERLAND_FS_FUSE_FUSE_API_H

Added: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c	2009-03-31 21:48:56 UTC (rev 29843)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c	2009-04-01 00:11:34 UTC (rev 29844)
@@ -0,0 +1,67 @@
+/*
+  FUSE: Filesystem in Userspace
+  Copyright (C) 2001-2007  Miklos Szeredi <miklos at szeredi.hu>
+
+  This program can be distributed under the terms of the GNU LGPLv2.
+  See the file COPYING.LIB
+*/
+
+#include "fuse_config.h"
+
+
+enum  {
+	KEY_HELP,
+};
+
+#define FUSE_LIB_OPT(t, p, v) { t, offsetof(struct fuse_config, p), v }
+
+static const struct fuse_opt fuse_lib_opts[] = {
+	FUSE_OPT_KEY("-h",		      KEY_HELP),
+	FUSE_OPT_KEY("--help",		      KEY_HELP),
+	FUSE_OPT_KEY("debug",		      FUSE_OPT_KEY_KEEP),
+	FUSE_OPT_KEY("-d",		      FUSE_OPT_KEY_KEEP),
+	FUSE_LIB_OPT("debug",		      debug, 1),
+	FUSE_LIB_OPT("-d",		      debug, 1),
+	FUSE_LIB_OPT("hard_remove",	      hard_remove, 1),
+	FUSE_LIB_OPT("use_ino",		      use_ino, 1),
+	FUSE_LIB_OPT("readdir_ino",	      readdir_ino, 1),
+	FUSE_LIB_OPT("direct_io",	      direct_io, 1),
+	FUSE_LIB_OPT("kernel_cache",	      kernel_cache, 1),
+	FUSE_LIB_OPT("auto_cache",	      auto_cache, 1),
+	FUSE_LIB_OPT("noauto_cache",	      auto_cache, 0),
+	FUSE_LIB_OPT("umask=",		      set_mode, 1),
+	FUSE_LIB_OPT("umask=%o",	      umask, 0),
+	FUSE_LIB_OPT("uid=",		      set_uid, 1),
+	FUSE_LIB_OPT("uid=%d",		      uid, 0),
+	FUSE_LIB_OPT("gid=",		      set_gid, 1),
+	FUSE_LIB_OPT("gid=%d",		      gid, 0),
+	FUSE_LIB_OPT("entry_timeout=%lf",     entry_timeout, 0),
+	FUSE_LIB_OPT("attr_timeout=%lf",      attr_timeout, 0),
+	FUSE_LIB_OPT("ac_attr_timeout=%lf",   ac_attr_timeout, 0),
+	FUSE_LIB_OPT("ac_attr_timeout=",      ac_attr_timeout_set, 1),
+	FUSE_LIB_OPT("negative_timeout=%lf",  negative_timeout, 0),
+	FUSE_LIB_OPT("intr",		      intr, 1),
+	FUSE_LIB_OPT("intr_signal=%d",	      intr_signal, 0),
+	FUSE_LIB_OPT("modules=%s",	      modules, 0),
+	FUSE_OPT_END
+};
+
+
+static int
+fuse_lib_opt_proc(void *data, const char *arg, int key,
+	struct fuse_args *outargs)
+{
+	(void)data;
+	(void)arg;
+	(void)key;
+	(void)outargs;
+
+	return 1;
+}
+
+
+int
+fuse_parse_config_args(struct fuse_args* args, struct fuse_config* config)
+{
+	return fuse_opt_parse(args, config, fuse_lib_opts, fuse_lib_opt_proc) == 0;
+}

Added: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.h	2009-03-31 21:48:56 UTC (rev 29843)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.h	2009-04-01 00:11:34 UTC (rev 29844)
@@ -0,0 +1,51 @@
+/*
+  FUSE: Filesystem in Userspace
+  Copyright (C) 2001-2007  Miklos Szeredi <miklos at szeredi.hu>
+
+  This program can be distributed under the terms of the GNU LGPLv2.
+  See the file COPYING.LIB
+*/
+#ifndef USERLAND_FS_FUSE_CONFIG_H
+#define USERLAND_FS_FUSE_CONFIG_H
+
+#include "fuse_api.h"
+
+
+struct fuse_config {
+	unsigned int uid;
+	unsigned int gid;
+	unsigned int  umask;
+	double entry_timeout;
+	double negative_timeout;
+	double attr_timeout;
+	double ac_attr_timeout;
+	int ac_attr_timeout_set;
+	int debug;
+	int hard_remove;
+	int use_ino;
+	int readdir_ino;
+	int set_mode;
+	int set_uid;
+	int set_gid;
+	int direct_io;
+	int kernel_cache;
+	int auto_cache;
+	int intr;
+	int intr_signal;
+	int help;
+	char *modules;
+};
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int fuse_parse_config_args(struct fuse_args* args, struct fuse_config* config);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	// USERLAND_FS_FUSE_CONFIG_H

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp	2009-03-31 21:48:56 UTC (rev 29843)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp	2009-04-01 00:11:34 UTC (rev 29844)
@@ -8,6 +8,7 @@
 #include <stdio.h>
 
 #include "fuse_api.h"
+#include "fuse_config.h"
 #include "FUSEFileSystem.h"
 
 
@@ -18,10 +19,20 @@
 printf("fuse_main_real(%d, %p, %p, %ld, %p)\n", argc, argv, op, opSize,
 userData);
 
+	// parse args
+	struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
+	fuse_config config;
+	bool success = fuse_parse_config_args(&args, &config);
+	fuse_opt_free_args(&args);
+
+	if (!success)
+		return 1;
+
 	// run the main loop
-	status_t error = FUSEFileSystem::GetInstance()->FinishInitClientFS(op,
-		opSize, userData);
+	status_t error = FUSEFileSystem::GetInstance()->FinishInitClientFS(&config,
+		op, opSize, userData);
 
+
 	return error == B_OK ? 0 : 1;
 }
 



From koki at haikuzone.net  Wed Apr  1 03:33:15 2009
From: koki at haikuzone.net (Jorge G. Mare)
Date: Tue, 31 Mar 2009 18:33:15 -0700
Subject: [Haiku-commits] r29843 - in haiku/trunk/src/data/beos_mime:
 audio video
In-Reply-To: <200903312148.n2VLmuQe027256@sheep.berlios.de>
References: <200903312148.n2VLmuQe027256@sheep.berlios.de>
Message-ID: <49D2C45B.7000805@haikuzone.net>

dlmcpaul at BerliOS wrote:
> Author: dlmcpaul
> Date: 2009-03-31 23:48:56 +0200 (Tue, 31 Mar 2009)
> New Revision: 29843
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29843&view=rev
>
> Modified:
>    haiku/trunk/src/data/beos_mime/audio/mp4
>    haiku/trunk/src/data/beos_mime/video/mp4
> Log:
> mp4 is video not audio, add m4v as a mpeg-4 extension
>   

Nice one!

Cheers,

Jorge



From fekdahl at gmail.com  Wed Apr  1 07:00:04 2009
From: fekdahl at gmail.com (Fredrik Ekdahl)
Date: Wed, 01 Apr 2009 07:00:04 +0200
Subject: [Haiku-commits] r29843 - in haiku/trunk/src/data/beos_mime:
 audio video
In-Reply-To: <200903312148.n2VLmuQe027256@sheep.berlios.de>
References: <200903312148.n2VLmuQe027256@sheep.berlios.de>
Message-ID: <49D2F4D4.3080004@gmail.com>

dlmcpaul at BerliOS skrev:
> Author: dlmcpaul
> Date: 2009-03-31 23:48:56 +0200 (Tue, 31 Mar 2009)
> New Revision: 29843
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29843&view=rev
> 
> Modified:
>    haiku/trunk/src/data/beos_mime/audio/mp4
>    haiku/trunk/src/data/beos_mime/video/mp4
> Log:
> mp4 is video not audio, add m4v as a mpeg-4 extension

That's not true. MP4 files can be only audio, audio and video, only 
video, text etc. In fact it can contain any number of streams.
See http://en.wikipedia.org/wiki/Mp4#.MP4_versus_.M4A_file_extensions
and http://tools.ietf.org/html/rfc4337
The standard only specifies .mp4 and .mpg4 as extension for MP4 format, 
though since Apple started using m4a for audio only files this has 
become common practice.

> Modified: haiku/trunk/src/data/beos_mime/audio/mp4
> ===================================================================
> --- haiku/trunk/src/data/beos_mime/audio/mp4	2009-03-31 21:35:59 UTC (rev 29842)
> +++ haiku/trunk/src/data/beos_mime/audio/mp4	2009-03-31 21:48:56 UTC (rev 29843)
> @@ -8,7 +8,6 @@
>  resource(3, "META:PREF_APP") #'MSIG' "application/x-vnd.Haiku-MediaPlayer";
>  
>  resource(4, "META:EXTENS") message(234) {
> -	"extensions" = "mp4",
>  	"extensions" = "m4a",
>  	"type" = "audio/mp4"
>  };
> 
> Modified: haiku/trunk/src/data/beos_mime/video/mp4
> ===================================================================
> --- haiku/trunk/src/data/beos_mime/video/mp4	2009-03-31 21:35:59 UTC (rev 29842)
> +++ haiku/trunk/src/data/beos_mime/video/mp4	2009-03-31 21:48:56 UTC (rev 29843)
> @@ -7,6 +7,7 @@
>  
>  resource(3, "META:EXTENS") message(234) {
>  	"extensions" = "mp4",
> +	"extensions" = "m4v",
>  	"type" = "video/mp4"
>  };

m4v is a totally different thing than mp4. m4v indicates a raw 
bitstream, not encapsulated in MP4 format which .mp4 indicates.
I think it's wrong to give m4v files the mime type video/mp4 as that 
mime type means it's the file format MP4.

-- 
/Fredrik Ekdahl


From dlmcpaul at gmail.com  Wed Apr  1 07:16:12 2009
From: dlmcpaul at gmail.com (David McPaul)
Date: Wed, 1 Apr 2009 16:16:12 +1100
Subject: [Haiku-commits] r29843 - in haiku/trunk/src/data/beos_mime:
	audio video
In-Reply-To: <49D2F4D4.3080004@gmail.com>
References: <200903312148.n2VLmuQe027256@sheep.berlios.de>
	<49D2F4D4.3080004@gmail.com>
Message-ID: <da2be3d70903312216ydfd443ewded88615a44f40b9@mail.gmail.com>

On 2009-04-01, Fredrik Ekdahl <fekdahl at gmail.com> wrote:
> dlmcpaul at BerliOS skrev:
> > Author: dlmcpaul
> > Date: 2009-03-31 23:48:56 +0200 (Tue, 31 Mar 2009)
> > New Revision: 29843
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29843&view=rev
> >
> > Modified:
> >    haiku/trunk/src/data/beos_mime/audio/mp4
> >    haiku/trunk/src/data/beos_mime/video/mp4
> > Log:
> > mp4 is video not audio, add m4v as a mpeg-4 extension
>
> That's not true. MP4 files can be only audio, audio and video, only
> video, text etc. In fact it can contain any number of streams.

Yep.

> See http://en.wikipedia.org/wiki/Mp4#.MP4_versus_.M4A_file_extensions
> and http://tools.ietf.org/html/rfc4337
> The standard only specifies .mp4 and .mpg4 as extension for MP4 format,
> though since Apple started using m4a for audio only files this has
> become common practice.

And this is where the problem begins.

A mime type for audio/mp4 was added listing .m4a and .mp4 as valid
extensions.  So when I copied a .mp4 file onto my haiku partition it
would be identified as audio/mp4 and shown the audio icon.

The same extension was defined as video/mp4 which was a duplication
and did not work.

So I have removed .mp4 from audio/mp4 but have left .m4a since the
common practice of Apple is to reserve that extension for audio only
mp4 files.

I have added .m4v to video/mp4 because I am seeing many files with
that extension.  These files are clearly mp4 files (they contain video
and audio) but ultimately they are still video/mp4 and even if they
were raw streams they are still raw mp4 video streams.

Anyway we can remove the audio/mp4 mime and the extension .m4v from
the video/mp4 mime type to conform to the standard but we will need an
alternative to handle the non standard extensions .m4a and .m4v

> m4v is a totally different thing than mp4. m4v indicates a raw
> bitstream, not encapsulated in MP4 format which .mp4 indicates.
> I think it's wrong to give m4v files the mime type video/mp4 as that
> mime type means it's the file format MP4.

Wrong yes.  Alternative??

-- 
Cheers
David


From axeld at pinc-software.de  Wed Apr  1 10:14:47 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 01 Apr 2009 10:14:47 +0200 CEST
Subject: [Haiku-commits] r29841 - haiku/trunk/src/kits/interface
In-Reply-To: <200903312135.n2VLZ4l6026392@sheep.berlios.de>
Message-ID: <830938429-BeMail@zon>

stippi at mail.berlios.de wrote:
> Modified:
>    haiku/trunk/src/kits/interface/ColumnListView.cpp
> Log:
> Puh... big coding style cleanup. I probably missed a few issues 
> too... but
> should be much better now. There was like three different styles 
> before.

Not to belittle your work, but I really hope to get rid of this class 
in the future :-)

Bye,
   Axel.



From axeld at pinc-software.de  Wed Apr  1 10:15:51 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 01 Apr 2009 10:15:51 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r29838_-_haiku/trunk/src/add-ons/media/?=
 =?utf-8?q?plugins/avcodec/libavcodec?=
In-Reply-To: <da2be3d70903311427y66ff3f77gf78e5880e7cca833@mail.gmail.com>
Message-ID: <894729303-BeMail@zon>

David McPaul <dlmcpaul at gmail.com> wrote:
> 2009/4/1 Fran?ois Revol <revol at free.fr>:
> >> Log:
> >> performance improvements
> > Sure this will builds with gcc2 ???
> It should do, thats what I use here under BeOS.
> 
> I also have the MMX stuff building as well but the resulting object
> file does not load under haiku :-(

You might want to file a bug report for this, along with the binaries 
to reproduce the problem.

Bye,
   Axel.



From fredrik at modeen.se  Wed Apr  1 10:16:44 2009
From: fredrik at modeen.se (Fredrik =?utf-8?Q?Mod=C3=A8en?=)
Date: Wed, 1 Apr 2009 10:16:44 +0200 (CEST)
Subject: [Haiku-commits] r29841 - haiku/trunk/src/kits/interface
In-Reply-To: <830938429-BeMail@zon>
References: <830938429-BeMail@zon>
Message-ID: <1d1ff6e4963ad056f6ee4e41a758e802.squirrel@webmail2.webbhotellsgruppen.se>


> stippi at mail.berlios.de wrote:
>> Modified:
>>    haiku/trunk/src/kits/interface/ColumnListView.cpp
>> Log:
>> Puh... big coding style cleanup. I probably missed a few issues
>> too... but
>> should be much better now. There was like three different styles
>> before.
>
> Not to belittle your work, but I really hope to get rid of this class
> in the future :-)
How come? replaced with other class?
I'm using it as it has a nicer look than other list classes.

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


-- 
MVH
Fredrik Mod?en



From superstippi at gmx.de  Wed Apr  1 10:43:18 2009
From: superstippi at gmx.de (Stephan Assmus)
Date: Wed, 01 Apr 2009 10:43:18 +0200
Subject: [Haiku-commits] r29841 - haiku/trunk/src/kits/interface
In-Reply-To: <1d1ff6e4963ad056f6ee4e41a758e802.squirrel@webmail2.webbhotells
	gruppen.se>
References: <830938429-BeMail@zon>
	<1d1ff6e4963ad056f6ee4e41a758e802.squirrel@webmail2.webbhotellsgruppen.se>
Message-ID: <20090401104318.2447.3@bepc.1238570199.fake>


On 2009-04-01 at 10:39:01 [+0200], Fredrik Mod?en <fredrik at modeen.se> wrote:
> 
> > stippi at mail.berlios.de wrote:
> >> Modified:
> >>    haiku/trunk/src/kits/interface/ColumnListView.cpp
> >> Log:
> >> Puh... big coding style cleanup. I probably missed a few issues too... 
> >> but
> >> should be much better now. There was like three different styles 
> >> before.
> >
> > Not to belittle your work, but I really hope to get rid of this class 
> > in the future :-)
> How come? replaced with other class?
> I'm using it as it has a nicer look than other list classes.

For this more complex Interface Kit class, one should really be able to use 
the Model-View-Controller pattern. Ingo has written such a tree view 
implementation a years ago for eXposer, but it's not yet complete. For the 
time being, I wanted to add layout features to the BColumnListView and 
improve the look. It's being used in a couple of panels already. Sometimes 
I enjoy such dull tasks where I don't have to think too much... :-)

Best regards,
-Stephan


From dlmcpaul at gmail.com  Wed Apr  1 11:02:46 2009
From: dlmcpaul at gmail.com (David McPaul)
Date: Wed, 1 Apr 2009 20:02:46 +1100
Subject: [Haiku-commits] r29838 -
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec
In-Reply-To: <894729303-BeMail@zon>
References: <da2be3d70903311427y66ff3f77gf78e5880e7cca833@mail.gmail.com>
	<894729303-BeMail@zon>
Message-ID: <da2be3d70904010202l48b2b974wb47cd046862935b4@mail.gmail.com>

2009/4/1 Axel D?rfler <axeld at pinc-software.de>:
> David McPaul <dlmcpaul at gmail.com> wrote:
>> 2009/4/1 Fran?ois Revol <revol at free.fr>:
>> >> Log:
>> >> performance improvements
>> > Sure this will builds with gcc2 ???
>> It should do, thats what I use here under BeOS.
>>
>> I also have the MMX stuff building as well but the resulting object
>> file does not load under haiku :-(
>
> You might want to file a bug report for this, along with the binaries
> to reproduce the problem.

Once I work out if it is my fault or not.

-- 
Cheers
David


From axeld at pinc-software.de  Wed Apr  1 11:15:34 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 01 Apr 2009 11:15:34 +0200 CEST
Subject: [Haiku-commits] r29841 - haiku/trunk/src/kits/interface
In-Reply-To: <1d1ff6e4963ad056f6ee4e41a758e802.squirrel@webmail2.webbhotellsgruppen.se>
Message-ID: <4477518225-BeMail@zon>

Fredrik Mod?en <fredrik at modeen.se> wrote:
> > stippi at mail.berlios.de wrote:
> >> Modified:
> >>    haiku/trunk/src/kits/interface/ColumnListView.cpp
> > Not to belittle your work, but I really hope to get rid of this 
> > class
> > in the future :-)
> How come? replaced with other class?
> I'm using it as it has a nicer look than other list classes.

It just has an awful design (not visually, the code is what matters) 
that does neither match the way one wants to to have, nor the usual Be 
interface kit style.

Bye,
   Axel.



From stippi at mail.berlios.de  Wed Apr  1 11:28:35 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 1 Apr 2009 11:28:35 +0200
Subject: [Haiku-commits] r29845 - haiku/trunk/src/kits/tracker
Message-ID: <200904010928.n319SZXl014686@sheep.berlios.de>

Author: stippi
Date: 2009-04-01 11:28:32 +0200 (Wed, 01 Apr 2009)
New Revision: 29845
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29845&view=rev

Modified:
   haiku/trunk/src/kits/tracker/Model.cpp
   haiku/trunk/src/kits/tracker/Utilities.h
   haiku/trunk/src/kits/tracker/WidgetAttributeText.cpp
Log:
Patch by plasm with some modifications by myself: Implement natural sorting
in Tracker. Strings are compared in chunks where the type of each chunk can be
numer or string. Thanks a lot!


Modified: haiku/trunk/src/kits/tracker/Model.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/Model.cpp	2009-04-01 00:11:34 UTC (rev 29844)
+++ haiku/trunk/src/kits/tracker/Model.cpp	2009-04-01 09:28:32 UTC (rev 29845)
@@ -321,7 +321,7 @@
 	} else if (resolvedCompareModel->IsDirectory())
 		return 1;
 
-	return strcasecmp(Name(), compareModel->Name());
+	return NaturalCompare(Name(), compareModel->Name());
 }
 
 

Modified: haiku/trunk/src/kits/tracker/Utilities.h
===================================================================
--- haiku/trunk/src/kits/tracker/Utilities.h	2009-04-01 00:11:34 UTC (rev 29844)
+++ haiku/trunk/src/kits/tracker/Utilities.h	2009-04-01 09:28:32 UTC (rev 29845)
@@ -136,6 +136,7 @@
 		BPoint fLocation;	
 };
 
+
 // extends PoseInfo adding workspace support; used for desktop
 // poses only
 class ExtendedPoseInfo {
@@ -176,8 +177,144 @@
 void DisallowMetaKeys(BTextView *);
 void DisallowFilenameKeys(BTextView *);
 
+
+inline bool 
+IsDigit(const char c) 
+{
+	if ((c >= 48 && c <= 57) || c == 32) 
+		return true;
+	else 
+		return false;
+}
+
+
+//! Compares two strings naturally, as opposed to lexicographically
+inline int 
+NaturalCompare(const char *s1, const char *s2) 
+{
+	struct Chunk {
+		int32	type;
+		char*	ascii;
+			// Type = 0
+		int32	num;
+			// Type = 1
+	};
+
+	Chunk a;
+	Chunk b;
+
+	size_t len1 = strlen(s1);
+	size_t len2 = strlen(s2);
+
+	char bufferA[len1 + 1];
+	char bufferB[len2 + 1];
+
+	uint32 i = 0;
+	uint32 j = 0;
+
+	while (true) {
+		// determine type of next chunks in each string based on first char
+		if (i == len1) 
+			a.type = -1;
+		else if (IsDigit(s1[i]))
+			a.type = 1;
+		else 
+			a.type = 0;
+
+		if (j == len2)
+			b.type = -1;
+		else if (IsDigit(s2[j])) 
+			b.type = 1;
+		else 
+			b.type = 0;
+
+		// check if we reached the end of either string
+		if (a.type == b.type && a.type == -1)
+			return 0;
+		if (a.type == -1)
+			return -1;
+		if (b.type == -1)
+			return 1;
+
+		if (a.type != b.type) {
+			// different chunk types, just compare the remaining strings
+			return strcasecmp(&s1[i], &s2[j]);
+		}
+
+		// fetch the next chunk for a
+		if (a.type == 0) {
+			// string chunk
+			int32 k = i;
+			while (!IsDigit(s1[k]) && s1[k] != 0) {
+				bufferA[k - i] = s1[k];
+				k++;
+			}
+			bufferA[k - i] = 0;
+			a.ascii = bufferA;
+			i += k - i;
+		} else {
+			// number chunk
+			int32 k = i;
+			while (IsDigit(s1[k]) && s1[k] != 0) {
+				bufferA[k - i] = s1[k];
+				k++;
+			}
+			bufferA[k - i] = 0;
+			a.ascii = bufferA;
+			a.num = atoi(bufferA);
+			i += k - i;
+		}
+
+		// fetch the next chunk for b
+		if (b.type == 0) {
+			// string chunk
+			int32 k = j;
+			while (!IsDigit(s2[k]) && s2[k] != 0) {
+				bufferB[k - j] = s2[k];
+				k++;
+			}
+			bufferB[k - j] = 0;
+			b.ascii = bufferB;
+			j += k - j;
+		} else {
+			// number chunk
+			int32 k = j;
+			while (IsDigit(s2[k]) && s2[k] != 0) {
+				bufferB[k - j] = s2[k];
+				k++;
+			}
+			bufferB[k - j] = 0;
+			b.ascii = bufferB;
+			b.num = atoi(bufferB);
+			j += k - j;
+		}
+
+		// compare the two chunks based on their type
+		if (a.type == 0) {
+			// string chunks
+			int stringCompareResult = strcasecmp(a.ascii, b.ascii);
+			// if the chunk strings are the same, keep using natural
+			// sorting for the next chunks
+			if (stringCompareResult != 0)
+				return stringCompareResult;
+		} else {
+			// number chunks
+			if (a.num != b.num) {
+				if (a.num < b.num)
+					return -1;
+				if (a.num > b.num)
+					return 1;
+			}
+		}
+	}
+
+	return 0;
+}
+
+
 bool ValidateStream(BMallocIO *, uint32, int32 version);
 
+
 uint32 HashString(const char *string, uint32 seed);
 uint32 AttrHashString(const char *string, uint32 type);
 

Modified: haiku/trunk/src/kits/tracker/WidgetAttributeText.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/WidgetAttributeText.cpp	2009-04-01 00:11:34 UTC (rev 29844)
+++ haiku/trunk/src/kits/tracker/WidgetAttributeText.cpp	2009-04-01 09:28:32 UTC (rev 29845)
@@ -63,7 +63,6 @@
 
 const int32 kGenericReadBufferSize = 1024;
 
-
 template <class View>
 float
 TruncStringBase(BString *result, const char *str, int32 length,
@@ -595,7 +594,7 @@
 	if (fValueDirty)
 		ReadValue(&fFullValueText);
 
-	return strcasecmp(fFullValueText.String(), compareTo->ValueAsText(view));
+	return NaturalCompare(fFullValueText.String(), compareTo->ValueAsText(view));
 }
 
 
@@ -782,7 +781,7 @@
 	if (NameAttributeText::sSortFolderNamesFirst)
 		return fModel->CompareFolderNamesFirst(attr.TargetModel());
 
-	return strcasecmp(fFullValueText.String(), compareTo->ValueAsText(view));
+	return NaturalCompare(fFullValueText.String(), compareTo->ValueAsText(view));
 }
 
 



From fekdahl at gmail.com  Wed Apr  1 11:43:59 2009
From: fekdahl at gmail.com (Fredrik Ekdahl)
Date: Wed, 01 Apr 2009 11:43:59 +0200
Subject: [Haiku-commits] r29843 - in haiku/trunk/src/data/beos_mime:
 audio video
In-Reply-To: <da2be3d70903312216ydfd443ewded88615a44f40b9@mail.gmail.com>
References: <200903312148.n2VLmuQe027256@sheep.berlios.de>	<49D2F4D4.3080004@gmail.com>
	<da2be3d70903312216ydfd443ewded88615a44f40b9@mail.gmail.com>
Message-ID: <49D3375F.2040102@gmail.com>

David McPaul skrev:
> On 2009-04-01, Fredrik Ekdahl <fekdahl at gmail.com> wrote:
>> dlmcpaul at BerliOS skrev:
>>> Author: dlmcpaul
>>> Date: 2009-03-31 23:48:56 +0200 (Tue, 31 Mar 2009)
>>> New Revision: 29843
>>> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29843&view=rev
>>>
>>> Modified:
>>>    haiku/trunk/src/data/beos_mime/audio/mp4
>>>    haiku/trunk/src/data/beos_mime/video/mp4
>>> Log:
>>> mp4 is video not audio, add m4v as a mpeg-4 extension
>> That's not true. MP4 files can be only audio, audio and video, only
>> video, text etc. In fact it can contain any number of streams.
> 
> Yep.
> 
>> See http://en.wikipedia.org/wiki/Mp4#.MP4_versus_.M4A_file_extensions
>> and http://tools.ietf.org/html/rfc4337
>> The standard only specifies .mp4 and .mpg4 as extension for MP4 format,
>> though since Apple started using m4a for audio only files this has
>> become common practice.
> 
> And this is where the problem begins.
> 
> A mime type for audio/mp4 was added listing .m4a and .mp4 as valid
> extensions.  So when I copied a .mp4 file onto my haiku partition it
> would be identified as audio/mp4 and shown the audio icon.
> 
> The same extension was defined as video/mp4 which was a duplication
> and did not work.
> 
> So I have removed .mp4 from audio/mp4 but have left .m4a since the
> common practice of Apple is to reserve that extension for audio only
> mp4 files.
> 
> I have added .m4v to video/mp4 because I am seeing many files with
> that extension.  These files are clearly mp4 files (they contain video
> and audio) but ultimately they are still video/mp4 and even if they
> were raw streams they are still raw mp4 video streams.
> 
> Anyway we can remove the audio/mp4 mime and the extension .m4v from
> the video/mp4 mime type to conform to the standard but we will need an
> alternative to handle the non standard extensions .m4a and .m4v
> 

No reason to remove audio/mp4, as that is an IANA standard.
After a bit of thought, I think your approach is the most convenient.
Files with mp4 extension are most often videos, so having that extension 
in the video mime type and not in audio sounds like a good compromise.
I suppose a sniffer rule which differentiates between the different 
types would be too complex, right?

>> m4v is a totally different thing than mp4. m4v indicates a raw
>> bitstream, not encapsulated in MP4 format which .mp4 indicates.
>> I think it's wrong to give m4v files the mime type video/mp4 as that
>> mime type means it's the file format MP4.
> 
> Wrong yes.  Alternative??

Seems Apple started this also. So .m4v can mean both raw video streams 
and MP4 format files.

-- 
/Fredrik Ekdahl


From stippi at mail.berlios.de  Wed Apr  1 12:28:36 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 1 Apr 2009 12:28:36 +0200
Subject: [Haiku-commits] r29846 -
	haiku/trunk/src/tests/servers/app/playground
Message-ID: <200904011028.n31ASaog021045@sheep.berlios.de>

Author: stippi
Date: 2009-04-01 12:28:34 +0200 (Wed, 01 Apr 2009)
New Revision: 29846
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29846&view=rev

Modified:
   haiku/trunk/src/tests/servers/app/playground/ObjectWindow.cpp
   haiku/trunk/src/tests/servers/app/playground/ObjectWindow.h
   haiku/trunk/src/tests/servers/app/playground/main.cpp
Log:
Patch by maxime.simon: Make Playground use a BColorControl instead of those
text controls for defining the color. Thanks a lot! (Also took the opportunity
to fix some coding style violations which had already been there.)


Modified: haiku/trunk/src/tests/servers/app/playground/ObjectWindow.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/playground/ObjectWindow.cpp	2009-04-01 09:28:32 UTC (rev 29845)
+++ haiku/trunk/src/tests/servers/app/playground/ObjectWindow.cpp	2009-04-01 10:28:34 UTC (rev 29846)
@@ -9,6 +9,7 @@
 #include <Box.h>
 #include <Button.h>
 #include <CheckBox.h>
+#include <ColorControl.h>
 #include <ListItem.h>
 #include <ListView.h>
 #include <Menu.h>
@@ -116,18 +117,8 @@
 
 // constructor
 ObjectWindow::ObjectWindow(BRect frame, const char* name)
-//	: BWindow(frame, name, B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
-//			  B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE)
 	: BWindow(frame, name, B_DOCUMENT_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
 			  B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE)
-//	: BWindow(frame, name, B_DOCUMENT_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
-//			  B_ASYNCHRONOUS_CONTROLS)
-//	: BWindow(frame, name, B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
-//			  B_ASYNCHRONOUS_CONTROLS)
-//	: BWindow(frame, name, B_BORDERED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
-//			  B_ASYNCHRONOUS_CONTROLS)
-//	: BWindow(frame, name, B_NO_BORDER_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
-//			  B_ASYNCHRONOUS_CONTROLS)
 {
 	BRect b(Bounds());
 
@@ -147,7 +138,8 @@
 	b = Bounds();
 	b.top = menuBar->Bounds().bottom + 1;
 	b.right = ceilf((b.left + b.right) / 2.0);
-	BBox* bg = new BBox(b, "bg box", B_FOLLOW_TOP_BOTTOM, B_WILL_DRAW, B_PLAIN_BORDER);
+	BBox* bg = new BBox(b, "bg box", B_FOLLOW_TOP_BOTTOM, B_WILL_DRAW,
+		B_PLAIN_BORDER);
 
 	AddChild(bg);
 	bg->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
@@ -160,44 +152,36 @@
 								 B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE);
 	// wrap a scroll view around the object view
 	BScrollView* scrollView = new BScrollView("object scroller", fObjectView,
-											  B_FOLLOW_ALL, 0, true, true,
-											  B_NO_BORDER);
+		B_FOLLOW_ALL, 0, true, true, B_NO_BORDER);
 
 	if (BScrollBar* scrollBar = fObjectView->ScrollBar(B_VERTICAL)) {
 		scrollBar->SetRange(0.0, fObjectView->Bounds().Height());
 		scrollBar->SetProportion(0.5);
-//		scrollBar->SetRange(0.0, 0.0);
 	}
 	if (BScrollBar* scrollBar = fObjectView->ScrollBar(B_HORIZONTAL)) {
 		scrollBar->SetRange(0.0, fObjectView->Bounds().Width());
 		scrollBar->SetProportion(0.5);
-//		scrollBar->SetRange(0.0, 0.0);
-//		b = scrollBar->Frame();
-//		b.right = b.left + 50;
-//		scrollBar->ResizeBy(-51, 0);
-//		scrollBar->MoveBy(51, 0);
-//		StatusView* statusView = new StatusView(b, scrollBar);
-//		scrollView->AddChild(statusView);
 	}
 	AddChild(scrollView);
 
 	b = bg->Bounds();
 	// controls occupy the left side of the window
 	b.InsetBy(5.0, 5.0);
-	BBox* controlGroup = new BBox(b, "controls box", B_FOLLOW_LEFT | B_FOLLOW_TOP_BOTTOM,
-								  B_WILL_DRAW, B_FANCY_BORDER);
+	BBox* controlGroup = new BBox(b, "controls box",
+		B_FOLLOW_LEFT | B_FOLLOW_TOP_BOTTOM, B_WILL_DRAW, B_FANCY_BORDER);
 
 	controlGroup->SetLabel("Controls");
 	bg->AddChild(controlGroup);
 
 	b = controlGroup->Bounds();
-	b.top += 10.0;
+	b.top += controlGroup->InnerFrame().top;
 	b.bottom = b.top + 25.0;
-	b.InsetBy(5.0, 5.0);
-	b.right = b.left + b.Width() / 2.0 - 3.0;
+	b.InsetBy(10.0, 10.0);
+	b.right = b.left + b.Width() / 2.0 - 5.0;
 
 	// new button
-	fNewB = new BButton(b, "new button", "New Object", new BMessage(MSG_NEW_OBJECT));
+	fNewB = new BButton(b, "new button", "New Object",
+		new BMessage(MSG_NEW_OBJECT));
 	controlGroup->AddChild(fNewB);
 	SetDefaultButton(fNewB);
 
@@ -285,63 +269,46 @@
 	item->SetMarked(true);
 	popupMenu->AddItem(item);
 
-	b.OffsetBy(0, radioButton->Bounds().Height() + 5.0);
-	fDrawingModeMF = new BMenuField(b, "drawing mode field", "Mode",
-									popupMenu);
+	b.OffsetBy(0, radioButton->Bounds().Height() + 10.0);
+	fDrawingModeMF = new BMenuField(b, "drawing mode field", "Mode:",
+		popupMenu);
 
 	controlGroup->AddChild(fDrawingModeMF);
 
-	fDrawingModeMF->SetDivider(fDrawingModeMF->StringWidth(fDrawingModeMF->Label()) + 10.0);
-
-	// red text control
-	b.OffsetBy(0, fDrawingModeMF->Bounds().Height() + 5.0);
-	fRedTC = new BTextControl(b, "red text control", "Red", "",
-							  new BMessage(MSG_SET_COLOR));
-	controlGroup->AddChild(fRedTC);
-
-	// green text control
-	b.OffsetBy(0, fRedTC->Bounds().Height() + 5.0);
-	fGreenTC = new BTextControl(b, "green text control", "Green", "",
-								new BMessage(MSG_SET_COLOR));
-	controlGroup->AddChild(fGreenTC);
-
-	// blue text control
-	b.OffsetBy(0, fGreenTC->Bounds().Height() + 5.0);
-	fBlueTC = new BTextControl(b, "blue text control", "Blue", "",
-							   new BMessage(MSG_SET_COLOR));
-	controlGroup->AddChild(fBlueTC);
-
+	fDrawingModeMF->SetDivider(fDrawingModeMF->StringWidth(
+		fDrawingModeMF->Label()) + 10.0);
+	
+	// color control
+	b.OffsetBy(0, fDrawingModeMF->Bounds().Height() + 10.0);
+	fColorControl = new BColorControl(b.LeftTop(), B_CELLS_16x16, 8,
+		"color control", new BMessage(MSG_SET_COLOR));
+	controlGroup->AddChild(fColorControl);
+	
 	// alpha text control
-	b.OffsetBy(0, fBlueTC->Bounds().Height() + 5.0);
-	fAlphaTC = new BTextControl(b, "alpha text control", "Alpha", "",
-								new BMessage(MSG_SET_COLOR));
+	b.OffsetBy(0, fColorControl-> Bounds().Height() + 5.0);
+	fAlphaTC = new BTextControl(b, "alpha text control", "Alpha:", "",
+		new BMessage(MSG_SET_COLOR));
 	controlGroup->AddChild(fAlphaTC);
 
 	// divide text controls the same
-	float mWidth = fDrawingModeMF->StringWidth(fDrawingModeMF->Label());
-	float rWidth = fRedTC->StringWidth(fRedTC->Label());
-	float gWidth = fGreenTC->StringWidth(fGreenTC->Label());
-	float bWidth = fBlueTC->StringWidth(fBlueTC->Label());
-	float aWidth = fAlphaTC->StringWidth(fAlphaTC->Label());
-
-	float width = max_c(mWidth, max_c(rWidth, max_c(gWidth, max_c(bWidth, aWidth)))) + 10.0;
+    float mWidth = fDrawingModeMF->StringWidth(fDrawingModeMF->Label());
+    float aWidth = fAlphaTC->StringWidth(fAlphaTC->Label());
+    
+    float width = max_c(mWidth, aWidth) + 20.0;
 	fDrawingModeMF->SetDivider(width);
-	fRedTC->SetDivider(width);
-	fGreenTC->SetDivider(width);
-	fBlueTC->SetDivider(width);
 	fAlphaTC->SetDivider(width);
 
 	// fill check box
 	b.OffsetBy(0, fAlphaTC->Bounds().Height() + 5.0);
 	fFillCB = new BCheckBox(b, "fill check box", "Fill",
-							new BMessage(MSG_SET_FILL_OR_STROKE));
+		new BMessage(MSG_SET_FILL_OR_STROKE));
 	controlGroup->AddChild(fFillCB);
 
 	// pen size text control
 	b.OffsetBy(0, radioButton->Bounds().Height() + 5.0);
 	b.bottom = b.top + 10.0;//35;
-	fPenSizeS = new BSlider(b, "width slider", "Width",
-							NULL, 1, 100, B_TRIANGLE_THUMB);
+	fPenSizeS = new BSlider(b, "width slider", "Width:", NULL, 1, 100,
+		B_TRIANGLE_THUMB);
 	fPenSizeS->SetLimitLabels("1", "100");
 	fPenSizeS->SetModificationMessage(new BMessage(MSG_SET_PEN_SIZE));
 	fPenSizeS->SetHashMarks(B_HASH_MARKS_BOTTOM);
@@ -351,42 +318,24 @@
 
 	// list view with objects
 	b = controlGroup->Bounds();
-	b.top += 10.0;
-	b.InsetBy(9.0, 7.0);
+	b.top += controlGroup->InnerFrame().top;
+	b.InsetBy(10.0, 10.0);
 	b.left = b.left + b.Width() / 2.0 + 6.0;
 	b.right -= B_V_SCROLL_BAR_WIDTH;
-b.bottom = fDrawingModeMF->Frame().top - 5.0;
+    b.bottom = fDrawingModeMF->Frame().top - 10.0;
 
 	fObjectLV = new ObjectListView(b, "object list", B_SINGLE_SELECTION_LIST);
 	fObjectLV->SetSelectionMessage(new BMessage(MSG_OBJECT_SELECTED));
 
 	// wrap a scroll view around the list view
 	scrollView = new BScrollView("list scroller", fObjectLV,
-								 B_FOLLOW_NONE, 0, false, true,
-								 B_FANCY_BORDER);
+		B_FOLLOW_NONE, 0, false, true, B_FANCY_BORDER);
 	controlGroup->AddChild(scrollView);
 
-	// add a dummy tab view
-	b.top = b.bottom + 10.0;
-	b.right += B_V_SCROLL_BAR_WIDTH;
-	b.bottom = controlGroup->Bounds().bottom - 7.0;
-	BTabView* tabView = new BTabView(b, "tab view", B_WIDTH_FROM_WIDEST, 
-									 B_FOLLOW_ALL, B_FULL_UPDATE_ON_RESIZE |
-									 B_WILL_DRAW | B_NAVIGABLE_JUMP |
-									 B_FRAME_EVENTS | B_NAVIGABLE);
-	
-	BView* tabChild = new TestView(BRect(0, 0, 40, 40), "T", B_FOLLOW_ALL, 0);
-	tabView->AddTab(tabChild);
-	tabChild = new TestView(BRect(0, 0, 40, 40), "T", B_FOLLOW_ALL, 0);
-	tabView->AddTab(tabChild);
-	tabChild = new BTextControl(BRect(0, 0, 80, 40), "T", "Test", "Text", NULL);
-	tabView->AddTab(tabChild);
-	controlGroup->AddChild(tabView);
-
 	// enforce some size limits
 	float minWidth = controlGroup->Frame().Width() + 30.0;
-	float minHeight = fPenSizeS->Frame().bottom +
-					  menuBar->Bounds().Height() + 15.0;
+	float minHeight = fPenSizeS->Frame().bottom
+		+ menuBar->Bounds().Height() + 15.0;
 	float maxWidth = minWidth * 4.0;
 	float maxHeight = minHeight + 100;
 	SetSizeLimits(minWidth, maxWidth, minHeight, maxHeight);
@@ -520,17 +469,10 @@
 	rgb_color c = fObjectView->StateColor();
 	char string[32];
 
-	sprintf(string, "%d", c.red);
-	fRedTC->SetText(string);
-
-	sprintf(string, "%d", c.green);
-	fGreenTC->SetText(string);
-
-	sprintf(string, "%d", c.blue);
-	fBlueTC->SetText(string);
-
 	sprintf(string, "%d", c.alpha);
 	fAlphaTC->SetText(string);
+
+	fColorControl->SetValue(c);
 }
 
 // _GetColor
@@ -538,11 +480,10 @@
 ObjectWindow::_GetColor() const
 {
 	rgb_color c;
-	c.red	= max_c(0, min_c(255, atoi(fRedTC->Text())));
-	c.green	= max_c(0, min_c(255, atoi(fGreenTC->Text())));
-	c.blue	= max_c(0, min_c(255, atoi(fBlueTC->Text())));
-	c.alpha	= max_c(0, min_c(255, atoi(fAlphaTC->Text())));
-
+	
+	c = fColorControl->ValueAsColor();
+	c.alpha = max_c(0, min_c(255, atoi(fAlphaTC->Text())));
+	
 	return c;
 }
 

Modified: haiku/trunk/src/tests/servers/app/playground/ObjectWindow.h
===================================================================
--- haiku/trunk/src/tests/servers/app/playground/ObjectWindow.h	2009-04-01 09:28:32 UTC (rev 29845)
+++ haiku/trunk/src/tests/servers/app/playground/ObjectWindow.h	2009-04-01 10:28:34 UTC (rev 29846)
@@ -7,6 +7,7 @@
 
 class BButton;
 class BCheckBox;
+class BColorControl;
 class BListView;
 class BMenuField;
 class BTextControl;
@@ -37,9 +38,7 @@
 
 	BMenuField*			fDrawingModeMF;
 
-	BTextControl*		fRedTC;
-	BTextControl*		fGreenTC;
-	BTextControl*		fBlueTC;
+	BColorControl*		fColorControl;
 	BTextControl*		fAlphaTC;
 
 	BCheckBox*			fFillCB;

Modified: haiku/trunk/src/tests/servers/app/playground/main.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/playground/main.cpp	2009-04-01 09:28:32 UTC (rev 29845)
+++ haiku/trunk/src/tests/servers/app/playground/main.cpp	2009-04-01 10:28:34 UTC (rev 29846)
@@ -10,7 +10,7 @@
 int
 main(int argc, char** argv)
 {
-	BApplication* app = new BApplication("application/x.vnd-Haiku.Playground");
+	BApplication* app = new BApplication("application/x-vnd.Haiku-Playground");
 
 	BRect frame(50.0, 50.0, 600.0, 400.0);
 	BWindow* window = new ObjectWindow(frame, "Playground");



From dlmcpaul at gmail.com  Wed Apr  1 13:42:32 2009
From: dlmcpaul at gmail.com (David McPaul)
Date: Wed, 1 Apr 2009 22:42:32 +1100
Subject: [Haiku-commits] r29843 - in haiku/trunk/src/data/beos_mime:
	audio video
In-Reply-To: <49D3375F.2040102@gmail.com>
References: <200903312148.n2VLmuQe027256@sheep.berlios.de>
	<49D2F4D4.3080004@gmail.com>
	<da2be3d70903312216ydfd443ewded88615a44f40b9@mail.gmail.com>
	<49D3375F.2040102@gmail.com>
Message-ID: <da2be3d70904010442m39afc5e8sf4ed079c8fd4dd5b@mail.gmail.com>

2009/4/1 Fredrik Ekdahl <fekdahl at gmail.com>:
> David McPaul skrev:
>> Anyway we can remove the audio/mp4 mime and the extension .m4v from
>> the video/mp4 mime type to conform to the standard but we will need an
>> alternative to handle the non standard extensions .m4a and .m4v
>
> No reason to remove audio/mp4, as that is an IANA standard.
> After a bit of thought, I think your approach is the most convenient.
> Files with mp4 extension are most often videos, so having that extension
> in the video mime type and not in audio sounds like a good compromise.
> I suppose a sniffer rule which differentiates between the different
> types would be too complex, right?

Maybe.  A raw stream should not have the ftyp atom which appears early
in a mp4.  But apple decided to put them in MOV files now as well so
it is actually difficult figure out mp4 from MOV without parsing the
ftyp.

But it would help with determining actual container formats from raw
just not mp4 from mov.

-- 
Cheers
David


From stippi at mail.berlios.de  Wed Apr  1 14:33:46 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 1 Apr 2009 14:33:46 +0200
Subject: [Haiku-commits] r29847 - haiku/trunk/src/kits/interface
Message-ID: <200904011233.n31CXkS0008335@sheep.berlios.de>

Author: stippi
Date: 2009-04-01 14:33:45 +0200 (Wed, 01 Apr 2009)
New Revision: 29847
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29847&view=rev

Modified:
   haiku/trunk/src/kits/interface/ScrollView.cpp
Log:
* B_SUPPORTS_LAYOUT is already added by the BView consturctor.
* Fixed MaxSize() and PreferredSize() to use the correct explicitly set size.


Modified: haiku/trunk/src/kits/interface/ScrollView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ScrollView.cpp	2009-04-01 10:28:34 UTC (rev 29846)
+++ haiku/trunk/src/kits/interface/ScrollView.cpp	2009-04-01 12:33:45 UTC (rev 29847)
@@ -31,7 +31,7 @@
 
 BScrollView::BScrollView(const char* name, BView* target, uint32 flags,
 		bool horizontal, bool vertical, border_style border)
-	: BView(name, _ModifyFlags(flags, border) | B_SUPPORTS_LAYOUT),
+	: BView(name, _ModifyFlags(flags, border)),
 	fTarget(target),
 	fBorder(border)
 {
@@ -753,7 +753,7 @@
 	BSize size = _ComputeSize(fTarget != NULL ? fTarget->MaxSize()
 		: BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED));
 
-	return BLayoutUtils::ComposeSize(ExplicitMinSize(), size);
+	return BLayoutUtils::ComposeSize(ExplicitMaxSize(), size);
 }
 
 
@@ -763,7 +763,7 @@
 	BSize size = _ComputeSize(fTarget != NULL ? fTarget->PreferredSize()
 		: BSize(32, 32));
 
-	return BLayoutUtils::ComposeSize(ExplicitMinSize(), size);
+	return BLayoutUtils::ComposeSize(ExplicitPreferredSize(), size);
 }
 
 



From stippi at mail.berlios.de  Wed Apr  1 14:35:09 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 1 Apr 2009 14:35:09 +0200
Subject: [Haiku-commits] r29848 - in haiku/trunk: headers/private/interface
	src/kits/interface
Message-ID: <200904011235.n31CZ9OM008439@sheep.berlios.de>

Author: stippi
Date: 2009-04-01 14:35:06 +0200 (Wed, 01 Apr 2009)
New Revision: 29848
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29848&view=rev

Modified:
   haiku/trunk/headers/private/interface/ColumnListView.h
   haiku/trunk/src/kits/interface/ColumnListView.cpp
Log:
Make BColumnListView layout-friendly.


Modified: haiku/trunk/headers/private/interface/ColumnListView.h
===================================================================
--- haiku/trunk/headers/private/interface/ColumnListView.h	2009-04-01 12:33:45 UTC (rev 29847)
+++ haiku/trunk/headers/private/interface/ColumnListView.h	2009-04-01 12:35:06 UTC (rev 29848)
@@ -247,6 +247,9 @@
 									const char* name, uint32 resizingMode,
 									uint32 flags, border_style = B_NO_BORDER,
 									bool showHorizontalScrollbar = true);
+								BColumnListView(const char* name,
+									uint32 flags, border_style = B_NO_BORDER,
+									bool showHorizontalScrollbar = true);
 	virtual						~BColumnListView();
 
 	// Interaction
@@ -370,8 +373,20 @@
 	virtual	void 				WindowActivated(bool active);
 	virtual	void 				Draw(BRect updateRect);
 
+	virtual BSize				MinSize();
+	virtual BSize				PreferredSize();
+	virtual BSize				MaxSize();
+
+	virtual	void				InvalidateLayout(bool descendants = false);
+	virtual	void				DoLayout();
+
 private:
 			void				_Init(bool showHorizontalScrollbar);
+			void				_GetChildViewRects(const BRect& bounds,
+									bool showHorizontalScrollBar,
+									BRect& titleRect, BRect& outlineRect,
+									BRect& vScrollBarRect,
+									BRect& hScrollBarRect);
 
 			rgb_color 			fColorList[B_COLOR_TOTAL];
 			BPrivate::TitleView* fTitleView;

Modified: haiku/trunk/src/kits/interface/ColumnListView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ColumnListView.cpp	2009-04-01 12:33:45 UTC (rev 29847)
+++ haiku/trunk/src/kits/interface/ColumnListView.cpp	2009-04-01 12:35:06 UTC (rev 29848)
@@ -55,6 +55,7 @@
 #include <Cursor.h>
 #include <Debug.h>
 #include <GraphicsDefs.h>
+#include <LayoutUtils.h>
 #include <MenuItem.h>
 #include <PopUpMenu.h>
 #include <Region.h>
@@ -767,8 +768,8 @@
 	:
 	BView(rect, name, resizingMode,
 		flags | B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE),
-	fStatusView(0),
-	fSelectionMessage(0),
+	fStatusView(NULL),
+	fSelectionMessage(NULL),
 	fSortingEnabled(true),
 	fLatchWidth(kLatchWidth),
 	fBorderStyle(border)
@@ -777,6 +778,20 @@
 }
 
 
+BColumnListView::BColumnListView(const char* name, uint32 flags,
+	border_style border, bool showHorizontalScrollbar)
+	:
+	BView(name, flags | B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE),
+	fStatusView(NULL),
+	fSelectionMessage(NULL),
+	fSortingEnabled(true),
+	fLatchWidth(kLatchWidth),
+	fBorderStyle(border)
+{
+	_Init(showHorizontalScrollbar);
+}
+
+
 BColumnListView::~BColumnListView()
 {
 	while (BColumn* column = (BColumn*)fColumns.RemoveItem(0L))
@@ -1772,6 +1787,176 @@
 }
 
 
+BSize
+BColumnListView::MinSize()
+{
+	BSize size;
+	size.width = 100;
+	size.height = kTitleHeight + 3 * ceilf(be_plain_font->Size());
+	if (!fHorizontalScrollBar->IsHidden())
+		size.height += fHorizontalScrollBar->Frame().Height() + 1;
+	// TODO: Take border size into account
+
+	return BLayoutUtils::ComposeSize(ExplicitMinSize(), size);
+}
+
+
+BSize
+BColumnListView::PreferredSize()
+{
+	BSize size = MinSize();
+	size.height += ceilf(be_plain_font->Size()) * 20;
+	// TODO: size.width = entire width of title view (all columns)
+
+	return BLayoutUtils::ComposeSize(ExplicitPreferredSize(), size);
+}
+
+
+BSize
+BColumnListView::MaxSize()
+{
+	BSize size(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED);
+	return BLayoutUtils::ComposeSize(ExplicitMaxSize(), size);
+}
+
+
+void
+BColumnListView::InvalidateLayout(bool descendants)
+{
+	BView::InvalidateLayout(descendants);
+}
+
+
+void
+BColumnListView::DoLayout()
+{
+	if (!(Flags() & B_SUPPORTS_LAYOUT))
+		return;
+
+	BRect titleRect;
+	BRect outlineRect;
+	BRect vScrollBarRect;
+	BRect hScrollBarRect;
+	_GetChildViewRects(Bounds(), !fHorizontalScrollBar->IsHidden(),
+		titleRect, outlineRect, vScrollBarRect, hScrollBarRect);
+
+	fTitleView->MoveTo(titleRect.LeftTop());
+	fTitleView->ResizeTo(titleRect.Width(), titleRect.Height());
+
+	fOutlineView->MoveTo(outlineRect.LeftTop());
+	fOutlineView->ResizeTo(outlineRect.Width(), outlineRect.Height());
+
+	fVerticalScrollBar->MoveTo(vScrollBarRect.LeftTop());
+	fVerticalScrollBar->ResizeTo(vScrollBarRect.Width(),
+		vScrollBarRect.Height());
+	
+	fHorizontalScrollBar->MoveTo(hScrollBarRect.LeftTop());
+	fHorizontalScrollBar->ResizeTo(hScrollBarRect.Width(),
+		hScrollBarRect.Height());
+
+	fOutlineView->FixScrollBar(true);
+}
+
+
+void
+BColumnListView::_Init(bool showHorizontalScrollbar)
+{
+	SetViewColor(B_TRANSPARENT_32_BIT);
+
+	BRect bounds(Bounds());
+	if (bounds.Width() <= 0)
+		bounds.right = 100;
+	if (bounds.Height() <= 0)
+		bounds.bottom = 100;
+
+	for (int i = 0; i < (int)B_COLOR_TOTAL; i++)
+		fColorList[i] = kColor[i];
+
+	BRect titleRect;
+	BRect outlineRect;
+	BRect vScrollBarRect;
+	BRect hScrollBarRect;
+	_GetChildViewRects(bounds, showHorizontalScrollbar, titleRect, outlineRect,
+		vScrollBarRect, hScrollBarRect);
+
+	fOutlineView = new OutlineView(outlineRect, &fColumns, &fSortColumns, this);
+	AddChild(fOutlineView);
+
+
+	fTitleView = new TitleView(titleRect, fOutlineView, &fColumns,
+		&fSortColumns, this, B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP);
+	AddChild(fTitleView);
+
+	fVerticalScrollBar = new BScrollBar(vScrollBarRect, "vertical_scroll_bar",
+		fOutlineView, 0.0, bounds.Height(), B_VERTICAL);
+	AddChild(fVerticalScrollBar);
+
+	fHorizontalScrollBar = new BScrollBar(hScrollBarRect,
+		"horizontal_scroll_bar", fTitleView, 0.0, bounds.Width(), B_HORIZONTAL);
+	AddChild(fHorizontalScrollBar);
+
+	if (!showHorizontalScrollbar)
+		fHorizontalScrollBar->Hide();
+
+	fOutlineView->FixScrollBar(true);
+}
+
+
+void
+BColumnListView::_GetChildViewRects(const BRect& bounds,
+	bool showHorizontalScrollbar, BRect& titleRect, BRect& outlineRect,
+	BRect& vScrollBarRect, BRect& hScrollBarRect)
+{
+	titleRect = bounds;
+	titleRect.bottom = titleRect.top + kTitleHeight;
+#if !LOWER_SCROLLBAR
+	titleRect.right -= B_V_SCROLL_BAR_WIDTH + 1;
+#endif
+
+	outlineRect = bounds;
+	outlineRect.top = titleRect.bottom + 1.0;
+	outlineRect.right -= B_V_SCROLL_BAR_WIDTH + 1;
+	if (showHorizontalScrollbar)
+		outlineRect.bottom -= B_H_SCROLL_BAR_HEIGHT + 1;
+
+	vScrollBarRect = bounds;
+#if LOWER_SCROLLBAR
+	vScrollBarRect.top += kTitleHeight;
+#endif
+
+	vScrollBarRect.left = vScrollBarRect.right - B_V_SCROLL_BAR_WIDTH;
+	if (showHorizontalScrollbar)
+		vScrollBarRect.bottom -= B_H_SCROLL_BAR_HEIGHT;
+
+	hScrollBarRect = bounds;
+	hScrollBarRect.top = hScrollBarRect.bottom - B_H_SCROLL_BAR_HEIGHT;
+	hScrollBarRect.right -= B_V_SCROLL_BAR_WIDTH;
+
+	// Adjust stuff so the border will fit.
+	if (fBorderStyle == B_PLAIN_BORDER) {
+		titleRect.InsetBy(1, 0);
+		titleRect.top++;
+		outlineRect.InsetBy(1, 0);
+		outlineRect.bottom--;
+
+		vScrollBarRect.OffsetBy(-1, 0);
+		vScrollBarRect.InsetBy(0, 1);
+		hScrollBarRect.OffsetBy(0, -1);
+		hScrollBarRect.InsetBy(1, 0);
+	} else if (fBorderStyle == B_FANCY_BORDER) {
+		titleRect.InsetBy(2, 0);
+		titleRect.top += 2;
+		outlineRect.InsetBy(2, 0);
+		outlineRect.bottom -= 2;
+
+		vScrollBarRect.OffsetBy(-2, 0);
+		vScrollBarRect.InsetBy(0, 2);
+		hScrollBarRect.OffsetBy(0, -2);
+		hScrollBarRect.InsetBy(2, 0);
+	}
+}
+
+
 // #pragma mark -
 
 
@@ -4553,83 +4738,3 @@
 }
 
 
-void
-BColumnListView::_Init(bool showHorizontalScrollbar)
-{
-	SetViewColor(B_TRANSPARENT_32_BIT);
-
-	BRect bounds(Bounds());
-	
-	for (int i = 0; i < (int)B_COLOR_TOTAL; i++)
-		fColorList[i] = kColor[i];
-	
-	BRect titleRect(bounds);
-	titleRect.bottom = titleRect.top + kTitleHeight;
-#if !LOWER_SCROLLBAR
-	titleRect.right -= B_V_SCROLL_BAR_WIDTH + 1;
-#endif
-
-	BRect outlineRect(bounds);
-	outlineRect.top = titleRect.bottom + 1.0;
-	outlineRect.right -= B_V_SCROLL_BAR_WIDTH + 1;
-	if (showHorizontalScrollbar)
-		outlineRect.bottom -= B_H_SCROLL_BAR_HEIGHT + 1;
-
-	BRect vScrollBarRect(bounds);
-#if LOWER_SCROLLBAR
-	vScrollBarRect.top += kTitleHeight;
-#endif
-
-	vScrollBarRect.left = vScrollBarRect.right - B_V_SCROLL_BAR_WIDTH;
-	if (showHorizontalScrollbar)
-		vScrollBarRect.bottom -= B_H_SCROLL_BAR_HEIGHT;
-
-	BRect hScrollBarRect(bounds);
-	hScrollBarRect.top = hScrollBarRect.bottom - B_H_SCROLL_BAR_HEIGHT;
-	hScrollBarRect.right -= B_V_SCROLL_BAR_WIDTH;
-
-	// Adjust stuff so the border will fit.
-	if (fBorderStyle == B_PLAIN_BORDER) {
-		titleRect.InsetBy(1, 0);
-		titleRect.top++;
-		outlineRect.InsetBy(1, 0);
-		outlineRect.bottom--;
-
-		vScrollBarRect.OffsetBy(-1, 0);
-		vScrollBarRect.InsetBy(0, 1);
-		hScrollBarRect.OffsetBy(0, -1);
-		hScrollBarRect.InsetBy(1, 0);
-	} else if (fBorderStyle == B_FANCY_BORDER) {
-		titleRect.InsetBy(2, 0);
-		titleRect.top += 2;
-		outlineRect.InsetBy(2, 0);
-		outlineRect.bottom -= 2;
-
-		vScrollBarRect.OffsetBy(-2, 0);
-		vScrollBarRect.InsetBy(0, 2);
-		hScrollBarRect.OffsetBy(0, -2);
-		hScrollBarRect.InsetBy(2, 0);
-	}
-	
-	fOutlineView = new OutlineView(outlineRect, &fColumns, &fSortColumns, this);
-	AddChild(fOutlineView);
-
-
-	fTitleView = new TitleView(titleRect, fOutlineView, &fColumns,
-		&fSortColumns, this, B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP);
-	AddChild(fTitleView);
-
-	fVerticalScrollBar = new BScrollBar(vScrollBarRect, "vertical_scroll_bar",
-		fOutlineView, 0.0, bounds.Height(), B_VERTICAL);
-	AddChild(fVerticalScrollBar);
-
-	fHorizontalScrollBar = new BScrollBar(hScrollBarRect,
-		"horizontal_scroll_bar", fTitleView, 0.0, bounds.Width(), B_HORIZONTAL);
-	AddChild(fHorizontalScrollBar);
-
-	if (!showHorizontalScrollbar)
-		fHorizontalScrollBar->Hide();
-
-	fOutlineView->FixScrollBar(true);
-}
-



From stippi at mail.berlios.de  Wed Apr  1 14:39:47 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 1 Apr 2009 14:39:47 +0200
Subject: [Haiku-commits] r29849 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200904011239.n31CdleX008944@sheep.berlios.de>

Author: stippi
Date: 2009-04-01 14:39:44 +0200 (Wed, 01 Apr 2009)
New Revision: 29849
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29849&view=rev

Modified:
   haiku/trunk/headers/os/interface/Region.h
   haiku/trunk/src/kits/interface/Region.cpp
Log:
Patch by Brecht Machiels: Add operator==() to BRegion. Thanks a lot!
Also fixed some coding style inconsistency.


Modified: haiku/trunk/headers/os/interface/Region.h
===================================================================
--- haiku/trunk/headers/os/interface/Region.h	2009-04-01 12:35:06 UTC (rev 29848)
+++ haiku/trunk/headers/os/interface/Region.h	2009-04-01 12:39:44 UTC (rev 29849)
@@ -31,7 +31,8 @@
 								BRegion(const BRect rect);
 	virtual						~BRegion();	
 
-			BRegion				&operator=(const BRegion &from);
+			BRegion&			operator=(const BRegion& from);
+			bool				operator==(const BRegion& other) const;
 
 			void				Set(BRect newBounds);
 			void				Set(clipping_rect newBounds);

Modified: haiku/trunk/src/kits/interface/Region.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Region.cpp	2009-04-01 12:35:06 UTC (rev 29848)
+++ haiku/trunk/src/kits/interface/Region.cpp	2009-04-01 12:39:44 UTC (rev 29849)
@@ -26,10 +26,11 @@
 	and its fBounds will be invalid.
 */
 BRegion::BRegion()
-	: fCount(0)
-	, fDataSize(0)
-	, fBounds((clipping_rect){ 0, 0, 0, 0 })
-	, fData(NULL)
+	:
+	fCount(0),
+	fDataSize(0),
+	fBounds((clipping_rect){ 0, 0, 0, 0 }),
+	fData(NULL)
 {
 	_SetSize(kDataBlockSize);
 }
@@ -39,10 +40,11 @@
 	\param region The region to copy.
 */
 BRegion::BRegion(const BRegion& region)
-	: fCount(0)
-	, fDataSize(0)
-	, fBounds((clipping_rect){ 0, 0, 0, 0 })
-	, fData(NULL)
+	:
+	fCount(0),
+	fDataSize(0),
+	fBounds((clipping_rect){ 0, 0, 0, 0 }),
+	fData(NULL)
 {
 	*this = region;
 }
@@ -52,10 +54,11 @@
 	\param rect The BRect to set the region to.
 */
 BRegion::BRegion(const BRect rect)
-	: fCount(0)
-	, fDataSize(1)
-	, fBounds((clipping_rect){ 0, 0, 0, 0 })
-	, fData(&fBounds)
+	:
+	fCount(0),
+	fDataSize(1),
+	fBounds((clipping_rect){ 0, 0, 0, 0 }),
+	fData(&fBounds)
 {
 	if (!rect.IsValid())
 		return;
@@ -94,7 +97,7 @@
 	\param region the BRegion to copy.
 	\return This function always returns \c *this.
 */
-BRegion &
+BRegion&
 BRegion::operator=(const BRegion &region)
 {
 	if (&region == this)
@@ -112,6 +115,21 @@
 	return *this;
 }
 
+/*!	\brief Compares this region to another (by value).
+	\param other the BRegion to compare to.
+	\return \ctrue if the two regions are the same, \cfalse otherwise.
+*/
+bool
+BRegion::operator==(const BRegion& other) const
+{
+	if (&other == this)
+		return true;
+	
+	if (fCount != other.fCount)
+		return false;
+	
+	return memcmp(fData, other.fData, fCount * sizeof(clipping_rect)) == 0;
+}
 
 /*!	\brief Set the region to contain just the given BRect.
 	\param newBounds A BRect.



From axeld at pinc-software.de  Wed Apr  1 15:33:24 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 01 Apr 2009 15:33:24 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r29849_-_in_haiku/trunk=3A_headers/os/i?=
 =?utf-8?q?nterface_src/kits/interface?=
In-Reply-To: <200904011239.n31CdleX008944@sheep.berlios.de>
Message-ID: <19947173113-BeMail@zon>

stippi at mail.berlios.de wrote:
>  }
>  
> +/*!	\brief Compares this region to another (by value).
> +	\param other the BRegion to compare to.
> +	\return \ctrue if the two regions are the same, \cfalse otherwise.
> +*/
> +bool
> +BRegion::operator==(const BRegion& other) const
> +{
> +	if (&other == this)
> +		return true;
> +	
> +	if (fCount != other.fCount)
> +		return false;
> +	
> +	return memcmp(fData, other.fData, fCount * sizeof(clipping_rect)) =
> = 0;
> +}
>  
>  /*!	\brief Set the region to contain just the given BRect.

Two spaces between functions. That was even the example I used when 
pointing out the coding style violations in the answer to his first 
patch... :-)

Bye,
   Axel.



From axeld at pinc-software.de  Wed Apr  1 15:34:06 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 01 Apr 2009 15:34:06 +0200 CEST
Subject: [Haiku-commits] r29847 - haiku/trunk/src/kits/interface
In-Reply-To: <200904011233.n31CXkS0008335@sheep.berlios.de>
Message-ID: <19989391771-BeMail@zon>

stippi at mail.berlios.de wrote:
> Log:
> * B_SUPPORTS_LAYOUT is already added by the BView consturctor.
> * Fixed MaxSize() and PreferredSize() to use the correct explicitly 
> set size.

Oops, thanks! The powers of copy and paste...

Bye,
   Axel.



From axeld at mail.berlios.de  Wed Apr  1 16:04:41 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 1 Apr 2009 16:04:41 +0200
Subject: [Haiku-commits] r29850 - haiku/trunk/src/data/etc/keymaps
Message-ID: <200904011404.n31E4fli018558@sheep.berlios.de>

Author: axeld
Date: 2009-04-01 16:04:32 +0200 (Wed, 01 Apr 2009)
New Revision: 29850
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29850&view=rev

Added:
   haiku/trunk/src/data/etc/keymaps/Arabic (102).keymap
   haiku/trunk/src/data/etc/keymaps/Brazilian (ABNT2).keymap
   haiku/trunk/src/data/etc/keymaps/Bulgarian (Cyrillic).keymap
   haiku/trunk/src/data/etc/keymaps/French (Mac).keymap
   haiku/trunk/src/data/etc/keymaps/Lithuanian (Baltic).keymap
   haiku/trunk/src/data/etc/keymaps/Polish (programmer's).keymap
   haiku/trunk/src/data/etc/keymaps/Serbian (Cyrillic).keymap
   haiku/trunk/src/data/etc/keymaps/Serbian (Latin).keymap
   haiku/trunk/src/data/etc/keymaps/Spanish (Dvorak).keymap
   haiku/trunk/src/data/etc/keymaps/Turkish (Type-F).keymap
   haiku/trunk/src/data/etc/keymaps/Turkish (Type-Q).keymap
Removed:
   haiku/trunk/src/data/etc/keymaps/Arabic(102).keymap
   haiku/trunk/src/data/etc/keymaps/Brazilian(ABNT2).keymap
   haiku/trunk/src/data/etc/keymaps/Bulgarian(Cyrillic).keymap
   haiku/trunk/src/data/etc/keymaps/French(Mac).keymap
   haiku/trunk/src/data/etc/keymaps/Lithuanian(Baltic).keymap
   haiku/trunk/src/data/etc/keymaps/Polish(programmer's).keymap
   haiku/trunk/src/data/etc/keymaps/Serbian(Cyrillic).keymap
   haiku/trunk/src/data/etc/keymaps/Serbian(Latin).keymap
   haiku/trunk/src/data/etc/keymaps/Spanish(Dvorak).keymap
   haiku/trunk/src/data/etc/keymaps/Turkish(type-F).keymap
   haiku/trunk/src/data/etc/keymaps/Turkish(type-Q).keymap
Log:
* Keymap names can have spaces, and so they do now (a must even, since they
  are directly presented to the user this way).


Copied: haiku/trunk/src/data/etc/keymaps/Arabic (102).keymap (from rev 29849, haiku/trunk/src/data/etc/keymaps/Arabic(102).keymap)


Property changes on: haiku/trunk/src/data/etc/keymaps/Arabic (102).keymap
___________________________________________________________________
Name: svn:keywords
   + author date id revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Deleted: haiku/trunk/src/data/etc/keymaps/Arabic(102).keymap

Copied: haiku/trunk/src/data/etc/keymaps/Brazilian (ABNT2).keymap (from rev 29849, haiku/trunk/src/data/etc/keymaps/Brazilian(ABNT2).keymap)


Property changes on: haiku/trunk/src/data/etc/keymaps/Brazilian (ABNT2).keymap
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: haiku/trunk/src/data/etc/keymaps/Brazilian(ABNT2).keymap

Copied: haiku/trunk/src/data/etc/keymaps/Bulgarian (Cyrillic).keymap (from rev 29849, haiku/trunk/src/data/etc/keymaps/Bulgarian(Cyrillic).keymap)


Property changes on: haiku/trunk/src/data/etc/keymaps/Bulgarian (Cyrillic).keymap
___________________________________________________________________
Name: svn:keywords
   + author date id revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Deleted: haiku/trunk/src/data/etc/keymaps/Bulgarian(Cyrillic).keymap

Copied: haiku/trunk/src/data/etc/keymaps/French (Mac).keymap (from rev 29849, haiku/trunk/src/data/etc/keymaps/French(Mac).keymap)


Property changes on: haiku/trunk/src/data/etc/keymaps/French (Mac).keymap
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: haiku/trunk/src/data/etc/keymaps/French(Mac).keymap

Copied: haiku/trunk/src/data/etc/keymaps/Lithuanian (Baltic).keymap (from rev 29849, haiku/trunk/src/data/etc/keymaps/Lithuanian(Baltic).keymap)


Property changes on: haiku/trunk/src/data/etc/keymaps/Lithuanian (Baltic).keymap
___________________________________________________________________
Name: svn:keywords
   + author date id revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Deleted: haiku/trunk/src/data/etc/keymaps/Lithuanian(Baltic).keymap

Copied: haiku/trunk/src/data/etc/keymaps/Polish (programmer's).keymap (from rev 29849, haiku/trunk/src/data/etc/keymaps/Polish(programmer's).keymap)


Property changes on: haiku/trunk/src/data/etc/keymaps/Polish (programmer's).keymap
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: haiku/trunk/src/data/etc/keymaps/Polish(programmer's).keymap

Copied: haiku/trunk/src/data/etc/keymaps/Serbian (Cyrillic).keymap (from rev 29849, haiku/trunk/src/data/etc/keymaps/Serbian(Cyrillic).keymap)


Property changes on: haiku/trunk/src/data/etc/keymaps/Serbian (Cyrillic).keymap
___________________________________________________________________
Name: svn:keywords
   + author date id revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: haiku/trunk/src/data/etc/keymaps/Serbian (Latin).keymap (from rev 29849, haiku/trunk/src/data/etc/keymaps/Serbian(Latin).keymap)


Property changes on: haiku/trunk/src/data/etc/keymaps/Serbian (Latin).keymap
___________________________________________________________________
Name: svn:keywords
   + author date id revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Deleted: haiku/trunk/src/data/etc/keymaps/Serbian(Cyrillic).keymap

Deleted: haiku/trunk/src/data/etc/keymaps/Serbian(Latin).keymap

Copied: haiku/trunk/src/data/etc/keymaps/Spanish (Dvorak).keymap (from rev 29849, haiku/trunk/src/data/etc/keymaps/Spanish(Dvorak).keymap)


Property changes on: haiku/trunk/src/data/etc/keymaps/Spanish (Dvorak).keymap
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: haiku/trunk/src/data/etc/keymaps/Spanish(Dvorak).keymap

Copied: haiku/trunk/src/data/etc/keymaps/Turkish (Type-F).keymap (from rev 29849, haiku/trunk/src/data/etc/keymaps/Turkish(type-F).keymap)


Property changes on: haiku/trunk/src/data/etc/keymaps/Turkish (Type-F).keymap
___________________________________________________________________
Name: svn:keywords
   + author date id revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Copied: haiku/trunk/src/data/etc/keymaps/Turkish (Type-Q).keymap (from rev 29849, haiku/trunk/src/data/etc/keymaps/Turkish(type-Q).keymap)


Property changes on: haiku/trunk/src/data/etc/keymaps/Turkish (Type-Q).keymap
___________________________________________________________________
Name: svn:keywords
   + author date id revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Deleted: haiku/trunk/src/data/etc/keymaps/Turkish(type-F).keymap

Deleted: haiku/trunk/src/data/etc/keymaps/Turkish(type-Q).keymap



From axeld at mail.berlios.de  Wed Apr  1 17:47:31 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 1 Apr 2009 17:47:31 +0200
Subject: [Haiku-commits] r29851 - haiku/trunk/src/preferences/keymap
Message-ID: <200904011547.n31FlVj4029698@sheep.berlios.de>

Author: axeld
Date: 2009-04-01 17:47:30 +0200 (Wed, 01 Apr 2009)
New Revision: 29851
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29851&view=rev

Modified:
   haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp
   haiku/trunk/src/preferences/keymap/KeymapWindow.cpp
Log:
* Now accepts only the first character that is dropped on a key.
* Also, escaped strings (like those from CharacterMap) are now converted
  automatically.


Modified: haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp	2009-04-01 14:04:32 UTC (rev 29850)
+++ haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp	2009-04-01 15:47:30 UTC (rev 29851)
@@ -6,6 +6,7 @@
 
 #include "KeyboardLayoutView.h"
 
+#include <Beep.h>
 #include <Bitmap.h>
 #include <ControlLook.h>
 #include <LayoutUtils.h>
@@ -303,10 +304,41 @@
 		ssize_t size;
 		if (message->FindData("text/plain", B_MIME_DATA,
 				(const void**)&data, &size) == B_OK) {
-			// ignore trailing null bytes
-			if (data[size - 1] == '\0')
-				size--;
+			// Automatically convert UTF-8 escaped strings (for example from
+			// CharacterMap)
+			int32 dataSize = 0;
+			uint8 buffer[16];
+			if (size > 3 && data[0] == '\\' && data[1] == 'x') {
+				char tempBuffer[16];
+				if (size > 15)
+					size = 15;
+				memcpy(tempBuffer, data, size);
+				tempBuffer[size] = '\0';
+				data = tempBuffer;
 
+				while (size > 3 && data[0] == '\\' && data[1] == 'x') {
+					buffer[dataSize++] = strtoul(&data[2], NULL, 16);
+					if ((buffer[dataSize - 1] & 0x80) == 0)
+						break;
+
+					size -= 4;
+					data += 4;
+				}
+				data = (const char*)buffer;
+			} else if ((data[0] & 0xc0) != 0x80 && (data[0] & 0x80) != 0) {
+				// only accept the first character UTF-8 character
+				while (dataSize < size && (data[dataSize] & 0x80) != 0) {
+					dataSize++;
+				}
+			} else if ((data[0] & 0x80) == 0) {
+				// an ASCII character
+				dataSize = 1;
+			} else {
+				// no valid character
+				beep();
+				return;
+			}
+
 			int32 buttons;
 			if (!message->IsSourceRemote()
 				&& message->FindInt32("buttons", &buttons) == B_OK
@@ -325,7 +357,7 @@
 				if (string != NULL) {
 					// switch keys
 					fKeymap->SetKey(fDropTarget->code, fModifiers, fDeadKey,
-						(const char*)data, size);
+						(const char*)data, dataSize);
 					fKeymap->SetKey(key->code, fDragModifiers, fDeadKey,
 						string, numBytes);
 					delete[] string;
@@ -334,14 +366,14 @@
 					fKeymap->SetModifier(key->code,
 						fKeymap->Modifier(fDropTarget->code));
 					fKeymap->SetKey(fDropTarget->code, fModifiers, fDeadKey,
-						(const char*)data, size);
+						(const char*)data, dataSize);
 				}
 			} else {
 				// Send the old key to the target, so it's not lost entirely
 				_SendFakeKeyDown(fDropTarget);
 
 				fKeymap->SetKey(fDropTarget->code, fModifiers, fDeadKey,
-					(const char*)data, size);
+					(const char*)data, dataSize);
 			}
 		} else if (!message->IsSourceRemote()
 			&& message->FindInt32("key", &keyCode) == B_OK) {

Modified: haiku/trunk/src/preferences/keymap/KeymapWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/KeymapWindow.cpp	2009-04-01 14:04:32 UTC (rev 29850)
+++ haiku/trunk/src/preferences/keymap/KeymapWindow.cpp	2009-04-01 15:47:30 UTC (rev 29851)
@@ -191,9 +191,6 @@
 			break;
 		}
 
-		case B_MIME_DATA:
-			break;
-
 		case B_SAVE_REQUESTED:
 		{
 			entry_ref ref;



From axeld at mail.berlios.de  Wed Apr  1 17:53:54 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 1 Apr 2009 17:53:54 +0200
Subject: [Haiku-commits] r29852 - haiku/trunk/src/apps/charactermap
Message-ID: <200904011553.n31FrsKN030026@sheep.berlios.de>

Author: axeld
Date: 2009-04-01 17:53:53 +0200 (Wed, 01 Apr 2009)
New Revision: 29852
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29852&view=rev

Modified:
   haiku/trunk/src/apps/charactermap/CharacterView.cpp
   haiku/trunk/src/apps/charactermap/CharacterView.h
   haiku/trunk/src/apps/charactermap/CharacterWindow.cpp
Log:
* Added support for copying characters into the clipboard via Command-C, and
  a popup menu.


Modified: haiku/trunk/src/apps/charactermap/CharacterView.cpp
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterView.cpp	2009-04-01 15:47:30 UTC (rev 29851)
+++ haiku/trunk/src/apps/charactermap/CharacterView.cpp	2009-04-01 15:53:53 UTC (rev 29852)
@@ -10,12 +10,19 @@
 #include <string.h>
 
 #include <Bitmap.h>
+#include <Clipboard.h>
 #include <LayoutUtils.h>
+#include <MenuItem.h>
+#include <PopUpMenu.h>
 #include <ScrollBar.h>
+#include <Window.h>
 
 #include "UnicodeBlocks.h"
 
 
+static const uint32 kMsgCopyAsEscapedString = 'cesc';
+
+
 CharacterView::CharacterView(const char* name)
 	: BView(name, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE | B_FRAME_EVENTS),
 	fTargetCommand(0),
@@ -151,8 +158,42 @@
 
 
 void
+CharacterView::MessageReceived(BMessage* message)
+{
+	switch (message->what) {
+		case kMsgCopyAsEscapedString:
+		case B_COPY:
+		{
+			uint32 character;
+			if (message->FindInt32("character", (int32*)&character) != B_OK) {
+				if (!fHasCharacter)
+					break;
+
+				character = fCurrentCharacter;
+			}
+
+			char text[16];
+			if (message->what == kMsgCopyAsEscapedString)
+				UnicodeToUTF8Hex(character, text, sizeof(text));
+			else
+				UnicodeToUTF8(character, text, sizeof(text));
+
+			_CopyToClipboard(text);
+			break;
+		}
+
+		default:
+			BView::MessageReceived(message);
+			break;
+	}
+}
+
+
+void
 CharacterView::AttachedToWindow()
 {
+	Window()->AddShortcut('C', B_SHIFT_KEY,
+		new BMessage(kMsgCopyAsEscapedString), this);
 }
 
 
@@ -180,7 +221,34 @@
 void
 CharacterView::MouseDown(BPoint where)
 {
-	fClickPoint = where;
+	int32 buttons;
+	if (!fHasCharacter
+		|| Window()->CurrentMessage() == NULL
+		|| Window()->CurrentMessage()->FindInt32("buttons", &buttons) != B_OK
+		|| (buttons & B_SECONDARY_MOUSE_BUTTON) == 0) {
+		// Memorize click point for dragging
+		fClickPoint = where;
+		return;
+	}
+
+	// Open pop-up menu
+
+	BPopUpMenu *menu = new BPopUpMenu(B_EMPTY_STRING, false, false);
+	menu->SetFont(be_plain_font);
+
+	BMessage* message =  new BMessage(B_COPY);
+	message->AddInt32("character", fCurrentCharacter);
+	menu->AddItem(new BMenuItem("Copy Character", message, 'C'));
+
+	message =  new BMessage(kMsgCopyAsEscapedString);
+	message->AddInt32("character", fCurrentCharacter);
+	menu->AddItem(new BMenuItem("Copy As Escaped Byte String",
+		message, 'C', B_SHIFT_KEY));
+
+	menu->SetTargetForItems(this);
+
+	ConvertToScreen(&where);
+	menu->Go(where, true, true, true);
 }
 
 
@@ -404,7 +472,7 @@
 	font_height fontHeight;
 	GetFontHeight(&fontHeight);
 	fTitleHeight = (int32)ceilf(fontHeight.ascent + fontHeight.descent
-		+ fontHeight.leading);
+		+ fontHeight.leading) + 2;
 	fTitleBase = (int32)ceilf(fontHeight.ascent);
 
 	// Find widest character
@@ -468,3 +536,21 @@
 
 	Invalidate();
 }
+
+
+void
+CharacterView::_CopyToClipboard(const char* text)
+{
+	if (!be_clipboard->Lock())
+		return;
+
+	be_clipboard->Clear();
+
+	BMessage* clip = be_clipboard->Data();
+	if (clip != NULL) {
+		clip->AddData("text/plain", B_MIME_TYPE, text, strlen(text));
+		be_clipboard->Commit();
+	}
+
+	be_clipboard->Unlock();
+}

Modified: haiku/trunk/src/apps/charactermap/CharacterView.h
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterView.h	2009-04-01 15:47:30 UTC (rev 29851)
+++ haiku/trunk/src/apps/charactermap/CharacterView.h	2009-04-01 15:53:53 UTC (rev 29852)
@@ -38,6 +38,8 @@
 								size_t textSize);
 
 protected:
+	virtual void			MessageReceived(BMessage* message);
+
 	virtual	void			AttachedToWindow();
 	virtual	void			DetachedFromWindow();
 
@@ -58,6 +60,7 @@
 			bool 			_GetCharacterAt(BPoint point, uint32& character,
 								BRect* _frame = NULL);
 			void			_UpdateSize();
+			void			_CopyToClipboard(const char* text);
 
 private:
 			BMessenger		fTarget;

Modified: haiku/trunk/src/apps/charactermap/CharacterWindow.cpp
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterWindow.cpp	2009-04-01 15:47:30 UTC (rev 29851)
+++ haiku/trunk/src/apps/charactermap/CharacterWindow.cpp	2009-04-01 15:53:53 UTC (rev 29852)
@@ -181,6 +181,10 @@
 CharacterWindow::MessageReceived(BMessage* message)
 {
 	switch (message->what) {
+		case B_COPY:
+			PostMessage(message, fCharacterView);
+			break;
+
 		case kMsgUnicodeBlockSelected:
 		{
 			int32 index;



From stippi at mail.berlios.de  Wed Apr  1 18:02:09 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 1 Apr 2009 18:02:09 +0200
Subject: [Haiku-commits] r29853 - haiku/trunk/src/kits/interface
Message-ID: <200904011602.n31G29Zc031055@sheep.berlios.de>

Author: stippi
Date: 2009-04-01 18:02:08 +0200 (Wed, 01 Apr 2009)
New Revision: 29853
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29853&view=rev

Modified:
   haiku/trunk/src/kits/interface/Region.cpp
Log:
Fixed a few more coding style issues, thanks Axel!


Modified: haiku/trunk/src/kits/interface/Region.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Region.cpp	2009-04-01 15:53:53 UTC (rev 29852)
+++ haiku/trunk/src/kits/interface/Region.cpp	2009-04-01 16:02:08 UTC (rev 29853)
@@ -98,7 +98,7 @@
 	\return This function always returns \c *this.
 */
 BRegion&
-BRegion::operator=(const BRegion &region)
+BRegion::operator=(const BRegion& region)
 {
 	if (&region == this)
 		return *this;
@@ -115,6 +115,7 @@
 	return *this;
 }
 
+
 /*!	\brief Compares this region to another (by value).
 	\param other the BRegion to compare to.
 	\return \ctrue if the two regions are the same, \cfalse otherwise.
@@ -131,6 +132,7 @@
 	return memcmp(fData, other.fData, fCount * sizeof(clipping_rect)) == 0;
 }
 
+
 /*!	\brief Set the region to contain just the given BRect.
 	\param newBounds A BRect.
 */



From stippi at mail.berlios.de  Wed Apr  1 19:55:05 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 1 Apr 2009 19:55:05 +0200
Subject: [Haiku-commits] r29854 - haiku/trunk/src/apps/bootman
Message-ID: <200904011755.n31Ht5pm018315@sheep.berlios.de>

Author: stippi
Date: 2009-04-01 19:55:04 +0200 (Wed, 01 Apr 2009)
New Revision: 29854
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29854&view=rev

Modified:
   haiku/trunk/src/apps/bootman/BootManagerWindow.cpp
Log:
As Michael correctly pointed out, there is no reason for the window to be
not resizable, since it will even nicely relayout itself on size changes.
Some pages can be resized too small, but anyways, that can be improved.


Modified: haiku/trunk/src/apps/bootman/BootManagerWindow.cpp
===================================================================
--- haiku/trunk/src/apps/bootman/BootManagerWindow.cpp	2009-04-01 16:02:08 UTC (rev 29853)
+++ haiku/trunk/src/apps/bootman/BootManagerWindow.cpp	2009-04-01 17:55:04 UTC (rev 29854)
@@ -22,7 +22,7 @@
 
 BootManagerWindow::BootManagerWindow()
 	: BWindow(BRect(100, 100, 500, 400), "Boot Manager", B_TITLED_WINDOW, 
-		B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
+		B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE)
 {
 	float minWidth, maxWidth, minHeight, maxHeight;
 	GetSizeLimits(&minWidth, &maxWidth, &minHeight, &maxHeight);



From stippi at mail.berlios.de  Wed Apr  1 21:53:17 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 1 Apr 2009 21:53:17 +0200
Subject: [Haiku-commits] r29855 - haiku/trunk/src/tests/kits/interface/look
Message-ID: <200904011953.n31JrHqC001345@sheep.berlios.de>

Author: stippi
Date: 2009-04-01 21:53:14 +0200 (Wed, 01 Apr 2009)
New Revision: 29855
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29855&view=rev

Modified:
   haiku/trunk/src/tests/kits/interface/look/Jamfile
   haiku/trunk/src/tests/kits/interface/look/Look.cpp
Log:
Integrate a BColumnListView...


Modified: haiku/trunk/src/tests/kits/interface/look/Jamfile
===================================================================
--- haiku/trunk/src/tests/kits/interface/look/Jamfile	2009-04-01 17:55:04 UTC (rev 29854)
+++ haiku/trunk/src/tests/kits/interface/look/Jamfile	2009-04-01 19:53:14 UTC (rev 29855)
@@ -1,6 +1,8 @@
 SubDir HAIKU_TOP src tests kits interface look ;
 
+UsePrivateHeaders interface ;
+
 SimpleTest LookTest :
 	Look.cpp
-	: be tracker
+	: be tracker libcolumnlistview.a
 	;	

Modified: haiku/trunk/src/tests/kits/interface/look/Look.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/look/Look.cpp	2009-04-01 17:55:04 UTC (rev 29854)
+++ haiku/trunk/src/tests/kits/interface/look/Look.cpp	2009-04-01 19:53:14 UTC (rev 29855)
@@ -9,6 +9,7 @@
 #include <ChannelSlider.h>
 #include <CheckBox.h>
 #include <ColorControl.h>
+#include <ColumnListView.h>
 #include <ControlLook.h>
 #include <FilePanel.h>
 #include <GridLayoutBuilder.h>
@@ -266,6 +267,7 @@
 
 	// create some controls
 
+	// BListView
 	BListView* listView = new BListView();
 	for (int32 i = 0; i < 20; i++) {
 		BString itemLabel("List Item ");
@@ -276,6 +278,16 @@
 		true, true);
 	scrollView->SetExplicitMinSize(BSize(300, 140));
 
+	// BColumnListView
+	BColumnListView* columnListView = new BColumnListView("clv", 0,
+		B_FANCY_BORDER);
+//	for (int32 i = 0; i < 20; i++) {
+//		BString itemLabel("List Item ");
+//		itemLabel << i + 1;
+//		columnListView->AddItem(new BStringItem(itemLabel.String()));
+//	}
+
+
 	BGridView* controls = new BGridView(kInset, kInset);
 	BGridLayout* layout = controls->GridLayout();
 	controls->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED));
@@ -296,6 +308,7 @@
 	BTabView* tabView = new BTabView("tab view", B_WIDTH_FROM_WIDEST);
 	BView* content = BGroupLayoutBuilder(B_VERTICAL, kInset)
 		.Add(scrollView)
+		.Add(columnListView)
 		.Add(controls)
 		.SetInsets(kInset, kInset, kInset, kInset);
 



From anevilyak at mail.berlios.de  Thu Apr  2 05:03:17 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Thu, 2 Apr 2009 05:03:17 +0200
Subject: [Haiku-commits] r29856 -
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec
Message-ID: <200904020303.n3233Hnn025697@sheep.berlios.de>

Author: anevilyak
Date: 2009-04-02 05:03:16 +0200 (Thu, 02 Apr 2009)
New Revision: 29856
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29856&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
Log:
gcc4 build fix - thanks to Artur Wyszynski for submitting. Closes ticket #3652.


Modified: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile	2009-04-01 19:53:14 UTC (rev 29855)
+++ haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile	2009-04-02 03:03:16 UTC (rev 29856)
@@ -10,7 +10,11 @@
 TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
 	: -Wall -Wmissing-prototypes -Wsign-compare -Wpointer-arith ] ;
 
-SubDirCcFlags -fomit-frame-pointer -DPIC ;
+if $(HAIKU_GCC_VERSION[1]) >= 3 {
+	SubDirCcFlags -fomit-frame-pointer -fno-pic ;
+} else {
+	SubDirCcFlags -fomit-frame-pointer -DPIC ;
+}
 SubDirCcFlags -DHAVE_AV_CONFIG_H=1 ;
 
 StaticLibrary libavcodec.a :



From anevilyak at mail.berlios.de  Thu Apr  2 05:13:57 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Thu, 2 Apr 2009 05:13:57 +0200
Subject: [Haiku-commits] r29857 - haiku/trunk/src/system/kernel/scheduler
Message-ID: <200904020313.n323DvrB026782@sheep.berlios.de>

Author: anevilyak
Date: 2009-04-02 05:13:55 +0200 (Thu, 02 Apr 2009)
New Revision: 29857
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29857&view=rev

Modified:
   haiku/trunk/src/system/kernel/scheduler/scheduler_affine.cpp
Log:
Various tweaks - 1) while enqueued, keep track of which run queue a thread is in on the scheduler data structure, and use this information so that set_thread_priority doesn't have to search every CPU to find the thread. Also slightly tweak the enqueue and steal operations to take advantage of some of the stats we're now tracking, and experiment with variable quantum sizes for low priority CPU bound threads. Still lots of work to do with respect to balancing and/or affinity though.



Modified: haiku/trunk/src/system/kernel/scheduler/scheduler_affine.cpp
===================================================================
--- haiku/trunk/src/system/kernel/scheduler/scheduler_affine.cpp	2009-04-02 03:03:16 UTC (rev 29856)
+++ haiku/trunk/src/system/kernel/scheduler/scheduler_affine.cpp	2009-04-02 03:13:55 UTC (rev 29857)
@@ -36,13 +36,17 @@
 
 // The run queues. Holds the threads ready to run ordered by priority.
 // One queue per schedulable target (CPU, core, etc.).
+// TODO: consolidate this such that HT/SMT entities on the same physical core
+// share a queue, once we have the necessary API for retrieving the topology
+// information
 static struct thread* sRunQueue[B_MAX_CPU_COUNT];
 static int32 sRunQueueSize[B_MAX_CPU_COUNT];
 static struct thread* sIdleThreads;
 static cpu_mask_t sIdleCPUs = 0;
 
 const int32 kMaxTrackingQuantums = 5;
-const bigtime_t kMaxThreadQuantum = 3000;
+const bigtime_t kMinThreadQuantum = 3000;
+const bigtime_t kMaxThreadQuantum = 10000;
 
 struct scheduler_thread_data {
 	scheduler_thread_data(void) 
@@ -55,6 +59,7 @@
 	{
 		memset(fLastThreadQuantums, 0, sizeof(fLastThreadQuantums));
 		fLastQuantumSlot = 0;
+		fLastQueue = -1;
 	}
 
 	int32 GetAverageQuantumUsage() const
@@ -67,6 +72,7 @@
 	
 	int32 fLastThreadQuantums[kMaxTrackingQuantums];
 	int16 fLastQuantumSlot;
+	int32 fLastQueue;
 };
 
 
@@ -117,8 +123,7 @@
 	for (int32 i = 0; i < smp_get_num_cpus(); i++) {
 		if (gCPU[i].disabled)
 			continue;
-		if (targetCPU < 0 
-			|| gCPU[i].active_time < gCPU[targetCPU].active_time)
+		if (targetCPU < 0 || sRunQueueSize[i] < sRunQueueSize[targetCPU])
 			targetCPU = i;
 	}
 	
@@ -176,6 +181,7 @@
 			prev->queue_next = thread;
 		else
 			sRunQueue[targetCPU] = thread;
+		thread->scheduler_data->fLastQueue = targetCPU;
 	}
 	
 	thread->next_priority = thread->priority;
@@ -207,6 +213,7 @@
 		sRunQueue[currentCPU] = resultThread->queue_next;
 	}
 	sRunQueueSize[currentCPU]--;
+	resultThread->scheduler_data->fLastQueue = -1;
 	
 	return resultThread;
 }
@@ -223,9 +230,13 @@
 	// look through the active CPUs - find the one
 	// that has a) threads available to steal, and
 	// b) out of those, the one that's the most CPU-bound
+	// TODO: make this more intelligent along with enqueue
+	// - we need to try and maintain a reasonable balance
+	// in run queue sizes across CPUs, and also try to maintain
+	// an even distribution of cpu bound / interactive threads
 	for (int32 i = 0; i < smp_get_num_cpus(); i++) {
 		// skip CPUs that have either no or only one thread
-		if (sRunQueue[i] == NULL || sRunQueue[i]->queue_next == NULL)
+		if (sRunQueueSize[i] < 2)
 			continue;
 		if (i == currentCPU)
 			continue;
@@ -233,7 +244,7 @@
 		// pick whichever one is generally the most CPU bound.
 		if (targetCPU < 0)
 			targetCPU = i;
-		else if (gCPU[i].active_time > gCPU[targetCPU].active_time)
+		else if (sRunQueueSize[i] > sRunQueueSize[targetCPU])
 			targetCPU = i;
 	}
 
@@ -289,18 +300,14 @@
 	// data pointer on the thread struct) so we only have to walk 
 	// that exact queue to find it.
 	struct thread *item = NULL, *prev = NULL;
-	for (int32 i = 0; i < smp_get_num_cpus(); i++) {
-		for (item = sRunQueue[i], prev = NULL; item && item != thread;
-				item = item->queue_next) {
+	targetCPU = thread->scheduler_data->fLastQueue;
+	
+	for (item = sRunQueue[targetCPU], prev = NULL; item && item != thread;
+			item = item->queue_next) {
 			if (prev)
 				prev = prev->queue_next;
 			else
-				prev = sRunQueue[i];
-		}
-		if (item) {
-			targetCPU = i;
-			break;
-		}
+				prev = item;
 	}
 
 	ASSERT(item == thread);
@@ -458,7 +465,13 @@
 	}
 
 	if (nextThread != oldThread || oldThread->cpu->preempted) {
-		bigtime_t quantum = kMaxThreadQuantum;	// ToDo: calculate quantum!
+		bigtime_t quantum = kMinThreadQuantum;
+		// give CPU-bound background threads a larger quantum size
+		// to minimize unnecessary context switches if the system is idle
+		if (nextThread->scheduler_data->GetAverageQuantumUsage() 
+			> (kMinThreadQuantum >> 1) 
+			&& nextThread->priority < B_NORMAL_PRIORITY)
+			quantum = kMaxThreadQuantum;
 		timer *quantumTimer = &oldThread->cpu->quantum_timer;
 
 		if (!oldThread->cpu->preempted)



From axeld at mail.berlios.de  Thu Apr  2 10:18:07 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 2 Apr 2009 10:18:07 +0200
Subject: [Haiku-commits] r29858 - haiku/trunk/src/servers/app
Message-ID: <200904020818.n328I7Zg031076@sheep.berlios.de>

Author: axeld
Date: 2009-04-02 10:18:07 +0200 (Thu, 02 Apr 2009)
New Revision: 29858
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29858&view=rev

Modified:
   haiku/trunk/src/servers/app/MultiLocker.cpp
Log:
* Fixed build in DEBUG mode.
* Automatic whitespace cleanup.


Modified: haiku/trunk/src/servers/app/MultiLocker.cpp
===================================================================
--- haiku/trunk/src/servers/app/MultiLocker.cpp	2009-04-02 03:13:55 UTC (rev 29857)
+++ haiku/trunk/src/servers/app/MultiLocker.cpp	2009-04-02 08:18:07 UTC (rev 29858)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2005-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT license.
  *
  * Copyright 1999, Be Incorporated.   All Rights Reserved.
@@ -15,7 +15,9 @@
 
 
 #define TIMING	MULTI_LOCKER_TIMING
-#define DEBUG	MULTI_LOCKER_DEBUG
+#ifndef DEBUG
+#	define DEBUG	MULTI_LOCKER_DEBUG
+#endif
 
 
 const int32 LARGE_NUMBER = 100000;
@@ -100,7 +102,7 @@
 	delete_sem(fLock);
 	free(fDebugArray);
 #endif
-#if TIMING	
+#if TIMING
 	// let's produce some performance numbers
 	printf("MultiLocker Statistics:\n"
 		"Avg ReadLock: %lld\n"
@@ -130,7 +132,7 @@
 	where the thread's stack is located.  Each time a new writer acquires the lock,
 	its thread_id and stack_page are recorded.  IsWriteLocked gets the stack_page of the
 	current thread and sees if it is a match.  If the stack_page matches you are guaranteed
-	to have the matching thread.  If the stack page doesn't match the more traditional 
+	to have the matching thread.  If the stack page doesn't match the more traditional
 	find_thread(NULL) method of matching the thread_ids is used.
 
 	This technique is very useful when dealing with a lock that is acquired in a nested fashion.
@@ -160,7 +162,7 @@
 		// determine which page in memory this stack represents
 		// this is managed by taking the address of the item on the
 		// stack and dividing it by the size of the memory pages
-		// if it is the same as the cached stack_page, there is a match 
+		// if it is the same as the cached stack_page, there is a match
 		uint32 stackBase = (uint32)&writeLockHolder / B_PAGE_SIZE;
 		thread_id thread = 0;
 
@@ -202,7 +204,7 @@
 	bigtime_t start = system_time();
 #endif
 
-	bool locked = false;	
+	bool locked = false;
 
 	// the lock must be initialized
 	if (fInit == B_OK) {
@@ -212,7 +214,7 @@
 			locked = true;
 		} else {
 			// increment and retrieve the current count of readers
-			int32 currentCount = atomic_add(&fReadCount, 1);	
+			int32 currentCount = atomic_add(&fReadCount, 1);
 			if (currentCount < 0) {
 				// a writer holds the lock so wait for fReadSem to be released
 				status_t status;
@@ -222,7 +224,7 @@
 
 				locked = status == B_OK;
 			} else
-				locked = true;			
+				locked = true;
 		}
 	}
 
@@ -232,7 +234,7 @@
 	rl_count++;
 #endif
 
-	return locked;	
+	return locked;
 }
 
 
@@ -296,7 +298,7 @@
 	wl_time += (end - start);
 	wl_count++;
 #endif
-	
+
 	return locked;
 }
 
@@ -313,7 +315,7 @@
 	if (IsWriteLocked()) {
 		// writers simply decrement the nesting count
 		fWriterNest--;
-		unlocked = true;	
+		unlocked = true;
 	} else {
 		// decrement and retrieve the read counter
 		int32 current_count = atomic_add(&fReadCount, -1);
@@ -330,7 +332,7 @@
 	ru_count++;
 #endif
 
-	return unlocked;	
+	return unlocked;
 }
 
 
@@ -397,7 +399,7 @@
 bool
 MultiLocker::ReadLock()
 {
-	bool locked = false;	
+	bool locked = false;
 
 	if (fInit != B_OK)
 		debugger("lock not initialized");
@@ -427,7 +429,7 @@
 bool
 MultiLocker::WriteLock()
 {
-	bool locked = false;	
+	bool locked = false;
 
 	if (fInit != B_OK)
 		debugger("lock not initialized");
@@ -476,7 +478,7 @@
 		if (fWriterNest < 0)
 			debugger("ReadUnlock() - negative writer nest count");
 
-		unlocked = true;	
+		unlocked = true;
 	} else {
 		// decrement and retrieve the read counter
 		unlocked = release_sem_etc(fLock, 1, B_DO_NOT_RESCHEDULE) == B_OK;
@@ -484,7 +486,7 @@
 			_UnregisterThread();
 	}
 
-	return unlocked;	
+	return unlocked;
 }
 
 



From axeld at mail.berlios.de  Thu Apr  2 10:18:30 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 2 Apr 2009 10:18:30 +0200
Subject: [Haiku-commits] r29859 - haiku/trunk/src/servers/app/drawing/Painter
Message-ID: <200904020818.n328IUFt031142@sheep.berlios.de>

Author: axeld
Date: 2009-04-02 10:18:29 +0200 (Thu, 02 Apr 2009)
New Revision: 29859
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29859&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp
Log:
* Fixed warnings.
* Automatic whitespace cleanup.


Modified: haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp	2009-04-02 08:18:07 UTC (rev 29858)
+++ haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp	2009-04-02 08:18:29 UTC (rev 29859)
@@ -459,8 +459,9 @@
 		} while (fBaseRenderer.next_clip_box());
 
 		return true;
+	}
 
-	} else if (a.y == b.y) {
+	if (a.y == b.y) {
 		// horizontal
 		int32 y = (int32)a.y;
 		uint8* dst = fBuffer.row_ptr(y);
@@ -512,19 +513,19 @@
 	const BGradient& gradient) const
 {
 	CHECK_CLIPPING
-	
+
 	_Transform(&pt1);
 	_Transform(&pt2);
 	_Transform(&pt3);
-	
+
 	fPath.remove_all();
-	
+
 	fPath.move_to(pt1.x, pt1.y);
 	fPath.line_to(pt2.x, pt2.y);
 	fPath.line_to(pt3.x, pt3.y);
-	
+
 	fPath.close_polygon();
-	
+
 	return _FillPath(fPath, gradient);
 }
 
@@ -565,23 +566,23 @@
 					 const BGradient& gradient, bool closed) const
 {
 	CHECK_CLIPPING
-	
+
 	if (numPts > 0) {
-		
+
 		fPath.remove_all();
-		
+
 		_Transform(p);
 		fPath.move_to(p->x, p->y);
-		
+
 		for (int32 i = 1; i < numPts; i++) {
 			p++;
 			_Transform(p);
 			fPath.line_to(p->x, p->y);
 		}
-		
+
 		if (closed)
 			fPath.close_polygon();
-		
+
 		return _FillPath(fPath, gradient);
 	}
 	return BRect(0.0, 0.0, -1.0, -1.0);
@@ -619,20 +620,20 @@
 Painter::FillBezier(BPoint* p, const BGradient& gradient) const
 {
 	CHECK_CLIPPING
-	
+
 	fPath.remove_all();
-	
+
 	_Transform(&(p[0]));
 	_Transform(&(p[1]));
 	_Transform(&(p[2]));
 	_Transform(&(p[3]));
-	
+
 	fPath.move_to(p[0].x, p[0].y);
 	fPath.curve4(p[1].x, p[1].y,
 				 p[2].x, p[2].y,
 				 p[3].x, p[3].y);
-	
-	
+
+
 	fPath.close_polygon();
 	return _FillPath(fCurve, gradient);
 }
@@ -692,7 +693,7 @@
 	const BGradient& gradient) const
 {
 	CHECK_CLIPPING
-	
+
 	// TODO: if shapes are ever used more heavily in Haiku,
 	// it would be nice to use BShape data directly (write
 	// an AGG "VertexSource" adaptor)
@@ -703,7 +704,7 @@
 			fPath.move_to(points->x, points->y);
 			points++;
 		}
-		
+
 		if (op & OP_LINETO) {
 			int32 count = opList[i] & 0x00FFFFFF;
 			while (count--) {
@@ -711,7 +712,7 @@
 				points++;
 			}
 		}
-		
+
 		if (op & OP_BEZIERTO) {
 			int32 count = opList[i] & 0x00FFFFFF;
 			while (count) {
@@ -722,11 +723,11 @@
 				count -= 3;
 			}
 		}
-		
+
 		if (op & OP_CLOSE)
 			fPath.close_polygon();
 	}
-	
+
 	return _FillPath(fCurve, gradient);
 }
 
@@ -858,7 +859,7 @@
 Painter::FillRect(const BRect& r, const BGradient& gradient) const
 {
 	CHECK_CLIPPING
-	
+
 	// support invalid rects
 	BPoint a(min_c(r.left, r.right), min_c(r.top, r.bottom));
 	BPoint b(max_c(r.left, r.right), max_c(r.top, r.bottom));
@@ -949,8 +950,8 @@
 
 	int32 gradientArraySize = r.IntegerHeight() + 1;
 	uint32 gradientArray[gradientArraySize];
-	int32 gradientTop = gradient.Start().y;
-	int32 gradientBottom = gradient.End().y;
+	int32 gradientTop = (int32)gradient.Start().y;
+	int32 gradientBottom = (int32)gradient.End().y;
 	int32 colorCount = gradientBottom - gradientTop + 1;
 	if (colorCount < 0) {
 		// Gradient is upside down. That's currently not supported by this
@@ -960,7 +961,7 @@
 
 	_MakeGradient(gradient, colorCount, gradientArray,
 		gradientTop - (int32)r.top, gradientArraySize);
-	
+
 	uint8* dst = fBuffer.row_ptr(0);
 	uint32 bpr = fBuffer.stride();
 	int32 left = (int32)r.left;
@@ -1053,7 +1054,7 @@
 		if (gSubpixelAntialiasing) {
 			fSubpixRasterizer.reset();
 			fSubpixRasterizer.add_path(outer);
-			
+
 			// don't add an inner hole if the "size is negative", this avoids
 			// some defects that can be observed on R5 and could be regarded
 			// as a bug.
@@ -1071,7 +1072,7 @@
 			fSubpixRasterizer.filling_rule(agg::fill_even_odd);
 
 			if (fPenSize > 2)
-				agg::render_scanlines(fSubpixRasterizer, fSubpixPackedScanline, 
+				agg::render_scanlines(fSubpixRasterizer, fSubpixPackedScanline,
 					fSubpixRenderer);
 			else
 				agg::render_scanlines(fSubpixRasterizer, fSubpixUnpackedScanline,
@@ -1141,22 +1142,22 @@
 	 const BGradient& gradient) const
 {
 	CHECK_CLIPPING
-	
+
 	BPoint lt(r.left, r.top);
 	BPoint rb(r.right, r.bottom);
 	_Transform(&lt, false);
 	_Transform(&rb, false);
-	
+
 	// account for stricter interpretation of coordinates in AGG
 	// the rectangle ranges from the top-left (.0, .0)
 	// to the bottom-right (.9999, .9999) corner of pixels
 	rb.x += 1.0;
 	rb.y += 1.0;
-	
+
 	agg::rounded_rect rect;
 	rect.rect(lt.x, lt.y, rb.x, rb.y);
 	rect.radius(xRadius, yRadius);
-	
+
 	return _FillPath(rect, gradient);
 }
 
@@ -1257,21 +1258,21 @@
 Painter::FillEllipse(BRect r, const BGradient& gradient) const
 {
 	CHECK_CLIPPING
-	
+
 	AlignEllipseRect(&r, true);
-	
+
 	float xRadius = r.Width() / 2.0;
 	float yRadius = r.Height() / 2.0;
 	BPoint center(r.left + xRadius, r.top + yRadius);
-	
+
 	int32 divisions = (int32)((xRadius + yRadius + 2 * fPenSize) * PI / 2);
 	if (divisions < 12)
 		divisions = 12;
 	if (divisions > 4096)
 		divisions = 4096;
-	
+
 	agg::ellipse path(center.x, center.y, xRadius, yRadius, divisions);
-		
+
 	return _FillPath(path, gradient);
 }
 
@@ -1337,22 +1338,22 @@
 	float span, const BGradient& gradient) const
 {
 	CHECK_CLIPPING
-	
+
 	_Transform(&center);
-	
+
 	double angleRad = (angle * PI) / 180.0;
 	double spanRad = (span * PI) / 180.0;
 	agg::bezier_arc arc(center.x, center.y, xRadius, yRadius,
 						-angleRad, -spanRad);
-	
+
 	agg::conv_curve<agg::bezier_arc> segmentedArc(arc);
-	
+
 	fPath.remove_all();
-	
+
 	// build a new path by starting at the center point,
 	// then traversing the arc, then going back to the center
 	fPath.move_to(center.x, center.y);
-	
+
 	segmentedArc.rewind(0);
 	double x;
 	double y;
@@ -1361,9 +1362,9 @@
 		fPath.line_to(x, y);
 		cmd = segmentedArc.vertex(&x, &y);
 	}
-	
+
 	fPath.close_polygon();
-	
+
 	return _FillPath(fPath, gradient);
 }
 
@@ -1478,7 +1479,7 @@
 Painter::FillRegion(const BRegion* region, const BGradient& gradient) const
 {
 	CHECK_CLIPPING
-	
+
 	BRegion copy(*region);
 	int32 count = copy.CountRects();
 	BRect touched = FillRect(copy.RectAt(0), gradient);
@@ -1805,8 +1806,8 @@
 	BBitmap* temp = NULL;
 	ObjectDeleter<BBitmap> tempDeleter;
 
-	
 
+
 	if ((format != B_RGBA32 && format != B_RGB32)
 		|| (format == B_RGB32 && fDrawingMode != B_OP_COPY
 #if 1
@@ -1848,7 +1849,7 @@
 					srcBuffer.stride(), B_TRANSPARENT_MAGIC_RGBA32,
 					temp);
 				break;
-	
+
 			// TODO: not sure if this applies to B_RGBA15 too. It
 			// should not because B_RGBA15 actually has an alpha
 			// channel itself and it should have been preserved
@@ -1860,7 +1861,7 @@
 					srcBuffer.stride(), B_TRANSPARENT_MAGIC_RGBA15,
 					temp);
 				break;
-	
+
 			default:
 				break;
 		}
@@ -1981,9 +1982,9 @@
 
 	// Do not calculate more filter weights than necessary and also
 	// keep the stack based allocations reasonably sized
-	if (fClippingRegion->Frame().IntegerWidth() + 1 < dstWidth)
+	if (fClippingRegion->Frame().IntegerWidth() + 1 < (int32)dstWidth)
 		dstWidth = fClippingRegion->Frame().IntegerWidth() + 1;
-	if (fClippingRegion->Frame().IntegerHeight() + 1 < dstHeight)
+	if (fClippingRegion->Frame().IntegerHeight() + 1 < (int32)dstHeight)
 		dstHeight = fClippingRegion->Frame().IntegerHeight() + 1;
 
 	// When calculating less filter weights than specified by viewRect,
@@ -1991,12 +1992,12 @@
 	uint32 filterWeightXIndexOffset = 0;
 	uint32 filterWeightYIndexOffset = 0;
 	if (fClippingRegion->Frame().left > viewRect.left) {
-		filterWeightXIndexOffset = fClippingRegion->Frame().left
-			- viewRect.left;
+		filterWeightXIndexOffset = (int32)(fClippingRegion->Frame().left
+			- viewRect.left);
 	}
 	if (fClippingRegion->Frame().top > viewRect.top) {
-		filterWeightYIndexOffset = fClippingRegion->Frame().top
-			- viewRect.top;
+		filterWeightYIndexOffset = (int32)(fClippingRegion->Frame().top
+			- viewRect.top);
 	}
 
 	// should not pose a problem with stack overflows
@@ -2102,9 +2103,9 @@
 
 	// Do not calculate more filter weights than necessary and also
 	// keep the stack based allocations reasonably sized
-	if (fClippingRegion->Frame().IntegerWidth() + 1 < dstWidth)
+	if (fClippingRegion->Frame().IntegerWidth() + 1 < (int32)dstWidth)
 		dstWidth = fClippingRegion->Frame().IntegerWidth() + 1;
-	if (fClippingRegion->Frame().IntegerHeight() + 1 < dstHeight)
+	if (fClippingRegion->Frame().IntegerHeight() + 1 < (int32)dstHeight)
 		dstHeight = fClippingRegion->Frame().IntegerHeight() + 1;
 
 	// When calculating less filter weights than specified by viewRect,
@@ -2112,12 +2113,12 @@
 	uint32 filterWeightXIndexOffset = 0;
 	uint32 filterWeightYIndexOffset = 0;
 	if (fClippingRegion->Frame().left > viewRect.left) {
-		filterWeightXIndexOffset = fClippingRegion->Frame().left
-			- viewRect.left;
+		filterWeightXIndexOffset = (int32)(fClippingRegion->Frame().left
+			- viewRect.left);
 	}
 	if (fClippingRegion->Frame().top > viewRect.top) {
-		filterWeightYIndexOffset = fClippingRegion->Frame().top
-			- viewRect.top;
+		filterWeightYIndexOffset = (int32)(fClippingRegion->Frame().top
+			- viewRect.top);
 	}
 
 	struct FilterInfo {
@@ -2280,7 +2281,7 @@
 							d[1] = (s[1] * wTop + sBottom[1] * wBottom) >> 8;
 							d[2] = (s[2] * wTop + sBottom[2] * wBottom) >> 8;
 						} else {
-							// calculate the weighted sum of all four 
+							// calculate the weighted sum of all four
 							// interpolated pixels
 							const uint16 wLeft = xWeights[x].weight;
 							const uint16 wRight = 255 - wLeft;
@@ -2288,13 +2289,13 @@
 							uint32 t0 = (s[0] * wLeft + s[4] * wRight) * wTop;
 							uint32 t1 = (s[1] * wLeft + s[5] * wRight) * wTop;
 							uint32 t2 = (s[2] * wLeft + s[6] * wRight) * wTop;
-		
+
 							// left and right of bottom row
 							s += srcBPR;
 							t0 += (s[0] * wLeft + s[4] * wRight) * wBottom;
 							t1 += (s[1] * wLeft + s[5] * wRight) * wBottom;
 							t2 += (s[2] * wLeft + s[6] * wRight) * wBottom;
-	
+
 							d[0] = t0 >> 16;
 							d[1] = t1 >> 16;
 							d[2] = t2 >> 16;
@@ -2331,7 +2332,7 @@
 
 				for (int32 x = xIndexL; x <= xIndexMax; x++) {
 					const uint8* s = src + xWeights[x].index;
-					// calculate the weighted sum of all four 
+					// calculate the weighted sum of all four
 					// interpolated pixels
 					const uint16 wLeft = xWeights[x].weight;
 					const uint16 wRight = 255 - wLeft;
@@ -2585,11 +2586,11 @@
 	stroke.miter_limit(fMiterLimit);
 
 	if (gSubpixelAntialiasing) {
-	
+
 		fSubpixRasterizer.reset();
 		fSubpixRasterizer.add_path(stroke);
-		
-		agg::render_scanlines(fSubpixRasterizer, 
+
+		agg::render_scanlines(fSubpixRasterizer,
 			fSubpixPackedScanline, fSubpixRenderer);
 	} else {
 
@@ -2612,7 +2613,7 @@
 Painter::_FillPath(VertexSource& path) const
 {
 	if (gSubpixelAntialiasing) {
-		
+
 		fSubpixRasterizer.reset();
 		fSubpixRasterizer.add_path(path);
 		agg::render_scanlines(fSubpixRasterizer,
@@ -2632,7 +2633,7 @@
 Painter::_FillPath(VertexSource& path, const BGradient& gradient) const
 {
 	GTRACE("Painter::_FillPath\n");
-	
+
 	switch(gradient.GetType()) {
 		case BGradient::TYPE_LINEAR: {
 			GTRACE(("Painter::_FillPath> type == TYPE_LINEAR\n"));
@@ -2802,7 +2803,7 @@
 								 const BGradientLinear& linear) const
 {
 	GTRACE("Painter::_FillPathGradientLinear\n");
-	
+
 	BPoint start = linear.Start();
 	BPoint end = linear.End();
 
@@ -2814,18 +2815,18 @@
 				gradient_func_type, color_array_type> span_gradient_type;
 	typedef agg::renderer_scanline_aa<renderer_base, span_allocator_type,
 				span_gradient_type> renderer_gradient_type;
-	
+
 	gradient_func_type gradientFunc;
 	agg::trans_affine gradientMtx;
 	interpolator_type spanInterpolator(gradientMtx);
 	span_allocator_type spanAllocator;
 	color_array_type colorArray;
-	
+
 	_MakeGradient(colorArray, linear);
 
 	span_gradient_type spanGradient(spanInterpolator, gradientFunc,
 									colorArray, 0, 100);
-	
+
 	renderer_gradient_type gradientRenderer(fBaseRenderer, spanAllocator,
 											spanGradient);
 
@@ -2843,11 +2844,11 @@
 								 const BGradientRadial& radial) const
 {
 	GTRACE("Painter::_FillPathGradientRadial\n");
-	
+
 	BPoint center = radial.Center();
 // TODO: finish this
 //	float radius = radial.Radius();
-	
+
 	typedef agg::span_interpolator_linear<> interpolator_type;
 	typedef agg::pod_auto_array<agg::rgba8, 256> color_array_type;
 	typedef agg::span_allocator<agg::rgba8> span_allocator_type;
@@ -2856,18 +2857,18 @@
 	gradient_func_type, color_array_type> span_gradient_type;
 	typedef agg::renderer_scanline_aa<renderer_base, span_allocator_type,
 	span_gradient_type> renderer_gradient_type;
-	
+
 	gradient_func_type gradientFunc;
 	agg::trans_affine gradientMtx;
 	interpolator_type spanInterpolator(gradientMtx);
 	span_allocator_type spanAllocator;
 	color_array_type colorArray;
-	
+
 	_MakeGradient(colorArray, radial);
-	
+
 	span_gradient_type spanGradient(spanInterpolator, gradientFunc,
 									colorArray, 0, 100);
-	
+
 	renderer_gradient_type gradientRenderer(fBaseRenderer, spanAllocator,
 											spanGradient);
 
@@ -2876,7 +2877,7 @@
 	gradientMtx.invert();
 
 //	_CalcLinearGradientTransform(start, end, gradientMtx);
-	
+
 	fRasterizer.reset();
 	fRasterizer.add_path(path);
 	agg::render_scanlines(fRasterizer, fPackedScanline, gradientRenderer);
@@ -2889,12 +2890,12 @@
 							const BGradientRadialFocus& focus) const
 {
 	GTRACE("Painter::_FillPathGradientRadialFocus\n");
-	
+
 	BPoint center = focus.Center();
 // TODO: finish this.
 //	BPoint focal = focus.Focal();
 //	float radius = focus.Radius();
-	
+
 	typedef agg::span_interpolator_linear<> interpolator_type;
 	typedef agg::pod_auto_array<agg::rgba8, 256> color_array_type;
 	typedef agg::span_allocator<agg::rgba8> span_allocator_type;
@@ -2903,27 +2904,27 @@
 	gradient_func_type, color_array_type> span_gradient_type;
 	typedef agg::renderer_scanline_aa<renderer_base, span_allocator_type,
 	span_gradient_type> renderer_gradient_type;
-	
+
 	gradient_func_type gradientFunc;
 	agg::trans_affine gradientMtx;
 	interpolator_type spanInterpolator(gradientMtx);
 	span_allocator_type spanAllocator;
 	color_array_type colorArray;
-	
+
 	_MakeGradient(colorArray, focus);
-	
+
 	span_gradient_type spanGradient(spanInterpolator, gradientFunc,
 									colorArray, 0, 100);
-	
+
 	renderer_gradient_type gradientRenderer(fBaseRenderer, spanAllocator,
 											spanGradient);
-	
+
 	gradientMtx.reset();
 	gradientMtx *= agg::trans_affine_translation(center.x, center.y);
 	gradientMtx.invert();
-	
+
 	//	_CalcLinearGradientTransform(start, end, gradientMtx);
-	
+
 	fRasterizer.reset();
 	fRasterizer.add_path(path);
 	agg::render_scanlines(fRasterizer, fPackedScanline, gradientRenderer);
@@ -2936,10 +2937,10 @@
 								  const BGradientDiamond& diamond) const
 {
 	GTRACE("Painter::_FillPathGradientDiamond\n");
-	
+
 	BPoint center = diamond.Center();
 //	float radius = diamond.Radius();
-	
+
 	typedef agg::span_interpolator_linear<> interpolator_type;
 	typedef agg::pod_auto_array<agg::rgba8, 256> color_array_type;
 	typedef agg::span_allocator<agg::rgba8> span_allocator_type;
@@ -2948,27 +2949,27 @@
 	gradient_func_type, color_array_type> span_gradient_type;
 	typedef agg::renderer_scanline_aa<renderer_base, span_allocator_type,
 	span_gradient_type> renderer_gradient_type;
-	
+
 	gradient_func_type gradientFunc;
 	agg::trans_affine gradientMtx;
 	interpolator_type spanInterpolator(gradientMtx);
 	span_allocator_type spanAllocator;
 	color_array_type colorArray;
-	
+
 	_MakeGradient(colorArray, diamond);
-	
+
 	span_gradient_type spanGradient(spanInterpolator, gradientFunc,
 									colorArray, 0, 100);
-	
+
 	renderer_gradient_type gradientRenderer(fBaseRenderer, spanAllocator,
 											spanGradient);
-	
+
 	gradientMtx.reset();
 	gradientMtx *= agg::trans_affine_translation(center.x, center.y);
 	gradientMtx.invert();
-	
+
 	//	_CalcLinearGradientTransform(start, end, gradientMtx);
-	
+
 	fRasterizer.reset();
 	fRasterizer.add_path(path);
 	agg::render_scanlines(fRasterizer, fPackedScanline, gradientRenderer);
@@ -2981,10 +2982,10 @@
 								const BGradientConic& conic) const
 {
 	GTRACE("Painter::_FillPathGradientConic\n");
-	
+
 	BPoint center = conic.Center();
 //	float radius = conic.Radius();
-	
+
 	typedef agg::span_interpolator_linear<> interpolator_type;
 	typedef agg::pod_auto_array<agg::rgba8, 256> color_array_type;
 	typedef agg::span_allocator<agg::rgba8> span_allocator_type;
@@ -2993,27 +2994,27 @@
 	gradient_func_type, color_array_type> span_gradient_type;
 	typedef agg::renderer_scanline_aa<renderer_base, span_allocator_type,
 	span_gradient_type> renderer_gradient_type;
-	
+
 	gradient_func_type gradientFunc;
 	agg::trans_affine gradientMtx;
 	interpolator_type spanInterpolator(gradientMtx);
 	span_allocator_type spanAllocator;
 	color_array_type colorArray;
-	
+
 	_MakeGradient(colorArray, conic);
-	
+
 	span_gradient_type spanGradient(spanInterpolator, gradientFunc,
 									colorArray, 0, 100);
-	
+
 	renderer_gradient_type gradientRenderer(fBaseRenderer, spanAllocator,
 											spanGradient);
-	
+
 	gradientMtx.reset();
 	gradientMtx *= agg::trans_affine_translation(center.x, center.y);
 	gradientMtx.invert();
-	
+
 	//	_CalcLinearGradientTransform(start, end, gradientMtx);
-	
+
 	fRasterizer.reset();
 	fRasterizer.add_path(path);
 	agg::render_scanlines(fRasterizer, fPackedScanline, gradientRenderer);



From axeld at mail.berlios.de  Thu Apr  2 11:04:07 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 2 Apr 2009 11:04:07 +0200
Subject: [Haiku-commits] r29860 - haiku/trunk/src/servers/app/drawing/Painter
Message-ID: <200904020904.n32947uj003358@sheep.berlios.de>

Author: axeld
Date: 2009-04-02 11:04:00 +0200 (Thu, 02 Apr 2009)
New Revision: 29860
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29860&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp
Log:
* agg::rendering_buffer::row_ptr() crashes when passing an out of bounds index.
* This fixes bug #2316.


Modified: haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp	2009-04-02 08:18:29 UTC (rev 29859)
+++ haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp	2009-04-02 09:04:00 UTC (rev 29860)
@@ -464,6 +464,9 @@
 	if (a.y == b.y) {
 		// horizontal
 		int32 y = (int32)a.y;
+		if (y < 0 || y >= fBuffer.height())
+			return true;
+
 		uint8* dst = fBuffer.row_ptr(y);
 		int32 x1 = (int32)min_c(a.x, b.x);
 		int32 x2 = (int32)max_c(a.x, b.x);
@@ -982,7 +985,8 @@
 //					for (int32 x = x1; x <= x2; x++) {
 //						*handle++ = gradientArray[y1 - top];
 //					}
-gfxset32(offset + y1 * bpr, gradientArray[y1 - top], (x2 - x1 + 1) * 4);
+				gfxset32(offset + y1 * bpr, gradientArray[y1 - top],
+					(x2 - x1 + 1) * 4);
 			}
 		}
 	} while (fBaseRenderer.next_clip_box());
@@ -1010,7 +1014,7 @@
 //			for (int32 x = left; x <= right; x++) {
 //				*handle++ = color.data32;
 //			}
-gfxset32(dst, color.data32, bytes);
+		gfxset32(dst, color.data32, bytes);
 		dst += bpr;
 	}
 }



From axeld at mail.berlios.de  Thu Apr  2 11:05:50 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 2 Apr 2009 11:05:50 +0200
Subject: [Haiku-commits] r29861 - haiku/trunk/src/servers/app/drawing
Message-ID: <200904020905.n3295op6003549@sheep.berlios.de>

Author: axeld
Date: 2009-04-02 11:05:49 +0200 (Thu, 02 Apr 2009)
New Revision: 29861
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29861&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
Log:
* Fixed Stippi's favourite typo ("appearantly" does not exist).


Modified: haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2009-04-02 09:04:00 UTC (rev 29860)
+++ haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2009-04-02 09:05:49 UTC (rev 29861)
@@ -861,10 +861,11 @@
 	// NOTE: region expected to be already clipped correctly!!
 	BRect frame = r.Frame();
 	if (!fPainter->Bounds().Contains(frame)) {
-		// NOTE: I am not quite sure yet how this can happen, but appearantly it can (see bug 634)
-		// This function is used for internal app_server painting, in the case of bug 634,
-		// the background of views is painted. But the view region should never be outside the
-		// frame buffer bounds.
+		// NOTE: I am not quite sure yet how this can happen, but apparantly it
+		// can (see bug #634).
+		// This function is used for internal app_server painting, in the case of
+		// bug #634, the background of views is painted. But the view region
+		// should never be outside the frame buffer bounds.
 //		char message[1024];
 //		BRect bounds = fPainter->Bounds();
 //		sprintf(message, "FillRegion() - painter: (%d, %d)->(%d, %d), region: (%d, %d)->(%d, %d)",



From axeld at mail.berlios.de  Thu Apr  2 11:09:49 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 2 Apr 2009 11:09:49 +0200
Subject: [Haiku-commits] r29862 - haiku/trunk/src/servers/app/drawing/Painter
Message-ID: <200904020909.n3299nIn003875@sheep.berlios.de>

Author: axeld
Date: 2009-04-02 11:09:46 +0200 (Thu, 02 Apr 2009)
New Revision: 29862
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29862&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp
Log:
* Fixed warning I just introduced.


Modified: haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp	2009-04-02 09:05:49 UTC (rev 29861)
+++ haiku/trunk/src/servers/app/drawing/Painter/Painter.cpp	2009-04-02 09:09:46 UTC (rev 29862)
@@ -464,7 +464,7 @@
 	if (a.y == b.y) {
 		// horizontal
 		int32 y = (int32)a.y;
-		if (y < 0 || y >= fBuffer.height())
+		if (y < 0 || y >= (int32)fBuffer.height())
 			return true;
 
 		uint8* dst = fBuffer.row_ptr(y);



From axeld at mail.berlios.de  Thu Apr  2 11:46:24 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 2 Apr 2009 11:46:24 +0200
Subject: [Haiku-commits] r29863 - haiku/trunk/src/apps/charactermap
Message-ID: <200904020946.n329kOmj009113@sheep.berlios.de>

Author: axeld
Date: 2009-04-02 11:46:21 +0200 (Thu, 02 Apr 2009)
New Revision: 29863
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29863&view=rev

Added:
   haiku/trunk/src/apps/charactermap/UnicodeBlockView.cpp
   haiku/trunk/src/apps/charactermap/UnicodeBlockView.h
Modified:
   haiku/trunk/src/apps/charactermap/CharacterWindow.cpp
   haiku/trunk/src/apps/charactermap/CharacterWindow.h
   haiku/trunk/src/apps/charactermap/Jamfile
   haiku/trunk/src/apps/charactermap/UnicodeBlocks.cpp
Log:
* Added filter control for the Unicode block list.
* The status line now contains the character as well, as suggested by humdinger.
* Moved the list view into its own class UnicodeBlockView.


Modified: haiku/trunk/src/apps/charactermap/CharacterWindow.cpp
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterWindow.cpp	2009-04-02 09:09:46 UTC (rev 29862)
+++ haiku/trunk/src/apps/charactermap/CharacterWindow.cpp	2009-04-02 09:46:21 UTC (rev 29863)
@@ -10,6 +10,7 @@
 #include <string.h>
 
 #include <Application.h>
+#include <Button.h>
 #include <File.h>
 #include <FindDirectory.h>
 #include <GroupLayoutBuilder.h>
@@ -17,15 +18,17 @@
 #include <Menu.h>
 #include <MenuBar.h>
 #include <MenuItem.h>
+#include <MessageFilter.h>
 #include <Path.h>
 #include <Roster.h>
 #include <ScrollView.h>
 #include <Slider.h>
 #include <SplitLayoutBuilder.h>
 #include <StringView.h>
+#include <TextControl.h>
 
 #include "CharacterView.h"
-#include "UnicodeBlocks.h"
+#include "UnicodeBlockView.h"
 
 
 static const uint32 kMsgUnicodeBlockSelected = 'unbs';
@@ -34,6 +37,9 @@
 static const uint32 kMsgFontSizeChanged = 'fsch';
 static const uint32 kMsgPrivateBlocks = 'prbl';
 static const uint32 kMsgContainedBlocks = 'cnbl';
+static const uint32 kMsgFilterChanged = 'fltr';
+static const uint32 kMsgFilterEntered = 'flte';
+static const uint32 kMsgClearFilter = 'clrf';
 
 static const int32 kMinFontSize = 10;
 static const int32 kMaxFontSize = 72;
@@ -59,7 +65,56 @@
 	mutable char	fText[32];
 };
 
+class MouseMovedFilter : public BMessageFilter {
+public:
+	MouseMovedFilter()
+		: BMessageFilter(B_ANY_DELIVERY, B_ANY_SOURCE, B_MOUSE_MOVED)
+	{
+	}
 
+	int32 ResetMoved()
+	{
+		int32 old = fMouseMoved;
+		fMouseMoved = 0;
+
+		return old;
+	}
+
+	virtual filter_result Filter(BMessage* message, BHandler** /*_target*/)
+	{
+		fMouseMoved++;
+		return B_DISPATCH_MESSAGE;
+	}
+
+private:
+	int32	fMouseMoved;
+};
+
+class EscapeMessageFilter : public BMessageFilter {
+public:
+	EscapeMessageFilter(uint32 command)
+		: BMessageFilter(B_ANY_DELIVERY, B_ANY_SOURCE, B_KEY_DOWN),
+		fCommand(command)
+	{
+	}
+
+	virtual filter_result Filter(BMessage* message, BHandler** /*_target*/)
+	{
+		const char* bytes;
+		if (message->what != B_KEY_DOWN
+			|| message->FindString("bytes", &bytes) != B_OK
+			|| bytes[0] != B_ESCAPE)
+			return B_DISPATCH_MESSAGE;
+
+		Looper()->PostMessage(fCommand);
+		return B_SKIP_MESSAGE;
+	}
+
+private:
+	uint32	fCommand;
+};
+
+
 CharacterWindow::CharacterWindow()
 	: BWindow(BRect(100, 100, 700, 550), "CharacterMap", B_TITLED_WINDOW,
 		B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE
@@ -80,7 +135,13 @@
 
 	BMenuBar* menuBar = new BMenuBar("menu");
 
-	fUnicodeBlockView = new BListView("unicodeBlocks");
+	fFilterControl = new BTextControl("Filter:", NULL, new BMessage(kMsgFilterEntered));
+	fFilterControl->SetModificationMessage(new BMessage(kMsgFilterChanged));
+
+	BButton* clearButton = new BButton("clear", "Clear",
+		new BMessage(kMsgClearFilter));
+
+	fUnicodeBlockView = new UnicodeBlockView("unicodeBlocks");
 	fUnicodeBlockView->SetSelectionMessage(
 		new BMessage(kMsgUnicodeBlockSelected));
 
@@ -90,11 +151,16 @@
 	fCharacterView = new CharacterView("characters");
 	fCharacterView->SetTarget(this, kMsgCharacterChanged);
 
+	// TODO: have a context object shared by CharacterView/UnicodeBlockView
 	bool show;
-	if (settings.FindBool("show private blocks", &show) == B_OK)
+	if (settings.FindBool("show private blocks", &show) == B_OK) {
 		fCharacterView->ShowPrivateBlocks(show);
-	if (settings.FindBool("show contained blocks only", &show) == B_OK)
+		fUnicodeBlockView->ShowPrivateBlocks(show);
+	}
+	if (settings.FindBool("show contained blocks only", &show) == B_OK) {
 		fCharacterView->ShowContainedBlocksOnly(show);
+		fUnicodeBlockView->ShowPrivateBlocks(show);
+	}
 
 	const char* family;
 	const char* style;
@@ -130,8 +196,12 @@
 	AddChild(BGroupLayoutBuilder(B_VERTICAL)
 		.Add(menuBar)
 		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)//BSplitLayoutBuilder()
-			.Add(unicodeScroller)
 			.Add(BGroupLayoutBuilder(B_VERTICAL, 10)
+				.Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)
+					.Add(fFilterControl)
+					.Add(clearButton))
+				.Add(unicodeScroller))
+			.Add(BGroupLayoutBuilder(B_VERTICAL, 10)
 				.Add(characterScroller)
 				.Add(fFontSizeSlider)
 				.Add(fCodeView))
@@ -167,8 +237,14 @@
 
 	menuBar->AddItem(_CreateFontMenu());
 
-	_CreateUnicodeBlocks();
-	InvalidateLayout();
+	AddCommonFilter(new EscapeMessageFilter(kMsgClearFilter));
+	fMouseMovedFilter = new MouseMovedFilter();
+	AddCommonFilter(fMouseMovedFilter);
+
+	// TODO: why is this needed?
+	fUnicodeBlockView->SetTarget(this);
+
+	fFilterControl->MakeFocus();
 }
 
 
@@ -192,7 +268,13 @@
 				|| index < 0)
 				break;
 
-			fCharacterView->ScrollTo(index);
+			BlockListItem* item
+				= static_cast<BlockListItem*>(fUnicodeBlockView->ItemAt(index));
+			fCharacterView->ScrollTo(item->BlockIndex());
+
+			// Give the filter control focus if we got here by mouse action
+			if (fMouseMovedFilter->ResetMoved())
+				fFilterControl->MakeFocus();
 			break;
 		}
 
@@ -202,13 +284,16 @@
 			if (message->FindInt32("character", (int32*)&character) != B_OK)
 				break;
 
+			char utf8[16];
+			CharacterView::UnicodeToUTF8(character, utf8, sizeof(utf8));
+
 			char utf8Hex[32];
 			CharacterView::UnicodeToUTF8Hex(character, utf8Hex,
 				sizeof(utf8Hex));
 
 			char text[128];
-			snprintf(text, sizeof(text), "Code: %#lx (%ld), UTF-8: %s",
-				character, character, utf8Hex);
+			snprintf(text, sizeof(text), "'%s' Code: %#lx (%ld), UTF-8: %s",
+				utf8, character, character, utf8Hex);
 
 			fCodeView->SetText(text);
 			break;
@@ -259,7 +344,7 @@
 			item->SetMarked(!item->IsMarked());
 
 			fCharacterView->ShowPrivateBlocks(item->IsMarked());
-			_UpdateUnicodeBlocks();
+			fUnicodeBlockView->ShowPrivateBlocks(item->IsMarked());
 			break;
 		}
 
@@ -273,10 +358,25 @@
 			item->SetMarked(!item->IsMarked());
 
 			fCharacterView->ShowContainedBlocksOnly(item->IsMarked());
-			_UpdateUnicodeBlocks();
+			fUnicodeBlockView->ShowContainedBlocksOnly(item->IsMarked());
 			break;
 		}
 
+		case kMsgFilterChanged:
+			fUnicodeBlockView->SetFilter(fFilterControl->Text());
+			break;
+
+		case kMsgFilterEntered:
+			fUnicodeBlockView->MakeFocus();
+			fUnicodeBlockView->Select(0);
+			fMouseMovedFilter->ResetMoved();
+			break;
+
+		case kMsgClearFilter:
+			fFilterControl->SetText("");
+			fFilterControl->MakeFocus();
+			break;
+
 		default:
 			BWindow::MessageReceived(message);
 			break;
@@ -412,41 +512,3 @@
 
 	return menu;
 }
-
-
-void
-CharacterWindow::_UpdateUnicodeBlocks()
-{
-	for (int32 i = 0; i < fUnicodeBlockView->CountItems(); i++) {
-		BStringItem* item
-			= static_cast<BStringItem*>(fUnicodeBlockView->ItemAt(i));
-
-		bool enabled = fCharacterView->IsShowingBlock(i);
-
-		if (item->IsEnabled() != enabled) {
-			item->SetEnabled(enabled);
-			fUnicodeBlockView->InvalidateItem(i);
-		}
-	}
-}
-
-
-void
-CharacterWindow::_CreateUnicodeBlocks()
-{
-	float minWidth = 0;
-	for (uint32 i = 0; i < kNumUnicodeBlocks; i++) {
-		BStringItem* item = new BStringItem(kUnicodeBlocks[i].name);
-		fUnicodeBlockView->AddItem(item);
-
-		float width = fUnicodeBlockView->StringWidth(item->Text());
-		if (minWidth < width)
-			minWidth = width;
-	}
-
-	fUnicodeBlockView->SetExplicitMinSize(BSize(minWidth / 2, 32));
-	fUnicodeBlockView->SetExplicitMaxSize(BSize(minWidth, B_SIZE_UNSET));
-
-	_UpdateUnicodeBlocks();
-}
-

Modified: haiku/trunk/src/apps/charactermap/CharacterWindow.h
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterWindow.h	2009-04-02 09:09:46 UTC (rev 29862)
+++ haiku/trunk/src/apps/charactermap/CharacterWindow.h	2009-04-02 09:46:21 UTC (rev 29863)
@@ -15,7 +15,10 @@
 class BMenuItem;
 class BSlider;
 class BStringView;
+class BTextControl;
 class CharacterView;
+class MouseMovedFilter;
+class UnicodeBlockView;
 
 
 class CharacterWindow : public BWindow {
@@ -33,15 +36,15 @@
 
 			void			_SetFont(const char* family, const char* style);
 			BMenu*			_CreateFontMenu();
-			void			_UpdateUnicodeBlocks();
-			void			_CreateUnicodeBlocks();
 
 private:
-			BListView*		fUnicodeBlockView;
+			BTextControl*	fFilterControl;
+			UnicodeBlockView* fUnicodeBlockView;
 			CharacterView*	fCharacterView;
 			BMenuItem*		fSelectedFontItem;
 			BSlider*		fFontSizeSlider;
 			BStringView*	fCodeView;
+			MouseMovedFilter* fMouseMovedFilter;
 };
 
 #endif	// CHARACTER_WINDOW_H

Modified: haiku/trunk/src/apps/charactermap/Jamfile
===================================================================
--- haiku/trunk/src/apps/charactermap/Jamfile	2009-04-02 09:09:46 UTC (rev 29862)
+++ haiku/trunk/src/apps/charactermap/Jamfile	2009-04-02 09:46:21 UTC (rev 29863)
@@ -9,6 +9,7 @@
 	CharacterView.cpp
 	CharacterWindow.cpp
 	UnicodeBlocks.cpp
+	UnicodeBlockView.cpp
 
 	: be
 	: CharacterMap.rdef

Added: haiku/trunk/src/apps/charactermap/UnicodeBlockView.cpp
===================================================================
--- haiku/trunk/src/apps/charactermap/UnicodeBlockView.cpp	2009-04-02 09:09:46 UTC (rev 29862)
+++ haiku/trunk/src/apps/charactermap/UnicodeBlockView.cpp	2009-04-02 09:46:21 UTC (rev 29863)
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2009, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include "UnicodeBlockView.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "UnicodeBlocks.h"
+
+
+BlockListItem::BlockListItem(const char* label, uint32 blockIndex)
+	: BStringItem(label),
+	fBlockIndex(blockIndex)
+{
+}
+
+
+//	#pragma mark -
+
+
+UnicodeBlockView::UnicodeBlockView(const char* name)
+	: BListView(name),
+	fBlocks(kNumUnicodeBlocks, true),
+	fShowPrivateBlocks(false),
+	fShowContainedBlocksOnly(false)
+{
+}
+
+
+UnicodeBlockView::~UnicodeBlockView()
+{
+}
+
+
+void
+UnicodeBlockView::SetFilter(const char* filter)
+{
+	fFilter = filter;
+	_UpdateBlocks();
+}
+
+
+void
+UnicodeBlockView::ShowPrivateBlocks(bool show)
+{
+	if (fShowPrivateBlocks == show)
+		return;
+
+	fShowPrivateBlocks = show;
+	_UpdateBlocks();
+}
+
+
+void
+UnicodeBlockView::ShowContainedBlocksOnly(bool show)
+{
+	if (fShowContainedBlocksOnly == show)
+		return;
+
+	fShowContainedBlocksOnly = show;
+	_UpdateBlocks();
+}
+
+
+bool
+UnicodeBlockView::IsShowingBlock(int32 blockIndex) const
+{
+	if (blockIndex < 0 || blockIndex >= (int32)kNumUnicodeBlocks)
+		return false;
+
+	if (!fShowPrivateBlocks && kUnicodeBlocks[blockIndex].private_block)
+		return false;
+
+	return true;
+}
+
+
+void
+UnicodeBlockView::AttachedToWindow()
+{
+	// TODO: if we're calling this in the constructor, strange things happen
+	_CreateBlocks();
+}
+
+
+void
+UnicodeBlockView::DetachedFromWindow()
+{
+	MakeEmpty();
+	fBlocks.MakeEmpty();
+}
+
+
+void
+UnicodeBlockView::_UpdateBlocks()
+{
+	MakeEmpty();
+
+	for (int32 i = 0; i < fBlocks.CountItems(); i++) {
+		if (fFilter.Length() != 0) {
+			if (strcasestr(kUnicodeBlocks[i].name, fFilter.String()) == NULL)
+				continue;
+		}
+
+		if (!IsShowingBlock(i))
+			continue;
+
+		AddItem(fBlocks.ItemAt(i));
+	}
+}
+
+
+void
+UnicodeBlockView::_CreateBlocks()
+{
+	float minWidth = 0;
+	for (uint32 i = 0; i < kNumUnicodeBlocks; i++) {
+		BlockListItem* item = new BlockListItem(kUnicodeBlocks[i].name, i);
+		fBlocks.AddItem(item);
+
+		float width = StringWidth(item->Text());
+		if (minWidth < width)
+			minWidth = width;
+	}
+
+	SetExplicitMinSize(BSize(minWidth / 2, 32));
+	SetExplicitMaxSize(BSize(minWidth, B_SIZE_UNSET));
+
+	_UpdateBlocks();
+}
+

Added: haiku/trunk/src/apps/charactermap/UnicodeBlockView.h
===================================================================
--- haiku/trunk/src/apps/charactermap/UnicodeBlockView.h	2009-04-02 09:09:46 UTC (rev 29862)
+++ haiku/trunk/src/apps/charactermap/UnicodeBlockView.h	2009-04-02 09:46:21 UTC (rev 29863)
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2009, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef UNICODE_BLOCK_VIEW_H
+#define UNICODE_BLOCK_VIEW_H
+
+
+#include <ListView.h>
+#include <ObjectList.h>
+#include <String.h>
+
+
+class BlockListItem : public BStringItem {
+public:
+							BlockListItem(const char* label, uint32 blockIndex);
+
+			uint32			BlockIndex() const { return fBlockIndex; }
+
+private:
+			uint32			fBlockIndex;
+};
+
+
+class UnicodeBlockView : public BListView {
+public:
+							UnicodeBlockView(const char* name);
+	virtual					~UnicodeBlockView();
+
+			void			SetFilter(const char* filter);
+			const char*		Filter() const
+								{ return fFilter.String(); }
+
+			void			ShowPrivateBlocks(bool show);
+			bool			IsShowingPrivateBlocks() const
+								{ return fShowPrivateBlocks; }
+
+			void			ShowContainedBlocksOnly(bool show);
+			bool			IsShowingContainedBlocksOnly() const
+								{ return fShowContainedBlocksOnly; }
+
+			bool			IsShowingBlock(int32 blockIndex) const;
+
+protected:
+	virtual	void			AttachedToWindow();
+	virtual	void			DetachedFromWindow();
+
+private:
+			void			_UpdateBlocks();
+			void			_CreateBlocks();
+
+private:
+			BObjectList<BlockListItem> fBlocks;
+			BString			fFilter;
+			bool			fShowPrivateBlocks;
+			bool			fShowContainedBlocksOnly;
+};
+
+#endif	// UNICODE_BLOCK_VIEW_H

Modified: haiku/trunk/src/apps/charactermap/UnicodeBlocks.cpp
===================================================================
--- haiku/trunk/src/apps/charactermap/UnicodeBlocks.cpp	2009-04-02 09:09:46 UTC (rev 29862)
+++ haiku/trunk/src/apps/charactermap/UnicodeBlocks.cpp	2009-04-02 09:46:21 UTC (rev 29863)
@@ -130,7 +130,7 @@
 	{"Vai", 0xa500, 0xa63f, false, kNoBlock},
 	{"Cyrillic Extended B", 0xa640, 0xa69f, false, kNoBlock},
 	{"Modifier Tone Letters", 0xa700, 0xa71f, false, kNoBlock},
-	{"Lating Extended D", 0xa720, 0xa7ff, false, kNoBlock},
+	{"Latin Extended D", 0xa720, 0xa7ff, false, kNoBlock},
 	{"Syloti Nagri", 0xa800, 0xa82f, false, kNoBlock},
 	{"Phags-pa", 0xa840, 0xa87f, false, kNoBlock},
 	{"Saurashtra", 0xa880, 0xa8df, false, kNoBlock},



From axeld at mail.berlios.de  Thu Apr  2 11:51:11 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 2 Apr 2009 11:51:11 +0200
Subject: [Haiku-commits] r29864 - haiku/trunk/src/apps/charactermap
Message-ID: <200904020951.n329pB1b009683@sheep.berlios.de>

Author: axeld
Date: 2009-04-02 11:51:09 +0200 (Thu, 02 Apr 2009)
New Revision: 29864
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29864&view=rev

Modified:
   haiku/trunk/src/apps/charactermap/CharacterWindow.cpp
Log:
* Improved filter input vs. mouse use behaviour.


Modified: haiku/trunk/src/apps/charactermap/CharacterWindow.cpp
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterWindow.cpp	2009-04-02 09:46:21 UTC (rev 29863)
+++ haiku/trunk/src/apps/charactermap/CharacterWindow.cpp	2009-04-02 09:51:09 UTC (rev 29864)
@@ -72,12 +72,14 @@
 	{
 	}
 
-	int32 ResetMoved()
+	bool HasMoved() const
 	{
-		int32 old = fMouseMoved;
+		return fMouseMoved != 0;
+	}
+
+	void ResetMoved()
+	{
 		fMouseMoved = 0;
-
-		return old;
 	}
 
 	virtual filter_result Filter(BMessage* message, BHandler** /*_target*/)
@@ -273,7 +275,7 @@
 			fCharacterView->ScrollTo(item->BlockIndex());
 
 			// Give the filter control focus if we got here by mouse action
-			if (fMouseMovedFilter->ResetMoved())
+			if (fMouseMovedFilter->HasMoved())
 				fFilterControl->MakeFocus();
 			break;
 		}
@@ -364,12 +366,14 @@
 
 		case kMsgFilterChanged:
 			fUnicodeBlockView->SetFilter(fFilterControl->Text());
+			fMouseMovedFilter->ResetMoved();
 			break;
 
 		case kMsgFilterEntered:
-			fUnicodeBlockView->MakeFocus();
-			fUnicodeBlockView->Select(0);
-			fMouseMovedFilter->ResetMoved();
+			if (!fMouseMovedFilter->HasMoved()) {
+				fUnicodeBlockView->MakeFocus();
+				fUnicodeBlockView->Select(0);
+			}
 			break;
 
 		case kMsgClearFilter:



From alex at zappotek.com  Thu Apr  2 12:00:00 2009
From: alex at zappotek.com (Alexandre Deckner)
Date: Thu, 02 Apr 2009 12:00:00 +0200
Subject: [Haiku-commits] r29861 - haiku/trunk/src/servers/app/drawing
In-Reply-To: <200904020905.n3295op6003549@sheep.berlios.de>
References: <200904020905.n3295op6003549@sheep.berlios.de>
Message-ID: <49D48CA0.4030706@zappotek.com>

axeld at BerliOS wrote:
> +		// NOTE: I am not quite sure yet how this can happen, but apparantly it
> +		// can (see bug #634).
> +		// This function is used for internal app_server painting, in the case of
> +		// bug #634, the background of views is painted. But the view region
> +		// should never be outside the frame buffer bounds.
Hehe :) You mean "apparently"?

Alex



From axeld at mail.berlios.de  Thu Apr  2 12:01:08 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 2 Apr 2009 12:01:08 +0200
Subject: [Haiku-commits] r29865 - haiku/trunk/src/apps/charactermap
Message-ID: <200904021001.n32A18S9011174@sheep.berlios.de>

Author: axeld
Date: 2009-04-02 12:01:05 +0200 (Thu, 02 Apr 2009)
New Revision: 29865
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29865&view=rev

Modified:
   haiku/trunk/src/apps/charactermap/CharacterWindow.cpp
   haiku/trunk/src/apps/charactermap/CharacterWindow.h
Log:
* Got rid of the mouse move heuristics again, and tried a cleaner approach
  by redirecting up/down keys to the list view.


Modified: haiku/trunk/src/apps/charactermap/CharacterWindow.cpp
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterWindow.cpp	2009-04-02 09:51:09 UTC (rev 29864)
+++ haiku/trunk/src/apps/charactermap/CharacterWindow.cpp	2009-04-02 10:01:05 UTC (rev 29865)
@@ -38,7 +38,6 @@
 static const uint32 kMsgPrivateBlocks = 'prbl';
 static const uint32 kMsgContainedBlocks = 'cnbl';
 static const uint32 kMsgFilterChanged = 'fltr';
-static const uint32 kMsgFilterEntered = 'flte';
 static const uint32 kMsgClearFilter = 'clrf';
 
 static const int32 kMinFontSize = 10;
@@ -65,31 +64,29 @@
 	mutable char	fText[32];
 };
 
-class MouseMovedFilter : public BMessageFilter {
+class RedirectUpAndDownFilter : public BMessageFilter {
 public:
-	MouseMovedFilter()
-		: BMessageFilter(B_ANY_DELIVERY, B_ANY_SOURCE, B_MOUSE_MOVED)
+	RedirectUpAndDownFilter(BHandler* target)
+		: BMessageFilter(B_ANY_DELIVERY, B_ANY_SOURCE, B_KEY_DOWN),
+		fTarget(target)
 	{
 	}
 
-	bool HasMoved() const
+	virtual filter_result Filter(BMessage* message, BHandler** _target)
 	{
-		return fMouseMoved != 0;
-	}
+		const char* bytes;
+		if (message->FindString("bytes", &bytes) != B_OK)
+			return B_DISPATCH_MESSAGE;
 
-	void ResetMoved()
-	{
-		fMouseMoved = 0;
-	}
+		if (bytes[0] == B_UP_ARROW
+			|| bytes[0] == B_DOWN_ARROW)
+			*_target = fTarget;
 
-	virtual filter_result Filter(BMessage* message, BHandler** /*_target*/)
-	{
-		fMouseMoved++;
 		return B_DISPATCH_MESSAGE;
 	}
 
 private:
-	int32	fMouseMoved;
+	BHandler*	fTarget;
 };
 
 class EscapeMessageFilter : public BMessageFilter {
@@ -137,7 +134,7 @@
 
 	BMenuBar* menuBar = new BMenuBar("menu");
 
-	fFilterControl = new BTextControl("Filter:", NULL, new BMessage(kMsgFilterEntered));
+	fFilterControl = new BTextControl("Filter:", NULL, NULL);
 	fFilterControl->SetModificationMessage(new BMessage(kMsgFilterChanged));
 
 	BButton* clearButton = new BButton("clear", "Clear",
@@ -240,8 +237,7 @@
 	menuBar->AddItem(_CreateFontMenu());
 
 	AddCommonFilter(new EscapeMessageFilter(kMsgClearFilter));
-	fMouseMovedFilter = new MouseMovedFilter();
-	AddCommonFilter(fMouseMovedFilter);
+	AddCommonFilter(new RedirectUpAndDownFilter(fUnicodeBlockView));
 
 	// TODO: why is this needed?
 	fUnicodeBlockView->SetTarget(this);
@@ -274,9 +270,7 @@
 				= static_cast<BlockListItem*>(fUnicodeBlockView->ItemAt(index));
 			fCharacterView->ScrollTo(item->BlockIndex());
 
-			// Give the filter control focus if we got here by mouse action
-			if (fMouseMovedFilter->HasMoved())
-				fFilterControl->MakeFocus();
+			fFilterControl->MakeFocus();
 			break;
 		}
 
@@ -366,16 +360,9 @@
 
 		case kMsgFilterChanged:
 			fUnicodeBlockView->SetFilter(fFilterControl->Text());
-			fMouseMovedFilter->ResetMoved();
+			fUnicodeBlockView->Select(0);
 			break;
 
-		case kMsgFilterEntered:
-			if (!fMouseMovedFilter->HasMoved()) {
-				fUnicodeBlockView->MakeFocus();
-				fUnicodeBlockView->Select(0);
-			}
-			break;
-
 		case kMsgClearFilter:
 			fFilterControl->SetText("");
 			fFilterControl->MakeFocus();

Modified: haiku/trunk/src/apps/charactermap/CharacterWindow.h
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterWindow.h	2009-04-02 09:51:09 UTC (rev 29864)
+++ haiku/trunk/src/apps/charactermap/CharacterWindow.h	2009-04-02 10:01:05 UTC (rev 29865)
@@ -17,7 +17,6 @@
 class BStringView;
 class BTextControl;
 class CharacterView;
-class MouseMovedFilter;
 class UnicodeBlockView;
 
 
@@ -44,7 +43,6 @@
 			BMenuItem*		fSelectedFontItem;
 			BSlider*		fFontSizeSlider;
 			BStringView*	fCodeView;
-			MouseMovedFilter* fMouseMovedFilter;
 };
 
 #endif	// CHARACTER_WINDOW_H



From axeld at pinc-software.de  Thu Apr  2 12:04:35 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 02 Apr 2009 12:04:35 +0200 CEST
Subject: [Haiku-commits] r29861 - haiku/trunk/src/servers/app/drawing
In-Reply-To: <49D48CA0.4030706@zappotek.com>
Message-ID: <12258014120-BeMail@zon>

Alexandre Deckner <alex at zappotek.com> wrote:
> axeld at BerliOS wrote:
> > +		// NOTE: I am not quite sure yet how this can happen, but 
> > apparantly it
> > +		// can (see bug #634).
> > +		// This function is used for internal app_server painting, 
> > in the case of
> > +		// bug #634, the background of views is painted. But the 
> > view region
> > +		// should never be outside the frame buffer bounds.
> Hehe :) You mean "apparently"?

Damn, missed that character ;-)

Bye,
   Axel.



From axeld at mail.berlios.de  Thu Apr  2 12:05:14 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 2 Apr 2009 12:05:14 +0200
Subject: [Haiku-commits] r29866 - haiku/trunk/src/servers/app/drawing
Message-ID: <200904021005.n32A5EBS011651@sheep.berlios.de>

Author: axeld
Date: 2009-04-02 12:05:13 +0200 (Thu, 02 Apr 2009)
New Revision: 29866
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29866&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
Log:
* This time, I actually got it right, thanks Alexandre...


Modified: haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2009-04-02 10:01:05 UTC (rev 29865)
+++ haiku/trunk/src/servers/app/drawing/DrawingEngine.cpp	2009-04-02 10:05:13 UTC (rev 29866)
@@ -861,7 +861,7 @@
 	// NOTE: region expected to be already clipped correctly!!
 	BRect frame = r.Frame();
 	if (!fPainter->Bounds().Contains(frame)) {
-		// NOTE: I am not quite sure yet how this can happen, but apparantly it
+		// NOTE: I am not quite sure yet how this can happen, but apparently it
 		// can (see bug #634).
 		// This function is used for internal app_server painting, in the case of
 		// bug #634, the background of views is painted. But the view region



From axeld at mail.berlios.de  Thu Apr  2 12:15:14 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 2 Apr 2009 12:15:14 +0200
Subject: [Haiku-commits] r29867 - haiku/trunk/src/kits/interface
Message-ID: <200904021015.n32AFE7J012897@sheep.berlios.de>

Author: axeld
Date: 2009-04-02 12:15:14 +0200 (Thu, 02 Apr 2009)
New Revision: 29867
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29867&view=rev

Modified:
   haiku/trunk/src/kits/interface/Font.cpp
Log:
* At least pretend to support all unicode blocks, and don't make such
  obvious lies.


Modified: haiku/trunk/src/kits/interface/Font.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Font.cpp	2009-04-02 10:05:13 UTC (rev 29866)
+++ haiku/trunk/src/kits/interface/Font.cpp	2009-04-02 10:15:14 UTC (rev 29867)
@@ -866,7 +866,7 @@
 BFont::Blocks() const
 {
 	// TODO: Add Block support
-	return unicode_block();
+	return unicode_block(~0LL, ~0LL);
 }
 
 



From axeld at mail.berlios.de  Thu Apr  2 18:07:10 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 2 Apr 2009 18:07:10 +0200
Subject: [Haiku-commits] r29868 -
	haiku/trunk/src/system/kernel/disk_device_manager
Message-ID: <200904021607.n32G7ARk000228@sheep.berlios.de>

Author: axeld
Date: 2009-04-02 18:07:09 +0200 (Thu, 02 Apr 2009)
New Revision: 29868
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29868&view=rev

Modified:
   haiku/trunk/src/system/kernel/disk_device_manager/ddm_userland_interface.cpp
Log:
* Minor cleanup.


Modified: haiku/trunk/src/system/kernel/disk_device_manager/ddm_userland_interface.cpp
===================================================================
--- haiku/trunk/src/system/kernel/disk_device_manager/ddm_userland_interface.cpp	2009-04-02 10:15:14 UTC (rev 29867)
+++ haiku/trunk/src/system/kernel/disk_device_manager/ddm_userland_interface.cpp	2009-04-02 16:07:09 UTC (rev 29868)
@@ -12,10 +12,11 @@
  	\brief Interface for userspace calls.
 */
 
+#include <ddm_userland_interface.h>
+
 #include <stdlib.h>
 
 #include <AutoDeleter.h>
-#include <ddm_userland_interface.h>
 #include <fs/KPath.h>
 #include <KDiskDevice.h>
 #include <KDiskDeviceManager.h>
@@ -1282,7 +1283,7 @@
 	if (!partition->CheckAndMarkBusy(true))
 		return B_BUSY;
 
-// TODO: We should also check, if any partition is mounted!
+	// TODO: We should also check, if any partition is mounted!
 
 	// uninitialize
 	error = partition->UninitializeContents(true);
@@ -1306,7 +1307,6 @@
 	off_t offset, off_t size, const char* _type, const char* _name,
 	const char* _parameters, size_t parametersSize, partition_id* childID,
 	int32* childChangeCounter)
-
 {
 	// copy parameters in
 	UserStringParameter<false> type;
@@ -1437,12 +1437,7 @@
 		return error;
 
 	// return change counter
-	if ((error = copy_to_user_value(_changeCounter, partition->ChangeCounter()))
-			!= B_OK) {
-		return error;
-	}
-
-	return B_OK;
+	return copy_to_user_value(_changeCounter, partition->ChangeCounter());
 }
 
 



From axeld at mail.berlios.de  Thu Apr  2 18:08:14 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 2 Apr 2009 18:08:14 +0200
Subject: [Haiku-commits] r29869 - haiku/trunk/headers/private/shared
Message-ID: <200904021608.n32G8EJf000361@sheep.berlios.de>

Author: axeld
Date: 2009-04-02 18:08:13 +0200 (Thu, 02 Apr 2009)
New Revision: 29869
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29869&view=rev

Modified:
   haiku/trunk/headers/private/shared/OpenHashTable.h
Log:
* Fixed build when Debug.h had already been included.
* Automatic whitespace cleanup.


Modified: haiku/trunk/headers/private/shared/OpenHashTable.h
===================================================================
--- haiku/trunk/headers/private/shared/OpenHashTable.h	2009-04-02 16:07:09 UTC (rev 29868)
+++ haiku/trunk/headers/private/shared/OpenHashTable.h	2009-04-02 16:08:13 UTC (rev 29869)
@@ -49,9 +49,13 @@
 #include <new>
 
 // don't include <Debug.h>
-#define ASSERT(E)               (void)0
-#define TRESPASS()              (void)0
- 
+#ifndef ASSERT
+#	define ASSERT(E)               (void)0
+#endif
+#ifndef TRESPASS
+#	define TRESPASS()              (void)0
+#endif
+
 namespace BPrivate {
 
 template <class Element>
@@ -89,17 +93,17 @@
 		// 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
@@ -116,7 +120,7 @@
 private:
 	bool _RehashIfNeeded();
 	bool _Rehash();
-	
+
 	int32 fArraySize;
 	int32 fInitialSize;
 	int32 fElementCount;
@@ -189,7 +193,7 @@
 }
 
 template<class Element, class ElementVec>
-int32 
+int32
 OpenHashTable<Element, ElementVec>::OptimalSize(int32 minSize)
 {
 	for (int32 index = 0; ; index++)
@@ -207,12 +211,12 @@
 	hash %= fArraySize;
 	if (fHashArray[hash] < 0)
 		return 0;
-	
+
 	return &fElementVector->At(fHashArray[hash]);
 }
 
 template<class Element, class ElementVec>
-int32 
+int32
 OpenHashTable<Element, ElementVec>::ElementIndex(const Element *element) const
 {
 	return fElementVector->IndexOf(*element);
@@ -226,21 +230,21 @@
 }
 
 template<class Element, class ElementVec>
-int32 
+int32
 OpenHashTable<Element, ElementVec>::ArraySize() const
 {
 	 return fArraySize;
 }
 
 template<class Element, class ElementVec>
-int32 
+int32
 OpenHashTable<Element, ElementVec>::VectorSize() const
 {
 	 return fElementVector->Size();
 }
 
 template<class Element, class ElementVec>
-int32 
+int32
 OpenHashTable<Element, ElementVec>::CountElements() const
 {
 	 return fElementCount;
@@ -264,7 +268,7 @@
 }
 
 template<class Element, class ElementVec>
-void 
+void
 OpenHashTable<Element, ElementVec>::Remove(Element *element, bool dontRehash)
 {
 	if (!dontRehash)
@@ -287,7 +291,7 @@
 			TRESPASS();
 			return;
 		}
-		
+
 		if (&fElementVector->At(next) == element) {
 			fElementVector->At(index).fNext = element->fNext;
 			fElementVector->Remove(next);
@@ -299,7 +303,7 @@
 }
 
 template<class Element, class ElementVec>
-void 
+void
 OpenHashTable<Element, ElementVec>::RemoveAll()
 {
 	for (int32 i = 0; fElementCount > 0 && i < fArraySize; i++) {
@@ -317,7 +321,7 @@
 }
 
 template<class Element, class ElementVec>
-void 
+void
 OpenHashTable<Element, ElementVec>::SetElementVector(ElementVec *elementVector)
 {
 	fElementVector = elementVector;
@@ -419,18 +423,18 @@
 }
 
 template<class Element>
-int32 
+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 
+int32
 OpenHashElementArray<Element>::Size() const
 {
 	return fSize;
@@ -460,7 +464,7 @@
 	int32 index = fNextFree;
 	if (fNextDeleted >= 0) {
 		index = fNextDeleted;
-		fNextDeleted = At(index).fNext;		
+		fNextDeleted = At(index).fNext;
 	} else if (fNextFree >= fSize - 1) {
 		int32 newSize = fSize + kGrowChunk;
 /*
@@ -486,11 +490,11 @@
 		// call placement new to initialize the element properly
 	ASSERT(At(index).fNext == -1);
 
-	return &At(index);		
+	return &At(index);
 }
 
 template<class Element>
-void 
+void
 OpenHashElementArray<Element>::Remove(int32 index)
 {
 	// delete by chaining empty elements in a single linked



From axeld at mail.berlios.de  Thu Apr  2 18:54:12 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Thu, 2 Apr 2009 18:54:12 +0200
Subject: [Haiku-commits] r29870 -
	haiku/trunk/src/add-ons/kernel/network/stack
Message-ID: <200904021654.n32GsCEB024107@sheep.berlios.de>

Author: axeld
Date: 2009-04-02 18:54:11 +0200 (Thu, 02 Apr 2009)
New Revision: 29870
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29870&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/stack/net_buffer.cpp
Log:
* Minor cleanup.


Modified: haiku/trunk/src/add-ons/kernel/network/stack/net_buffer.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/net_buffer.cpp	2009-04-02 16:08:13 UTC (rev 29869)
+++ haiku/trunk/src/add-ons/kernel/network/stack/net_buffer.cpp	2009-04-02 16:54:11 UTC (rev 29870)
@@ -1074,7 +1074,7 @@
 		return NULL;
 
 	TRACE(("%ld:   duplicate: %p)\n", find_thread(NULL), duplicate));
-	
+
 	// copy the data from the source buffer
 
 	data_node *node = (data_node *)list_get_first_item(&buffer->buffers);
@@ -1310,9 +1310,10 @@
 		} else {
 			// we need a new place for this node
 			data_node *newNode = add_data_node(buffer, node->header);
-			if (newNode == NULL)
-// TODO: try to revert buffers to their initial state!!
+			if (newNode == NULL) {
+				// TODO: try to revert buffers to their initial state!!
 				return ENOBUFS;
+			}
 
 			last = node;
 			*newNode = *node;
@@ -1502,7 +1503,7 @@
 		if (_contiguousBuffer)
 			*_contiguousBuffer = node->start;
 
-		// adjust offset of following nodes	
+		// adjust offset of following nodes
 		while ((node = (data_node *)list_get_next_item(&buffer->buffers, node)) != NULL) {
 			node->offset += size;
 		}
@@ -1701,7 +1702,7 @@
 		node = (data_node *)list_get_next_item(&buffer->buffers, node);
 	}
 
-	// adjust offset of following nodes	
+	// adjust offset of following nodes
 	while (node != NULL) {
 		node->offset -= bytes;
 		node = (data_node *)list_get_next_item(&buffer->buffers, node);



From bonefish at mail.berlios.de  Thu Apr  2 19:46:10 2009
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 2 Apr 2009 19:46:10 +0200
Subject: [Haiku-commits] r29871 -
	haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse
Message-ID: <200904021746.n32HkA5n019228@sheep.berlios.de>

Author: bonefish
Date: 2009-04-02 19:46:09 +0200 (Thu, 02 Apr 2009)
New Revision: 29871
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29871&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp
Log:
* Initialize fuse_config before parsing the arguments.
* Implemented fuse_is_lib_option() more correctly.
* Actually use the value of the "use_ino" option.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp	2009-04-02 16:54:11 UTC (rev 29870)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp	2009-04-02 17:46:09 UTC (rev 29871)
@@ -243,6 +243,8 @@
 PRINT(("FUSEFileSystem::FinishInitClientFS()\n"));
 	fExitStatus = B_ERROR;
 
+	fFUSEConfig = *config;
+
 	// do the initialization
 	status_t error = _InitClientFS(ops, opSize, userData);
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h	2009-04-02 16:54:11 UTC (rev 29870)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h	2009-04-02 17:46:09 UTC (rev 29871)
@@ -8,11 +8,9 @@
 #include "../FileSystem.h"
 
 #include "fuse_api.h"
+#include "fuse_config.h"
 
 
-struct fuse_config;
-
-
 namespace UserlandFS {
 
 class FUSEFileSystem : public FileSystem {
@@ -35,6 +33,8 @@
 
 			fuse_fs*			GetFS() const	{ return fFS; }
 
+			const fuse_config&	GetFUSEConfig() const	{ return fFUSEConfig; }
+
 	virtual	status_t			CreateVolume(Volume** _volume, dev_t id);
 	virtual	status_t			DeleteVolume(Volume* volume);
 
@@ -68,6 +68,7 @@
 			const char*			fInitParameters;
 			fuse_fs*			fFS;
 			fuse_conn_info		fConnectionInfo;
+			fuse_config			fFUSEConfig;
 
 			FSVolumeCapabilities fVolumeCapabilities;
 			FSVNodeCapabilities	fNodeCapabilities;

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp	2009-04-02 16:54:11 UTC (rev 29870)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp	2009-04-02 17:46:09 UTC (rev 29871)
@@ -670,6 +670,9 @@
 	fFS = _FileSystem()->GetFS();
 	_FileSystem()->GetVolumeCapabilities(fCapabilities);
 
+	const fuse_config& config = _FileSystem()->GetFUSEConfig();
+	fUseNodeIDs = config.use_ino;
+
 	// get the root node
 	struct stat st;
 	int fuseError = fuse_fs_getattr(fFS, "/", &st);

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c	2009-04-02 16:54:11 UTC (rev 29870)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c	2009-04-02 17:46:09 UTC (rev 29871)
@@ -9,7 +9,7 @@
 #include "fuse_config.h"
 
 
-enum  {
+enum {
 	KEY_HELP,
 };
 
@@ -65,3 +65,11 @@
 {
 	return fuse_opt_parse(args, config, fuse_lib_opts, fuse_lib_opt_proc) == 0;
 }
+
+
+int
+fuse_is_lib_option(const char* opt)
+{
+	return /*fuse_lowlevel_is_lib_option(opt) ||*/
+		fuse_opt_match(fuse_lib_opts, opt);
+}

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp	2009-04-02 16:54:11 UTC (rev 29870)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp	2009-04-02 17:46:09 UTC (rev 29871)
@@ -3,8 +3,7 @@
  * Distributed under the terms of the MIT License.
  */
 
-#define FUSE_USE_VERSION FUSE_VERSION
-
+#include <signal.h>
 #include <stdio.h>
 
 #include "fuse_api.h"
@@ -21,7 +20,14 @@
 
 	// parse args
 	struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
+
 	fuse_config config;
+	memset(&config, 0, sizeof(config));
+	config.entry_timeout = 1.0;
+	config.attr_timeout = 1.0;
+	config.negative_timeout = 0.0;
+	config.intr_signal = SIGUSR1;
+
 	bool success = fuse_parse_config_args(&args, &config);
 	fuse_opt_free_args(&args);
 
@@ -38,15 +44,6 @@
 
 
 int
-fuse_is_lib_option(const char* opt)
-{
-printf("fuse_is_lib_option(\"%s\")\n", opt);
-	// TODO: Implement!
-	return 0;
-}
-
-
-int
 fuse_version(void)
 {
 	return FUSE_VERSION;



From bonefish at mail.berlios.de  Thu Apr  2 21:41:54 2009
From: bonefish at mail.berlios.de (bonefish at BerliOS)
Date: Thu, 2 Apr 2009 21:41:54 +0200
Subject: [Haiku-commits] r29872 - in haiku/trunk:
	headers/private/userlandfs/private
	src/add-ons/kernel/file_systems/userlandfs/kernel_add_on
	src/add-ons/kernel/file_systems/userlandfs/server
	src/add-ons/kernel/file_systems/userlandfs/server/fuse
Message-ID: <200904021941.n32Jfs5n001654@sheep.berlios.de>

Author: bonefish
Date: 2009-04-02 21:41:53 +0200 (Thu, 02 Apr 2009)
New Revision: 29872
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29872&view=rev

Modified:
   haiku/trunk/headers/private/userlandfs/private/Requests.h
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Volume.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.h
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.h
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp
Log:
* For every request to userland we also send the team/thread/user/group ID of
  the current thread, now. Implemented by introducing a new base class
  KernelRequest which has respective attributes.
* Server: RequestThreadContext does now also save the request that is being
  processed. Furthermore some space has been reserved for file system specific
  data, which can be initialized by the new
  FileSystem::InitRequestThreadContext().
* FUSE library: Implemented fuse_get_context() using the new
  RequestThreadContext feature.


Modified: haiku/trunk/headers/private/userlandfs/private/Requests.h
===================================================================
--- haiku/trunk/headers/private/userlandfs/private/Requests.h	2009-04-02 17:46:09 UTC (rev 29871)
+++ haiku/trunk/headers/private/userlandfs/private/Requests.h	2009-04-02 19:41:53 UTC (rev 29872)
@@ -256,10 +256,21 @@
 // #pragma mark - kernel requests
 
 
+// KernelRequest
+class KernelRequest : public Request {
+public:
+	KernelRequest(uint32 type) : Request(type) {}
+
+	team_id		team;
+	thread_id	thread;
+	uid_t		user;
+	gid_t		group;
+};
+
 // VolumeRequest
-class VolumeRequest : public Request {
+class VolumeRequest : public KernelRequest {
 public:
-	VolumeRequest(uint32 type) : Request(type) {}
+	VolumeRequest(uint32 type) : KernelRequest(type) {}
 
 	void*		volume;
 };
@@ -365,9 +376,9 @@
 
 
 // MountVolumeRequest
-class MountVolumeRequest : public Request {
+class MountVolumeRequest : public KernelRequest {
 public:
-	MountVolumeRequest() : Request(MOUNT_VOLUME_REQUEST) {}
+	MountVolumeRequest() : KernelRequest(MOUNT_VOLUME_REQUEST) {}
 	status_t GetAddressInfos(AddressInfo* infos, int32* count);
 
 	dev_t		nsid;
@@ -2235,6 +2246,7 @@
 }	// namespace UserlandFSUtil
 
 using UserlandFSUtil::ReplyRequest;
+using UserlandFSUtil::KernelRequest;
 using UserlandFSUtil::VolumeRequest;
 using UserlandFSUtil::NodeRequest;
 using UserlandFSUtil::FileRequest;

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Volume.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Volume.cpp	2009-04-02 17:46:09 UTC (rev 29871)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/Volume.cpp	2009-04-02 19:41:53 UTC (rev 29872)
@@ -18,6 +18,7 @@
 #include <util/OpenHashTable.h>
 
 #include <fs/fd.h>	// kernel private
+#include <thread.h>
 
 #include "IORequest.h"	// kernel internal
 
@@ -4327,6 +4328,15 @@
 Volume::_SendRequest(RequestPort* port, RequestAllocator* allocator,
 	RequestHandler* handler, Request** reply)
 {
+	// fill in the caller info
+	KernelRequest* request = static_cast<KernelRequest*>(
+		allocator->GetRequest());
+	struct thread* thread = thread_get_current_thread();
+	request->team = thread->team->id;
+	request->thread = thread->id;
+	request->user = geteuid();
+	request->group = getegid();
+
 	if (!fFileSystem->IsUserlandServerThread())
 		return port->SendRequest(allocator, handler, reply);
 	// Here it gets dangerous: a thread of the userland server team being here

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.cpp	2009-04-02 17:46:09 UTC (rev 29871)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.cpp	2009-04-02 19:41:53 UTC (rev 29872)
@@ -1,4 +1,7 @@
-// FileSystem.cpp
+/*
+ * Copyright 2001-2009, Ingo Weinhold, ingo_weinhold at gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
 
 #include "FileSystem.h"
 
@@ -33,6 +36,12 @@
 
 
 void
+FileSystem::InitRequestThreadContext(RequestThreadContext* context)
+{
+}
+
+
+void
 FileSystem::RegisterVolume(Volume* volume)
 {
 	AutoLocker<Locker> _(fLock);

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.h	2009-04-02 17:46:09 UTC (rev 29871)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.h	2009-04-02 19:41:53 UTC (rev 29872)
@@ -1,5 +1,7 @@
-// FileSystem.h
-
+/*
+ * Copyright 2001-2009, Ingo Weinhold, ingo_weinhold at gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef USERLAND_FS_FILE_SYSTEM_H
 #define USERLAND_FS_FILE_SYSTEM_H
 
@@ -15,8 +17,10 @@
 
 namespace UserlandFS {
 
+class RequestThreadContext;
 class Volume;
 
+
 class FileSystem {
 public:
 								FileSystem(const char* fsName);
@@ -29,6 +33,9 @@
 	virtual	status_t			CreateVolume(Volume** volume, dev_t id) = 0;
 	virtual	status_t			DeleteVolume(Volume* volume) = 0;
 
+	virtual	void				InitRequestThreadContext(
+									RequestThreadContext* context);
+
 			void				RegisterVolume(Volume* volume);
 			void				UnregisterVolume(Volume* volume);
 			Volume*				VolumeWithID(dev_t id);

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.cpp	2009-04-02 17:46:09 UTC (rev 29871)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.cpp	2009-04-02 19:41:53 UTC (rev 29872)
@@ -1,28 +1,39 @@
-// RequestThread.cpp
+/*
+ * Copyright 2001-2009, Ingo Weinhold, ingo_weinhold at gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
 
+#include "RequestThread.h"
+
 #include <new>
 
 #include <TLS.h>
 
-#include "RequestThread.h"
+#include "FileSystem.h"
 #include "ServerDefs.h"
 #include "UserlandRequestHandler.h"
+#include "Volume.h"
 
-using std::nothrow;
 
 static const int32 sTLSVariable = tls_allocate();
 
+
 // constructor
-RequestThreadContext::RequestThreadContext(Volume* volume)
-	: fPreviousContext(NULL),
-	  fThread(NULL),
-	  fVolume(volume)
+RequestThreadContext::RequestThreadContext(Volume* volume,
+	KernelRequest* request)
+	:
+	fPreviousContext(NULL),
+	fThread(NULL),
+	fVolume(volume),
+	fRequest(request)
 {
 	fThread = RequestThread::GetCurrentThread();
 	if (fThread) {
 		fPreviousContext = fThread->GetContext();
 		fThread->SetContext(this);
 	}
+
+	volume->GetFileSystem()->InitRequestThreadContext(this);
 }
 
 // destructor
@@ -74,7 +85,7 @@
 	if (!fileSystem)
 		return B_BAD_VALUE;
 	// create the port
-	fPort = new(nothrow) RequestPort(kRequestPortSize);
+	fPort = new(std::nothrow) RequestPort(kRequestPortSize);
 	if (!fPort)
 		return B_NO_MEMORY;
 	status_t error = fPort->InitCheck();

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.h	2009-04-02 17:46:09 UTC (rev 29871)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/RequestThread.h	2009-04-02 19:41:53 UTC (rev 29872)
@@ -1,5 +1,7 @@
-// RequestThread.h
-
+/*
+ * Copyright 2001-2009, Ingo Weinhold, ingo_weinhold at gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef USERLAND_FS_REQUEST_THREAD_H
 #define USERLAND_FS_REQUEST_THREAD_H
 
@@ -11,19 +13,26 @@
 class RequestThread;
 class Volume;
 
+#define REQUEST_THREAD_CONTEXT_FS_DATA_SIZE	256
+
 // RequestThreadContext
 class RequestThreadContext {
 public:
-								RequestThreadContext(Volume* volume);
+								RequestThreadContext(Volume* volume,
+									KernelRequest* request);
 								~RequestThreadContext();
 
 			RequestThread*		GetThread() const;
 			Volume*				GetVolume() const;
+			KernelRequest*		GetRequest() const	{ return fRequest; }
+			void*				GetFSData() 		{ return fFSData; }
 
 private:
 			RequestThreadContext*	fPreviousContext;
 			RequestThread*		fThread;
 			Volume*				fVolume;
+			KernelRequest*		fRequest;
+			uint8				fFSData[REQUEST_THREAD_CONTEXT_FS_DATA_SIZE];
 };
 
 // RequestThread

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp	2009-04-02 17:46:09 UTC (rev 29871)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp	2009-04-02 19:41:53 UTC (rev 29872)
@@ -51,6 +51,7 @@
 		fDone = true;
 		return B_OK;
 	}
+
 	switch (request->GetType()) {
 		// FS
 		case MOUNT_VOLUME_REQUEST:
@@ -253,7 +254,7 @@
 	// mount it
 	ino_t rootID;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Mount(device, request->flags,
 			(const char*)request->parameters.GetData(), &rootID);
 		if (result != B_OK)
@@ -288,7 +289,7 @@
 	if (!volume)
 		result = B_BAD_VALUE;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Unmount();
 	}
 
@@ -314,7 +315,7 @@
 	if (!volume)
 		result = B_BAD_VALUE;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Sync();
 	}
 	// prepare the reply
@@ -340,7 +341,7 @@
 		result = B_BAD_VALUE;
 	fs_info info;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->ReadFSInfo(&info);
 	}
 	// prepare the reply
@@ -366,7 +367,7 @@
 	if (!volume)
 		result = B_BAD_VALUE;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->WriteFSInfo(&request->info, request->mask);
 	}
 
@@ -398,7 +399,7 @@
 
 	ino_t vnid = 0;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Lookup(request->node,
 			(const char*)request->entryName.GetData(), &vnid);
 	}
@@ -444,7 +445,7 @@
 
 	// execute the request
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->GetVNodeName(node, buffer, bufferSize);
 	}
 
@@ -471,7 +472,7 @@
 	uint32 flags;
 	FSVNodeCapabilities capabilities;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->ReadVNode(request->vnid, request->reenter, &node,
 			&type, &flags, &capabilities);
 	}
@@ -504,7 +505,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->WriteVNode(request->node, request->reenter);
 	}
 
@@ -532,7 +533,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->RemoveVNode(request->node, request->reenter);
 	}
 
@@ -563,7 +564,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		IORequestInfo requestInfo(request->request, request->isWrite,
 			request->offset, request->length);
 		result = volume->DoIO(request->node, request->fileCookie, requestInfo);
@@ -593,7 +594,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->CancelIO(request->node, request->fileCookie,
 			request->request);
 	}
@@ -625,7 +626,7 @@
 	file_io_vec vecs[IterativeIOGetVecsReply::MAX_VECS];
 	size_t vecCount = IterativeIOGetVecsReply::MAX_VECS;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->IterativeIOGetVecs(request->cookie, request->request,
 			request->offset, request->size, vecs, &vecCount);
 		if (result == B_OK) {
@@ -664,7 +665,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->IterativeIOFinished(request->cookie, request->request,
 			request->status, request->partialTransfer,
 			request->bytesTransferred);
@@ -729,7 +730,7 @@
 	// execute the request
 	status_t ioctlError = B_OK;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		ioctlError = volume->IOCtl(request->node, request->fileCookie,
 			request->command, buffer, len);
 	}
@@ -754,7 +755,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->SetFlags(request->node, request->fileCookie,
 			request->flags);
 	}
@@ -783,7 +784,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Select(request->node, request->fileCookie,
 			request->event, request->sync);
 	}
@@ -812,7 +813,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Deselect(request->node, request->fileCookie,
 			request->event, request->sync);
 	}
@@ -841,7 +842,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->FSync(request->node);
 	}
 
@@ -886,7 +887,7 @@
 	// execute the request
 	size_t bytesRead;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->ReadSymlink(node, buffer, bufferSize, &bytesRead);
 	}
 
@@ -910,7 +911,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->CreateSymlink(request->node,
 			(const char*)request->name.GetData(),
 			(const char*)request->target.GetData(), request->mode);
@@ -940,7 +941,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Link(request->node,
 			(const char*)request->name.GetData(), request->target);
 	}
@@ -969,7 +970,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Unlink(request->node,
 			(const char*)request->name.GetData());
 	}
@@ -998,7 +999,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Rename(request->oldDir,
 			(const char*)request->oldName.GetData(), request->newDir,
 			(const char*)request->newName.GetData());
@@ -1028,7 +1029,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Access(request->node, request->mode);
 	}
 
@@ -1057,7 +1058,7 @@
 
 	struct stat st;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->ReadStat(request->node, &st);
 	}
 
@@ -1086,7 +1087,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->WriteStat(request->node, &request->st, request->mask);
 	}
 
@@ -1120,7 +1121,7 @@
 	ino_t vnid;
 	void* fileCookie;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Create(request->node,
 			(const char*)request->name.GetData(), request->openMode,
 			request->mode, &fileCookie, &vnid);
@@ -1153,7 +1154,7 @@
 
 	void* fileCookie;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Open(request->node, request->openMode, &fileCookie);
 	}
 
@@ -1182,7 +1183,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Close(request->node, request->fileCookie);
 	}
 
@@ -1210,7 +1211,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->FreeCookie(request->node, request->fileCookie);
 	}
 
@@ -1258,7 +1259,7 @@
 	// execute the request
 	size_t bytesRead;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Read(node, fileCookie, pos, buffer, size, &bytesRead);
 	}
 
@@ -1283,7 +1284,7 @@
 
 	size_t bytesWritten;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->Write(request->node, request->fileCookie,
 			request->pos, request->buffer.GetData(), request->buffer.GetSize(),
 			&bytesWritten);
@@ -1318,7 +1319,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->CreateDir(request->node,
 			(const char*)request->name.GetData(), request->mode);
 	}
@@ -1347,7 +1348,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->RemoveDir(request->node,
 			(const char*)request->name.GetData());
 	}
@@ -1377,7 +1378,7 @@
 
 	void* dirCookie = NULL;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->OpenDir(request->node, &dirCookie);
 	}
 
@@ -1406,7 +1407,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->CloseDir(request->node, request->dirCookie);
 	}
 
@@ -1434,7 +1435,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->FreeDirCookie(request->node, request->dirCookie);
 	}
 
@@ -1482,7 +1483,7 @@
 	// execute the request
 	uint32 countRead;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->ReadDir(node, dirCookie, buffer, bufferSize, count,
 			&countRead);
 	}
@@ -1517,7 +1518,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->RewindDir(request->node, request->dirCookie);
 	}
 
@@ -1550,7 +1551,7 @@
 
 	void* attrDirCookie;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->OpenAttrDir(request->node, &attrDirCookie);
 	}
 
@@ -1579,7 +1580,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->CloseAttrDir(request->node, request->attrDirCookie);
 	}
 
@@ -1607,7 +1608,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->FreeAttrDirCookie(request->node,
 			request->attrDirCookie);
 	}
@@ -1656,7 +1657,7 @@
 	// execute the request
 	uint32 countRead;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->ReadAttrDir(node, attrDirCookie, buffer, bufferSize,
 			count, &countRead);
 	}
@@ -1681,7 +1682,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->RewindAttrDir(request->node, request->attrDirCookie);
 	}
 
@@ -1714,7 +1715,7 @@
 
 	void* attrCookie;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->CreateAttr(request->node,
 			(const char*)request->name.GetData(), request->type,
 			request->openMode, &attrCookie);
@@ -1746,7 +1747,7 @@
 
 	void* attrCookie;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->OpenAttr(request->node,
 			(const char*)request->name.GetData(), request->openMode,
 			&attrCookie);
@@ -1777,7 +1778,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->CloseAttr(request->node, request->attrCookie);
 	}
 
@@ -1805,7 +1806,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->FreeAttrCookie(request->node, request->attrCookie);
 	}
 
@@ -1853,7 +1854,7 @@
 	// execute the request
 	size_t bytesRead;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->ReadAttr(node, attrCookie, pos, buffer, size,
 			&bytesRead);
 	}
@@ -1879,7 +1880,7 @@
 
 	size_t bytesWritten;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->WriteAttr(request->node, request->attrCookie,
 			request->pos, request->buffer.GetData(), request->buffer.GetSize(),
 			&bytesWritten);
@@ -1911,7 +1912,7 @@
 
 	struct stat st;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->ReadAttrStat(request->node, request->attrCookie,
 			&st);
 	}
@@ -1941,7 +1942,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->WriteAttrStat(request->node, request->attrCookie,
 			&request->st, request->mask);
 	}
@@ -1970,7 +1971,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->RenameAttr(
 			request->oldNode, (const char*)request->oldName.GetData(),
 			request->newNode, (const char*)request->newName.GetData());
@@ -2000,7 +2001,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->RemoveAttr(request->node,
 			(const char*)request->name.GetData());
 	}
@@ -2034,7 +2035,7 @@
 
 	void* indexDirCookie;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->OpenIndexDir(&indexDirCookie);
 	}
 
@@ -2063,7 +2064,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->CloseIndexDir(request->indexDirCookie);
 	}
 
@@ -2091,7 +2092,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->FreeIndexDirCookie(request->indexDirCookie);
 	}
 
@@ -2138,7 +2139,7 @@
 	// execute the request
 	uint32 countRead;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->ReadIndexDir(indexDirCookie, buffer, bufferSize,
 			count, &countRead);
 	}
@@ -2163,7 +2164,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->RewindIndexDir(request->indexDirCookie);
 	}
 
@@ -2191,7 +2192,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->CreateIndex((const char*)request->name.GetData(),
 			request->type, request->flags);
 	}
@@ -2220,7 +2221,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->RemoveIndex((const char*)request->name.GetData());
 	}
 
@@ -2249,7 +2250,7 @@
 
 	struct stat st;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->ReadIndexStat((const char*)request->name.GetData(),
 			&st);
 	}
@@ -2284,7 +2285,7 @@
 
 	void* queryCookie;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->OpenQuery((const char*)request->queryString.GetData(),
 			request->flags, request->port, request->token, &queryCookie);
 	}
@@ -2314,7 +2315,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->CloseQuery(request->queryCookie);
 	}
 
@@ -2342,7 +2343,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->FreeQueryCookie(request->queryCookie);
 	}
 
@@ -2389,7 +2390,7 @@
 	// execute the request
 	uint32 countRead;
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->ReadQuery(queryCookie, buffer, bufferSize,
 			count, &countRead);
 	}
@@ -2414,7 +2415,7 @@
 		result = B_BAD_VALUE;
 
 	if (result == B_OK) {
-		RequestThreadContext context(volume);
+		RequestThreadContext context(volume, request);
 		result = volume->RewindQuery(request->queryCookie);
 	}
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp	2009-04-02 17:46:09 UTC (rev 29871)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp	2009-04-02 19:41:53 UTC (rev 29872)
@@ -13,7 +13,9 @@
 #include "fuse_fs.h"
 #include "FUSEVolume.h"
 
+#include "../RequestThread.h"
 
+
 class FUSEFileSystem::ArgumentVector {
 private:
 	enum { MAX_ARGUMENTS = 128 };
@@ -180,6 +182,30 @@
 }
 
 
+void
+FUSEFileSystem::InitRequestThreadContext(RequestThreadContext* context)
+{
+	// Statically assert that fuse_context fits in the RequestThreadContext
+	// FS data. We can't include <Debug.h> as it clashes with our "Debug.h".
+	do {
+		static const int staticAssertHolds
+			= sizeof(fuse_context) <= REQUEST_THREAD_CONTEXT_FS_DATA_SIZE;
+		struct __staticAssertStruct__ {
+			char __static_assert_failed__[2 * staticAssertHolds - 1];
+		};
+	} while (false);
+
+	// init a fuse_context
+	KernelRequest* request = context->GetRequest();
+	fuse_context* fuseContext = (fuse_context*)context->GetFSData();
+	fuseContext->fuse = (struct fuse*)this;
+	fuseContext->uid = request->user;
+	fuseContext->gid = request->group;
+	fuseContext->pid = request->team;
+	fuseContext->private_data = fFS != NULL ? fFS->userData : NULL;
+}
+
+
 status_t
 FUSEFileSystem::InitClientFS(const char* parameters)
 {

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h	2009-04-02 17:46:09 UTC (rev 29871)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h	2009-04-02 19:41:53 UTC (rev 29872)
@@ -38,6 +38,9 @@
 	virtual	status_t			CreateVolume(Volume** _volume, dev_t id);
 	virtual	status_t			DeleteVolume(Volume* volume);
 
+	virtual	void				InitRequestThreadContext(
+									RequestThreadContext* context);
+
 			status_t			InitClientFS(const char* parameters);
 			void				ExitClientFS(status_t status);
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp	2009-04-02 17:46:09 UTC (rev 29871)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp	2009-04-02 19:41:53 UTC (rev 29872)
@@ -17,6 +17,7 @@
 #include "FUSEFileSystem.h"
 
 #include "../kernel_emu.h"
+#include "../RequestThread.h"
 
 
 // TODO: For remote/shared file systems (sshfs, nfs, etc.) we need to notice
@@ -673,6 +674,11 @@
 	const fuse_config& config = _FileSystem()->GetFUSEConfig();
 	fUseNodeIDs = config.use_ino;
 
+	// update the fuse_context::private_data field before calling into the FS
+	fuse_context* context = (fuse_context*)RequestThread::GetCurrentThread()
+		->GetContext()->GetFSData();
+	context->private_data = fFS->userData;
+
 	// get the root node
 	struct stat st;
 	int fuseError = fuse_fs_getattr(fFS, "/", &st);

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp	2009-04-02 17:46:09 UTC (rev 29871)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp	2009-04-02 19:41:53 UTC (rev 29872)
@@ -10,7 +10,9 @@
 #include "fuse_config.h"
 #include "FUSEFileSystem.h"
 
+#include "../RequestThread.h"
 
+
 int
 fuse_main_real(int argc, char* argv[], const struct fuse_operations* op,
 	size_t opSize, void* userData)
@@ -48,3 +50,13 @@
 {
 	return FUSE_VERSION;
 }
+
+
+struct fuse_context*
+fuse_get_context(void)
+{
+	RequestThread* requestThread = RequestThread::GetCurrentThread();
+	return requestThread != NULL
+		? (fuse_context*)requestThread->GetContext()->GetFSData()
+		: NULL;
+}



From mmlr at mail.berlios.de  Fri Apr  3 03:31:16 2009
From: mmlr at mail.berlios.de (mmlr at BerliOS)
Date: Fri, 3 Apr 2009 03:31:16 +0200
Subject: [Haiku-commits] r29873 - haiku/trunk/docs/userguide/en/installation
Message-ID: <200904030131.n331VGof013447@sheep.berlios.de>

Author: mmlr
Date: 2009-04-03 03:31:15 +0200 (Fri, 03 Apr 2009)
New Revision: 29873
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29873&view=rev

Modified:
   haiku/trunk/docs/userguide/en/installation/install-source-beos.html
Log:
Update the cross-compiler link to the current version.

Modified: haiku/trunk/docs/userguide/en/installation/install-source-beos.html
===================================================================
--- haiku/trunk/docs/userguide/en/installation/install-source-beos.html	2009-04-02 19:41:53 UTC (rev 29872)
+++ haiku/trunk/docs/userguide/en/installation/install-source-beos.html	2009-04-03 01:31:15 UTC (rev 29873)
@@ -49,7 +49,7 @@
 
 
 <h1>Installing the cross-compiler</h1>
-<p>Download the <a href="http://haiku.mlotz.ch/haiku_cross_compiler_bone_2.95.3-haiku-080323.zip">Haiku cross-compiler</a> and extract it to <span class="path">/boot</span> (for example by setting the <i>Destination</i> in Expander to just <span class="path">/boot</span>). Then you need to configure your tree to use this cross compiler. Go to the root folder of your checked out Haiku repository and invoke the configure script with the <span class="cli">--cross-tools-prefix</span> option like this:</p>
+<p>Download the <a href="http://haiku.mlotz.ch/haiku_cross_compiler_bone_2.95.3-haiku-081024.zip">Haiku cross-compiler</a> and extract it to <span class="path">/boot</span> (for example by setting the <i>Destination</i> in Expander to just <span class="path">/boot</span>). Then you need to configure your tree to use this cross compiler. Go to the root folder of your checked out Haiku repository and invoke the configure script with the <span class="cli">--cross-tools-prefix</span> option like this:</p>
 
 <pre class="terminal">configure --cross-tools-prefix /boot/apps/haiku/cross-tools/bin/i586-pc-haiku-</pre>
 



From umccullough at gmail.com  Fri Apr  3 03:33:49 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Thu, 2 Apr 2009 18:33:49 -0700
Subject: [Haiku-commits] r29873 -
	haiku/trunk/docs/userguide/en/installation
In-Reply-To: <1e80d8750904021832h4e3c7358gb7591131a4cb46ca@mail.gmail.com>
References: <200904030131.n331VGof013447@sheep.berlios.de>
	<1e80d8750904021832h4e3c7358gb7591131a4cb46ca@mail.gmail.com>
Message-ID: <1e80d8750904021833x6e08d0dah8e2dee8ea2c9bfc2@mail.gmail.com>

On Thu, Apr 2, 2009 at 6:32 PM, Urias McCullough <umccullough at gmail.com> wrote:
>> Log:
>> Update the cross-compiler link to the current version.
>
> Great, I'll update the website instructions.

Oh...done already? :)


From umccullough at gmail.com  Fri Apr  3 03:32:09 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Thu, 2 Apr 2009 18:32:09 -0700
Subject: [Haiku-commits] r29873 -
	haiku/trunk/docs/userguide/en/installation
In-Reply-To: <200904030131.n331VGof013447@sheep.berlios.de>
References: <200904030131.n331VGof013447@sheep.berlios.de>
Message-ID: <1e80d8750904021832h4e3c7358gb7591131a4cb46ca@mail.gmail.com>

On Thu, Apr 2, 2009 at 6:31 PM, mmlr at BerliOS <mmlr at mail.berlios.de> wrote:
> Author: mmlr
> Date: 2009-04-03 03:31:15 +0200 (Fri, 03 Apr 2009)
> New Revision: 29873
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29873&view=rev
>
> Modified:
> ? haiku/trunk/docs/userguide/en/installation/install-source-beos.html
> Log:
> Update the cross-compiler link to the current version.

Great, I'll update the website instructions.


From axeld at mail.berlios.de  Fri Apr  3 09:45:15 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 3 Apr 2009 09:45:15 +0200
Subject: [Haiku-commits] r29874 - haiku/trunk/src/kits/network
Message-ID: <200904030745.n337jFRS015369@sheep.berlios.de>

Author: axeld
Date: 2009-04-03 09:45:14 +0200 (Fri, 03 Apr 2009)
New Revision: 29874
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29874&view=rev

Removed:
   haiku/trunk/src/kits/network/old/
Log:
* Removed old network stuff.




From axeld at mail.berlios.de  Fri Apr  3 10:05:27 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 3 Apr 2009 10:05:27 +0200
Subject: [Haiku-commits] r29875 - haiku/trunk/src/system/kernel
Message-ID: <200904030805.n3385RTY029661@sheep.berlios.de>

Author: axeld
Date: 2009-04-03 10:05:25 +0200 (Fri, 03 Apr 2009)
New Revision: 29875
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29875&view=rev

Modified:
   haiku/trunk/src/system/kernel/real_time_clock.c
Log:
* Minor cleanup.


Modified: haiku/trunk/src/system/kernel/real_time_clock.c
===================================================================
--- haiku/trunk/src/system/kernel/real_time_clock.c	2009-04-03 07:45:14 UTC (rev 29874)
+++ haiku/trunk/src/system/kernel/real_time_clock.c	2009-04-03 08:05:25 UTC (rev 29875)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2004-2009, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Copyright 2003, Jeff Ward, jeff at r2d2.stcloudstate.edu. All rights reserved.
  *
  * Distributed under the terms of the MIT License.
@@ -196,7 +196,7 @@
 
 	seconds = seconds % RTC_SECONDS_DAY;
 	t->tm_hour = seconds / 3600;
- 
+
 	seconds = seconds % 3600;
 	t->tm_min = seconds / 60;
 	t->tm_sec = seconds % 60;
@@ -268,7 +268,7 @@
 
 	TRACE(("new system_time_offset %Ld\n",
 		arch_rtc_get_system_time_offset(sRealTimeData)));
-	
+
 	return B_OK;
 }
 
@@ -305,10 +305,12 @@
 
 	sIsGMT = isGMT;
 
-	if (wasGMT != sIsGMT)
-                arch_rtc_set_system_time_offset(sRealTimeData,
-                        arch_rtc_get_system_time_offset(sRealTimeData) + (((sIsGMT) ? 1 : -1) * sTimezoneOffset));
- 
+	if (wasGMT != sIsGMT) {
+		arch_rtc_set_system_time_offset(sRealTimeData,
+			arch_rtc_get_system_time_offset(sRealTimeData) + (((sIsGMT) ? 1 : -1)
+				* sTimezoneOffset));
+	}
+
 	return B_OK;
 }
 



From axeld at mail.berlios.de  Fri Apr  3 11:02:48 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 3 Apr 2009 11:02:48 +0200
Subject: [Haiku-commits] r29876 - in haiku/trunk: build/jam build/scripts
	data/system/boot headers/os/storage src/apps/aboutsystem
	src/apps/processcontroller src/bin/bash src/bin/gdb/gdb
	src/bin/grep/src src/bin/make src/bin/vim/src
	src/kits/tracker src/preferences/joysticks
	src/preferences/keymap src/preferences/time src/servers/debug
	src/servers/registrar src/system/boot src/system/boot/loader
	src/system/boot/platform/atari_m68k
	src/system/boot/platform/bios_ia32
	src/system/boot/platform/generic src/system/kernel/fs
	src/system/libroot/os src/system/runtime_loader
Message-ID: <200904030902.n3392mKv021542@sheep.berlios.de>

Author: axeld
Date: 2009-04-03 11:02:44 +0200 (Fri, 03 Apr 2009)
New Revision: 29876
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29876&view=rev

Modified:
   haiku/trunk/build/jam/BuildSetup
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/build/jam/ImageRules
   haiku/trunk/build/jam/OptionalPackages
   haiku/trunk/build/jam/UserBuildConfig.ReadMe
   haiku/trunk/build/jam/UserBuildConfig.sample
   haiku/trunk/build/scripts/build_haiku_cd
   haiku/trunk/build/scripts/build_haiku_image
   haiku/trunk/data/system/boot/Bootscript
   haiku/trunk/data/system/boot/Bootscript.cd
   haiku/trunk/data/system/boot/SetupEnvironment
   haiku/trunk/headers/os/storage/FindDirectory.h
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
   haiku/trunk/src/apps/processcontroller/PCWorld.cpp
   haiku/trunk/src/apps/processcontroller/ProcessController.cpp
   haiku/trunk/src/bin/bash/config-top.h
   haiku/trunk/src/bin/gdb/gdb/Jamfile
   haiku/trunk/src/bin/grep/src/Jamfile
   haiku/trunk/src/bin/make/config.h
   haiku/trunk/src/bin/vim/src/gui_beos.cc
   haiku/trunk/src/kits/tracker/FSUtils.cpp
   haiku/trunk/src/kits/tracker/FSUtils.h
   haiku/trunk/src/preferences/joysticks/JoyWin.cpp
   haiku/trunk/src/preferences/keymap/KeymapWindow.cpp
   haiku/trunk/src/preferences/time/ZoneView.cpp
   haiku/trunk/src/preferences/time/ZoneView.h
   haiku/trunk/src/servers/debug/DebugServer.cpp
   haiku/trunk/src/servers/registrar/TRoster.cpp
   haiku/trunk/src/system/boot/Jamfile
   haiku/trunk/src/system/boot/loader/loader.cpp
   haiku/trunk/src/system/boot/platform/atari_m68k/shell.S
   haiku/trunk/src/system/boot/platform/atari_m68k/stage1.S
   haiku/trunk/src/system/boot/platform/bios_ia32/stage1.S
   haiku/trunk/src/system/boot/platform/bios_ia32/stage1.bin
   haiku/trunk/src/system/boot/platform/generic/text_menu.cpp
   haiku/trunk/src/system/kernel/fs/vfs_boot.cpp
   haiku/trunk/src/system/libroot/os/find_directory.c
   haiku/trunk/src/system/runtime_loader/runtime_loader.c
Log:
* Changed directory structure as suggested on the mailing list.
* Made the TimeZoneView less error prone, and also actually use Haiku code (the
  previous check didn't work since it used #if, not #ifdef).
* Also took the liberty to rename our boot loader to haiku_loader, since I had
  to update the nasm binary anyway. Updated the assembly sources to nasm 2.0.
* I haven't found where the synth location in the MIDI code is specified,
  though.
* Also, NetBootArchive, and FloppyBootImage haven't been updated yet. Will do
  so next.
* Some optional packages still put their license to beos/etc/licenses. I didn't
  update them yet, as we'll probably do so anyway at some point. Also, I think
  we might want to introduce a common/data/licenses instead for those.
* If you encounter any problems, please tell!


Modified: haiku/trunk/build/jam/BuildSetup
===================================================================
--- haiku/trunk/build/jam/BuildSetup	2009-04-03 08:05:25 UTC (rev 29875)
+++ haiku/trunk/build/jam/BuildSetup	2009-04-03 09:02:44 UTC (rev 29876)
@@ -171,21 +171,21 @@
 	{
 		HAIKU_DEFINES += __POWERPC__ ;
 		HAIKU_BOOT_PLATFORM = openfirmware ;
-		# offset in floppy image (>= sizeof(zbeos))
+		# offset in floppy image (>= sizeof(haiku_loader))
 		HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
 	}
 	case x86 :
 	{
 		HAIKU_DEFINES += __INTEL__ ;
 		HAIKU_BOOT_PLATFORM = bios_ia32 ;
-		# offset in floppy image (>= sizeof(zbeos))
+		# offset in floppy image (>= sizeof(haiku_loader))
 		HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
 	}
 	case m68k :
 	{
 		HAIKU_DEFINES += __M68K__ ;
 		HAIKU_BOOT_PLATFORM = atari_m68k ;
-		# offset in floppy image (>= sizeof(zbeos))
+		# offset in floppy image (>= sizeof(haiku_loader))
 		HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 130 ; # in kB
 	}
 	case * :

Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-03 08:05:25 UTC (rev 29875)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-03 09:02:44 UTC (rev 29876)
@@ -18,7 +18,7 @@
 	GPL_ONLY = "" ;
 }
 
-BEOS_BIN = "[" addattr alert arp base64 basename bc beep bootman bzip2
+SYSTEM_BIN = "[" addattr alert arp base64 basename bc beep bootman bzip2
 	cal cat catattr checkfs chgrp chmod chop chown chroot cksum clear
 	clockconfig cmp comm compress copyattr $(X86_ONLY)CortexAddOnHost cp
 	csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname
@@ -48,50 +48,51 @@
 	zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
 ;
 
-BEOS_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc DiskProbe
+SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc DiskProbe
 	DiskUsage DriveSetup CDPlayer Expander Icon-O-Matic Installer LaunchBox
 	Magnify Mail MediaPlayer MidiPlayer NetworkStatus PackageInstaller People
 	PowerStatus ProcessController Screenshot ShowImage SoundRecorder StyledEdit
 	Terminal TextSearch TV Workspaces
 ;
-BEOS_PREFERENCES = Appearance Backgrounds DataTranslations E-mail
+SYSTEM_PREFERENCES = Appearance Backgrounds DataTranslations E-mail
 	FileTypes Fonts Keyboard Keymap Media Menu Mouse Network Printers Screen
 	ScreenSaver Sounds Time Touchpad <preference>Tracker VirtualMemory
 ;
-BEOS_DEMOS = BSnow Chart Clock $(X86_ONLY)Cortex FontDemo
+SYSTEM_DEMOS = BSnow Chart Clock $(X86_ONLY)Cortex FontDemo
 	$(X86_ONLY)GLDirectMode $(X86_ONLY)GLTeapot Mandelbrot Pairs
 	Playground Pulse Sudoku Gradients
 ;
-BEOS_SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
+SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
 	libtranslation.so libbnetapi.so libnetwork.so libdebug.so libbsd.so
 	libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so
 	libmidi2.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so
 	$(X86_ONLY)libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so
 	libilmimf.so libiconv.so
 ;
-BEOS_SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server
+SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server
 	net_server media_addon_server input_server app_server fake_app_server
 	midi_server print_server mail_daemon
 ;
 
-BEOS_NETWORK_DEVICES = ethernet loopback ;
-BEOS_NETWORK_DATALINK_PROTOCOLS = ethernet_frame <module>arp loopback_frame
+SYSTEM_NETWORK_DEVICES = ethernet loopback ;
+SYSTEM_NETWORK_DATALINK_PROTOCOLS = ethernet_frame <module>arp loopback_frame
 	ipv4_datagram ;
-#BEOS_NETWORK_PPP = ipcp modem pap pppoe ;
-BEOS_NETWORK_PROTOCOLS = ipv4 tcp udp icmp unix ;
+#SYSTEM_NETWORK_PPP = ipcp modem pap pppoe ;
+SYSTEM_NETWORK_PROTOCOLS = ipv4 tcp udp icmp unix ;
 
-BEOS_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant $(X86_ONLY)nvidia.accelerant
-	$(X86_ONLY)matrox.accelerant $(X86_ONLY)neomagic.accelerant
-	$(X86_ONLY)intel_extreme.accelerant $(X86_ONLY)s3.accelerant $(X86_ONLY)vesa.accelerant
+SYSTEM_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant
+	$(X86_ONLY)nvidia.accelerant $(X86_ONLY)matrox.accelerant
+	$(X86_ONLY)neomagic.accelerant $(X86_ONLY)intel_extreme.accelerant
+	$(X86_ONLY)s3.accelerant $(X86_ONLY)vesa.accelerant
 	#$(X86_ONLY)via.accelerant
 	#$(X86_ONLY)vmware.accelerant
 ;
-BEOS_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator JPEGTranslator
-	JPEG2000Translator PCXTranslator PNGTranslator PPMTranslator RAWTranslator
-	RTF-Translator SGITranslator STXTTranslator TGATranslator
+SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator
+	JPEGTranslator JPEG2000Translator PCXTranslator PNGTranslator PPMTranslator
+	RAWTranslator RTF-Translator SGITranslator STXTTranslator TGATranslator
 	TIFFTranslator WonderBrushTranslator
 ;
-BEOS_ADD_ONS_MEDIA = cortex_audioadapter.media_addon cortex_flanger.media_addon
+SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon cortex_flanger.media_addon
 	dvb.media_addon
 	hmulti_audio.media_addon
 	mixer.media_addon
@@ -103,7 +104,7 @@
 	firewire_dv.media_addon
 	#legacy.media_addon
 ;
-BEOS_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder
+SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder
 	aiff_reader au_reader $(X86_ONLY)avcodec avi_reader
 	matroska mov_reader
 	mp3_decoder mp3_reader
@@ -112,21 +113,21 @@
 	# theora
 	vorbis wav_reader
 ;
-BEOS_ADD_ONS_PRINT = Canon\ LIPS3\ Compatible Canon\ LIPS4\ Compatible
+SYSTEM_ADD_ONS_PRINT = Canon\ LIPS3\ Compatible Canon\ LIPS4\ Compatible
 	PCL5\ Compatible PCL6\ Compatible PDF\ Writer PS\ Compatible Preview
 ;
-BEOS_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port
+SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port
 	Print\ To\ File Serial\ Port USB\ Port
 ;
-BEOS_ADD_ONS_SCREENSAVERS = DebugNow Flurry Haiku IFS Spider Message ;
-BEOS_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ;
-BEOS_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ;
-BEOS_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
+SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow Flurry Haiku IFS Spider Message ;
+SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ;
+SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ;
+SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
 	$(X86_ONLY)neomagic $(X86_ONLY)matrox $(X86_ONLY)intel_extreme
 	$(X86_ONLY)s3 $(X86_ONLY)vesa #$(X86_ONLY)via #$(X86_ONLY)vmware
 ;
-BEOS_ADD_ONS_DRIVERS_MIDI = emuxki ;
-BEOS_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)broadcom440x
+SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki ;
+SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)broadcom440x
 	$(X86_ONLY)broadcom570x etherpci $(X86_ONLY)ipro1000
 	pegasus $(X86_ONLY)rtl8139 rtl8169 $(X86_ONLY)rtl81xx sis900
 	$(X86_ONLY)via_rhine wb840 $(X86_ONLY)ipro100 $(X86_ONLY)nforce
@@ -134,44 +135,44 @@
 	$(X86_ONLY)marvell_yukon $(X86_ONLY)syskonnect
 	$(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx usb_ecm
 ;
-#BEOS_ADD_ONS_DRIVERS_ACPI = $(X86_ONLY)acpi_button ;
-BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)ps2 $(X86_ONLY)isa ide scsi
+#SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
+SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)ps2 $(X86_ONLY)isa ide scsi
 	config_manager agp_gart usb firewire $(X86_ONLY)acpi
 ;
-BEOS_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
+SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
 	write_overlay $(GPL_ONLY)reiserfs ;
 #googlefs $(GPL_ONLY)ntfs ;
 
 
 # modules
-AddFilesToHaikuImage beos system add-ons kernel bus_managers
-	: $(BEOS_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToHaikuImage beos system add-ons kernel busses agp_gart
+AddFilesToHaikuImage system add-ons kernel bus_managers
+	: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
+AddFilesToHaikuImage system add-ons kernel busses agp_gart
 	: $(X86_ONLY)<agp_gart>intel ;
-AddFilesToHaikuImage beos system add-ons kernel busses ide
+AddFilesToHaikuImage system add-ons kernel busses ide
 	: generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa ;
-AddFilesToHaikuImage beos system add-ons kernel busses scsi
+AddFilesToHaikuImage system add-ons kernel busses scsi
 	: ahci ;
-AddFilesToHaikuImage beos system add-ons kernel busses usb
+AddFilesToHaikuImage system add-ons kernel busses usb
 	: <usb>uhci <usb>ohci <usb>ehci ;
-AddFilesToHaikuImage beos system add-ons kernel console : vga_text ;
-AddFilesToHaikuImage beos system add-ons kernel debugger
+AddFilesToHaikuImage system add-ons kernel console : vga_text ;
+AddFilesToHaikuImage system add-ons kernel debugger
 	: $(X86_ONLY)<kdebug>disasm <kdebug>hangman <kdebug>invalidate_on_exit
 	<kdebug>usb_keyboard ;
-AddFilesToHaikuImage beos system add-ons kernel file_systems
-	: $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToHaikuImage beos system add-ons kernel generic
+AddFilesToHaikuImage system add-ons kernel file_systems
+	: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
+AddFilesToHaikuImage system add-ons kernel generic
 	: dpc ide_adapter locked_pool mpu401 scsi_periph ;
-AddFilesToHaikuImage beos system add-ons kernel partitioning_systems
+AddFilesToHaikuImage system add-ons kernel partitioning_systems
 	: intel session ;
-AddFilesToHaikuImage beos system add-ons kernel interrupt_controllers
+AddFilesToHaikuImage system add-ons kernel interrupt_controllers
 	: $(PPC_ONLY)openpic ;
 
 if $(TARGET_ARCH) = x86 {
-	AddFilesToHaikuImage beos system add-ons kernel cpu : generic_x86 ;
+	AddFilesToHaikuImage system add-ons kernel cpu : generic_x86 ;
 
 	if $(HAIKU_GCC_VERSION[1]) = 2 {
-		AddFilesToHaikuImage beos system add-ons kernel debugger demangle :
+		AddFilesToHaikuImage system add-ons kernel debugger demangle :
 			<kdebug>gcc2 ;
 	}
 }
@@ -182,62 +183,62 @@
 # legacy drivers
 AddDriversToHaikuImage				: console dprintf $(X86_ONLY)keyboard null
 									  random <driver>tty zero ;
-AddDriversToHaikuImage audio hmulti	: $(BEOS_ADD_ONS_DRIVERS_AUDIO) ;
-AddDriversToHaikuImage audio old	: $(BEOS_ADD_ONS_DRIVERS_AUDIO_OLD) ;
-AddDriversToHaikuImage midi			: $(BEOS_ADD_ONS_DRIVERS_MIDI) ;
+AddDriversToHaikuImage audio hmulti	: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ;
+AddDriversToHaikuImage audio old	: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ;
+AddDriversToHaikuImage midi			: $(SYSTEM_ADD_ONS_DRIVERS_MIDI) ;
 AddDriversToHaikuImage bus			: usb_raw fw_raw ;
 AddDriversToHaikuImage disk floppy	: $(X86_ONLY)pc_floppy ;
 AddDriversToHaikuImage disk usb		: usb_disk ;
 AddDriversToHaikuImage disk virtual	: nbd ;
 AddDriversToHaikuImage dvb			: cx23882 ;
-AddDriversToHaikuImage graphics		: $(BEOS_ADD_ONS_DRIVERS_GRAPHICS) ;
+AddDriversToHaikuImage graphics		: $(SYSTEM_ADD_ONS_DRIVERS_GRAPHICS) ;
 AddDriversToHaikuImage input		: ps2_hid usb_hid wacom ;
 AddDriversToHaikuImage misc			: <driver>poke <driver>test <driver>mem ;
-AddDriversToHaikuImage net			: $(BEOS_ADD_ONS_DRIVERS_NET) ;
-#AddDriversToHaikuImage power		: $(BEOS_ADD_ONS_DRIVERS_ACPI) ;
+AddDriversToHaikuImage net			: $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
+#AddDriversToHaikuImage power		: $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
 
 # kernel
-AddFilesToHaikuImage beos system : <revisioned>kernel_$(TARGET_ARCH) ;
+AddFilesToHaikuImage system : <revisioned>kernel_$(TARGET_ARCH) ;
 
 # libs
-AddFilesToHaikuImage beos system lib : $(BEOS_SYSTEM_LIBS) ;
+AddFilesToHaikuImage system lib : $(SYSTEM_LIBS) ;
 
 # libnetwork.so replaces quite a few libraries
-BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES
+SYSTEM_LIBS_LIBNETWORK_ALIASES
 	= libsocket.so libbind.so libnet.so ;
 
 local lib ;
-for lib in $(BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES) {
-	AddSymlinkToHaikuImage beos system lib : libnetwork.so : $(lib) ;
+for lib in $(SYSTEM_LIBS_LIBNETWORK_ALIASES) {
+	AddSymlinkToHaikuImage system lib : libnetwork.so : $(lib) ;
 }
 
-AddSymlinkToHaikuImage beos system lib : libbnetapi.so : libnetapi.so ;
+AddSymlinkToHaikuImage system lib : libbnetapi.so : libnetapi.so ;
 
 # libGL.so has GLU (like BeOS) *and* GLUT API built-in
-BEOS_SYSTEM_LIBS_LIBGL_ALIASES
+SYSTEM_LIBS_LIBGL_ALIASES
 	= libGLU.so libglut.so ;
 
 if $(TARGET_ARCH) = x86 {
 local lib ;
-for lib in $(BEOS_SYSTEM_LIBS_LIBGL_ALIASES) {
-	AddSymlinkToHaikuImage beos system lib : libGL.so : $(lib) ;
+for lib in $(SYSTEM_LIBS_LIBGL_ALIASES) {
+	AddSymlinkToHaikuImage system lib : libGL.so : $(lib) ;
 }
 }
 
 # servers
-AddFilesToHaikuImage beos system servers : $(BEOS_SYSTEM_SERVERS) ;
+AddFilesToHaikuImage system servers : $(SYSTEM_SERVERS) ;
 
 # apps
-AddFilesToHaikuImage beos system		: runtime_loader Deskbar Tracker ;
-AddFilesToHaikuImage beos bin			: $(BEOS_BIN) consoled ;
-AddFilesToHaikuImage beos apps			: $(BEOS_APPS) ;
-AddFilesToHaikuImage beos preferences	: $(BEOS_PREFERENCES) ;
-AddFilesToHaikuImage beos demos			: $(BEOS_DEMOS) ;
+AddFilesToHaikuImage system				: runtime_loader Deskbar Tracker ;
+AddFilesToHaikuImage system bin			: $(SYSTEM_BIN) consoled ;
+AddFilesToHaikuImage system apps		: $(SYSTEM_APPS) ;
+AddFilesToHaikuImage system preferences	: $(SYSTEM_PREFERENCES) ;
+AddFilesToHaikuImage system demos		: $(SYSTEM_DEMOS) ;
 
 SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToHaikuImage beos bin			: which ;
+AddFilesToHaikuImage system bin			: which ;
 
-AddSymlinkToHaikuImage beos bin : sh : bash ;
+AddSymlinkToHaikuImage system bin : sh : bash ;
 
 AddSymlinkToHaikuImage home Desktop : /boot/home : Home ;
 
@@ -250,7 +251,7 @@
 local linkTarget ;
 for linkTarget in $(DESKBAR_APPLICATIONS) {
 	AddSymlinkToHaikuImage home config be Applications
-		: /boot/beos/apps/$(linkTarget) : $(linkTarget) ;
+		: /boot/system/apps/$(linkTarget) : $(linkTarget) ;
 }
 
 # Deskbar Desktop Applets links
@@ -260,12 +261,12 @@
 ;
 for linkTarget in $(DESKBAR_DESKTOP_APPLETS) {
 	AddSymlinkToHaikuImage home config be Desktop\ Applets
-		: /boot/beos/apps/$(linkTarget) : $(linkTarget) ;
+		: /boot/system/apps/$(linkTarget) : $(linkTarget) ;
 }
 
 # Deskbar Preferences links
 AddDirectoryToHaikuImage home config be Preferences ;
-# TODO/NOTE: Cannot use $(BEOS_PREFERENCES) here since there is
+# TODO/NOTE: Cannot use $(SYSTEM_PREFERENCES) here since there is
 # "<preferences>Tracker"...
 DESKBAR_PREFERENCES = Appearance Backgrounds DataTranslations E-mail
 	FileTypes Fonts Keyboard Keymap Media Menu Mouse Network Printers Screen
@@ -273,34 +274,34 @@
 ;
 for linkTarget in $(DESKBAR_PREFERENCES) {
 	AddSymlinkToHaikuImage home config be Preferences
-		: /boot/beos/preferences/$(linkTarget) : $(linkTarget) ;
+		: /boot/system/preferences/$(linkTarget) : $(linkTarget) ;
 }
 
 # Deskbar Demo links
 AddDirectoryToHaikuImage home config be Demos ;
-for linkTarget in $(BEOS_DEMOS) {
+for linkTarget in $(SYSTEM_DEMOS) {
 	AddSymlinkToHaikuImage home config be Demos
-		: /boot/beos/demos/$(linkTarget) : $(linkTarget) ;
+		: /boot/system/demos/$(linkTarget) : $(linkTarget) ;
 }
 
-AddSymlinkToHaikuImage beos bin : bzip2 : bunzip2 ;
-AddSymlinkToHaikuImage beos bin : less : more ;
-AddSymlinkToHaikuImage beos bin : gzip : gunzip ;
-AddSymlinkToHaikuImage beos bin : gzip : zcat ;
-AddSymlinkToHaikuImage beos bin : zdiff : zcmp ;
-AddSymlinkToHaikuImage beos bin : unzip : zipinfo ;
-AddSymlinkToHaikuImage beos bin : gawk : awk ;
-AddSymlinkToHaikuImage beos bin : grep : egrep ;
-AddSymlinkToHaikuImage beos bin : grep : fgrep ;
-AddSymlinkToHaikuImage beos bin : vim : vi ;
-AddSymlinkToHaikuImage beos bin : vim : view ;
+AddSymlinkToHaikuImage system bin : bzip2 : bunzip2 ;
+AddSymlinkToHaikuImage system bin : less : more ;
+AddSymlinkToHaikuImage system bin : gzip : gunzip ;
+AddSymlinkToHaikuImage system bin : gzip : zcat ;
+AddSymlinkToHaikuImage system bin : zdiff : zcmp ;
+AddSymlinkToHaikuImage system bin : unzip : zipinfo ;
+AddSymlinkToHaikuImage system bin : gawk : awk ;
+AddSymlinkToHaikuImage system bin : grep : egrep ;
+AddSymlinkToHaikuImage system bin : grep : fgrep ;
+AddSymlinkToHaikuImage system bin : vim : vi ;
+AddSymlinkToHaikuImage system bin : vim : view ;
 
 
 # scripts and data files
 local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript InstallerInitScript
 	InstallerFinishScript ;
 SEARCH on $(bootScripts) = [ FDirName $(HAIKU_TOP) data system boot ] ;
-AddFilesToHaikuImage beos system boot : $(bootScripts) ;
+AddFilesToHaikuImage system boot : $(bootScripts) ;
 
 local userBootScripts = UserBootscript.sample UserSetupEnvironment.sample ;
 SEARCH on $(userBootScripts) = [ FDirName $(HAIKU_TOP) data config boot ] ;
@@ -309,25 +310,25 @@
 local logoArtwork = "HAIKU logo - white on blue - big.png"
 	"HAIKU logo - white on blue - normal.png" ;
 SEARCH on $(logoArtwork) = [ FDirName $(HAIKU_TOP) data artwork ] ;
-AddFilesToHaikuImage beos etc artwork : $(logoArtwork) ;
+AddFilesToHaikuImage system data artwork : $(logoArtwork) ;
 
-AddDirectoryToHaikuImage beos etc sounds ;
+AddDirectoryToHaikuImage system data sounds ;
 
 # Mail spell check dictionaries
 local spellFiles = words geekspeak ;
 spellFiles = $(spellFiles:G=spell) ;
 SEARCH on $(spellFiles)
 	= [ FDirName $(HAIKU_TOP) src apps mail ] ;
-AddFilesToHaikuImage beos etc word_dictionary : $(spellFiles) ;
+AddFilesToHaikuImage system etc word_dictionary : $(spellFiles) ;
 
 local etcFiles = inputrc profile teapot.data ;
 etcFiles = $(etcFiles:G=etc) ;
 SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ;
 etcFiles += <etc>termcap <etc>sysless <etc>sysless.in ;
-AddFilesToHaikuImage beos etc : $(etcFiles) ;
+AddFilesToHaikuImage system etc : $(etcFiles) ;
 
 SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
-AddFilesToHaikuImage beos etc vim : <etc>vimrc ;
+AddFilesToHaikuImage system etc vim : <etc>vimrc ;
 
 local fortuneFiles =  Art Computers Education Food Fortunes Goedel Haiku
 	Humorists Kids Law "Linux cookies" Love Magic Medicine Miscellaneous
@@ -335,37 +336,37 @@
 	Sports "Tech Support Excuses" ;
 fortuneFiles = $(fortuneFiles:G=etc!fortunes) ;
 SEARCH on $(fortuneFiles) = [ FDirName $(HAIKU_TOP) data etc fortunes ] ;
-AddFilesToHaikuImage beos etc fortunes : $(fortuneFiles) ;
+AddFilesToHaikuImage system etc fortunes : $(fortuneFiles) ;
 
 local fontDir = [ FDirName $(HAIKU_TOP) data etc fonts ] ;
 local psFonts = [ Glob $(fontDir)/psfonts : *.afm *.pfb ] ;
 local ttFonts = [ Glob $(fontDir)/ttfonts : *.ttf ] ;
-AddFilesToHaikuImage beos etc fonts psfonts : $(psFonts) ;
-AddFilesToHaikuImage beos etc fonts ttfonts : $(ttFonts) ;
+AddFilesToHaikuImage system fonts psfonts : $(psFonts) ;
+AddFilesToHaikuImage system fonts ttfonts : $(ttFonts) ;
 
 local kanbeDir = [ FDirName $(HAIKU_TOP) data etc KanBe ] ;
 local kanbeDefault = [ Glob $(kanbeDir)/default : *.canna *.gz ] ;
 local kanbeDic = [ Glob $(kanbeDir)/dic : *.cbp ] ;
 local kanbeDicCanna = [ Glob $(kanbeDir)/dic/canna
 	: *.cld *.ctd *.cbd *.dir ] ;
-AddFilesToHaikuImage beos etc KanBe default : $(kanbeDefault) ;
-AddFilesToHaikuImage beos etc KanBe dic : $(kanbeDic) ;
-AddFilesToHaikuImage beos etc KanBe dic canna : $(kanbeDicCanna) ;
-AddDirectoryToHaikuImage beos etc KanBe dic group ;
-AddDirectoryToHaikuImage beos etc KanBe dic user ;
+AddFilesToHaikuImage system data KanBe default : $(kanbeDefault) ;
+AddFilesToHaikuImage system data KanBe dic : $(kanbeDic) ;
+AddFilesToHaikuImage system data KanBe dic canna : $(kanbeDicCanna) ;
+AddDirectoryToHaikuImage system data KanBe dic group ;
+AddDirectoryToHaikuImage system data KanBe dic user ;
 
 local keymapFiles = [ GLOB [ FDirName $(HAIKU_TOP) src data etc keymaps ]
 	: *.keymap ] ;
 keymapFiles = $(keymapFiles:BG=keymap) ;
-AddFilesToHaikuImage beos etc Keymap : $(keymapFiles) ;
-AddSymlinkToHaikuImage beos etc Keymap : Swedish : Finnish ;
-AddSymlinkToHaikuImage beos etc Keymap : Slovene : Croatian ;
-AddSymlinkToHaikuImage beos etc Keymap : US-International : Brazilian ;
+AddFilesToHaikuImage system data Keymaps : $(keymapFiles) ;
+AddSymlinkToHaikuImage system data Keymaps : Swedish : Finnish ;
+AddSymlinkToHaikuImage system data Keymaps : Slovene : Croatian ;
+AddSymlinkToHaikuImage system data Keymaps : US-International : Brazilian ;
 
 local timezones = [ FTimeZoneBinaries $(HAIKU_TIME_ZONE_SOURCES) : : true ] ;
 for timezone in $(timezones) {
 	local dir = [ on $(timezone) return $(RELATIVE_TIMEZONE_DIR) ] ;
-	AddFilesToHaikuImage beos etc timezones $(dir) : $(timezone) ;
+	AddFilesToHaikuImage system data timezones $(dir) : $(timezone) ;
 }
 
 local driverSettingsFiles = <driver-settings>kernel ;
@@ -390,7 +391,7 @@
 AddFilesToHaikuImage common settings : <post-install>fresh_install ;
 
 # boot loader
-AddFilesToHaikuImage beos system : zbeos ;
+AddFilesToHaikuImage system : haiku_loader ;
 
 # boot module links
 AddBootModuleSymlinksToHaikuImage
@@ -405,48 +406,48 @@
 ;
 
 # add-ons
-AddFilesToHaikuImage beos system add-ons accelerants
-	: $(BEOS_ADD_ONS_ACCELERANTS) ;
-AddFilesToHaikuImage beos system add-ons opengl
+AddFilesToHaikuImage system add-ons accelerants
+	: $(SYSTEM_ADD_ONS_ACCELERANTS) ;
+AddFilesToHaikuImage system add-ons opengl
 	: $(X86_ONLY)Mesa\ Software\ Renderer ;
-AddFilesToHaikuImage beos system add-ons Translators
-	: $(BEOS_ADD_ONS_TRANSLATORS) ;
-AddFilesToHaikuImage beos system add-ons mail_daemon inbound_protocols : POP3 IMAP ;
-AddFilesToHaikuImage beos system add-ons mail_daemon outbound_protocols : SMTP ;
-AddFilesToHaikuImage beos system add-ons mail_daemon inbound_filters : Match\ Header Spam\ Filter R5\ Daemon\ Filter ;
-AddFilesToHaikuImage beos system add-ons mail_daemon outbound_filters : Fortune ;
-AddFilesToHaikuImage beos system add-ons mail_daemon system_filters : Inbox New\ Mail\ Notification Outbox Message\ Parser ;
-AddFilesToHaikuImage beos system add-ons media : $(BEOS_ADD_ONS_MEDIA) ;
-AddFilesToHaikuImage beos system add-ons media plugins
-	: $(BEOS_ADD_ONS_MEDIA_PLUGINS) ;
-AddFilesToHaikuImage beos system add-ons Tracker
+AddFilesToHaikuImage system add-ons Translators
+	: $(SYSTEM_ADD_ONS_TRANSLATORS) ;
+AddFilesToHaikuImage system add-ons mail_daemon inbound_protocols : POP3 IMAP ;
+AddFilesToHaikuImage system add-ons mail_daemon outbound_protocols : SMTP ;
+AddFilesToHaikuImage system add-ons mail_daemon inbound_filters : Match\ Header Spam\ Filter R5\ Daemon\ Filter ;
+AddFilesToHaikuImage system add-ons mail_daemon outbound_filters : Fortune ;
+AddFilesToHaikuImage system add-ons mail_daemon system_filters : Inbox New\ Mail\ Notification Outbox Message\ Parser ;
+AddFilesToHaikuImage system add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ;
+AddFilesToHaikuImage system add-ons media plugins
+	: $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
+AddFilesToHaikuImage system add-ons Tracker
 	: FileType-F ZipOMatic-Z Open\ Target\ Folder-T ;
-AddSymlinkToHaikuImage beos system add-ons Tracker
-	: /boot/beos/preferences/Backgrounds : Background-B ;
-AddSymlinkToHaikuImage beos system add-ons Tracker
-	: /boot/beos/apps/TextSearch : TextSearch-G ;
-AddSymlinkToHaikuImage beos system add-ons Tracker
-	: /boot/beos/apps/DiskUsage : DiskUsage-I ;
-AddFilesToHaikuImage beos system add-ons input_server devices
+AddSymlinkToHaikuImage system add-ons Tracker
+	: /boot/system/preferences/Backgrounds : Background-B ;
+AddSymlinkToHaikuImage system add-ons Tracker
+	: /boot/system/apps/TextSearch : TextSearch-G ;
+AddSymlinkToHaikuImage system add-ons Tracker
+	: /boot/system/apps/DiskUsage : DiskUsage-I ;
+AddFilesToHaikuImage system add-ons input_server devices
 	: <input>keyboard <input>mouse <input>wacom ;
-AddFilesToHaikuImage beos system add-ons input_server filters : screen_saver ;
-AddFilesToHaikuImage beos system add-ons kernel network
+AddFilesToHaikuImage system add-ons input_server filters : screen_saver ;
+AddFilesToHaikuImage system add-ons kernel network
 	: <net>notifications stack ;
-AddFilesToHaikuImage beos system add-ons kernel network devices
-	: $(BEOS_NETWORK_DEVICES) ;
-AddFilesToHaikuImage beos system add-ons kernel network datalink_protocols
-	: $(BEOS_NETWORK_DATALINK_PROTOCOLS) ;
-AddFilesToHaikuImage beos system add-ons kernel network ppp
-	: $(BEOS_NETWORK_PPP) ;
-AddFilesToHaikuImage beos system add-ons kernel network protocols
-	: $(BEOS_NETWORK_PROTOCOLS) ;
-AddFilesToHaikuImage beos system add-ons Print : $(BEOS_ADD_ONS_PRINT) ;
-AddFilesToHaikuImage beos system add-ons Print transport
-	: $(BEOS_ADD_ONS_PRINT_TRANSPORT) ;
-AddFilesToHaikuImage beos system add-ons Screen\ Savers
-	: $(BEOS_ADD_ONS_SCREENSAVERS) ;
+AddFilesToHaikuImage system add-ons kernel network devices
+	: $(SYSTEM_NETWORK_DEVICES) ;
+AddFilesToHaikuImage system add-ons kernel network datalink_protocols
+	: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
+AddFilesToHaikuImage system add-ons kernel network ppp
+	: $(SYSTEM_NETWORK_PPP) ;
+AddFilesToHaikuImage system add-ons kernel network protocols
+	: $(SYSTEM_NETWORK_PROTOCOLS) ;
+AddFilesToHaikuImage system add-ons Print : $(SYSTEM_ADD_ONS_PRINT) ;
+AddFilesToHaikuImage system add-ons Print transport
+	: $(SYSTEM_ADD_ONS_PRINT_TRANSPORT) ;
+AddFilesToHaikuImage system add-ons Screen\ Savers
+	: $(SYSTEM_ADD_ONS_SCREENSAVERS) ;
 
-AddFilesToHaikuImage beos system add-ons disk_systems
+AddFilesToHaikuImage system add-ons disk_systems
 	: <disk_system>intel <disk_system>bfs ;
 
 # create directories that will remain empty
@@ -469,11 +470,11 @@
 AddDirectoryToHaikuImage home config add-ons Tracker ;
 AddDirectoryToHaikuImage home config add-ons Screen\ Savers ;
 AddDirectoryToHaikuImage home config add-ons Translators ;
-AddDirectoryToHaikuImage beos etc synth ;
-AddDirectoryToHaikuImage beos system add-ons input_server methods ;
+AddDirectoryToHaikuImage system data synth ;
+AddDirectoryToHaikuImage system add-ons input_server methods ;
 
 # optional
-AddFilesToHaikuImage optional beos system add-ons input_server methods : canna ;
+AddFilesToHaikuImage optional system add-ons input_server methods : canna ;
 
 # printers
 AddDirectoryToHaikuImage home config settings printers Preview
@@ -482,7 +483,7 @@
       : home-config-settings-printers-save-as-pdf.rdef ;
 
 # licenses
-CopyDirectoryToHaikuImage beos etc
+CopyDirectoryToHaikuImage system data
 	: [ FDirName $(HAIKU_TOP) data etc licenses ]
 	: licenses : -x .svn ;
 
@@ -512,14 +513,14 @@
 
 # collect the targets we would install in the lib directory
 local alternativeSystemLibs ;
-local libTargets = [ FFilesInHaikuImageDirectory beos system lib ] ;
+local libTargets = [ FFilesInHaikuImageDirectory system lib ] ;
 local libTarget ;
 for libTarget in $(libTargets) {
 	alternativeSystemLibs += [ on $(libTarget) return $(TARGET) ] ;
 }
 
 # collect the symlinks we would install in the lib directory
-libTargets = [ FSymlinksInHaikuImageDirectory beos system lib ] ;
+libTargets = [ FSymlinksInHaikuImageDirectory system lib ] ;
 local tmpAlternativeLibDir
 	= [ FDirName $(HAIKU_OUTPUT_DIR) tmp alternativeLibs ] ;
 for libTarget in $(libTargets) {
@@ -567,7 +568,7 @@
 	}
 
 	# install the alternative libs in the right directory
-	UnzipArchiveToHaikuImage beos system lib $(libSubDir)
+	UnzipArchiveToHaikuImage system lib $(libSubDir)
 		: $(otherAlternativeSystemLibsZip) ;
 }
 

Modified: haiku/trunk/build/jam/ImageRules
===================================================================
--- haiku/trunk/build/jam/ImageRules	2009-04-03 08:05:25 UTC (rev 29875)
+++ haiku/trunk/build/jam/ImageRules	2009-04-03 09:02:44 UTC (rev 29876)
@@ -288,10 +288,10 @@
 {
 	# AddDriversToContainer <container> : <relative directory> : <targets> ;
 	#
-	local directoryTokens = beos system add-ons kernel drivers dev
+	local directoryTokens = system add-ons kernel drivers dev
 		$(relativeDirectoryTokens) ;
 
-	AddFilesToContainer $(container) : beos system add-ons kernel drivers bin
+	AddFilesToContainer $(container) : system add-ons kernel drivers bin
 		: $(targets) ;
 
 	# If the image shall only be updated, we don't add any symlinks.
@@ -320,7 +320,7 @@
 {
 	# AddNewDriversToContainer <container> : <directory> : <targets> ;
 	#
-	local directoryTokens = beos system add-ons kernel drivers
+	local directoryTokens = system add-ons kernel drivers
 		$(relativeDirectoryTokens) ;
 
 	AddFilesToContainer $(container) : $(directoryTokens)
@@ -356,7 +356,7 @@
 		local name = $(target:BS) ;
 		local linkTarget = [ FDirName /boot $(installDir:G=) $(name) ] ;
 
-		AddSymlinkToContainer $(container) : beos system add-ons kernel boot
+		AddSymlinkToContainer $(container) : system add-ons kernel boot
 			: $(linkTarget) : $(name) ;
 	}
 }
@@ -751,7 +751,7 @@
 		Always $(file) ;
 		MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
 		BuildHaikuImageUserGroupFile $(file) ;
-		AddFilesToHaikuImage beos etc : $(file) ;
+		AddFilesToHaikuImage system etc : $(file) ;
 	}
 
 	HAIKU_IMAGE_USER_GROUP_ENTRIES on $(file) = $(allEntries) ;
@@ -805,7 +805,7 @@
 		name = ;
 	}
 
-	AddFilesToHaikuImage beos etc licenses : $(file) : $(name) ;
+	AddFilesToHaikuImage system data licenses : $(file) : $(name) ;
 }
 
 
@@ -1053,9 +1053,9 @@
 
 # warning: that is quite x86 dependant...
 
-rule BuildFloppyBootImage image : zbeos : archive
+rule BuildFloppyBootImage image : haikuLoader : archive
 {
-	Depends $(image) : $(zbeos) ;
+	Depends $(image) : $(haikuLoader) ;
 	Depends $(image) : $(archive) ;
 	#MakeLocateDebug $(image) ;
 	ARCHIVE_IMAGE_OFFSET on $(image) = $(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ;
@@ -1067,7 +1067,7 @@
 		FLOPPY_IMAGE_BLOCK_SIZE on $(image) = 2 ;
 	}
 
-	BuildFloppyBootImage1 $(image) : $(zbeos) $(archive) ;
+	BuildFloppyBootImage1 $(image) : $(haikuLoader) $(archive) ;
 }
 
 actions BuildFloppyBootImage1
@@ -1075,11 +1075,9 @@
 	$(RM) $(<)
 	# make an empty image
 	dd if=/dev/zero of=$(<) bs=$(FLOPPY_IMAGE_BLOCK_SIZE)k count=1440
-	# add zbeos
+	# add haiku_loader
 	dd if=$(>[1]) of=$(<) conv=notrunc
 	# add the boot drivers tgz archive
-	# keep the offset in sync with
-	# src/system/boot/loader/file_systems/tarfs/tarfs.cpp:kFloppyArchiveOffset
 	dd if=$(>[2]) of=$(<) bs=$(ARCHIVE_IMAGE_OFFSET)k seek=1 conv=notrunc
 }
 

Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-04-03 08:05:25 UTC (rev 29875)
+++ haiku/trunk/build/jam/OptionalPackages	2009-04-03 09:02:44 UTC (rev 29876)
@@ -102,10 +102,10 @@
 if [ IsOptionalHaikuImagePackageAdded BeBook ] {
 	InstallOptionalHaikuImagePackage bebook_20081026
 		: http://haiku-files.org/files/optional-packages/bebook_20081026.zip
-		: beos documentation
+		: system documentation
 	;
 	AddSymlinkToHaikuImage home Desktop
-		: /boot/beos/documentation/bebook/index.html : BeBook ;
+		: /boot/system/documentation/bebook/index.html : BeBook ;
 }
 
 
@@ -147,14 +147,15 @@
 if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
 	local bluetoothDrivers = h2generic ;
 	AddDriversToHaikuImage bluetooth : $(bluetoothDrivers) ;
-	AddFilesToHaikuImage beos system servers : bluetooth_server ;
-	AddFilesToHaikuImage beos system lib : libbluetooth.so ;
-	AddFilesToHaikuImage beos system add-ons kernel network devices : bluetooth ;
-	AddFilesToHaikuImage beos system add-ons kernel network protocols : l2cap ;
-	AddFilesToHaikuImage beos system add-ons kernel bluetooth : btCoreData ;
-	AddFilesToHaikuImage beos preferences : Bluetooth ;
-	AddFilesToHaikuImage beos bin : bt_dev_info bt_discovery ;
-	AddSymlinkToHaikuImage home config be Preferences : /boot/beos/preferences/Bluetooth ;
+	AddFilesToHaikuImage system servers : bluetooth_server ;
+	AddFilesToHaikuImage system lib : libbluetooth.so ;
+	AddFilesToHaikuImage system add-ons kernel network devices : bluetooth ;
+	AddFilesToHaikuImage system add-ons kernel network protocols : l2cap ;
+	AddFilesToHaikuImage system add-ons kernel bluetooth : btCoreData ;
+	AddFilesToHaikuImage system preferences : Bluetooth ;
+	AddFilesToHaikuImage system bin : bt_dev_info bt_discovery ;
+	AddSymlinkToHaikuImage home config be Preferences
+		: /boot/system/preferences/Bluetooth ;
 	if [ IsOptionalHaikuImagePackageAdded Development ] {
 		AddSymlinkToHaikuImage develop lib x86 : /system/lib/libbluetooth.so ;
 	}
@@ -198,12 +199,12 @@
 	AddFilesToHaikuImage develop lib x86 : libposix_error_mapper.a ;
 
 	# cc and c++ wrapper scripts
-	AddFilesToHaikuImage beos bin : cc c++ ;
+	AddFilesToHaikuImage system bin : cc c++ ;
 
 	# mkdepend build tool, which is part of the Haiku source tree
 	# (same as make, but make is already included independent of the
 	# Development package)
-	AddFilesToHaikuImage beos bin : mkdepend ;
+	AddFilesToHaikuImage system bin : mkdepend ;
 
 	# skeleton makefile and makefile-engine
 	local makefileEngineFiles =
@@ -520,10 +521,10 @@
 # UserlandFS
 if [ IsOptionalHaikuImagePackageAdded UserlandFS ] {
 	# kernel module
-	AddFilesToHaikuImage beos system add-ons kernel file_systems : userlandfs ;
+	AddFilesToHaikuImage system add-ons kernel file_systems : userlandfs ;
 
 	# server
-	AddFilesToHaikuImage beos system servers : userlandfs_server ;
+	AddFilesToHaikuImage system servers : userlandfs_server ;
 
 	# libs
 	local userlandfsLibs =
@@ -531,7 +532,7 @@
 		libuserlandfs_haiku_kernel.so
 		libuserlandfs_fuse.so
 	;
-	AddFilesToHaikuImage beos system lib : $(userlandfsLibs) ;
+	AddFilesToHaikuImage system lib : $(userlandfsLibs) ;
 
 	# development goodies
 	if [ IsOptionalHaikuImagePackageAdded Development ] {
@@ -602,17 +603,17 @@
 
 # Welcome
 if [ IsOptionalHaikuImagePackageAdded Welcome ] {
-	CopyDirectoryToHaikuImage beos documentation
+	CopyDirectoryToHaikuImage system documentation
 		: [ FDirName $(HAIKU_TOP) docs welcome ]
 		: welcome : -x .svn ;
-	CopyDirectoryToHaikuImage beos documentation
+	CopyDirectoryToHaikuImage system documentation
 		: [ FDirName $(HAIKU_TOP) docs userguide ]
 		: userguide : -x .svn ;
-	AddFilesToHaikuImage beos documentation
+	AddFilesToHaikuImage system documentation
 		: [ FDirName $(HAIKU_TOP) docs Haiku-doc.css ]
 		: Haiku-doc.css ;
 	AddSymlinkToHaikuImage home Desktop
-		: /boot/beos/documentation/welcome/welcome.html : Welcome ;
+		: /boot/system/documentation/welcome/welcome.html : Welcome ;
 }
 
 

Modified: haiku/trunk/build/jam/UserBuildConfig.ReadMe
===================================================================
--- haiku/trunk/build/jam/UserBuildConfig.ReadMe	2009-04-03 08:05:25 UTC (rev 29875)
+++ haiku/trunk/build/jam/UserBuildConfig.ReadMe	2009-04-03 09:02:44 UTC (rev 29876)
@@ -83,17 +83,17 @@
 # has been added, like for "kernel").
 HAIKU_INCLUDE_IN_IMAGE on libbe.so kernel = 1 ;
 
-# Add "crashing_app" to the beos/bin directory of the Haiku image/installation.
+# Add "crashing_app" to the system/bin directory of the Haiku image/installation.
 # Note, that this also makes the image depend on the target, i.e. it is
 # automatically updated when the image is built.
-AddFilesToHaikuImage beos bin : crashing_app ;
+AddFilesToHaikuImage system bin : crashing_app ;
 
 # Make a symlink to home/config/bin/crash.
-AddSymlinkToHaikuImage home config bin : /beos/bin/crashing_app : crash ;
+AddSymlinkToHaikuImage home config bin : /bin/crashing_app : crash ;
 
 # Add timezone and keymap settings.
 AddSymlinkToHaikuImage home config settings
-	: /boot/beos/etc/timezones/Europe/Paris : timezone ;
+	: /boot/system/data/timezones/Europe/Paris : timezone ;
 AddFilesToHaikuImage home config settings : <keymap>US-International : Key_map ;
 
 # Adds the source directories src/kits/storage and src/tests/servers/debug

Modified: haiku/trunk/build/jam/UserBuildConfig.sample
===================================================================
--- haiku/trunk/build/jam/UserBuildConfig.sample	2009-04-03 08:05:25 UTC (rev 29875)
+++ haiku/trunk/build/jam/UserBuildConfig.sample	2009-04-03 09:02:44 UTC (rev 29876)
@@ -8,7 +8,7 @@
 #HAIKU_INSTALL_DIR = /Haiku ;
 
 # Install Haiku on device /dev/sda57. Be sure you know what you're doing!
-#HAIKU_IMAGE_DIR		= /dev ;
+#HAIKU_IMAGE_DIR	= /dev ;
 #HAIKU_IMAGE_NAME	= sda57 ;
 #HAIKU_DONT_CLEAR_IMAGE = 1 ;
 
@@ -19,7 +19,7 @@
 
 # Add symlink/file (timezone and keymap settings) to the image.
 #AddSymlinkToHaikuImage home config settings
-#	: /boot/beos/etc/timezones/Europe/Paris : timezone ;
+#	: /boot/system/data/timezones/Europe/Paris : timezone ;
 #AddFilesToHaikuImage home config settings : <keymap>US-International
 #	: Key_map ;
 

Modified: haiku/trunk/build/scripts/build_haiku_cd
===================================================================
--- haiku/trunk/build/scripts/build_haiku_cd	2009-04-03 08:05:25 UTC (rev 29875)
+++ haiku/trunk/build/scripts/build_haiku_cd	2009-04-03 09:02:44 UTC (rev 29876)
@@ -135,7 +135,7 @@
 	$rmAttrs -f $copyrightAttrs
 	touch $copyrightAttrs
 	$addattr -f $copyrightsFile COPYRIGHTS $copyrightAttrs
-	$copyAttrs $copyrightAttrs ${tPrefix}beos/apps/AboutSystem
+	$copyAttrs $copyrightAttrs ${tPrefix}system/apps/AboutSystem
 fi
 
 # generate the attribute stores

Modified: haiku/trunk/build/scripts/build_haiku_image
===================================================================
--- haiku/trunk/build/scripts/build_haiku_image	2009-04-03 08:05:25 UTC (rev 29875)
+++ haiku/trunk/build/scripts/build_haiku_image	2009-04-03 09:02:44 UTC (rev 29876)
@@ -207,7 +207,7 @@
 		$rmAttrs -f $copyrightAttrs
 		touch $copyrightAttrs
 		$addattr -f $copyrightsFile COPYRIGHTS $copyrightAttrs
-		$copyAttrs ${sPrefix}$copyrightAttrs ${tPrefix}beos/apps/AboutSystem
+		$copyAttrs ${sPrefix}$copyrightAttrs ${tPrefix}system/apps/AboutSystem
 	fi
 fi
 

Modified: haiku/trunk/data/system/boot/Bootscript
===================================================================
--- haiku/trunk/data/system/boot/Bootscript	2009-04-03 08:05:25 UTC (rev 29875)
+++ haiku/trunk/data/system/boot/Bootscript	2009-04-03 09:02:44 UTC (rev 29876)
@@ -20,7 +20,7 @@
 		echo There is no "$toLaunch"
 	fi
 	return 0
-}	
+}
 
 # launchscript <script path>
 
@@ -54,13 +54,13 @@
 exec >/dev/null 2>&1
 
 # Standard locations of boot files
-SCRIPTS=beos/system/boot
-SERVERS=beos/system/servers
+SCRIPTS=system/boot
+SERVERS=system/servers
 
 # clean the shared memory dir
 shmDir=/boot/var/shared_memory
 rm -rf $shmDir
-mkdir $shmDir
+mkdir -p $shmDir
 chmod 777 $shmDir
 
 # Set up the environment
@@ -77,7 +77,7 @@
 fi
 
 # Sets timezone etc.
-runprog beos/bin/clockconfig
+runprog system/bin/clockconfig
 
 # Launch servers
 
@@ -105,18 +105,18 @@
 # Launch Terminal or consoled depending on $SAFEMODE
 if [ "$SAFEMODE" != "yes" ]; then
 	if [ -e /etc/users ]; then
-		launch beos/system/Login
+		launch system/Login
 		# nothing more
 	else
-		launch beos/system/Tracker
-		launch beos/system/Deskbar
+		launch system/Tracker
+		launch system/Deskbar
 
 		# install ProcessController in the deskbar
-		(sleep 7; /boot/beos/apps/ProcessController -deskbar) &
+		(sleep 7; /boot/system/apps/ProcessController -deskbar) &
 	fi
-	launch beos/apps/Terminal
+	launch system/apps/Terminal
 else
-	launch beos/bin/consoled
+	launch system/bin/consoled
 fi
 
 if [ "$SAFEMODE" != "yes" ]; then
@@ -124,7 +124,7 @@
 	launch $SERVERS/midi_server
 fi
 
-# Launch Print Server 
+# Launch Print Server
 if [ "$SAFEMODE" != "yes" ]; then
 	launch $SERVERS/print_server
 fi
@@ -135,7 +135,7 @@
 fi
 
 # Check for daily saving time
-launch beos/bin/dstcheck
+launch system/bin/dstcheck
 
 if [ "$SAFEMODE" != "yes" ]; then
 	# Start user boot script

Modified: haiku/trunk/data/system/boot/Bootscript.cd
===================================================================
--- haiku/trunk/data/system/boot/Bootscript.cd	2009-04-03 08:05:25 UTC (rev 29875)
+++ haiku/trunk/data/system/boot/Bootscript.cd	2009-04-03 09:02:44 UTC (rev 29876)
@@ -72,15 +72,15 @@
 
 # Launch Terminal or consoled depending on $SAFEMODE
 if [ "$SAFEMODE" != "yes" ]; then
-	if [ -x /boot/beos/apps/Installer ]; then
-		/boot/beos/apps/Installer
-		#/boot/beos/apps/Terminal -x /boot/beos/apps/Installer
+	if [ -x /boot/system/apps/Installer ]; then
+		/boot/system/apps/Installer
+		#/boot/system/apps/Terminal -x /boot/system/apps/Installer
 	else
-		/boot/beos/apps/Terminal
+		/boot/system/apps/Terminal
 	fi
-	#launch beos/apps/Terminal
+	#launch system/apps/Terminal
 else
-	launch beos/bin/consoled
+	launch system/bin/consoled
 fi
 
 # sync disks

Modified: haiku/trunk/data/system/boot/SetupEnvironment
===================================================================
--- haiku/trunk/data/system/boot/SetupEnvironment	2009-04-03 08:05:25 UTC (rev 29875)
+++ haiku/trunk/data/system/boot/SetupEnvironment	2009-04-03 09:02:44 UTC (rev 29876)
@@ -42,13 +42,13 @@
 
 if [ "$SAFEMODE" != "yes" ]
 then
-	export PATH=.:$HOME/config/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
-	export LIBRARY_PATH="%A/lib:$HOME/config/lib:/boot/common/lib:/boot/beos/system/lib"
-	export ADDON_PATH="%A/add-ons:$HOME/config/add-ons:/boot/beos/system/add-ons"
+	export PATH=.:$HOME/config/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences:$BETOOLS
+	export LIBRARY_PATH="%A/lib:$HOME/config/lib:/boot/common/lib:/boot/system/lib"
+	export ADDON_PATH="%A/add-ons:$HOME/config/add-ons:/boot/system/add-ons"
 else
-	export PATH=.:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
-	export LIBRARY_PATH="%A/lib:/boot/common/lib:/boot/beos/system/lib"
-	export ADDON_PATH="%A/add-ons:/boot/beos/system/add-ons"
+	export PATH=.:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences:$BETOOLS
+	export LIBRARY_PATH="%A/lib:/boot/common/lib:/boot/system/lib"
+	export ADDON_PATH="%A/add-ons:/boot/system/add-ons"
 fi

[... truncated: 4164 lines follow ...]


From stippi at mail.berlios.de  Fri Apr  3 11:18:26 2009
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Fri, 3 Apr 2009 11:18:26 +0200
Subject: [Haiku-commits] r29877 - haiku/trunk/src/kits/interface
Message-ID: <200904030918.n339IQt7023650@sheep.berlios.de>

Author: stippi
Date: 2009-04-03 11:18:26 +0200 (Fri, 03 Apr 2009)
New Revision: 29877
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29877&view=rev

Modified:
   haiku/trunk/src/kits/interface/ControlLook.cpp
Log:
Make sure to fill the scroll corner if necessary.


Modified: haiku/trunk/src/kits/interface/ControlLook.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ControlLook.cpp	2009-04-03 09:02:44 UTC (rev 29876)
+++ haiku/trunk/src/kits/interface/ControlLook.cpp	2009-04-03 09:18:26 UTC (rev 29877)
@@ -703,6 +703,14 @@
 		&& horizontalScrollBarFrame.IsValid()
 		&& verticalScrollBarFrame.IsValid();
 
+	// calculate scroll corner rect before messing with the "rect"
+	BRect scrollCornerFillRect(rect.right, rect.bottom,
+		rect.right, rect.bottom);
+	if (horizontalScrollBarFrame.IsValid())
+		scrollCornerFillRect.left = horizontalScrollBarFrame.right + 1;
+	if (verticalScrollBarFrame.IsValid())
+		scrollCornerFillRect.top = verticalScrollBarFrame.bottom + 1;
+
 	uint32 borders = _borders;
 	if (excludeScrollCorner) {
 		rect.bottom = horizontalScrollBarFrame.top;
@@ -747,7 +755,16 @@
 		_DrawFrame(view, verticalScrollBarFrame, scrollbarFrameColor,
 			scrollbarFrameColor, scrollbarFrameColor, scrollbarFrameColor,
 			borders);
+
+		// exclude recessed frame
+		scrollCornerFillRect.top++;
+		scrollCornerFillRect.left++;
 	}
+
+	if (scrollCornerFillRect.IsValid()) {
+		view->SetHighColor(base);
+		view->FillRect(scrollCornerFillRect);
+	}
 }
 
 



From stippi at mail.berlios.de  Fri Apr  3 11:19:58 2009
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Fri, 3 Apr 2009 11:19:58 +0200
Subject: [Haiku-commits] r29878 - haiku/trunk/src/kits/interface
Message-ID: <200904030919.n339JwWm023962@sheep.berlios.de>

Author: stippi
Date: 2009-04-03 11:19:58 +0200 (Fri, 03 Apr 2009)
New Revision: 29878
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29878&view=rev

Modified:
   haiku/trunk/src/kits/interface/ColumnListView.cpp
Log:
Prettify the column title drawing. TODO: Make this more re-usable and put into
BControlLook. Then use from Tracker as well. Also, Tracker still has the nicer
sorting indicators.


Modified: haiku/trunk/src/kits/interface/ColumnListView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ColumnListView.cpp	2009-04-03 09:18:26 UTC (rev 29877)
+++ haiku/trunk/src/kits/interface/ColumnListView.cpp	2009-04-03 09:19:58 UTC (rev 29878)
@@ -52,6 +52,7 @@
 
 #include <Application.h>
 #include <Bitmap.h>
+#include <ControlLook.h>
 #include <Cursor.h>
 #include <Debug.h>
 #include <GraphicsDefs.h>
@@ -70,7 +71,7 @@
 #define SMART_REDRAW 1
 #define DRAG_TITLE_OUTLINE 1
 #define CONSTRAIN_CLIPPING_REGION 1
-#define LOWER_SCROLLBAR 1
+#define LOWER_SCROLLBAR 0
 
 namespace BPrivate {
 
@@ -172,7 +173,7 @@
 
 static const float kTintedLineTint = 0.7 * B_NO_TINT + 0.3 * B_DARKEN_1_TINT;
 
-static const float kTitleHeight = 17.0;
+static const float kTitleHeight = 16.0;
 static const float kLatchWidth = 15.0;
 
 
@@ -1093,7 +1094,8 @@
 {
 	if (fColumns.HasItem(column)) {
 		SetColumnVisible(column, false);
-		Window()->UpdateIfNeeded();
+		if (Window() != NULL)
+			Window()->UpdateIfNeeded();
 		fColumns.RemoveItem(column);
 	}
 }
@@ -1534,7 +1536,14 @@
 void
 BColumnListView::MakeFocus(bool isFocus)
 {
-	Invalidate();	// Redraw focus marks around view
+	if (fBorderStyle != B_NO_BORDER) {
+		// Redraw focus marks around view
+		Invalidate();
+	}
+
+	fHorizontalScrollBar->SetBorderHighlighted(isFocus);
+	fVerticalScrollBar->SetBorderHighlighted(isFocus);
+
 	BView::MakeFocus(isFocus);
 }
 
@@ -1669,11 +1678,30 @@
 
 
 void
-BColumnListView::Draw(BRect)
+BColumnListView::Draw(BRect updateRect)
 {
 	BRect rect = Bounds();
-	PushState();
 
+	if (be_control_look != NULL) {
+		uint32 flags = 0;
+		if (IsFocus() && Window()->IsActive())
+			flags |= BControlLook::B_FOCUSED;
+
+		rgb_color base = ui_color(B_PANEL_BACKGROUND_COLOR);
+
+		BRect verticalScrollBarFrame;
+		if (!fVerticalScrollBar->IsHidden())
+			verticalScrollBarFrame = fVerticalScrollBar->Frame();
+		BRect horizontalScrollBarFrame;
+		if (!fHorizontalScrollBar->IsHidden())
+			horizontalScrollBarFrame = fHorizontalScrollBar->Frame();
+
+		be_control_look->DrawScrollViewFrame(this, rect, updateRect,
+			verticalScrollBarFrame, horizontalScrollBarFrame,
+			base, fBorderStyle, flags);
+		return;
+	}
+
 	BRect cornerRect(rect.right - B_V_SCROLL_BAR_WIDTH,
 		rect.bottom - B_H_SCROLL_BAR_HEIGHT, rect.right, rect.bottom);
 	if (fBorderStyle == B_PLAIN_BORDER) {
@@ -1703,7 +1731,6 @@
 	BView::SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 		// fills lower right rect between scroll bars
 	FillRect(cornerRect);
-	PopState();
 }
 
 
@@ -1792,7 +1819,7 @@
 {
 	BSize size;
 	size.width = 100;
-	size.height = kTitleHeight + 3 * ceilf(be_plain_font->Size());
+	size.height = kTitleHeight + 4 * B_H_SCROLL_BAR_HEIGHT;
 	if (!fHorizontalScrollBar->IsHidden())
 		size.height += fHorizontalScrollBar->Frame().Height() + 1;
 	// TODO: Take border size into account
@@ -1910,14 +1937,14 @@
 	titleRect = bounds;
 	titleRect.bottom = titleRect.top + kTitleHeight;
 #if !LOWER_SCROLLBAR
-	titleRect.right -= B_V_SCROLL_BAR_WIDTH + 1;
+	titleRect.right -= B_V_SCROLL_BAR_WIDTH;
 #endif
 
 	outlineRect = bounds;
 	outlineRect.top = titleRect.bottom + 1.0;
-	outlineRect.right -= B_V_SCROLL_BAR_WIDTH + 1;
+	outlineRect.right -= B_V_SCROLL_BAR_WIDTH;
 	if (showHorizontalScrollbar)
-		outlineRect.bottom -= B_H_SCROLL_BAR_HEIGHT + 1;
+		outlineRect.bottom -= B_H_SCROLL_BAR_HEIGHT;
 
 	vScrollBarRect = bounds;
 #if LOWER_SCROLLBAR
@@ -1935,24 +1962,22 @@
 	// Adjust stuff so the border will fit.
 	if (fBorderStyle == B_PLAIN_BORDER) {
 		titleRect.InsetBy(1, 0);
-		titleRect.top++;
-		outlineRect.InsetBy(1, 0);
-		outlineRect.bottom--;
+		titleRect.OffsetBy(0, 1);
+		outlineRect.InsetBy(1, 1);
+	} else if (fBorderStyle == B_FANCY_BORDER) {
+		titleRect.InsetBy(2, 0);
+		titleRect.OffsetBy(0, 2);
+		outlineRect.InsetBy(2, 2);
 
 		vScrollBarRect.OffsetBy(-1, 0);
+#if LOWER_SCROLLBAR
+		vScrollBarRect.top += 2;
+		vScrollBarRect.bottom -= 1;
+#else
 		vScrollBarRect.InsetBy(0, 1);
+#endif
 		hScrollBarRect.OffsetBy(0, -1);
 		hScrollBarRect.InsetBy(1, 0);
-	} else if (fBorderStyle == B_FANCY_BORDER) {
-		titleRect.InsetBy(2, 0);
-		titleRect.top += 2;
-		outlineRect.InsetBy(2, 0);
-		outlineRect.bottom -= 2;
-
-		vScrollBarRect.OffsetBy(-2, 0);
-		vScrollBarRect.InsetBy(0, 2);
-		hScrollBarRect.OffsetBy(0, -2);
-		hScrollBarRect.InsetBy(2, 0);
 	}
 }
 
@@ -2010,11 +2035,9 @@
 	delete fColumnPop;
 	fColumnPop = NULL;
 	
-	fDrawBuffer->Lock();
-	fDrawBufferView->RemoveSelf();
-	fDrawBuffer->Unlock();
-	delete fDrawBufferView;
+#if DOUBLE_BUFFERED_COLUMN_RESIZE
 	delete fDrawBuffer;
+#endif
 	delete fUpSortArrow;
 	delete fDownSortArrow;
 
@@ -2215,20 +2238,18 @@
 	float dX = fSelectedColumnRect.left + fSelectedColumn->Width()
 		 - originalEdge;
 	if (dX != 0) {
-		BRect originalRect(originalEdge, 0, 1000000.0, fVisibleRect.Height());
+		float columnHeight = fVisibleRect.Height();
+		BRect originalRect(originalEdge, 0, 1000000.0, columnHeight);
 		BRect movedRect(originalRect);
 		movedRect.OffsetBy(dX, 0);
 
 		// Update the size of the title column
-		BRect sourceRect(0, 0, fSelectedColumn->Width(), fVisibleRect.Height());
+		BRect sourceRect(0, 0, fSelectedColumn->Width(), columnHeight);
 		BRect destRect(sourceRect);
 		destRect.OffsetBy(fSelectedColumnRect.left, 0);
 
 #if DOUBLE_BUFFERED_COLUMN_RESIZE
 		fDrawBuffer->Lock();
-		fDrawBufferView->SetHighColor(
-			fMasterView->Color(B_COLOR_HEADER_BACKGROUND));
-		fDrawBufferView->FillRect(sourceRect);
 		DrawTitle(fDrawBufferView, sourceRect, fSelectedColumn, false);
 		fDrawBufferView->Sync();
 		fDrawBuffer->Unlock();
@@ -2237,8 +2258,6 @@
 		DrawBitmap(fDrawBuffer, sourceRect, destRect);
 #else
 		CopyBits(originalRect, movedRect);
-		SetHighColor(fMasterView->Color(B_COLOR_HEADER_BACKGROUND));
-		FillRect(destRect);
 		DrawTitle(this, destRect, fSelectedColumn, false);
 #endif
 
@@ -2313,50 +2332,78 @@
 	rgb_color bevelHigh;
 	rgb_color bevelLow;
 	// Want exterior borders to overlap.
-	rect.right += 1;
-	drawRect = rect;
-	drawRect.InsetBy(2, 2);
-	if (depressed) {
-		backgroundColor = mix_color(
-			fMasterView->Color(B_COLOR_HEADER_BACKGROUND),
-			make_color(0, 0, 0), 64);
-		bevelHigh = mix_color(backgroundColor, make_color(0, 0, 0), 64);
-		bevelLow = mix_color(backgroundColor, make_color(255, 255, 255), 128);
-		drawRect.left++;
-		drawRect.top++;
+	if (be_control_look == NULL) {
+		rect.right += 1;
+		drawRect = rect;
+		drawRect.InsetBy(2, 2);
+		if (depressed) {
+			backgroundColor = mix_color(
+				fMasterView->Color(B_COLOR_HEADER_BACKGROUND),
+				make_color(0, 0, 0), 64);
+			bevelHigh = mix_color(backgroundColor, make_color(0, 0, 0), 64);
+			bevelLow = mix_color(backgroundColor, make_color(255, 255, 255),
+				128);
+			drawRect.left++;
+			drawRect.top++;
+		} else {
+			backgroundColor = fMasterView->Color(B_COLOR_HEADER_BACKGROUND);
+			bevelHigh = mix_color(backgroundColor, make_color(255, 255, 255),
+				192);
+			bevelLow = mix_color(backgroundColor, make_color(0, 0, 0), 64);
+			drawRect.bottom--;
+			drawRect.right--;
+		}
 	} else {
-		backgroundColor = fMasterView->Color(B_COLOR_HEADER_BACKGROUND);
-		bevelHigh = mix_color(backgroundColor, make_color(255, 255, 255), 192);
-		bevelLow = mix_color(backgroundColor, make_color(0, 0, 0), 64);
-		drawRect.bottom--;
-		drawRect.right--;
+		drawRect = rect;
 	}
 
-	view->SetHighColor(borderColor);
-	view->StrokeRect(rect);	
-	view->BeginLineArray(4);
-	view->AddLine(BPoint(rect.left + 1, rect.top + 1),
-		BPoint(rect.right - 1, rect.top + 1), bevelHigh);
-	view->AddLine(BPoint(rect.left + 1, rect.top + 1),
-		BPoint(rect.left + 1, rect.bottom - 1), bevelHigh);
-	view->AddLine(BPoint(rect.right - 1, rect.top + 1),
-		BPoint(rect.right - 1, rect.bottom - 1), bevelLow);
-	view->AddLine(BPoint(rect.left + 2, rect.bottom-1),
-		BPoint(rect.right - 1, rect.bottom - 1), bevelLow);	
-	view->EndLineArray();
-
 	font_height fh;
 	GetFontHeight(&fh);
 	
 	float baseline = floor(drawRect.top + fh.ascent
-		+ (drawRect.Height() + 1 - (fh.ascent+fh.descent)) / 2);
+		+ (drawRect.Height() + 1 - (fh.ascent + fh.descent)) / 2);
 				   
-	view->SetHighColor(backgroundColor);
-	view->SetLowColor(backgroundColor);
+	if (be_control_look != NULL) {
+		BRect bgRect = rect;
 
-	view->FillRect(rect.InsetByCopy(2, 2));
+		rgb_color base = ui_color(B_PANEL_BACKGROUND_COLOR);
+		view->SetHighColor(tint_color(base, B_DARKEN_2_TINT));
+		view->StrokeLine(bgRect.LeftBottom(), bgRect.RightBottom());
 
+		bgRect.bottom--;
+		bgRect.right--;
 
+		if (depressed)
+			base = tint_color(base, B_DARKEN_1_TINT);
+
+		be_control_look->DrawButtonBackground(view, bgRect, rect, base, 0,
+			BControlLook::B_TOP_BORDER | BControlLook::B_BOTTOM_BORDER);
+
+		view->SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR),
+			B_DARKEN_2_TINT));
+		view->StrokeLine(rect.RightTop(), rect.RightBottom());
+
+	} else {
+
+		view->SetHighColor(borderColor);
+		view->StrokeRect(rect);	
+		view->BeginLineArray(4);
+		view->AddLine(BPoint(rect.left + 1, rect.top + 1),
+			BPoint(rect.right - 1, rect.top + 1), bevelHigh);
+		view->AddLine(BPoint(rect.left + 1, rect.top + 1),
+			BPoint(rect.left + 1, rect.bottom - 1), bevelHigh);
+		view->AddLine(BPoint(rect.right - 1, rect.top + 1),
+			BPoint(rect.right - 1, rect.bottom - 1), bevelLow);
+		view->AddLine(BPoint(rect.left + 2, rect.bottom-1),
+			BPoint(rect.right - 1, rect.bottom - 1), bevelLow);	
+		view->EndLineArray();
+
+		view->SetHighColor(backgroundColor);
+		view->SetLowColor(backgroundColor);
+
+		view->FillRect(rect.InsetByCopy(2, 2));
+	}
+
 	// If no column given, nothing else to draw.
 	if (!column)
 		return;
@@ -2408,19 +2455,17 @@
 
 	if (drawRect.right > drawRect.left) {
 #if CONSTRAIN_CLIPPING_REGION
-		BRegion clipRegion;
-		clipRegion.Set(drawRect);
+		BRegion clipRegion(drawRect);
+		view->PushState();
 		view->ConstrainClippingRegion(&clipRegion);
-		view->PushState();
 #endif
 		view->MovePenTo(BPoint(drawRect.left + 8, baseline));
-		view->SetDrawingMode(B_OP_COPY);
+		view->SetDrawingMode(B_OP_OVER);
 		view->SetHighColor(fMasterView->Color(B_COLOR_HEADER_TEXT));
 		column->DrawTitle(drawRect, view);
 
 #if CONSTRAIN_CLIPPING_REGION
 		view->PopState();
-		view->ConstrainClippingRegion(NULL);
 #endif
 	}
 }
@@ -2883,11 +2928,9 @@
 
 OutlineView::~OutlineView()
 {
-	fDrawBuffer->Lock();
-	fDrawBufferView->RemoveSelf();
-	fDrawBuffer->Unlock();
-	delete fDrawBufferView;
+#if DOUBLE_BUFFERED_COLUMN_RESIZE
 	delete fDrawBuffer;
+#endif
 
 	Clear();
 }
@@ -3003,7 +3046,9 @@
 		tintedLine = !tintedLine;
 
 		if (line + rowHeight >= fVisibleRect.top) {
+#if DOUBLE_BUFFERED_COLUMN_RESIZE
 			BRect sourceRect(0, 0, column->Width(), rowHeight);
+#endif
 			BRect destRect(leftEdge, line, leftEdge + column->Width(),
 				line + rowHeight);
 
@@ -3060,10 +3105,9 @@
 					fieldRect.left += fMasterView->LatchWidth();
 
 	#if CONSTRAIN_CLIPPING_REGION
-				BRegion clipRegion;
-				clipRegion.Set(fieldRect);
+				BRegion clipRegion(fieldRect);
+				fDrawBufferView->PushState();
 				fDrawBufferView->ConstrainClippingRegion(&clipRegion);
-				fDrawBufferView->PushState();
 	#endif
 				fDrawBufferView->SetHighColor(fMasterView->Color(
 					row->fNextSelected ? B_COLOR_SELECTION_TEXT
@@ -3074,7 +3118,6 @@
 				column->DrawField(field, fieldRect, fDrawBufferView);
 	#if CONSTRAIN_CLIPPING_REGION
 				fDrawBufferView->PopState();
-				fDrawBufferView->ConstrainClippingRegion(NULL);
 	#endif
 			}
 
@@ -3100,26 +3143,24 @@
 			BField* field = row->GetField(column->fFieldID);
 			if (field) {
 	#if CONSTRAIN_CLIPPING_REGION
-				BRegion clipRegion;
-				clipRegion.Set(destRect);
+				BRegion clipRegion(destRect);
+				PushState();
 				ConstrainClippingRegion(&clipRegion);
-				PushState();
 	#endif
-				SetHighColor(fColorList[row->fNextSelected
-					? B_COLOR_SELECTION_TEXT : B_COLOR_TEXT]);
+				SetHighColor(fMasterView->Color(row->fNextSelected
+					? B_COLOR_SELECTION_TEXT : B_COLOR_TEXT));
 				float baseline = floor(destRect.top + fh.ascent
 					+ (destRect.Height() + 1 - (fh.ascent + fh.descent)) / 2);
 				MovePenTo(destRect.left + 8, baseline);
 				column->DrawField(field, destRect, this);
 	#if CONSTRAIN_CLIPPING_REGION
 				PopState();
-				ConstrainClippingRegion(NULL);
 	#endif
 			}
 
 			if (fFocusRow == row && !fEditMode && fMasterView->IsFocus()
 				&& Window()->IsActive()) {
-				SetHighColor(fColorList[B_COLOR_ROW_DIVIDER]);
+				SetHighColor(fMasterView->Color(B_COLOR_ROW_DIVIDER));
 				StrokeRect(BRect(0, destRect.top, 10000.0, destRect.bottom));
 			}
 #endif
@@ -3253,10 +3294,9 @@
 						BField* field = row->GetField(column->fFieldID);
 						if (field) {
 #if CONSTRAIN_CLIPPING_REGION
-							BRegion clipRegion;
-							clipRegion.Set(destRect);
+							BRegion clipRegion(destRect);
+							PushState();
 							ConstrainClippingRegion(&clipRegion);
-							PushState();
 #endif
 							SetHighColor(fMasterView->Color(
 								row->fNextSelected ? B_COLOR_SELECTION_TEXT
@@ -3268,7 +3308,6 @@
 							column->DrawField(field, destRect, this);
 #if CONSTRAIN_CLIPPING_REGION
 							PopState();
-							ConstrainClippingRegion(NULL);
 #endif
 						}
 					}



From axeld at pinc-software.de  Fri Apr  3 11:27:34 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Fri, 03 Apr 2009 11:27:34 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r29876_-_in_haiku/trunk=3A_build/jam_bu?=
 =?utf-8?q?ild/scripts_data/system/boot_headers/os/storage_src/apps/abouts?=
 =?utf-8?q?ystem_src/apps/processcontroller_src/bin/bash_src/bin/gdb/gdb_s?=
 =?utf-8?q?rc/bin/grep/src_src/bin/make_src/bin/vim/src_src/kits/tracker_s?=
 =?utf-8?q?rc/preferences/joysticks_src/preferences/keymap_src/preferences?=
 =?utf-8?q?/time_src/servers/debug_src/servers/registrar__src/system/boot_?=
 =?utf-8?q?src/system/boot/loader_src/system/boot/platform/atari=5Fm68k_sr?=
 =?utf-8?q?c/system/boot/platform/bios=5Fia32_src/system/boot/platform/gen?=
 =?utf-8?q?eric_src/system/kernel/fs_src/system/libroot/os__src/system/run?=
 =?utf-8?q?time=5Floader?=
In-Reply-To: <200904030902.n3392mKv021542@sheep.berlios.de>
Message-ID: <10611990546-BeMail@zon>

axeld at BerliOS <axeld at mail.berlios.de> wrote:
> Log:
> * Changed directory structure as suggested on the mailing list.

Please note that you'll have to run makebootable in case you are 
updating an existing installation before you can remove the /boot/beos 
directory, since it will still boot from that one.
To do so from the build host you can do something like:
$ jam -q run :/<build\>makebootable <path-to-my-image>

In case you are using VMware images only, use:
$ jam -q run :/<build\>makebootable --start-offset 65536 <path-to-my-
vmware-image>

HTH

Bye,
   Axel.



From axeld at mail.berlios.de  Fri Apr  3 11:35:41 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 3 Apr 2009 11:35:41 +0200
Subject: [Haiku-commits] r29879 - haiku/trunk/src/preferences/backgrounds
Message-ID: <200904030935.n339ZfR0026193@sheep.berlios.de>

Author: axeld
Date: 2009-04-03 11:35:40 +0200 (Fri, 03 Apr 2009)
New Revision: 29879
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29879&view=rev

Modified:
   haiku/trunk/src/preferences/backgrounds/BackgroundsView.cpp
Log:
* The artwork directory has been relocated as well.


Modified: haiku/trunk/src/preferences/backgrounds/BackgroundsView.cpp
===================================================================
--- haiku/trunk/src/preferences/backgrounds/BackgroundsView.cpp	2009-04-03 09:19:58 UTC (rev 29878)
+++ haiku/trunk/src/preferences/backgrounds/BackgroundsView.cpp	2009-04-03 09:35:40 UTC (rev 29879)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008, Haiku, Inc. All Rights Reserved.
+ * Copyright 2002-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -278,7 +278,7 @@
 
 	BPath path;
 	entry_ref ref;
-	if (find_directory(B_BEOS_ETC_DIRECTORY, &path) == B_OK) {
+	if (find_directory(B_SYSTEM_DATA_DIRECTORY, &path) == B_OK) {
 		path.Append("artwork");
 		get_ref_for_path(path.Path(), &ref);
 	}



From axeld at mail.berlios.de  Fri Apr  3 11:42:59 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Fri, 3 Apr 2009 11:42:59 +0200
Subject: [Haiku-commits] r29880 - haiku/trunk/build/jam
Message-ID: <200904030942.n339gxW0026871@sheep.berlios.de>

Author: axeld
Date: 2009-04-03 11:42:58 +0200 (Fri, 03 Apr 2009)
New Revision: 29880
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29880&view=rev

Modified:
   haiku/trunk/build/jam/FloppyBootImage
   haiku/trunk/build/jam/NetBootArchive
Log:
* Updated to the relocated/renamed beos/system directory.


Modified: haiku/trunk/build/jam/FloppyBootImage
===================================================================
--- haiku/trunk/build/jam/FloppyBootImage	2009-04-03 09:35:40 UTC (rev 29879)
+++ haiku/trunk/build/jam/FloppyBootImage	2009-04-03 09:42:58 UTC (rev 29880)
@@ -18,48 +18,48 @@
 
 local BOOT_ADD_ONS_NET ;
 if $(NET_BOOT) = 1 {
-BOOT_ADD_ONS_NET = 
+BOOT_ADD_ONS_NET =
 #	nbd
 #	remote_disk
-#	$(BEOS_ADD_ONS_DRIVERS_NET)
+#	$(SYSTEM_ADD_ONS_DRIVERS_NET)
 #	stack socket
-#	$(BEOS_NETWORK_DEVICES)
-#	$(BEOS_NETWORK_DATALINK_PROTOCOLS) 
-#	$(BEOS_NETWORK_PPP)
-#	$(BEOS_NETWORK_PROTOCOLS)
+#	$(SYSTEM_NETWORK_DEVICES)
+#	$(SYSTEM_NETWORK_DATALINK_PROTOCOLS)
+#	$(SYSTEM_NETWORK_PPP)
+#	$(SYSTEM_NETWORK_PROTOCOLS)
 ;
 }
 
-BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi
+SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi
 	config_manager agp_gart usb
 ;
-BEOS_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ;
+SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ;
 #cdda fat googlefs nfs ;
 
 
 # modules
-AddFilesToFloppyBootArchive beos system add-ons kernel bus_managers
-	: $(BEOS_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToFloppyBootArchive beos system add-ons kernel busses agp_gart
+AddFilesToFloppyBootArchive system add-ons kernel bus_managers
+	: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
+AddFilesToFloppyBootArchive system add-ons kernel busses agp_gart
 	: $(X86_ONLY)<agp_gart>intel ;
-AddFilesToFloppyBootArchive beos system add-ons kernel busses ide
+AddFilesToFloppyBootArchive system add-ons kernel busses ide
 	: generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 ;
-AddFilesToFloppyBootArchive beos system add-ons kernel busses scsi
+AddFilesToFloppyBootArchive system add-ons kernel busses scsi
 	: ahci ;
-AddFilesToFloppyBootArchive beos system add-ons kernel console : vga_text ;
-AddFilesToFloppyBootArchive beos system add-ons kernel file_systems
-	: $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToFloppyBootArchive beos system add-ons kernel generic
+AddFilesToFloppyBootArchive system add-ons kernel console : vga_text ;
+AddFilesToFloppyBootArchive system add-ons kernel file_systems
+	: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
+AddFilesToFloppyBootArchive system add-ons kernel generic
 	: ide_adapter locked_pool scsi_periph ;
-AddFilesToFloppyBootArchive beos system add-ons kernel partitioning_systems
+AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
 	: intel session ;
-AddFilesToFloppyBootArchive beos system add-ons kernel interrupt_controllers
+AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers
 	: $(PPC_ONLY)openpic ;
-AddFilesToFloppyBootArchive beos system add-ons kernel busses usb
+AddFilesToFloppyBootArchive system add-ons kernel busses usb
 	: <usb>uhci <usb>ohci <usb>ehci ;
 
 if $(TARGET_ARCH) = x86 {
-	AddFilesToFloppyBootArchive beos system add-ons kernel cpu : generic_x86 ;
+	AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ;
 }
 
 # drivers
@@ -68,11 +68,11 @@
 if $(NET_BOOT) = 1 {
 #AddDriversToFloppyBootArchive disk virtual	: nbd ;
 AddDriversToFloppyBootArchive disk virtual	: remote_disk ;
-AddDriversToFloppyBootArchive net			: $(BEOS_ADD_ONS_DRIVERS_NET) ;
+AddDriversToFloppyBootArchive net			: $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
 }
 
 # kernel
-AddFilesToFloppyBootArchive beos system : <revisioned>kernel_$(TARGET_ARCH) ;
+AddFilesToFloppyBootArchive system : <revisioned>kernel_$(TARGET_ARCH) ;
 
 # scripts and data files
 
@@ -84,21 +84,21 @@
 
 if $(NET_BOOT) = 1 {
 # add-ons
-AddFilesToFloppyBootArchive beos system add-ons kernel network
+AddFilesToFloppyBootArchive system add-ons kernel network
 	: stack socket ;
-AddFilesToFloppyBootArchive beos system add-ons kernel network devices
-	: $(BEOS_NETWORK_DEVICES) ;
-AddFilesToFloppyBootArchive beos system add-ons kernel network datalink_protocols
-	: $(BEOS_NETWORK_DATALINK_PROTOCOLS) ;
-AddFilesToFloppyBootArchive beos system add-ons kernel network ppp
-	: $(BEOS_NETWORK_PPP) ;
-AddFilesToFloppyBootArchive beos system add-ons kernel network protocols
-	: $(BEOS_NETWORK_PROTOCOLS) ;
+AddFilesToFloppyBootArchive system add-ons kernel network devices
+	: $(SYSTEM_NETWORK_DEVICES) ;
+AddFilesToFloppyBootArchive system add-ons kernel network datalink_protocols
+	: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
+AddFilesToFloppyBootArchive system add-ons kernel network ppp
+	: $(SYSTEM_NETWORK_PPP) ;
+AddFilesToFloppyBootArchive system add-ons kernel network protocols
+	: $(SYSTEM_NETWORK_PROTOCOLS) ;
 }
 
 # boot module links
 AddBootModuleSymlinksToFloppyBootArchive
-	$(BEOS_ADD_ONS_BUS_MANAGERS)
+	$(SYSTEM_ADD_ONS_BUS_MANAGERS)
 	$(PPC_ONLY)openpic
 	ide_adapter locked_pool scsi_periph
 	$(X86_ONLY)generic_x86
@@ -106,7 +106,7 @@
 	<usb>uhci <usb>ohci <usb>ehci
 	scsi_cd scsi_disk usb_disk
 	intel session
-	$(BEOS_ADD_ONS_FILE_SYSTEMS)
+	$(SYSTEM_ADD_ONS_FILE_SYSTEMS)
 	$(BOOT_ADD_ONS_NET)
 ;
 
@@ -161,7 +161,8 @@
 HAIKU_BOOT_FLOPPY = haiku-boot-floppy.image ;
 MakeLocate $(HAIKU_BOOT_FLOPPY) : $(HAIKU_OUTPUT_DIR) ;
 
-BuildFloppyBootImage $(HAIKU_BOOT_FLOPPY) : zbeos : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;
+BuildFloppyBootImage $(HAIKU_BOOT_FLOPPY) : haiku_loader
+	: $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;
 
 # remove the archive
 RmTemps $(HAIKU_BOOT_FLOPPY) : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;

Modified: haiku/trunk/build/jam/NetBootArchive
===================================================================
--- haiku/trunk/build/jam/NetBootArchive	2009-04-03 09:35:40 UTC (rev 29879)
+++ haiku/trunk/build/jam/NetBootArchive	2009-04-03 09:42:58 UTC (rev 29880)
@@ -14,54 +14,54 @@
 	GPL_ONLY = "" ;
 }
 
-BEOS_NETWORK_DEVICES = ethernet loopback ;
-BEOS_NETWORK_DATALINK_PROTOCOLS = ethernet_frame <module>arp loopback_frame
+SYSTEM_NETWORK_DEVICES = ethernet loopback ;
+SYSTEM_NETWORK_DATALINK_PROTOCOLS = ethernet_frame <module>arp loopback_frame
 	ipv4_datagram ;
-BEOS_NETWORK_PROTOCOLS = ipv4 tcp udp icmp ;
+SYSTEM_NETWORK_PROTOCOLS = ipv4 tcp udp icmp ;
 
-BEOS_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com etherpci $(X86_ONLY)ipro1000
+SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com etherpci $(X86_ONLY)ipro1000
 	$(X86_ONLY)ipro100 $(X86_ONLY)rtl8139 rtl8169 sis900
 	$(X86_ONLY)marvell_yukon $(X86_ONLY)via_rhine wb840 vlance
 	$(GPL_ONLY)bcm440x $(GPL_ONLY)bcm570x
 ;
-BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi
+SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi
 	config_manager agp_gart
 ;
-BEOS_ADD_ONS_FILE_SYSTEMS = bfs fat iso9660 ;
+SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs fat iso9660 ;
 #cdda googlefs nfs $(GPL_ONLY)ntfs ;
 
 
 # modules
-AddFilesToNetBootArchive beos system add-ons kernel bus_managers
-	: $(BEOS_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToNetBootArchive beos system add-ons kernel busses agp_gart
+AddFilesToNetBootArchive system add-ons kernel bus_managers
+	: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
+AddFilesToNetBootArchive system add-ons kernel busses agp_gart
 	: $(X86_ONLY)<agp_gart>intel ;
-AddFilesToNetBootArchive beos system add-ons kernel busses ide
+AddFilesToNetBootArchive system add-ons kernel busses ide
 	: generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ;
-AddFilesToNetBootArchive beos system add-ons kernel busses scsi
+AddFilesToNetBootArchive system add-ons kernel busses scsi
 	: ahci ;
-AddFilesToNetBootArchive beos system add-ons kernel console : vga_text ;
-AddFilesToNetBootArchive beos system add-ons kernel file_systems
-	: $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToNetBootArchive beos system add-ons kernel generic
+AddFilesToNetBootArchive system add-ons kernel console : vga_text ;
+AddFilesToNetBootArchive system add-ons kernel file_systems
+	: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
+AddFilesToNetBootArchive system add-ons kernel generic
 	: ide_adapter locked_pool scsi_periph ;
-AddFilesToNetBootArchive beos system add-ons kernel partitioning_systems
+AddFilesToNetBootArchive system add-ons kernel partitioning_systems
 	: intel session ;
-AddFilesToNetBootArchive beos system add-ons kernel interrupt_controllers
+AddFilesToNetBootArchive system add-ons kernel interrupt_controllers
 	: $(PPC_ONLY)openpic ;
 
 if $(TARGET_ARCH) = x86 {
-	AddFilesToNetBootArchive beos system add-ons kernel cpu : generic_x86 ;
+	AddFilesToNetBootArchive system add-ons kernel cpu : generic_x86 ;
 }
 
 # drivers
 AddNewDriversToNetBootArchive disk scsi	: scsi_cd scsi_disk ;
 #AddDriversToNetBootArchive disk virtual : nbd ;
 AddDriversToNetBootArchive disk virtual	: remote_disk ;
-AddDriversToNetBootArchive net			: $(BEOS_ADD_ONS_DRIVERS_NET) ;
+AddDriversToNetBootArchive net			: $(SYSTEM_ADD_ONS_DRIVERS_NET) ;
 
 # kernel
-AddFilesToNetBootArchive beos system : <revisioned>kernel_$(TARGET_ARCH) ;
+AddFilesToNetBootArchive system : <revisioned>kernel_$(TARGET_ARCH) ;
 
 # scripts and data files
 
@@ -72,34 +72,34 @@
 	: $(driverSettingsFiles) ;
 
 # add-ons
-AddFilesToNetBootArchive beos system add-ons kernel network
+AddFilesToNetBootArchive system add-ons kernel network
 	: stack ;
-AddFilesToNetBootArchive beos system add-ons kernel network devices
-	: $(BEOS_NETWORK_DEVICES) ;
-AddFilesToNetBootArchive beos system add-ons kernel network datalink_protocols
-	: $(BEOS_NETWORK_DATALINK_PROTOCOLS) ;
-AddFilesToNetBootArchive beos system add-ons kernel network ppp
-	: $(BEOS_NETWORK_PPP) ;
-AddFilesToNetBootArchive beos system add-ons kernel network protocols
-	: $(BEOS_NETWORK_PROTOCOLS) ;
+AddFilesToNetBootArchive system add-ons kernel network devices
+	: $(SYSTEM_NETWORK_DEVICES) ;
+AddFilesToNetBootArchive system add-ons kernel network datalink_protocols
+	: $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ;
+AddFilesToNetBootArchive system add-ons kernel network ppp
+	: $(SYSTEM_NETWORK_PPP) ;
+AddFilesToNetBootArchive system add-ons kernel network protocols
+	: $(SYSTEM_NETWORK_PROTOCOLS) ;
 
 # boot module links
 AddBootModuleSymlinksToNetBootArchive
-	$(BEOS_ADD_ONS_BUS_MANAGERS)
+	$(SYSTEM_ADD_ONS_BUS_MANAGERS)
 	ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112
-	$(BEOS_ADD_ONS_FILE_SYSTEMS)
+	$(SYSTEM_ADD_ONS_FILE_SYSTEMS)
 	ide_adapter locked_pool scsi_periph
 	intel session
 	$(PPC_ONLY)openpic
 	$(X86_ONLY)generic_x86
 #	nbd
 	remote_disk
-	$(BEOS_ADD_ONS_DRIVERS_NET)
+	$(SYSTEM_ADD_ONS_DRIVERS_NET)
 	stack
-	$(BEOS_NETWORK_DEVICES)
-	$(BEOS_NETWORK_DATALINK_PROTOCOLS)
-	$(BEOS_NETWORK_PPP)
-	$(BEOS_NETWORK_PROTOCOLS)
+	$(SYSTEM_NETWORK_DEVICES)
+	$(SYSTEM_NETWORK_DATALINK_PROTOCOLS)
+	$(SYSTEM_NETWORK_PPP)
+	$(SYSTEM_NETWORK_PROTOCOLS)
 ;
 
 



From axeld at mail.berlios.de  Fri Apr  3 19:52:51 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Fri, 3 Apr 2009 19:52:51 +0200
Subject: [Haiku-commits] r29881 -
	haiku/trunk/src/add-ons/input_server/methods/canna
Message-ID: <200904031752.n33HqpTc012183@sheep.berlios.de>

Author: axeld
Date: 2009-04-03 19:52:49 +0200 (Fri, 03 Apr 2009)
New Revision: 29881
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29881&view=rev

Modified:
   haiku/trunk/src/add-ons/input_server/methods/canna/CannaLooper.cpp
Log:
* Forgot to update the Canna directory.
* This fixes bug #3660.


Modified: haiku/trunk/src/add-ons/input_server/methods/canna/CannaLooper.cpp
===================================================================
--- haiku/trunk/src/add-ons/input_server/methods/canna/CannaLooper.cpp	2009-04-03 09:42:58 UTC (rev 29880)
+++ haiku/trunk/src/add-ons/input_server/methods/canna/CannaLooper.cpp	2009-04-03 17:52:49 UTC (rev 29881)
@@ -10,15 +10,17 @@
 
 #include <string.h>
 
+#include <Alert.h>
+#include <FindDirectory.h>
 #include <Input.h>
-#include <Screen.h>
 #include <Menu.h>
 #include <MenuItem.h>
-#include <Alert.h>
 #include <Messenger.h>
+#include <Path.h>
+#include <Screen.h>
 
 #ifdef DEBUG
-#include <Debug.h>
+#	include <Debug.h>
 #endif
 
 #include "CannaCommon.h"
@@ -27,8 +29,9 @@
 #include "KouhoWindow.h"
 #include "PaletteWindow.h"
 
-CannaLooper::CannaLooper( CannaMethod *method )
-	:BLooper( "Canna Looper" )
+
+CannaLooper::CannaLooper(CannaMethod* method)
+	: BLooper("Canna Looper")
 {
 	owner = method;
 	canna = 0;
@@ -109,23 +112,31 @@
 	BLooper::Quit();
 }
 
+
 status_t
-CannaLooper::ReadSettings( char *basepath )
+CannaLooper::ReadSettings(char* basePath)
 {
-#ifndef __HAIKU__ 
-	strcpy( basepath, "/boot/home/config/KanBe/" );
-#else
-	strcpy( basepath, "/etc/KanBe/" );
-#endif
+	BPath path;
+	status_t status = find_directory(B_SYSTEM_DATA_DIRECTORY, &path);
+	if (status != B_OK)
+		return status;
+
+	path.Append("KanBe");
+
+	strcpy(basePath, path.Path());
+
 	font_family family;
 	font_style style;
-	strcpy( family, "Haru" );
-	strcpy( style, "Regular" );
-	kouhoFont.SetFamilyAndStyle( family, style );
-	kouhoFont.SetSize( 12 );
-	return B_NO_ERROR;
+	strcpy(family, "Haru");
+	strcpy(style, "Regular");
+
+	kouhoFont.SetFamilyAndStyle(family, style);
+	kouhoFont.SetSize(12);
+
+	return B_OK;
 }
 
+
 void
 CannaLooper::EnqueueMessage( BMessage *msg )
 {



From axeld at mail.berlios.de  Fri Apr  3 20:32:01 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Fri, 3 Apr 2009 20:32:01 +0200
Subject: [Haiku-commits] r29882 - haiku/trunk/src/bin/make
Message-ID: <200904031832.n33IW1bF015740@sheep.berlios.de>

Author: axeld
Date: 2009-04-03 20:31:59 +0200 (Fri, 03 Apr 2009)
New Revision: 29882
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29882&view=rev

Modified:
   haiku/trunk/src/bin/make/config.h
Log:
* Fixed locale default directory (was wrong before my patch as well, though).


Modified: haiku/trunk/src/bin/make/config.h
===================================================================
--- haiku/trunk/src/bin/make/config.h	2009-04-03 17:52:49 UTC (rev 29881)
+++ haiku/trunk/src/bin/make/config.h	2009-04-03 18:31:59 UTC (rev 29882)
@@ -2,7 +2,7 @@
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
-#define LOCALEDIR	"/etc/local/"
+#define LOCALEDIR	"/etc/locale/"
 #define LIBDIR		"/boot/develop/lib/"
 #define INCLUDEDIR	"/boot/develop/headers/"
 



From stippi at mail.berlios.de  Fri Apr  3 21:40:22 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 3 Apr 2009 21:40:22 +0200
Subject: [Haiku-commits] r29883 - haiku/trunk/src/preferences/network
Message-ID: <200904031940.n33JeM4i024834@sheep.berlios.de>

Author: stippi
Date: 2009-04-03 21:39:15 +0200 (Fri, 03 Apr 2009)
New Revision: 29883
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29883&view=rev

Modified:
   haiku/trunk/src/preferences/network/EthernetSettingsView.cpp
   haiku/trunk/src/preferences/network/EthernetSettingsView.h
   haiku/trunk/src/preferences/network/Jamfile
Log:
When setting a network device to DHCP and applying the settings, trigger
auto-configuration in the net_server. Code taken and adopted from ifconfig.


Modified: haiku/trunk/src/preferences/network/EthernetSettingsView.cpp
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsView.cpp	2009-04-03 18:31:59 UTC (rev 29882)
+++ haiku/trunk/src/preferences/network/EthernetSettingsView.cpp	2009-04-03 19:39:15 UTC (rev 29883)
@@ -57,6 +57,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <NetServer.h>
+
 #include "AutoDeleter.h"
 
 
@@ -338,6 +340,7 @@
 	fCurrentSettings->SetAutoConfigure(
 		strcmp(fTypeMenuField->Menu()->FindMarked()->Label(), "DHCP") == 0);
 
+
 	fCurrentSettings->fNameservers.MakeEmpty();
 	fCurrentSettings->fNameservers.AddItem(new BString(
 		fPrimaryDNSTextControl->Text()));
@@ -355,6 +358,8 @@
 	_ApplyControlsToConfiguration();
 	_SaveDNSConfiguration();
 	_SaveAdaptersConfiguration();
+	if (fCurrentSettings->GetAutoConfigure())
+		_TriggerAutoConfig(fCurrentSettings->GetName());
 }
 
 
@@ -432,6 +437,42 @@
 
 
 status_t
+EthernetSettingsView::_TriggerAutoConfig(const char* device)
+{
+	BMessenger networkServer(kNetServerSignature);
+	if (!networkServer.IsValid()) {
+		(new BAlert("error", "The net_server needs to run for the auto "
+			"configuration!", "Ok"))->Go();
+		return B_ERROR;
+	}
+
+	BMessage message(kMsgConfigureInterface);
+	message.AddString("device", device);
+	BMessage address;
+	address.AddString("family", "inet");
+	address.AddBool("auto config", true);
+	message.AddMessage("address", &address);
+
+	BMessage reply;
+	status_t status = networkServer.SendMessage(&message, &reply);
+	if (status != B_OK) {
+		BString errorMessage("Sending auto-config message failed: ");
+		errorMessage << strerror(status);
+		(new BAlert("error", errorMessage.String(), "Ok"))->Go();
+		return status;
+	} else if (reply.FindInt32("status", &status) == B_OK
+			&& status != B_OK) {
+		BString errorMessage("Auto-configuring failed: ");
+		errorMessage << strerror(status);
+		(new BAlert("error", errorMessage.String(), "Ok"))->Go();
+		return status;
+	}
+
+	return B_OK;
+}
+
+
+status_t
 EthernetSettingsView::_GetPath(const char* name, BPath& path)
 {
 	if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path, true) != B_OK)

Modified: haiku/trunk/src/preferences/network/EthernetSettingsView.h
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsView.h	2009-04-03 18:31:59 UTC (rev 29882)
+++ haiku/trunk/src/preferences/network/EthernetSettingsView.h	2009-04-03 19:39:15 UTC (rev 29883)
@@ -45,6 +45,7 @@
 				void			_SaveAdaptersConfiguration();
 				void			_ApplyControlsToConfiguration();
 				status_t		_GetPath(const char* name, BPath& path);
+				status_t		_TriggerAutoConfig(const char* device);
 private:
 		
 				BButton*		fApplyButton;

Modified: haiku/trunk/src/preferences/network/Jamfile
===================================================================
--- haiku/trunk/src/preferences/network/Jamfile	2009-04-03 18:31:59 UTC (rev 29882)
+++ haiku/trunk/src/preferences/network/Jamfile	2009-04-03 19:39:15 UTC (rev 29883)
@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src preferences network ;
 
 UsePrivateHeaders shared ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers net ] : true ;
 
 Preference Network :
 	NetworkApp.cpp



From stippi at mail.berlios.de  Fri Apr  3 21:42:51 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 3 Apr 2009 21:42:51 +0200
Subject: [Haiku-commits] r29884 - haiku/trunk/src/preferences/network
Message-ID: <200904031942.n33JgpFu025065@sheep.berlios.de>

Author: stippi
Date: 2009-04-03 21:42:50 +0200 (Fri, 03 Apr 2009)
New Revision: 29884
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29884&view=rev

Modified:
   haiku/trunk/src/preferences/network/EthernetSettingsView.cpp
Log:
An unintentional line break was added in last commit.


Modified: haiku/trunk/src/preferences/network/EthernetSettingsView.cpp
===================================================================
--- haiku/trunk/src/preferences/network/EthernetSettingsView.cpp	2009-04-03 19:39:15 UTC (rev 29883)
+++ haiku/trunk/src/preferences/network/EthernetSettingsView.cpp	2009-04-03 19:42:50 UTC (rev 29884)
@@ -340,7 +340,6 @@
 	fCurrentSettings->SetAutoConfigure(
 		strcmp(fTypeMenuField->Menu()->FindMarked()->Label(), "DHCP") == 0);
 
-
 	fCurrentSettings->fNameservers.MakeEmpty();
 	fCurrentSettings->fNameservers.AddItem(new BString(
 		fPrimaryDNSTextControl->Text()));



From anevilyak at gmail.com  Sat Apr  4 01:01:42 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Fri, 3 Apr 2009 18:01:42 -0500
Subject: [Haiku-commits] r29876 - in haiku/trunk: build/jam
	build/scripts data/system/boot headers/os/storage
	src/apps/aboutsystem src/apps/processcontroller src/bin/bash
	src/bin/gdb/gdb src/bin/grep/src src/bin/make src/bin/vim/src
	src/kits/tracker src/p
Message-ID: <f019d2f30904031601t2d864434ja0865ebe870961f5@mail.gmail.com>

On Fri, Apr 3, 2009 at 4:27 AM, Axel D?rfler <axeld at pinc-software.de> wrote:
> axeld at BerliOS <axeld at mail.berlios.de> wrote:
>> Log:
>> * Changed directory structure as suggested on the mailing list.

FYI, you seem to have broken the devkit in the process, at least
everything I've tried to build now fails to find libbe and friends
when the compiler goes to link. Also noticed a few hardwired symlinks
in various places in /boot/develop/tools/gnupro that are pointing to
e.g. /boot/beos/system/lib/libstdc++.r4.so

Regards,

Rene


From oruizdorantes at mail.berlios.de  Sat Apr  4 01:04:31 2009
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Sat, 4 Apr 2009 01:04:31 +0200
Subject: [Haiku-commits] r29885 - in haiku/trunk/headers: os/kernel
	private/shared
Message-ID: <200904032304.n33N4VKF015335@sheep.berlios.de>

Author: oruizdorantes
Date: 2009-04-04 01:04:30 +0200 (Sat, 04 Apr 2009)
New Revision: 29885
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29885&view=rev

Modified:
   haiku/trunk/headers/os/kernel/OS.h
   haiku/trunk/headers/private/shared/cpu_type.h
Log:
- Path by Joerg Meyer
- Add identification for Efficeon CPUs



Modified: haiku/trunk/headers/os/kernel/OS.h
===================================================================
--- haiku/trunk/headers/os/kernel/OS.h	2009-04-03 19:42:50 UTC (rev 29884)
+++ haiku/trunk/headers/os/kernel/OS.h	2009-04-03 23:04:30 UTC (rev 29885)
@@ -561,6 +561,8 @@
 	/* Transmeta */
 	B_CPU_TRANSMETA_x86					= 0x1600,
 	B_CPU_TRANSMETA_CRUSOE				= 0x1654,
+	B_CPU_TRANSMETA_EFFICEON			= 0x16f2,
+	B_CPU_TRANSMETA_EFFICEON_2			= 0x16f3,
 
 	/* Rise */
 	B_CPU_RISE_x86						= 0x1400,

Modified: haiku/trunk/headers/private/shared/cpu_type.h
===================================================================
--- haiku/trunk/headers/private/shared/cpu_type.h	2009-04-03 19:42:50 UTC (rev 29884)
+++ haiku/trunk/headers/private/shared/cpu_type.h	2009-04-03 23:04:30 UTC (rev 29885)
@@ -166,6 +166,9 @@
 		/* Transmeta */
 		case B_CPU_TRANSMETA_CRUSOE:
 			return "Crusoe";
+		case B_CPU_TRANSMETA_EFFICEON:
+		case B_CPU_TRANSMETA_EFFICEON_2:
+			return "Efficeon";
 
 		/* IDT/VIA */
 		case B_CPU_IDT_WINCHIP_C6:



From anevilyak at mail.berlios.de  Sat Apr  4 01:34:14 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sat, 4 Apr 2009 01:34:14 +0200
Subject: [Haiku-commits] r29886 - haiku/trunk/build/jam
Message-ID: <200904032334.n33NYEtU013834@sheep.berlios.de>

Author: anevilyak
Date: 2009-04-04 01:34:13 +0200 (Sat, 04 Apr 2009)
New Revision: 29886
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29886&view=rev

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Fix building library symlinks. Should un-break building things within Haiku. Thanks Axel for helping track this down.


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-04-03 23:04:30 UTC (rev 29885)
+++ haiku/trunk/build/jam/OptionalPackages	2009-04-03 23:34:13 UTC (rev 29886)
@@ -188,7 +188,7 @@
 
 	# library symlinks
 	local lib ;
-	for lib in $(BEOS_SYSTEM_LIBS) libglut.so {
+	for lib in $(SYSTEM_LIBS) libglut.so {
 		AddSymlinkToHaikuImage develop lib x86 : /system/lib/$(lib:BS) ;
 	}
 



From phoudoin at mail.berlios.de  Sat Apr  4 01:36:56 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Sat, 4 Apr 2009 01:36:56 +0200
Subject: [Haiku-commits] r29887 -
	haiku/trunk/src/add-ons/input_server/devices/keyboard
Message-ID: <200904032336.n33NauXB016827@sheep.berlios.de>

Author: phoudoin
Date: 2009-04-04 01:36:31 +0200 (Sat, 04 Apr 2009)
New Revision: 29887
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29887&view=rev

Modified:
   haiku/trunk/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp
Log:
Fixed system teams check.


Modified: haiku/trunk/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp
===================================================================
--- haiku/trunk/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp	2009-04-03 23:34:13 UTC (rev 29886)
+++ haiku/trunk/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp	2009-04-03 23:36:31 UTC (rev 29887)
@@ -115,7 +115,9 @@
 bool
 TeamListItem::IsSystemServer()
 {
-	char* system = "/boot/beos/system/";
+    // TODO: use find_directory() in place of hardcoded paths
+
+	char* system = "/boot/system/";
 	if (strncmp(system, fInfo.args, strlen(system)) == 0)
 		return true;
 



From phoudoin at mail.berlios.de  Sat Apr  4 01:50:14 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Sat, 4 Apr 2009 01:50:14 +0200
Subject: [Haiku-commits] r29888 - haiku/trunk/src/system/libroot/posix/unistd
Message-ID: <200904032350.n33NoELT002687@sheep.berlios.de>

Author: phoudoin
Date: 2009-04-04 01:50:12 +0200 (Sat, 04 Apr 2009)
New Revision: 29888
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29888&view=rev

Modified:
   haiku/trunk/src/system/libroot/posix/unistd/conf.c
Log:
Another fix after /boot/beos -> /boot/system change.


Modified: haiku/trunk/src/system/libroot/posix/unistd/conf.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/unistd/conf.c	2009-04-03 23:36:31 UTC (rev 29887)
+++ haiku/trunk/src/system/libroot/posix/unistd/conf.c	2009-04-03 23:50:12 UTC (rev 29888)
@@ -335,7 +335,7 @@
 
 	switch (name) {
 		case _CS_PATH:
-			string = "/bin:/boot/beos/apps:" \
+			string = "/bin:/boot/system/apps:" \
 				"/boot/common/bin:/boot/develop/bin";
 			break;
 		default:



From phoudoin at mail.berlios.de  Sat Apr  4 01:51:48 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Sat, 4 Apr 2009 01:51:48 +0200
Subject: [Haiku-commits] r29889 -
	haiku/trunk/src/add-ons/kernel/file_systems/udf/drive_setup_addon
Message-ID: <200904032351.n33Npmp7003063@sheep.berlios.de>

Author: phoudoin
Date: 2009-04-04 01:51:47 +0200 (Sat, 04 Apr 2009)
New Revision: 29889
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29889&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
Log:
Fixed UDF drive_setup_addon install location.
Please review, as I clearly dunno what I'm doing here ;-)


Modified: haiku/trunk/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile	2009-04-03 23:50:12 UTC (rev 29888)
+++ haiku/trunk/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile	2009-04-03 23:51:47 UTC (rev 29889)
@@ -51,7 +51,7 @@
 
 actions ignore InstallUDFDS
 {
-	cp $(>) /boot/beos/system/add-ons/drive_setup/fs/
+	cp $(>) /boot/system/add-ons/drive_setup/fs/
 }
 
 InstallUDFDS install : i-udf-ds ;



From phoudoin at mail.berlios.de  Sat Apr  4 01:56:28 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Sat, 4 Apr 2009 01:56:28 +0200
Subject: [Haiku-commits] r29890 - haiku/trunk/src/libs/iconv
Message-ID: <200904032356.n33NuSjn003450@sheep.berlios.de>

Author: phoudoin
Date: 2009-04-04 01:56:26 +0200 (Sat, 04 Apr 2009)
New Revision: 29890
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29890&view=rev

Modified:
   haiku/trunk/src/libs/iconv/Jamfile
Log:
Fixed iconv LIBDIR definition.


Modified: haiku/trunk/src/libs/iconv/Jamfile
===================================================================
--- haiku/trunk/src/libs/iconv/Jamfile	2009-04-03 23:51:47 UTC (rev 29889)
+++ haiku/trunk/src/libs/iconv/Jamfile	2009-04-03 23:56:26 UTC (rev 29890)
@@ -10,7 +10,7 @@
 	: -Wmissing-prototypes -Wsign-compare ] ;
 
 SubDirCcFlags
-	-DLIBDIR="\\\"/boot/beos/system/lib\\\""
+	-DLIBDIR="\\\"/boot/system/lib\\\""
 	-DICONV_CONST=""
 	;
 



From phoudoin at mail.berlios.de  Sat Apr  4 02:02:51 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Sat, 4 Apr 2009 02:02:51 +0200
Subject: [Haiku-commits] r29891 -
	haiku/trunk/src/add-ons/mail_daemon/outbound_filters/fortune
Message-ID: <200904040002.n3402pCC003964@sheep.berlios.de>

Author: phoudoin
Date: 2009-04-04 02:02:49 +0200 (Sat, 04 Apr 2009)
New Revision: 29891
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29891&view=rev

Modified:
   haiku/trunk/src/add-ons/mail_daemon/outbound_filters/fortune/ConfigView.cpp
Log:
Fixed default fortunes file path.


Modified: haiku/trunk/src/add-ons/mail_daemon/outbound_filters/fortune/ConfigView.cpp
===================================================================
--- haiku/trunk/src/add-ons/mail_daemon/outbound_filters/fortune/ConfigView.cpp	2009-04-03 23:56:26 UTC (rev 29890)
+++ haiku/trunk/src/add-ons/mail_daemon/outbound_filters/fortune/ConfigView.cpp	2009-04-04 00:02:49 UTC (rev 29891)
@@ -27,7 +27,7 @@
 
 	BRect rect(5,4,250,25);
 	rect.bottom = rect.top - 2 + itemHeight;
-	BMailFileConfigView *fview = new BMailFileConfigView(MDR_DIALECT_CHOICE ("Fortune File:","??????:"),"fortune_file",false,"/boot/beos/etc/fortunes/default",B_FILE_NODE);
+	BMailFileConfigView *fview = new BMailFileConfigView(MDR_DIALECT_CHOICE ("Fortune File:","??????:"),"fortune_file",false,"/boot/system/etc/fortunes/default",B_FILE_NODE);
 	AddChild(fview);
 	
 	rect.top = rect.bottom + 8;
@@ -44,7 +44,7 @@
 {
 	BString path = archive->FindString("fortune_file");
 	if (path == B_EMPTY_STRING)
-		path = "/boot/beos/etc/fortunes/default";
+		path = "/boot/system/etc/fortunes/default";
 	
 	if (BMailFileConfigView *control = (BMailFileConfigView *)FindView("fortune_file"))
 		control->SetTo(archive,NULL);



From superstippi at gmx.de  Sun Apr  5 02:28:09 2009
From: superstippi at gmx.de (=?utf-8?q?Stephan_A=C3=9Fmus?=)
Date: Sun, 05 Apr 2009 02:28:09 +0200
Subject: [Haiku-commits] r29889 -
 haiku/trunk/src/add-ons/kernel/file_systems/udf/drive_setup_addon
In-Reply-To: <200904032351.n33Npmp7003063@sheep.berlios.de>
References: <200904032351.n33Npmp7003063@sheep.berlios.de>
Message-ID: <20090405022809.50793.2@bepc.1238874027.fake>


On 2009-04-05 at 02:24:23 [+0200], phoudoin at mail.berlios.de wrote:
> Author: phoudoin
> Date: 2009-04-04 01:51:47 +0200 (Sat, 04 Apr 2009) New Revision: 29889
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29889&view=rev
> 
> Modified:
>    haiku/trunk/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfi
>    le
> Log:
> Fixed UDF drive_setup_addon install location.
> Please review, as I clearly dunno what I'm doing here ;-)
> 
> 
> Modified: 
> haiku/trunk/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile 
> ===================================================================
> --- 
> haiku/trunk/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile 
>    2009-04-03 23:50:12 UTC (rev 29888)
> +++ 
> haiku/trunk/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile 
>    2009-04-03 23:51:47 UTC (rev 29889)
> @@ -51,7 +51,7 @@
>  
>  actions ignore InstallUDFDS
>  {
> -    cp $(>) /boot/beos/system/add-ons/drive_setup/fs/
> +    cp $(>) /boot/system/add-ons/drive_setup/fs/
>  }

Haiku takes completely different types of add-ons (disk device api).

Best regards,
-Stephan



From superstippi at gmx.de  Sun Apr  5 02:29:40 2009
From: superstippi at gmx.de (=?utf-8?q?Stephan_A=C3=9Fmus?=)
Date: Sun, 05 Apr 2009 02:29:40 +0200
Subject: [Haiku-commits] r29891 -
 haiku/trunk/src/add-ons/mail_daemon/outbound_filters/fortune
In-Reply-To: <200904040002.n3402pCC003964@sheep.berlios.de>
References: <200904040002.n3402pCC003964@sheep.berlios.de>
Message-ID: <20090405022940.50831.3@bepc.1238874027.fake>


On 2009-04-05 at 02:24:23 [+0200], phoudoin at mail.berlios.de wrote:
> Author: phoudoin
> Date: 2009-04-04 02:02:49 +0200 (Sat, 04 Apr 2009) New Revision: 29891
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29891&view=rev
> 
> Modified:
>    haiku/trunk/src/add-ons/mail_daemon/outbound_filters/fortune/ConfigView
>    .cpp
> Log:
> Fixed default fortunes file path.
> 
> 
> Modified: 
> haiku/trunk/src/add-ons/mail_daemon/outbound_filters/fortune/ConfigView.cp
> p ===================================================================
> --- 
> haiku/trunk/src/add-ons/mail_daemon/outbound_filters/fortune/ConfigView.cp
> p    2009-04-03 23:56:26 UTC (rev 29890)
> +++ 
> haiku/trunk/src/add-ons/mail_daemon/outbound_filters/fortune/ConfigView.cp
> p    2009-04-04 00:02:49 UTC (rev 29891)
> @@ -27,7 +27,7 @@
>  
>      BRect rect(5,4,250,25);
>      rect.bottom = rect.top - 2 + itemHeight;
> -    BMailFileConfigView *fview = new 
> BMailFileConfigView(MDR_DIALECT_CHOICE ("Fortune 
> File:","??????:"),"fortune_file",false,"/boot/beos/etc/fortunes/default",B
> _FILE_NODE);
> +    BMailFileConfigView *fview = new 
> BMailFileConfigView(MDR_DIALECT_CHOICE ("Fortune 
> File:","??????:"),"fortune_file",false,"/boot/system/etc/fortunes/default"
> ,B_FILE_NODE);
>      AddChild(fview);
>      
>      rect.top = rect.bottom + 8;
> @@ -44,7 +44,7 @@
>  {
>      BString path = archive->FindString("fortune_file"); if (path == 
>      B_EMPTY_STRING)
> -        path = "/boot/beos/etc/fortunes/default";
> +        path = "/boot/system/etc/fortunes/default";

Hm. While you're at it, you may as well fix the problem for real. ;-)

Best regards,
-Stephan


From phoudoin at mail.berlios.de  Sat Apr  4 02:34:51 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Sat, 4 Apr 2009 02:34:51 +0200
Subject: [Haiku-commits] r29892 - in haiku/trunk/data:
	common/boot/post_install config/boot
Message-ID: <200904040034.n340Yprg009991@sheep.berlios.de>

Author: phoudoin
Date: 2009-04-04 02:34:46 +0200 (Sat, 04 Apr 2009)
New Revision: 29892
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29892&view=rev

Modified:
   haiku/trunk/data/common/boot/post_install/mime_update.sh
   haiku/trunk/data/config/boot/UserBootscript.sample
Log:
Fixed system paths. 
At least, this system directory relayout show vividly that in many places we should use find_directory() 
instead. Ironically, these ones can't but keep hardcoded paths, except if I've missed some 
/bin/find_directory tool ;-)


Modified: haiku/trunk/data/common/boot/post_install/mime_update.sh
===================================================================
--- haiku/trunk/data/common/boot/post_install/mime_update.sh	2009-04-04 00:02:49 UTC (rev 29891)
+++ haiku/trunk/data/common/boot/post_install/mime_update.sh	2009-04-04 00:34:46 UTC (rev 29892)
@@ -2,8 +2,8 @@
 
 # Make sure all apps have a MIME DB entry.
 
-mimeset -apps -f /boot/beos/apps
-mimeset -f /boot/beos/documentation
-mimeset -apps -f /boot/beos/preferences
-mimeset -apps -f /boot/beos/system/servers
+mimeset -apps -f /boot/system/apps
+mimeset -f /boot/system/documentation
+mimeset -apps -f /boot/system/preferences
+mimeset -apps -f /boot/system/servers
 mimeset -apps -f /boot/apps

Modified: haiku/trunk/data/config/boot/UserBootscript.sample
===================================================================
--- haiku/trunk/data/config/boot/UserBootscript.sample	2009-04-04 00:02:49 UTC (rev 29891)
+++ haiku/trunk/data/config/boot/UserBootscript.sample	2009-04-04 00:34:46 UTC (rev 29892)
@@ -12,4 +12,4 @@
 # This will allow the script to execute that command and process the next line.
 
 # Run LaunchBox
-# /boot/beos/apps/LaunchBox &
+# /boot/system/apps/LaunchBox &



From stippi at mail.berlios.de  Sat Apr  4 10:08:54 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sat, 4 Apr 2009 10:08:54 +0200
Subject: [Haiku-commits] r29893 - haiku/trunk/src/apps/deskcalc
Message-ID: <200904040808.n3488sMi028247@sheep.berlios.de>

Author: stippi
Date: 2009-04-04 10:08:51 +0200 (Sat, 04 Apr 2009)
New Revision: 29893
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29893&view=rev

Modified:
   haiku/trunk/src/apps/deskcalc/CalcView.cpp
Log:
* Fix drawing the background if needed on other shelfs than Tracker (untested).
* Fix invalidating the whole view when receiving a color drop, since the frame
  around the text input is also affected now.


Modified: haiku/trunk/src/apps/deskcalc/CalcView.cpp
===================================================================
--- haiku/trunk/src/apps/deskcalc/CalcView.cpp	2009-04-04 00:34:46 UTC (rev 29892)
+++ haiku/trunk/src/apps/deskcalc/CalcView.cpp	2009-04-04 08:08:51 UTC (rev 29893)
@@ -284,7 +284,7 @@
 CalcView::Draw(BRect updateRect)
 {
 	bool drawBackground = true;
-	if (Parent() && Window()->Bounds() != Frame()) {
+	if (Parent() && (Parent()->Flags() & B_DRAW_ON_CHILDREN) != 0) {
 		// CalcView is embedded somewhere, most likely the Tracker Desktop
 		// shelf.
 		drawBackground = false;
@@ -758,8 +758,8 @@
 		if (keypadRect.Contains(dropPoint) && dropColor) {
 			fBaseColor = *dropColor;
 			_Colorize();
-			// redraw keypad
-			Invalidate(keypadRect);
+			// redraw
+			Invalidate();
 		}
 
 	} else {



From stippi at mail.berlios.de  Sat Apr  4 13:07:49 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sat, 4 Apr 2009 13:07:49 +0200
Subject: [Haiku-commits] r29894 - haiku/trunk/src/preferences/appearance
Message-ID: <200904041107.n34B7nxI007070@sheep.berlios.de>

Author: stippi
Date: 2009-04-04 13:07:44 +0200 (Sat, 04 Apr 2009)
New Revision: 29894
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29894&view=rev

Modified:
   haiku/trunk/src/preferences/appearance/APRView.cpp
Log:
Patch by Jaagup Repaen: Fix crash when pressing "Defaults" because of
non-existing decor popup. Thanks a lot!


Modified: haiku/trunk/src/preferences/appearance/APRView.cpp
===================================================================
--- haiku/trunk/src/preferences/appearance/APRView.cpp	2009-04-04 08:08:51 UTC (rev 29893)
+++ haiku/trunk/src/preferences/appearance/APRView.cpp	2009-04-04 11:07:44 UTC (rev 29894)
@@ -197,12 +197,14 @@
 			UpdateControls();
 			UpdateAllColors();
 
-			BMenuItem *item = fDecorMenu->FindItem("Default");
-			if (item) {
-				item->SetMarked(true);
-				#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-				BPrivate::set_decorator(fDecorMenu->IndexOf(item));
-				#endif
+			if (fDecorMenu) {
+				BMenuItem *item = fDecorMenu->FindItem("Default");
+				if (item) {
+					item->SetMarked(true);
+					#ifdef HAIKU_TARGET_PLATFORM_HAIKU
+					BPrivate::set_decorator(fDecorMenu->IndexOf(item));
+					#endif
+				}
 			}
 			Window()->PostMessage(kMsgUpdate);
 			break;



From mmu_man at mail.berlios.de  Sat Apr  4 13:24:04 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sat, 4 Apr 2009 13:24:04 +0200
Subject: [Haiku-commits] r29895 -
	haiku/trunk/src/add-ons/kernel/file_systems/googlefs
Message-ID: <200904041124.n34BO4mV024042@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-04 13:24:03 +0200 (Sat, 04 Apr 2009)
New Revision: 29895
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29895&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/googlefs/http_cnx.c
   haiku/trunk/src/add-ons/kernel/file_systems/googlefs/parse_google_html.c
Log:
Fixed googlefs, 
- it now reports as Mozilla/5 compatible to get classed tags to better identify results and make sure the server doesn't fallback to html4
- fixed parsing
- the google servers are getting picky about http CRLF, so send them correctly.
Now it needs to be ported to the Haiku VFS...


Modified: haiku/trunk/src/add-ons/kernel/file_systems/googlefs/http_cnx.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/googlefs/http_cnx.c	2009-04-04 11:07:44 UTC (rev 29894)
+++ haiku/trunk/src/add-ons/kernel/file_systems/googlefs/http_cnx.c	2009-04-04 11:24:03 UTC (rev 29895)
@@ -26,7 +26,14 @@
 
 #define HTTPVER "1.0"
 
-#define GOOGLEFS_UA "GoogleFS"
+//#define GOOGLEFS_UA "GoogleFS"
+//Mozilla/3.0 (compatible; NetPositive/2.2.2; BeOS)
+//Mozilla/5.0 (BeOS; U; BeOS BePC; en-US; rv:1.8.1.18) Gecko/20081114 BonEcho/2.0.0.18
+#ifdef __HAIKU__
+#define GOOGLEFS_UA "Mozilla/5.0 (compatible; GoogleFS/0.1; Haiku)"
+#else
+#define GOOGLEFS_UA "Mozilla/5.0 (compatible; GoogleFS/0.1; BeOS)"
+#endif
 
 #ifdef TESTME
 #define BUFSZ (128*1024)
@@ -125,7 +132,7 @@
 	if (!req)
 		return B_NO_MEMORY;
 	/* no snprintf in kernel :( */
-	sprintf(req, "GET %s HTTP/"HTTPVER"\nUser-Agent: " GOOGLEFS_UA "/" "0.1" "\nAccept: */*\n\n", url);
+	sprintf(req, "GET %s HTTP/"HTTPVER"\r\nUser-Agent: " GOOGLEFS_UA "\r\nAccept: */*\r\n\r\n", url);
 	reqlen = strlen(req);
 	err = len = write(cnx->sock, req, reqlen);
 	if (len < 1)

Modified: haiku/trunk/src/add-ons/kernel/file_systems/googlefs/parse_google_html.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/googlefs/parse_google_html.c	2009-04-04 11:07:44 UTC (rev 29894)
+++ haiku/trunk/src/add-ons/kernel/file_systems/googlefs/parse_google_html.c	2009-04-04 11:24:03 UTC (rev 29895)
@@ -24,12 +24,17 @@
 
 #ifdef TESTME
 #define BUFSZ (128*1024)
+int dbgstep = 0;
+#define PRST printf(DBG "step %d\n", dbgstep++)
+#else
+#define PRST {}
 #endif
 
 //old
 //#define G_BEGIN_URL "<p class=g><a class=l href=\""
 //#define G_BEGIN_URL "<div class=g><a class=l href=\""
-#define G_BEGIN_URL "<div class=g><a href=\""
+//#define G_BEGIN_URL "<div class=g><a href=\""
+#define G_BEGIN_URL "<li class=g><h3 class=r><a href=\""
 //#define G_END_URL "\">"
 #define G_END_URL "\" class=l>"
 //#define G_BEGIN_NAME 
@@ -55,26 +60,41 @@
 		return EINVAL;
 	/* sanity checks */
 	printf(DBG"sanity check...\n");
-	if (strstr(html, "<html><head>") != html)
-		return EINVAL;
+	PRST;
+	/* google now sends <!doctype html><head> sometimes... */
+	if (strstr(html, "<!doctype html><head>") != html) {
+		if (strstr(html, "<html><head>") != html)
+			return EINVAL;
+	}
+	PRST;
 //	p = strstr(html, "<title>Google Search:");
 	p = strstr(html, "Google");
 	if (!p) return EINVAL;
-	p = strstr(html, "</head><body");
+	PRST;
+	p = strstr(html, "<body");
 	if (!p) return EINVAL;
-	p = strstr(html, ">Results <b>");
+	PRST;
+	p = strstr(html, ">&nbsp;Results <b>");
 	if (!p) return EINVAL;
-	p+= strlen(">Results <b>");
+	PRST;
+	p+= strlen(">&nbsp;Results <b>");
 	startid = strtol(p, &p, 10);
 	if (!p) return EINVAL;
+	PRST;
 	p = strstr(html, "</b> - <b>");
 	p+= strlen("</b> - <b>");
 	if (!p) return EINVAL;
+	PRST;
 	lastid = strtol(p, &p, 10);
 	if (!p) return EINVAL;
+	PRST;
 	maxres = lastid - startid + 1;
 	printf(DBG"getting %ld results (%ld to %ld)\n", maxres, startid, lastid);
 	
+	p = strstr(html, "Search Results<");
+	if (!p) return EINVAL;
+	PRST;
+
 	
 	printf(DBG"parsing...\n");
 	do {
@@ -82,6 +102,9 @@
 		long itemlen;
 		char *tmp;
 		int i;
+#ifdef TESTME
+		dbgstep = 0;
+#endif
 		nres = malloc(sizeof(struct google_result));
 		if (!nres) {
 			// XXX: cleanup!
@@ -90,6 +113,7 @@
 		memset(nres, 0, sizeof(struct google_result));
 		nres->id = startid + numres; //- 1;
 
+		PRST;
 		/* find url */
 		// <p class=g><a href=URL>
 		if (!p) break;
@@ -98,12 +122,14 @@
 		else
 			p = strstr(p, G_BEGIN_URL);
 		if (!p) break;
+		PRST;
 		p+= strlen(G_BEGIN_URL);
 		nextresult = strstr(p, G_BEGIN_URL);
 		//printf(DBG"[%ld] found token 1\n", numres);
 		item = p;
 		p = strstr(p, G_END_URL);
 		if (!p) break;
+		PRST;
 		p+= strlen(G_END_URL);
 		//printf(DBG"[%ld] found token 2\n", numres);
 		itemlen = p - item - strlen(G_END_URL);
@@ -116,6 +142,7 @@
 		item = p;
 		p = strstr(p, G_END_NAME);
 		if (!p) break;
+		PRST;
 		p+= strlen(G_END_NAME);
 		//printf(DBG"[%ld] found token 3\n", numres);
 		itemlen = p - item - strlen(G_END_NAME);
@@ -127,10 +154,17 @@
 		strncpy(q, item, itemlen);
 		q[itemlen] = '\0';
 		/* strip <*b> off */
+		PRST;
 		while ((tmp = strstr(q, "<b>")))
 			strcpy(tmp, tmp + 3);
 		while ((tmp = strstr(q, "</b>")))
 			strcpy(tmp, tmp + 4);
+		/* strip <*em> off */
+		PRST;
+		while ((tmp = strstr(q, "<em>")))
+			strcpy(tmp, tmp + 4);
+		while ((tmp = strstr(q, "</em>")))
+			strcpy(tmp, tmp + 5);
 		/* strip &foo; */
 		tmp = unentitify_string(q);
 		free(q);
@@ -139,6 +173,7 @@
 		strncpy(nres->name, tmp, GR_MAX_NAME-1);
 		nres->name[GR_MAX_NAME-1] = '\0';
 		free(tmp);
+		PRST;
 		
 #if 0
 		/* find snipset */



From axeld at pinc-software.de  Sat Apr  4 12:13:37 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sat, 04 Apr 2009 12:13:37
Subject: [Haiku-commits]
 =?utf-8?q?r29892_-_in_haiku/trunk/data=3A_common/?=
 =?utf-8?q?boot/post=5Finstall_config/boot?=
In-Reply-To: <200904040034.n340Yprg009991@sheep.berlios.de>
Message-ID: <3853757050-BeMail@ibm>

phoudoin at mail.berlios.de wrote:
> Log:
> Fixed system paths. 
> At least, this system directory relayout show vividly that in many 
> places we should > use find_directory() 
> instead. Ironically, these ones can't but keep hardcoded paths, except 
> if I've
> missed some /bin/find_directory tool ;-)

How about finddir? :-)
Which reminds me that I actually need to update that as well.

Bye,
   Axel.



From axeld at mail.berlios.de  Sat Apr  4 14:25:37 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sat, 4 Apr 2009 14:25:37 +0200
Subject: [Haiku-commits] r29896 - haiku/trunk/src/bin
Message-ID: <200904041225.n34CPbbu025246@sheep.berlios.de>

Author: axeld
Date: 2009-04-04 14:25:36 +0200 (Sat, 04 Apr 2009)
New Revision: 29896
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29896&view=rev

Modified:
   haiku/trunk/src/bin/finddir.c
Log:
* Updated to contain all of the directory constant changes made so far.
* Some cleanup.


Modified: haiku/trunk/src/bin/finddir.c
===================================================================
--- haiku/trunk/src/bin/finddir.c	2009-04-04 11:24:03 UTC (rev 29895)
+++ haiku/trunk/src/bin/finddir.c	2009-04-04 12:25:36 UTC (rev 29896)
@@ -1,16 +1,17 @@
 /*
- * finddir.c - 
- * (c) 2002, Sebastian Nozzi <sebnozzi at gmx.net>
- * 08/24/2004 - Francois Revol - added -l option.
+ * Copyright 2002, Sebastian Nozzi <sebnozzi at gmx.net>.
+ * Copyright 2004, Francois Revol.
+ *
+ * Distributed under the terms of the MIT License.
  */
 
+#include <stdio.h>
+#include <string.h>
+
 #include <FindDirectory.h>
 #include <fs_info.h>
 
-#include <stdio.h>
-#include <string.h>
 
-
 #define NO_ERRORS			0
 #define ARGUMENT_MISSING	1
 #define WRONG_DIR_TYPE		2
@@ -20,25 +21,34 @@
 	directory_which value;
 } directoryType;
 
-#define KEYVALUE_PAIR(key) {#key,key}
+#define KEYVALUE_PAIR(key) {#key, key}
 
 directoryType directoryTypes[] = {
+	// Generic directories
 	KEYVALUE_PAIR(B_DESKTOP_DIRECTORY),
 	KEYVALUE_PAIR(B_TRASH_DIRECTORY),
 	KEYVALUE_PAIR(B_APPS_DIRECTORY),
 	KEYVALUE_PAIR(B_PREFERENCES_DIRECTORY),
-	KEYVALUE_PAIR(B_BEOS_DIRECTORY),
-	KEYVALUE_PAIR(B_BEOS_SYSTEM_DIRECTORY),
-	KEYVALUE_PAIR(B_BEOS_ADDONS_DIRECTORY),
-	KEYVALUE_PAIR(B_BEOS_BOOT_DIRECTORY),
-	KEYVALUE_PAIR(B_BEOS_FONTS_DIRECTORY),
-	KEYVALUE_PAIR(B_BEOS_LIB_DIRECTORY),
-	KEYVALUE_PAIR(B_BEOS_SERVERS_DIRECTORY),
-	KEYVALUE_PAIR(B_BEOS_APPS_DIRECTORY),
-	KEYVALUE_PAIR(B_BEOS_BIN_DIRECTORY),
-	KEYVALUE_PAIR(B_BEOS_ETC_DIRECTORY),
-	KEYVALUE_PAIR(B_BEOS_DOCUMENTATION_DIRECTORY),
-	KEYVALUE_PAIR(B_BEOS_PREFERENCES_DIRECTORY),
+	KEYVALUE_PAIR(B_UTILITIES_DIRECTORY),
+
+	// System directories
+	KEYVALUE_PAIR(B_SYSTEM_DIRECTORY),
+	KEYVALUE_PAIR(B_SYSTEM_ADDONS_DIRECTORY),
+	KEYVALUE_PAIR(B_SYSTEM_BOOT_DIRECTORY),
+	KEYVALUE_PAIR(B_SYSTEM_FONTS_DIRECTORY),
+	KEYVALUE_PAIR(B_SYSTEM_LIB_DIRECTORY),
+	KEYVALUE_PAIR(B_SYSTEM_SERVERS_DIRECTORY),
+	KEYVALUE_PAIR(B_SYSTEM_APPS_DIRECTORY),
+	KEYVALUE_PAIR(B_SYSTEM_BIN_DIRECTORY),
+	KEYVALUE_PAIR(B_SYSTEM_ETC_DIRECTORY),
+	KEYVALUE_PAIR(B_SYSTEM_DOCUMENTATION_DIRECTORY),
+	KEYVALUE_PAIR(B_SYSTEM_PREFERENCES_DIRECTORY),
+	KEYVALUE_PAIR(B_SYSTEM_TRANSLATORS_DIRECTORY),
+	KEYVALUE_PAIR(B_SYSTEM_MEDIA_NODES_DIRECTORY),
+	KEYVALUE_PAIR(B_SYSTEM_SOUNDS_DIRECTORY),
+	KEYVALUE_PAIR(B_SYSTEM_DATA_DIRECTORY),
+
+	// Common directories
 	KEYVALUE_PAIR(B_COMMON_DIRECTORY),
 	KEYVALUE_PAIR(B_COMMON_SYSTEM_DIRECTORY),
 	KEYVALUE_PAIR(B_COMMON_ADDONS_DIRECTORY),
@@ -55,6 +65,12 @@
 	KEYVALUE_PAIR(B_COMMON_SPOOL_DIRECTORY),
 	KEYVALUE_PAIR(B_COMMON_TEMP_DIRECTORY),
 	KEYVALUE_PAIR(B_COMMON_VAR_DIRECTORY),
+	KEYVALUE_PAIR(B_COMMON_TRANSLATORS_DIRECTORY),
+	KEYVALUE_PAIR(B_COMMON_MEDIA_NODES_DIRECTORY),
+	KEYVALUE_PAIR(B_COMMON_SOUNDS_DIRECTORY),
+	KEYVALUE_PAIR(B_COMMON_DATA_DIRECTORY),
+
+	// User directories
 	KEYVALUE_PAIR(B_USER_DIRECTORY),
 	KEYVALUE_PAIR(B_USER_CONFIG_DIRECTORY),
 	KEYVALUE_PAIR(B_USER_ADDONS_DIRECTORY),
@@ -63,23 +79,32 @@
 	KEYVALUE_PAIR(B_USER_LIB_DIRECTORY),
 	KEYVALUE_PAIR(B_USER_SETTINGS_DIRECTORY),
 	KEYVALUE_PAIR(B_USER_DESKBAR_DIRECTORY),
-	/* some more */
+	KEYVALUE_PAIR(B_USER_PRINTERS_DIRECTORY),
+	KEYVALUE_PAIR(B_USER_TRANSLATORS_DIRECTORY),
+	KEYVALUE_PAIR(B_USER_MEDIA_NODES_DIRECTORY),
+	KEYVALUE_PAIR(B_USER_SOUNDS_DIRECTORY),
+	KEYVALUE_PAIR(B_USER_DATA_DIRECTORY),
+	KEYVALUE_PAIR(B_USER_CACHE_DIRECTORY),
+
+	// Legacy system directories
+	KEYVALUE_PAIR(B_BEOS_DIRECTORY),
+	KEYVALUE_PAIR(B_BEOS_SYSTEM_DIRECTORY),
+	KEYVALUE_PAIR(B_BEOS_ADDONS_DIRECTORY),
+	KEYVALUE_PAIR(B_BEOS_BOOT_DIRECTORY),
+	KEYVALUE_PAIR(B_BEOS_FONTS_DIRECTORY),
+	KEYVALUE_PAIR(B_BEOS_LIB_DIRECTORY),
+	KEYVALUE_PAIR(B_BEOS_SERVERS_DIRECTORY),
+	KEYVALUE_PAIR(B_BEOS_APPS_DIRECTORY),
+	KEYVALUE_PAIR(B_BEOS_BIN_DIRECTORY),
+	KEYVALUE_PAIR(B_BEOS_ETC_DIRECTORY),
+	KEYVALUE_PAIR(B_BEOS_DOCUMENTATION_DIRECTORY),
+	KEYVALUE_PAIR(B_BEOS_PREFERENCES_DIRECTORY),
+	KEYVALUE_PAIR(B_BEOS_TRANSLATORS_DIRECTORY),
 	KEYVALUE_PAIR(B_BEOS_MEDIA_NODES_DIRECTORY),
 	KEYVALUE_PAIR(B_BEOS_SOUNDS_DIRECTORY),
-	KEYVALUE_PAIR(B_BEOS_TRANSLATORS_DIRECTORY),
-	KEYVALUE_PAIR(B_COMMON_MEDIA_NODES_DIRECTORY),
-	KEYVALUE_PAIR(B_COMMON_SOUNDS_DIRECTORY),
-	KEYVALUE_PAIR(B_COMMON_TRANSLATORS_DIRECTORY),
-	KEYVALUE_PAIR(B_USER_MEDIA_NODES_DIRECTORY),
-	KEYVALUE_PAIR(B_USER_PRINTERS_DIRECTORY),
-	KEYVALUE_PAIR(B_USER_SOUNDS_DIRECTORY),
-	KEYVALUE_PAIR(B_USER_TRANSLATORS_DIRECTORY),
-	KEYVALUE_PAIR(B_UTILITIES_DIRECTORY),
-#ifdef B_BEOS_VERSION_DANO
-	/* Dano specific */
-	KEYVALUE_PAIR(B_ROOT_DIRECTORY),
-#endif /* B_BEOS_VERSION_DANO */
-	{NULL,B_USER_DESKBAR_DIRECTORY}
+	KEYVALUE_PAIR(B_BEOS_DATA_DIRECTORY),
+
+	{NULL, B_USER_DESKBAR_DIRECTORY}
 };
 
 
@@ -95,13 +120,14 @@
 
 
 static bool
-retrieveDirValue(directoryType *list, const char *key, directory_which *value_out)
+retrieveDirValue(directoryType *list, const char *key,
+	directory_which *valueOut)
 {
 	unsigned i = 0;
 	
 	while (list[i].key != NULL) {
 		if (strcmp(list[i].key, key) == 0) {
-			*value_out = list[i].value;
+			*valueOut = list[i].value;
 			return true;
 		}
 
@@ -173,10 +199,8 @@
 	if (status == NO_ERRORS && argc > directoryArgNr) {
 		/* get directory constant from next argument */
 
-		if (retrieveDirValue(directoryTypes, argv[directoryArgNr], &dirType) == false) {
+		if (!retrieveDirValue(directoryTypes, argv[directoryArgNr], &dirType))
 			status = WRONG_DIR_TYPE;
-		}
-		
 	} else {
 		status = ARGUMENT_MISSING;
 	}
@@ -186,10 +210,8 @@
 	if (status == NO_ERRORS) {
 		/* Question: would B_PATH_NAME_LENGTH alone have been enough? */
 		char buffer[B_PATH_NAME_LENGTH+B_FILE_NAME_LENGTH];
-		status_t result;
-		
-		result = find_directory (dirType, volume, /*create it*/ false, buffer, sizeof(buffer));
-		
+		status_t result = find_directory (dirType, volume, false, buffer,
+			sizeof(buffer));
 		if (result == B_OK) {
 			printf("%s\n", buffer);
 		} else {
@@ -202,7 +224,8 @@
 	/* Error messages and return code setting */
 
 	if (status == WRONG_DIR_TYPE) {
-		printf("%s: unrecognized directory_which constant \'%s\'\n", argv[0], argv[directoryArgNr]);
+		printf("%s: unrecognized directory_which constant \'%s\'\n", argv[0],
+			argv[directoryArgNr]);
 		returnCode = 252;
 	}
 
@@ -210,7 +233,7 @@
 		usageMsg();
 		returnCode = 255;
 	}
-	
+
 	return returnCode;
 }
 



From axeld at mail.berlios.de  Sat Apr  4 15:35:50 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sat, 4 Apr 2009 15:35:50 +0200
Subject: [Haiku-commits] r29897 - in haiku/trunk: build/jam
	src/add-ons/input_server/methods/canna
Message-ID: <200904041335.n34DZoPG000216@sheep.berlios.de>

Author: axeld
Date: 2009-04-04 15:35:46 +0200 (Sat, 04 Apr 2009)
New Revision: 29897
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29897&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/src/add-ons/input_server/methods/canna/CannaLooper.cpp
   haiku/trunk/src/add-ons/input_server/methods/canna/CannaLooper.h
   haiku/trunk/src/add-ons/input_server/methods/canna/CannaMethod.cpp
Log:
* Fixed Canna (and bug #3660) for real this time.
* Cleaned up CannaLooper.cpp/h to mostly conform to our coding style.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-04 12:25:36 UTC (rev 29896)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-04 13:35:46 UTC (rev 29897)
@@ -344,16 +344,16 @@
 AddFilesToHaikuImage system fonts psfonts : $(psFonts) ;
 AddFilesToHaikuImage system fonts ttfonts : $(ttFonts) ;
 
-local kanbeDir = [ FDirName $(HAIKU_TOP) data etc KanBe ] ;
-local kanbeDefault = [ Glob $(kanbeDir)/default : *.canna *.gz ] ;
-local kanbeDic = [ Glob $(kanbeDir)/dic : *.cbp ] ;
-local kanbeDicCanna = [ Glob $(kanbeDir)/dic/canna
+local cannaDir = [ FDirName $(HAIKU_TOP) data etc KanBe ] ;
+local cannaDefault = [ Glob $(cannaDir)/default : *.canna *.gz ] ;
+local cannaDic = [ Glob $(cannaDir)/dic : *.cbp ] ;
+local cannaDicCanna = [ Glob $(cannaDir)/dic/canna
 	: *.cld *.ctd *.cbd *.dir ] ;
-AddFilesToHaikuImage system data KanBe default : $(kanbeDefault) ;
-AddFilesToHaikuImage system data KanBe dic : $(kanbeDic) ;
-AddFilesToHaikuImage system data KanBe dic canna : $(kanbeDicCanna) ;
-AddDirectoryToHaikuImage system data KanBe dic group ;
-AddDirectoryToHaikuImage system data KanBe dic user ;
+AddFilesToHaikuImage system data Canna default : $(cannaDefault) ;
+AddFilesToHaikuImage system data Canna dic : $(cannaDic) ;
+AddFilesToHaikuImage system data Canna dic canna : $(cannaDicCanna) ;
+AddDirectoryToHaikuImage system data Canna dic group ;
+AddDirectoryToHaikuImage system data Canna dic user ;
 
 local keymapFiles = [ GLOB [ FDirName $(HAIKU_TOP) src data etc keymaps ]
 	: *.keymap ] ;

Modified: haiku/trunk/src/add-ons/input_server/methods/canna/CannaLooper.cpp
===================================================================
--- haiku/trunk/src/add-ons/input_server/methods/canna/CannaLooper.cpp	2009-04-04 12:25:36 UTC (rev 29896)
+++ haiku/trunk/src/add-ons/input_server/methods/canna/CannaLooper.cpp	2009-04-04 13:35:46 UTC (rev 29897)
@@ -1,15 +1,17 @@
-//
-//	CannaLooper.cpp
-//	CannaIM looper object
+/*
+ * Copyright 2007-2009 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 1999 M.Kawamura
+ */
 
-//	This is a part of...
-//	CannaIM
-//	version 1.0
-//	(c) 1999 M.Kawamura
-//
 
+#include "CannaLooper.h"
+
 #include <string.h>
 
+#include <Debug.h>
+
 #include <Alert.h>
 #include <FindDirectory.h>
 #include <Input.h>
@@ -19,96 +21,75 @@
 #include <Path.h>
 #include <Screen.h>
 
-#ifdef DEBUG
-#	include <Debug.h>
-#endif
-
 #include "CannaCommon.h"
-#include "CannaLooper.h"
 #include "CannaMethod.h"
 #include "KouhoWindow.h"
 #include "PaletteWindow.h"
 
 
 CannaLooper::CannaLooper(CannaMethod* method)
-	: BLooper("Canna Looper")
+	: BLooper("Canna Looper"),
+	fOwner(method),
+	fCanna(NULL),
+	fKouhoWindow(NULL),
+	fPaletteWindow(NULL)
 {
-	owner = method;
-	canna = 0;
-	theKouhoWindow = 0;
-	thePalette = 0;
-	self = BMessenger( NULL, this );
+	fMenu = new BMenu(B_EMPTY_STRING);
+	fMenu->SetFont(be_plain_font);
+	fMenu->AddItem(new BMenuItem("About CannaIM" B_UTF8_ELLIPSIS,
+		new BMessage( B_ABOUT_REQUESTED)));
+	fMenu->AddSeparatorItem();
+	fMenu->AddItem(new BMenuItem("Convert arrow keys",
+		new BMessage(ARROW_KEYS_FLIPPED)));
+	fMenu->AddItem(new BMenuItem("Reload Init file",
+		new BMessage(RELOAD_INIT_FILE)));
 
-	theMenu = new BMenu( B_EMPTY_STRING );
-	theMenu->SetFont( be_plain_font );
-	theMenu->AddItem( new BMenuItem( "About CannaIM" B_UTF8_ELLIPSIS, new BMessage( B_ABOUT_REQUESTED )));
-	theMenu->AddSeparatorItem();
-	theMenu->AddItem( new BMenuItem( "Convert arrow keys", new BMessage( ARROW_KEYS_FLIPPED )));
-	theMenu->AddItem( new BMenuItem( "Reload Init file", new BMessage( RELOAD_INIT_FILE )));
-
-	if ( gSettings.convert_arrowkey )
-	{
-		BMenuItem *item = theMenu->FindItem( ARROW_KEYS_FLIPPED );
-		item->SetMarked( true );
+	if (gSettings.convert_arrowkey) {
+		BMenuItem* item = fMenu->FindItem(ARROW_KEYS_FLIPPED);
+		item->SetMarked(true);
 	}
-	
+
 	Run();
 }
 
+
 status_t
-CannaLooper::InitCheck()
+CannaLooper::Init()
 {
-	status_t err;
-	char basepath[ B_PATH_NAME_LENGTH + 1 ];
-	err = ReadSettings( basepath );
-	if ( err != B_NO_ERROR )
+	char basePath[B_PATH_NAME_LENGTH + 1];
+	status_t err = ReadSettings(basePath);
+	if (err != B_NO_ERROR)
 		return err;
 
-	canna = new CannaInterface( basepath );
-	err = canna->InitCheck();
-	if ( err != B_NO_ERROR )
-		return err;
-	
-//	theKouhoWindow = new KouhoWindow( &kouhoFont );
-		
-	return B_NO_ERROR;
+	fCanna = new CannaInterface(basePath);
+
+	return fCanna->InitCheck();
 }
 
+
 void
 CannaLooper::Quit()
 {
 	// delete palette here
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: destructor called.\n" ));
-#endif
-	if ( canna )
-	{
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: Deleting canna...\n" ));
-#endif
-		delete canna;
+	SERIAL_PRINT(("CannaLooper: destructor called.\n"));
+	delete fCanna;
+
+	if (fKouhoWindow != NULL) {
+		SERIAL_PRINT(("CannaLooper: Sending QUIT to kouho window...\n"));
+
+		fKouhoWindow->Lock();
+		fKouhoWindow->Quit();
 	}
-	
-	if ( theKouhoWindow )
-	{
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: Sending QUIT to kouho window...\n" ));
-#endif
-		theKouhoWindow->Lock();
-		theKouhoWindow->Quit();
+
+	if (fPaletteWindow) {
+		SERIAL_PRINT(("CannaLooper: Sending QUIT to palette...\n"));
+
+		fPaletteWindow->Lock();
+		fPaletteWindow->Quit();
 	}
-	
-	if ( thePalette )
-	{
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: Sending QUIT to palette...\n" ));
-#endif
-		thePalette->Lock();
-		thePalette->Quit();
-	}
-	
-	owner->SetMenu( NULL, BMessenger() );
-	delete theMenu;
+
+	fOwner->SetMenu(NULL, BMessenger());
+	delete fMenu;
 	BLooper::Quit();
 }
 
@@ -121,431 +102,390 @@
 	if (status != B_OK)
 		return status;
 
-	path.Append("KanBe");
+	path.Append("Canna");
 
-	strcpy(basePath, path.Path());
+	strlcpy(basePath, path.Path(), B_PATH_NAME_LENGTH);
+	strlcat(basePath, "/", B_PATH_NAME_LENGTH);
 
 	font_family family;
 	font_style style;
 	strcpy(family, "Haru");
 	strcpy(style, "Regular");
 
-	kouhoFont.SetFamilyAndStyle(family, style);
-	kouhoFont.SetSize(12);
+	fKouhoFont.SetFamilyAndStyle(family, style);
+	fKouhoFont.SetSize(12);
 
 	return B_OK;
 }
 
 
 void
-CannaLooper::EnqueueMessage( BMessage *msg )
+CannaLooper::EnqueueMessage(BMessage* msg)
 {
-	owner->EnqueueMessage( msg );
+	fOwner->EnqueueMessage(msg);
 }
 
+
 void
-CannaLooper::MessageReceived( BMessage *msg )
+CannaLooper::MessageReceived(BMessage* msg)
 {
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: Entering MessageReceived() what=%x\n", msg->what ));
-#endif
-	switch ( msg->what )
-	{
+	SERIAL_PRINT(("CannaLooper: Entering MessageReceived() what=%.4s\n",
+		(char*)&msg->what));
+
+	switch (msg->what) {
 		case B_KEY_DOWN:
 		case NUM_SELECTED_FROM_KOUHO_WIN:
-			HandleKeyDown( msg );
+			_HandleKeyDown(msg);
 			break;
-		
+
 		case B_INPUT_METHOD_EVENT:
 			uint32 opcode, result;
-			opcode = 0;
-			msg->FindInt32( "be:opcode", (int32 *)&opcode );
-			switch ( opcode )
-			{
+			msg->FindInt32("be:opcode", (int32*)&opcode);
+
+			switch (opcode) {
 				case B_INPUT_METHOD_LOCATION_REQUEST:
-					HandleLocationReply( msg );
+					_HandleLocationReply(msg);
 					break;
-					
+
 				case B_INPUT_METHOD_STOPPED:
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: B_INPUT_METHOD_STOPPED received\n" ));
-#endif
-					ForceKakutei();
+					SERIAL_PRINT(("CannaLooper: B_INPUT_METHOD_STOPPED "
+						"received\n"));
+					_ForceKakutei();
 					break;
 			}
 			break;
-			
+
 		case CANNA_METHOD_ACTIVATED:
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: CANNA_METHOD_ACTIVATED received\n" ));
-#endif
-			HandleMethodActivated( msg->HasBool( "active" ) );
+			SERIAL_PRINT(("CannaLooper: CANNA_METHOD_ACTIVATED received\n"));
+			_HandleMethodActivated(msg->HasBool("active"));
 			break;
-		
+
 		case MODE_CHANGED_FROM_PALETTE:
-			ForceKakutei();
+			_ForceKakutei();
 			int32 mode;
-			msg->FindInt32( "mode", &mode );
-			result = canna->ChangeMode( mode );
-			ProcessResult( result );
+			msg->FindInt32("mode", &mode);
+			result = fCanna->ChangeMode(mode);
+			_ProcessResult(result);
 			break;
-			
+
 		case B_ABOUT_REQUESTED:
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: B_ABOUT_REQUESTED received\n" ));
-#endif
-			BAlert *panel;
-			panel = new BAlert( "", "CannaIM Version 1.02\n"
-								"  by Masao Kawamura 1999\n\n"
-								"Canna\n  Copyright 1992 NEC Corporation, Tokyo, Japan\n"
-								"  Special thanks to T.Murai for porting\n"
-								"  BeOS Version 1.02",
-								"OK" );
+		{
+			SERIAL_PRINT(("CannaLooper: B_ABOUT_REQUESTED received\n"));
+
+			BAlert* panel = new BAlert( "", "Canna Input Method\n"
+				"  by Masao Kawamura 1999\n\n"
+				"Canna\n"
+				"  Copyright 1992 NEC Corporation, Tokyo, Japan\n"
+				"  Special thanks to T.Murai for porting\n",
+				"OK");
 			panel->Go();
 			break;
-			
+		}
+	
 		case RELOAD_INIT_FILE:
-			ForceKakutei();
-			canna->Reset();
+			_ForceKakutei();
+			fCanna->Reset();
 			break;
 
 		case ARROW_KEYS_FLIPPED:
-			{
-				BMenuItem *item = theMenu->FindItem( ARROW_KEYS_FLIPPED );
-				gSettings.convert_arrowkey = !gSettings.convert_arrowkey;
-				item->SetMarked( gSettings.convert_arrowkey );
-				canna->SetConvertArrowKey( gSettings.convert_arrowkey );
-			
-			}
+		{
+			BMenuItem* item = fMenu->FindItem(ARROW_KEYS_FLIPPED);
+			gSettings.convert_arrowkey = !gSettings.convert_arrowkey;
+			item->SetMarked(gSettings.convert_arrowkey);
+			fCanna->SetConvertArrowKey(gSettings.convert_arrowkey);
 			break;
-			
-							
+		}
+
 		default:
-			BLooper::MessageReceived( msg );
+			BLooper::MessageReceived(msg);
 			break;
 	}
 }
 
-void CannaLooper::HandleKeyDown( BMessage *msg )
+
+void
+CannaLooper::_HandleKeyDown(BMessage* msg)
 {
-	uint32 result;
 	uint32 modifier;
-//	int32 rawchar;
 	int32 key;
-	char theChar;
+	msg->FindInt32("modifiers", (int32*)&modifier);
+	msg->FindInt32("key", &key);
 
-	msg->FindInt32( "modifiers", (int32 *)&modifier );
-	msg->FindInt32( "key", &key );
-//	msg->FindInt32( "raw_char", &rawchar );
-	
-	if ( ( modifier & B_COMMAND_KEY ) != 0 )
-	{
-		EnqueueMessage( DetachCurrentMessage() );
+	if ((modifier & B_COMMAND_KEY) != 0) {
+		EnqueueMessage(DetachCurrentMessage());
 		return;
 	}
-	
-	msg->FindInt8( "byte", (int8 *)&theChar );
 
-// The if clause below is to avoid processing key input which char code is 0x80 or more.
-// if mikakutei string exists, dispose current message.
-// Otherwise, send it to application as usual B_KEY_DOWN message.
-// This is a bug fix for version 1.0 beta 2
+	char character;
+	msg->FindInt8("byte", (int8*)&character);
 
-	if ( theChar & 0x80 )
-	{
-		if ( canna->MikakuteiLength() != 0 )
-		{
-			BMessage *blackhole = DetachCurrentMessage();
-			delete blackhole;
-		}
+	// The if clause below is to avoid processing key input which char code
+	// is 0x80 or more.
+	// if mikakutei string exists, dispose current message.
+	// Otherwise, send it to application as usual B_KEY_DOWN message.
+	if ((character & 0x80) != 0) {
+		if (fCanna->MikakuteiLength() != 0)
+			delete DetachCurrentMessage();
 		else
-			EnqueueMessage( DetachCurrentMessage() );
+			EnqueueMessage(DetachCurrentMessage());
 
 		return;
 	}
-	
-// end of bug fix
 
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: HandleKeyDown() calling CannaInterface::KeyIn()...\n", result ));
-#endif
-	
-	result = canna->KeyIn( theChar, modifier, key );
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: HandleKeyDown() received result = %d from CannaInterface.\n", result ));
-#endif
-	ProcessResult( result );
+	SERIAL_PRINT(("CannaLooper: HandleKeyDown() calling "
+		"CannaInterface::KeyIn()...\n", result));
+
+	uint32 result = fCanna->KeyIn(character, modifier, key);
+
+	SERIAL_PRINT(("CannaLooper: HandleKeyDown() received result = %d from "
+		"CannaInterface.\n", result));
+
+	_ProcessResult(result);
 }
 
+
 void
-CannaLooper::ProcessResult( uint32 result )
+CannaLooper::_ProcessResult(uint32 result)
 {
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: ProcessResult() processing result = %d\n", result ));
-#endif
-	if ( result & GUIDELINE_APPEARED )
-	{
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: ProcessResult() processing GUIDELINE_APPEARED\n" ));
-#endif
-		if ( canna->MikakuteiLength() != 0 ) // usual guideline i.e. kouho
-		{
-			BMessage *msg = new BMessage( B_INPUT_METHOD_EVENT );
-			msg->AddInt32( "be:opcode", B_INPUT_METHOD_LOCATION_REQUEST );
-			owner->EnqueueMessage( msg );
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: B_INPUT_METHOD_LOCATION_REQUEST has been sent\n" ));
-#endif
+	SERIAL_PRINT(("CannaLooper: _ProcessResult() processing result = %d\n",
+		result));
+
+	if ((result & GUIDELINE_APPEARED) != 0) {
+		SERIAL_PRINT(("CannaLooper: _ProcessResult() processing "
+			"GUIDELINE_APPEARED\n"));
+
+		if (fCanna->MikakuteiLength() != 0) {
+			// usual guideline i.e. kouho
+
+			BMessage* msg = new BMessage(B_INPUT_METHOD_EVENT);
+			msg->AddInt32("be:opcode", B_INPUT_METHOD_LOCATION_REQUEST);
+			fOwner->EnqueueMessage(msg);
+
+			SERIAL_PRINT(("CannaLooper: B_INPUT_METHOD_LOCATION_REQUEST has "
+				"been sent\n"));
+		} else {
+			// guideline exists, but no mikakutei string - means extend mode
+			// and such.
+			SERIAL_PRINT(("  GUIDELINE_APPEARED: calling "
+				"GenerateKouho()...\n"));
+
+			fKouhoWindow->PostMessage(fCanna->GenerateKouhoString());
+			SERIAL_PRINT(("  GUIDELINE_APPEARED: posting KouhoMsg to "
+				"KouhoWindow %x...\n", fKouhoWindow));
+
+			fKouhoWindow->PostMessage(KOUHO_WINDOW_SHOW_ALONE);
 		}
-		else // guideline exists, but no mikakutei string - means extend mode and such.
-		{
-#ifdef DEBUG
-		SERIAL_PRINT(( "  GUIDELINE_APPEARED: calling GenerateKouho()...\n" ));
-#endif
-			theKouhoWindow->PostMessage( canna->GenerateKouhoString() );
-			BMessage m( KOUHO_WINDOW_SHOW_ALONE );
-#ifdef DEBUG
-		SERIAL_PRINT(( "  GUIDELINE_APPEARED: posting KouhoMsg to KouhoWindow %x...\n", theKouhoWindow ));
-#endif
-			theKouhoWindow->PostMessage( &m );
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: KOUHO_WINDOW_SHOW_ALONE has been sent\n" ));
-#endif
-		}
-		
 	}
 
-//	if ( result == MIKAKUTEI_NO_CHANGE )
-//		return;
-				
-	if ( result & GUIDELINE_DISAPPEARED )
-	{
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: ProcessResult() processing GUIDELINE_DISAPPEARED\n" ));
-#endif
-		theKouhoWindow->PostMessage( KOUHO_WINDOW_HIDE );
+	if ((result & GUIDELINE_DISAPPEARED) != 0) {
+		SERIAL_PRINT(("CannaLooper: _ProcessResult() processing "
+			"GUIDELINE_DISAPPEARED\n"));
+		fKouhoWindow->PostMessage(KOUHO_WINDOW_HIDE);
 	}
-		
-	if ( result & MODE_CHANGED )
-	{
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: ProcessResult() processing MODE_CHANGED\n" ));
-#endif
-		int32 mode;
-		mode = canna->GetMode();
-		BMessage m( PALETTE_WINDOW_BUTTON_UPDATE );
-		m.AddInt32( "mode", mode );
-		thePalette->PostMessage( &m );
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: PALETTE_BUTTON_UPDATE has been sent. mode = %d\n", mode ));
-#endif
+
+	if ((result & MODE_CHANGED) != 0) {
+		SERIAL_PRINT(("CannaLooper: _ProcessResult() processing "
+			"MODE_CHANGED\n"));
+
+		BMessage message(PALETTE_WINDOW_BUTTON_UPDATE);
+		message.AddInt32("mode", fCanna->GetMode());
+		fPaletteWindow->PostMessage(&message);
+
+		SERIAL_PRINT(("CannaLooper: PALETTE_BUTTON_UPDATE has been sent. "
+			"mode = %d\n", fCanna->GetMode()));
 	}
 
-	if ( result & GUIDELINE_CHANGED )
-	{
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: ProcessResult() processing GUIDELINE_CHANGED\n" ));
-#endif
-		theKouhoWindow->PostMessage( canna->GenerateKouhoString() );
+	if ((result & GUIDELINE_CHANGED) != 0) {
+		SERIAL_PRINT(("CannaLooper: _ProcessResult() processing "
+			"GUIDELINE_CHANGED\n"));
+		fKouhoWindow->PostMessage(fCanna->GenerateKouhoString());
 	}
 
-	if ( result & THROUGH_INPUT )
-	{
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: ProcessResult() processing THROUGH_INPUT\n" ));
-#endif
-		EnqueueMessage( DetachCurrentMessage() );
+	if ((result & THROUGH_INPUT) != 0) {
+		SERIAL_PRINT(("CannaLooper: _ProcessResult() processing "
+			"THROUGH_INPUT\n"));
+		EnqueueMessage(DetachCurrentMessage());
 	}
 
-	if ( result & NEW_INPUT_STARTED )
-	{
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: ProcessResult() processing NEW_INPUT_STARTED\n" ));
-#endif
+	if ((result & NEW_INPUT_STARTED) != 0) {
+		SERIAL_PRINT(("CannaLooper: _ProcessResult() processing "
+			"NEW_INPUT_STARTED\n"));
 		SendInputStarted();
 	}
 
-	if ( result & KAKUTEI_EXISTS )
-	{
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: ProcessResult() processing KAKUTEI_EXISTS\n" ));
-#endif
-		BMessage *msg = new BMessage( B_INPUT_METHOD_EVENT );
-		msg->AddInt32( "be:opcode", B_INPUT_METHOD_CHANGED );
-	
-		msg->AddString("be:string", canna->GetKakuteiStr() );
+	if ((result & KAKUTEI_EXISTS) != 0) {
+		SERIAL_PRINT(("CannaLooper: _ProcessResult() processing "
+			"KAKUTEI_EXISTS\n"));
+
+		BMessage* msg = new BMessage(B_INPUT_METHOD_EVENT);
+		msg->AddInt32("be:opcode", B_INPUT_METHOD_CHANGED);
+
+		msg->AddString("be:string", fCanna->GetKakuteiStr());
 		msg->AddInt32("be:clause_start", 0);
-		msg->AddInt32("be:clause_end", canna->KakuteiLength() );
-		msg->AddInt32("be:selection", canna->KakuteiLength() );
-		msg->AddInt32("be:selection", canna->KakuteiLength() );
-		msg->AddBool( "be:confirmed", true );
-		owner->EnqueueMessage( msg );
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: B_INPUT_METHOD_CHANGED (confired) has been sent\n" ));
-#endif
-		if ( !(result & MIKAKUTEI_EXISTS) ) //if both kakutei and mikakutei exist, do not send B_INPUT_STOPPED
+		msg->AddInt32("be:clause_end", fCanna->KakuteiLength());
+		msg->AddInt32("be:selection", fCanna->KakuteiLength());
+		msg->AddInt32("be:selection", fCanna->KakuteiLength());
+		msg->AddBool("be:confirmed", true);
+		fOwner->EnqueueMessage(msg);
+
+		SERIAL_PRINT(("CannaLooper: B_INPUT_METHOD_CHANGED (confired) has "
+			"been sent\n"));
+
+		// if both kakutei and mikakutei exist, do not send B_INPUT_STOPPED
+		if (!(result & MIKAKUTEI_EXISTS))
 			SendInputStopped();
-		
 	}
-	
-	if ( result & MIKAKUTEI_EXISTS )
-	{
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: ProcessResult() processing MIKAKUTEI_EXISTS\n" ));
-#endif
+
+	if ((result & MIKAKUTEI_EXISTS) != 0) {
+		SERIAL_PRINT(("CannaLooper: _ProcessResult() processing "
+			"MIKAKUTEI_EXISTS\n" ));
+
 		int32 start, finish;
-		BMessage *msg = new BMessage( B_INPUT_METHOD_EVENT );
-		msg->AddInt32( "be:opcode", B_INPUT_METHOD_CHANGED );
-	
-		msg->AddString("be:string", canna->GetMikakuteiStr() );
-		if ( canna->HasRev() )
-		{
-			canna->GetRevPosition( &start, &finish );
+		BMessage* msg = new BMessage(B_INPUT_METHOD_EVENT);
+		msg->AddInt32("be:opcode", B_INPUT_METHOD_CHANGED);
+		msg->AddString("be:string", fCanna->GetMikakuteiStr());
+
+		if (fCanna->HasRev()) {
+			fCanna->GetRevPosition( &start, &finish);
 			msg->AddInt32("be:clause_start", 0);
-			msg->AddInt32("be:clause_end", start );
-			msg->AddInt32("be:clause_start", start );
-			msg->AddInt32("be:clause_end", finish );
-			msg->AddInt32("be:clause_start", finish );
-			msg->AddInt32("be:clause_end", canna->MikakuteiLength() );
-		}
-		else
-		{
-			start = finish = canna->MikakuteiLength();
+			msg->AddInt32("be:clause_end", start);
+			msg->AddInt32("be:clause_start", start);
+			msg->AddInt32("be:clause_end", finish);
+			msg->AddInt32("be:clause_start", finish);
+			msg->AddInt32("be:clause_end", fCanna->MikakuteiLength());
+		} else {
+			start = finish = fCanna->MikakuteiLength();
 			msg->AddInt32("be:clause_start", 0);
-			msg->AddInt32("be:clause_end", canna->MikakuteiLength() );
+			msg->AddInt32("be:clause_end", fCanna->MikakuteiLength());
 		}
-		
-		msg->AddInt32("be:selection", start );
-		msg->AddInt32("be:selection", finish );
-		//msg->AddBool( "be:confirmed", false );
-		owner->EnqueueMessage( msg );
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: B_INPUT_METHOD_CHANGED (non-confirmed) has been sent\n" ));
-#endif
+
+		msg->AddInt32("be:selection", start);
+		msg->AddInt32("be:selection", finish);
+		//msg->AddBool("be:confirmed", false);
+		fOwner->EnqueueMessage(msg);
+
+		SERIAL_PRINT(("CannaLooper: B_INPUT_METHOD_CHANGED (non-confirmed) "
+			"has been sent\n"));
 	}
-	
-	if ( result & MIKAKUTEI_BECOME_EMPTY )
-	{
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: ProcessResult() processing MIKAKUTEI_BECOME_EMPTY\n" ));
-#endif
-		BMessage *msg = new BMessage( B_INPUT_METHOD_EVENT );
-		msg->AddInt32( "be:opcode", B_INPUT_METHOD_CHANGED );
-	
-		msg->AddString("be:string", B_EMPTY_STRING );
+
+	if ((result & MIKAKUTEI_BECOME_EMPTY) != 0) {
+		SERIAL_PRINT(("CannaLooper: _ProcessResult() processing "
+			"MIKAKUTEI_BECOME_EMPTY\n" ));
+		BMessage* msg = new BMessage(B_INPUT_METHOD_EVENT);
+		msg->AddInt32("be:opcode", B_INPUT_METHOD_CHANGED);
+
+		msg->AddString("be:string", B_EMPTY_STRING);
 		msg->AddInt32("be:clause_start", 0);
-		msg->AddInt32("be:clause_end", 0 );
-		msg->AddInt32("be:selection", 0 );
-		msg->AddInt32("be:selection", 0 );
-		msg->AddBool( "be:confirmed", true );
-		owner->EnqueueMessage( msg );
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: B_INPUT_METHOD_CHANGED (NULL, confired) has been sent\n" ));
-#endif
-	
+		msg->AddInt32("be:clause_end", 0);
+		msg->AddInt32("be:selection", 0);
+		msg->AddInt32("be:selection", 0);
+		msg->AddBool( "be:confirmed", true);
+		fOwner->EnqueueMessage(msg);
+
+		SERIAL_PRINT(( "CannaLooper: B_INPUT_METHOD_CHANGED (NULL, confired) "
+			"has been sent\n"));
+
 		SendInputStopped();
 	}
 }
 
+
 void
-CannaLooper::HandleLocationReply( BMessage *msg )
+CannaLooper::_HandleLocationReply(BMessage* msg)
 {
 	BPoint where = B_ORIGIN;
 	float height = 0.0;
 	int32 start;
 
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: B_INPUT_METHOD_LOCATION_REQUEST received\n" ));
-#endif
+	SERIAL_PRINT(("CannaLooper: B_INPUT_METHOD_LOCATION_REQUEST received\n"));
 
-	start = canna->GetRevStartPositionInChar();
+	start = fCanna->GetRevStartPositionInChar();
+
 #ifdef DEBUG
 	type_code type;
 	int32 count;
-	msg->GetInfo( "be:location_reply", &type, &count );
-	SERIAL_PRINT(( "CannaLooper: LOCATION_REPLY has %d locations.\n", count ));
-	SERIAL_PRINT(( "CannaLooper: RevStartPosition is %d.\n", start ));
+	msg->GetInfo("be:location_reply", &type, &count);
+	SERIAL_PRINT(("CannaLooper: LOCATION_REPLY has %d locations.\n", count));
+	SERIAL_PRINT(("CannaLooper: RevStartPosition is %d.\n", start));
 #endif
-	msg->FindPoint( "be:location_reply", start, &where );
-	msg->FindFloat( "be:height_reply", start, &height );
-	BMessage m( KOUHO_WINDOW_SHOWAT );
-	m.AddPoint( "position", where );
-	m.AddFloat( "height", height );
 
+	msg->FindPoint("be:location_reply", start, &where);
+	msg->FindFloat("be:height_reply", start, &height);
+	BMessage m(KOUHO_WINDOW_SHOWAT);
+	m.AddPoint("position", where);
+	m.AddFloat("height", height);
 
-	theKouhoWindow->PostMessage( canna->GenerateKouhoString() );
-	theKouhoWindow->PostMessage( &m );
+	fKouhoWindow->PostMessage(fCanna->GenerateKouhoString());
+	fKouhoWindow->PostMessage(&m);
 }
 
+
 void
-CannaLooper::HandleMethodActivated( bool active )
+CannaLooper::_HandleMethodActivated(bool active)
 {
-	if ( active )
-	{
-		if ( !thePalette ) //first time input method activated 
-		{
+	if (active) {
+		if (!fPaletteWindow) {
+			// first time input method activated 
 			float x = gSettings.palette_loc.x;
 			float y = gSettings.palette_loc.y;
-			BRect frame( x, y, x + 114, y + 44 );
-			thePalette = new PaletteWindow( frame, this );
-			thePalette->Show();
-			theKouhoWindow = new KouhoWindow( &kouhoFont, this );
-			theKouhoWindow->Run();
+			BRect frame(x, y, x + 114, y + 44);
+			fPaletteWindow = new PaletteWindow(frame, this);
+			fPaletteWindow->Show();
+			fKouhoWindow = new KouhoWindow(&fKouhoFont, this);
+			fKouhoWindow->Run();
 		}
-		thePalette->PostMessage( PALETTE_WINDOW_SHOW );
-		owner->SetMenu( theMenu, self );
+
+		fPaletteWindow->PostMessage(PALETTE_WINDOW_SHOW);
+		fOwner->SetMenu(fMenu, this);
+	} else {
+		_ForceKakutei();
+		fCanna->ChangeMode(CANNA_MODE_HenkanMode);
+		BMessage m(PALETTE_WINDOW_BUTTON_UPDATE);
+		m.AddInt32("mode", CANNA_MODE_HenkanMode);
+		fPaletteWindow->PostMessage(&m);
+		fPaletteWindow->PostMessage(PALETTE_WINDOW_HIDE);
+		fKouhoWindow->PostMessage(KOUHO_WINDOW_HIDE);
+		fOwner->SetMenu(NULL, this);
 	}
-	else
-	{
-		ForceKakutei();
-		canna->ChangeMode( CANNA_MODE_HenkanMode );
-		BMessage m( PALETTE_WINDOW_BUTTON_UPDATE );
-		m.AddInt32( "mode", CANNA_MODE_HenkanMode );
-		thePalette->PostMessage( &m );
-		thePalette->PostMessage( PALETTE_WINDOW_HIDE );
-		theKouhoWindow->PostMessage( KOUHO_WINDOW_HIDE );
-		owner->SetMenu( NULL, self );
-	}
 }
+	
 			
 void
-CannaLooper::ForceKakutei()
+CannaLooper::_ForceKakutei()
 {
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: ForceKakutei() called\n" ));
-#endif
-	uint32 result = canna->Kakutei();
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: returned from Kakutei(). result = %d\n", result ));
-#endif
-	if ( result != NOTHING_TO_KAKUTEI )
-		ProcessResult( result );
+	SERIAL_PRINT(( "CannaLooper: _ForceKakutei() called\n" ));
+
+	uint32 result = fCanna->Kakutei();
+
+	SERIAL_PRINT(("CannaLooper: returned from Kakutei(). result = %d\n",
+		result));
+
+	if (result != NOTHING_TO_KAKUTEI)
+		_ProcessResult(result);
 	else
 		SendInputStopped();
-	
-	return;
 }
 
+
 void
 CannaLooper::SendInputStopped()
 {
-	BMessage *msg = new BMessage( B_INPUT_METHOD_EVENT );
-	msg->AddInt32( "be:opcode", B_INPUT_METHOD_STOPPED );
-	EnqueueMessage( msg );
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: B_INPUT_METHOD_STOPPED has been sent\n" ));
-#endif
+	BMessage* msg = new BMessage(B_INPUT_METHOD_EVENT);
+	msg->AddInt32("be:opcode", B_INPUT_METHOD_STOPPED);
+	EnqueueMessage(msg);
+
+	SERIAL_PRINT(("CannaLooper: B_INPUT_METHOD_STOPPED has been sent\n"));
 }
 
+
 void
 CannaLooper::SendInputStarted()
 {
-		BMessage *msg = new BMessage( B_INPUT_METHOD_EVENT );
-		msg->AddInt32( "be:opcode", B_INPUT_METHOD_STARTED );
-		msg->AddMessenger( "be:reply_to", BMessenger( NULL, this ) );
-		EnqueueMessage( msg );
-#ifdef DEBUG
-		SERIAL_PRINT(( "CannaLooper: B_INPUT_METHOD_STARTED has been sent\n" ));
-#endif
+	BMessage* msg = new BMessage(B_INPUT_METHOD_EVENT);
+	msg->AddInt32("be:opcode", B_INPUT_METHOD_STARTED);
+	msg->AddMessenger("be:reply_to", BMessenger(NULL, this));
+	EnqueueMessage(msg);
+
+	SERIAL_PRINT(("CannaLooper: B_INPUT_METHOD_STARTED has been sent\n"));
 }
 

Modified: haiku/trunk/src/add-ons/input_server/methods/canna/CannaLooper.h
===================================================================
--- haiku/trunk/src/add-ons/input_server/methods/canna/CannaLooper.h	2009-04-04 12:25:36 UTC (rev 29896)
+++ haiku/trunk/src/add-ons/input_server/methods/canna/CannaLooper.h	2009-04-04 13:35:46 UTC (rev 29897)
@@ -1,16 +1,13 @@
-//
-//	CannaLooper.h
-//	CannaIM Looper object
+/*
+ * Copyright 2007-2009 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 1999 M.Kawamura
+ */
+#ifndef CANNA_LOOPER_H
+#define CANNA_LOOPER_H
 
-//	This is a part of...
-//	CannaIM
-//	version 1.0
-//	(c) 1999 M.Kawamura
-//
 
-#ifndef _CANNA_LOOPER_H
-#define _CANNA_LOOPER_H
-
 #include <Messenger.h>
 #include <Font.h>
 #include <Looper.h>
@@ -24,32 +21,33 @@
 
 extern Preferences gSettings;
 
-class CannaLooper : public BLooper
-{
+class CannaLooper : public BLooper {
 public:
-					CannaLooper( CannaMethod *method );
-	virtual void	Quit();
-	void			MessageReceived( BMessage *msg );
-	void			EnqueueMessage( BMessage *msg );
-	status_t		InitCheck();
-	status_t		ReadSettings( char *basepath );
-//	bool			QuitRequested();
-	void			SendInputStopped();
-	void			SendInputStarted();
-	
+							CannaLooper(CannaMethod* method);
+
+	virtual void			Quit();
+	virtual void			MessageReceived(BMessage* msg);
+
+			void			EnqueueMessage(BMessage* msg);
+			status_t		Init();
+			status_t		ReadSettings(char* basePath);
+
+			void			SendInputStopped();
+			void			SendInputStarted();
+
 private:
-	CannaMethod*	owner;
-	CannaInterface*	canna;
-	BFont			kouhoFont;
-	void			HandleKeyDown( BMessage *msg );
-	void			HandleLocationReply( BMessage *msg );
-	void			HandleMethodActivated( bool active );
-	void			ProcessResult( uint32 result );
-	void			ForceKakutei();
-	KouhoWindow*	theKouhoWindow;
-	PaletteWindow*	thePalette;
-	BMenu*			theMenu;
-	BMessenger		self;
+			void			_HandleKeyDown(BMessage* msg);
+			void			_HandleLocationReply(BMessage* msg);
+			void			_HandleMethodActivated(bool active);
+			void			_ProcessResult(uint32 result);
+			void			_ForceKakutei();
+
+			CannaMethod*	fOwner;
+			CannaInterface*	fCanna;
+			BFont			fKouhoFont;
+			KouhoWindow*	fKouhoWindow;
+			PaletteWindow*	fPaletteWindow;
+			BMenu*			fMenu;
 };
 
-#endif
+#endif	// CANNA_LOOPER_H

Modified: haiku/trunk/src/add-ons/input_server/methods/canna/CannaMethod.cpp
===================================================================
--- haiku/trunk/src/add-ons/input_server/methods/canna/CannaMethod.cpp	2009-04-04 12:25:36 UTC (rev 29896)
+++ haiku/trunk/src/add-ons/input_server/methods/canna/CannaMethod.cpp	2009-04-04 13:35:46 UTC (rev 29897)
@@ -23,12 +23,15 @@
 BInputServerMethod*
 instantiate_input_method()
 {
-	return (new CannaMethod());
+	return new CannaMethod();
 }
 
 
+//	#pragma mark -
+
+
 CannaMethod::CannaMethod()
-	:BInputServerMethod( "Canna", (const uchar *)kCannaIcon )

[... truncated: 14 lines follow ...]


From axeld at mail.berlios.de  Sat Apr  4 16:38:12 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sat, 4 Apr 2009 16:38:12 +0200
Subject: [Haiku-commits] r29898 -
	haiku/trunk/src/add-ons/kernel/network/protocols/tcp
Message-ID: <200904041438.n34EcC0u006903@sheep.berlios.de>

Author: axeld
Date: 2009-04-04 16:38:10 +0200 (Sat, 04 Apr 2009)
New Revision: 29898
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29898&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
Log:
* Improved tracing.


Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp	2009-04-04 13:35:46 UTC (rev 29897)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp	2009-04-04 14:38:10 UTC (rev 29898)
@@ -177,6 +177,50 @@
 	tcp_state		fState;
 };
 
+class Spawn : public AbstractTraceEntry {
+public:
+	Spawn(TCPEndpoint* listeningEndpoint, TCPEndpoint* spawnedEndpoint)
+		:
+		fListeningEndpoint(listeningEndpoint),
+		fSpawnedEndpoint(spawnedEndpoint)
+	{
+		Initialized();
+	}
+
+	virtual void AddDump(TraceOutput& out)
+	{
+		out.Print("tcp:%p spawns %p", fListeningEndpoint, fSpawnedEndpoint);
+	}
+
+protected:
+	TCPEndpoint*	fListeningEndpoint;
+	TCPEndpoint*	fSpawnedEndpoint;
+};
+
+class Error : public AbstractTraceEntry {
+	Error(TCPEndpoint* endpoint, const char* error, int32 line)
+		:
+		fEndpoint(endpoint),
+		fLine(line),
+		fError(error),
+		fState(endpoint->State())
+	{
+		Initialized();
+	}
+
+	virtual void AddDump(TraceOutput& out)
+	{
+		out.Print("tcp:%p (%12s) error at line %ld: %s", fEndpoint,
+			name_for_state(fState), fLine, fError);
+	}
+
+protected:
+	TCPEndpoint*	fEndpoint;
+	int32			fLine;
+	const char*		fError;
+	tcp_state		fState;
+};
+
 class Timer : public AbstractTraceEntry {
 public:
 	Timer(TCPEndpoint* endpoint, const char* which)
@@ -1309,7 +1353,8 @@
 	ProtocolSocket::Open();
 
 	fState = SYNCHRONIZE_RECEIVED;
-	T(State(this));
+	T(Spawn(parent, this));
+
 	fManager = parent->fManager;
 
 	LocalAddress().SetTo(buffer->destination);
@@ -1318,11 +1363,14 @@
 	TRACE("Spawn()");
 
 	// TODO: proper error handling!
-	if (fManager->BindChild(this) < B_OK)
+	if (fManager->BindChild(this) != B_OK) {
+		T(Error(this, "binding failed", __LINE__));
 		return DROP;
-
-	if (_PrepareSendPath(*PeerAddress()) < B_OK)
+	}
+	if (_PrepareSendPath(*PeerAddress()) != B_OK) {
+		T(Error(this, "prepare send faild", __LINE__));
 		return DROP;
+	}
 
 	fOptions = parent->fOptions;
 	fAcceptSemaphore = parent->fAcceptSemaphore;
@@ -1330,8 +1378,10 @@
 	_PrepareReceivePath(segment);
 
 	// send SYN+ACK
-	if (_SendQueued() < B_OK)
+	if (_SendQueued() != B_OK) {
+		T(Error(this, "sending failed", __LINE__));
 		return DROP;
+	}
 
 	segment.flags &= ~TCP_FLAG_SYNCHRONIZE;
 		// we handled this flag now, it must not be set for further processing
@@ -1358,8 +1408,10 @@
 
 	// spawn new endpoint for accept()
 	net_socket* newSocket;
-	if (gSocketModule->spawn_pending_socket(socket, &newSocket) < B_OK)
+	if (gSocketModule->spawn_pending_socket(socket, &newSocket) < B_OK) {
+		T(Error(this, "spawning failed", __LINE__));
 		return DROP;
+	}
 
 	return ((TCPEndpoint *)newSocket->first_protocol)->_Spawn(this,
 		segment, buffer);



From axeld at mail.berlios.de  Sat Apr  4 16:43:50 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sat, 4 Apr 2009 16:43:50 +0200
Subject: [Haiku-commits] r29899 -
	haiku/trunk/src/add-ons/kernel/network/protocols/tcp
Message-ID: <200904041443.n34EhojA007978@sheep.berlios.de>

Author: axeld
Date: 2009-04-04 16:43:48 +0200 (Sat, 04 Apr 2009)
New Revision: 29899
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29899&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
Log:
* Now it works.


Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp	2009-04-04 14:38:10 UTC (rev 29898)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp	2009-04-04 14:43:48 UTC (rev 29899)
@@ -198,6 +198,7 @@
 };
 
 class Error : public AbstractTraceEntry {
+public:
 	Error(TCPEndpoint* endpoint, const char* error, int32 line)
 		:
 		fEndpoint(endpoint),



From phoudoin at mail.berlios.de  Sat Apr  4 18:13:17 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Sat, 4 Apr 2009 18:13:17 +0200
Subject: [Haiku-commits] r29900 - haiku/trunk/src/bin
Message-ID: <200904041613.n34GDHVL015185@sheep.berlios.de>

Author: phoudoin
Date: 2009-04-04 18:13:15 +0200 (Sat, 04 Apr 2009)
New Revision: 29900
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29900&view=rev

Modified:
   haiku/trunk/src/bin/finddir.c
Log:
Made errors reported on stderr, not stdout.


Modified: haiku/trunk/src/bin/finddir.c
===================================================================
--- haiku/trunk/src/bin/finddir.c	2009-04-04 14:43:48 UTC (rev 29899)
+++ haiku/trunk/src/bin/finddir.c	2009-04-04 16:13:15 UTC (rev 29900)
@@ -217,14 +217,14 @@
 		} else {
 			/* else what? */
 			/* this can not happen! */
-			printf("Serious internal error; contact support\n");
+			fprintf(stderr, "Serious internal error; contact support\n");
 		}
 	}
 
 	/* Error messages and return code setting */
 
 	if (status == WRONG_DIR_TYPE) {
-		printf("%s: unrecognized directory_which constant \'%s\'\n", argv[0],
+		fprintf(stderr, "%s: unrecognized directory_which constant \'%s\'\n", argv[0],
 			argv[directoryArgNr]);
 		returnCode = 252;
 	}



From phoudoin at mail.berlios.de  Sat Apr  4 18:15:24 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Sat, 4 Apr 2009 18:15:24 +0200
Subject: [Haiku-commits] r29901 - haiku/trunk/data/common/boot/post_install
Message-ID: <200904041615.n34GFOYO015506@sheep.berlios.de>

Author: phoudoin
Date: 2009-04-04 18:15:22 +0200 (Sat, 04 Apr 2009)
New Revision: 29901
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29901&view=rev

Modified:
   haiku/trunk/data/common/boot/post_install/mime_update.sh
Log:
Now using finddir to get system path, as suggested by Axel.


Modified: haiku/trunk/data/common/boot/post_install/mime_update.sh
===================================================================
--- haiku/trunk/data/common/boot/post_install/mime_update.sh	2009-04-04 16:13:15 UTC (rev 29900)
+++ haiku/trunk/data/common/boot/post_install/mime_update.sh	2009-04-04 16:15:22 UTC (rev 29901)
@@ -2,8 +2,10 @@
 
 # Make sure all apps have a MIME DB entry.
 
-mimeset -apps -f /boot/system/apps
-mimeset -f /boot/system/documentation
-mimeset -apps -f /boot/system/preferences
-mimeset -apps -f /boot/system/servers
-mimeset -apps -f /boot/apps
+SYSTEM=$(/bin/finddir B_SYSTEM_DIRECTORY 2>/dev/null || echo "/boot/beos")
+
+mimeset -apps -f "$SYSTEM/apps"
+mimeset       -f "$SYSTEM/documentation"
+mimeset -apps -f "$SYSTEM/preferences"
+mimeset -apps -f "$SYSTEM/servers"
+mimeset -apps -f "/boot/apps"



From axeld at mail.berlios.de  Sat Apr  4 18:23:43 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sat, 4 Apr 2009 18:23:43 +0200
Subject: [Haiku-commits] r29902 -
	haiku/trunk/src/add-ons/kernel/network/stack
Message-ID: <200904041623.n34GNhgl016564@sheep.berlios.de>

Author: axeld
Date: 2009-04-04 18:23:42 +0200 (Sat, 04 Apr 2009)
New Revision: 29902
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29902&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/stack/domains.cpp
   haiku/trunk/src/add-ons/kernel/network/stack/interfaces.cpp
Log:
* Locking order dictates that this lock is an inner lock, and shouldn't
  be used everywhere.
* This also fixes a panic when deleting interfaces (an already deleted
  lock was unlocked).


Modified: haiku/trunk/src/add-ons/kernel/network/stack/domains.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/domains.cpp	2009-04-04 16:15:22 UTC (rev 29901)
+++ haiku/trunk/src/add-ons/kernel/network/stack/domains.cpp	2009-04-04 16:23:42 UTC (rev 29902)
@@ -220,11 +220,7 @@
 	if (device == NULL)
 		return ENODEV;
 
-	// The locking protocol dictates that if both the receive lock
-	// and domain locks are required, we MUST obtain the receive
-	// lock before the domain lock.
-	RecursiveLocker _1(device->receive_lock);
-	RecursiveLocker _2(domain->lock);
+	RecursiveLocker _(domain->lock);
 
 	net_interface* interface = find_interface(domain, name);
 	if (interface != NULL) {

Modified: haiku/trunk/src/add-ons/kernel/network/stack/interfaces.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/interfaces.cpp	2009-04-04 16:15:22 UTC (rev 29901)
+++ haiku/trunk/src/add-ons/kernel/network/stack/interfaces.cpp	2009-04-04 16:23:42 UTC (rev 29902)
@@ -169,6 +169,8 @@
 static void
 notify_device_monitors(net_device_interface* interface, int32 event)
 {
+	RecursiveLocker _(interface->receive_lock);
+
 	DeviceMonitorList::Iterator iterator
 		= interface->monitor_funcs.GetIterator();
 	while (net_device_monitor* monitor = iterator.Next()) {
@@ -545,15 +547,9 @@
 	if (device->module->receive_data != NULL) {
 		thread_id readerThread = interface->reader_thread;
 
-		// one of the callers must hold a reference to the net_device_interface
-		// usually it is one of the net_interfaces.
-		recursive_lock_unlock(&interface->receive_lock);
-
 		// make sure the reader thread is gone before shutting down the interface
 		status_t status;
 		wait_for_thread(readerThread, &status);
-
-		recursive_lock_lock(&interface->receive_lock);
 	}
 }
 
@@ -768,12 +764,6 @@
 	// This is very complex, refer to delete_interface() for
 	// further details.
 
-	RecursiveLocker _(interface->receive_lock);
-
-	// this will possibly call:
-	//  remove_interface_from_domain() [domain gets locked]
-	//   delete_interface()
-	//    ... [see delete_interface()]
 	domain_removed_device_interface(interface);
 
 	notify_device_monitors(interface, B_DEVICE_BEING_REMOVED);



From mmu_man at mail.berlios.de  Sat Apr  4 18:31:34 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sat, 4 Apr 2009 18:31:34 +0200
Subject: [Haiku-commits] r29903 - haiku/trunk/src/bin
Message-ID: <200904041631.n34GVYIT018817@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-04 18:31:33 +0200 (Sat, 04 Apr 2009)
New Revision: 29903
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29903&view=rev

Modified:
   haiku/trunk/src/bin/urlwrapper.cpp
Log:
Implemented UnurlString() and used it. Now you can fully use query: as in
query://%28%28MAIL:to==%22%2ahaiku%2a%22%29%26%26%28BEOS:TYPE==%22text/x-email%22%29%29 :)


Modified: haiku/trunk/src/bin/urlwrapper.cpp
===================================================================
--- haiku/trunk/src/bin/urlwrapper.cpp	2009-04-04 16:23:42 UTC (rev 29902)
+++ haiku/trunk/src/bin/urlwrapper.cpp	2009-04-04 16:31:33 UTC (rev 29903)
@@ -15,14 +15,16 @@
 #include <Alert.h>
 #include <Application.h>
 #include <AppFileInfo.h>
+#include <Debug.h>
 #include <Mime.h>
 #include <Message.h>
 #include <TypeConstants.h>
 #include <Roster.h>
 #include <String.h>
+
+#include <ctype.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <Debug.h>
 
 /* compile-time configuration */
 #include "urlwrapper.h"
@@ -206,7 +208,19 @@
 
 status_t UrlWrapperApp::UnurlString(BString &s)
 {
-	// TODO:WRITEME
+	// TODO: check for %00 and bail out!
+	int32 length = s.Length();
+	int i;
+	for (i = 0; s[i] && i < length - 2; i++) {
+		if (s[i] == '%' && isxdigit(s[i+1]) && isxdigit(s[i+2])) {
+			int c;
+			sscanf(s.String() + i + 1, "%02x", &c);
+			s.Remove(i, 3);
+			s.Insert((char)c, 1, i);
+			length -= 2;
+		}
+	}
+	
 	return B_OK;
 }
 
@@ -423,7 +437,7 @@
 	if (u.proto == "file") {
 		BMessage m(B_REFS_RECEIVED);
 		entry_ref ref;
-		// UnurlString(path);
+		UnurlString(u.path);
 		if (get_ref_for_path(u.path.String(), &ref) < B_OK)
 			return;
 		m.AddRef("refs", &ref);
@@ -433,7 +447,7 @@
 #endif
 
 #ifdef HANDLE_QUERY
-	// XXX:TODO: unencode the formula + split options
+	// XXX:TODO: split options
 	if (u.proto == "query") {
 		// mktemp ?
 		BString qname("/tmp/query-url-temp-");
@@ -444,8 +458,7 @@
 		BString s;
 		int32 v;
 		
-		// TODO:
-		// UnurlString(full);
+		UnurlString(u.full);
 		// TODO: handle options (list of attrs in the column, ...)
 
 		v = 'qybF'; // QuerY By Formula XXX: any #define for that ?
@@ -453,6 +466,7 @@
 		s = "TextControl";
 		query.WriteAttr("_trk/focusedView", B_STRING_TYPE, 0LL, s.String(), s.Length()+1);
 		s = u.full;
+		PRINT(("QUERY='%s'\n", s.String()));
 		query.WriteAttr("_trk/qryinitstr", B_STRING_TYPE, 0LL, s.String(), s.Length()+1);
 		query.WriteAttr("_trk/qrystr", B_STRING_TYPE, 0LL, s.String(), s.Length()+1);
 		s = "application/x-vnd.Be-query";



From axeld at mail.berlios.de  Sat Apr  4 19:12:21 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sat, 4 Apr 2009 19:12:21 +0200
Subject: [Haiku-commits] r29904 - haiku/trunk/src/apps/networkstatus
Message-ID: <200904041712.n34HCLRh015701@sheep.berlios.de>

Author: axeld
Date: 2009-04-04 19:12:18 +0200 (Sat, 04 Apr 2009)
New Revision: 29904
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29904&view=rev

Modified:
   haiku/trunk/src/apps/networkstatus/Jamfile
   haiku/trunk/src/apps/networkstatus/NetworkStatusView.cpp
   haiku/trunk/src/apps/networkstatus/NetworkStatusView.h
Log:
* Removed the polling of the network status; instead, it now uses the new
  network notifications.
* It also doesn't keep a socket open over the whole time which would prevent
  the network stack to be unloaded.


Modified: haiku/trunk/src/apps/networkstatus/Jamfile
===================================================================
--- haiku/trunk/src/apps/networkstatus/Jamfile	2009-04-04 16:31:33 UTC (rev 29903)
+++ haiku/trunk/src/apps/networkstatus/Jamfile	2009-04-04 17:12:18 UTC (rev 29904)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UsePrivateHeaders shared ;
+UsePrivateHeaders net shared ;
 UseLibraryHeaders agg icon ;
 
 local icon_libs ;

Modified: haiku/trunk/src/apps/networkstatus/NetworkStatusView.cpp
===================================================================
--- haiku/trunk/src/apps/networkstatus/NetworkStatusView.cpp	2009-04-04 16:31:33 UTC (rev 29903)
+++ haiku/trunk/src/apps/networkstatus/NetworkStatusView.cpp	2009-04-04 17:12:18 UTC (rev 29904)
@@ -11,8 +11,14 @@
 
 #include "NetworkStatusView.h"
 
-#include "NetworkStatus.h"
-#include "NetworkStatusIcons.h"
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <unistd.h>
 
 #include <Alert.h>
 #include <Application.h>
@@ -29,23 +35,12 @@
 #include <String.h>
 #include <TextView.h>
 
-#include <arpa/inet.h>
-#include <net/if.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <unistd.h>
+#include <net_notifications.h>
 
-#ifndef HAIKU_TARGET_PLATFORM_HAIKU
-// BONE compatibility
-#	define IF_NAMESIZE IFNAMSIZ
-#	define IFF_LINK 0
-#	define IFF_CONFIGURING 0
-#	define ifc_value ifc_val
-#endif
+#include "NetworkStatus.h"
+#include "NetworkStatusIcons.h"
 
+
 static const char *kStatusDescriptions[] = {
 	"Unknown",
 	"No Link",
@@ -57,17 +52,43 @@
 extern "C" _EXPORT BView *instantiate_deskbar_item(void);
 
 
-const uint32 kMsgUpdate = 'updt';
 const uint32 kMsgShowConfiguration = 'shcf';
 const uint32 kMsgOpenNetworkPreferences = 'onwp';
 
 const uint32 kMinIconWidth = 16;
 const uint32 kMinIconHeight = 16;
 
-const bigtime_t kUpdateInterval = 1000000;
-	// every second
 
+class SocketOpener {
+public:
+	SocketOpener()
+	{
+		fSocket = socket(AF_INET, SOCK_DGRAM, 0);
+	}
 
+	~SocketOpener()
+	{
+		close(fSocket);
+	}
+
+	status_t InitCheck()
+	{
+		return fSocket >= 0 ? B_OK : B_ERROR;
+	}
+
+	operator int() const
+	{
+		return fSocket;
+	}
+
+private:
+	int	fSocket;
+};
+
+
+//	#pragma mark -
+
+
 NetworkStatusView::NetworkStatusView(BRect frame, int32 resizingMode,
 		bool inDeskbar)
 	: BView(frame, kDeskbarItemName, resizingMode,
@@ -111,8 +132,6 @@
 void
 NetworkStatusView::_Init()
 {
-	fMessageRunner = NULL;
-
 	for (int i = 0; i < kStatusCount; i++) {
 		fBitmaps[i] = NULL;
 	}
@@ -206,10 +225,9 @@
 
 	SetLowColor(ViewColor());
 
-	BMessage update(kMsgUpdate);
-	fMessageRunner = new BMessageRunner(this, &update, kUpdateInterval);
+	start_watching_network(
+		B_WATCH_NETWORK_INTERFACE_CHANGES | B_WATCH_NETWORK_LINK_CHANGES, this);
 
-	fSocket = socket(AF_INET, SOCK_DGRAM, 0);
 	_Update();
 }
 
@@ -217,8 +235,7 @@
 void
 NetworkStatusView::DetachedFromWindow()
 {
-	delete fMessageRunner;
-	close(fSocket);
+	stop_watching_network(this);
 }
 
 
@@ -226,7 +243,7 @@
 NetworkStatusView::MessageReceived(BMessage* message)
 {
 	switch (message->what) {
-		case kMsgUpdate:
+		case B_NETWORK_MONITOR:
 			_Update();
 			break;
 
@@ -276,8 +293,8 @@
 NetworkStatusView::_ShowConfiguration(BMessage* message)
 {
 	static const struct information_entry {
-		const char *label;
-		int32 control;
+		const char*	label;
+		int32		control;
 	} kInformationEntries[] = {
 		{ "Address", SIOCGIFADDR },
 		{ "Broadcast", SIOCGIFBRDADDR },
@@ -285,7 +302,11 @@
 		{ NULL }
 	};
 
-	const char *name;
+	SocketOpener socket;
+	if (socket.InitCheck() != B_OK)
+		return;
+
+	const char* name;
 	if (message->FindString("interface", &name) != B_OK)
 		return;
 
@@ -298,7 +319,7 @@
 	size_t boldLength = text.Length();
 
 	for (int i = 0; kInformationEntries[i].label; i++) {
-		if (ioctl(fSocket, kInformationEntries[i].control, &request,
+		if (ioctl(socket, kInformationEntries[i].control, &request,
 				sizeof(request)) < 0) {
 			continue;
 		}
@@ -341,7 +362,7 @@
 void
 NetworkStatusView::MouseDown(BPoint point)
 {
-	BPopUpMenu *menu = new BPopUpMenu(B_EMPTY_STRING, false, false);
+	BPopUpMenu* menu = new BPopUpMenu(B_EMPTY_STRING, false, false);
 	menu->SetAsyncAutoDestruct(true);
 	menu->SetFont(be_plain_font);
 
@@ -376,7 +397,7 @@
 void
 NetworkStatusView::_AboutRequested()
 {
-	BAlert *alert = new BAlert("about", "NetworkStatus\n"
+	BAlert* alert = new BAlert("about", "NetworkStatus\n"
 		"\twritten by Axel D?rfler and Hugo Santos\n"
 		"\tCopyright 2007, Haiku, Inc.\n", "Ok");
 	BTextView *view = alert->TextView();
@@ -407,12 +428,16 @@
 int32
 NetworkStatusView::_DetermineInterfaceStatus(const char* name)
 {
+	SocketOpener socket;
+	if (socket.InitCheck() != B_OK)
+		return kStatusUnknown;
+
 	ifreq request;
 	if (!_PrepareRequest(request, name))
 		return kStatusUnknown;
 
 	uint32 flags = 0;
-	if (ioctl(fSocket, SIOCGIFFLAGS, &request, sizeof(struct ifreq)) == 0)
+	if (ioctl(socket, SIOCGIFFLAGS, &request, sizeof(struct ifreq)) == 0)
 		flags = request.ifr_flags;
 
 	int32 status = kStatusNoLink;
@@ -431,29 +456,33 @@
 void
 NetworkStatusView::_Update(bool force)
 {
+	SocketOpener socket;
+	if (socket.InitCheck() != B_OK)
+		return;
+
 	// iterate over all interfaces and retrieve minimal status
 
 	ifconf config;
 	config.ifc_len = sizeof(config.ifc_value);
-	if (ioctl(fSocket, SIOCGIFCOUNT, &config, sizeof(struct ifconf)) < 0)
+	if (ioctl(socket, SIOCGIFCOUNT, &config, sizeof(struct ifconf)) < 0)
 		return;
 
 	uint32 count = (uint32)config.ifc_value;
 	if (count == 0)
 		return;
 
-	void *buffer = malloc(count * sizeof(struct ifreq));
+	void* buffer = malloc(count * sizeof(struct ifreq));
 	if (buffer == NULL)
 		return;
 
 	config.ifc_len = count * sizeof(struct ifreq);
 	config.ifc_buf = buffer;
-	if (ioctl(fSocket, SIOCGIFCONF, &config, sizeof(struct ifconf)) < 0) {
+	if (ioctl(socket, SIOCGIFCONF, &config, sizeof(struct ifconf)) < 0) {
 		free(buffer);
 		return;
 	}
 
-	ifreq *interface = (ifreq *)buffer;
+	ifreq* interface = (ifreq*)buffer;
 
 	int32 oldStatus = fStatus;
 	fStatus = kStatusUnknown;
@@ -481,15 +510,15 @@
 void
 NetworkStatusView::_OpenNetworksPreferences()
 {
-	status_t ret = be_roster->Launch("application/x-vnd.Haiku-Network");
-	if (ret < B_OK) {
+	status_t status = be_roster->Launch("application/x-vnd.Haiku-Network");
+	if (status < B_OK) {
 		BString errorMessage("Launching the Network preflet failed.\n\n"
 			"Error: ");
-		errorMessage << strerror(ret);
+		errorMessage << strerror(status);
 		BAlert* alert = new BAlert("launch error", errorMessage.String(),
 			"Ok");
-		// asynchronous alert in order to not block replicant host
-		// application
+
+		// asynchronous alert in order to not block replicant host application
 		alert->Go(NULL);
 	}
 }

Modified: haiku/trunk/src/apps/networkstatus/NetworkStatusView.h
===================================================================
--- haiku/trunk/src/apps/networkstatus/NetworkStatusView.h	2009-04-04 16:31:33 UTC (rev 29903)
+++ haiku/trunk/src/apps/networkstatus/NetworkStatusView.h	2009-04-04 17:12:18 UTC (rev 29904)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -56,12 +56,10 @@
 		void			_Update(bool force = false);
 		void			_OpenNetworksPreferences();
 
-		BMessageRunner*	fMessageRunner;
 		BObjectList<BString> fInterfaces;
 		bool			fInDeskbar;
 		BBitmap*		fBitmaps[kStatusCount];
 		int32			fStatus;
-		int				fSocket;
 };
 
 #endif	// NETWORK_STATUS_VIEW_H



From revol at free.fr  Sat Apr  4 19:25:27 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Sat, 04 Apr 2009 19:25:27 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r29876_-_in_haiku/trunk=3A_build/jam_bu?=
 =?utf-8?q?ild/scripts_data/system/boot_headers/os/storage_src/apps/abouts?=
 =?utf-8?q?ystem_src/apps/processcontroller_src/bin/bash_src/bin/gdb/gdb_s?=
 =?utf-8?q?rc/bin/grep/src_src/bin/make_src/bin/vim/src_src/kits/tracker_s?=
 =?utf-8?q?rc/preferences/joysticks_src/preferences/keymap_src/preferences?=
 =?utf-8?q?/time_src/servers/debug_src/servers/registrar__src/system/boot_?=
 =?utf-8?q?src/system/boot/loader_src/system/boot/platform/atari=5Fm68k_sr?=
 =?utf-8?q?c/system/boot/platform/bios=5Fia32_src/system/boot/platform/gen?=
 =?utf-8?q?eric_src/system/kernel/fs_src/system/libroot/os__src/system/run?=
 =?utf-8?q?time=5Floader?=
In-Reply-To: <200904030902.n3392mKv021542@sheep.berlios.de>
Message-ID: <31571218160-BeMail@laptop>

> Log:
> * Changed directory structure as suggested on the mailing list.

Maybe such a huge change should be commited alone to make it easier to 
see what goes with it...

> * Also, NetBootArchive, and FloppyBootImage haven't been updated yet. 
> Will do
>   so next.

They each have their own list of module and driver files, maybe those 
should be merged someway... would simplify changing stuff.

Fran?ois.


From stippi at mail.berlios.de  Sat Apr  4 19:26:55 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sat, 4 Apr 2009 19:26:55 +0200
Subject: [Haiku-commits] r29905 - haiku/trunk/src/kits/tracker
Message-ID: <200904041726.n34HQtEp002507@sheep.berlios.de>

Author: stippi
Date: 2009-04-04 19:26:52 +0200 (Sat, 04 Apr 2009)
New Revision: 29905
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29905&view=rev

Modified:
   haiku/trunk/src/kits/tracker/ContainerWindow.cpp
Log:
Patch by Maxime Simon: Add short cuts ot the icon modes. Thanks a lot! Fixes
ticket #2431.


Modified: haiku/trunk/src/kits/tracker/ContainerWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-04-04 17:12:18 UTC (rev 29904)
+++ haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-04-04 17:26:52 UTC (rev 29905)
@@ -1916,29 +1916,29 @@
 
 	message = new BMessage(kScaleIconMode);
 	message->AddInt32("size", 40);
-	item = new BMenuItem("40 x 40", message);
+	item = new BMenuItem("40 x 40", message, '2');
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
 	message = new BMessage(kScaleIconMode);
 	message->AddInt32("size", 48);
-	item = new BMenuItem("48 x 48", message);
+	item = new BMenuItem("48 x 48", message, '3');
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
 	message = new BMessage(kScaleIconMode);
 	message->AddInt32("size", 64);
-	item = new BMenuItem("64 x 64", message);
+	item = new BMenuItem("64 x 64", message, '4');
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
 	menu->AddItem(iconSizeMenu);
 
-	item = new BMenuItem("Mini Icon View", new BMessage(kMiniIconMode), '2');
+	item = new BMenuItem("Mini Icon View", new BMessage(kMiniIconMode), '5');
 	item->SetTarget(PoseView());
 	menu->AddItem(item);
 
-	item = new BMenuItem("List View", new BMessage(kListMode), '3');
+	item = new BMenuItem("List View", new BMessage(kListMode), '6');
 	item->SetTarget(PoseView());
 	menu->AddItem(item);
 



From axeld at pinc-software.de  Sat Apr  4 20:53:07 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sat, 04 Apr 2009 20:53:07
Subject: [Haiku-commits] r29876 - in haiku/trunk: build/jam
 build/scripts data/system/boot headers/os/storage src/apps/aboutsystem
 src/apps/processcontroller src/bin/bash src/bin/gdb/gdb src/bin/grep/src
 src/bin/make src/bin/vim/src src/kits/tracker src/preferences/joysticks
 src/preferences/keymap src/preferences/time src/servers/debug
 src/servers/registrar src/system/boot src/system/boot/loader
 src/system/boot/platform/atari_m68k src/system/boot/platform/bios_ia32
 src/system/boot/platform/generic src/system/kernel/fs src/system/libroot/os
 src/system/runtime_loader
In-Reply-To: <31571218160-BeMail@laptop>
Message-ID: <423645946-BeMail@ibm>

Fran?ois Revol wrote:
> > Log:
> > * Changed directory structure as suggested on the mailing list.
> Maybe such a huge change should be commited alone to make it easier 
> to 
> see what goes with it...

While I could ask you right away as you sit almost next to me: what do 
you mean by committing it alone? It only contains stuff that was needed 
to make it work - besides renaming zbeos, but I needed to touch most of 
that parts anyway, due to the change in location.

> > * Also, NetBootArchive, and FloppyBootImage haven't been updated 
> > yet. 
> > Will do so next.
> They each have their own list of module and driver files, maybe those 
> should be merged someway... would simplify changing stuff.

Indeed. Someone could do that :-)

Bye,
   Axel.



From stippi at mail.berlios.de  Sat Apr  4 23:03:36 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sat, 4 Apr 2009 23:03:36 +0200
Subject: [Haiku-commits] r29906 - in haiku/trunk: data/etc/licenses
	src/apps/aboutsystem src/apps/poorman src/apps/poorman/libhttpd
Message-ID: <200904042103.n34L3aHE019900@sheep.berlios.de>

Author: stippi
Date: 2009-04-04 23:03:19 +0200 (Sat, 04 Apr 2009)
New Revision: 29906
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29906&view=rev

Added:
   haiku/trunk/data/etc/licenses/LibHTTPd
   haiku/trunk/src/apps/poorman/PoorManLogger.cpp
   haiku/trunk/src/apps/poorman/PoorManLogger.h
   haiku/trunk/src/apps/poorman/PoorManServer.cpp
   haiku/trunk/src/apps/poorman/PoorManServer.h
   haiku/trunk/src/apps/poorman/libhttpd/
   haiku/trunk/src/apps/poorman/libhttpd/README
   haiku/trunk/src/apps/poorman/libhttpd/config.h
   haiku/trunk/src/apps/poorman/libhttpd/libhttpd.c
   haiku/trunk/src/apps/poorman/libhttpd/libhttpd.h
   haiku/trunk/src/apps/poorman/libhttpd/match.c
   haiku/trunk/src/apps/poorman/libhttpd/match.h
   haiku/trunk/src/apps/poorman/libhttpd/mime_encodings.txt
   haiku/trunk/src/apps/poorman/libhttpd/mime_types.txt
   haiku/trunk/src/apps/poorman/libhttpd/tdate_parse.c
   haiku/trunk/src/apps/poorman/libhttpd/tdate_parse.h
   haiku/trunk/src/apps/poorman/libhttpd/version.h
Removed:
   haiku/trunk/src/apps/poorman/PoorManMainView.cpp
   haiku/trunk/src/apps/poorman/PoorManMainView.h
Modified:
   haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
   haiku/trunk/src/apps/poorman/Jamfile
   haiku/trunk/src/apps/poorman/PoorMan.cpp
   haiku/trunk/src/apps/poorman/PoorManApplication.cpp
   haiku/trunk/src/apps/poorman/PoorManApplication.h
   haiku/trunk/src/apps/poorman/PoorManPreferencesWindow.cpp
   haiku/trunk/src/apps/poorman/PoorManPreferencesWindow.h
   haiku/trunk/src/apps/poorman/PoorManWindow.cpp
   haiku/trunk/src/apps/poorman/PoorManWindow.h
   haiku/trunk/src/apps/poorman/StatusSlider.cpp
   haiku/trunk/src/apps/poorman/StatusSlider.h
   haiku/trunk/src/apps/poorman/constants.cpp
   haiku/trunk/src/apps/poorman/constants.h
Log:
Patch by Ma Jie: Basically - make Poorman (the webserver) work. Libhttpd from
Jef Poskanzer is providing the backend, but had to be adopted in some ways.
Other issues in Poorman have been resolved.

When testing the license integration, I stumbled over some AboutSystem bugs,
basically clicking licenses would not open them. I fixed those in this patch,
sorry for mixing that up.

Note to Ma Jie: I changed the encoding of the libhttpd files to UTF-8!
(This affects only the (C) glyph.) Thanks a lot for your awesome work on
Poorman, it's really appreciated!


Added: haiku/trunk/data/etc/licenses/LibHTTPd
===================================================================
--- haiku/trunk/data/etc/licenses/LibHTTPd	2009-04-04 17:26:52 UTC (rev 29905)
+++ haiku/trunk/data/etc/licenses/LibHTTPd	2009-04-04 21:03:19 UTC (rev 29906)
@@ -0,0 +1,25 @@
+/*
+** Copyright ? 1995,1998,1999,2000,2001 by Jef Poskanzer <jef at mail.acme.com>.
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+** 1. Redistributions of source code must retain the above copyright
+**    notice, this list of conditions and the following disclaimer.
+** 2. Redistributions in binary form must reproduce the above copyright
+**    notice, this list of conditions and the following disclaimer in the
+**    documentation and/or other materials provided with the distribution.
+**
+** THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+** ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+** OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+** LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+** SUCH DAMAGE.
+*/

Modified: haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp
===================================================================
--- haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2009-04-04 17:26:52 UTC (rev 29905)
+++ haiku/trunk/src/apps/aboutsystem/AboutSystem.cpp	2009-04-04 21:03:19 UTC (rev 29906)
@@ -565,7 +565,7 @@
 	_GetLicensesPath(licensesPath);
 
 	BPath mitPath(licensesPath);
-	mitPath.Append("MIT license");
+	mitPath.Append("MIT");
 
 	font.SetSize(be_bold_font->Size() + 4);
 	font.SetFace(B_BOLD_FACE);
@@ -808,6 +808,13 @@
 //		"http://www.opensound.com");
 // BSD license
 
+	// libhttpd copyright (used as Poorman backend)
+	AddCopyrightEntry("libhttpd",
+		"Copyright " B_UTF8_COPYRIGHT "1995,1998,1999,2000,2001 by "
+		"Jef Poskanzer. All rights reserved.",
+		Licenses("LibHTTPd", NULL),
+		"http://www.acme.com/software/thttpd/");
+
 #ifdef __INTEL__
 	// Udis86 copyrights
 	AddCopyrightEntry("Udis86",
@@ -1018,7 +1025,7 @@
 		for (int32 i = 0; i < licenses.CountLicenses(); i++) {
 			const char* license = licenses.LicenseAt(i);
 			BString licensePath(licensesPath.Path());
-			licensePath += license;
+			licensePath << '/' << license;
 
 			if (i > 0)
 				fCreditsView->Insert(", ");

Modified: haiku/trunk/src/apps/poorman/Jamfile
===================================================================
--- haiku/trunk/src/apps/poorman/Jamfile	2009-04-04 17:26:52 UTC (rev 29905)
+++ haiku/trunk/src/apps/poorman/Jamfile	2009-04-04 21:03:19 UTC (rev 29906)
@@ -1,19 +1,53 @@
 SubDir HAIKU_TOP src apps poorman ;
 
+SubDirCcFlags [ FDefines HAVE__PROGNAME=1 HAVE_FCNTL_H=1 HAVE_GRP_H=1 HAVE_MEMORY_H=1 HAVE_POLL_H=1 HAVE_SYS_POLL_H=1 TIME_WITH_SYS_TIME=1 HAVE_DIRENT_H=1 HAVE_STRERROR=1 HAVE_WAITPID=1 HAVE_VSNPRINTF=1 HAVE_SETSID=1 HAVE_SIGSET=1 HAVE_ATOLL=1 HAVE_UNISTD_H=1 HAVE_GETPAGESIZE=1 HAVE_MMAP=1 HAVE_SELECT=1 HAVE_POLL=1 HAVE_TM_GMTOFF=1 HAVE_SOCKLENT=1 HAVE_INT64T=1 ] ;
+
+SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps poorman libhttpd ] ;
+
+rule THTTPMakeHeader header : text
+{
+        header = [ FGristFiles $(header) ] ;
+        text = [ FGristFiles $(text) ] ;
+
+        SEARCH on $(text) = $(SEARCH_SOURCE) ;
+        MakeLocateArch $(header) ;
+
+        Depends $(header) : $(text) ;
+        LocalClean clean : $(header) ;
+
+        THTTPMakeHeader1 $(header) : $(text) ;
+}
+
+actions THTTPMakeHeader1
+{
+		rm -f $(1)
+		sed < $(2) > $(1) \
+			-e 's/#.*//' -e 's/[ 	]*$//' -e '/^$/d' \
+			-e 's/[ 	][ 	]*/", 0, "/' -e 's/^/{ "/' -e 's/$/", 0 },/'
+}
+
+THTTPMakeHeader mime_encodings.h : mime_encodings.txt ;
+THTTPMakeHeader mime_types.h : mime_types.txt ;
+
 AddResources PoorMan : PoorMan.rdef ;
 
 Application PoorMan : PoorMan.cpp
-	PoorManMainView.cpp
 	PoorManWindow.cpp
 	PoorManView.cpp
 	PoorManAdvancedView.cpp
 	StatusSlider.cpp
+	PoorManServer.cpp
 	PoorManSiteView.cpp
+	PoorManLogger.cpp
 	PoorManLoggingView.cpp
 	PoorManPreferencesWindow.cpp 
 	PoorManApplication.cpp
 	constants.cpp
-	: be tracker $(TARGET_LIBSTDC++)
+	
+	# libhttpd
+	libhttpd.c
+	match.c
+	tdate_parse.c
+	
+	: be network tracker $(TARGET_LIBSTDC++)
 	;
-
-

Modified: haiku/trunk/src/apps/poorman/PoorMan.cpp
===================================================================
--- haiku/trunk/src/apps/poorman/PoorMan.cpp	2009-04-04 17:26:52 UTC (rev 29905)
+++ haiku/trunk/src/apps/poorman/PoorMan.cpp	2009-04-04 21:03:19 UTC (rev 29906)
@@ -18,4 +18,4 @@
 	//printf("be_app: %p", be_app);
 	
 	return 0;
-}
\ No newline at end of file
+}

Modified: haiku/trunk/src/apps/poorman/PoorManApplication.cpp
===================================================================
--- haiku/trunk/src/apps/poorman/PoorManApplication.cpp	2009-04-04 17:26:52 UTC (rev 29905)
+++ haiku/trunk/src/apps/poorman/PoorManApplication.cpp	2009-04-04 21:03:19 UTC (rev 29906)
@@ -5,30 +5,35 @@
  *	Version: 0.1
  */
 
+#include <Application.h>
 #include <Alert.h>
+#include <Directory.h>
 
 #include "constants.h"
-#include "PoorManView.h"
 #include "PoorManApplication.h"
+#include "PoorManWindow.h"
 
-
 PoorManApplication::PoorManApplication()
 	: BApplication(STR_APP_SIG),
-	  status(false), hits(0)
+	  mainWindow(NULL)
 {
-	// -------------------------------------------
-	// Main Window
-	//PoorManView		* mainView;
-	BRect			  mainRect;
-	
-	mainRect.Set(30.0f, 30.0f, 355.0f, 185.0f);
+	BRect mainRect(82.0f, 30.0f, 400.0f, 350.0f);
 	mainWindow = new PoorManWindow(mainRect);
+	mainWindow->Hide();
+	mainWindow->Show();
 	
-	//mainRect.OffsetTo(B_ORIGIN);
-	//mainView = new PoorManView(mainRect, STR_APP_NAME);
-	//mainView->SetViewColor(216,216,216,255);
+	BDirectory webDir;
+	if(mainWindow->ReadSettings() != B_OK){
+		if(webDir.SetTo(STR_DEFAULT_WEB_DIRECTORY) != B_OK)
+			mainWindow->DefaultSettings();
+	} else {
+		if(webDir.SetTo(mainWindow->WebDir()) != B_OK)
+			mainWindow->DefaultSettings();
+	}
 	
-	mainWindow->Show();	
+	mainWindow->StartServer();
+	mainWindow->SetDirLabel(mainWindow->WebDir());
+	mainWindow->Show();
 }
 
 void 

Modified: haiku/trunk/src/apps/poorman/PoorManApplication.h
===================================================================
--- haiku/trunk/src/apps/poorman/PoorManApplication.h	2009-04-04 17:26:52 UTC (rev 29905)
+++ haiku/trunk/src/apps/poorman/PoorManApplication.h	2009-04-04 21:03:19 UTC (rev 29906)
@@ -11,8 +11,8 @@
 
 #include <Application.h>
 
-#include "PoorManWindow.h"
-#include "PoorManPreferencesWindow.h"
+class PoorManWindow;
+//#include "PoorManPreferencesWindow.h"
 
 
 class PoorManApplication: public BApplication
@@ -23,13 +23,13 @@
 PoorManWindow *	GetPoorManWindow() { return mainWindow; }
 private:
 			PoorManWindow				* mainWindow;
-			PoorManPreferencesWindow	* prefWindow;
+			//PoorManPreferencesWindow	* prefWindow;
 			
 			// --------------------------------------------
 			// settings variables
-			bool	status;
-			char	directory[512];
-			uint32	hits;	
+			//bool	status;
+			//char	directory[512];
+			//uint32	hits;	
 	
 };
 

Added: haiku/trunk/src/apps/poorman/PoorManLogger.cpp
===================================================================
--- haiku/trunk/src/apps/poorman/PoorManLogger.cpp	2009-04-04 17:26:52 UTC (rev 29905)
+++ haiku/trunk/src/apps/poorman/PoorManLogger.cpp	2009-04-04 21:03:19 UTC (rev 29906)
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2009 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Author(s):
+ *		Ma Jie, china.majie at gmail
+ */
+
+#include "PoorManLogger.h"
+
+#include <time.h>
+#include <netinet/in.h>
+
+#include <Messenger.h>
+#include <Message.h>
+#include <TypeConstants.h>
+
+#include "PoorManApplication.h"
+#include "PoorManWindow.h"
+
+void
+poorman_log(const char* msg, bool needTimeHeader,
+	in_addr_t addr, rgb_color color)
+{
+	time_t now = time(NULL);
+	
+	PoorManWindow* window = static_cast<PoorManApplication*>(be_app)->GetPoorManWindow();
+
+	if(!window->LogConsoleFlag() && !window->LogFileFlag())
+		return;
+	
+	BMessenger messenger(window);
+	BMessage message(MSG_LOG);
+	
+	if(message.AddString("cstring", msg) != B_OK)
+		return;
+	if(needTimeHeader){
+		if(message.AddData("time_t", B_TIME_TYPE, &now, sizeof(time_t)) != B_OK)
+			return;
+	}
+	if(addr != INADDR_NONE)
+		message.AddData("in_addr_t", B_ANY_TYPE, &addr, sizeof(in_addr_t));
+	
+	if(color != BLACK)
+		message.AddData("rgb_color", B_RGB_COLOR_TYPE, &color, sizeof(rgb_color));
+
+	messenger.SendMessage(&message, (BHandler*)NULL, 1000000);
+}

Added: haiku/trunk/src/apps/poorman/PoorManLogger.h
===================================================================
--- haiku/trunk/src/apps/poorman/PoorManLogger.h	2009-04-04 17:26:52 UTC (rev 29905)
+++ haiku/trunk/src/apps/poorman/PoorManLogger.h	2009-04-04 21:03:19 UTC (rev 29906)
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2009 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Author(s):
+ *		Ma Jie, china.majie at gmail
+ */
+#ifndef POOR_MAN_LOG_H
+#define POOR_MAN_LOG_H
+
+#include <netinet/in.h>
+
+#include "constants.h" //for rgb_color BLACK
+
+#ifdef __cplusplus
+	extern "C"
+	void poorman_log(
+		const char* msg,
+		bool needTimeHeader = true,
+		in_addr_t addr = INADDR_NONE,
+		rgb_color color = BLACK
+	);
+#else //c version is for libhttpd
+	void poorman_log(
+		const char* msg,
+		bool needTimeHeader,
+		in_addr_t addr,
+		rgb_color color
+	);
+#endif
+
+
+#endif	// POOR_MAN_LOG_H

Deleted: haiku/trunk/src/apps/poorman/PoorManMainView.cpp

Deleted: haiku/trunk/src/apps/poorman/PoorManMainView.h

Modified: haiku/trunk/src/apps/poorman/PoorManPreferencesWindow.cpp
===================================================================
--- haiku/trunk/src/apps/poorman/PoorManPreferencesWindow.cpp	2009-04-04 17:26:52 UTC (rev 29905)
+++ haiku/trunk/src/apps/poorman/PoorManPreferencesWindow.cpp	2009-04-04 21:03:19 UTC (rev 29906)
@@ -8,14 +8,14 @@
 #include <Window.h>
 #include <Box.h>
 #include <Directory.h>
-#include <iostream>
+#include <Debug.h>
 
 #include "constants.h"
 #include "PoorManWindow.h"
 #include "PoorManApplication.h"
 #include "PoorManPreferencesWindow.h"
+#include "PoorManServer.h"
 
-
 PoorManPreferencesWindow::PoorManPreferencesWindow(BRect frame, char * name)
 	: BWindow(frame, name, B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_RESIZABLE),
 	webDirFilePanel(NULL),
@@ -102,7 +102,7 @@
 	BMessenger messenger(this);
 	BMessage message(MSG_FILE_PANEL_SELECT_WEB_DIR);
 	webDirFilePanel = new BFilePanel(B_OPEN_PANEL, &messenger, NULL,
-		B_DIRECTORY_NODE, false, &message);
+		B_DIRECTORY_NODE, false, &message, NULL, true);
 
 	webDirFilePanel->SetPanelDirectory(new BDirectory("/boot/home/public_html"));
 	webDirFilePanel->SetButtonLabel(B_DEFAULT_BUTTON, "Select");
@@ -120,39 +120,44 @@
 
 }
 
-
 PoorManPreferencesWindow::~PoorManPreferencesWindow()
 {
 	delete logFilePanel;
 	delete webDirFilePanel;
 }
 
-
 void
 PoorManPreferencesWindow::MessageReceived(BMessage* message)
 {
 	switch (message->what) {
 	case MSG_PREF_BTN_DONE:
 			PoorManWindow		*	win;
+			PoorManServer* server;
 			win = ((PoorManApplication *)be_app)->GetPoorManWindow();
+			server = win->GetServer();
 
-			std::cout << "Pref Window: sendDir CheckBox: " << siteView->SendDirValue() << std::endl;
+			PRINT(("Pref Window: sendDir CheckBox: %d\n", siteView->SendDirValue()));
+			server->SetListDir(siteView->SendDirValue());
 			win->SetDirListFlag(siteView->SendDirValue());
-			std::cout << "Pref Window: indexFileName TextControl: " << siteView->IndexFileName() << std::endl;
-			win->SetIndexFileName(siteView->IndexFileName());
-			std::cout << "Pref Window: webDir: " << siteView->WebDir() << std::endl;
-			win->SetWebDir(siteView->WebDir());
-			win->SetDirLabel(siteView->WebDir());
+			PRINT(("Pref Window: indexFileName TextControl: %s\n", siteView->IndexFileName()));
+			if(server->SetIndexName(siteView->IndexFileName()) == B_OK)
+				win->SetIndexFileName(siteView->IndexFileName());
+			PRINT(("Pref Window: webDir: %s\n", siteView->WebDir()));
+			if(server->SetWebDir(siteView->WebDir()) == B_OK){
+				win->SetWebDir(siteView->WebDir());
+				win->SetDirLabel(siteView->WebDir());
+			}
 
-			std::cout << "Pref Window: logConsole CheckBox: " << loggingView->LogConsoleValue() << std::endl;
+			PRINT(("Pref Window: logConsole CheckBox: %d\n", loggingView->LogConsoleValue()));
 			win->SetLogConsoleFlag(loggingView->LogConsoleValue());
-			std::cout << "Pref Window: logFile CheckBox: " << loggingView->LogFileValue() << std::endl;
+			PRINT(("Pref Window: logFile CheckBox: %d\n", loggingView->LogFileValue()));
 			win->SetLogFileFlag(loggingView->LogFileValue());
-			std::cout << "Pref Window: logFileName: " << loggingView->LogFileName() << std::endl;
+			PRINT(("Pref Window: logFileName: %s\n", loggingView->LogFileName()));
 			win->SetLogPath(loggingView->LogFileName());
 
-			std::cout << "Pref Window: MaxConnections Slider: " << advancedView->MaxSimultaneousConnections() << std::endl;
-			win->SetMaxConnections(advancedView->MaxSimultaneousConnections());
+			PRINT(("Pref Window: MaxConnections Slider: %ld\n", advancedView->MaxSimultaneousConnections()));
+			server->SetMaxConns(advancedView->MaxSimultaneousConnections());
+			win->SetMaxConnections((int16)advancedView->MaxSimultaneousConnections());
 
 
 			if (Lock())
@@ -169,7 +174,7 @@
 		break;
 	case MSG_FILE_PANEL_SELECT_WEB_DIR:
 			// handle the open BMessage from the Select Web Directory File Panel
-			std::cout << "Select Web Directory:\n" << std::endl;
+			PRINT(("Select Web Directory:\n"));
 			SelectWebDir(message);
 		break;
 	case MSG_PREF_LOG_BTN_CREATE_FILE:
@@ -178,12 +183,12 @@
 		break;
 	case MSG_FILE_PANEL_CREATE_LOG_FILE:
 			// handle the save BMessage from the Create Log File Panel
-			std::cout << "Create Log File:\n" << std::endl;
+			PRINT(("Create Log File:\n"));
 			CreateLogFile(message);
 		break;
 	case MSG_PREF_ADV_SLD_MAX_CONNECTION:
 			max_connections = advancedView->MaxSimultaneousConnections();
-			std::cout << "Max Connections: " << max_connections << std::endl;
+			PRINT(("Max Connections: %ld\n", max_connections));
 		break;
 
 	default:
@@ -212,8 +217,20 @@
 	//	;//return err;
 	entry.GetPath(&path);
 
-	std::cout << "DIR: " << path.Path() << std::endl;
+	PRINT(("DIR: %s\n", path.Path()));
 	siteView->SetWebDir(path.Path());
+	
+	bool temp;
+	if(message->FindBool("Default Dialog", &temp) == B_OK){
+		PoorManWindow* win = ((PoorManApplication *)be_app)->GetPoorManWindow();
+		if(win->GetServer()->SetWebDir(siteView->WebDir()) == B_OK){
+			win->SetWebDir(siteView->WebDir());
+			win->SetDirLabel(siteView->WebDir());
+		}
+		win->StartServer();
+		if(Lock())
+			Quit();
+	}
 }
 
 void
@@ -236,7 +253,7 @@
 	//	;//return err;
 	entry.GetPath(&path);
 	path.Append(name);
-	std::cout << "Log File: " << path.Path() << std::endl;
+	PRINT(("Log File: %s\n", path.Path()));
 
 	if (err == B_OK)
 	{
@@ -246,3 +263,15 @@
 
 	// mark the checkbox
 }
+
+/*A special version for "the default dialog", don't use it in MessageReceived()*/
+void
+PoorManPreferencesWindow::ShowWebDirFilePanel()
+{
+	BMessage message(MSG_FILE_PANEL_SELECT_WEB_DIR);
+	message.AddBool("Default Dialog", true);
+	
+	webDirFilePanel->SetMessage(&message);
+	if(!webDirFilePanel->IsShowing())
+		webDirFilePanel->Show();
+}

Modified: haiku/trunk/src/apps/poorman/PoorManPreferencesWindow.h
===================================================================
--- haiku/trunk/src/apps/poorman/PoorManPreferencesWindow.h	2009-04-04 17:26:52 UTC (rev 29905)
+++ haiku/trunk/src/apps/poorman/PoorManPreferencesWindow.h	2009-04-04 21:03:19 UTC (rev 29906)
@@ -72,7 +72,7 @@
 
 virtual	void	MessageReceived(BMessage * message);
 
-		void	ShowWebDirFilePanel() { if (!webDirFilePanel->IsShowing()) webDirFilePanel->Show(); }
+		void	ShowWebDirFilePanel();
 		void	SelectWebDir(BMessage * message);
 		void	CreateLogFile(BMessage * message);
 };

Added: haiku/trunk/src/apps/poorman/PoorManServer.cpp
===================================================================
--- haiku/trunk/src/apps/poorman/PoorManServer.cpp	2009-04-04 17:26:52 UTC (rev 29905)
+++ haiku/trunk/src/apps/poorman/PoorManServer.cpp	2009-04-04 21:03:19 UTC (rev 29906)
@@ -0,0 +1,424 @@
+/*
+ * Copyright 2009 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Author(s):
+ *		Ma Jie, china.majie at gmail
+ */
+
+#include "PoorManServer.h"
+
+#include <pthread.h>
+#include <string.h>
+#include <stdlib.h>
+#include <time.h> //for struct timeval
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <File.h>
+#include <Debug.h>
+#include <OS.h>
+#include <String.h>
+#include <StorageDefs.h>
+#include <SupportDefs.h>
+
+#include "PoorManApplication.h"
+#include "PoorManLogger.h"
+#include "PoorManWindow.h"
+#include "libhttpd/libhttpd.h"
+
+PoorManServer::PoorManServer(const char* webDir,
+	int32 maxConns,	bool listDir,const char* idxName)
+	:fIsRunning(false),
+	 fMaxConns(maxConns),
+	 fIndexName(new char[strlen(idxName)+1]),
+	 fCurConns(0)
+{
+	fHttpdServer = httpd_initialize(
+		(char*)0,//hostname
+		(httpd_sockaddr*)0,//sa4P
+		(httpd_sockaddr*)0,//sa6P
+		(unsigned short)80,//port
+		(char*)0,//cgi pattern
+		0,//cgi_limit
+		"iso-8859-1",//charset
+		"",//p3p
+		-1,//max_age
+		const_cast<char*>(webDir),//cwd
+		1,//no_log
+		(FILE*)0,//logfp
+		0,//no_symlink_check
+		0,//vhost
+		0,//global_passwd
+		(char*)0,//url_pattern
+		(char*)0,//local_pattern
+		0//no_empty_referers
+	);
+	
+	strcpy(fIndexName, idxName);
+	
+	size_t cwdLen = strlen(fHttpdServer->cwd);
+	if(fHttpdServer->cwd[cwdLen-1] == '/'){
+		fHttpdServer->cwd[cwdLen-1] = '\0';
+	}
+	
+	fHttpdServer->do_list_dir = (listDir?1:0);
+	fHttpdServer->index_name = fIndexName;
+	
+	pthread_rwlock_init(&fWebDirLock, NULL);
+	pthread_rwlock_init(&fIndexNameLock, NULL);
+}
+
+PoorManServer::~PoorManServer()
+{
+	Stop();
+	httpd_terminate(fHttpdServer);
+	delete[] fIndexName;
+	pthread_rwlock_destroy(&fWebDirLock);
+	pthread_rwlock_destroy(&fIndexNameLock);
+}
+
+status_t PoorManServer::Run()
+{
+	if(chdir(fHttpdServer->cwd) == -1){
+		poorman_log("no web directory, can't start up.\n", false, INADDR_NONE, RED);
+		return B_ERROR;
+	}
+	
+	httpd_sockaddr sa4;
+	memset(&sa4,0,sizeof(httpd_sockaddr));
+	sa4.sa_in.sin_family = AF_INET;
+	sa4.sa_in.sin_port = htons(80);
+	sa4.sa_in.sin_addr.s_addr = htonl(INADDR_ANY);
+	fHttpdServer->listen4_fd = httpd_initialize_listen_socket(&sa4);
+	if(fHttpdServer->listen4_fd == -1)
+		return B_ERROR;
+
+	fListenerTid = spawn_thread(
+		PoorManServer::_Listener,
+		"www listener",
+		B_NORMAL_PRIORITY,
+		static_cast<void*>(this)
+	);
+	if(fListenerTid < B_OK){
+		poorman_log("can't create listener thread.\n", false, INADDR_NONE, RED);
+		return B_ERROR;
+	}
+	fIsRunning = true;
+	if(resume_thread(fListenerTid) != B_OK){
+		fIsRunning = false;
+		return B_ERROR;
+	}
+	
+	//our server is up and running
+	return B_OK;
+}
+
+status_t PoorManServer::Stop()
+{
+	if(fIsRunning){
+		fIsRunning = false;
+		httpd_unlisten(fHttpdServer);
+	}
+	return B_OK;
+}
+
+/*The Web Dir is not changed if an error occured.
+ */
+status_t PoorManServer::SetWebDir(const char* webDir)
+{
+	if(chdir(webDir) == -1){
+		//log it
+		return B_ERROR;
+	}
+
+	char* tmp = strdup(webDir);
+	if(tmp == NULL)
+		return B_ERROR;
+	
+	if(pthread_rwlock_wrlock(&fWebDirLock) == 0){
+		free(fHttpdServer->cwd);
+		fHttpdServer->cwd = tmp;
+		if(tmp[strlen(tmp)-1] == '/'){
+			tmp[strlen(tmp)-1] = '\0';
+		}
+		pthread_rwlock_unlock(&fWebDirLock);
+	} else {
+		free(tmp);
+		return B_ERROR;
+	}
+
+	return B_OK;
+}
+
+status_t PoorManServer::SetMaxConns(int32 count)
+{
+	fMaxConns = count;
+	return B_OK;
+}
+
+status_t PoorManServer::SetListDir(bool listDir)
+{
+	fHttpdServer->do_list_dir = (listDir?1:0);
+	return B_OK;
+}
+
+status_t PoorManServer::SetIndexName(const char* idxName)
+{
+	size_t length = strlen(idxName);
+	if(length > B_PATH_NAME_LENGTH+1)
+		return B_ERROR;
+	
+	char* tmp = new char[length+1];
+	if(tmp == NULL)
+		return B_ERROR;
+	
+	strcpy(tmp, idxName);
+	if(pthread_rwlock_wrlock(&fIndexNameLock) == 0){
+		delete[] fIndexName;
+		fIndexName = tmp;
+		fHttpdServer->index_name = fIndexName;
+		pthread_rwlock_unlock(&fIndexNameLock);
+	} else {
+		delete[] tmp;
+		return B_ERROR;
+	}
+	
+	return B_OK;
+}
+
+int32 PoorManServer::_Listener(void* data)
+{
+	PRINT(("The listener thread is working.\n"));
+	int retval;
+	thread_id tid;
+	httpd_conn* hc;
+	PoorManServer* s = static_cast<PoorManServer*>(data);
+	
+	while(s->fIsRunning){
+		hc = new httpd_conn;
+		hc->initialized = 0;
+		PRINT(("calling httpd_get_conn()\n"));
+		retval = //accept(), blocked here
+			httpd_get_conn(s->fHttpdServer, s->fHttpdServer->listen4_fd, hc);
+		switch (retval){
+		case GC_OK:
+			break;
+		case GC_FAIL:
+			httpd_destroy_conn(hc);
+			delete hc;
+			s->fIsRunning = false;
+			return -1;
+		case GC_NO_MORE: //should not happen, since we have a blocking socket
+			httpd_destroy_conn(hc);
+			continue;
+			break;
+		default: //shouldn't happen
+			continue;
+			break;
+		}
+		
+		if(s->fCurConns > s->fMaxConns){
+			httpd_send_err(hc, 503,
+				httpd_err503title, "", httpd_err503form, "");
+			httpd_write_response(hc);
+			continue;
+		}
+		
+		tid = spawn_thread(
+			PoorManServer::_Worker,
+			"www connection",
+			B_NORMAL_PRIORITY,
+			static_cast<void*>(s)
+		);
+		if(tid < B_OK){
+			continue;
+		}
+		/*We don't check the return code here.
+		 *As we can't kill a thread that doesn't receive the
+		 *httpd_conn, we simply let it die itself.
+		 */
+		send_data(tid, 512, &hc, sizeof(httpd_conn*));
+		atomic_add(&s->fCurConns, 1);
+		resume_thread(tid);
+	}//while
+	return 0;
+}
+
+int32 PoorManServer::_Worker(void* data)
+{
+	static const struct timeval kTimeVal = {60, 0};
+	PoorManServer* s = static_cast<PoorManServer*>(data);
+	httpd_conn* hc;
+	int retval;
+	
+	if(has_data(find_thread(NULL))){
+		thread_id sender;
+		if(receive_data(&sender, &hc, sizeof(httpd_conn*)) != 512)
+			goto cleanup;
+	} else {
+		goto cleanup;
+	}
+	
+	PRINT(("A worker thread starts to work.\n"));
+
+	setsockopt(hc->conn_fd, SOL_SOCKET, SO_RCVTIMEO, &kTimeVal, sizeof(struct timeval));	
+	retval = recv(
+		hc->conn_fd,
+		&(hc->read_buf[hc->read_idx]),
+		hc->read_size - hc->read_idx,
+		0
+	);
+	if(retval < 0)
+		goto cleanup;
+
+	hc->read_idx += retval;
+	switch(httpd_got_request(hc)){
+	case GR_GOT_REQUEST:
+		break;
+	case GR_BAD_REQUEST:
+		httpd_send_err(hc,400,httpd_err400title,"",httpd_err400form,"");
+		httpd_write_response(hc);//fall through
+	case GR_NO_REQUEST: //fall through
+	default: //won't happen
+		goto cleanup;
+		break;
+	}
+	
+	if(httpd_parse_request(hc) < 0){
+		httpd_write_response(hc);
+		goto cleanup;
+	}
+	
+	retval = httpd_start_request(hc,(struct timeval*)0);
+	if(retval < 0){
+		httpd_write_response(hc);
+		goto cleanup;
+	}
+	
+	/*true means the connection is already handled
+	 *by the directory index generator in httpd_start_request().
+	 */
+	if(hc->file_address == (char*) 0){
+		static_cast<PoorManApplication*>(be_app)->GetPoorManWindow()->SetHits(
+			static_cast<PoorManApplication*>(be_app)->GetPoorManWindow()->GetHits()+1
+		);
+		hc->conn_fd = -1;
+		goto cleanup;
+	}
+	
+	switch(hc->method){
+	case METHOD_GET:
+		s->_HandleGet(hc);
+		break;
+	case METHOD_HEAD:
+		s->_HandleHead(hc);
+		break;
+	case METHOD_POST:
+		s->_HandlePost(hc);
+		break;
+	default:
+		break;
+	}
+	
+cleanup: ;
+	httpd_close_conn(hc,(struct timeval*)0);
+	httpd_destroy_conn(hc);
+	
+	delete hc;
+	atomic_add(&s->fCurConns, -1);
+	return 0;
+}
+
+status_t PoorManServer::_HandleGet(httpd_conn* hc)
+{
+	PRINT(("HandleGet() called\n"));
+	
+	off_t length;
+	ssize_t bytesRead;
+	uint8* buf;
+	BString log;
+	
+	BFile file(hc->expnfilename, B_READ_ONLY);
+	if(file.InitCheck() != B_OK)
+		return B_ERROR;
+	
+	buf = new uint8[POOR_MAN_BUF_SIZE];
+	if(buf == NULL)
+		return B_ERROR;
+	
+	if(hc->got_range == 1)
+		length = hc->last_byte_index + 1 - hc->first_byte_index;
+	else 
+		length = hc->sb.st_size;
+	
+	static_cast<PoorManApplication*>(be_app)->GetPoorManWindow()->SetHits(
+		static_cast<PoorManApplication*>(be_app)->GetPoorManWindow()->GetHits()+1
+	);
+	
+	log.SetTo("Sending file: ");
+	if(pthread_rwlock_rdlock(&fWebDirLock) == 0){
+		log << hc->hs->cwd;
+		pthread_rwlock_unlock(&fWebDirLock);
+	}
+	log << '/' << hc->expnfilename << '\n';
+	poorman_log(log.String(), true, hc->client_addr.sa_in.sin_addr.s_addr);
+	
+	//send mime headers
+	if(send(hc->conn_fd,hc->response,hc->responselen,0) < 0){
+		delete [] buf;
+		return B_ERROR;
+	}
+	
+	file.Seek(hc->first_byte_index, SEEK_SET);
+	while(true){
+		bytesRead = file.Read(buf, POOR_MAN_BUF_SIZE);
+		if(bytesRead == 0)
+			break;
+		else if(bytesRead < 0){
+			delete [] buf;
+			return B_ERROR;
+		}
+		if(send(hc->conn_fd, (void*)buf, bytesRead, 0) < 0){
+			log.SetTo("Error sending file: ");
+			if(pthread_rwlock_rdlock(&fWebDirLock) == 0){
+				log << hc->hs->cwd;
+				pthread_rwlock_unlock(&fWebDirLock);
+			}
+			log << '/' << hc->expnfilename << '\n';
+			poorman_log(log.String(), true, hc->client_addr.sa_in.sin_addr.s_addr, RED);
+			delete [] buf;
+			return B_ERROR;
+		}
+	}
+	
+	delete [] buf;
+	return B_OK;
+}
+
+status_t PoorManServer::_HandleHead(httpd_conn* hc)
+{
+	int retval = send(hc->conn_fd,hc->response,hc->responselen,0);
+	if(retval == -1)
+		return B_ERROR;
+	return B_OK;
+}
+
+status_t PoorManServer::_HandlePost(httpd_conn* hc)
+{
+	//not implemented
+	return B_OK;
+}
+
+pthread_rwlock_t* get_web_dir_lock()
+{
+	return static_cast<PoorManApplication*>(be_app)->
+		GetPoorManWindow()->GetServer()->GetWebDirLock();
+}
+
+pthread_rwlock_t* get_index_name_lock()
+{
+	return static_cast<PoorManApplication*>(be_app)->
+		GetPoorManWindow()->GetServer()->GetIndexNameLock();
+}

Added: haiku/trunk/src/apps/poorman/PoorManServer.h
===================================================================
--- haiku/trunk/src/apps/poorman/PoorManServer.h	2009-04-04 17:26:52 UTC (rev 29905)
+++ haiku/trunk/src/apps/poorman/PoorManServer.h	2009-04-04 21:03:19 UTC (rev 29906)
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2009 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Author(s):
+ *		Ma Jie, china.majie at gmail
+ */
+#ifndef POOR_MAN_SERVER_H
+#define POOR_MAN_SERVER_H
+
+#include <pthread.h>
+
+#include <OS.h>
+#include <SupportDefs.h>
+
+#include "libhttpd/libhttpd.h"
+
+#define POOR_MAN_BUF_SIZE 1048576ll
+
+#ifdef __cplusplus
+class PoorManServer{
+public:
+						PoorManServer(const char* webDir, int32 maxConns,
+							bool listDir, const char* idxName);
+	virtual             ~PoorManServer();
+
+			status_t	Run();
+			status_t	Stop();
+
+			bool        IsRunning()const{return fIsRunning;}
+			
+			status_t    SetWebDir(const char* webDir);
+			status_t    SetMaxConns(int32 count);
+			status_t	SetListDir(bool listDir);
+			status_t	SetIndexName(const char* idxName);
+
+			pthread_rwlock_t* GetWebDirLock(){return &fWebDirLock;}
+			pthread_rwlock_t* GetIndexNameLock(){return &fIndexNameLock;}
+private:
+			bool        fIsRunning;
+			int32       fMaxConns;//Max Thread Count
+			char*		fIndexName;//Index File Name
+			
+			thread_id	  fListenerTid;
+			int32		  fCurConns;
+			httpd_server* fHttpdServer;
+			
+			pthread_rwlock_t fWebDirLock;
+			pthread_rwlock_t fIndexNameLock;
+			
+			PoorManServer(){}
+			PoorManServer(PoorManServer& s){}
+			PoorManServer& operator=(PoorManServer& s){return *this;}
+
+	//two thread functions.
+	static 	int32		_Listener(void* data);
+	static  int32		_Worker(void* data);
+	
+			status_t   _HandleGet(httpd_conn* hc);
+			status_t   _HandleHead(httpd_conn* hc);
+			status_t   _HandlePost(httpd_conn* hc);
+};
+#endif

[... truncated: 6171 lines follow ...]


From revol at free.fr  Sat Apr  4 23:27:13 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Sat, 04 Apr 2009 23:27:13 +0200 CEST
Subject: [Haiku-commits] r29876 - in haiku/trunk: build/jam
 build/scripts data/system/boot headers/os/storage src/apps/aboutsystem
 src/apps/processcontroller src/bin/bash src/bin/gdb/gdb src/bin/grep/src
 src/bin/make src/bin/vim/src src/kits/tracker src/preferences/joysticks
 src/preferences/keymap src/preferences/time src/servers/debug
 src/servers/registrar src/system/boot src/system/boot/loader
 src/system/boot/platform/atari_m68k src/system/boot/platform/bios_ia32
 src/system/boot/platform/generic src/system/kernel/fs src/system/libroot/os
 src/system/runtime_loader
In-Reply-To: <423645946-BeMail@ibm>
Message-ID: <5634864009-BeMail@laptop>

> Fran?ois Revol wrote:
> > > Log:
> > > * Changed directory structure as suggested on the mailing list.
> > Maybe such a huge change should be commited alone to make it easier 
> > to 
> > see what goes with it...
> 
> While I could ask you right away as you sit almost next to me: what 
> do 
> you mean by committing it alone? It only contains stuff that was 
> needed 
> to make it work - besides renaming zbeos, but I needed to touch most 
> of 
> that parts anyway, due to the change in location.

Just without the other parts, maybe I missread but I saw like 5 other 
items in the same commit :p

> 
> > > * Also, NetBootArchive, and FloppyBootImage haven't been updated 
> > > yet. 
> > > Will do so next.
> > They each have their own list of module and driver files, maybe 
> > those 
> > should be merged someway... would simplify changing stuff.
> 
> Indeed. Someone could do that :-)

Indeed, someone shoud do that :-)

Fran?ois.


From bonefish at mail.berlios.de  Sat Apr  4 23:57:13 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Sat, 4 Apr 2009 23:57:13 +0200
Subject: [Haiku-commits] r29907 - haiku/trunk/src/system/kernel/debug
Message-ID: <200904042157.n34LvDus022969@sheep.berlios.de>

Author: bonefish
Date: 2009-04-04 23:57:07 +0200 (Sat, 04 Apr 2009)
New Revision: 29907
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29907&view=rev

Modified:
   haiku/trunk/src/system/kernel/debug/debug.cpp
Log:
bonefish + mmlr:
Check gKernelStartup to avoid sending ICI when entering the kernel debugger
(after ICI is enabled). Moreover it's more obvious than to use that instead
of relying on ICIs not being enabled.


Modified: haiku/trunk/src/system/kernel/debug/debug.cpp
===================================================================
--- haiku/trunk/src/system/kernel/debug/debug.cpp	2009-04-04 21:03:19 UTC (rev 29906)
+++ haiku/trunk/src/system/kernel/debug/debug.cpp	2009-04-04 21:57:07 UTC (rev 29907)
@@ -743,7 +743,8 @@
 	arch_debug_save_registers(&dbg_register_file[smp_get_current_cpu()][0]);
 	sPreviousDprintfState = set_dprintf_enabled(true);
 
-	if (sDebuggerOnCPU != smp_get_current_cpu() && smp_get_num_cpus() > 1) {
+	if (!gKernelStartup && sDebuggerOnCPU != smp_get_current_cpu()
+		&& smp_get_num_cpus() > 1) {
 		// First entry on a MP system, send a halt request to all of the other
 		// CPUs. Should they try to enter the debugger they will be cought in
 		// the loop above.



From bonefish at mail.berlios.de  Sat Apr  4 23:59:39 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Sat, 4 Apr 2009 23:59:39 +0200
Subject: [Haiku-commits] r29908 - haiku/trunk/src/system/kernel
Message-ID: <200904042159.n34Lxda5023426@sheep.berlios.de>

Author: bonefish
Date: 2009-04-04 23:59:37 +0200 (Sat, 04 Apr 2009)
New Revision: 29908
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29908&view=rev

Modified:
   haiku/trunk/src/system/kernel/thread.cpp
Log:
bonefish + mmlr:
Don't really resume the undertaker thread after creating it, since at that
point the scheduler has not been started yet. Didn't do any harm, since it was
only the second thread anyway and the idle thread was rescheduled almost
immediately.


Modified: haiku/trunk/src/system/kernel/thread.cpp
===================================================================
--- haiku/trunk/src/system/kernel/thread.cpp	2009-04-04 21:57:07 UTC (rev 29907)
+++ haiku/trunk/src/system/kernel/thread.cpp	2009-04-04 21:59:37 UTC (rev 29908)
@@ -216,7 +216,7 @@
 	} else {
 		thread = inthread;
 	}
-	
+
 	if (!recycled)
 		scheduler_on_thread_create(thread);
 
@@ -259,7 +259,7 @@
 	thread->select_infos = NULL;
 	thread->post_interrupt_callback = NULL;
 	thread->post_interrupt_data = NULL;
-	
+
 	sprintf(temp, "thread_%ld_retcode_sem", thread->id);
 	thread->exit.sem = create_sem(0, temp);
 	if (thread->exit.sem < B_OK)
@@ -277,7 +277,7 @@
 
 	if (arch_thread_init_thread_struct(thread) < B_OK)
 		goto err4;
-	
+
 	return thread;
 
 err4:
@@ -2107,7 +2107,7 @@
 		B_DISPLAY_PRIORITY, NULL);
 	if (undertakerThread < 0)
 		panic("Failed to create undertaker thread!");
-	resume_thread(undertakerThread);
+	send_signal_etc(undertakerThread, SIGCONT, B_DO_NOT_RESCHEDULE);
 
 	// set up some debugger commands
 	add_debugger_command_etc("threads", &dump_thread_list, "List all threads",



From stippi at mail.berlios.de  Sun Apr  5 00:00:01 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sun, 5 Apr 2009 00:00:01 +0200
Subject: [Haiku-commits] r29909 - haiku/trunk/build/jam
Message-ID: <200904042200.n34M013E023481@sheep.berlios.de>

Author: stippi
Date: 2009-04-05 00:00:00 +0200 (Sun, 05 Apr 2009)
New Revision: 29909
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29909&view=rev

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


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-04 21:59:37 UTC (rev 29908)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-04 22:00:00 UTC (rev 29909)
@@ -51,8 +51,8 @@
 SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc DiskProbe
 	DiskUsage DriveSetup CDPlayer Expander Icon-O-Matic Installer LaunchBox
 	Magnify Mail MediaPlayer MidiPlayer NetworkStatus PackageInstaller People
-	PowerStatus ProcessController Screenshot ShowImage SoundRecorder StyledEdit
-	Terminal TextSearch TV Workspaces
+	PoorMan PowerStatus ProcessController Screenshot ShowImage SoundRecorder
+	StyledEdit Terminal TextSearch TV Workspaces
 ;
 SYSTEM_PREFERENCES = Appearance Backgrounds DataTranslations E-mail
 	FileTypes Fonts Keyboard Keymap Media Menu Mouse Network Printers Screen
@@ -246,7 +246,7 @@
 AddDirectoryToHaikuImage home config be Applications ;
 DESKBAR_APPLICATIONS = ActivityMonitor CharacterMap CodyCam CDPlayer DeskCalc
 	DiskProbe DriveSetup DiskUsage Expander Icon-O-Matic Magnify Mail MediaPlayer
-	MidiPlayer People Screenshot SoundRecorder StyledEdit Terminal TV
+	MidiPlayer People PoorMan Screenshot SoundRecorder StyledEdit Terminal TV
 ;
 local linkTarget ;
 for linkTarget in $(DESKBAR_APPLICATIONS) {



From axeld at mail.berlios.de  Sun Apr  5 00:22:36 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sun, 5 Apr 2009 00:22:36 +0200
Subject: [Haiku-commits] r29910 - haiku/trunk/src/apps/charactermap
Message-ID: <200904042222.n34MMatx026853@sheep.berlios.de>

Author: axeld
Date: 2009-04-05 00:22:34 +0200 (Sun, 05 Apr 2009)
New Revision: 29910
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29910&view=rev

Modified:
   haiku/trunk/src/apps/charactermap/CharacterView.cpp
   haiku/trunk/src/apps/charactermap/CharacterView.h
Log:
* Tried to make the scrolling position less surprising when resizing the window.
  Sometimes it even seems to work :-)
* FrameResized() called _UpdateSize(), although DoLayout() already did so.


Modified: haiku/trunk/src/apps/charactermap/CharacterView.cpp
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterView.cpp	2009-04-04 22:00:00 UTC (rev 29909)
+++ haiku/trunk/src/apps/charactermap/CharacterView.cpp	2009-04-04 22:22:34 UTC (rev 29910)
@@ -214,7 +214,17 @@
 void
 CharacterView::FrameResized(float width, float height)
 {
-	_UpdateSize();
+	// Scroll to character
+
+	if (!fHasTopCharacter)
+		return;
+
+	BRect frame = _FrameFor(fTopCharacter);
+	if (!frame.IsValid())
+		return;
+
+	BView::ScrollTo(0, frame.top - fTopOffset);
+	fHasTopCharacter = false;
 }
 
 
@@ -396,6 +406,7 @@
 void
 CharacterView::DoLayout()
 {
+	fHasTopCharacter = _GetTopmostCharacter(fTopCharacter, fTopOffset);
 	_UpdateSize();
 }
 
@@ -408,7 +419,7 @@
 		if (!IsShowingBlock(i))
 			continue;
 
-		if (fTitleTops[i] < point.y
+		if (fTitleTops[i] <= point.y
 			&& (i == kNumUnicodeBlocks - 1 || fTitleTops[i + 1] > point.y))
 			return i;
 	}
@@ -538,6 +549,57 @@
 }
 
 
+bool
+CharacterView::_GetTopmostCharacter(uint32& character, int32& offset)
+{
+	int32 top = (int32)Bounds().top;
+
+	int32 i = _BlockAt(BPoint(0, top));
+	if (i == -1)
+		return false;
+
+	int32 characterTop = fTitleTops[i] + fTitleHeight;
+	if (characterTop > top) {
+		character = kUnicodeBlocks[i].start;
+		offset = characterTop - top;
+		return true;
+	}
+
+	int32 lines = (top - characterTop + fCharacterHeight - 1)
+		/ fCharacterHeight;
+
+	character = kUnicodeBlocks[i].start + lines * fCharactersPerLine;
+	offset = top - characterTop - lines * fCharacterHeight;
+	return true;
+}
+
+
+BRect
+CharacterView::_FrameFor(uint32 character)
+{
+	// find block containing the character
+	
+	// TODO: could use binary search here
+
+	for (uint32 i = 0; i < kNumUnicodeBlocks; i++) {
+		if (kUnicodeBlocks[i].end < character)
+			continue;
+		if (kUnicodeBlocks[i].start > character) {
+			// Character is not mapped
+			return BRect();
+		}
+
+		int32 diff = character - kUnicodeBlocks[i].start;
+		int32 y = fTitleTops[i] + fTitleHeight + diff / fCharactersPerLine;
+		int32 x = fGap / 2 + diff % fCharactersPerLine;
+
+		return BRect(x, y, x + fCharacterWidth + fGap, y + fCharacterHeight);
+	}
+
+	return BRect();
+}
+
+
 void
 CharacterView::_CopyToClipboard(const char* text)
 {

Modified: haiku/trunk/src/apps/charactermap/CharacterView.h
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterView.h	2009-04-04 22:00:00 UTC (rev 29909)
+++ haiku/trunk/src/apps/charactermap/CharacterView.h	2009-04-04 22:22:34 UTC (rev 29910)
@@ -60,6 +60,9 @@
 			bool 			_GetCharacterAt(BPoint point, uint32& character,
 								BRect* _frame = NULL);
 			void			_UpdateSize();
+			bool			_GetTopmostCharacter(uint32& character,
+								int32& offset);
+			BRect			_FrameFor(uint32 character);
 			void			_CopyToClipboard(const char* text);
 
 private:
@@ -69,6 +72,9 @@
 			bool			fHasCharacter;
 			uint32			fCurrentCharacter;
 			BRect			fCurrentCharacterFrame;
+			bool			fHasTopCharacter;
+			uint32			fTopCharacter;
+			int32			fTopOffset;
 
 			bool			fShowPrivateBlocks;
 			bool			fShowContainedBlocksOnly;



From axeld at pinc-software.de  Sat Apr  4 22:25:35 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sat, 04 Apr 2009 22:25:35
Subject: [Haiku-commits] r29876 - in haiku/trunk: build/jam
 build/scripts data/system/boot headers/os/storage src/apps/aboutsystem
 src/apps/processcontroller src/bin/bash src/bin/gdb/gdb src/bin/grep/src
 src/bin/make src/bin/vim/src src/kits/tracker src/preferences/joysticks
 src/preferences/keymap src/preferences/time src/servers/debug
 src/servers/registrar src/system/boot src/system/boot/loader
 src/system/boot/platform/atari_m68k src/system/boot/platform/bios_ia32
 src/system/boot/platform/generic src/system/kernel/fs src/system/libroot/os
 src/system/runtime_loader
In-Reply-To: <5634864009-BeMail@laptop>
Message-ID: <5971703545-BeMail@ibm>

Fran?ois Revol wrote:
> Just without the other parts, maybe I missread but I saw like 5 other 
> items in the same commit :p

I just mentioned those to show what else was necessary to make it work 
:-)

Bye,
   Axel.



From stippi at mail.berlios.de  Sun Apr  5 00:41:04 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sun, 5 Apr 2009 00:41:04 +0200
Subject: [Haiku-commits] r29911 - haiku/trunk/src/kits/interface
Message-ID: <200904042241.n34Mf4m4002535@sheep.berlios.de>

Author: stippi
Date: 2009-04-05 00:40:58 +0200 (Sun, 05 Apr 2009)
New Revision: 29911
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29911&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
Patch by Olivier Coursiere: Fixes ticket #3673. Thanks a lot!
NOTE: There are some more problems with regard to this, if you resize
DeskCalc (which sets a new font size on the expression view, and then type
something, the newly typed stuff will have the old font still...)


Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-04-04 22:22:34 UTC (rev 29910)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-04-04 22:40:58 UTC (rev 29911)
@@ -1658,8 +1658,25 @@
 
 	_CancelInputMethod();
 
-	_SetRunArray(startOffset, endOffset, inRuns);
+	const text_run_array *runs = inRuns;
 
+	text_run_array oneRun;
+	
+	if (!fStylable) {
+		// When the text view is not stylable, we always set the whole text's
+		// style with the first run and ignore the offsets 
+		if (inRuns->count == 0)
+			return;
+		startOffset = 0;
+		endOffset = fText->Length();
+		oneRun.count = 1;
+		oneRun.runs[0] = inRuns->runs[0];
+		oneRun.runs[0].offset = 0;		
+		runs = &oneRun;
+	}
+	
+	_SetRunArray(startOffset, endOffset, runs);
+
 	_Refresh(startOffset, endOffset, true, false);
 }
 
@@ -2960,7 +2977,7 @@
 	// update the style runs
 	fStyles->BumpOffset(inLength, fStyles->OffsetToRun(inOffset - 1) + 1);
 
-	if (inRuns != NULL) {
+	if (fStylable && (inRuns != NULL)) {
 		_SetRunArray(inOffset, inOffset + inLength, inRuns);
 	} else {
 		// apply nullStyle to inserted text



From mmu_man at mail.berlios.de  Sun Apr  5 00:42:27 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 5 Apr 2009 00:42:27 +0200
Subject: [Haiku-commits] r29912 - haiku/trunk/src/apps/poorman
Message-ID: <200904042242.n34MgRCb004269@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-05 00:42:26 +0200 (Sun, 05 Apr 2009)
New Revision: 29912
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29912&view=rev

Modified:
   haiku/trunk/src/apps/poorman/PoorManWindow.cpp
Log:
Fix gcc4 build.


Modified: haiku/trunk/src/apps/poorman/PoorManWindow.cpp
===================================================================
--- haiku/trunk/src/apps/poorman/PoorManWindow.cpp	2009-04-04 22:40:58 UTC (rev 29911)
+++ haiku/trunk/src/apps/poorman/PoorManWindow.cpp	2009-04-04 22:42:26 UTC (rev 29912)
@@ -279,15 +279,15 @@
 		if(message->FindData("time_t", B_TIME_TYPE, &pointer, &size) != B_OK)
 			time = -1;
 		else
-			time = *static_cast<time_t*>(pointer);
+			time = *static_cast<const time_t*>(pointer);
 		if(message->FindData("in_addr_t", B_ANY_TYPE, &pointer, &size) != B_OK)
 			address = INADDR_NONE;
 		else
-			address = *static_cast<in_addr_t*>(pointer);
+			address = *static_cast<const in_addr_t*>(pointer);
 		if(message->FindData("rgb_color", B_RGB_COLOR_TYPE, &pointer, &size) != B_OK)
 			color = BLACK;
 		else
-			color = *static_cast<rgb_color*>(pointer);
+			color = *static_cast<const rgb_color*>(pointer);
 		
 		if(time != -1){
 			char timeString[26];



From axeld at mail.berlios.de  Sun Apr  5 01:05:58 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sun, 5 Apr 2009 01:05:58 +0200
Subject: [Haiku-commits] r29913 - haiku/trunk/src/apps/mail
Message-ID: <200904042305.n34N5wNF024493@sheep.berlios.de>

Author: axeld
Date: 2009-04-05 01:05:55 +0200 (Sun, 05 Apr 2009)
New Revision: 29913
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29913&view=rev

Modified:
   haiku/trunk/src/apps/mail/ButtonBar.cpp
   haiku/trunk/src/apps/mail/ButtonBar.h
   haiku/trunk/src/apps/mail/MailWindow.cpp
Log:
* Made the button bar no longer draw over the menu bar, and it now uses the
  BControlLook to draw its bottom border instead of using a BBox, and have the
  parent move it around to make it somehow fit (or not).
* Cleanup.


Modified: haiku/trunk/src/apps/mail/ButtonBar.cpp
===================================================================
--- haiku/trunk/src/apps/mail/ButtonBar.cpp	2009-04-04 22:42:26 UTC (rev 29912)
+++ haiku/trunk/src/apps/mail/ButtonBar.cpp	2009-04-04 23:05:55 UTC (rev 29913)
@@ -33,76 +33,83 @@
 */
 
 #include "ButtonBar.h"
+
 #include <stdlib.h>
 #include <math.h>
 
+#include <ControlLook.h>
+
+
 struct BBDivider {
 	float 		where;
 	float		vmargin;
-	BmapButton	*button;
+	BmapButton* button;
 };
 
 static const int32 kDividerBlockSize = 8;
 
-ButtonBar::ButtonBar(BRect frame, const char *name, uint8 enabledOffset, uint8 disabledOffset, 
-		uint8 rollOffset, uint8 pressedOffset, float Hmargin, float Vmargin, 
-		uint32 resizeMask, int32 flags, border_style border)
-	: BBox(frame, name, resizeMask, flags, border),
-		fMaxHeight(0),
-		fMaxWidth(0),
-		fNextXOffset(Hmargin),
-		fHMargin(Hmargin), 
-		fVMargin(Vmargin),
-		fEnabledOffset(enabledOffset), 
-		fDisabledOffset(disabledOffset), 
-		fRollOffset(rollOffset), 
-		fPressedOffset(pressedOffset), 
-		fDividerArray(NULL),
-		fDividers(0),
-		fShowLabels(true)
+
+ButtonBar::ButtonBar(BRect frame, const char* name, uint8 enabledOffset,
+		uint8 disabledOffset, uint8 rollOffset, uint8 pressedOffset,
+		float Hmargin, float Vmargin, uint32 resizeMask, int32 flags)
+	: BView(frame, name, resizeMask, flags),
+	fMaxHeight(0),
+	fMaxWidth(0),
+	fNextXOffset(Hmargin),
+	fHMargin(Hmargin), 
+	fVMargin(Vmargin),
+	fEnabledOffset(enabledOffset), 
+	fDisabledOffset(disabledOffset), 
+	fRollOffset(rollOffset), 
+	fPressedOffset(pressedOffset), 
+	fDividerArray(NULL),
+	fDividers(0),
+	fShowLabels(true)
 {
 }
 
-ButtonBar::~ButtonBar(void)
+
+ButtonBar::~ButtonBar()
 {
-	if (fDividerArray)
-		free(fDividerArray);
+	free(fDividerArray);
 }
 						
-BmapButton *ButtonBar::AddButton(const char *label, int32 baseID, BMessage *msg)
+
+BmapButton*
+ButtonBar::AddButton(const char *label, int32 baseID, BMessage *msg)
 {
-	BmapButton *button;
-	
-	button = new BmapButton(BRect(0, 0, 31, 31), label, label, baseID+fEnabledOffset, 
-		baseID+fDisabledOffset, baseID+fRollOffset, baseID+fPressedOffset, 
-		fShowLabels, msg, B_FOLLOW_LEFT | B_FOLLOW_TOP);
-	
+	BmapButton* button = new BmapButton(BRect(0, 0, 31, 31), label, label,
+		baseID + fEnabledOffset, baseID + fDisabledOffset, baseID + fRollOffset,
+		baseID + fPressedOffset, fShowLabels, msg,
+		B_FOLLOW_LEFT | B_FOLLOW_TOP);
+
 	fButtonList.AddItem(button);
 	AddChild(button);
 	return button;
 }
 
-void ButtonBar::Arrange(bool fixedWidth)
+
+void
+ButtonBar::Arrange(bool fixedWidth)
 {
 	// Reset Positioning Info
 	fNextXOffset = fHMargin;
 	fMaxHeight = 0;
 	fMaxWidth = 0;
-	
+
 	int32 i;
 	float width, height;
 	BmapButton *button;
-	
+
 	// Determine Largest button dimensions
-	for (i = 0; (button = (BmapButton *)fButtonList.ItemAt(i)) != NULL; i++)
-	{
+	for (i = 0; (button = (BmapButton*)fButtonList.ItemAt(i)) != NULL; i++) {
 		button->GetPreferredSize(&width, &height);
 		if (height > fMaxHeight)
 			fMaxHeight = height;
 		if (width > fMaxWidth)
 			fMaxWidth = width;
 	}
-	
+
 	// Arrange buttons
 	for (i = 0; (button = (BmapButton *)fButtonList.ItemAt(i)) != NULL; i++) {
 		button->MoveTo(fNextXOffset, fVMargin);
@@ -115,69 +122,92 @@
 			fNextXOffset += width + fHMargin;
 		}
 	}
-	
+
 	// Move dividers to match
-	for(i = 0; i < fDividers; i++) {
-		if (fDividerArray[i].button)
-			fDividerArray[i].where = fDividerArray[i].button->Frame().right + floor(fHMargin/2);
-		else
+	for (i = 0; i < fDividers; i++) {
+		if (fDividerArray[i].button) {
+			fDividerArray[i].where = fDividerArray[i].button->Frame().right
+				+ floor(fHMargin/2);
+		} else
 			fDividerArray[i].where = floor(fHMargin / 2);
 	}
 }
 
-void ButtonBar::GetPreferredSize(float *width, float *height)
+
+void
+ButtonBar::GetPreferredSize(float* width, float* height)
 {
 	*width = fNextXOffset + fHMargin;
-	*height = fMaxHeight + (2 * fVMargin);
+	*height = fMaxHeight + (2 * fVMargin) + 3;
 }
 
-void ButtonBar::AttachedToWindow(void)
+
+void
+ButtonBar::AttachedToWindow()
 {
 	if (Parent())
 		SetViewColor(Parent()->ViewColor());
-	BBox::AttachedToWindow(); 
 }
 
-void ButtonBar::Draw(BRect updateRect)
+
+void
+ButtonBar::Draw(BRect updateRect)
 {
-	BBox::Draw(updateRect);
-	rgb_color	high = { 184, 184, 184, 255 };
-	rgb_color	low = { 232, 232, 232, 255 };
-	BRect		bounds = Bounds();
-	float		where, vmargin;
-	
-	BeginLineArray(fDividers*2);
-	for (int32 i=0; i<fDividers; i++) {
-		where = fDividerArray[i].where;
-		vmargin = fDividerArray[i].vmargin;
-		AddLine(BPoint(where, fVMargin+vmargin), BPoint(where, bounds.bottom-fVMargin-vmargin), high);
-		AddLine(BPoint(where+1, fVMargin+vmargin), BPoint(where+1, bounds.bottom-fVMargin-vmargin), low);
+	rgb_color high = tint_color(ViewColor(), 1.1);
+	rgb_color low = tint_color(ViewColor(), 0.8);
+	BRect bounds = Bounds();
+
+	BeginLineArray(fDividers * 2);
+
+	for (int32 i = 0; i < fDividers; i++) {
+		float where = fDividerArray[i].where;
+		float vmargin = fDividerArray[i].vmargin;
+
+		AddLine(BPoint(where, fVMargin + vmargin),
+			BPoint(where, bounds.bottom - fVMargin - vmargin), high);
+		AddLine(BPoint(where + 1, fVMargin + vmargin),
+			BPoint(where + 1, bounds.bottom - fVMargin - vmargin), low);
 	}
 	EndLineArray();
+
+	be_control_look->DrawBorder(this, bounds, updateRect, ViewColor(),
+		B_FANCY_BORDER, 0, BControlLook::B_BOTTOM_BORDER);
 }
 
-void ButtonBar::AddDivider(float vmargin)
+
+void
+ButtonBar::AddDivider(float vmargin)
 {
 	// Do we need to allocate memory?
-	if (fDividers == 0)
-		fDividerArray = (BBDivider *)malloc(sizeof(BBDivider)*kDividerBlockSize);
-	if ((fDividers % kDividerBlockSize) == 0)
-		fDividerArray = (BBDivider *)realloc(fDividerArray, sizeof(BBDivider)*kDividerBlockSize*((fDividers/kDividerBlockSize)+1));
-	
+	if (fDividers == 0) {
+		fDividerArray = (BBDivider*)malloc(sizeof(BBDivider)
+			* kDividerBlockSize);
+	}
+	if ((fDividers % kDividerBlockSize) == 0) {
+		fDividerArray = (BBDivider*)realloc(fDividerArray,
+			sizeof(BBDivider) * kDividerBlockSize
+			* ((fDividers/kDividerBlockSize) + 1));
+	}
+
 	// Cache the location and the button which proceeds it
 	// The button is stored because we may later wish to change the layout
 	fDividerArray[fDividers].vmargin = vmargin;
-	fDividerArray[fDividers].where = fNextXOffset+floor(fHMargin/2);
-	fDividerArray[fDividers].button = (BmapButton *)fButtonList.ItemAt(fButtonList.CountItems()-1);
+	fDividerArray[fDividers].where = fNextXOffset + floorf(fHMargin / 2);
+	fDividerArray[fDividers].button = (BmapButton*)fButtonList.ItemAt(
+		fButtonList.CountItems() - 1);
 	fDividers++;
 }
 
-void ButtonBar::ShowLabels(bool show)
+
+void
+ButtonBar::ShowLabels(bool show)
 {
-	BmapButton *button;
-	
+	BmapButton* button;
+
 	// Set show label flags on buttons
-	for (int32 i=0; (button = (BmapButton *)fButtonList.ItemAt(i)) != NULL; i++)
+	for (int32 i = 0; (button = (BmapButton*)fButtonList.ItemAt(i)) != NULL;
+			i++) {
 		button->ShowLabel(show);
+	}
 	fShowLabels = show;
 }

Modified: haiku/trunk/src/apps/mail/ButtonBar.h
===================================================================
--- haiku/trunk/src/apps/mail/ButtonBar.h	2009-04-04 22:42:26 UTC (rev 29912)
+++ haiku/trunk/src/apps/mail/ButtonBar.h	2009-04-04 23:05:55 UTC (rev 29913)
@@ -41,14 +41,13 @@
 
 struct BBDivider;
 
-class ButtonBar : public BBox {
+class ButtonBar : public BView {
 public:
 	ButtonBar(BRect frame, const char *name, uint8 enabledOffset,
 		uint8 disabledOffset, uint8 rollOffset, uint8 pressedOffset,
 		float Hmargin, float Vmargin, 
 		uint32 resizeMask = B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP,
-		int32 flags = B_NAVIGABLE_JUMP | B_FRAME_EVENTS | B_WILL_DRAW,
-		border_style border = B_FANCY_BORDER);
+		int32 flags = B_NAVIGABLE_JUMP | B_FRAME_EVENTS | B_WILL_DRAW);
 	virtual ~ButtonBar( void );
 		
 	// Hooks

Modified: haiku/trunk/src/apps/mail/MailWindow.cpp
===================================================================
--- haiku/trunk/src/apps/mail/MailWindow.cpp	2009-04-04 22:42:26 UTC (rev 29912)
+++ haiku/trunk/src/apps/mail/MailWindow.cpp	2009-04-04 23:05:55 UTC (rev 29913)
@@ -493,11 +493,10 @@
 	if (showButtonBar) {
 		BuildButtonBar();
 		fButtonBar->ShowLabels(showButtonBar);
-		fButtonBar->Arrange(/* True for all buttons same size, false to just fit */
-			MDR_DIALECT_CHOICE (true, true));
+		fButtonBar->Arrange(MDR_DIALECT_CHOICE(true, true));
 		fButtonBar->GetPreferredSize(&bbwidth, &bbheight);
-		fButtonBar->ResizeTo(Bounds().right+3, bbheight+1);
-		fButtonBar->MoveTo(-1, height-1);
+		fButtonBar->ResizeTo(Bounds().right, bbheight);
+		fButtonBar->MoveTo(0, height);
 		fButtonBar->Show();
 	} else
 		fButtonBar = NULL;
@@ -646,8 +645,8 @@
 		fButtonBar->Arrange(/* True for all buttons same size, false to just fit */
 			MDR_DIALECT_CHOICE (true, true));
 		fButtonBar->GetPreferredSize( &bbwidth, &bbheight);
-		fButtonBar->ResizeTo(Bounds().right+3, bbheight+1);
-		fButtonBar->MoveTo(-1, nextY-1);
+		fButtonBar->ResizeTo(Bounds().right, bbheight);
+		fButtonBar->MoveTo(0, nextY);
 		nextY += bbheight + 1;
 		if (fButtonBar->IsHidden())
 			fButtonBar->Show();



From bonefish at mail.berlios.de  Sun Apr  5 01:54:04 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Sun, 5 Apr 2009 01:54:04 +0200
Subject: [Haiku-commits] r29914 - in haiku/trunk/src/system/kernel: .
	scheduler
Message-ID: <200904042354.n34Ns4nh008913@sheep.berlios.de>

Author: bonefish
Date: 2009-04-05 01:54:01 +0200 (Sun, 05 Apr 2009)
New Revision: 29914
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29914&view=rev

Modified:
   haiku/trunk/src/system/kernel/main.cpp
   haiku/trunk/src/system/kernel/scheduler/scheduler_affine.cpp
   haiku/trunk/src/system/kernel/scheduler/scheduler_simple.cpp
Log:
bonefish + mmlr:
* We started the "main2" thread too late. Since the scheduler was already
  started on all CPUs, the idle thread could wait (for a mutex) while
  spawing the "main2" thread. This violated the assumption in the scheduler
  that all idle threads would always be ready or running. We now create the
  thread while the kernel runs still single-threaded.
* scheduler_start() is now invoked with interrupts still disabled. We enable
  them after the function returns. This prevents scheduler_reschedule() from
  potentially being invoked before scheduler_start().


Modified: haiku/trunk/src/system/kernel/main.cpp
===================================================================
--- haiku/trunk/src/system/kernel/main.cpp	2009-04-04 23:05:55 UTC (rev 29913)
+++ haiku/trunk/src/system/kernel/main.cpp	2009-04-04 23:54:01 UTC (rev 29914)
@@ -189,6 +189,13 @@
 		swap_init();
 #endif
 
+		// Start a thread to finish initializing the rest of the system. Note,
+		// it won't be scheduled before calling scheduler_start() (on any CPU).
+		TRACE("spawning main2 thread\n");
+		thread_id thread = spawn_kernel_thread(&main2, "main2",
+			B_NORMAL_PRIORITY, NULL);
+		send_signal_etc(thread, SIGCONT, B_DO_NOT_RESCHEDULE);
+
 		// bring up the AP cpus in a lock step fashion
 		TRACE("waking up AP cpus\n");
 		sCpuRendezvous = sCpuRendezvous2 = 0;
@@ -202,16 +209,9 @@
 		smp_cpu_rendezvous(&sCpuRendezvous2, 0);
 			// release the AP cpus to go enter the scheduler
 
-		TRACE("enabling interrupts and starting scheduler on cpu 0\n");
+		TRACE("starting scheduler on cpu 0 and enabling interrupts\n");
+		scheduler_start();
 		enable_interrupts();
-		scheduler_start();
-
-		// start a thread to finish initializing the rest of the system
-		TRACE("starting main2 thread\n");
-		thread_id thread = spawn_kernel_thread(&main2, "main2",
-			B_NORMAL_PRIORITY, NULL);
-		TRACE("resuming main2 thread...\n");
-		resume_thread(thread);
 	} else {
 		// lets make sure we're in sync with the main cpu
 		// the boot processor has probably been sending us
@@ -228,8 +228,8 @@
 		smp_cpu_rendezvous(&sCpuRendezvous2, currentCPU);
 
 		// welcome to the machine
+		scheduler_start();
 		enable_interrupts();
-		scheduler_start();
 	}
 
 	TRACE("main: done... begin idle loop on cpu %d\n", currentCPU);

Modified: haiku/trunk/src/system/kernel/scheduler/scheduler_affine.cpp
===================================================================
--- haiku/trunk/src/system/kernel/scheduler/scheduler_affine.cpp	2009-04-04 23:05:55 UTC (rev 29913)
+++ haiku/trunk/src/system/kernel/scheduler/scheduler_affine.cpp	2009-04-04 23:54:01 UTC (rev 29914)
@@ -49,13 +49,13 @@
 const bigtime_t kMaxThreadQuantum = 10000;
 
 struct scheduler_thread_data {
-	scheduler_thread_data(void) 
+	scheduler_thread_data(void)
 	{
 		Init();
 	}
-	
-	
-	void Init() 
+
+
+	void Init()
 	{
 		memset(fLastThreadQuantums, 0, sizeof(fLastThreadQuantums));
 		fLastQuantumSlot = 0;
@@ -69,7 +69,7 @@
 			quantumAverage += fLastThreadQuantums[i];
 		return quantumAverage / kMaxTrackingQuantums;
 	}
-	
+
 	int32 fLastThreadQuantums[kMaxTrackingQuantums];
 	int16 fLastQuantumSlot;
 	int32 fLastQueue;
@@ -96,13 +96,13 @@
 
 	for (int32 i = 0; i < smp_get_num_cpus(); i++) {
 		thread = sRunQueue[i];
-		kprintf("Run queue for cpu %ld (%ld threads)\n", i, 
+		kprintf("Run queue for cpu %ld (%ld threads)\n", i,
 			sRunQueueSize[i]);
 		if (sRunQueueSize[i] > 0) {
 			kprintf("thread      id      priority  avg. quantum  name\n");
 			while (thread) {
 				kprintf("%p  %-7ld %-8ld  %-12ld  %s\n", thread, thread->id,
-					thread->priority, 
+					thread->priority,
 					thread->scheduler_data->GetAverageQuantumUsage(),
 					thread->name);
 				thread = thread->queue_next;
@@ -126,7 +126,7 @@
 		if (targetCPU < 0 || sRunQueueSize[i] < sRunQueueSize[targetCPU])
 			targetCPU = i;
 	}
-	
+
 	return targetCPU;
 }
 
@@ -151,7 +151,7 @@
 affine_enqueue_in_run_queue(struct thread *thread)
 {
 	int32 targetCPU = -1;
-	if (thread->pinned_to_cpu > 0) 
+	if (thread->pinned_to_cpu > 0)
 		targetCPU = thread->previous_cpu->cpu_num;
 	else if (thread->previous_cpu == NULL || thread->previous_cpu->disabled)
 		targetCPU = affine_get_most_idle_cpu();
@@ -183,14 +183,14 @@
 			sRunQueue[targetCPU] = thread;
 		thread->scheduler_data->fLastQueue = targetCPU;
 	}
-	
+
 	thread->next_priority = thread->priority;
 
 	if (thread->priority != B_IDLE_PRIORITY && targetCPU != smp_get_current_cpu()) {
 		int32 idleCPU = targetCPU;
 		if ((sIdleCPUs & (1 << targetCPU)) == 0) {
 			idleCPU = affine_get_next_idle_cpu();
-			// no idle CPUs are available 
+			// no idle CPUs are available
 			// to try and grab this task
 			if (idleCPU < 0)
 				return;
@@ -214,7 +214,7 @@
 	}
 	sRunQueueSize[currentCPU]--;
 	resultThread->scheduler_data->fLastQueue = -1;
-	
+
 	return resultThread;
 }
 
@@ -256,17 +256,17 @@
 			if (nextThread->pinned_to_cpu > 0) {
 				prevThread = nextThread;
 				nextThread = prevThread->queue_next;
-			} else 
+			} else
 				break;
 		} while (nextThread->queue_next != NULL);
-		
+
 		// we reached the end of the queue without finding an
 		// eligible thread.
 		if (nextThread->pinned_to_cpu > 0)
 			nextThread = NULL;
-		
-		// dequeue the thread we're going to steal	
-		if (nextThread != NULL) 
+
+		// dequeue the thread we're going to steal
+		if (nextThread != NULL)
 			dequeue_from_run_queue(prevThread, targetCPU);
 	}
 
@@ -297,11 +297,11 @@
 
 	// search run queues for the thread
 	// TODO: keep track of the queue a thread is in (perhaps in a
-	// data pointer on the thread struct) so we only have to walk 
+	// data pointer on the thread struct) so we only have to walk
 	// that exact queue to find it.
 	struct thread *item = NULL, *prev = NULL;
 	targetCPU = thread->scheduler_data->fLastQueue;
-	
+
 	for (item = sRunQueue[targetCPU], prev = NULL; item && item != thread;
 			item = item->queue_next) {
 			if (prev)
@@ -404,7 +404,7 @@
 			// skip normal threads sometimes (roughly 20%)
 			if (_rand() > 0x1a00)
 				break;
-			
+
 			// skip until next lower priority
 			int32 priority = nextThread->priority;
 			do {
@@ -412,7 +412,7 @@
 				nextThread = nextThread->queue_next;
 			} while (nextThread->queue_next != NULL
 				&& priority == nextThread->queue_next->priority);
-		} 
+		}
 		// extract selected thread from the run queue
 		dequeue_from_run_queue(prevThread, currentCPU);
 	} else {
@@ -423,7 +423,7 @@
 			nextThread = NULL;
 		if (nextThread == NULL) {
 			TRACE(("No threads to steal, grabbing from idle pool\n"));
-			// no other CPU had anything for us to take, 
+			// no other CPU had anything for us to take,
 			// grab one from the kernel's idle pool
 			nextThread = sIdleThreads;
 			if (nextThread)
@@ -447,7 +447,7 @@
 
 	// track CPU activity
 	if (!thread_is_idle_thread(oldThread)) {
-		bigtime_t activeTime = 
+		bigtime_t activeTime =
 			(oldThread->kernel_time - oldThread->cpu->last_kernel_time)
 			+ (oldThread->user_time - oldThread->cpu->last_user_time);
 		oldThread->cpu->active_time += activeTime;
@@ -468,8 +468,8 @@
 		bigtime_t quantum = kMinThreadQuantum;
 		// give CPU-bound background threads a larger quantum size
 		// to minimize unnecessary context switches if the system is idle
-		if (nextThread->scheduler_data->GetAverageQuantumUsage() 
-			> (kMinThreadQuantum >> 1) 
+		if (nextThread->scheduler_data->GetAverageQuantumUsage()
+			> (kMinThreadQuantum >> 1)
 			&& nextThread->priority < B_NORMAL_PRIORITY)
 			quantum = kMaxThreadQuantum;
 		timer *quantumTimer = &oldThread->cpu->quantum_timer;
@@ -516,19 +516,17 @@
 }
 
 
-/*!	This starts the scheduler. Must be run under the context of
-	the initial idle thread.
+/*!	This starts the scheduler. Must be run in the context of the initial idle
+	thread. Interrupts must be disabled and will be disabled when returning.
 */
 static void
 affine_start(void)
 {
-	cpu_status state = disable_interrupts();
 	GRAB_THREAD_LOCK();
 
 	affine_reschedule();
 
 	RELEASE_THREAD_LOCK();
-	restore_interrupts(state);
 }
 
 

Modified: haiku/trunk/src/system/kernel/scheduler/scheduler_simple.cpp
===================================================================
--- haiku/trunk/src/system/kernel/scheduler/scheduler_simple.cpp	2009-04-04 23:05:55 UTC (rev 29913)
+++ haiku/trunk/src/system/kernel/scheduler/scheduler_simple.cpp	2009-04-04 23:54:01 UTC (rev 29914)
@@ -261,7 +261,7 @@
 		// CPU is disabled - service any threads we may have that are pinned,
 		// otherwise just select the idle thread
 		while (nextThread && nextThread->priority > B_IDLE_PRIORITY) {
-			if (nextThread->pinned_to_cpu > 0 && 
+			if (nextThread->pinned_to_cpu > 0 &&
 				nextThread->previous_cpu == oldThread->cpu)
 					break;
 			prevThread = nextThread;
@@ -401,19 +401,17 @@
 }
 
 
-/*!	This starts the scheduler. Must be run under the context of
-	the initial idle thread.
+/*!	This starts the scheduler. Must be run in the context of the initial idle
+	thread. Interrupts must be disabled and will be disabled when returning.
 */
 static void
 simple_start(void)
 {
-	cpu_status state = disable_interrupts();
 	GRAB_THREAD_LOCK();
 
 	simple_reschedule();
 
 	RELEASE_THREAD_LOCK();
-	restore_interrupts(state);
 }
 
 



From anevilyak at mail.berlios.de  Sun Apr  5 04:43:36 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sun, 5 Apr 2009 04:43:36 +0200
Subject: [Haiku-commits] r29915 - in
	haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server:
	. beos
Message-ID: <200904050243.n352haKY029451@sheep.berlios.de>

Author: anevilyak
Date: 2009-04-05 04:43:35 +0200 (Sun, 05 Apr 2009)
New Revision: 29915
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29915&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp
Log:
Patch by Urias McCullough: Fix userlandfs build on ppc (unused variable warning/error). Thanks!



Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.cpp	2009-04-04 23:54:01 UTC (rev 29914)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.cpp	2009-04-05 02:43:35 UTC (rev 29915)
@@ -338,11 +338,11 @@
 	char buffer[1024];
 	strcpy(buffer, "PANIC: ");
 	int32 prefixLen = strlen(buffer);
-	int bufferSize = sizeof(buffer) - prefixLen;
 	va_list args;
 	va_start(args, format);
 	// no vsnprintf() on PPC
 	#if defined(__INTEL__)
+		int bufferSize = sizeof(buffer) - prefixLen;
 		vsnprintf(buffer + prefixLen, bufferSize - 1, format, args);
 	#else
 		vsprintf(buffer + prefixLen, format, args);

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp	2009-04-04 23:54:01 UTC (rev 29914)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp	2009-04-05 02:43:35 UTC (rev 29915)
@@ -907,10 +907,10 @@
 	char buffer[1024];
 	strcpy(buffer, "PANIC: ");
 	int32 prefixLen = strlen(buffer);
-	int bufferSize = sizeof(buffer) - prefixLen;
 
 	// no vsnprintf() on PPC
 	#if defined(__INTEL__)
+		int bufferSize = sizeof(buffer) - prefixLen;
 		vsnprintf(buffer + prefixLen, bufferSize - 1, format, args);
 	#else
 		vsprintf(buffer + prefixLen, format, args);



From anevilyak at mail.berlios.de  Sun Apr  5 05:36:00 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sun, 5 Apr 2009 05:36:00 +0200
Subject: [Haiku-commits] r29916 - haiku/trunk/build/jam
Message-ID: <200904050336.n353a0an000610@sheep.berlios.de>

Author: anevilyak
Date: 2009-04-05 05:35:59 +0200 (Sun, 05 Apr 2009)
New Revision: 29916
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29916&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
Mark Flurry as x86-only for now, as other platforms don't yet have a libGL. Thanks again to Urias.



Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-05 02:43:35 UTC (rev 29915)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-05 03:35:59 UTC (rev 29916)
@@ -119,7 +119,7 @@
 SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port
 	Print\ To\ File Serial\ Port USB\ Port
 ;
-SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow Flurry Haiku IFS Spider Message ;
+SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow $(X86_ONLY)Flurry Haiku IFS Spider Message ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ;
 SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia



From mmu_man at mail.berlios.de  Sun Apr  5 09:34:38 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 5 Apr 2009 09:34:38 +0200
Subject: [Haiku-commits] r29917 - haiku/trunk/src/system/libroot/posix/unistd
Message-ID: <200904050734.n357Ycqf000718@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-05 09:34:37 +0200 (Sun, 05 Apr 2009)
New Revision: 29917
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29917&view=rev

Modified:
   haiku/trunk/src/system/libroot/posix/unistd/ttyname.c
Log:
Fix error reporting to conform to the POSIX ttyname_r and ttyname.


Modified: haiku/trunk/src/system/libroot/posix/unistd/ttyname.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/unistd/ttyname.c	2009-04-05 03:35:59 UTC (rev 29916)
+++ haiku/trunk/src/system/libroot/posix/unistd/ttyname.c	2009-04-05 07:34:37 UTC (rev 29917)
@@ -29,15 +29,15 @@
 
 	// first, some sanity checks:
 	if (fstat(fd, &fdStat) < 0)
-		return -1;
+		return ENOTTY;
 
-	if (!S_ISCHR(fdStat.st_mode) || !isatty(fd)) {
-		errno = ENOTTY;
+	if (!S_ISCHR(fdStat.st_mode) || !isatty(fd))
 		return ENOTTY;
-	}
 
 	// just ask devfs
-	return ioctl(fd, B_GET_PATH_FOR_DEVICE, buffer, bufferSize);
+	if (ioctl(fd, B_GET_PATH_FOR_DEVICE, buffer, bufferSize) < 0)
+		return errno;
+	return 0;
 }
 
 
@@ -52,7 +52,9 @@
 	static char pathname[MAXPATHLEN];
 
 	int err = ttyname_r(fd, pathname, sizeof(pathname));
-	if (err < 0)
+	if (err != 0) {
+		errno = err;
 		return NULL;
+	}
 	return pathname;
 }



From stippi at mail.berlios.de  Sun Apr  5 09:35:41 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sun, 5 Apr 2009 09:35:41 +0200
Subject: [Haiku-commits] r29918 - haiku/trunk/src/apps/deskcalc
Message-ID: <200904050735.n357ZfI3000907@sheep.berlios.de>

Author: stippi
Date: 2009-04-05 09:35:40 +0200 (Sun, 05 Apr 2009)
New Revision: 29918
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29918&view=rev

Modified:
   haiku/trunk/src/apps/deskcalc/CalcView.cpp
Log:
Reset the follow mode to "follow none" when instantiating a replicant view.


Modified: haiku/trunk/src/apps/deskcalc/CalcView.cpp
===================================================================
--- haiku/trunk/src/apps/deskcalc/CalcView.cpp	2009-04-05 07:34:37 UTC (rev 29917)
+++ haiku/trunk/src/apps/deskcalc/CalcView.cpp	2009-04-05 07:35:40 UTC (rev 29918)
@@ -170,6 +170,9 @@
 	fOptions(new CalcOptions()),
 	fShowKeypad(true)
 {
+	// Do not restore the follow mode, in shelfs, we never follow.
+	SetResizingMode(B_FOLLOW_NONE);
+
 	// create expression text view
 	fExpressionTextView = new ExpressionTextView(_ExpressionRect(), this);
 	AddChild(fExpressionTextView);



From axeld at mail.berlios.de  Sun Apr  5 10:01:26 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sun, 5 Apr 2009 10:01:26 +0200
Subject: [Haiku-commits] r29919 - in
	haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server:
	. beos
Message-ID: <200904050801.n3581QTU007610@sheep.berlios.de>

Author: axeld
Date: 2009-04-05 10:01:23 +0200 (Sun, 05 Apr 2009)
New Revision: 29919
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29919&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp
Log:
* That must have been a BeOS limitation, at least our kernel sports the same
  generic API for each architecture.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.cpp	2009-04-05 07:35:40 UTC (rev 29918)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.cpp	2009-04-05 08:01:23 UTC (rev 29919)
@@ -338,17 +338,12 @@
 	char buffer[1024];
 	strcpy(buffer, "PANIC: ");
 	int32 prefixLen = strlen(buffer);
+
 	va_list args;
 	va_start(args, format);
-	// no vsnprintf() on PPC
-	#if defined(__INTEL__)
-		int bufferSize = sizeof(buffer) - prefixLen;
-		vsnprintf(buffer + prefixLen, bufferSize - 1, format, args);
-	#else
-		vsprintf(buffer + prefixLen, format, args);
-	#endif
+	vsnprintf(buffer + prefixLen, sizeof(buffer) - prefixLen, format, args);
 	va_end(args);
-	buffer[sizeof(buffer) - 1] = '\0';
+
 	debugger(buffer);
 }
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp	2009-04-05 07:35:40 UTC (rev 29918)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/kernel_emu.cpp	2009-04-05 08:01:23 UTC (rev 29919)
@@ -900,36 +900,6 @@
 	debugger(message);
 }
 
-// vpanic
-void
-UserlandFS::KernelEmu::vpanic(const char *format, va_list args)
-{
-	char buffer[1024];
-	strcpy(buffer, "PANIC: ");
-	int32 prefixLen = strlen(buffer);
-
-	// no vsnprintf() on PPC
-	#if defined(__INTEL__)
-		int bufferSize = sizeof(buffer) - prefixLen;
-		vsnprintf(buffer + prefixLen, bufferSize - 1, format, args);
-	#else
-		vsprintf(buffer + prefixLen, format, args);
-	#endif
-
-	buffer[sizeof(buffer) - 1] = '\0';
-	debugger(buffer);
-}
-
-// panic
-void
-UserlandFS::KernelEmu::panic(const char *format, ...)
-{
-	va_list args;
-	va_start(args, format);
-	vpanic(format, args);
-	va_end(args);
-}
-
 // vdprintf
 void
 UserlandFS::KernelEmu::vdprintf(const char *format, va_list args)



From stippi at mail.berlios.de  Sun Apr  5 10:18:56 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sun, 5 Apr 2009 10:18:56 +0200
Subject: [Haiku-commits] r29920 -
	haiku/trunk/src/add-ons/kernel/bus_managers/ps2
Message-ID: <200904050818.n358Iu90012152@sheep.berlios.de>

Author: stippi
Date: 2009-04-05 10:18:53 +0200 (Sun, 05 Apr 2009)
New Revision: 29920
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29920&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c
   haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_dev.h
   haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c
Log:
Patch by Olivier Coursiere: Reset the touchpad mode when closing the device.
Will be useful when (input) devices are closed during shutdown. (app_server
and input_server are never quit during shutdown, so the drivers are not closed
either.) Apparently, the touchpad will remain as configured before, on a soft
reset which confuses for example BeOS, when it's booted after Haiku.


Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c	2009-04-05 08:01:23 UTC (rev 29919)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c	2009-04-05 08:18:53 UTC (rev 29920)
@@ -66,7 +66,7 @@
 };
 
 
-static status_t
+status_t
 ps2_reset_mouse(ps2_dev *dev)
 {
 	uint8 data[2];

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_dev.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_dev.h	2009-04-05 08:01:23 UTC (rev 29919)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_dev.h	2009-04-05 08:18:53 UTC (rev 29920)
@@ -74,6 +74,8 @@
 status_t	ps2_dev_command_timeout(ps2_dev *dev, uint8 cmd, const uint8 *out,
 				int out_count, uint8 *in, int in_count, bigtime_t timeout);
 
+status_t	ps2_reset_mouse(ps2_dev *dev);
+
 void		ps2_dev_publish(ps2_dev *dev);
 void		ps2_dev_unpublish(ps2_dev *dev);
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c	2009-04-05 08:01:23 UTC (rev 29919)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c	2009-04-05 08:18:53 UTC (rev 29920)
@@ -630,6 +630,7 @@
 status_t
 synaptics_close(void *_cookie)
 {
+	status_t status;
 	synaptics_cookie *cookie = _cookie;
 
 	ps2_dev_command_timeout(cookie->dev, PS2_CMD_DISABLE, NULL, 0, NULL, 0,
@@ -641,6 +642,15 @@
 	atomic_and(&cookie->dev->flags, ~PS2_FLAG_OPEN);
 	atomic_and(&cookie->dev->flags, ~PS2_FLAG_ENABLED);
 
+	// Reset the touchpad so it generate standard ps2 packets instead of
+	// extended ones. If not, BeOS is confused with such packets when rebooting
+	// without a complete shutdown.
+	status = ps2_reset_mouse(cookie->dev);
+	if (status != B_OK) {
+		INFO("ps2: reset failed\n");
+		return B_ERROR;
+	}
+		
 	if (gTouchpadInfo.capPassThrough)
 		ps2_service_notify_device_removed(gPassthroughDevice);
 



From axeld at mail.berlios.de  Sun Apr  5 10:34:35 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sun, 5 Apr 2009 10:34:35 +0200
Subject: [Haiku-commits] r29921 - haiku/trunk/src/preferences/keymap
Message-ID: <200904050834.n358YZui016083@sheep.berlios.de>

Author: axeld
Date: 2009-04-05 10:34:32 +0200 (Sun, 05 Apr 2009)
New Revision: 29921
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29921&view=rev

Modified:
   haiku/trunk/src/preferences/keymap/KeyboardLayout.cpp
   haiku/trunk/src/preferences/keymap/KeyboardLayout.h
   haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp
   haiku/trunk/src/preferences/keymap/KeymapMessageFilter.cpp
Log:
* Fixed drawing the L-shaped enter key; the clipping was constrained on the
  wrong view since I added offscreen drawing.
* Added a description of the keyboard layout language; it's unlikely to
  undergo much changes anymore now.
* Added a few comments for stippi :-)


Modified: haiku/trunk/src/preferences/keymap/KeyboardLayout.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/KeyboardLayout.cpp	2009-04-05 08:18:53 UTC (rev 29920)
+++ haiku/trunk/src/preferences/keymap/KeyboardLayout.cpp	2009-04-05 08:34:32 UTC (rev 29921)
@@ -154,6 +154,50 @@
 void
 KeyboardLayout::SetDefault()
 {
+	// The keyboard layout description language defines the position,
+	// size, shape, and scancodes of the keys on the keyboard, row by
+	// row.
+	// You can define variables that are substituted in the row
+	// descriptions. Variables are always prefixed with a '$' symbol.
+
+	// On top level, only two different terms are accepted: value pairs,
+	// and row descriptions.
+	// Value pairs are in the form "<name> = <value>". There are only two
+	// predefined names at this moment "name" that specifies the name of
+	// a layout, and "default-size" that specifies the size of keys when
+	// no specific size is given. Also, variables can be specified this
+	// way.
+
+	// Row descriptions are embedded in the '[' and ']' brackets.
+	// The first term within a row is the position of the row, written as
+	// "<x>,<y>;" - the delimiter between terms/keys is usually the
+	// semi-colon. After the initial position, key descriptions are expected
+	// until the row is closed with a ']'.
+
+	// A key description is of the form "<shape>:<scancodes>", where <shape>
+	// is combined of the shape of the character, and its size, written as
+	// "<kind><width>,<height>[,<second-row-width>]".
+	// The kind can either be 'r' (the default, can also be omitted) for
+	// rectangular keys, or 'l' for the enter key. Additionally, you can use
+	// the 'd' character to mark dark keys. The size can be omitted completely,
+	// in which case the defined "default-size" is used. The default size is
+	// also used to determine the height of the first row of the enter key;
+	// the "<second-row-width>" specifier is only valid for enter keys, too.
+
+	// The scancodes can be written in different ways:
+	// 1) "+<count>": adds <count> keys, the scancodes will be used relative
+	//    to the previous keys.
+	// 2) "<first>-<last>": keys are added for scancode <first> to scancode
+	//    <last>.
+	// 3) "<first>+<count>": one key with the <first> scancode is added, plus
+	//    <count> ones with relative scancode from that one.
+
+	// Finally, you can also define LED indicator. Those can be made instead
+	// of a key, it accepts a size, but no shape modifiers. Also, instead of
+	// a scancode, the name of the modifer is given, currently only the
+	// following are allowed: "led-num", "led-caps", and "led-scroll".
+
+	// See for examples in the default layout below.
 #if 1
 	static const char* kDefaultLayout104 = "name = Generic 104-key\n"
 		// Size shortcuts
@@ -573,6 +617,7 @@
 }
 
 
+/*!	Returns the term delimiter expected in a certain parse mode. */
 const char*
 KeyboardLayout::_Delimiter(parse_mode mode)
 {
@@ -677,6 +722,10 @@
 }
 
 
+/*!	Initializes the keyboard layout from the data given.
+	The string has to be a valid keyboard layout description, otherwise
+	an error is returned.
+*/
 status_t
 KeyboardLayout::_InitFrom(const char* data)
 {

Modified: haiku/trunk/src/preferences/keymap/KeyboardLayout.h
===================================================================
--- haiku/trunk/src/preferences/keymap/KeyboardLayout.h	2009-04-05 08:18:53 UTC (rev 29920)
+++ haiku/trunk/src/preferences/keymap/KeyboardLayout.h	2009-04-05 08:34:32 UTC (rev 29921)
@@ -28,6 +28,7 @@
 	key_shape	shape;
 	BRect		frame;
 	float		second_row;
+		// this is the width of the second row of a kEnterKeyShape key
 	bool		dark;
 };
 

Modified: haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp	2009-04-05 08:18:53 UTC (rev 29920)
+++ haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp	2009-04-05 08:34:32 UTC (rev 29921)
@@ -538,14 +538,15 @@
 		BRegion region(rect);
 		BRect originalRect = rect;
 		BRect missingRect = rect;
+
 		// TODO: for some reason, this does not always equal the bottom of
 		// the other keys...
-		missingRect.top = floorf(rect.bottom - fGap + 2
-			- fLayout->DefaultKeySize().height * fFactor);
+		missingRect.top = floorf(rect.top
+			+ fLayout->DefaultKeySize().height * fFactor - fGap - 1);
 		missingRect.right = floorf(missingRect.left
 			+ (key->frame.Width() - key->second_row) * fFactor - fGap - 2);
 		region.Exclude(missingRect);
-		ConstrainClippingRegion(&region);
+		view->ConstrainClippingRegion(&region);
 
 		_DrawKeyButton(view, rect, updateRect, base, background, pressed);
 
@@ -556,7 +557,7 @@
 		missingRect.right--;
 		missingRect.top -= 2;
 		region.Set(missingRect);
-		ConstrainClippingRegion(&region);
+		view->ConstrainClippingRegion(&region);
 
 		rect = originalRect;
 		rect.bottom = missingRect.top + 2;
@@ -566,14 +567,14 @@
 		missingRect.right++;
 		missingRect.top += 2;
 		region.Set(missingRect);
-		ConstrainClippingRegion(&region);
+		view->ConstrainClippingRegion(&region);
 
 		rect = originalRect;
 		rect.left = missingRect.right - 2;
 		rect.top = missingRect.top - 2;
 		_DrawKeyButton(view, rect, updateRect, base, background, pressed);
 
-		ConstrainClippingRegion(NULL);
+		view->ConstrainClippingRegion(NULL);
 	}
 }
 

Modified: haiku/trunk/src/preferences/keymap/KeymapMessageFilter.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/KeymapMessageFilter.cpp	2009-04-05 08:18:53 UTC (rev 29920)
+++ haiku/trunk/src/preferences/keymap/KeymapMessageFilter.cpp	2009-04-05 08:34:32 UTC (rev 29921)
@@ -3,6 +3,11 @@
  * Distributed under the terms of the MIT License.
  */
 
+/*!	This class implements a filter that applies a certain keymap to
+	the keyboard input.
+	It's used to be able to make keymap changes live within the
+	application.
+*/
 
 #include "KeymapMessageFilter.h"
 
@@ -64,6 +69,6 @@
 			delete[] string;
 		}
 	}
-	
+
 	return B_DISPATCH_MESSAGE;
 }



From stippi at mail.berlios.de  Sun Apr  5 10:41:50 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sun, 5 Apr 2009 10:41:50 +0200
Subject: [Haiku-commits] r29922 - haiku/trunk/src/kits/tracker
Message-ID: <200904050841.n358fooI018192@sheep.berlios.de>

Author: stippi
Date: 2009-04-05 10:41:48 +0200 (Sun, 05 Apr 2009)
New Revision: 29922
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29922&view=rev

Modified:
   haiku/trunk/src/kits/tracker/TrackerInitialState.cpp
Log:
* Should fix the default desktop background (Haiku logo) since the move of the
  artwork folder.


Modified: haiku/trunk/src/kits/tracker/TrackerInitialState.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/TrackerInitialState.cpp	2009-04-05 08:34:32 UTC (rev 29921)
+++ haiku/trunk/src/kits/tracker/TrackerInitialState.cpp	2009-04-05 08:41:48 UTC (rev 29922)
@@ -461,7 +461,7 @@
 	// make the large Haiku Logo the default background
 
 	BPath path;
-	status_t status = find_directory(B_BEOS_ETC_DIRECTORY, &path);
+	status_t status = find_directory(B_SYSTEM_DATA_DIRECTORY, &path);
 	if (status < B_OK) {
 		BString errorMessage;
 		errorMessage << "At " << __PRETTY_FUNCTION__ << "\n";



From axeld at mail.berlios.de  Sun Apr  5 10:55:20 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sun, 5 Apr 2009 10:55:20 +0200
Subject: [Haiku-commits] r29923 - haiku/trunk/src/preferences/keymap
Message-ID: <200904050855.n358tKnJ021479@sheep.berlios.de>

Author: axeld
Date: 2009-04-05 10:55:18 +0200 (Sun, 05 Apr 2009)
New Revision: 29923
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29923&view=rev

Modified:
   haiku/trunk/src/preferences/keymap/KeyboardLayout.cpp
Log:
* _FreeKeys() now also clears the indicator list (so they are no longer copied
  each time you load a new layout).
* Fixed the IBM laptop keyboard layout.


Modified: haiku/trunk/src/preferences/keymap/KeyboardLayout.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/KeyboardLayout.cpp	2009-04-05 08:41:48 UTC (rev 29922)
+++ haiku/trunk/src/preferences/keymap/KeyboardLayout.cpp	2009-04-05 08:55:18 UTC (rev 29923)
@@ -267,11 +267,11 @@
 		"[ 0,10; $s:0x02+3; $gap:-; $s:+4; $gap:-; $s:+4; $sgap:-; "
 			"$s:0x34+2; ]\n"
 		"[ 0,20; :0x11+12; $backspace:+1 ]\n"
-		"[ 0,38; $tab:+1; :+12; $enter:0x47; ]\n"
+		"[ 0,38; $tab:0x26; :+12; $enter:0x47; ]\n"
 		"[ 0,56; $caps:0x3b; :+11; :0x33 ]\n"
 		"[ 0,74; $l-shift-ctrl:0x4b; :0x69; :0x4c+9; $r-shift:+1 ]\n"
 		"[ 0,92; :0x99; $l-shift-ctrl:0x5c; $option:0x66; :0x5d; $space:+1; "
-			":+1; :0x67; :0x60; $s:0x9a; $s:0x57; $s:0x9b ]\n"
+			":+1; :0x68; :0x60; $s:0x9a; $s:0x57; $s:0x9b ]\n"
 		"[ 221,102; $s:0x61+2; ]\n";
 
 	_InitFrom(kIBMLaptop);
@@ -287,6 +287,8 @@
 	fKeyCount = 0;
 	fKeyCapacity = 0;
 	fBounds = BRect();
+
+	fIndicators.MakeEmpty();
 }
 
 



From mmu_man at mail.berlios.de  Sun Apr  5 10:57:29 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 5 Apr 2009 10:57:29 +0200
Subject: [Haiku-commits] r29924 - haiku/trunk/build/jam
Message-ID: <200904050857.n358vT9o021963@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-05 10:57:29 +0200 (Sun, 05 Apr 2009)
New Revision: 29924
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29924&view=rev

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Introduce a BeOSCompatibility OptionalPackage for those why need to demo apps before fixing them, you lazy. :P
Use with caution, it will disappear someday.


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-04-05 08:55:18 UTC (rev 29923)
+++ haiku/trunk/build/jam/OptionalPackages	2009-04-05 08:57:29 UTC (rev 29924)
@@ -17,6 +17,7 @@
 #	Beam
 #	BeBook
 #	BeHappy
+#	BeOSCompatibility
 #	BePDF
 #	Bluetooth
 #	CVS
@@ -126,6 +127,18 @@
 }
 
 
+# BeOSCompatibility
+if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] {
+	Echo "Warning: Adding BeOS compatibility symlinks. This will go away. Please fix your apps!" ;
+	AddSymlinkToHaikuImage beos : ../system/apps ;
+	AddSymlinkToHaikuImage beos : ../system/bin ;
+	AddSymlinkToHaikuImage beos : ../system/documentation ;
+	AddSymlinkToHaikuImage beos : ../system/etc ;
+	AddSymlinkToHaikuImage beos : ../system/preferences ;
+	AddSymlinkToHaikuImage beos : ../system ;
+}
+
+
 # BePDF
 if [ IsOptionalHaikuImagePackageAdded BePDF ] {
 	if $(TARGET_ARCH) != x86 {



From mmu_man at mail.berlios.de  Sun Apr  5 11:14:21 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 5 Apr 2009 11:14:21 +0200
Subject: [Haiku-commits] r29925 - in haiku/trunk: build/jam src/bin/bash
Message-ID: <200904050914.n359EL9K025784@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-05 11:14:21 +0200 (Sun, 05 Apr 2009)
New Revision: 29925
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29925&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/src/bin/bash/Jamfile
Log:
Install bash as bash, and symlink sh to it, it's how it's done on other platforms and more logical.
Btw those defines here are x86 only... FIXME


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-05 08:57:29 UTC (rev 29924)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-05 09:14:21 UTC (rev 29925)
@@ -18,7 +18,7 @@
 	GPL_ONLY = "" ;
 }
 
-SYSTEM_BIN = "[" addattr alert arp base64 basename bc beep bootman bzip2
+SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
 	cal cat catattr checkfs chgrp chmod chop chown chroot cksum clear
 	clockconfig cmp comm compress copyattr $(X86_ONLY)CortexAddOnHost cp
 	csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname
@@ -38,7 +38,7 @@
 	printf profile ps ptx pwd query quit rc readlink release renice rescan rlog
 	rm rmattr rmindex rmdir roster route
 	safemode screen_blanker screenmode sed setdecor settype setversion setvolume
-	seq sh sha1sum shar shred shuf shutdown sleep sort spamdbm split stat strace
+	seq sha1sum shar shred shuf shutdown sleep sort spamdbm split stat strace
 	stty su sum sync sysinfo
 	tac tail tar tcpdump tcptester tee telnet telnetd test top touch tput tr
 	traceroute translate true tsort tty
@@ -238,7 +238,7 @@
 SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
 AddFilesToHaikuImage system bin			: which ;
 
-AddSymlinkToHaikuImage system bin : sh : bash ;
+AddSymlinkToHaikuImage system bin : bash : sh ;
 
 AddSymlinkToHaikuImage home Desktop : /boot/home : Home ;
 

Modified: haiku/trunk/src/bin/bash/Jamfile
===================================================================
--- haiku/trunk/src/bin/bash/Jamfile	2009-04-05 08:57:29 UTC (rev 29924)
+++ haiku/trunk/src/bin/bash/Jamfile	2009-04-05 09:14:21 UTC (rev 29925)
@@ -2,7 +2,7 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-SubDirCcFlags -DHAVE_CONFIG_H -DPROGRAM='\"sh\"' -DCONF_HOSTTYPE='\"i586\"' -DCONF_OSTYPE='\"beos\"' -DCONF_MACHTYPE='\"i586-pc-beos\"' -DCONF_VENDOR='\"pc\"' -DSHELL ;
+SubDirCcFlags -DHAVE_CONFIG_H -DPROGRAM='\"bash\"' -DCONF_HOSTTYPE='\"i586\"' -DCONF_OSTYPE='\"beos\"' -DCONF_MACHTYPE='\"i586-pc-beos\"' -DCONF_VENDOR='\"pc\"' -DSHELL ;
 
 # filter warnings we don't want here
 TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
@@ -64,7 +64,7 @@
 	jobControlSources = nojobs.c ;
 }
 
-BinCommand sh :
+BinCommand bash :
 	parse.y shell.c eval.c general.c make_cmd.c print_cmd.c
 	dispose_cmd.c execute_cmd.c variables.c version.c
 	expr.c copy_cmd.c flags.c subst.c hashcmd.c hashlib.c mailcheck.c



From mmu_man at mail.berlios.de  Sun Apr  5 12:51:06 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 5 Apr 2009 12:51:06 +0200
Subject: [Haiku-commits] r29926 - haiku/trunk/src/bin/bash
Message-ID: <200904051051.n35Ap6LI029969@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-05 12:51:04 +0200 (Sun, 05 Apr 2009)
New Revision: 29926
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29926&view=rev

Modified:
   haiku/trunk/src/bin/bash/Jamfile
Log:
Replace hardcoded defines by substrings from $(HAIKU_GCC_MACHINE).
OSTYPE is still set to BeOS, I know some scripts check for it... will need to be fixed.


Modified: haiku/trunk/src/bin/bash/Jamfile
===================================================================
--- haiku/trunk/src/bin/bash/Jamfile	2009-04-05 09:14:21 UTC (rev 29925)
+++ haiku/trunk/src/bin/bash/Jamfile	2009-04-05 10:51:04 UTC (rev 29926)
@@ -2,8 +2,18 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-SubDirCcFlags -DHAVE_CONFIG_H -DPROGRAM='\"bash\"' -DCONF_HOSTTYPE='\"i586\"' -DCONF_OSTYPE='\"beos\"' -DCONF_MACHTYPE='\"i586-pc-beos\"' -DCONF_VENDOR='\"pc\"' -DSHELL ;
+# split the canonical target string
+local cpuName = [ Match "([^-]*)-.*" : $(HAIKU_GCC_MACHINE) ] ;
+local vendorName = [ Match "[^-]*-([^-]*)" : $(HAIKU_GCC_MACHINE) ] ;
+local osName = [ Match "[^-]*-[^-]*-([^-]*)" : $(HAIKU_GCC_MACHINE) ] ;
 
+SubDirCcFlags -DHAVE_CONFIG_H -DPROGRAM='\"bash\"' -DSHELL ;
+SubDirCcFlags -DCONF_MACHTYPE='\"$(HAIKU_GCC_MACHINE)\"' ;
+SubDirCcFlags -DCONF_HOSTTYPE='\"$(cpuName)\"' ;
+SubDirCcFlags -DCONF_VENDOR='\"$(vendorName)\"' ;
+#SubDirCcFlags -DCONF_OSTYPE='\"$(osName)\"' ;
+SubDirCcFlags -DCONF_OSTYPE='\"beos\"' ;
+
 # filter warnings we don't want here
 TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
 	: -Wall -Wmissing-prototypes -Wsign-compare ] ;



From mmu_man at mail.berlios.de  Sun Apr  5 13:02:47 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 5 Apr 2009 13:02:47 +0200
Subject: [Haiku-commits] r29927 - haiku/trunk/src/servers/input
Message-ID: <200904051102.n35B2lw0009474@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-05 13:02:38 +0200 (Sun, 05 Apr 2009)
New Revision: 29927
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29927&view=rev

Modified:
   haiku/trunk/src/servers/input/MethodReplicant.cpp
   haiku/trunk/src/servers/input/remote_icon.h
Log:
- fixed hardcoded color in Deskbar replicant.
- fixed transparent pixels in the icon. This could make use of an HVIF one :)


Modified: haiku/trunk/src/servers/input/MethodReplicant.cpp
===================================================================
--- haiku/trunk/src/servers/input/MethodReplicant.cpp	2009-04-05 10:51:04 UTC (rev 29926)
+++ haiku/trunk/src/servers/input/MethodReplicant.cpp	2009-04-05 11:02:38 UTC (rev 29927)
@@ -40,7 +40,6 @@
 	fSegments = new BBitmap(BRect(0, 0, kRemoteWidth - 1, kRemoteHeight - 1), kRemoteColorSpace);
 	fSegments->SetBits(kRemoteBits, kRemoteWidth*kRemoteHeight, 0, kRemoteColorSpace);
 	// Background Color
-	SetViewColor(184, 184, 184);
 
 	//add dragger
 	BRect rect(Bounds());
@@ -108,6 +107,9 @@
 MethodReplicant::AttachedToWindow()
 {
 	CALLED();
+
+	SetViewColor(Parent()->ViewColor());
+
 	BMessenger messenger(this);
 	BMessage msg(IS_METHOD_REGISTER);
 	msg.AddMessenger("address", messenger);

Modified: haiku/trunk/src/servers/input/remote_icon.h
===================================================================
--- haiku/trunk/src/servers/input/remote_icon.h	2009-04-05 10:51:04 UTC (rev 29926)
+++ haiku/trunk/src/servers/input/remote_icon.h	2009-04-05 11:02:38 UTC (rev 29927)
@@ -5,16 +5,16 @@
 const unsigned char kRemoteBits [] = {
 	0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
 	0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,
-	0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0x00,0x00,0xff,0xff,0xff,0xff,
-	0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xff,0x0b,0xff,0xff,0x18,0x00,0x00,0xff,0xff,
-	0xff,0xff,0xff,0xff,0xff,0x00,0xff,0x0b,0xff,0x0b,0xff,0x0b,0xff,0xff,0x00,0x00,
-	0xff,0xff,0xff,0xff,0x00,0xff,0x0b,0xff,0x0b,0xff,0x0b,0xff,0xff,0x0a,0x0b,0x00,
-	0xff,0xff,0xff,0x00,0xff,0x0b,0xff,0x0b,0xff,0x0b,0xff,0xff,0x0a,0x0a,0x00,0x0f,
-	0xff,0xff,0x00,0xff,0x0b,0xff,0x0b,0xff,0x0b,0xff,0xff,0x0b,0x0a,0x00,0x0f,0x0f,
-	0xff,0x00,0xff,0x0b,0xff,0x0b,0xff,0x0b,0xff,0xff,0x0b,0x0a,0x00,0x0f,0x0f,0xff,
-	0x00,0xff,0xff,0xff,0x0a,0x18,0x0b,0xff,0xff,0x0a,0x0b,0x00,0x0f,0x0f,0xff,0xff,
-	0x00,0x11,0x11,0xff,0xff,0x0b,0xff,0xff,0x0a,0x0a,0x00,0x0f,0x0f,0xff,0xff,0xff,
-	0x00,0x11,0x11,0x11,0x11,0xff,0xff,0x0b,0x0a,0x00,0x0f,0x0f,0xff,0xff,0xff,0xff,
+	0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x17,0x17,0x00,0x00,0xff,0xff,0xff,0xff,
+	0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x17,0x0b,0x17,0x17,0x18,0x00,0x00,0xff,0xff,
+	0xff,0xff,0xff,0xff,0xff,0x00,0x17,0x0b,0x17,0x0b,0x17,0x0b,0x17,0x17,0x00,0x00,
+	0xff,0xff,0xff,0xff,0x00,0x17,0x0b,0x17,0x0b,0x17,0x0b,0x17,0x17,0x0a,0x0b,0x00,
+	0xff,0xff,0xff,0x00,0x17,0x0b,0x17,0x0b,0x17,0x0b,0x17,0x17,0x0a,0x0a,0x00,0x0f,
+	0xff,0xff,0x00,0x17,0x0b,0x17,0x0b,0x17,0x0b,0x17,0x17,0x0b,0x0a,0x00,0x0f,0x0f,
+	0xff,0x00,0x17,0x0b,0x17,0x0b,0x17,0x0b,0x17,0x17,0x0b,0x0a,0x00,0x0f,0x0f,0xff,
+	0x00,0x17,0x17,0x17,0x0a,0x18,0x0b,0x17,0x17,0x0a,0x0b,0x00,0x0f,0x0f,0xff,0xff,
+	0x00,0x11,0x11,0x17,0x17,0x0b,0x17,0x17,0x0a,0x0a,0x00,0x0f,0x0f,0xff,0xff,0xff,
+	0x00,0x11,0x11,0x11,0x11,0x17,0x17,0x0b,0x0a,0x00,0x0f,0x0f,0xff,0xff,0xff,0xff,
 	0xff,0x00,0x00,0x11,0x11,0x11,0x0b,0x0b,0x00,0x0f,0x0f,0xff,0xff,0xff,0xff,0xff,
 	0xff,0xff,0xff,0x00,0x00,0x11,0x0b,0x00,0x0f,0x0f,0xff,0xff,0xff,0xff,0xff,0xff,
 	0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x0f,0x0f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,



From axeld at mail.berlios.de  Sun Apr  5 14:00:38 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sun, 5 Apr 2009 14:00:38 +0200
Subject: [Haiku-commits] r29928 -
	haiku/trunk/src/add-ons/kernel/network/protocols/tcp
Message-ID: <200904051200.n35C0ctF000403@sheep.berlios.de>

Author: axeld
Date: 2009-04-05 14:00:36 +0200 (Sun, 05 Apr 2009)
New Revision: 29928
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29928&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp
   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/BufferQueue.h
   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/tcp.h
Log:
bonefish + axeld:
* There was one incorrect check in BufferQueue::Get() that happened because
  the wrong operator was used due to the uint32 cast operator.
* Consequently, we removed the uint32 cast operator, and changed the code
  to deal with this. Fortunately, no other bugs were observed.


Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp	2009-04-05 11:02:38 UTC (rev 29927)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp	2009-04-05 12:00:36 UTC (rev 29928)
@@ -91,14 +91,15 @@
 	}
 	if (sequence < fFirstSequence) {
 		// this buffer contains data that is already long gone - trim it
-		gBufferModule->remove_header(buffer, fFirstSequence - sequence);
+		gBufferModule->remove_header(buffer,
+			(fFirstSequence - sequence).Number());
 		sequence = fFirstSequence;
 	}
 
 	if (fList.IsEmpty() || sequence >= fLastSequence) {
 		// we usually just add the buffer to the end of the queue
 		fList.Add(buffer);
-		buffer->sequence = sequence;
+		buffer->sequence = sequence.Number();
 
 		if (sequence == fLastSequence
 			&& fLastSequence - fFirstSequence == fNumBytes) {
@@ -157,7 +158,7 @@
 				> sequence) {
 			// We already have the first part of this buffer
 			gBufferModule->remove_header(buffer,
-				previous->sequence + previous->size - sequence);
+				(previous->sequence + previous->size - sequence).Number());
 			sequence = previous->sequence + previous->size;
 		}
 	}
@@ -179,7 +180,7 @@
 		} else if (tcp_sequence(next->sequence) > sequence) {
 			// We have the end of this buffer already
 			gBufferModule->remove_trailer(buffer,
-				sequence + buffer->size - next->sequence);
+				(sequence + buffer->size - next->sequence).Number());
 		} else {
 			// We already have this data
 			gBufferModule->free(buffer);
@@ -196,7 +197,7 @@
 	}
 
 	fList.Insert(next, buffer);
-	buffer->sequence = sequence;
+	buffer->sequence = sequence.Number();
 	fNumBytes += buffer->size;
 
 	// we might need to update the number of bytes available
@@ -253,7 +254,7 @@
 			gBufferModule->free(buffer);
 		} else {
 			// remove the header as far as needed
-			size_t size = sequence - buffer->sequence;
+			size_t size = (sequence - buffer->sequence).Number();
 			gBufferModule->remove_header(buffer, size);
 
 			buffer->sequence += size;
@@ -290,7 +291,7 @@
 		return B_BAD_VALUE;
 	}
 	if (tcp_sequence(sequence + bytes) > fLastSequence)
-		bytes = fLastSequence - sequence;
+		bytes = (fLastSequence - sequence).Number();
 
 	size_t bytesLeft = bytes;
 
@@ -305,14 +306,14 @@
 
 	if (source == NULL)
 		panic("we should have had that data...");
-	if (source->sequence > sequence) {
+	if (tcp_sequence(source->sequence) > sequence) {
 		panic("source %p, sequence = %lu (%lu)\n", source, source->sequence,
-			(uint32)sequence);
+			sequence.Number());
 	}
 
 	// clone the data
 
-	uint32 offset = sequence - source->sequence;
+	uint32 offset = (sequence - source->sequence).Number();
 
 	while (source != NULL && bytesLeft > 0) {
 		size_t size = min_c(source->size - offset, bytesLeft);
@@ -416,10 +417,10 @@
 size_t
 BufferQueue::Available(tcp_sequence sequence) const
 {
-	if (sequence > (uint32)fFirstSequence + fContiguousBytes)
+	if (sequence > (fFirstSequence + fContiguousBytes).Number())
 		return 0;
 
-	return fContiguousBytes + fFirstSequence - sequence;
+	return (fContiguousBytes + fFirstSequence - sequence).Number();
 }
 
 

Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/BufferQueue.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/BufferQueue.h	2009-04-05 11:02:38 UTC (rev 29927)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/BufferQueue.h	2009-04-05 12:00:36 UTC (rev 29928)
@@ -76,8 +76,8 @@
 {
 	// we must check if fPushPointer is not 0 here due to
 	// tcp_sequence's special handling of >
-	return fPushPointer != 0
-		&& fPushPointer > fFirstSequence ? fPushPointer - fFirstSequence : 0;
+	return fPushPointer != 0 && fPushPointer > fFirstSequence
+		? (fPushPointer - fFirstSequence).Number() : 0;
 }
 
 #endif	// BUFFER_QUEUE_H

Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp	2009-04-05 11:02:38 UTC (rev 29927)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp	2009-04-05 12:00:36 UTC (rev 29928)
@@ -1548,7 +1548,7 @@
 		// the window must not shrink
 
 	// trim buffer to be within the receive window
-	int32 drop = fReceiveNext - segment.sequence;
+	int32 drop = (int32)(fReceiveNext - segment.sequence).Number();
 	if (drop > 0) {
 		if ((uint32)drop > buffer->size
 			|| ((uint32)drop == buffer->size
@@ -1566,7 +1566,8 @@
 
 	int32 action = KEEP;
 
-	drop = segment.sequence + buffer->size - (fReceiveNext + fReceiveWindow);
+	drop = (int32)(segment.sequence + buffer->size
+		- (fReceiveNext + fReceiveWindow)).Number();
 	if (drop > 0) {
 		// remove data exceeding our window
 		if ((uint32)drop >= buffer->size) {
@@ -1844,7 +1845,7 @@
 	if (segment.advertised_window > 0) {
 		// correct the window to take into account what already has been advertised
 		uint32 window = (segment.advertised_window << fReceiveWindowShift)
-			- (fReceiveMaxAdvertised - fReceiveNext);
+			- (fReceiveMaxAdvertised - fReceiveNext).Number();
 
 		// if we can advertise a window larger than twice the maximum segment
 		// size, or half the maximum buffer size we send a window update
@@ -1912,14 +1913,14 @@
 	else
 		segment.advertised_window = min_c(TCP_MAX_WINDOW, availableBytes);
 
-	segment.acknowledge = fReceiveNext;
+	segment.acknowledge = fReceiveNext.Number();
 
 	// Process urgent data
 	if (fSendUrgentOffset > fSendNext) {
 		segment.flags |= TCP_FLAG_URGENT;
-		segment.urgent_offset = fSendUrgentOffset - fSendNext;
+		segment.urgent_offset = (fSendUrgentOffset - fSendNext).Number();
 	} else {
-		fSendUrgentOffset = fSendUnacknowledged;
+		fSendUrgentOffset = fSendUnacknowledged.Number();
 			// Keep urgent offset updated, so that it doesn't reach into our
 			// send window on overlap
 		segment.urgent_offset = 0;
@@ -1942,8 +1943,8 @@
 	// reduced (by congestion for instance), so at some point in time flight
 	// size may be larger than the currently calculated window.
 
-	uint32 flightSize = fSendMax - fSendUnacknowledged;
-	uint32 consumedWindow = fSendNext - fSendUnacknowledged;
+	uint32 flightSize = (fSendMax - fSendUnacknowledged).Number();
+	uint32 consumedWindow = (fSendNext - fSendUnacknowledged).Number();
 
 	if (consumedWindow > sendWindow) {
 		sendWindow = 0;
@@ -1998,7 +1999,7 @@
 		PeerAddress().CopyTo(buffer->destination);
 
 		uint32 size = buffer->size;
-		segment.sequence = fSendNext;
+		segment.sequence = fSendNext.Number();
 
 		TRACE("SendQueued(): buffer %p (%lu bytes) address %s to %s\n"
 			"\tflags 0x%x, seq %lu, ack %lu, rwnd %hu, cwnd %lu, ssthresh %lu\n"
@@ -2033,7 +2034,7 @@
 		if (segment.flags & TCP_FLAG_FINISH)
 			size++;
 
-		uint32 sendMax = fSendMax;
+		uint32 sendMax = fSendMax.Number();
 		fSendNext += size;
 		if (fSendMax < fSendNext)
 			fSendMax = fSendNext;
@@ -2205,7 +2206,7 @@
 void
 TCPEndpoint::_ResetSlowStart()
 {
-	fSlowStartThreshold = max_c((fSendMax - fSendUnacknowledged) / 2,
+	fSlowStartThreshold = max_c((fSendMax - fSendUnacknowledged).Number() / 2,
 		2 * fSendMaxSegmentSize);
 	fCongestionWindow = fSendMaxSegmentSize;
 }
@@ -2300,11 +2301,11 @@
 	kprintf("  accept sem: %ld\n", fAcceptSemaphore);
 	kprintf("  options: 0x%lx\n", (uint32)fOptions);
 	kprintf("  send\n");
-	kprintf("    window shift: %lu\n", (uint32)fSendWindowShift);
-	kprintf("    unacknowledged: %lu\n", (uint32)fSendUnacknowledged);
-	kprintf("    next: %lu\n", (uint32)fSendNext);
-	kprintf("    max: %lu\n", (uint32)fSendMax);
-	kprintf("    urgent offset: %lu\n", (uint32)fSendUrgentOffset);
+	kprintf("    window shift: %u\n", fSendWindowShift);
+	kprintf("    unacknowledged: %lu\n", fSendUnacknowledged.Number());
+	kprintf("    next: %lu\n", fSendNext.Number());
+	kprintf("    max: %lu\n", fSendMax.Number());
+	kprintf("    urgent offset: %lu\n", fSendUrgentOffset.Number());
 	kprintf("    window: %lu\n", fSendWindow);
 	kprintf("    max window: %lu\n", fSendMaxWindow);
 	kprintf("    max segment size: %lu\n", fSendMaxSegmentSize);
@@ -2312,25 +2313,25 @@
 #if DEBUG_BUFFER_QUEUE
 	fSendQueue.Dump();
 #endif
-	kprintf("    last acknowledge sent: %lu\n", (uint32)fLastAcknowledgeSent);
-	kprintf("    initial sequence: %lu\n", (uint32)fInitialSendSequence);
+	kprintf("    last acknowledge sent: %lu\n", fLastAcknowledgeSent.Number());
+	kprintf("    initial sequence: %lu\n", fInitialSendSequence.Number());
 	kprintf("  receive\n");
-	kprintf("    window shift: %lu\n", (uint32)fReceiveWindowShift);
-	kprintf("    next: %lu\n", (uint32)fReceiveNext);
-	kprintf("    max advertised: %lu\n", (uint32)fReceiveMaxAdvertised);
-	kprintf("    window: %lu\n", (uint32)fReceiveWindow);
-	kprintf("    max segment size: %lu\n", (uint32)fReceiveMaxSegmentSize);
+	kprintf("    window shift: %u\n", fReceiveWindowShift);
+	kprintf("    next: %lu\n", fReceiveNext.Number());
+	kprintf("    max advertised: %lu\n", fReceiveMaxAdvertised.Number());
+	kprintf("    window: %lu\n", fReceiveWindow);
+	kprintf("    max segment size: %lu\n", fReceiveMaxSegmentSize);
 	kprintf("    queue: %lu / %lu\n", fReceiveQueue.Available(),
 		fReceiveQueue.Size());
 #if DEBUG_BUFFER_QUEUE
 	fReceiveQueue.Dump();
 #endif
-	kprintf("    initial sequence: %lu\n", (uint32)fInitialReceiveSequence);
+	kprintf("    initial sequence: %lu\n", fInitialReceiveSequence.Number());
 	kprintf("    duplicate acknowledge count: %lu\n",
 		fDuplicateAcknowledgeCount);
 	kprintf("  round trip time: %ld (deviation %ld)\n", fRoundTripTime,
 		fRoundTripDeviation);
-	kprintf("  retransmit timeout: %llu\n", (uint64)fRetransmitTimeout);
+	kprintf("  retransmit timeout: %lld\n", fRetransmitTimeout);
 	kprintf("  congestion window: %lu\n", fCongestionWindow);
 	kprintf("  slow start threshold: %lu\n", fSlowStartThreshold);
 }

Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/tcp.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/tcp.h	2009-04-05 11:02:38 UTC (rev 29927)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/tcp.h	2009-04-05 12:00:36 UTC (rev 29928)
@@ -73,29 +73,106 @@
 
 class tcp_sequence {
 public:
-					tcp_sequence() {}
-					tcp_sequence(uint32 sequence) : fNumber(sequence) {}
+	inline tcp_sequence() {}
+	inline tcp_sequence(uint32 sequence)
+		: fNumber(sequence)
+	{
+	}
 
-					operator uint32() const { return fNumber; }
+	inline uint32 Number() const
+	{
+		return fNumber;
+	}
 
-			void	operator=(uint32 sequence) { fNumber = sequence; }
-			bool	operator>(uint32 sequence) const
-						{ return (int32)(fNumber - sequence) > 0; }
-			bool	operator>=(uint32 sequence) const
-						{ return (int32)(fNumber - sequence) >= 0; }
-			bool	operator<(uint32 sequence) const
-						{ return (int32)(fNumber - sequence) < 0; }
-			bool	operator<=(uint32 sequence) const
-						{ return (int32)(fNumber - sequence) <= 0; }
+	inline tcp_sequence& operator=(tcp_sequence sequence)
+	{
+		fNumber = sequence.fNumber;
+		return *this;
+	}
 
-			uint32&	operator+=(uint32 sequence) { return fNumber += sequence; }
-			uint32&	operator++() { return ++fNumber; }
-			uint32	operator++(int _) { return fNumber++; }
+	inline tcp_sequence& operator+=(tcp_sequence sequence)
+	{
+		fNumber += sequence.fNumber;
+		return *this;
+	}
 
-private:
+	inline tcp_sequence& operator++()
+	{
+		fNumber++;
+		return *this;
+	}
+
+	inline tcp_sequence operator++(int _)
+	{
+		fNumber++;
+		return fNumber - 1;
+	}
+
+// Conceptually private, but used in global operators.
+//private:
 	uint32	fNumber;
 };
 
+
+// Global tcp_sequence Operators
+
+
+inline bool
+operator>(tcp_sequence a, tcp_sequence b)
+{
+	return (int32)(a.fNumber - b.fNumber) > 0;
+}
+
+
+inline bool
+operator>=(tcp_sequence a, tcp_sequence b)
+{
+	return (int32)(a.fNumber - b.fNumber) >= 0;
+}
+
+
+inline bool
+operator<(tcp_sequence a, tcp_sequence b)
+{
+	return (int32)(a.fNumber - b.fNumber) < 0;
+}
+
+
+inline bool
+operator<=(tcp_sequence a, tcp_sequence b)
+{
+	return (int32)(a.fNumber - b.fNumber) <= 0;
+}
+
+
+inline tcp_sequence
+operator+(tcp_sequence a, tcp_sequence b)
+{
+	return a.fNumber + b.fNumber;
+}
+
+
+inline tcp_sequence
+operator-(tcp_sequence a, tcp_sequence b)
+{
+	return a.fNumber - b.fNumber;
+}
+
+
+inline bool
+operator!=(tcp_sequence a, tcp_sequence b)
+{
+	return a.fNumber != b.fNumber;
+}
+
+
+inline bool
+operator==(tcp_sequence a, tcp_sequence b)
+{
+	return a.fNumber == b.fNumber;
+}
+
+
 // TCP flag constants
 #define TCP_FLAG_FINISH					0x01
 #define TCP_FLAG_SYNCHRONIZE			0x02



From axeld at mail.berlios.de  Sun Apr  5 15:00:54 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sun, 5 Apr 2009 15:00:54 +0200
Subject: [Haiku-commits] r29929 - haiku/trunk/src/preferences/keymap
Message-ID: <200904051300.n35D0si6013193@sheep.berlios.de>

Author: axeld
Date: 2009-04-05 15:00:51 +0200 (Sun, 05 Apr 2009)
New Revision: 29929
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29929&view=rev

Modified:
   haiku/trunk/src/preferences/keymap/KeymapWindow.cpp
   haiku/trunk/src/preferences/keymap/KeymapWindow.h
Log:
* Changed the way the shortcuts are switched: we no longer do the same thing
  as BeOS on the right side (that is, switching control and option key), but
  switch control and command there as well.
* As a consequence, the Alt-Gr key will stay where it is when switching the
  shortcuts.


Modified: haiku/trunk/src/preferences/keymap/KeymapWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/KeymapWindow.cpp	2009-04-05 12:00:36 UTC (rev 29928)
+++ haiku/trunk/src/preferences/keymap/KeymapWindow.cpp	2009-04-05 13:00:51 UTC (rev 29929)
@@ -152,7 +152,7 @@
 	fAppliedMap = fCurrentMap;
 	fCurrentMap.SetTarget(this, new BMessage(kMsgKeymapUpdated));
 
-	_UpdateShortcutButton();
+	_UpdateSwitchShortcutButton();
 
 	Unlock();
 }
@@ -437,19 +437,18 @@
 }
 
 
+/*!	Sets the label of the "Switch Shorcuts" button to make it more
+	descriptive what will happen when you press that button.
+*/
 void
-KeymapWindow::_UpdateShortcutButton()
+KeymapWindow::_UpdateSwitchShortcutButton()
 {
 	const char* label = "Switch Shortcut Keys";
 	if (fCurrentMap.KeyForModifier(B_LEFT_COMMAND_KEY) == 0x5d
-		&& fCurrentMap.KeyForModifier(B_LEFT_CONTROL_KEY) == 0x5c
-		&& fCurrentMap.KeyForModifier(B_RIGHT_OPTION_KEY) == 0x5f
-		&& fCurrentMap.KeyForModifier(B_RIGHT_CONTROL_KEY) == 0x60) {
+		&& fCurrentMap.KeyForModifier(B_LEFT_CONTROL_KEY) == 0x5c) {
 		label = "Switch Shortcut Keys To Windows/Linux Mode";
 	} else if (fCurrentMap.KeyForModifier(B_LEFT_COMMAND_KEY) == 0x5c
-		&& fCurrentMap.KeyForModifier(B_LEFT_CONTROL_KEY) == 0x5d
-		&& fCurrentMap.KeyForModifier(B_RIGHT_OPTION_KEY) == 0x60
-		&& fCurrentMap.KeyForModifier(B_RIGHT_CONTROL_KEY) == 0x5f) {
+		&& fCurrentMap.KeyForModifier(B_LEFT_CONTROL_KEY) == 0x5d) {
 		label = "Switch Shortcut Keys To Haiku Mode";
 	}
 
@@ -463,7 +462,7 @@
 	fUseButton->SetEnabled(!fCurrentMap.Equals(fAppliedMap));
 	fRevertButton->SetEnabled(!fCurrentMap.Equals(fPreviousMap));
 
-	_UpdateShortcutButton();
+	_UpdateSwitchShortcutButton();
 }
 
 
@@ -472,7 +471,7 @@
 {
 	uint32 leftCommand = fCurrentMap.Map().left_command_key;
 	uint32 leftControl = fCurrentMap.Map().left_control_key;
-	uint32 rightOption = fCurrentMap.Map().right_option_key;
+	uint32 rightCommand = fCurrentMap.Map().right_command_key;
 	uint32 rightControl = fCurrentMap.Map().right_control_key;
 
 	// switch left side
@@ -480,8 +479,8 @@
 	fCurrentMap.Map().left_control_key = leftCommand;
 
 	// switch right side
-	fCurrentMap.Map().right_option_key = rightControl;
-	fCurrentMap.Map().right_control_key = rightOption;
+	fCurrentMap.Map().right_command_key = rightControl;
+	fCurrentMap.Map().right_control_key = rightCommand;
 
 	fKeyboardLayoutView->SetKeymap(&fCurrentMap);
 	_UpdateButtons();

Modified: haiku/trunk/src/preferences/keymap/KeymapWindow.h
===================================================================
--- haiku/trunk/src/preferences/keymap/KeymapWindow.h	2009-04-05 12:00:36 UTC (rev 29928)
+++ haiku/trunk/src/preferences/keymap/KeymapWindow.h	2009-04-05 13:00:51 UTC (rev 29929)
@@ -39,7 +39,7 @@
 			BView*				_CreateMapLists();
 			void				_AddKeyboardLayouts(BMenu* menu);
 
-			void				_UpdateShortcutButton();
+			void				_UpdateSwitchShortcutButton();
 			void				_UpdateButtons();
 			void				_SwitchShortcutKeys();
 



From axeld at mail.berlios.de  Sun Apr  5 15:02:37 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sun, 5 Apr 2009 15:02:37 +0200
Subject: [Haiku-commits] r29930 - haiku/trunk/src/preferences/keymap
Message-ID: <200904051302.n35D2bUc013469@sheep.berlios.de>

Author: axeld
Date: 2009-04-05 15:02:36 +0200 (Sun, 05 Apr 2009)
New Revision: 29930
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29930&view=rev

Modified:
   haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp
   haiku/trunk/src/preferences/keymap/KeyboardLayoutView.h
Log:
* Made the modifiers sticky when used with the mouse. This greatly improves
  changing keymaps this way.


Modified: haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp	2009-04-05 13:00:51 UTC (rev 29929)
+++ haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp	2009-04-05 13:02:36 UTC (rev 29930)
@@ -133,16 +133,27 @@
 	fDropPoint.x = -1;
 
 	Key* key = _KeyAt(point);
-	if (key != NULL) {
-		fKeyState[key->code / 8] |= (1 << (7 - (key->code & 7)));
-		
-		if (fKeymap != NULL && fKeymap->IsModifierKey(key->code)) {
+	if (key == NULL)
+		return;
+
+	if (fKeymap != NULL && fKeymap->IsModifierKey(key->code)) {
+		if (_KeyState(key->code)) {
+			uint32 modifier = fKeymap->Modifier(key->code);
+			if ((modifier & modifiers()) == 0) {
+				_SetKeyState(key->code, false);
+				fModifiers &= ~modifier;
+				Invalidate();
+			}
+		} else {
+			_SetKeyState(key->code, true);
 			fModifiers |= fKeymap->Modifier(key->code);
 			Invalidate();
+		}
 
-			// TODO: if possible, we could handle the lock keys for real
-		} else
-			_InvalidateKey(key);
+		// TODO: if possible, we could handle the lock keys for real
+	} else {
+		_SetKeyState(key->code, true);
+		_InvalidateKey(key);
 	}
 }
 
@@ -152,19 +163,16 @@
 {
 	Key* key = _KeyAt(fClickPoint);
 	if (key != NULL) {
-		fKeyState[key->code / 8] &= ~(1 << (7 - (key->code & 7)));
+		// modifier keys are sticky when used with the mouse
+		if (fKeymap != NULL && fKeymap->IsModifierKey(key->code))
+			return;
 
+		_SetKeyState(key->code, false);
+
 		if (_HandleDeadKey(key->code, fModifiers) && fDeadKey != 0)
 			return;
 
-		if (fKeymap != NULL && fKeymap->IsModifierKey(key->code)) {
-			int32 newModifiers = modifiers();
-			if (fModifiers != newModifiers) {
-				fModifiers = modifiers();
-				Invalidate();
-			}
-		} else
-			_InvalidateKey(key);
+		_InvalidateKey(key);
 
 		if (fDragKey == NULL && fKeymap != NULL) {
 			// Send fake key down message to target
@@ -188,7 +196,17 @@
 
 			_EvaluateDropTarget(point);
 		}
-	} else if (fDragKey == NULL && (fabs(point.x - fClickPoint.x) > 4
+
+		return;
+	}
+	
+	int32 buttons;
+	if (Window()->CurrentMessage() == NULL
+		|| Window()->CurrentMessage()->FindInt32("buttons", &buttons) != B_OK
+		|| buttons == 0)
+		return;
+
+	if (fDragKey == NULL && (fabs(point.x - fClickPoint.x) > 4
 		|| fabs(point.y - fClickPoint.y) > 4)) {
 		// start dragging
 		Key* key = _KeyAt(fClickPoint);
@@ -767,26 +785,46 @@
 
 
 bool
-KeyboardLayoutView::_IsKeyPressed(int32 code)
+KeyboardLayoutView::_IsKeyPressed(uint32 code)
 {
+	if (fDropTarget != NULL && fDropTarget->code == (int32)code)
+		return true;
+
+	return _KeyState(code);
+}
+
+
+bool
+KeyboardLayoutView::_KeyState(uint32 code) const
+{
 	if (code >= 16 * 8)
 		return false;
 
-	if (fDropTarget != NULL && fDropTarget->code == code)
-		return true;
-
 	return (fKeyState[code / 8] & (1 << (7 - (code & 7)))) != 0;
 }
 
 
+void
+KeyboardLayoutView::_SetKeyState(uint32 code, bool pressed)
+{
+	if (code >= 16 * 8)
+		return;
+
+	if (pressed)
+		fKeyState[code / 8] |= (1 << (7 - (code & 7)));
+	else
+		fKeyState[code / 8] &= ~(1 << (7 - (code & 7)));
+}
+
+
 Key*
-KeyboardLayoutView::_KeyForCode(int32 code)
+KeyboardLayoutView::_KeyForCode(uint32 code)
 {
 	// TODO: have a lookup array
 
 	for (int32 i = 0; i < fLayout->CountKeys(); i++) {
 		Key* key = fLayout->KeyAt(i);
-		if (key->code == code)
+		if (key->code == (int32)code)
 			return key;
 	}
 
@@ -795,7 +833,7 @@
 
 
 void
-KeyboardLayoutView::_InvalidateKey(int32 code)
+KeyboardLayoutView::_InvalidateKey(uint32 code)
 {
 	_InvalidateKey(_KeyForCode(code));
 }
@@ -814,7 +852,7 @@
 	\return true if the view has been invalidated.
 */
 bool
-KeyboardLayoutView::_HandleDeadKey(int32 key, int32 modifiers)
+KeyboardLayoutView::_HandleDeadKey(uint32 key, int32 modifiers)
 {
 	if (fKeymap == NULL)
 		return false;

Modified: haiku/trunk/src/preferences/keymap/KeyboardLayoutView.h
===================================================================
--- haiku/trunk/src/preferences/keymap/KeyboardLayoutView.h	2009-04-05 13:00:51 UTC (rev 29929)
+++ haiku/trunk/src/preferences/keymap/KeyboardLayoutView.h	2009-04-05 13:02:36 UTC (rev 29930)
@@ -71,11 +71,13 @@
 								size_t textSize);
 			void			_GetKeyLabel(const Key* key, char* text,
 								size_t textSize, key_kind& keyKind);
-			bool			_IsKeyPressed(int32 code);
-			Key*			_KeyForCode(int32 code);
-			void			_InvalidateKey(int32 code);
+			bool			_IsKeyPressed(uint32 code);
+			bool			_KeyState(uint32 code) const;
+			void			_SetKeyState(uint32 code, bool pressed);
+			Key*			_KeyForCode(uint32 code);
+			void			_InvalidateKey(uint32 code);
 			void			_InvalidateKey(const Key* key);
-			bool			_HandleDeadKey(int32 key, int32 modifiers);
+			bool			_HandleDeadKey(uint32 key, int32 modifiers);
 			void			_KeyChanged(const BMessage* message);
 			Key*			_KeyAt(BPoint point);
 			BRect			_FrameFor(BRect keyFrame);



From mmlr at mail.berlios.de  Sun Apr  5 15:04:32 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Sun, 5 Apr 2009 15:04:32 +0200
Subject: [Haiku-commits] r29931 - haiku/trunk/src/add-ons/kernel/busses/usb
Message-ID: <200904051304.n35D4Wed013878@sheep.berlios.de>

Author: mmlr
Date: 2009-04-05 15:04:30 +0200 (Sun, 05 Apr 2009)
New Revision: 29931
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29931&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/busses/usb/ehci.cpp
Log:
It turns out that on some BIOSes even if the handover is signaled as successful,
the BIOS doesn't remove it's SMIs. When then initializing the controller this
would trigger all sorts of stuff and for example freeze the system. We therefore
always force off the SMIs, even if the handover didn't fail.


Modified: haiku/trunk/src/add-ons/kernel/busses/usb/ehci.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/usb/ehci.cpp	2009-04-05 13:02:36 UTC (rev 29930)
+++ haiku/trunk/src/add-ons/kernel/busses/usb/ehci.cpp	2009-04-05 13:04:30 UTC (rev 29931)
@@ -200,15 +200,17 @@
 
 			if (legacySupport & EHCI_LEGSUP_BIOSOWNED) {
 				TRACE_ERROR("bios won't give up control over the host controller (ignoring)\n");
-
-				// turn off the BIOS owned flag, clear all SMIs and continue
-				sPCIModule->write_pci_config(fPCIInfo->bus, fPCIInfo->device,
-					fPCIInfo->function, extendedCapPointer + 2, 1, 0);
-				sPCIModule->write_pci_config(fPCIInfo->bus, fPCIInfo->device,
-					fPCIInfo->function, extendedCapPointer + 4, 4, 0);
 			} else if (legacySupport & EHCI_LEGSUP_OSOWNED) {
 				TRACE_ALWAYS("successfully took ownership of the host controller\n");
 			}
+
+			// Force off the BIOS owned flag, and clear all SMIs. Some BIOSes
+			// do indicate a successful handover but do not remove their SMIs
+			// and then freeze the system when interrupts are generated.
+			sPCIModule->write_pci_config(fPCIInfo->bus, fPCIInfo->device,
+				fPCIInfo->function, extendedCapPointer + 2, 1, 0);
+			sPCIModule->write_pci_config(fPCIInfo->bus, fPCIInfo->device,
+				fPCIInfo->function, extendedCapPointer + 4, 4, 0);
 		} else {
 			TRACE("extended capability is not a legacy support register\n");
 		}



From kirilla at mail.berlios.de  Sun Apr  5 15:08:56 2009
From: kirilla at mail.berlios.de (kirilla at mail.berlios.de)
Date: Sun, 5 Apr 2009 15:08:56 +0200
Subject: [Haiku-commits] r29932 - haiku/trunk/src/apps/text_search
Message-ID: <200904051308.n35D8uvG014730@sheep.berlios.de>

Author: kirilla
Date: 2009-04-05 15:08:42 +0200 (Sun, 05 Apr 2009)
New Revision: 29932
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29932&view=rev

Modified:
   haiku/trunk/src/apps/text_search/GrepWindow.cpp
   haiku/trunk/src/apps/text_search/TextSearch.cpp
Log:
Spotted a few left-over occurences of the previous names: TrackerGrep and Tracker Grep. Simplified the About window: Version is no longer essential. Its simply part of Haiku now. The name is more self-explanatory now, so there is no need to explain the purpose of the application in the About window. Removed the mention of myself as the maintainer, as its maintained collectively by Haiku now. Moved myself into the list of contributors, after Oliver Tappe, which I think is chronologically correct. If the primary copyright holder was Haiku and not Matthijs Hollemans, it would have been appropriate to use Haikus BAboutWindow, but alas.

Modified: haiku/trunk/src/apps/text_search/GrepWindow.cpp
===================================================================
--- haiku/trunk/src/apps/text_search/GrepWindow.cpp	2009-04-05 13:04:30 UTC (rev 29931)
+++ haiku/trunk/src/apps/text_search/GrepWindow.cpp	2009-04-05 13:08:42 UTC (rev 29932)
@@ -1438,7 +1438,7 @@
 
 	if (!_AreAllFoldersOpenInTracker(&folderList)) {
 		BAlert* alert = new BAlert(NULL,
-			_T("Tracker Grep couldn't open one or more folders, and it's very "
+			_T(APP_NAME " couldn't open one or more folders, and it's very "
 				"sorry about it."),
 			_T("Forgive and forget!"), NULL, NULL, B_WIDTH_AS_USUAL,
 			B_STOP_ALERT);
@@ -1469,37 +1469,16 @@
 void
 GrepWindow::_OnAboutRequested()
 {
-	app_info appInfo;
-	version_info vInfo;
-	BFile appFile;
-	BAppFileInfo appFileInfo;
-	BString fAppVersion;
-
-	if (be_app->Lock()) {
-		be_app->GetAppInfo(&appInfo);
-		appFile.SetTo(&appInfo.ref, B_READ_ONLY);
-		appFileInfo.SetTo(&appFile);
-		if (appFileInfo.GetVersionInfo(&vInfo, B_APP_VERSION_KIND) == B_OK)
-			fAppVersion = BString("") << vInfo.major << '.' << vInfo.middle;
-		be_app->Unlock();
-	}
-
 	BString text;
-	text << APP_NAME << " " << fAppVersion << "\n";
+	text << APP_NAME << " " << "\n\n";
 	int32 titleLength = text.Length();
-	text << _T("Get a grip on grep.") << "\n\n";
-	text << _T(APP_NAME " lets you search the contents of your files.") << " ";
-	text << _T("It is primarily intended for use with text files.") << "\n\n";
-	text << _T("Created by Matthijs Hollemans") << "\n";
-	text << "mahlzeit at users.sf.net" << "\n\n";
-	text << _T("Maintained by Jonas Sundstr?m") << "\n";
-	text << "jonas at kirilla.com" << "\n\n";
-	text << _T("Contributed to by: ");
+	text << _T("Created by Matthijs Hollemans.") << "\n\n";
+	text << _T("Contributed to by ");
 	text << _T("Peter Hinely, Serge Fantino, Hideki Naito, Oscar Lesta, "
-		"Oliver Tappe, Luc Schrijvers and momoziro.");
+		"Oliver Tappe, Jonas Sundstr?m, Luc Schrijvers and momoziro.");
 	text << "\n";
 
-	BAlert* alert = new BAlert("Tracker Grep", text.String(), _T("Ok"), NULL,
+	BAlert* alert = new BAlert("TextSearch", text.String(), _T("Ok"), NULL,
 		NULL, B_WIDTH_AS_USUAL, B_INFO_ALERT);
 
 	BTextView* view = alert->TextView();

Modified: haiku/trunk/src/apps/text_search/TextSearch.cpp
===================================================================
--- haiku/trunk/src/apps/text_search/TextSearch.cpp	2009-04-05 13:04:30 UTC (rev 29931)
+++ haiku/trunk/src/apps/text_search/TextSearch.cpp	2009-04-05 13:08:42 UTC (rev 29932)
@@ -51,7 +51,7 @@
 	// array contains the entry_refs of the selected files. The last
 	// argument, "reserved", is currently unused.
 	
-	// This version of TrackerGrep is a Tracker add-on, but primarily
+	// This version of TextSearch is a Tracker add-on, but primarily
 	// it is a stand-alone application. The add-on launches the app
 	// on the set of files you had selected in Tracker. That way you
 	// get the benefits of the Tracker add-on with the benefits of the



From mmlr at mail.berlios.de  Sun Apr  5 15:19:34 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Sun, 5 Apr 2009 15:19:34 +0200
Subject: [Haiku-commits] r29933 -
	haiku/trunk/src/add-ons/kernel/bus_managers/usb
Message-ID: <200904051319.n35DJYfh016697@sheep.berlios.de>

Author: mmlr
Date: 2009-04-05 15:19:32 +0200 (Sun, 05 Apr 2009)
New Revision: 29933
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29933&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/usb/Hub.cpp
Log:
Fix search+replace error introduced with reworking debug output. This should
fix full/lowspeed devices behind high-speed hubs again.


Modified: haiku/trunk/src/add-ons/kernel/bus_managers/usb/Hub.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/usb/Hub.cpp	2009-04-05 13:08:42 UTC (rev 29932)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/usb/Hub.cpp	2009-04-05 13:19:32 UTC (rev 29933)
@@ -253,7 +253,7 @@
 				int8 hubAddress = HubAddress();
 				uint8 hubPort = HubPort();
 				if (Speed() == USB_SPEED_HIGHSPEED) {
-					hubAddress = USBID();
+					hubAddress = DeviceAddress();
 					hubPort = i + 1;
 				}
 



From axeld at mail.berlios.de  Sun Apr  5 15:30:32 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sun, 5 Apr 2009 15:30:32 +0200
Subject: [Haiku-commits] r29934 - haiku/trunk/src/preferences/keymap
Message-ID: <200904051330.n35DUVDb018922@sheep.berlios.de>

Author: axeld
Date: 2009-04-05 15:30:27 +0200 (Sun, 05 Apr 2009)
New Revision: 29934
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29934&view=rev

Modified:
   haiku/trunk/src/preferences/keymap/KeyboardLayout.cpp
Log:
* Made the 105 key international keyboard the default, since this is probably
  more helpful to most people than the 104 key one.


Modified: haiku/trunk/src/preferences/keymap/KeyboardLayout.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/KeyboardLayout.cpp	2009-04-05 13:19:32 UTC (rev 29933)
+++ haiku/trunk/src/preferences/keymap/KeyboardLayout.cpp	2009-04-05 13:30:27 UTC (rev 29934)
@@ -199,53 +199,53 @@
 
 	// See for examples in the default layout below.
 #if 1
-	static const char* kDefaultLayout104 = "name = Generic 104-key\n"
+	static const char* kDefaultLayout105 =
+		"name = Generic 105-key International\n"
 		// Size shortcuts
 		"default-size = 10,10\n"
 		"$b = 5,10\n"
 		"$c = 20,10\n"
 		"$d = 15,10\n"
-		"$enter = d20,10\n"
+		"$e = l15,20,9\n"
 		"$f = 10,20\n"
 		"$g = 13,10\n"
 		// Key rows
 		"[ 0,0; d:0x01; :-; :+4; $b:-; d:+4; $b:-; :+4; $b:-; d:+3; $b:-; "
 			"$g:led-num; $g:led-caps; $g:led-scroll ]\n"
 		"[ 0,20; :+13; d$c:+; $b:-; d:+3; $b:-; d:+4 ]\n"
-		"[ 0,30; d$d:0x26; :+12; $d:+1; $b:-; d:+3; $b:-; :+3; "
+		"[ 0,30; d$d:0x26; :+12; d$e:0x47; $b:-; d:0x34-0x36; $b:-; :+3; "
 			"d$f:+1 ]\n"
-		"[ 0,40; d$c:0x3b; :+11; $enter:+1; 40,10:-; :+3 ]\n"
-		"[ 0,50; d24,10:0x4b; :+10; d26,10:+1; 15,10:-; d:+1; "
+		"[ 0,40; d19,10:0x3b; :+11; :0x33; 51,10:-; :0x48-0x4a ]\n"
+		"[ 0,50; d$g:0x4b; :0x69; :0x4c+9; d27,10:+1; 15,10:-; d:+1; "
 		"	15,10:-; :+3; d$f:+1 ]\n"
 		"[ 0,60; d$g:0x5c; d$g:0x66; d$g:0x5d; 59,10:+1; d$g:+1; d$g:0x67+1; "
 			"d$g:0x60; $b:-; d:+3; $b:-; $c:+1; :+1 ]\n";
 
-	_InitFrom(kDefaultLayout104);
+	_InitFrom(kDefaultLayout105);
 #endif
 #if 0
-	static const char* kDefaultLayout105 =
-		"name = Generic 105-key International\n"
+	static const char* kDefaultLayout104 = "name = Generic 104-key\n"
 		// Size shortcuts
 		"default-size = 10,10\n"
 		"$b = 5,10\n"
 		"$c = 20,10\n"
 		"$d = 15,10\n"
-		"$e = l15,20,9\n"
+		"$enter = d20,10\n"
 		"$f = 10,20\n"
 		"$g = 13,10\n"
 		// Key rows
 		"[ 0,0; d:0x01; :-; :+4; $b:-; d:+4; $b:-; :+4; $b:-; d:+3; $b:-; "
 			"$g:led-num; $g:led-caps; $g:led-scroll ]\n"
 		"[ 0,20; :+13; d$c:+; $b:-; d:+3; $b:-; d:+4 ]\n"
-		"[ 0,30; d$d:0x26; :+12; d$e:0x47; $b:-; d:0x34-0x36; $b:-; :+3; "
+		"[ 0,30; d$d:0x26; :+12; $d:+1; $b:-; d:+3; $b:-; :+3; "
 			"d$f:+1 ]\n"
-		"[ 0,40; d19,10:0x3b; :+11; :0x33; 51,10:-; :0x48-0x4a ]\n"
-		"[ 0,50; d$g:0x4b; :0x69; :0x4c+9; d27,10:+1; 15,10:-; d:+1; "
+		"[ 0,40; d$c:0x3b; :+11; $enter:+1; 40,10:-; :+3 ]\n"
+		"[ 0,50; d24,10:0x4b; :+10; d26,10:+1; 15,10:-; d:+1; "
 		"	15,10:-; :+3; d$f:+1 ]\n"
 		"[ 0,60; d$g:0x5c; d$g:0x66; d$g:0x5d; 59,10:+1; d$g:+1; d$g:0x67+1; "
 			"d$g:0x60; $b:-; d:+3; $b:-; $c:+1; :+1 ]\n";
 
-	_InitFrom(kDefaultLayout105);
+	_InitFrom(kDefaultLayout104);
 #endif
 #if 0
 	static const char* kIBMLaptop = "name = IBM Laptop International\n"



From bonefish at mail.berlios.de  Sun Apr  5 15:49:07 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Sun, 5 Apr 2009 15:49:07 +0200
Subject: [Haiku-commits] r29935 -
	haiku/trunk/src/add-ons/input_server/filters/screen_saver
Message-ID: <200904051349.n35Dn7Co022700@sheep.berlios.de>

Author: bonefish
Date: 2009-04-05 15:49:05 +0200 (Sun, 05 Apr 2009)
New Revision: 29935
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29935&view=rev

Modified:
   haiku/trunk/src/add-ons/input_server/filters/screen_saver/ScreenSaverFilter.cpp
Log:
* On construction initialize fLastEventTime with the current system time.
  Otherwise when restarting the input server the screen blanker would start
  immediately.
* Automatic white space cleanup.


Modified: haiku/trunk/src/add-ons/input_server/filters/screen_saver/ScreenSaverFilter.cpp
===================================================================
--- haiku/trunk/src/add-ons/input_server/filters/screen_saver/ScreenSaverFilter.cpp	2009-04-05 13:30:27 UTC (rev 29934)
+++ haiku/trunk/src/add-ons/input_server/filters/screen_saver/ScreenSaverFilter.cpp	2009-04-05 13:49:05 UTC (rev 29935)
@@ -65,7 +65,7 @@
 		case B_SOME_APP_QUIT:
 		{
 			const char *signature;
-			if (message->FindString("be:signature", &signature) == B_OK 
+			if (message->FindString("be:signature", &signature) == B_OK
 				&& strcasecmp(signature, SCREEN_BLANKER_SIG) == 0) {
 				fFilter->SetEnabled(message->what == B_SOME_APP_LAUNCHED);
 			}
@@ -89,16 +89,16 @@
 //	#pragma mark -
 
 
-ScreenSaverFilter::ScreenSaverFilter() 
+ScreenSaverFilter::ScreenSaverFilter()
 	: BLocker("screen saver filter"),
-	fLastEventTime(0),
+	fLastEventTime(system_time()),
 	fBlankTime(0),
 	fSnoozeTime(0),
 	fCurrentCorner(NO_CORNER),
 	fFrameNum(0),
 	fRunner(NULL),
 	fCornerRunner(NULL),
-	fWatchingDirectory(false), 
+	fWatchingDirectory(false),
 	fWatchingFile(false),
 	fEnabled(false)
 {
@@ -237,7 +237,7 @@
 	BAutolock _(this);
 
 	bigtime_t now = system_time();
-	if (now >= fLastEventTime + fBlankTime)  
+	if (now >= fLastEventTime + fBlankTime)
 		_Invoke();
 
 	// TODO: this doesn't work correctly - since the BMessageRunner is not



From axeld at mail.berlios.de  Sun Apr  5 16:56:13 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sun, 5 Apr 2009 16:56:13 +0200
Subject: [Haiku-commits] r29936 - in haiku/trunk: build/jam data/etc
	data/system data/system/data data/system/data/Canna
	data/system/data/KeyboardLayouts data/system/data/joysticks
	data/system/data/licenses
Message-ID: <200904051456.n35EuD9R004769@sheep.berlios.de>

Author: axeld
Date: 2009-04-05 16:55:59 +0200 (Sun, 05 Apr 2009)
New Revision: 29936
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29936&view=rev

Added:
   haiku/trunk/data/system/data/
   haiku/trunk/data/system/data/Canna/
   haiku/trunk/data/system/data/Canna/default/
   haiku/trunk/data/system/data/Canna/dic/
   haiku/trunk/data/system/data/KeyboardLayouts/
   haiku/trunk/data/system/data/KeyboardLayouts/Generic 104-key
   haiku/trunk/data/system/data/KeyboardLayouts/Generic 105-key International
   haiku/trunk/data/system/data/KeyboardLayouts/IBM Laptop International
   haiku/trunk/data/system/data/joysticks/
   haiku/trunk/data/system/data/joysticks/Analog_2_Axes
   haiku/trunk/data/system/data/joysticks/Analog_3_Axes
   haiku/trunk/data/system/data/joysticks/Analog_4_Axes
   haiku/trunk/data/system/data/joysticks/Analog_Dual_2_Axes
   haiku/trunk/data/system/data/joysticks/Generic_USB_Joystick
   haiku/trunk/data/system/data/joysticks/Gravis_GamePad_Pro
   haiku/trunk/data/system/data/joysticks/Gravis_Xterminator
   haiku/trunk/data/system/data/joysticks/Logitech_CyberMan_2
   haiku/trunk/data/system/data/joysticks/Logitech_Precision_GamePad
   haiku/trunk/data/system/data/joysticks/Logitech_ThunderPad_Digital
   haiku/trunk/data/system/data/joysticks/Logitech_WingMan_Extreme_Digital
   haiku/trunk/data/system/data/joysticks/Logitech_WingMan_Interceptor
   haiku/trunk/data/system/data/joysticks/Microsoft_SideWinder_GamePad
   haiku/trunk/data/system/data/joysticks/Microsoft_SideWinder_PrecisionPro
   haiku/trunk/data/system/data/joysticks/ThrustMaster_Inceptor_Millennium_3D_Digital
   haiku/trunk/data/system/data/joysticks/ThrustMaster_Rage_3D_Digital
   haiku/trunk/data/system/data/licenses/
   haiku/trunk/data/system/data/licenses/Artistic
   haiku/trunk/data/system/data/licenses/Artistic (Perl)
   haiku/trunk/data/system/data/licenses/Artistic v2.0
   haiku/trunk/data/system/data/licenses/BSD (2-clause)
   haiku/trunk/data/system/data/licenses/BSD (3-clause)
   haiku/trunk/data/system/data/licenses/BSD (4-clause)
   haiku/trunk/data/system/data/licenses/GNU GPL v1
   haiku/trunk/data/system/data/licenses/GNU GPL v2
   haiku/trunk/data/system/data/licenses/GNU GPL v3
   haiku/trunk/data/system/data/licenses/GNU LGPL v2
   haiku/trunk/data/system/data/licenses/GNU LGPL v2.1
   haiku/trunk/data/system/data/licenses/LibHTTPd
   haiku/trunk/data/system/data/licenses/MIT
Removed:
   haiku/trunk/data/etc/KanBe/
   haiku/trunk/data/etc/joysticks/
   haiku/trunk/data/etc/licenses/
   haiku/trunk/data/system/data/Canna/default/
   haiku/trunk/data/system/data/Canna/dic/
   haiku/trunk/data/system/data/joysticks/Analog_2_Axes
   haiku/trunk/data/system/data/joysticks/Analog_3_Axes
   haiku/trunk/data/system/data/joysticks/Analog_4_Axes
   haiku/trunk/data/system/data/joysticks/Analog_Dual_2_Axes
   haiku/trunk/data/system/data/joysticks/Generic_USB_Joystick
   haiku/trunk/data/system/data/joysticks/Gravis_GamePad_Pro
   haiku/trunk/data/system/data/joysticks/Gravis_Xterminator
   haiku/trunk/data/system/data/joysticks/Logitech_CyberMan_2
   haiku/trunk/data/system/data/joysticks/Logitech_Precision_GamePad
   haiku/trunk/data/system/data/joysticks/Logitech_ThunderPad_Digital
   haiku/trunk/data/system/data/joysticks/Logitech_WingMan_Extreme_Digital
   haiku/trunk/data/system/data/joysticks/Logitech_WingMan_Interceptor
   haiku/trunk/data/system/data/joysticks/Microsoft_SideWinder_GamePad
   haiku/trunk/data/system/data/joysticks/Microsoft_SideWinder_PrecisionPro
   haiku/trunk/data/system/data/joysticks/ThrustMaster_Inceptor_Millennium_3D_Digital
   haiku/trunk/data/system/data/joysticks/ThrustMaster_Rage_3D_Digital
   haiku/trunk/data/system/data/licenses/Artistic
   haiku/trunk/data/system/data/licenses/Artistic (Perl)
   haiku/trunk/data/system/data/licenses/Artistic v2.0
   haiku/trunk/data/system/data/licenses/BSD (2-clause)
   haiku/trunk/data/system/data/licenses/BSD (3-clause)
   haiku/trunk/data/system/data/licenses/BSD (4-clause)
   haiku/trunk/data/system/data/licenses/GNU GPL v1
   haiku/trunk/data/system/data/licenses/GNU GPL v2
   haiku/trunk/data/system/data/licenses/GNU GPL v3
   haiku/trunk/data/system/data/licenses/GNU LGPL v2
   haiku/trunk/data/system/data/licenses/GNU LGPL v2.1
   haiku/trunk/data/system/data/licenses/MIT
Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
* Moved some stuff in data/etc/ to data/system/data because that's where
  they now end up in the image.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-05 13:49:05 UTC (rev 29935)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-05 14:55:59 UTC (rev 29936)
@@ -344,7 +344,7 @@
 AddFilesToHaikuImage system fonts psfonts : $(psFonts) ;
 AddFilesToHaikuImage system fonts ttfonts : $(ttFonts) ;
 
-local cannaDir = [ FDirName $(HAIKU_TOP) data etc KanBe ] ;
+local cannaDir = [ FDirName $(HAIKU_TOP) data system data Canna ] ;
 local cannaDefault = [ Glob $(cannaDir)/default : *.canna *.gz ] ;
 local cannaDic = [ Glob $(cannaDir)/dic : *.cbp ] ;
 local cannaDicCanna = [ Glob $(cannaDir)/dic/canna
@@ -484,7 +484,7 @@
 
 # licenses
 CopyDirectoryToHaikuImage system data
-	: [ FDirName $(HAIKU_TOP) data etc licenses ]
+	: [ FDirName $(HAIKU_TOP) data system data licenses ]
 	: licenses : -x .svn ;
 
 

Copied: haiku/trunk/data/system/data/Canna (from rev 29905, haiku/trunk/data/etc/KanBe)

Copied: haiku/trunk/data/system/data/Canna/default (from rev 29935, haiku/trunk/data/etc/KanBe/default)

Copied: haiku/trunk/data/system/data/Canna/dic (from rev 29935, haiku/trunk/data/etc/KanBe/dic)

Added: haiku/trunk/data/system/data/KeyboardLayouts/Generic 104-key
===================================================================
--- haiku/trunk/data/system/data/KeyboardLayouts/Generic 104-key	2009-04-05 13:49:05 UTC (rev 29935)
+++ haiku/trunk/data/system/data/KeyboardLayouts/Generic 104-key	2009-04-05 14:55:59 UTC (rev 29936)
@@ -0,0 +1,20 @@
+name = Generic 104-key
+
+# Size shortcuts
+default-size = 10,10
+$b = 5,10
+$c = 20,10
+$d = 15,10
+$enter = d20,10
+$f = 10,20
+$g = 13,10
+
+# Key rows
+[ 0,0; d:0x01; :-; :+4; $b:-; d:+4; $b:-; :+4; $b:-; d:+3; $b:-;
+	$g:led-num; $g:led-caps; $g:led-scroll ]
+[ 0,20; :+13; d$c:+; $b:-; d:+3; $b:-; d:+4 ]
+[ 0,30; d$d:0x26; :+12; $d:+1; $b:-; d:+3; $b:-; :+3; d$f:+1 ]
+[ 0,40; d$c:0x3b; :+11; $enter:+1; 40,10:-; :+3 ]
+[ 0,50; d24,10:0x4b; :+10; d26,10:+1; 15,10:-; d:+1; 15,10:-; :+3; d$f:+1 ]
+[ 0,60; d$g:0x5c; d$g:0x66; d$g:0x5d; 59,10:+1; d$g:+1; d$g:0x67+1;
+	d$g:0x60; $b:-; d:+3; $b:-; $c:+1; :+1 ]

Added: haiku/trunk/data/system/data/KeyboardLayouts/Generic 105-key International
===================================================================
--- haiku/trunk/data/system/data/KeyboardLayouts/Generic 105-key International	2009-04-05 13:49:05 UTC (rev 29935)
+++ haiku/trunk/data/system/data/KeyboardLayouts/Generic 105-key International	2009-04-05 14:55:59 UTC (rev 29936)
@@ -0,0 +1,22 @@
+name = Generic 105-key International
+
+# Size shortcuts
+default-size = 10,10
+$b = 5,10
+$c = 20,10
+$d = 15,10
+$e = l15,20,9
+$f = 10,20
+$g = 13,10
+
+# Key rows
+[ 0,0; d:0x01; :-; :+4; $b:-; d:+4; $b:-; :+4; $b:-; d:+3; $b:-; 
+	$g:led-num; $g:led-caps; $g:led-scroll ]
+[ 0,20; :+13; d$c:+; $b:-; d:+3; $b:-; d:+4 ]
+[ 0,30; d$d:0x26; :+12; d$e:0x47; $b:-; d:0x34-0x36; $b:-; :+3; 
+	d$f:+1 ]
+[ 0,40; d19,10:0x3b; :+11; :0x33; 51,10:-; :0x48-0x4a ]
+[ 0,50; d$g:0x4b; :0x69; :0x4c+9; d27,10:+1; 15,10:-; d:+1; 
+	15,10:-; :+3; d$f:+1 ]
+[ 0,60; d$g:0x5c; d$g:0x66; d$g:0x5d; 59,10:+1; d$g:+1; d$g:0x67+1; 
+	d$g:0x60; $b:-; d:+3; $b:-; $c:+1; :+1 ]

Added: haiku/trunk/data/system/data/KeyboardLayouts/IBM Laptop International
===================================================================
--- haiku/trunk/data/system/data/KeyboardLayouts/IBM Laptop International	2009-04-05 13:49:05 UTC (rev 29935)
+++ haiku/trunk/data/system/data/KeyboardLayouts/IBM Laptop International	2009-04-05 14:55:59 UTC (rev 29936)
@@ -0,0 +1,26 @@
+name = IBM Laptop International
+
+# Size shortcuts
+default-size = 18,18
+$s = 17,10
+$gap = 6,10
+$sgap = 5,10
+$backspace = 38,18
+$tab = 28,18
+$caps = 32,18
+$enter = l28,36,22
+$l-shift-ctrl = 23,18
+$r-shift = 51,18
+$option = 13,18
+$space = 95,18
+
+# Key rows
+[ 0,0; $s:0x01; 148,10:-; $s:0x0e+2; $sgap:-; $s:0x1f+2; ]
+[ 0,10; $s:0x02+3; $gap:-; $s:+4; $gap:-; $s:+4; $sgap:-; $s:0x34+2; ]
+[ 0,20; :0x11+12; $backspace:+1 ]
+[ 0,38; $tab:0x26; :+12; $enter:0x47; ]
+[ 0,56; $caps:0x3b; :+11; :0x33 ]
+[ 0,74; $l-shift-ctrl:0x4b; :0x69; :0x4c+9; $r-shift:+1 ]
+[ 0,92; :0x99; $l-shift-ctrl:0x5c; $option:0x66; :0x5d; $space:+1;
+	:+1; :0x68; :0x60; $s:0x9a; $s:0x57; $s:0x9b ]
+[ 221,102; $s:0x61+2; ]

Copied: haiku/trunk/data/system/data/joysticks (from rev 29905, haiku/trunk/data/etc/joysticks)

Deleted: haiku/trunk/data/system/data/joysticks/Analog_2_Axes

Copied: haiku/trunk/data/system/data/joysticks/Analog_2_Axes (from rev 29935, haiku/trunk/data/etc/joysticks/Analog_2_Axes)

Deleted: haiku/trunk/data/system/data/joysticks/Analog_3_Axes

Copied: haiku/trunk/data/system/data/joysticks/Analog_3_Axes (from rev 29935, haiku/trunk/data/etc/joysticks/Analog_3_Axes)

Deleted: haiku/trunk/data/system/data/joysticks/Analog_4_Axes

Copied: haiku/trunk/data/system/data/joysticks/Analog_4_Axes (from rev 29935, haiku/trunk/data/etc/joysticks/Analog_4_Axes)

Deleted: haiku/trunk/data/system/data/joysticks/Analog_Dual_2_Axes

Copied: haiku/trunk/data/system/data/joysticks/Analog_Dual_2_Axes (from rev 29935, haiku/trunk/data/etc/joysticks/Analog_Dual_2_Axes)

Deleted: haiku/trunk/data/system/data/joysticks/Generic_USB_Joystick

Copied: haiku/trunk/data/system/data/joysticks/Generic_USB_Joystick (from rev 29935, haiku/trunk/data/etc/joysticks/Generic_USB_Joystick)

Deleted: haiku/trunk/data/system/data/joysticks/Gravis_GamePad_Pro

Copied: haiku/trunk/data/system/data/joysticks/Gravis_GamePad_Pro (from rev 29935, haiku/trunk/data/etc/joysticks/Gravis_GamePad_Pro)

Deleted: haiku/trunk/data/system/data/joysticks/Gravis_Xterminator

Copied: haiku/trunk/data/system/data/joysticks/Gravis_Xterminator (from rev 29935, haiku/trunk/data/etc/joysticks/Gravis_Xterminator)

Deleted: haiku/trunk/data/system/data/joysticks/Logitech_CyberMan_2

Copied: haiku/trunk/data/system/data/joysticks/Logitech_CyberMan_2 (from rev 29935, haiku/trunk/data/etc/joysticks/Logitech_CyberMan_2)

Deleted: haiku/trunk/data/system/data/joysticks/Logitech_Precision_GamePad

Copied: haiku/trunk/data/system/data/joysticks/Logitech_Precision_GamePad (from rev 29935, haiku/trunk/data/etc/joysticks/Logitech_Precision_GamePad)

Deleted: haiku/trunk/data/system/data/joysticks/Logitech_ThunderPad_Digital

Copied: haiku/trunk/data/system/data/joysticks/Logitech_ThunderPad_Digital (from rev 29935, haiku/trunk/data/etc/joysticks/Logitech_ThunderPad_Digital)

Deleted: haiku/trunk/data/system/data/joysticks/Logitech_WingMan_Extreme_Digital

Copied: haiku/trunk/data/system/data/joysticks/Logitech_WingMan_Extreme_Digital (from rev 29935, haiku/trunk/data/etc/joysticks/Logitech_WingMan_Extreme_Digital)

Deleted: haiku/trunk/data/system/data/joysticks/Logitech_WingMan_Interceptor

Copied: haiku/trunk/data/system/data/joysticks/Logitech_WingMan_Interceptor (from rev 29935, haiku/trunk/data/etc/joysticks/Logitech_WingMan_Interceptor)

Deleted: haiku/trunk/data/system/data/joysticks/Microsoft_SideWinder_GamePad

Copied: haiku/trunk/data/system/data/joysticks/Microsoft_SideWinder_GamePad (from rev 29935, haiku/trunk/data/etc/joysticks/Microsoft_SideWinder_GamePad)

Deleted: haiku/trunk/data/system/data/joysticks/Microsoft_SideWinder_PrecisionPro

Copied: haiku/trunk/data/system/data/joysticks/Microsoft_SideWinder_PrecisionPro (from rev 29935, haiku/trunk/data/etc/joysticks/Microsoft_SideWinder_PrecisionPro)

Deleted: haiku/trunk/data/system/data/joysticks/ThrustMaster_Inceptor_Millennium_3D_Digital

Copied: haiku/trunk/data/system/data/joysticks/ThrustMaster_Inceptor_Millennium_3D_Digital (from rev 29935, haiku/trunk/data/etc/joysticks/ThrustMaster_Inceptor_Millennium_3D_Digital)

Deleted: haiku/trunk/data/system/data/joysticks/ThrustMaster_Rage_3D_Digital

Copied: haiku/trunk/data/system/data/joysticks/ThrustMaster_Rage_3D_Digital (from rev 29935, haiku/trunk/data/etc/joysticks/ThrustMaster_Rage_3D_Digital)

Copied: haiku/trunk/data/system/data/licenses (from rev 29905, haiku/trunk/data/etc/licenses)

Deleted: haiku/trunk/data/system/data/licenses/Artistic

Copied: haiku/trunk/data/system/data/licenses/Artistic (from rev 29935, haiku/trunk/data/etc/licenses/Artistic)

Deleted: haiku/trunk/data/system/data/licenses/Artistic (Perl)

Copied: haiku/trunk/data/system/data/licenses/Artistic (Perl) (from rev 29935, haiku/trunk/data/etc/licenses/Artistic (Perl))

Deleted: haiku/trunk/data/system/data/licenses/Artistic v2.0

Copied: haiku/trunk/data/system/data/licenses/Artistic v2.0 (from rev 29935, haiku/trunk/data/etc/licenses/Artistic v2.0)

Deleted: haiku/trunk/data/system/data/licenses/BSD (2-clause)

Copied: haiku/trunk/data/system/data/licenses/BSD (2-clause) (from rev 29935, haiku/trunk/data/etc/licenses/BSD (2-clause))

Deleted: haiku/trunk/data/system/data/licenses/BSD (3-clause)

Copied: haiku/trunk/data/system/data/licenses/BSD (3-clause) (from rev 29935, haiku/trunk/data/etc/licenses/BSD (3-clause))

Deleted: haiku/trunk/data/system/data/licenses/BSD (4-clause)

Copied: haiku/trunk/data/system/data/licenses/BSD (4-clause) (from rev 29935, haiku/trunk/data/etc/licenses/BSD (4-clause))

Deleted: haiku/trunk/data/system/data/licenses/GNU GPL v1

Copied: haiku/trunk/data/system/data/licenses/GNU GPL v1 (from rev 29935, haiku/trunk/data/etc/licenses/GNU GPL v1)

Deleted: haiku/trunk/data/system/data/licenses/GNU GPL v2

Copied: haiku/trunk/data/system/data/licenses/GNU GPL v2 (from rev 29935, haiku/trunk/data/etc/licenses/GNU GPL v2)

Deleted: haiku/trunk/data/system/data/licenses/GNU GPL v3

Copied: haiku/trunk/data/system/data/licenses/GNU GPL v3 (from rev 29935, haiku/trunk/data/etc/licenses/GNU GPL v3)

Deleted: haiku/trunk/data/system/data/licenses/GNU LGPL v2

Copied: haiku/trunk/data/system/data/licenses/GNU LGPL v2 (from rev 29935, haiku/trunk/data/etc/licenses/GNU LGPL v2)

Deleted: haiku/trunk/data/system/data/licenses/GNU LGPL v2.1

Copied: haiku/trunk/data/system/data/licenses/GNU LGPL v2.1 (from rev 29935, haiku/trunk/data/etc/licenses/GNU LGPL v2.1)

Copied: haiku/trunk/data/system/data/licenses/LibHTTPd (from rev 29935, haiku/trunk/data/etc/licenses/LibHTTPd)

Deleted: haiku/trunk/data/system/data/licenses/MIT

Copied: haiku/trunk/data/system/data/licenses/MIT (from rev 29935, haiku/trunk/data/etc/licenses/MIT)



From stippi at mail.berlios.de  Sun Apr  5 16:59:51 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sun, 5 Apr 2009 16:59:51 +0200
Subject: [Haiku-commits] r29937 - in haiku/trunk: headers/private/interface
	src/kits/interface src/servers/app src/servers/app/drawing
Message-ID: <200904051459.n35ExpcT005548@sheep.berlios.de>

Author: stippi
Date: 2009-04-05 16:59:43 +0200 (Sun, 05 Apr 2009)
New Revision: 29937
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29937&view=rev

Modified:
   haiku/trunk/headers/private/interface/ViewPrivate.h
   haiku/trunk/src/kits/interface/View.cpp
   haiku/trunk/src/servers/app/DrawState.cpp
   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/PatternHandler.h
Log:
Begun to use structs for the BView<->app_server communication. This makes
the protocoll less prone to errors, reduces possible points of failure and
most importantly, reduces the number of function calls to the link API.
I only know the numbers for StrokeLine(), which I tested via the Benchmark
test app. With this change, drawing random colored and positioned lines
actually doubled in speed. On the BView side, the calls to
ServerLink::Attach() only halfed, while on the app_server side, the number
of calls to ServerLink::Read() is now 1/4th. It will also be worth
investigating why the link stuff is so slow at all. I also optimized
BView::DrawString() a lot in this change, but I don't have any numbers
yet. Some other commands which used multiple Attach()/Read() calls were
also optimized, at least the most important ones. Begin/EndLineArray() was
also pretty bad on the app_server side. 


Modified: haiku/trunk/headers/private/interface/ViewPrivate.h
===================================================================
--- haiku/trunk/headers/private/interface/ViewPrivate.h	2009-04-05 14:55:59 UTC (rev 29936)
+++ haiku/trunk/headers/private/interface/ViewPrivate.h	2009-04-05 14:59:43 UTC (rev 29937)
@@ -15,6 +15,7 @@
 #include <Point.h>
 #include <Rect.h>
 #include <Region.h>
+#include <ServerProtocolStructs.h>
 
 const static uint32 kDeleteReplicant = 'JAHA';
 
@@ -121,21 +122,13 @@
 
 }	// namespace BPrivate
 
-struct _array_hdr_{
-	float			startX;
-	float			startY;
-	float			endX;
-	float			endY;
-	rgb_color		color;
-};
-
 struct _array_data_{
 		// the max number of points in the array
-	uint32			maxCount;
+	uint32				maxCount;
 		// the current number of points in the array
-	uint32			count;
+	uint32				count;
 		// the array of points
-	_array_hdr_*	array;
+	ViewLineArrayInfo*	array;
 };
 
 #endif	/* VIEW_PRIVATE_H */

Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2009-04-05 14:55:59 UTC (rev 29936)
+++ haiku/trunk/src/kits/interface/View.cpp	2009-04-05 14:59:43 UTC (rev 29937)
@@ -51,6 +51,7 @@
 #include <MessageUtils.h>
 #include <PortLink.h>
 #include <ServerProtocol.h>
+#include <ServerProtocolStructs.h>
 #include <ShapePrivate.h>
 #include <TokenSpace.h>
 #include <ViewPrivate.h>
@@ -216,22 +217,27 @@
 	UpdateServerFontState(link);
 
 	link.StartMessage(AS_VIEW_SET_STATE);
-	link.Attach<BPoint>(pen_location);
-	link.Attach<float>(pen_size);
-	link.Attach<rgb_color>(high_color);
-	link.Attach<rgb_color>(low_color);
-	link.Attach< ::pattern>(pattern);
-	link.Attach<int8>((int8)drawing_mode);
-	link.Attach<BPoint>(origin);
-	link.Attach<int8>((int8)line_join);
-	link.Attach<int8>((int8)line_cap);
-	link.Attach<float>(miter_limit);
-	link.Attach<int8>((int8)alpha_source_mode);
-	link.Attach<int8>((int8)alpha_function_mode);
-	link.Attach<float>(scale);
-	link.Attach<bool>(font_aliasing);
 
+	ViewSetStateInfo info;
+	info.penLocation = pen_location;
+	info.penSize = pen_size;
+	info.highColor = high_color;
+	info.lowColor = low_color;
+	info.pattern = pattern;
+	info.drawingMode = drawing_mode;
+	info.origin = origin;
+	info.scale = scale;
+	info.lineJoin = line_join;
+	info.lineCap = line_cap;
+	info.miterLimit = miter_limit;
+	info.alphaSourceMode = alpha_source_mode;
+	info.alphaFunctionMode = alpha_function_mode;
+	info.fontAntialiasing = font_aliasing;
+	link.Attach<ViewSetStateInfo>(info);
+
 	// we send the 'local' clipping region... if we have one...
+	// TODO: Could be optimized, but is low prio, since most views won't
+	// have a custom clipping region.
 	if (clipping_region_used) {
 		int32 count = clipping_region.CountRects();
 		link.Attach<int32>(count);
@@ -260,58 +266,37 @@
 		|| code != B_OK)
 		return;
 
-	uint32 fontID;
-	float size;
-	float shear;
-	float rotation;
-	float falseBoldeWidth;
-	uint8 spacing;
-	uint8 encoding;
-	uint16 face;
-	uint32 flags;
+	ViewGetStateInfo info;
+	link.Read<ViewGetStateInfo>(&info);
 
-	// read and set the font state
-	link.Read<int32>((int32 *)&fontID);
-	link.Read<float>(&size);
-	link.Read<float>(&shear);
-	link.Read<float>(&rotation);
-	link.Read<float>(&falseBoldeWidth);
-	link.Read<int8>((int8 *)&spacing);
-	link.Read<int8>((int8 *)&encoding);
-	link.Read<int16>((int16 *)&face);
-	link.Read<int32>((int32 *)&flags);
-
+	// set view's font state
 	font_flags = B_FONT_ALL;
-	font.SetFamilyAndStyle(fontID);
-	font.SetSize(size);
-	font.SetShear(shear);
-	font.SetRotation(rotation);
-	font.SetFalseBoldWidth(falseBoldeWidth);
-	font.SetSpacing(spacing);
-	font.SetEncoding(encoding);
-	font.SetFace(face);
-	font.SetFlags(flags);
+	font.SetFamilyAndStyle(info.fontID);
+	font.SetSize(info.fontSize);
+	font.SetShear(info.fontShear);
+	font.SetRotation(info.fontRotation);
+	font.SetFalseBoldWidth(info.fontFalseBoldWidth);
+	font.SetSpacing(info.fontSpacing);
+	font.SetEncoding(info.fontEncoding);
+	font.SetFace(info.fontFace);
+	font.SetFlags(info.fontFlags);
 
-	// read and set view's state
-	link.Read<BPoint>(&pen_location);
-	link.Read<float>(&pen_size);
-	link.Read<rgb_color>(&high_color);
-	link.Read<rgb_color>(&low_color);
-	link.Read< ::pattern>(&pattern);
-	link.Read<BPoint>(&origin);
+	// set view's state
+	pen_location = info.viewStateInfo.penLocation;
+	pen_size = info.viewStateInfo.penSize;
+	high_color = info.viewStateInfo.highColor;
+	low_color = info.viewStateInfo.lowColor;
+	pattern = info.viewStateInfo.pattern;
+	drawing_mode = info.viewStateInfo.drawingMode;
+	origin = info.viewStateInfo.origin;
+	scale = info.viewStateInfo.scale;
+	line_join = info.viewStateInfo.lineJoin;
+	line_cap = info.viewStateInfo.lineCap;
+	miter_limit = info.viewStateInfo.miterLimit;
+	alpha_source_mode = info.viewStateInfo.alphaSourceMode;
+	alpha_function_mode = info.viewStateInfo.alphaFunctionMode;
+	font_aliasing = info.viewStateInfo.fontAntialiasing;
 
-	int8 drawingMode;
-	link.Read<int8>((int8 *)&drawingMode);
-	drawing_mode = (::drawing_mode)drawingMode;
-
-	link.Read<int8>((int8 *)&line_cap);
-	link.Read<int8>((int8 *)&line_join);
-	link.Read<float>(&miter_limit);
-	link.Read<int8>((int8 *)&alpha_source_mode);
-	link.Read<int8>((int8 *)&alpha_function_mode);
-	link.Read<float>(&scale);
-	link.Read<bool>(&font_aliasing);
-
 	// read the user clipping
 	// (that's NOT the current View visible clipping but the additional
 	// user specified clipping!)
@@ -796,6 +781,7 @@
 	fParent->_ConvertFromScreen(pt, false);
 }
 
+
 void
 BView::ConvertFromScreen(BPoint *pt) const
 {
@@ -1017,8 +1003,10 @@
 	_CheckLockAndSwitchCurrent();
 
 	fOwner->fLink->StartMessage(AS_VIEW_SET_CURSOR);
-	fOwner->fLink->Attach<int32>(cursor->fServerToken);
-	fOwner->fLink->Attach<bool>(sync);
+	ViewSetViewCursorInfo info;
+	info.cursorToken = cursor->fServerToken;
+	info.sync = sync;
+	fOwner->fLink->Attach<ViewSetViewCursorInfo>(info);
 
 	if (!sync) {
 		cursor->fPendingViewCursor = true;
@@ -1781,10 +1769,13 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
+		ViewSetLineModeInfo info;
+		info.lineJoin = lineJoin;
+		info.lineCap = lineCap;
+		info.miterLimit = miterLimit;
+
 		fOwner->fLink->StartMessage(AS_VIEW_SET_LINE_MODE);
-		fOwner->fLink->Attach<int8>((int8)lineCap);
-		fOwner->fLink->Attach<int8>((int8)lineJoin);
-		fOwner->fLink->Attach<float>(miterLimit);
+		fOwner->fLink->Attach<ViewSetLineModeInfo>(info);
 
 		fState->valid_flags |= B_VIEW_LINE_MODES_BIT;
 	}
@@ -1830,13 +1821,13 @@
 		int32 code;
 		if (fOwner->fLink->FlushWithReply(code) == B_OK
 			&& code == B_OK) {
-			int8 cap, join;
-			fOwner->fLink->Read<int8>((int8 *)&cap);
-			fOwner->fLink->Read<int8>((int8 *)&join);
-			fOwner->fLink->Read<float>(&fState->miter_limit);
 
-			fState->line_cap = (cap_mode)cap;
-			fState->line_join = (join_mode)join;
+			ViewSetLineModeInfo info;
+			fOwner->fLink->Read<ViewSetLineModeInfo>(&info);
+
+			fState->line_cap = info.lineCap;
+			fState->line_join = info.lineJoin;
+			fState->miter_limit = info.miterLimit;
 		}
 
 		fState->valid_flags |= B_VIEW_LINE_MODES_BIT;
@@ -1901,9 +1892,12 @@
 	if (fOwner) {
 		_CheckLockAndSwitchCurrent();
 
+		ViewBlendingModeInfo info;
+		info.sourceAlpha = sourceAlpha;
+		info.alphaFunction = alphaFunction;
+
 		fOwner->fLink->StartMessage(AS_VIEW_SET_BLENDING_MODE);
-		fOwner->fLink->Attach<int8>((int8)sourceAlpha);
-		fOwner->fLink->Attach<int8>((int8)alphaFunction);
+		fOwner->fLink->Attach<ViewBlendingModeInfo>(info);
 
 		fState->valid_flags |= B_VIEW_BLENDING_BIT;
 	}
@@ -1926,12 +1920,11 @@
 
 		int32 code;
  		if (fOwner->fLink->FlushWithReply(code) == B_OK && code == B_OK) {
-			int8 alphaSourceMode, alphaFunctionMode;
-			fOwner->fLink->Read<int8>(&alphaSourceMode);
-			fOwner->fLink->Read<int8>(&alphaFunctionMode);
+ 			ViewBlendingModeInfo info;
+			fOwner->fLink->Read<ViewBlendingModeInfo>(&info);
 
-			fState->alpha_source_mode = (source_alpha)alphaSourceMode;
-			fState->alpha_function_mode = (alpha_function)alphaFunctionMode;
+			fState->alpha_source_mode = info.sourceAlpha;
+			fState->alpha_function_mode = info.alphaFunction;
 
 			fState->valid_flags |= B_VIEW_BLENDING_BIT;
 		}
@@ -1963,8 +1956,7 @@
 		_CheckLockAndSwitchCurrent();
 
 		fOwner->fLink->StartMessage(AS_VIEW_SET_PEN_LOC);
-		fOwner->fLink->Attach<float>(x);
-		fOwner->fLink->Attach<float>(y);
+		fOwner->fLink->Attach<BPoint>(BPoint(x, y));
 
 		fState->valid_flags |= B_VIEW_PEN_LOCATION_BIT;
 	}
@@ -2387,11 +2379,14 @@
 
 	_CheckLockAndSwitchCurrent();
 
+	ViewDrawBitmapInfo info;
+	info.bitmapToken = bitmap->_ServerToken();
+	info.options = options;
+	info.viewRect = viewRect;
+	info.bitmapRect = bitmapRect;
+
 	fOwner->fLink->StartMessage(AS_VIEW_DRAW_BITMAP);
-	fOwner->fLink->Attach<int32>(bitmap->_ServerToken());
-	fOwner->fLink->Attach<uint32>(options);
-	fOwner->fLink->Attach<BRect>(viewRect);
-	fOwner->fLink->Attach<BRect>(bitmapRect);
+	fOwner->fLink->Attach<ViewDrawBitmapInfo>(info);
 
 	_FlushIfNotInTransaction();
 }
@@ -2422,15 +2417,14 @@
 
 	_CheckLockAndSwitchCurrent();
 
-	BRect bitmapRect = bitmap->Bounds().OffsetToCopy(B_ORIGIN);
-	BRect viewRect = bitmapRect.OffsetToCopy(where);
-	uint32 options = 0;
+	ViewDrawBitmapInfo info;
+	info.bitmapToken = bitmap->_ServerToken();
+	info.options = 0;
+	info.bitmapRect = bitmap->Bounds().OffsetToCopy(B_ORIGIN);
+	info.viewRect = info.bitmapRect.OffsetToCopy(where);
 
 	fOwner->fLink->StartMessage(AS_VIEW_DRAW_BITMAP);
-	fOwner->fLink->Attach<int32>(bitmap->_ServerToken());
-	fOwner->fLink->Attach<uint32>(options);
-	fOwner->fLink->Attach<BRect>(viewRect);
-	fOwner->fLink->Attach<BRect>(bitmapRect);
+	fOwner->fLink->Attach<ViewDrawBitmapInfo>(info);
 
 	_FlushIfNotInTransaction();
 }
@@ -2533,33 +2527,33 @@
 
 
 void
-BView::DrawString(const char *string, int32 length, BPoint location,
-	escapement_delta *delta)
+BView::DrawString(const char* string, int32 length, BPoint location,
+	escapement_delta* delta)
 {
-	if (string == NULL || length < 1)
+	if (fOwner == NULL || string == NULL || length < 1)
 		return;
 
-	if (fOwner) {
-		_CheckLockAndSwitchCurrent();
+	_CheckLockAndSwitchCurrent();
 
-		// 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);
+	ViewDrawStringInfo info;
+	info.stringLength = length;
+	info.location = location;
+	if (delta != NULL)
+		info.delta = *delta;
 
-		if (delta)
-			fOwner->fLink->Attach<escapement_delta>(*delta);
+	// 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->AttachString(string, length);
+	fOwner->fLink->Attach<ViewDrawStringInfo>(info);
+	fOwner->fLink->Attach(string, length);
 
-		_FlushIfNotInTransaction();
+	_FlushIfNotInTransaction();
 
-		// this modifies our pen location, so we invalidate the flag.
-		fState->valid_flags &= ~B_VIEW_PEN_LOCATION_BIT;
-	}
+	// this modifies our pen location, so we invalidate the flag.
+	fState->valid_flags &= ~B_VIEW_PEN_LOCATION_BIT;
 }
 
 
@@ -3277,9 +3271,12 @@
 	_CheckLockAndSwitchCurrent();
 	_UpdatePattern(pattern);
 
+	ViewStrokeLineInfo info;
+	info.startPoint = pt0;
+	info.endPoint = pt1;
+
 	fOwner->fLink->StartMessage(AS_STROKE_LINE);
-	fOwner->fLink->Attach<BPoint>(pt0);
-	fOwner->fLink->Attach<BPoint>(pt1);
+	fOwner->fLink->Attach<ViewStrokeLineInfo>(info);
 
 	_FlushIfNotInTransaction();
 
@@ -3386,7 +3383,7 @@
 	fCommArray = new _array_data_;
 	fCommArray->maxCount = count;
 	fCommArray->count = 0;
-	fCommArray->array = new _array_hdr_[count];
+	fCommArray->array = new ViewLineArrayInfo[count];
 }
 
 
@@ -3403,10 +3400,8 @@
 
 	const uint32 &arrayCount = fCommArray->count;
 	if (arrayCount < fCommArray->maxCount) {
-		fCommArray->array[arrayCount].startX = pt0.x;
-		fCommArray->array[arrayCount].startY = pt0.y;
-		fCommArray->array[arrayCount].endX = pt1.x;
-		fCommArray->array[arrayCount].endY = pt1.y;
+		fCommArray->array[arrayCount].startPoint = pt0;
+		fCommArray->array[arrayCount].endPoint = pt1;
 		fCommArray->array[arrayCount].color = col;
 
 		fCommArray->count++;
@@ -3420,7 +3415,7 @@
 	if (fOwner == NULL)
 		return;
 
-	if (!fCommArray)
+	if (fCommArray == NULL)
 		debugger("Can't call EndLineArray before BeginLineArray");
 
 	_CheckLockAndSwitchCurrent();
@@ -3428,7 +3423,7 @@
 	fOwner->fLink->StartMessage(AS_STROKE_LINEARRAY);
 	fOwner->fLink->Attach<int32>(fCommArray->count);
 	fOwner->fLink->Attach(fCommArray->array,
-			fCommArray->count * sizeof(_array_hdr_));
+		fCommArray->count * sizeof(ViewLineArrayInfo));
 
 	_FlushIfNotInTransaction();
 

Modified: haiku/trunk/src/servers/app/DrawState.cpp
===================================================================
--- haiku/trunk/src/servers/app/DrawState.cpp	2009-04-05 14:55:59 UTC (rev 29936)
+++ haiku/trunk/src/servers/app/DrawState.cpp	2009-04-05 14:59:43 UTC (rev 29937)
@@ -12,6 +12,7 @@
 
 //!	Data classes for working with BView states and draw parameters
 
+#include "DrawState.h"
 
 #include <new>
 #include <stdio.h>
@@ -20,8 +21,8 @@
 
 #include "LinkReceiver.h"
 #include "LinkSender.h"
+#include "ServerProtocolStructs.h"
 
-#include "DrawState.h"
 
 using std::nothrow;
 
@@ -183,24 +184,24 @@
 void
 DrawState::ReadFromLink(BPrivate::LinkReceiver& link)
 {
-	rgb_color highColor;
-	rgb_color lowColor;
-	pattern patt;
+	ViewSetStateInfo info;
 
-	link.Read<BPoint>(&fPenLocation);
-	link.Read<float>(&fPenSize);
-	link.Read(&highColor, sizeof(rgb_color));
-	link.Read(&lowColor, sizeof(rgb_color));
-	link.Read(&patt, sizeof(pattern));
-	link.Read<int8>((int8*)&fDrawingMode);
-	link.Read<BPoint>(&fOrigin);
-	link.Read<int8>((int8*)&fLineJoinMode);
-	link.Read<int8>((int8*)&fLineCapMode);
-	link.Read<float>(&fMiterLimit);
-	link.Read<int8>((int8*)&fAlphaSrcMode);
-	link.Read<int8>((int8*)&fAlphaFncMode);
-	link.Read<float>(&fScale);
-	link.Read<bool>(&fFontAliasing);
+	link.Read<ViewSetStateInfo>(&info);
+	
+	fPenLocation = info.penLocation;
+	fPenSize = info.penSize;
+	fHighColor = info.highColor;
+	fLowColor = info.lowColor;
+	fPattern = info.pattern;
+	fDrawingMode = info.drawingMode;
+	fOrigin = info.origin;
+	fScale = info.scale;
+	fLineJoinMode = info.lineJoin;
+	fLineCapMode = info.lineCap;
+	fMiterLimit = info.miterLimit;
+	fAlphaSrcMode = info.alphaSourceMode;
+	fAlphaFncMode = info.alphaFunctionMode;
+	fFontAliasing = info.fontAntialiasing;
 
 	if (fPreviousState) {
 		fCombinedOrigin = fPreviousState->fCombinedOrigin + fOrigin;
@@ -210,11 +211,10 @@
 		fCombinedScale = fScale;
 	}
 
-	fHighColor = highColor;
-	fLowColor = lowColor;
-	fPattern = patt;
 
 	// read clipping
+	// TODO: This could be optimized, but the user clipping regions are rarely
+	// used, so it's low priority...
 	int32 clipRectCount;
 	link.Read<int32>(&clipRectCount);
 
@@ -237,33 +237,39 @@
 DrawState::WriteToLink(BPrivate::LinkSender& link) const
 {
 	// Attach font state
-	link.Attach<uint32>(fFont.GetFamilyAndStyle());
-	link.Attach<float>(fFont.Size());
-	link.Attach<float>(fFont.Shear());
-	link.Attach<float>(fFont.Rotation());
-	link.Attach<float>(fFont.FalseBoldWidth());
-	link.Attach<uint8>(fFont.Spacing());
-	link.Attach<uint8>(fFont.Encoding());
-	link.Attach<uint16>(fFont.Face());
-	link.Attach<uint32>(fFont.Flags());
+	ViewGetStateInfo info;
+	info.fontID = fFont.GetFamilyAndStyle();
+	info.fontSize = fFont.Size();
+	info.fontShear = fFont.Shear();
+	info.fontRotation = fFont.Rotation();
+	info.fontFalseBoldWidth = fFont.FalseBoldWidth();
+	info.fontSpacing = fFont.Spacing();
+	info.fontEncoding = fFont.Encoding();
+	info.fontFace = fFont.Face();
+	info.fontFlags = fFont.Flags();
 
 	// Attach view state
-	link.Attach<BPoint>(fPenLocation);
-	link.Attach<float>(fPenSize);
-	link.Attach<rgb_color>(fHighColor);
-	link.Attach<rgb_color>(fLowColor);
-	link.Attach<uint64>(fPattern.GetInt64());
-	link.Attach<BPoint>(fOrigin);
-	link.Attach<uint8>((uint8)fDrawingMode);
-	link.Attach<uint8>((uint8)fLineCapMode);
-	link.Attach<uint8>((uint8)fLineJoinMode);
-	link.Attach<float>(fMiterLimit);
-	link.Attach<uint8>((uint8)fAlphaSrcMode);
-	link.Attach<uint8>((uint8)fAlphaFncMode);
-	link.Attach<float>(fScale);
-	link.Attach<bool>(fFontAliasing);
+	info.viewStateInfo.penLocation = fPenLocation;
+	info.viewStateInfo.penSize = fPenSize;
+	info.viewStateInfo.highColor = fHighColor;
+	info.viewStateInfo.lowColor = fLowColor;
+	info.viewStateInfo.pattern = (::pattern)fPattern.GetPattern();
+	info.viewStateInfo.drawingMode = fDrawingMode;
+	info.viewStateInfo.origin = fOrigin;
+	info.viewStateInfo.scale = fScale;
+	info.viewStateInfo.lineJoin = fLineJoinMode;
+	info.viewStateInfo.lineCap = fLineCapMode;
+	info.viewStateInfo.miterLimit = fMiterLimit;
+	info.viewStateInfo.alphaSourceMode = fAlphaSrcMode;
+	info.viewStateInfo.alphaFunctionMode = fAlphaFncMode;
+	info.viewStateInfo.fontAntialiasing = fFontAliasing;
 
 
+	link.Attach<ViewGetStateInfo>(info);
+
+
+	// TODO: Could be optimized, but is low prio, since most views do not
+	// use a custom clipping region...
 	if (fClippingRegion) {
 		int32 clippingRectCount = fClippingRegion->CountRects();
 		link.Attach<int32>(clippingRectCount);

Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2009-04-05 14:55:59 UTC (rev 29936)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2009-04-05 14:59:43 UTC (rev 29937)
@@ -43,6 +43,7 @@
 #include <DirectWindowPrivate.h>
 #include <MessagePrivate.h>
 #include <PortLink.h>
+#include <ServerProtocolStructs.h>
 #include <ViewPrivate.h>
 #include <WindowInfo.h>
 #include <WindowPrivate.h>
@@ -1545,17 +1546,15 @@
 			DTRACE(("ServerWindow %s: Message AS_VIEW_CURSOR: View: %s\n",
 				Title(), fCurrentView->Name()));
 
-			int32 token;
-			bool sync;
-			link.Read<int32>(&token);
-			if (link.Read<bool>(&sync) != B_OK)
+			ViewSetViewCursorInfo info;
+			if (link.Read<ViewSetViewCursorInfo>(&info) != B_OK)
 				break;
 
 			if (!fDesktop->GetCursorManager().Lock())
 				break;
 
 			ServerCursor* cursor
-				= fDesktop->GetCursorManager().FindCursor(token);
+				= fDesktop->GetCursorManager().FindCursor(info.cursorToken);
 			fCurrentView->SetCursor(cursor);
 
 			fDesktop->GetCursorManager().Unlock();
@@ -1565,7 +1564,7 @@
 				if (fDesktop->ViewUnderMouse(fWindow) == fCurrentView->Token())
 					fServerApp->SetCurrentCursor(cursor);
 			}
-			if (sync) {
+			if (info.sync) {
 				// sync the client (it can now delete the cursor)
 				fLink.StartMessage(B_OK);
 				fLink.Flush();
@@ -1612,21 +1611,16 @@
 		{
 			DTRACE(("ServerWindow %s: Message AS_VIEW_SET_LINE_MODE: "
 				"View: %s\n", Title(), fCurrentView->Name()));
-			int8 lineCap, lineJoin;
-			float miterLimit;
-
-			link.Read<int8>(&lineCap);
-			link.Read<int8>(&lineJoin);
-			if (link.Read<float>(&miterLimit) != B_OK)
+			ViewSetLineModeInfo info;
+			if (link.Read<ViewSetLineModeInfo>(&info) != B_OK)
 				break;
 
-			fCurrentView->CurrentState()->SetLineCapMode((cap_mode)lineCap);
-			fCurrentView->CurrentState()->SetLineJoinMode((join_mode)lineJoin);
-			fCurrentView->CurrentState()->SetMiterLimit(miterLimit);
+			fCurrentView->CurrentState()->SetLineCapMode(info.lineCap);
+			fCurrentView->CurrentState()->SetLineJoinMode(info.lineJoin);
+			fCurrentView->CurrentState()->SetMiterLimit(info.miterLimit);
 
-			fWindow->GetDrawingEngine()->SetStrokeMode((cap_mode)lineCap,
-				(join_mode)lineJoin, miterLimit);
-//			_UpdateDrawState(fCurrentView);
+			fWindow->GetDrawingEngine()->SetStrokeMode(info.lineCap,
+				info.lineJoin, info.miterLimit);
 
 			break;
 		}
@@ -1634,10 +1628,13 @@
 		{
 			DTRACE(("ServerWindow %s: Message AS_VIEW_GET_LINE_MODE: "
 				"View: %s\n", Title(), fCurrentView->Name()));
+			ViewSetLineModeInfo info;
+			info.lineJoin = fCurrentView->CurrentState()->LineJoinMode();
+			info.lineCap = fCurrentView->CurrentState()->LineCapMode();
+			info.miterLimit = fCurrentView->CurrentState()->MiterLimit();
+
 			fLink.StartMessage(B_OK);
-			fLink.Attach<int8>((int8)(fCurrentView->CurrentState()->LineCapMode()));
-			fLink.Attach<int8>((int8)(fCurrentView->CurrentState()->LineJoinMode()));
-			fLink.Attach<float>(fCurrentView->CurrentState()->MiterLimit());
+			fLink.Attach<ViewSetLineModeInfo>(info);
 			fLink.Flush();
 
 			break;
@@ -1690,16 +1687,15 @@
 		}
 		case AS_VIEW_SET_PEN_LOC:
 		{
-			float x, y;
-			link.Read<float>(&x);
-			if (link.Read<float>(&y) != B_OK)
+			BPoint location;
+			if (link.Read<BPoint>(&location) != B_OK)
 				break;
 
 			DTRACE(("ServerWindow %s: Message AS_VIEW_SET_PEN_LOC: "
 				"View: %s -> BPoint(%.1f, %.1f)\n", Title(),
-				fCurrentView->Name(), x, y));
+				fCurrentView->Name(), location.x, location.y));
 
-			fCurrentView->CurrentState()->SetPenLocation(BPoint(x, y));
+			fCurrentView->CurrentState()->SetPenLocation(location);
 			break;
 		}
 		case AS_VIEW_GET_PEN_LOC:
@@ -1847,27 +1843,28 @@
 		{
 			DTRACE(("ServerWindow %s: Message AS_VIEW_SET_BLEND_MODE: "
 				"View: %s\n", Title(), fCurrentView->Name()));
-			int8 srcAlpha, alphaFunc;
 
-			link.Read<int8>(&srcAlpha);
-			if (link.Read<int8>(&alphaFunc) != B_OK)
+			ViewBlendingModeInfo info;
+			if (link.Read<ViewBlendingModeInfo>(&info) != B_OK)
 				break;
 
 			fCurrentView->CurrentState()->SetBlendingMode(
-				(source_alpha)srcAlpha, (alpha_function)alphaFunc);
+				info.sourceAlpha, info.alphaFunction);
 			fWindow->GetDrawingEngine()->SetBlendingMode(
-				(source_alpha)srcAlpha, (alpha_function)alphaFunc);
+				info.sourceAlpha, info.alphaFunction);
 			break;
 		}
 		case AS_VIEW_GET_BLENDING_MODE:
 		{
 			DTRACE(("ServerWindow %s: Message AS_VIEW_GET_BLEND_MODE: "
 				"View: %s\n", Title(), fCurrentView->Name()));
+
+			ViewBlendingModeInfo info;
+			info.sourceAlpha = fCurrentView->CurrentState()->AlphaSrcMode();
+			info.alphaFunction = fCurrentView->CurrentState()->AlphaFncMode();
+
 			fLink.StartMessage(B_OK);
-			fLink.Attach<int8>((int8)(
-				fCurrentView->CurrentState()->AlphaSrcMode()));
-			fLink.Attach<int8>((int8)(
-				fCurrentView->CurrentState()->AlphaFncMode()));
+			fLink.Attach<ViewBlendingModeInfo>(info);
 			fLink.Flush();
 
 			break;
@@ -2286,27 +2283,23 @@
 	switch (code) {
 		case AS_STROKE_LINE:
 		{
-			float x1, y1, x2, y2;
-
-			link.Read<float>(&x1);
-			link.Read<float>(&y1);
-			link.Read<float>(&x2);
-			if (link.Read<float>(&y2) != B_OK)
+			ViewStrokeLineInfo info;
+			if (link.Read<ViewStrokeLineInfo>(&info) != B_OK)
 				break;
 
 			DTRACE(("ServerWindow %s: Message AS_STROKE_LINE: View: %s -> "
 				"BPoint(%.1f, %.1f) - BPoint(%.1f, %.1f)\n", Title(),
-					fCurrentView->Name(), x1, y1, x2, y2));
+					fCurrentView->Name(),
+					info.startPoint.x, info.startPoint.y,
+					info.endPoint.x, info.endPoint.y));
 
-			BPoint p1(x1, y1);
-			BPoint p2(x2, y2);
-			BPoint penPos = p2;
-			fCurrentView->ConvertToScreenForDrawing(&p1);
-			fCurrentView->ConvertToScreenForDrawing(&p2);
-			drawingEngine->StrokeLine(p1, p2);
+			BPoint penPos = info.endPoint;
+			fCurrentView->ConvertToScreenForDrawing(&info.startPoint);
+			fCurrentView->ConvertToScreenForDrawing(&info.endPoint);
+			drawingEngine->StrokeLine(info.startPoint, info.endPoint);
 
-			// We update the pen here because many DrawingEngine calls which do not update the
-			// pen position actually call StrokeLine
+			// We update the pen here because many DrawingEngine calls which
+			// do not update the pen position actually call StrokeLine
 
 			// TODO: Decide where to put this, for example, it cannot be done
 			// for DrawString(), also there needs to be a decision, if penlocation
@@ -2379,15 +2372,8 @@
 		}
 		case AS_VIEW_DRAW_BITMAP:
 		{
-			int32 bitmapToken;
-			uint32 options;
-			BRect bitmapRect;
-			BRect viewRect;
-
-			link.Read<int32>(&bitmapToken);
-			link.Read<uint32>(&options);
-			link.Read<BRect>(&viewRect);
-			if (link.Read<BRect>(&bitmapRect) != B_OK)
+			ViewDrawBitmapInfo info;
+			if (link.Read<ViewDrawBitmapInfo>(&info) != B_OK)
 				break;
 
 #if 0
@@ -2395,23 +2381,24 @@
 				options |= B_FILTER_BITMAP_BILINEAR;
 #endif
 
-			ServerBitmap* bitmap = fServerApp->FindBitmap(bitmapToken);
+			ServerBitmap* bitmap = fServerApp->FindBitmap(info.bitmapToken);
 			if (bitmap) {
 
 				DTRACE(("ServerWindow %s: Message AS_VIEW_DRAW_BITMAP: "
 					"View: %s, bitmap: %ld (size %ld x %ld), "
 					"BRect(%.1f, %.1f, %.1f, %.1f) -> "
 					"BRect(%.1f, %.1f, %.1f, %.1f)\n",
-					fTitle, fCurrentView->Name(), bitmapToken,
+					fTitle, fCurrentView->Name(), info.bitmapToken,
 					bitmap->Width(), bitmap->Height(),
-					bitmapRect.left, bitmapRect.top, bitmapRect.right,
-					bitmapRect.bottom, viewRect.left, viewRect.top,
-					viewRect.right, viewRect.bottom));
+					info.bitmapRect.left, info.bitmapRect.top,
+					info.bitmapRect.right, info.bitmapRect.bottom,
+					info.viewRect.left, info.viewRect.top,
+					info.viewRect.right, info.viewRect.bottom));
 
-				fCurrentView->ConvertToScreenForDrawing(&viewRect);
+				fCurrentView->ConvertToScreenForDrawing(&info.viewRect);
 
-				drawingEngine->DrawBitmap(bitmap, bitmapRect, viewRect,
-					options);
+				drawingEngine->DrawBitmap(bitmap, info.bitmapRect,
+					info.viewRect, info.options);
 			}
 
 			break;
@@ -2758,52 +2745,73 @@
 			// 2) LineArrayData
 
 			int32 lineCount;
+			if (link.Read<int32>(&lineCount) != B_OK || lineCount <= 0)
+				break;
 
-			link.Read<int32>(&lineCount);
-			if (lineCount > 0) {
-				LineArrayData lineData[lineCount];
+			// To speed things up, try to use a stack allocation and only
+			// fall back to the heap if there are enough lines...
+			ViewLineArrayInfo* lineData;
+			static const int32 kStackBufferLineDataCount = 64;
+			ViewLineArrayInfo lineDataStackBuffer[kStackBufferLineDataCount];
+			if (lineCount > kStackBufferLineDataCount) {
+				lineData = new(std::nothrow) ViewLineArrayInfo[lineCount];
+				if (lineData == NULL)
+					break;
+			} else
+				lineData = lineDataStackBuffer;
 
-				for (int32 i = 0; i < lineCount; i++) {
-					LineArrayData* index = &lineData[i];
+			// Read them all in one go
+			size_t dataSize = lineCount * sizeof(ViewLineArrayInfo);
+			if (link.Read(lineData, dataSize) != B_OK) {
+				if (lineData != lineDataStackBuffer)
+					delete[] lineData;
+				break;
+			}
 
-					link.Read<float>(&(index->pt1.x));
-					link.Read<float>(&(index->pt1.y));
-					link.Read<float>(&(index->pt2.x));
-					link.Read<float>(&(index->pt2.y));
-					link.Read<rgb_color>(&(index->color));
+			// Convert to screen coords and draw
+			for (int32 i = 0; i < lineCount; i++) {
+				ViewLineArrayInfo* index = &lineData[i];
 
-					fCurrentView->ConvertToScreenForDrawing(&index->pt1);
-					fCurrentView->ConvertToScreenForDrawing(&index->pt2);
-				}
-				drawingEngine->StrokeLineArray(lineCount, lineData);
+				fCurrentView->ConvertToScreenForDrawing(&index->startPoint);
+				fCurrentView->ConvertToScreenForDrawing(&index->endPoint);
 			}
+			drawingEngine->StrokeLineArray(lineCount, lineData);
+
+			if (lineData != lineDataStackBuffer)
+				delete[] lineData;
 			break;
 		}
 		case AS_DRAW_STRING:
 		case AS_DRAW_STRING_WITH_DELTA:
 		{
-			char* string;
-			int32 length;
-			BPoint location;
-			escapement_delta _delta;
-			escapement_delta* delta = NULL;
+			ViewDrawStringInfo info;
+			if (link.Read<ViewDrawStringInfo>(&info) != B_OK)
+				break;
 
-			link.Read<int32>(&length);
-			link.Read<BPoint>(&location);
+			char* string = (char*)malloc(info.stringLength + 1);
+			if (string == NULL)
+				break;
+
+			escapement_delta* delta = NULL;
 			if (code == AS_DRAW_STRING_WITH_DELTA) {
-				link.Read<escapement_delta>(&_delta);
-				if (_delta.nonspace != 0.0 || _delta.space != 0.0)
-					delta = &_delta;
+				// In this case, info.delta will contain valid values.
+				delta = &info.delta;
 			}
-			if (link.ReadString(&string) != B_OK)
+
+			if (link.Read(string, info.stringLength) != B_OK) {
+				free(string);
 				break;
+			}
+			// Terminate the string, if nothing else, it's important
+			// for the DTRACE call below...
+			string[info.stringLength] = '\0';
 
 			DTRACE(("ServerWindow %s: Message AS_DRAW_STRING, View: %s "
 				"-> %s\n", Title(), fCurrentView->Name(), string));
 
-			fCurrentView->ConvertToScreenForDrawing(&location);
-			BPoint penLocation = drawingEngine->DrawString(string, length,
-				location, delta);
+			fCurrentView->ConvertToScreenForDrawing(&info.location);
+			BPoint penLocation = drawingEngine->DrawString(string,
+				info.stringLength, info.location, delta);
 
 			fCurrentView->ConvertFromScreenForDrawing(&penLocation);
 			fCurrentView->CurrentState()->SetPenLocation(penLocation);
@@ -2903,12 +2911,11 @@
 
 		case AS_VIEW_SET_PEN_LOC:
 		{
-			float x, y;
-			link.Read<float>(&x);
-			link.Read<float>(&y);
-			picture->WriteSetPenLocation(BPoint(x, y));
+			BPoint location;
+			link.Read<BPoint>(&location);
+			picture->WriteSetPenLocation(location);
 
-			fCurrentView->CurrentState()->SetPenLocation(BPoint(x, y));
+			fCurrentView->CurrentState()->SetPenLocation(location);
 			break;
 		}
 		case AS_VIEW_SET_PEN_SIZE:
@@ -2925,21 +2932,19 @@
 
 		case AS_VIEW_SET_LINE_MODE:
 		{
-			int8 lineCap, lineJoin;
-			float miterLimit;
 
-			link.Read<int8>(&lineCap);
-			link.Read<int8>(&lineJoin);
-			link.Read<float>(&miterLimit);
+			ViewSetLineModeInfo info;
+			link.Read<ViewSetLineModeInfo>(&info);
 
-			picture->WriteSetLineMode((cap_mode)lineCap, (join_mode)lineJoin, miterLimit);
+			picture->WriteSetLineMode(info.lineCap, info.lineJoin,
+				info.miterLimit);
 
-			fCurrentView->CurrentState()->SetLineCapMode((cap_mode)lineCap);
-			fCurrentView->CurrentState()->SetLineJoinMode((join_mode)lineJoin);
-			fCurrentView->CurrentState()->SetMiterLimit(miterLimit);
+			fCurrentView->CurrentState()->SetLineCapMode(info.lineCap);
+			fCurrentView->CurrentState()->SetLineJoinMode(info.lineJoin);
+			fCurrentView->CurrentState()->SetMiterLimit(info.miterLimit);
 
-			fWindow->GetDrawingEngine()->SetStrokeMode((cap_mode)lineCap,
-				(join_mode)lineJoin, miterLimit);
+			fWindow->GetDrawingEngine()->SetStrokeMode(info.lineCap,
+				info.lineJoin, info.miterLimit);
 			break;
 		}
 		case AS_VIEW_SET_SCALE:
@@ -3081,14 +3086,10 @@
 
 		case AS_STROKE_LINE:
 		{
-			float x1, y1, x2, y2;
+			ViewStrokeLineInfo info;
+			link.Read<ViewStrokeLineInfo>(&info);
 
-			link.Read<float>(&x1);
-			link.Read<float>(&y1);
-			link.Read<float>(&x2);
-			link.Read<float>(&y2);
-
-			picture->WriteStrokeLine(BPoint(x1, y1), BPoint(x2, y2));
+			picture->WriteStrokeLine(info.startPoint, info.endPoint);
 			break;
 		}
 
@@ -3102,17 +3103,13 @@
 			picture->WritePushState();
 
 			for (int32 i = 0; i < lineCount; i++) {
-				float x1, y1, x2, y2;
-				link.Read<float>(&x1);
-				link.Read<float>(&y1);
-				link.Read<float>(&x2);
-				link.Read<float>(&y2);
+				ViewLineArrayInfo lineData;
+				if (link.Read<ViewLineArrayInfo >(&lineData) != B_OK)
+					break;
 
-				rgb_color color;
-				link.Read<rgb_color>(&color);
-
-				picture->WriteSetHighColor(color);
-				picture->WriteStrokeLine(BPoint(x1, y1), BPoint(x2, y2));
+				picture->WriteSetHighColor(lineData.color);
+				picture->WriteStrokeLine(lineData.startPoint,
+					lineData.endPoint);
 			}
 
 			picture->WritePopState();
@@ -3139,19 +3136,30 @@

[... truncated: 238 lines follow ...]


From axeld at pinc-software.de  Sun Apr  5 17:01:54 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sun, 05 Apr 2009 17:01:54 +0200
Subject: [Haiku-commits]
 =?utf-8?q?r29936_-_in_haiku/trunk=3A_build/jam_da?=
 =?utf-8?q?ta/etc_data/system_data/system/data_data/system/data/Canna_data?=
 =?utf-8?q?/system/data/KeyboardLayouts_data/system/data/joysticks_data/sy?=
 =?utf-8?q?stem/data/licenses?=
In-Reply-To: <200904051456.n35EuD9R004769@sheep.berlios.de>
Message-ID: <26912220240-BeMail@ibm>

axeld at mail.berlios.de wrote:
>    haiku/trunk/data/system/data/KeyboardLayouts/Generic 104-key
>    haiku/trunk/data/system/data/KeyboardLayouts/Generic 105-key 
> International
>    haiku/trunk/data/system/data/KeyboardLayouts/IBM Laptop 
> International

I obviously forgot to mention those in the commit message.
They are alternative keyboard layouts that can be used in the Keymap 
preferences.

Bye,
   Axel.



From stippi at mail.berlios.de  Sun Apr  5 17:04:33 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sun, 5 Apr 2009 17:04:33 +0200
Subject: [Haiku-commits] r29938 - haiku/trunk/headers/private/app
Message-ID: <200904051504.n35F4XnH006683@sheep.berlios.de>

Author: stippi
Date: 2009-04-05 17:04:31 +0200 (Sun, 05 Apr 2009)
New Revision: 29938
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29938&view=rev

Added:
   haiku/trunk/headers/private/app/ServerProtocolStructs.h
Log:
Argh! Sorry, should have been part of previous commit.


Added: haiku/trunk/headers/private/app/ServerProtocolStructs.h
===================================================================
--- haiku/trunk/headers/private/app/ServerProtocolStructs.h	2009-04-05 14:59:43 UTC (rev 29937)
+++ haiku/trunk/headers/private/app/ServerProtocolStructs.h	2009-04-05 15:04:31 UTC (rev 29938)
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2009, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Stephan A?mus, <superstippi at gmx.de>
+ */
+#ifndef APP_SERVER_PROTOCOL_STRUCTS_H
+#define APP_SERVER_PROTOCOL_STRUCTS_H
+
+
+#include <Rect.h>
+
+
+struct ViewSetStateInfo {
+	BPoint						penLocation;
+	float						penSize;
+	rgb_color					highColor;
+	rgb_color					lowColor;
+	::pattern					pattern;
+	drawing_mode				drawingMode;
+	BPoint						origin;
+	float						scale;
+	join_mode					lineJoin;
+	cap_mode					lineCap;
+	float						miterLimit;
+	source_alpha				alphaSourceMode;
+	alpha_function				alphaFunctionMode;
+	bool						fontAntialiasing;
+};
+
+
+struct ViewGetStateInfo {
+	int32						fontID;
+	float						fontSize;
+	float						fontShear;
+	float						fontRotation;
+	float						fontFalseBoldWidth;
+	int8						fontSpacing;
+	int8						fontEncoding;
+	int16						fontFace;
+	int32						fontFlags;
+
+	ViewSetStateInfo			viewStateInfo;
+};
+
+
+struct ViewDragImageInfo {
+	int32						bitmapToken;
+	int32						dragMode;
+	BPoint						offset;
+	int32						bufferSize;
+};
+
+
+struct ViewSetViewCursorInfo {
+	int32						cursorToken;
+	bool						sync;
+};
+
+
+struct ViewBeginRectTrackingInfo {
+	BRect						rect;
+	uint32						style;
+};
+
+
+struct ViewSetLineModeInfo {
+	join_mode					lineJoin;
+	cap_mode					lineCap;
+	float						miterLimit;
+};
+
+
+struct ViewBlendingModeInfo {
+	source_alpha				sourceAlpha;
+	alpha_function				alphaFunction;
+};
+
+
+struct ViewDrawBitmapInfo {
+	int32						bitmapToken;
+	uint32						options;
+	BRect						viewRect;
+	BRect						bitmapRect;
+};
+
+
+struct ViewDrawStringInfo {
+	int32						stringLength;
+	BPoint						location;
+	escapement_delta			delta;
+};
+
+
+struct ViewStrokeLineInfo {
+	BPoint						startPoint;
+	BPoint						endPoint;
+};
+
+
+struct ViewLineArrayInfo {
+	BPoint						startPoint;
+	BPoint						endPoint;
+	rgb_color					color;
+};
+
+
+#endif	// APP_SERVER_PROTOCOL_STRUCTS_H



From zooey at mail.berlios.de  Sun Apr  5 17:14:06 2009
From: zooey at mail.berlios.de (zooey at mail.berlios.de)
Date: Sun, 5 Apr 2009 17:14:06 +0200
Subject: [Haiku-commits] r29939 - haiku/trunk/src/apps/workspaces
Message-ID: <200904051514.n35FE6NO008999@sheep.berlios.de>

Author: zooey
Date: 2009-04-05 17:13:53 +0200 (Sun, 05 Apr 2009)
New Revision: 29939
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29939&view=rev

Modified:
   haiku/trunk/src/apps/workspaces/Jamfile
Log:
build fix:
* added 'app' private header path such that ServerProtocolStructs.h
  can be found

Modified: haiku/trunk/src/apps/workspaces/Jamfile
===================================================================
--- haiku/trunk/src/apps/workspaces/Jamfile	2009-04-05 15:04:31 UTC (rev 29938)
+++ haiku/trunk/src/apps/workspaces/Jamfile	2009-04-05 15:13:53 UTC (rev 29939)
@@ -3,7 +3,7 @@
 SetSubDirSupportedPlatformsBeOSCompatible ;
 AddSubDirSupportedPlatforms libbe_test ;
 
-UsePrivateHeaders interface ;
+UsePrivateHeaders app interface ;
 
 Application Workspaces :
 	Workspaces.cpp 



From aldeck at mail.berlios.de  Sun Apr  5 17:30:15 2009
From: aldeck at mail.berlios.de (aldeck at mail.berlios.de)
Date: Sun, 5 Apr 2009 17:30:15 +0200
Subject: [Haiku-commits] r29940 - haiku/trunk/src/kits/tracker
Message-ID: <200904051530.n35FUFKh012668@sheep.berlios.de>

Author: aldeck
Date: 2009-04-05 17:29:56 +0200 (Sun, 05 Apr 2009)
New Revision: 29940
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29940&view=rev

Modified:
   haiku/trunk/src/kits/tracker/ContainerWindow.cpp
   haiku/trunk/src/kits/tracker/PoseView.cpp
Log:
* Implements enhancement #2829, ie: change the modifier key (now shift) to force identify on 
already identified files and change the menu item label accordingly so that the 'feature' is 
not hidden anymore.
 The identification mechanism will probably be automated in the future, forcing 
identification would then become the only use of this menu item.


Modified: haiku/trunk/src/kits/tracker/ContainerWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-04-05 15:13:53 UTC (rev 29939)
+++ haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-04-05 15:29:56 UTC (rev 29940)
@@ -2357,12 +2357,12 @@
 		parent->AddItem(fCreateLinkItem, index);
 	}
 
-    // Set the "Create Link" item label here so it
-    // appears correctly when menus are disabled, too.
-    if (modifierKeys & B_SHIFT_KEY)
-    	fCreateLinkItem->SetLabel("Create Relative Link");
-    else
-    	fCreateLinkItem->SetLabel("Create Link");
+	// Set the "Create Link" item label here so it
+	// appears correctly when menus are disabled, too.
+	if (modifierKeys & B_SHIFT_KEY)
+		fCreateLinkItem->SetLabel("Create Relative Link");
+	else
+		fCreateLinkItem->SetLabel("Create Link");
 
 	// only enable once the menus are built
 	fMoveToItem->SetEnabled(false);
@@ -2405,6 +2405,15 @@
 	fMoveToItem->SetEnabled(true);
 	fCopyToItem->SetEnabled(true);
 	fCreateLinkItem->SetEnabled(true);
+
+	// Set the "Identify" item label
+	BMenuItem *identifyItem = parent->FindItem(kIdentifyEntry);
+	if (identifyItem != NULL) {
+		if (modifierKeys & B_SHIFT_KEY)
+			identifyItem->SetLabel("Force Identify");
+		else
+			identifyItem->SetLabel("Identify");
+	}
 }
 
 

Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-05 15:13:53 UTC (rev 29939)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-05 15:29:56 UTC (rev 29940)
@@ -7709,7 +7709,7 @@
 void
 BPoseView::IdentifySelection()
 {
-	bool force = (modifiers() & B_OPTION_KEY) != 0;
+	bool force = (modifiers() & B_SHIFT_KEY) != 0;
 	int32 count = fSelectionList->CountItems();
 	for (int32 index = 0; index < count; index++) {
 		BPose *pose = fSelectionList->ItemAt(index);
@@ -8890,21 +8890,21 @@
 	// note: fAlreadySelectedDropTarget is a trick to avoid to really search
 	// fSelectionList. Another solution would be to add Hilite/IsHilited just
 	// like Select/IsSelected in BPose and let it handle this case internally
-	
+
 	// can happen when starting a new drag
-	if (fAlreadySelectedDropTarget != fDropTarget)		
-		fAlreadySelectedDropTarget = NULL;	
-	
+	if (fAlreadySelectedDropTarget != fDropTarget)
+		fAlreadySelectedDropTarget = NULL;
+
 	// don't select, this droptarget was already part of a user selection
-	if (fDropTarget->IsSelected() && hiliteState) {		
-		fAlreadySelectedDropTarget = fDropTarget;		
-		return;	
- 	} 	
-	
+	if (fDropTarget->IsSelected() && hiliteState) {
+		fAlreadySelectedDropTarget = fDropTarget;
+		return;
+	}
+
 	// don't unselect the fAlreadySelectedDropTarget 
 	if ((fAlreadySelectedDropTarget == fDropTarget) && !hiliteState) {
 		fAlreadySelectedDropTarget = NULL;
-		return;	
+		return;
 	}
 
 	fDropTarget->Select(hiliteState);



From alex at zappotek.com  Sun Apr  5 17:34:09 2009
From: alex at zappotek.com (Alex)
Date: Sun, 05 Apr 2009 17:34:09 +0200
Subject: [Haiku-commits] r29940 - haiku/trunk/src/kits/tracker
In-Reply-To: <200904051530.n35FUFKh012668@sheep.berlios.de>
Message-ID: <1238945649-054c85424f914446c84c175fefd17199@zappotek.com>


----- Message d'origine -----
De: aldeck at mail.berlios.de
Date: Sun, 5 Apr 2009 17:30:15 +0200
Sujet: [Haiku-commits] r29940 - haiku/trunk/src/kits/tracker
?: haiku-commits at lists.berlios.de

>Author: aldeck
>Date: 2009-04-05 17:29:56 +0200 (Sun, 05 Apr 2009)
>New Revision: 29940
>ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29940&view=rev
>
>Modified:
>   haiku/trunk/src/kits/tracker/ContainerWindow.cpp
>   haiku/trunk/src/kits/tracker/PoseView.cpp
>Log:
>* Implements enhancement #2829, ie: change the modifier key (now shift) to force identify on 
>already identified files and change the menu item label accordingly so that the 'feature' is 
>not hidden anymore.
> The identification mechanism will probably be automated in the future, forcing 
>identification would then become the only use of this menu item.
>

Forgot to mention some minor cleanups, sorry.


From jonas at kirilla.com  Sun Apr  5 17:20:31 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Sun, 05 Apr 2009 17:20:31 +0200 CEST
Subject: [Haiku-commits] r29936 - in haiku/trunk: build/jam data/etc
 data/system data/system/data data/system/data/Canna
 data/system/data/KeyboardLayouts data/system/data/joysticks
 data/system/data/licenses
In-Reply-To: <26912220240-BeMail@ibm>
Message-ID: <10314280659-BeMail@kirilla>

"Axel D?rfler" <axeld at pinc-software.de> wrote:
> axeld at mail.berlios.de wrote:
> >    haiku/trunk/data/system/data/KeyboardLayouts/Generic 104-key
> >    haiku/trunk/data/system/data/KeyboardLayouts/Generic 105-key 
> > International
> >    haiku/trunk/data/system/data/KeyboardLayouts/IBM Laptop 
> > International
> 
> I obviously forgot to mention those in the commit message.
> They are alternative keyboard layouts that can be used in the Keymap 
> preferences.

Could Haiku know itself what style of keyboard
is present and its keymap? 

(PS2/USB - any difference in what is possible 
to find out about the keyboard?)

MacOS X has a user dialog at install time asking
the user to press the key directly to the right of
the left-side shift key, IIRC, giving the system
some rudimentary idea which of 3 major types of
keyboards the current one is.

For Haiku this dialog could happen when opening
the  Keymap preferences the first time. (if its
not possible to probe a keyboard silently)

/Jonas.



From stippi at mail.berlios.de  Sun Apr  5 17:41:49 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sun, 5 Apr 2009 17:41:49 +0200
Subject: [Haiku-commits] r29941 - haiku/trunk/src/tests/servers/app/benchmark
Message-ID: <200904051541.n35Ffn65015099@sheep.berlios.de>

Author: stippi
Date: 2009-04-05 17:41:41 +0200 (Sun, 05 Apr 2009)
New Revision: 29941
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29941&view=rev

Modified:
   haiku/trunk/src/tests/servers/app/benchmark/Benchmark.cpp
   haiku/trunk/src/tests/servers/app/benchmark/ClippedLineTest.cpp
   haiku/trunk/src/tests/servers/app/benchmark/ClippedLineTest.h
   haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.cpp
   haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.h
   haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.cpp
   haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.h
   haiku/trunk/src/tests/servers/app/benchmark/StringTest.cpp
   haiku/trunk/src/tests/servers/app/benchmark/StringTest.h
   haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.cpp
   haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.h
Log:
Make Benchmark pick up the test you want to run from the command line args.


Modified: haiku/trunk/src/tests/servers/app/benchmark/Benchmark.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/Benchmark.cpp	2009-04-05 15:29:56 UTC (rev 29940)
+++ haiku/trunk/src/tests/servers/app/benchmark/Benchmark.cpp	2009-04-05 15:41:41 UTC (rev 29941)
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2008 Stephan A?mus <superstippi at gmx.de>
+ * Copyright (C) 2008-2009 Stephan A?mus <superstippi at gmx.de>
  * All rights reserved. Distributed under the terms of the MIT license.
  */
 
+#include <memory>
 #include <stdio.h>
 
 #include <Application.h>
@@ -17,15 +18,27 @@
 #include "StringTest.h"
 #include "VerticalLineTest.h"
 
+
+struct test_info {
+	const char*				name;
+	Test*					(*create)();
+};
+
+const test_info kTestInfos[] = {
+	{ "ClippedLines",		ClippedLineTest::CreateTest },
+	{ "HorizontalLines",	HorizontalLineTest::CreateTest },
+	{ "RandomLines",		RandomLineTest::CreateTest },
+	{ "Strings",			StringTest::CreateTest },
+	{ "VerticalLines",		VerticalLineTest::CreateTest },
+	{ NULL, NULL }
+};
+
+
 class Benchmark : public BApplication {
 public:
-	Benchmark()
+	Benchmark(Test* test)
 		: BApplication("application/x-vnd.haiku-benchmark"),
-		  fTest(new ClippedLineTest),
-//		  fTest(new HorizontalLineTest),
-//		  fTest(new RandomLineTest),
-//		  fTest(new StringTest),
-//		  fTest(new VerticalLineTest),
+		  fTest(test),
 		  fTestWindow(NULL)
 	{
 	}
@@ -79,11 +92,51 @@
 };
 
 
-// main
+static void
+print_test_list(bool error)
+{
+	FILE* out = (error ? stderr : stdout);
+
+	fprintf(out, "available tests:\n");
+
+	for (int32 i = 0; kTestInfos[i].name; i++)
+		fprintf(out, "  %s\n", kTestInfos[i].name);
+}
+
+
 int
 main(int argc, char** argv)
 {
-	Benchmark app;
+	// get test name
+	const char* testName;
+	if (argc < 2) {
+		fprintf(stderr, "Usage: %s <test name>\n", argv[0]);
+		print_test_list(true);
+		exit(1);
+	}
+	testName = argv[1];
+
+	// find and create the test
+	Test* test = NULL;
+	try {
+		for (int32 i = 0; kTestInfos[i].name; i++) {
+			if (strcmp(testName, kTestInfos[i].name) == 0) {
+				test = (kTestInfos[i].create)();
+				break;
+			}
+		}
+	} catch (std::bad_alloc) {
+		fprintf(stderr, "Insufficient memory to create the test. Sorry.\n");
+		exit(1);
+	}
+
+	if (test == NULL) {
+		fprintf(stderr, "Error: Invalid test name: \"%s\"\n", testName);
+		print_test_list(true);
+		exit(1);
+	}
+
+	Benchmark app(test);
 	app.Run();
 	return 0;
 }

Modified: haiku/trunk/src/tests/servers/app/benchmark/ClippedLineTest.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/ClippedLineTest.cpp	2009-04-05 15:29:56 UTC (rev 29940)
+++ haiku/trunk/src/tests/servers/app/benchmark/ClippedLineTest.cpp	2009-04-05 15:41:41 UTC (rev 29941)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Stephan A?mus <superstippi at gmx.de>
+ * Copyright (C) 2008-2009 Stephan A?mus <superstippi at gmx.de>
  * All rights reserved. Distributed under the terms of the MIT license.
  */
 
@@ -95,3 +95,10 @@
 		(float)timeLeak / fIterations / 1000000);
 }
 
+
+Test*
+ClippedLineTest::CreateTest()
+{
+	return new ClippedLineTest();
+}
+

Modified: haiku/trunk/src/tests/servers/app/benchmark/ClippedLineTest.h
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/ClippedLineTest.h	2009-04-05 15:29:56 UTC (rev 29940)
+++ haiku/trunk/src/tests/servers/app/benchmark/ClippedLineTest.h	2009-04-05 15:41:41 UTC (rev 29941)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Stephan A?mus <superstippi at gmx.de>
+ * Copyright (C) 2008-2009 Stephan A?mus <superstippi at gmx.de>
  * All rights reserved. Distributed under the terms of the MIT license.
  */
 #ifndef CLIPPED_LINE_TEST_H
@@ -18,6 +18,8 @@
 	virtual	bool				RunIteration(BView* view);
 	virtual	void				PrintResults();
 
+	static	Test*				CreateTest();
+
 private:
 	bigtime_t					fTestDuration;
 	bigtime_t					fTestStart;

Modified: haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.cpp	2009-04-05 15:29:56 UTC (rev 29940)
+++ haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.cpp	2009-04-05 15:41:41 UTC (rev 29941)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Stephan A?mus <superstippi at gmx.de>
+ * Copyright (C) 2008-2009 Stephan A?mus <superstippi at gmx.de>
  * All rights reserved. Distributed under the terms of the MIT license.
  */
 
@@ -87,3 +87,10 @@
 		(float)timeLeak / fIterations / 1000000);
 }
 
+
+Test*
+HorizontalLineTest::CreateTest()
+{
+	return new HorizontalLineTest();
+}
+

Modified: haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.h
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.h	2009-04-05 15:29:56 UTC (rev 29940)
+++ haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.h	2009-04-05 15:41:41 UTC (rev 29941)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Stephan A?mus <superstippi at gmx.de>
+ * Copyright (C) 2008-2009 Stephan A?mus <superstippi at gmx.de>
  * All rights reserved. Distributed under the terms of the MIT license.
  */
 #ifndef HORIZONTAL_LINE_TEST_H
@@ -18,6 +18,8 @@
 	virtual	bool				RunIteration(BView* view);
 	virtual	void				PrintResults();
 
+	static	Test*				CreateTest();
+
 private:
 	bigtime_t					fTestDuration;
 	bigtime_t					fTestStart;

Modified: haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.cpp	2009-04-05 15:29:56 UTC (rev 29940)
+++ haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.cpp	2009-04-05 15:41:41 UTC (rev 29941)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Stephan A?mus <superstippi at gmx.de>
+ * Copyright (C) 2008-2009 Stephan A?mus <superstippi at gmx.de>
  * All rights reserved. Distributed under the terms of the MIT license.
  */
 
@@ -90,3 +90,11 @@
 		(float)timeLeak / fIterations / 1000000);
 }
 
+
+Test*
+RandomLineTest::CreateTest()
+{
+	return new RandomLineTest();
+}
+
+

Modified: haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.h
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.h	2009-04-05 15:29:56 UTC (rev 29940)
+++ haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.h	2009-04-05 15:41:41 UTC (rev 29941)
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 2008 Stephan A?mus <superstippi at gmx.de>
+ * Copyright (C) 2008-2009 Stephan A?mus <superstippi at gmx.de>
  * All rights reserved. Distributed under the terms of the MIT license.
  */
-#ifndef VERTICAL_LINE_TEST_H
-#define VERTICAL_LINE_TEST_H
+#ifndef RANDOM_LINE_TEST_H
+#define RANDOM_LINE_TEST_H
 
 #include <Rect.h>
 
@@ -18,6 +18,8 @@
 	virtual	bool				RunIteration(BView* view);
 	virtual	void				PrintResults();
 
+	static	Test*				CreateTest();
+
 private:
 	bigtime_t					fTestDuration;
 	bigtime_t					fTestStart;
@@ -30,4 +32,4 @@
 	BRect						fViewBounds;
 };
 
-#endif // VERTICAL_LINE_TEST_H
+#endif // RANDOM_LINE_TEST_H

Modified: haiku/trunk/src/tests/servers/app/benchmark/StringTest.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/StringTest.cpp	2009-04-05 15:29:56 UTC (rev 29940)
+++ haiku/trunk/src/tests/servers/app/benchmark/StringTest.cpp	2009-04-05 15:41:41 UTC (rev 29941)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Stephan A?mus <superstippi at gmx.de>
+ * Copyright (C) 2008-2009 Stephan A?mus <superstippi at gmx.de>
  * All rights reserved. Distributed under the terms of the MIT license.
  */
 
@@ -111,3 +111,10 @@
 		(float)timeLeak / fIterations / 1000000);
 }
 
+
+Test*
+StringTest::CreateTest()
+{
+	return new StringTest();
+}
+

Modified: haiku/trunk/src/tests/servers/app/benchmark/StringTest.h
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/StringTest.h	2009-04-05 15:29:56 UTC (rev 29940)
+++ haiku/trunk/src/tests/servers/app/benchmark/StringTest.h	2009-04-05 15:41:41 UTC (rev 29941)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Stephan A?mus <superstippi at gmx.de>
+ * Copyright (C) 2008-2009 Stephan A?mus <superstippi at gmx.de>
  * All rights reserved. Distributed under the terms of the MIT license.
  */
 #ifndef STRING_TEST_H
@@ -18,6 +18,8 @@
 	virtual	bool				RunIteration(BView* view);
 	virtual	void				PrintResults();
 
+	static	Test*				CreateTest();
+
 private:
 	bigtime_t					fTestDuration;
 	bigtime_t					fTestStart;

Modified: haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.cpp	2009-04-05 15:29:56 UTC (rev 29940)
+++ haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.cpp	2009-04-05 15:41:41 UTC (rev 29941)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Stephan A?mus <superstippi at gmx.de>
+ * Copyright (C) 2008-2009 Stephan A?mus <superstippi at gmx.de>
  * All rights reserved. Distributed under the terms of the MIT license.
  */
 
@@ -87,3 +87,10 @@
 		(float)timeLeak / fIterations / 1000000);
 }
 
+
+Test*
+VerticalLineTest::CreateTest()
+{
+	return new VerticalLineTest();
+}
+

Modified: haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.h
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.h	2009-04-05 15:29:56 UTC (rev 29940)
+++ haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.h	2009-04-05 15:41:41 UTC (rev 29941)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Stephan A?mus <superstippi at gmx.de>
+ * Copyright (C) 2008-2009 Stephan A?mus <superstippi at gmx.de>
  * All rights reserved. Distributed under the terms of the MIT license.
  */
 #ifndef VERTICAL_LINE_TEST_H
@@ -18,6 +18,8 @@
 	virtual	bool				RunIteration(BView* view);
 	virtual	void				PrintResults();
 
+	static	Test*				CreateTest();
+
 private:
 	bigtime_t					fTestDuration;
 	bigtime_t					fTestStart;



From revol at free.fr  Sun Apr  5 17:47:42 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Sun, 05 Apr 2009 17:47:42 +0200 CEST
Subject: [Haiku-commits] r29936 - in haiku/trunk: build/jam data/etc
 data/system data/system/data data/system/data/Canna
 data/system/data/KeyboardLayouts data/system/data/joysticks
 data/system/data/licenses
In-Reply-To: <10314280659-BeMail@kirilla>
Message-ID: <11114419074-BeMail@laptop>

> "Axel D?rfler" <axeld at pinc-software.de> wrote:
> > axeld at mail.berlios.de wrote:
> > >    haiku/trunk/data/system/data/KeyboardLayouts/Generic 104-key
> > >    haiku/trunk/data/system/data/KeyboardLayouts/Generic 105-key 
> > > International
> > >    haiku/trunk/data/system/data/KeyboardLayouts/IBM Laptop 
> > > International
> > 
> > I obviously forgot to mention those in the commit message.
> > They are alternative keyboard layouts that can be used in the 
> > Keymap 
> > preferences.
> 
> Could Haiku know itself what style of keyboard
> is present and its keymap? 
> 
> (PS2/USB - any difference in what is possible 
> to find out about the keyboard?)

Not for PS/2, as far as I did search.
USB keyboards should have a lang field in their HID descriptors, though 
I don't know how well it's reported, and if it's even set for different 
layouts or just set to the lang of the manufacturer regardless the 
keys...

And you'll get it wrong whenever someone remaps it as dvorak anyway :p

> MacOS X has a user dialog at install time asking
> the user to press the key directly to the right of
> the left-side shift key, IIRC, giving the system
> some rudimentary idea which of 3 major types of
> keyboards the current one is.

Oh you mean 102 keys or some other count ? I think this should be 
reported somewhere.

Fran?ois.


From axeld at mail.berlios.de  Sun Apr  5 17:59:10 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sun, 5 Apr 2009 17:59:10 +0200
Subject: [Haiku-commits] r29942 - haiku/trunk/build/jam
Message-ID: <200904051559.n35FxAic019031@sheep.berlios.de>

Author: axeld
Date: 2009-04-05 17:59:08 +0200 (Sun, 05 Apr 2009)
New Revision: 29942
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29942&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
* Copy keyboard layouts to the image as well.
* I noticed a bit too late that we usually have lower caps folder in our
  repository. Well, if someone complains enough... :-)


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-05 15:41:41 UTC (rev 29941)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-05 15:59:08 UTC (rev 29942)
@@ -355,7 +355,7 @@
 AddDirectoryToHaikuImage system data Canna dic group ;
 AddDirectoryToHaikuImage system data Canna dic user ;
 
-local keymapFiles = [ GLOB [ FDirName $(HAIKU_TOP) src data etc keymaps ]
+local keymapFiles = [ Glob [ FDirName $(HAIKU_TOP) src data etc keymaps ]
 	: *.keymap ] ;
 keymapFiles = $(keymapFiles:BG=keymap) ;
 AddFilesToHaikuImage system data Keymaps : $(keymapFiles) ;
@@ -363,6 +363,11 @@
 AddSymlinkToHaikuImage system data Keymaps : Slovene : Croatian ;
 AddSymlinkToHaikuImage system data Keymaps : US-International : Brazilian ;
 
+local keyboardLayoutsDir
+	= [ FDirName $(HAIKU_TOP) data system data KeyboardLayouts ] ;
+local keyboardLayouts = [ Glob $(keyboardLayoutsDir) : [^.]* ] ;
+AddFilesToHaikuImage system data KeyboardLayouts : $(keyboardLayouts) ;
+
 local timezones = [ FTimeZoneBinaries $(HAIKU_TIME_ZONE_SOURCES) : : true ] ;
 for timezone in $(timezones) {
 	local dir = [ on $(timezone) return $(RELATIVE_TIMEZONE_DIR) ] ;



From kirilla at mail.berlios.de  Sun Apr  5 18:56:46 2009
From: kirilla at mail.berlios.de (kirilla at mail.berlios.de)
Date: Sun, 5 Apr 2009 18:56:46 +0200
Subject: [Haiku-commits] r29943 - haiku/trunk/src/apps/terminal
Message-ID: <200904051656.n35GukwT019613@sheep.berlios.de>

Author: kirilla
Date: 2009-04-05 18:56:42 +0200 (Sun, 05 Apr 2009)
New Revision: 29943
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29943&view=rev

Modified:
   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:
Suppress ResizeView (the grey rows & columns view) when entering/leaving fullscreen mode, and when zooming. Its useful only when manually resizing the window. In the other cases it simply flickers by.

Modified: haiku/trunk/src/apps/terminal/TermView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.cpp	2009-04-05 15:59:08 UTC (rev 29942)
+++ haiku/trunk/src/apps/terminal/TermView.cpp	2009-04-05 16:56:42 UTC (rev 29943)
@@ -253,6 +253,7 @@
 	fFontHeight = 0;
 	fFontAscent = 0;
 	fFrameResized = false;
+	fResizeViewDisableCount = 0;
 	fLastActivityTime = 0;
 	fCursorState = 0;
 	fCursorHeight = 0;
@@ -1303,9 +1304,12 @@
 	fResizeView->ResizeTo(width * 1.5, height * 1.5);
 	fResizeView->MoveTo((Bounds().Width() - fResizeView->Bounds().Width()) / 2,
 		(Bounds().Height()- fResizeView->Bounds().Height()) / 2);
-	if (!hasResizeView)
+	if (!hasResizeView && fResizeViewDisableCount < 1)
 		AddChild(fResizeView);
 
+	if (fResizeViewDisableCount > 0)
+		fResizeViewDisableCount--;
+
 	SetTermSize(rows, columns, false);
 
 	fFrameResized = true;
@@ -2557,3 +2561,10 @@
 		}
 	}
 }
+
+void
+TermView::DisableResizeView(int32 disableCount = 1)
+{
+	fResizeViewDisableCount += disableCount;
+}
+

Modified: haiku/trunk/src/apps/terminal/TermView.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.h	2009-04-05 15:59:08 UTC (rev 29942)
+++ haiku/trunk/src/apps/terminal/TermView.h	2009-04-05 16:56:42 UTC (rev 29943)
@@ -83,6 +83,8 @@
 
 			void			InitiateDrag();
 
+			void			DisableResizeView(int32 disableCount = 1);
+
 protected:
 	virtual void			AttachedToWindow();
 	virtual void			DetachedFromWindow();
@@ -196,6 +198,7 @@
 
 			// frame resized flag.
 			bool			fFrameResized;
+			int32			fResizeViewDisableCount;
 
 			// Cursor Blinking, draw flag.
 			bigtime_t		fLastActivityTime;

Modified: haiku/trunk/src/apps/terminal/TermWindow.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.cpp	2009-04-05 15:59:08 UTC (rev 29942)
+++ haiku/trunk/src/apps/terminal/TermWindow.cpp	2009-04-05 16:56:42 UTC (rev 29943)
@@ -482,6 +482,7 @@
 		
 		case FULLSCREEN:
 			if (!fSavedFrame.IsValid()) { // go fullscreen
+				_ActiveTermView()->DisableResizeView();
 				float mbHeight = fMenubar->Bounds().Height() + 1;
 				fSavedFrame = Frame();
 				BScreen screen(this);
@@ -495,6 +496,7 @@
 				ResizeTo(screen.Frame().Width()+1, screen.Frame().Height()+1);
 				MoveTo(screen.Frame().left, screen.Frame().top);
 			} else { // exit fullscreen
+				_ActiveTermView()->DisableResizeView();
 				float mbHeight = fMenubar->Bounds().Height() + 1;
 				fMenubar->Show();
 				_ActiveTermView()->ScrollBar()->Show();
@@ -847,6 +849,14 @@
 
 
 void
+TermWindow::Zoom(BPoint leftTop, float width, float height)
+{
+	_ActiveTermView()->DisableResizeView();
+	BWindow::Zoom(leftTop, width, height);
+}
+
+
+void
 TermWindow::_ResizeView(TermView *view)
 {
 	int fontWidth, fontHeight;

Modified: haiku/trunk/src/apps/terminal/TermWindow.h
===================================================================
--- haiku/trunk/src/apps/terminal/TermWindow.h	2009-04-05 15:59:08 UTC (rev 29942)
+++ haiku/trunk/src/apps/terminal/TermWindow.h	2009-04-05 16:56:42 UTC (rev 29943)
@@ -59,6 +59,7 @@
 	virtual void	MessageReceived(BMessage *message);
 	virtual void	WindowActivated(bool);
 	virtual void	MenusBeginning();
+	virtual	void	Zoom(BPoint leftTop, float width, float height);
 
 private:
 	struct Session;



From stippi at mail.berlios.de  Sun Apr  5 19:25:33 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sun, 5 Apr 2009 19:25:33 +0200
Subject: [Haiku-commits] r29944 -
	haiku/trunk/src/add-ons/kernel/bus_managers/ps2
Message-ID: <200904051725.n35HPXGm015853@sheep.berlios.de>

Author: stippi
Date: 2009-04-05 19:25:29 +0200 (Sun, 05 Apr 2009)
New Revision: 29944
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29944&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c
Log:
Patch by Clemens Zeidler:
* Enable the Synaptics driver again.
* After performing the checks for the Synaptics device, issue a reset to avoid
  the device being left in a weird state. This fixes at least the weird mouse
  in VMWare with enabled Synaptics driver. Please report if there are any other
  problems! :-)

Thanks a lot!


Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c	2009-04-05 16:56:42 UTC (rev 29943)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c	2009-04-05 17:25:29 UTC (rev 29944)
@@ -6,6 +6,7 @@
  *
  * Authors (in chronological order):
  *		Marcus Overhagen (marcus at overhagen.de)
+ *		Clemens Zeidler (haiku at clemens-zeidler.de)
  */
 
 
@@ -102,7 +103,6 @@
 	// probe devices
 	// the probe function has to set the dev name and the dev packet size
 
-#if 0
 	status = probe_trackpoint(dev);
 	if (status == B_OK) {
 		*hooks = &gStandardMouseDeviceHooks;
@@ -114,8 +114,15 @@
 		*hooks = &gSynapticsDeviceHooks;
 		goto dev_found;
 	}
-#endif
 
+	// reset the mouse for the case that the previous probes leaf the mouse in
+	// a undefined state
+	status = ps2_reset_mouse(dev);
+	if (status != B_OK) {
+		INFO("ps2: reset after probe failed\n");
+		return B_ERROR;
+	}
+
 	status = probe_standard_mouse(dev);
 	if (status == B_OK) {
 		*hooks = &gStandardMouseDeviceHooks;
@@ -180,8 +187,6 @@
 		if (status == B_OK) {
 			status = devfs_publish_device(dev->name, hooks);
 		}
-
-		//status = devfs_publish_device(dev->name, &gPointingDeviceHooks);
 	}
 
 	dev->active = true;



From anevilyak at mail.berlios.de  Sun Apr  5 19:53:34 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Sun, 5 Apr 2009 19:53:34 +0200
Subject: [Haiku-commits] r29945 - haiku/trunk/src/apps/terminal
Message-ID: <200904051753.n35HrY64014374@sheep.berlios.de>

Author: anevilyak
Date: 2009-04-05 19:53:33 +0200 (Sun, 05 Apr 2009)
New Revision: 29945
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29945&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermView.cpp
Log:
gcc4 build fix.



Modified: haiku/trunk/src/apps/terminal/TermView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.cpp	2009-04-05 17:25:29 UTC (rev 29944)
+++ haiku/trunk/src/apps/terminal/TermView.cpp	2009-04-05 17:53:33 UTC (rev 29945)
@@ -2563,7 +2563,7 @@
 }
 
 void
-TermView::DisableResizeView(int32 disableCount = 1)
+TermView::DisableResizeView(int32 disableCount)
 {
 	fResizeViewDisableCount += disableCount;
 }



From jonas at kirilla.com  Sun Apr  5 20:10:28 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Sun, 05 Apr 2009 20:10:28 +0200 CEST
Subject: [Haiku-commits] r29945 - haiku/trunk/src/apps/terminal
In-Reply-To: <200904051753.n35HrY64014374@sheep.berlios.de>
Message-ID: <20511035922-BeMail@kirilla>

anevilyak at BerliOS <anevilyak at mail.berlios.de> wrote:
 ...
> gcc4 build fix.
 ...
> Modified: haiku/trunk/src/apps/terminal/TermView.cpp
 ...
> -TermView::DisableResizeView(int32 disableCount = 1)
> +TermView::DisableResizeView(int32 disableCount)

Thanks, Rene.

/Jonas.


From mmu_man at mail.berlios.de  Sun Apr  5 20:18:28 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 5 Apr 2009 20:18:28 +0200
Subject: [Haiku-commits] r29946 - haiku/trunk/src/bin
Message-ID: <200904051818.n35IISbm016927@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-05 20:18:27 +0200 (Sun, 05 Apr 2009)
New Revision: 29946
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29946&view=rev

Modified:
   haiku/trunk/src/bin/renice.c
Log:
- cleanup
- fix non UTF-8 in comments
- fixed unix priority scaling


Modified: haiku/trunk/src/bin/renice.c
===================================================================
--- haiku/trunk/src/bin/renice.c	2009-04-05 17:53:33 UTC (rev 29945)
+++ haiku/trunk/src/bin/renice.c	2009-04-05 18:18:27 UTC (rev 29946)
@@ -1,5 +1,5 @@
 /* renice.c - unixish renice command for BeOs
- * (c) 2001, 2002, Fran?ois Revol (mmu_man) for OpenBeOS
+ * (c) 2001, 2002, Fran??ois Revol (mmu_man) for OpenBeOS
  * released under the MIT licence.
  *
  * How did I live without it before ??? ;)
@@ -8,7 +8,7 @@
  *  Cleanup for inclusion in OpenBeOS,
  *  Used the code to rewrite the 'prio' BeOS command for OpenBeOS.
  * 04-14-2002 v1.1
- *  Added -f upon suggestion from Id?fix on BeShare
+ *  Added -f upon suggestion from Id??fix on BeShare
  * 2001 v1.0
  *  Initial.
  */
@@ -24,41 +24,43 @@
 /usr/sbin/renice [-n increment] [-p] [-g | -u] ID ... /usr/sbin/renice priority [-p] pid ... [-g pgrp ...] [-u user ...]
 
 
-#define B_LOW_PRIORITY                  5
-#define B_NORMAL_PRIORITY               10
-#define B_DISPLAY_PRIORITY              15
-#define B_URGENT_DISPLAY_PRIORITY       20
-#define B_REAL_TIME_DISPLAY_PRIORITY    100
-#define B_URGENT_PRIORITY               110
-#define B_REAL_TIME_PRIORITY            120
-
 BeOs priorities:
-High Prio (realtime)            Default                  Low Prio
-120                               10                        1 (0 only for idle_thread)
+(realtime)	High Prio			Default					Low Prio
+120			99					10						1 (0 only for idle_thread)
 
-UNIX Priorities:
--20                               0                         20
+UNIX nice:
+			-20					0						19
+UNIX priorities:
+			0					20						39
 
-Note that however this isn't perfect, since priorities 
-beyond 100 in BeOS move the thread into the real-time class.
-Linux for example, has a separate API for doing this, 
-and even a process set to -20 can be in the normal scheduling class.
-
 renice can be given more than one pid on the command line.
 prio is locked into one pid, then the priority.
 
 */
 
+#ifndef NZERO
+#define NZERO 20
+#endif
+
+#define BZERO B_NORMAL_PRIORITY
+#define BMIN (B_REAL_TIME_DISPLAY_PRIORITY-1)
+//#define BMAX B_NORMAL_PRIORITY
+#define BMAX 1
+
 // returns an equivalent UNIX priority for a given BeOS priority.
 static int32 prio_be_to_unix(int32 prio)
 {
-	return (prio > 10)?(- (20 * (prio - 10)) / 110):(2 * (10 - prio));
+	if (prio > BZERO)
+		return NZERO - ((prio - BZERO) * NZERO) / (BMIN - BZERO);
+	return NZERO + ((BZERO - prio) * (NZERO - 1)) / (BZERO - BMAX);
 }
 
 // returns an equivalent BeOS priority for a given UNIX priority.
 static int32 prio_unix_to_be(int32 prio)
 {
-	return (prio > 0)?(10 - (prio/2)):(10 + 110 * (-prio) / 20);
+	if (prio > NZERO)
+		return BZERO - ((prio - NZERO) * (BZERO - BMAX)) / (NZERO-1);
+	return BZERO + ((NZERO - prio) * (BMIN - BZERO)) / (NZERO);
 }
 
 static status_t renice_thread(int32 prio, int32 increment, bool use_be_prio, thread_id th)
@@ -94,7 +96,7 @@
 	int err = 1;
 	char *thname;
 
-	prio = 9; // default UNIX priority for nice
+	prio = NZERO; // default UNIX priority for nice
 	// convert it to beos
 	if (!use_be_prio)
 	prio = prio_unix_to_be(prio);
@@ -130,6 +132,7 @@
 						th = thinfo.thread;
 						renice_thread(prio, increment, use_be_prio, th);
 						err = 0;
+						/* find another one */
 					}
 				}
 			}



From aldeck at mail.berlios.de  Sun Apr  5 20:54:17 2009
From: aldeck at mail.berlios.de (aldeck at mail.berlios.de)
Date: Sun, 5 Apr 2009 20:54:17 +0200
Subject: [Haiku-commits] r29947 - haiku/trunk/src/kits/interface
Message-ID: <200904051854.n35IsHwR021607@sheep.berlios.de>

Author: aldeck
Date: 2009-04-05 20:54:15 +0200 (Sun, 05 Apr 2009)
New Revision: 29947
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29947&view=rev

Modified:
   haiku/trunk/src/kits/interface/Dragger.cpp
Log:
* Fixes a small regression introduced in r29728, don't return B_ERROR if we couldn't lock 
the popup's window, in this case the window just closed, so we go on with archiving then.
There's still a (rarely occuring) problem with the unlocking though, probably due to some 
BMenu funkyness, will investigate, left a TODO.


Modified: haiku/trunk/src/kits/interface/Dragger.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Dragger.cpp	2009-04-05 18:18:27 UTC (rev 29946)
+++ haiku/trunk/src/kits/interface/Dragger.cpp	2009-04-05 18:54:15 UTC (rev 29947)
@@ -118,13 +118,17 @@
 	BMessage popupMsg;
 	
 	if (fPopUp) {
-		if (fPopUp->Window()->Lock()) {
-			ret = fPopUp->Archive(&popupMsg, deep);
-			if (ret == B_OK)
-				ret = data->AddMessage("_popup", &popupMsg);
+		bool windowLocked = fPopUp->Window()->Lock();
+
+		ret = fPopUp->Archive(&popupMsg, deep);
+
+		if (windowLocked)
 			fPopUp->Window()->Unlock();
-		} else
-			ret = B_ERROR;
+				// TODO: Investigate, in some (rare) occasions the menu window
+				//		 has already been unlocked
+
+		if (ret == B_OK)
+			ret = data->AddMessage("_popup", &popupMsg);
 	}
 
 	if (ret == B_OK)



From stippi at mail.berlios.de  Sun Apr  5 21:04:27 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sun, 5 Apr 2009 21:04:27 +0200
Subject: [Haiku-commits] r29948 - haiku/trunk/src/system/kernel
Message-ID: <200904051904.n35J4RgR022912@sheep.berlios.de>

Author: stippi
Date: 2009-04-05 21:04:25 +0200 (Sun, 05 Apr 2009)
New Revision: 29948
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29948&view=rev

Modified:
   haiku/trunk/src/system/kernel/shutdown.c
Log:
Patch by Olivier Coursiere: When rebooting, shutdown all the system teams,
most importantly input_server, which then closes the drivers for input devices.
This in turn will do some cleanup. The touch pad driver will then be reset to
act as normal PS/2 mouse, so that OS like BeOS can use it again.


Modified: haiku/trunk/src/system/kernel/shutdown.c
===================================================================
--- haiku/trunk/src/system/kernel/shutdown.c	2009-04-05 18:54:15 UTC (rev 29947)
+++ haiku/trunk/src/system/kernel/shutdown.c	2009-04-05 19:04:25 UTC (rev 29948)
@@ -1,4 +1,5 @@
 /*
+ * Copyright 2009, Olivier Coursi?re. All rights reserved.
  * Copyright 2004, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
@@ -11,8 +12,20 @@
 status_t
 system_shutdown(bool reboot)
 {
-	// ToDo: shutdown all system services!
-
+	int32 cookie = 0;
+	team_info info;
+	
+	// Now shutdown all system services!
+	// TODO: Once we are sure we can shutdown the system on all hardware
+	// checking reboot may not be necessary anymore.
+	if (reboot) {
+		while (get_next_team_info(&cookie, &info) == B_OK) {
+			if (info.team == B_SYSTEM_TEAM)
+				continue;
+			kill_team(info.team);
+		}
+	}
+	
 	sync();
 
 	return arch_cpu_shutdown(reboot);



From aldeck at mail.berlios.de  Sun Apr  5 21:59:55 2009
From: aldeck at mail.berlios.de (aldeck at mail.berlios.de)
Date: Sun, 5 Apr 2009 21:59:55 +0200
Subject: [Haiku-commits] r29949 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200904051959.n35JxtWS028867@sheep.berlios.de>

Author: aldeck
Date: 2009-04-05 21:59:53 +0200 (Sun, 05 Apr 2009)
New Revision: 29949
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29949&view=rev

Modified:
   haiku/trunk/headers/os/interface/Dragger.h
   haiku/trunk/src/kits/interface/Dragger.cpp
Log:
* Make BDragger respect the doc and only archive/unarchive the popup menu when it's a 
custom provided one. Incidentally makes #1775 (that i'll reopen in a moment, see r29947) a 
lot less likely to happen for most users since it can now only happen with those 
customized popups.


Modified: haiku/trunk/headers/os/interface/Dragger.h
===================================================================
--- haiku/trunk/headers/os/interface/Dragger.h	2009-04-05 19:04:25 UTC (rev 29948)
+++ haiku/trunk/headers/os/interface/Dragger.h	2009-04-05 19:59:53 UTC (rev 29949)
@@ -114,6 +114,7 @@
 				bool		fTransition;
 				bool		fIsZombie;
 				char		fErrCount;
+				bool		fPopUpIsCustom;
 				BBitmap	*	fBitmap;
 				BPopUpMenu*	fPopUp;
 				uint32		_reserved[3];

Modified: haiku/trunk/src/kits/interface/Dragger.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Dragger.cpp	2009-04-05 19:04:25 UTC (rev 29948)
+++ haiku/trunk/src/kits/interface/Dragger.cpp	2009-04-05 19:59:53 UTC (rev 29949)
@@ -59,6 +59,7 @@
 	fTransition(false),
 	fIsZombie(false),
 	fErrCount(0),
+	fPopUpIsCustom(false),
 	fPopUp(NULL)
 {
 	fBitmap = new BBitmap(BRect(0.0f, 0.0f, 7.0f, 7.0f), B_CMAP8, false, false);
@@ -74,6 +75,7 @@
 	fTransition(false),
 	fIsZombie(false),
 	fErrCount(0),
+	fPopUpIsCustom(false),
 	fPopUp(NULL)
 {
 	data->FindInt32("_rel", (int32 *)&fRelation);
@@ -85,16 +87,17 @@
 	if (data->FindMessage("_popup", &popupMsg) == B_OK) {
 		BArchivable *archivable = instantiate_object(&popupMsg);
 
-		if (archivable)
+		if (archivable) {
 			fPopUp = dynamic_cast<BPopUpMenu *>(archivable);
+			fPopUpIsCustom = true;
+		}
 	}
 }
 
 
 BDragger::~BDragger()
 {
-	SetPopUp(NULL);
-	
+	delete fPopUp;
 	delete fBitmap;
 }
 
@@ -117,7 +120,7 @@
 
 	BMessage popupMsg;
 	
-	if (fPopUp) {
+	if (fPopUp && fPopUpIsCustom) {
 		bool windowLocked = fPopUp->Window()->Lock();
 
 		ret = fPopUp->Archive(&popupMsg, deep);
@@ -510,11 +513,13 @@
 status_t
 BDragger::SetPopUp(BPopUpMenu *menu)
 {
-	if (fPopUp != menu)
+	if (menu != NULL && menu != fPopUp) {
 		delete fPopUp;
-
-	fPopUp = menu;
-	return B_OK;
+		fPopUp = menu;
+		fPopUpIsCustom = true;
+		return B_OK;
+	}
+	return B_ERROR;
 }
 
 



From axeld at mail.berlios.de  Sun Apr  5 23:05:52 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sun, 5 Apr 2009 23:05:52 +0200
Subject: [Haiku-commits] r29950 - haiku/trunk/src/apps/activitymonitor
Message-ID: <200904052105.n35L5qbI004185@sheep.berlios.de>

Author: axeld
Date: 2009-04-05 23:05:50 +0200 (Sun, 05 Apr 2009)
New Revision: 29950
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29950&view=rev

Modified:
   haiku/trunk/src/apps/activitymonitor/ActivityView.cpp
   haiku/trunk/src/apps/activitymonitor/ActivityView.h
   haiku/trunk/src/apps/activitymonitor/CircularBuffer.h
   haiku/trunk/src/apps/activitymonitor/SettingsWindow.cpp
Log:
* Added a ViewHistory class that stores the current values, so they don't have
  to be interpolated everytime. This class also makes sure that the values are
  always from the same offsets, so the flickering is gone.
* Need to use SetMouseEventMask() or else the mouse up will be ignored when
  changing the resolution via dragging the mouse.
* Fixed a bug that prevented the DataHistory data interpolation from working
  correctly.
* The refresh threads are now working at B_URGENT_DISPLAY_PRIORITY, making the
  view updates much more stable with less jitter.
* Removed the draw refresh, and have it always be the same as the value
  refresh.
* Added lower refresh intervals (25, and 75 ms).


Modified: haiku/trunk/src/apps/activitymonitor/ActivityView.cpp
===================================================================
--- haiku/trunk/src/apps/activitymonitor/ActivityView.cpp	2009-04-05 19:59:53 UTC (rev 29949)
+++ haiku/trunk/src/apps/activitymonitor/ActivityView.cpp	2009-04-05 21:05:50 UTC (rev 29950)
@@ -9,6 +9,7 @@
 #include <new>
 #include <stdio.h>
 #include <stdlib.h>
+#include <vector.h>
 
 #ifdef __HAIKU__
 #	include <AbstractLayoutItem.h>
@@ -20,6 +21,7 @@
 #include <MenuItem.h>
 #include <MessageRunner.h>
 #include <PopUpMenu.h>
+#include <Shape.h>
 #include <String.h>
 
 #include "ActivityMonitor.h"
@@ -29,22 +31,92 @@
 #include "SystemInfoHandler.h"
 
 
+template<typename ObjectType>
+class ListAddDeleter {
+public:
+	ListAddDeleter(BObjectList<ObjectType>& list, ObjectType* object,
+			int32 spot)
+		:
+		fList(list),
+		fObject(object)
+	{
+		if (fObject != NULL && !fList.AddItem(fObject, spot)) {
+			delete fObject;
+			fObject = NULL;
+		}
+	}
+
+	~ListAddDeleter()
+	{
+		if (fObject != NULL) {
+			fList.RemoveItem(fObject);
+			delete fObject;
+		}
+	}
+
+	bool Failed() const
+	{
+		return fObject == NULL;
+	}
+
+	void Detach()
+	{
+		fObject = NULL;
+	}
+
+private:
+	BObjectList<ObjectType>&	fList;
+	ObjectType*					fObject;
+};
+
+
+/*!	This class manages the scale of a history with a dynamic scale.
+	Every history value will be input via Update(), and the minimum/maximum
+	is computed from that.
+*/
 class Scale {
 public:
-							Scale(scale_type type);
+								Scale(scale_type type);
 
-			int64			MinimumValue() const { return fMinimumValue; }
-			int64			MaximumValue() const { return fMaximumValue; }
+			int64				MinimumValue() const { return fMinimumValue; }
+			int64				MaximumValue() const { return fMaximumValue; }
 
-			void			Update(int64 value);
+			void				Update(int64 value);
 
 private:
-	scale_type				fType;
-	int64					fMinimumValue;
-	int64					fMaximumValue;
-	bool					fInitialized;
+			scale_type			fType;
+			int64				fMinimumValue;
+			int64				fMaximumValue;
+			bool				fInitialized;
 };
 
+/*!	Stores the interpolated on screen view values. This is done so that the
+	interpolation is fixed, and does not change when being scrolled.
+
+	We could also just do this by making sure we always ask for the same
+	interval only, but this way we also save the interpolation.
+*/
+class ViewHistory {
+public:
+								ViewHistory();
+
+			int64				ValueAt(int32 x);
+
+			int32				Start() const
+									{ return fValues.Size()
+										- fValues.CountItems(); }
+
+			void				Update(DataHistory* history, int32 width,
+									int32 resolution, bigtime_t toTime,
+									bigtime_t step, bigtime_t refresh);
+
+private:
+			CircularBuffer<int64> fValues;
+			int32				fResolution;
+			bigtime_t			fRefresh;
+			bigtime_t			fLastTime;
+};
+
 struct data_item {
 	bigtime_t	time;
 	int64		value;
@@ -127,6 +199,75 @@
 //	#pragma mark -
 
 
+ViewHistory::ViewHistory()
+	:
+	fValues(1),
+	fResolution(-1),
+	fRefresh(-1),
+	fLastTime(0)
+{
+}
+
+
+int64
+ViewHistory::ValueAt(int32 x)
+{
+	int64* value = fValues.ItemAt(x - Start());
+	if (value != NULL)
+		return *value;
+
+	return 0;
+}
+
+
+void
+ViewHistory::Update(DataHistory* history, int32 width, int32 resolution,
+	bigtime_t toTime, bigtime_t step, bigtime_t refresh)
+{
+	// Check if we need to invalidate the existing values
+	if ((int32)fValues.Size() != width
+		|| fResolution != resolution
+		|| fRefresh != refresh) {
+		fValues.SetSize(width);
+		fLastTime = 0;
+		fResolution = resolution;
+		fRefresh = refresh;
+	}
+
+	// Compute how many new values we need to retrieve
+	if (fLastTime < history->Start())
+		fLastTime = history->Start();
+
+	int32 updateWidth = int32((toTime - fLastTime) / step);
+	if (updateWidth < 1)
+		return;
+
+	if (updateWidth > (int32)fValues.Size()) {
+		updateWidth = fValues.Size();
+		fLastTime = toTime - updateWidth * step;
+	}
+
+	for (int32 i = 0; i < updateWidth; i++) {
+		int64 value = history->ValueAt(fLastTime += step);
+
+		if (step > refresh) {
+			uint32 count = 1;
+			for (bigtime_t offset = refresh; offset < step; offset += refresh) {
+				// TODO: handle int64 overflow correctly!
+				value += history->ValueAt(fLastTime + offset);
+				count++;
+			}
+			value /= count;
+		}
+
+		fValues.AddItem(value);
+	}
+}
+
+
+//	#pragma mark -
+
+
 DataHistory::DataHistory(bigtime_t memorize, bigtime_t interval)
 	:
 	fBuffer(10000),
@@ -182,7 +323,7 @@
 				int64 value = item->value;
 				value += int64(double(nextItem->value - value)
 					/ (nextItem->time - item->time) * (time - item->time));
-				return item->value;
+				return value;
 			}
 
 			// search in right part
@@ -458,7 +599,6 @@
 	SetViewColor(B_TRANSPARENT_COLOR);
 
 	fRefreshInterval = kInitialRefreshInterval;
-	fDrawInterval = kInitialRefreshInterval * 2;
 	fLastRefresh = 0;
 	fDrawResolution = 1;
 	fZooming = false;
@@ -610,6 +750,7 @@
 
 	BAutolock _(fSourcesLock);
 
+	// Search for the correct insert spot to maintain the order of the sources
 	int32 insert = DataSource::IndexOf(source);
 	for (int32 i = 0; i < fSources.CountItems() && i < insert; i++) {
 		DataSource* before = fSources.ItemAt(i);
@@ -621,6 +762,9 @@
 	if (insert > fSources.CountItems())
 		insert = fSources.CountItems();
 
+	// Generate DataHistory and ViewHistory objects for the source
+	// (one might need one history per CPU)
+
 	uint32 count = 1;
 	if (source->PerCPU()) {
 		SystemInfo info;
@@ -630,13 +774,14 @@
 	for (uint32 i = 0; i < count; i++) {
 		DataHistory* values = new(std::nothrow) DataHistory(10 * 60000000LL,
 			RefreshInterval());
-		if (values == NULL)
-			return B_NO_MEMORY;
+		ListAddDeleter<DataHistory> valuesDeleter(fValues, values, insert);
 
-		if (!fValues.AddItem(values, insert + i)) {
-			delete values;
+		ViewHistory* viewValues = new(std::nothrow) ViewHistory;
+		ListAddDeleter<ViewHistory> viewValuesDeleter(fViewValues, viewValues,
+			insert);
+
+		if (valuesDeleter.Failed() || viewValuesDeleter.Failed())
 			return B_NO_MEMORY;
-		}
 
 		values->SetScale(_ScaleFor(source->ScaleType()));
 
@@ -646,6 +791,10 @@
 		else
 			copy = source->Copy();
 
+		ListAddDeleter<DataSource> sourceDeleter(fSources, copy, insert);
+		if (sourceDeleter.Failed())
+			return B_NO_MEMORY;
+
 		BString colorName = source->Name();
 		colorName << " color";
 		if (state != NULL) {
@@ -657,11 +806,9 @@
 				copy->SetColor(*color);
 		}
 
-		if (!fSources.AddItem(copy, insert + i)) {
-			fValues.RemoveItem(values);
-			delete values;
-			return B_NO_MEMORY;
-		}
+		valuesDeleter.Detach();
+		viewValuesDeleter.Detach();
+		sourceDeleter.Detach();
 	}
 
 #ifdef __HAIKU__
@@ -723,7 +870,7 @@
 
 	fRefreshSem = create_sem(0, "refresh sem");
 	fRefreshThread = spawn_thread(&_RefreshThread, "source refresh",
-		B_NORMAL_PRIORITY, this);
+		B_URGENT_DISPLAY_PRIORITY, this);
 	resume_thread(fRefreshThread);
 
 	FrameResized(Bounds().Width(), Bounds().Height());
@@ -808,6 +955,7 @@
 		fZoomPoint = where;
 		fOriginalResolution = fDrawResolution;
 		fZooming = true;
+		SetMouseEventMask(B_POINTER_EVENTS);
 		return;
 	}
 
@@ -858,7 +1006,6 @@
 
 	ConvertToScreen(&where);
 	menu->Go(where, true, false, true);
-
 }
 
 
@@ -953,11 +1100,6 @@
 				interval = 10000;
 
 			atomic_set64(&fRefreshInterval, interval);
-			
-			if (interval > 250000)
-				atomic_set64(&fDrawInterval, interval);
-			else
-				atomic_set64(&fDrawInterval, interval * 2);
 			break;
 
 		case kMsgToggleDataSource:
@@ -1182,47 +1324,32 @@
 	BAutolock _(fSourcesLock);
 
 	for (uint32 i = fSources.CountItems(); i-- > 0;) {
+		ViewHistory* viewValues = fViewValues.ItemAt(i);
 		DataSource* source = fSources.ItemAt(i);
 		DataHistory* values = fValues.ItemAt(i);
-		bigtime_t time = now - steps * timeStep;
-			// for now steps pixels per second
 
-		view->BeginLineArray(steps);
-		view->SetHighColor(source->Color());
+		viewValues->Update(values, steps, fDrawResolution, now, timeStep,
+			RefreshInterval());
 
-		float lastY = FLT_MIN;
-		uint32 lastX = 0;
+		uint32 x = viewValues->Start() * step;
+		BShape shape;
+		bool first = true;
 
-		for (uint32 x = 0; x < width; x += step, time += timeStep) {
-			// TODO: compute starting point instead!
-			if (values->Start() > time || values->End() < time)
-				continue;
+		for (uint32 i = viewValues->Start(); i < steps; x += step, i++) {
+			float y = _PositionForValue(source, values,
+				viewValues->ValueAt(i));
 
-			int64 value = values->ValueAt(time);
-			if (timeStep > RefreshInterval()) {
-				// TODO: always start with the same index, so that it always
-				// uses the same values for computation (currently it jumps)
-				uint32 count = 1;
-				for (bigtime_t offset = RefreshInterval(); offset < timeStep;
-						offset += RefreshInterval()) {
-					// TODO: handle int64 overflow correctly!
-					value += values->ValueAt(time + offset);
-					count++;
-				}
-				value /= count;
-			}
-
-			float y = _PositionForValue(source, values, value);
-			if (lastY != FLT_MIN) {
-				view->AddLine(BPoint(lastX, lastY), BPoint(x, y),
-					source->Color());
-			}
-
-			lastX = x;
-			lastY = y;
+			if (first) {
+				shape.MoveTo(BPoint(x, y));
+				first = false;
+			} else
+				shape.LineTo(BPoint(x, y));
 		}
 
-		view->EndLineArray();
+		view->SetHighColor(source->Color());
+		view->SetLineMode(B_BUTT_CAP, B_ROUND_JOIN);
+		view->MovePenTo(B_ORIGIN);
+		view->StrokeShape(&shape);
 	}
 
 	// TODO: add marks when an app started or quit
@@ -1336,11 +1463,7 @@
 
 		fSourcesLock.Unlock();
 
-		bigtime_t now = info.Time();
-		if (fLastRefresh + DrawInterval() <= now) {
-			target.SendMessage(B_INVALIDATE);
-			fLastRefresh = now;
-		}
+		target.SendMessage(B_INVALIDATE);
 	}
 }
 

Modified: haiku/trunk/src/apps/activitymonitor/ActivityView.h
===================================================================
--- haiku/trunk/src/apps/activitymonitor/ActivityView.h	2009-04-05 19:59:53 UTC (rev 29949)
+++ haiku/trunk/src/apps/activitymonitor/ActivityView.h	2009-04-05 21:05:50 UTC (rev 29950)
@@ -17,9 +17,9 @@
 
 class BBitmap;
 class BMessageRunner;
-class DataSource;
 class Scale;
 class SystemInfoHandler;
+class ViewHistory;
 struct data_item;
 
 
@@ -76,8 +76,6 @@
 
 			bigtime_t	RefreshInterval() const
 							{ return atomic_get64((vint64*)&fRefreshInterval); }
-			bigtime_t	DrawInterval() const
-							{ return atomic_get64((vint64*)&fDrawInterval); }
 
 protected:
 	virtual	void		AttachedToWindow();
@@ -133,11 +131,11 @@
 	mutable BLocker		fSourcesLock;
 	BObjectList<DataSource> fSources;
 	BObjectList<DataHistory> fValues;
+	BObjectList<ViewHistory> fViewValues;
 	thread_id			fRefreshThread;
 	sem_id				fRefreshSem;
 	bigtime_t			fRefreshInterval;
 	bigtime_t			fLastRefresh;
-	bigtime_t			fDrawInterval;
 	int32				fDrawResolution;
 	bool				fShowLegend;
 	bool				fZooming;

Modified: haiku/trunk/src/apps/activitymonitor/CircularBuffer.h
===================================================================
--- haiku/trunk/src/apps/activitymonitor/CircularBuffer.h	2009-04-05 19:59:53 UTC (rev 29949)
+++ haiku/trunk/src/apps/activitymonitor/CircularBuffer.h	2009-04-05 21:05:50 UTC (rev 29950)
@@ -16,10 +16,9 @@
 public:
 	CircularBuffer(size_t size)
 		:
-		fSize(size)
+		fSize(0)
 	{
-		fBuffer = (Type *)malloc(fSize * sizeof(Type));
-		MakeEmpty();
+		SetSize(size);
 	}
 
 	~CircularBuffer()
@@ -32,6 +31,18 @@
 		return fBuffer != NULL ? B_OK : B_NO_MEMORY;
 	}
 
+	status_t SetSize(size_t size)
+	{
+		MakeEmpty();
+
+		if (fSize == size)
+			return B_OK;
+
+		fSize = size;
+		fBuffer = (Type*)malloc(fSize * sizeof(Type));
+		return fBuffer != NULL ? B_OK : B_NO_MEMORY;
+	}
+
 	void MakeEmpty()
 	{
 		fIn = 0;
@@ -67,6 +78,11 @@
 		fBuffer[index % fSize] = item;
 	}
 
+	size_t Size() const
+	{
+		return fSize;
+	}
+
 private:
 	uint32		fFirst;
 	uint32		fIn;

Modified: haiku/trunk/src/apps/activitymonitor/SettingsWindow.cpp
===================================================================
--- haiku/trunk/src/apps/activitymonitor/SettingsWindow.cpp	2009-04-05 19:59:53 UTC (rev 29949)
+++ haiku/trunk/src/apps/activitymonitor/SettingsWindow.cpp	2009-04-05 21:05:50 UTC (rev 29950)
@@ -17,7 +17,11 @@
 
 static const uint32 kMsgUpdateTimeInterval = 'upti';
 
-static const bigtime_t kUpdateIntervals[] = { 50, 100, 250, 500, 1000, 2000 };
+static const bigtime_t kUpdateIntervals[] = {
+	25, 50, 75, 100, 250, 500, 1000, 2000
+};
+static const size_t kNumUpdateIntervals
+	= sizeof(kUpdateIntervals) / sizeof(kUpdateIntervals[0]);
 
 
 class IntervalSlider : public BSlider {
@@ -42,9 +46,7 @@
 		// Find closest index
 		int32 bestDiff = LONG_MAX;
 		uint32 bestIndex = 0;
-		for (uint32 i = 0;
-				i < sizeof(kUpdateIntervals) / sizeof(kUpdateIntervals[0]);
-				i++) {
+		for (uint32 i = 0; i < kNumUpdateIntervals; i++) {
 			int32 diff = abs(kUpdateIntervals[i] - interval);
 			if (diff < bestDiff) {
 				bestDiff = diff;
@@ -63,7 +65,7 @@
 private:
 	const char* _TextFor(uint32 level) const
 	{
-		if (level >= sizeof(kUpdateIntervals) / sizeof(kUpdateIntervals[0]))
+		if (level >= kNumUpdateIntervals)
 			return NULL;
 
 		bigtime_t interval = kUpdateIntervals[level];
@@ -90,7 +92,7 @@
 	SetLayout(new BGroupLayout(B_VERTICAL));
 
 	fIntervalSlider = new IntervalSlider("Update time interval:",
-		new BMessage(kMsgUpdateTimeInterval), 6);
+		new BMessage(kMsgUpdateTimeInterval), kNumUpdateIntervals);
 	fIntervalSlider->SetInterval(target->RefreshInterval());
 
 	// controls pane



From axeld at mail.berlios.de  Sun Apr  5 23:22:20 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sun, 5 Apr 2009 23:22:20 +0200
Subject: [Haiku-commits] r29951 - haiku/trunk/src/apps/activitymonitor
Message-ID: <200904052122.n35LMK8T005927@sheep.berlios.de>

Author: axeld
Date: 2009-04-05 23:22:14 +0200 (Sun, 05 Apr 2009)
New Revision: 29951
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29951&view=rev

Modified:
   haiku/trunk/src/apps/activitymonitor/ActivityView.cpp
Log:
* Fixed removing a per CPU source.
* Fixed drawing problem when adding a new source, and the draw happened before
  a new value came in.


Modified: haiku/trunk/src/apps/activitymonitor/ActivityView.cpp
===================================================================
--- haiku/trunk/src/apps/activitymonitor/ActivityView.cpp	2009-04-05 21:05:50 UTC (rev 29950)
+++ haiku/trunk/src/apps/activitymonitor/ActivityView.cpp	2009-04-05 21:22:14 UTC (rev 29951)
@@ -229,14 +229,16 @@
 		|| fResolution != resolution
 		|| fRefresh != refresh) {
 		fValues.SetSize(width);
-		fLastTime = 0;
 		fResolution = resolution;
 		fRefresh = refresh;
+		fLastTime = 0;
 	}
 
 	// Compute how many new values we need to retrieve
 	if (fLastTime < history->Start())
 		fLastTime = history->Start();
+	if (fLastTime > history->End())
+		return;
 
 	int32 updateWidth = int32((toTime - fLastTime) / step);
 	if (updateWidth < 1)
@@ -827,7 +829,6 @@
 
 	while (true) {
 		DataSource* source = FindDataSource(remove);
-		//debug_printf("SEARCH %s, found %p\n", remove->Name(), source);
 		if (source == NULL) {
 			if (removed)
 				break;
@@ -1116,7 +1117,7 @@
 			if (source == NULL)
 				AddDataSource(baseSource);
 			else
-				RemoveDataSource(source);
+				RemoveDataSource(baseSource);
 
 			Invalidate();
 			break;



From mmu_man at mail.berlios.de  Sun Apr  5 23:56:47 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 5 Apr 2009 23:56:47 +0200
Subject: [Haiku-commits] r29952 - in haiku/trunk/src/add-ons/tracker: .
	iconvader
Message-ID: <200904052156.n35Lulf6008475@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-05 23:56:46 +0200 (Sun, 05 Apr 2009)
New Revision: 29952
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29952&view=rev

Added:
   haiku/trunk/src/add-ons/tracker/iconvader/
   haiku/trunk/src/add-ons/tracker/iconvader/IconVader.cpp
   haiku/trunk/src/add-ons/tracker/iconvader/IconVader.rdef
   haiku/trunk/src/add-ons/tracker/iconvader/Jamfile
Modified:
   haiku/trunk/src/add-ons/tracker/Jamfile
Log:
Prototype of an absolutely insane game.


Modified: haiku/trunk/src/add-ons/tracker/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/tracker/Jamfile	2009-04-05 21:22:14 UTC (rev 29951)
+++ haiku/trunk/src/add-ons/tracker/Jamfile	2009-04-05 21:56:46 UTC (rev 29952)
@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src add-ons tracker ;
 
 SubInclude HAIKU_TOP src add-ons tracker filetype ;
+SubInclude HAIKU_TOP src add-ons tracker iconvader ;
 SubInclude HAIKU_TOP src add-ons tracker opentargetfolder ;
 SubInclude HAIKU_TOP src add-ons tracker mark_as ;
 SubInclude HAIKU_TOP src add-ons tracker zipomatic ;

Added: haiku/trunk/src/add-ons/tracker/iconvader/IconVader.cpp
===================================================================
--- haiku/trunk/src/add-ons/tracker/iconvader/IconVader.cpp	2009-04-05 21:22:14 UTC (rev 29951)
+++ haiku/trunk/src/add-ons/tracker/iconvader/IconVader.cpp	2009-04-05 21:56:46 UTC (rev 29952)
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2006, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include <Alert.h>
+#include <Messenger.h>
+#include <Roster.h>
+#include <View.h>
+
+#include "PoseView.h"
+
+static void Error(BView *view, status_t status, bool unlock=false)
+{
+	BAlert *alert;
+	if (view && unlock)
+		view->UnlockLooper();
+	BString s(strerror(status));
+	alert = new BAlert("Error", s.String(), "Ok");
+	alert->Go();
+}
+
+/*!
+	\brief Tracker add-on entry
+*/
+extern "C" void
+process_refs(entry_ref dir, BMessage* refs, void* /*reserved*/)
+{
+	status_t status;
+	BAlert *alert;
+	BMessenger msgr;
+	BPoseView *view = NULL;
+	BMessage poseViewBackup;
+	BMessage poseViewColumnBackup;
+	uint32 poseViewModeBackup;
+	BString windowTitleBackup;
+
+	refs->PrintToStream();
+	
+	status = refs->FindMessenger("TrackerViewToken", &msgr);
+	if (status < B_OK) {
+		Error(view, status);
+		return;
+	}
+
+	status = B_ERROR;
+	if (!msgr.LockTarget()) {
+		Error(view, status);
+		return;
+	}
+
+	status = B_BAD_HANDLER;
+	view = dynamic_cast<BPoseView *>(msgr.Target(NULL));
+	if (!view) {
+		Error(view, status);
+		return;
+	}
+	if (dynamic_cast<BWindow *>(view->Looper()) == NULL) {
+		Error(view, status, true);
+		return;
+	}
+
+	windowTitleBackup = view->Window()->Title();
+
+	view->SaveColumnState(poseViewColumnBackup);
+	view->SaveState(poseViewBackup);
+	view->SetDragEnabled(false);
+	view->SetSelectionRectEnabled(false);
+	view->SetPoseEditing(false);
+	poseViewModeBackup = view->ViewMode();
+	
+
+	view->SetViewMode(kIconMode);
+
+	view->ShowBarberPole();
+
+
+	view->UnlockLooper();
+
+
+
+	//alert = new BAlert("Error", "Plop", "Ok");
+	//alert->Go();
+
+
+	int32 score = 0;
+	int32 count = 300;
+	while (count--) {
+		status = B_ERROR;
+		if (!msgr.LockTarget()) {
+			Error(view, status);
+			return;
+		}
+
+		BPose *pose;
+		for (int32 i = 0; (pose = view->PoseAtIndex(i)); i++) {
+			if (pose->IsSelected()) {
+				score++;
+				pose->Select(false);
+			}
+			BPoint location = pose->Location();
+			location.x += ((rand() % 20) - 10);
+			location.y += ((rand() % 20) - 10);
+			pose->SetLocation(location);
+		}
+
+		view->CheckPoseVisibility();
+
+		view->Invalidate();
+
+		BString str("Score: ");
+		str << score;
+		view->Window()->SetTitle(str.String());
+		
+		view->UnlockLooper();
+		snooze(100000);
+	}
+
+
+	status = B_ERROR;
+	if (!msgr.LockTarget()) {
+		Error(view, status);
+		return;
+	}
+
+	/*
+	status = B_BAD_HANDLER;
+	view = dynamic_cast<BPoseView *>(msgr.Target(NULL));
+	if (!view)
+		goto err1;
+	*/
+
+	view->HideBarberPole();
+	view->SetViewMode(poseViewModeBackup);
+	view->RestoreState(poseViewBackup);
+	view->RestoreColumnState(poseViewColumnBackup);
+
+	view->Window()->SetTitle(windowTitleBackup.String());
+	
+/*
+	BMessage('_RRC') {
+        TrackerViewToken = BMessenger(port=32004, team=591, target=direct:0x131)
+} */
+
+
+	//be_roster->Launch("application/x-vnd.haiku-filetypes", refs);
+	
+	view->UnlockLooper();
+	return;
+
+}

Added: haiku/trunk/src/add-ons/tracker/iconvader/IconVader.rdef
===================================================================
--- haiku/trunk/src/add-ons/tracker/iconvader/IconVader.rdef	2009-04-05 21:22:14 UTC (rev 29951)
+++ haiku/trunk/src/add-ons/tracker/iconvader/IconVader.rdef	2009-04-05 21:56:46 UTC (rev 29952)
@@ -0,0 +1,111 @@
+/*
+ * FileType.rdef
+ */
+
+// The FileType add-on has no app signature as it is no standalone application
+//resource app_signature "application/x-vnd.Haiku-FileType";
+//resource app_flags B_MULTIPLE_LAUNCH;
+
+resource file_types message {
+	"types" = "application/x-vnd.Be-directory"
+};
+
+resource app_version {
+	major  = 1,
+	middle = 0,
+	minor  = 0,
+
+	/* 0 = development	1 = alpha			2 = beta
+	   3 = gamma		4 = golden master	5 = final */
+	variety = 0,
+
+	internal = 1,
+
+	short_info = "IconVader",
+	long_info = "IconVader, Copyright 2009 Haiku Inc."
+};
+
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
+
+resource vector_icon {
+	$"6E6369660C0500040169020006023CADF43D104EBF02CA3EA2224BF02046648D"
+	$"00FFDB97FFFCAF29020006023A6496BA3F153EBCDD3EEA91492CB5C09D5100FF"
+	$"F7EAFEFDD17B020006023AB3673751B2BC59783FD2D74C71F846F85900C85805"
+	$"FFF06306020106033AC71C0000000000003AB6DB4A6A0045300000F2F2F2FFBC"
+	$"A184AB7D7A7A02000602388A280000000000004000004AF00000000000C85804"
+	$"FFDC952F020006023B37D13A0397BB629E3CB4584A3EDF4A1E9400C6D7F5FF6B"
+	$"94DD020006023C71E33A0C78BA15E43C7D214B02AA49855700E3EDFFFF9EC2FF"
+	$"0200060239AB92381275BA365C3BEB2A4B2A844A9A5F00003CB0FF2C62D00200"
+	$"06033AC7B03884E3B903663B534D48B61F4958AE00FCFFDC7FF8F0BCFFF4DC8A"
+	$"020006023A7061B88A6E3B1AAE3CFAD946AC4F48C79100000000FFA9A06E130A"
+	$"053E303E4452445232452C0A043E303E444C444C360A063E304C3652324630C3"
+	$"BBB893452C0A044C44524452324C36020448224B22452242284225422B482E45"
+	$"2E4B2E4E284E2B4E250605E2024A60505A5660506054604C584A0A0346305232"
+	$"4A2E0A063A443A564A5E56535642463C0A043A443A564A5E4A4B0A043A444A4B"
+	$"5642463C0A044A4B4A5E565356420604AE342D223822382C4632524247080233"
+	$"33273B080231BCA9B6AFBEB40802BC10BCA92B40080237BDE8B821C0BF0802BC"
+	$"1DBF66B8A0C1D708023BBFF3304808023B44BA12C42E100A010105000A00010B"
+	$"1815FF01178400040A00010B18001501178500040A0A010B000A0B070E0D0C10"
+	$"0F12111815FF01178100040A0001001001178400040A020101000A030102000A"
+	$"040103000A060106000A0001041001178400040A050104000A00010710011784"
+	$"00040A070108000A09010A000A08010900"
+};
+
+#else // HAIKU_TARGET_PLATFORM_HAIKU
+
+resource large_icon array {
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF02020008FFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF041B17110802FFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF041B3F3F1B150800FFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFF00FFFFFFFFFFFF021B3F3F1B150A00FFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFF003F00FFFFFFFFFF04151B1B17110800FFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFF003FFD00FFFFFFFFFF02081515150A0800FFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFF003FFDFDFD00FFFFFF00F9000A0A080A00FFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFF003FFDFDFDFD00FFFF003FF97D000000007D0000FFFFFFFFFFFFFF"
+	$"FFFFFFFF003FFDFDFDFDFDFD00FF00F93F3F7D7D7D7D7D7DF900FFFFFFFFFFFF"
+	$"FFFFFF003FFDFDFDFD62FDFD00FF00F9F9F93F3FF9F9F9F97D00FFFFFFFFFFFF"
+	$"FFFF003FFEFDFDFD62FDFDFDFA0000F9F9F9F9F93F3FF97D7D00FFFFFFFFFFFF"
+	$"FF003FFEFEFDFD89FDFDFDFDFA0000F9F9F9F9F9F9F97D7D7D00FFFFFFFFFFFF"
+	$"003FFEFEFEFDB0FD62FD62FDFAFA00F9F9F9F9F9F9F97D7D7D00FFFFFFFFFFFF"
+	$"FF003FFEFEB0FD89FD62FD62FAFA00F9F9F9F9F9F9F97D7D7D00FFFFFFFFFFFF"
+	$"FF003FFEB0FDB0FDB0FD62FAFAFAFA00F9F90000F9F97D7D7D00FFFFFFFFFFFF"
+	$"FFFF003FFEB0FDB0FDB0FDFAFA62FA000000606000007D7D7D00FFFFFFFFFFFF"
+	$"FFFF003FFEFDFDFD89FD62FD62FAFAFA00606060606000007D00FFFFFFFFFFFF"
+	$"FFFFFF003FFDFDB0FD89FD62FAFAFA0060606060606060600000FFFFFFFFFFFF"
+	$"FFFFFF003FFDFDFDB0FD89FAFAFA00606060606060606060606000FFFFFFFFFF"
+	$"FFFFFFFF003FFDB0FDB0FDFDFA006060606060606060606060D5000EFFFFFFFF"
+	$"FFFFFFFF003FFDFDB0FDFDFD003F60606060606060606060D5D5000EFFFFFFFF"
+	$"FFFFFFFFFF003FFDFDFDFDFD00AC3F3F60606060606060D5D5D5000E0E0EFFFF"
+	$"FFFFFFFFFF003FFDFDFDFDFD00ACACAC3F3F60606060D5D5D5D5000E0E0E0E0E"
+	$"FFFFFFFFFFFF003FFDFDFD0000ACACACACAC3F3F60D5D5D5D5D5000E0E0E0E0E"
+	$"FFFFFFFFFFFF003FFDFD000E00ACACACACACACACD5D5D5D5D5D5000E0E0E0EFF"
+	$"FFFFFFFFFFFFFF00FD000E0E00ACACACACACACACD5D5D5D5D5D5000E0E0EFFFF"
+	$"FFFFFFFFFFFFFFFF000E0E0E00ACACACACACACACD5D5D5D5D5000E0E0EFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFF00ACACACACACACACD5D5D5D5000E0E0EFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFF0000ACACACACACD5D5D5000E0E0EFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000ACACACD5D5000E0E0EFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000ACD5000E0E0EFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000E0E0EFFFFFFFFFFFFFFFF"
+};
+
+resource mini_icon array {
+	$"FFFFFFFFFFFFFFFF020200FFFFFFFFFF"
+	$"FFFFFFFFFFFFFF04151E1500FFFFFFFF"
+	$"FFFFFFFFFFFFFF021D1E1C00FFFFFFFF"
+	$"FFFFFFFF00FFFF00151B1600FFFFFFFF"
+	$"FFFFFF003F0000FA0000000000FFFFFF"
+	$"FFFF003FFD0000F9F9FAFAFAFA00FFFF"
+	$"FF003FFEFDFD00F9F9F9F97D7D00FFFF"
+	$"003F62FE89FD00F9F9F900007D00FFFF"
+	$"FF003FB0FD89FA00F90060600000FFFF"
+	$"FF003FFEB0FD620000606060606000FF"
+	$"FFFF003FFD89FA003F3F606060D500FF"
+	$"FFFF003FFDFDFA00ACAC3F3FD5D5000E"
+	$"FFFFFF003FFD0000ACACACACD5D5000E"
+	$"FFFFFF003F000E00ACACACACD5D5000E"
+	$"FFFFFFFF000E0E0E0000ACACD5000E0E"
+	$"FFFFFFFFFFFFFFFFFFFF0000000E0EFF"
+};
+
+#endif // HAIKU_TARGET_PLATFORM_HAIKU
+

Added: haiku/trunk/src/add-ons/tracker/iconvader/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/tracker/iconvader/Jamfile	2009-04-05 21:22:14 UTC (rev 29951)
+++ haiku/trunk/src/add-ons/tracker/iconvader/Jamfile	2009-04-05 21:56:46 UTC (rev 29952)
@@ -0,0 +1,22 @@
+SubDir HAIKU_TOP src add-ons tracker iconvader ;
+
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
+if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
+	UseHeaders [ FDirName $(HAIKU_TOP) src kits tracker ] : true ;
+	UsePrivateHeaders tracker ;
+} else {
+	# private, for testing...
+	SubDirC++Flags -I/work/zeta/src/cebit/os/zeta/system/lib/tracker ;
+	SubDirC++Flags -I/work/zeta/src/cebit/headers_p/tracker ;
+	SubDirC++Flags -I/work/zeta/src/cebit/headers_p ;
+}
+
+# TODO: does not seem to work:
+AddResources IconVader : IconVader.rdef ;
+
+Addon IconVader :
+	IconVader.cpp
+
+	: be tracker
+;



From stippi at mail.berlios.de  Mon Apr  6 00:10:31 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Mon, 6 Apr 2009 00:10:31 +0200
Subject: [Haiku-commits] r29953 - haiku/trunk/src/tests/servers/app/benchmark
Message-ID: <200904052210.n35MAVD6009438@sheep.berlios.de>

Author: stippi
Date: 2009-04-06 00:10:21 +0200 (Mon, 06 Apr 2009)
New Revision: 29953
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29953&view=rev

Removed:
   haiku/trunk/src/tests/servers/app/benchmark/ClippedLineTest.cpp
   haiku/trunk/src/tests/servers/app/benchmark/ClippedLineTest.h
Modified:
   haiku/trunk/src/tests/servers/app/benchmark/Benchmark.cpp
   haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.cpp
   haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.h
   haiku/trunk/src/tests/servers/app/benchmark/Jamfile
   haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.cpp
   haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.h
   haiku/trunk/src/tests/servers/app/benchmark/StringTest.cpp
   haiku/trunk/src/tests/servers/app/benchmark/StringTest.h
   haiku/trunk/src/tests/servers/app/benchmark/Test.cpp
   haiku/trunk/src/tests/servers/app/benchmark/Test.h
   haiku/trunk/src/tests/servers/app/benchmark/TestWindow.cpp
   haiku/trunk/src/tests/servers/app/benchmark/TestWindow.h
   haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.cpp
   haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.h
Log:
One can now chose clipping or no clipping (--clipping or -c) and the drawing
mode. The ClippedLineTest is removed, since that was a dup of RandomLines
anyways.


Modified: haiku/trunk/src/tests/servers/app/benchmark/Benchmark.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/Benchmark.cpp	2009-04-05 21:56:46 UTC (rev 29952)
+++ haiku/trunk/src/tests/servers/app/benchmark/Benchmark.cpp	2009-04-05 22:10:21 UTC (rev 29953)
@@ -9,10 +9,10 @@
 #include <Application.h>
 #include <Screen.h>
 
+#include "DrawingModeToString.h"
 #include "TestWindow.h"
 
 // tests
-#include "ClippedLineTest.h"
 #include "HorizontalLineTest.h"
 #include "RandomLineTest.h"
 #include "StringTest.h"
@@ -25,7 +25,6 @@
 };
 
 const test_info kTestInfos[] = {
-	{ "ClippedLines",		ClippedLineTest::CreateTest },
 	{ "HorizontalLines",	HorizontalLineTest::CreateTest },
 	{ "RandomLines",		RandomLineTest::CreateTest },
 	{ "Strings",			StringTest::CreateTest },
@@ -36,10 +35,12 @@
 
 class Benchmark : public BApplication {
 public:
-	Benchmark(Test* test)
+	Benchmark(Test* test, drawing_mode mode, bool clipping)
 		: BApplication("application/x-vnd.haiku-benchmark"),
 		  fTest(test),
-		  fTestWindow(NULL)
+		  fTestWindow(NULL),
+		  fDrawingMode(mode),
+		  fUseClipping(clipping)
 	{
 	}
 
@@ -59,8 +60,8 @@
 		frame.right = frame.left + width - 1;
 		frame.bottom = frame.top + height - 1;
 
-		fTestWindow = new TestWindow(frame, fTest, B_OP_COPY,
-			BMessenger(this));
+		fTestWindow = new TestWindow(frame, fTest, fDrawingMode,
+			fUseClipping, BMessenger(this));
 	}
 
 	virtual bool QuitRequested()
@@ -77,7 +78,9 @@
 				printf("Test canceled early.\n");
 				// fall through
 			case MSG_TEST_FINISHED:
-				fTest->PrintResults();
+				fTestWindow->Lock();
+				fTest->PrintResults(fTestWindow->View());
+				fTestWindow->Unlock();
 				PostMessage(B_QUIT_REQUESTED);
 				break;
 			default:
@@ -89,6 +92,8 @@
 private:
 	Test*			fTest;
 	TestWindow*		fTestWindow;
+	drawing_mode	fDrawingMode;
+	bool			fUseClipping;
 };
 
 
@@ -114,8 +119,26 @@
 		print_test_list(true);
 		exit(1);
 	}
-	testName = argv[1];
+	// skip program name
+	argc--;
+	argv++;
 
+	testName = argv[0];
+	bool clipping = false;
+	drawing_mode mode = B_OP_COPY;
+
+	while (argc > 0) {
+		drawing_mode possibleMode;
+		if (strcmp(argv[0], "--clipping") == 0 || strcmp(argv[0], "-c") == 0) {
+			clipping = true;
+		} else if (ToDrawingMode(argv[0], possibleMode)) {
+			mode = possibleMode;
+		}
+		argc--;
+		argv++;
+	}
+	
+
 	// find and create the test
 	Test* test = NULL;
 	try {
@@ -136,7 +159,7 @@
 		exit(1);
 	}
 
-	Benchmark app(test);
+	Benchmark app(test, mode, clipping);
 	app.Run();
 	return 0;
 }

Deleted: haiku/trunk/src/tests/servers/app/benchmark/ClippedLineTest.cpp

Deleted: haiku/trunk/src/tests/servers/app/benchmark/ClippedLineTest.h

Modified: haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.cpp	2009-04-05 21:56:46 UTC (rev 29952)
+++ haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.cpp	2009-04-05 22:10:21 UTC (rev 29953)
@@ -72,15 +72,19 @@
 
 
 void
-HorizontalLineTest::PrintResults()
+HorizontalLineTest::PrintResults(BView* view)
 {
 	if (fTestDuration == 0) {
 		printf("Test was not run.\n");
 		return;
 	}
 	bigtime_t timeLeak = system_time() - fTestStart - fTestDuration;
+
+	Test::PrintResults(view);
+
 	printf("Line width: %ld\n", fViewBounds.IntegerWidth() + 1 - 2);
 	printf("Lines per iteration: %ld\n", fViewBounds.IntegerHeight() / 2);
+	printf("Total lines rendered: %llu\n", fLinesRendered);
 	printf("Lines per second: %.3f\n",
 		fLinesRendered * 1000000.0 / fTestDuration);
 	printf("Average time between iterations: %.4f seconds.\n",

Modified: haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.h
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.h	2009-04-05 21:56:46 UTC (rev 29952)
+++ haiku/trunk/src/tests/servers/app/benchmark/HorizontalLineTest.h	2009-04-05 22:10:21 UTC (rev 29953)
@@ -16,7 +16,7 @@
 
 	virtual	void				Prepare(BView* view);
 	virtual	bool				RunIteration(BView* view);
-	virtual	void				PrintResults();
+	virtual	void				PrintResults(BView* view);
 
 	static	Test*				CreateTest();
 

Modified: haiku/trunk/src/tests/servers/app/benchmark/Jamfile
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/Jamfile	2009-04-05 21:56:46 UTC (rev 29952)
+++ haiku/trunk/src/tests/servers/app/benchmark/Jamfile	2009-04-05 22:10:21 UTC (rev 29953)
@@ -8,7 +8,7 @@
 
 Application Benchmark :
 	Benchmark.cpp
-	ClippedLineTest.cpp
+	DrawingModeToString.cpp
 	HorizontalLineTest.cpp
 	RandomLineTest.cpp
 	StringTest.cpp

Modified: haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.cpp	2009-04-05 21:56:46 UTC (rev 29952)
+++ haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.cpp	2009-04-05 22:10:21 UTC (rev 29953)
@@ -76,14 +76,18 @@
 
 
 void
-RandomLineTest::PrintResults()
+RandomLineTest::PrintResults(BView* view)
 {
 	if (fTestDuration == 0) {
 		printf("Test was not run.\n");
 		return;
 	}
 	bigtime_t timeLeak = system_time() - fTestStart - fTestDuration;
+
+	Test::PrintResults(view);
+
 	printf("Lines per iteration: %lu\n", fLinesPerIteration);
+	printf("Total lines rendered: %llu\n", fLinesRendered);
 	printf("Lines per second: %.3f\n",
 		fLinesRendered * 1000000.0 / fTestDuration);
 	printf("Average time between iterations: %.4f seconds.\n",

Modified: haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.h
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.h	2009-04-05 21:56:46 UTC (rev 29952)
+++ haiku/trunk/src/tests/servers/app/benchmark/RandomLineTest.h	2009-04-05 22:10:21 UTC (rev 29953)
@@ -16,7 +16,7 @@
 
 	virtual	void				Prepare(BView* view);
 	virtual	bool				RunIteration(BView* view);
-	virtual	void				PrintResults();
+	virtual	void				PrintResults(BView* view);
 
 	static	Test*				CreateTest();
 

Modified: haiku/trunk/src/tests/servers/app/benchmark/StringTest.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/StringTest.cpp	2009-04-05 21:56:46 UTC (rev 29952)
+++ haiku/trunk/src/tests/servers/app/benchmark/StringTest.cpp	2009-04-05 22:10:21 UTC (rev 29953)
@@ -97,13 +97,16 @@
 
 
 void
-StringTest::PrintResults()
+StringTest::PrintResults(BView* view)
 {
 	if (fTestDuration == 0) {
 		printf("Test was not run.\n");
 		return;
 	}
 	bigtime_t timeLeak = system_time() - fTestStart - fTestDuration;
+
+	Test::PrintResults(view);
+
 	printf("Glyphs per DrawString() call: %ld\n", fGlyphsPerLine);
 	printf("Glyphs per second: %.3f\n",
 		fGlyphsRendered * 1000000.0 / fTestDuration);

Modified: haiku/trunk/src/tests/servers/app/benchmark/StringTest.h
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/StringTest.h	2009-04-05 21:56:46 UTC (rev 29952)
+++ haiku/trunk/src/tests/servers/app/benchmark/StringTest.h	2009-04-05 22:10:21 UTC (rev 29953)
@@ -16,7 +16,7 @@
 
 	virtual	void				Prepare(BView* view);
 	virtual	bool				RunIteration(BView* view);
-	virtual	void				PrintResults();
+	virtual	void				PrintResults(BView* view);
 
 	static	Test*				CreateTest();
 

Modified: haiku/trunk/src/tests/servers/app/benchmark/Test.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/Test.cpp	2009-04-05 21:56:46 UTC (rev 29952)
+++ haiku/trunk/src/tests/servers/app/benchmark/Test.cpp	2009-04-05 22:10:21 UTC (rev 29953)
@@ -5,9 +5,13 @@
 
 #include "Test.h"
 
+#include <stdio.h>
+
 #include <View.h>
 
+#include "DrawingModeToString.h"
 
+
 Test::Test()
 {
 }
@@ -35,3 +39,17 @@
 
 	view->ConstrainClippingRegion(&fClippingRegion);
 }
+
+
+void
+Test::PrintResults(BView* view)
+{
+	if (fClippingRegion.CountRects() > 0)
+		printf("Clipping rects: %ld\n", fClippingRegion.CountRects());
+
+	const char* string;
+	if (ToString(view->DrawingMode(), string))
+		printf("Drawing mode: %s\n", string);
+}
+
+

Modified: haiku/trunk/src/tests/servers/app/benchmark/Test.h
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/Test.h	2009-04-05 21:56:46 UTC (rev 29952)
+++ haiku/trunk/src/tests/servers/app/benchmark/Test.h	2009-04-05 22:10:21 UTC (rev 29953)
@@ -16,7 +16,7 @@
 
 	virtual	void				Prepare(BView* view) = 0;
 	virtual	bool				RunIteration(BView* view) = 0;
-	virtual	void				PrintResults() = 0;
+	virtual	void				PrintResults(BView* view);
 
 			void				SetupClipping(BView* view);
 

Modified: haiku/trunk/src/tests/servers/app/benchmark/TestWindow.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/TestWindow.cpp	2009-04-05 21:56:46 UTC (rev 29952)
+++ haiku/trunk/src/tests/servers/app/benchmark/TestWindow.cpp	2009-04-05 22:10:21 UTC (rev 29953)
@@ -8,10 +8,12 @@
 
 
 TestView::TestView(BRect frame, Test* test, drawing_mode mode,
-		const BMessenger& target)
-	: BView(frame, "test view", B_FOLLOW_ALL, B_WILL_DRAW),
-	  fTest(test),
-	  fTarget(target)
+		bool useClipping, const BMessenger& target)
+	:
+	BView(frame, "test view", B_FOLLOW_ALL, B_WILL_DRAW),
+	fTest(test),
+	fTarget(target),
+	fUseClipping(useClipping)
 {
 	SetDrawingMode(mode);
 }
@@ -21,6 +23,8 @@
 TestView::AttachedToWindow()
 {
 	fTest->Prepare(this);
+	if (fUseClipping)
+		fTest->SetupClipping(this);
 }
 
 
@@ -37,14 +41,14 @@
 
 
 TestWindow::TestWindow(BRect frame, Test* test, drawing_mode mode,
-		const BMessenger& target)
+		bool useClipping, const BMessenger& target)
 	: BWindow(frame, "Test Window", B_TITLED_WINDOW_LOOK,
 		B_FLOATING_ALL_WINDOW_FEEL, B_NOT_ZOOMABLE | B_NOT_RESIZABLE),
 	  fTarget(target),
 	  fAllowedToQuit(false)
 {
-	TestView* view = new TestView(Bounds(), test, mode, target);
-	AddChild(view);
+	fTestView = new TestView(Bounds(), test, mode, useClipping, target);
+	AddChild(fTestView);
 	Show();
 }
 

Modified: haiku/trunk/src/tests/servers/app/benchmark/TestWindow.h
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/TestWindow.h	2009-04-05 21:56:46 UTC (rev 29952)
+++ haiku/trunk/src/tests/servers/app/benchmark/TestWindow.h	2009-04-05 22:10:21 UTC (rev 29953)
@@ -22,7 +22,7 @@
 class TestView : public BView {
 public:
 								TestView(BRect frame, Test* test,
-									drawing_mode mode,
+									drawing_mode mode, bool useClipping,
 									const BMessenger& target);
 
 	virtual	void				AttachedToWindow();
@@ -31,21 +31,24 @@
 private:
 			Test*				fTest;
 			BMessenger			fTarget;
+			bool				fUseClipping;
 };
 
 // TestWindow
 class TestWindow : public BWindow {
 public:
 								TestWindow(BRect fame, Test* test,
-									drawing_mode mode,
+									drawing_mode mode, bool useClipping,
 									const BMessenger& target);
 
 	virtual	bool				QuitRequested();
 
 			void				SetAllowedToQuit(bool allowed);
+			BView*				View() const { return fTestView; }
 private:
 			BMessenger			fTarget;
 			bool				fAllowedToQuit;
+			TestView*			fTestView;
 };
 
 #endif // TEST_WINDOW_H

Modified: haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.cpp	2009-04-05 21:56:46 UTC (rev 29952)
+++ haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.cpp	2009-04-05 22:10:21 UTC (rev 29953)
@@ -72,15 +72,19 @@
 
 
 void
-VerticalLineTest::PrintResults()
+VerticalLineTest::PrintResults(BView* view)
 {
 	if (fTestDuration == 0) {
 		printf("Test was not run.\n");
 		return;
 	}
 	bigtime_t timeLeak = system_time() - fTestStart - fTestDuration;
+
+	Test::PrintResults(view);
+
 	printf("Line height: %ld\n", fViewBounds.IntegerHeight() + 1 - 2);
 	printf("Lines per iteration: %ld\n", fViewBounds.IntegerWidth() / 2);
+	printf("Total lines rendered: %llu\n", fLinesRendered);
 	printf("Lines per second: %.3f\n",
 		fLinesRendered * 1000000.0 / fTestDuration);
 	printf("Average time between iterations: %.4f seconds.\n",

Modified: haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.h
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.h	2009-04-05 21:56:46 UTC (rev 29952)
+++ haiku/trunk/src/tests/servers/app/benchmark/VerticalLineTest.h	2009-04-05 22:10:21 UTC (rev 29953)
@@ -16,7 +16,7 @@
 
 	virtual	void				Prepare(BView* view);
 	virtual	bool				RunIteration(BView* view);
-	virtual	void				PrintResults();
+	virtual	void				PrintResults(BView* view);
 
 	static	Test*				CreateTest();
 



From mmu_man at mail.berlios.de  Mon Apr  6 00:19:20 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Mon, 6 Apr 2009 00:19:20 +0200
Subject: [Haiku-commits] r29954 - haiku/trunk/src/add-ons/tracker/iconvader
Message-ID: <200904052219.n35MJKb3010162@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-06 00:19:20 +0200 (Mon, 06 Apr 2009)
New Revision: 29954
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29954&view=rev

Modified:
   haiku/trunk/src/add-ons/tracker/iconvader/IconVader.cpp
Log:
Score 1 point/file, 2 points/dir and -10/symlink...


Modified: haiku/trunk/src/add-ons/tracker/iconvader/IconVader.cpp
===================================================================
--- haiku/trunk/src/add-ons/tracker/iconvader/IconVader.cpp	2009-04-05 22:10:21 UTC (rev 29953)
+++ haiku/trunk/src/add-ons/tracker/iconvader/IconVader.cpp	2009-04-05 22:19:20 UTC (rev 29954)
@@ -96,7 +96,12 @@
 		BPose *pose;
 		for (int32 i = 0; (pose = view->PoseAtIndex(i)); i++) {
 			if (pose->IsSelected()) {
-				score++;
+				if (pose->TargetModel()->IsFile())
+					score++;
+				if (pose->TargetModel()->IsDirectory())
+					score+=2;
+				if (pose->TargetModel()->IsSymLink())
+					score-=10;
 				pose->Select(false);
 			}
 			BPoint location = pose->Location();



From mmu_man at mail.berlios.de  Mon Apr  6 00:28:29 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Mon, 6 Apr 2009 00:28:29 +0200
Subject: [Haiku-commits] r29955 - haiku/trunk/src/add-ons/tracker/iconvader
Message-ID: <200904052228.n35MSTum011624@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-06 00:28:29 +0200 (Mon, 06 Apr 2009)
New Revision: 29955
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29955&view=rev

Modified:
   haiku/trunk/src/add-ons/tracker/iconvader/IconVader.cpp
Log:
Show an explanation alert, and a score total.


Modified: haiku/trunk/src/add-ons/tracker/iconvader/IconVader.cpp
===================================================================
--- haiku/trunk/src/add-ons/tracker/iconvader/IconVader.cpp	2009-04-05 22:19:20 UTC (rev 29954)
+++ haiku/trunk/src/add-ons/tracker/iconvader/IconVader.cpp	2009-04-05 22:28:29 UTC (rev 29955)
@@ -80,8 +80,8 @@
 
 
 
-	//alert = new BAlert("Error", "Plop", "Ok");
-	//alert->Go();
+	alert = new BAlert("Error", "IconVader:\nClick on the icons to get points. Avoid symlinks!", "Ok");
+	alert->Go();
 
 
 	int32 score = 0;
@@ -122,7 +122,12 @@
 		snooze(100000);
 	}
 
+	BString scoreStr("You scored ");
+	scoreStr << score << " points!";
+	alert = new BAlert("Error", scoreStr.String(), "Cool!");
+	alert->Go();
 
+
 	status = B_ERROR;
 	if (!msgr.LockTarget()) {
 		Error(view, status);



From zooey at mail.berlios.de  Mon Apr  6 00:28:55 2009
From: zooey at mail.berlios.de (zooey at mail.berlios.de)
Date: Mon, 6 Apr 2009 00:28:55 +0200
Subject: [Haiku-commits] r29956 - haiku/trunk/src/tests/kits/interface
Message-ID: <200904052228.n35MSt2r011658@sheep.berlios.de>

Author: zooey
Date: 2009-04-06 00:28:54 +0200 (Mon, 06 Apr 2009)
New Revision: 29956
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29956&view=rev

Added:
   haiku/trunk/src/tests/kits/interface/TextViewTest.cpp
Modified:
   haiku/trunk/src/tests/kits/interface/Jamfile
Log:
* added a test for BTextView which exposes a couple of problems
  with large contents


Modified: haiku/trunk/src/tests/kits/interface/Jamfile
===================================================================
--- haiku/trunk/src/tests/kits/interface/Jamfile	2009-04-05 22:28:29 UTC (rev 29955)
+++ haiku/trunk/src/tests/kits/interface/Jamfile	2009-04-05 22:28:54 UTC (rev 29956)
@@ -147,6 +147,11 @@
 	: be
 ;
 
+SimpleTest TextViewTest :
+	TextViewTest.cpp
+	: be
+	;
+
 SEARCH on [ FGristFiles
 		ScrollView.cpp CheckBox.cpp ChannelSlider.cpp ChannelControl.cpp Slider.cpp Control.cpp
 	] = [ FDirName $(HAIKU_TOP) src kits interface ] ;

Added: haiku/trunk/src/tests/kits/interface/TextViewTest.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/TextViewTest.cpp	2009-04-05 22:28:29 UTC (rev 29955)
+++ haiku/trunk/src/tests/kits/interface/TextViewTest.cpp	2009-04-05 22:28:54 UTC (rev 29956)
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2009, Oliver Tappe, zooey at hirschkaefer.de. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include <Application.h>
+#include <Window.h>
+#include <ScrollView.h>
+#include <String.h>
+#include <TextView.h>
+
+#include <stdio.h>
+
+
+class Window : public BWindow {
+	public:
+		Window();
+
+		virtual bool QuitRequested();
+};
+
+
+//	#pragma mark -
+
+
+Window::Window()
+	: BWindow(BRect(100, 100, 800, 500), "TextView-Test",
+			B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS)
+{
+	BRect rect = Bounds().InsetByCopy(20, 20);
+
+	BTextView* textView = new BTextView(rect, "text-o-mo", 
+		rect.OffsetToCopy(0, 0), B_FOLLOW_ALL);
+
+	BScrollView* scrollView = new BScrollView("scroll-o-mo", textView, 
+		B_FOLLOW_ALL_SIDES, 0, true, true);
+	AddChild(scrollView);
+	
+	printf("starting to prepare content ... [%Ld]\n", system_time());
+	
+	// generate a million lines of content
+	const int32 kLineCount = 1000000;
+	const int32 kLineNoSize = 6;
+	BString line
+		= ":	you should see a pretty large text in this textview	...\n";
+	BString format = BString("%*d") << line;
+	BString content;
+	int32 lineLength = line.Length() + kLineNoSize;
+	int32 contentLength = lineLength * kLineCount;
+	char* currLine = content.LockBuffer(contentLength);
+	if (currLine) {
+		int32 lineNo = 0;
+		char buf[10];
+		for ( ; lineNo < kLineCount; currLine += lineLength)
+			sprintf(currLine, format.String(), kLineNoSize, lineNo++);
+		content.UnlockBuffer(contentLength);
+	}
+	printf("setting content ... [%Ld]\n", system_time());
+	textView->SetText(content.String());
+	printf("done. [%Ld]\n", system_time());
+}
+
+
+bool
+Window::QuitRequested()
+{
+	be_app->PostMessage(B_QUIT_REQUESTED);
+	return true;
+}
+
+
+//	#pragma mark -
+
+
+class Application : public BApplication {
+	public:
+		Application();
+
+		virtual void ReadyToRun(void);
+};
+
+
+Application::Application()
+	: BApplication("application/x-vnd.haiku-test")
+{
+}
+
+
+void
+Application::ReadyToRun(void)
+{
+	BWindow *window = new Window();
+	window->Show();
+}
+
+
+//	#pragma mark -
+
+
+int 
+main(int argc, char **argv)
+{
+	Application app;
+
+	app.Run();
+	return 0;
+}
+



From anevilyak at mail.berlios.de  Mon Apr  6 00:33:57 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Mon, 6 Apr 2009 00:33:57 +0200
Subject: [Haiku-commits] r29957 - in haiku/trunk/src:
	add-ons/mail_daemon/outbound_protocols/smtp
	add-ons/media/plugins/avi_reader add-ons/translators/jpeg
	apps/icon-o-matic apps/installer kits/tracker
	preferences/appearance preferences/keymap servers/app
Message-ID: <200904052233.n35MXvbH014217@sheep.berlios.de>

Author: anevilyak
Date: 2009-04-06 00:33:53 +0200 (Mon, 06 Apr 2009)
New Revision: 29957
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29957&view=rev

Modified:
   haiku/trunk/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
   haiku/trunk/src/add-ons/media/plugins/avi_reader/Jamfile
   haiku/trunk/src/add-ons/translators/jpeg/Jamfile
   haiku/trunk/src/apps/icon-o-matic/Jamfile
   haiku/trunk/src/apps/installer/Jamfile
   haiku/trunk/src/kits/tracker/Jamfile
   haiku/trunk/src/preferences/appearance/Jamfile
   haiku/trunk/src/preferences/keymap/Jamfile
   haiku/trunk/src/servers/app/Jamfile
Log:
Fix several cases of forgetting to include libstdc++ in the libs. This allows a successful build of Haiku on gcc4 Haiku, though it's presently unclear to me why this didn't prevent linking on any other platform (gcc2 haiku, and gcc2/4 cross compilers from FBSD had no issues here).



Modified: haiku/trunk/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile	2009-04-05 22:28:54 UTC (rev 29956)
+++ haiku/trunk/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile	2009-04-05 22:33:53 UTC (rev 29957)
@@ -25,7 +25,7 @@
 	smtp.cpp
 	md5c.c ;
 
-LinkAgainst SMTP : be libmail.so $(TARGET_NETWORK_LIBS) ;
+LinkAgainst SMTP : be libmail.so $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++) ;
 
 if $(USE_SSL) {
 	LinkAgainst SMTP : $(sslDir)/lib/libssl.so $(sslDir)/lib/libcrypto.so ;

Modified: haiku/trunk/src/add-ons/media/plugins/avi_reader/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avi_reader/Jamfile	2009-04-05 22:28:54 UTC (rev 29956)
+++ haiku/trunk/src/add-ons/media/plugins/avi_reader/Jamfile	2009-04-05 22:33:53 UTC (rev 29957)
@@ -10,7 +10,7 @@
 	avi_reader.cpp
 	:
 	libopendml.a
-	be libmedia.so
+	be libmedia.so $(TARGET_LIBSTDC++)
 ;
 
 SubInclude HAIKU_TOP src add-ons media plugins avi_reader libOpenDML ;

Modified: haiku/trunk/src/add-ons/translators/jpeg/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/translators/jpeg/Jamfile	2009-04-05 22:28:54 UTC (rev 29956)
+++ haiku/trunk/src/add-ons/translators/jpeg/Jamfile	2009-04-05 22:33:53 UTC (rev 29957)
@@ -92,7 +92,7 @@
 	exif_parser.cpp
 	JPEGTranslator.cpp
 
-	: be translation libjpeg.a
+	: be translation libjpeg.a $(TARGET_LIBSTDC++)
 	: true
 ;
 

Modified: haiku/trunk/src/apps/icon-o-matic/Jamfile
===================================================================
--- haiku/trunk/src/apps/icon-o-matic/Jamfile	2009-04-05 22:28:54 UTC (rev 29956)
+++ haiku/trunk/src/apps/icon-o-matic/Jamfile	2009-04-05 22:33:53 UTC (rev 29957)
@@ -297,7 +297,7 @@
 	MainWindow.cpp
 	Util.cpp
 
-	: be tracker translation libshared.a libagg.a libexpat.a
+	: be tracker translation libshared.a libagg.a libexpat.a $(TARGET_LIBSTDC++)
 
 	: Icon-O-Matic.rdef
 ;

Modified: haiku/trunk/src/apps/installer/Jamfile
===================================================================
--- haiku/trunk/src/apps/installer/Jamfile	2009-04-05 22:28:54 UTC (rev 29956)
+++ haiku/trunk/src/apps/installer/Jamfile	2009-04-05 22:33:53 UTC (rev 29957)
@@ -14,5 +14,5 @@
 	InstallerWindow.cpp
 	PackageViews.cpp
 	PartitionMenuItem.cpp
-	: be tracker translation
+	: be tracker translation $(TARGET_LIBSTDC++)
 	: Installer.rdef ;

Modified: haiku/trunk/src/kits/tracker/Jamfile
===================================================================
--- haiku/trunk/src/kits/tracker/Jamfile	2009-04-05 22:28:54 UTC (rev 29956)
+++ haiku/trunk/src/kits/tracker/Jamfile	2009-04-05 22:33:53 UTC (rev 29957)
@@ -93,7 +93,7 @@
 	VolumeWindow.cpp
 	WidgetAttributeText.cpp
 
-	: be translation $(vector_icon_libs)
+	: be translation $(vector_icon_libs) $(TARGET_LIBSTDC++)
 
 	;
 

Modified: haiku/trunk/src/preferences/appearance/Jamfile
===================================================================
--- haiku/trunk/src/preferences/appearance/Jamfile	2009-04-05 22:28:54 UTC (rev 29956)
+++ haiku/trunk/src/preferences/appearance/Jamfile	2009-04-05 22:33:53 UTC (rev 29957)
@@ -22,7 +22,7 @@
 	#FontMenu.cpp
 	#MenuView.cpp
 	
-	: be
+	: be $(TARGET_LIBSTDC++)
 	: Appearance.rdef
 	;
 

Modified: haiku/trunk/src/preferences/keymap/Jamfile
===================================================================
--- haiku/trunk/src/preferences/keymap/Jamfile	2009-04-05 22:28:54 UTC (rev 29956)
+++ haiku/trunk/src/preferences/keymap/Jamfile	2009-04-05 22:33:53 UTC (rev 29957)
@@ -13,6 +13,6 @@
 	KeymapMessageFilter.cpp
 	KeymapWindow.cpp
 
-	: be tracker
+	: be tracker $(TARGET_LIBSTDC++)
 	: Keymap.rdef
 ;

Modified: haiku/trunk/src/servers/app/Jamfile
===================================================================
--- haiku/trunk/src/servers/app/Jamfile	2009-04-05 22:28:54 UTC (rev 29956)
+++ haiku/trunk/src/servers/app/Jamfile	2009-04-05 22:33:53 UTC (rev 29957)
@@ -63,7 +63,7 @@
 	:
 	libtranslation.so libbe.so
 	libasdrawing.a libpainter.a libagg.a libfreetype.so
-	libtextencoding.so libshared.a
+	libtextencoding.so libshared.a $(TARGET_LIBSTDC++)
 
 	: app_server.rdef
 ;



From axeld at pinc-software.de  Mon Apr  6 00:48:09 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Mon, 06 Apr 2009 00:48:09 +0200
Subject: [Haiku-commits] r29936 - in haiku/trunk: build/jam data/etc
 data/system data/system/data data/system/data/Canna
 data/system/data/KeyboardLayouts data/system/data/joysticks
 data/system/data/licenses
In-Reply-To: <10314280659-BeMail@kirilla>
Message-ID: <54886679348-BeMail@ibm>

Jonas Sundstr?m wrote:
> Could Haiku know itself what style of keyboard
> is present and its keymap? 

I hope it could, but our HID driver would not support that yet, anyway 
(as we only use the boot protocol).

> (PS2/USB - any difference in what is possible 
> to find out about the keyboard?)

PS/2 has no possibility of this at all, but USB has some.

> MacOS X has a user dialog at install time asking
> the user to press the key directly to the right of
> the left-side shift key, IIRC, giving the system
> some rudimentary idea which of 3 major types of
> keyboards the current one is.

I came across that one as well; it would be a possibility for PS/2 
keyboards, but ultimately, it doesn't matter that much, anyway -- they 
keymap isn't changed in any way on Haiku, it's just for the looks in 
Keymap.

> For Haiku this dialog could happen when opening
> the  Keymap preferences the first time. (if its
> not possible to probe a keyboard silently)

I'm not sure yet how that will work, but I plan to have per keyboard 
keymaps. It might be solved similarly to what the app_server currently 
does for monitors (ie. use whatever the keyboard reports, remember 
model and product number to recognize similar keyboards that share the 
same settings, but can still have different ones).

Bye,
   Axel.



From anevilyak at gmail.com  Mon Apr  6 01:11:25 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Sun, 5 Apr 2009 18:11:25 -0500
Subject: [Haiku-commits] r29956 - haiku/trunk/src/tests/kits/interface
In-Reply-To: <200904052228.n35MSt2r011658@sheep.berlios.de>
References: <200904052228.n35MSt2r011658@sheep.berlios.de>
Message-ID: <f019d2f30904051611j7098cfcgbf5e608b7f042773@mail.gmail.com>

On Sun, Apr 5, 2009 at 5:28 PM,  <zooey at mail.berlios.de> wrote:
> + ? ? ? BString format = BString("%*d") << line;

Was this by any chance supposed to be "%6d" ?

Regards,

Rene


From kirilla at mail.berlios.de  Mon Apr  6 01:48:01 2009
From: kirilla at mail.berlios.de (kirilla at mail.berlios.de)
Date: Mon, 6 Apr 2009 01:48:01 +0200
Subject: [Haiku-commits] r29958 - haiku/trunk/src/kits/tracker
Message-ID: <200904052348.n35Nm16F025549@sheep.berlios.de>

Author: kirilla
Date: 2009-04-06 01:47:58 +0200 (Mon, 06 Apr 2009)
New Revision: 29958
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29958&view=rev

Modified:
   haiku/trunk/src/kits/tracker/AutoMounter.cpp
   haiku/trunk/src/kits/tracker/ContainerWindow.cpp
   haiku/trunk/src/kits/tracker/FSClipboard.cpp
   haiku/trunk/src/kits/tracker/FSUtils.cpp
   haiku/trunk/src/kits/tracker/FavoritesConfig.cpp
   haiku/trunk/src/kits/tracker/FilePanelPriv.cpp
   haiku/trunk/src/kits/tracker/OpenWithWindow.cpp
   haiku/trunk/src/kits/tracker/PoseView.cpp
   haiku/trunk/src/kits/tracker/Tracker.cpp
   haiku/trunk/src/kits/tracker/WidgetAttributeText.cpp
Log:
Setting the escape key as shortcut for the Cancel options of Tracker's dialogs.

Modified: haiku/trunk/src/kits/tracker/AutoMounter.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/AutoMounter.cpp	2009-04-05 22:33:53 UTC (rev 29957)
+++ haiku/trunk/src/kits/tracker/AutoMounter.cpp	2009-04-05 23:47:58 UTC (rev 29958)
@@ -232,6 +232,7 @@
 		BAlert* alert = new BAlert("Mount Warning", string.String(),
 			"Mount Read/Write", "Cancel", "Mount Read-only",
 			B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
+		alert->SetShortcut(1, B_ESCAPE);
 		int32 choice = alert->Go();
 		switch (choice) {
 			case 0:
@@ -284,8 +285,10 @@
 		"Note: if an application is currently writing to the volume, unmounting"
 		" it now might result in loss of data.\n";
 
-	int32 choice = (new BAlert("", text.String(), "Cancel", "Force Unmount",
-		NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+	BAlert* alert = new BAlert("", text.String(), "Cancel", "Force Unmount",
+		NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+	alert->SetShortcut(0, B_ESCAPE);
+	int32 choice = alert->Go();
 
 	return choice == 1;
 }
@@ -1018,8 +1021,10 @@
 			text << "To unmount " << partition->VolumeName() << " some query "
 			"windows have to be closed. Would you like to close the query "
 			"windows?";
-			if ((new BAlert("", text.String(), "Cancel", "Close and unmount", NULL,
-				B_WIDTH_FROM_LABEL))->Go() == 0)
+			BAlert* alert = new BAlert("", text.String(), "Cancel", 
+				"Close and unmount", NULL, B_WIDTH_FROM_LABEL);
+			alert->SetShortcut(0, B_ESCAPE);
+			if (alert->Go() == 0)
 				return partition;
 			tracker->CloseActiveQueryWindows(params->device);
 		}

Modified: haiku/trunk/src/kits/tracker/ContainerWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-04-05 22:33:53 UTC (rev 29957)
+++ haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-04-05 23:47:58 UTC (rev 29958)
@@ -2973,8 +2973,10 @@
 	if (result != B_OK) {
 		char buffer[1024];
 		sprintf(buffer, "Error %s loading Add-On %s.", strerror(result), addonRef.name);
-		(new BAlert("", buffer, "Cancel", 0, 0,
-			B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+		BAlert* alert = new BAlert("", buffer, "Cancel", 0, 0,
+			B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+		alert->SetShortcut(0, B_ESCAPE);
+		alert->Go();
 		return;
 	}
 

Modified: haiku/trunk/src/kits/tracker/FSClipboard.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/FSClipboard.cpp	2009-04-05 22:33:53 UTC (rev 29957)
+++ haiku/trunk/src/kits/tracker/FSClipboard.cpp	2009-04-05 23:47:58 UTC (rev 29958)
@@ -462,8 +462,10 @@
 
 	// can't copy/paste to root('/') directory
 	if (model->IsRoot()) {
-		(new BAlert("", kNoCopyToRootStr, "Cancel", NULL, NULL,
-			B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+		BAlert *alert = new BAlert("", kNoCopyToRootStr, "Cancel", 
+			NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+		alert->SetShortcut(0, B_ESCAPE);
+		alert->Go();
 		okToMove = false;			
 	}
 
@@ -472,8 +474,10 @@
 
 	// can't copy items into the trash
 	if (copyList->CountItems() > 0 && FSIsTrashDir(&entry)) {
-		(new BAlert("", kNoCopyToTrashStr, "Cancel", NULL, NULL,
-			B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+		BAlert *alert = new BAlert("", kNoCopyToTrashStr, "Cancel",
+			NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+		alert->SetShortcut(0, B_ESCAPE);
+		alert->Go();
 		okToMove = false;
 	}
 

Modified: haiku/trunk/src/kits/tracker/FSUtils.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/FSUtils.cpp	2009-04-05 22:33:53 UTC (rev 29957)
+++ haiku/trunk/src/kits/tracker/FSUtils.cpp	2009-04-05 23:47:58 UTC (rev 29958)
@@ -180,12 +180,17 @@
 	char buffer[512];
 	sprintf(buffer, message, name, strerror(error));
 
-	if (allowContinue)
-		return (new BAlert("", buffer, "Cancel", "OK", 0,
-			B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() != 0;
+	if (allowContinue) {
+		BAlert *alert = new BAlert("", buffer, "Cancel", "OK", 0,
+			B_WIDTH_AS_USUAL, B_STOP_ALERT);
+		alert->SetShortcut(0, B_ESCAPE);
+		return alert->Go() != 0;
+	}
 
-	(new BAlert("", buffer, "Cancel", 0, 0,
-			B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+	BAlert *alert = new BAlert("", buffer, "Cancel", 0, 0,
+		B_WIDTH_AS_USUAL, B_STOP_ALERT);
+	alert->SetShortcut(0, B_ESCAPE);
+	alert->Go();
 	return false;
 }
 
@@ -546,8 +551,11 @@
 		if (gStatusWindow)
 			gStatusWindow->RemoveStatusItem(thread);
 
-		(new BAlert("", "You can't move or copy items to read-only volumes.",
-			"Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+		BAlert *alert = new BAlert("", 
+			"You can't move or copy items to read-only volumes.",
+			"Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+		alert->SetShortcut(0, B_ESCAPE);
+		alert->Go();
 		return B_ERROR;
 	}
 
@@ -565,8 +573,10 @@
 			else
 				errorStr = "You cannot copy or move the root directory.";
 
-			(new BAlert("", errorStr, "Cancel", 0, 0,
-				B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+			BAlert *alert = new BAlert("", errorStr, "Cancel", 0, 0,
+				B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+			alert->SetShortcut(0, B_ESCAPE);
+			alert->Go();
 			return B_ERROR;
 		}
 		if (moveMode == kMoveSelectionTo
@@ -604,8 +614,10 @@
 
 					// check for free space before starting copy
 					if ((totalSize + (4 * kKBSize)) >= dstVol->FreeBytes()) {
-						(new BAlert("", kNoFreeSpace, "Cancel", 0, 0,
-							B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+						BAlert *alert = new BAlert("", kNoFreeSpace, "Cancel",
+							0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+						alert->SetShortcut(0, B_ESCAPE);
+						alert->Go();
 						return B_ERROR;
 					}
 				}
@@ -766,8 +778,10 @@
 			if (sourceEntry.InitCheck() != B_OK) {
 				BString error;
 				error << "Error moving \"" << srcRef->name << "\".";
-				(new BAlert("", error.String(), "Cancel", 0, 0,
-					B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+				BAlert *alert = new BAlert("", error.String(), "Cancel", 0, 0,
+					B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+				alert->SetShortcut(0, B_ESCAPE);
+				alert->Go();
 				break;
 			}
 
@@ -781,8 +795,10 @@
 					BString error;
 					error << "Error moving \"" << srcRef->name << "\" to Trash. ("
 						<< strerror(result) << ")";
-					(new BAlert("", error.String(), "Cancel", 0, 0,
-						B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+					BAlert *alert = new BAlert("", error.String(), "Cancel",
+						0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+					alert->SetShortcut(0, B_ESCAPE);
+					alert->Go();
 					break;
 				}
 				continue;
@@ -1619,8 +1635,10 @@
 				volume.GetName(name);
 				char buffer[256];
 				sprintf(buffer, "Cannot unmount the boot volume \"%s\".", name);
-				(new BAlert("", buffer, "Cancel", 0, 0,
-					B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+				BAlert *alert = new BAlert("", buffer, "Cancel", 0, 0,
+					B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+				alert->SetShortcut(0, B_ESCAPE);
+				alert->Go();
 			} else {
 				BMessage message(kUnmountVolume);
 				message.AddInt32("device_id", volume.Device());
@@ -1723,8 +1741,11 @@
 		const char *verb = (moveMode == kMoveSelectionTo) ? "moving" : "copying";
 		char replaceMsg[256];
 		sprintf(replaceMsg, kReplaceManyStr, verb, verb);
-
-		switch ((new BAlert("", replaceMsg, "Cancel", "Prompt", "Replace All"))->Go()) {
+		
+		BAlert *alert = new BAlert("", replaceMsg,
+			"Cancel", "Prompt", "Replace All");
+		alert->SetShortcut(0, B_ESCAPE);
+		switch (alert->Go()) {
 			case 0:
 				return kCanceled;
 
@@ -1857,11 +1878,12 @@
 
 		// special case single collision (don't need Replace All shortcut)
 		BAlert *alert;
-		if (multipleCollisions || sourceIsDirectory)
+		if (multipleCollisions || sourceIsDirectory) {
 			alert = new BAlert("", replaceMsg, "Skip", "Replace All");
-		else
+		} else {
 			alert = new BAlert("", replaceMsg, "Cancel", "Replace");
-
+			alert->SetShortcut(0, B_ESCAPE);
+		}
 		switch (alert->Go()) {
 			case 0:		// user selected "Cancel" or "Skip"
 				replaceAll = kCanceled;
@@ -1887,8 +1909,10 @@
 		BString error;
 		error << "There was a problem trying to replace \""
 			<< name << "\". The item might be open or busy.";
-		(new BAlert("", error.String(), "Cancel", 0, 0,
-			B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+		BAlert *alert = new BAlert("", error.String(), "Cancel", 0, 0,
+			B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+		alert->SetShortcut(0, B_ESCAPE);
+		alert->Go();
 	}
 
 	return err;
@@ -2769,8 +2793,10 @@
 		}
 	}
 
-	(new BAlert("", "Sorry, could not create a new folder.", "Cancel", 0, 0,
-		B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+	BAlert *alert = new BAlert("", "Sorry, could not create a new folder.",
+		"Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+	alert->SetShortcut(0, B_ESCAPE);
+	alert->Go();
 	return result;
 }
 
@@ -2914,12 +2940,17 @@
 		alertString << "Could not open \"" << appRef->name << "\" (" << strerror(error) << "). ";
 		if (refs && openWithOK) {
 			alertString << kFindAlternativeStr;
-			if ((new BAlert("", alertString.String(), "Cancel", "Find", 0,
-					B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go() == 1)
+			BAlert *alert = new BAlert("", alertString.String(),
+				"Cancel", "Find", 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+			alert->SetShortcut(0, B_ESCAPE);
+			if (alert->Go() == 1)
 				error = TrackerOpenWith(refs);
-		} else
-			(new BAlert("", alertString.String(), "Cancel", 0, 0,
-				B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+		} else {
+			BAlert *alert = new BAlert("", alertString.String(),
+				"Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+			alert->SetShortcut(0, B_ESCAPE);
+			alert->Go();
+		}
 	}
 }
 
@@ -3131,8 +3162,11 @@
 				// offer the possibility to change the permissions
 
 				alertString << "\nShould this be fixed?";
-				if ((new BAlert("", alertString.String(), "Cancel", "Proceed", 0,
-						B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go() == 1) {
+				BAlert *alert = new BAlert("", alertString.String(),
+					"Cancel", "Proceed", 0,	B_WIDTH_AS_USUAL,
+					B_WARNING_ALERT);
+				alert->SetShortcut(0, B_ESCAPE);
+				if (alert->Go() == 1) {
 					BEntry entry(&documentRef);
 					mode_t permissions;
 
@@ -3185,12 +3219,18 @@
 		if (openWithOK) {
 			ASSERT(alternative);
 			alertString << alternative;
-			if ((new BAlert("", alertString.String(), "Cancel", "Find", 0,
-					B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go() == 1)
+			BAlert *alert = new BAlert("", alertString.String(),
+				"Cancel", "Find", 0, B_WIDTH_AS_USUAL,
+				B_WARNING_ALERT);
+			alert->SetShortcut(0, B_ESCAPE);
+			if (alert->Go() == 1)
 				error = TrackerOpenWith(refs);
-		} else
-			(new BAlert("", alertString.String(), "Cancel", 0, 0,
-					B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+		} else {
+			BAlert *alert = new BAlert("", alertString.String(),
+				"Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+			alert->SetShortcut(0, B_ESCAPE);
+			alert->Go();
+		}
 	}
 }
 

Modified: haiku/trunk/src/kits/tracker/FavoritesConfig.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/FavoritesConfig.cpp	2009-04-05 22:33:53 UTC (rev 29957)
+++ haiku/trunk/src/kits/tracker/FavoritesConfig.cpp	2009-04-05 23:47:58 UTC (rev 29958)
@@ -2236,8 +2236,12 @@
 			{
 				const char *text = fNameFld->Text();
 				if (!text || text[0] == '\0'){
-					if ((new BAlert("", "The new name is empty, please enter a name", 
-						"Cancel", "OK", NULL, B_WIDTH_AS_USUAL))->Go() == 0)
+					BAlert *alert = new BAlert("",
+						"The new name is empty, please "
+						"enter a name", "Cancel", "OK", NULL, 
+						B_WIDTH_AS_USUAL);
+					alert->SetShortcut(0, B_ESCAPE);
+					if (alert->Go() == 0)
 						return;
 				}
 				BMessage nameChangeMessage(kNameChange);

Modified: haiku/trunk/src/kits/tracker/FilePanelPriv.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/FilePanelPriv.cpp	2009-04-05 22:33:53 UTC (rev 29957)
+++ haiku/trunk/src/kits/tracker/FilePanelPriv.cpp	2009-04-05 23:47:58 UTC (rev 29958)
@@ -1389,6 +1389,16 @@
 	BAlert *alert = new BAlert("", text, button1, button2, button3,
 		B_WIDTH_AS_USUAL, B_WARNING_ALERT);
 	alert->MoveTo(Frame().left + 10, Frame().top + 10);
+
+	if (strncmp(button1, "Cancel", 7))
+		alert->SetShortcut(0, B_ESCAPE);
+
+	if (strncmp(button2, "Cancel", 7))
+		alert->SetShortcut(1, B_ESCAPE);
+
+	if (strncmp(button3, "Cancel", 7))
+		alert->SetShortcut(2, B_ESCAPE);	
+	
 	return alert->Go();
 }
 

Modified: haiku/trunk/src/kits/tracker/OpenWithWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/OpenWithWindow.cpp	2009-04-05 22:33:53 UTC (rev 29957)
+++ haiku/trunk/src/kits/tracker/OpenWithWindow.cpp	2009-04-05 23:47:58 UTC (rev 29958)
@@ -678,8 +678,10 @@
 				"publisher of the application and ask them to update their application "
 				"to list the type of your document as supported.";
 
-			if ((new BAlert("", warning.String(), "Cancel", "Open", 0,
-				B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go() == 0)
+			BAlert *alert = new BAlert("", warning.String(),
+				"Cancel", "Open", 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+			alert->SetShortcut(0, B_ESCAPE);
+			if (alert->Go() == 0)
 				return;
 		}
 		// else - once we have an extensible sniffer, tell users to ask

Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-05 22:33:53 UTC (rev 29957)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-05 23:47:58 UTC (rev 29958)
@@ -2392,9 +2392,14 @@
 {
 	// make sure last column is not removed
 	if (CountColumns() == 1) {
-		if (runAlert)
-			(new BAlert("", "You must have at least one Attribute showing.",
-				"Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+		if (runAlert) {
+			BAlert *alert = new BAlert("",	
+				"You must have at least one Attribute showing.",
+				"Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+			alert->SetShortcut(0, B_ESCAPE);
+			alert->Go();
+		}
+
 		return false;
 	}
 
@@ -4491,22 +4496,28 @@
 	bool okToMove = true;
 
 	if (destFolder->IsRoot()) {
-		(new BAlert("", kNoCopyToRootStr, "Cancel", NULL, NULL,
-			B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+		BAlert *alert = new BAlert("", kNoCopyToRootStr, "Cancel",
+			NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+		alert->SetShortcut(0, B_ESCAPE);
+		alert->Go();
 		okToMove = false;
 	}
 
 	// can't copy items into the trash
 	if (forceCopy && destIsTrash) {
-		(new BAlert("", kNoCopyToTrashStr, "Cancel", NULL, NULL,
-			B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+		BAlert *alert = new BAlert("", kNoCopyToTrashStr, "Cancel",
+			NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+		alert->SetShortcut(0, B_ESCAPE);
+		alert->Go();
 		okToMove = false;
 	}
 
 	// can't create symlinks into the trash
 	if (createLink && destIsTrash) {
-		(new BAlert("", kNoLinkToTrashStr, "Cancel", NULL, NULL,
-			B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+		BAlert *alert = new BAlert("", kNoLinkToTrashStr, "Cancel",
+			NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+		alert->SetShortcut(0, B_ESCAPE);
+		alert->Go();
 		okToMove = false;
 	}
 
@@ -4514,8 +4525,10 @@
 	if (srcWindow->TargetModel()->IsQuery()
 		&& !forceCopy && !destIsTrash && !createLink) {
 		srcWindow->UpdateIfNeeded();
-		okToMove = (new BAlert("", kOkToMoveStr, "Cancel", "Move", NULL,
-			B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go() == 1;
+		BAlert *alert = new BAlert("", kOkToMoveStr, "Cancel",
+			"Move", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+		alert->SetShortcut(0, B_ESCAPE);
+		okToMove = alert->Go() == 1;
 	}
 
 	if (okToMove) {
@@ -5377,9 +5390,10 @@
 {
 	BVolume volume (ref->device);
 	if (volume.IsReadOnly()) {
-		BAlert *alert (new BAlert ("", "Files cannot be moved or deleted "
-			"from a read-only volume.", "Cancel", NULL, NULL, 
-			B_WIDTH_AS_USUAL, B_STOP_ALERT));
+		BAlert *alert = new BAlert ("", "Files cannot be moved or "
+			"deleted from a read-only volume.", "Cancel", NULL,
+			NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+		alert->SetShortcut(0, B_ESCAPE);
 		alert->Go();
 		return false;
 	}
@@ -5427,7 +5441,9 @@
 				"be reverted.)";
 		}
 
-		if ((new BAlert("", alertText, "Cancel", "Delete"))->Go() == 0)
+		BAlert *alert = new BAlert("", alertText, "Cancel", "Delete");
+		alert->SetShortcut(0, B_ESCAPE);
+		if (alert->Go() == 0)
 			return;
 	}
 
@@ -7644,8 +7660,11 @@
 {
 	BMessenger tracker(kTrackerSignature);
 	if (!tracker.IsValid()) {
-		(new BAlert("", "The Tracker must be running to see Info windows.",
-			"Cancel", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+		BAlert *alert = new BAlert("", "The Tracker must be running "
+			"to see Info windows.", "Cancel", NULL, NULL,
+			B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+		alert->SetShortcut(0, B_ESCAPE);
+		alert->Go();
 		return;
  	}
 	SendSelectionAsRefs(kGetInfo);
@@ -7657,8 +7676,11 @@
 {
 	BMessenger tracker(kTrackerSignature);
 	if (!tracker.IsValid()) {
-		(new BAlert("", "The Tracker must be running to see set the default printer.",
-			"Cancel", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+		BAlert *alert = new BAlert("", "The Tracker must be running "
+			"to see set the default printer.", "Cancel", NULL, 
+			NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+		alert->SetShortcut(0, B_ESCAPE);
+		alert->Go();
 		return;
  	}
 	SendSelectionAsRefs(kMakeActivePrinter);

Modified: haiku/trunk/src/kits/tracker/Tracker.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/Tracker.cpp	2009-04-05 22:33:53 UTC (rev 29957)
+++ haiku/trunk/src/kits/tracker/Tracker.cpp	2009-04-05 23:47:58 UTC (rev 29958)
@@ -680,9 +680,11 @@
 
 		if (!brokenLinkWithSpecificHandler) {
 			delete model;
-			(new BAlert("", "There was an error resolving the link.",
-				"Cancel", 0, 0,
-				B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+			BAlert *alert = new BAlert("",
+				"There was an error resolving the link.",
+				"Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+			alert->SetShortcut(0, B_ESCAPE);
+			alert->Go();
 			return result;
 		}
 	} else 

Modified: haiku/trunk/src/kits/tracker/WidgetAttributeText.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/WidgetAttributeText.cpp	2009-04-05 22:33:53 UTC (rev 29957)
+++ haiku/trunk/src/kits/tracker/WidgetAttributeText.cpp	2009-04-05 23:47:58 UTC (rev 29958)
@@ -1602,8 +1602,10 @@
 		&& type != B_DOUBLE_TYPE
 		&& type != B_CHAR_TYPE
 		&& type != B_BOOL_TYPE) {
-		(new BAlert("", "Sorry, you cannot edit that attribute.",
-			"Cancel", 0, 0, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+		BAlert *alert = new BAlert("", "Sorry, you cannot edit that attribute.",
+			"Cancel", 0, 0, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+		alert->SetShortcut(0, B_ESCAPE);
+		alert->Go();
 		return false;
 	}
 
@@ -1634,8 +1636,11 @@
 				sscanf(textView->Text(), "%c", &ch);
 				//Check if we read the start of a multi-byte glyph:
 				if (!isprint(ch)) {
-					(new BAlert("", "Sorry, The 'Character' attribute cannot store a multi-byte glyph.",
-						"Cancel", 0, 0, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+					BAlert *alert = new BAlert("", "Sorry, The 'Character' "
+						"attribute cannot store a multi-byte glyph.",
+						"Cancel", 0, 0, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+					alert->SetShortcut(0, B_ESCAPE);
+					alert->Go();
 					return false;
 				}
 			
@@ -1732,8 +1737,11 @@
 	}
 
 	if (size < 0) {
-		(new BAlert("", "There was an error writing the attribute.",
-			"Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+		BAlert *alert = new BAlert("", 
+			"There was an error writing the attribute.", 
+			"Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+		alert->SetShortcut(0, B_CANCEL);
+		alert->Go();
 
 		fValueIsDefined = false;
 		return false;



From stippi at mail.berlios.de  Mon Apr  6 10:06:07 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Mon, 6 Apr 2009 10:06:07 +0200
Subject: [Haiku-commits] r29959 - haiku/trunk/src/tests/servers/app/benchmark
Message-ID: <200904060806.n36867ws000786@sheep.berlios.de>

Author: stippi
Date: 2009-04-06 10:06:05 +0200 (Mon, 06 Apr 2009)
New Revision: 29959
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29959&view=rev

Added:
   haiku/trunk/src/tests/servers/app/benchmark/DrawingModeToString.cpp
   haiku/trunk/src/tests/servers/app/benchmark/DrawingModeToString.h
Log:
If you had added Benchmark as a target, your build would have been broken,
because I forgot to add these files in my last commit... sorry.


Added: haiku/trunk/src/tests/servers/app/benchmark/DrawingModeToString.cpp
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/DrawingModeToString.cpp	2009-04-05 23:47:58 UTC (rev 29958)
+++ haiku/trunk/src/tests/servers/app/benchmark/DrawingModeToString.cpp	2009-04-06 08:06:05 UTC (rev 29959)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2009 Stephan A?mus <superstippi at gmx.de>
+ * All rights reserved. Distributed under the terms of the MIT license.
+ */
+
+#include "DrawingModeToString.h"
+
+struct DrawingModeString {
+	const char*		string;
+	drawing_mode	mode;
+};
+
+
+static const DrawingModeString kDrawingModes[] = {
+	{ "B_OP_COPY",		B_OP_COPY },
+	{ "B_OP_OVER",		B_OP_OVER },
+	{ "B_OP_ERASE",		B_OP_ERASE },
+	{ "B_OP_INVERT",	B_OP_INVERT },
+	{ "B_OP_ADD",		B_OP_ADD },
+	{ "B_OP_SUBTRACT",	B_OP_SUBTRACT },
+	{ "B_OP_BLEND",		B_OP_BLEND },
+	{ "B_OP_MIN",		B_OP_MIN },
+	{ "B_OP_MAX",		B_OP_MAX },
+	{ "B_OP_SELECT",	B_OP_SELECT },
+	{ "B_OP_ALPHA",		B_OP_ALPHA }
+};
+
+
+bool ToDrawingMode(const char* string, drawing_mode& mode)
+{
+	int entries = sizeof(kDrawingModes) / sizeof(DrawingModeString);
+	for (int32 i = 0; i < entries; i++) {
+		if (strcmp(kDrawingModes[i].string, string) == 0) {
+			mode = kDrawingModes[i].mode;
+			return true;
+		}
+	}
+	return false;
+}
+
+
+bool ToString(drawing_mode mode, const char*& string)
+{
+	int entries = sizeof(kDrawingModes) / sizeof(DrawingModeString);
+	for (int32 i = 0; i < entries; i++) {
+		if (kDrawingModes[i].mode == mode) {
+			string = kDrawingModes[i].string;
+			return true;
+		}
+	}
+	return false;
+}

Added: haiku/trunk/src/tests/servers/app/benchmark/DrawingModeToString.h
===================================================================
--- haiku/trunk/src/tests/servers/app/benchmark/DrawingModeToString.h	2009-04-05 23:47:58 UTC (rev 29958)
+++ haiku/trunk/src/tests/servers/app/benchmark/DrawingModeToString.h	2009-04-06 08:06:05 UTC (rev 29959)
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2009 Stephan A?mus <superstippi at gmx.de>
+ * All rights reserved. Distributed under the terms of the MIT license.
+ */
+#ifndef DRAWING_MODE_TO_STRING_H
+#define DRAWING_MODE_TO_STRING_H
+
+#include <InterfaceDefs.h>
+
+
+bool ToDrawingMode(const char* string, drawing_mode& mode);
+bool ToString(drawing_mode mode, const char*& string);
+
+
+#endif // DRAWING_MODE_TO_STRING_H



From zooey at mail.berlios.de  Mon Apr  6 11:00:54 2009
From: zooey at mail.berlios.de (zooey at mail.berlios.de)
Date: Mon, 6 Apr 2009 11:00:54 +0200
Subject: [Haiku-commits] r29960 - haiku/trunk/src/kits/interface
Message-ID: <200904060900.n3690spZ006743@sheep.berlios.de>

Author: zooey
Date: 2009-04-06 11:00:52 +0200 (Mon, 06 Apr 2009)
New Revision: 29960
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29960&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
fixed two scalability problems that made BTextView perform rather slow
with large contents:
* when searching for tab characters in DrawLine(), we now limit the search 
  to the current line, too (not only the end of the style) - this avoids
  scanning to the end of large contents repeatedly
* there's no need to refresh from the edit location to the end of the
  content in _DoInsertText(), we only need to refresh the part that has
  changed

Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-04-06 08:06:05 UTC (rev 29959)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-04-06 09:00:52 UTC (rev 29960)
@@ -3905,7 +3905,7 @@
 	const text_run_array *inRuns)
 {
 	_CancelInputMethod();
-	
+
 	if (TextLength() + inLength > MaxBytes())
 		return;
 	
@@ -3923,12 +3923,11 @@
 	InsertText(inText, inLength, inOffset, inRuns);
 
 	// offset the caret/selection 	 
-	//int32 saveStart = fSelStart; 	 
-	fSelStart += inLength; 	 
-	fSelEnd += inLength;
+	fSelStart += inLength;
+	fClickOffset = fSelEnd = fSelStart;
 	
 	// recalc line breaks and draw the text
-	_Refresh(inOffset, textLength, true, false);
+	_Refresh(inOffset, inOffset + inLength, true, true);
 }
 
 
@@ -3997,7 +3996,7 @@
 		view->SetFont(font);
 		view->SetHighColor(*color);
 
-		tabChars = numBytes;
+		tabChars = min_c(numBytes, length);
 		do {
 			foundTab = fText->FindChar(B_TAB, offset, &tabChars);
 			if (foundTab) {
@@ -4046,9 +4045,7 @@
 			}
 
 			int32 returnedBytes = tabChars;
-			const char *stringToDraw = fText->GetString(offset,
-				&returnedBytes);
-
+			const char *stringToDraw = fText->GetString(offset, &returnedBytes);
 			view->SetDrawingMode(textRenderingMode);
 			view->DrawString(stringToDraw, returnedBytes);
 			if (foundTab) {
@@ -4064,7 +4061,7 @@
 			offset += tabChars;
 			length -= tabChars;
 			numBytes -= tabChars;
-			tabChars = numBytes;
+			tabChars = min_c(numBytes, length);
 			numTabs = 0;
 		} while (foundTab && tabChars > 0);
 	}



From axeld at mail.berlios.de  Mon Apr  6 11:37:42 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Mon, 6 Apr 2009 11:37:42 +0200
Subject: [Haiku-commits] r29961 -
	haiku/trunk/src/add-ons/kernel/network/protocols/tcp
Message-ID: <200904060937.n369bgTe011360@sheep.berlios.de>

Author: axeld
Date: 2009-04-06 11:37:40 +0200 (Mon, 06 Apr 2009)
New Revision: 29961
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29961&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
Log:
* This should fix the tcp build when tracing is turned on.


Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp	2009-04-06 09:00:52 UTC (rev 29960)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp	2009-04-06 09:37:40 UTC (rev 29961)
@@ -121,15 +121,15 @@
 class Send : public AbstractTraceEntry {
 public:
 	Send(TCPEndpoint* endpoint, tcp_segment_header& segment, net_buffer* buffer,
-			uint32 firstSequence, uint32 lastSequence)
+			tcp_sequence firstSequence, tcp_sequence lastSequence)
 		:
 		fEndpoint(endpoint),
 		fBuffer(buffer),
 		fBufferSize(buffer->size),
 		fSequence(segment.sequence),
 		fAcknowledge(segment.acknowledge),
-		fFirstSequence(firstSequence),
-		fLastSequence(lastSequence),
+		fFirstSequence(firstSequence.Number()),
+		fLastSequence(lastSequence.Number()),
 		fState(endpoint->State()),
 		fFlags(segment.flags)
 	{



From zooey at hirschkaefer.de  Mon Apr  6 13:50:34 2009
From: zooey at hirschkaefer.de (Oliver Tappe)
Date: Mon, 06 Apr 2009 11:50:34 +0000
Subject: [Haiku-commits] r29956 - haiku/trunk/src/tests/kits/interface
In-Reply-To: <f019d2f30904051611j7098cfcgbf5e608b7f042773@mail.gmail.com>
References: <200904052228.n35MSt2r011658@sheep.berlios.de>
	<f019d2f30904051611j7098cfcgbf5e608b7f042773@mail.gmail.com>
Message-ID: <20090406115034.1276.1@bepc.1239017784.fake>

Hi Rene,

On 2009-04-06 at 11:40:44 [+0000], Rene Gollent <anevilyak at gmail.com> wrote:
> On Sun, Apr 5, 2009 at 5:28 PM,  <zooey at mail.berlios.de> wrote:
> > +       BString format = BString("%*d") << line;
> 
> Was this by any chance supposed to be "%6d" ?

Thanks for the heads up, but no: since the 6 is being used at another place 
where the size of the required memory is computed, I thought it would be 
better (safer) to use a constant for both occurrences, such that it is more 
obvious that they belong together.

cheers,
    Oliver


From zooey at mail.berlios.de  Mon Apr  6 13:31:23 2009
From: zooey at mail.berlios.de (zooey at mail.berlios.de)
Date: Mon, 6 Apr 2009 13:31:23 +0200
Subject: [Haiku-commits] r29962 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200904061131.n36BVNcq012984@sheep.berlios.de>

Author: zooey
Date: 2009-04-06 13:31:10 +0200 (Mon, 06 Apr 2009)
New Revision: 29962
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29962&view=rev

Modified:
   haiku/trunk/headers/os/interface/TextView.h
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
* Instead of invoking _DrawLines out of the app-server drawing context,
  we request the drawing via Invalidate() - this make use of the app-server's
  potential double buffering, whenever that is active. This change reduces 
  flickering in VESA mode considerably.

Modified: haiku/trunk/headers/os/interface/TextView.h
===================================================================
--- haiku/trunk/headers/os/interface/TextView.h	2009-04-06 09:37:40 UTC (rev 29961)
+++ haiku/trunk/headers/os/interface/TextView.h	2009-04-06 11:31:10 UTC (rev 29962)
@@ -324,6 +324,10 @@
 
 			void				_DrawLines(int32 startLine, int32 endLine,
 									int32 startOffset = -1, bool erase = false);
+			void				_RequestDrawLines(int32 startLine, 
+									int32 endLine, int32 startOffset = -1, 
+									bool erase = false);
+			
 			void				_DrawCaret(int32 offset);
 			void				_ShowCaret();
 			void				_HideCaret();

Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-04-06 09:37:40 UTC (rev 29961)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-04-06 11:31:10 UTC (rev 29962)
@@ -1628,7 +1628,8 @@
 		_Refresh(startOffset, endOffset, startOffset != endOffset, false);
 	} else {
 		// the line breaks wont change, simply redraw
-		_DrawLines(LineAt(startOffset), LineAt(endOffset), startOffset, true);
+		_RequestDrawLines(LineAt(startOffset), LineAt(endOffset), startOffset,
+			true);
 	}
 }
 
@@ -3536,7 +3537,7 @@
 
 	_AutoResize(false);
 
-	_DrawLines(fromLine, toLine, drawOffset, erase);
+	_RequestDrawLines(fromLine, toLine, drawOffset, erase);
 
 	// erase the area below the text
 	BRect eraseRect = bounds;
@@ -4164,6 +4165,29 @@
 
 
 void
+BTextView::_RequestDrawLines(int32 startLine, int32 endLine, 
+	int32 startOffset, bool erase)
+{
+	if (!Window())
+		return;
+
+	long maxLine = fLines->NumLines() - 1;
+	if (startLine < 0)
+		startLine = 0;
+	if (endLine > maxLine)
+		endLine = maxLine;
+
+	STELine *from = (*fLines)[startLine];
+	STELine *to = endLine == maxLine ? NULL : (*fLines)[endLine + 1];
+	BRect invalidRect(fTextRect.left, from->origin + fTextRect.top,
+		fTextRect.right, 
+		to != NULL ? to->origin + fTextRect.top : fTextRect.bottom);
+	Invalidate(invalidRect);
+	Window()->UpdateIfNeeded();
+}
+
+
+void
 BTextView::_DrawCaret(int32 offset)
 {
 	float lineHeight;
@@ -4566,7 +4590,7 @@
 	fTextRect.right = fTextRect.left + newWidth;
 
 	if (redraw)
-		_DrawLines(0, 0);
+		_RequestDrawLines(0, 0);
 
 	// erase any potential left over outside the text rect
 	// (can only be on right hand side)



From bonefish at mail.berlios.de  Mon Apr  6 13:33:06 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Mon, 6 Apr 2009 13:33:06 +0200
Subject: [Haiku-commits] r29963 - in
	haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs: . ntfs
Message-ID: <200904061133.n36BX6mq014771@sheep.berlios.de>

Author: bonefish
Date: 2009-04-06 13:33:04 +0200 (Mon, 06 Apr 2009)
New Revision: 29963
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29963&view=rev

Added:
   haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/ntfs/
   haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/ntfs/Jamfile
Modified:
   haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/Jamfile
Log:
Added jamfile for building ntfs for userland.


Modified: haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/Jamfile
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/Jamfile	2009-04-06 11:31:10 UTC (rev 29962)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/Jamfile	2009-04-06 11:33:04 UTC (rev 29963)
@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src tests add-ons kernel file_systems userlandfs ;
 
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems userlandfs bfs ;
+SubInclude HAIKU_TOP src tests add-ons kernel file_systems userlandfs ntfs ;
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems userlandfs r5 ;
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems userlandfs ramfs ;
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems userlandfs reiserfs ;

Added: haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/ntfs/Jamfile
===================================================================
--- haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/ntfs/Jamfile	2009-04-06 11:31:10 UTC (rev 29962)
+++ haiku/trunk/src/tests/add-ons/kernel/file_systems/userlandfs/ntfs/Jamfile	2009-04-06 11:33:04 UTC (rev 29963)
@@ -0,0 +1,44 @@
+SubDir HAIKU_TOP src tests add-ons kernel file_systems userlandfs ntfs ;
+
+local ntfsTop = [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems ntfs ] ;
+
+SEARCH_SOURCE += $(ntfsTop) ;
+
+# set some additional defines
+{
+	local defines =
+		USER=1
+	;
+
+	defines = [ FDefines $(defines) ] ;
+	SubDirCcFlags $(defines) ;
+	SubDirC++Flags $(defines) ;
+}
+
+SubDirHdrs [ FDirName $(ntfsTop) libntfs ] ;
+
+SubDirCcFlags -DHAVE_CONFIG_H=1 ;
+SubDirC++Flags -DHAVE_CONFIG_H=1 ;
+
+UsePrivateHeaders kernel ;
+
+
+Addon <userland>ntfs
+	:
+	attributes.c
+	mime_table.c
+	utils.c
+	ntfsdir.c
+	volume_util.c
+	fs_func.c
+	kernel_interface.c
+	:
+	libntfs.a libuserlandfs_haiku_kernel.so
+;
+
+SEARCH on [ FGristFiles
+		kernel_cpp.cpp
+	] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
+
+SubIncludeGPL HAIKU_TOP src add-ons kernel file_systems ntfs libntfs ;
+



From bonefish at mail.berlios.de  Mon Apr  6 13:37:22 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Mon, 6 Apr 2009 13:37:22 +0200
Subject: [Haiku-commits] r29964 -
	haiku/trunk/src/add-ons/kernel/file_systems/ntfs
Message-ID: <200904061137.n36BbMn3017888@sheep.berlios.de>

Author: bonefish
Date: 2009-04-06 13:37:19 +0200 (Mon, 06 Apr 2009)
New Revision: 29964
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29964&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/ntfs/fs_func.c
   haiku/trunk/src/add-ons/kernel/file_systems/ntfs/ntfs.h
Log:
* fs_walk():
  - Get the actual node type. This seemed to be the main problem with using
    ntfs -- paths beyond the root directory could not be resolved.
  - Fixed memory leak in case of error.
* Pass node types instead of mode_t's to publish_vnode().
* Automatic white space cleanup.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/ntfs/fs_func.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ntfs/fs_func.c	2009-04-06 11:33:04 UTC (rev 29963)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ntfs/fs_func.c	2009-04-06 11:37:19 UTC (rev 29964)
@@ -47,6 +47,55 @@
 	char label[256];
 } identify_cookie;
 
+
+static status_t
+get_node_type(ntfs_inode* ni, int* _type)
+{
+	ntfs_attr* na;
+
+	// get the node type
+	if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) {
+		*_type = S_IFDIR;
+		return B_OK;
+	}
+
+	// Regular or Interix (INTX) file.
+	*_type = S_IFREG;
+
+	na = ntfs_attr_open(ni, AT_DATA, NULL, 0);
+	if (!na)
+		return ENOENT;
+
+	if (!ni->flags & FILE_ATTR_HIDDEN) {
+		if (na->data_size == 0)
+			*_type = S_IFIFO;
+	}
+
+	if (na->data_size <= sizeof(INTX_FILE_TYPES) + sizeof(ntfschar) * MAX_PATH
+			&& na->data_size > sizeof(INTX_FILE_TYPES)) {
+		INTX_FILE* intx_file;
+
+		intx_file = ntfs_malloc(na->data_size);
+		if (!intx_file)	{
+			ntfs_attr_close(na);
+			return EINVAL;
+		}
+		if (ntfs_attr_pread(na, 0, na->data_size, intx_file) != na->data_size) {
+			free(intx_file);
+			ntfs_attr_close(na);
+			return EINVAL;
+		}
+		if (intx_file->magic == INTX_SYMBOLIC_LINK)
+			*_type = S_IFLNK;
+		free(intx_file);
+	}
+
+	ntfs_attr_close(na);
+
+	return B_OK;
+}
+
+
 float
 fs_identify_partition(int fd, partition_data *partition, void **_cookie)
 {
@@ -182,7 +231,8 @@
 			newNode->vnid = *_rootID;
 			newNode->parent_vnid = -1;
 
-			result = publish_vnode( _vol, *_rootID, (void*)newNode, &gNTFSVnodeOps, FS_DIR_MODE, 0);
+			result = publish_vnode( _vol, *_rootID, (void*)newNode,
+				&gNTFSVnodeOps, S_IFDIR, 0);
 			if ( result != B_NO_ERROR )	{
 				free( ns );
 				result = EINVAL;
@@ -395,7 +445,6 @@
 }
 
 
-
 status_t
 fs_read_vnode(fs_volume *_vol, ino_t vnid, fs_vnode *_node, int *_type, uint32 *_flags, bool reenter)
 {
@@ -418,11 +467,16 @@
 		char *name = NULL;
 
 		ni = ntfs_inode_open(ns->ntvol, vnid);
-		if(ni==NULL) {
+		if (ni == NULL) {
 			result = ENOENT;
 			goto exit;
-		 }
+		}
 
+		// get the node type
+		result = get_node_type(ni, _type);
+		if (result != B_OK)
+			goto exit;
+
 		newNode->vnid = vnid;
 		newNode->parent_vnid = ntfs_get_parent_ref(ni);
 
@@ -438,15 +492,17 @@
 		}
 
 		_node->private_node = newNode;
-		*_type = 0666;
 	}
 	else
 		result = ENOMEM;
 exit:
 
-	if(ni)
+	if (ni != NULL)
 		ntfs_inode_close(ni);
 
+	if (result != B_OK && newNode != NULL)
+		free(newNode);
+
 	ERRPRINT("fs_read_vnode - EXIT, result is %s\n", strerror(result));
 
 	if ( !reenter )
@@ -869,7 +925,8 @@
 			set_mime(newNode, name);
 
 			result = B_NO_ERROR;
-			result = publish_vnode(_vol, *_vnid, (void*)newNode,&gNTFSVnodeOps, FS_FILE_MODE, 0);
+			result = publish_vnode(_vol, *_vnid, (void*)newNode,&gNTFSVnodeOps,
+				S_IFREG, 0);
 
 			ntfs_mark_free_space_outdated(ns);
 
@@ -1263,7 +1320,8 @@
 			fmode = FS_FILE_MODE;
 	}
 
-	if ((result = publish_vnode(_vol, MREF(sym->mft_no), symnode,&gNTFSVnodeOps, FS_SLNK_MODE | fmode, 0)) != 0)
+	if ((result = publish_vnode(_vol, MREF(sym->mft_no), symnode,
+			&gNTFSVnodeOps, S_IFLNK | fmode, 0)) != 0)
 		ERRPRINT("fs_symlink - new_vnode failed for vnid %Ld: %s\n", MREF(sym->mft_no), strerror(result));
 
 	put_vnode(_vol, MREF(sym->mft_no) );
@@ -1344,7 +1402,8 @@
 		newNode->parent_vnid = MREF(bi->mft_no);
 		set_mime(newNode, ".***");
 
-		result = publish_vnode(_vol, vnid, (void*)newNode,&gNTFSVnodeOps, FS_DIR_MODE, 0);
+		result = publish_vnode(_vol, vnid, (void*)newNode, &gNTFSVnodeOps,
+			S_IFDIR, 0);
 
 		put_vnode(_vol, MREF(ni->mft_no));
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/ntfs/ntfs.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/ntfs/ntfs.h	2009-04-06 11:33:04 UTC (rev 29963)
+++ haiku/trunk/src/add-ons/kernel/file_systems/ntfs/ntfs.h	2009-04-06 11:37:19 UTC (rev 29964)
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 2006-2007 Troeglazov Gerasim (3dEyes**)
  *
  * This program/include file is free software; you can redistribute it and/or
@@ -16,7 +16,7 @@
  * distribution in the file COPYING); if not, write to the Free Software
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
- 
+
 #ifndef _NTFS_H
 #define _NTFS_H
 
@@ -77,12 +77,12 @@
 } \
 \
 LOCK((vol)->vlock); \
-} 
+}
 
 #define 	UNLOCK_VOL(vol) \
 { \
 UNLOCK((vol)->vlock); \
-} 
+}
 
 typedef enum {
 	NF_FreeClustersOutdate	= (1 << 0),  		// Information about amount of free clusters is outdated.
@@ -105,8 +105,8 @@
 
 #define ntfs_mark_free_space_outdated(ns) (ns->state |= (NF_FreeClustersOutdate | NF_FreeMFTOutdate));
 
- 
- 
+
+
 typedef struct nspace
 {
 	ntfs_volume	*ntvol;
@@ -118,7 +118,7 @@
 #endif
 	int			free_cluster_count;
 	char		volumeLabel[MAX_PATH];
-	
+
 	ulong 		flags;
 
 	int 		state;
@@ -130,11 +130,11 @@
 	BOOL 		force;
 	BOOL 		debug;
 	BOOL 		noatime;
-	BOOL 		no_detach;	
-	
-	
+	BOOL 		no_detach;
+
+
 	lock		vlock;
-		
+
 } nspace;
 
 



From stippi at mail.berlios.de  Mon Apr  6 14:38:16 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Mon, 6 Apr 2009 14:38:16 +0200
Subject: [Haiku-commits] r29965 - haiku/trunk/src/servers/app
Message-ID: <200904061238.n36CcGot010756@sheep.berlios.de>

Author: stippi
Date: 2009-04-06 14:38:15 +0200 (Mon, 06 Apr 2009)
New Revision: 29965
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29965&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Avoid using the heap allocator for most string drawing when reading the command
from the link. My benchmark measuring is inconclusive, the numbers are sometimes
very different. At first sight, it looks like string drawing can be up to
double as fast with this change, but sometimes, the numbers are about the same.
Hm.


Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2009-04-06 11:37:19 UTC (rev 29964)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2009-04-06 12:38:15 UTC (rev 29965)
@@ -2788,9 +2788,15 @@
 			if (link.Read<ViewDrawStringInfo>(&info) != B_OK)
 				break;
 
-			char* string = (char*)malloc(info.stringLength + 1);
-			if (string == NULL)
-				break;
+			const ssize_t kMaxStackStringSize = 4096;
+			char stackString[kMaxStackStringSize];
+			char* string = stackString;
+			if (info.stringLength >= kMaxStackStringSize) {
+				// NOTE: Careful, the + 1 is for termination!
+				string = (char*)malloc((info.stringLength + 1 + 63) / 64 * 64);
+				if (string == NULL)
+					break;
+			}
 
 			escapement_delta* delta = NULL;
 			if (code == AS_DRAW_STRING_WITH_DELTA) {
@@ -2799,7 +2805,8 @@
 			}
 
 			if (link.Read(string, info.stringLength) != B_OK) {
-				free(string);
+				if (string != stackString)
+					free(string);
 				break;
 			}
 			// Terminate the string, if nothing else, it's important
@@ -2816,7 +2823,8 @@
 			fCurrentView->ConvertFromScreenForDrawing(&penLocation);
 			fCurrentView->CurrentState()->SetPenLocation(penLocation);
 
-			free(string);
+			if (string != stackString)
+				free(string);
 			break;
 		}
 



From stippi at mail.berlios.de  Mon Apr  6 15:15:18 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Mon, 6 Apr 2009 15:15:18 +0200
Subject: [Haiku-commits] r29966 - haiku/trunk/build/jam
Message-ID: <200904061315.n36DFIKA017389@sheep.berlios.de>

Author: stippi
Date: 2009-04-06 15:15:16 +0200 (Mon, 06 Apr 2009)
New Revision: 29966
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29966&view=rev

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Patch by BGA/Matt Madia: Fix the location of lpe symlink home -> common. Thanks!


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-04-06 12:38:15 UTC (rev 29965)
+++ haiku/trunk/build/jam/OptionalPackages	2009-04-06 13:15:16 UTC (rev 29966)
@@ -484,7 +484,7 @@
 
 		AddSymlinkToHaikuImage home config be Applications
 			: /boot/apps/Pe/Pe ;
-		AddSymlinkToHaikuImage home config bin
+		AddSymlinkToHaikuImage common bin
 			: /boot/apps/Pe/lpe ;
 	}
 }



From stippi at mail.berlios.de  Mon Apr  6 15:50:26 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Mon, 6 Apr 2009 15:50:26 +0200
Subject: [Haiku-commits] r29967 - haiku/trunk/src/kits/tracker
Message-ID: <200904061350.n36DoQuY021581@sheep.berlios.de>

Author: stippi
Date: 2009-04-06 15:50:24 +0200 (Mon, 06 Apr 2009)
New Revision: 29967
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29967&view=rev

Modified:
   haiku/trunk/src/kits/tracker/ContainerWindow.cpp
   haiku/trunk/src/kits/tracker/PoseView.cpp
Log:
Patch by Maxime Simon with small changes by myself: Change the icon size
menu as discussed in ticket #2431. There are only three main shortcuts for
icon, mini icon and list mode. Additional short cuts have been added to
increase and decrease the icon size. I've moved the shortcut from the 32
icon size to the menu item for the icon size menu itself. Unfortunately,
icon placement does not scale with the size (as before) and switching to
icon mode from one of the other modes does not restore the previous icon
size. Looking into it.


Modified: haiku/trunk/src/kits/tracker/ContainerWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-04-06 13:15:16 UTC (rev 29966)
+++ haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-04-06 13:50:24 UTC (rev 29967)
@@ -1910,35 +1910,53 @@
 
 	BMessage* message = new BMessage(kIconMode);
 	message->AddInt32("size", 32);
-	item = new BMenuItem("32 x 32", message, '1');
+	item = new BMenuItem("32 x 32", message);
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
 	message = new BMessage(kScaleIconMode);
 	message->AddInt32("size", 40);
-	item = new BMenuItem("40 x 40", message, '2');
+	item = new BMenuItem("40 x 40", message);
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
 	message = new BMessage(kScaleIconMode);
 	message->AddInt32("size", 48);
-	item = new BMenuItem("48 x 48", message, '3');
+	item = new BMenuItem("48 x 48", message);
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
 	message = new BMessage(kScaleIconMode);
 	message->AddInt32("size", 64);
-	item = new BMenuItem("64 x 64", message, '4');
+	item = new BMenuItem("64 x 64", message);
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
+	iconSizeMenu->AddSeparatorItem();
+
+	message = new BMessage(kScaleIconMode);
+	message->AddInt32("scale", 0);
+	item = new BMenuItem("Decrease Size", message, '-');
+	item->SetTarget(PoseView());
+	iconSizeMenu->AddItem(item);
+
+	message = new BMessage(kScaleIconMode);
+	message->AddInt32("scale", 1);
+	item = new BMenuItem("Increase Size", message, '+');
+	item->SetTarget(PoseView());
+	iconSizeMenu->AddItem(item);
+
+	// A sub menu where the super item can be invoked.
 	menu->AddItem(iconSizeMenu);
+	iconSizeMenu->Superitem()->SetShortcut('1', B_COMMAND_KEY);
+	iconSizeMenu->Superitem()->SetMessage(new BMessage(kIconMode));
+	iconSizeMenu->Superitem()->SetTarget(PoseView());
 
-	item = new BMenuItem("Mini Icon View", new BMessage(kMiniIconMode), '5');
+	item = new BMenuItem("Mini Icon View", new BMessage(kMiniIconMode), '2');
 	item->SetTarget(PoseView());
 	menu->AddItem(item);
 
-	item = new BMenuItem("List View", new BMessage(kListMode), '6');
+	item = new BMenuItem("List View", new BMessage(kListMode), '3');
 	item->SetTarget(PoseView());
 	menu->AddItem(item);
 

Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-06 13:15:16 UTC (rev 29966)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-06 13:50:24 UTC (rev 29967)
@@ -2037,12 +2037,40 @@
 
 		case kScaleIconMode: {
 			int32 size;
+			int32 scale;
 			if (message->FindInt32("size", &size) == B_OK) {
-				if (size != (int32)IconSizeInt()) {
+				if (size != (int32)IconSizeInt())
 					fViewState->SetIconSize(size);
-				} else
-					break;		// no change
-			}
+			} else if (message->FindInt32("scale", &scale) == B_OK
+						&& (fViewState->ViewMode() == kIconMode
+							|| fViewState->ViewMode() == kScaleIconMode)) {
+				if (scale == 0 && (int32)IconSizeInt() != 32) {
+					switch ((int32)IconSizeInt()) {
+						case 40:
+							fViewState->SetIconSize(32);
+							break;
+						case 48:
+							fViewState->SetIconSize(40);
+							break;
+						case 64:
+							fViewState->SetIconSize(48);
+							break;
+					}
+				} else if (scale == 1 && (int32)IconSizeInt() != 128) {
+					switch ((int32)IconSizeInt()) {
+						case 32:
+							fViewState->SetIconSize(40);
+							break;
+						case 40:
+							fViewState->SetIconSize(48);
+							break;
+						case 48:
+							fViewState->SetIconSize(64);
+							break;
+					}
+				}
+			} else
+				break;		// no change
 		} // fall thru
 		case kListMode:
 		case kIconMode:



From anevilyak at mail.berlios.de  Mon Apr  6 17:22:03 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Mon, 6 Apr 2009 17:22:03 +0200
Subject: [Haiku-commits] r29968 - haiku/trunk/src/apps/activitymonitor
Message-ID: <200904061522.n36FM3MZ003723@sheep.berlios.de>

Author: anevilyak
Date: 2009-04-06 17:21:57 +0200 (Mon, 06 Apr 2009)
New Revision: 29968
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29968&view=rev

Modified:
   haiku/trunk/src/apps/activitymonitor/ActivityView.cpp
Log:
gcc4 build fix.


Modified: haiku/trunk/src/apps/activitymonitor/ActivityView.cpp
===================================================================
--- haiku/trunk/src/apps/activitymonitor/ActivityView.cpp	2009-04-06 13:50:24 UTC (rev 29967)
+++ haiku/trunk/src/apps/activitymonitor/ActivityView.cpp	2009-04-06 15:21:57 UTC (rev 29968)
@@ -9,7 +9,7 @@
 #include <new>
 #include <stdio.h>
 #include <stdlib.h>
-#include <vector.h>
+#include <vector>
 
 #ifdef __HAIKU__
 #	include <AbstractLayoutItem.h>



From czeidler at mail.berlios.de  Mon Apr  6 20:08:11 2009
From: czeidler at mail.berlios.de (czeidler at mail.berlios.de)
Date: Mon, 6 Apr 2009 20:08:11 +0200
Subject: [Haiku-commits] r29969 - in haiku/trunk: build/jam
	src/preferences/mail src/preferences/mail/ProviderInfo
Message-ID: <200904061808.n36I8BHI025940@sheep.berlios.de>

Author: czeidler
Date: 2009-04-06 20:07:31 +0200 (Mon, 06 Apr 2009)
New Revision: 29969
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29969&view=rev

Added:
   haiku/trunk/src/preferences/mail/AutoConfig.cpp
   haiku/trunk/src/preferences/mail/AutoConfig.h
   haiku/trunk/src/preferences/mail/AutoConfigView.cpp
   haiku/trunk/src/preferences/mail/AutoConfigView.h
   haiku/trunk/src/preferences/mail/AutoConfigWindow.cpp
   haiku/trunk/src/preferences/mail/AutoConfigWindow.h
   haiku/trunk/src/preferences/mail/DNSQuery.cpp
   haiku/trunk/src/preferences/mail/DNSQuery.h
   haiku/trunk/src/preferences/mail/ProviderInfo/
   haiku/trunk/src/preferences/mail/ProviderInfo/Jamfile
   haiku/trunk/src/preferences/mail/ProviderInfo/aol.com.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/arcor.de.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/cern.ch.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/freenet.de.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/gmx.de.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/googlemail.com.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/lycos.de.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/mymail.ch.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/netcologne.de.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/o2online.de.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/physik.rwth-aachen.de.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/rwth-aachen.de.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/t-online.de.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/web.de.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/yahoo.de.rdef
Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/src/preferences/mail/Account.cpp
   haiku/trunk/src/preferences/mail/Account.h
   haiku/trunk/src/preferences/mail/ConfigWindow.cpp
   haiku/trunk/src/preferences/mail/Jamfile
Log:
Simplify the mail configuration.
- Introduce a database of known providers.
- Guess the mx server if the provider is not known.
- Guess default setting.



Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-06 15:21:57 UTC (rev 29968)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-06 18:07:31 UTC (rev 29969)
@@ -314,6 +314,9 @@
 
 AddDirectoryToHaikuImage system data sounds ;
 
+# Add mail provider infos.
+AddFilesToHaikuImage home config settings Mail ProviderInfo : $(HAIKU_PROVIDER_INFOS) ;
+
 # Mail spell check dictionaries
 local spellFiles = words geekspeak ;
 spellFiles = $(spellFiles:G=spell) ;

Modified: haiku/trunk/src/preferences/mail/Account.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/Account.cpp	2009-04-06 15:21:57 UTC (rev 29968)
+++ haiku/trunk/src/preferences/mail/Account.cpp	2009-04-06 18:07:31 UTC (rev 29969)
@@ -645,7 +645,7 @@
 }
 
 
-void Accounts::NewAccount()
+Account* Accounts::NewAccount()
 {
 	Account *account = new Account();
 	gAccounts.AddItem(account);
@@ -653,6 +653,7 @@
 	
 	if (gListView)
 		gListView->Select(gListView->IndexOf(account->fAccountItem));
+	return account;
 }
 
 

Modified: haiku/trunk/src/preferences/mail/Account.h
===================================================================
--- haiku/trunk/src/preferences/mail/Account.h	2009-04-06 15:21:57 UTC (rev 29968)
+++ haiku/trunk/src/preferences/mail/Account.h	2009-04-06 18:07:31 UTC (rev 29969)
@@ -93,7 +93,7 @@
 {
 	public:
 		static void	Create(BListView *listView,BView *configView);
-		static void NewAccount();
+		static Account* NewAccount();
 		static void Save();
 		static void	Delete();
 

Added: haiku/trunk/src/preferences/mail/AutoConfig.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/AutoConfig.cpp	2009-04-06 15:21:57 UTC (rev 29968)
+++ haiku/trunk/src/preferences/mail/AutoConfig.cpp	2009-04-06 18:07:31 UTC (rev 29969)
@@ -0,0 +1,192 @@
+#include "AutoConfig.h"
+#include "DNSQuery.h"
+
+#include <Directory.h>
+#include <Entry.h>
+#include <File.h>
+#include <FindDirectory.h>
+#include <Path.h>
+#include <stdio.h>
+
+
+status_t
+AutoConfig::GetInfoFromMailAddress(const char* email, provider_info *info)
+{
+	BString provider = ExtractProvider(email);
+
+	// first check the database
+	if (LoadProviderInfo(provider, info) == B_OK)
+		return B_OK;
+
+	// fallback try to read MX record
+	if (GetMXRecord(provider.String(), info) == B_OK) 
+		return B_ENTRY_NOT_FOUND;
+
+	// if no MX record received guess a name
+	GuessServerName(provider.String(), info);
+	return B_ENTRY_NOT_FOUND;
+}
+
+
+status_t
+AutoConfig::GetMXRecord(const char* provider, provider_info *info)
+{
+	BObjectList<mx_record> mxList;
+	DNSQuery dnsQuery;
+	if (dnsQuery.GetMXRecords(provider, &mxList) != B_OK)
+		return B_ERROR;
+
+	mx_record *mxRec = mxList.ItemAt(0);
+	if (mxRec == NULL)
+		return B_ERROR;
+
+	info->imap_server = mxRec->serverName;
+	info->pop_server =  mxRec->serverName;
+	info->smtp_server =  mxRec->serverName;
+
+	info->authentification_pop = 0;
+	info->authentification_smtp = 0;
+	info->username_pattern = 0;
+	return B_OK;
+
+}
+
+
+status_t
+AutoConfig::GuessServerName(const char* provider, provider_info* info)
+{
+	info->imap_server = "mail.";
+	info->imap_server += provider;
+	info->pop_server = "mail.";
+	info->pop_server +=  provider;
+	info->smtp_server = "mail.";
+	info->smtp_server +=  provider;
+
+	info->authentification_pop = 0;
+	info->authentification_smtp = 0;
+	info->username_pattern = 0;
+	return B_OK;
+}
+
+
+void
+AutoConfig::PrintProviderInfo(provider_info* pInfo)
+{
+	printf("Provider: %s:\n", pInfo->provider.String());
+	printf("pop_mail_host: %s\n", pInfo->pop_server.String());
+	printf("imap_mail_host: %s\n", pInfo->imap_server.String());
+	printf("smtp_host: %s\n", pInfo->smtp_server.String());
+	printf("pop authentification: %i\n", int(pInfo->authentification_pop));
+	printf("smtp authentification: %i\n",
+			int(pInfo->authentification_smtp));
+	printf("username_pattern: %i\n",
+			int(pInfo->username_pattern));
+}
+
+
+BString
+AutoConfig::ExtractProvider(const char* email)
+{
+	BString emailS(email);
+	BString provider;
+	int32 at = emailS.FindLast("@");
+	emailS.CopyInto(provider, at + 1, emailS.Length() - at);
+	return provider;
+}
+
+
+
+status_t
+AutoConfig::LoadProviderInfo(const BString &provider, provider_info* info)
+{
+	BPath path;
+	status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &path);
+	if (status != B_OK)
+		return status;
+	path.Append(INFO_DIR);
+	BDirectory infoDir(path.Path());
+	
+	BFile infoFile(&infoDir, provider.String(), B_READ_ONLY);
+	if (infoFile.InitCheck() != B_OK)
+		return B_ENTRY_NOT_FOUND;
+
+	info->provider = provider;
+	if (ReadProviderInfo(&infoFile, info) == true)
+		return B_OK;
+	
+	return B_ERROR;
+}
+
+
+bool
+AutoConfig::ReadProviderInfo(BNode *node, provider_info* info)
+{
+	bool infoFound = false;
+	char buffer[255];
+
+	// server
+	ssize_t size;
+	size = node->ReadAttr(ATTR_NAME_POPSERVER, B_STRING_TYPE, 0, &buffer, 255);
+	if (size > 0) {
+		info->pop_server = buffer;
+		infoFound = true;
+	}
+	size = node->ReadAttr(ATTR_NAME_IMAPSERVER, B_STRING_TYPE, 0, &buffer, 255);
+	if (size > 0) {
+		info->imap_server = buffer;
+		infoFound = true;
+	}
+	size = node->ReadAttr(ATTR_NAME_SMTPSERVER, B_STRING_TYPE, 0, &buffer, 255);
+	if (size > 0) {
+		info->smtp_server = buffer;
+		infoFound = true;
+	}
+
+	// authentification type
+	int32 authType;
+	size = node->ReadAttr(ATTR_NAME_AUTHPOP, B_INT32_TYPE, 0, &authType,
+							sizeof(int32));
+	if (size == sizeof(int32)) {
+		info->authentification_pop = authType;
+		infoFound = true;
+	}
+	size = node->ReadAttr(ATTR_NAME_AUTHSMTP, B_INT32_TYPE, 0, &authType,
+							sizeof(int32));
+	if (size == sizeof(int32)) {
+		info->authentification_smtp = authType;
+		infoFound = true;
+	}
+
+	// ssl
+	int32 ssl;
+	size = node->ReadAttr(ATTR_NAME_POPSSL, B_INT32_TYPE, 0, &ssl,
+							sizeof(int32));
+	if (size == sizeof(int32)) {
+		info->ssl_pop = ssl;
+		infoFound = true;
+	}
+	size = node->ReadAttr(ATTR_NAME_IMAPSSL, B_INT32_TYPE, 0, &ssl,
+							sizeof(int32));
+	if (size == sizeof(int32)) {
+		info->ssl_imap = ssl;
+		infoFound = true;
+	}
+	size = node->ReadAttr(ATTR_NAME_SMTPSSL, B_INT32_TYPE, 0, &ssl,
+							sizeof(int32));
+	if (size == sizeof(int32)) {
+		info->ssl_smtp = ssl;
+		infoFound = true;
+	}
+
+	// username pattern
+	int32 pattern;
+	size = node->ReadAttr(ATTR_NAME_USERNAME, B_INT32_TYPE, 0, &pattern,
+							sizeof(int32));
+	if (size == sizeof(int32)) {
+		info->username_pattern = pattern;
+		infoFound = true;
+	}
+	
+	return infoFound;
+}
+

Added: haiku/trunk/src/preferences/mail/AutoConfig.h
===================================================================
--- haiku/trunk/src/preferences/mail/AutoConfig.h	2009-04-06 15:21:57 UTC (rev 29968)
+++ haiku/trunk/src/preferences/mail/AutoConfig.h	2009-04-06 18:07:31 UTC (rev 29969)
@@ -0,0 +1,81 @@
+#ifndef AUTO_CONFIG_H
+#define AUTO_CONFIG_H
+
+
+#include <List.h>
+#include <Node.h>
+#include <String.h>
+
+#define INFO_DIR "Mail/ProviderInfo"
+
+#define ATTR_NAME_POPSERVER "POP Server"
+#define ATTR_NAME_IMAPSERVER "IMAP Server"
+#define ATTR_NAME_SMTPSERVER "SMTP Server"
+#define ATTR_NAME_AUTHPOP "POP Authentification"
+#define ATTR_NAME_AUTHSMTP "SMTP Authentification"
+#define ATTR_NAME_POPSSL "POP SSL"
+#define ATTR_NAME_IMAPSSL "IMAP SSL"
+#define ATTR_NAME_SMTPSSL "SMTP SSL"
+#define ATTR_NAME_USERNAME "Username Pattern"
+
+
+/*
+ATTR_NAME_AUTHPOP:
+	0	plain text
+	1	APOP
+
+ATTR_NAME_AUTHSMTP:
+	0	none
+	1	ESMTP
+	2	POP3 before SMTP
+
+ATTR_NAME_USERNAME:
+	0	username is the email address (default)
+	1	username is the local-part of the email address local-part at domain.net
+	2	no username is proposed
+*/
+
+
+
+struct provider_info
+{
+	BString provider;
+
+	BString pop_server;
+	BString imap_server;
+	BString smtp_server;
+
+	int32 authentification_pop;
+	int32 authentification_smtp;
+
+	int32 ssl_pop;
+	int32 ssl_imap;
+	int32 ssl_smtp;
+
+	int32 username_pattern;
+};
+
+
+class AutoConfig
+{
+	public:
+		status_t		GetInfoFromMailAddress(const char* email,
+												provider_info *info);
+					
+		// for debug
+		void			PrintProviderInfo(provider_info* pInfo);
+				  
+	private:
+		status_t		GetMXRecord(const char* provider, provider_info *info);
+		status_t		GuessServerName(const char* provider,
+											provider_info *info);
+
+		BString			ExtractProvider(const char* email);
+		status_t		LoadProviderInfo(const BString &provider, provider_info* info);
+		bool			ReadProviderInfo(BNode *node, provider_info* info);
+		
+};
+
+
+
+#endif
\ No newline at end of file

Added: haiku/trunk/src/preferences/mail/AutoConfigView.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/AutoConfigView.cpp	2009-04-06 15:21:57 UTC (rev 29968)
+++ haiku/trunk/src/preferences/mail/AutoConfigView.cpp	2009-04-06 18:07:31 UTC (rev 29969)
@@ -0,0 +1,537 @@
+#include "AutoConfigView.h"
+
+#include <Directory.h>
+#include <Entry.h>
+#include <FindDirectory.h>
+#include <Message.h>
+#include <MenuItem.h>
+#include <Path.h>
+#include <PopUpMenu.h>
+#include <String.h>
+#include <Window.h>
+
+#include <MailSettings.h>
+
+
+AutoConfigView::AutoConfigView(BRect rect, AutoConfig &config)
+	:	BBox(rect),
+		fAutoConfig(config)
+{
+	int32 stepSize = 30;
+	int32 divider = 100;
+	BPoint topLeft(20, 20);
+	BPoint rightDown(rect.Width() - 20, 20 + stepSize);
+	
+	// type view
+	BPopUpMenu *chainsPopUp = new BPopUpMenu(B_EMPTY_STRING);
+	const char *chainModes[] = {
+		"Receive Mail Only",
+		"Send Mail Only",
+		"Send and Receive Mail"};
+	BMenuItem *item;
+	for (int32 i = 0;i < 3;i++)
+		chainsPopUp->AddItem(item = new BMenuItem(chainModes[i], NULL));
+
+	fTypeField = new BMenuField(BRect(topLeft, rightDown),NULL,
+									"Account Type:",chainsPopUp);
+	fTypeField->SetDivider(divider);
+	fTypeField->Menu()->ItemAt(2)->SetMarked(true);
+	//fAccount->SetType(2);
+	AddChild(fTypeField);
+	
+	// protocol view
+	topLeft.y+= stepSize;
+	rightDown.y+= stepSize;
+	fInProtocolsField = SetupProtokolView(BRect(topLeft, rightDown));
+	if(fInProtocolsField){
+		fTypeField->SetDivider(divider);
+		AddChild(fInProtocolsField);
+	}
+	
+	// search for smtp ref
+	GetSMTPAddonRef(&fSMTPAddonRef);
+
+	// email view
+	topLeft.y+= stepSize;
+	rightDown.y+= stepSize;
+	fEmailView = new BTextControl(BRect(topLeft, rightDown),
+									"email", "E-mail Address", "",
+									new BMessage(kEMailChangedMsg));
+	fEmailView->SetDivider(divider);
+	AddChild(fEmailView);
+
+	// login name view
+	topLeft.y+= stepSize;
+	rightDown.y+= stepSize;
+	fLoginNameView = new BTextControl(BRect(topLeft, rightDown),
+									"login", "Login Name", "",
+									NULL);
+	fLoginNameView->SetDivider(divider);
+	AddChild(fLoginNameView);
+
+	// password view
+	topLeft.y+= stepSize;
+	rightDown.y+= stepSize;
+	fPasswordView = new BTextControl(BRect(topLeft, rightDown),
+									"password", "Password", "",
+									NULL);
+	fPasswordView->SetDivider(divider);
+	fPasswordView->TextView()->HideTyping(true);
+	AddChild(fPasswordView);
+
+	// account view
+	topLeft.y+= stepSize;
+	rightDown.y+= stepSize;
+	fAccountNameView = new BTextControl(BRect(topLeft, rightDown),
+									"account", "Account Name", "",
+									NULL);
+	fAccountNameView->SetDivider(divider);
+	AddChild(fAccountNameView);
+
+	// name view
+	topLeft.y+= stepSize;
+	rightDown.y+= stepSize;
+	fNameView = new BTextControl(BRect(topLeft, rightDown),
+									"name", "Real Name", "",
+									NULL);
+	AddChild(fNameView);
+	fNameView->SetDivider(divider);
+	
+}
+
+
+void
+AutoConfigView::AttachedToWindow()
+{
+	fEmailView->SetTarget(this);
+	fEmailView->MakeFocus(true);
+}
+
+
+void
+AutoConfigView::MessageReceived(BMessage *msg)
+{
+	BString text, login;
+	switch (msg->what)
+	{
+		case kEMailChangedMsg:
+		{
+			text = fLoginNameView->Text();
+			if (text == "")
+				ProposeUsername();
+			fLoginNameView->MakeFocus();
+			fLoginNameView->TextView()->SelectAll();
+
+			text = fAccountNameView->Text();
+			if (text == "")
+				fAccountNameView->SetText(fEmailView->Text());
+			break;
+		}
+		default:
+			BView::MessageReceived(msg);
+			break;
+	}
+}
+
+
+bool
+AutoConfigView::GetBasicAccountInfo(account_info &info)
+{
+	status_t status = B_OK;
+
+	BMenuItem* item = fTypeField->Menu()->FindMarked();
+	info.type = fTypeField->Menu()->IndexOf(item);
+	
+	BString inboundProtocolName = "";
+	item = fInProtocolsField->Menu()->FindMarked();
+	if (item) {
+		inboundProtocolName = item->Label();
+		item->Message()->FindRef("protocol", &(info.inboundProtocol));
+	}
+	else
+		status = B_ERROR;
+
+	if (inboundProtocolName.FindFirst("IMAP") >= 0)
+		info.inboundType = IMAP;
+	else
+		info.inboundType = POP;
+	
+	info.outboundProtocol = fSMTPAddonRef;
+	info.name = fNameView->Text();
+	info.accountName = fAccountNameView->Text();
+	info.email = fEmailView->Text();
+	info.loginName = fLoginNameView->Text();
+	info.password = fPasswordView->Text();
+
+	return status;
+}
+
+
+BMenuField*
+AutoConfigView::SetupProtokolView(BRect rect)
+{
+	BPopUpMenu *menu = new BPopUpMenu("Choose Protocol");
+
+	for (int i = 0; i < 2; i++) {
+		BPath path;
+		status_t status = find_directory((i == 0) ? B_USER_ADDONS_DIRECTORY :
+											B_BEOS_ADDONS_DIRECTORY, &path);
+		if (status != B_OK)
+			return NULL;
+	
+		path.Append("mail_daemon");
+		path.Append("inbound_protocols");
+				
+		BDirectory dir(path.Path());
+		entry_ref protocolRef;
+		while (dir.GetNextRef(&protocolRef) == B_OK)
+		{
+			char name[B_FILE_NAME_LENGTH];
+			BEntry entry(&protocolRef);
+			entry.GetName(name);
+	
+			BMenuItem *item;
+			BMessage *msg = new BMessage(kProtokollChangedMsg);
+			menu->AddItem(item = new BMenuItem(name, msg));
+			msg->AddRef("protocol",&protocolRef);
+	
+			//if (*ref == protocolRef)
+			item->SetMarked(true);
+		}
+	}
+
+	BMenuField *protocolsMenuField = new BMenuField(rect, NULL, NULL, menu);
+	protocolsMenuField->ResizeToPreferred();
+	return protocolsMenuField;
+}
+
+
+status_t
+AutoConfigView::GetSMTPAddonRef(entry_ref *ref)
+{
+	for (int i = 0; i < 2; i++) {
+		BPath path;
+		status_t status = find_directory((i == 0) ? B_USER_ADDONS_DIRECTORY :
+											B_BEOS_ADDONS_DIRECTORY, &path);
+		if (status != B_OK)
+		{
+			return B_ERROR;
+		}
+	
+		path.Append("mail_daemon");
+		path.Append("outbound_protocols");
+				
+		BDirectory dir(path.Path());
+		
+		while (dir.GetNextRef(ref) == B_OK)
+		{
+			return B_OK;
+		}
+	}
+	
+	return B_ERROR;
+}
+
+
+BString
+AutoConfigView::ExtractLocalPart(const char* email)
+{
+	BString emailS(email);
+	BString localPart;
+	int32 at = emailS.FindLast("@");
+	emailS.CopyInto(localPart, 0, at);
+	return localPart;
+}
+
+
+void
+AutoConfigView::ProposeUsername()
+{
+	const char* email = fEmailView->Text();
+	provider_info info;
+	status_t status = fAutoConfig.GetInfoFromMailAddress(email, &info);
+	if (status == B_OK) {
+		BString localPart = ExtractLocalPart(email);
+		switch (info.username_pattern) {
+			case 0:
+				// username is the mail address
+				fLoginNameView->SetText(email);
+				break;
+			case 1:
+				// username is the local-part
+				fLoginNameView->SetText(localPart.String());
+				break;
+			case 2:
+				// do nothing
+				break;
+		}
+	}
+	else {
+		fLoginNameView->SetText(email);
+	}
+}
+
+
+bool
+AutoConfigView::IsValidMailAddress(BString email)
+{
+	int32 atPos = email.FindFirst("@");
+	if (atPos < 0)
+		return false;
+	BString provider;
+	email.CopyInto(provider, atPos + 1, email.Length() - atPos);
+	if (provider.FindLast(".") < 0)
+		return false;
+	return true;	
+}
+
+
+ServerSettingsView::ServerSettingsView(BRect rect, const account_info &info)
+	:	BView(rect, NULL,B_FOLLOW_ALL,0),
+		fInboundAccount(false),
+		fOutboundAccount(false),
+		fInboundAuthMenu(NULL),
+		fOutboundAuthMenu(NULL),
+		fInboundEncrItemStart(NULL),
+		fOutboundEncrItemStart(NULL)
+{
+	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+
+	int32 divider = 120;
+
+	switch (info.type) {
+		case 0:
+			fInboundAccount = true;
+			break;
+		case 1:
+			fOutboundAccount = true;
+			break;
+		case 2:
+			fInboundAccount = true;
+			fOutboundAccount = true;
+			break;
+	}
+	// inbound
+	BRect boxRect = Bounds();
+	boxRect.bottom/= 2;
+	boxRect.bottom-= 5;
+
+	BBox *box = new BBox(boxRect);
+	box->SetLabel("Inbound");
+	AddChild(box);
+
+	BString serverName;
+	if (info.inboundType == IMAP)
+		serverName = info.providerInfo.imap_server;
+	else
+		serverName = info.providerInfo.pop_server;
+
+	fInboundNameView = new BTextControl(BRect(10, 20, rect.Width() - 20, 35),
+										"inbound", "Server Name",
+										serverName.String(),
+										new BMessage(kServerChangedMsg));
+	fInboundNameView->SetDivider(divider);
+
+	box->AddChild(fInboundNameView);
+	
+	GetAuthEncrMenu(info.inboundProtocol, &fInboundAuthMenu,
+						&fInboundEncryptionMenu);
+	if (fInboundAuthMenu) {
+		int authID = info.providerInfo.authentification_pop;
+		if (info.inboundType == POP)
+			fInboundAuthMenu->Menu()->ItemAt(authID)->SetMarked(true);
+		fInboundAuthItemStart = fInboundAuthMenu->Menu()->FindMarked();
+		box->AddChild(fInboundAuthMenu);
+		fInboundAuthMenu->SetDivider(divider);
+		fInboundAuthMenu->MoveTo(10, 50);
+	}
+	if (fInboundEncryptionMenu) {
+		BMenuItem *item = NULL;
+		if (info.inboundType == POP) {
+			item = fInboundEncryptionMenu->Menu()
+					->ItemAt(info.providerInfo.ssl_pop);
+			item->SetMarked(true);
+			fInboundEncryptionMenu->MoveTo(10, 80);
+		}
+		if (info.inboundType == IMAP) {
+			item = fInboundEncryptionMenu->Menu()
+					->ItemAt(info.providerInfo.ssl_imap);
+			if (item)
+				item->SetMarked(true);
+			fInboundEncryptionMenu->MoveTo(10, 50);
+		}
+		fInboundEncrItemStart = fInboundEncryptionMenu->Menu()->FindMarked();
+		box->AddChild(fInboundEncryptionMenu);
+		fInboundEncryptionMenu->SetDivider(divider);
+	}
+	
+	if (!fInboundAccount) {
+		fInboundNameView->SetEnabled(false);
+		if (fInboundAuthMenu)
+			fInboundAuthMenu->SetEnabled(false);
+	}
+
+	// outbound
+	boxRect = Bounds();
+	boxRect.top = boxRect.bottom / 2;
+	boxRect.top+= 5;
+
+	box = new BBox(boxRect);
+	box->SetLabel("Outbound");
+	AddChild(box);
+
+	serverName = info.providerInfo.smtp_server;
+	fOutboundNameView = new BTextControl(BRect(10, 20, rect.Width() - 20, 30),
+									"outbound", "Server Name",
+									serverName.String(),
+									new BMessage(kServerChangedMsg));
+	fOutboundNameView->SetDivider(divider);
+
+	box->AddChild(fOutboundNameView);
+	
+	GetAuthEncrMenu(info.outboundProtocol, &fOutboundAuthMenu,
+						&fOutboundEncryptionMenu);
+	if (fOutboundAuthMenu) {
+		BMenuItem *item = fOutboundAuthMenu->Menu()
+							->ItemAt(info.providerInfo.authentification_smtp);
+		item->SetMarked(true);
+		fOutboundAuthItemStart = item;
+		box->AddChild(fOutboundAuthMenu);
+		fOutboundAuthMenu->SetDivider(divider);
+		fOutboundAuthMenu->MoveTo(10, 50);
+	}
+	if (fOutboundEncryptionMenu) {
+		BMenuItem *item = fOutboundEncryptionMenu->Menu()
+							->ItemAt(info.providerInfo.ssl_smtp);
+		if (item)
+			item->SetMarked(true);
+		fOutboundEncrItemStart = item;
+		box->AddChild(fOutboundEncryptionMenu);
+		fOutboundEncryptionMenu->SetDivider(divider);
+		fOutboundEncryptionMenu->MoveTo(10, 80);
+	}
+
+	if (!fOutboundAccount) {
+		fOutboundNameView->SetEnabled(false);
+		if (fOutboundAuthMenu)
+			fOutboundAuthMenu->SetEnabled(false);
+	}
+	
+}
+
+
+void
+ServerSettingsView::GetServerInfo(account_info &info)
+{
+	if (info.inboundType == IMAP) {
+		info.providerInfo.imap_server = fInboundNameView->Text();
+		if (fInboundEncryptionMenu) {
+			BMenuItem* item = fInboundEncryptionMenu->Menu()->FindMarked();
+			if (item)
+				info.providerInfo.ssl_imap = fInboundEncryptionMenu->Menu()
+												->IndexOf(item);
+		}
+	} else {
+		info.providerInfo.pop_server = fInboundNameView->Text();
+		BMenuItem* item = NULL;
+		if (fInboundAuthMenu) {
+			item = fInboundAuthMenu->Menu()->FindMarked();
+			if (item)
+				info.providerInfo.authentification_pop = fInboundAuthMenu
+															->Menu()
+															->IndexOf(item);
+		}
+		if (fInboundEncryptionMenu) {
+			item = fInboundEncryptionMenu->Menu()->FindMarked();
+			if (item)
+				info.providerInfo.ssl_pop = fInboundEncryptionMenu->Menu()
+												->IndexOf(item);
+		}
+	}
+	info.providerInfo.smtp_server = fOutboundNameView->Text();
+	BMenuItem* item = NULL;
+	if (fOutboundAuthMenu) {
+		item = fOutboundAuthMenu->Menu()->FindMarked();
+		if (item)
+			info.providerInfo.authentification_smtp = fOutboundAuthMenu->Menu()
+														->IndexOf(item);
+	}
+
+	if (fOutboundEncryptionMenu) {
+		item = fOutboundEncryptionMenu->Menu()->FindMarked();
+		if (item)
+			info.providerInfo.ssl_smtp = fOutboundEncryptionMenu->Menu()
+											->IndexOf(item);
+	}
+	DetectMenuChanges();
+}
+
+
+void
+ServerSettingsView::DetectMenuChanges()
+{
+	bool changed = false;
+	if (fInboundAuthMenu) {
+		BMenuItem *item = fInboundAuthMenu->Menu()->FindMarked();
+		if (fInboundAuthItemStart != item)
+			changed = true;
+	}
+	if (fInboundEncryptionMenu) {
+		BMenuItem *item = fInboundEncryptionMenu->Menu()->FindMarked();
+		if (fInboundEncrItemStart != item)
+			changed = true;
+	}
+	if (fOutboundAuthMenu) {
+		BMenuItem *item = fOutboundAuthMenu->Menu()->FindMarked();
+		if (fOutboundAuthItemStart != item)
+			changed = true;
+	}
+	if (fOutboundEncryptionMenu) {
+		BMenuItem *item = fOutboundEncryptionMenu->Menu()->FindMarked();
+		if (fOutboundEncrItemStart != item)
+			changed = true;
+	}
+	if (changed) {
+		BMessage msg(kServerChangedMsg);
+		BMessenger messenger(NULL, Window()->Looper());
+		messenger.SendMessage(&msg);
+	}
+}
+
+
+void
+ServerSettingsView::GetAuthEncrMenu(const entry_ref &ref,
+									BMenuField **authField,
+									BMenuField **sslField)
+{
+// TODO: These menus being NULL is not correctly handled everywhere
+// in this class.
+	BMessage dummyMsg;
+	BView *(* instantiate_config)(BMessage *,BMessage *);
+	BPath addon(&ref);
+	image_id image = load_add_on(addon.Path());
+	if (image < B_OK) {
+		*authField = NULL;
+		*sslField = NULL;
+		return;
+	}
+
+	if (get_image_symbol(image,"instantiate_config_panel",
+			B_SYMBOL_TYPE_TEXT,(void **)&instantiate_config) < B_OK)
+	{
+		unload_add_on(image);
+		image = B_MISSING_SYMBOL;
+		*authField = NULL;
+		*sslField = NULL;
+		return;
+	}
+
+	BView *view = (*instantiate_config)(&dummyMsg, &dummyMsg);
+	*authField = (BMenuField *)(view->FindView("auth_method"));
+	*sslField = (BMenuField *)(view->FindView("flavor"));
+		
+	view->RemoveChild(*authField);
+	view->RemoveChild(*sslField);
+	delete view;
+	unload_add_on(image);
+}

Added: haiku/trunk/src/preferences/mail/AutoConfigView.h
===================================================================
--- haiku/trunk/src/preferences/mail/AutoConfigView.h	2009-04-06 15:21:57 UTC (rev 29968)
+++ haiku/trunk/src/preferences/mail/AutoConfigView.h	2009-04-06 18:07:31 UTC (rev 29969)
@@ -0,0 +1,101 @@
+#ifndef AUTO_CONFIG_VIEW_H
+#define AUTO_CONFIG_VIEW_H
+
+#include "AutoConfig.h"
+
+#include <Box.h>
+#include <Entry.h>
+#include <MenuField.h>
+#include <ProtocolConfigView.h>
+#include <String.h>
+#include <TextControl.h>
+
+
+const int32	kNameChangedMsg			=	'?nch';
+const int32	kEMailChangedMsg		=	'?ech';
+const int32 kProtokollChangedMsg	=	'?pch';
+const int32 kServerChangedMsg		=	'?sch';
+
+enum inbound_type
+{
+	POP,
+	IMAP
+};
+
+
+struct account_info
+{
+	int32			type;
+	inbound_type	inboundType;
+	entry_ref		inboundProtocol;
+	entry_ref		outboundProtocol;
+	BString			name;
+	BString			accountName;
+	BString			email;
+	BString			loginName;
+	BString			password;
+	provider_info	providerInfo;
+};
+
+
+class AutoConfigView : public BBox
+{
+	public:
+						AutoConfigView(BRect rect, AutoConfig &config);
+						
+		virtual void	AttachedToWindow();
+		virtual void	MessageReceived(BMessage *msg);
+
+		bool			GetBasicAccountInfo(account_info &info);
+		bool			IsValidMailAddress(BString email);
+
+	private:
+		BMenuField*		SetupProtokolView(BRect rect);
+		status_t		GetSMTPAddonRef(entry_ref *ref);
+
+		BString			ExtractLocalPart(const char* email);
+		void			ProposeUsername();
+
+		entry_ref		fSMTPAddonRef;
+		BMenuField		*fTypeField;
+		BMenuField		*fInProtocolsField;
+		BTextControl	*fNameView;
+		BTextControl	*fAccountNameView;
+		BTextControl	*fEmailView;
+		BTextControl	*fLoginNameView;
+		BTextControl	*fPasswordView;
+
+		// ref to the parent autoconfig so you only ones read the database
+		AutoConfig		&fAutoConfig;
+};
+
+
+class ServerSettingsView : public BView
+{
+	public:
+						ServerSettingsView(BRect rect, const account_info &info);
+						
+		void			GetServerInfo(account_info &info);
+
+	private:
+		void			DetectMenuChanges();
+		void			GetAuthEncrMenu(const entry_ref &ref,
+										BMenuField **authField,
+										BMenuField **sslField);
+		bool			fInboundAccount;
+		bool			fOutboundAccount;
+		BTextControl	*fInboundNameView;
+		BMenuField		*fInboundAuthMenu;
+		BMenuField		*fInboundEncryptionMenu;
+		BTextControl	*fOutboundNameView;
+		BMenuField		*fOutboundAuthMenu;
+		BMenuField		*fOutboundEncryptionMenu;
+
+		BMenuItem		*fInboundAuthItemStart;
+		BMenuItem		*fInboundEncrItemStart;
+		BMenuItem		*fOutboundAuthItemStart;
+		BMenuItem		*fOutboundEncrItemStart;
+};
+
+
+#endif
\ No newline at end of file

Added: haiku/trunk/src/preferences/mail/AutoConfigWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/AutoConfigWindow.cpp	2009-04-06 15:21:57 UTC (rev 29968)
+++ haiku/trunk/src/preferences/mail/AutoConfigWindow.cpp	2009-04-06 18:07:31 UTC (rev 29969)
@@ -0,0 +1,202 @@
+#include "AutoConfigWindow.h"
+
+#include "AutoConfig.h"
+#include "AutoConfigView.h"
+
+#include <Alert.h>
+#include <Application.h>

[... truncated: 1172 lines follow ...]


From czeidler at mail.berlios.de  Mon Apr  6 20:14:37 2009
From: czeidler at mail.berlios.de (czeidler at mail.berlios.de)
Date: Mon, 6 Apr 2009 20:14:37 +0200
Subject: [Haiku-commits] r29970 -
	haiku/trunk/src/preferences/mail/ProviderInfo
Message-ID: <200904061814.n36IEban026575@sheep.berlios.de>

Author: czeidler
Date: 2009-04-06 20:14:36 +0200 (Mon, 06 Apr 2009)
New Revision: 29970
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29970&view=rev

Added:
   haiku/trunk/src/preferences/mail/ProviderInfo/ReadMe
Log:
Description of the provider database / attribute format.



Added: haiku/trunk/src/preferences/mail/ProviderInfo/ReadMe
===================================================================
--- haiku/trunk/src/preferences/mail/ProviderInfo/ReadMe	2009-04-06 18:07:31 UTC (rev 29969)
+++ haiku/trunk/src/preferences/mail/ProviderInfo/ReadMe	2009-04-06 18:14:36 UTC (rev 29970)
@@ -0,0 +1,28 @@
+The provider database is simply a collection of files with attributes. To add
+new provider to the image rdef files are used. In the jam file you have to add
+the new provider name. Here an example rdef file:
+ 
+resource(1, "Provider") "gmx.de";
+resource(2, "POP Server") "pop.gmx.net";
+resource(3, "IMAP Server") "imap.gmx.net";
+resource(4, "SMTP Server") "mail.gmx.de";
+resource(5, "POP Authentification") 0;
+resource(6, "SMTP Authentification") 0;
+resource(7, "Username Pattern") 0;
+ 
+ 
+you can pass the following options to the last three items:
+ 
+"POP Authentification":
+	0	plain text
+	1	APOP
+ 
+"SMTP Authentification":
+	0	none
+	1	ESMTP
+	2	POP3 before SMTP
+ 
+"Username Pattern":
+	0	username is the email address (default)
+	1	username is the local-part of the email address local-part at domain.net
+	2	no username is proposed 



From stippi at mail.berlios.de  Mon Apr  6 20:18:18 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Mon, 6 Apr 2009 20:18:18 +0200
Subject: [Haiku-commits] r29971 - haiku/trunk/src/kits/tracker
Message-ID: <200904061818.n36IIICN027337@sheep.berlios.de>

Author: stippi
Date: 2009-04-06 20:18:12 +0200 (Mon, 06 Apr 2009)
New Revision: 29971
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29971&view=rev

Modified:
   haiku/trunk/src/kits/tracker/ContainerWindow.cpp
   haiku/trunk/src/kits/tracker/DeskWindow.cpp
   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/ViewState.cpp
   haiku/trunk/src/kits/tracker/ViewState.h
Log:
* Cleanup in the icon mode stuff. kScaleIconMode is gone. There is simply
  kIconMode and it can have different sizes.
* The "Icon Mode" super menu item is marked, when in icon mode, as well as
  the size item in it's sub menu.
* When switching from mini icon mode or list mode back into icon mode, the
  previous icon size is now restored. This also works when the folder has
  been closed meanwhile. (The on-disk format for view state has changed, so
  your folders will open with default values.)


Modified: haiku/trunk/src/kits/tracker/ContainerWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-04-06 18:14:36 UTC (rev 29970)
+++ haiku/trunk/src/kits/tracker/ContainerWindow.cpp	2009-04-06 18:18:12 UTC (rev 29971)
@@ -1914,19 +1914,19 @@
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
-	message = new BMessage(kScaleIconMode);
+	message = new BMessage(kIconMode);
 	message->AddInt32("size", 40);
 	item = new BMenuItem("40 x 40", message);
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
-	message = new BMessage(kScaleIconMode);
+	message = new BMessage(kIconMode);
 	message->AddInt32("size", 48);
 	item = new BMenuItem("48 x 48", message);
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
-	message = new BMessage(kScaleIconMode);
+	message = new BMessage(kIconMode);
 	message->AddInt32("size", 64);
 	item = new BMenuItem("64 x 64", message);
 	item->SetTarget(PoseView());
@@ -1934,13 +1934,13 @@
 
 	iconSizeMenu->AddSeparatorItem();
 
-	message = new BMessage(kScaleIconMode);
+	message = new BMessage(kIconMode);
 	message->AddInt32("scale", 0);
 	item = new BMenuItem("Decrease Size", message, '-');
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
-	message = new BMessage(kScaleIconMode);
+	message = new BMessage(kIconMode);
 	message->AddInt32("scale", 1);
 	item = new BMenuItem("Increase Size", message, '+');
 	item->SetTarget(PoseView());
@@ -2936,7 +2936,7 @@
 
 		uint32 viewMode = PoseView()->ViewMode();
 		if (sizeMenu) {
-			if (viewMode == kIconMode || viewMode == kScaleIconMode) {
+			if (viewMode == kIconMode) {
 				int32 iconSize = (int32)PoseView()->IconSizeInt();
 				for (int32 i = 0; BMenuItem* item = sizeMenu->ItemAt(i); i++) {
 					BMessage* message = item->Message();
@@ -2953,10 +2953,8 @@
 				for (int32 i = 0; BMenuItem* item = sizeMenu->ItemAt(i); i++)
 					item->SetMarked(false);
 			}
-		} else {
-			MarkNamedMenuItem(menu, kIconMode, viewMode == kIconMode);
 		}
-
+		MarkNamedMenuItem(menu, kIconMode, viewMode == kIconMode);
 		MarkNamedMenuItem(menu, kListMode, viewMode == kListMode);
 		MarkNamedMenuItem(menu, kMiniIconMode, viewMode == kMiniIconMode);
 

Modified: haiku/trunk/src/kits/tracker/DeskWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/DeskWindow.cpp	2009-04-06 18:14:36 UTC (rev 29970)
+++ haiku/trunk/src/kits/tracker/DeskWindow.cpp	2009-04-06 18:18:12 UTC (rev 29971)
@@ -271,21 +271,21 @@
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
-	message = new BMessage(kScaleIconMode);
+	message = new BMessage(kIconMode);
 	message->AddInt32("size", 40);
 	item = new BMenuItem("40 x 40", message);
 	item->SetMarked(PoseView()->IconSizeInt() == 40);
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
-	message = new BMessage(kScaleIconMode);
+	message = new BMessage(kIconMode);
 	message->AddInt32("size", 48);
 	item = new BMenuItem("48 x 48", message);
 	item->SetMarked(PoseView()->IconSizeInt() == 48);
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
-	message = new BMessage(kScaleIconMode);
+	message = new BMessage(kIconMode);
 	message->AddInt32("size", 64);
 	item = new BMenuItem("64 x 64", message);
 	item->SetMarked(PoseView()->IconSizeInt() == 64);

Modified: haiku/trunk/src/kits/tracker/Pose.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/Pose.cpp	2009-04-06 18:14:36 UTC (rev 29970)
+++ haiku/trunk/src/kits/tracker/Pose.cpp	2009-04-06 18:18:12 UTC (rev 29971)
@@ -450,8 +450,7 @@
 {
 	ASSERT(poseView->ViewMode() != kListMode);
 
-	if (poseView->ViewMode() == kIconMode
-		|| poseView->ViewMode() == kScaleIconMode) {
+	if (poseView->ViewMode() == kIconMode) {
 		// check icon rect, then actual icon pixel
 		BRect rect(fLocation, fLocation);
 		rect.right += poseView->IconSizeInt() - 1;
@@ -880,8 +879,7 @@
 	ASSERT(poseView->ViewMode() != kListMode);
 
 	BRect rect;
-	if (poseView->ViewMode() == kIconMode
-		|| poseView->ViewMode() == kScaleIconMode) {
+	if (poseView->ViewMode() == kIconMode) {
 		rect.left = fLocation.x;
 		rect.right = rect.left + poseView->IconSizeInt();
 

Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-06 18:14:36 UTC (rev 29970)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-06 18:18:12 UTC (rev 29971)
@@ -929,7 +929,7 @@
 {
 	switch (ViewMode()) {
 		case kIconMode:
-			fViewState->SetIconSize(B_LARGE_ICON);
+			// IconSize should allready be set in MessageReceived()
 			fIconPoseHeight = ceilf(IconSizeInt() + sFontHeight + 1);
 			break;
 
@@ -938,11 +938,6 @@
 			fIconPoseHeight = ceilf(sFontHeight < IconSizeInt() ? IconSizeInt() : sFontHeight + 1);
 			break;
 
-		case kScaleIconMode:
-			// IconSize should allready be set in MessageReceived()
-			fIconPoseHeight = ceilf(IconSizeInt() + sFontHeight + 1);
-			break;
-
 		default:
 			fViewState->SetIconSize(B_MINI_ICON);
 			fIconPoseHeight = fListElemHeight;
@@ -961,11 +956,6 @@
 			break;
 
 		case kIconMode:
-			grid->Set(60, 60);
-			offset->Set(20, 20);
-			break;
-
-		case kScaleIconMode:
 			grid->Set(IconSizeInt() + 28, IconSizeInt() + 28);
 			offset->Set(20, 20);
 			break;
@@ -1727,7 +1717,6 @@
 
 			case kIconMode:
 			case kMiniIconMode:
-			case kScaleIconMode:
 				if (poseInfo->fInitedDirectory == -1LL || fAlwaysAutoPlace) {
 					if (pose->HasLocation())
 						RemoveFromVSList(pose);
@@ -2035,15 +2024,14 @@
 				pendingNodeMonitorCache.Add(message);
 			break;
 
-		case kScaleIconMode: {
+		case kIconMode: {
 			int32 size;
 			int32 scale;
 			if (message->FindInt32("size", &size) == B_OK) {
 				if (size != (int32)IconSizeInt())
 					fViewState->SetIconSize(size);
 			} else if (message->FindInt32("scale", &scale) == B_OK
-						&& (fViewState->ViewMode() == kIconMode
-							|| fViewState->ViewMode() == kScaleIconMode)) {
+						&& fViewState->ViewMode() == kIconMode) {
 				if (scale == 0 && (int32)IconSizeInt() != 32) {
 					switch ((int32)IconSizeInt()) {
 						case 40:
@@ -2069,11 +2057,16 @@
 							break;
 					}
 				}
-			} else
-				break;		// no change
+			} else {
+				int32 iconSize = fViewState->LastIconSize();
+				if (iconSize < 32 || iconSize > 64) {
+					// uninitialized last icon size?
+					iconSize = 32;
+				}
+				fViewState->SetIconSize(iconSize);
+			}
 		} // fall thru
 		case kListMode:
-		case kIconMode:
 		case kMiniIconMode:
 			SetViewMode(message->what);
 			break;
@@ -2729,18 +2722,26 @@
 void
 BPoseView::SetViewMode(uint32 newMode)
 {
-	if (newMode == ViewMode() && newMode != kScaleIconMode)
-		return;
+	uint32 oldMode = ViewMode();
+	uint32 lastIconSize = fViewState->LastIconSize();
 
+	if (newMode == oldMode) {
+		if (newMode != kIconMode || lastIconSize == fViewState->IconSize())
+			return;
+	}
+
 	ASSERT(!IsFilePanel());
 
 	uint32 lastIconMode = fViewState->LastIconMode();
-	if (newMode != kListMode)
+	if (newMode != kListMode) {
 		fViewState->SetLastIconMode(newMode);
+		if (oldMode == kIconMode)
+			fViewState->SetLastIconSize(fViewState->IconSize());
+	}
 
-	uint32 oldMode = ViewMode();
 	fViewState->SetViewMode(newMode);
 
+	// toggle view layout between listmode and non-listmode, if necessary
 	BContainerWindow *window = ContainerWindow();
 	if (oldMode == kListMode) {
 		fTitleView->RemoveSelf();
@@ -2750,7 +2751,7 @@
 
 		MoveBy(0, -(kTitleViewHeight + 1));
 		ResizeBy(0, kTitleViewHeight + 1);
-	} else if (ViewMode() == kListMode) {
+	} else if (newMode == kListMode) {
 		MoveBy(0, kTitleViewHeight + 1);
 		ResizeBy(0, -(kTitleViewHeight + 1));
 
@@ -2767,14 +2768,14 @@
 
 	CommitActivePose();
 	SetIconPoseHeight();
-	GetLayoutInfo(ViewMode(), &fGrid, &fOffset);
+	GetLayoutInfo(newMode, &fGrid, &fOffset);
 
 	// see if we need to map icons into new mode
-	bool mapIcons;
-	if (fOkToMapIcons)
-		mapIcons = (ViewMode() != kListMode) && (ViewMode() != lastIconMode);
-	else
-		mapIcons = false;
+	bool mapIcons = false;
+	if (fOkToMapIcons) {
+		mapIcons = (newMode != kListMode) && (newMode != lastIconMode
+			|| fViewState->IconSize() != lastIconSize);
+	}
 
 	BPoint oldOffset;
 	BPoint oldGrid;
@@ -2784,7 +2785,7 @@
 	BRect bounds(Bounds());
 	PoseList newPoseList(30);
 
-	if (ViewMode() != kListMode) {
+	if (newMode != kListMode) {
 		int32 count = fPoseList->CountItems();
 		for (int32 index = 0; index < count; index++) {
 			BPose *pose = fPoseList->ItemAt(index);
@@ -2797,7 +2798,7 @@
 
 	// update origin in case of a list <-> icon mode transition
 	BPoint newOrigin;
-	if (ViewMode() == kListMode)
+	if (newMode == kListMode)
 		newOrigin = fViewState->ListOrigin();
 	else
 		newOrigin = fViewState->IconOrigin();

Modified: haiku/trunk/src/kits/tracker/PoseView.h
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.h	2009-04-06 18:14:36 UTC (rev 29970)
+++ haiku/trunk/src/kits/tracker/PoseView.h	2009-04-06 18:18:12 UTC (rev 29971)
@@ -99,7 +99,6 @@
 const uint32 kMiniIconMode = 'Tmic';
 const uint32 kIconMode = 'Ticn';
 const uint32 kListMode = 'Tlst';
-const uint32 kScaleIconMode = 'Tsic'; // new mode for scaled icons
 
 const uint32 kCheckTypeahead = 'Tcty';
 

Modified: haiku/trunk/src/kits/tracker/TextWidget.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/TextWidget.cpp	2009-04-06 18:14:36 UTC (rev 29970)
+++ haiku/trunk/src/kits/tracker/TextWidget.cpp	2009-04-06 18:18:12 UTC (rev 29971)
@@ -159,8 +159,7 @@
 
 		result.bottom = poseLoc.y + (view->ListElemHeight() - 1);
 	} else {
-		if (view->ViewMode() == kIconMode
-			|| view->ViewMode() == kScaleIconMode) {
+		if (view->ViewMode() == kIconMode) {
 			// large/scaled icon mode
 			result.left = poseLoc.x + (view->IconSizeInt() - textWidth) / 2;
 		} else {
@@ -338,7 +337,6 @@
 	rect.right = rect.left + textView->LineWidth() + 3;
 	// center new width, if necessary
 	if (view->ViewMode() == kIconMode
-		|| view->ViewMode() == kScaleIconMode
 		|| view->ViewMode() == kListMode && fAlignment == B_ALIGN_CENTER) {
 		rect.OffsetBy(bounds.Width() / 2 - rect.Width() / 2, 0);
 	}
@@ -366,7 +364,6 @@
 	// configure text view
 	switch (view->ViewMode()) {
 		case kIconMode:
-		case kScaleIconMode:
 			textView->SetAlignment(B_ALIGN_CENTER);
 			break;
 

Modified: haiku/trunk/src/kits/tracker/ViewState.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/ViewState.cpp	2009-04-06 18:14:36 UTC (rev 29970)
+++ haiku/trunk/src/kits/tracker/ViewState.cpp	2009-04-06 18:18:12 UTC (rev 29971)
@@ -70,6 +70,7 @@
 const char *kViewStateSecondarySortTypeName = "ViewState:fSecondarySortType";
 const char *kViewStateReverseSortName = "ViewState:fReverseSort";
 const char *kViewStateIconSizeName = "ViewState:fIconSize";
+const char *kViewStateLastIconSizeName = "ViewState:fLastIconSize";
 
 
 static const int32 kColumnStateMinArchiveVersion = 21;
@@ -280,6 +281,7 @@
 	fViewMode = kListMode;
 	fLastIconMode = 0;
 	fIconSize = 32;
+	fLastIconSize = 32;
 	fListOrigin.Set(0, 0);
 	fIconOrigin.Set(0, 0);
 	fPrimarySortAttr = AttrHashString(kAttrStatName, B_STRING_TYPE);
@@ -304,12 +306,14 @@
 	stream->Read(&fSecondarySortType, sizeof(uint32));
 	stream->Read(&fReverseSort, sizeof(bool));
 	stream->Read(&fIconSize, sizeof(uint32));
+	stream->Read(&fLastIconSize, sizeof(uint32));
 
 	if (endianSwap) {
 		PRINT(("endian swapping view state\n"));
 		fViewMode = B_SWAP_INT32(fViewMode);
 		fLastIconMode = B_SWAP_INT32(fLastIconMode);
 		fIconSize = B_SWAP_INT32(fIconSize);
+		fLastIconSize = B_SWAP_INT32(fLastIconSize);
 		swap_data(B_POINT_TYPE, &fListOrigin,
 			sizeof(fListOrigin), B_SWAP_ALWAYS);
 		swap_data(B_POINT_TYPE, &fIconOrigin,
@@ -365,6 +369,7 @@
 	stream->Write(&fSecondarySortType, sizeof(uint32));
 	stream->Write(&fReverseSort, sizeof(bool));
 	stream->Write(&fIconSize, sizeof(uint32));
+	stream->Write(&fLastIconSize, sizeof(uint32));
 }
 
 
@@ -388,6 +393,8 @@
 		static_cast<int32>(fSecondarySortType));
 	message.AddBool(kViewStateReverseSortName, fReverseSort);
 	message.AddInt32(kViewStateIconSizeName, static_cast<int32>(fIconSize));
+	message.AddInt32(kViewStateLastIconSizeName,
+		static_cast<int32>(fLastIconSize));
 }
 
 
@@ -432,6 +439,7 @@
 	fPreviousViewMode = fViewMode;
 	fPreviousLastIconMode = fLastIconMode;
 	fPreviousIconSize = fIconSize;
+	fPreviousLastIconSize = fLastIconSize;
 	fPreviousListOrigin = fListOrigin;
 	fPreviousIconOrigin = fIconOrigin;
 	fPreviousPrimarySortAttr = fPrimarySortAttr;
@@ -458,6 +466,10 @@
 		state->fIconSize = 16;
 	if (state->fIconSize > 64)
 		state->fIconSize = 64;
+	if (state->fLastIconSize < 16)
+		state->fLastIconSize = 16;
+	if (state->fLastIconSize > 64)
+		state->fLastIconSize = 64;
 
 	if (fixOnly)
 		return state;
@@ -466,12 +478,10 @@
 	if ((state->fViewMode != kListMode
 			&& state->fViewMode != kIconMode
 			&& state->fViewMode != kMiniIconMode
-			&& state->fViewMode != kScaleIconMode
 			&& state->fViewMode != 0)
 		|| (state->fLastIconMode != kListMode
 			&& state->fLastIconMode != kIconMode
 			&& state->fLastIconMode != kMiniIconMode
-			&& state->fLastIconMode != kScaleIconMode
 			&& state->fLastIconMode != 0)) {
 		PRINT(("Bad data instantiating ViewState, view mode %x, lastIconMode %x\n",
 			state->fViewMode, state->fLastIconMode));

Modified: haiku/trunk/src/kits/tracker/ViewState.h
===================================================================
--- haiku/trunk/src/kits/tracker/ViewState.h	2009-04-06 18:14:36 UTC (rev 29970)
+++ haiku/trunk/src/kits/tracker/ViewState.h	2009-04-06 18:18:12 UTC (rev 29971)
@@ -96,7 +96,7 @@
 };
 
 
-const int32 kViewStateArchiveVersion = 10;
+const int32 kViewStateArchiveVersion = 11;
 	// bump version when layout or size changes
 
 class BViewState {
@@ -113,6 +113,7 @@
 		uint32 ViewMode() const;
 		uint32 LastIconMode() const;
 		uint32 IconSize() const;
+		uint32 LastIconSize() const;
 		BPoint ListOrigin() const;
 		BPoint IconOrigin() const;
 		uint32 PrimarySort() const;
@@ -124,6 +125,7 @@
 		void SetViewMode(uint32);
 		void SetLastIconMode(uint32);
 		void SetIconSize(uint32);
+		void SetLastIconSize(uint32);
 		void SetListOrigin(BPoint);
 		void SetIconOrigin(BPoint);
 		void SetPrimarySort(uint32);
@@ -140,6 +142,7 @@
 		uint32 fViewMode;
 		uint32 fLastIconMode;
 		uint32 fIconSize;
+		uint32 fLastIconSize;
 		BPoint fListOrigin;
 		BPoint fIconOrigin;
 		uint32 fPrimarySortAttr;
@@ -153,6 +156,7 @@
 		uint32 	fPreviousViewMode;
 		uint32 	fPreviousLastIconMode;
 		uint32 	fPreviousIconSize;
+		uint32 	fPreviousLastIconSize;
 		BPoint 	fPreviousListOrigin;
 		BPoint 	fPreviousIconOrigin;
 		uint32 	fPreviousPrimarySortAttr;
@@ -268,6 +272,13 @@
 }
 
 
+inline uint32
+BViewState::LastIconSize() const
+{
+	return fLastIconSize;
+}
+
+
 inline BPoint
 BViewState::ListOrigin() const
 {
@@ -337,6 +348,13 @@
 
 
 inline void
+BViewState::SetLastIconSize(uint32 size)
+{
+	fLastIconSize = size;
+}
+
+
+inline void
 BViewState::SetListOrigin(BPoint newOrigin)
 {
 	fListOrigin = newOrigin;
@@ -389,6 +407,7 @@
 	return (fPreviousViewMode != fViewMode)
 		|| (fPreviousLastIconMode != fLastIconMode)
 		|| (fPreviousIconSize != fIconSize)
+		|| (fPreviousLastIconSize != fLastIconSize)
 		|| (fPreviousListOrigin != fListOrigin)
 		|| (fPreviousIconOrigin != fIconOrigin)
 		|| (fPreviousPrimarySortAttr != fPrimarySortAttr)



From aldeck at mail.berlios.de  Mon Apr  6 21:15:04 2009
From: aldeck at mail.berlios.de (aldeck at mail.berlios.de)
Date: Mon, 6 Apr 2009 21:15:04 +0200
Subject: [Haiku-commits] r29972 - in haiku/trunk: headers/os/interface
	headers/private/shared src/kits/interface src/kits/shared
Message-ID: <200904061915.n36JF4GU008690@sheep.berlios.de>

Author: aldeck
Date: 2009-04-06 21:15:00 +0200 (Mon, 06 Apr 2009)
New Revision: 29972
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29972&view=rev

Added:
   haiku/trunk/headers/private/shared/DragTrackingFilter.h
   haiku/trunk/src/kits/shared/DragTrackingFilter.cpp
Modified:
   haiku/trunk/headers/os/interface/Dragger.h
   haiku/trunk/src/kits/interface/Dragger.cpp
   haiku/trunk/src/kits/shared/Jamfile
Log:
* Rewrote BDragger's mouse tracking to be asynchronous using a message filter. Placed the filter in 
kits/shared since i plan to use it in other places like Tracker. Animated replicants like 
ActivityMonitor wont stall anymore when initiating the drag. (On the desktop, Tracker's mouse 
tracking still busy loops sometimes, that's next on my list). 

I had asynchronous long click detection (one button mouse support) in it but decided to get rid of 
it, it adds unneeded complexity in the code and is even getting in your way sometimes (ex: now you can 
take your time to drag the dragger, you wont be interrupted). If we want to reimplement that 
someday it should be done system wide anyway (only Tracker and replicants have that 'feature' 
AFAIK).


Modified: haiku/trunk/headers/os/interface/Dragger.h
===================================================================
--- haiku/trunk/headers/os/interface/Dragger.h	2009-04-06 18:18:12 UTC (rev 29971)
+++ haiku/trunk/headers/os/interface/Dragger.h	2009-04-06 19:15:00 UTC (rev 29972)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _DRAGGER_H
@@ -115,7 +115,7 @@
 				bool		fIsZombie;
 				char		fErrCount;
 				bool		fPopUpIsCustom;
-				BBitmap	*	fBitmap;
+				BBitmap*	fBitmap;
 				BPopUpMenu*	fPopUp;
 				uint32		_reserved[3];
 };

Added: haiku/trunk/headers/private/shared/DragTrackingFilter.h
===================================================================
--- haiku/trunk/headers/private/shared/DragTrackingFilter.h	2009-04-06 18:18:12 UTC (rev 29971)
+++ haiku/trunk/headers/private/shared/DragTrackingFilter.h	2009-04-06 19:15:00 UTC (rev 29972)
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2009, Alexandre Deckner, alex at zappotek.com
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef DRAG_TRACKING_FILTER_H
+#define DRAG_TRACKING_FILTER_H
+
+#include <MessageFilter.h>
+#include <Point.h>
+
+class BView;
+class BHandler;
+
+namespace BPrivate {
+
+class DragTrackingFilter : public BMessageFilter {
+public:
+						DragTrackingFilter(BView* targetView, uint32 messageWhat);
+
+	filter_result		Filter(BMessage* message, BHandler** _target);
+
+private:
+			BView*		fTargetView;
+			uint32		fMessageWhat;
+			bool		fIsTracking;
+			BPoint		fClickPoint;
+			uint32		fClickButtons;
+};
+
+}	// namespace BPrivate
+
+using BPrivate::DragTrackingFilter;
+
+#endif	// DRAG_TRACKING_FILTER_H

Modified: haiku/trunk/src/kits/interface/Dragger.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Dragger.cpp	2009-04-06 18:18:12 UTC (rev 29971)
+++ haiku/trunk/src/kits/interface/Dragger.cpp	2009-04-06 19:15:00 UTC (rev 29972)
@@ -1,10 +1,11 @@
 /*
- * Copyright 2001-2008, Haiku.
+ * Copyright 2001-2009, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Marc Flerackers (mflerackers at androme.be)
  *		Rene Gollent (rene at gollent.com)
+ *		Alexandre Deckner (alex at zappotek.com)
  */
 
 //!	BDragger represents a replicant "handle".
@@ -25,6 +26,7 @@
 #include <Window.h>
 
 #include <AppServerLink.h>
+#include <DragTrackingFilter.h>
 #include <binary_compatibility/Interface.h>
 #include <ServerProtocol.h>
 #include <ViewPrivate.h>
@@ -37,6 +39,7 @@
 BLocker BDragger::sLock("BDragger static");
 BList BDragger::sList;
 
+const uint32 kMsgDragStarted = 'Drgs';
 
 const unsigned char
 kHandBitmap[] = {
@@ -153,6 +156,8 @@
 
 	_DetermineRelationship();
 	_AddToList();
+
+	AddFilter(new DragTrackingFilter(this, kMsgDragStarted));
 }
 
 
@@ -211,73 +216,8 @@
 	uint32 buttons;
 	Window()->CurrentMessage()->FindInt32("buttons", (int32 *)&buttons);
 
-	if (buttons & B_SECONDARY_MOUSE_BUTTON) {
-		if (!fShelf)
-			return;
-
+	if (fShelf != NULL && (buttons & B_SECONDARY_MOUSE_BUTTON))
 		_ShowPopUp(fTarget, where);
-	} else {
-		bigtime_t time = system_time();
-		bigtime_t clickSpeed = 0;
-
-		get_click_speed(&clickSpeed);
-
-		bool drag = false;
-
-		while (true) {
-			BPoint mousePoint;
-			GetMouse(&mousePoint, &buttons, false);
-
-			if (!buttons || system_time() > time + clickSpeed)
-				break;
-
-			float squaredDistance =
-				(mousePoint.x - where.x) * (mousePoint.x - where.x)
-				+ (mousePoint.y - where.y) * (mousePoint.y - where.y);
-  
-			if (squaredDistance >= 16) {
-				drag = true;
-				break;
-			}
-
-			snooze(40000);
-		}
-
-		if (drag) {
-			BMessage archive(B_ARCHIVED_OBJECT);
-
-			if (fRelation == TARGET_IS_PARENT)
-				fTarget->Archive(&archive);
-			else if (fRelation == TARGET_IS_CHILD)
-				Archive(&archive);
-			else {
-				if (fTarget->Archive(&archive)) {
-					BMessage archivedSelf(B_ARCHIVED_OBJECT);
-
-					if (Archive(&archivedSelf))
-						archive.AddMessage("__widget", &archivedSelf);
-				}
-			}
-
-			archive.AddInt32("be:actions", B_TRASH_TARGET);
-
-			BPoint offset;
-			drawing_mode mode;
-			BBitmap *bitmap = DragBitmap(&offset, &mode);
-			if (bitmap != NULL)
-				DragMessage(&archive, bitmap, mode, offset, this);
-			else {
-				DragMessage(&archive,
-					ConvertFromScreen(fTarget->ConvertToScreen(fTarget->Bounds())),
-					this);
-			}
-		} else {
-			if (!fShelf)
-				return;
-
-			_ShowPopUp(fTarget, where);
-		}
-	}
 }
 
 
@@ -328,6 +268,37 @@
 			}
 			break;
 
+		case kMsgDragStarted:
+			if (fTarget != NULL) {
+				BMessage archive(B_ARCHIVED_OBJECT);
+
+				if (fRelation == TARGET_IS_PARENT)
+					fTarget->Archive(&archive);
+				else if (fRelation == TARGET_IS_CHILD)
+					Archive(&archive);
+				else {
+					if (fTarget->Archive(&archive)) {
+						BMessage archivedSelf(B_ARCHIVED_OBJECT);
+
+						if (Archive(&archivedSelf))
+							archive.AddMessage("__widget", &archivedSelf);
+					}
+				}
+
+				archive.AddInt32("be:actions", B_TRASH_TARGET);
+				BPoint offset;
+				drawing_mode mode;
+				BBitmap *bitmap = DragBitmap(&offset, &mode);
+				if (bitmap != NULL)
+					DragMessage(&archive, bitmap, mode, offset, this);
+				else {
+					DragMessage(&archive,
+						ConvertFromScreen(fTarget->ConvertToScreen(fTarget->Bounds())),
+						this);
+				}
+			}
+			break;
+
 		default:
 			BView::MessageReceived(msg);
 			break;

Added: haiku/trunk/src/kits/shared/DragTrackingFilter.cpp
===================================================================
--- haiku/trunk/src/kits/shared/DragTrackingFilter.cpp	2009-04-06 18:18:12 UTC (rev 29971)
+++ haiku/trunk/src/kits/shared/DragTrackingFilter.cpp	2009-04-06 19:15:00 UTC (rev 29972)
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2009, Alexandre Deckner, alex at zappotek.com
+ * Distributed under the terms of the MIT License.
+ */
+
+/*!
+	\class DragTrackingFilter
+	\brief A simple mouse drag detection filter
+	* 
+	* A simple mouse filter that detects the start of a mouse drag over a
+	* threshold distance and sends a message with the 'what' field of your
+	* choice. Especially usefull for drag and drop.
+	* Allows you to free your code of encumbering mouse tracking details. 
+	*
+	* It can detect fast drags spanning outside of a small view by temporarily
+	* setting the B_POINTER_EVENTS flag on the view.
+*/
+
+#include <DragTrackingFilter.h>
+
+#include <Message.h>
+#include <Messenger.h>
+#include <View.h>
+
+static const int kSquaredDragThreshold = 9;
+
+DragTrackingFilter::DragTrackingFilter(BView* targetView, uint32 messageWhat)
+	: BMessageFilter(B_ANY_DELIVERY, B_ANY_SOURCE),
+	fTargetView(targetView),
+	fMessageWhat(messageWhat),
+	fIsTracking(false),
+	fClickButtons(0)
+{
+}
+
+
+filter_result
+DragTrackingFilter::Filter(BMessage* message, BHandler** /*_target*/)
+{
+	if (fTargetView == NULL)
+		return B_DISPATCH_MESSAGE;
+
+	switch (message->what) {
+		case B_MOUSE_DOWN:
+			message->FindPoint("where", &fClickPoint);
+			message->FindInt32("buttons", (int32*)&fClickButtons);
+			fIsTracking = true;
+
+			fTargetView->SetMouseEventMask(B_POINTER_EVENTS);
+
+			return B_DISPATCH_MESSAGE;
+
+		case B_MOUSE_UP:
+			fIsTracking = false;
+			return B_DISPATCH_MESSAGE;
+
+		case B_MOUSE_MOVED:
+		{
+			BPoint where;
+			message->FindPoint("be:view_where", &where);
+
+			// TODO: be more flexible about buttons and pass their state
+			//		 in the message
+			if (fIsTracking && (fClickButtons & B_PRIMARY_MOUSE_BUTTON)) {
+
+				BPoint delta(fClickPoint - where);
+				float squaredDelta = (delta.x * delta.x) + (delta.y * delta.y);
+
+				if (squaredDelta >= kSquaredDragThreshold) {
+					BMessage dragClickMessage(fMessageWhat);
+					dragClickMessage.AddPoint("be:view_where", fClickPoint);
+						// name it "be:view_where" since BView::DragMessage
+						// positions the dragging frame/bitmap by retrieving the
+						// current message and reading that field
+					BMessenger messenger(fTargetView);
+					messenger.SendMessage(&dragClickMessage);
+
+					fIsTracking = false;
+				}
+			}
+			return B_DISPATCH_MESSAGE;
+		}
+		default:
+			break;
+	}
+
+	return B_DISPATCH_MESSAGE;
+}

Modified: haiku/trunk/src/kits/shared/Jamfile
===================================================================
--- haiku/trunk/src/kits/shared/Jamfile	2009-04-06 18:18:12 UTC (rev 29971)
+++ haiku/trunk/src/kits/shared/Jamfile	2009-04-06 19:15:00 UTC (rev 29972)
@@ -17,6 +17,7 @@
 	ColorQuantizer.cpp
 	CommandPipe.cpp
 	DateTime.cpp
+	DragTrackingFilter.cpp
 	HashString.cpp
 	RWLockManager.cpp
 ;



From korli at mail.berlios.de  Mon Apr  6 21:33:31 2009
From: korli at mail.berlios.de (korli at BerliOS)
Date: Mon, 6 Apr 2009 21:33:31 +0200
Subject: [Haiku-commits] r29973 - in haiku/trunk: headers/libs/png
	src/libs/png
Message-ID: <200904061933.n36JXVBL012292@sheep.berlios.de>

Author: korli
Date: 2009-04-06 21:33:30 +0200 (Mon, 06 Apr 2009)
New Revision: 29973
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29973&view=rev

Modified:
   haiku/trunk/headers/libs/png/png.h
   haiku/trunk/headers/libs/png/pngconf.h
   haiku/trunk/src/libs/png/LICENSE
   haiku/trunk/src/libs/png/png.c
   haiku/trunk/src/libs/png/pngget.c
   haiku/trunk/src/libs/png/pngread.c
   haiku/trunk/src/libs/png/pngrtran.c
   haiku/trunk/src/libs/png/pngrutil.c
   haiku/trunk/src/libs/png/pngset.c
   haiku/trunk/src/libs/png/pngwio.c
   haiku/trunk/src/libs/png/pngwrite.c
Log:
updated libpng to 1.2.35


Modified: haiku/trunk/headers/libs/png/png.h
===================================================================
--- haiku/trunk/headers/libs/png/png.h	2009-04-06 19:15:00 UTC (rev 29972)
+++ haiku/trunk/headers/libs/png/png.h	2009-04-06 19:33:30 UTC (rev 29973)
@@ -1,14 +1,14 @@
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.2.34 - December 18, 2008
- * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * libpng version 1.2.35 - February 14, 2009
+ * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * Authors and maintainers:
  *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *  libpng versions 0.97, January 1998, through 1.2.34 - December 18, 2008: Glenn
+ *  libpng versions 0.97, January 1998, through 1.2.35 - February 14, 2009: Glenn
  *  See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -217,6 +217,11 @@
  *    1.2.34rc01              13    10234  12.so.0.34[.0]
  *    1.0.42                  10    10042  10.so.0.42[.0]
  *    1.2.34                  13    10234  12.so.0.34[.0]
+ *    1.2.35beta01-03         13    10235  12.so.0.35[.0]
+ *    1.0.43rc01-02           10    10043  10.so.0.43[.0]
+ *    1.2.35rc01-02           13    10235  12.so.0.35[.0]
+ *    1.0.43                  10    10043  10.so.0.43[.0]
+ *    1.2.35                  13    10235  12.so.0.35[.0]
  *
  *    Henceforth the source version will match the shared-library major
  *    and minor numbers; the shared-library major version number will be
@@ -246,7 +251,7 @@
  * If you modify libpng you may insert additional notices immediately following
  * this sentence.
  *
- * libpng versions 1.2.6, August 15, 2004, through 1.2.34, December 18, 2008, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.35, February 14, 2009, are
  * Copyright (c) 2004, 2006-2008 Glenn Randers-Pehrson, and are
  * distributed according to the same disclaimer and license as libpng-1.2.5
  * with the following individual added to the list of Contributing Authors:
@@ -358,13 +363,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    December 18, 2008
+ *    February 14, 2009
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
  *
  *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.2.34 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.2.35 are Y2K compliant.  It is my belief that earlier
  *    versions were also Y2K compliant.
  *
  *    Libpng only has three year fields.  One is a 2-byte unsigned integer
@@ -420,9 +425,9 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.34"
+#define PNG_LIBPNG_VER_STRING "1.2.35"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.2.34 - December 18, 2008\n"
+   " libpng version 1.2.35 - February 14, 2009\n"
 
 #define PNG_LIBPNG_VER_SONUM   0
 #define PNG_LIBPNG_VER_DLLNUM  13
@@ -430,7 +435,7 @@
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   2
-#define PNG_LIBPNG_VER_RELEASE 34
+#define PNG_LIBPNG_VER_RELEASE 35
 /* This should match the numeric part of the final component of
  * PNG_LIBPNG_VER_STRING, omitting any leading zero: */
 
@@ -458,7 +463,7 @@
  * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
  * version 1.0.0 was mis-numbered 100 instead of 10000).  From
  * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release */
-#define PNG_LIBPNG_VER 10234 /* 1.2.34 */
+#define PNG_LIBPNG_VER 10235 /* 1.2.35 */
 
 #ifndef PNG_VERSION_INFO_ONLY
 /* include the compression library's header */
@@ -1482,7 +1487,7 @@
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef png_structp version_1_2_34;
+typedef png_structp version_1_2_35;
 
 typedef png_struct FAR * FAR * png_structpp;
 

Modified: haiku/trunk/headers/libs/png/pngconf.h
===================================================================
--- haiku/trunk/headers/libs/png/pngconf.h	2009-04-06 19:15:00 UTC (rev 29972)
+++ haiku/trunk/headers/libs/png/pngconf.h	2009-04-06 19:33:30 UTC (rev 29973)
@@ -1,9 +1,9 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.2.34 - December 18, 2008
+ * libpng version 1.2.35 - February 14, 2009
  * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  */
@@ -233,6 +233,8 @@
 #  include <windows.h>
    /* Console I/O functions are not supported on WindowsCE */
 #  define PNG_NO_CONSOLE_IO
+   /* abort() may not be supported on some/all Windows CE platforms */
+#  define PNG_ABORT() exit(-1)
 #  ifdef PNG_DEBUG
 #    undef PNG_DEBUG
 #  endif

Modified: haiku/trunk/src/libs/png/LICENSE
===================================================================
--- haiku/trunk/src/libs/png/LICENSE	2009-04-06 19:15:00 UTC (rev 29972)
+++ haiku/trunk/src/libs/png/LICENSE	2009-04-06 19:33:30 UTC (rev 29973)
@@ -8,7 +8,7 @@
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 
-libpng versions 1.2.6, August 15, 2004, through 1.2.33, October 31, 2008, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.35, February 14, 2009, are
 Copyright (c) 2004, 2006-2008 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -106,4 +106,4 @@
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-October 31, 2008
+February 14, 2009

Modified: haiku/trunk/src/libs/png/png.c
===================================================================
--- haiku/trunk/src/libs/png/png.c	2009-04-06 19:15:00 UTC (rev 29972)
+++ haiku/trunk/src/libs/png/png.c	2009-04-06 19:33:30 UTC (rev 29973)
@@ -13,7 +13,7 @@
 #include "png.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_34 Your_png_h_is_not_version_1_2_34;
+typedef version_1_2_35 Your_png_h_is_not_version_1_2_35;
 
 /* Version information for C files.  This had better match the version
  * string defined in png.h.  */
@@ -694,7 +694,7 @@
 png_get_copyright(png_structp png_ptr)
 {
    png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
-   return ((png_charp) "\n libpng version 1.2.34 - December 18, 2008\n\
+   return ((png_charp) "\n libpng version 1.2.35 - February 14, 2009\n\
    Copyright (c) 1998-2008 Glenn Randers-Pehrson\n\
    Copyright (c) 1996-1997 Andreas Dilger\n\
    Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");

Modified: haiku/trunk/src/libs/png/pngget.c
===================================================================
--- haiku/trunk/src/libs/png/pngget.c	2009-04-06 19:15:00 UTC (rev 29972)
+++ haiku/trunk/src/libs/png/pngget.c	2009-04-06 19:33:30 UTC (rev 29973)
@@ -883,7 +883,7 @@
 #endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */
 
 #ifdef PNG_SET_USER_LIMITS_SUPPORTED
-/* these functions were added to libpng 1.2.6 */
+/* These functions were added to libpng 1.2.6 */
 png_uint_32 PNGAPI
 png_get_user_width_max (png_structp png_ptr)
 {

Modified: haiku/trunk/src/libs/png/pngread.c
===================================================================
--- haiku/trunk/src/libs/png/pngread.c	2009-04-06 19:15:00 UTC (rev 29972)
+++ haiku/trunk/src/libs/png/pngread.c	2009-04-06 19:33:30 UTC (rev 29973)
@@ -1,9 +1,9 @@
 
 /* pngread.c - read a PNG file
  *
- * Last changed in libpng 1.2.30 [August 15, 2008]
+ * Last changed in libpng 1.2.35 [February 14, 2009]
  * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -1437,11 +1437,11 @@
 #ifdef PNG_FREE_ME_SUPPORTED
       info_ptr->free_me |= PNG_FREE_ROWS;
 #endif
+      png_memset(info_ptr->row_pointers, 0, info_ptr->height
+         * png_sizeof(png_bytep));
       for (row = 0; row < (int)info_ptr->height; row++)
-      {
          info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
             png_get_rowbytes(png_ptr, info_ptr));
-      }
    }
 
    png_read_image(png_ptr, info_ptr->row_pointers);

Modified: haiku/trunk/src/libs/png/pngrtran.c
===================================================================
--- haiku/trunk/src/libs/png/pngrtran.c	2009-04-06 19:15:00 UTC (rev 29972)
+++ haiku/trunk/src/libs/png/pngrtran.c	2009-04-06 19:33:30 UTC (rev 29973)
@@ -1,9 +1,9 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * Last changed in libpng 1.2.30 [August 15, 2008]
+ * Last changed in libpng 1.2.35 [February 14, 2009]
  * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -309,9 +309,7 @@
 
          hash = (png_dsortpp)png_malloc(png_ptr, (png_uint_32)(769 *
             png_sizeof(png_dsortp)));
-         for (i = 0; i < 769; i++)
-            hash[i] = NULL;
-/*         png_memset(hash, 0, 769 * png_sizeof(png_dsortp)); */
+         png_memset(hash, 0, 769 * png_sizeof(png_dsortp));
 
          num_new_palette = num_palette;
 
@@ -684,7 +682,7 @@
       }
       png_ptr->rgb_to_gray_red_coeff   = red_int;
       png_ptr->rgb_to_gray_green_coeff = green_int;
-      png_ptr->rgb_to_gray_blue_coeff  = 
+      png_ptr->rgb_to_gray_blue_coeff  =
          (png_uint_16)(32768 - red_int - green_int);
    }
 }
@@ -1329,7 +1327,7 @@
       if (rgb_error)
       {
          png_ptr->rgb_to_gray_status=1;
-         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == 
+         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
              PNG_RGB_TO_GRAY_WARN)
             png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
          if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
@@ -3836,7 +3834,7 @@
                dp = row + (row_info->rowbytes << 1) - 1;
                for (i = 0; i < row_width; i++)
                {
-                  if (*(sp - 1) == gray_high && *(sp) == gray_low) 
+                  if (*(sp - 1) == gray_high && *(sp) == gray_low)
                   {
                      *dp-- = 0;
                      *dp-- = 0;
@@ -4133,6 +4131,8 @@
         double fin, fout;
         png_uint_32 last, max;
 
+        png_memset(png_ptr->gamma_16_table, 0, num * png_sizeof(png_uint_16p)); 
+
         for (i = 0; i < num; i++)
         {
            png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr,
@@ -4188,6 +4188,8 @@
         png_ptr->gamma_16_to_1 = (png_uint_16pp)png_malloc(png_ptr,
            (png_uint_32)(num * png_sizeof(png_uint_16p )));
 
+        png_memset(png_ptr->gamma_16_to_1, 0, num * png_sizeof(png_uint_16p)); 
+
         for (i = 0; i < num; i++)
         {
            png_ptr->gamma_16_to_1[i] = (png_uint_16p)png_malloc(png_ptr,
@@ -4211,6 +4213,9 @@
         png_ptr->gamma_16_from_1 = (png_uint_16pp)png_malloc(png_ptr,
            (png_uint_32)(num * png_sizeof(png_uint_16p)));
 
+        png_memset(png_ptr->gamma_16_from_1, 0,
+           num * png_sizeof(png_uint_16p)); 
+
         for (i = 0; i < num; i++)
         {
            png_ptr->gamma_16_from_1[i] = (png_uint_16p)png_malloc(png_ptr,

Modified: haiku/trunk/src/libs/png/pngrutil.c
===================================================================
--- haiku/trunk/src/libs/png/pngrutil.c	2009-04-06 19:15:00 UTC (rev 29972)
+++ haiku/trunk/src/libs/png/pngrutil.c	2009-04-06 19:33:30 UTC (rev 29973)
@@ -1118,6 +1118,7 @@
 
    png_debug(1, "in png_handle_sPLT");
 
+
    if (!(png_ptr->mode & PNG_HAVE_IHDR))
       png_error(png_ptr, "Missing IHDR before sPLT");
    else if (png_ptr->mode & PNG_HAVE_IDAT)
@@ -1904,6 +1905,7 @@
 
    png_debug(1, "in png_handle_tEXt");
 
+
    if (!(png_ptr->mode & PNG_HAVE_IHDR))
       png_error(png_ptr, "Missing IHDR before tEXt");
 
@@ -1920,6 +1922,7 @@
 #endif
 
    png_free(png_ptr, png_ptr->chunkdata);
+
    png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
    if (png_ptr->chunkdata == NULL)
    {
@@ -1937,6 +1940,7 @@
    }
 
    key = png_ptr->chunkdata;
+
    key[slength] = 0x00;
 
    for (text = key; *text; text++)
@@ -1986,6 +1990,8 @@
    png_size_t slength, prefix_len, data_len;
 
    png_debug(1, "in png_handle_zTXt");
+
+
    if (!(png_ptr->mode & PNG_HAVE_IHDR))
       png_error(png_ptr, "Missing IHDR before zTXt");
 
@@ -2090,6 +2096,7 @@
 
    png_debug(1, "in png_handle_iTXt");
 
+
    if (!(png_ptr->mode & PNG_HAVE_IHDR))
       png_error(png_ptr, "Missing IHDR before iTXt");
 
@@ -2216,6 +2223,7 @@
 
    png_debug(1, "in png_handle_unknown");
 
+
    if (png_ptr->mode & PNG_HAVE_IDAT)
    {
 #ifdef PNG_USE_LOCAL_ARRAYS
@@ -3204,9 +3212,9 @@
    png_debug1(3, "width = %lu,", png_ptr->width);
    png_debug1(3, "height = %lu,", png_ptr->height);
    png_debug1(3, "iwidth = %lu,", png_ptr->iwidth);
-   png_debug1(3, "num_rows = %lu", png_ptr->num_rows);
+   png_debug1(3, "num_rows = %lu,", png_ptr->num_rows);
    png_debug1(3, "rowbytes = %lu,", png_ptr->rowbytes);
-   png_debug1(3, "irowbytes = %lu,", png_ptr->irowbytes);
+   png_debug1(3, "irowbytes = %lu", png_ptr->irowbytes);
 
    png_ptr->flags |= PNG_FLAG_ROW_INIT;
 }

Modified: haiku/trunk/src/libs/png/pngset.c
===================================================================
--- haiku/trunk/src/libs/png/pngset.c	2009-04-06 19:15:00 UTC (rev 29972)
+++ haiku/trunk/src/libs/png/pngset.c	2009-04-06 19:33:30 UTC (rev 29973)
@@ -1,9 +1,9 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * Last changed in libpng 1.2.34 [December 18, 2008]
+ * Last changed in libpng 1.2.35 [February 14, 2009]
  * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -61,7 +61,8 @@
 #endif
    info_ptr->valid |= PNG_INFO_cHRM;
 }
-#endif
+#endif /* PNG_FLOATING_POINT_SUPPORTED */
+
 #ifdef PNG_FIXED_POINT_SUPPORTED
 void PNGAPI
 png_set_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
@@ -382,8 +383,12 @@
       return;
    }
 
-   info_ptr->pcal_params[nparams] = NULL;
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_PCAL;
+#endif
 
+   png_memset(info_ptr->pcal_params, 0, (nparams + 1) * png_sizeof(png_charp));
+
    for (i = 0; i < nparams; i++)
    {
       length = png_strlen(params[i]) + 1;
@@ -399,9 +404,6 @@
    }
 
    info_ptr->valid |= PNG_INFO_pCAL;
-#ifdef PNG_FREE_ME_SUPPORTED
-   info_ptr->free_me |= PNG_FREE_PCAL;
-#endif
 }
 #endif
 
@@ -635,7 +637,7 @@
    }
 #endif /* cHRM */
 }
-#endif
+#endif /* sRGB */
 
 
 #if defined(PNG_iCCP_SUPPORTED)
@@ -959,6 +961,7 @@
 
     png_memcpy(np, info_ptr->splt_palettes,
            info_ptr->splt_palettes_num * png_sizeof(png_sPLT_t));
+
     png_free(png_ptr, info_ptr->splt_palettes);
     info_ptr->splt_palettes=NULL;
 

Modified: haiku/trunk/src/libs/png/pngwio.c
===================================================================
--- haiku/trunk/src/libs/png/pngwio.c	2009-04-06 19:15:00 UTC (rev 29972)
+++ haiku/trunk/src/libs/png/pngwio.c	2009-04-06 19:33:30 UTC (rev 29973)
@@ -1,9 +1,9 @@
 
 /* pngwio.c - functions for data output
  *
- * Last changed in libpng 1.2.30 [August 15, 2008]
+ * Last changed in libpng 1.2.35 [February 14, 2009]
  * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -137,7 +137,7 @@
    if (png_ptr == NULL) return;
 #if !defined(_WIN32_WCE)
    io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
-   if (io_ptr != NULL)
+   if (io_ptr != NULL && fileno(io_ptr) != -1)
       fflush(io_ptr);
 #endif
 }

Modified: haiku/trunk/src/libs/png/pngwrite.c
===================================================================
--- haiku/trunk/src/libs/png/pngwrite.c	2009-04-06 19:15:00 UTC (rev 29972)
+++ haiku/trunk/src/libs/png/pngwrite.c	2009-04-06 19:33:30 UTC (rev 29973)
@@ -1,7 +1,7 @@
 
 /* pngwrite.c - general routines to write a PNG file
  *
- * Last changed in libpng 1.2.31 [August 19, 2008]
+ * Last changed in libpng 1.2.34 [December 18, 2008]
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2008 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)



From stippi at mail.berlios.de  Mon Apr  6 21:46:03 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Mon, 6 Apr 2009 21:46:03 +0200
Subject: [Haiku-commits] r29974 - haiku/trunk/src/kits/tracker
Message-ID: <200904061946.n36Jk3e0014841@sheep.berlios.de>

Author: stippi
Date: 2009-04-06 21:46:01 +0200 (Mon, 06 Apr 2009)
New Revision: 29974
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29974&view=rev

Modified:
   haiku/trunk/src/kits/tracker/Pose.cpp
   haiku/trunk/src/kits/tracker/Pose.h
   haiku/trunk/src/kits/tracker/PoseView.cpp
Log:
* Changing the icon size will now work more like simply scaling/zooming the
  view. BPose converts the scale in SetLocation() and Location(), which does
  _not_ affect performance for list mode, BTW. So that should be fine.
* The center of the pose view is now locked when changing the icon size.


Modified: haiku/trunk/src/kits/tracker/Pose.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/Pose.cpp	2009-04-06 19:33:30 UTC (rev 29973)
+++ haiku/trunk/src/kits/tracker/Pose.cpp	2009-04-06 19:46:01 UTC (rev 29974)
@@ -195,7 +195,7 @@
 	if (poseView->ViewMode() == kListMode)
 		rect = widget->CalcClickRect(poseLoc, column, poseView);
 	else
-		rect = widget->CalcClickRect(pose->Location(), 0, poseView);
+		rect = widget->CalcClickRect(pose->Location(poseView), 0, poseView);
 
 	if (rect.Contains(where)) {
 		widget->MouseUp(rect, poseView, pose, where, pose->DelayedEdit());
@@ -224,7 +224,7 @@
 BPose::UpdateAllWidgets(int32, BPoint poseLoc, BPoseView *poseView)
 {
 	if (poseView->ViewMode() != kListMode)
-		poseLoc = fLocation;
+		poseLoc = Location(poseView);
 
 	ASSERT(fModel->IsNodeOpen());
 	EachTextWidget(this, poseView, OneCheckAndUpdate, poseLoc);
@@ -236,7 +236,7 @@
 	uint32 attrType, int32, BPoint poseLoc, BPoseView *poseView)
 {
 	if (poseView->ViewMode() != kListMode)
-		poseLoc = fLocation;
+		poseLoc = Location(poseView);
 
 	ASSERT(!resolvedModel || resolvedModel->IsNodeOpen());
 
@@ -330,18 +330,20 @@
 {
 	IconCache::sIconCache->IconChanged(ResolvedModel());
 
+	int32 iconSize = poseView->IconSizeInt();
+
 	BRect rect;
 	if (poseView->ViewMode() == kListMode) {
 		rect = CalcRect(poseLoc, poseView);
 		rect.left += kListOffset;
-		// TODO: make this depend on IconSizeInt() as well?
-		rect.right = rect.left + B_MINI_ICON;
-		rect.top = rect.bottom - B_MINI_ICON;
+		rect.right = rect.left + iconSize;
+		rect.top = rect.bottom - iconSize;
 	} else {
-		rect.left = fLocation.x;
-		rect.top = fLocation.y;
-		rect.right = rect.left + poseView->IconSizeInt();
-		rect.bottom = rect.top + poseView->IconSizeInt();
+		BPoint location = Location(poseView);
+		rect.left = location.x;
+		rect.top = location.y;
+		rect.right = rect.left + iconSize;
+		rect.bottom = rect.top + iconSize;
 	}
 
 	poseView->Invalidate(rect);
@@ -390,7 +392,7 @@
 			if (poseView->ViewMode() == kListMode)
 				bounds = widget->CalcRect(poseLoc, column, poseView);
 			else
-				bounds = widget->CalcRect(fLocation, NULL, poseView);
+				bounds = widget->CalcRect(Location(poseView), NULL, poseView);
 			widget->StartEdit(bounds, poseView, this);
 			break;
 		}
@@ -422,7 +424,7 @@
 				BPoint poseLoc(0, poseIndex * poseView->ListElemHeight());
 				bounds = widget->CalcRect(poseLoc, column, poseView);
 			} else
-				bounds = widget->CalcRect(fLocation, 0, poseView);
+				bounds = widget->CalcRect(Location(poseView), 0, poseView);
 
 			widget->StartEdit(bounds, poseView, this);
 			break;
@@ -450,14 +452,16 @@
 {
 	ASSERT(poseView->ViewMode() != kListMode);
 
+	BPoint location = Location(poseView);
+
 	if (poseView->ViewMode() == kIconMode) {
 		// check icon rect, then actual icon pixel
-		BRect rect(fLocation, fLocation);
+		BRect rect(location, location);
 		rect.right += poseView->IconSizeInt() - 1;
 		rect.bottom += poseView->IconSizeInt() - 1;
 
 		if (rect.Contains(where))
-			return IconCache::sIconCache->IconHitTest(where - fLocation,
+			return IconCache::sIconCache->IconHitTest(where - location,
 													  ResolvedModel(),
 													  kNormalIcon,
 													  poseView->IconSize());
@@ -469,14 +473,14 @@
 			rect.right = rect.left + textWidth; 
 		}
 
-		rect.top = fLocation.y + poseView->IconSizeInt();
+		rect.top = location.y + poseView->IconSizeInt();
 		rect.bottom = rect.top + poseView->FontHeight();
 
 		return rect.Contains(where);
 	}
 	
 	// MINI_ICON_MODE rect calc
-	BRect rect(fLocation, fLocation);
+	BRect rect(location, location);
 	rect.right += B_MINI_ICON + kMiniIconSeparator;
 	rect.bottom += poseView->IconPoseHeight();
 	BTextWidget *widget = WidgetFor(poseView->FirstColumn()->AttrHash());
@@ -612,7 +616,7 @@
 		if (updateRgn && !updateRgn->Intersects(rect))
 			return;
 
-		BPoint iconOrigin(fLocation);
+		BPoint iconOrigin(Location(poseView));
 		iconOrigin += offset;
 
 		DrawIcon(iconOrigin, drawView, poseView->IconSize(), directDraw,
@@ -626,7 +630,7 @@
 		if (!widget || !widget->IsVisible())
 			return;
 
-		rect = widget->CalcRect(fLocation, 0, poseView);
+		rect = widget->CalcRect(Location(poseView), 0, poseView);
 
 		bool selectDuringDraw = directDraw && selected
 			&& (poseView->IsDesktopWindow() || windowActive);
@@ -664,11 +668,13 @@
 	ASSERT(poseView->ViewMode() != kListMode);
 	ASSERT(!IsSelected());
 
+	BPoint location(Location(poseView));
+
 	// draw icon directly
 	if (fPercent == -1)
-		DrawIcon(fLocation, poseView, poseView->IconSize(), true);
+		DrawIcon(location, poseView, poseView->IconSize(), true);
 	else
-		UpdateIcon(fLocation, poseView);
+		UpdateIcon(location, poseView);
 
 	BColumn *column = poseView->FirstColumn();
 	if (!column)
@@ -679,7 +685,7 @@
 		return;
 
 	// just invalidate the background, don't draw anything
-	poseView->Invalidate(widget->CalcRect(fLocation, 0, poseView));
+	poseView->Invalidate(widget->CalcRect(location, 0, poseView));
 }
 
 
@@ -691,8 +697,10 @@
 
 	BRect oldBounds;
 
+	BPoint oldLocation = Location(poseView);
+
 	ASSERT(poseView->ViewMode() != kListMode);
-	if (point == fLocation || poseView->ViewMode() == kListMode)
+	if (point == oldLocation || poseView->ViewMode() == kListMode)
 		return;
 
 	if (inval)
@@ -702,10 +710,16 @@
 	if (poseView->ActivePose() == this) {
 		BView *border_view = poseView->FindView("BorderView");
 		if (border_view)
-			border_view->MoveBy(point.x - fLocation.x, point.y - fLocation.y);
+			border_view->MoveBy(point.x - oldLocation.x, point.y - oldLocation.y);
 	}
 
-	fLocation = point;
+	float scale = 1.0;
+	if (poseView->ViewMode() == kIconMode) {
+		scale = poseView->IconSize() / 32.0;
+	}
+	fLocation.x = point.x / scale;
+	fLocation.y = point.y / scale;
+
 	fHasLocation = true;
 	fNeedsSaveLocation = true;
 
@@ -851,6 +865,31 @@
 }
 
 
+BPoint
+BPose::Location(const BPoseView *poseView) const
+{
+	float scale = 1.0;
+	if (poseView->ViewMode() == kIconMode)
+		scale = poseView->IconSize() / 32.0;
+
+	return BPoint(fLocation.x * scale, fLocation.y * scale);
+}
+
+
+void
+BPose::SetLocation(BPoint point, const BPoseView *poseView)
+{
+	float scale = 1.0;
+	if (poseView->ViewMode() == kIconMode)
+		scale = poseView->IconSize() / 32.0;
+
+	fLocation = BPoint(floorf(point.x / scale), floorf(point.y / scale));
+if (isinff(fLocation.x) || isinff(fLocation.y))
+debugger("BPose::SetLocation() - infinite location");
+	fHasLocation = true;
+}
+
+
 BRect
 BPose::CalcRect(BPoint loc, const BPoseView *poseView, bool minimalRect)
 {
@@ -879,8 +918,9 @@
 	ASSERT(poseView->ViewMode() != kListMode);
 
 	BRect rect;
+	BPoint location = Location(poseView);
 	if (poseView->ViewMode() == kIconMode) {
-		rect.left = fLocation.x;
+		rect.left = location.x;
 		rect.right = rect.left + poseView->IconSizeInt();
 
 		BTextWidget *widget = WidgetFor(poseView->FirstColumn()->AttrHash());
@@ -892,12 +932,12 @@
 			}
 		}
 
-		rect.top = fLocation.y;
+		rect.top = location.y;
 		rect.bottom = rect.top + poseView->IconPoseHeight();
 	} else {
 		// MINI_ICON_MODE rect calc
-		rect.left = fLocation.x;
-		rect.top = fLocation.y;
+		rect.left = location.x;
+		rect.top = location.y;
 		rect.right = rect.left + B_MINI_ICON + kMiniIconSeparator;
 		rect.bottom = rect.top + poseView->IconPoseHeight();
 		BTextWidget *widget = WidgetFor(poseView->FirstColumn()->AttrHash());
@@ -927,8 +967,8 @@
 	}
 	PRINT(("%sselected\n", IsSelected() ? "" : "not "));
 	PRINT(("location %s x:%f y:%f\n", HasLocation() ? "" : "unknown ",
-		HasLocation() ? Location().x : 0,
-		HasLocation() ? Location().y : 0));
+		HasLocation() ? fLocation.x : 0,
+		HasLocation() ? fLocation.y : 0));
 	PRINT(("%s autoplaced \n", WasAutoPlaced() ? "was" : "not"));
 }
 

Modified: haiku/trunk/src/kits/tracker/Pose.h
===================================================================
--- haiku/trunk/src/kits/tracker/Pose.h	2009-04-06 19:33:30 UTC (rev 29973)
+++ haiku/trunk/src/kits/tracker/Pose.h	2009-04-06 19:46:01 UTC (rev 29974)
@@ -60,7 +60,7 @@
 		BTextWidget *AddWidget(BPoseView *, BColumn *);
 		BTextWidget *AddWidget(BPoseView *, BColumn *, ModelNodeLazyOpener &opener);
 		void RemoveWidget(BPoseView *, BColumn *);
-		void SetLocation(BPoint);
+		void SetLocation(BPoint, const BPoseView *);
 		void MoveTo(BPoint, BPoseView *, bool inval = true);
 
 		void Draw(BRect, BPoseView *, bool fullDraw = true,
@@ -108,7 +108,7 @@
 		void EditNextWidget(BPoseView *);
 		void EditPreviousWidget(BPoseView *);
 
-		BPoint Location() const;
+		BPoint Location(const BPoseView *poseView) const;
 		bool DelayedEdit() const;
 		void SetDelayedEdit(bool delay);
 		bool ListModeInited() const;
@@ -234,24 +234,7 @@
 }
 
 
-inline BPoint
-BPose::Location() const
-{
-	return fLocation;
-}
-
-
 inline void
-BPose::SetLocation(BPoint point)
-{
-	fLocation = BPoint(floorf(point.x), floorf(point.y));
-if (isinff(fLocation.x) || isinff(fLocation.y))
-debugger("BPose::SetLocation() - infinite location");
-	fHasLocation = true;
-}
-
-
-inline void
 BPose::Draw(BRect rect, BPoseView *view, bool fullDraw,
 	const BRegion *updateRgn)
 {

Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-06 19:33:30 UTC (rev 29973)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-06 19:46:01 UTC (rev 29974)
@@ -714,7 +714,7 @@
 			else
 				poseInfo.fInitedDirectory = model->EntryRef()->directory;
 
-			poseInfo.fLocation = pose->Location();
+			poseInfo.fLocation = pose->Location(this);
 
 			ExtendedPoseInfo *extendedPoseInfo = NULL;
 			size_t extendedPoseInfoSize = 0;
@@ -740,7 +740,7 @@
 				}
 				ASSERT(extendedPoseInfo);
 
-				extendedPoseInfo->SetLocationForFrame(pose->Location(),
+				extendedPoseInfo->SetLocationForFrame(pose->Location(this),
 					*frameIfDesktop);
 				extendedPoseInfoSize = extendedPoseInfo->Size();
 			}
@@ -1016,7 +1016,7 @@
 		int32 index = fPoseList->IndexOf(ActivePose());
 		BPoint loc(0, index * fListElemHeight);
 		if (ViewMode() != kListMode)
-			loc = ActivePose()->Location();
+			loc = ActivePose()->Location(this);
 
 		ActivePose()->Commit(saveChanges, loc, this, index);
 		fActivePose = NULL;
@@ -1652,7 +1652,7 @@
 		// set location from poseinfo if saved loc was for this dir
 		if (poseInfo->fInitedDirectory != -1LL) {
 			PinPointToValidRange(poseInfo->fLocation);
-			pose->SetLocation(poseInfo->fLocation);
+			pose->SetLocation(poseInfo->fLocation, this);
 			AddToVSList(pose);
 		}
 
@@ -1743,9 +1743,9 @@
 				if (fEnsurePosesVisible && !viewBounds.Intersects(poseBounds)) {
 					viewBounds.InsetBy(20, 20);
 					RemoveFromVSList(pose);
-					BPoint loc(pose->Location());
+					BPoint loc(pose->Location(this));
 					loc.ConstrainTo(viewBounds);
-					pose->SetLocation(loc);
+					pose->SetLocation(loc, this);
 					pose->SetSaveLocation();
 					AddToVSList(pose);
 					poseBounds = pose->CalcRect(this);
@@ -2741,6 +2741,24 @@
 
 	fViewState->SetViewMode(newMode);
 
+	// try to lock the center of the pose view when scaling icons
+	BPoint scaleOffset(0, 0);
+	if (newMode == kIconMode && oldMode == kIconMode) {
+		// definitely changing the icon size, so we will need to scroll
+		BRect bounds(Bounds());
+		BPoint center(bounds.LeftTop());
+		center.x += bounds.Width() / 2.0;
+		center.y += bounds.Height() / 2.0;
+		// convert the center into "unscaled icon placement" space
+		float oldScale = lastIconSize / 32.0;
+		BPoint unscaledCenter(center.x / oldScale, center.y / oldScale);
+		// get the new center in "scaled icon placement" place
+		float newScale = fViewState->IconSize() / 32.0;
+		BPoint newCenter(unscaledCenter.x * newScale,
+			unscaledCenter.y * newScale);
+		scaleOffset = newCenter - center;
+	}
+
 	// toggle view layout between listmode and non-listmode, if necessary
 	BContainerWindow *window = ContainerWindow();
 	if (oldMode == kListMode) {
@@ -2801,7 +2819,7 @@
 	if (newMode == kListMode)
 		newOrigin = fViewState->ListOrigin();
 	else
-		newOrigin = fViewState->IconOrigin();
+		newOrigin = fViewState->IconOrigin() + scaleOffset;
 
 	PinPointToValidRange(newOrigin);
 
@@ -2837,8 +2855,8 @@
 	BPoint delta;
 	BPoint poseLoc;
 
-	poseLoc = PinToGrid(pose->Location(), oldGrid, oldOffset);
-	delta = pose->Location() - poseLoc;
+	poseLoc = PinToGrid(pose->Location(this), oldGrid, oldOffset);
+	delta = pose->Location(this) - poseLoc;
 	poseLoc -= oldOffset;
 
 	if (poseLoc.x >= 0)
@@ -2866,7 +2884,7 @@
 	}
 
 	poseLoc += fOffset;
-	pose->SetLocation(poseLoc);
+	pose->SetLocation(poseLoc, this);
 	pose->SetSaveLocation();
 }
 
@@ -3156,7 +3174,7 @@
 		int32 count = fPoseList->CountItems();
 		for (int32 index = 0; index < count; index++) {
 			BPose *pose = fPoseList->ItemAt(index);
-			BPoint location(pose->Location());
+			BPoint location(pose->Location(this));
 			BPoint newLocation(PinToGrid(location, fGrid, fOffset));
 
 			// do we need to move pose to a grid location?
@@ -3191,7 +3209,7 @@
 BPoseView::PlacePose(BPose *pose, BRect &viewBounds)
 {
 	// move pose to probable location
-	pose->SetLocation(fHintLocation);
+	pose->SetLocation(fHintLocation, this);
 	BRect rect(pose->CalcRect(this));
 	BPoint deltaFromBounds(fHintLocation - rect.LeftTop());
 
@@ -3214,9 +3232,9 @@
 
 	rect.InsetBy(3, 0);
 
-	fHintLocation = pose->Location() + BPoint(fGrid.x, 0);
+	fHintLocation = pose->Location(this) + BPoint(fGrid.x, 0);
 
-	pose->SetLocation(rect.LeftTop() + deltaFromBounds);
+	pose->SetLocation(rect.LeftTop() + deltaFromBounds, this);
 	pose->SetSaveLocation();
 }
 
@@ -3251,7 +3269,7 @@
 		BPose *pose = fPoseList->ItemAt(index);
 		if (pose->WasAutoPlaced()) {
 			RemoveFromVSList(pose);
-			fHintLocation = pose->Location();
+			fHintLocation = pose->Location(this);
 			BRect oldBounds(pose->CalcRect(this));
 			PlacePose(pose, viewBounds);
 
@@ -3286,7 +3304,7 @@
 	int32 count = fPoseList->CountItems();
 	for (int32 index = 0; index < count; index++) {
 		BPose *pose = fPoseList->ItemAt(index);
-		BPoint newLocation(pose->Location());
+		BPoint newLocation(pose->Location(this));
 		bool locationNeedsUpdating = false;
 
 		if (desktop) {
@@ -3303,7 +3321,7 @@
 					Invalidate(pose->CalcRect(this));
 						// make sure the old icon gets erased
 					RemoveFromVSList(pose);
-					pose->SetLocation(newLocation);
+					pose->SetLocation(newLocation, this);
 						// set the new location
 				}
 			}
@@ -3319,11 +3337,11 @@
 				Invalidate(rect);
 				RemoveFromVSList(pose);
 			}
-			BPoint loc(pose->Location());
+			BPoint loc(pose->Location(this));
 			loc.ConstrainTo(bounds);
 				// place it onscreen
 
-			pose->SetLocation(loc);
+			pose->SetLocation(loc, this);
 				// set the new location
 			locationNeedsUpdating = true;
 		}
@@ -3359,7 +3377,7 @@
 	int32 index = FirstIndexAtOrBelow((int32)(poseRect.top - IconPoseHeight()));
 	int32 numPoses = fVSPoseList->CountItems();
 
-	while (index < numPoses && fVSPoseList->ItemAt(index)->Location().y
+	while (index < numPoses && fVSPoseList->ItemAt(index)->Location(this).y
 		< poseRect.bottom) {
 
 		BRect rect(fVSPoseList->ItemAt(index)->CalcRect(this));
@@ -3384,7 +3402,7 @@
 		fHintLocation.y += fGrid.y;
 		fHintLocation.x = viewBounds.left + fOffset.x;
 		fHintLocation = PinToGrid(fHintLocation, fGrid, fOffset);
-		pose->SetLocation(fHintLocation);
+		pose->SetLocation(fHintLocation, this);
 		poseRect = pose->CalcRect(this);
 		poseRect.InsetBy(-3, 0);
 	}
@@ -3404,7 +3422,7 @@
 
 	while (l <= r) {
 		index = (l + r) >> 1;
-		int32 result = (int32)(y - fVSPoseList->ItemAt(index)->Location().y);
+		int32 result = (int32)(y - fVSPoseList->ItemAt(index)->Location(this).y);
 
 		if (result < 0)
 			r = index - 1;
@@ -3413,7 +3431,7 @@
 		else {
 			// compare turned out equal, find first pose
 			while (index > 0
-				&& y == fVSPoseList->ItemAt(index - 1)->Location().y)
+				&& y == fVSPoseList->ItemAt(index - 1)->Location(this).y)
 				index--;
 			return index;
 		}
@@ -3421,7 +3439,7 @@
 
 	// didn't find pose AT location y - bump index to proper insert point
 	while (index < fVSPoseList->CountItems()
-		&& fVSPoseList->ItemAt(index)->Location().y <= y)
+		&& fVSPoseList->ItemAt(index)->Location(this).y <= y)
 			index++;
 
 	// if flag is true then constrain index to legal value since this
@@ -3437,7 +3455,7 @@
 void
 BPoseView::AddToVSList(BPose *pose)
 {
-	int32 index = FirstIndexAtOrBelow((int32)pose->Location().y, false);
+	int32 index = FirstIndexAtOrBelow((int32)pose->Location(this).y, false);
 	fVSPoseList->AddItem(pose, index);
 }
 
@@ -3445,7 +3463,7 @@
 int32
 BPoseView::RemoveFromVSList(const BPose *pose)
 {
-	int32 index = FirstIndexAtOrBelow((int32)pose->Location().y);
+	int32 index = FirstIndexAtOrBelow((int32)pose->Location(this).y);
 
 	int32 count = fVSPoseList->CountItems();
 	for (; index < count; index++) {
@@ -4498,7 +4516,7 @@
 			// need to do this because bsearch uses top of pose
 			// to locate pose to remove
 			targetView->RemoveFromVSList(pose);
-			BPoint location (pose->Location() + delta);
+			BPoint location (pose->Location(targetView) + delta);
 			BRect oldBounds(pose->CalcRect(targetView));
 			if (dropOnGrid)
 				location = targetView->PinToGrid(location, targetView->fGrid, targetView->fOffset);
@@ -5270,7 +5288,7 @@
 		if (sourceInListMode)
 			poseLoc = dropEnd + BPoint(0, index * (IconPoseHeight() + 3));
 		else
-			poseLoc = dropEnd + (pose->Location() - dropStart);
+			poseLoc = dropEnd + (pose->Location(this) - dropStart);
 
 		if (dropOnGrid)
 			poseLoc = PinToGrid(poseLoc, fGrid, fOffset);
@@ -6756,7 +6774,7 @@
 				if (pose->IsSelected())
 					result = result | pose->CalcRect(this);
 
-				if (pose->Location().y > bounds.bottom)
+				if (pose->Location(this).y > bounds.bottom)
 					break;
 			}
 		}
@@ -7010,7 +7028,7 @@
 					fSelectionPivotPose = pose;
 			}
 
-			if (pose->Location().y > selectionRect.bottom)
+			if (pose->Location(this).y > selectionRect.bottom)
 				break;
 		}
 	}
@@ -7079,7 +7097,7 @@
 				AddRemovePoseFromSelection(fPoseList->ItemAt(i), i, select);
 
 		} else {
-			BRect selection(where, fSelectionPivotPose->Location());
+			BRect selection(where, fSelectionPivotPose->Location(this));
 
 			// Things will get odd if we don't 'fix' the selection rect.
 			if (selection.left > selection.right) {
@@ -7812,7 +7830,7 @@
 						Invalidate(pose->CalcRect(this));
 					}
 
-					if (pose->Location().y > bounds.bottom)
+					if (pose->Location(this).y > bounds.bottom)
 						break;
 				}
 			}
@@ -7872,7 +7890,7 @@
 							Invalidate(pose->CalcRect(this));
 						}
 
-					if (pose->Location().y > bounds.bottom)
+					if (pose->Location(this).y > bounds.bottom)
 						break;
 				}
 			}
@@ -8837,7 +8855,8 @@
 				returnvalue = false;
 		}
 	} else {
-		int32 startIndex = FirstIndexAtOrBelow((int32)(bounds.top - IconPoseHeight()), true);
+		int32 startIndex = FirstIndexAtOrBelow((int32)(bounds.top
+			- IconPoseHeight()), true);
 		int32 count = fVSPoseList->CountItems();
 
 		for (int32 index = startIndex; index < count; index++) {
@@ -8849,7 +8868,7 @@
 					break;
 				}
 
-				if (pose->Location().y > bounds.bottom) {
+				if (pose->Location(this).y > bounds.bottom) {
 					returnvalue = false;
 					break;
 				}
@@ -8999,7 +9018,7 @@
 					break;
 				}
 
-				if (pose->Location().y > bounds.bottom)
+				if (pose->Location(this).y > bounds.bottom)
 					break;
 			}
 		}



From stippi at mail.berlios.de  Mon Apr  6 22:23:20 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Mon, 6 Apr 2009 22:23:20 +0200
Subject: [Haiku-commits] r29975 - haiku/trunk/build/jam
Message-ID: <200904062023.n36KNKql020542@sheep.berlios.de>

Author: stippi
Date: 2009-04-06 22:23:18 +0200 (Mon, 06 Apr 2009)
New Revision: 29975
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29975&view=rev

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Patch by siarzhuk: Added an optional package for a Keymap switcher application.
Thanks a lot!


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-04-06 19:46:01 UTC (rev 29974)
+++ haiku/trunk/build/jam/OptionalPackages	2009-04-06 20:23:18 UTC (rev 29975)
@@ -23,6 +23,7 @@
 #	CVS
 #	Development
 #	Firefox
+#	KeymapSwitcher
 #	LibLayout
 #	Links
 #	NetSurf
@@ -336,6 +337,24 @@
 }
 
 
+# KeymapSwitcher
+if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 {
+		Echo "No optional package KeymapSwitcher available for gcc4" ;
+	} else {
+		local baseURL = http://downloads.sourceforge.net/dotmatrix4beos ;
+		InstallOptionalHaikuImagePackage KeymapSwitcher-gcc2-20090409
+			:  $(baseURL)/HaikuKeymapSwitcher-package-1.0.2.zip
+			:
+		;
+		AddSymlinkToHaikuImage home config be Desktop\ Applets
+			: /boot/common/bin/KeymapSwitcher ;
+	}
+}
+
+
 # LibLayout library
 if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
 	if $(TARGET_ARCH) != x86 {



From aldeck at mail.berlios.de  Mon Apr  6 22:30:23 2009
From: aldeck at mail.berlios.de (aldeck at mail.berlios.de)
Date: Mon, 6 Apr 2009 22:30:23 +0200
Subject: [Haiku-commits] r29976 - haiku/trunk/src/apps/activitymonitor
Message-ID: <200904062030.n36KUNEQ021711@sheep.berlios.de>

Author: aldeck
Date: 2009-04-06 22:30:21 +0200 (Mon, 06 Apr 2009)
New Revision: 29976
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29976&view=rev

Modified:
   haiku/trunk/src/apps/activitymonitor/ActivityView.cpp
Log:
* Archive/Unarchive refresh interval
* Minor style fix


Modified: haiku/trunk/src/apps/activitymonitor/ActivityView.cpp
===================================================================
--- haiku/trunk/src/apps/activitymonitor/ActivityView.cpp	2009-04-06 20:23:18 UTC (rev 29975)
+++ haiku/trunk/src/apps/activitymonitor/ActivityView.cpp	2009-04-06 20:30:21 UTC (rev 29976)
@@ -555,7 +555,7 @@
 #ifdef __HAIKU__
 	: BView(name, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE | B_FRAME_EVENTS),
 #else
-	: BView(BRect(0,0,300,200), name, B_FOLLOW_NONE,
+	: BView(BRect(0, 0, 300, 200), name, B_FOLLOW_NONE,
 		B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE | B_FRAME_EVENTS),
 #endif
 	fSourcesLock("data sources")
@@ -600,7 +600,6 @@
 #endif
 	SetViewColor(B_TRANSPARENT_COLOR);
 
-	fRefreshInterval = kInitialRefreshInterval;
 	fLastRefresh = 0;
 	fDrawResolution = 1;
 	fZooming = false;
@@ -608,6 +607,10 @@
 	fSystemInfoHandler = new SystemInfoHandler;
 
 	if (settings == NULL
+		|| settings->FindInt64("refresh interval", &fRefreshInterval) != B_OK)
+		fRefreshInterval = kInitialRefreshInterval;
+
+	if (settings == NULL
 		|| settings->FindBool("show legend", &fShowLegend) != B_OK)
 		fShowLegend = true;
 
@@ -666,6 +669,10 @@
 	if (status != B_OK)
 		return status;
 
+	status = state.AddInt64("refresh interval", fRefreshInterval);
+	if (status != B_OK)
+		return status;
+
 	status = state.AddData("history background color", B_RGB_COLOR_TYPE,
 		&fHistoryBackgroundColor, sizeof(rgb_color));
 	if (status != B_OK)



From zooey at mail.berlios.de  Mon Apr  6 22:42:07 2009
From: zooey at mail.berlios.de (zooey at mail.berlios.de)
Date: Mon, 6 Apr 2009 22:42:07 +0200
Subject: [Haiku-commits] r29977 - haiku/trunk/headers/private/kernel
Message-ID: <200904062042.n36Kg7Kk022494@sheep.berlios.de>

Author: zooey
Date: 2009-04-06 22:42:05 +0200 (Mon, 06 Apr 2009)
New Revision: 29977
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29977&view=rev

Modified:
   haiku/trunk/headers/private/kernel/tracing.h
Log:
zooey + bonefish:
* made usable from C

Modified: haiku/trunk/headers/private/kernel/tracing.h
===================================================================
--- haiku/trunk/headers/private/kernel/tracing.h	2009-04-06 20:30:21 UTC (rev 29976)
+++ haiku/trunk/headers/private/kernel/tracing.h	2009-04-06 20:42:05 UTC (rev 29977)
@@ -195,6 +195,8 @@
 };
 
 
+int dump_tracing(int argc, char** argv, WrapperTraceFilter* wrapperFilter);
+
 #endif	// __cplusplus
 
 #ifdef __cplusplus
@@ -205,9 +207,8 @@
 uint8* alloc_tracing_buffer_memcpy(const void* source, size_t size, bool user);
 char* alloc_tracing_buffer_strcpy(const char* source, size_t maxSize,
 			bool user);
-tracing_stack_trace* capture_tracing_stack_trace(int32 maxCount,
+struct tracing_stack_trace* capture_tracing_stack_trace(int32 maxCount,
 			int32 skipFrames, bool userOnly);
-int dump_tracing(int argc, char** argv, WrapperTraceFilter* wrapperFilter);
 void lock_tracing_buffer();
 void unlock_tracing_buffer();
 status_t tracing_init(void);



From zooey at mail.berlios.de  Mon Apr  6 22:46:23 2009
From: zooey at mail.berlios.de (zooey at mail.berlios.de)
Date: Mon, 6 Apr 2009 22:46:23 +0200
Subject: [Haiku-commits] r29978 - in haiku/trunk: headers/private/kernel
	src/system/kernel/vm
Message-ID: <200904062046.n36KkNSD022789@sheep.berlios.de>

Author: zooey
Date: 2009-04-06 22:46:18 +0200 (Mon, 06 Apr 2009)
New Revision: 29978
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29978&view=rev

Modified:
   haiku/trunk/headers/private/kernel/vm.h
   haiku/trunk/src/system/kernel/vm/vm.cpp
Log:
zooey + bonefish:
* optimized unmapping of a single page that was rather inefficient
  for large areas

Modified: haiku/trunk/headers/private/kernel/vm.h
===================================================================
--- haiku/trunk/headers/private/kernel/vm.h	2009-04-06 20:42:05 UTC (rev 29977)
+++ haiku/trunk/headers/private/kernel/vm.h	2009-04-06 20:46:18 UTC (rev 29978)
@@ -87,6 +87,8 @@
 int32 vm_test_map_activation(struct vm_page *page, bool *_modified);
 void vm_clear_map_flags(struct vm_page *page, uint32 flags);
 void vm_remove_all_page_mappings(struct vm_page *page, uint32 *_flags);
+bool vm_unmap_page(struct vm_area* area, addr_t virtualAddress, 
+	bool preserveModified);
 status_t vm_unmap_pages(struct vm_area *area, addr_t base, size_t length,
 			bool preserveModified);
 status_t vm_map_page(struct vm_area *area, struct vm_page *page, addr_t address,

Modified: haiku/trunk/src/system/kernel/vm/vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm.cpp	2009-04-06 20:42:05 UTC (rev 29977)
+++ haiku/trunk/src/system/kernel/vm/vm.cpp	2009-04-06 20:46:18 UTC (rev 29978)
@@ -3046,6 +3046,79 @@
 }
 
 
+bool
+vm_unmap_page(vm_area* area, addr_t virtualAddress, bool preserveModified)
+{
+	vm_translation_map* map = &area->address_space->translation_map;
+
+	map->ops->lock(map);
+
+	addr_t physicalAddress;
+	uint32 flags;
+	status_t status = map->ops->query(map, virtualAddress, &physicalAddress, 
+		&flags);
+	if (status < B_OK || (flags & PAGE_PRESENT) == 0) {
+		map->ops->unlock(map);
+		return false;
+	}
+	vm_page* page = vm_lookup_page(physicalAddress / B_PAGE_SIZE);
+	if (page == NULL && area->cache_type != CACHE_TYPE_DEVICE) {
+		panic("area %p looking up page failed for pa 0x%lx\n", area,
+			physicalAddress);
+	}
+
+	if (area->wiring != B_NO_LOCK && area->cache_type != CACHE_TYPE_DEVICE)
+		decrement_page_wired_count(page);
+
+	map->ops->unmap(map, virtualAddress, virtualAddress + B_PAGE_SIZE - 1);
+
+	if (preserveModified) {
+		map->ops->flush(map);
+
+		status = map->ops->query(map, virtualAddress, &physicalAddress, &flags);
+		if ((flags & PAGE_MODIFIED) != 0 && page->state != PAGE_STATE_MODIFIED)
+			vm_page_set_state(page, PAGE_STATE_MODIFIED);
+	}
+
+	map->ops->unlock(map);
+
+	if (area->wiring == B_NO_LOCK) {
+		vm_page_mapping* mapping;
+
+		mutex_lock(&sMappingLock);
+		map->ops->lock(map);
+
+		vm_page_mappings::Iterator iterator = page->mappings.GetIterator();
+		while (iterator.HasNext()) {
+			mapping = iterator.Next();
+
+			if (mapping->area == area) {
+				area->mappings.Remove(mapping);
+				page->mappings.Remove(mapping);
+
+				if (page->mappings.IsEmpty() && page->wired_count == 0)
+					atomic_add(&gMappedPagesCount, -1);
+
+				map->ops->unlock(map);
+				mutex_unlock(&sMappingLock);
+
+				free(mapping);
+
+				return true;
+			}
+		}
+
+		map->ops->unlock(map);
+		mutex_unlock(&sMappingLock);
+		
+		dprintf("vm_unmap_page: couldn't find mapping for area %p in page %p\n",
+			area, page);
+	}
+
+	return true;
+}
+
+
 status_t
 vm_unmap_pages(vm_area* area, addr_t base, size_t size, bool preserveModified)
 {
@@ -4559,11 +4632,11 @@
 }
 
 
-/*!	Finds a page at the specified \a cacheOffset in either the \a topCacheRef
+/*!	Finds a page at the specified \a cacheOffset in either the \a topCache
 	or in its source chain. Will also page in a missing page in case there is
-	a cache that has the page.
+	a cache, whose backing store has the page.
 	If it couldn't find a page, it will return the vm_cache that should get it,
-	otherwise, it will return the vm_cache that contains the cache.
+	otherwise, it will return the vm_cache that contains the page.
 	It always grabs a reference to the vm_cache that it returns, and also locks
 	it.
 */
@@ -4968,7 +5041,7 @@
 		// In case this is a copy-on-write page, we need to unmap it from the
 		// area now
 		if (isWrite && page->cache == topCache)
-			vm_unmap_pages(area, address, B_PAGE_SIZE, true);
+			vm_unmap_page(area, address, true);
 
 		// TODO: there is currently no mechanism to prevent a page being mapped
 		// more than once in case of a second page fault!
@@ -6384,7 +6457,7 @@
 			map->ops->unlock(map);
 
 			if (unmapPage)
-				vm_unmap_pages(area, pageAddress, B_PAGE_SIZE, true);
+				vm_unmap_page(area, pageAddress, true);
 		}
 	}
 



From axeld at mail.berlios.de  Mon Apr  6 23:06:22 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Mon, 6 Apr 2009 23:06:22 +0200
Subject: [Haiku-commits] r29979 - in haiku/trunk:
	headers/private/kernel/util src/bin/debug/profile
	src/system/kernel src/system/kernel/cache
	src/system/kernel/device_manager
Message-ID: <200904062106.n36L6MI6025363@sheep.berlios.de>

Author: axeld
Date: 2009-04-06 23:06:19 +0200 (Mon, 06 Apr 2009)
New Revision: 29979
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29979&view=rev

Modified:
   haiku/trunk/headers/private/kernel/util/DoublyLinkedList.h
   haiku/trunk/src/bin/debug/profile/BasicThreadProfileResult.cpp
   haiku/trunk/src/bin/debug/profile/CallgrindThreadProfileResult.cpp
   haiku/trunk/src/system/kernel/cache/block_cache.cpp
   haiku/trunk/src/system/kernel/condition_variable.cpp
   haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp
Log:
* Added RemoveTail() method.
* Renamed DoublyLinkedList::Size() to Count(), since it actually counts the
  items (ie. O(n)).


Modified: haiku/trunk/headers/private/kernel/util/DoublyLinkedList.h
===================================================================
--- haiku/trunk/headers/private/kernel/util/DoublyLinkedList.h	2009-04-06 20:46:18 UTC (rev 29978)
+++ haiku/trunk/headers/private/kernel/util/DoublyLinkedList.h	2009-04-06 21:06:19 UTC (rev 29979)
@@ -1,5 +1,7 @@
 /* 
- * Copyright 2005-2007, Ingo Weinhold, bonefish at users.sf.net. All rights reserved.
+ * Copyright 2005-2007, Ingo Weinhold, bonefish at users.sf.net.
+ * Copyright 2006-2009, Axel D?rfler, axeld at pinc-software.de.
+ *
  * Distributed under the terms of the MIT License.
  */
 #ifndef KERNEL_UTIL_DOUBLY_LINKED_LIST_H
@@ -40,9 +42,9 @@
 	DoublyLinkedListLinkImpl() : fDoublyLinkedListLink() {}
 	~DoublyLinkedListLinkImpl() {}
 
-	DLL_Link *GetDoublyLinkedListLink()	
+	DLL_Link* GetDoublyLinkedListLink()	
 		{ return &fDoublyLinkedListLink; }
-	const DLL_Link *GetDoublyLinkedListLink() const
+	const DLL_Link* GetDoublyLinkedListLink() const
 		{ return &fDoublyLinkedListLink; }
 
 private:
@@ -56,12 +58,12 @@
 	typedef DoublyLinkedListLink<Element> Link;
 
 public:
-	inline Link *operator()(Element *element) const
+	inline Link* operator()(Element* element) const
 	{
 		return element->GetDoublyLinkedListLink();
 	}
 
-	inline const Link *operator()(const Element *element) const
+	inline const Link* operator()(const Element* element) const
 	{
 		return element->GetDoublyLinkedListLink();
 	}
@@ -75,12 +77,12 @@
 	typedef DoublyLinkedListLink<Element> Link;
 
 public:
-	inline Link *operator()(Element *element) const
+	inline Link* operator()(Element* element) const
 	{
 		return &(element->*LinkMember);
 	}
 
-	inline const Link *operator()(const Element *element) const
+	inline const Link* operator()(const Element* element) const
 	{
 		return &(element->*LinkMember);
 	}
@@ -93,14 +95,14 @@
 		typedef DoublyLinkedListLink<Element> Link;
 
 	public:
-		inline Link *operator()(Element *element) const
+		inline Link* operator()(Element* element) const
 		{
-			return (Link *)&element->link;
+			return (Link*)&element->link;
 		}
 
-		inline const Link *operator()(const Element *element) const
+		inline const Link* operator()(const Element* element) const
 		{
-			return (const Link *)&element->link;
+			return (const Link*)&element->link;
 		}
 };
 
@@ -120,7 +122,7 @@
 public:
 	class Iterator {
 	public:
-		Iterator(List *list)
+		Iterator(List* list)
 			:
 			fList(list)
 		{
@@ -141,7 +143,7 @@
 			return fNext;
 		}
 
-		Element *Next()
+		Element* Next()
 		{
 			fCurrent = fNext;
 			if (fNext)
@@ -149,14 +151,14 @@
 			return fCurrent;
 		}
 
-		Element *Current()
+		Element* Current()
 		{
 			return fCurrent;
 		}
 
-		Element *Remove()
+		Element* Remove()
 		{
-			Element *element = fCurrent;
+			Element* element = fCurrent;
 			if (fCurrent) {
 				fList->Remove(fCurrent);
 				fCurrent = NULL;
@@ -164,7 +166,7 @@
 			return element;
 		}
 
-		Iterator &operator=(const Iterator &other)
+		Iterator &operator=(const Iterator& other)
 		{
 			fList = other.fList;
 			fCurrent = other.fCurrent;
@@ -179,21 +181,21 @@
 		}
 
 	private:
-		List	*fList;
-		Element	*fCurrent;
-		Element	*fNext;
+		List*		fList;
+		Element*	fCurrent;
+		Element*	fNext;
 	};
 
 	class ConstIterator {
 	public:
-		ConstIterator(const List *list)
+		ConstIterator(const List* list)
 			:
 			fList(list)
 		{
 			Rewind();
 		}
 
-		ConstIterator(const ConstIterator &other)
+		ConstIterator(const ConstIterator& other)
 		{
 			*this = other;
 		}
@@ -203,15 +205,15 @@
 			return fNext;
 		}
 
-		Element *Next()
+		Element* Next()
 		{
-			Element *element = fNext;
+			Element* element = fNext;
 			if (fNext)
 				fNext = fList->GetNext(fNext);
 			return element;
 		}
 
-		ConstIterator &operator=(const ConstIterator &other)
+		ConstIterator& operator=(const ConstIterator& other)
 		{
 			fList = other.fList;
 			fNext = other.fNext;
@@ -224,20 +226,20 @@
 		}
 
 	private:
-		const List	*fList;
-		Element		*fNext;
+		const List*	fList;
+		Element*	fNext;
 	};
 
 	class ReverseIterator {
 	public:
-		ReverseIterator(List *list)
+		ReverseIterator(List* list)
 			:
 			fList(list)
 		{
 			Rewind();
 		}
 
-		ReverseIterator(const ReverseIterator &other)
+		ReverseIterator(const ReverseIterator& other)
 		{
 			*this = other;
 		}
@@ -247,7 +249,7 @@
 			return fNext;
 		}
 
-		Element *Next()
+		Element* Next()
 		{
 			fCurrent = fNext;
 			if (fNext)
@@ -255,9 +257,9 @@
 			return fCurrent;
 		}
 
-		Element *Remove()
+		Element* Remove()
 		{
-			Element *element = fCurrent;
+			Element* element = fCurrent;
 			if (fCurrent) {
 				fList->Remove(fCurrent);
 				fCurrent = NULL;
@@ -265,7 +267,7 @@
 			return element;
 		}
 
-		ReverseIterator &operator=(const ReverseIterator &other)
+		ReverseIterator &operator=(const ReverseIterator& other)
 		{
 			fList = other.fList;
 			fCurrent = other.fCurrent;
@@ -280,21 +282,21 @@
 		}
 
 	private:
-		List	*fList;
-		Element	*fCurrent;
-		Element	*fNext;
+		List*		fList;
+		Element*	fCurrent;
+		Element*	fNext;
 	};
 
 	class ConstReverseIterator {
 	public:
-		ConstReverseIterator(const List *list)
+		ConstReverseIterator(const List* list)
 			:
 			fList(list)
 		{
 			Rewind();
 		}
 
-		ConstReverseIterator(const ConstReverseIterator &other)
+		ConstReverseIterator(const ConstReverseIterator& other)
 		{
 			*this = other;
 		}
@@ -304,15 +306,15 @@
 			return fNext;
 		}
 
-		Element *Next()
+		Element* Next()
 		{
-			Element *element = fNext;
+			Element* element = fNext;
 			if (fNext)
 				fNext = fList->GetPrevious(fNext);
 			return element;
 		}
 
-		ConstReverseIterator &operator=(const ConstReverseIterator &other)
+		ConstReverseIterator& operator=(const ConstReverseIterator& other)
 		{
 			fList = other.fList;
 			fNext = other.fNext;
@@ -325,8 +327,8 @@
 		}
 
 	private:
-		const List	*fList;
-		Element		*fNext;
+		const List*	fList;
+		Element*	fNext;
 	};
 
 public:
@@ -335,30 +337,31 @@
 
 	inline bool IsEmpty() const			{ return (fFirst == NULL); }
 
-	inline void Insert(Element *element, bool back = true);
-	inline void Insert(Element *before, Element *element);
-	inline void Add(Element *element, bool back = true);
-	inline void Remove(Element *element);
+	inline void Insert(Element* element, bool back = true);
+	inline void Insert(Element* before, Element* element);
+	inline void Add(Element* element, bool back = true);
+	inline void Remove(Element* element);
 
-	inline void Swap(Element *a, Element *b);
+	inline void Swap(Element* a, Element* b);
 
-	inline void MoveFrom(DOUBLY_LINKED_LIST_CLASS_NAME *fromList);
+	inline void MoveFrom(DOUBLY_LINKED_LIST_CLASS_NAME* fromList);
 
 	inline void RemoveAll();
 	inline void MakeEmpty()				{ RemoveAll(); }
 
-	inline Element *First() const		{ return fFirst; }
-	inline Element *Last() const		{ return fLast; }
+	inline Element* First() const		{ return fFirst; }
+	inline Element* Last() const		{ return fLast; }
 
-	inline Element *Head() const		{ return fFirst; }
-	inline Element *Tail() const		{ return fLast; }
+	inline Element* Head() const		{ return fFirst; }
+	inline Element* Tail() const		{ return fLast; }
 
-	inline Element *RemoveHead();
+	inline Element* RemoveHead();
+	inline Element* RemoveTail();
 
-	inline Element *GetPrevious(Element *element) const;
-	inline Element *GetNext(Element *element) const;
+	inline Element* GetPrevious(Element* element) const;
+	inline Element* GetNext(Element* element) const;
 
-	inline int32 Size() const;
+	inline int32 Count() const;
 		// O(n)!
 
 	inline Iterator GetIterator()				{ return Iterator(this); }
@@ -370,8 +373,8 @@
 		{ return ConstReverseIterator(this); }
 
 private:
-	Element	*fFirst;
-	Element	*fLast;
+	Element*		fFirst;
+	Element*		fLast;
 
 	static GetLink	sGetLink;
 };
@@ -382,7 +385,7 @@
 // Insert
 DOUBLY_LINKED_LIST_TEMPLATE_LIST
 void
-DOUBLY_LINKED_LIST_CLASS_NAME::Insert(Element *element, bool back)
+DOUBLY_LINKED_LIST_CLASS_NAME::Insert(Element* element, bool back)
 {
 	if (element) {
 #if DEBUG_DOUBLY_LINKED_LIST
@@ -392,7 +395,7 @@
 
 		if (back) {
 			// append
-			Link *elLink = sGetLink(element);
+			Link* elLink = sGetLink(element);
 			elLink->previous = fLast;
 			elLink->next = NULL;
 			if (fLast)
@@ -402,7 +405,7 @@
 			fLast = element;
 		} else {
 			// prepend
-			Link *elLink = sGetLink(element);
+			Link* elLink = sGetLink(element);
 			elLink->previous = NULL;
 			elLink->next = fFirst;
 			if (fFirst)
@@ -417,7 +420,7 @@
 // Insert
 DOUBLY_LINKED_LIST_TEMPLATE_LIST
 void
-DOUBLY_LINKED_LIST_CLASS_NAME::Insert(Element *before, Element *element)
+DOUBLY_LINKED_LIST_CLASS_NAME::Insert(Element* before, Element* element)
 {
 	if (before == NULL) {
 		Insert(element);
@@ -431,8 +434,8 @@
 		"list: %p\n", this);
 #endif
 
-	Link *beforeLink = sGetLink(before);
-	Link *link = sGetLink(element);
+	Link* beforeLink = sGetLink(before);
+	Link* link = sGetLink(element);
 
 	link->next = before;
 	link->previous = beforeLink->previous;
@@ -447,7 +450,7 @@
 // Add
 DOUBLY_LINKED_LIST_TEMPLATE_LIST
 void
-DOUBLY_LINKED_LIST_CLASS_NAME::Add(Element *element, bool back)
+DOUBLY_LINKED_LIST_CLASS_NAME::Add(Element* element, bool back)
 {
 	Insert(element, back);
 }
@@ -455,7 +458,7 @@
 // Remove
 DOUBLY_LINKED_LIST_TEMPLATE_LIST
 void
-DOUBLY_LINKED_LIST_CLASS_NAME::Remove(Element *element)
+DOUBLY_LINKED_LIST_CLASS_NAME::Remove(Element* element)
 {
 	if (element) {
 #if DEBUG_DOUBLY_LINKED_LIST
@@ -464,7 +467,7 @@
 			"list: %p, element: %p\n", this, element);
 #endif
 
-		Link *elLink = sGetLink(element);
+		Link* elLink = sGetLink(element);
 		if (elLink->previous)
 			sGetLink(elLink->previous)->next = elLink->next;
 		else
@@ -481,11 +484,11 @@
 // Swap
 DOUBLY_LINKED_LIST_TEMPLATE_LIST
 void
-DOUBLY_LINKED_LIST_CLASS_NAME::Swap(Element *a, Element *b)
+DOUBLY_LINKED_LIST_CLASS_NAME::Swap(Element* a, Element* b)
 {
 	if (a && b && a != b) {
-		Element *aNext = sGetLink(a)->next;
-		Element *bNext = sGetLink(b)->next;
+		Element* aNext = sGetLink(a)->next;
+		Element* bNext = sGetLink(b)->next;
 		if (a == bNext) {
 			Remove(a);
 			Insert(b, a);
@@ -504,7 +507,7 @@
 // MoveFrom
 DOUBLY_LINKED_LIST_TEMPLATE_LIST
 void
-DOUBLY_LINKED_LIST_CLASS_NAME::MoveFrom(DOUBLY_LINKED_LIST_CLASS_NAME *fromList)
+DOUBLY_LINKED_LIST_CLASS_NAME::MoveFrom(DOUBLY_LINKED_LIST_CLASS_NAME* fromList)
 {
 	if (fromList && fromList->fFirst) {
 		if (fFirst) {
@@ -525,9 +528,9 @@
 void
 DOUBLY_LINKED_LIST_CLASS_NAME::RemoveAll()
 {
-	Element *element = fFirst;
+	Element* element = fFirst;
 	while (element) {
-		Link *elLink = sGetLink(element);
+		Link* elLink = sGetLink(element);
 		element = elLink->next;
 		elLink->previous = NULL;
 		elLink->next = NULL;
@@ -538,20 +541,30 @@
 
 // RemoveHead
 DOUBLY_LINKED_LIST_TEMPLATE_LIST
-Element *
+Element* 
 DOUBLY_LINKED_LIST_CLASS_NAME::RemoveHead()
 {
-	Element *element = Head();
+	Element* element = Head();
 	Remove(element);
 	return element;
 }
 
+// RemoveTail
+DOUBLY_LINKED_LIST_TEMPLATE_LIST
+Element* 
+DOUBLY_LINKED_LIST_CLASS_NAME::RemoveTail()
+{
+	Element* element = Tail();
+	Remove(element);
+	return element;
+}
+
 // GetPrevious
 DOUBLY_LINKED_LIST_TEMPLATE_LIST
-Element *
-DOUBLY_LINKED_LIST_CLASS_NAME::GetPrevious(Element *element) const
+Element* 
+DOUBLY_LINKED_LIST_CLASS_NAME::GetPrevious(Element* element) const
 {
-	Element *result = NULL;
+	Element* result = NULL;
 	if (element)
 		result = sGetLink(element)->previous;
 	return result;
@@ -559,19 +572,19 @@
 
 // GetNext
 DOUBLY_LINKED_LIST_TEMPLATE_LIST
-Element *
-DOUBLY_LINKED_LIST_CLASS_NAME::GetNext(Element *element) const
+Element* 
+DOUBLY_LINKED_LIST_CLASS_NAME::GetNext(Element* element) const
 {
-	Element *result = NULL;
+	Element* result = NULL;
 	if (element)
 		result = sGetLink(element)->next;
 	return result;
 }
 
-// Size
+// Count
 DOUBLY_LINKED_LIST_TEMPLATE_LIST
 int32
-DOUBLY_LINKED_LIST_CLASS_NAME::Size() const
+DOUBLY_LINKED_LIST_CLASS_NAME::Count() const
 {
 	int32 count = 0;
 	for (Element* element = First(); element; element = GetNext(element))

Modified: haiku/trunk/src/bin/debug/profile/BasicThreadProfileResult.cpp
===================================================================
--- haiku/trunk/src/bin/debug/profile/BasicThreadProfileResult.cpp	2009-04-06 20:46:18 UTC (rev 29978)
+++ haiku/trunk/src/bin/debug/profile/BasicThreadProfileResult.cpp	2009-04-06 21:06:19 UTC (rev 29979)
@@ -120,7 +120,7 @@
 BasicThreadProfileResult::PrintResults()
 {
 	// get hit images
-	BasicThreadImage* images[fOldImages.Size() + fImages.Size()];
+	BasicThreadImage* images[fOldImages.Count() + fImages.Count()];
 	int32 imageCount = GetHitImages(images);
 
 	// count symbols

Modified: haiku/trunk/src/bin/debug/profile/CallgrindThreadProfileResult.cpp
===================================================================
--- haiku/trunk/src/bin/debug/profile/CallgrindThreadProfileResult.cpp	2009-04-06 20:46:18 UTC (rev 29978)
+++ haiku/trunk/src/bin/debug/profile/CallgrindThreadProfileResult.cpp	2009-04-06 21:06:19 UTC (rev 29979)
@@ -204,7 +204,7 @@
 	fprintf(out, "summary: %lld %lld\n", fTotalTicks, fTotalTicks * fInterval);
 
 	// get hit images
-	CallgrindThreadImage* images[fOldImages.Size() + fImages.Size()];
+	CallgrindThreadImage* images[fOldImages.Count() + fImages.Count()];
 	int32 imageCount = GetHitImages(images);
 
 	for (int32 i = 0; i < imageCount; i++) {

Modified: haiku/trunk/src/system/kernel/cache/block_cache.cpp
===================================================================
--- haiku/trunk/src/system/kernel/cache/block_cache.cpp	2009-04-06 20:46:18 UTC (rev 29978)
+++ haiku/trunk/src/system/kernel/cache/block_cache.cpp	2009-04-06 21:06:19 UTC (rev 29979)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2004-2009, Axel D?rfler, axeld at pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
@@ -1523,7 +1523,7 @@
 
 	kprintf(" %ld blocks total, %ld dirty, %ld discarded, %ld referenced, %ld "
 		"in unused.\n", count, dirty, discarded, referenced,
-		cache->unused_blocks.Size());
+		cache->unused_blocks.Count());
 
 	hash_close(cache->hash, &iterator, false);
 	return 0;

Modified: haiku/trunk/src/system/kernel/condition_variable.cpp
===================================================================
--- haiku/trunk/src/system/kernel/condition_variable.cpp	2009-04-06 20:46:18 UTC (rev 29978)
+++ haiku/trunk/src/system/kernel/condition_variable.cpp	2009-04-06 21:06:19 UTC (rev 29979)
@@ -264,7 +264,7 @@
 	ConditionVariableHash::Iterator it(&sConditionVariableHash);
 	while (ConditionVariable* variable = it.Next()) {
 		// count waiting threads
-		int count = variable->fEntries.Size();
+		int count = variable->fEntries.Count();
 
 		kprintf("%p  %p  %-20s %15d\n", variable, variable->fObject,
 			variable->fObjectType, count);

Modified: haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp
===================================================================
--- haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp	2009-04-06 20:46:18 UTC (rev 29978)
+++ haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp	2009-04-06 21:06:19 UTC (rev 29979)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2002-2009, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 
@@ -723,7 +723,7 @@
 
 			kprintf("%p  %5ld %3ld %5ld %c %3ld %s\n", driver,
 				driver->image < 0 ? -1 : driver->image,
-				driver->devices_used, driver->devices.Size(),
+				driver->devices_used, driver->devices.Count(),
 				driver->binary_updated ? 'U' : ' ', driver->priority,
 				driver->name);
 		}
@@ -751,7 +751,7 @@
 	kprintf(" node:           %Ld\n", driver->node);
 	kprintf(" last modified:  %ld\n", driver->last_modified);
 	kprintf(" devs used:      %ld\n", driver->devices_used);
-	kprintf(" devs published: %ld\n", driver->devices.Size());
+	kprintf(" devs published: %ld\n", driver->devices.Count());
 	kprintf(" binary updated: %d\n", driver->binary_updated);
 	kprintf(" priority:       %ld\n", driver->priority);
 	kprintf(" api version:    %ld\n", driver->api_version);



From axeld at mail.berlios.de  Mon Apr  6 23:13:07 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Mon, 6 Apr 2009 23:13:07 +0200
Subject: [Haiku-commits] r29980 - haiku/trunk/headers/private/kernel/util
Message-ID: <200904062113.n36LD7oS025832@sheep.berlios.de>

Author: axeld
Date: 2009-04-06 23:13:06 +0200 (Mon, 06 Apr 2009)
New Revision: 29980
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29980&view=rev

Modified:
   haiku/trunk/headers/private/kernel/util/DoublyLinkedList.h
Log:
* Missed that when cleaning up the style.


Modified: haiku/trunk/headers/private/kernel/util/DoublyLinkedList.h
===================================================================
--- haiku/trunk/headers/private/kernel/util/DoublyLinkedList.h	2009-04-06 21:06:19 UTC (rev 29979)
+++ haiku/trunk/headers/private/kernel/util/DoublyLinkedList.h	2009-04-06 21:13:06 UTC (rev 29980)
@@ -28,8 +28,8 @@
 	DoublyLinkedListLink() : next(NULL), previous(NULL) {}
 	~DoublyLinkedListLink() {}
 
-	Element	*next;
-	Element	*previous;
+	Element*	next;
+	Element*	previous;
 };
 
 // DoublyLinkedListLinkImpl



From axeld at mail.berlios.de  Mon Apr  6 23:18:30 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Mon, 6 Apr 2009 23:18:30 +0200
Subject: [Haiku-commits] r29981 -
	haiku/trunk/src/add-ons/kernel/network/stack
Message-ID: <200904062118.n36LIU9r026187@sheep.berlios.de>

Author: axeld
Date: 2009-04-06 23:18:29 +0200 (Mon, 06 Apr 2009)
New Revision: 29981
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29981&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
Log:
* Now uses DoublyLinkedList instead of the struct list C stuff.
* Cleanup.


Modified: haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-06 21:13:06 UTC (rev 29980)
+++ haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-06 21:18:29 UTC (rev 29981)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2008, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -35,32 +35,35 @@
 #include "utility.h"
 
 
-struct net_socket_private : net_socket {
-	struct list_link		link;
-	team_id					owner;
-	uint32					max_backlog;
-	uint32					child_count;
-	struct list				pending_children;
-	struct list				connected_children;
+struct net_socket_private;
+typedef DoublyLinkedList<net_socket_private> SocketList;
 
-	struct select_sync_pool	*select_pool;
-	mutex					lock;
+struct net_socket_private
+		: net_socket, DoublyLinkedListLinkImpl<net_socket_private> {
+	team_id						owner;
+	uint32						max_backlog;
+	uint32						child_count;
+	SocketList					pending_children;
+	SocketList					connected_children;
+
+	struct select_sync_pool*	select_pool;
+	mutex						lock;
 };
 
 
-void socket_delete(net_socket *socket);
-int socket_bind(net_socket *socket, const struct sockaddr *address,
+void socket_delete(net_socket* socket);
+int socket_bind(net_socket* socket, const struct sockaddr* address,
 	socklen_t addressLength);
-int socket_setsockopt(net_socket *socket, int level, int option,
-	const void *value, int length);
+int socket_setsockopt(net_socket* socket, int level, int option,
+	const void* value, int length);
 
 
-struct list sSocketList;
-mutex sSocketLock;
+static SocketList sSocketList;
+static mutex sSocketLock;
 
 
 static size_t
-compute_user_iovec_length(iovec *userVec, uint32 count)
+compute_user_iovec_length(iovec* userVec, uint32 count)
 {
 	size_t length = 0;
 
@@ -77,14 +80,9 @@
 
 
 static void
-delete_children(struct list *list)
+delete_children(SocketList& list)
 {
-	while (true) {
-		net_socket_private *child
-			= (net_socket_private *)list_remove_head_item(list);
-		if (child == NULL)
-			break;
-
+	while (net_socket_private* child = list.RemoveHead()) {
 		child->parent = NULL;
 		socket_delete(child);
 	}
@@ -92,9 +90,9 @@
 
 
 static status_t
-create_socket(int family, int type, int protocol, net_socket_private **_socket)
+create_socket(int family, int type, int protocol, net_socket_private** _socket)
 {
-	struct net_socket_private *socket = new (std::nothrow) net_socket_private;
+	struct net_socket_private* socket = new(std::nothrow) net_socket_private;
 	if (socket == NULL)
 		return B_NO_MEMORY;
 
@@ -113,11 +111,6 @@
 	socket->receive.low_water_mark = 1;
 	socket->receive.timeout = B_INFINITE_TIMEOUT;
 
-	list_init_etc(&socket->pending_children, offsetof(net_socket_private,
-		link));
-	list_init_etc(&socket->connected_children, offsetof(net_socket_private,
-		link));
-
 	status_t status = get_domain_protocols(socket);
 	if (status < B_OK) {
 		mutex_destroy(&socket->lock);
@@ -131,10 +124,10 @@
 
 
 static status_t
-add_ancillary_data(net_socket *socket, ancillary_data_container* container,
-	void *data, size_t dataLen)
+add_ancillary_data(net_socket* socket, ancillary_data_container* container,
+	void* data, size_t dataLen)
 {
-	cmsghdr *header = (cmsghdr*)data;
+	cmsghdr* header = (cmsghdr*)data;
 
 	while (dataLen > 0) {
 		if (header->cmsg_len < sizeof(cmsghdr) || header->cmsg_len > dataLen)
@@ -157,10 +150,10 @@
 
 
 static status_t
-process_ancillary_data(net_socket *socket, ancillary_data_container* container,
-	msghdr *messageHeader)
+process_ancillary_data(net_socket* socket, ancillary_data_container* container,
+	msghdr* messageHeader)
 {
-	uint8 *dataBuffer = (uint8*)messageHeader->msg_control;
+	uint8* dataBuffer = (uint8*)messageHeader->msg_control;
 	int dataBufferLen = messageHeader->msg_controllen;
 
 	if (container == NULL || dataBuffer == NULL) {
@@ -169,7 +162,7 @@
 	}
 
 	ancillary_data_header header;
-	void *data = NULL;
+	void* data = NULL;
 
 	while ((data = next_ancillary_data(container, data, &header)) != NULL) {
 		if (socket->first_info->process_ancillary_data == NULL)
@@ -191,7 +184,7 @@
 
 
 static ssize_t
-socket_receive_no_buffer(net_socket *socket, msghdr *header, void *data,
+socket_receive_no_buffer(net_socket* socket, msghdr* header, void* data,
 	size_t length, int flags)
 {
 	iovec stackVec = { data, length };
@@ -227,9 +220,9 @@
 
 
 status_t
-socket_open(int family, int type, int protocol, net_socket **_socket)
+socket_open(int family, int type, int protocol, net_socket** _socket)
 {
-	net_socket_private *socket;
+	net_socket_private* socket;
 	status_t status = create_socket(family, type, protocol, &socket);
 	if (status < B_OK)
 		return status;
@@ -243,7 +236,7 @@
 	socket->owner = team_get_current_team_id();
 
 	mutex_lock(&sSocketLock);
-	list_add_item(&sSocketList, socket);
+	sSocketList.Add(socket);
 	mutex_unlock(&sSocketLock);
 
 	*_socket = socket;
@@ -252,15 +245,15 @@
 
 
 status_t
-socket_close(net_socket *_socket)
+socket_close(net_socket* _socket)
 {
-	net_socket_private *socket = (net_socket_private *)_socket;
+	net_socket_private* socket = (net_socket_private*)_socket;
 	return socket->first_info->close(socket->first_protocol);
 }
 
 
 status_t
-socket_free(net_socket *socket)
+socket_free(net_socket* socket)
 {
 	status_t status = socket->first_info->free(socket->first_protocol);
 	if (status == B_BUSY)
@@ -272,16 +265,16 @@
 
 
 status_t
-socket_readv(net_socket *socket, const iovec *vecs, size_t vecCount,
-	size_t *_length)
+socket_readv(net_socket* socket, const iovec* vecs, size_t vecCount,
+	size_t* _length)
 {
 	return -1;
 }
 
 
 status_t
-socket_writev(net_socket *socket, const iovec *vecs, size_t vecCount,
-	size_t *_length)
+socket_writev(net_socket* socket, const iovec* vecs, size_t vecCount,
+	size_t* _length)
 {
 	if (socket->peer.ss_len == 0)
 		return ECONNRESET;
@@ -294,7 +287,7 @@
 	}
 
 	// TODO: useful, maybe even computed header space!
-	net_buffer *buffer = gNetBufferModule.create(256);
+	net_buffer* buffer = gNetBufferModule.create(256);
 	if (buffer == NULL)
 		return ENOBUFS;
 
@@ -329,7 +322,7 @@
 
 
 status_t
-socket_control(net_socket *socket, int32 op, void *data, size_t length)
+socket_control(net_socket* socket, int32 op, void* data, size_t length)
 {
 	switch (op) {
 		case FIONBIO:
@@ -365,21 +358,21 @@
 
 
 ssize_t
-socket_read_avail(net_socket *socket)
+socket_read_avail(net_socket* socket)
 {
 	return socket->first_info->read_avail(socket->first_protocol);
 }
 
 
 ssize_t
-socket_send_avail(net_socket *socket)
+socket_send_avail(net_socket* socket)
 {
 	return socket->first_info->send_avail(socket->first_protocol);
 }
 
 
 status_t
-socket_send_data(net_socket *socket, net_buffer *buffer)
+socket_send_data(net_socket* socket, net_buffer* buffer)
 {
 	return socket->first_info->send_data(socket->first_protocol,
 		buffer);
@@ -387,8 +380,8 @@
 
 
 status_t
-socket_receive_data(net_socket *socket, size_t length, uint32 flags,
-	net_buffer **_buffer)
+socket_receive_data(net_socket* socket, size_t length, uint32 flags,
+	net_buffer** _buffer)
 {
 	status_t status = socket->first_info->read_data(socket->first_protocol,
 		length, flags, _buffer);
@@ -406,15 +399,17 @@
 
 
 status_t
-socket_get_next_stat(uint32 *_cookie, int family, struct net_stat *stat)
+socket_get_next_stat(uint32* _cookie, int family, struct net_stat* stat)
 {
 	MutexLocker locker(sSocketLock);
 
-	net_socket_private *socket = NULL;
+	net_socket_private* socket = NULL;
+	SocketList::Iterator iterator = sSocketList.GetIterator();
 	uint32 cookie = *_cookie;
 	uint32 count = 0;
-	while ((socket = (net_socket_private *)list_get_next_item(&sSocketList,
-			socket)) != NULL) {
+	while (iterator.HasNext()) {
+		socket = iterator.Next();
+
 		// TODO: also traverse the pending connections
 		if (count == cookie)
 			break;
@@ -451,9 +446,9 @@
 
 
 status_t
-socket_spawn_pending(net_socket *_parent, net_socket **_socket)
+socket_spawn_pending(net_socket* _parent, net_socket** _socket)
 {
-	net_socket_private *parent = (net_socket_private *)_parent;
+	net_socket_private* parent = (net_socket_private*)_parent;
 
 	MutexLocker locker(parent->lock);
 
@@ -463,7 +458,7 @@
 	if (parent->child_count > 3 * parent->max_backlog / 2)
 		return ENOBUFS;
 
-	net_socket_private *socket;
+	net_socket_private* socket;
 	status_t status = create_socket(parent->family, parent->type,
 		parent->protocol, &socket);
 	if (status < B_OK)
@@ -479,7 +474,7 @@
 	memcpy(&socket->peer, &parent->peer, parent->peer.ss_len);
 
 	// add to the parent's list of pending connections
-	list_add_item(&parent->pending_children, socket);
+	parent->pending_children.Add(socket);
 	socket->parent = parent;
 	parent->child_count++;
 
@@ -489,20 +484,20 @@
 
 
 void
-socket_delete(net_socket *_socket)
+socket_delete(net_socket* _socket)
 {
-	net_socket_private *socket = (net_socket_private *)_socket;
+	net_socket_private* socket = (net_socket_private*)_socket;
 
 	if (socket->parent != NULL)
 		panic("socket still has a parent!");
 
 	mutex_lock(&sSocketLock);
-	list_remove_item(&sSocketList, socket);
+	sSocketList.Remove(socket);
 	mutex_unlock(&sSocketLock);
 
 	// also delete all children of this socket
-	delete_children(&socket->pending_children);
-	delete_children(&socket->connected_children);
+	delete_children(socket->pending_children);
+	delete_children(socket->connected_children);
 
 	put_domain_protocols(socket);
 	mutex_destroy(&socket->lock);
@@ -511,14 +506,13 @@
 
 
 status_t
-socket_dequeue_connected(net_socket *_parent, net_socket **_socket)
+socket_dequeue_connected(net_socket* _parent, net_socket** _socket)
 {
-	net_socket_private *parent = (net_socket_private *)_parent;
+	net_socket_private* parent = (net_socket_private*)_parent;
 
 	mutex_lock(&parent->lock);
 
-	net_socket_private *socket = (net_socket_private *)list_remove_head_item(
-		&parent->connected_children);
+	net_socket_private* socket = parent->connected_children.RemoveHead();
 	if (socket != NULL) {
 		socket->parent = NULL;
 		parent->child_count--;
@@ -531,7 +525,7 @@
 		return B_ENTRY_NOT_FOUND;
 
 	mutex_lock(&sSocketLock);
-	list_add_item(&sSocketList, socket);
+	sSocketList.Add(socket);
 	mutex_unlock(&sSocketLock);
 
 	return B_OK;
@@ -539,78 +533,65 @@
 
 
 ssize_t
-socket_count_connected(net_socket *_parent)
+socket_count_connected(net_socket* _parent)
 {
-	net_socket_private *parent = (net_socket_private *)_parent;
+	net_socket_private* parent = (net_socket_private*)_parent;
 
 	MutexLocker _(parent->lock);
-
-	ssize_t count = 0;
-	void *item = NULL;
-	while ((item = list_get_next_item(&parent->connected_children,
-			item)) != NULL) {
-		count++;
-	}
-
-	return count;
+	return parent->connected_children.Count();
 }
 
 
 status_t
-socket_set_max_backlog(net_socket *_socket, uint32 backlog)
+socket_set_max_backlog(net_socket* _socket, uint32 backlog)
 {
-	net_socket_private *socket = (net_socket_private *)_socket;
+	net_socket_private* socket = (net_socket_private*)_socket;
 
 	// we enforce an upper limit of connections waiting to be accepted
 	if (backlog > 256)
 		backlog = 256;
 
-	mutex_lock(&socket->lock);
+	MutexLocker _(socket->lock);
 
 	// first remove the pending connections, then the already connected
 	// ones as needed
-	net_socket_private *child;
+	net_socket_private* child;
 	while (socket->child_count > backlog
-		&& (child = (net_socket_private *)list_remove_tail_item(
-				&socket->pending_children)) != NULL) {
+		&& (child = socket->pending_children.RemoveTail()) != NULL) {
 		child->parent = NULL;
 		socket->child_count--;
 	}
 	while (socket->child_count > backlog
-		&& (child = (net_socket_private *)list_remove_tail_item(
-				&socket->connected_children)) != NULL) {
+		&& (child = socket->connected_children.RemoveTail()) != NULL) {
 		child->parent = NULL;
 		socket_delete(child);
 		socket->child_count--;
 	}
 
 	socket->max_backlog = backlog;
-	mutex_unlock(&socket->lock);
 	return B_OK;
 }
 
 
-/*!
-	The socket has been connected. It will be moved to the connected queue
+/*!	The socket has been connected. It will be moved to the connected queue
 	of its parent socket.
 */
 status_t
-socket_connected(net_socket *socket)
+socket_connected(net_socket* socket)
 {
-	net_socket_private *parent = (net_socket_private *)socket->parent;
+	net_socket_private* parent = (net_socket_private*)socket->parent;
 	if (parent == NULL)
 		return B_BAD_VALUE;
 
-	mutex_lock(&parent->lock);
+	MutexLocker _(&parent->lock);
 
-	list_remove_item(&parent->pending_children, socket);
-	list_add_item(&parent->connected_children, socket);
+	parent->pending_children.Remove((net_socket_private*)socket);
+	parent->connected_children.Add((net_socket_private*)socket);
 
 	// notify parent
 	if (parent->select_pool)
 		notify_select_event_pool(parent->select_pool, B_SELECT_READ);
 
-	mutex_unlock(&parent->lock);
 	return B_OK;
 }
 
@@ -619,9 +600,9 @@
 
 
 status_t
-socket_request_notification(net_socket *_socket, uint8 event, selectsync *sync)
+socket_request_notification(net_socket* _socket, uint8 event, selectsync* sync)
 {
-	net_socket_private *socket = (net_socket_private *)_socket;
+	net_socket_private* socket = (net_socket_private*)_socket;
 
 	mutex_lock(&socket->lock);
 
@@ -663,36 +644,29 @@
 
 
 status_t
-socket_cancel_notification(net_socket *_socket, uint8 event, selectsync *sync)
+socket_cancel_notification(net_socket* _socket, uint8 event, selectsync* sync)
 {
-	net_socket_private *socket = (net_socket_private *)_socket;
+	net_socket_private* socket = (net_socket_private*)_socket;
 
-	mutex_lock(&socket->lock);
-
-	status_t status = remove_select_sync_pool_entry(&socket->select_pool,
-		sync, event);
-
-	mutex_unlock(&socket->lock);
-	return status;
+	MutexLocker _(socket->lock);
+	return remove_select_sync_pool_entry(&socket->select_pool, sync, event);
 }
 
 
 status_t
-socket_notify(net_socket *_socket, uint8 event, int32 value)
+socket_notify(net_socket* _socket, uint8 event, int32 value)
 {
-	net_socket_private *socket = (net_socket_private *)_socket;
+	net_socket_private* socket = (net_socket_private*)_socket;
 	bool notify = true;
 
 	switch (event) {
 		case B_SELECT_READ:
-			if ((ssize_t)socket->receive.low_water_mark > value
-				&& value >= B_OK)
+			if ((ssize_t)socket->receive.low_water_mark > value && value >= B_OK)
 				notify = false;
 			break;
 
 		case B_SELECT_WRITE:
-			if ((ssize_t)socket->send.low_water_mark > value
-				&& value >= B_OK)
+			if ((ssize_t)socket->send.low_water_mark > value && value >= B_OK)
 				notify = false;
 			break;
 
@@ -701,12 +675,11 @@
 			break;
 	}
 
-	mutex_lock(&socket->lock);
+	MutexLocker _(socket->lock);
 
 	if (notify && socket->select_pool)
 		notify_select_event_pool(socket->select_pool, event);
 
-	mutex_unlock(&socket->lock);
 	return B_OK;
 }
 
@@ -715,13 +688,13 @@
 
 
 int
-socket_accept(net_socket *socket, struct sockaddr *address,
-	socklen_t *_addressLength, net_socket **_acceptedSocket)
+socket_accept(net_socket* socket, struct sockaddr* address,
+	socklen_t* _addressLength, net_socket** _acceptedSocket)
 {
 	if ((socket->options & SO_ACCEPTCONN) == 0)
 		return B_BAD_VALUE;
 
-	net_socket *accepted;
+	net_socket* accepted;
 	status_t status = socket->first_info->accept(socket->first_protocol,
 		&accepted);
 	if (status < B_OK)
@@ -739,7 +712,7 @@
 
 
 int
-socket_bind(net_socket *socket, const struct sockaddr *address,
+socket_bind(net_socket* socket, const struct sockaddr* address,
 	socklen_t addressLength)
 {
 	sockaddr empty;
@@ -755,7 +728,7 @@
 
 	if (socket->address.ss_len != 0) {
 		status_t status = socket->first_info->unbind(socket->first_protocol,
-			(sockaddr *)&socket->address);
+			(sockaddr*)&socket->address);
 		if (status < B_OK)
 			return status;
 	}
@@ -763,7 +736,7 @@
 	memcpy(&socket->address, address, sizeof(sockaddr));
 
 	status_t status = socket->first_info->bind(socket->first_protocol,
-		(sockaddr *)address);
+		(sockaddr*)address);
 	if (status < B_OK) {
 		// clear address again, as binding failed
 		socket->address.ss_len = 0;
@@ -774,7 +747,7 @@
 
 
 int
-socket_connect(net_socket *socket, const struct sockaddr *address,
+socket_connect(net_socket* socket, const struct sockaddr* address,
 	socklen_t addressLength)
 {
 	if (address == NULL || addressLength == 0)
@@ -792,8 +765,8 @@
 
 
 int
-socket_getpeername(net_socket *socket, struct sockaddr *address,
-	socklen_t *_addressLength)
+socket_getpeername(net_socket* socket, struct sockaddr* address,
+	socklen_t* _addressLength)
 {
 	if (socket->peer.ss_len == 0)
 		return ENOTCONN;
@@ -805,8 +778,8 @@
 
 
 int
-socket_getsockname(net_socket *socket, struct sockaddr *address,
-	socklen_t *_addressLength)
+socket_getsockname(net_socket* socket, struct sockaddr* address,
+	socklen_t* _addressLength)
 {
 	if (socket->address.ss_len == 0)
 		return ENOTCONN;
@@ -819,8 +792,8 @@
 
 
 status_t
-socket_get_option(net_socket *socket, int level, int option, void *value,
-	int *_length)
+socket_get_option(net_socket* socket, int level, int option, void* value,
+	int* _length)
 {
 	if (level != SOL_SOCKET)
 		return ENOPROTOOPT;
@@ -828,7 +801,7 @@
 	switch (option) {
 		case SO_SNDBUF:
 		{
-			uint32 *size = (uint32 *)value;
+			uint32* size = (uint32*)value;
 			*size = socket->send.buffer_size;
 			*_length = sizeof(uint32);
 			return B_OK;
@@ -836,7 +809,7 @@
 
 		case SO_RCVBUF:
 		{
-			uint32 *size = (uint32 *)value;
+			uint32* size = (uint32*)value;
 			*size = socket->receive.buffer_size;
 			*_length = sizeof(uint32);
 			return B_OK;
@@ -844,7 +817,7 @@
 
 		case SO_SNDLOWAT:
 		{
-			uint32 *size = (uint32 *)value;
+			uint32* size = (uint32*)value;
 			*size = socket->send.low_water_mark;
 			*_length = sizeof(uint32);
 			return B_OK;
@@ -852,7 +825,7 @@
 
 		case SO_RCVLOWAT:
 		{
-			uint32 *size = (uint32 *)value;
+			uint32* size = (uint32*)value;
 			*size = socket->receive.low_water_mark;
 			*_length = sizeof(uint32);
 			return B_OK;
@@ -872,7 +845,7 @@
 			if (timeout == B_INFINITE_TIMEOUT)
 				timeout = 0;
 
-			struct timeval *timeval = (struct timeval *)value;
+			struct timeval* timeval = (struct timeval*)value;
 			timeval->tv_sec = timeout / 1000000LL;
 			timeval->tv_usec = timeout % 1000000LL;
 
@@ -882,7 +855,7 @@
 
 		case SO_NONBLOCK:
 		{
-			int32 *_set = (int32 *)value;
+			int32* _set = (int32*)value;
 			*_set = socket->receive.timeout == 0 && socket->send.timeout == 0;
 			*_length = sizeof(int32);
 			return B_OK;
@@ -898,7 +871,7 @@
 		case SO_REUSEPORT:
 		case SO_USELOOPBACK:
 		{
-			int32 *_set = (int32 *)value;
+			int32* _set = (int32*)value;
 			*_set = (socket->options & option) != 0;
 			*_length = sizeof(int32);
 			return B_OK;
@@ -906,7 +879,7 @@
 
 		case SO_ERROR:
 		{
-			int32 *_set = (int32 *)value;
+			int32* _set = (int32*)value;
 			*_set = socket->error;
 			*_length = sizeof(int32);
 
@@ -925,8 +898,8 @@
 
 
 int
-socket_getsockopt(net_socket *socket, int level, int option, void *value,
-	int *_length)
+socket_getsockopt(net_socket* socket, int level, int option, void* value,
+	int* _length)
 {
 	return socket->first_protocol->module->getsockopt(socket->first_protocol,
 		level, option, value, _length);
@@ -934,7 +907,7 @@
 
 
 int
-socket_listen(net_socket *socket, int backlog)
+socket_listen(net_socket* socket, int backlog)
 {
 	status_t status = socket->first_info->listen(socket->first_protocol,
 		backlog);
@@ -946,7 +919,7 @@
 
 
 ssize_t
-socket_receive(net_socket *socket, msghdr *header, void *data, size_t length,
+socket_receive(net_socket* socket, msghdr* header, void* data, size_t length,
 	int flags)
 {
 	// If the protocol sports read_data_no_buffer() we use it.
@@ -954,7 +927,7 @@
 		return socket_receive_no_buffer(socket, header, data, length, flags);
 
 	size_t totalLength = length;
-	net_buffer *buffer;
+	net_buffer* buffer;
 	int i;
 
 	// the convention to this function is that have header been
@@ -1048,22 +1021,22 @@
 
 
 ssize_t
-socket_send(net_socket *socket, msghdr *header, const void *data, size_t length,
+socket_send(net_socket* socket, msghdr* header, const void* data, size_t length,
 	int flags)
 {
-	const sockaddr *address = NULL;
+	const sockaddr* address = NULL;
 	socklen_t addressLength = 0;
 	size_t bytesLeft = length;
 
 	if (length > SSIZE_MAX)
 		return B_BAD_VALUE;
 
-	ancillary_data_container *ancillaryData = NULL;
+	ancillary_data_container* ancillaryData = NULL;
 	CObjectDeleter<ancillary_data_container> ancillaryDataDeleter(NULL,
 		&delete_ancillary_data_container);
 
 	if (header != NULL) {
-		address = (const sockaddr *)header->msg_name;
+		address = (const sockaddr*)header->msg_name;
 		addressLength = header->msg_namelen;
 
 		// get the ancillary data
@@ -1074,7 +1047,7 @@
 			ancillaryDataDeleter.SetTo(ancillaryData);
 
 			status_t status = add_ancillary_data(socket, ancillaryData,
-				(cmsghdr *)header->msg_control, header->msg_controllen);
+				(cmsghdr*)header->msg_control, header->msg_controllen);
 			if (status != B_OK)
 				return status;
 		}
@@ -1090,7 +1063,7 @@
 			return EISCONN;
 
 		// socket is connected, we use that address
-		address = (struct sockaddr *)&socket->peer;
+		address = (struct sockaddr*)&socket->peer;
 		addressLength = socket->peer.ss_len;
 	}
 
@@ -1143,7 +1116,7 @@
 
 	while (bytesLeft > 0) {
 		// TODO: useful, maybe even computed header space!
-		net_buffer *buffer = gNetBufferModule.create(256);
+		net_buffer* buffer = gNetBufferModule.create(256);
 		if (buffer == NULL)
 			return ENOBUFS;
 
@@ -1175,7 +1148,7 @@
 				// partial send
 				vecOffset = bytes;
 				length -= vecOffset;
-				data = (uint8 *)data + vecOffset;
+				data = (uint8*)data + vecOffset;
 			} else if (header != NULL) {
 				// proceed with next buffer, if any
 				vecOffset = 0;
@@ -1224,7 +1197,7 @@
 
 
 status_t
-socket_set_option(net_socket *socket, int level, int option, const void *value,
+socket_set_option(net_socket* socket, int level, int option, const void* value,
 	int length)
 {
 	if (level != SOL_SOCKET)
@@ -1237,7 +1210,7 @@
 			if (length < (int)sizeof(struct linger))
 				return B_BAD_VALUE;
 
-			struct linger *linger = (struct linger *)value;
+			struct linger* linger = (struct linger*)value;
 			if (linger->l_onoff) {
 				socket->options |= SO_LINGER;
 				socket->linger = linger->l_linger;
@@ -1252,28 +1225,28 @@
 			if (length != sizeof(uint32))
 				return B_BAD_VALUE;
 
-			socket->send.buffer_size = *(const uint32 *)value;
+			socket->send.buffer_size = *(const uint32*)value;
 			return B_OK;
 
 		case SO_RCVBUF:
 			if (length != sizeof(uint32))
 				return B_BAD_VALUE;
 
-			socket->receive.buffer_size = *(const uint32 *)value;
+			socket->receive.buffer_size = *(const uint32*)value;
 			return B_OK;
 
 		case SO_SNDLOWAT:
 			if (length != sizeof(uint32))
 				return B_BAD_VALUE;
 
-			socket->send.low_water_mark = *(const uint32 *)value;
+			socket->send.low_water_mark = *(const uint32*)value;
 			return B_OK;
 
 		case SO_RCVLOWAT:
 			if (length != sizeof(uint32))
 				return B_BAD_VALUE;
 
-			socket->receive.low_water_mark = *(const uint32 *)value;
+			socket->receive.low_water_mark = *(const uint32*)value;
 			return B_OK;
 
 		case SO_RCVTIMEO:
@@ -1282,7 +1255,7 @@
 			if (length != sizeof(struct timeval))
 				return B_BAD_VALUE;
 
-			const struct timeval *timeval = (const struct timeval *)value;
+			const struct timeval* timeval = (const struct timeval*)value;
 			bigtime_t timeout = timeval->tv_sec * 1000000LL + timeval->tv_usec;
 			if (timeout == 0)
 				timeout = B_INFINITE_TIMEOUT;
@@ -1298,7 +1271,7 @@
 			if (length != sizeof(int32))
 				return B_BAD_VALUE;
 
-			if (*(const int32 *)value) {
+			if (*(const int32*)value) {
 				socket->send.timeout = 0;
 				socket->receive.timeout = 0;
 			} else {
@@ -1318,7 +1291,7 @@
 			if (length != sizeof(int32))
 				return B_BAD_VALUE;
 
-			if (*(const int32 *)value)
+			if (*(const int32*)value)
 				socket->options |= option;
 			else
 				socket->options &= ~option;
@@ -1329,7 +1302,7 @@
 			if (length != sizeof(int32))
 				return B_BAD_VALUE;
 
-			int index = *(const int32 *)value;
+			int index = *(const int32*)value;
 			if (index < 0)
 				return B_BAD_VALUE;
 
@@ -1349,7 +1322,7 @@
 
 
 int
-socket_setsockopt(net_socket *socket, int level, int option, const void *value,
+socket_setsockopt(net_socket* socket, int level, int option, const void* value,
 	int length)
 {
 	return socket->first_protocol->module->setsockopt(socket->first_protocol,
@@ -1358,7 +1331,7 @@
 
 
 int
-socket_shutdown(net_socket *socket, int direction)
+socket_shutdown(net_socket* socket, int direction)
 {
 	return socket->first_info->shutdown(socket->first_protocol, direction);
 }
@@ -1426,16 +1399,11 @@
 	switch (op) {
 		case B_MODULE_INIT:
 		{
-			// TODO: this is currently done in the net_stack driver
-			// initialize the main stack if not done so already
-			//module_info *module;
-			//return get_module(NET_STARTER_MODULE_NAME, &module);
-			list_init_etc(&sSocketList, offsetof(net_socket_private, link));
+			new (&sSocketList) SocketList;
 			mutex_init(&sSocketLock, "socket list");
 			return B_OK;
 		}
 		case B_MODULE_UNINIT:
-			//return put_module(NET_STARTER_MODULE_NAME);
 			mutex_destroy(&sSocketLock);
 			return B_OK;
 



From revol at free.fr  Mon Apr  6 23:22:38 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Mon, 06 Apr 2009 23:22:38 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r29970_-_haiku/trunk/src/preferences/ma?=
 =?utf-8?q?il/ProviderInfo?=
In-Reply-To: <200904061814.n36IEban026575@sheep.berlios.de>
Message-ID: <7664822960-BeMail@laptop>

> Author: czeidler
> Date: 2009-04-06 20:14:36 +0200 (Mon, 06 Apr 2009)
> New Revision: 29970
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29970&view=rev
> 
> Added:
>    haiku/trunk/src/preferences/mail/ProviderInfo/ReadMe
> Log:
> Description of the provider database / attribute format.
> 

Cool, I'll be adding my french ones...

cern.ch ? you know ppl there ? :p

Fran?ois.


From anevilyak at mail.berlios.de  Tue Apr  7 00:10:42 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Tue, 7 Apr 2009 00:10:42 +0200
Subject: [Haiku-commits] r29982 - haiku/trunk/src/kits/interface
Message-ID: <200904062210.n36MAgBf031640@sheep.berlios.de>

Author: anevilyak
Date: 2009-04-07 00:10:41 +0200 (Tue, 07 Apr 2009)
New Revision: 29982
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29982&view=rev

Modified:
   haiku/trunk/src/kits/interface/Control.cpp
   haiku/trunk/src/kits/interface/TextControl.cpp
Log:
Implemented BTextControl's string "Value" property. This fixes ticket #3494.



Modified: haiku/trunk/src/kits/interface/Control.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Control.cpp	2009-04-06 21:18:29 UTC (rev 29981)
+++ haiku/trunk/src/kits/interface/Control.cpp	2009-04-06 22:10:41 UTC (rev 29982)
@@ -179,7 +179,7 @@
 					reply.AddString("result", fLabel);
 					handled = true;
 				} else {
-					// B_GET_PROPERTY
+					// B_SET_PROPERTY
 					const char *label;
 					if (message->FindString("data", &label) == B_OK) {
 						SetLabel(label);
@@ -192,7 +192,7 @@
 					reply.AddInt32("result", fValue);
 					handled = true;
 				} else {
-					// B_GET_PROPERTY
+					// B_SET_PROPERTY
 					int32 value;
 					if (message->FindInt32("data", &value) == B_OK) {
 						SetValue(value);
@@ -205,7 +205,7 @@
 					reply.AddBool("result", fEnabled);
 					handled = true;
 				} else {
-					// B_GET_PROPERTY
+					// B_SET_PROPERTY
 					bool enabled;
 					if (message->FindBool("data", &enabled) == B_OK) {
 						SetEnabled(enabled);

Modified: haiku/trunk/src/kits/interface/TextControl.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextControl.cpp	2009-04-06 21:18:29 UTC (rev 29981)
+++ haiku/trunk/src/kits/interface/TextControl.cpp	2009-04-06 22:10:41 UTC (rev 29982)
@@ -16,6 +16,7 @@
 #include <ControlLook.h>
 #include <LayoutUtils.h>
 #include <Message.h>
+#include <PropertyInfo.h>
 #include <Region.h>
 #include <Window.h>
 
@@ -40,6 +41,18 @@
 #endif
 
 
+static property_info sPropertyList[] = {
+	{
+		"Value",
+		{ B_GET_PROPERTY, B_SET_PROPERTY },
+		{ B_DIRECT_SPECIFIER },
+		NULL, 0,
+		{ B_STRING_TYPE }
+	},
+	{}
+};
+
+
 class BTextControl::LabelLayoutItem : public BAbstractLayoutItem {
 public:
 								LabelLayoutItem(BTextControl* parent);
@@ -542,40 +555,55 @@
 
 
 void
-BTextControl::MessageReceived(BMessage *msg)
+BTextControl::MessageReceived(BMessage *message)
 {
-	switch(msg->what) {
-		case B_SET_PROPERTY:
-		case B_GET_PROPERTY:
-			// TODO: implement these.
-			
-			// fall through and pass to BControl
-			// until implemented - note that we will still
-			// need to pass these up the chain for any scripting
-			// messages we don't handle ourselves regardless.
-		default:
-			BControl::MessageReceived(msg);
-			break;
+	if (message->what == B_GET_PROPERTY || message->what == B_SET_PROPERTY) {
+		BMessage reply(B_REPLY);
+		bool handled = false;
+
+		BMessage specifier;
+		int32 index;
+		int32 form;
+		const char *property;
+		if (message->GetCurrentSpecifier(&index, &specifier, &form, &property) == B_OK) {
+			if (strcmp(property, "Value") == 0) {
+				if (message->what == B_GET_PROPERTY) {
+					reply.AddString("result", fText->Text());
+					handled = true;
+				} else {
+					const char *value = NULL;
+					// B_SET_PROPERTY
+					if (message->FindString("data", &value) == B_OK) {
+						fText->SetText(value);
+						reply.AddInt32("error", B_OK);
+						handled = true;
+					}
+				}
+			}
+		}
+		
+		if (handled) {
+			message->SendReply(&reply);
+			return;
+		}
 	}
+	
+	BControl::MessageReceived(message);
 }
 
 
 BHandler *
-BTextControl::ResolveSpecifier(BMessage *msg, int32 index,
-										 BMessage *specifier, int32 form,
+BTextControl::ResolveSpecifier(BMessage *message, int32 index,
+										 BMessage *specifier, int32 what,
 										 const char *property)
 {
-	/*
-	BPropertyInfo propInfo(prop_list);
-	BHandler *target = NULL;
+	BPropertyInfo propInfo(sPropertyList);
 
-	if (propInfo.FindMatch(message, 0, specifier, what, property) < B_OK)
-		return BControl::ResolveSpecifier(message, index, specifier, what,
-			property);
-	else
+	if (propInfo.FindMatch(message, 0, specifier, what, property) >= B_OK)
 		return this;
-	*/
-	return BControl::ResolveSpecifier(msg, index, specifier, form, property);
+
+	return BControl::ResolveSpecifier(message, index, specifier, what,
+		property);
 }
 
 



From zooey at mail.berlios.de  Tue Apr  7 00:27:02 2009
From: zooey at mail.berlios.de (zooey at mail.berlios.de)
Date: Tue, 7 Apr 2009 00:27:02 +0200
Subject: [Haiku-commits] r29983 - haiku/trunk/src/kits/interface
Message-ID: <200904062227.n36MR2B4000026@sheep.berlios.de>

Author: zooey
Date: 2009-04-07 00:27:01 +0200 (Tue, 07 Apr 2009)
New Revision: 29983
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29983&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
applied two textview-patches from Blub that fixes #3458:
* Select() did not re-show the caret when it should
* GoToLine() must hide/show the caret to avoid drawing artefacts


Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-04-06 22:10:41 UTC (rev 29982)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-04-06 22:27:01 UTC (rev 29983)
@@ -1331,7 +1331,9 @@
 BTextView::GoToLine(int32 index)
 {
 	_CancelInputMethod();
+	_HideCaret();
 	fSelStart = fSelEnd = fClickOffset = OffsetAt(index);
+	_ShowCaret();
 }
 
 
@@ -1507,6 +1509,7 @@
 				Highlight(fSelStart, fSelEnd);
 		}
 		fSelStart = fSelEnd = fClickOffset = startOffset;
+		_ShowCaret();
 	} else {
 		if (fActive) {
 			// draw only those ranges that are different



From axeld at mail.berlios.de  Tue Apr  7 00:46:00 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 7 Apr 2009 00:46:00 +0200
Subject: [Haiku-commits] r29984 -
	haiku/trunk/src/add-ons/kernel/network/stack
Message-ID: <200904062246.n36Mk0r8012728@sheep.berlios.de>

Author: axeld
Date: 2009-04-07 00:45:58 +0200 (Tue, 07 Apr 2009)
New Revision: 29984
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29984&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
Log:
* Added KDL commands to inspect sockets ("socket", and "sockets").


Modified: haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-06 22:27:01 UTC (rev 29983)
+++ haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-06 22:45:58 UTC (rev 29984)
@@ -35,6 +35,9 @@
 #include "utility.h"
 
 
+#define ADD_DEBUGGER_COMMANDS
+
+
 struct net_socket_private;
 typedef DoublyLinkedList<net_socket_private> SocketList;
 
@@ -216,6 +219,68 @@
 }
 
 
+#ifdef ADD_DEBUGGER_COMMANDS
+
+static int
+dump_socket(int argc, char** argv)
+{
+	if (argc < 2) {
+		kprintf("usage: %s [address]\n", argv[0]);
+		return 0;
+	}
+
+	net_socket_private* socket = (net_socket_private*)parse_expression(argv[1]);
+
+	kprintf("SOCKET %p\n", socket);
+	kprintf("  family.type.protocol: %d.%d.%d\n",
+		socket->family, socket->type, socket->protocol);
+	kprintf("  parent:               %p\n", socket->parent);
+	kprintf("  first protocol:       %p\n", socket->first_protocol);
+	kprintf("  first module_info:    %p\n", socket->first_info);
+	kprintf("  options:              %x\n", socket->options);
+	kprintf("  linger:               %d\n", socket->linger);
+	kprintf("  bound to device:      %d\n", socket->bound_to_device);
+	kprintf("  owner:                %ld\n", socket->owner);
+	kprintf("  max backlog:          %ld\n", socket->max_backlog);
+	kprintf("  child_count:          %lu\n", socket->child_count);
+	
+	if (socket->child_count == 0)
+		return 0;
+
+	kprintf("    pending children:\n");
+	SocketList::Iterator iterator = socket->pending_children.GetIterator();
+	while (net_socket_private* child = iterator.Next()) {
+		kprintf("      %p\n", child);
+	}
+
+	kprintf("    connected children:\n");
+	iterator = socket->connected_children.GetIterator();
+	while (net_socket_private* child = iterator.Next()) {
+		kprintf("      %p\n", child);
+	}
+
+	return 0;
+}
+
+
+static int
+dump_sockets(int argc, char** argv)
+{
+	kprintf("address        kind  owner protocol   module_info parent\n");
+
+	SocketList::Iterator iterator = sSocketList.GetIterator();
+	while (net_socket_private* socket = iterator.Next()) {
+		kprintf("%p %2d.%2d.%2d %6ld %p %p  %p\n", socket,
+			socket->family, socket->type, socket->protocol, socket->owner,
+			socket->first_protocol, socket->first_info, socket->parent);
+	}
+
+	return 0;
+}
+
+#endif	// ADD_DEBUGGER_COMMANDS
+
+
 //	#pragma mark -
 
 
@@ -1401,10 +1466,20 @@
 		{
 			new (&sSocketList) SocketList;
 			mutex_init(&sSocketLock, "socket list");
+
+#ifdef ADD_DEBUGGER_COMMANDS
+			add_debugger_command("sockets", dump_sockets, "lists all sockets");
+			add_debugger_command("socket", dump_socket, "dumps a socket");
+#endif
 			return B_OK;
 		}
 		case B_MODULE_UNINIT:
 			mutex_destroy(&sSocketLock);
+
+#ifdef ADD_DEBUGGER_COMMANDS
+			remove_debugger_command("socket", dump_socket);
+			remove_debugger_command("sockets", dump_sockets);
+#endif
 			return B_OK;
 
 		default:



From anevilyak at mail.berlios.de  Tue Apr  7 01:50:21 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Tue, 7 Apr 2009 01:50:21 +0200
Subject: [Haiku-commits] r29985 - haiku/trunk/src/kits/interface
Message-ID: <200904062350.n36NoLaA014230@sheep.berlios.de>

Author: anevilyak
Date: 2009-04-07 01:50:20 +0200 (Tue, 07 Apr 2009)
New Revision: 29985
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29985&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextControl.cpp
Log:
Make gcc4 happy.



Modified: haiku/trunk/src/kits/interface/TextControl.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextControl.cpp	2009-04-06 22:45:58 UTC (rev 29984)
+++ haiku/trunk/src/kits/interface/TextControl.cpp	2009-04-06 23:50:20 UTC (rev 29985)
@@ -10,6 +10,8 @@
 
 /*!	BTextControl displays text that can act like a control. */
 
+#include <string.h>
+
 #include <TextControl.h>
 
 #include <AbstractLayoutItem.h>



From axeld at mail.berlios.de  Tue Apr  7 02:15:53 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 7 Apr 2009 02:15:53 +0200
Subject: [Haiku-commits] r29986 -
	haiku/trunk/src/add-ons/kernel/network/stack
Message-ID: <200904070015.n370Fr5Q016325@sheep.berlios.de>

Author: axeld
Date: 2009-04-07 02:15:52 +0200 (Tue, 07 Apr 2009)
New Revision: 29986
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29986&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
Log:
* socket_delete() now also supports deleting children that still have a parent;
  added a potentially dangerous TODO, though (will look into this tomorrow).
* Improved output of the KDL command, and also include the child sockets in the
  list.


Modified: haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-06 23:50:20 UTC (rev 29985)
+++ haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-07 00:15:52 UTC (rev 29986)
@@ -51,6 +51,8 @@
 
 	struct select_sync_pool*	select_pool;
 	mutex						lock;
+
+	bool						is_connected;
 };
 
 
@@ -221,6 +223,16 @@
 
 #ifdef ADD_DEBUGGER_COMMANDS
 
+static void
+print_socket_line(net_socket_private* socket, const char* prefix)
+{
+	kprintf("%s%p %2d.%2d.%2d %6ld %p %p  %p%s\n", prefix, socket,
+		socket->family, socket->type, socket->protocol, socket->owner,
+		socket->first_protocol, socket->first_info, socket->parent,
+		socket->parent != NULL ? socket->is_connected ? " (c)" : " (p)" : "");
+}
+
+
 static int
 dump_socket(int argc, char** argv)
 {
@@ -242,6 +254,7 @@
 	kprintf("  bound to device:      %d\n", socket->bound_to_device);
 	kprintf("  owner:                %ld\n", socket->owner);
 	kprintf("  max backlog:          %ld\n", socket->max_backlog);
+	kprintf("  is connected:         %d\n", socket->is_connected);
 	kprintf("  child_count:          %lu\n", socket->child_count);
 	
 	if (socket->child_count == 0)
@@ -250,13 +263,13 @@
 	kprintf("    pending children:\n");
 	SocketList::Iterator iterator = socket->pending_children.GetIterator();
 	while (net_socket_private* child = iterator.Next()) {
-		kprintf("      %p\n", child);
+		print_socket_line(child, "      ");
 	}
 
 	kprintf("    connected children:\n");
 	iterator = socket->connected_children.GetIterator();
 	while (net_socket_private* child = iterator.Next()) {
-		kprintf("      %p\n", child);
+		print_socket_line(child, "      ");
 	}
 
 	return 0;
@@ -270,9 +283,18 @@
 
 	SocketList::Iterator iterator = sSocketList.GetIterator();
 	while (net_socket_private* socket = iterator.Next()) {
-		kprintf("%p %2d.%2d.%2d %6ld %p %p  %p\n", socket,
-			socket->family, socket->type, socket->protocol, socket->owner,
-			socket->first_protocol, socket->first_info, socket->parent);
+		print_socket_line(socket, "");
+		
+		SocketList::Iterator childIterator
+			= socket->pending_children.GetIterator();
+		while (net_socket_private* child = childIterator.Next()) {
+			print_socket_line(child, " ");
+		}
+
+		childIterator = socket->connected_children.GetIterator();
+		while (net_socket_private* child = childIterator.Next()) {
+			print_socket_line(child, " ");
+		}
 	}
 
 	return 0;
@@ -552,10 +574,23 @@
 socket_delete(net_socket* _socket)
 {
 	net_socket_private* socket = (net_socket_private*)_socket;
+	net_socket_private* parent = (net_socket_private*)socket->parent;
 
-	if (socket->parent != NULL)
-		panic("socket still has a parent!");
+	if (parent != NULL) {
+		// The socket still has a parent
+		// TODO: we need to make sure our parent isn't deleted right now,
+		//   or in the process of deleting its children...
+		MutexLocker _(parent->lock);
 
+		if (socket->is_connected)
+			parent->connected_children.Remove(socket);
+		else
+			parent->pending_children.Remove(socket);
+
+		parent->child_count--;
+		socket->parent = NULL;
+	}
+
 	mutex_lock(&sSocketLock);
 	sSocketList.Remove(socket);
 	mutex_unlock(&sSocketLock);
@@ -565,6 +600,7 @@
 	delete_children(socket->connected_children);
 
 	put_domain_protocols(socket);
+
 	mutex_destroy(&socket->lock);
 	delete socket;
 }
@@ -652,6 +688,7 @@
 
 	parent->pending_children.Remove((net_socket_private*)socket);
 	parent->connected_children.Add((net_socket_private*)socket);
+	((net_socket_private*)socket)->is_connected = true;
 
 	// notify parent
 	if (parent->select_pool)



From axeld at mail.berlios.de  Tue Apr  7 02:18:41 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 7 Apr 2009 02:18:41 +0200
Subject: [Haiku-commits] r29987 -
	haiku/trunk/src/add-ons/kernel/network/protocols/tcp
Message-ID: <200904070018.n370Ifqo016791@sheep.berlios.de>

Author: axeld
Date: 2009-04-07 02:18:40 +0200 (Tue, 07 Apr 2009)
New Revision: 29987
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29987&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
Log:
* Fixed TCPEndpoint::Listen() never setting the backlog on its socket, causing
  only a single pending connection to be accepted at once.
* Fixed discarding endpoints that still had a parent, but were closed before
  they could be accepted (or even established). Previously, these were never
  deleted, slowly filling up the socket's backlog.


Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp	2009-04-07 00:15:52 UTC (rev 29986)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp	2009-04-07 00:18:40 UTC (rev 29987)
@@ -711,7 +711,7 @@
 {
 	TRACE("Unbind()");
 
-	MutexLocker lock(fLock);
+	MutexLocker _(fLock);
 	return fManager->Unbind(this);
 }
 
@@ -721,7 +721,7 @@
 {
 	TRACE("Listen()");
 
-	MutexLocker lock(fLock);
+	MutexLocker _(fLock);
 
 	if (fState != CLOSED)
 		return B_BAD_VALUE;
@@ -731,12 +731,14 @@
 		return ENOBUFS;
 
 	status_t status = fManager->SetPassive(this);
-	if (status < B_OK) {
+	if (status != B_OK) {
 		delete_sem(fAcceptSemaphore);
 		fAcceptSemaphore = -1;
 		return status;
 	}
 
+	gSocketModule->set_max_backlog(socket, count);
+
 	fState = LISTEN;
 	T(State(this));
 	return B_OK;
@@ -1179,8 +1181,8 @@
 status_t
 TCPEndpoint::_WaitForEstablished(MutexLocker &locker, bigtime_t timeout)
 {
-// TODO: Checking for CLOSED seems correct, but breaks several neon tests.
-// When investigating this, also have a look at _Close() and _HandleReset().
+	// TODO: Checking for CLOSED seems correct, but breaks several neon tests.
+	// When investigating this, also have a look at _Close() and _HandleReset().
 	while (fState < ESTABLISHED/* && fState != CLOSED*/) {
 		if (socket->error != B_OK)
 			return socket->error;
@@ -1208,6 +1210,15 @@
 
 	fSendList.Signal();
 	_NotifyReader();
+
+	if (socket->parent != NULL) {
+		// We still have a parent - obviously, we haven't been accepted yet,
+		// so no one could ever close us.
+		// Since we can't just delete ourself here, we trigger an immediate
+		// time-wait timer.
+		_CancelConnectionTimers();
+		gStackModule->set_timer(&fTimeWaitTimer, 0);
+	}
 }
 
 



From anevilyak at mail.berlios.de  Tue Apr  7 05:31:35 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Tue, 7 Apr 2009 05:31:35 +0200
Subject: [Haiku-commits] r29988 - haiku/trunk/src/kits/tracker
Message-ID: <200904070331.n373VZvV012299@sheep.berlios.de>

Author: anevilyak
Date: 2009-04-07 05:31:33 +0200 (Tue, 07 Apr 2009)
New Revision: 29988
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29988&view=rev

Modified:
   haiku/trunk/src/kits/tracker/PoseView.cpp
Log:
If drag and drop with the context menu is used (right click drag / control + drag), treat "Copy Here" as a request to duplicate the item if the destination is the same folder.



Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-07 00:18:40 UTC (rev 29987)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-07 03:31:33 UTC (rev 29988)
@@ -4502,7 +4502,11 @@
 	if (!createLink && !createRelativeLink && (*srcWindow->PoseView()->TargetModel()->NodeRef()
 		== *destFolder->NodeRef())) {
 		BPoseView *targetView = srcWindow->PoseView();
-
+		if (forceCopy) {
+			targetView->DuplicateSelection(&clickPt, &loc);
+			return;
+		}
+		
 		if (targetView->ViewMode() == kListMode)                    // can't move in list view
 			return;
 		



From korli at users.berlios.de  Tue Apr  7 10:14:05 2009
From: korli at users.berlios.de (=?ISO-8859-1?B?Suly9G1lIER1dmFs?=)
Date: Tue, 7 Apr 2009 10:14:05 +0200
Subject: [Haiku-commits] r29969 - in haiku/trunk: build/jam
	src/preferences/mail src/preferences/mail/ProviderInfo
In-Reply-To: <200904061808.n36I8BHI025940@sheep.berlios.de>
References: <200904061808.n36I8BHI025940@sheep.berlios.de>
Message-ID: <c47b1d430904070114l26ba2d31hcd2e479dfd29ca4c@mail.gmail.com>

Hi Clemens,

2009/4/6 <czeidler at mail.berlios.de>

> Added: haiku/trunk/src/preferences/mail/AutoConfig.h
> ===================================================================
> --- haiku/trunk/src/preferences/mail/AutoConfig.h       2009-04-06 15:21:57
> UTC (rev 29968)
> +++ haiku/trunk/src/preferences/mail/AutoConfig.h       2009-04-06 18:07:31
> UTC (rev 29969)
> @@ -0,0 +1,81 @@
> +#ifndef AUTO_CONFIG_H
> +#define AUTO_CONFIG_H
> +
> +
>


I think you forgot to include a licence on most of the added files :)

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

From stippi at mail.berlios.de  Tue Apr  7 11:03:31 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Tue, 7 Apr 2009 11:03:31 +0200
Subject: [Haiku-commits] r29989 - haiku/trunk/src/apps/terminal
Message-ID: <200904070903.n3793VuA020664@sheep.berlios.de>

Author: stippi
Date: 2009-04-07 11:03:29 +0200 (Tue, 07 Apr 2009)
New Revision: 29989
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29989&view=rev

Modified:
   haiku/trunk/src/apps/terminal/TermView.cpp
Log:
* Watch the system clipboard for changes.
* On the event of a clipboard change, check if the clipboard contains text
  now and replace the contents of the internal "mouse clipboard". So when
  right/middle clicking into the Terminal, the current system clipboard contents
  are inserted. As soon as the user selects text in the Terminal again, that
  text will have priority over the system clipboard, as before.

Fixes ticket #3700.


Modified: haiku/trunk/src/apps/terminal/TermView.cpp
===================================================================
--- haiku/trunk/src/apps/terminal/TermView.cpp	2009-04-07 03:31:33 UTC (rev 29988)
+++ haiku/trunk/src/apps/terminal/TermView.cpp	2009-04-07 09:03:29 UTC (rev 29989)
@@ -937,12 +937,16 @@
 		fTextBuffer->SetListener(thisMessenger);
 		_SynchronizeWithTextBuffer(0, -1);
 	}
+
+	be_clipboard->StartWatching(thisMessenger);
 }
 
 
 void
 TermView::DetachedFromWindow()
 {
+	be_clipboard->StopWatching(BMessenger(this));
+
 	delete fWinchRunner;
 	fWinchRunner = NULL;
 
@@ -1398,6 +1402,29 @@
 			break;
 		}
 
+		case B_CLIPBOARD_CHANGED:
+			// This message originates from the system clipboard. Overwrite
+			// the contents of the mouse clipboard with the ones from the
+			// system clipboard, in case it contains text data.
+			if (be_clipboard->Lock()) {
+				if (gMouseClipboard->Lock()) {
+					BMessage* clipMsgA = be_clipboard->Data();
+					const char* text;
+					ssize_t numBytes;
+					if (clipMsgA->FindData("text/plain", B_MIME_TYPE,
+							(const void**)&text, &numBytes) == B_OK ) {
+						gMouseClipboard->Clear();
+						BMessage* clipMsgB = gMouseClipboard->Data();
+						clipMsgB->AddData("text/plain", B_MIME_TYPE,
+							text, numBytes);
+						gMouseClipboard->Commit();
+					}
+					gMouseClipboard->Unlock();
+				}
+				be_clipboard->Unlock();
+			}
+			break;
+
 		case B_SELECT_ALL:
 			SelectAll();
 			break;



From revol at free.fr  Tue Apr  7 12:34:11 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Tue, 07 Apr 2009 12:34:11 +0200 CEST
Subject: [Haiku-commits] r29989 - haiku/trunk/src/apps/terminal
In-Reply-To: <200904070903.n3793VuA020664@sheep.berlios.de>
Message-ID: <2086146809-BeMail@laptop>

> Author: stippi
> Date: 2009-04-07 11:03:29 +0200 (Tue, 07 Apr 2009)
> New Revision: 29989
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29989&view=rev
> 
> Modified:
>    haiku/trunk/src/apps/terminal/TermView.cpp
> Log:
> * Watch the system clipboard for changes.
> * On the event of a clipboard change, check if the clipboard contains 
> text
>   now and replace the contents of the internal "mouse clipboard". So 
> when
>   right/middle clicking into the Terminal, the current system 
> clipboard contents
>   are inserted. As soon as the user selects text in the Terminal 
> again, that
>   text will have priority over the system clipboard, as before.
> 

Not shure about this... the BeOS Terminal doesn't do it. It might 
actually be an intended feature.

Fran?ois.


From superstippi at gmx.de  Thu Apr  9 14:29:28 2009
From: superstippi at gmx.de (=?utf-8?q?Stephan_A=C3=9Fmus?=)
Date: Thu, 09 Apr 2009 14:29:28 +0200
Subject: [Haiku-commits] r29989 - haiku/trunk/src/apps/terminal
In-Reply-To: <2086146809-BeMail@laptop>
References: <2086146809-BeMail@laptop>
Message-ID: <20090409142928.59881.2@bepc.1239266602.fake>


On 2009-04-09 at 14:24:54 [+0200], Fran?ois Revol <revol at free.fr> wrote:
> > Author: stippi
> > Date: 2009-04-07 11:03:29 +0200 (Tue, 07 Apr 2009) New Revision: 29989
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29989&view=rev
> > 
> > Modified:
> >    haiku/trunk/src/apps/terminal/TermView.cpp
> > Log:
> > * Watch the system clipboard for changes.
> > * On the event of a clipboard change, check if the clipboard contains 
> > text
> >   now and replace the contents of the internal "mouse clipboard". So 
> > when
> >   right/middle clicking into the Terminal, the current system 
> > clipboard contents
> >   are inserted. As soon as the user selects text in the Terminal 
> > again, that
> >   text will have priority over the system clipboard, as before.
> > 
> 
> Not shure about this... the BeOS Terminal doesn't do it. It might 
> actually be an intended feature.

Are you sure it doesn't, especially since there was a bug report about 
exactly this feature being present in BeOS? IIRC, ZETA switched to the 
Haiku Terminal in one of it's last versions. I find this solution rather 
ok. The only irritation may be when you still have text selected in the 
Terminal from before copying something to the clipboard in another app. 
Unless you think that these two clipboards should stay completely separate.

Best regards,
-Stephan




From revol at free.fr  Tue Apr  7 13:58:18 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Tue, 07 Apr 2009 13:58:18 +0200 CEST
Subject: [Haiku-commits] r29989 - haiku/trunk/src/apps/terminal
In-Reply-To: <20090409142928.59881.2@bepc.1239266602.fake>
Message-ID: <314783414-BeMail@laptop>

> > Not shure about this... the BeOS Terminal doesn't do it. It might 
> > actually be an intended feature.
> 
> Are you sure it doesn't, especially since there was a bug report 
> about 
> exactly this feature being present in BeOS? IIRC, ZETA switched to 
> the 

Definitely.

> Haiku Terminal in one of it's last versions. I find this solution 
> rather 

The version I use here still has the old BeOS Terminl.

> ok. The only irritation may be when you still have text selected in 
> the 
> Terminal from before copying something to the clipboard in another 
> app. 

Yes, this seems unconsistent.

Fran?ois.


From axeld at mail.berlios.de  Tue Apr  7 14:01:32 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 7 Apr 2009 14:01:32 +0200
Subject: [Haiku-commits] r29990 - in haiku/trunk: headers/private/shared
	src/kits/support src/system/kernel/lib
Message-ID: <200904071201.n37C1WVN010093@sheep.berlios.de>

Author: axeld
Date: 2009-04-07 14:01:30 +0200 (Tue, 07 Apr 2009)
New Revision: 29990
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29990&view=rev

Added:
   haiku/trunk/headers/private/shared/WeakReferenceable.h
   haiku/trunk/src/kits/support/WeakReferenceable.cpp
Modified:
   haiku/trunk/src/kits/support/Jamfile
   haiku/trunk/src/system/kernel/lib/Jamfile
Log:
* Added a WeakReferenceable implementation, completely untested yet.


Added: haiku/trunk/headers/private/shared/WeakReferenceable.h
===================================================================
--- haiku/trunk/headers/private/shared/WeakReferenceable.h	2009-04-07 09:03:29 UTC (rev 29989)
+++ haiku/trunk/headers/private/shared/WeakReferenceable.h	2009-04-07 12:01:30 UTC (rev 29990)
@@ -0,0 +1,261 @@
+/*
+ * Copyright 2009, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _WEAK_REFERENCEABLE_H
+#define _WEAK_REFERENCEABLE_H
+
+
+#include <Referenceable.h>
+
+
+namespace BPrivate {
+
+class WeakReferenceable;
+
+class WeakPointer : public Referenceable {
+public:
+			WeakReferenceable*	Get();
+			bool				Put();
+
+			int32				UseCount() const;
+
+private:
+	friend class WeakReferenceable;
+
+								WeakPointer(WeakReferenceable* object);
+								~WeakPointer();
+
+private:
+			bool				_GetUnchecked();
+
+private:
+			vint32				fUseCount;
+			WeakReferenceable*	fObject;
+};
+
+class WeakReferenceable {
+public:
+								WeakReferenceable();
+	virtual						~WeakReferenceable();
+
+			void				AddReference()
+									{ fPointer->_GetUnchecked(); }
+
+			bool				RemoveReference()
+									{ return fPointer->Put(); }
+
+			int32				CountReferences() const
+									{ return fPointer->UseCount(); }
+
+			WeakPointer*		GetWeakPointer();
+
+protected:
+			WeakPointer*		fPointer;
+};
+
+template<typename Type = BPrivate::Referenceable>
+class WeakReference {
+public:
+	WeakReference()
+		:
+		fPointer(NULL),
+		fObject(NULL)
+	{
+	}
+
+	WeakReference(Type* object)
+		:
+		fPointer(NULL),
+		fObject(NULL)
+	{
+		SetTo(object);
+	}
+
+	WeakReference(const WeakPointer& other)
+		:
+		fPointer(NULL),
+		fObject(NULL)
+	{
+		SetTo(&other);
+	}
+
+	WeakReference(const WeakReference<Type>& other)
+		:
+		fPointer(NULL),
+		fObject(NULL)
+	{
+		SetTo(other.fPointer);
+	}
+
+	~WeakReference()
+	{
+		Unset();
+	}
+
+	void SetTo(Type* object)
+	{
+		Unset();
+
+		if (object != NULL) {
+			fPointer = object->GetWeakPointer();
+			fObject = fPointer->Get();
+		}
+	}
+
+	void SetTo(WeakPointer* pointer)
+	{
+		Unset();
+
+		if (pointer != NULL) {
+			fPointer = pointer->AddReference();
+			fObject = pointer->Get();
+		}
+	}
+
+	void Unset()
+	{
+		if (fPointer != NULL) {
+			if (fObject != NULL) {
+				fPointer->Put();
+				fObject = NULL;
+			}
+			fPointer->RemoveReference();
+			fPointer = NULL;
+		}
+	}
+
+	Type* Get() const
+	{
+		return fObject;
+	}
+
+	Type* Detach()
+	{
+		Type* object = fObject;
+		Unset();
+		return object;
+	}
+
+	Type& operator*() const
+	{
+		return *fObject;
+	}
+
+	Type* operator->() const
+	{
+		return fObject;
+	}
+
+	WeakReference& operator=(const WeakReference<Type>& other)
+	{
+		SetTo(other.fPointer);
+		return *this;
+	}
+
+	WeakReference& operator=(const Type& other)
+	{
+		SetTo(&other);
+		return *this;
+	}
+
+	bool operator==(const WeakReference<Type>& other) const
+	{
+		return fPointer == other.fPointer;
+	}
+
+	bool operator!=(const WeakReference<Type>& other) const
+	{
+		return fPointer != other.fPointer;
+	}
+
+private:
+	WeakPointer*	fPointer;
+	Type*			fObject;
+};
+
+
+//	#pragma mark -
+
+
+inline WeakReferenceable*
+WeakPointer::Get()
+{
+	int32 count;
+
+	do {
+		count = fUseCount;
+		if (count == 0)
+			return NULL;
+	} while (atomic_test_and_set(&fUseCount, count, count + 1) != count);
+
+	return fObject;
+}
+
+
+inline bool
+WeakPointer::Put()
+{
+	if (atomic_add(&fUseCount, -1) == 1) {
+		delete fObject;
+		return true;
+	}
+
+	return false;
+}
+
+
+inline int32
+WeakPointer::UseCount() const
+{
+	return fUseCount;
+}
+
+
+inline
+WeakPointer::WeakPointer(WeakReferenceable* object)
+	:
+	fUseCount(1),
+	fObject(object)
+{
+}
+
+
+inline
+WeakPointer::~WeakPointer()
+{
+}
+
+
+inline bool
+WeakPointer::_GetUnchecked()
+{
+	return atomic_add(&fUseCount, 1) == 1;
+}
+
+
+//	#pragma -
+
+
+inline
+WeakReferenceable::WeakReferenceable()
+	:
+	fPointer(new WeakPointer(this))
+{
+}
+
+
+inline WeakPointer*
+WeakReferenceable::GetWeakPointer()
+{
+	fPointer->AddReference();
+	return fPointer;
+}
+
+}	// namespace BPrivate
+
+using BPrivate::WeakReferenceable;
+using BPrivate::WeakPointer;
+using BPrivate::WeakReference;
+
+#endif	// _WEAK_REFERENCEABLE_H

Modified: haiku/trunk/src/kits/support/Jamfile
===================================================================
--- haiku/trunk/src/kits/support/Jamfile	2009-04-07 09:03:29 UTC (rev 29989)
+++ haiku/trunk/src/kits/support/Jamfile	2009-04-07 12:01:30 UTC (rev 29990)
@@ -18,4 +18,5 @@
 	Referenceable.cpp
 	StopWatch.cpp
 	String.cpp
+	WeakReferenceable.cpp
 ;

Added: haiku/trunk/src/kits/support/WeakReferenceable.cpp
===================================================================
--- haiku/trunk/src/kits/support/WeakReferenceable.cpp	2009-04-07 09:03:29 UTC (rev 29989)
+++ haiku/trunk/src/kits/support/WeakReferenceable.cpp	2009-04-07 12:01:30 UTC (rev 29990)
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2009, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include <WeakReferenceable.h>
+
+
+WeakReferenceable::~WeakReferenceable()
+{
+}
+

Modified: haiku/trunk/src/system/kernel/lib/Jamfile
===================================================================
--- haiku/trunk/src/system/kernel/lib/Jamfile	2009-04-07 09:03:29 UTC (rev 29989)
+++ haiku/trunk/src/system/kernel/lib/Jamfile	2009-04-07 12:01:30 UTC (rev 29990)
@@ -120,6 +120,7 @@
 
 KernelMergeObject kernel_misc.o :
 	Referenceable.cpp
+	WeakReferenceable.cpp
 
 	: $(TARGET_KERNEL_PIC_CCFLAGS)
 ;



From superstippi at gmx.de  Thu Apr  9 15:39:08 2009
From: superstippi at gmx.de (=?utf-8?q?Stephan_A=C3=9Fmus?=)
Date: Thu, 09 Apr 2009 15:39:08 +0200
Subject: [Haiku-commits] r29989 - haiku/trunk/src/apps/terminal
In-Reply-To: <314783414-BeMail@laptop>
References: <314783414-BeMail@laptop>
Message-ID: <20090409153908.67480.4@bepc.1239266602.fake>


On 2009-04-09 at 15:03:05 [+0200], Fran?ois Revol <revol at free.fr> wrote:
> > > Not shure about this... the BeOS Terminal doesn't do it. It might 
> > > actually be an intended feature.
> > 
> > Are you sure it doesn't, especially since there was a bug report about 
> > exactly this feature being present in BeOS? IIRC, ZETA switched to the 
> 
> Definitely.
> 
> > Haiku Terminal in one of it's last versions. I find this solution 
> > rather 
> 
> The version I use here still has the old BeOS Terminl.
> 
> > ok. The only irritation may be when you still have text selected in the 
> > Terminal from before copying something to the clipboard in another app. 
> 
> Yes, this seems unconsistent.

Ok, I've checked the BeOS Terminal behavior:

* It does not have an internal clipboard for the selection.
* Which also means you cannot copy text across Terminal windows using the 
middle/right mouse button (!).
* /If/ text is selected in a Terminal window, that text has precedence over 
the system clipboard. Like if you have text selected, that is pasted. If 
you unselect it, then suddenly the system clipboard text is pasted without 
any further action.

The above could be regarded as consistent behaviour. However, the missing 
cross Terminal mouse pasting is a major drawback. This *can* only be fixed 
by some kind of internal additional cross-Terminal clipboard, for the 
simple reason that just selecting something in Terminal should not already 
replace the contents of the system clipboard, so it has to be an internal 
one. If you then invoke the copy shortcut, it obviously goes into the 
system clipboard.

But the internal clipboard feature means that the Terminal where you have 
last selected something will have modified the internal clipboard, so even 
if you still have a selection in another Terminal, it would not be in the 
internal clipboard anymore. A possibility would be to deselect in all the 
other Terminals as soon as you select in one Terminal. That again would be 
highly annoying.

For all those reasons, I believe that the solution I have found is the best 
one considering all features that one wants to have and the respective side 
effects. It means that:

* Selecting something in any Terminal modifies the cross Terminal internal 
clipboard. The last selected text wins.
* This already introduces the decoupling of visible selection and current 
clipboard.
* When you invoke the copy shortcut in any other application, or the 
Terminal itself (!), then that text always also replaces the internal cross 
Terminal clipboard.

This behaviour is also consistent, it simply means that the last copied 
text is always available in the clipboard.

Best regards,
-Stephan


From bonefish at mail.berlios.de  Tue Apr  7 15:53:23 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Tue, 7 Apr 2009 15:53:23 +0200
Subject: [Haiku-commits] r29991 - haiku/trunk/build/jam
Message-ID: <200904071353.n37DrN28019669@sheep.berlios.de>

Author: bonefish
Date: 2009-04-07 15:53:22 +0200 (Tue, 07 Apr 2009)
New Revision: 29991
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29991&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
Reenabled ntfs. I wouldn't mount it writable, but reading shouldn't harm.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-07 12:01:30 UTC (rev 29990)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-07 13:53:22 UTC (rev 29991)
@@ -140,8 +140,8 @@
 	config_manager agp_gart usb firewire $(X86_ONLY)acpi
 ;
 SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
-	write_overlay $(GPL_ONLY)reiserfs ;
-#googlefs $(GPL_ONLY)ntfs ;
+	write_overlay $(GPL_ONLY)ntfs $(GPL_ONLY)reiserfs ;
+#googlefs ;
 
 
 # modules



From bonefish at mail.berlios.de  Tue Apr  7 16:06:08 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Tue, 7 Apr 2009 16:06:08 +0200
Subject: [Haiku-commits] r29992 - haiku/trunk/src/system/kernel/vm
Message-ID: <200904071406.n37E68X3021065@sheep.berlios.de>

Author: bonefish
Date: 2009-04-07 16:06:07 +0200 (Tue, 07 Apr 2009)
New Revision: 29992
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29992&view=rev

Modified:
   haiku/trunk/src/system/kernel/vm/vm_page.cpp
Log:
* PageWriterRun::Go(), vm_page_write_modified_page_range(): When writing the
  page failed since the cache has been shrunk, we need not only remove the
  page from the cache, we also need to remove all of its area mappings and
  free it. Not removing the area mappings might have been the cause of #3110,
  not freeing it would cause it to be leaked for good.
* vm_page_write_modified_page_range(): When writing failed for another reason
  and the page wasn't in the modified queue before, we would lose the info
  in which queue it was before and setting the page state to modified would
  assume the active queue. This could potentially screw up our page queue
  structures.


Modified: haiku/trunk/src/system/kernel/vm/vm_page.cpp
===================================================================
--- haiku/trunk/src/system/kernel/vm/vm_page.cpp	2009-04-07 13:53:22 UTC (rev 29991)
+++ haiku/trunk/src/system/kernel/vm/vm_page.cpp	2009-04-07 14:06:07 UTC (rev 29992)
@@ -1116,17 +1116,20 @@
 			move_page_to_active_or_inactive_queue(page, true);
 			page->busy_writing = false;
 		} else {
-			// We don't have to put the PAGE_MODIFIED bit back, as it's
-			// still in the modified pages list.
+			// Writing failed, so move the page back to the modified queue.
 			{
 				InterruptsSpinLocker locker(sPageLock);
 				page->state = PAGE_STATE_MODIFIED;
 				enqueue_page(&sModifiedPageQueue, page);
 			}
+
 			if (!page->busy_writing) {
-				// someone has cleared the busy_writing flag which tells
-				// us our page has gone invalid
+				// Someone has cleared the busy_writing flag which tells
+				// us our page has gone invalid. We need to remove it from the
+				// cache and free it completely.
+				vm_remove_all_page_mappings(page, NULL);
 				cache->RemovePage(page);
+				vm_page_free(cache, page);
 			} else
 				page->busy_writing = false;
 		}
@@ -1519,6 +1522,7 @@
 			continue;
 		}
 
+		int oldPageState = page->state;
 		page->state = PAGE_STATE_BUSY;
 		page->busy_writing = true;
 
@@ -1542,6 +1546,14 @@
 		status_t status = write_page(page, 0, NULL);
 		cache->Lock();
 
+		// Before disabling interrupts handle part of the special case that
+		// writing the page failed due the cache having been shrunk. We need to
+		// remove the page from the cache and free it.
+		if (status != B_OK && !page->busy_writing) {
+			vm_remove_all_page_mappings(page, NULL);
+			cache->RemovePage(page);
+		}
+
 		InterruptsSpinLocker locker(&sPageLock);
 
 		if (status == B_OK) {
@@ -1549,23 +1561,31 @@
 			move_page_to_active_or_inactive_queue(page, dequeuedPage);
 			page->busy_writing = false;
 		} else {
-			// We don't have to put the PAGE_MODIFIED bit back, as it's still
-			// in the modified pages list.
+			// Writing the page failed -- move to the modified queue. If we
+			// dequeued it from there, just enqueue it again, otherwise set the
+			// page set explicitly, which will take care of moving between the
+			// queues.
 			if (dequeuedPage) {
 				page->state = PAGE_STATE_MODIFIED;
 				enqueue_page(&sModifiedPageQueue, page);
+			} else {
+				page->state = oldPageState;
+				set_page_state_nolock(page, PAGE_STATE_MODIFIED);
 			}
 
 			if (!page->busy_writing) {
-				// someone has cleared the busy_writing flag which tells
-				// us our page has gone invalid
-				cache->RemovePage(page);
-			} else {
-				if (!dequeuedPage)
-					set_page_state_nolock(page, PAGE_STATE_MODIFIED);
+				// The busy_writing flag was cleared. That means the cache has
+				// been shrunk while we were trying to write the page and we
+				// have to free it now.
 
+				// Adjust temporary modified pages count, if necessary.
+				if (dequeuedPage && cache->temporary)
+					sModifiedTemporaryPages--;
+
+				// free the page
+				set_page_state_nolock(page, PAGE_STATE_FREE);
+			} else
 				page->busy_writing = false;
-			}
 		}
 
 		busyCondition.Unpublish();



From zooey at mail.berlios.de  Tue Apr  7 17:11:04 2009
From: zooey at mail.berlios.de (zooey at mail.berlios.de)
Date: Tue, 7 Apr 2009 17:11:04 +0200
Subject: [Haiku-commits] r29993 - haiku/trunk/src/tests/kits/interface
Message-ID: <200904071511.n37FB44m030258@sheep.berlios.de>

Author: zooey
Date: 2009-04-07 17:11:03 +0200 (Tue, 07 Apr 2009)
New Revision: 29993
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29993&view=rev

Modified:
   haiku/trunk/src/tests/kits/interface/TextViewTest.cpp
Log:
* removed unused variable
* automatic whitespace cleanup

Modified: haiku/trunk/src/tests/kits/interface/TextViewTest.cpp
===================================================================
--- haiku/trunk/src/tests/kits/interface/TextViewTest.cpp	2009-04-07 14:06:07 UTC (rev 29992)
+++ haiku/trunk/src/tests/kits/interface/TextViewTest.cpp	2009-04-07 15:11:03 UTC (rev 29993)
@@ -30,15 +30,15 @@
 {
 	BRect rect = Bounds().InsetByCopy(20, 20);
 
-	BTextView* textView = new BTextView(rect, "text-o-mo", 
+	BTextView* textView = new BTextView(rect, "text-o-mo",
 		rect.OffsetToCopy(0, 0), B_FOLLOW_ALL);
 
-	BScrollView* scrollView = new BScrollView("scroll-o-mo", textView, 
+	BScrollView* scrollView = new BScrollView("scroll-o-mo", textView,
 		B_FOLLOW_ALL_SIDES, 0, true, true);
 	AddChild(scrollView);
-	
+
 	printf("starting to prepare content ... [%Ld]\n", system_time());
-	
+
 	// generate a million lines of content
 	const int32 kLineCount = 1000000;
 	const int32 kLineNoSize = 6;
@@ -51,7 +51,6 @@
 	char* currLine = content.LockBuffer(contentLength);
 	if (currLine) {
 		int32 lineNo = 0;
-		char buf[10];
 		for ( ; lineNo < kLineCount; currLine += lineLength)
 			sprintf(currLine, format.String(), kLineNoSize, lineNo++);
 		content.UnlockBuffer(contentLength);
@@ -98,7 +97,7 @@
 //	#pragma mark -
 
 
-int 
+int
 main(int argc, char **argv)
 {
 	Application app;



From axeld at mail.berlios.de  Tue Apr  7 17:14:17 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 7 Apr 2009 17:14:17 +0200
Subject: [Haiku-commits] r29994 - in haiku/trunk: headers/private/shared
	src/kits/support src/system/kernel/lib
Message-ID: <200904071514.n37FEGfc030536@sheep.berlios.de>

Author: axeld
Date: 2009-04-07 17:14:15 +0200 (Tue, 07 Apr 2009)
New Revision: 29994
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29994&view=rev

Removed:
   haiku/trunk/src/kits/support/WeakReferenceable.cpp
Modified:
   haiku/trunk/headers/private/shared/WeakReferenceable.h
   haiku/trunk/src/kits/support/Jamfile
   haiku/trunk/src/system/kernel/lib/Jamfile
Log:
* Made the WeakReferenceable class templatized. Not really sure yet I like that
  better, though :-)
* Also fixed a mixup of the unintuitive argument order of our
  atomic_test_and_set(); I guess I will change that sooner or later.


Modified: haiku/trunk/headers/private/shared/WeakReferenceable.h
===================================================================
--- haiku/trunk/headers/private/shared/WeakReferenceable.h	2009-04-07 15:11:03 UTC (rev 29993)
+++ haiku/trunk/headers/private/shared/WeakReferenceable.h	2009-04-07 15:14:15 UTC (rev 29994)
@@ -11,19 +11,20 @@
 
 namespace BPrivate {
 
-class WeakReferenceable;
+template<typename Type> class WeakReferenceable;
 
+template<typename Type>
 class WeakPointer : public Referenceable {
 public:
-			WeakReferenceable*	Get();
+			Type*				Get();
 			bool				Put();
 
 			int32				UseCount() const;
 
 private:
-	friend class WeakReferenceable;
+	friend class WeakReferenceable<Type>;
 
-								WeakPointer(WeakReferenceable* object);
+								WeakPointer(Type* object);
 								~WeakPointer();
 
 private:
@@ -31,13 +32,14 @@
 
 private:
 			vint32				fUseCount;
-			WeakReferenceable*	fObject;
+			Type*				fObject;
 };
 
+template<typename Type>
 class WeakReferenceable {
 public:
-								WeakReferenceable();
-	virtual						~WeakReferenceable();
+								WeakReferenceable(Type* object);
+								~WeakReferenceable();
 
 			void				AddReference()
 									{ fPointer->_GetUnchecked(); }
@@ -48,13 +50,13 @@
 			int32				CountReferences() const
 									{ return fPointer->UseCount(); }
 
-			WeakPointer*		GetWeakPointer();
+			WeakPointer<Type>*	GetWeakPointer();
 
 protected:
-			WeakPointer*		fPointer;
+			WeakPointer<Type>*	fPointer;
 };
 
-template<typename Type = BPrivate::Referenceable>
+template<typename Type>
 class WeakReference {
 public:
 	WeakReference()
@@ -72,7 +74,7 @@
 		SetTo(object);
 	}
 
-	WeakReference(const WeakPointer& other)
+	WeakReference(WeakPointer<Type>& other)
 		:
 		fPointer(NULL),
 		fObject(NULL)
@@ -80,6 +82,14 @@
 		SetTo(&other);
 	}
 
+	WeakReference(WeakPointer<Type>* other)
+		:
+		fPointer(NULL),
+		fObject(NULL)
+	{
+		SetTo(other);
+	}
+
 	WeakReference(const WeakReference<Type>& other)
 		:
 		fPointer(NULL),
@@ -103,12 +113,13 @@
 		}
 	}
 
-	void SetTo(WeakPointer* pointer)
+	void SetTo(WeakPointer<Type>* pointer)
 	{
 		Unset();
 
 		if (pointer != NULL) {
-			fPointer = pointer->AddReference();
+			fPointer = pointer;
+			fPointer->AddReference();
 			fObject = pointer->Get();
 		}
 	}
@@ -142,6 +153,11 @@
 		return *fObject;
 	}
 
+	operator Type*() const
+	{
+		return fObject;
+	}
+
 	Type* operator->() const
 	{
 		return fObject;
@@ -149,6 +165,9 @@
 
 	WeakReference& operator=(const WeakReference<Type>& other)
 	{
+		if (this == &other)
+			return *this;
+
 		SetTo(other.fPointer);
 		return *this;
 	}
@@ -159,6 +178,18 @@
 		return *this;
 	}
 
+	WeakReference& operator=(WeakPointer<Type>& other)
+	{
+		SetTo(&other);
+		return *this;
+	}
+
+	WeakReference& operator=(WeakPointer<Type>* other)
+	{
+		SetTo(other);
+		return *this;
+	}
+
 	bool operator==(const WeakReference<Type>& other) const
 	{
 		return fPointer == other.fPointer;
@@ -170,7 +201,7 @@
 	}
 
 private:
-	WeakPointer*	fPointer;
+	WeakPointer<Type>*	fPointer;
 	Type*			fObject;
 };
 
@@ -178,23 +209,25 @@
 //	#pragma mark -
 
 
-inline WeakReferenceable*
-WeakPointer::Get()
+template<typename Type>
+inline Type*
+WeakPointer<Type>::Get()
 {
-	int32 count;
+	int32 count = -11;
 
 	do {
-		count = fUseCount;
+		count = atomic_get(&fUseCount);
 		if (count == 0)
 			return NULL;
-	} while (atomic_test_and_set(&fUseCount, count, count + 1) != count);
+	} while (atomic_test_and_set(&fUseCount, count + 1, count) != count);
 
 	return fObject;
 }
 
 
+template<typename Type>
 inline bool
-WeakPointer::Put()
+WeakPointer<Type>::Put()
 {
 	if (atomic_add(&fUseCount, -1) == 1) {
 		delete fObject;
@@ -205,15 +238,17 @@
 }
 
 
+template<typename Type>
 inline int32
-WeakPointer::UseCount() const
+WeakPointer<Type>::UseCount() const
 {
 	return fUseCount;
 }
 
 
+template<typename Type>
 inline
-WeakPointer::WeakPointer(WeakReferenceable* object)
+WeakPointer<Type>::WeakPointer(Type* object)
 	:
 	fUseCount(1),
 	fObject(object)
@@ -221,14 +256,16 @@
 }
 
 
+template<typename Type>
 inline
-WeakPointer::~WeakPointer()
+WeakPointer<Type>::~WeakPointer()
 {
 }
 
 
+template<typename Type>
 inline bool
-WeakPointer::_GetUnchecked()
+WeakPointer<Type>::_GetUnchecked()
 {
 	return atomic_add(&fUseCount, 1) == 1;
 }
@@ -237,17 +274,27 @@
 //	#pragma -
 
 
+template<typename Type>
 inline
-WeakReferenceable::WeakReferenceable()
+WeakReferenceable<Type>::WeakReferenceable(Type* object)
 	:
-	fPointer(new WeakPointer(this))
+	fPointer(new WeakPointer<Type>(object))
 {
 }
 
 
-inline WeakPointer*
-WeakReferenceable::GetWeakPointer()
+template<typename Type>
+inline
+WeakReferenceable<Type>::~WeakReferenceable()
 {
+	fPointer->RemoveReference();
+}
+
+
+template<typename Type>
+inline WeakPointer<Type>*
+WeakReferenceable<Type>::GetWeakPointer()
+{
 	fPointer->AddReference();
 	return fPointer;
 }

Modified: haiku/trunk/src/kits/support/Jamfile
===================================================================
--- haiku/trunk/src/kits/support/Jamfile	2009-04-07 15:11:03 UTC (rev 29993)
+++ haiku/trunk/src/kits/support/Jamfile	2009-04-07 15:14:15 UTC (rev 29994)
@@ -18,5 +18,4 @@
 	Referenceable.cpp
 	StopWatch.cpp
 	String.cpp
-	WeakReferenceable.cpp
 ;

Deleted: haiku/trunk/src/kits/support/WeakReferenceable.cpp

Modified: haiku/trunk/src/system/kernel/lib/Jamfile
===================================================================
--- haiku/trunk/src/system/kernel/lib/Jamfile	2009-04-07 15:11:03 UTC (rev 29993)
+++ haiku/trunk/src/system/kernel/lib/Jamfile	2009-04-07 15:14:15 UTC (rev 29994)
@@ -120,7 +120,6 @@
 
 KernelMergeObject kernel_misc.o :
 	Referenceable.cpp
-	WeakReferenceable.cpp
 
 	: $(TARGET_KERNEL_PIC_CCFLAGS)
 ;



From zooey at mail.berlios.de  Tue Apr  7 17:29:25 2009
From: zooey at mail.berlios.de (zooey at mail.berlios.de)
Date: Tue, 7 Apr 2009 17:29:25 +0200
Subject: [Haiku-commits] r29995 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200904071529.n37FTPrU031672@sheep.berlios.de>

Author: zooey
Date: 2009-04-07 17:29:23 +0200 (Tue, 07 Apr 2009)
New Revision: 29995
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29995&view=rev

Modified:
   haiku/trunk/headers/os/interface/TextView.h
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
continued work on BTextView:
* reverted my recent change that caused Mail to always show the end
  of mails 8-) and now invoke ScrollToOffset() wherever it was missing
  (mostly in keyboard-related methods)
* _DoInsertText() only moves the caret if the text has been inserted
  in front of the caret, not after it
* overhauled selection by char/word/line and their extension mechanism
  (which now behaves as the haiku shell)
* use strnlen() instead of strlen() in those versions of Insert() which
  accept a length parameter, as strlen can potentially waste a lot of
  cycles skipping the whole string, when all we want is to clamp the length.
* cleanup (some of it automatic removal of trailing whitespace)

Modified: haiku/trunk/headers/os/interface/TextView.h
===================================================================
--- haiku/trunk/headers/os/interface/TextView.h	2009-04-07 15:14:15 UTC (rev 29994)
+++ haiku/trunk/headers/os/interface/TextView.h	2009-04-07 15:29:23 UTC (rev 29995)
@@ -303,6 +303,9 @@
 									float* outAscent, float* outDescent,
 									float* ioWidth);
 
+			int32				_FindLeftWordBoundary(int32 offset);
+			int32				_FindRightWordBoundary(int32 offset);
+
 			float				_StyledWidth(int32 fromOffset, int32 length,
 									float* outAscent = NULL,
 									float* outDescent = NULL) const;

Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-04-07 15:14:15 UTC (rev 29994)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-04-07 15:29:23 UTC (rev 29995)
@@ -114,7 +114,7 @@
 	int32				clickOffset;
 	bool				shiftDown;
 	BRect				selectionRect;
-		
+
 	int32				anchor;
 	int32				selStart;
 	int32				selEnd;
@@ -295,7 +295,7 @@
 		rect.Set(0, 0, 0, 0);
 
 	_InitObject(rect, NULL, NULL);
-	
+
 	const char *text = NULL;
 	if (archive->FindString("_text", &text) == B_OK)
 		SetText(text);
@@ -308,7 +308,7 @@
 
 	if (archive->FindFloat("_tab", &value) == B_OK)
 		SetTabWidth(value);
-	
+
 	if (archive->FindInt32("_col_sp", &flag) == B_OK)
 		SetColorSpace((color_space)flag);
 
@@ -318,7 +318,7 @@
 	if (archive->FindInt32("_sel", &flag) == B_OK &&
 		archive->FindInt32("_sel", &flag2) == B_OK)
 		Select(flag, flag2);
-	
+
 	bool toggle;
 
 	if (archive->FindBool("_stylable", &toggle) == B_OK)
@@ -340,7 +340,7 @@
 	const int32 *disallowedChars = NULL;
 	if (archive->FindData("_dis_ch", B_RAW_TYPE,
 		(const void **)&disallowedChars, &disallowedCount) == B_OK) {
-		
+
 		fDisallowedChars = new BList;
 		disallowedCount /= sizeof(int32);
 		for (int32 x = 0; x < disallowedCount; x++) {
@@ -348,10 +348,10 @@
 				reinterpret_cast<void *>(disallowedChars[x]));
 		}
 	}
-	
+
 	ssize_t runSize = 0;
 	const void *flattenedRun = NULL;
-	
+
 	if (archive->FindData("_runs", B_RAW_TYPE, &flattenedRun, &runSize)
 			== B_OK) {
 		text_run_array *runArray = UnflattenRunArray(flattenedRun,
@@ -361,7 +361,7 @@
 			FreeRunArray(runArray);
 		}
 	}
-	
+
 }
 
 
@@ -380,7 +380,7 @@
 	delete fDisallowedChars;
 	delete fUndo;
 	delete fClickRunner;
-	delete fDragRunner;	
+	delete fDragRunner;
 	delete fLayoutData;
 }
 
@@ -425,7 +425,7 @@
 	if (err == B_OK)
 		err = data->AddInt32("_sel", fSelStart);
 	if (err == B_OK)
-		err = data->AddInt32("_sel", fSelEnd);	
+		err = data->AddInt32("_sel", fSelEnd);
 	if (err == B_OK)
 		err = data->AddBool("_stylable", fStylable);
 	if (err == B_OK)
@@ -436,7 +436,7 @@
 		err = data->AddBool("_nsel", !fSelectable);
 	if (err == B_OK)
 		err = data->AddBool("_nedit", !fEditable);
-	
+
 	if (err == B_OK && fDisallowedChars != NULL) {
 		err = data->AddData("_dis_ch", B_RAW_TYPE, fDisallowedChars->Items(),
 			fDisallowedChars->CountItems() * sizeof(int32));
@@ -445,46 +445,46 @@
 	if (err == B_OK) {
 		int32 runSize = 0;
 		text_run_array *runArray = RunArray(0, TextLength());
-		
-		void *flattened = FlattenRunArray(runArray, &runSize);	
+
+		void *flattened = FlattenRunArray(runArray, &runSize);
 		if (flattened != NULL) {
-			data->AddData("_runs", B_RAW_TYPE, flattened, runSize);	
+			data->AddData("_runs", B_RAW_TYPE, flattened, runSize);
 			free(flattened);
 		} else
 			err = B_NO_MEMORY;
-	
+
 		FreeRunArray(runArray);
 	}
-	
+
 	return err;
 }
 
 
 /*! \brief Hook function called when the BTextView is added to the
 	window's view hierarchy.
-	
+
 	Set the window's pulse rate to 2 per second and adjust scrollbars if needed
 */
 void
 BTextView::AttachedToWindow()
 {
 	BView::AttachedToWindow();
-	
+
 	SetDrawingMode(B_OP_COPY);
-	
+
 	Window()->SetPulseRate(500000);
-	
+
 	fCaretVisible = false;
 	fCaretTime = 0;
 	fClickCount = 0;
 	fClickTime = 0;
 	fDragOffset = -1;
 	fActive = false;
-	
+
 	_AutoResize(true);
-	
+
 	_UpdateScrollbars();
-	
+
 	SetViewCursor(B_CURSOR_SYSTEM_DEFAULT);
 }
 
@@ -524,16 +524,16 @@
 	// should we even bother?
 	if (!fEditable && !fSelectable)
 		return;
-	
+
 	_CancelInputMethod();
-	
+
 	if (!IsFocus())
 		MakeFocus();
-	
+
 	_HideCaret();
-	
+
 	_StopMouseTracking();
-	
+
 	BMessenger messenger(this);
 	fTrackingMouse = new (nothrow) TextTrackState(messenger);
 	if (fTrackingMouse == NULL)
@@ -553,45 +553,47 @@
 	bigtime_t clickTime = system_time();
 	bigtime_t clickSpeed = 0;
 	get_click_speed(&clickSpeed);
-	bool multipleClick = false;
-	if (clickTime - fClickTime < clickSpeed
-		&& fClickOffset == fTrackingMouse->clickOffset) {
-		multipleClick = true;
-	}
+	bool multipleClick
+		= clickTime - fClickTime < clickSpeed
+			&& fClickOffset == fTrackingMouse->clickOffset;
 
-	fWhere = where;	
+	fWhere = where;
 
 	SetMouseEventMask(B_POINTER_EVENTS | B_KEYBOARD_EVENTS,
 		B_LOCK_WINDOW_FOCUS | B_NO_POINTER_HISTORY);
-	
+
 	if (fSelStart != fSelEnd && !fTrackingMouse->shiftDown && !multipleClick) {
 		BRegion region;
 		GetTextRegion(fSelStart, fSelEnd, &region);
 		if (region.Contains(where)) {
 			// Setup things for dragging
 			fTrackingMouse->selectionRect = region.Frame();
+			fClickCount = 1;
+			fClickTime = clickTime;
 			return;
 		}
 	}
-	
+
 	if (multipleClick) {
-		if (fClickCount > 1) {
+		if (fClickCount > 3) {
 			fClickCount = 0;
 			fClickTime = 0;
 		} else {
-			fClickCount = 2;
+			fClickCount++;
 			fClickTime = clickTime;
 		}
-	} else {
+	} else if (!fTrackingMouse->shiftDown) {
+		// skip multiple click handling if shift is pressed, as we want to keep
+		// the current selection state (char, word or line) and just extend the
+		// selection in that case
 		fClickOffset = fTrackingMouse->clickOffset;
 		fClickCount = 1;
 		fClickTime = clickTime;
 
 		// Deselect any previously selected text
-		if (!fTrackingMouse->shiftDown)
-			Select(fTrackingMouse->clickOffset, fTrackingMouse->clickOffset);
+		Select(fTrackingMouse->clickOffset, fTrackingMouse->clickOffset);
 	}
-	
+
 	if (fClickTime == clickTime) {
 		BMessage message(_PING_);
 		message.AddInt64("clickTime", clickTime);
@@ -602,7 +604,7 @@
 			clickSpeed, 1);
 	}
 
-	
+
 	if (!fSelectable) {
 		_StopMouseTracking();
 		return;
@@ -613,8 +615,8 @@
 		offset = fSelEnd;
 
 	fTrackingMouse->anchor = offset;
-	
-	MouseMoved(where, B_INSIDE_VIEW, NULL); 	
+
+	MouseMoved(where, B_INSIDE_VIEW, NULL);
 }
 
 
@@ -629,7 +631,7 @@
 {
 	BView::MouseUp(where);
 	_PerformMouseUp(where);
-	
+
 	delete fDragRunner;
 	fDragRunner = NULL;
 }
@@ -680,7 +682,7 @@
 BTextView::WindowActivated(bool state)
 {
 	BView::WindowActivated(state);
-	
+
 	if (state && IsFocus()) {
 		if (!fActive)
 			_Activate();
@@ -688,11 +690,11 @@
 		if (fActive)
 			_Deactivate();
 	}
-	
+
 	BPoint where;
 	ulong buttons;
 	GetMouse(&where, &buttons, false);
-	
+
 	if (Bounds().Contains(where))
 		_TrackMouse(where, NULL);
 }
@@ -821,7 +823,7 @@
 BTextView::MakeFocus(bool focusState)
 {
 	BView::MakeFocus(focusState);
-	
+
 	if (focusState && Window() && Window()->IsActive()) {
 		if (!fActive)
 			_Activate();
@@ -839,16 +841,16 @@
 BTextView::MessageReceived(BMessage *message)
 {
 	// TODO: block input if not editable (Andrew)
-	
+
 	// was this message dropped?
-	if (message->WasDropped()) {	
-		BPoint dropOffset;	
+	if (message->WasDropped()) {
+		BPoint dropOffset;
 		BPoint dropPoint = message->DropPoint(&dropOffset);
 		ConvertFromScreen(&dropPoint);
 		ConvertFromScreen(&dropOffset);
 		if (!_MessageDropped(message, dropPoint, dropOffset))
 			BView::MessageReceived(message);
-		
+
 		return;
 	}
 
@@ -893,7 +895,7 @@
 							fInline = new InlineInput(messenger);
 						}
 						break;
-					}	
+					}
 
 					case B_INPUT_METHOD_STOPPED:
 						delete fInline;
@@ -937,7 +939,7 @@
 
 			BMessage reply;
 			bool handled = false;
-			switch(message->what) {		
+			switch(message->what) {
 				case B_GET_PROPERTY:
 					handled = _GetProperty(&specifier, specifier.what, property,
 						&reply);
@@ -950,7 +952,7 @@
 
 				case B_COUNT_PROPERTIES:
 					handled = _CountProperties(&specifier, specifier.what,
-						property, &reply);	
+						property, &reply);
 					break;
 
 				default:
@@ -1029,7 +1031,7 @@
 	status_t err = data->AddString("suites", "suite/vnd.Be-text-view");
 	if (err != B_OK)
 		return err;
-	
+
 	BPropertyInfo prop_info(sPropertyList);
 	err = data->AddFlat("messages", &prop_info);
 
@@ -1107,7 +1109,7 @@
 	const text_run_array *inRuns)
 {
 	_CancelInputMethod();
-	
+
 	// hide the caret/unhilite the selection
 	if (fActive) {
 		if (fSelStart != fSelEnd)
@@ -1116,17 +1118,17 @@
 			_HideCaret();
 		}
 	}
-	
+
 	// remove data from buffer
 	if (fText->Length() > 0)
 		DeleteText(0, fText->Length()); // TODO: was fText->Length() - 1
-		
+
 	if (inText != NULL && inLength > 0)
 		InsertText(inText, inLength, 0, inRuns);
-	
+
 	// recalc line breaks and draw the text
 	_Refresh(0, inLength, true, false);
-	fClickOffset = fSelStart = fSelEnd = 0;	
+	fClickOffset = fSelStart = fSelEnd = 0;
 	ScrollTo(B_ORIGIN);
 
 	// draw the caret
@@ -1189,10 +1191,8 @@
 BTextView::Insert(const char *inText, int32 inLength,
 	const text_run_array *inRuns)
 {
-	if (inText != NULL && inLength > 0) {
-		int32 realLength = strlen(inText);
-		_DoInsertText(inText, min_c(inLength, realLength), fSelStart, inRuns);
-	}
+	if (inText != NULL && inLength > 0)
+		_DoInsertText(inText, strnlen(inText, inLength), fSelStart, inRuns);
 }
 
 
@@ -1200,13 +1200,8 @@
 BTextView::Insert(int32 startOffset, const char *inText, int32 inLength,
 					   const text_run_array *inRuns)
 {
-	CALLED();
-	
-	// do we really need to do anything?
-	if (inText != NULL && inLength > 0) {
-		int32 realLength = strlen(inText);
-		_DoInsertText(inText, min_c(inLength, realLength), startOffset, inRuns);
-	}
+	if (inText != NULL && inLength > 0)
+		_DoInsertText(inText, strnlen(inText, inLength), startOffset, inRuns);
 }
 
 
@@ -1230,7 +1225,7 @@
 	// anything to delete?
 	if (startOffset == endOffset)
 		return;
-		
+
 	// hide the caret/unhilite the selection
 	if (fActive) {
 		if (fSelStart != fSelEnd)
@@ -1240,7 +1235,7 @@
 	}
 	// remove data from buffer
 	DeleteText(startOffset, endOffset);
-	
+
 	// Check if the caret needs to be moved
 	if (fClickOffset >= endOffset)
 		fClickOffset -= (endOffset - startOffset);
@@ -1250,8 +1245,8 @@
 	fSelEnd = fSelStart = fClickOffset;
 
 	// recalc line breaks and draw what's left
-	_Refresh(startOffset, endOffset, true, true);
-	
+	_Refresh(startOffset, endOffset, true, false);
+
 	// draw the caret
 	if (fActive)
 		_ShowCaret();
@@ -1260,7 +1255,7 @@
 
 /*! \brief Returns the BTextView text as a C string.
 	\return A pointer to the text.
-	
+
 	It is possible that the BTextView object had to do some operations
 	on the text, to be able to return it as a C string.
 	If you need to call Text() repeatedly, you'd better use GetText().
@@ -1299,7 +1294,7 @@
 {
 	if (offset < 0 || offset >= fText->Length())
 		return '\0';
-		
+
 	return fText->RealCharAt(offset);
 }
 
@@ -1380,7 +1375,7 @@
 			clipboard->Commit();
 		}
 		clipboard->Unlock();
-	}	
+	}
 }
 
 
@@ -1392,7 +1387,7 @@
 {
 	CALLED();
 	_CancelInputMethod();
-	
+
 	if (!clipboard->Lock())
 		return;
 
@@ -1421,7 +1416,8 @@
 				Delete();
 
 			Insert(text, len, runArray);
-		}		
+			ScrollToOffset(fSelEnd);
+		}
 	}
 
 	clipboard->Unlock();
@@ -1448,7 +1444,7 @@
 BTextView::AcceptsPaste(BClipboard *clipboard)
 {
 	bool result = false;
-	
+
 	if (fEditable && clipboard && clipboard->Lock()) {
 		BMessage *data = clipboard->Data();
 		result = data && data->HasData("text/plain", B_MIME_TYPE);
@@ -1479,13 +1475,13 @@
 	CALLED();
 	if (!fSelectable)
 		return;
-	
+
 	_CancelInputMethod();
-		
+
 	// a negative selection?
 	if (startOffset > endOffset)
 		return;
-	
+
 	// pin offsets at reasonable values
 	if (startOffset < 0)
 		startOffset = 0;
@@ -1493,15 +1489,15 @@
 		endOffset = 0;
 	else if (endOffset > fText->Length())
 		endOffset = fText->Length();
-	
+
 	// is the new selection any different from the current selection?
 	if (startOffset == fSelStart && endOffset == fSelEnd)
 		return;
-		
+
 	fStyles->InvalidateNullStyle();
-	
+
 	_HideCaret();
-	
+
 	if (startOffset == endOffset) {
 		if (fSelStart != fSelEnd) {
 			// unhilite the selection
@@ -1539,7 +1535,7 @@
 			}
 		}
 		fSelStart = startOffset;
-		fSelEnd = fClickOffset = endOffset;
+		fSelEnd = endOffset;
 	}
 }
 
@@ -1563,7 +1559,7 @@
 BTextView::GetSelection(int32 *outStart, int32 *outEnd) const
 {
 	int32 start = 0, end = 0;
-	
+
 	if (fSelectable) {
 		start = fSelStart;
 		end = fSelEnd;
@@ -1571,7 +1567,7 @@
 
 	if (outStart)
 		*outStart = start;
-	if (outEnd)	
+	if (outEnd)
 		*outEnd = end;
 }
 
@@ -1632,7 +1628,7 @@
 	} else {
 		// the line breaks wont change, simply redraw
 		_RequestDrawLines(LineAt(startOffset), LineAt(endOffset), startOffset,
-			true);
+			false);
 	}
 }
 
@@ -1665,20 +1661,20 @@
 	const text_run_array *runs = inRuns;
 
 	text_run_array oneRun;
-	
+
 	if (!fStylable) {
 		// When the text view is not stylable, we always set the whole text's
-		// style with the first run and ignore the offsets 
+		// style with the first run and ignore the offsets
 		if (inRuns->count == 0)
 			return;
 		startOffset = 0;
 		endOffset = fText->Length();
 		oneRun.count = 1;
 		oneRun.runs[0] = inRuns->runs[0];
-		oneRun.runs[0].offset = 0;		
+		oneRun.runs[0].offset = 0;
 		runs = &oneRun;
 	}
-	
+
 	_SetRunArray(startOffset, endOffset, runs);
 
 	_Refresh(startOffset, endOffset, true, false);
@@ -1754,11 +1750,11 @@
 	int32 lineNum = LineAt(inOffset);
 	STELine* line = (*fLines)[lineNum];
 	float height = 0;
-	
+
 	BPoint result;
-	result.x = 0.0;	
+	result.x = 0.0;
 	result.y = line->origin + fTextRect.top;
-	
+
 	// Handle the case where there is only one line
 	// (no text inserted)
 	// TODO: See if we can do this better
@@ -1766,28 +1762,28 @@
 		const rgb_color *color = NULL;
 		const BFont *font = NULL;
 		fStyles->GetNullStyle(&font, &color);
-		
+
 		font_height fontHeight;
 		font->GetHeight(&fontHeight);
 		height = fontHeight.ascent + fontHeight.descent;
-		
-	} else {	
+
+	} else {
 		height = (line + 1)->origin - line->origin;
-	
+
 		// special case: go down one line if inOffset is a newline
 		if (inOffset == textLength && fText->RealCharAt(inOffset - 1)
 				== B_ENTER) {
 			result.y += height;
 			height = LineHeight(CountLines() - 1);
-	
+
 		} else {
 			int32 offset = line->offset;
 			int32 length = inOffset - line->offset;
 			int32 numBytes = length;
-			bool foundTab = false;		
+			bool foundTab = false;
 			do {
 				foundTab = fText->FindChar(B_TAB, offset, &numBytes);
-				float width = _StyledWidth(offset, numBytes);	
+				float width = _StyledWidth(offset, numBytes);
 				result.x += width;
 
 				if (foundTab) {
@@ -1799,7 +1795,7 @@
 				length -= numBytes;
 				numBytes = length;
 			} while (foundTab && length > 0);
-		} 		
+		}
 	}
 
 	if (fAlignment != B_ALIGN_LEFT) {
@@ -1838,7 +1834,7 @@
 		return textLength;
 	else if (point.y < fTextRect.top)
 		return 0;
-	
+
 	int32 lineNum = LineAt(point);
 	STELine* line = (*fLines)[lineNum];
 
@@ -1850,7 +1846,7 @@
 		if (point.y >= ((line + 1)->origin + fTextRect.top))
 			return textLength;
 	}
-	
+
 	// convert to text rect coordinates
 	if (fAlignment != B_ALIGN_LEFT) {
 		float lineWidth = fTextRect.right - LineWidth(lineNum);
@@ -1858,7 +1854,7 @@
 			lineWidth /= 2;
 		point.x -= lineWidth;
 	}
-	
+
 	point.x -= fTextRect.left;
 	point.x = max_c(point.x, 0.0);
 
@@ -1869,7 +1865,7 @@
 	const int32 limit = (line + 1)->offset;
 	float location = 0;
 	do {
-		const int32 nextInitial = _NextInitialByte(offset);	
+		const int32 nextInitial = _NextInitialByte(offset);
 		const int32 saveOffset = offset;
 		float width = 0;
 		if (ByteAt(offset) == B_TAB)
@@ -1926,31 +1922,11 @@
 void
 BTextView::FindWord(int32 inOffset, int32 *outFromOffset, int32 *outToOffset)
 {
-	int32 offset;
-	uint32 charType = _CharClassification(inOffset);
-
-	// check to the left
-	int32 previous;
-	for (offset = inOffset, previous = offset; offset > 0;
-				previous = _PreviousInitialByte(offset)) {
-		if (_CharClassification(previous) != charType)
-			break;
-		offset = previous;
-	}
-
 	if (outFromOffset)
-		*outFromOffset = offset;
+		*outFromOffset = _FindLeftWordBoundary(inOffset);
 
-	// check to the right
-	int32 textLen = TextLength();
-	for (offset = inOffset; offset < textLen;
-			offset = _NextInitialByte(offset)) {
-		if (_CharClassification(offset) != charType)
-			break;
-	}
-	
 	if (outToOffset)
-		*outToOffset = offset;
+		*outToOffset = _FindRightWordBoundary(inOffset);
 }
 
 
@@ -1977,7 +1953,7 @@
 		return 0;
 
 	STELine* line = (*fLines)[lineNum];
-	return _StyledWidth(line->offset, (line + 1)->offset - line->offset);	
+	return _StyledWidth(line->offset, (line + 1)->offset - line->offset);
 }
 
 
@@ -2017,7 +1993,7 @@
 		startLine = 0;
 	if (endLine > numLines - 1)
 		endLine = numLines - 1;
-	
+
 	float height = (*fLines)[endLine + 1]->origin
 		- (*fLines)[startLine]->origin;
 
@@ -2045,10 +2021,10 @@
 	float endLineHeight = 0.0;
 	BPoint startPt = PointAt(startOffset, &startLineHeight);
 	BPoint endPt = PointAt(endOffset, &endLineHeight);
-	
+
 	startLineHeight = ceilf(startLineHeight);
 	endLineHeight = ceilf(endLineHeight);
-		
+
 	BRect selRect;
 
 	if (startPt.y == endPt.y) {
@@ -2065,7 +2041,7 @@
 		selRect.right = fTextRect.right;
 		selRect.bottom = startPt.y + startLineHeight - 1.0;
 		outRegion->Include(selRect);
-	
+
 		if (startPt.y + startLineHeight < endPt.y) {
 			// more than two lines in the range
 			selRect.left = fTextRect.left;
@@ -2074,7 +2050,7 @@
 			selRect.bottom = endPt.y - 1.0;
 			outRegion->Include(selRect);
 		}
-		
+
 		selRect.left = fTextRect.left;
 		selRect.top = endPt.y;
 		selRect.right = endPt.x - 1.0;
@@ -2145,11 +2121,11 @@
 	// get real
 	if (startOffset >= endOffset)
 		return;
-		
+
 	BRegion selRegion;
 	GetTextRegion(startOffset, endOffset, &selRegion);
-	
-	SetDrawingMode(B_OP_INVERT);	
+
+	SetDrawingMode(B_OP_INVERT);
 	FillRegion(&selRegion, B_SOLID_HIGH);
 	SetDrawingMode(B_OP_COPY);
 }
@@ -2270,9 +2246,9 @@
 {
 	if (width == fTabWidth)
 		return;
-		
+
 	fTabWidth = width;
-	
+
 	if (Window() != NULL)
 		_Refresh(0, fText->Length(), true, false);
 }
@@ -2297,9 +2273,9 @@
 {
 	if (selectable == fSelectable)
 		return;
-		
+
 	fSelectable = selectable;
-	
+
 	if (Window() != NULL) {
 		if (fActive) {
 			// show/hide the caret, hilite/unhilite the selection
@@ -2332,7 +2308,7 @@
 {
 	if (editable == fEditable)
 		return;
-		
+
 	fEditable = editable;
 	// TextControls change the color of the text when
 	// they are made editable, so we need to invalidate
@@ -2340,11 +2316,11 @@
 	// TODO: it works well, but it could be caused by a bug somewhere else
 	if (fEditable)
 		fStyles->InvalidateNullStyle();
-	if (Window() != NULL && fActive) {	
+	if (Window() != NULL && fActive) {
 		if (!fEditable) {
 			_HideCaret();
 			_CancelInputMethod();
-		} 	
+		}
 	}
 }
 
@@ -2380,7 +2356,7 @@
 	}
 
 	fWrap = wrap;
-	_Refresh(0, fText->Length(), true, true);
+	_Refresh(0, fText->Length(), true, false);
 
 	if (updateOnScreen) {
 		// show the caret, hilite the selection
@@ -2417,8 +2393,8 @@
 		// respect multibyte characters boundaries.
 		const int32 previousInitial = _PreviousInitialByte(offset);
 		if (_NextInitialByte(previousInitial) != offset)
-			offset = previousInitial;			
-		
+			offset = previousInitial;
+
 		Delete(offset, textLength);
 	}
 }
@@ -2473,7 +2449,7 @@
 			 flag == B_ALIGN_RIGHT ||
 			 flag == B_ALIGN_CENTER)) {
 		fAlignment = flag;
-		
+
 		// After setting new alignment, update the view/window
 		if (Window() != NULL)
 			Invalidate();
@@ -2550,12 +2526,12 @@
 	if (resize) {
 		fResizable = true;
 		fContainerView = resizeView;
-		
+
 		// Wrapping mode and resizable mode can't live together
 		if (fWrap) {
 			fWrap = false;
 
-			if (fActive && Window() != NULL) {	
+			if (fActive && Window() != NULL) {
 				if (fSelStart != fSelEnd && fSelectable)
 					Highlight(fSelStart, fSelEnd);
 				else
@@ -2711,7 +2687,7 @@
 	BView::GetHeightForWidth(width, min, max, preferred);
 }
 
-									
+
 void
 BTextView::InvalidateLayout(bool descendants)
 {
@@ -2827,7 +2803,7 @@
 	for (int32 i = 0; i < runArray->count; i++) {
 		new (&runArray->runs[i].font) BFont;
 	}
-	
+
 	if (outSize != NULL)
 		*outSize = size;
 
@@ -2844,7 +2820,7 @@
 		for (int32 i = 0; i < countDelta; i++) {
 			copy->runs[i].offset = orig->runs[i].offset;
 			copy->runs[i].font = orig->runs[i].font;
-			copy->runs[i].color = orig->runs[i].color;	
+			copy->runs[i].color = orig->runs[i].color;
 		}
 	}
 	return copy;
@@ -2861,7 +2837,7 @@
 	// Call destructors explicitly
 	for (int32 i = 0; i < array->count; i++)
 		array->runs[i].font.~BFont();
-	
+
 	free(array);
 }
 
@@ -2925,7 +2901,7 @@
 
 		return NULL;
 	}
-	
+
 	int32 count = B_BENDIAN_TO_HOST_INT32(array->count);
 
 	text_run_array *runArray = AllocRunArray(count, _size);
@@ -2999,17 +2975,17 @@
 	// sanity checking
 	if (fromOffset >= toOffset || fromOffset < 0 || toOffset > fText->Length())
 		return;
-		
+
 	// set nullStyle to style at beginning of range
 	fStyles->InvalidateNullStyle();
-	fStyles->SyncNullStyle(fromOffset);	
-	
+	fStyles->SyncNullStyle(fromOffset);
+
 	// remove from the text buffer
 	fText->RemoveRange(fromOffset, toOffset);
-	
+
 	// remove any lines that have been obliterated
 	fLines->RemoveLineRange(fromOffset, toOffset);
-	
+
 	// remove any style runs that have been obliterated
 	fStyles->RemoveStyleRange(fromOffset, toOffset);
 }
@@ -3044,7 +3020,7 @@
 	// Add originator and action
 	drag->AddPointer("be:originator", this);
 	drag->AddInt32("be_actions", B_TRASH_TARGET);
-	
+
 	// add the text
 	int32 numBytes = fSelEnd - fSelStart;
 	const char* text = fText->GetString(fSelStart, &numBytes);
@@ -3053,11 +3029,11 @@
 	// add the corresponding styles
 	int32 size = 0;
 	text_run_array *styles = RunArray(fSelStart, fSelEnd, &size);
-	
+
 	if (styles != NULL) {
 		drag->AddData("application/x-vnd.Be-text_run_array", B_MIME_TYPE,
 			styles, size);
-	
+
 		FreeRunArray(styles);
 	}
 
@@ -3097,16 +3073,16 @@
 		GetFont(&font);
 	else
 		font = *initialFont;
-		
+
 	_NormalizeFont(&font);
-	

[... truncated: 933 lines follow ...]


From anevilyak at gmail.com  Tue Apr  7 17:31:58 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Tue, 7 Apr 2009 10:31:58 -0500
Subject: [Haiku-commits] r29995 - in haiku/trunk: headers/os/interface
	src/kits/interface
In-Reply-To: <200904071529.n37FTPrU031672@sheep.berlios.de>
References: <200904071529.n37FTPrU031672@sheep.berlios.de>
Message-ID: <f019d2f30904070831g7adf1c8cof04a29ee612bbf@mail.gmail.com>

On Tue, Apr 7, 2009 at 10:29 AM,  <zooey at mail.berlios.de> wrote:
> Author: zooey
> Date: 2009-04-07 17:29:23 +0200 (Tue, 07 Apr 2009)
> New Revision: 29995
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29995&view=rev
>
> Modified:
> ? haiku/trunk/headers/os/interface/TextView.h
> ? haiku/trunk/src/kits/interface/TextView.cpp
> Log:
> continued work on BTextView:
> * reverted my recent change that caused Mail to always show the end
> ?of mails 8-) and now invoke ScrollToOffset() wherever it was missing
> ?(mostly in keyboard-related methods)

I presume that also explains the textview on the right side of
AboutHaiku showing the exact same behavior? (starting up scrolled to
bottom instead of top).

Regards,

Rene


From zooey at mail.berlios.de  Tue Apr  7 17:52:59 2009
From: zooey at mail.berlios.de (zooey at mail.berlios.de)
Date: Tue, 7 Apr 2009 17:52:59 +0200
Subject: [Haiku-commits] r29996 - haiku/trunk/src/kits/interface
Message-ID: <200904071552.n37FqxYE001154@sheep.berlios.de>

Author: zooey
Date: 2009-04-07 17:52:58 +0200 (Tue, 07 Apr 2009)
New Revision: 29996
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29996&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
* fix off-by-one error in my last change that reverted the editing
  direction - oops ;-)
* undo is now active by default

Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-04-07 15:29:23 UTC (rev 29995)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-04-07 15:52:58 UTC (rev 29996)
@@ -3124,6 +3124,8 @@
 
 	fLayoutData = new LayoutData;
 	fLayoutData->UpdateInsets(Bounds().OffsetToCopy(B_ORIGIN), fTextRect);
+
+	SetDoesUndo(true);
 }
 
 
@@ -3931,7 +3933,7 @@
 	InsertText(inText, inLength, inOffset, inRuns);
 
 	// offset the caret/selection, if the text was inserted before it
-	if (inOffset < fSelEnd) {
+	if (inOffset <= fSelEnd) {
 		fSelStart += inLength;
 		fClickOffset = fSelEnd = fSelStart;
 	}



From axeld at mail.berlios.de  Tue Apr  7 17:53:38 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 7 Apr 2009 17:53:38 +0200
Subject: [Haiku-commits] r29997 - haiku/trunk/src/system/kernel/debug
Message-ID: <200904071553.n37FrcKV001425@sheep.berlios.de>

Author: axeld
Date: 2009-04-07 17:53:37 +0200 (Tue, 07 Apr 2009)
New Revision: 29997
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29997&view=rev

Modified:
   haiku/trunk/src/system/kernel/debug/tracing.cpp
Log:
* Added --stacktrace to the flat list of options.
* Removed superfluous and uncommon '"' around options.


Modified: haiku/trunk/src/system/kernel/debug/tracing.cpp
===================================================================
--- haiku/trunk/src/system/kernel/debug/tracing.cpp	2009-04-07 15:52:58 UTC (rev 29996)
+++ haiku/trunk/src/system/kernel/debug/tracing.cpp	2009-04-07 15:53:37 UTC (rev 29997)
@@ -1,6 +1,6 @@
 /*
  * Copyright 2008, Ingo Weinhold, ingo_weinhold at gmx.de.
- * Copyright 2008, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2008-2009, Axel D?rfler, axeld at pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
@@ -1228,9 +1228,10 @@
 
 	add_debugger_command_etc("traced", &dump_tracing_command,
 		"Dump recorded trace entries",
-		"[ \"--printteam\" ] [ \"--difftime\" ] (\"forward\" | \"backward\") "
+		"[ --printteam ] [ --difftime ] [ --stacktrace ] "
+			"(\"forward\" | \"backward\") "
 			"| ([ <start> [ <count> [ <range> ] ] ] "
-				"[ #<pattern> | (\"filter\" <filter>) ])\n"
+			"[ #<pattern> | (\"filter\" <filter>) ])\n"
 		"Prints recorded trace entries. If \"backward\" or \"forward\" is\n"
 		"specified, the command continues where the previous invocation left\n"
 		"off, i.e. printing the previous respectively next entries (as many\n"
@@ -1238,9 +1239,9 @@
 		"afterwards entering an empty line in the debugger will reinvoke it.\n"
 		"If no arguments are given, the command continues in the direction\n"
 		"of the last invocation.\n"
-		"\"--printteam\"  enables printing the entries' team IDs.\n"
-		"\"--difftime\"   print difference times for all but the first entry.\n"
-		"\"--stacktrace\" print stack traces for entries that captured one.\n"
+		"--printteam  - enables printing the entries' team IDs.\n"
+		"--difftime   - print difference times for all but the first entry.\n"
+		"--stacktrace - print stack traces for entries that captured one.\n"
 		"  <start>    - The base index of the entries to print. Depending on\n"
 		"               whether the iteration direction is forward or\n"
 		"               backward this will be the first or last entry printed\n"



From bonefish at mail.berlios.de  Tue Apr  7 18:01:32 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Tue, 7 Apr 2009 18:01:32 +0200
Subject: [Haiku-commits] r29998 -
	haiku/trunk/src/tests/system/kernel/device_manager
Message-ID: <200904071601.n37G1W9R003284@sheep.berlios.de>

Author: bonefish
Date: 2009-04-07 18:01:29 +0200 (Tue, 07 Apr 2009)
New Revision: 29998
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29998&view=rev

Modified:
   haiku/trunk/src/tests/system/kernel/device_manager/dma_resource_test.cpp
Log:
Fixed build. The tests actually reveal a problem in the IORequest
implementation.


Modified: haiku/trunk/src/tests/system/kernel/device_manager/dma_resource_test.cpp
===================================================================
--- haiku/trunk/src/tests/system/kernel/device_manager/dma_resource_test.cpp	2009-04-07 15:53:37 UTC (rev 29997)
+++ haiku/trunk/src/tests/system/kernel/device_manager/dma_resource_test.cpp	2009-04-07 16:01:29 UTC (rev 29998)
@@ -189,26 +189,11 @@
 		const iovec& vec = operation->Vecs()[i];
 		addr_t base = (addr_t)vec.iov_base;
 		size_t length = vec.iov_len;
-		size_t pageOffset = base % B_PAGE_SIZE;
 
-		while (length > 0) {
-			size_t toCopy = min_c(length, B_PAGE_SIZE - pageOffset);
-
-			uint8* virtualAddress;
-			vm_get_physical_page(base - pageOffset, (addr_t*)&virtualAddress,
-				PHYSICAL_PAGE_NO_WAIT);
-
-			if (operation->IsWrite())
-				memcpy(disk + offset, virtualAddress + pageOffset, toCopy);
-			else
-				memcpy(virtualAddress + pageOffset, disk + offset, toCopy);
-
-			vm_put_physical_page((addr_t)virtualAddress);
-
-			length -= toCopy;
-			offset += toCopy;
-			pageOffset = 0;
-		}
+		if (operation->IsWrite())
+			vm_memcpy_from_physical(disk + offset, base, length, false);
+		else
+			vm_memcpy_to_physical(base, disk + offset, length, false);
 	}
 
 	if (sIOScheduler != NULL)



From bonefish at mail.berlios.de  Tue Apr  7 18:06:32 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Tue, 7 Apr 2009 18:06:32 +0200
Subject: [Haiku-commits] r29999 -
	haiku/trunk/src/system/kernel/device_manager
Message-ID: <200904071606.n37G6WF6003792@sheep.berlios.de>

Author: bonefish
Date: 2009-04-07 18:06:30 +0200 (Tue, 07 Apr 2009)
New Revision: 29999
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29999&view=rev

Modified:
   haiku/trunk/src/system/kernel/device_manager/IORequest.cpp
Log:
IOOperation::Finish():
* Fixed the read with bounce buffer case. When skipping a partial bounce
  buffer before the part we're interested in, we forgot to update "offset".
* Added some more comments for readability.


Modified: haiku/trunk/src/system/kernel/device_manager/IORequest.cpp
===================================================================
--- haiku/trunk/src/system/kernel/device_manager/IORequest.cpp	2009-04-07 16:01:29 UTC (rev 29998)
+++ haiku/trunk/src/system/kernel/device_manager/IORequest.cpp	2009-04-07 16:06:30 UTC (rev 29999)
@@ -246,9 +246,12 @@
 
 		status_t error = B_OK;
 
+		// We iterate through the vecs we have read, moving offset (the device
+		// offset) as we go. If [offset, offset + vec.iov_len) intersects with
+		// [startOffset, endOffset) we copy to the final location.
 		off_t offset = fOffset;
-		off_t startOffset = fOriginalOffset;
-		off_t endOffset = fOriginalOffset + fOriginalLength;
+		const off_t startOffset = fOriginalOffset;
+		const off_t endOffset = fOriginalOffset + fOriginalLength;
 
 		for (uint32 i = 0; error == B_OK && i < vecCount; i++) {
 			const iovec& vec = vecs[i];
@@ -256,21 +259,28 @@
 			size_t length = vec.iov_len;
 
 			if (offset < startOffset) {
+				// If the complete vector is before the start offset, skip it.
 				if (offset + length <= startOffset) {
 					offset += length;
 					continue;
 				}
 
+				// The vector starts before the start offset, but intersects
+				// with it. Skip the part we aren't interested in.
 				size_t diff = startOffset - offset;
+				offset += diff;
 				base += diff;
 				length -= diff;
 			}
 
 			if (offset + length > endOffset) {
+				// If we're already beyond the end offset, we're done.
 				if (offset >= endOffset)
 					break;
 
+				// The vector extends beyond the end offset -- cut it.
 				length = endOffset - offset;
+				length -= offset + length - endOffset;
 			}
 
 			if (base >= bounceBufferStart && base < bounceBufferEnd) {



From axeld at mail.berlios.de  Tue Apr  7 18:07:21 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 7 Apr 2009 18:07:21 +0200
Subject: [Haiku-commits] r30000 - in haiku/trunk: headers/private/net
	src/add-ons/kernel/network/protocols/tcp
	src/add-ons/kernel/network/stack
Message-ID: <200904071607.n37G7Lll003886@sheep.berlios.de>

Author: axeld
Date: 2009-04-07 18:07:15 +0200 (Tue, 07 Apr 2009)
New Revision: 30000
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30000&view=rev

Modified:
   haiku/trunk/headers/private/net/net_socket.h
   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/EndpointManager.cpp
   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.h
   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/tcp.cpp
   haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
   haiku/trunk/src/add-ons/kernel/network/stack/stack_interface.cpp
Log:
* Sockets now inherit from WeakReferenceable.
* This fixes the problem when a socket changes something with regards to its
  parent.


Modified: haiku/trunk/headers/private/net/net_socket.h
===================================================================
--- haiku/trunk/headers/private/net/net_socket.h	2009-04-07 16:06:30 UTC (rev 29999)
+++ haiku/trunk/headers/private/net/net_socket.h	2009-04-07 16:07:15 UTC (rev 30000)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef NET_SOCKET_H
@@ -38,7 +38,6 @@
 	}						send, receive;
 
 	status_t				error;
-	struct net_socket		*parent;
 } net_socket;
 
 struct net_socket_module_info {
@@ -47,7 +46,7 @@
 	status_t	(*open_socket)(int family, int type, int protocol,
 					net_socket **_socket);
 	status_t	(*close)(net_socket *socket);
-	status_t	(*free)(net_socket *socket);
+	void		(*free)(net_socket *socket);
 
 	status_t	(*readv)(net_socket *socket, const iovec *vecs,
 					size_t vecCount, size_t *_length);
@@ -72,13 +71,17 @@
 					struct net_stat *stat);
 
 	// connections
+	void		(*acquire_socket)(net_socket *socket);
+	bool		(*release_socket)(net_socket *socket);
+
 	status_t	(*spawn_pending_socket)(net_socket *parent,
 					net_socket **_socket);
-	void		(*delete_socket)(net_socket *socket);
 	status_t	(*dequeue_connected)(net_socket *parent, net_socket **_socket);
 	ssize_t		(*count_connected)(net_socket *parent);
 	status_t	(*set_max_backlog)(net_socket *socket, uint32 backlog);
+	bool		(*has_parent)(net_socket *socket);
 	status_t	(*set_connected)(net_socket *socket);
+	status_t	(*set_aborted)(net_socket *socket);
 
 	// notifications
 	status_t	(*request_notification)(net_socket *socket, uint8 event,

Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/EndpointManager.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/EndpointManager.cpp	2009-04-07 16:06:30 UTC (rev 29999)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/EndpointManager.cpp	2009-04-07 16:07:15 UTC (rev 30000)
@@ -318,7 +318,9 @@
 
 	TCPEndpoint *endpoint = _LookupConnection(local, peer);
 	if (endpoint != NULL) {
-		TRACE(("TCP: Received packet corresponds to explicit endpoint %p\n", endpoint));
+		TRACE(("TCP: Received packet corresponds to explicit endpoint %p\n",
+			endpoint));
+		gSocketModule->acquire_socket(endpoint->socket);
 		return endpoint;
 	}
 
@@ -329,7 +331,9 @@
 
 	endpoint = _LookupConnection(local, *wildcard);
 	if (endpoint != NULL) {
-		TRACE(("TCP: Received packet corresponds to wildcard endpoint %p\n", endpoint));
+		TRACE(("TCP: Received packet corresponds to wildcard endpoint %p\n",
+			endpoint));
+		gSocketModule->acquire_socket(endpoint->socket);
 		return endpoint;
 	}
 
@@ -339,7 +343,9 @@
 
 	endpoint = _LookupConnection(*localWildcard, *wildcard);
 	if (endpoint != NULL) {
-		TRACE(("TCP: Received packet corresponds to local wildcard endpoint %p\n", endpoint));
+		TRACE(("TCP: Received packet corresponds to local wildcard endpoint "
+			"%p\n", endpoint));
+		gSocketModule->acquire_socket(endpoint->socket);
 		return endpoint;
 	}
 
@@ -564,7 +570,7 @@
 EndpointManager::Dump() const
 {
 	kprintf("-------- TCP Domain %p ---------\n", this);
-	kprintf("%10s %20s %20s %8s %8s %12s\n", "address", "local", "peer",
+	kprintf("%10s %21s %21s %8s %8s %12s\n", "address", "local", "peer",
 		"recv-q", "send-q", "state");
 
 	ConnectionTable::Iterator iterator = fConnectionHash.GetIterator();
@@ -576,7 +582,7 @@
 		endpoint->LocalAddress().AsString(localBuf, sizeof(localBuf), true);
 		endpoint->PeerAddress().AsString(peerBuf, sizeof(peerBuf), true);
 
-		kprintf("%p %20s %20s %8lu %8lu %12s\n", endpoint, localBuf, peerBuf,
+		kprintf("%p %21s %21s %8lu %8lu %12s\n", endpoint, localBuf, peerBuf,
 			endpoint->fReceiveQueue.Available(), endpoint->fSendQueue.Used(),
 			name_for_state(endpoint->State()));
 	}

Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp	2009-04-07 16:06:30 UTC (rev 29999)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp	2009-04-07 16:07:15 UTC (rev 30000)
@@ -554,7 +554,7 @@
 }
 
 
-status_t
+void
 TCPEndpoint::Free()
 {
 	TRACE("Free()");
@@ -562,17 +562,16 @@
 	MutexLocker _(fLock);
 
 	if (fState <= SYNCHRONIZE_SENT)
-		return B_OK;
+		return;
 
 	// we are only interested in the timer, not in changing state
 	_EnterTimeWait();
 
 	fFlags |= FLAG_CLOSED;
-	if ((fFlags & FLAG_DELETE_ON_CLOSE) != 0)
-		return B_OK;
-
-	return B_BUSY;
+	if ((fFlags & FLAG_DELETE_ON_CLOSE) == 0) {
 		// we'll be freed later when the 2MSL timer expires
+		gSocketModule->acquire_socket(socket);
+	}
 }
 
 
@@ -1169,7 +1168,7 @@
 	fState = ESTABLISHED;
 	T(State(this));
 
-	if (socket->parent != NULL) {
+	if (gSocketModule->has_parent(socket)) {
 		gSocketModule->set_connected(socket);
 		release_sem_etc(fAcceptSemaphore, 1, B_DO_NOT_RESCHEDULE);
 	}
@@ -1211,13 +1210,11 @@
 	fSendList.Signal();
 	_NotifyReader();
 
-	if (socket->parent != NULL) {
+	if (gSocketModule->has_parent(socket)) {
 		// We still have a parent - obviously, we haven't been accepted yet,
 		// so no one could ever close us.
-		// Since we can't just delete ourself here, we trigger an immediate
-		// time-wait timer.
 		_CancelConnectionTimers();
-		gStackModule->set_timer(&fTimeWaitTimer, 0);
+		gSocketModule->set_aborted(socket);
 	}
 }
 
@@ -1792,8 +1789,7 @@
 	if ((fFlags & (FLAG_CLOSED | FLAG_DELETE_ON_CLOSE))
 			== (FLAG_CLOSED | FLAG_DELETE_ON_CLOSE)) {
 		locker.Unlock();
-		gSocketModule->delete_socket(socket);
-			// this will also delete us
+		gSocketModule->release_socket(socket);
 	}
 
 	return segmentAction;
@@ -2293,7 +2289,7 @@
 
 	locker.Unlock();
 
-	gSocketModule->delete_socket(endpoint->socket);
+	gSocketModule->release_socket(endpoint->socket);
 }
 
 

Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.h	2009-04-07 16:06:30 UTC (rev 29999)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.h	2009-04-07 16:07:15 UTC (rev 30000)
@@ -50,7 +50,7 @@
 
 			status_t	Open();
 			status_t	Close();
-			status_t	Free();
+			void		Free();
 			status_t	Connect(const struct sockaddr* address);
 			status_t	Accept(struct net_socket** _acceptedSocket);
 			status_t	Bind(const sockaddr* address);

Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/tcp.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/tcp.cpp	2009-04-07 16:06:30 UTC (rev 29999)
+++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/tcp.cpp	2009-04-07 16:07:15 UTC (rev 30000)
@@ -496,7 +496,8 @@
 status_t
 tcp_free(net_protocol* protocol)
 {
-	return ((TCPEndpoint*)protocol)->Free();
+	((TCPEndpoint*)protocol)->Free();
+	return B_OK;
 }
 
 
@@ -708,9 +709,10 @@
 
 	TCPEndpoint* endpoint = endpointManager->FindConnection(
 		buffer->destination, buffer->source);
-	if (endpoint != NULL)
+	if (endpoint != NULL) {
 		segmentAction = endpoint->SegmentReceived(segment, buffer);
-	else if ((segment.flags & TCP_FLAG_RESET) == 0)
+		gSocketModule->release_socket(endpoint->socket);
+	} else if ((segment.flags & TCP_FLAG_RESET) == 0)
 		segmentAction = DROP | RESET;
 
 	if ((segmentAction & RESET) != 0) {

Modified: haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-07 16:06:30 UTC (rev 29999)
+++ haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-07 16:07:15 UTC (rev 30000)
@@ -16,13 +16,15 @@
 
 #include <new>
 
-#include <AutoDeleter.h>
 #include <Drivers.h>
 #include <KernelExport.h>
 #include <Select.h>
+
+#include <AutoDeleter.h>
 #include <team.h>
 #include <util/AutoLock.h>
 #include <util/list.h>
+#include <WeakReferenceable.h>
 
 #include <fs/select_sync_pool.h>
 #include <kernel.h>
@@ -41,8 +43,15 @@
 struct net_socket_private;
 typedef DoublyLinkedList<net_socket_private> SocketList;
 
-struct net_socket_private
-		: net_socket, DoublyLinkedListLinkImpl<net_socket_private> {
+struct net_socket_private : net_socket,
+		DoublyLinkedListLinkImpl<net_socket_private>,
+		WeakReferenceable<net_socket_private> {
+	net_socket_private();
+	~net_socket_private();
+
+	void RemoveFromParent();
+
+	WeakPointer<net_socket_private>* parent;
 	team_id						owner;
 	uint32						max_backlog;
 	uint32						child_count;
@@ -56,7 +65,6 @@
 };
 
 
-void socket_delete(net_socket* socket);
 int socket_bind(net_socket* socket, const struct sockaddr* address,
 	socklen_t addressLength);
 int socket_setsockopt(net_socket* socket, int level, int option,
@@ -67,6 +75,80 @@
 static mutex sSocketLock;
 
 
+net_socket_private::net_socket_private()
+	: WeakReferenceable<net_socket_private>(this),
+	parent(NULL),
+	owner(-1),
+	max_backlog(0),
+	child_count(0),
+	select_pool(NULL),
+	is_connected(false)
+{
+	first_protocol = NULL;
+	first_info = NULL;
+	options = 0;
+	linger = 0;
+	bound_to_device = 0;
+	error = 0;
+
+	address.ss_len = 0;
+	peer.ss_len = 0;
+
+	mutex_init(&lock, "socket");
+
+	// set defaults (may be overridden by the protocols)
+	send.buffer_size = 65535;
+	send.low_water_mark = 1;
+	send.timeout = B_INFINITE_TIMEOUT;
+	receive.buffer_size = 65535;
+	receive.low_water_mark = 1;
+	receive.timeout = B_INFINITE_TIMEOUT;
+}
+
+
+net_socket_private::~net_socket_private()
+{
+	if (parent != NULL)
+		panic("socket still has a parent!");
+
+	mutex_lock(&sSocketLock);
+	sSocketList.Remove(this);
+	mutex_unlock(&sSocketLock);
+
+	mutex_lock(&lock);
+
+	// also delete all children of this socket
+	while (net_socket_private* child = pending_children.RemoveHead()) {
+		child->RemoveFromParent();
+	}
+	while (net_socket_private* child = connected_children.RemoveHead()) {
+		child->RemoveFromParent();
+	}
+
+	put_domain_protocols(this);
+
+	mutex_unlock(&lock);
+	mutex_destroy(&lock);
+}
+
+
+void
+net_socket_private::RemoveFromParent()
+{
+	parent->RemoveReference();
+	parent = NULL;
+
+	mutex_lock(&sSocketLock);
+	sSocketList.Add(this);
+	mutex_unlock(&sSocketLock);
+
+	RemoveReference();
+}
+
+
+//	#pragma mark -
+
+
 static size_t
 compute_user_iovec_length(iovec* userVec, uint32 count)
 {
@@ -84,16 +166,6 @@
 }
 
 
-static void
-delete_children(SocketList& list)
-{
-	while (net_socket_private* child = list.RemoveHead()) {
-		child->parent = NULL;
-		socket_delete(child);
-	}
-}
-
-
 static status_t
 create_socket(int family, int type, int protocol, net_socket_private** _socket)
 {
@@ -101,21 +173,10 @@
 	if (socket == NULL)
 		return B_NO_MEMORY;
 
-	memset(socket, 0, sizeof(net_socket_private));
 	socket->family = family;
 	socket->type = type;
 	socket->protocol = protocol;
 
-	mutex_init(&socket->lock, "socket");
-
-	// set defaults (may be overridden by the protocols)
-	socket->send.buffer_size = 65535;
-	socket->send.low_water_mark = 1;
-	socket->send.timeout = B_INFINITE_TIMEOUT;
-	socket->receive.buffer_size = 65535;
-	socket->receive.low_water_mark = 1;
-	socket->receive.timeout = B_INFINITE_TIMEOUT;
-
 	status_t status = get_domain_protocols(socket);
 	if (status < B_OK) {
 		mutex_destroy(&socket->lock);
@@ -316,7 +377,7 @@
 
 	status = socket->first_info->open(socket->first_protocol);
 	if (status < B_OK) {
-		socket_delete(socket);
+		delete socket;
 		return status;
 	}
 
@@ -339,15 +400,12 @@
 }
 
 
-status_t
-socket_free(net_socket* socket)
+void
+socket_free(net_socket* _socket)
 {
-	status_t status = socket->first_info->free(socket->first_protocol);
-	if (status == B_BUSY)
-		return B_OK;
-
-	socket_delete(socket);
-	return B_OK;
+	net_socket_private* socket = (net_socket_private*)_socket;
+	socket->first_info->free(socket->first_protocol);
+	socket->RemoveReference();
 }
 
 
@@ -532,6 +590,22 @@
 //	#pragma mark - connections
 
 
+void
+socket_acquire(net_socket* _socket)
+{
+	net_socket_private* socket = (net_socket_private*)_socket;
+	socket->AddReference();
+}
+
+
+bool
+socket_release(net_socket* _socket)
+{
+	net_socket_private* socket = (net_socket_private*)_socket;
+	return socket->RemoveReference();
+}
+
+
 status_t
 socket_spawn_pending(net_socket* _parent, net_socket** _socket)
 {
@@ -562,7 +636,7 @@
 
 	// add to the parent's list of pending connections
 	parent->pending_children.Add(socket);
-	socket->parent = parent;
+	socket->parent = parent->GetWeakPointer();
 	parent->child_count++;
 
 	*_socket = socket;
@@ -570,42 +644,9 @@
 }
 
 
-void
-socket_delete(net_socket* _socket)
-{
-	net_socket_private* socket = (net_socket_private*)_socket;
-	net_socket_private* parent = (net_socket_private*)socket->parent;
-
-	if (parent != NULL) {
-		// The socket still has a parent
-		// TODO: we need to make sure our parent isn't deleted right now,
-		//   or in the process of deleting its children...
-		MutexLocker _(parent->lock);
-
-		if (socket->is_connected)
-			parent->connected_children.Remove(socket);
-		else
-			parent->pending_children.Remove(socket);
-
-		parent->child_count--;
-		socket->parent = NULL;
-	}
-
-	mutex_lock(&sSocketLock);
-	sSocketList.Remove(socket);
-	mutex_unlock(&sSocketLock);
-
-	// also delete all children of this socket
-	delete_children(socket->pending_children);
-	delete_children(socket->connected_children);
-
-	put_domain_protocols(socket);
-
-	mutex_destroy(&socket->lock);
-	delete socket;
-}
-
-
+/*!	Dequeues a connected child from a parent socket.
+	It also returns a reference with the child socket.
+*/
 status_t
 socket_dequeue_connected(net_socket* _parent, net_socket** _socket)
 {
@@ -615,7 +656,8 @@
 
 	net_socket_private* socket = parent->connected_children.RemoveHead();
 	if (socket != NULL) {
-		socket->parent = NULL;
+		socket->AddReference();
+		socket->RemoveFromParent();
 		parent->child_count--;
 		*_socket = socket;
 	}
@@ -625,10 +667,6 @@
 	if (socket == NULL)
 		return B_ENTRY_NOT_FOUND;
 
-	mutex_lock(&sSocketLock);
-	sSocketList.Add(socket);
-	mutex_unlock(&sSocketLock);
-
 	return B_OK;
 }
 
@@ -659,13 +697,12 @@
 	net_socket_private* child;
 	while (socket->child_count > backlog
 		&& (child = socket->pending_children.RemoveTail()) != NULL) {
-		child->parent = NULL;
+		child->RemoveFromParent();
 		socket->child_count--;
 	}
 	while (socket->child_count > backlog
 		&& (child = socket->connected_children.RemoveTail()) != NULL) {
-		child->parent = NULL;
-		socket_delete(child);
+		child->RemoveFromParent();
 		socket->child_count--;
 	}
 
@@ -674,21 +711,34 @@
 }
 
 
+/*!	Returns whether or not this socket has a parent. The parent might not be
+	valid anymore, though.
+*/
+bool
+socket_has_parent(net_socket* _socket)
+{
+	net_socket_private* socket = (net_socket_private*)_socket;
+	return socket->parent != NULL;
+}
+
+
 /*!	The socket has been connected. It will be moved to the connected queue
 	of its parent socket.
 */
 status_t
-socket_connected(net_socket* socket)
+socket_connected(net_socket* _socket)
 {
-	net_socket_private* parent = (net_socket_private*)socket->parent;
+	net_socket_private* socket = (net_socket_private*)_socket;
+
+	WeakReference<net_socket_private> parent = socket->parent;
 	if (parent == NULL)
 		return B_BAD_VALUE;
 
-	MutexLocker _(&parent->lock);
+	MutexLocker _(parent->lock);
 
-	parent->pending_children.Remove((net_socket_private*)socket);
-	parent->connected_children.Add((net_socket_private*)socket);
-	((net_socket_private*)socket)->is_connected = true;
+	parent->pending_children.Remove(socket);
+	parent->connected_children.Add(socket);
+	socket->is_connected = true;
 
 	// notify parent
 	if (parent->select_pool)
@@ -698,6 +748,32 @@
 }
 
 
+/*!	The socket has been aborted. Steals the parent's reference, and releases
+	it.
+*/
+status_t
+socket_aborted(net_socket* _socket)
+{
+	net_socket_private* socket = (net_socket_private*)_socket;
+
+	WeakReference<net_socket_private> parent = socket->parent;
+	if (parent == NULL)
+		return B_BAD_VALUE;
+
+	MutexLocker _(parent->lock);
+
+	if (socket->is_connected)
+		parent->connected_children.Remove(socket);
+	else
+		parent->pending_children.Remove(socket);
+
+	parent->child_count--;
+	socket->RemoveFromParent();
+
+	return B_OK;
+}
+
+
 //	#pragma mark - notifications
 
 
@@ -1551,12 +1627,15 @@
 	socket_get_next_stat,
 
 	// connections
+	socket_acquire,
+	socket_release,
 	socket_spawn_pending,
-	socket_delete,
 	socket_dequeue_connected,
 	socket_count_connected,
 	socket_set_max_backlog,
+	socket_has_parent,
 	socket_connected,
+	socket_aborted,
 
 	// notifications
 	socket_request_notification,

Modified: haiku/trunk/src/add-ons/kernel/network/stack/stack_interface.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/stack_interface.cpp	2009-04-07 16:06:30 UTC (rev 29999)
+++ haiku/trunk/src/add-ons/kernel/network/stack/stack_interface.cpp	2009-04-07 16:07:15 UTC (rev 30000)
@@ -27,7 +27,8 @@
 static status_t
 stack_interface_free(net_socket* socket)
 {
-	return gNetSocketModule.free(socket);
+	gNetSocketModule.free(socket);
+	return B_OK;
 }
 
 



From anevilyak at gmail.com  Tue Apr  7 18:08:23 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Tue, 7 Apr 2009 11:08:23 -0500
Subject: [Haiku-commits] r30000 - in haiku/trunk: headers/private/net
	src/add-ons/kernel/network/protocols/tcp
	src/add-ons/kernel/network/stack
In-Reply-To: <200904071607.n37G7Lll003886@sheep.berlios.de>
References: <200904071607.n37G7Lll003886@sheep.berlios.de>
Message-ID: <f019d2f30904070908q6a12bffaq9b05bdb694a2b63c@mail.gmail.com>

On Tue, Apr 7, 2009 at 11:07 AM,  <axeld at mail.berlios.de> wrote:
> Author: axeld
> Date: 2009-04-07 18:07:15 +0200 (Tue, 07 Apr 2009)
> New Revision: 30000

Time to ship Alpha1 I guess? ;)

Regards,

Rene


From stippi at mail.berlios.de  Tue Apr  7 18:09:03 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Tue, 7 Apr 2009 18:09:03 +0200
Subject: [Haiku-commits] r30001 - haiku/trunk/src/apps/activitymonitor
Message-ID: <200904071609.n37G93n4004024@sheep.berlios.de>

Author: stippi
Date: 2009-04-07 18:09:00 +0200 (Tue, 07 Apr 2009)
New Revision: 30001
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30001&view=rev

Modified:
   haiku/trunk/src/apps/activitymonitor/ActivityView.cpp
   haiku/trunk/src/apps/activitymonitor/ActivityView.h
   haiku/trunk/src/apps/activitymonitor/DataSource.cpp
   haiku/trunk/src/apps/activitymonitor/DataSource.h
Log:
* Some beautification, mostly for when the replicant is embedded on the Desktop.
* Fall back to a shorter legend label when the room is too small (before
  truncating).


Modified: haiku/trunk/src/apps/activitymonitor/ActivityView.cpp
===================================================================
--- haiku/trunk/src/apps/activitymonitor/ActivityView.cpp	2009-04-07 16:07:15 UTC (rev 30000)
+++ haiku/trunk/src/apps/activitymonitor/ActivityView.cpp	2009-04-07 16:09:00 UTC (rev 30001)
@@ -13,6 +13,7 @@
 
 #ifdef __HAIKU__
 #	include <AbstractLayoutItem.h>
+#	include <ControlLook.h>
 #endif
 #include <Application.h>
 #include <Autolock.h>
@@ -920,6 +921,8 @@
 ActivityView::_UpdateOffscreenBitmap()
 {
 	BRect frame = _HistoryFrame();
+	frame.OffsetTo(B_ORIGIN);
+
 	if (fOffscreen != NULL && frame == fOffscreen->Bounds())
 		return;
 
@@ -1183,14 +1186,15 @@
 BRect
 ActivityView::_HistoryFrame() const
 {
-	if (!fShowLegend)
-		return Bounds();
-
 	BRect frame = Bounds();
-	BRect legendFrame = _LegendFrame();
 
-	frame.bottom = legendFrame.top - 1;
+	if (fShowLegend) {
+		BRect legendFrame = _LegendFrame();
+		frame.bottom = legendFrame.top - 1;
+	}
 
+	frame.InsetBy(2, 2);
+
 	return frame;
 }
 
@@ -1283,7 +1287,7 @@
 
 
 void
-ActivityView::_DrawHistory()
+ActivityView::_DrawHistory(bool drawBackground)
 {
 	_UpdateOffscreenBitmap();
 
@@ -1294,6 +1298,19 @@
 	}
 
 	BRect frame = _HistoryFrame();
+	BRect outerFrame = frame.InsetByCopy(-2, -2);
+
+	// draw the outer frame
+	uint32 flags = 0;
+	if (!drawBackground)
+		flags |= BControlLook::B_BLEND_FRAME;
+	be_control_look->DrawTextControlBorder(this, outerFrame,
+		outerFrame, fLegendBackgroundColor, flags);
+
+	// convert to offscreen view if necessary
+	if (view != this)
+		frame.OffsetTo(B_ORIGIN);
+
 	view->SetLowColor(fHistoryBackgroundColor);
 	view->FillRect(frame, B_SOLID_LOW);
 
@@ -1322,7 +1339,6 @@
 		scaleColor = tint_color(scaleColor, B_DARKEN_2_TINT);
 
 	view->SetHighColor(scaleColor);
-	view->StrokeRect(frame);
 	view->StrokeLine(BPoint(frame.left, frame.top + frame.Height() / 2),
 		BPoint(frame.right, frame.top + frame.Height() / 2));
 
@@ -1364,7 +1380,7 @@
 	view->Sync();
 	if (fOffscreen != NULL) {
 		fOffscreen->Unlock();
-		DrawBitmap(fOffscreen, B_ORIGIN);
+		DrawBitmap(fOffscreen, outerFrame.LeftTop());
 	}
 }
 
@@ -1393,21 +1409,25 @@
 
 
 void
-ActivityView::Draw(BRect /*updateRect*/)
+ActivityView::Draw(BRect updateRect)
 {
-	_DrawHistory();
+	bool drawBackground = true;
+	if (Parent() && (Parent()->Flags() & B_DRAW_ON_CHILDREN) != 0)
+		drawBackground = false;
 
+	_DrawHistory(drawBackground);
+
 	if (!fShowLegend)
 		return;
 
 	// draw legend
+	BRect legendFrame = _LegendFrame();
+	SetLowColor(fLegendBackgroundColor);
+	if (drawBackground)
+		FillRect(legendFrame, B_SOLID_LOW);
 
 	BAutolock _(fSourcesLock);
-	BRect legendFrame = _LegendFrame();
 
-	SetLowColor(fLegendBackgroundColor);
-	FillRect(legendFrame, B_SOLID_LOW);
-
 	font_height fontHeight;
 	GetFontHeight(&fontHeight);
 
@@ -1418,11 +1438,12 @@
 
 		// draw color box
 		BRect colorBox = _LegendColorFrameAt(legendFrame, i);
-		SetHighColor(tint_color(source->Color(), B_DARKEN_1_TINT));
-		StrokeRect(colorBox);
+		BRect rect = colorBox;
+		uint32 flags = BControlLook::B_BLEND_FRAME;
+		be_control_look->DrawTextControlBorder(this, rect,
+			rect, fLegendBackgroundColor, flags);
 		SetHighColor(source->Color());
-		colorBox.InsetBy(1, 1);
-		FillRect(colorBox);
+		FillRect(rect);
 
 		// show current value and label
 		float y = frame.top + ceilf(fontHeight.ascent);
@@ -1432,10 +1453,22 @@
 		float width = StringWidth(text.String());
 
 		BString label = source->Label();
-		TruncateString(&label, B_TRUNCATE_MIDDLE,
-			frame.right - colorBox.right - 12 - width);
+		float possibleLabelWidth = frame.right - colorBox.right - 12 - width;
+		// TODO: TruncateString() is broken... remove + 5 when fixed!
+		if (ceilf(StringWidth(label.String()) + 5) > possibleLabelWidth)
+			label = source->ShortLabel();
+		TruncateString(&label, B_TRUNCATE_MIDDLE, possibleLabelWidth);
 
-		SetHighColor(ui_color(B_CONTROL_TEXT_COLOR));
+		if (drawBackground)
+			SetHighColor(ui_color(B_CONTROL_TEXT_COLOR));
+		else {
+			SetDrawingMode(B_OP_OVER);
+			rgb_color c = Parent()->LowColor();
+			if (c.red + c.green + c.blue > 128 * 3)
+				SetHighColor(0, 0, 0);
+			else
+				SetHighColor(255, 255, 255);
+		}
 		DrawString(label.String(), BPoint(6 + colorBox.right, y));
 		DrawString(text.String(), BPoint(frame.right - width, y));
 	}

Modified: haiku/trunk/src/apps/activitymonitor/ActivityView.h
===================================================================
--- haiku/trunk/src/apps/activitymonitor/ActivityView.h	2009-04-07 16:07:15 UTC (rev 30000)
+++ haiku/trunk/src/apps/activitymonitor/ActivityView.h	2009-04-07 16:09:00 UTC (rev 30001)
@@ -110,7 +110,7 @@
 			BRect		_LegendColorFrameAt(BRect frame, int32 index) const;
 			float		_PositionForValue(DataSource* source,
 							DataHistory* values, int64 value);
-			void		_DrawHistory();
+			void		_DrawHistory(bool drawBackground);
 			void		_UpdateResolution(int32 resolution,
 							bool broadcast = true);
 

Modified: haiku/trunk/src/apps/activitymonitor/DataSource.cpp
===================================================================
--- haiku/trunk/src/apps/activitymonitor/DataSource.cpp	2009-04-07 16:07:15 UTC (rev 30000)
+++ haiku/trunk/src/apps/activitymonitor/DataSource.cpp	2009-04-07 16:09:00 UTC (rev 30001)
@@ -151,6 +151,13 @@
 
 
 const char*
+DataSource::ShortLabel() const
+{
+	return Label();
+}
+
+
+const char*
 DataSource::Label() const
 {
 	return "";
@@ -325,6 +332,13 @@
 }
 
 
+const char*
+UsedMemoryDataSource::ShortLabel() const
+{
+	return "Memory";
+}
+
+
 bool
 UsedMemoryDataSource::Primary() const
 {
@@ -367,6 +381,13 @@
 }
 
 
+const char*
+CachedMemoryDataSource::ShortLabel() const
+{
+	return "Cache";
+}
+
+
 bool
 CachedMemoryDataSource::Primary() const
 {
@@ -412,6 +433,13 @@
 }
 
 
+const char*
+SwapSpaceDataSource::ShortLabel() const
+{
+	return "Swap";
+}
+
+
 bool
 SwapSpaceDataSource::Primary() const
 {
@@ -459,6 +487,13 @@
 }
 
 
+const char*
+SemaphoresDataSource::ShortLabel() const
+{
+	return "Sems";
+}
+
+
 bool
 SemaphoresDataSource::AdaptiveScale() const
 {
@@ -647,6 +682,13 @@
 }
 
 
+const char*
+RunningAppsDataSource::ShortLabel() const
+{
+	return "Apps";
+}
+
+
 bool
 RunningAppsDataSource::AdaptiveScale() const
 {
@@ -676,6 +718,7 @@
 	fPreviousTime = other.fPreviousTime;
 	fCPU = other.fCPU;
 	fLabel = other.fLabel;
+	fShortLabel = other.fShortLabel;
 }
 
 
@@ -738,6 +781,13 @@
 
 
 const char*
+CPUUsageDataSource::ShortLabel() const
+{
+	return fShortLabel.String();
+}
+
+
+const char*
 CPUUsageDataSource::Name() const
 {
 	return "CPU Usage";
@@ -773,6 +823,7 @@
 	if (SystemInfo().CPUCount() > 1)
 		fLabel << " " << cpu;
 
+	fShortLabel = fLabel;
 	fLabel << " Usage";
 
 	const rgb_color kColors[] = {
@@ -868,6 +919,13 @@
 
 
 const char*
+CPUCombinedUsageDataSource::ShortLabel() const
+{
+	return "CPU";
+}
+
+
+const char*
 CPUCombinedUsageDataSource::Name() const
 {
 	return "CPU Usage (combined)";
@@ -959,6 +1017,13 @@
 
 
 const char*
+PageFaultsDataSource::ShortLabel() const
+{
+	return "P-Faults";
+}
+
+
+const char*
 PageFaultsDataSource::Name() const
 {
 	return "Page Faults";
@@ -1053,6 +1118,13 @@
 
 
 const char*
+NetworkUsageDataSource::ShortLabel() const
+{
+	return fIn ? "RX" : "TX";
+}
+
+
+const char*
 NetworkUsageDataSource::Name() const
 {
 	return fIn ? "Network Receive" : "Network Send";

Modified: haiku/trunk/src/apps/activitymonitor/DataSource.h
===================================================================
--- haiku/trunk/src/apps/activitymonitor/DataSource.h	2009-04-07 16:07:15 UTC (rev 30000)
+++ haiku/trunk/src/apps/activitymonitor/DataSource.h	2009-04-07 16:09:00 UTC (rev 30001)
@@ -40,6 +40,7 @@
 
 	virtual const char*	Name() const;
 	virtual const char*	Label() const;
+	virtual const char*	ShortLabel() const;
 	virtual const char*	Unit() const;
 	virtual rgb_color	Color() const;
 	virtual bool		AdaptiveScale() const;
@@ -81,6 +82,7 @@
 
 	virtual	int64		NextValue(SystemInfo& info);
 	virtual const char*	Label() const;
+	virtual const char*	ShortLabel() const;
 	virtual bool		Primary() const;
 };
 
@@ -94,6 +96,7 @@
 
 	virtual	int64		NextValue(SystemInfo& info);
 	virtual const char*	Label() const;
+	virtual const char*	ShortLabel() const;
 	virtual bool		Primary() const;
 };
 
@@ -107,6 +110,7 @@
 
 	virtual	int64		NextValue(SystemInfo& info);
 	virtual const char*	Label() const;
+	virtual const char*	ShortLabel() const;
 	virtual bool		Primary() const;
 };
 
@@ -120,6 +124,7 @@
 
 	virtual	int64		NextValue(SystemInfo& info);
 	virtual const char*	Label() const;
+	virtual const char*	ShortLabel() const;
 	virtual bool		AdaptiveScale() const;
 };
 
@@ -172,6 +177,7 @@
 
 	virtual	int64		NextValue(SystemInfo& info);
 	virtual const char*	Label() const;
+	virtual const char*	ShortLabel() const;
 	virtual bool		AdaptiveScale() const;
 };
 
@@ -190,6 +196,7 @@
 
 	virtual const char*	Name() const;
 	virtual const char*	Label() const;
+	virtual const char*	ShortLabel() const;
 
 	virtual int32		CPU() const;
 	virtual bool		PerCPU() const;
@@ -202,6 +209,7 @@
 	bigtime_t			fPreviousTime;
 	int32				fCPU;
 	BString				fLabel;
+	BString				fShortLabel;
 };
 
 
@@ -219,6 +227,7 @@
 
 	virtual const char*	Name() const;
 	virtual const char*	Label() const;
+	virtual const char*	ShortLabel() const;
 
 	virtual bool		MultiCPUOnly() const;
 	virtual bool		Primary() const;
@@ -243,6 +252,7 @@
 
 	virtual const char*	Name() const;
 	virtual const char*	Label() const;
+	virtual const char*	ShortLabel() const;
 	virtual bool		AdaptiveScale() const;
 	virtual bool		Primary() const;
 
@@ -266,6 +276,7 @@
 
 	virtual const char*	Name() const;
 	virtual const char*	Label() const;
+	virtual const char*	ShortLabel() const;
 	virtual bool		AdaptiveScale() const;
 	virtual scale_type	ScaleType() const;
 	virtual bool		Primary() const;



From revol at free.fr  Tue Apr  7 19:17:41 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Tue, 07 Apr 2009 19:17:41 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r30000_-_in_haiku/trunk=3A_headers/priv?=
 =?utf-8?q?ate/net_src/add-ons/kernel/network/protocols/tcp_src/add-ons/ke?=
 =?utf-8?q?rnel/network/stack?=
In-Reply-To: <f019d2f30904070908q6a12bffaq9b05bdb694a2b63c@mail.gmail.com>
Message-ID: <422212754-BeMail@laptop>

> On Tue, Apr 7, 2009 at 11:07 AM,  <axeld at mail.berlios.de> wrote:
> > Author: axeld
> > Date: 2009-04-07 18:07:15 +0200 (Tue, 07 Apr 2009)
> > New Revision: 30000

Aw, I was quite sure you wouldn't wait for me to do this one :P

You get the whole cookie truck :P

> 
> Time to ship Alpha1 I guess? ;)
> 

I suppose so :p


Fran?ois.


From stippi at mail.berlios.de  Tue Apr  7 19:40:26 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Tue, 7 Apr 2009 19:40:26 +0200
Subject: [Haiku-commits] r30002 -
	haiku/trunk/src/system/kernel/device_manager
Message-ID: <200904071740.n37HeQOv031181@sheep.berlios.de>

Author: stippi
Date: 2009-04-07 19:40:16 +0200 (Tue, 07 Apr 2009)
New Revision: 30002
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30002&view=rev

Modified:
   haiku/trunk/src/system/kernel/device_manager/IORequest.cpp
Log:
Removed unintentional thought mumbling left-over that would fortunately cause
no harm.


Modified: haiku/trunk/src/system/kernel/device_manager/IORequest.cpp
===================================================================
--- haiku/trunk/src/system/kernel/device_manager/IORequest.cpp	2009-04-07 16:09:00 UTC (rev 30001)
+++ haiku/trunk/src/system/kernel/device_manager/IORequest.cpp	2009-04-07 17:40:16 UTC (rev 30002)
@@ -280,7 +280,6 @@
 
 				// The vector extends beyond the end offset -- cut it.
 				length = endOffset - offset;
-				length -= offset + length - endOffset;
 			}
 
 			if (base >= bounceBufferStart && base < bounceBufferEnd) {



From axeld at mail.berlios.de  Tue Apr  7 19:41:50 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 7 Apr 2009 19:41:50 +0200
Subject: [Haiku-commits] r30003 -
	haiku/trunk/src/add-ons/kernel/network/stack
Message-ID: <200904071741.n37HfoCs031736@sheep.berlios.de>

Author: axeld
Date: 2009-04-07 19:41:46 +0200 (Tue, 07 Apr 2009)
New Revision: 30003
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30003&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
Log:
* dump_socket() now also prints the actual parent again (not just its
  WeakPointer).


Modified: haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-07 17:40:16 UTC (rev 30002)
+++ haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-07 17:41:46 UTC (rev 30003)
@@ -307,7 +307,8 @@
 	kprintf("SOCKET %p\n", socket);
 	kprintf("  family.type.protocol: %d.%d.%d\n",
 		socket->family, socket->type, socket->protocol);
-	kprintf("  parent:               %p\n", socket->parent);
+	WeakReference<net_socket_private> parent = socket->parent;
+	kprintf("  parent:               %p (%p)\n", parent.Get(), socket->parent);
 	kprintf("  first protocol:       %p\n", socket->first_protocol);
 	kprintf("  first module_info:    %p\n", socket->first_info);
 	kprintf("  options:              %x\n", socket->options);



From leavengood at gmail.com  Tue Apr  7 19:41:34 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Tue, 7 Apr 2009 13:41:34 -0400
Subject: [Haiku-commits] r29888 -
	haiku/trunk/src/system/libroot/posix/unistd
In-Reply-To: <200904032350.n33NoELT002687@sheep.berlios.de>
References: <200904032350.n33NoELT002687@sheep.berlios.de>
Message-ID: <a4855ac50904071041k3d574096ne91b061f6269560a@mail.gmail.com>

On Fri, Apr 3, 2009 at 7:50 PM,  <phoudoin at mail.berlios.de> wrote:
>
> Modified:
> ? haiku/trunk/src/system/libroot/posix/unistd/conf.c
> Log:
> Another fix after /boot/beos -> /boot/system change.

I know this is something we probably won't change again, but surely
there is a way to put the definition of these directories into a
header or try to use find_directory() everywhere. All this hard-coding
is raising my "code smell" antennae.

Regards,
Ryan


From stippi at mail.berlios.de  Tue Apr  7 20:02:23 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Tue, 7 Apr 2009 20:02:23 +0200
Subject: [Haiku-commits] r30004 - haiku/trunk/src/servers/app
Message-ID: <200904071802.n37I2N7K027112@sheep.berlios.de>

Author: stippi
Date: 2009-04-07 20:02:22 +0200 (Tue, 07 Apr 2009)
New Revision: 30004
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30004&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Fixed incorrect comment.


Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2009-04-07 17:41:46 UTC (rev 30003)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2009-04-07 18:02:22 UTC (rev 30004)
@@ -3161,8 +3161,7 @@
 				free(string);
 				break;
 			}
-			// Terminate the string, if nothing else, it's important
-			// for the DTRACE call below...
+			// Terminate the string
 			string[info.stringLength] = '\0';
 
 			picture->WriteDrawString(info.location, string, info.stringLength,



From zooey at hirschkaefer.de  Tue Apr  7 22:09:13 2009
From: zooey at hirschkaefer.de (Oliver Tappe)
Date: Tue, 07 Apr 2009 20:09:13 +0000
Subject: [Haiku-commits] r29995 - in haiku/trunk: headers/os/interface
 src/kits/interface
In-Reply-To: <f019d2f30904070831g7adf1c8cof04a29ee612bbf@mail.gmail.com>
References: <200904071529.n37FTPrU031672@sheep.berlios.de>
	<f019d2f30904070831g7adf1c8cof04a29ee612bbf@mail.gmail.com>
Message-ID: <20090407200913.670.1@bepc.1239134302.fake>

Hi Rene,

On 2009-04-07 at 19:47:58 [+0000], Rene Gollent <anevilyak at gmail.com> wrote:
> On Tue, Apr 7, 2009 at 10:29 AM,  <zooey at mail.berlios.de> wrote:
> > continued work on BTextView:
> > * reverted my recent change that caused Mail to always show the end
> >  of mails 8-) and now invoke ScrollToOffset() wherever it was missing
> >  (mostly in keyboard-related methods)
> 
> I presume that also explains the textview on the right side of
> AboutHaiku showing the exact same behavior? (starting up scrolled to
> bottom instead of top).

Most probably, yes: the textview would scroll downwards whenever a program 
inserted text via Insert() (as opposed to SetText()).

cheers,
    Oliver


From ingo_weinhold at gmx.de  Tue Apr  7 20:42:18 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Tue, 07 Apr 2009 20:42:18 +0200
Subject: [Haiku-commits] r29888 -
 haiku/trunk/src/system/libroot/posix/unistd
In-Reply-To: <a4855ac50904071041k3d574096ne91b061f6269560a@mail.gmail.com>
References: <200904032350.n33NoELT002687@sheep.berlios.de>
	<a4855ac50904071041k3d574096ne91b061f6269560a@mail.gmail.com>
Message-ID: <20090407204218.349.1@knochen-vm.localdomain>


On 2009-04-07 at 19:41:34 [+0200], Ryan Leavengood <leavengood at gmail.com> 
wrote:
> On Fri, Apr 3, 2009 at 7:50 PM,  <phoudoin at mail.berlios.de> wrote:
> >
> > Modified:
> >   haiku/trunk/src/system/libroot/posix/unistd/conf.c
> > Log:
> > Another fix after /boot/beos -> /boot/system change.
> 
> I know this is something we probably won't change again, but surely
> there is a way to put the definition of these directories into a
> header or try to use find_directory() everywhere. All this hard-coding
> is raising my "code smell" antennae.

+1

In fact it already had been suggested at the time of the last 
find_directory() round that the places where hardcoding the paths is OK 
(kernel, system components) should use macros defined in a central header. 
Considering Axel's advanced age we can't really blame him for forgetting 
it, though. ;-)

CU, Ingo


From oruizdorantes at mail.berlios.de  Tue Apr  7 20:47:49 2009
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Tue, 7 Apr 2009 20:47:49 +0200
Subject: [Haiku-commits] r30005 -
	haiku/trunk/src/add-ons/kernel/bluetooth/btCoreData
Message-ID: <200904071847.n37IlneB032448@sheep.berlios.de>

Author: oruizdorantes
Date: 2009-04-07 20:47:49 +0200 (Tue, 07 Apr 2009)
New Revision: 30005
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30005&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bluetooth/btCoreData/BTCoreData.cpp
Log:
Fix build, due Count/Size change in 29979

Modified: haiku/trunk/src/add-ons/kernel/bluetooth/btCoreData/BTCoreData.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bluetooth/btCoreData/BTCoreData.cpp	2009-04-07 18:02:22 UTC (rev 30004)
+++ haiku/trunk/src/add-ons/kernel/bluetooth/btCoreData/BTCoreData.cpp	2009-04-07 18:47:49 UTC (rev 30005)
@@ -42,7 +42,7 @@
 		conn = iterator.Next();
 		kprintf("\tLocalDevice=%lx Destination=%s handle=%#x type=%d outqueue=%ld expected=%ld\n",
 					conn->Hid, bdaddrUtils::ToString(conn->destination),
-			conn->handle, conn->type, conn->OutGoingFrames.Size() , conn->ExpectedResponses.Size());
+			conn->handle, conn->type, conn->OutGoingFrames.Count() , conn->ExpectedResponses.Count());
 
 			// each channel
 			DoublyLinkedList<L2capChannel>::Iterator channelIterator = conn->ChannelList.GetIterator();



From axeld at pinc-software.de  Tue Apr  7 19:14:31 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Tue, 07 Apr 2009 19:14:31
Subject: [Haiku-commits] r29888 -
 haiku/trunk/src/system/libroot/posix/unistd
In-Reply-To: <20090407204218.349.1@knochen-vm.localdomain>
Message-ID: <1652301041-BeMail@quad>

Ingo Weinhold wrote:
> In fact it already had been suggested at the time of the last 
> find_directory() round that the places where hardcoding the paths is 
> OK 
> (kernel, system components) should use macros defined in a central 
> header. 
> Considering Axel's advanced age we can't really blame him for 
> forgetting 
> it, though. ;-)

I actually don't forget everything I haven't done yet - it's on my TODO 
list, but not on top yet ;-))

Bye,
   Axel.



From anevilyak at gmail.com  Tue Apr  7 21:19:20 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Tue, 7 Apr 2009 14:19:20 -0500
Subject: [Haiku-commits] r29888 -
	haiku/trunk/src/system/libroot/posix/unistd
In-Reply-To: <1652301041-BeMail@quad>
References: <20090407204218.349.1@knochen-vm.localdomain>
	<1652301041-BeMail@quad>
Message-ID: <f019d2f30904071219x6bd0137fwe5e5e3369fc5ff2@mail.gmail.com>

On Tue, Apr 7, 2009 at 2:14 PM, Axel D?rfler <axeld at pinc-software.de> wrote:
>
> I actually don't forget everything I haven't done yet - it's on my TODO
> list, but not on top yet ;-))

I'm scared to ask how many megabytes your TODO file is at this point ;)

Regards,

Rene


From axeld at mail.berlios.de  Tue Apr  7 21:50:05 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 7 Apr 2009 21:50:05 +0200
Subject: [Haiku-commits] r30006 - haiku/trunk/src/apps/stylededit
Message-ID: <200904071950.n37Jo57D006807@sheep.berlios.de>

Author: axeld
Date: 2009-04-07 21:50:03 +0200 (Tue, 07 Apr 2009)
New Revision: 30006
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30006&view=rev

Modified:
   haiku/trunk/src/apps/stylededit/StyledEditWindow.cpp
   haiku/trunk/src/apps/stylededit/StyledEditWindow.h
Log:
* Removed the line view again. Sorry, but this is pretty useless, had a small
  fixed size, didn't follow our coding style, etc.
* I did not remove the back-end code in the StyledEditView, though (nor did I
  had a look at it for coding style violations :-)).


Modified: haiku/trunk/src/apps/stylededit/StyledEditWindow.cpp
===================================================================
--- haiku/trunk/src/apps/stylededit/StyledEditWindow.cpp	2009-04-07 18:47:49 UTC (rev 30005)
+++ haiku/trunk/src/apps/stylededit/StyledEditWindow.cpp	2009-04-07 19:50:03 UTC (rev 30006)
@@ -15,7 +15,6 @@
 #include "StyledEditView.h"
 #include "StyledEditWindow.h"
 
-
 #include <Alert.h>
 #include <Autolock.h>
 #include <CharacterSet.h>
@@ -31,15 +30,16 @@
 #include <Rect.h>
 #include <Roster.h>
 #include <ScrollView.h>
-#include <StringView.h>
 #include <TextControl.h>
 #include <TextView.h>
 #include <TranslationUtils.h>
 
 using namespace BPrivate;
 
+
 const float kLineViewWidth = 30.0;
 
+
 StyledEditWindow::StyledEditWindow(BRect frame, int32 id, uint32 encoding)
 	: BWindow(frame, "untitled", B_DOCUMENT_WINDOW, B_ASYNCHRONOUS_CONTROLS)
 {
@@ -120,15 +120,6 @@
 	AddChild(fScrollView);
 	fTextView->MakeFocus(true);
 	
-	BScrollBar* HScrollBar = fScrollView->ScrollBar(B_HORIZONTAL);
-	HScrollBar->MoveBy(kLineViewWidth + 1, 0);
-	HScrollBar->ResizeBy((-1 * kLineViewWidth) - 1, 0);
-	
-	fStringView = new BStringView(BRect(0,0,kLineViewWidth,B_H_SCROLL_BAR_HEIGHT), "stringview", "1", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
-	fStringView->SetAlignment(B_ALIGN_CENTER);
-	fScrollView->AddChild(fStringView);
-	fStringView->MoveTo(0.0, HScrollBar->Frame().top);
-	
 	// Add "File"-menu:
 	BMenu* menu = new BMenu("File");
 	fMenuBar->AddItem(menu);
@@ -542,11 +533,6 @@
 			fCopyItem->SetEnabled(false);
 			fClearItem->SetEnabled(false);
 			break;
-		case UPDATE_LINE:
-			char buf[20];
-			sprintf(buf, "%ld", fTextView->CurrentLine() + 1);
-			fStringView->SetText(buf);
-			break;	
 		case TEXT_CHANGED:
 			if (fUndoFlag) {
 				if (fUndoCleans) {

Modified: haiku/trunk/src/apps/stylededit/StyledEditWindow.h
===================================================================
--- haiku/trunk/src/apps/stylededit/StyledEditWindow.h	2009-04-07 18:47:49 UTC (rev 30005)
+++ haiku/trunk/src/apps/stylededit/StyledEditWindow.h	2009-04-07 19:50:03 UTC (rev 30006)
@@ -23,7 +23,6 @@
 class BMenuItem;
 class BFilePanel;
 class BScrollView;
-class BStringView;
 class StyledEditView;
 
 
@@ -116,7 +115,6 @@
 
 		StyledEditView	*fTextView;
 		BScrollView		*fScrollView;
-		BStringView		*fStringView;
 
 		BFilePanel		*fSavePanel;
 		BMenu			*fSavePanelEncodingMenu;



From mmu_man at mail.berlios.de  Tue Apr  7 21:52:23 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Tue, 7 Apr 2009 21:52:23 +0200
Subject: [Haiku-commits] r30007 -
	haiku/trunk/src/preferences/mail/ProviderInfo
Message-ID: <200904071952.n37JqN7M007605@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-07 21:52:23 +0200 (Tue, 07 Apr 2009)
New Revision: 30007
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30007&view=rev

Added:
   haiku/trunk/src/preferences/mail/ProviderInfo/free.fr.rdef
   haiku/trunk/src/preferences/mail/ProviderInfo/laposte.net.rdef
Modified:
   haiku/trunk/src/preferences/mail/ProviderInfo/Jamfile
Log:
Add descriptions for my email providers.


Modified: haiku/trunk/src/preferences/mail/ProviderInfo/Jamfile
===================================================================
--- haiku/trunk/src/preferences/mail/ProviderInfo/Jamfile	2009-04-07 19:50:03 UTC (rev 30006)
+++ haiku/trunk/src/preferences/mail/ProviderInfo/Jamfile	2009-04-07 19:52:23 UTC (rev 30007)
@@ -6,9 +6,11 @@
 	aol.com
 	arcor.de
 	cern.ch
+	free.fr
 	freenet.de
 	gmx.de
 	googlemail.com
+	laposte.net
 	lycos.de
 	mymail.ch
 	netcologne.de

Added: haiku/trunk/src/preferences/mail/ProviderInfo/free.fr.rdef
===================================================================
--- haiku/trunk/src/preferences/mail/ProviderInfo/free.fr.rdef	2009-04-07 19:50:03 UTC (rev 30006)
+++ haiku/trunk/src/preferences/mail/ProviderInfo/free.fr.rdef	2009-04-07 19:52:23 UTC (rev 30007)
@@ -0,0 +1,9 @@
+resource(1, "POP Server") "pop.free.fr";
+resource(2, "IMAP Server") "imap.free.fr";
+resource(3, "SMTP Server") "smtp.free.fr";
+resource(4, "POP Authentification") 1;
+resource(5, "SMTP Authentification") 1;
+resource(6, "POP SSL") 0;
+resource(7, "IMAP SSL") 0;
+resource(8, "SMTP SSL") 0;
+resource(9, "Username Pattern") 1;

Added: haiku/trunk/src/preferences/mail/ProviderInfo/laposte.net.rdef
===================================================================
--- haiku/trunk/src/preferences/mail/ProviderInfo/laposte.net.rdef	2009-04-07 19:50:03 UTC (rev 30006)
+++ haiku/trunk/src/preferences/mail/ProviderInfo/laposte.net.rdef	2009-04-07 19:52:23 UTC (rev 30007)
@@ -0,0 +1,9 @@
+resource(1, "POP Server") "pop.laposte.net";
+resource(2, "IMAP Server") "imap.laposte.net";
+resource(3, "SMTP Server") "smtp.laposte.net";
+resource(4, "POP Authentification") 0;
+resource(5, "SMTP Authentification") 1;
+resource(6, "POP SSL") 0;
+resource(7, "IMAP SSL") 0;
+resource(8, "SMTP SSL") 0;
+resource(9, "Username Pattern") 1;



From rossi at webpositive.org  Tue Apr  7 21:45:31 2009
From: rossi at webpositive.org (Marcus Jacob)
Date: Tue, 7 Apr 2009 21:45:31 +0200
Subject: [Haiku-commits] r30000 - in haiku/trunk: headers/private/net
	src/add-ons/kernel/network/protocols/tcp
	src/add-ons/kernel/network/stack
In-Reply-To: <200904071607.n37G7Lll003886@sheep.berlios.de>
References: <200904071607.n37G7Lll003886@sheep.berlios.de>
Message-ID: <5198241A-51BC-4F6B-AC2C-C77FE4B85299@webpositive.org>

Sorry for top posting! One of the recent changes broke dhcp. Will file  
a bug report once I can access the net from a non mobile browser.

Rossi

--
Marcus Jacob

- via e-mail push -


On 07.04.2009, at 18:07, axeld at mail.berlios.de wrote:

> Author: axeld
> Date: 2009-04-07 18:07:15 +0200 (Tue, 07 Apr 2009)
> New Revision: 30000
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30000&view=rev
>
> Modified:
>   haiku/trunk/headers/private/net/net_socket.h
>   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/ 
> EndpointManager.cpp
>   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
>   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.h
>   haiku/trunk/src/add-ons/kernel/network/protocols/tcp/tcp.cpp
>   haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
>   haiku/trunk/src/add-ons/kernel/network/stack/stack_interface.cpp
> Log:
> * Sockets now inherit from WeakReferenceable.
> * This fixes the problem when a socket changes something with  
> regards to its
>  parent.
>
>
> Modified: haiku/trunk/headers/private/net/net_socket.h
> ===================================================================
> --- haiku/trunk/headers/private/net/net_socket.h    2009-04-07  
> 16:06:30 UTC (rev 29999)
> +++ haiku/trunk/headers/private/net/net_socket.h    2009-04-07  
> 16:07:15 UTC (rev 30000)
> @@ -1,5 +1,5 @@
> /*
> - * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
> + * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
>  * Distributed under the terms of the MIT License.
>  */
> #ifndef NET_SOCKET_H
> @@ -38,7 +38,6 @@
>    }                        send, receive;
>
>    status_t                error;
> -    struct net_socket        *parent;
> } net_socket;
>
> struct net_socket_module_info {
> @@ -47,7 +46,7 @@
>    status_t    (*open_socket)(int family, int type, int protocol,
>                    net_socket **_socket);
>    status_t    (*close)(net_socket *socket);
> -    status_t    (*free)(net_socket *socket);
> +    void        (*free)(net_socket *socket);
>
>    status_t    (*readv)(net_socket *socket, const iovec *vecs,
>                    size_t vecCount, size_t *_length);
> @@ -72,13 +71,17 @@
>                    struct net_stat *stat);
>
>    // connections
> +    void        (*acquire_socket)(net_socket *socket);
> +    bool        (*release_socket)(net_socket *socket);
> +
>    status_t    (*spawn_pending_socket)(net_socket *parent,
>                    net_socket **_socket);
> -    void        (*delete_socket)(net_socket *socket);
>    status_t    (*dequeue_connected)(net_socket *parent, net_socket  
> **_socket);
>    ssize_t        (*count_connected)(net_socket *parent);
>    status_t    (*set_max_backlog)(net_socket *socket, uint32 backlog);
> +    bool        (*has_parent)(net_socket *socket);
>    status_t    (*set_connected)(net_socket *socket);
> +    status_t    (*set_aborted)(net_socket *socket);
>
>    // notifications
>    status_t    (*request_notification)(net_socket *socket, uint8  
> event,
>
> Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/ 
> EndpointManager.cpp
> ===================================================================
> --- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/ 
> EndpointManager.cpp    2009-04-07 16:06:30 UTC (rev 29999)
> +++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/ 
> EndpointManager.cpp    2009-04-07 16:07:15 UTC (rev 30000)
> @@ -318,7 +318,9 @@
>
>    TCPEndpoint *endpoint = _LookupConnection(local, peer);
>    if (endpoint != NULL) {
> -        TRACE(("TCP: Received packet corresponds to explicit  
> endpoint %p\n", endpoint));
> +        TRACE(("TCP: Received packet corresponds to explicit  
> endpoint %p\n",
> +            endpoint));
> +        gSocketModule->acquire_socket(endpoint->socket);
>        return endpoint;
>    }
>
> @@ -329,7 +331,9 @@
>
>    endpoint = _LookupConnection(local, *wildcard);
>    if (endpoint != NULL) {
> -        TRACE(("TCP: Received packet corresponds to wildcard  
> endpoint %p\n", endpoint));
> +        TRACE(("TCP: Received packet corresponds to wildcard  
> endpoint %p\n",
> +            endpoint));
> +        gSocketModule->acquire_socket(endpoint->socket);
>        return endpoint;
>    }
>
> @@ -339,7 +343,9 @@
>
>    endpoint = _LookupConnection(*localWildcard, *wildcard);
>    if (endpoint != NULL) {
> -        TRACE(("TCP: Received packet corresponds to local wildcard  
> endpoint %p\n", endpoint));
> +        TRACE(("TCP: Received packet corresponds to local wildcard  
> endpoint "
> +            "%p\n", endpoint));
> +        gSocketModule->acquire_socket(endpoint->socket);
>        return endpoint;
>    }
>
> @@ -564,7 +570,7 @@
> EndpointManager::Dump() const
> {
>    kprintf("-------- TCP Domain %p ---------\n", this);
> -    kprintf("%10s %20s %20s %8s %8s %12s\n", "address", "local",  
> "peer",
> +    kprintf("%10s %21s %21s %8s %8s %12s\n", "address", "local",  
> "peer",
>        "recv-q", "send-q", "state");
>
>    ConnectionTable::Iterator iterator = fConnectionHash.GetIterator();
> @@ -576,7 +582,7 @@
>        endpoint->LocalAddress().AsString(localBuf, sizeof(localBuf),  
> true);
>        endpoint->PeerAddress().AsString(peerBuf, sizeof(peerBuf),  
> true);
>
> -        kprintf("%p %20s %20s %8lu %8lu %12s\n", endpoint,  
> localBuf, peerBuf,
> +        kprintf("%p %21s %21s %8lu %8lu %12s\n", endpoint,  
> localBuf, peerBuf,
>            endpoint->fReceiveQueue.Available(), endpoint- 
> >fSendQueue.Used(),
>            name_for_state(endpoint->State()));
>    }
>
> Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/ 
> TCPEndpoint.cpp
> ===================================================================
> --- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/ 
> TCPEndpoint.cpp    2009-04-07 16:06:30 UTC (rev 29999)
> +++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/ 
> TCPEndpoint.cpp    2009-04-07 16:07:15 UTC (rev 30000)
> @@ -554,7 +554,7 @@
> }
>
>
> -status_t
> +void
> TCPEndpoint::Free()
> {
>    TRACE("Free()");
> @@ -562,17 +562,16 @@
>    MutexLocker _(fLock);
>
>    if (fState <= SYNCHRONIZE_SENT)
> -        return B_OK;
> +        return;
>
>    // we are only interested in the timer, not in changing state
>    _EnterTimeWait();
>
>    fFlags |= FLAG_CLOSED;
> -    if ((fFlags & FLAG_DELETE_ON_CLOSE) != 0)
> -        return B_OK;
> -
> -    return B_BUSY;
> +    if ((fFlags & FLAG_DELETE_ON_CLOSE) == 0) {
>        // we'll be freed later when the 2MSL timer expires
> +        gSocketModule->acquire_socket(socket);
> +    }
> }
>
>
> @@ -1169,7 +1168,7 @@
>    fState = ESTABLISHED;
>    T(State(this));
>
> -    if (socket->parent != NULL) {
> +    if (gSocketModule->has_parent(socket)) {
>        gSocketModule->set_connected(socket);
>        release_sem_etc(fAcceptSemaphore, 1, B_DO_NOT_RESCHEDULE);
>    }
> @@ -1211,13 +1210,11 @@
>    fSendList.Signal();
>    _NotifyReader();
>
> -    if (socket->parent != NULL) {
> +    if (gSocketModule->has_parent(socket)) {
>        // We still have a parent - obviously, we haven't been  
> accepted yet,
>        // so no one could ever close us.
> -        // Since we can't just delete ourself here, we trigger an  
> immediate
> -        // time-wait timer.
>        _CancelConnectionTimers();
> -        gStackModule->set_timer(&fTimeWaitTimer, 0);
> +        gSocketModule->set_aborted(socket);
>    }
> }
>
> @@ -1792,8 +1789,7 @@
>    if ((fFlags & (FLAG_CLOSED | FLAG_DELETE_ON_CLOSE))
>            == (FLAG_CLOSED | FLAG_DELETE_ON_CLOSE)) {
>        locker.Unlock();
> -        gSocketModule->delete_socket(socket);
> -            // this will also delete us
> +        gSocketModule->release_socket(socket);
>    }
>
>    return segmentAction;
> @@ -2293,7 +2289,7 @@
>
>    locker.Unlock();
>
> -    gSocketModule->delete_socket(endpoint->socket);
> +    gSocketModule->release_socket(endpoint->socket);
> }
>
>
>
> Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/ 
> TCPEndpoint.h
> ===================================================================
> --- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/ 
> TCPEndpoint.h    2009-04-07 16:06:30 UTC (rev 29999)
> +++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/ 
> TCPEndpoint.h    2009-04-07 16:07:15 UTC (rev 30000)
> @@ -50,7 +50,7 @@
>
>            status_t    Open();
>            status_t    Close();
> -            status_t    Free();
> +            void        Free();
>            status_t    Connect(const struct sockaddr* address);
>            status_t    Accept(struct net_socket** _acceptedSocket);
>            status_t    Bind(const sockaddr* address);
>
> Modified: haiku/trunk/src/add-ons/kernel/network/protocols/tcp/tcp.cpp
> ===================================================================
> --- haiku/trunk/src/add-ons/kernel/network/protocols/tcp/tcp.cpp     
> 2009-04-07 16:06:30 UTC (rev 29999)
> +++ haiku/trunk/src/add-ons/kernel/network/protocols/tcp/tcp.cpp     
> 2009-04-07 16:07:15 UTC (rev 30000)
> @@ -496,7 +496,8 @@
> status_t
> tcp_free(net_protocol* protocol)
> {
> -    return ((TCPEndpoint*)protocol)->Free();
> +    ((TCPEndpoint*)protocol)->Free();
> +    return B_OK;
> }
>
>
> @@ -708,9 +709,10 @@
>
>    TCPEndpoint* endpoint = endpointManager->FindConnection(
>        buffer->destination, buffer->source);
> -    if (endpoint != NULL)
> +    if (endpoint != NULL) {
>        segmentAction = endpoint->SegmentReceived(segment, buffer);
> -    else if ((segment.flags & TCP_FLAG_RESET) == 0)
> +        gSocketModule->release_socket(endpoint->socket);
> +    } else if ((segment.flags & TCP_FLAG_RESET) == 0)
>        segmentAction = DROP | RESET;
>
>    if ((segmentAction & RESET) != 0) {
>
> Modified: haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
> ===================================================================
> --- haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp     
> 2009-04-07 16:06:30 UTC (rev 29999)
> +++ haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp     
> 2009-04-07 16:07:15 UTC (rev 30000)
> @@ -16,13 +16,15 @@
>
> #include <new>
>
> -#include <AutoDeleter.h>
> #include <Drivers.h>
> #include <KernelExport.h>
> #include <Select.h>
> +
> +#include <AutoDeleter.h>
> #include <team.h>
> #include <util/AutoLock.h>
> #include <util/list.h>
> +#include <WeakReferenceable.h>
>
> #include <fs/select_sync_pool.h>
> #include <kernel.h>
> @@ -41,8 +43,15 @@
> struct net_socket_private;
> typedef DoublyLinkedList<net_socket_private> SocketList;
>
> -struct net_socket_private
> -        : net_socket, DoublyLinkedListLinkImpl<net_socket_private> {
> +struct net_socket_private : net_socket,
> +        DoublyLinkedListLinkImpl<net_socket_private>,
> +        WeakReferenceable<net_socket_private> {
> +    net_socket_private();
> +    ~net_socket_private();
> +
> +    void RemoveFromParent();
> +
> +    WeakPointer<net_socket_private>* parent;
>    team_id                        owner;
>    uint32                        max_backlog;
>    uint32                        child_count;
> @@ -56,7 +65,6 @@
> };
>
>
> -void socket_delete(net_socket* socket);
> int socket_bind(net_socket* socket, const struct sockaddr* address,
>    socklen_t addressLength);
> int socket_setsockopt(net_socket* socket, int level, int option,
> @@ -67,6 +75,80 @@
> static mutex sSocketLock;
>
>
> +net_socket_private::net_socket_private()
> +    : WeakReferenceable<net_socket_private>(this),
> +    parent(NULL),
> +    owner(-1),
> +    max_backlog(0),
> +    child_count(0),
> +    select_pool(NULL),
> +    is_connected(false)
> +{
> +    first_protocol = NULL;
> +    first_info = NULL;
> +    options = 0;
> +    linger = 0;
> +    bound_to_device = 0;
> +    error = 0;
> +
> +    address.ss_len = 0;
> +    peer.ss_len = 0;
> +
> +    mutex_init(&lock, "socket");
> +
> +    // set defaults (may be overridden by the protocols)
> +    send.buffer_size = 65535;
> +    send.low_water_mark = 1;
> +    send.timeout = B_INFINITE_TIMEOUT;
> +    receive.buffer_size = 65535;
> +    receive.low_water_mark = 1;
> +    receive.timeout = B_INFINITE_TIMEOUT;
> +}
> +
> +
> +net_socket_private::~net_socket_private()
> +{
> +    if (parent != NULL)
> +        panic("socket still has a parent!");
> +
> +    mutex_lock(&sSocketLock);
> +    sSocketList.Remove(this);
> +    mutex_unlock(&sSocketLock);
> +
> +    mutex_lock(&lock);
> +
> +    // also delete all children of this socket
> +    while (net_socket_private* child =  
> pending_children.RemoveHead()) {
> +        child->RemoveFromParent();
> +    }
> +    while (net_socket_private* child =  
> connected_children.RemoveHead()) {
> +        child->RemoveFromParent();
> +    }
> +
> +    put_domain_protocols(this);
> +
> +    mutex_unlock(&lock);
> +    mutex_destroy(&lock);
> +}
> +
> +
> +void
> +net_socket_private::RemoveFromParent()
> +{
> +    parent->RemoveReference();
> +    parent = NULL;
> +
> +    mutex_lock(&sSocketLock);
> +    sSocketList.Add(this);
> +    mutex_unlock(&sSocketLock);
> +
> +    RemoveReference();
> +}
> +
> +
> +//    #pragma mark -
> +
> +
> static size_t
> compute_user_iovec_length(iovec* userVec, uint32 count)
> {
> @@ -84,16 +166,6 @@
> }
>
>
> -static void
> -delete_children(SocketList& list)
> -{
> -    while (net_socket_private* child = list.RemoveHead()) {
> -        child->parent = NULL;
> -        socket_delete(child);
> -    }
> -}
> -
> -
> static status_t
> create_socket(int family, int type, int protocol,  
> net_socket_private** _socket)
> {
> @@ -101,21 +173,10 @@
>    if (socket == NULL)
>        return B_NO_MEMORY;
>
> -    memset(socket, 0, sizeof(net_socket_private));
>    socket->family = family;
>    socket->type = type;
>    socket->protocol = protocol;
>
> -    mutex_init(&socket->lock, "socket");
> -
> -    // set defaults (may be overridden by the protocols)
> -    socket->send.buffer_size = 65535;
> -    socket->send.low_water_mark = 1;
> -    socket->send.timeout = B_INFINITE_TIMEOUT;
> -    socket->receive.buffer_size = 65535;
> -    socket->receive.low_water_mark = 1;
> -    socket->receive.timeout = B_INFINITE_TIMEOUT;
> -
>    status_t status = get_domain_protocols(socket);
>    if (status < B_OK) {
>        mutex_destroy(&socket->lock);
> @@ -316,7 +377,7 @@
>
>    status = socket->first_info->open(socket->first_protocol);
>    if (status < B_OK) {
> -        socket_delete(socket);
> +        delete socket;
>        return status;
>    }
>
> @@ -339,15 +400,12 @@
> }
>
>
> -status_t
> -socket_free(net_socket* socket)
> +void
> +socket_free(net_socket* _socket)
> {
> -    status_t status = socket->first_info->free(socket- 
> >first_protocol);
> -    if (status == B_BUSY)
> -        return B_OK;
> -
> -    socket_delete(socket);
> -    return B_OK;
> +    net_socket_private* socket = (net_socket_private*)_socket;
> +    socket->first_info->free(socket->first_protocol);
> +    socket->RemoveReference();
> }
>
>
> @@ -532,6 +590,22 @@
> //    #pragma mark - connections
>
>
> +void
> +socket_acquire(net_socket* _socket)
> +{
> +    net_socket_private* socket = (net_socket_private*)_socket;
> +    socket->AddReference();
> +}
> +
> +
> +bool
> +socket_release(net_socket* _socket)
> +{
> +    net_socket_private* socket = (net_socket_private*)_socket;
> +    return socket->RemoveReference();
> +}
> +
> +
> status_t
> socket_spawn_pending(net_socket* _parent, net_socket** _socket)
> {
> @@ -562,7 +636,7 @@
>
>    // add to the parent's list of pending connections
>    parent->pending_children.Add(socket);
> -    socket->parent = parent;
> +    socket->parent = parent->GetWeakPointer();
>    parent->child_count++;
>
>    *_socket = socket;
> @@ -570,42 +644,9 @@
> }
>
>
> -void
> -socket_delete(net_socket* _socket)
> -{
> -    net_socket_private* socket = (net_socket_private*)_socket;
> -    net_socket_private* parent = (net_socket_private*)socket->parent;
> -
> -    if (parent != NULL) {
> -        // The socket still has a parent
> -        // TODO: we need to make sure our parent isn't deleted  
> right now,
> -        //   or in the process of deleting its children...
> -        MutexLocker _(parent->lock);
> -
> -        if (socket->is_connected)
> -            parent->connected_children.Remove(socket);
> -        else
> -            parent->pending_children.Remove(socket);
> -
> -        parent->child_count--;
> -        socket->parent = NULL;
> -    }
> -
> -    mutex_lock(&sSocketLock);
> -    sSocketList.Remove(socket);
> -    mutex_unlock(&sSocketLock);
> -
> -    // also delete all children of this socket
> -    delete_children(socket->pending_children);
> -    delete_children(socket->connected_children);
> -
> -    put_domain_protocols(socket);
> -
> -    mutex_destroy(&socket->lock);
> -    delete socket;
> -}
> -
> -
> +/*!    Dequeues a connected child from a parent socket.
> +    It also returns a reference with the child socket.
> +*/
> status_t
> socket_dequeue_connected(net_socket* _parent, net_socket** _socket)
> {
> @@ -615,7 +656,8 @@
>
>    net_socket_private* socket = parent- 
> >connected_children.RemoveHead();
>    if (socket != NULL) {
> -        socket->parent = NULL;
> +        socket->AddReference();
> +        socket->RemoveFromParent();
>        parent->child_count--;
>        *_socket = socket;
>    }
> @@ -625,10 +667,6 @@
>    if (socket == NULL)
>        return B_ENTRY_NOT_FOUND;
>
> -    mutex_lock(&sSocketLock);
> -    sSocketList.Add(socket);
> -    mutex_unlock(&sSocketLock);
> -
>    return B_OK;
> }
>
> @@ -659,13 +697,12 @@
>    net_socket_private* child;
>    while (socket->child_count > backlog
>        && (child = socket->pending_children.RemoveTail()) != NULL) {
> -        child->parent = NULL;
> +        child->RemoveFromParent();
>        socket->child_count--;
>    }
>    while (socket->child_count > backlog
>        && (child = socket->connected_children.RemoveTail()) != NULL) {
> -        child->parent = NULL;
> -        socket_delete(child);
> +        child->RemoveFromParent();
>        socket->child_count--;
>    }
>
> @@ -674,21 +711,34 @@
> }
>
>
> +/*!    Returns whether or not this socket has a parent. The parent  
> might not be
> +    valid anymore, though.
> +*/
> +bool
> +socket_has_parent(net_socket* _socket)
> +{
> +    net_socket_private* socket = (net_socket_private*)_socket;
> +    return socket->parent != NULL;
> +}
> +
> +
> /*!    The socket has been connected. It will be moved to the  
> connected queue
>    of its parent socket.
> */
> status_t
> -socket_connected(net_socket* socket)
> +socket_connected(net_socket* _socket)
> {
> -    net_socket_private* parent = (net_socket_private*)socket->parent;
> +    net_socket_private* socket = (net_socket_private*)_socket;
> +
> +    WeakReference<net_socket_private> parent = socket->parent;
>    if (parent == NULL)
>        return B_BAD_VALUE;
>
> -    MutexLocker _(&parent->lock);
> +    MutexLocker _(parent->lock);
>
> -    parent->pending_children.Remove((net_socket_private*)socket);
> -    parent->connected_children.Add((net_socket_private*)socket);
> -    ((net_socket_private*)socket)->is_connected = true;
> +    parent->pending_children.Remove(socket);
> +    parent->connected_children.Add(socket);
> +    socket->is_connected = true;
>
>    // notify parent
>    if (parent->select_pool)
> @@ -698,6 +748,32 @@
> }
>
>
> +/*!    The socket has been aborted. Steals the parent's reference,  
> and releases
> +    it.
> +*/
> +status_t
> +socket_aborted(net_socket* _socket)
> +{
> +    net_socket_private* socket = (net_socket_private*)_socket;
> +
> +    WeakReference<net_socket_private> parent = socket->parent;
> +    if (parent == NULL)
> +        return B_BAD_VALUE;
> +
> +    MutexLocker _(parent->lock);
> +
> +    if (socket->is_connected)
> +        parent->connected_children.Remove(socket);
> +    else
> +        parent->pending_children.Remove(socket);
> +
> +    parent->child_count--;
> +    socket->RemoveFromParent();
> +
> +    return B_OK;
> +}
> +
> +
> //    #pragma mark - notifications
>
>
> @@ -1551,12 +1627,15 @@
>    socket_get_next_stat,
>
>    // connections
> +    socket_acquire,
> +    socket_release,
>    socket_spawn_pending,
> -    socket_delete,
>    socket_dequeue_connected,
>    socket_count_connected,
>    socket_set_max_backlog,
> +    socket_has_parent,
>    socket_connected,
> +    socket_aborted,
>
>    // notifications
>    socket_request_notification,
>
> Modified: haiku/trunk/src/add-ons/kernel/network/stack/ 
> stack_interface.cpp
> ===================================================================
> --- haiku/trunk/src/add-ons/kernel/network/stack/ 
> stack_interface.cpp    2009-04-07 16:06:30 UTC (rev 29999)
> +++ haiku/trunk/src/add-ons/kernel/network/stack/ 
> stack_interface.cpp    2009-04-07 16:07:15 UTC (rev 30000)
> @@ -27,7 +27,8 @@
> static status_t
> stack_interface_free(net_socket* socket)
> {
> -    return gNetSocketModule.free(socket);
> +    gNetSocketModule.free(socket);
> +    return B_OK;
> }
>
>
>
> _______________________________________________
> Haiku-commits mailing list
> Haiku-commits at lists.berlios.de
> https://lists.berlios.de/mailman/listinfo/haiku-commits
> etwork/stack/stack_interface.cpp
> ===================================================================
> --- haiku/trunk/src/add-ons/kernel/network/stack/ 
> stack_interface.cpp    2009-04-07 16:06:30 UTC (rev 29999)
> +++ haiku/trunk/src/add-ons/kernel/network/stack/ 
> stack_interface.cpp    2009-04-07 16:07:15 UTC (rev 30000)
> @@ -27,7 +27,8 @@
> static status_t
> stack_interface_free(net_socket* socket)
> {
> -    return gNetSocketModule.free(socket);
> +    gNetSocketModule.free(socket);
> +    return B_OK;
> }
>
>
>
> _______________________________________________
> Haiku-commits mailing list
> Haiku-commits at lists.berlios.de
> https://lists.berlios.de/mailman/listinfo/haiku-commits
> nfo/haiku-commits


From mmu_man at mail.berlios.de  Tue Apr  7 22:51:09 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Tue, 7 Apr 2009 22:51:09 +0200
Subject: [Haiku-commits] r30008 -
	haiku/trunk/src/add-ons/kernel/network/stack
Message-ID: <200904072051.n37Kp9DV018267@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-07 22:51:01 +0200 (Tue, 07 Apr 2009)
New Revision: 30008
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30008&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
Log:
This fixed gcc4 build (overloaded == operator...) though I'm not sure it's what was meant. Please check.


Modified: haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-07 19:52:23 UTC (rev 30007)
+++ haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-07 20:51:01 UTC (rev 30008)
@@ -732,7 +732,7 @@
 	net_socket_private* socket = (net_socket_private*)_socket;
 
 	WeakReference<net_socket_private> parent = socket->parent;
-	if (parent == NULL)
+	if (socket->parent == NULL)
 		return B_BAD_VALUE;
 
 	MutexLocker _(parent->lock);
@@ -758,7 +758,7 @@
 	net_socket_private* socket = (net_socket_private*)_socket;
 
 	WeakReference<net_socket_private> parent = socket->parent;
-	if (parent == NULL)
+	if (socket->parent == NULL)
 		return B_BAD_VALUE;
 
 	MutexLocker _(parent->lock);



From stippi at mail.berlios.de  Tue Apr  7 23:09:13 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Tue, 7 Apr 2009 23:09:13 +0200
Subject: [Haiku-commits] r30009 - haiku/trunk/src/kits/tracker
Message-ID: <200904072109.n37L9DA6020858@sheep.berlios.de>

Author: stippi
Date: 2009-04-07 23:09:10 +0200 (Tue, 07 Apr 2009)
New Revision: 30009
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30009&view=rev

Modified:
   haiku/trunk/src/kits/tracker/DeskWindow.cpp
   haiku/trunk/src/kits/tracker/Pose.cpp
   haiku/trunk/src/kits/tracker/Pose.h
   haiku/trunk/src/kits/tracker/PoseView.cpp
   haiku/trunk/src/kits/tracker/PoseView.h
Log:
* Fix the completely broken desktop icon size changing which I introduced
  yesterday. It needs to auto-place icons which go out of view or underneath
  the deskbar or a replicant. Also it obviously cannot scroll to keep the
  view "centered" as normal Tracker windows.
* Fix/improve the desktop context menu with regards to icon size options. It
  also displays the shortcuts, which now work on the desktop too.
* When doing an icon cleanup on the desktop, not only the deskbar is avoided,
  but also replicant views.


Modified: haiku/trunk/src/kits/tracker/DeskWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/DeskWindow.cpp	2009-04-07 20:51:01 UTC (rev 30008)
+++ haiku/trunk/src/kits/tracker/DeskWindow.cpp	2009-04-07 21:09:10 UTC (rev 30009)
@@ -77,6 +77,21 @@
 		fTrashContextMenu(0),
 		fShouldUpdateAddonShortcuts(true)
 {
+	// Add icon view switching shortcuts. These are displayed in the context
+	// menu, although they obviously don't work from those menu items.
+	BMessage* message = new BMessage(kIconMode);
+	AddShortcut('1', B_COMMAND_KEY, message, PoseView());
+
+	message = new BMessage(kMiniIconMode);
+	AddShortcut('2', B_COMMAND_KEY, message, PoseView());
+
+	message = new BMessage(kIconMode);
+	message->AddInt32("scale", 1);
+	AddShortcut('+', B_COMMAND_KEY, message, PoseView());
+
+	message = new BMessage(kIconMode);
+	message->AddInt32("scale", 0);
+	AddShortcut('-', B_COMMAND_KEY, message, PoseView());
 }
 
 
@@ -266,7 +281,7 @@
 
 	BMessage* message = new BMessage(kIconMode);
 	message->AddInt32("size", 32);
-	BMenuItem* item = new BMenuItem("32 x 32", message, '1');
+	BMenuItem* item = new BMenuItem("32 x 32", message);
 	item->SetMarked(PoseView()->IconSizeInt() == 32);
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
@@ -292,9 +307,28 @@
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
+	iconSizeMenu->AddSeparatorItem();
+
+	message = new BMessage(kIconMode);
+	message->AddInt32("scale", 0);
+	item = new BMenuItem("Decrease Size", message, '-');
+	item->SetTarget(PoseView());
+	iconSizeMenu->AddItem(item);
+
+	message = new BMessage(kIconMode);
+	message->AddInt32("scale", 1);
+	item = new BMenuItem("Increase Size", message, '+');
+	item->SetTarget(PoseView());
+	iconSizeMenu->AddItem(item);
+
+	// A sub menu where the super item can be invoked.
 	menu->AddItem(iconSizeMenu);
+	iconSizeMenu->Superitem()->SetShortcut('1', B_COMMAND_KEY);
+	iconSizeMenu->Superitem()->SetMessage(new BMessage(kIconMode));
+	iconSizeMenu->Superitem()->SetTarget(PoseView());
+	iconSizeMenu->Superitem()->SetMarked(PoseView()->ViewMode() == kIconMode);
 
-	item = new BMenuItem("Mini Icon View", new BMessage(kMiniIconMode));
+	item = new BMenuItem("Mini Icon View", new BMessage(kMiniIconMode), '2');
 	item->SetMarked(PoseView()->ViewMode() == kMiniIconMode);
 	menu->AddItem(item);
 

Modified: haiku/trunk/src/kits/tracker/Pose.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/Pose.cpp	2009-04-07 20:51:01 UTC (rev 30008)
+++ haiku/trunk/src/kits/tracker/Pose.cpp	2009-04-07 21:09:10 UTC (rev 30009)
@@ -891,7 +891,7 @@
 
 
 BRect
-BPose::CalcRect(BPoint loc, const BPoseView *poseView, bool minimalRect)
+BPose::CalcRect(BPoint loc, const BPoseView *poseView, bool minimalRect) const
 {
 	ASSERT(poseView->ViewMode() == kListMode);
 
@@ -913,7 +913,7 @@
 
 
 BRect
-BPose::CalcRect(const BPoseView *poseView)
+BPose::CalcRect(const BPoseView *poseView) const
 {
 	ASSERT(poseView->ViewMode() != kListMode);
 

Modified: haiku/trunk/src/kits/tracker/Pose.h
===================================================================
--- haiku/trunk/src/kits/tracker/Pose.h	2009-04-07 20:51:01 UTC (rev 30008)
+++ haiku/trunk/src/kits/tracker/Pose.h	2009-04-07 21:09:10 UTC (rev 30009)
@@ -91,8 +91,9 @@
 		bool PointInPose(BPoint poseLoc, const BPoseView *, BPoint where,
 				BTextWidget ** = NULL) const;
 		bool PointInPose(const BPoseView *, BPoint where) const ;
-		BRect CalcRect(BPoint loc, const BPoseView *, bool minimal_rect = false);
-		BRect CalcRect(const BPoseView *);
+		BRect CalcRect(BPoint loc, const BPoseView *,
+			bool minimal_rect = false) const;
+		BRect CalcRect(const BPoseView *) const;
 		void UpdateAllWidgets(int32 poseIndex, BPoint poseLoc, BPoseView *);
 		void UpdateWidgetAndModel(Model *resolvedModel, const char *attrName,
 				uint32 attrType, int32 poseIndex, BPoint poseLoc, BPoseView *view);

Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-07 20:51:01 UTC (rev 30008)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-07 21:09:10 UTC (rev 30009)
@@ -2741,9 +2741,11 @@
 
 	fViewState->SetViewMode(newMode);
 
-	// try to lock the center of the pose view when scaling icons
+	// Try to lock the center of the pose view when scaling icons, but not
+	// if we are the desktop.
 	BPoint scaleOffset(0, 0);
-	if (newMode == kIconMode && oldMode == kIconMode) {
+	bool iconSizeChanged = newMode == kIconMode && oldMode == kIconMode;
+	if (!IsDesktopWindow() && iconSizeChanged) {
 		// definitely changing the icon size, so we will need to scroll
 		BRect bounds(Bounds());
 		BPoint center(bounds.LeftTop());
@@ -2795,6 +2797,9 @@
 			|| fViewState->IconSize() != lastIconSize);
 	}
 
+	// check if we need to re-place poses when they are out of view
+	bool checkLocations = IsDesktopWindow() && iconSizeChanged;
+
 	BPoint oldOffset;
 	BPoint oldGrid;
 	if (mapIcons)
@@ -2807,10 +2812,16 @@
 		int32 count = fPoseList->CountItems();
 		for (int32 index = 0; index < count; index++) {
 			BPose *pose = fPoseList->ItemAt(index);
-			if (pose->HasLocation() == false)
+			if (pose->HasLocation() == false) {
 				newPoseList.AddItem(pose);
-			else if (mapIcons)
+			} else if (checkLocations && !IsValidLocation(pose)) {
+				// this icon has a location, but needs to be remapped, because
+				// it is going out of view for example
+				RemoveFromVSList(pose);
+				newPoseList.AddItem(pose);
+			} else if (mapIcons) {
 				MapToNewIconMode(pose, oldGrid, oldOffset);
+			}
 		}
 	}
 
@@ -3216,19 +3227,16 @@
 	// make pose rect a little bigger to ensure space between poses
 	rect.InsetBy(-3, 0);
 
-	BRect deskbarFrame;
-	bool checkDeskbarFrame = false;
-	if (IsDesktopWindow() && GetDeskbarFrame(&deskbarFrame) == B_OK) {
-		checkDeskbarFrame = true;
-		deskbarFrame.InsetBy(-10, -10);
-	}
+	bool checkValidLocation = IsDesktopWindow();
 
 	// find an empty slot to put pose into
-	if (fVSPoseList->CountItems() > 0)
+	if (fVSPoseList->CountItems() > 0) {
 		while (SlotOccupied(rect, viewBounds)
-			// avoid Deskbar
-			|| (checkDeskbarFrame && deskbarFrame.Intersects(rect)))
+			// check good location on the desktop
+			|| (checkValidLocation && !IsValidLocation(rect))) {
 			NextSlot(pose, rect, viewBounds);
+		}
+	}
 
 	rect.InsetBy(3, 0);
 
@@ -3239,6 +3247,49 @@
 }
 
 
+bool
+BPoseView::IsValidLocation(const BPose *pose)
+{
+	if (!IsDesktopWindow())
+		return true;
+
+	BRect rect(pose->CalcRect(this));
+	rect.InsetBy(-3, 0);
+	return IsValidLocation(rect);
+}
+
+
+bool
+BPoseView::IsValidLocation(const BRect& rect)
+{
+	if (!IsDesktopWindow())
+		return true;
+
+	// on the desktop, don't allow icons outside of the view bounds
+	if (!Bounds().Contains(rect))
+		return false;
+
+	// also check the deskbar frame
+	BRect deskbarFrame;
+	if (GetDeskbarFrame(&deskbarFrame) == B_OK) {
+		deskbarFrame.InsetBy(-10, -10);
+		if (deskbarFrame.Intersects(rect))
+			return false;
+	}
+
+	// check replicants
+	for (int32 i = 0; BView* child = ChildAt(i); i++) {
+		BRect childFrame = child->Frame();
+		childFrame.InsetBy(-5, -5);
+		if (childFrame.Intersects(rect))
+			return false;
+	}
+
+	// location is ok
+	return true;
+}
+
+
 status_t
 BPoseView::GetDeskbarFrame(BRect* frame)
 {

Modified: haiku/trunk/src/kits/tracker/PoseView.h
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.h	2009-04-07 20:51:01 UTC (rev 30008)
+++ haiku/trunk/src/kits/tracker/PoseView.h	2009-04-07 21:09:10 UTC (rev 30009)
@@ -479,6 +479,8 @@
 			// find poses that need placing and place them in a new spot
 		void PlacePose(BPose *, BRect &);
 			// find a new place for a pose, starting at fHintLocation and place it
+		bool IsValidLocation(const BPose *pose);
+		bool IsValidLocation(const BRect& rect);
 		status_t GetDeskbarFrame(BRect* frame);
 		bool SlotOccupied(BRect poseRect, BRect viewBounds) const;
 		void NextSlot(BPose *, BRect &poseRect, BRect viewBounds);



From superstippi at gmx.de  Fri Apr 10 00:14:56 2009
From: superstippi at gmx.de (=?utf-8?q?Stephan_A=C3=9Fmus?=)
Date: Thu, 09 Apr 2009 22:14:56 +0000
Subject: [Haiku-commits] r30008 -
 haiku/trunk/src/add-ons/kernel/network/stack
In-Reply-To: <200904072051.n37Kp9DV018267@sheep.berlios.de>
References: <200904072051.n37Kp9DV018267@sheep.berlios.de>
Message-ID: <20090409221456.1668.1@bepc.1239314962.fake>


On 2009-04-09 at 22:09:36 [+0000], mmu_man at BerliOS 
<mmu_man at mail.berlios.de> wrote:
> Author: mmu_man
> Date: 2009-04-07 22:51:01 +0200 (Tue, 07 Apr 2009) New Revision: 30008
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30008&view=rev
> 
> Modified:
>    haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
> Log:
> This fixed gcc4 build (overloaded == operator...) though I'm not sure 
> it's what was meant. Please check.

It is not correct, please revert. I don't know what would be the correct 
fix yet, but your change definitely breaks the GCC2 build (ie maybe not the 
build, but the code semantics).

Best regards,
-Stephan



From axeld at pinc-software.de  Tue Apr  7 23:29:24 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Tue, 07 Apr 2009 23:29:24 +0200
Subject: [Haiku-commits]
 =?utf-8?q?r30008_-_haiku/trunk/src/add-ons/kernel?=
 =?utf-8?q?/network/stack?=
In-Reply-To: <200904072051.n37Kp9DV018267@sheep.berlios.de>
Message-ID: <9745209235-BeMail@quad>

mmu_man at BerliOS wrote:
> Log:
> This fixed gcc4 build (overloaded == operator...) though I'm not sure 
> it's what 
> was meant. Please check.

Obviously not this; please, if you don't understand something, don't 
mess it up, or only propose a patch if you are unsure. This change may 
cause a KDL easily, so please revert.

What exactly is the GCC4 error message?

Bye,
   Axel.



From stippi at mail.berlios.de  Tue Apr  7 23:34:29 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Tue, 7 Apr 2009 23:34:29 +0200
Subject: [Haiku-commits] r30010 - haiku/trunk/src/kits/tracker
Message-ID: <200904072134.n37LYTwF024099@sheep.berlios.de>

Author: stippi
Date: 2009-04-07 23:34:27 +0200 (Tue, 07 Apr 2009)
New Revision: 30010
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30010&view=rev

Modified:
   haiku/trunk/src/kits/tracker/PoseView.cpp
Log:
When changing icon size, pose locations need saving. That's not so nice, but
pose locations are always in view coordinates from the perspective of BPoseView,
even if the unscaled location wouldn't change from the perspective of BPose.
This could be removed when storing and restoring unscaled location. I was just
not sure were all this happens.


Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-07 21:09:10 UTC (rev 30009)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-07 21:34:27 UTC (rev 30010)
@@ -2819,6 +2819,10 @@
 				// it is going out of view for example
 				RemoveFromVSList(pose);
 				newPoseList.AddItem(pose);
+			} else if (iconSizeChanged) {
+				// The pose location is still changed in view coordinates,
+				// so it needs to be changed anyways!
+				pose->SetSaveLocation();
 			} else if (mapIcons) {
 				MapToNewIconMode(pose, oldGrid, oldOffset);
 			}



From revol at free.fr  Tue Apr  7 23:39:31 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Tue, 07 Apr 2009 23:39:31 +0200 CEST
Subject: [Haiku-commits] r30008 -
 haiku/trunk/src/add-ons/kernel/network/stack
In-Reply-To: <20090409221456.1668.1@bepc.1239314962.fake>
Message-ID: <840197176-BeMail@laptop>

> 
> On 2009-04-09 at 22:09:36 [+0000], mmu_man at BerliOS 
> <mmu_man at mail.berlios.de> wrote:
> > Author: mmu_man
> > Date: 2009-04-07 22:51:01 +0200 (Tue, 07 Apr 2009) New Revision: 
> > 30008
> > ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30008&view=rev
> > 
> > Modified:
> >    haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
> > Log:
> > This fixed gcc4 build (overloaded == operator...) though I'm not 
> > sure 
> > it's what was meant. Please check.
> 
> It is not correct, please revert. I don't know what would be the 
> correct 
> fix yet, but your change definitely breaks the GCC2 build (ie maybe 
> not the 
> build, but the code semantics).

Then it doesn't break the _build_ :p

Fran?ois.


From axeld at mail.berlios.de  Tue Apr  7 23:40:58 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Tue, 7 Apr 2009 23:40:58 +0200
Subject: [Haiku-commits] r30011 - haiku/trunk/headers/private/shared
Message-ID: <200904072140.n37Lew2e027615@sheep.berlios.de>

Author: axeld
Date: 2009-04-07 23:40:57 +0200 (Tue, 07 Apr 2009)
New Revision: 30011
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30011&view=rev

Modified:
   haiku/trunk/headers/private/shared/DateTime.h
Log:
* Remove executable bit.



Property changes on: haiku/trunk/headers/private/shared/DateTime.h
___________________________________________________________________
Name: svn:executable
   - *



From revol at free.fr  Tue Apr  7 23:42:31 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Tue, 07 Apr 2009 23:42:31 +0200 CEST
Subject: [Haiku-commits] r30008 -
 haiku/trunk/src/add-ons/kernel/network/stack
In-Reply-To: <9745209235-BeMail@quad>
Message-ID: <1020938103-BeMail@laptop>

> mmu_man at BerliOS wrote:
> > Log:
> > This fixed gcc4 build (overloaded == operator...) though I'm not 
> > sure 
> > it's what 
> > was meant. Please check.
> 
> Obviously not this; please, if you don't understand something, don't 
> mess it up, or only propose a patch if you are unsure. This change 
> may 
> cause a KDL easily, so please revert.
> 
> What exactly is the GCC4 error message?

C++ generated/objects/haiku/x86/release/add-ons/kernel/network/stack/
net_socket.o
src/add-ons/kernel/network/stack/net_socket.cpp: In function 'status_t 
socket_connected(net_socket*)':
src/add-ons/kernel/network/stack/net_socket.cpp:735: error: ambiguous 
overload for 'operator==' in 'parent == 0'
src/add-ons/kernel/network/stack/net_socket.cpp:735: note: candidates 
are: operator==(net_socket_private*, net_socket_private*) <built-in>
headers/private/shared/WeakReferenceable.h:193: note:                 
bool BPrivate::WeakReference<Type>::operator==(const 
BPrivate::WeakReference<Type>&) const [with Type = net_socket_private]
src/add-ons/kernel/network/stack/net_socket.cpp: In function 'status_t 
socket_aborted(net_socket*)':
src/add-ons/kernel/network/stack/net_socket.cpp:761: error: ambiguous 
overload for 'operator==' in 'parent == 0'
src/add-ons/kernel/network/stack/net_socket.cpp:761: note: candidates 
are: operator==(net_socket_private*, net_socket_private*) <built-in>
headers/private/shared/WeakReferenceable.h:193: note:                 
bool BPrivate::WeakReference<Type>::operator==(const 
BPrivate::WeakReference<Type>&) const [with Type = net_socket_private]


From revol at free.fr  Tue Apr  7 23:48:02 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Tue, 07 Apr 2009 23:48:02 +0200 CEST
Subject: [Haiku-commits] r30008 -
 haiku/trunk/src/add-ons/kernel/network/stack
In-Reply-To: <9745209235-BeMail@quad>
Message-ID: <1351604786-BeMail@laptop>

> mmu_man at BerliOS wrote:
> > Log:
> > This fixed gcc4 build (overloaded == operator...) though I'm not 
> > sure 
> > it's what 
> > was meant. Please check.
> 
> Obviously not this; please, if you don't understand something, don't 
> mess it up, or only propose a patch if you are unsure. This change 
> may 

Interestingly, checking for NULL == parent doesn't trigger the error...
I suppose the == operator overload only works one way (or is the other 
one missing ?).

> cause a KDL easily, so please revert.

I'd rather have it fixed right away.

Fran?ois.


From zooey at mail.berlios.de  Wed Apr  8 00:40:56 2009
From: zooey at mail.berlios.de (zooey at mail.berlios.de)
Date: Wed, 8 Apr 2009 00:40:56 +0200
Subject: [Haiku-commits] r30012 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200904072240.n37Meuwt009015@sheep.berlios.de>

Author: zooey
Date: 2009-04-08 00:40:53 +0200 (Wed, 08 Apr 2009)
New Revision: 30012
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30012&view=rev

Modified:
   haiku/trunk/headers/os/interface/TextView.h
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
* implemented wordwise navigation via control + arrow keys
* renamed _FindXXXWordBoundary() methods to _Previous/_NextWordBoundary()
  since the respective per-char methods are named this way
* started to work on improving the behaviour of page-up/page-down

Modified: haiku/trunk/headers/os/interface/TextView.h
===================================================================
--- haiku/trunk/headers/os/interface/TextView.h	2009-04-07 21:40:57 UTC (rev 30011)
+++ haiku/trunk/headers/os/interface/TextView.h	2009-04-07 22:40:53 UTC (rev 30012)
@@ -303,9 +303,6 @@
 									float* outAscent, float* outDescent,
 									float* ioWidth);
 
-			int32				_FindLeftWordBoundary(int32 offset);
-			int32				_FindRightWordBoundary(int32 offset);
-
 			float				_StyledWidth(int32 fromOffset, int32 length,
 									float* outAscent = NULL,
 									float* outDescent = NULL) const;
@@ -327,10 +324,10 @@
 
 			void				_DrawLines(int32 startLine, int32 endLine,
 									int32 startOffset = -1, bool erase = false);
-			void				_RequestDrawLines(int32 startLine, 
-									int32 endLine, int32 startOffset = -1, 
+			void				_RequestDrawLines(int32 startLine,
+									int32 endLine, int32 startOffset = -1,
 									bool erase = false);
-			
+
 			void				_DrawCaret(int32 offset);
 			void				_ShowCaret();
 			void				_HideCaret();
@@ -369,6 +366,9 @@
 			int32				_NextInitialByte(int32 offset) const;
 			int32				_PreviousInitialByte(int32 offset) const;
 
+			int32				_PreviousWordBoundary(int32 offset);
+			int32				_NextWordBoundary(int32 offset);
+
 			bool				_GetProperty(BMessage* specifier, int32 form,
 									const char* property, BMessage* reply);
 			bool				_SetProperty(BMessage* specifier, int32 form,

Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-04-07 21:40:57 UTC (rev 30011)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-04-07 22:40:53 UTC (rev 30012)
@@ -7,6 +7,7 @@
  *		Marc Flerackers (mflerackers at androme.be)
  *		Stefano Ceccherini (stefano.ceccherini at gmail.com)
  *		Stephan A?mus <superstippi at gmx.de>
+ *		Oliver Tappe <zooey at hirschkaefer.de>
  */
 
 /*!	BTextView displays and manages styled text. */
@@ -1923,10 +1924,10 @@
 BTextView::FindWord(int32 inOffset, int32 *outFromOffset, int32 *outToOffset)
 {
 	if (outFromOffset)
-		*outFromOffset = _FindLeftWordBoundary(inOffset);
+		*outFromOffset = _PreviousWordBoundary(inOffset);
 
 	if (outToOffset)
-		*outToOffset = _FindRightWordBoundary(inOffset);
+		*outToOffset = _NextWordBoundary(inOffset);
 }
 
 
@@ -3178,38 +3179,42 @@
 		message->FindInt32("modifiers", &modifiers);
 
 	bool shiftDown = modifiers & B_SHIFT_KEY;
+	bool ctrlDown = modifiers & B_CONTROL_KEY;
 
 	int32 currentOffset = fClickOffset;
 	switch (inArrowKey) {
 		case B_LEFT_ARROW:
-			if (shiftDown) {
-				fClickOffset = _PreviousInitialByte(fClickOffset);
-				if (fClickOffset != currentOffset) {
+			if (fSelStart != fSelEnd && !shiftDown)
+				fClickOffset = fSelStart;
+			else {
+				fClickOffset
+					= ctrlDown
+						? _PreviousWordBoundary(fClickOffset - 1)
+						: _PreviousInitialByte(fClickOffset);
+				if (shiftDown && fClickOffset != currentOffset) {
 					if (fClickOffset >= fSelStart)
 						selEnd = fClickOffset;
 					else
 						selStart = fClickOffset;
 				}
-			} else if (fSelStart != fSelEnd)
-				fClickOffset = fSelStart;
-			else
-				fClickOffset = _PreviousInitialByte(fSelStart);
-
+			}
 			break;
 
 		case B_RIGHT_ARROW:
-			if (shiftDown) {
-				fClickOffset = _NextInitialByte(fClickOffset);
-				if (fClickOffset != currentOffset) {
+			if (fSelStart != fSelEnd && !shiftDown)
+				fClickOffset = fSelEnd;
+			else {
+				fClickOffset
+					= ctrlDown
+						? _NextWordBoundary(fClickOffset)
+						: _NextInitialByte(fClickOffset);
+				if (shiftDown && fClickOffset != currentOffset) {
 					if (fClickOffset <= fSelEnd)
 						selStart = fClickOffset;
 					else
 						selEnd = fClickOffset;
 				}
-			} else if (fSelStart != fSelEnd)
-				fClickOffset = fSelEnd;
-			else
-				fClickOffset = _NextInitialByte(fSelEnd);
+			}
 			break;
 
 		case B_UP_ARROW:
@@ -3392,7 +3397,7 @@
 			BPoint currentPos = PointAt(fClickOffset);
 
 			currentPos.y += Bounds().Height();
-			fClickOffset = OffsetAt(LineAt(currentPos) + 1);
+			fClickOffset = OffsetAt(LineAt(currentPos));
 
 			if (shiftDown) {
 				if (fClickOffset >= fSelEnd) {
@@ -3803,7 +3808,7 @@
 
 
 int32
-BTextView::_FindLeftWordBoundary(int32 offset)
+BTextView::_PreviousWordBoundary(int32 offset)
 {
 	uint32 charType = _CharClassification(offset);
 	int32 previous;
@@ -3819,7 +3824,7 @@
 
 
 int32
-BTextView::_FindRightWordBoundary(int32 offset)
+BTextView::_NextWordBoundary(int32 offset)
 {
 	uint32 charType = _CharClassification(offset);
 	int32 textLen = TextLength();
@@ -4338,17 +4343,17 @@
 		case 2:
 			// double click, extend selection wordwise
 			if (currentOffset <= fTrackingMouse->anchor) {
-				fTrackingMouse->selStart = _FindLeftWordBoundary(currentOffset);
+				fTrackingMouse->selStart = _PreviousWordBoundary(currentOffset);
 				fTrackingMouse->selEnd
 					= fTrackingMouse->shiftDown
 						? fSelEnd
-						: _FindRightWordBoundary(fTrackingMouse->anchor);
+						: _NextWordBoundary(fTrackingMouse->anchor);
 			} else {
 				fTrackingMouse->selStart
 					= fTrackingMouse->shiftDown
 						? fSelStart
-						: _FindLeftWordBoundary(fTrackingMouse->anchor);
-				fTrackingMouse->selEnd = _FindRightWordBoundary(currentOffset);
+						: _PreviousWordBoundary(fTrackingMouse->anchor);
+				fTrackingMouse->selEnd = _NextWordBoundary(currentOffset);
 			}
 			break;
 



From axeld at pinc-software.de  Wed Apr  8 00:44:47 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 08 Apr 2009 00:44:47 +0200
Subject: [Haiku-commits]
 =?utf-8?q?r29888_-_haiku/trunk/src/system/libroot?=
 =?utf-8?q?/posix/unistd?=
In-Reply-To: <f019d2f30904071219x6bd0137fwe5e5e3369fc5ff2@mail.gmail.com>
Message-ID: <14268071663-BeMail@quad>

Rene Gollent wrote:
> On Tue, Apr 7, 2009 at 2:14 PM, Axel D?rfler <axeld at pinc-software.de> 
> wrote:
> > I actually don't forget everything I haven't done yet - it's on my 
> > TODO
> > list, but not on top yet ;-))
> I'm scared to ask how many megabytes your TODO file is at this point 
> ;)

It could be a bit, I stopped counting a loooong time ago :-)

Bye,
   Axel.



From axeld at pinc-software.de  Tue Apr  7 22:50:16 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Tue, 07 Apr 2009 22:50:16
Subject: [Haiku-commits] r30008 -
 haiku/trunk/src/add-ons/kernel/network/stack
In-Reply-To: <1351604786-BeMail@laptop>
Message-ID: <14596586766-BeMail@quad>

Fran?ois Revol wrote:
> > Obviously not this; please, if you don't understand something, 
> > don't 
> > mess it up, or only propose a patch if you are unsure. This change 
> > may 
> Interestingly, checking for NULL == parent doesn't trigger the error.
> ..
> I suppose the == operator overload only works one way (or is the 
> other 
> one missing ?).
> 
> > cause a KDL easily, so please revert.
> I'd rather have it fixed right away.

Well, it would still build for the main platform, and not cause crashes
.
Anyway, a quick fix would be:
	if (parent.Get() == NULL) ...

Still, I would like to know what's going on, at least I can't see how 
that can be ambiguous. Maybe making the * constructors explicit would 
help?

Bye,
   Axel.



From axeld at mail.berlios.de  Wed Apr  8 01:32:07 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 8 Apr 2009 01:32:07 +0200
Subject: [Haiku-commits] r30013 -
	haiku/trunk/src/add-ons/media/media-add-ons/mixer
Message-ID: <200904072332.n37NW7ft029702@sheep.berlios.de>

Author: axeld
Date: 2009-04-08 01:32:00 +0200 (Wed, 08 Apr 2009)
New Revision: 30013
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30013&view=rev

Modified:
   haiku/trunk/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
Log:
* The audio mixer is supposed to support getting/setting only a single value,
  such that all channels are affected.
* This fixes the "setvolume" command under Haiku.


Modified: haiku/trunk/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp	2009-04-07 22:40:53 UTC (rev 30012)
+++ haiku/trunk/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp	2009-04-07 23:32:00 UTC (rev 30013)
@@ -1127,8 +1127,8 @@
 
 
 status_t 
-AudioMixer::GetParameterValue(int32 id, bigtime_t *last_change, 
-							  void *value, size_t *ioSize)
+AudioMixer::GetParameterValue(int32 id, bigtime_t *last_change, void *value,
+	size_t *ioSize)
 {
 	TRACE("GetParameterValue: id 0x%08lx, ioSize %ld\n", id, *ioSize);
 	int param = PARAM(id);
@@ -1196,11 +1196,31 @@
 				static_cast<float *>(value)[0] = GAIN_TO_DB((output->GetOutputChannelGain(0) + output->GetOutputChannelGain(1)) / 2);
 			} else {
 				// multi channel control
-				if (*ioSize < output->GetOutputChannelCount() * sizeof(float))
-					goto err;
-				*ioSize = output->GetOutputChannelCount() * sizeof(float);
-				for (int chan = 0; chan < output->GetOutputChannelCount(); chan++)
-					static_cast<float *>(value)[chan] = GAIN_TO_DB(output->GetOutputChannelGain(chan));
+				if (*ioSize == sizeof(float)) {
+					// get combined gain for all controls
+					float gain = 0;
+					for (int channel = 0;
+							channel < output->GetOutputChannelCount();
+							channel++) {
+						gain += GAIN_TO_DB(
+							output->GetOutputChannelGain(channel));
+					}
+					static_cast<float *>(value)[0] = gain
+						/ output->GetOutputChannelCount();
+				} else {
+					if (*ioSize < output->GetOutputChannelCount()
+							* sizeof(float))
+						goto err;
+
+					*ioSize = output->GetOutputChannelCount() * sizeof(float);
+
+					for (int channel = 0;
+							channel < output->GetOutputChannelCount();
+							channel++) {
+						static_cast<float *>(value)[channel]
+							= GAIN_TO_DB(output->GetOutputChannelGain(channel));
+					}
+				}
 			}
 		}
 		if (PARAM_IS_BALANCE(id)) {
@@ -1313,9 +1333,10 @@
 	return B_ERROR;
 }
 
-void 
-AudioMixer::SetParameterValue(int32 id, bigtime_t when, 
-							  const void *value, size_t size)
+
+void
+AudioMixer::SetParameterValue(int32 id, bigtime_t when, const void *value,
+	size_t size)
 {
 	TRACE("SetParameterValue: id 0x%08lx, size %ld\n", id, size);
 	bool update = false;
@@ -1394,7 +1415,8 @@
 		}
 		if (PARAM_IS_GAIN(id)) {
 			// output gain control
-			if (fCore->Settings()->UseBalanceControl() && output->GetOutputChannelCount() == 2 && 1 /*channel mask is stereo */) {
+			if (fCore->Settings()->UseBalanceControl()
+				&& output->GetOutputChannelCount() == 2 && 1 /*channel mask is stereo */) {
 				// single channel control + balance
 				float l = output->GetOutputChannelGain(0);
 				float r = output->GetOutputChannelGain(1);
@@ -1406,10 +1428,26 @@
 				output->SetOutputChannelGain(1, output->GetOutputChannelGain(1) * f);
 			} else {
 				// multi channel control
-				if (size < output->GetOutputChannelCount() * sizeof(float))
-					goto err;
-				for (int chan = 0; chan < output->GetOutputChannelCount(); chan++)
-					output->SetOutputChannelGain(chan, DB_TO_GAIN(static_cast<const float *>(value)[chan]));
+				if (size == sizeof(float)) {
+					// set same volume for all channels
+					float gain = static_cast<const float *>(value)[0];
+					for (int channel = 0;
+							channel < output->GetOutputChannelCount();
+							channel++) {
+						output->SetOutputChannelGain(channel,
+							DB_TO_GAIN(gain));
+					}
+				} else {
+					if (size < output->GetOutputChannelCount() * sizeof(float))
+						goto err;
+					for (int channel = 0;
+							channel < output->GetOutputChannelCount();
+							channel++) {
+						output->SetOutputChannelGain(channel,
+							DB_TO_GAIN(static_cast<const float *>(
+								value)[channel]));
+					}
+				}
 			}
 		}
 		if (PARAM_IS_BALANCE(id)) {



From axeld at mail.berlios.de  Wed Apr  8 01:35:52 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 8 Apr 2009 01:35:52 +0200
Subject: [Haiku-commits] r30014 - haiku/trunk/src/bin/desklink
Message-ID: <200904072335.n37NZqx8003451@sheep.berlios.de>

Author: axeld
Date: 2009-04-08 01:35:43 +0200 (Wed, 08 Apr 2009)
New Revision: 30014
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30014&view=rev

Added:
   haiku/trunk/src/bin/desklink/MixerControl.cpp
   haiku/trunk/src/bin/desklink/MixerControl.h
Modified:
   haiku/trunk/src/bin/desklink/DeskButton.cpp
   haiku/trunk/src/bin/desklink/Jamfile
   haiku/trunk/src/bin/desklink/VolumeSlider.cpp
   haiku/trunk/src/bin/desklink/VolumeSlider.h
   haiku/trunk/src/bin/desklink/desklink.cpp
   haiku/trunk/src/bin/desklink/desklink.rdef
   haiku/trunk/src/bin/desklink/iconfile.h
Log:
* Replaced the volume slider with one looking just like any other slider.
* This is still work in progress, though.


Modified: haiku/trunk/src/bin/desklink/DeskButton.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/DeskButton.cpp	2009-04-07 23:32:00 UTC (rev 30013)
+++ haiku/trunk/src/bin/desklink/DeskButton.cpp	2009-04-07 23:35:43 UTC (rev 30014)
@@ -110,7 +110,7 @@
 		case B_ABOUT_REQUESTED:
 			(new BAlert("About Desklink", "Desklink (Replicant)\n"
 				"  Brought to you by J?r?me DUVAL.\n\n"
-				"Copyright " B_UTF8_COPYRIGHT "2003-2007, Haiku","OK"))->Go();
+				"Copyright " B_UTF8_COPYRIGHT "2003-2009, Haiku","OK"))->Go();
 			break;
 		case OPEN_REF:
 			be_roster->Launch(&fRef);

Modified: haiku/trunk/src/bin/desklink/Jamfile
===================================================================
--- haiku/trunk/src/bin/desklink/Jamfile	2009-04-07 23:32:00 UTC (rev 30013)
+++ haiku/trunk/src/bin/desklink/Jamfile	2009-04-07 23:35:43 UTC (rev 30014)
@@ -2,18 +2,12 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-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 ;
-		# We need the public headers also when not compiling for Haiku.
-}
-
 BinCommand desklink :
 	desklink.cpp
 	VolumeSlider.cpp
 	DeskButton.cpp
+	MixerControl.cpp
+
 	: be libmedia.so
 	: desklink.rdef
-	;
-
+;

Copied: haiku/trunk/src/bin/desklink/MixerControl.cpp (from rev 29967, haiku/trunk/src/bin/desklink/VolumeSlider.cpp)
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeSlider.cpp	2009-04-06 13:50:24 UTC (rev 29967)
+++ haiku/trunk/src/bin/desklink/MixerControl.cpp	2009-04-07 23:35:43 UTC (rev 30014)
@@ -0,0 +1,212 @@
+/*
+ * Copyright 2003-2009, Haiku, Inc.
+ * Distributed under the terms of the MIT license.
+ *
+ * Authors:
+ *		J?r?me Duval
+ *		Fran?ois Revol
+ */
+
+
+#include "MixerControl.h"
+
+#include <Debug.h>
+#include <ParameterWeb.h>
+
+
+MixerControl::MixerControl(int32 volumeWhich, float* _value,
+		const char** _error)
+	:
+	fAudioMixerNode(NULL),
+	fParameterWeb(NULL),
+	fMixerParameter(NULL),
+	fMin(0.0f),
+	fMax(0.0f),
+	fStep(0.0f)
+{
+	bool retrying = false;
+	fAudioMixerNode = new media_node();
+
+	status_t err = B_OK;
+		/* BMediaRoster::Roster() doesn't set it if all is ok */
+	const char* errorString = NULL;
+	BMediaRoster* roster = BMediaRoster::Roster(&err);
+
+retry:
+	// Here we release the BMediaRoster once if we can't access the system
+	// mixer, to make sure it really isn't there, and it's not BMediaRoster
+	// that is messed up.
+	if (retrying) {
+		errorString = NULL;
+		PRINT(("retrying to get a Media Roster\n"));
+		/* BMediaRoster looks doomed */
+		roster = BMediaRoster::CurrentRoster();
+		if (roster) {
+			roster->Lock();
+			roster->Quit();
+		}
+		snooze(10000);
+		roster = BMediaRoster::Roster(&err);
+	}
+	
+	if (roster && err == B_OK) {
+		switch (volumeWhich) {
+			case VOLUME_USE_MIXER:
+				err = roster->GetAudioMixer(fAudioMixerNode);
+				break;
+			case VOLUME_USE_PHYS_OUTPUT:
+				err = roster->GetAudioOutput(fAudioMixerNode);
+				break;
+		}
+		if (err == B_OK) {
+			err = roster->GetParameterWebFor(*fAudioMixerNode, &fParameterWeb);
+			if (err == B_OK) {
+				// Finding the Mixer slider in the audio output ParameterWeb 
+				int32 numParams = fParameterWeb->CountParameters();
+				BParameter* p = NULL;
+				bool foundMixerLabel = false;
+				for (int i = 0; i < numParams; i++) {
+					p = fParameterWeb->ParameterAt(i);
+					PRINT(("BParameter[%i]: %s\n", i, p->Name()));
+					if (volumeWhich == VOLUME_USE_MIXER) {
+						if (!strcmp(p->Kind(), B_MASTER_GAIN))
+							break;
+					} else if (volumeWhich == VOLUME_USE_PHYS_OUTPUT) {
+						/* not all cards use the same name, and
+						 * they don't seem to use Kind() == B_MASTER_GAIN
+						 */
+						if (!strcmp(p->Kind(), B_MASTER_GAIN))
+							break;
+						PRINT(("not MASTER_GAIN \n"));
+
+						/* some audio card
+						 */
+						if (!strcmp(p->Name(), "Master"))
+							break;
+						PRINT(("not 'Master' \n"));
+
+						/* some Ensonic card have all controls names 'Volume', so
+						 * need to fint the one that has the 'Mixer' text label
+						 */
+						if (foundMixerLabel && !strcmp(p->Name(), "Volume"))
+							break;
+						if (!strcmp(p->Name(), "Mixer"))
+							foundMixerLabel = true;
+						PRINT(("not 'Mixer' \n"));
+					}
+#if 0
+					//if (!strcmp(p->Name(), "Master")) {
+					if (!strcmp(p->Kind(), B_MASTER_GAIN)) {
+						for (; i < numParams; i++) {
+							p = fParamWeb->ParameterAt(i);
+							if (strcmp(p->Kind(), B_MASTER_GAIN)) p=NULL;
+							else break;
+						}
+						break;
+					} else p = NULL;
+#endif
+					p = NULL;
+				}
+				if (p == NULL) {
+					errorString = volumeWhich
+						? "Could not find the soundcard":"Could not find the mixer";
+				} else if (p->Type() != BParameter::B_CONTINUOUS_PARAMETER) {
+					errorString = volumeWhich
+						? "Soundcard control unknown":"Mixer control unknown";
+				} else {
+					fMixerParameter = dynamic_cast<BContinuousParameter*>(p);
+					fMin = fMixerParameter->MinValue();
+					fMax = fMixerParameter->MaxValue();
+					fStep = fMixerParameter->ValueStep();
+
+					if (_value != NULL) {
+						float volume;
+						bigtime_t lastChange;
+						size_t size = sizeof(float);
+						fMixerParameter->GetValue(&volume, &size, &lastChange);
+
+						*_value = volume;
+					}
+				}
+			} else {
+				errorString = "No parameter web";
+			}
+		} else {
+			if (!retrying) {
+				retrying = true;
+				goto retry;
+			}
+			errorString = volumeWhich ? "No Audio output" : "No Mixer";
+		}
+	} else {
+		if (!retrying) {
+			retrying = true;
+			goto retry;
+		}
+		errorString = "No Media Roster";
+	}
+
+	if (err != B_OK) {
+		delete fAudioMixerNode;
+		fAudioMixerNode = NULL;
+	}
+	if (errorString) {
+		fprintf(stderr, "MixerControl: %s.\n", errorString);
+		if (_error)
+			*_error = errorString;
+	}
+	if (fMixerParameter == NULL && _value != NULL)
+		*_value = 0;
+}
+
+
+MixerControl::~MixerControl()
+{
+	delete fParameterWeb;
+
+	BMediaRoster* roster = BMediaRoster::CurrentRoster();
+	if (roster != NULL && fAudioMixerNode != NULL)
+		roster->ReleaseNode(*fAudioMixerNode);
+}
+
+
+void
+MixerControl::SetVolume(float volume)
+{
+	if (fMixerParameter == NULL)
+		return;
+
+	if (volume < fMin)
+		volume = fMin;
+	else if (volume > fMax)
+		volume = fMax;
+
+	if (volume != _GetVolume())
+		fMixerParameter->SetValue(&volume, sizeof(float), system_time());
+}
+
+
+void
+MixerControl::ChangeVolumeBy(float value)
+{
+	if (fMixerParameter == NULL || value == 0.0f)
+		return;
+
+	float volume = _GetVolume();
+	SetVolume(volume + value);
+}
+
+
+float
+MixerControl::_GetVolume()
+{
+	if (fMixerParameter == NULL)
+		return 0.0f;
+
+	float volume = 0;
+	bigtime_t lastChange;
+	size_t size = sizeof(float);
+	fMixerParameter->GetValue(&volume, &size, &lastChange);
+
+	return volume;
+}

Copied: haiku/trunk/src/bin/desklink/MixerControl.h (from rev 29967, haiku/trunk/src/bin/desklink/VolumeSlider.cpp)
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeSlider.cpp	2009-04-06 13:50:24 UTC (rev 29967)
+++ haiku/trunk/src/bin/desklink/MixerControl.h	2009-04-07 23:35:43 UTC (rev 30014)
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2003-2009, Haiku, Inc.
+ * Distributed under the terms of the MIT license.
+ *
+ * Authors:
+ *		J?r?me Duval
+ *		Fran?ois Revol
+ */
+#ifndef MIXER_CONTROL_H
+#define MIXER_CONTROL_H
+
+
+#include <MediaRoster.h>
+
+class BParameterWeb;
+class BContinuousParameter;
+
+
+// The volume which choices
+#define VOLUME_USE_MIXER		0 // default
+#define VOLUME_USE_PHYS_OUTPUT	1
+
+
+class MixerControl {
+public:
+							MixerControl(int32 volumeWhich, float *value = NULL,
+								const char **error = NULL);
+							~MixerControl();
+
+			void			SetVolume(float volume);
+			void			ChangeVolumeBy(float value);
+
+			float			Minimum() const { return fMin; }
+			float			Maximum() const { return fMax; }
+
+private:
+			float			_GetVolume();
+			void			_SetVolume(float volume);
+
+			media_node*		fAudioMixerNode;
+			BParameterWeb*	fParameterWeb;
+			BContinuousParameter* fMixerParameter;
+			float			fMin, fMax, fStep;
+};
+
+#endif	// MIXER_CONTROL_H

Modified: haiku/trunk/src/bin/desklink/VolumeSlider.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeSlider.cpp	2009-04-07 23:32:00 UTC (rev 30013)
+++ haiku/trunk/src/bin/desklink/VolumeSlider.cpp	2009-04-07 23:35:43 UTC (rev 30014)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2007, Haiku, Inc.
+ * Copyright 2003-2009, Haiku, Inc.
  * Distributed under the terms of the MIT license.
  *
  * Authors:
@@ -7,322 +7,52 @@
  *		Fran?ois Revol
  */
 
+
+#include "VolumeSlider.h"
+
 #include <string.h>
+#include <stdio.h>
 
-#include <MediaRoster.h>
-#include <MediaTheme.h>
-#include <MultiChannelControl.h>
-#include <Screen.h>
 #include <Beep.h>
 #include <Box.h>
-#include <stdio.h>
+#include <ControlLook.h>
 #include <Debug.h>
+#include <GroupLayout.h>
+#include <Screen.h>
+#include <Slider.h>
 
-#include "VolumeSlider.h"
-#include "iconfile.h"
+#include "MixerControl.h"
 
 #define VOLUME_CHANGED 'vlcg'
 #define VOLUME_UPDATED 'vlud'
 
-#define REDZONESTART 151
 
+class SliderView : public BSlider {
+public:
+							SliderView(const char* name, const char* label,
+								BMessage *message, int32 minValue,
+								int32 maxValue);
+	virtual					~SliderView();
 
+	virtual	void			MouseDown(BPoint where);
+	virtual	void			MessageReceived(BMessage* msg);
+	virtual void			DrawBar();
+	virtual const char*		UpdateText() const;
 
-MixerControl::MixerControl(int32 volumeWhich, float *value, const char **error)
-	:
-	fAudioMixerNode(NULL),
-	fParamWeb(NULL),
-	fMixerParam(NULL),
-	fMin(0.0),
-	fMax(0.0),
-	fStep(0.0)
-	{
-	bool retrying = false;
-	fAudioMixerNode = new media_node();
+private:
+			mutable	char	fText[64];
+};
 
-	status_t err = B_OK; /* BMediaRoster::Roster() doesn't set it if all is ok */
-	const char *errString = NULL;
-	BMediaRoster* roster = BMediaRoster::Roster(&err);
 
- retry:
-	/* here we release the BMediaRoster once if we can't access the system mixer,
-	 * to make sure it really isn't there, and it's not BMediaRoster that is messed up.
-	 */
-	if (retrying) {
-		errString = NULL;
-		PRINT(("retrying to get a Media Roster\n"));
-		/* BMediaRoster looks doomed */
-		roster = BMediaRoster::CurrentRoster();
-		if (roster) {
-			roster->Lock();
-			roster->Quit();
-		}
-		snooze(10000);
-		roster = BMediaRoster::Roster(&err);
-	}
-	
-	if (roster && err == B_OK) {
-		switch (volumeWhich) {
-			case VOLUME_USE_MIXER:
-				err = roster->GetAudioMixer(fAudioMixerNode);
-				break;
-			case VOLUME_USE_PHYS_OUTPUT:
-				err = roster->GetAudioOutput(fAudioMixerNode);
-				break;
-		}
-		if (err == B_OK) {
-			if ((err = roster->GetParameterWebFor(*fAudioMixerNode, &fParamWeb)) == B_OK) {
-				// Finding the Mixer slider in the audio output ParameterWeb 
-				int32 numParams = fParamWeb->CountParameters();
-				BParameter* p = NULL;
-				bool foundMixerLabel = false;
-				for (int i = 0; i < numParams; i++) {
-					p = fParamWeb->ParameterAt(i);
-					PRINT(("BParameter[%i]: %s\n", i, p->Name()));
-					if (volumeWhich == VOLUME_USE_MIXER) {
-						if (!strcmp(p->Kind(), B_MASTER_GAIN))
-							break;
-					} else if (volumeWhich == VOLUME_USE_PHYS_OUTPUT) {
-						/* not all cards use the same name, and
-						 * they don't seem to use Kind() == B_MASTER_GAIN
-						 */
-						if (!strcmp(p->Kind(), B_MASTER_GAIN))
-							break;
-						PRINT(("not MASTER_GAIN \n"));
 
-						/* some audio card
-						 */
-						if (!strcmp(p->Name(), "Master"))
-							break;
-						PRINT(("not 'Master' \n"));
-
-						/* some Ensonic card have all controls names 'Volume', so
-						 * need to fint the one that has the 'Mixer' text label
-						 */
-						if (foundMixerLabel && !strcmp(p->Name(), "Volume"))
-							break;
-						if (!strcmp(p->Name(), "Mixer"))
-							foundMixerLabel = true;
-						PRINT(("not 'Mixer' \n"));
-					}
-#if 0
-					//if (!strcmp(p->Name(), "Master")) {
-					if (!strcmp(p->Kind(), B_MASTER_GAIN)) {
-						for (; i < numParams; i++) {
-							p = fParamWeb->ParameterAt(i);
-							if (strcmp(p->Kind(), B_MASTER_GAIN)) p=NULL;
-							else break;
-						}
-						break;
-					} else p = NULL;
-#endif
-					p = NULL;
-				}
-				if (p == NULL) {
-					errString = volumeWhich
-						? "Could not find the soundcard":"Could not find the mixer";
-				} else if (p->Type() != BParameter::B_CONTINUOUS_PARAMETER) {
-					errString = volumeWhich
-						? "Soundcard control unknown":"Mixer control unknown";
-				} else {
-					fMixerParam = dynamic_cast<BContinuousParameter*>(p);
-					fMin = fMixerParam->MinValue();
-					fMax = fMixerParam->MaxValue();
-					fStep = fMixerParam->ValueStep();
-
-					float chanData[2];
-					bigtime_t lastChange;
-					size_t size = sizeof(chanData);
-
-					fMixerParam->GetValue(&chanData, &size, &lastChange);
-
-					if (value)
-						*value = (chanData[0] - fMin) * 100 / ((fMax - fMin) ? (fMax - fMin) : 1);
-				}
-			} else {
-				errString = "No parameter web";
-			}
-		} else {
-			if (!retrying) {
-				retrying = true;
-				goto retry;
-			}
-			errString = volumeWhich ? "No Audio output" : "No Mixer";
-		}
-	} else {
-		if (!retrying) {
-			retrying = true;
-			goto retry;
-		}
-		errString = "No Media Roster";
-	}
-
-	if (err != B_OK) {
-		delete fAudioMixerNode;
-		fAudioMixerNode = NULL;
-	}
-	if (errString) {
-		fprintf(stderr, "MixerControl: %s.\n", errString);
-		if (error)
-			*error = errString;
-	}
-	if (fMixerParam == NULL)
-		*value = -1;
-}
-
-
-MixerControl::~MixerControl()
+SliderView::SliderView(const char* name, const char* label, BMessage *message,
+		int32 minValue, int32 maxValue)
+	: BSlider("slider", label, message, minValue, maxValue, B_HORIZONTAL)
 {
-	delete fParamWeb;
-	BMediaRoster* roster = BMediaRoster::CurrentRoster();
-	if (roster && fAudioMixerNode)
-		roster->ReleaseNode(*fAudioMixerNode);
-}
+	font_height fontHeight;
+	GetFontHeight(&fontHeight);
+	SetBarThickness(ceilf((fontHeight.ascent + fontHeight.descent) * 0.7));
 
-
-void
-MixerControl::UpdateVolume(int32 value)
-{
-	if (!fMixerParam)
-		return;
-
-	float chanData[2];
-	bigtime_t lastChange;
-	size_t size = sizeof(chanData);
-
-	fMixerParam->GetValue(&chanData, &size, &lastChange);
-
-	for (int i = 0; i < 2; i++) {
-		chanData[i] = (value * (fMax - fMin) / 100) / fStep * fStep + fMin;
-	}
-
-	PRINT(("Min value: %f      Max Value: %f\nData: %f     %f\n",
-		fMixerParam->MinValue(), fMixerParam->MaxValue(), chanData[0], chanData[1]));
-	fMixerParam->SetValue(&chanData, sizeof(chanData), system_time()+1000);
-}
-
-
-void
-MixerControl::ChangeVolumeBy(int32 value)
-{
-	if (!fMixerParam)
-		return;
-
-	float chanData[2];
-	bigtime_t lastChange;
-	size_t size = sizeof(chanData);
-
-	fMixerParam->GetValue(&chanData, &size, &lastChange);
-
-	for (int i = 0; i < 2; i++) {
-		chanData[i] += fStep * value;
-		if (chanData[i] < fMin)
-			chanData[i] = fMin;
-		else if (chanData[i] > fMax)
-			chanData[i] = fMax;
-	}
-
-	PRINT(("Min value: %f      Max Value: %f\nData: %f     %f\n",
-		fMixerParam->MinValue(), fMixerParam->MaxValue(), chanData[0], chanData[1]));
-	fMixerParam->SetValue(&chanData, sizeof(chanData), system_time()+1000);
-}
-
-
-//	#pragma mark -
-
-
-VolumeSlider::VolumeSlider(BRect frame, bool dontBeep, int32 volumeWhich)
-	: BWindow(frame, "VolumeSlider", B_BORDERED_WINDOW_LOOK, B_FLOATING_ALL_WINDOW_FEEL,
-		B_ASYNCHRONOUS_CONTROLS | B_WILL_ACCEPT_FIRST_CLICK, 0)
-{
-	// Make sure it's not outside the screen.
-	const int32 kMargin = 3;
-	BRect windowRect = ConvertToScreen(Bounds());
-	BRect screenFrame(BScreen(B_MAIN_SCREEN_ID).Frame());
-	if (screenFrame.right < windowRect.right + kMargin)
-		MoveBy(- kMargin - windowRect.right + screenFrame.right, 0);
-	if (screenFrame.bottom < windowRect.bottom + kMargin)
-		MoveBy(0, - kMargin - windowRect.bottom + screenFrame.bottom);
-	if (screenFrame.left > windowRect.left - kMargin)
-		MoveBy(kMargin + screenFrame.left - windowRect.left, 0);
-	if (screenFrame.top > windowRect.top - kMargin)
-		MoveBy(0, kMargin + screenFrame.top - windowRect.top);
-
-	float value = 0.0;
-	fDontBeep = dontBeep;
-	const char *errString = NULL;
-	fMixerControl = new MixerControl(volumeWhich, &value, &errString);
-	
-	BBox *box = new BBox(Bounds(), "sliderbox", B_FOLLOW_LEFT | B_FOLLOW_TOP,
-		B_WILL_DRAW | B_FRAME_EVENTS, B_PLAIN_BORDER);
-	AddChild(box);
-
-	fHasChanged = false; /* make sure we don't beep if we don't change anything */
-	fSlider = new SliderView(box->Bounds().InsetByCopy(1, 1), new BMessage(VOLUME_CHANGED), 
-		errString == NULL ? "Volume" : errString, B_FOLLOW_LEFT | B_FOLLOW_TOP, (int32)value);
-	box->AddChild(fSlider);
-
-	fSlider->SetTarget(this);
-
-	SetPulseRate(100);
-}
-
-
-VolumeSlider::~VolumeSlider()
-{
-	delete fMixerControl;
-}
-
-
-void
-VolumeSlider::WindowActivated(bool active)
-{
-	/* don't Quit() ! thanks for FFM users */
-}
-
-
-void
-VolumeSlider::MessageReceived(BMessage *msg)
-{
-	switch (msg->what) {
-		case VOLUME_UPDATED:
-			PRINT(("VOLUME_UPDATED\n"));
-			fMixerControl->UpdateVolume(fSlider->Value());
-			fHasChanged = true;
-			break;
-
-		case VOLUME_CHANGED:
-			if (fHasChanged) {
-				PRINT(("VOLUME_CHANGED\n"));
-				fMixerControl->UpdateVolume(fSlider->Value());
-				if (!fDontBeep)
-					beep();
-			}
-			Quit();
-			break;
-
-		default:
-			BWindow::MessageReceived(msg);		// not a slider message, not our problem
-	}
-}
-
-
-//	#pragma mark -
-
-
-SliderView::SliderView(BRect rect, BMessage *msg, const char *title,
-		uint32 resizeFlags, int32 value)
-	: BControl(rect, "slider", NULL, msg, resizeFlags, B_WILL_DRAW | B_PULSE_NEEDED),
-	fLeftBitmap(BRect(0, 0, kLeftWidth - 1, kLeftHeight - 1), B_CMAP8),
-	fRightBitmap(BRect(0, 0, kRightWidth - 1, kRightHeight - 1), B_CMAP8),
-	fButtonBitmap(BRect(0, 0, kButtonWidth - 1, kButtonHeight - 1), B_CMAP8),
-	fTitle(title)
-{
-	fLeftBitmap.SetBits(kLeftBits, kLeftWidth * kLeftHeight, 0, B_CMAP8);
-	fRightBitmap.SetBits(kRightBits, kRightWidth * kRightHeight, 0, B_CMAP8);
-	fButtonBitmap.SetBits(kButtonBits, kButtonWidth * kButtonHeight, 0, B_CMAP8);
-
-	SetValue(value);
 	SetEventMask(B_POINTER_EVENTS, B_NO_POINTER_HISTORY);
 }
 
@@ -333,49 +63,12 @@
 
 
 void
-SliderView::Draw(BRect updateRect)
+SliderView::MouseDown(BPoint where)
 {
-	SetHighColor(189,186,189);
-	StrokeLine(BPoint(11,1), BPoint(192,1));
-	SetHighColor(0,0,0);
-	StrokeLine(BPoint(11,2), BPoint(192,2));
-	SetHighColor(255,255,255);
-	StrokeLine(BPoint(11,14), BPoint(192,14));
-	SetHighColor(231,227,231);
-	StrokeLine(BPoint(11,15), BPoint(192,15));
+	if (!IsEnabled() || !Bounds().Contains(where))
+		Invoke();
 
-	SetLowColor(ViewColor());
-
-	SetDrawingMode(B_OP_OVER);
-
-	DrawBitmapAsync(&fLeftBitmap, BPoint(5,1));
-	DrawBitmapAsync(&fRightBitmap, BPoint(193,1));
-
-	float position = 11 + (192-11) * ((Value() == -1) ? 0 : Value()) / 100;
-	float right = (position < REDZONESTART) ? position : REDZONESTART;
-	SetHighColor(99,151,99);
-	FillRect(BRect(11,3,right,4));
-	SetHighColor(156,203,156);
-	FillRect(BRect(11,5,right,13));
-	if (right == REDZONESTART) {
-		SetHighColor(156,101,99);
-		FillRect(BRect(REDZONESTART,3,position,4));
-		SetHighColor(255,154,156);
-		FillRect(BRect(REDZONESTART,5,position,13));
-	}		
-	SetHighColor(156,154,156);
-	FillRect(BRect(position,3,192,13));
-
-	float width = be_plain_font->StringWidth(fTitle);
-
-	SetHighColor(49,154,49);
-	DrawString(fTitle, BPoint(11 + (192-11-width)/2, 12));
-
-	DrawBitmapAsync(&fButtonBitmap, BPoint(position-5,3));
-
-	Sync();
-
-	SetDrawingMode(B_OP_COPY);
+	BSlider::MouseDown(where);
 }
 
 
@@ -422,62 +115,124 @@
 
 
 void
-SliderView::MouseDown(BPoint point)
+SliderView::DrawBar()
 {
-	if (Bounds().Contains(point)) {
-		SetTracking(true);
-		MouseMoved(point, B_INSIDE_VIEW, NULL);
-	} else
-		Invoke();
+	BRect frame = BarFrame();
+	BView* view = OffscreenView();
+
+	if (be_control_look != NULL) {
+		uint32 flags = be_control_look->Flags(this);
+		rgb_color base = ui_color(B_PANEL_BACKGROUND_COLOR);
+		rgb_color rightFillColor = (rgb_color){255, 109, 38, 255};
+		rgb_color leftFillColor = (rgb_color){116, 224, 0, 255};
+
+		int32 min, max;
+		GetLimits(&min, &max);
+		float position = 1.0f * (max - min - max) / (max - min);
+
+		be_control_look->DrawSliderBar(view, frame, frame, base, leftFillColor,
+			rightFillColor, position, flags, Orientation());
+		return;
+	}
+
+	BSlider::DrawBar();
 }
 
 
-void 
-SliderView::MouseMoved(BPoint point, uint32 transit, const BMessage *message)
+const char*
+SliderView::UpdateText() const
 {
-	if (!IsTracking())
-		return;
+	snprintf(fText, sizeof(fText), "%ld dB", Value());
+	return fText;
+}
 
-	int32 mouseButtons;
-	Window()->CurrentMessage()->FindInt32("buttons", &mouseButtons);
 
-	// button not pressed, exit
-	if (!(mouseButtons & B_PRIMARY_MOUSE_BUTTON)) {
-		Invoke();
-		SetTracking(false);
-	}
+//	#pragma mark -
 
-	if (Value() == -1)
-		return;
 
-	float v = MIN(MAX(point.x, 11), 192);
-	v = (v - 11) / (192-11) * 100;
-	v = MAX(MIN(v,100), 0);
-	SetValue((int32)v);
-	Draw(Bounds());
-	Flush();
+VolumeSlider::VolumeSlider(BRect frame, bool dontBeep, int32 volumeWhich)
+	: BWindow(frame, "VolumeSlider", B_BORDERED_WINDOW_LOOK,
+		B_FLOATING_ALL_WINDOW_FEEL,
+		B_ASYNCHRONOUS_CONTROLS | B_WILL_ACCEPT_FIRST_CLICK, 0)
+{
+	fDontBeep = dontBeep;
 
-	if (Window())
-		Window()->PostMessage(VOLUME_UPDATED);
+	const char *errorString = NULL;
+	float value = 0.0;
+	fMixerControl = new MixerControl(volumeWhich, &value, &errorString);
+
+	SetLayout(new BGroupLayout(B_HORIZONTAL));
+
+	BGroupLayout* layout = new BGroupLayout(B_HORIZONTAL);
+	layout->SetInsets(10, 0, 10, 0);
+
+	BBox* box = new BBox("sliderbox");
+	box->SetLayout(layout);
+	box->SetBorder(B_PLAIN_BORDER);
+	AddChild(box);
+
+	fHasChanged = false;
+		// make sure we don't beep if we don't change anything
+
+	fSlider = new SliderView("volume", errorString ? errorString : "Volume",
+		new BMessage(VOLUME_CHANGED), fMixerControl->Minimum(),
+		fMixerControl->Maximum());
+	fSlider->SetValue((int32)value);
+	fSlider->SetModificationMessage(new BMessage(VOLUME_UPDATED));
+	if (errorString != NULL)
+		fSlider->SetEnabled(false);
+	box->AddChild(fSlider);
+
+	fSlider->SetTarget(this);
+	SetPulseRate(100);
+	ResizeTo(300, 50);
+
+	// Make sure it's not outside the screen.
+	const int32 kMargin = 3;
+	BRect windowRect = Frame();
+	BRect screenFrame(BScreen(B_MAIN_SCREEN_ID).Frame());
+	if (screenFrame.right < windowRect.right + kMargin)
+		MoveBy(- kMargin - windowRect.right + screenFrame.right, 0);
+	if (screenFrame.bottom < windowRect.bottom + kMargin)
+		MoveBy(0, - kMargin - windowRect.bottom + screenFrame.bottom);
+	if (screenFrame.left > windowRect.left - kMargin)
+		MoveBy(kMargin + screenFrame.left - windowRect.left, 0);
+	if (screenFrame.top > windowRect.top - kMargin)
+		MoveBy(0, kMargin + screenFrame.top - windowRect.top);
 }
 
 
+VolumeSlider::~VolumeSlider()
+{
+	delete fMixerControl;
+}
+
+
 void
-SliderView::MouseUp(BPoint point)
+VolumeSlider::MessageReceived(BMessage *msg)
 {
-	if (!IsTracking())
-		return;
+	switch (msg->what) {
+		case VOLUME_UPDATED:
+puts("updated");
+			PRINT(("VOLUME_UPDATED\n"));
+			fMixerControl->SetVolume(fSlider->Value());
+			fHasChanged = true;
+			break;
 
-	if (Value() != -1 && Bounds().InsetBySelf(2, 2).Contains(point)) {
-		float v = MIN(MAX(point.x, 11), 192);
-		v = (v - 11) / (192-11) * 100;
-		v = MAX(MIN(v,100), 0);
-		SetValue((int32)v);
-	}
+		case VOLUME_CHANGED:
+puts("changed");
+			if (fHasChanged) {
+				PRINT(("VOLUME_CHANGED\n"));
+				fMixerControl->SetVolume(fSlider->Value());
+				if (!fDontBeep)
+					beep();
+			}
+			Quit();
+			break;
 
-	Invoke();
-	SetTracking(false);
-	Draw(Bounds());
-	Flush();
+		default:
+			BWindow::MessageReceived(msg);
+			break;
+	}
 }
 

Modified: haiku/trunk/src/bin/desklink/VolumeSlider.h
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeSlider.h	2009-04-07 23:32:00 UTC (rev 30013)
+++ haiku/trunk/src/bin/desklink/VolumeSlider.h	2009-04-07 23:35:43 UTC (rev 30014)
@@ -1,68 +1,35 @@
 /*
- * Copyright (c) 2003-2007, Haiku, Inc.
+ * Copyright 2003-2009, Haiku, Inc.
  * Distributed under the terms of the MIT license.
  *
  * Authors:
  *		J?r?me Duval
  *		Fran?ois Revol
  */
-#ifndef VOLUMESLIDER_H
-#define VOLUMESLIDER_H
+#ifndef VOLUME_SLIDER_H
+#define VOLUME_SLIDER_H
 
+
 #include <Window.h>
-#include <Control.h>
-#include <Bitmap.h>
-#include <ParameterWeb.h>
 
-#define VOLUME_USE_MIXER 0 /* default */
-#define VOLUME_USE_PHYS_OUTPUT 1
 
+class BSlider;
+class MixerControl;
 
-class MixerControl {
-	public:
-		MixerControl(int32 volumeWhich, float *value = NULL, const char **error = NULL);
-		~MixerControl();
-		
-		void UpdateVolume(int32 value);
-		void ChangeVolumeBy(int32 incr);
-	private:
-		media_node *fAudioMixerNode;
-		BParameterWeb* fParamWeb;
-		BContinuousParameter* fMixerParam;
-		float fMin, fMax, fStep;
-};
-
-
-class SliderView : public BControl {
-	public:
-		SliderView(BRect rect, BMessage *msg, const char* title, uint32 resizeFlags,
-			int32 value);
-		~SliderView();
-
-		virtual void Draw(BRect);
-		virtual void MessageReceived(BMessage*);
-		virtual void MouseDown(BPoint point);
-		virtual void MouseMoved(BPoint point, uint32 transit, const BMessage *message);
-		virtual void MouseUp(BPoint point);
-
-	private:
-		BBitmap fLeftBitmap, fRightBitmap, fButtonBitmap;
-		const char* fTitle;
-};
-
 class VolumeSlider : public BWindow {
-	public:
-		VolumeSlider(BRect frame, bool dontBeep=false, int32 volumeWhich=0);
-		~VolumeSlider();
+public:
+							VolumeSlider(BRect frame, bool dontBeep = false,
+								int32 volumeWhich = 0);
+							~VolumeSlider();
 
-		void MessageReceived(BMessage*);
-		void WindowActivated(bool active);
+protected:
+			void			MessageReceived(BMessage* message);
 
-	private:
-		MixerControl *fMixerControl;
-		bool fHasChanged;
-		bool fDontBeep;
-		SliderView *fSlider;
+private:
+			MixerControl*	fMixerControl;
+			bool			fHasChanged;
+			bool			fDontBeep;
+			BSlider*		fSlider;
 };
 
-#endif	// VOLUMESLIDER_H
+#endif	// VOLUME_SLIDER_H

Modified: haiku/trunk/src/bin/desklink/desklink.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/desklink.cpp	2009-04-07 23:32:00 UTC (rev 30013)
+++ haiku/trunk/src/bin/desklink/desklink.cpp	2009-04-07 23:35:43 UTC (rev 30014)
@@ -11,9 +11,8 @@
 
 //! VolumeControl and link items in Deskbar
 
-#include "VolumeSlider.h"
-#include "DeskButton.h"
-#include "iconfile.h"
+#include <stdio.h>
+#include <strings.h>
 
 #include <Alert.h>

[... truncated: 138 lines follow ...]


From anevilyak at mail.berlios.de  Wed Apr  8 02:09:34 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Wed, 8 Apr 2009 02:09:34 +0200
Subject: [Haiku-commits] r30015 - haiku/trunk/src/kits/interface
Message-ID: <200904080009.n3809YBP021554@sheep.berlios.de>

Author: anevilyak
Date: 2009-04-08 02:09:33 +0200 (Wed, 08 Apr 2009)
New Revision: 30015
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30015&view=rev

Modified:
   haiku/trunk/src/kits/interface/OutlineListView.cpp
Log:
Various cleanups to how the selection indices are maintained when part of the selection is occluded by a collapse operation, which could cause a crash in some instances. This fixes ticket #3711.


Modified: haiku/trunk/src/kits/interface/OutlineListView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/OutlineListView.cpp	2009-04-07 23:35:43 UTC (rev 30014)
+++ haiku/trunk/src/kits/interface/OutlineListView.cpp	2009-04-08 00:09:33 UTC (rev 30015)
@@ -483,6 +483,8 @@
 	int32 startIndex = index;
 	int32 max = FullListCountItems() - fullIndex - 1;
 	int32 count = 0;
+	bool selectionChanged = false;
+	
 	BListItem** items = (BListItem**)fFullList.Items() + fullIndex + 1;
 
 	while (max-- > 0) {
@@ -493,9 +495,10 @@
 		if (item->IsItemVisible()) {
 			fList.RemoveItem(item);
 			item->SetItemVisible(false);
-			if (item->IsSelected())
+			if (item->IsSelected()) {
+				selectionChanged = true;
 				item->Deselect();
-
+			}
 			count++;
 		}
 
@@ -504,19 +507,21 @@
 
 	_RecalcItemTops(startIndex);
 	// fix selection hints
-	// TODO: revise for multi selection lists
-	if (index < fFirstSelected) {
-		if (index + count < fFirstSelected) {
-			fFirstSelected -= count;
-			fLastSelected -= count;
-		} else {
-			// select top item
-			//fFirstSelected = fLastSelected = index;
-			//item->Select();
-			Select(index);
-		}
+	if (index < fFirstSelected && index + count < fFirstSelected) {
+		// all items removed were higher than the selection range,
+		// adjust the indexes to correspond to their new visible positions
+		fFirstSelected -= count;
+		fLastSelected -= count;
 	}
 
+	int32 maxIndex = fList.CountItems() - 1;
+	if (fFirstSelected > maxIndex) 
+		fFirstSelected = maxIndex;
+	if (fLastSelected > maxIndex)
+		fLastSelected = maxIndex;
+	if (selectionChanged)
+		SelectionChanged();
+	
 	_FixupScrollBar();
 	Invalidate();
 }



From leavengood at gmail.com  Wed Apr  8 06:10:57 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Wed, 8 Apr 2009 00:10:57 -0400
Subject: [Haiku-commits] r29888 -
	haiku/trunk/src/system/libroot/posix/unistd
In-Reply-To: <14268071663-BeMail@quad>
References: <f019d2f30904071219x6bd0137fwe5e5e3369fc5ff2@mail.gmail.com>
	<14268071663-BeMail@quad>
Message-ID: <a4855ac50904072110tb0bf020ha0085a2e0db73fc5@mail.gmail.com>

On Tue, Apr 7, 2009 at 6:44 PM, Axel D?rfler <axeld at pinc-software.de> wrote:
>
> It could be a bit, I stopped counting a loooong time ago :-)

Heck my to-do list for Haiku is a mile long too, and my areas of
expertise and interest are dwarfed by Axel's...

Regards,
Ryan


From leavengood at gmail.com  Wed Apr  8 06:35:14 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Wed, 8 Apr 2009 00:35:14 -0400
Subject: [Haiku-commits] r29937 - in haiku/trunk:
	headers/private/interface src/kits/interface src/servers/app
	src/servers/app/drawing
In-Reply-To: <200904051459.n35ExpcT005548@sheep.berlios.de>
References: <200904051459.n35ExpcT005548@sheep.berlios.de>
Message-ID: <a4855ac50904072135g3a7ea764v2d6a936f4f476994@mail.gmail.com>

On Sun, Apr 5, 2009 at 10:59 AM,  <stippi at mail.berlios.de> wrote:
>
> Begun to use structs for the BView<->app_server communication.

Nice change! I think this makes the code much more readable too. Plus
there is no chance of accidentally swapping parameter order when
reading or writing to the link. I know I fixed at least one such bug
in app_server, and I haven't done much app_server bug fixing. Of
course the speed increase is a nice benefit.

Still like you said it is worth investigating why the link stuff is so
slow. Could it be the use of templates?

Regards,
Ryan


From stefano.ceccherini at gmail.com  Wed Apr  8 06:57:22 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Wed, 8 Apr 2009 06:57:22 +0200
Subject: [Haiku-commits] r29996 - haiku/trunk/src/kits/interface
In-Reply-To: <200904071552.n37FqxYE001154@sheep.berlios.de>
References: <200904071552.n37FqxYE001154@sheep.berlios.de>
Message-ID: <894b9700904072157y139d0f7dwbc50ef76de29c35d@mail.gmail.com>

2009/4/7  <zooey at mail.berlios.de>:
> Author: zooey
> Date: 2009-04-07 17:52:58 +0200 (Tue, 07 Apr 2009)
> New Revision: 29996
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29996&view=rev
>
> Modified:
> ? haiku/trunk/src/kits/interface/TextView.cpp
> Log:
> * fix off-by-one error in my last change that reverted the editing
> ?direction - oops ;-)
> * undo is now active by default
>
Watch out, it is not in beos, although the documentation says otherwise.


From leavengood at gmail.com  Wed Apr  8 07:38:32 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Wed, 8 Apr 2009 01:38:32 -0400
Subject: [Haiku-commits] r30008 -
	haiku/trunk/src/add-ons/kernel/network/stack
In-Reply-To: <14596586766-BeMail@quad>
References: <1351604786-BeMail@laptop> <14596586766-BeMail@quad>
Message-ID: <a4855ac50904072238q228cb95eg6b869cb9734c13d3@mail.gmail.com>

On Tue, Apr 7, 2009 at 6:50 PM, Axel D?rfler <axeld at pinc-software.de> wrote:
> .
> Anyway, a quick fix would be:
> ? ? ? ?if (parent.Get() == NULL) ...
>
> Still, I would like to know what's going on, at least I can't see how
> that can be ambiguous. Maybe making the * constructors explicit would
> help?

Seems like you are on the right track. From what I can see there are
two possible == operators that could be used because of the * operator
in that class. Since you are comparing against a NULL pointer C++
could use the * operator to convert parent into the real pointer, or
it could leave it as a WeakReference<net_socket_private> and use the
== defined in that class. But what should it do? Hence the ambiguity.

Of course I am no C++ expert, and so I'm not sure what the best solution is.

Regards,
Ryan


From mmlr at mail.berlios.de  Wed Apr  8 09:46:03 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Wed, 8 Apr 2009 09:46:03 +0200
Subject: [Haiku-commits] r30016 - in haiku/trunk: build/jam
	src/add-ons/kernel/debugger src/add-ons/kernel/debugger/run_on_exit
Message-ID: <200904080746.n387k3jS027756@sheep.berlios.de>

Author: mmlr
Date: 2009-04-08 09:45:59 +0200 (Wed, 08 Apr 2009)
New Revision: 30016
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30016&view=rev

Added:
   haiku/trunk/src/add-ons/kernel/debugger/run_on_exit/
   haiku/trunk/src/add-ons/kernel/debugger/run_on_exit/Jamfile
   haiku/trunk/src/add-ons/kernel/debugger/run_on_exit/run_on_exit.cpp
Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/src/add-ons/kernel/debugger/Jamfile
Log:
Adding a run_on_exit kernel debugger add-on. It installs a debugger command
"on_exit" with which you can add commands to run when exiting the debugger.
With this you could for example "on_exit sync" and "on_exit shutdown -r" when
your app_server crashed.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-08 00:09:33 UTC (rev 30015)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-08 07:45:59 UTC (rev 30016)
@@ -158,7 +158,7 @@
 AddFilesToHaikuImage system add-ons kernel console : vga_text ;
 AddFilesToHaikuImage system add-ons kernel debugger
 	: $(X86_ONLY)<kdebug>disasm <kdebug>hangman <kdebug>invalidate_on_exit
-	<kdebug>usb_keyboard ;
+	<kdebug>usb_keyboard <kdebug>run_on_exit ;
 AddFilesToHaikuImage system add-ons kernel file_systems
 	: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
 AddFilesToHaikuImage system add-ons kernel generic

Modified: haiku/trunk/src/add-ons/kernel/debugger/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/debugger/Jamfile	2009-04-08 00:09:33 UTC (rev 30015)
+++ haiku/trunk/src/add-ons/kernel/debugger/Jamfile	2009-04-08 07:45:59 UTC (rev 30016)
@@ -7,4 +7,5 @@
 SubInclude HAIKU_TOP src add-ons kernel debugger hangman ;
 SubInclude HAIKU_TOP src add-ons kernel debugger invalidate_on_exit ;
 SubInclude HAIKU_TOP src add-ons kernel debugger laplinkll ;
+SubInclude HAIKU_TOP src add-ons kernel debugger run_on_exit ;
 SubInclude HAIKU_TOP src add-ons kernel debugger usb_keyboard ;

Added: haiku/trunk/src/add-ons/kernel/debugger/run_on_exit/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/debugger/run_on_exit/Jamfile	2009-04-08 00:09:33 UTC (rev 30015)
+++ haiku/trunk/src/add-ons/kernel/debugger/run_on_exit/Jamfile	2009-04-08 07:45:59 UTC (rev 30016)
@@ -0,0 +1,7 @@
+SubDir HAIKU_TOP src add-ons kernel debugger run_on_exit ;
+
+UsePrivateHeaders kernel ;
+
+KernelAddon <kdebug>run_on_exit :
+	run_on_exit.cpp
+	;

Added: haiku/trunk/src/add-ons/kernel/debugger/run_on_exit/run_on_exit.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/debugger/run_on_exit/run_on_exit.cpp	2009-04-08 00:09:33 UTC (rev 30015)
+++ haiku/trunk/src/add-ons/kernel/debugger/run_on_exit/run_on_exit.cpp	2009-04-08 07:45:59 UTC (rev 30016)
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr at mlotz.ch
+ * Distributed under the terms of the MIT License.
+ */
+#include <debug.h>
+#include <signal.h>
+#include <string.h>
+#include <image.h>
+
+
+static sem_id sRequestSem = -1;
+static char sCommandBuffer[1024];
+static uint32 sCommandOffset = 0;
+static uint32 sCommandCount = 0;
+
+
+static int32
+run_on_exit_loop(void *data)
+{
+	while (true) {
+		if (acquire_sem(sRequestSem) != B_OK)
+			break;
+
+		char *pointer = sCommandBuffer;
+		while (sCommandCount > 0) {
+			uint8 argCount = (uint8)pointer[0];
+			pointer++;
+
+			const char *args[argCount];
+			for (uint8 i = 0; i < argCount; i++) {
+				args[i] = pointer;
+				uint32 length = strlen(pointer);
+				pointer += length + 1;
+			}
+
+			thread_id thread = load_image(argCount, args, NULL);
+			if (thread >= B_OK)
+				resume_thread(thread);
+			sCommandCount--;
+		}
+
+		sCommandOffset = 0;
+	}
+
+	return 0;
+}
+
+
+static int
+add_run_on_exit_command(int argc, char **argv)
+{
+	if (argc < 2 || strcmp(argv[1], "--help") == 0) {
+		print_debugger_command_usage(argv[0]);
+		return 0;
+	}
+
+	if (argc > 256) {
+		kprintf("too many arguments\n");
+		return 0;
+	}
+
+	size_t totalLength = 1;
+	for (int32 i = 1; i < argc; i++)
+		totalLength += strlen(argv[i]) + 1;
+
+	if (sCommandOffset + totalLength > sizeof(sCommandBuffer)) {
+		kprintf("no space left in command buffer\n");
+		return 0;
+	}
+
+	char *pointer = sCommandBuffer + sCommandOffset;
+	*pointer++ = (char)(argc - 1);
+
+	for (int32 i = 1; i < argc; i++) {
+		strcpy(pointer, argv[i]);
+		pointer += strlen(argv[i]) + 1;
+	}
+
+	sCommandOffset += totalLength;
+	sCommandCount++;
+	return 0;
+}
+
+
+static void
+exit_debugger()
+{
+	if (sCommandCount > 0)
+		release_sem_etc(sRequestSem, 1, B_DO_NOT_RESCHEDULE);
+}
+
+
+static status_t
+std_ops(int32 op, ...)
+{
+	if (op == B_MODULE_INIT) {
+		sRequestSem = create_sem(0, "run_on_exit_request");
+		if (sRequestSem < B_OK)
+			return sRequestSem;
+
+		thread_id thread = spawn_kernel_thread(&run_on_exit_loop,
+			"run_on_exit_loop", B_NORMAL_PRIORITY, NULL);
+		if (thread < B_OK)
+			return thread;
+
+		send_signal_etc(thread, SIGCONT, B_DO_NOT_RESCHEDULE);
+
+		add_debugger_command_etc("on_exit", &add_run_on_exit_command,
+			"Adds a command to be run when leaving the kernel debugger",
+			"<command> [<arguments>]\n"
+			"Adds a command to be run when leaving the kernel debugger.\n", 0);
+
+		return B_OK;
+	} else if (op == B_MODULE_UNINIT) {
+		remove_debugger_command("on_exit", &add_run_on_exit_command);
+		// deleting the sem will also cause the thread to exit
+		delete_sem(sRequestSem);
+		sRequestSem = -1;
+		return B_OK;
+	}
+
+	return B_BAD_VALUE;
+}
+
+
+static struct debugger_module_info sModuleInfo = {
+	{
+		"debugger/run_on_exit/v1",
+		B_KEEP_LOADED,
+		&std_ops
+	},
+
+	NULL,
+	exit_debugger,
+	NULL,
+	NULL
+};
+
+module_info *modules[] = { 
+	(module_info *)&sModuleInfo,
+	NULL
+};



From axeld at mail.berlios.de  Wed Apr  8 09:57:34 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 8 Apr 2009 09:57:34 +0200
Subject: [Haiku-commits] r30017 -
	haiku/trunk/src/add-ons/kernel/network/stack
Message-ID: <200904080757.n387vYfb031952@sheep.berlios.de>

Author: axeld
Date: 2009-04-08 09:57:32 +0200 (Wed, 08 Apr 2009)
New Revision: 30017
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30017&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
Log:
* Fixed the buggy GCC4 work-around.


Modified: haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-08 07:45:59 UTC (rev 30016)
+++ haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-08 07:57:32 UTC (rev 30017)
@@ -732,7 +732,7 @@
 	net_socket_private* socket = (net_socket_private*)_socket;
 
 	WeakReference<net_socket_private> parent = socket->parent;
-	if (socket->parent == NULL)
+	if (parent.Get() == NULL)
 		return B_BAD_VALUE;
 
 	MutexLocker _(parent->lock);
@@ -758,7 +758,7 @@
 	net_socket_private* socket = (net_socket_private*)_socket;
 
 	WeakReference<net_socket_private> parent = socket->parent;
-	if (socket->parent == NULL)
+	if (parent.Get() == NULL)
 		return B_BAD_VALUE;
 
 	MutexLocker _(parent->lock);



From axeld at pinc-software.de  Wed Apr  8 07:58:19 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 08 Apr 2009 07:58:19
Subject: [Haiku-commits] r29996 - haiku/trunk/src/kits/interface
In-Reply-To: <894b9700904072157y139d0f7dwbc50ef76de29c35d@mail.gmail.com>
Message-ID: <920937078-BeMail@quad>

Stefano Ceccherini wrote:
> 2009/4/7  <zooey at mail.berlios.de>:
> > * undo is now active by default
> Watch out, it is not in beos, although the documentation says 
> otherwise.

Yeah, but what harm could possibly be done? :-)

Bye,
   Axel.



From stefano.ceccherini at gmail.com  Wed Apr  8 10:01:30 2009
From: stefano.ceccherini at gmail.com (Stefano Ceccherini)
Date: Wed, 8 Apr 2009 10:01:30 +0200
Subject: [Haiku-commits] r29996 - haiku/trunk/src/kits/interface
In-Reply-To: <920937078-BeMail@quad>
References: <894b9700904072157y139d0f7dwbc50ef76de29c35d@mail.gmail.com>
	<920937078-BeMail@quad>
Message-ID: <894b9700904080101r5bc3172x4a3320875bc00dac@mail.gmail.com>

2009/4/8 Axel D?rfler <axeld at pinc-software.de>:
> Stefano Ceccherini wrote:
>> 2009/4/7 ?<zooey at mail.berlios.de>:
>> > * undo is now active by default
>> Watch out, it is not in beos, although the documentation says
>> otherwise.
>
> Yeah, but what harm could possibly be done? :-)
>
> Bye,
> ? Axel.

Actually I was wrong, it's the opposite: it's enabled by default but
the documentation says it's disabled.


From revol at free.fr  Wed Apr  8 10:02:12 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Wed, 08 Apr 2009 10:02:12 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r29937_-_in_haiku/trunk=3A_headers/priv?=
 =?utf-8?q?ate/interface_src/kits/interface_src/servers/app_src/servers/ap?=
 =?utf-8?q?p/drawing?=
In-Reply-To: <a4855ac50904072135g3a7ea764v2d6a936f4f476994@mail.gmail.com>
Message-ID: <257225696-BeMail@laptop>

> On Sun, Apr 5, 2009 at 10:59 AM,  <stippi at mail.berlios.de> wrote:
> >
> > Begun to use structs for the BView<->app_server communication.
> 
> Nice change! I think this makes the code much more readable too. Plus
> there is no chance of accidentally swapping parameter order when
> reading or writing to the link. I know I fixed at least one such bug
> in app_server, and I haven't done much app_server bug fixing. Of
> course the speed increase is a nice benefit.

OTH it breaks possible network use due to endianness issues on multiple 
platforms...

Fran?ois.


From axeld at mail.berlios.de  Wed Apr  8 10:23:08 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 8 Apr 2009 10:23:08 +0200
Subject: [Haiku-commits] r30018 - haiku/trunk/src/kits/tracker
Message-ID: <200904080823.n388N8Nc013822@sheep.berlios.de>

Author: axeld
Date: 2009-04-08 10:23:07 +0200 (Wed, 08 Apr 2009)
New Revision: 30018
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30018&view=rev

Modified:
   haiku/trunk/src/kits/tracker/FilePanelPriv.cpp
Log:
* If you do something, please try to do it right, or at least test it.
* The alert escape check was broken in several ways. First of all, the buttons
  can be NULL which suddenly crashed apps. Second of all, the check didn't even
  work as it was reversed.
* Also, I disabled the code for now, as I really don't think string comparison
  heuristics are the way to solve this.


Modified: haiku/trunk/src/kits/tracker/FilePanelPriv.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/FilePanelPriv.cpp	2009-04-08 07:57:32 UTC (rev 30017)
+++ haiku/trunk/src/kits/tracker/FilePanelPriv.cpp	2009-04-08 08:23:07 UTC (rev 30018)
@@ -1390,15 +1390,15 @@
 		B_WIDTH_AS_USUAL, B_WARNING_ALERT);
 	alert->MoveTo(Frame().left + 10, Frame().top + 10);
 
-	if (strncmp(button1, "Cancel", 7))
+#if 0
+	if (button1 != NULL && !strncmp(button1, "Cancel", 7))
 		alert->SetShortcut(0, B_ESCAPE);
-
-	if (strncmp(button2, "Cancel", 7))
+	else if (button2 != NULL && !strncmp(button2, "Cancel", 7))
 		alert->SetShortcut(1, B_ESCAPE);
+	else if (button3 != NULL && !strncmp(button3, "Cancel", 7))
+		alert->SetShortcut(2, B_ESCAPE);	
+#endif
 
-	if (strncmp(button3, "Cancel", 7))
-		alert->SetShortcut(2, B_ESCAPE);	
-	
 	return alert->Go();
 }
 



From ingo_weinhold at gmx.de  Wed Apr  8 09:58:51 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Wed, 08 Apr 2009 09:58:51 +0200
Subject: [Haiku-commits] r29937 - in haiku/trunk:
 headers/private/interface src/kits/interface src/servers/app
 src/servers/app/drawing
In-Reply-To: <257225696-BeMail@laptop>
References: <257225696-BeMail@laptop>
Message-ID: <20090408095851.543.3@knochen-vm.localdomain>


On 2009-04-08 at 10:02:12 [+0200], Fran?ois Revol <revol at free.fr> wrote:
> > On Sun, Apr 5, 2009 at 10:59 AM,  <stippi at mail.berlios.de> wrote:
> > >
> > > Begun to use structs for the BView<->app_server communication.
> > 
> > Nice change! I think this makes the code much more readable too. Plus
> > there is no chance of accidentally swapping parameter order when
> > reading or writing to the link. I know I fixed at least one such bug
> > in app_server, and I haven't done much app_server bug fixing. Of
> > course the speed increase is a nice benefit.
> 
> OTH it breaks possible network use due to endianness issues on multiple
> platforms...

ATM we have neither network remote GUI support nor multiple platforms 
supporting it. Besides I would be in favor of implementing that 
transparently to the application in that it would always talk to the local 
app server with the app server using a special protocol forwarding the 
connection to the remote app server. This way it would even be possible to 
migrate the application GUI transparently to another machine 
(home<->phone<->work).

CU, Ingo


From superstippi at gmx.de  Wed Apr  8 10:49:14 2009
From: superstippi at gmx.de (=?utf-8?q?Stephan_A=C3=9Fmus?=)
Date: Wed, 08 Apr 2009 10:49:14 +0200
Subject: [Haiku-commits] r29937 - in haiku/trunk:
 headers/private/interface src/kits/interface src/servers/app
 src/servers/app/drawing
In-Reply-To: <a4855ac50904072135g3a7ea764v2d6a936f4f476994@mail.gmail.com>
References: <200904051459.n35ExpcT005548@sheep.berlios.de>
	<a4855ac50904072135g3a7ea764v2d6a936f4f476994@mail.gmail.com>
Message-ID: <20090408104914.1103.1@bepc.1239180065.fake>


On 2009-04-08 at 10:41:31 [+0200], Ryan Leavengood <leavengood at gmail.com> 
wrote:
> On Sun, Apr 5, 2009 at 10:59 AM,  <stippi at mail.berlios.de> wrote:
> >
> > Begun to use structs for the BView<->app_server communication.
> 
> Nice change! I think this makes the code much more readable too. Plus 
> there is no chance of accidentally swapping parameter order when reading 
> or writing to the link. I know I fixed at least one such bug in 
> app_server, and I haven't done much app_server bug fixing. Of course the 
> speed increase is a nice benefit.
> 
> Still like you said it is worth investigating why the link stuff is so 
> slow. Could it be the use of templates?

No, it appears I was fooled by my processor skipping beats to prevent 
over-heating. My changes did improve certain stuff, especially text 
rendering, but not by that huge margin. Bummer. It looks like notebooks 
these days are designed for the usual case of modern OS reducing speed when 
there is nothing to do. Haiku always runs the CPUs at full speed and it 
looks as though this causes them to go into anti-overheating-mode after a 
while (IBM/Lenovo T60). It became apparent after Ingo also got really weird 
benchmarking results and after a few other hints until we finally figured 
it out.

Best regards,
-Stephan


From revol at free.fr  Wed Apr  8 10:54:25 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Wed, 08 Apr 2009 10:54:25 +0200 CEST
Subject: [Haiku-commits] r29937 - in haiku/trunk:
 headers/private/interface src/kits/interface src/servers/app
 src/servers/app/drawing
In-Reply-To: <20090408104914.1103.1@bepc.1239180065.fake>
Message-ID: <3390735753-BeMail@laptop>

> 
> On 2009-04-08 at 10:41:31 [+0200], Ryan Leavengood <
> leavengood at gmail.com> 
> wrote:
> > On Sun, Apr 5, 2009 at 10:59 AM,  <stippi at mail.berlios.de> wrote:
> > >
> > > Begun to use structs for the BView<->app_server communication.
> > 
> > Nice change! I think this makes the code much more readable too. 
> > Plus 
> > there is no chance of accidentally swapping parameter order when 
> > reading 
> > or writing to the link. I know I fixed at least one such bug in 
> > app_server, and I haven't done much app_server bug fixing. Of 
> > course the 
> > speed increase is a nice benefit.
> > 
> > Still like you said it is worth investigating why the link stuff is 
> > so 
> > slow. Could it be the use of templates?
> 
> No, it appears I was fooled by my processor skipping beats to prevent 
> over-heating. My changes did improve certain stuff, especially text 
> rendering, but not by that huge margin. Bummer. It looks like 
> notebooks 
> these days are designed for the usual case of modern OS reducing 
> speed when 
> there is nothing to do. Haiku always runs the CPUs at full speed and 
> it 
> looks as though this causes them to go into anti-overheating-mode 
> after a 
> while (IBM/Lenovo T60). It became apparent after Ingo also got really 
> weird 
> benchmarking results and after a few other hints until we finally 
> figured 
> it out.
> 

Eh...
Is your processor rated correctly ?
I mean, if they claim 3GHz but can't stay there without burning then 
they are lying :p

Fran?ois.


From bonefish at mail.berlios.de  Wed Apr  8 11:51:03 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 8 Apr 2009 11:51:03 +0200
Subject: [Haiku-commits] r30019 - haiku/trunk/build/jam
Message-ID: <200904080951.n389p3lF023088@sheep.berlios.de>

Author: bonefish
Date: 2009-04-08 11:51:01 +0200 (Wed, 08 Apr 2009)
New Revision: 30019
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30019&view=rev

Modified:
   haiku/trunk/build/jam/MiscRules
Log:
Added rule SetupFeatureObjectsDir that simplifies using different output
directories when a certain feature is enabled/disabled/configured a certain
way.


Modified: haiku/trunk/build/jam/MiscRules
===================================================================
--- haiku/trunk/build/jam/MiscRules	2009-04-08 08:23:07 UTC (rev 30018)
+++ haiku/trunk/build/jam/MiscRules	2009-04-08 09:51:01 UTC (rev 30019)
@@ -1,6 +1,11 @@
 
 rule SetupObjectsDir
 {
+	# SetupObjectsDir
+	#
+	# Internal rule used to set up the *{LOCATE,SEARCH}*_{TARGET,SOURCE}
+	# variables for the current directory.
+
 	local relPath = [ FDirName $(SUBDIR_TOKENS[2-]) ] ;
 	if $(relPath) = . {
 		relPath = ;
@@ -24,6 +29,35 @@
 	;
 }
 
+rule SetupFeatureObjectsDir feature
+{
+	# SetupFeatureObjectsDir <feature>
+	#
+	# Updates the *{LOCATE,SEARCH}*_{TARGET,SOURCE} variables for the current
+	# directory appending a <feature> to each of them. Note that it resets
+	# the LOCATE_TARGET, LOCATE_SOURCE, SEARCH_SOURCE (!) variables. I.e. it
+	# should be invoked before customizing these variables further (e.g. like
+	# adding additional source directories to SEARCH_SOURCE).
+
+	COMMON_PLATFORM_LOCATE_TARGET
+		= [ FDirName $(COMMON_PLATFORM_LOCATE_TARGET) $(feature) ] ;
+
+	local var ;
+	for var in COMMON_ARCH COMMON_DEBUG DEBUG_$(HAIKU_DEBUG_LEVELS) {
+		HOST_$(var)_LOCATE_TARGET
+			= [ FDirName $(HOST_$(var)_LOCATE_TARGET) $(feature) ] ;
+		TARGET_$(var)_LOCATE_TARGET
+			= [ FDirName $(TARGET_$(var)_LOCATE_TARGET) $(feature) ] ;
+	}
+
+	LOCATE_TARGET = [ FDirName $(LOCATE_TARGET) $(feature) ] ;
+	LOCATE_SOURCE = $(LOCATE_TARGET) ;
+	SEARCH_SOURCE = $(SUBDIR) $(LOCATE_SOURCE)
+		$(HOST_COMMON_DEBUG_LOCATE_TARGET)		# Also add the standard output
+		$(TARGET_COMMON_DEBUG_LOCATE_TARGET)	# dirs for generated sources.
+	;
+}
+
 rule SubIncludeGPL
 {
 	# SubInclude rule that can be used to conditionally include GPL licensed



From bonefish at mail.berlios.de  Wed Apr  8 11:55:34 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 8 Apr 2009 11:55:34 +0200
Subject: [Haiku-commits] r30020 - haiku/trunk/build/jam
Message-ID: <200904080955.n389tYWw023698@sheep.berlios.de>

Author: bonefish
Date: 2009-04-08 11:55:33 +0200 (Wed, 08 Apr 2009)
New Revision: 30020
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30020&view=rev

Modified:
   haiku/trunk/build/jam/FileRules
   haiku/trunk/build/jam/ImageRules
Log:
* Added UnzipArchive rule which unzips a zip file into a target directory.
* Added DownloadOptionalPackage which is mainly a wrapper around DownloadFile
  preventing the package from being downloaded twice, even if invoked more
  than once.
* InstallOptionalHaikuImagePackage uses DownloadOptionalPackage now.


Modified: haiku/trunk/build/jam/FileRules
===================================================================
--- haiku/trunk/build/jam/FileRules	2009-04-08 09:51:01 UTC (rev 30019)
+++ haiku/trunk/build/jam/FileRules	2009-04-08 09:55:33 UTC (rev 30020)
@@ -189,6 +189,66 @@
 }
 
 
+rule UnzipArchive directory : entries : zipFile : grist
+{
+	# UnzipArchive <directory> : <entries> : <zipFile> [ : <grist> ]
+	#
+	# Unzips the zip file target <zipFile> to directory <directory>. The rule
+	# can be called multiple times for different <entries> for the same
+	# <directory> and <zipFile> combo.
+	#
+	# <directory> - The directory into which to unzip the zip file. The
+	#               directory is created is by this rule and it is the target
+	#               that the unzip action is associated with.
+	# <entries>   - The entries of the zip file one is interested in. The rule
+	#               always unzips the complete zip file, from the given entries
+	#               the rule creates targets (using <grist>) representing the
+	#               unzipped entries. Those targets are returned by the rule.
+	# <zipFile>   - The zip file target to unzip.
+	# <grist>     - The grist used to create targets from <entries>. Defaults to
+	#               "unzipped".
+
+	grist ?= unzipped ;
+
+	# Turn the entries into targets to build.
+	local targets ;
+	local entry ;
+	for entry in $(entries) {
+		local target = $(entry:G=$(grist)) ;
+		targets += $(target) ;
+	}
+
+	LOCATE on $(targets) = $(directory) ;
+	Depends $(targets) : $(directory) ;
+	NoUpdate $(targets) ;
+
+	# one-time initialization for the main target (the directory)
+	if ! [ on $(directory) return $(INITIALIZED) ] {
+		NoUpdate $(directory) ;
+		MakeLocate $(directory) : $(directory:P) ;
+		Depends $(directory) : $(zipFile) ;
+		UnzipArchive1 $(directory) : $(zipFile) ;
+		INITIALIZED on $(directory) = 1 ;
+	}
+
+	# Use a dummy rule so that it looks to jam like the targets are actually
+	# built from the directory target.
+	UnzipArchiveDummy $(targets) : $(directory) ;
+
+	return $(targets) ;
+}
+
+actions UnzipArchive1
+{
+	mkdir -p $(1[1])
+	unzip -q -u -o -d $(1[1]) $(2)
+}
+
+actions UnzipArchiveDummy
+{
+}
+
+
 rule ObjectReference
 {
 	# ObjectReference <reference object> : <source object>
@@ -299,3 +359,21 @@
 {
 	wget -O $(1) $(URL)
 }
+
+rule DownloadOptionalPackage package : url
+{
+	# download zip file
+	local zipFile = $(package:G=download).zip ;
+
+	# Request the download only once.
+	if [ on $(zipFile) return $(HAIKU_OPTIONAL_PACKAGE_DOWNLOAD) ] {
+		return $(zipFile) ;
+	}
+
+	HAIKU_OPTIONAL_PACKAGE_DOWNLOAD on $(zipFile) = 1 ;
+
+	MakeLocate $(zipFile) : $(HAIKU_DOWNLOAD_DIR) ;
+	DownloadFile $(zipFile) : $(url) ;
+
+	return $(zipFile) ;
+}

Modified: haiku/trunk/build/jam/ImageRules
===================================================================
--- haiku/trunk/build/jam/ImageRules	2009-04-08 09:51:01 UTC (rev 30019)
+++ haiku/trunk/build/jam/ImageRules	2009-04-08 09:55:33 UTC (rev 30020)
@@ -731,9 +731,7 @@
 rule InstallOptionalHaikuImagePackage package : url : dirTokens
 {
 	# download zip file
-	local zipFile = $(package:G=download).zip ;
-	MakeLocate $(zipFile) : $(HAIKU_DOWNLOAD_DIR) ;
-	DownloadFile $(zipFile) : $(url) ;
+	local zipFile = [ DownloadOptionalPackage $(package) : $(url) ] ;
 
 	# unzip onto image
 	UnzipArchiveToHaikuImage $(dirTokens) : $(zipFile) ;



From bonefish at mail.berlios.de  Wed Apr  8 12:07:28 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 8 Apr 2009 12:07:28 +0200
Subject: [Haiku-commits] r30021 - 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/bin/network/wget src/preferences/mail
Message-ID: <200904081007.n38A7S1b025435@sheep.berlios.de>

Author: bonefish
Date: 2009-04-08 12:07:17 +0200 (Wed, 08 Apr 2009)
New Revision: 30021
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30021&view=rev

Added:
   haiku/trunk/build/jam/OptionalBuildFeatures
   haiku/trunk/build/jam/OptionalPackageDependencies
Modified:
   haiku/trunk/Jamfile
   haiku/trunk/Jamrules
   haiku/trunk/build/jam/OptionalPackages
   haiku/trunk/build/jam/ReleaseBuildProfiles
   haiku/trunk/build/jam/UserBuildConfig.ReadMe
   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/bin/network/wget/Jamfile
   haiku/trunk/src/preferences/mail/Jamfile
Log:
* Moved the optional package dependency definitions into the new
  build/jam/OptionalPackageDependencies and include it earlier (before the
  Jamfiles).
* Introduced build/jam/OptionalBuildFeatures which is supposed to do the setup
  for optional build features that need it.
* Renamed USE_SSL to HAIKU_BUILD_FEATURE_SSL and made it more intelligent.
  The OpenSSL optional package is downloaded and unzipped automatically when
  enabled. Switching between enabled/disabled HAIKU_BUILD_FEATURE_SSL is
  handled gracefully -- the concerned components are built in separate
  subdirectories. Adding the OpenSSL optional package to the image also enables
  HAIKU_BUILD_FEATURE_SSL.


Modified: haiku/trunk/Jamfile
===================================================================
--- haiku/trunk/Jamfile	2009-04-08 09:55:33 UTC (rev 30020)
+++ haiku/trunk/Jamfile	2009-04-08 10:07:17 UTC (rev 30021)
@@ -132,6 +132,11 @@
 	Haiku
 ;
 
+# Evaluate optional package dependencies and prepare the optional build
+# features before parsing the Jamfile tree.
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalBuildFeatures ] ;
+
 # Optionally we allow not to include the "src" subdirectory.
 if $(HAIKU_DONT_INCLUDE_SRC) {
 	# Don't include "src", but at least include the stuff needed for the

Modified: haiku/trunk/Jamrules
===================================================================
--- haiku/trunk/Jamrules	2009-04-08 09:55:33 UTC (rev 30020)
+++ haiku/trunk/Jamrules	2009-04-08 10:07:17 UTC (rev 30021)
@@ -8,6 +8,8 @@
 HAIKU_OBJECT_DIR					= [ FDirName $(HAIKU_OUTPUT_DIR) objects ] ;
 HAIKU_COMMON_PLATFORM_OBJECT_DIR	= [ FDirName $(HAIKU_OBJECT_DIR) common ] ;
 HAIKU_DOWNLOAD_DIR					= [ FDirName $(HAIKU_OUTPUT_DIR) download ] ;
+HAIKU_OPTIONAL_BUILD_PACKAGES_DIR	= [ FDirName $(HAIKU_OUTPUT_DIR)
+											build_packages ] ;
 
 # Cache files for header scanning and jamfile caching
 HCACHEFILE = header_cache ;

Added: haiku/trunk/build/jam/OptionalBuildFeatures
===================================================================
--- haiku/trunk/build/jam/OptionalBuildFeatures	2009-04-08 09:55:33 UTC (rev 30020)
+++ haiku/trunk/build/jam/OptionalBuildFeatures	2009-04-08 10:07:17 UTC (rev 30021)
@@ -0,0 +1,47 @@
+# This file contains setup for features that can optionally be used for the
+# build. For features that require downloading a zip file from somewhere it is
+# likely the same file use for an optional package.
+
+
+# SSL
+
+# Automatically enable the SSL feature, when the optional OpenSSL optional
+# package is enabled.
+if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
+	HAIKU_BUILD_FEATURE_SSL = 1 ;
+}
+
+local baseURL = http://haiku-files.org/files/optional-packages ;
+HAIKU_OPENSSL_PACKAGE = openssl-0.9.8j-gcc2-2009-01-28 ;
+HAIKU_OPENSSL_URL = $(baseURL)/$(HAIKU_OPENSSL_PACKAGE).zip ;
+
+if $(HAIKU_BUILD_FEATURE_SSL) {
+	if $(TARGET_ARCH) != x86 {
+		Echo "SSL build feature not available for $(TARGET_ARCH)" ;
+	} else {
+		# Download the zip archive.
+		local zipFile = [ DownloadOptionalPackage $(HAIKU_OPENSSL_PACKAGE)
+			: $(HAIKU_OPENSSL_URL) ] ;
+
+		# zip file and output directory
+		HAIKU_OPENSSL_ZIP_FILE = $(zipFile) ;
+		HAIKU_OPENSSL_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
+			$(HAIKU_OPENSSL_PACKAGE) ] ;
+
+		# unzip headers and libraries
+		HAIKU_OPENSSL_HEADERS_DEPENDENCY = [ UnzipArchive $(HAIKU_OPENSSL_DIR)
+			: common/include/ : $(zipFile)
+		] ;
+
+		HAIKU_OPENSSL_LIBS = [ UnzipArchive $(HAIKU_OPENSSL_DIR)
+			:
+			common/lib/libcrypto.so
+			common/lib/libssl.so
+			: $(zipFile)
+		] ;
+
+		HAIKU_OPENSSL_ENABLED = 1 ;
+		HAIKU_OPENSSL_HEADERS
+			= [ FDirName $(HAIKU_OPENSSL_DIR) common include ] ;
+	}
+}

Added: haiku/trunk/build/jam/OptionalPackageDependencies
===================================================================
--- haiku/trunk/build/jam/OptionalPackageDependencies	2009-04-08 09:55:33 UTC (rev 30020)
+++ haiku/trunk/build/jam/OptionalPackageDependencies	2009-04-08 10:07:17 UTC (rev 30021)
@@ -0,0 +1,9 @@
+# package dependencies
+
+OptionalPackageDependencies APR-util : APR ;
+OptionalPackageDependencies BeHappy : BeBook NetSurf ;
+OptionalPackageDependencies Development : Perl ;
+OptionalPackageDependencies LibLayout : Development ;
+OptionalPackageDependencies NetSurf : OpenSSL ;
+OptionalPackageDependencies OpenSSH : OpenSSL ;
+OptionalPackageDependencies Subversion : OpenSSL ;

Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages	2009-04-08 09:55:33 UTC (rev 30020)
+++ haiku/trunk/build/jam/OptionalPackages	2009-04-08 10:07:17 UTC (rev 30021)
@@ -43,16 +43,6 @@
 #	Yasm
 
 
-# package dependencies
-OptionalPackageDependencies APR-util : APR ;
-OptionalPackageDependencies BeHappy : BeBook NetSurf ;
-OptionalPackageDependencies Development : Perl ;
-OptionalPackageDependencies LibLayout : Development ;
-OptionalPackageDependencies NetSurf : OpenSSL ;
-OptionalPackageDependencies OpenSSH : OpenSSL ;
-OptionalPackageDependencies Subversion : OpenSSL ;
-
-
 # APR
 if [ IsOptionalHaikuImagePackageAdded APR ] {
 	if $(TARGET_ARCH) != x86 {
@@ -446,16 +436,14 @@
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package OpenSSL available for $(TARGET_ARCH)" ;
 	} else {
-		local baseURL = http://haiku-files.org/files/optional-packages ;
-		InstallOptionalHaikuImagePackage openssl-0.9.8j-gcc2-2009-01-28
-			: $(baseURL)/openssl-0.9.8j-gcc2-2009-01-28.zip
+		InstallOptionalHaikuImagePackage $(HAIKU_OPENSSL_PACKAGE)
+			: $(HAIKU_OPENSSL_URL)
 			:
 		;
 	}
 }
 
 
-
 # P7zip
 if [ IsOptionalHaikuImagePackageAdded P7zip ] {
 	if $(TARGET_ARCH) != x86 {
@@ -481,8 +469,6 @@
 }
 
 
-
-
 # Pe text editor
 if [ IsOptionalHaikuImagePackageAdded Pe ] {
 	if $(TARGET_ARCH) != x86 {

Modified: haiku/trunk/build/jam/ReleaseBuildProfiles
===================================================================
--- haiku/trunk/build/jam/ReleaseBuildProfiles	2009-04-08 09:55:33 UTC (rev 30020)
+++ haiku/trunk/build/jam/ReleaseBuildProfiles	2009-04-08 10:07:17 UTC (rev 30021)
@@ -9,7 +9,6 @@
 		AddGroupToHaikuImage party : 101 : user sshd ;
 		HAIKU_IMAGE_HOST_NAME = shredder ;
 		HAIKU_IMAGE_SIZE = 400 ;
-		USE_SSL = 1 ;
 
 		AddOptionalHaikuImagePackages BePDF Firefox Pe Vision VLC WonderBrush ;
 		AddOptionalHaikuImagePackages CVS Development Subversion OpenSSH Yasm ;

Modified: haiku/trunk/build/jam/UserBuildConfig.ReadMe
===================================================================
--- haiku/trunk/build/jam/UserBuildConfig.ReadMe	2009-04-08 09:55:33 UTC (rev 30020)
+++ haiku/trunk/build/jam/UserBuildConfig.ReadMe	2009-04-08 10:07:17 UTC (rev 30021)
@@ -49,7 +49,12 @@
 # has no effect on executables or other shared objects.
 DEBUG on <src!bin!gdb!gdb!>haiku-nat.o = 1 ;
 
+# Enables the SSL build feature. Several targets will be compiled with SSL
+# support. Adding the OpenSSL optional package will automatically enable this
+# feature.
+HAIKU_BUILD_FEATURE_SSL = 1 ;
 
+
 # Haiku Image Related Modifications
 
 # Create a 100 MB image at /tmp/walter.image.

Modified: haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile	2009-04-08 09:55:33 UTC (rev 30020)
+++ haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile	2009-04-08 10:07:17 UTC (rev 30021)
@@ -11,29 +11,30 @@
 
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
-local sslDir ;
+local sources =
+	imap_client.cpp
+	imap_config.cpp
+	NestedString.cpp
+;
 
-if $(USE_SSL) {
+# use OpenSSL, if enabled
+if $(HAIKU_OPENSSL_ENABLED) {
 	SubDirC++Flags -DUSE_SSL ;
-	if ! $(SSL_DIR) {
-		sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl common ] ;
-	} else {
-		sslDir = $(SSL_DIR) ;
-	}
-	SubDirSysHdrs [ FDirName $(sslDir) include ] ;
+	SubDirSysHdrs $(HAIKU_OPENSSL_HEADERS) ;
+	Includes [ FGristFiles $(sources) ] : $(HAIKU_OPENSSL_HEADERS_DEPENDENCY) ;
+		# Dependency needed to trigger downloading/unzipping the package before
+		# compiling the files.
+	SetupFeatureObjectsDir ssl ;
+} else {
+	SetupFeatureObjectsDir no-ssl ;
 }
 
-Addon IMAP :
-	imap_client.cpp
-	imap_config.cpp
-	NestedString.cpp ;
+Addon IMAP
+	: $(sources)
+	: be libmail.so $(TARGET_NETWORK_LIBS) $(HAIKU_OPENSSL_LIBS)
+;
 
-LinkAgainst IMAP : be libmail.so $(TARGET_NETWORK_LIBS) ;
-
-if $(USE_SSL) {
-	LinkAgainst IMAP : $(sslDir)/lib/libssl.so $(sslDir)/lib/libcrypto.so ;
-}
-
 Package haiku-maildaemon-cvs :
 	IMAP :
-	boot home config add-ons mail_daemon inbound_protocols ;
+	boot home config add-ons mail_daemon inbound_protocols
+;

Modified: haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile	2009-04-08 09:55:33 UTC (rev 30020)
+++ haiku/trunk/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile	2009-04-08 10:07:17 UTC (rev 30021)
@@ -11,30 +11,31 @@
 
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
-local sslDir ;
-
-if $(USE_SSL) {
-	SubDirC++Flags -DUSE_SSL ;
-	if ! $(SSL_DIR) {
-		sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl common ] ;
-	} else {
-		sslDir = $(SSL_DIR) ;
-	}
-	SubDirSysHdrs [ FDirName $(sslDir) include ] ;
-}
-
-Addon POP3 :
+local sources =
 	MessageIO.cpp
 	pop3.cpp
 	SimpleMailProtocol.cpp
-	md5c.c ;
+	md5c.c
+;
 
-LinkAgainst POP3 : be libmail.so $(TARGET_NETWORK_LIBS) ;
-
-if $(USE_SSL) {
-	LinkAgainst POP3 : $(sslDir)/lib/libssl.so $(sslDir)/lib/libcrypto.so ;
+# use OpenSSL, if enabled
+if $(HAIKU_OPENSSL_ENABLED) {
+	SubDirC++Flags -DUSE_SSL ;
+	SubDirSysHdrs $(HAIKU_OPENSSL_HEADERS) ;
+	Includes [ FGristFiles $(sources) ] : $(HAIKU_OPENSSL_HEADERS_DEPENDENCY) ;
+		# Dependency needed to trigger downloading/unzipping the package before
+		# compiling the files.
+	SetupFeatureObjectsDir ssl ;
+} else {
+	SetupFeatureObjectsDir no-ssl ;
 }
 
+Addon POP3
+	: $(sources)
+	: be libmail.so $(TARGET_NETWORK_LIBS) $(HAIKU_OPENSSL_LIBS)
+;
+
 Package haiku-maildaemon-cvs :
 	POP3 :
-	boot home config add-ons mail_daemon inbound_protocols ;
+	boot home config add-ons mail_daemon inbound_protocols
+;

Modified: haiku/trunk/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile	2009-04-08 09:55:33 UTC (rev 30020)
+++ haiku/trunk/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile	2009-04-08 10:07:17 UTC (rev 30021)
@@ -11,26 +11,30 @@
 
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
-if $(USE_SSL) {
+local sources =
+	smtp.cpp
+	md5c.c
+;
+
+# use OpenSSL, if enabled
+if $(HAIKU_OPENSSL_ENABLED) {
 	SubDirC++Flags -DUSE_SSL ;
-	if ! $(SSL_DIR) {
-		sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl common ] ;
-	} else {
-		sslDir = $(SSL_DIR) ;
-	}
-	SubDirSysHdrs [ FDirName $(sslDir) include ] ;
+	SubDirSysHdrs $(HAIKU_OPENSSL_HEADERS) ;
+	Includes [ FGristFiles $(sources) ] : $(HAIKU_OPENSSL_HEADERS_DEPENDENCY) ;
+		# Dependency needed to trigger downloading/unzipping the package before
+		# compiling the files.
+	SetupFeatureObjectsDir ssl ;
+} else {
+	SetupFeatureObjectsDir no-ssl ;
 }
 
-Addon SMTP :
-	smtp.cpp
-	md5c.c ;
+Addon SMTP
+	: $(sources)
+	: be libmail.so $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++)
+		$(HAIKU_OPENSSL_LIBS)
+;
 
-LinkAgainst SMTP : be libmail.so $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++) ;
-
-if $(USE_SSL) {
-	LinkAgainst SMTP : $(sslDir)/lib/libssl.so $(sslDir)/lib/libcrypto.so ;
-}
-
 Package haiku-maildaemon-cvs :
 	SMTP :
-	boot home config add-ons mail_daemon outbound_protocols ;
+	boot home config add-ons mail_daemon outbound_protocols
+;

Modified: haiku/trunk/src/bin/network/wget/Jamfile
===================================================================
--- haiku/trunk/src/bin/network/wget/Jamfile	2009-04-08 09:55:33 UTC (rev 30020)
+++ haiku/trunk/src/bin/network/wget/Jamfile	2009-04-08 10:07:17 UTC (rev 30021)
@@ -1,28 +1,34 @@
 SubDir HAIKU_TOP src bin network wget ;
 
 UseHeaders [ FDirName $(SUBDIR) src ] : true ;
-SEARCH_SOURCE += [ FDirName $(SUBDIR) src ] ;
 
 local defines = [ FDefines HAVE_CONFIG_H=1 ] ;
 
 SubDirCcFlags $(defines) ;
 SubDirC++Flags $(defines) ;
 
-local SSL_FILES ;
-local SSL_LIBS ;
 
-if $(USE_SSL) {
+# use OpenSSL, if enabled
+local sslSources ;
+
+if $(HAIKU_OPENSSL_ENABLED) {
 	SubDirCcFlags -DHAVE_LIBSSL ;
-	if ! $(SSL_DIR) {
-		sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl common ] ;
-	} else {
-		sslDir = $(SSL_DIR) ;
-	}
-	SubDirSysHdrs [ FDirName $(sslDir) include ] ;
-	SSL_FILES = openssl.c ;
-	SSL_LIBS = $(sslDir)/lib/libssl.so $(sslDir)/lib/libcrypto.so ;
-} 
+	SubDirSysHdrs $(HAIKU_OPENSSL_HEADERS) ;
+	sslSources = openssl.c ;
+	Includes [ FGristFiles $(sslSources) ]
+		: $(HAIKU_OPENSSL_HEADERS_DEPENDENCY) ;
+		# Dependency needed to trigger downloading/unzipping the package before
+		# compiling the files.
+	SetupFeatureObjectsDir ssl ;
+} else {
+	SetupFeatureObjectsDir no-ssl ;
+}
 
+
+SEARCH_SOURCE += [ FDirName $(SUBDIR) src ] ;
+	# needs to be invoked after SetupFeatureObjectsDir
+
+
 BinCommand wget :
 	cmpt.c
 	connect.c
@@ -55,6 +61,6 @@
 	utils.c
 	version.c
 	xmalloc.c
-	$(SSL_FILES)
-	: $(TARGET_NETWORK_LIBS) $(SSL_LIBS)
+	$(sslSources)
+	: $(TARGET_NETWORK_LIBS) $(HAIKU_OPENSSL_LIBS)
 ;

Modified: haiku/trunk/src/preferences/mail/Jamfile
===================================================================
--- haiku/trunk/src/preferences/mail/Jamfile	2009-04-08 09:55:33 UTC (rev 30020)
+++ haiku/trunk/src/preferences/mail/Jamfile	2009-04-08 10:07:17 UTC (rev 30021)
@@ -15,25 +15,12 @@
 UsePrivateHeaders shared ;
 
 # TODO(bga): E-mail preferences does not really need to link against the
-# OpenSSL libraries. Remove this after problems with the runtile loader are
+# OpenSSL libraries. Remove this after problems with the runtime loader are
 # sorted up. Details here:
 #
 # http://www.freelists.org/post/haiku-development/Runtime-loader-problem
 
-local sslDir ;
-
-if $(USE_SSL) {
-	SubDirC++Flags -DUSE_SSL ;
-	if ! $(SSL_DIR) {
-		sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl common ] ;
-	} else {
-		sslDir = $(SSL_DIR) ;
-	}
-	SubDirSysHdrs [ FDirName $(sslDir) include ] ;
-}
-
-
-Preference E-mail :
+local sources =
 	Account.cpp
 	AutoConfig.cpp
 	AutoConfigWindow.cpp
@@ -42,18 +29,30 @@
 	ConfigViews.cpp
 	ConfigWindow.cpp
 	DNSQuery.cpp
-	main.cpp 
-	: be libmail.so $(HAIKU_NETWORK_LIBS) $(TARGET_NETAPI_LIB)
-	: e-mail.rdef
-	;
+	main.cpp
+;
 
-if $(USE_SSL) {
-	LinkAgainst E-mail : $(sslDir)/lib/libssl.so $(sslDir)/lib/libcrypto.so ;
+if $(HAIKU_OPENSSL_ENABLED) {
+	SubDirC++Flags -DUSE_SSL ;
+	SubDirSysHdrs $(HAIKU_OPENSSL_HEADERS) ;
+	Includes [ FGristFiles $(sources) ] : $(HAIKU_OPENSSL_HEADERS_DEPENDENCY) ;
+		# Dependency needed to trigger downloading/unzipping the package before
+		# compiling the files.
+	SetupFeatureObjectsDir ssl ;
+} else {
+	SetupFeatureObjectsDir no-ssl ;
 }
 
+Preference E-mail
+	: $(sources)
+	: be libmail.so $(HAIKU_NETWORK_LIBS) $(TARGET_NETAPI_LIB)
+		$(HAIKU_OPENSSL_LIBS)
+	: e-mail.rdef
+;
+
 Package haiku-maildaemon-cvs :
-	E-mail : 
-	boot beos preferences ;
+	E-mail :
+	boot beos preferences
+;
 
 SubInclude HAIKU_TOP src preferences mail ProviderInfo ;
-



From bonefish at mail.berlios.de  Wed Apr  8 12:57:57 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 8 Apr 2009 12:57:57 +0200
Subject: [Haiku-commits] r30022 - in haiku/trunk: headers/compatibility/bsd
	src/libs/bsd
Message-ID: <200904081057.n38AvvQ7019429@sheep.berlios.de>

Author: bonefish
Date: 2009-04-08 12:57:46 +0200 (Wed, 08 Apr 2009)
New Revision: 30022
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30022&view=rev

Added:
   haiku/trunk/headers/compatibility/bsd/string.h
   haiku/trunk/src/libs/bsd/string.cpp
Modified:
   haiku/trunk/src/libs/bsd/Jamfile
Log:
Added a strsep() to our BSD compatibility library.


Added: haiku/trunk/headers/compatibility/bsd/string.h
===================================================================
--- haiku/trunk/headers/compatibility/bsd/string.h	2009-04-08 10:07:17 UTC (rev 30021)
+++ haiku/trunk/headers/compatibility/bsd/string.h	2009-04-08 10:57:46 UTC (rev 30022)
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2009, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _BSD_STRING_H_
+#define _BSD_STRING_H_
+
+
+#include_next <string.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+char* strsep(char** string, const char* delimiters);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _BSD_STRING_H_ */

Modified: haiku/trunk/src/libs/bsd/Jamfile
===================================================================
--- haiku/trunk/src/libs/bsd/Jamfile	2009-04-08 10:07:17 UTC (rev 30021)
+++ haiku/trunk/src/libs/bsd/Jamfile	2009-04-08 10:57:46 UTC (rev 30022)
@@ -13,6 +13,7 @@
 	progname.c
 	pty.cpp
 	signal.c
+	string.cpp
 	stringlist.c
 	unvis.c
 	usershell.c

Added: haiku/trunk/src/libs/bsd/string.cpp
===================================================================
--- haiku/trunk/src/libs/bsd/string.cpp	2009-04-08 10:07:17 UTC (rev 30021)
+++ haiku/trunk/src/libs/bsd/string.cpp	2009-04-08 10:57:46 UTC (rev 30022)
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2009, Ingo Weinhold, ingo_weinhold at gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include <string.h>
+
+
+char*
+strsep(char** string, const char* delimiters)
+{
+	if (*string == NULL)
+		return NULL;
+
+	// find the end of the token
+	char* token = *string;
+	char* end = token;
+	while (*end != '\0' && strchr(delimiters, *end) == NULL)
+		end++;
+
+	// terminate the token and update the string pointer
+	if (*end != '\0') {
+		*end = '\0';
+		*string = end + 1;
+	} else
+		*string = NULL;
+
+	return token;
+}



From bonefish at mail.berlios.de  Wed Apr  8 12:58:57 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 8 Apr 2009 12:58:57 +0200
Subject: [Haiku-commits] r30023 -
	haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on
Message-ID: <200904081058.n38AwvLw020325@sheep.berlios.de>

Author: bonefish
Date: 2009-04-08 12:58:50 +0200 (Wed, 08 Apr 2009)
New Revision: 30023
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30023&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/kernel_interface.cpp
Log:
Also print the retrieved type and flags.


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	2009-04-08 10:57:46 UTC (rev 30022)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/kernel_interface.cpp	2009-04-08 10:58:50 UTC (rev 30023)
@@ -215,7 +215,8 @@
 		fsNode->ops = ops;
 	}
 
-	PRINT(("userlandfs_get_vnode() done: (%lx, %p)\n", error, node));
+	PRINT(("userlandfs_get_vnode() done: (%lx, %p, %#x, %#lx)\n", error, node,
+		*_type, *_flags));
 	return error;
 }
 



From bonefish at mail.berlios.de  Wed Apr  8 13:18:08 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 8 Apr 2009 13:18:08 +0200
Subject: [Haiku-commits] r30024 -
	haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse
Message-ID: <200904081118.n38BI8JJ011655@sheep.berlios.de>

Author: bonefish
Date: 2009-04-08 13:18:04 +0200 (Wed, 08 Apr 2009)
New Revision: 30024
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30024&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.h
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp
Log:
Implemented more of the detailed FUSE initialization functions for file systems
that use them directly instead of fuse_main().


Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp	2009-04-08 10:58:50 UTC (rev 30023)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp	2009-04-08 11:18:04 UTC (rev 30024)
@@ -272,11 +272,19 @@
 	fFUSEConfig = *config;
 
 	// do the initialization
-	status_t error = _InitClientFS(ops, opSize, userData);
+	fInitStatus = _InitClientFS(ops, opSize, userData);
+	return fInitStatus;
+}
 
+
+status_t
+FUSEFileSystem::MainLoop(bool multithreaded)
+{
+	// TODO: Respect the multithreaded flag!
+
+PRINT(("FUSEFileSystem::FinishMounting()\n"));
 	// notify the mount thread
 PRINT(("  notifying mount thread\n"));
-	fInitStatus = error;
 	delete_sem(fInitSemaphore);
 
 	// loop until unmounting
@@ -287,10 +295,10 @@
 
 	fExitSemaphore = -1;
 
-	if (error == B_OK)
+	if (fFS != NULL)
 		fuse_fs_destroy(fFS);
 
-	return error;
+	return fExitStatus;
 }
 
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h	2009-04-08 10:58:50 UTC (rev 30023)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.h	2009-04-08 11:18:04 UTC (rev 30024)
@@ -47,6 +47,7 @@
 			status_t			FinishInitClientFS(fuse_config* config,
 									const fuse_operations* ops, size_t opSize,
 									void* userData);
+			status_t			MainLoop(bool multithreaded);
 
 private:
 			class ArgumentVector;

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c	2009-04-08 10:58:50 UTC (rev 30023)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c	2009-04-08 11:18:04 UTC (rev 30024)
@@ -10,9 +10,32 @@
 
 
 enum {
+	KEY_KERN_FLAG,
+	KEY_KERN_OPT,
+	KEY_FUSERMOUNT_OPT,
+	KEY_SUBTYPE_OPT,
+	KEY_MTAB_OPT,
+	KEY_ALLOW_ROOT,
+	KEY_RO,
 	KEY_HELP,
+	KEY_VERSION,
 };
 
+struct mount_opts {
+	int allow_other;
+	int allow_root;
+	int ishelp;
+	int flags;
+	int nonempty;
+	int blkdev;
+	char *fsname;
+	char *subtype;
+	char *subtype_opt;
+	char *mtab_opts;
+	char *fusermount_opts;
+	char *kernel_opts;
+};
+
 #define FUSE_LIB_OPT(t, p, v) { t, offsetof(struct fuse_config, p), v }
 
 static const struct fuse_opt fuse_lib_opts[] = {
@@ -46,7 +69,49 @@
 	FUSE_OPT_END
 };
 
+#define FUSE_MOUNT_OPT(t, p) { t, offsetof(struct mount_opts, p), 1 }
 
+static const struct fuse_opt fuse_mount_opts[] = {
+	FUSE_MOUNT_OPT("allow_other",	    allow_other),
+	FUSE_MOUNT_OPT("allow_root",	    allow_root),
+	FUSE_MOUNT_OPT("nonempty",	    nonempty),
+	FUSE_MOUNT_OPT("blkdev",	    blkdev),
+	FUSE_MOUNT_OPT("fsname=%s",	    fsname),
+	FUSE_MOUNT_OPT("subtype=%s",	    subtype),
+	FUSE_OPT_KEY("allow_other",	    KEY_KERN_OPT),
+	FUSE_OPT_KEY("allow_root",	    KEY_ALLOW_ROOT),
+	FUSE_OPT_KEY("nonempty",	    KEY_FUSERMOUNT_OPT),
+	FUSE_OPT_KEY("blkdev",		    KEY_FUSERMOUNT_OPT),
+	FUSE_OPT_KEY("fsname=",		    KEY_FUSERMOUNT_OPT),
+	FUSE_OPT_KEY("subtype=",	    KEY_SUBTYPE_OPT),
+	FUSE_OPT_KEY("large_read",	    KEY_KERN_OPT),
+	FUSE_OPT_KEY("blksize=",	    KEY_KERN_OPT),
+	FUSE_OPT_KEY("default_permissions", KEY_KERN_OPT),
+	FUSE_OPT_KEY("max_read=",	    KEY_KERN_OPT),
+	FUSE_OPT_KEY("max_read=",	    FUSE_OPT_KEY_KEEP),
+	FUSE_OPT_KEY("user=",		    KEY_MTAB_OPT),
+	FUSE_OPT_KEY("-r",		    KEY_RO),
+	FUSE_OPT_KEY("ro",		    KEY_KERN_FLAG),
+	FUSE_OPT_KEY("rw",		    KEY_KERN_FLAG),
+	FUSE_OPT_KEY("suid",		    KEY_KERN_FLAG),
+	FUSE_OPT_KEY("nosuid",		    KEY_KERN_FLAG),
+	FUSE_OPT_KEY("dev",		    KEY_KERN_FLAG),
+	FUSE_OPT_KEY("nodev",		    KEY_KERN_FLAG),
+	FUSE_OPT_KEY("exec",		    KEY_KERN_FLAG),
+	FUSE_OPT_KEY("noexec",		    KEY_KERN_FLAG),
+	FUSE_OPT_KEY("async",		    KEY_KERN_FLAG),
+	FUSE_OPT_KEY("sync",		    KEY_KERN_FLAG),
+	FUSE_OPT_KEY("dirsync",		    KEY_KERN_FLAG),
+	FUSE_OPT_KEY("atime",		    KEY_KERN_FLAG),
+	FUSE_OPT_KEY("noatime",		    KEY_KERN_FLAG),
+	FUSE_OPT_KEY("-h",		    KEY_HELP),
+	FUSE_OPT_KEY("--help",		    KEY_HELP),
+	FUSE_OPT_KEY("-V",		    KEY_VERSION),
+	FUSE_OPT_KEY("--version",	    KEY_VERSION),
+	FUSE_OPT_END
+};
+
+
 static int
 fuse_lib_opt_proc(void *data, const char *arg, int key,
 	struct fuse_args *outargs)
@@ -61,7 +126,7 @@
 
 
 int
-fuse_parse_config_args(struct fuse_args* args, struct fuse_config* config)
+fuse_parse_lib_config_args(struct fuse_args* args, struct fuse_config* config)
 {
 	return fuse_opt_parse(args, config, fuse_lib_opts, fuse_lib_opt_proc) == 0;
 }
@@ -73,3 +138,104 @@
 	return /*fuse_lowlevel_is_lib_option(opt) ||*/
 		fuse_opt_match(fuse_lib_opts, opt);
 }
+
+
+#if 0
+struct mount_flags {
+	const char *opt;
+	unsigned long flag;
+	int on;
+};
+
+static struct mount_flags mount_flags[] = {
+	{"rw",	    MS_RDONLY,	    0},
+	{"ro",	    MS_RDONLY,	    1},
+	{"suid",    MS_NOSUID,	    0},
+	{"nosuid",  MS_NOSUID,	    1},
+	{"dev",	    MS_NODEV,	    0},
+	{"nodev",   MS_NODEV,	    1},
+	{"exec",    MS_NOEXEC,	    0},
+	{"noexec",  MS_NOEXEC,	    1},
+	{"async",   MS_SYNCHRONOUS, 0},
+	{"sync",    MS_SYNCHRONOUS, 1},
+	{"atime",   MS_NOATIME,	    0},
+	{"noatime", MS_NOATIME,	    1},
+	{"dirsync", MS_DIRSYNC,	    1},
+	{NULL,	    0,		    0}
+};
+#endif	// 0
+
+static void set_mount_flag(const char *s, int *flags)
+{
+#if 0
+	int i;
+
+	for (i = 0; mount_flags[i].opt != NULL; i++) {
+		const char *opt = mount_flags[i].opt;
+		if (strcmp(opt, s) == 0) {
+			if (mount_flags[i].on)
+				*flags |= mount_flags[i].flag;
+			else
+				*flags &= ~mount_flags[i].flag;
+			return;
+		}
+	}
+	fprintf(stderr, "fuse: internal error, can't find mount flag\n");
+	abort();
+#endif
+}
+
+static int fuse_mount_opt_proc(void *data, const char *arg, int key,
+			       struct fuse_args *outargs)
+{
+	struct mount_opts *mo = data;
+
+	switch (key) {
+	case KEY_ALLOW_ROOT:
+		if (fuse_opt_add_opt(&mo->kernel_opts, "allow_other") == -1 ||
+		    fuse_opt_add_arg(outargs, "-oallow_root") == -1)
+			return -1;
+		return 0;
+
+	case KEY_RO:
+		arg = "ro";
+		/* fall through */
+	case KEY_KERN_FLAG:
+		set_mount_flag(arg, &mo->flags);
+		return 0;
+
+	case KEY_KERN_OPT:
+		return fuse_opt_add_opt(&mo->kernel_opts, arg);
+
+	case KEY_FUSERMOUNT_OPT:
+		return fuse_opt_add_opt(&mo->fusermount_opts, arg);
+
+	case KEY_SUBTYPE_OPT:
+		return fuse_opt_add_opt(&mo->subtype_opt, arg);
+
+	case KEY_MTAB_OPT:
+		return fuse_opt_add_opt(&mo->mtab_opts, arg);
+
+	case KEY_HELP:
+//		mount_help();
+		mo->ishelp = 1;
+		break;
+
+	case KEY_VERSION:
+//		mount_version();
+		mo->ishelp = 1;
+		break;
+	}
+	return 1;
+}
+
+
+int
+fuse_parse_mount_config_args(struct fuse_args* args)
+{
+	struct mount_opts mo;
+	memset(&mo, 0, sizeof(mo));
+
+	return args == 0
+		|| fuse_opt_parse(args, &mo, fuse_mount_opts, fuse_mount_opt_proc) == 0;
+}

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.h	2009-04-08 10:58:50 UTC (rev 30023)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.h	2009-04-08 11:18:04 UTC (rev 30024)
@@ -41,8 +41,11 @@
 extern "C" {
 #endif
 
-int fuse_parse_config_args(struct fuse_args* args, struct fuse_config* config);
+int fuse_parse_lib_config_args(struct fuse_args* args,
+	struct fuse_config* config);
 
+int fuse_parse_mount_config_args(struct fuse_args* args);
+
 #ifdef __cplusplus
 }
 #endif

Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp	2009-04-08 10:58:50 UTC (rev 30023)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_main.cpp	2009-04-08 11:18:04 UTC (rev 30024)
@@ -3,9 +3,13 @@
  * Distributed under the terms of the MIT License.
  */
 
+#include <errno.h>
 #include <signal.h>
 #include <stdio.h>
+#include <string.h>
 
+#include "Debug.h"
+
 #include "fuse_api.h"
 #include "fuse_config.h"
 #include "FUSEFileSystem.h"
@@ -19,10 +23,89 @@
 {
 printf("fuse_main_real(%d, %p, %p, %ld, %p)\n", argc, argv, op, opSize,
 userData);
+	// Note: We use the fuse_*() functions here to initialize and run the
+	// file system, although some of them are merely dummies.
 
-	// parse args
 	struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
 
+	int result = 1;
+
+	// create the kernel channel
+	struct fuse_chan* channel = fuse_mount("/dummy", &args);
+	if (channel != NULL) {
+		// create the FUSE handle
+		struct fuse* fuseHandle = fuse_new(channel, &args, op, opSize,
+			userData);
+		if (fuseHandle != NULL) {
+			// run the main loop
+			result = fuse_loop_mt(fuseHandle);
+
+			fuse_destroy(fuseHandle);
+		}
+
+		fuse_unmount("/dummy", channel);
+	}
+
+	fuse_opt_free_args(&args);
+
+	return result;
+}
+
+
+int
+fuse_version(void)
+{
+	return FUSE_VERSION;
+}
+
+
+struct fuse_context*
+fuse_get_context(void)
+{
+	RequestThread* requestThread = RequestThread::GetCurrentThread();
+	return requestThread != NULL
+		? (fuse_context*)requestThread->GetContext()->GetFSData()
+		: NULL;
+}
+
+
+struct fuse_chan*
+fuse_mount(const char* mountpoint, struct fuse_args* args)
+{
+	// make sure the stdin/out/err descriptors are open
+	while (true) {
+		int fd = open("/dev/null", O_RDONLY);
+		if (fd < 0) {
+			ERROR(("fuse_mount(): Failed to open /dev/null: %s\n",
+				strerror(errno)));
+			return NULL;
+		}
+
+		if (fd > 2) {
+			close(fd);
+			break;
+		}
+	}
+
+	if (!fuse_parse_mount_config_args(args))
+		return NULL;
+
+	return (fuse_chan*)FUSEFileSystem::GetInstance();
+}
+
+
+void
+fuse_unmount(const char* mountpoint, struct fuse_chan* ch)
+{
+	// nothing to do
+}
+
+
+struct fuse*
+fuse_new(struct fuse_chan* ch, struct fuse_args* args,
+	const struct fuse_operations *op, size_t opSize, void *userData)
+{
+	// parse args
 	fuse_config config;
 	memset(&config, 0, sizeof(config));
 	config.entry_timeout = 1.0;
@@ -30,33 +113,61 @@
 	config.negative_timeout = 0.0;
 	config.intr_signal = SIGUSR1;
 
-	bool success = fuse_parse_config_args(&args, &config);
-	fuse_opt_free_args(&args);
+	bool success = fuse_parse_lib_config_args(args, &config);
 
-	if (!success)
-		return 1;
+	if (!success) {
+		PRINT(("fuse_new(): failed to parse arguments!\n"));
+		return NULL;
+	}
 
 	// run the main loop
 	status_t error = FUSEFileSystem::GetInstance()->FinishInitClientFS(&config,
 		op, opSize, userData);
 
+	return error == B_OK ? (struct fuse*)FUSEFileSystem::GetInstance() : NULL;
+}
 
-	return error == B_OK ? 0 : 1;
+
+void
+fuse_destroy(struct fuse* f)
+{
+	// TODO: Implement!
 }
 
 
 int
-fuse_version(void)
+fuse_loop(struct fuse* f)
 {
-	return FUSE_VERSION;
+	status_t error = FUSEFileSystem::GetInstance()->MainLoop(false);
+	return error == B_OK ? 0 : -1;
 }
 
 
-struct fuse_context*
-fuse_get_context(void)
+int
+fuse_loop_mt(struct fuse* f)
 {
-	RequestThread* requestThread = RequestThread::GetCurrentThread();
-	return requestThread != NULL
-		? (fuse_context*)requestThread->GetContext()->GetFSData()
-		: NULL;
+	status_t error = FUSEFileSystem::GetInstance()->MainLoop(true);
+	return error == B_OK ? 0 : -1;
 }
+
+
+void
+fuse_exit(struct fuse* f)
+{
+	// TODO: Implement!
+}
+
+
+int
+fuse_interrupted(void)
+{
+	// TODO: ?
+	return false;
+}
+
+
+int
+fuse_invalidate(struct fuse* f, const char* path)
+{
+	return EINVAL;
+}



From bonefish at mail.berlios.de  Wed Apr  8 14:56:06 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 8 Apr 2009 14:56:06 +0200
Subject: [Haiku-commits] r30025 - haiku/trunk/src/system/kernel/debug
Message-ID: <200904081256.n38Cu69h019465@sheep.berlios.de>

Author: bonefish
Date: 2009-04-08 14:56:02 +0200 (Wed, 08 Apr 2009)
New Revision: 30025
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30025&view=rev

Added:
   haiku/trunk/src/system/kernel/debug/gdb.cpp
Removed:
   haiku/trunk/src/system/kernel/debug/gdb.c
Modified:
   haiku/trunk/src/system/kernel/debug/Jamfile
   haiku/trunk/src/system/kernel/debug/gdb.h
Log:
* Style cleanup.
* gdb.c -> gdb.cpp


Modified: haiku/trunk/src/system/kernel/debug/Jamfile
===================================================================
--- haiku/trunk/src/system/kernel/debug/Jamfile	2009-04-08 11:18:04 UTC (rev 30024)
+++ haiku/trunk/src/system/kernel/debug/Jamfile	2009-04-08 12:56:02 UTC (rev 30025)
@@ -14,7 +14,7 @@
 	debug_parser.cpp
 	debug_variables.cpp
 	frame_buffer_console.cpp
-	gdb.c
+	gdb.cpp
 	tracing.cpp
 	user_debugger.cpp
 

Deleted: haiku/trunk/src/system/kernel/debug/gdb.c

Copied: haiku/trunk/src/system/kernel/debug/gdb.cpp (from rev 29978, haiku/trunk/src/system/kernel/debug/gdb.c)
===================================================================
--- haiku/trunk/src/system/kernel/debug/gdb.c	2009-04-06 20:46:18 UTC (rev 29978)
+++ haiku/trunk/src/system/kernel/debug/gdb.cpp	2009-04-08 12:56:02 UTC (rev 30025)
@@ -0,0 +1,500 @@
+/*
+ * Copyright 2005-2007, Axel D?rfler, axeld at pinc-software.de.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 2002, Manuel J. Petit. All rights reserved.
+ * Distributed under the terms of the NewOS License.
+ */
+
+/** Contains the code to interface with a remote GDB */
+
+#include "gdb.h"
+
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include <ByteOrder.h>
+
+#include <arch/debug_console.h>
+#include <debug.h>
+#include <smp.h>
+#include <vm.h>
+
+
+enum { INIT = 0, CMDREAD, CKSUM1, CKSUM2, WAITACK, QUIT, GDBSTATES };
+
+
+static char sCommand[512];
+static int sCommandIndex;
+static int sCheckSum;
+
+static char sReply[512];
+static char sSafeMemory[512];
+
+
+// utility functions
+
+
+static int
+parse_nibble(int input)
+{
+	int nibble = 0xff;
+
+	if (input >= '0' && input <= '9')
+		nibble = input - '0';
+
+	if (input >= 'A' && input <= 'F')
+		nibble = 0x0a + input - 'A';
+
+	if (input >= 'a' && input <= 'f')
+		nibble = 0x0a + input - 'a';
+
+	return nibble;
+}
+
+
+//	#pragma mark - GDB protocol
+
+
+static void
+gdb_ack(void)
+{
+	arch_debug_serial_putchar('+');
+}
+
+
+static void
+gdb_nak(void)
+{
+	arch_debug_serial_putchar('-');
+}
+
+
+static void
+gdb_resend_reply(void)
+{
+	arch_debug_serial_puts(sReply);
+}
+
+
+static void
+gdb_reply(char const* format, ...)
+{
+	int i;
+	int len;
+	int sum;
+	va_list args;
+
+	va_start(args, format);
+	sReply[0] = '$';
+	vsprintf(sReply + 1, format, args);
+	va_end(args);
+
+	len = strlen(sReply);
+	sum = 0;
+	for (i = 1; i < len; i++) {
+		sum += sReply[i];
+	}
+	sum %= 256;
+
+	sprintf(sReply + len, "#%02x", sum);
+
+	gdb_resend_reply();
+}
+
+
+static void
+gdb_regreply(int const* regs, int numregs)
+{
+	int i;
+	int len;
+	int sum;
+
+	sReply[0] = '$';
+	for (i = 0; i < numregs; i++)
+		sprintf(sReply + 1 + 8 * i, "%08lx", B_HOST_TO_BENDIAN_INT32(regs[i]));
+
+	len = strlen(sReply);
+	sum = 0;
+	for (i = 1; i < len; i++)
+		sum += sReply[i];
+	sum %= 256;
+
+	sprintf(sReply + len, "#%02x", sum);
+
+	gdb_resend_reply();
+}
+
+
+static void
+gdb_memreply(char const* bytes, int numbytes)
+{
+	int i;
+	int len;
+	int sum;
+
+	sReply[0] = '$';
+	for (i = 0; i < numbytes; i++)
+		sprintf(sReply + 1 + 2 * i, "%02x", (uint8)bytes[i]);
+
+	len = strlen(sReply);
+	sum = 0;
+	for (i = 1; i < len; i++)
+		sum += sReply[i];
+	sum %= 256;
+
+	sprintf(sReply + len, "#%02x", sum);
+
+	gdb_resend_reply();
+}
+
+
+//	#pragma mark - checksum verification
+
+
+static int
+gdb_verify_checksum(void)
+{
+	int i;
+	int len;
+	int sum;
+
+	len = strlen(sCommand);
+	sum = 0;
+	for (i = 0; i < len; i++)
+		sum += sCommand[i];
+	sum %= 256;
+
+	return (sum == sCheckSum) ? 1 : 0;
+}
+
+
+//	#pragma mark - command parsing
+
+
+static int
+gdb_parse_command(void)
+{
+	if (!gdb_verify_checksum()) {
+		gdb_nak();
+		return INIT;
+	} else
+		gdb_ack();
+
+	switch (sCommand[0]) {
+		case 'H':
+			/*
+			 * Command H (actually Hct) is used to select
+			 * the current thread (-1 meaning all threads)
+			 * We just fake we recognize the the command
+			 * and send an 'OK' response.
+			 */
+			gdb_reply("OK");
+			break;
+
+		case 'q':
+			{
+				extern unsigned __data_start;
+				extern unsigned __bss_start;
+
+				/*
+				 * There are several q commands:
+				 *
+				 *     qXXXX        Request info about XXXX.
+				 *     QXXXX=yyyy   Set value of XXXX to yyyy.
+				 *     qOffsets     Get segment offsets
+				 *
+				 * Currently we only support the 'qOffsets'
+				 * form.
+				 *
+				 * *Note* that we actually have to lie,
+				 * At first thought looks like we should
+				 * return '_start', '__data_start' &
+				 * '__bss_start', however gdb gets
+				 * confused because the kernel link script
+				 * pre-links at 0x80000000. To keep gdb
+				 * gdb happy we just substract that amount.
+				 */
+				if (strcmp(sCommand + 1, "Offsets") == 0) {
+					gdb_reply("Text=%x;Data=%x;Bss=%x", 0,
+						((unsigned)(&__data_start)) - 0x80000000,
+						((unsigned)(&__bss_start)) - 0x80000000);
+				} else
+					gdb_reply("ENS");
+			}
+			break;
+
+		case '?':
+			/*
+			 * command '?' is used for retrieving the signal
+			 * that stopped the program. Fully implemeting
+			 * this command requires help from the debugger,
+			 * by now we just fake a SIGKILL
+			 */
+			gdb_reply("S09");	/* SIGKILL = 9 */
+			break;
+
+		case 'g':
+			{
+				int cpu;
+
+				/*
+				 * command 'g' is used for reading the register
+				 * file. Faked by now.
+				 *
+				 * For x86 the register order is:
+				 *
+				 *    eax, ebx, ecx, edx,
+				 *    esp, ebp, esi, edi,
+				 *    eip, eflags,
+				 *    cs, ss, ds, es
+				 *
+				 * Note that even thought the segment descriptors
+				 * are actually 16 bits wide, gdb requires them
+				 * as 32 bit integers. Note also that for some
+				 * reason (unknown to me) gdb wants the register
+				 * dump in *big endian* format.
+				 */
+				cpu = smp_get_current_cpu();
+				gdb_regreply(dbg_register_file[cpu], 14);
+			}
+			break;
+
+		case 'm':
+			{
+				char* ptr;
+				unsigned address;
+				unsigned len;
+
+				/*
+				 * The 'm' command has the form mAAA,LLL
+				 * where AAA is the address and LLL is the
+				 * number of bytes.
+				 */
+				ptr = sCommand + 1;
+				address = 0;
+				len = 0;
+				while (ptr && *ptr && (*ptr != ',')) {
+					address <<= 4;
+					address += parse_nibble(*ptr);
+					ptr += 1;
+				}
+				if (*ptr == ',')
+					ptr += 1;
+
+				while (ptr && *ptr) {
+					len <<= 4;
+					len += parse_nibble(*ptr);
+					ptr += 1;
+				}
+
+				if (len > 128)
+					len = 128;
+
+				/*
+				 * We cannot directly access the requested memory
+				 * for gdb may be trying to access an stray pointer
+				 * We copy the memory to a safe buffer using
+				 * the bulletproof user_memcpy().
+				 */
+				if (user_memcpy(sSafeMemory, (char*)address, len) < 0)
+					gdb_reply("E02");
+				else
+					gdb_memreply(sSafeMemory, len);
+			}
+			break;
+
+		case 'k':
+			/*
+			 * Command 'k' actual semantics is 'kill the damn thing'.
+			 * However gdb sends that command when you disconnect
+			 * from a debug session. I guess that 'kill' for the
+			 * kernel would map to reboot... however that's a
+			 * a very mean thing to do, instead we just quit
+			 * the gdb state machine and fallback to the regular
+			 * kernel debugger command prompt.
+			 */
+			return QUIT;
+
+		default:
+			gdb_reply("E01");
+			break;
+	}
+
+	return WAITACK;
+}
+
+
+//	#pragma mark - protocol state machine
+
+
+static int
+gdb_init_handler(int input)
+{
+	switch (input) {
+		case '$':
+			memset(sCommand, 0, sizeof(sCommand));
+			sCommandIndex = 0;
+			return CMDREAD;
+
+		default:
+#if 0
+			gdb_nak();
+#else
+			/*
+			 * looks to me like we should send
+			 * a NAK here but it kinda works
+			 * better if we just gobble all
+			 * junk chars silently
+			 */
+#endif
+			return INIT;
+	}
+}
+
+
+static int
+gdb_cmdread_handler(int input)
+{
+	switch (input) {
+		case '#':
+			return CKSUM1;
+
+		default:
+			sCommand[sCommandIndex] = input;
+			sCommandIndex += 1;
+			return CMDREAD;
+	}
+}
+
+
+static int
+gdb_cksum1_handler(int input)
+{
+	int nibble = parse_nibble(input);
+
+	if (nibble == 0xff) {
+#if 0
+		gdb_nak();
+		return INIT;
+#else
+		/*
+		 * looks to me like we should send
+		 * a NAK here but it kinda works
+		 * better if we just gobble all
+		 * junk chars silently
+		 */
+#endif
+	}
+
+	sCheckSum = nibble << 4;
+
+	return CKSUM2;
+}
+
+
+static int
+gdb_cksum2_handler(int input)
+{
+	int nibble = parse_nibble(input);
+
+	if (nibble == 0xff) {
+#if 0
+		gdb_nak();
+		return INIT;
+#else
+		/*
+		 * looks to me like we should send
+		 * a NAK here but it kinda works
+		 * better if we just gobble all
+		 * junk chars silently
+		 */
+#endif
+	}
+
+	sCheckSum += nibble;
+
+	return gdb_parse_command();
+}
+
+
+static int
+gdb_waitack_handler(int input)
+{
+	switch (input) {
+		case '+':
+			return INIT;
+		case '-':
+			gdb_resend_reply();
+			return WAITACK;
+
+		default:
+			/*
+			 * looks like gdb and us are out of synch,
+			 * send a NAK and retry from INIT state.
+			 */
+			gdb_nak();
+			return INIT;
+	}
+}
+
+
+static int
+gdb_quit_handler(int input)
+{
+	(void)(input);
+
+	/*
+	 * actually we should never be here
+	 */
+	return QUIT;
+}
+
+
+static int (*dispatch_table[GDBSTATES])(int) = {
+	&gdb_init_handler,
+	&gdb_cmdread_handler,
+	&gdb_cksum1_handler,
+	&gdb_cksum2_handler,
+	&gdb_waitack_handler,
+	&gdb_quit_handler
+};
+
+
+static int
+gdb_state_dispatch(int curr, int input)
+{
+	if (curr < INIT || curr >= GDBSTATES)
+		return QUIT;
+
+	return dispatch_table[curr](input);
+}
+
+
+static int
+gdb_state_machine(void)
+{
+	int state = INIT;
+	int c;
+
+	while (state != QUIT) {
+		c = arch_debug_serial_getchar();
+		state = gdb_state_dispatch(state, c);
+	}
+
+	return 0;
+}
+
+
+//	#pragma mark -
+
+
+int
+cmd_gdb(int argc, char** argv)
+{
+	(void)(argc);
+	(void)(argv);
+
+	return gdb_state_machine();
+}

Modified: haiku/trunk/src/system/kernel/debug/gdb.h
===================================================================
--- haiku/trunk/src/system/kernel/debug/gdb.h	2009-04-08 11:18:04 UTC (rev 30024)
+++ haiku/trunk/src/system/kernel/debug/gdb.h	2009-04-08 12:56:02 UTC (rev 30025)
@@ -8,6 +8,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-int cmd_gdb(int, char **);
 
+int cmd_gdb(int argc, char** argv);
+
 #endif



From bonefish at mail.berlios.de  Wed Apr  8 15:13:10 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 8 Apr 2009 15:13:10 +0200
Subject: [Haiku-commits] r30026 - haiku/trunk/src/system/kernel/debug
Message-ID: <200904081313.n38DDAU0021404@sheep.berlios.de>

Author: bonefish
Date: 2009-04-08 15:13:08 +0200 (Wed, 08 Apr 2009)
New Revision: 30026
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30026&view=rev

Modified:
   haiku/trunk/src/system/kernel/debug/gdb.cpp
Log:
Converted C to C++ comments.


Modified: haiku/trunk/src/system/kernel/debug/gdb.cpp
===================================================================
--- haiku/trunk/src/system/kernel/debug/gdb.cpp	2009-04-08 12:56:02 UTC (rev 30025)
+++ haiku/trunk/src/system/kernel/debug/gdb.cpp	2009-04-08 13:13:08 UTC (rev 30026)
@@ -184,12 +184,10 @@
 
 	switch (sCommand[0]) {
 		case 'H':
-			/*
-			 * Command H (actually Hct) is used to select
-			 * the current thread (-1 meaning all threads)
-			 * We just fake we recognize the the command
-			 * and send an 'OK' response.
-			 */
+			// Command H (actually Hct) is used to select
+			// the current thread (-1 meaning all threads)
+			// We just fake we recognize the the command
+			// and send an 'OK' response.
 			gdb_reply("OK");
 			break;
 
@@ -198,24 +196,22 @@
 				extern unsigned __data_start;
 				extern unsigned __bss_start;
 
-				/*
-				 * There are several q commands:
-				 *
-				 *     qXXXX        Request info about XXXX.
-				 *     QXXXX=yyyy   Set value of XXXX to yyyy.
-				 *     qOffsets     Get segment offsets
-				 *
-				 * Currently we only support the 'qOffsets'
-				 * form.
-				 *
-				 * *Note* that we actually have to lie,
-				 * At first thought looks like we should
-				 * return '_start', '__data_start' &
-				 * '__bss_start', however gdb gets
-				 * confused because the kernel link script
-				 * pre-links at 0x80000000. To keep gdb
-				 * gdb happy we just substract that amount.
-				 */
+				// There are several q commands:
+				//
+				//     qXXXX        Request info about XXXX.
+				//     QXXXX=yyyy   Set value of XXXX to yyyy.
+				//     qOffsets     Get segment offsets
+				//
+				// Currently we only support the 'qOffsets'
+				// form.
+				//
+				// *Note* that we actually have to lie,
+				// At first thought looks like we should
+				// return '_start', '__data_start' &
+				// '__bss_start', however gdb gets
+				// confused because the kernel link script
+				// pre-links at 0x80000000. To keep gdb
+				// gdb happy we just substract that amount.
 				if (strcmp(sCommand + 1, "Offsets") == 0) {
 					gdb_reply("Text=%x;Data=%x;Bss=%x", 0,
 						((unsigned)(&__data_start)) - 0x80000000,
@@ -226,12 +222,10 @@
 			break;
 
 		case '?':
-			/*
-			 * command '?' is used for retrieving the signal
-			 * that stopped the program. Fully implemeting
-			 * this command requires help from the debugger,
-			 * by now we just fake a SIGKILL
-			 */
+			// command '?' is used for retrieving the signal
+			// that stopped the program. Fully implemeting
+			// this command requires help from the debugger,
+			// by now we just fake a SIGKILL
 			gdb_reply("S09");	/* SIGKILL = 9 */
 			break;
 
@@ -239,23 +233,21 @@
 			{
 				int cpu;
 
-				/*
-				 * command 'g' is used for reading the register
-				 * file. Faked by now.
-				 *
-				 * For x86 the register order is:
-				 *
-				 *    eax, ebx, ecx, edx,
-				 *    esp, ebp, esi, edi,
-				 *    eip, eflags,
-				 *    cs, ss, ds, es
-				 *
-				 * Note that even thought the segment descriptors
-				 * are actually 16 bits wide, gdb requires them
-				 * as 32 bit integers. Note also that for some
-				 * reason (unknown to me) gdb wants the register
-				 * dump in *big endian* format.
-				 */
+				// command 'g' is used for reading the register
+				// file. Faked by now.
+				//
+				// For x86 the register order is:
+				//
+				//    eax, ebx, ecx, edx,
+				//    esp, ebp, esi, edi,
+				//    eip, eflags,
+				//    cs, ss, ds, es
+				//
+				// Note that even thought the segment descriptors
+				// are actually 16 bits wide, gdb requires them
+				// as 32 bit integers. Note also that for some
+				// reason (unknown to me) gdb wants the register
+				// dump in *big endian* format.
 				cpu = smp_get_current_cpu();
 				gdb_regreply(dbg_register_file[cpu], 14);
 			}
@@ -267,11 +259,9 @@
 				unsigned address;
 				unsigned len;
 
-				/*
-				 * The 'm' command has the form mAAA,LLL
-				 * where AAA is the address and LLL is the
-				 * number of bytes.
-				 */
+				// The 'm' command has the form mAAA,LLL
+				// where AAA is the address and LLL is the
+				// number of bytes.
 				ptr = sCommand + 1;
 				address = 0;
 				len = 0;
@@ -292,12 +282,10 @@
 				if (len > 128)
 					len = 128;
 
-				/*
-				 * We cannot directly access the requested memory
-				 * for gdb may be trying to access an stray pointer
-				 * We copy the memory to a safe buffer using
-				 * the bulletproof user_memcpy().
-				 */
+				// We cannot directly access the requested memory
+				// for gdb may be trying to access an stray pointer
+				// We copy the memory to a safe buffer using
+				// the bulletproof user_memcpy().
 				if (user_memcpy(sSafeMemory, (char*)address, len) < 0)
 					gdb_reply("E02");
 				else
@@ -306,15 +294,13 @@
 			break;
 
 		case 'k':
-			/*
-			 * Command 'k' actual semantics is 'kill the damn thing'.
-			 * However gdb sends that command when you disconnect
-			 * from a debug session. I guess that 'kill' for the
-			 * kernel would map to reboot... however that's a
-			 * a very mean thing to do, instead we just quit
-			 * the gdb state machine and fallback to the regular
-			 * kernel debugger command prompt.
-			 */
+			// Command 'k' actual semantics is 'kill the damn thing'.
+			// However gdb sends that command when you disconnect
+			// from a debug session. I guess that 'kill' for the
+			// kernel would map to reboot... however that's a
+			// a very mean thing to do, instead we just quit
+			// the gdb state machine and fallback to the regular
+			// kernel debugger command prompt.
 			return QUIT;
 
 		default:
@@ -342,12 +328,10 @@
 #if 0
 			gdb_nak();
 #else
-			/*
-			 * looks to me like we should send
-			 * a NAK here but it kinda works
-			 * better if we just gobble all
-			 * junk chars silently
-			 */
+			// looks to me like we should send
+			// a NAK here but it kinda works
+			// better if we just gobble all
+			// junk chars silently
 #endif
 			return INIT;
 	}
@@ -379,12 +363,10 @@
 		gdb_nak();
 		return INIT;
 #else
-		/*
-		 * looks to me like we should send
-		 * a NAK here but it kinda works
-		 * better if we just gobble all
-		 * junk chars silently
-		 */
+		// looks to me like we should send
+		// a NAK here but it kinda works
+		// better if we just gobble all
+		// junk chars silently
 #endif
 	}
 
@@ -404,12 +386,10 @@
 		gdb_nak();
 		return INIT;
 #else
-		/*
-		 * looks to me like we should send
-		 * a NAK here but it kinda works
-		 * better if we just gobble all
-		 * junk chars silently
-		 */
+		// looks to me like we should send
+		// a NAK here but it kinda works
+		// better if we just gobble all
+		// junk chars silently
 #endif
 	}
 
@@ -430,10 +410,8 @@
 			return WAITACK;
 
 		default:
-			/*
-			 * looks like gdb and us are out of synch,
-			 * send a NAK and retry from INIT state.
-			 */
+			// looks like gdb and us are out of sync,
+			// send a NAK and retry from INIT state.
 			gdb_nak();
 			return INIT;
 	}
@@ -445,9 +423,7 @@
 {
 	(void)(input);
 
-	/*
-	 * actually we should never be here
-	 */
+	// actually we should never be here
 	return QUIT;
 }
 



From bonefish at mail.berlios.de  Wed Apr  8 15:15:17 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 8 Apr 2009 15:15:17 +0200
Subject: [Haiku-commits] r30027 - haiku/trunk/src/system/kernel/debug
Message-ID: <200904081315.n38DFH0G021575@sheep.berlios.de>

Author: bonefish
Date: 2009-04-08 15:15:16 +0200 (Wed, 08 Apr 2009)
New Revision: 30027
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30027&view=rev

Modified:
   haiku/trunk/src/system/kernel/debug/gdb.cpp
Log:
More style fixes. Sorry, missed those before.


Modified: haiku/trunk/src/system/kernel/debug/gdb.cpp
===================================================================
--- haiku/trunk/src/system/kernel/debug/gdb.cpp	2009-04-08 13:13:08 UTC (rev 30026)
+++ haiku/trunk/src/system/kernel/debug/gdb.cpp	2009-04-08 13:15:16 UTC (rev 30027)
@@ -192,34 +192,35 @@
 			break;
 
 		case 'q':
-			{
-				extern unsigned __data_start;
-				extern unsigned __bss_start;
+		{
+			extern unsigned __data_start;
+			extern unsigned __bss_start;
 
-				// There are several q commands:
-				//
-				//     qXXXX        Request info about XXXX.
-				//     QXXXX=yyyy   Set value of XXXX to yyyy.
-				//     qOffsets     Get segment offsets
-				//
-				// Currently we only support the 'qOffsets'
-				// form.
-				//
-				// *Note* that we actually have to lie,
-				// At first thought looks like we should
-				// return '_start', '__data_start' &
-				// '__bss_start', however gdb gets
-				// confused because the kernel link script
-				// pre-links at 0x80000000. To keep gdb
-				// gdb happy we just substract that amount.
-				if (strcmp(sCommand + 1, "Offsets") == 0) {
-					gdb_reply("Text=%x;Data=%x;Bss=%x", 0,
-						((unsigned)(&__data_start)) - 0x80000000,
-						((unsigned)(&__bss_start)) - 0x80000000);
-				} else
-					gdb_reply("ENS");
-			}
+			// There are several q commands:
+			//
+			//     qXXXX        Request info about XXXX.
+			//     QXXXX=yyyy   Set value of XXXX to yyyy.
+			//     qOffsets     Get segment offsets
+			//
+			// Currently we only support the 'qOffsets'
+			// form.
+			//
+			// *Note* that we actually have to lie,
+			// At first thought looks like we should
+			// return '_start', '__data_start' &
+			// '__bss_start', however gdb gets
+			// confused because the kernel link script
+			// pre-links at 0x80000000. To keep gdb
+			// gdb happy we just substract that amount.
+			if (strcmp(sCommand + 1, "Offsets") == 0) {
+				gdb_reply("Text=%x;Data=%x;Bss=%x", 0,
+					((unsigned)(&__data_start)) - 0x80000000,
+					((unsigned)(&__bss_start)) - 0x80000000);
+			} else
+				gdb_reply("ENS");
+
 			break;
+		}
 
 		case '?':
 			// command '?' is used for retrieving the signal
@@ -230,68 +231,70 @@
 			break;
 
 		case 'g':
-			{
-				int cpu;
+		{
+			int cpu;
 
-				// command 'g' is used for reading the register
-				// file. Faked by now.
-				//
-				// For x86 the register order is:
-				//
-				//    eax, ebx, ecx, edx,
-				//    esp, ebp, esi, edi,
-				//    eip, eflags,
-				//    cs, ss, ds, es
-				//
-				// Note that even thought the segment descriptors
-				// are actually 16 bits wide, gdb requires them
-				// as 32 bit integers. Note also that for some
-				// reason (unknown to me) gdb wants the register
-				// dump in *big endian* format.
-				cpu = smp_get_current_cpu();
-				gdb_regreply(dbg_register_file[cpu], 14);
-			}
+			// command 'g' is used for reading the register
+			// file. Faked by now.
+			//
+			// For x86 the register order is:
+			//
+			//    eax, ebx, ecx, edx,
+			//    esp, ebp, esi, edi,
+			//    eip, eflags,
+			//    cs, ss, ds, es
+			//
+			// Note that even thought the segment descriptors
+			// are actually 16 bits wide, gdb requires them
+			// as 32 bit integers. Note also that for some
+			// reason (unknown to me) gdb wants the register
+			// dump in *big endian* format.
+			cpu = smp_get_current_cpu();
+			gdb_regreply(dbg_register_file[cpu], 14);
+
 			break;
+		}
 
 		case 'm':
-			{
-				char* ptr;
-				unsigned address;
-				unsigned len;
+		{
+			char* ptr;
+			unsigned address;
+			unsigned len;
 
-				// The 'm' command has the form mAAA,LLL
-				// where AAA is the address and LLL is the
-				// number of bytes.
-				ptr = sCommand + 1;
-				address = 0;
-				len = 0;
-				while (ptr && *ptr && (*ptr != ',')) {
-					address <<= 4;
-					address += parse_nibble(*ptr);
-					ptr += 1;
-				}
-				if (*ptr == ',')
-					ptr += 1;
+			// The 'm' command has the form mAAA,LLL
+			// where AAA is the address and LLL is the
+			// number of bytes.
+			ptr = sCommand + 1;
+			address = 0;
+			len = 0;
+			while (ptr && *ptr && (*ptr != ',')) {
+				address <<= 4;
+				address += parse_nibble(*ptr);
+				ptr += 1;
+			}
+			if (*ptr == ',')
+				ptr += 1;
 
-				while (ptr && *ptr) {
-					len <<= 4;
-					len += parse_nibble(*ptr);
-					ptr += 1;
-				}
+			while (ptr && *ptr) {
+				len <<= 4;
+				len += parse_nibble(*ptr);
+				ptr += 1;
+			}
 
-				if (len > 128)
-					len = 128;
+			if (len > 128)
+				len = 128;
 
-				// We cannot directly access the requested memory
-				// for gdb may be trying to access an stray pointer
-				// We copy the memory to a safe buffer using
-				// the bulletproof user_memcpy().
-				if (user_memcpy(sSafeMemory, (char*)address, len) < 0)
-					gdb_reply("E02");
-				else
-					gdb_memreply(sSafeMemory, len);
-			}
+			// We cannot directly access the requested memory
+			// for gdb may be trying to access an stray pointer
+			// We copy the memory to a safe buffer using
+			// the bulletproof user_memcpy().
+			if (user_memcpy(sSafeMemory, (char*)address, len) < 0)
+				gdb_reply("E02");
+			else
+				gdb_memreply(sSafeMemory, len);
+
 			break;
+		}
 
 		case 'k':
 			// Command 'k' actual semantics is 'kill the damn thing'.



From axeld at mail.berlios.de  Wed Apr  8 16:12:48 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 8 Apr 2009 16:12:48 +0200
Subject: [Haiku-commits] r30028 - haiku/trunk/headers/os/interface
Message-ID: <200904081412.n38ECm9c031479@sheep.berlios.de>

Author: axeld
Date: 2009-04-08 16:12:45 +0200 (Wed, 08 Apr 2009)
New Revision: 30028
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30028&view=rev

Modified:
   haiku/trunk/headers/os/interface/UnicodeBlockObjects.h
Log:
* Cleanup.


Modified: haiku/trunk/headers/os/interface/UnicodeBlockObjects.h
===================================================================
--- haiku/trunk/headers/os/interface/UnicodeBlockObjects.h	2009-04-08 13:15:16 UTC (rev 30027)
+++ haiku/trunk/headers/os/interface/UnicodeBlockObjects.h	2009-04-08 14:12:45 UTC (rev 30028)
@@ -1,125 +1,88 @@
-//------------------------------------------------------------------------------
-//	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:		UnicodeBlockObjects.h
-//	Author:			Erik Jaesler (erik at cgsoftware.com)
-//	Description:	Predefined unicode_block objects
-//------------------------------------------------------------------------------
-
+/*
+ * Copyright 2001-2009, Haiku Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Erik Jaesler (erik at cgsoftware.com)
+ */
 #ifndef _UNICODEBLOCKOBJECTS_H
 #define _UNICODEBLOCKOBJECTS_H
 
-// Standard Includes -----------------------------------------------------------
 
-// System Includes -------------------------------------------------------------
 #include <Font.h>
 
-// Project Includes ------------------------------------------------------------
 
-// Local Includes --------------------------------------------------------------
-
-// Local Defines ---------------------------------------------------------------
-
-// Globals ---------------------------------------------------------------------
-
-
 // Unicode block list with their unicode encoding range
-const unicode_block B_BASIC_LATIN_BLOCK(					/* 0000 - 007F			*/				0x0000000000000000LL, 0x0000000000000001LL);			
-const unicode_block B_LATIN1_SUPPLEMENT_BLOCK(				/* 0080 - 00FF			*/				0x0000000000000000LL, 0x0000000000000002LL);			
-const unicode_block B_LATIN_EXTENDED_A_BLOCK(				/* 0100 - 017F			*/				0x0000000000000000LL, 0x0000000000000004LL);			
-const unicode_block B_LATIN_EXTENDED_B_BLOCK(				/* 0180 - 024F			*/				0x0000000000000000LL, 0x0000000000000008LL);			
-const unicode_block B_IPA_EXTENSIONS_BLOCK(					/* 0250 - 02AF			*/				0x0000000000000000LL, 0x0000000000000010LL);			
-const unicode_block B_SPACING_MODIFIER_LETTERS_BLOCK(		/* 02B0 - 02FF			*/				0x0000000000000000LL, 0x0000000000000020LL);			
-const unicode_block B_COMBINING_DIACRITICAL_MARKS_BLOCK(	/* 0300 - 036F			*/				0x0000000000000000LL, 0x0000000000000040LL);			
-const unicode_block B_BASIC_GREEK_BLOCK(					/* 0370 - 03CF			*/				0x0000000000000000LL, 0x0000000000000080LL);			
-const unicode_block B_GREEK_SYMBOLS_AND_COPTIC_BLOCK(		/* 03D0 - 03FF			*/				0x0000000000000000LL, 0x0000000000000100LL);			
-const unicode_block B_CYRILLIC_BLOCK(						/* 0400 - 04FF			*/				0x0000000000000000LL, 0x0000000000000200LL);			
-const unicode_block B_ARMENIAN_BLOCK(						/* 0530 - 058F			*/				0x0000000000000000LL, 0x0000000000000400LL);			
-const unicode_block B_BASIC_HEBREW_BLOCK(					/* 0590 - 05CF			*/				0x0000000000000000LL, 0x0000000000000800LL);			
-const unicode_block B_HEBREW_EXTENDED_BLOCK(				/* 05D0 - 05FF			*/				0x0000000000000000LL, 0x0000000000001000LL);			
-const unicode_block B_BASIC_ARABIC_BLOCK(					/* 0600 - 0670			*/				0x0000000000000000LL, 0x0000000000002000LL);			
-const unicode_block B_ARABIC_EXTENDED_BLOCK(				/* 0671 - 06FF			*/				0x0000000000000000LL, 0x0000000000004000LL);			
-const unicode_block B_DEVANAGARI_BLOCK(						/* 0900 - 097F			*/				0x0000000000000000LL, 0x0000000000008000LL);			
-const unicode_block B_BENGALI_BLOCK(						/* 0980 - 09FF			*/				0x0000000000000000LL, 0x0000000000010000LL);			
-const unicode_block B_GURMUKHI_BLOCK(						/* 0A00 - 0A7F			*/				0x0000000000000000LL, 0x0000000000020000LL);			
-const unicode_block B_GUJARATI_BLOCK(						/* 0A80 - 0AFF			*/				0x0000000000000000LL, 0x0000000000040000LL);			
-const unicode_block B_ORIYA_BLOCK(							/* 0B00 - 0B7F			*/				0x0000000000000000LL, 0x0000000000080000LL);			
-const unicode_block B_TAMIL_BLOCK(							/* 0B80 - 0BFF			*/				0x0000000000000000LL, 0x0000000000100000LL);			
-const unicode_block B_TELUGU_BLOCK(							/* 0C00 - 0C7F			*/				0x0000000000000000LL, 0x0000000000200000LL);			
-const unicode_block B_KANNADA_BLOCK(						/* 0C80 - 0CFF			*/				0x0000000000000000LL, 0x0000000000400000LL);			
-const unicode_block B_MALAYALAM_BLOCK(						/* 0D00 - 0D7F			*/				0x0000000000000000LL, 0x0000000000800000LL);			
-const unicode_block B_THAI_BLOCK(							/* 0E00 - 0E7F			*/				0x0000000000000000LL, 0x0000000001000000LL);			
-const unicode_block B_LAO_BLOCK(							/* 0E80 - 0EFF			*/				0x0000000000000000LL, 0x0000000002000000LL);			
-const unicode_block B_BASIC_GEORGIAN_BLOCK(					/* 10A0 - 10CF			*/				0x0000000000000000LL, 0x0000000004000000LL);			
-const unicode_block B_GEORGIAN_EXTENDED_BLOCK(				/* 10D0 - 10FF			*/				0x0000000000000000LL, 0x0000000008000000LL);			
-const unicode_block B_HANGUL_JAMO_BLOCK(					/* 1100 - 11FF			*/				0x0000000000000000LL, 0x0000000010000000LL);			
-const unicode_block B_LATIN_EXTENDED_ADDITIONAL_BLOCK(		/* 1E00 - 1EFF			*/				0x0000000000000000LL, 0x0000000020000000LL);			
-const unicode_block B_GREEK_EXTENDED_BLOCK(					/* 1F00 - 1FFF			*/				0x0000000000000000LL, 0x0000000040000000LL);			
-const unicode_block B_GENERAL_PUNCTUATION_BLOCK(			/* 2000 - 206F			*/				0x0000000000000000LL, 0x0000000080000000LL);			
-const unicode_block B_SUPERSCRIPTS_AND_SUBSCRIPTS_BLOCK(	/* 2070 - 209F			*/				0x0000000000000000LL, 0x0000000100000000LL);			
-const unicode_block B_CURRENCY_SYMBOLS_BLOCK(				/* 20A0 - 20CF			*/				0x0000000000000000LL, 0x0000000200000000LL);			
-const unicode_block B_COMBINING_MARKS_FOR_SYMBOLS_BLOCK(	/* 20D0 - 20FF			*/				0x0000000000000000LL, 0x0000000400000000LL);			
-const unicode_block B_LETTERLIKE_SYMBOLS_BLOCK(				/* 2100 - 214F			*/				0x0000000000000000LL, 0x0000000800000000LL);			
-const unicode_block B_NUMBER_FORMS_BLOCK(					/* 2150 - 218F			*/				0x0000000000000000LL, 0x0000001000000000LL);			
-const unicode_block B_ARROWS_BLOCK(							/* 2190 - 21FF			*/				0x0000000000000000LL, 0x0000002000000000LL);			
-const unicode_block B_MATHEMATICAL_OPERATORS_BLOCK(			/* 2200 - 22FF			*/				0x0000000000000000LL, 0x0000004000000000LL);			
-const unicode_block B_MISCELLANEOUS_TECHNICAL_BLOCK(		/* 2300 - 23FF			*/				0x0000000000000000LL, 0x0000008000000000LL);			
-const unicode_block B_CONTROL_PICTURES_BLOCK(				/* 2400 - 243F			*/				0x0000000000000000LL, 0x0000010000000000LL);			
-const unicode_block B_OPTICAL_CHARACTER_RECOGNITION_BLOCK(	/* 2440 - 245F			*/				0x0000000000000000LL, 0x0000020000000000LL);			
-const unicode_block B_ENCLOSED_ALPHANUMERICS_BLOCK(			/* 2460 - 24FF			*/				0x0000000000000000LL, 0x0000040000000000LL);			
-const unicode_block B_BOX_DRAWING_BLOCK(					/* 2500 - 257F			*/				0x0000000000000000LL, 0x0000080000000000LL);			
-const unicode_block B_BLOCK_ELEMENTS_BLOCK(					/* 2580 - 259F			*/				0x0000000000000000LL, 0x0000100000000000LL);			
-const unicode_block B_GEOMETRIC_SHAPES_BLOCK(				/* 25A0 - 25FF			*/				0x0000000000000000LL, 0x0000200000000000LL);			
-const unicode_block B_MISCELLANEOUS_SYMBOLS_BLOCK(			/* 2600 - 26FF			*/				0x0000000000000000LL, 0x0000400000000000LL);			
-const unicode_block B_DINGBATS_BLOCK(						/* 2700 - 27BF			*/				0x0000000000000000LL, 0x0000800000000000LL);			
-const unicode_block B_CJK_SYMBOLS_AND_PUNCTUATION_BLOCK(	/* 3000 - 303F			*/				0x0000000000000000LL, 0x0001000000000000LL);			
-const unicode_block B_HIRAGANA_BLOCK(						/* 3040 - 309F			*/				0x0000000000000000LL, 0x0002000000000000LL);			
-const unicode_block B_KATAKANA_BLOCK(						/* 30A0 - 30FF			*/				0x0000000000000000LL, 0x0004000000000000LL);			
-const unicode_block B_BOPOMOFO_BLOCK(						/* 3100 - 312F			*/				0x0000000000000000LL, 0x0008000000000000LL);			
-const unicode_block B_HANGUL_COMPATIBILITY_JAMO_BLOCK(		/* 3130 - 318F			*/				0x0000000000000000LL, 0x0010000000000000LL);			
-const unicode_block B_CJK_MISCELLANEOUS_BLOCK(				/* 3190 - 319F			*/				0x0000000000000000LL, 0x0020000000000000LL);			
-const unicode_block B_ENCLOSED_CJK_LETTERS_AND_MONTHS_BLOCK(/* 3200 - 32FF			*/				0x0000000000000000LL, 0x0040000000000000LL);			
-const unicode_block B_CJK_COMPATIBILITY_BLOCK(				/* 3300 - 33FF			*/				0x0000000000000000LL, 0x0080000000000000LL);			
-const unicode_block B_HANGUL_BLOCK(							/* AC00 - D7AF			*/				0x0000000000000000LL, 0x0100000000000000LL);			
-const unicode_block B_HIGH_SURROGATES_BLOCK(				/* D800 - DBFF			*/				0x0000000000000000LL, 0x0200000000000000LL);			
-const unicode_block B_LOW_SURROGATES_BLOCK(					/* DC00 - DFFF			*/				0x0000000000000000LL, 0x0400000000000000LL);			
-const unicode_block B_CJK_UNIFIED_IDEOGRAPHS_BLOCK(			/* 4E00 - 9FFF			*/				0x0000000000000000LL, 0x0800000000000000LL);			
-const unicode_block B_PRIVATE_USE_AREA_BLOCK(				/* E000 - F8FF			*/				0x0000000000000000LL, 0x1000000000000000LL);			
-const unicode_block B_CJK_COMPATIBILITY_IDEOGRAPHS_BLOCK(	/* F900 - FAFF			*/				0x0000000000000000LL, 0x2000000000000000LL);			
-const unicode_block B_ALPHABETIC_PRESENTATION_FORMS_BLOCK(	/* FB00 - FB4F			*/				0x0000000000000000LL, 0x4000000000000000LL);			
-const unicode_block B_ARABIC_PRESENTATION_FORMS_A_BLOCK(	/* FB50 - FDFF			*/				0x0000000000000000LL, 0x8000000000000000LL);			
-const unicode_block B_COMBINING_HALF_MARKS_BLOCK(			/* FE20 - FE2F			*/				0x0000000000000001LL, 0x0000000000000000LL);			
-const unicode_block B_CJK_COMPATIBILITY_FORMS_BLOCK(		/* FE30 - FE4F			*/				0x0000000000000002LL, 0x0000000000000000LL);			
-const unicode_block B_SMALL_FORM_VARIANTS_BLOCK(			/* FE50 - FE6F			*/				0x0000000000000004LL, 0x0000000000000000LL);			
-const unicode_block B_ARABIC_PRESENTATION_FORMS_B_BLOCK(	/* FE70 - FEFE			*/				0x0000000000000008LL, 0x0000000000000000LL);			
-const unicode_block B_HALFWIDTH_AND_FULLWIDTH_FORMS_BLOCK(	/* FF00 - FFEF			*/				0x0000000000000010LL, 0x0000000000000000LL);			
-const unicode_block B_SPECIALS_BLOCK(						/* FEFF and FFF0 - FFFF	*/				0x0000000000000020LL, 0x0000000000000000LL);			
-const unicode_block B_TIBETAN_BLOCK(						/* 0F00 - 0FBF			*/				0x0000000000000040LL, 0x0000000000000000LL);			
+const unicode_block B_BASIC_LATIN_BLOCK(					/* 0000 - 007F			*/	0x0000000000000000LL, 0x0000000000000001LL);
+const unicode_block B_LATIN1_SUPPLEMENT_BLOCK(				/* 0080 - 00FF			*/	0x0000000000000000LL, 0x0000000000000002LL);
+const unicode_block B_LATIN_EXTENDED_A_BLOCK(				/* 0100 - 017F			*/	0x0000000000000000LL, 0x0000000000000004LL);
+const unicode_block B_LATIN_EXTENDED_B_BLOCK(				/* 0180 - 024F			*/	0x0000000000000000LL, 0x0000000000000008LL);
+const unicode_block B_IPA_EXTENSIONS_BLOCK(					/* 0250 - 02AF			*/	0x0000000000000000LL, 0x0000000000000010LL);
+const unicode_block B_SPACING_MODIFIER_LETTERS_BLOCK(		/* 02B0 - 02FF			*/	0x0000000000000000LL, 0x0000000000000020LL);
+const unicode_block B_COMBINING_DIACRITICAL_MARKS_BLOCK(	/* 0300 - 036F			*/	0x0000000000000000LL, 0x0000000000000040LL);
+const unicode_block B_BASIC_GREEK_BLOCK(					/* 0370 - 03CF			*/	0x0000000000000000LL, 0x0000000000000080LL);
+const unicode_block B_GREEK_SYMBOLS_AND_COPTIC_BLOCK(		/* 03D0 - 03FF			*/	0x0000000000000000LL, 0x0000000000000100LL);
+const unicode_block B_CYRILLIC_BLOCK(						/* 0400 - 04FF			*/	0x0000000000000000LL, 0x0000000000000200LL);
+const unicode_block B_ARMENIAN_BLOCK(						/* 0530 - 058F			*/	0x0000000000000000LL, 0x0000000000000400LL);
+const unicode_block B_BASIC_HEBREW_BLOCK(					/* 0590 - 05CF			*/	0x0000000000000000LL, 0x0000000000000800LL);
+const unicode_block B_HEBREW_EXTENDED_BLOCK(				/* 05D0 - 05FF			*/	0x0000000000000000LL, 0x0000000000001000LL);
+const unicode_block B_BASIC_ARABIC_BLOCK(					/* 0600 - 0670			*/	0x0000000000000000LL, 0x0000000000002000LL);
+const unicode_block B_ARABIC_EXTENDED_BLOCK(				/* 0671 - 06FF			*/	0x0000000000000000LL, 0x0000000000004000LL);
+const unicode_block B_DEVANAGARI_BLOCK(						/* 0900 - 097F			*/	0x0000000000000000LL, 0x0000000000008000LL);
+const unicode_block B_BENGALI_BLOCK(						/* 0980 - 09FF			*/	0x0000000000000000LL, 0x0000000000010000LL);
+const unicode_block B_GURMUKHI_BLOCK(						/* 0A00 - 0A7F			*/	0x0000000000000000LL, 0x0000000000020000LL);
+const unicode_block B_GUJARATI_BLOCK(						/* 0A80 - 0AFF			*/	0x0000000000000000LL, 0x0000000000040000LL);
+const unicode_block B_ORIYA_BLOCK(							/* 0B00 - 0B7F			*/	0x0000000000000000LL, 0x0000000000080000LL);
+const unicode_block B_TAMIL_BLOCK(							/* 0B80 - 0BFF			*/	0x0000000000000000LL, 0x0000000000100000LL);
+const unicode_block B_TELUGU_BLOCK(							/* 0C00 - 0C7F			*/	0x0000000000000000LL, 0x0000000000200000LL);
+const unicode_block B_KANNADA_BLOCK(						/* 0C80 - 0CFF			*/	0x0000000000000000LL, 0x0000000000400000LL);
+const unicode_block B_MALAYALAM_BLOCK(						/* 0D00 - 0D7F			*/	0x0000000000000000LL, 0x0000000000800000LL);
+const unicode_block B_THAI_BLOCK(							/* 0E00 - 0E7F			*/	0x0000000000000000LL, 0x0000000001000000LL);
+const unicode_block B_LAO_BLOCK(							/* 0E80 - 0EFF			*/	0x0000000000000000LL, 0x0000000002000000LL);
+const unicode_block B_BASIC_GEORGIAN_BLOCK(					/* 10A0 - 10CF			*/	0x0000000000000000LL, 0x0000000004000000LL);
+const unicode_block B_GEORGIAN_EXTENDED_BLOCK(				/* 10D0 - 10FF			*/	0x0000000000000000LL, 0x0000000008000000LL);
+const unicode_block B_HANGUL_JAMO_BLOCK(					/* 1100 - 11FF			*/	0x0000000000000000LL, 0x0000000010000000LL);
+const unicode_block B_LATIN_EXTENDED_ADDITIONAL_BLOCK(		/* 1E00 - 1EFF			*/	0x0000000000000000LL, 0x0000000020000000LL);
+const unicode_block B_GREEK_EXTENDED_BLOCK(					/* 1F00 - 1FFF			*/	0x0000000000000000LL, 0x0000000040000000LL);
+const unicode_block B_GENERAL_PUNCTUATION_BLOCK(			/* 2000 - 206F			*/	0x0000000000000000LL, 0x0000000080000000LL);
+const unicode_block B_SUPERSCRIPTS_AND_SUBSCRIPTS_BLOCK(	/* 2070 - 209F			*/	0x0000000000000000LL, 0x0000000100000000LL);
+const unicode_block B_CURRENCY_SYMBOLS_BLOCK(				/* 20A0 - 20CF			*/	0x0000000000000000LL, 0x0000000200000000LL);
+const unicode_block B_COMBINING_MARKS_FOR_SYMBOLS_BLOCK(	/* 20D0 - 20FF			*/	0x0000000000000000LL, 0x0000000400000000LL);
+const unicode_block B_LETTERLIKE_SYMBOLS_BLOCK(				/* 2100 - 214F			*/	0x0000000000000000LL, 0x0000000800000000LL);
+const unicode_block B_NUMBER_FORMS_BLOCK(					/* 2150 - 218F			*/	0x0000000000000000LL, 0x0000001000000000LL);
+const unicode_block B_ARROWS_BLOCK(							/* 2190 - 21FF			*/	0x0000000000000000LL, 0x0000002000000000LL);
+const unicode_block B_MATHEMATICAL_OPERATORS_BLOCK(			/* 2200 - 22FF			*/	0x0000000000000000LL, 0x0000004000000000LL);
+const unicode_block B_MISCELLANEOUS_TECHNICAL_BLOCK(		/* 2300 - 23FF			*/	0x0000000000000000LL, 0x0000008000000000LL);
+const unicode_block B_CONTROL_PICTURES_BLOCK(				/* 2400 - 243F			*/	0x0000000000000000LL, 0x0000010000000000LL);
+const unicode_block B_OPTICAL_CHARACTER_RECOGNITION_BLOCK(	/* 2440 - 245F			*/	0x0000000000000000LL, 0x0000020000000000LL);
+const unicode_block B_ENCLOSED_ALPHANUMERICS_BLOCK(			/* 2460 - 24FF			*/	0x0000000000000000LL, 0x0000040000000000LL);
+const unicode_block B_BOX_DRAWING_BLOCK(					/* 2500 - 257F			*/	0x0000000000000000LL, 0x0000080000000000LL);
+const unicode_block B_BLOCK_ELEMENTS_BLOCK(					/* 2580 - 259F			*/	0x0000000000000000LL, 0x0000100000000000LL);
+const unicode_block B_GEOMETRIC_SHAPES_BLOCK(				/* 25A0 - 25FF			*/	0x0000000000000000LL, 0x0000200000000000LL);
+const unicode_block B_MISCELLANEOUS_SYMBOLS_BLOCK(			/* 2600 - 26FF			*/	0x0000000000000000LL, 0x0000400000000000LL);
+const unicode_block B_DINGBATS_BLOCK(						/* 2700 - 27BF			*/	0x0000000000000000LL, 0x0000800000000000LL);
+const unicode_block B_CJK_SYMBOLS_AND_PUNCTUATION_BLOCK(	/* 3000 - 303F			*/	0x0000000000000000LL, 0x0001000000000000LL);
+const unicode_block B_HIRAGANA_BLOCK(						/* 3040 - 309F			*/	0x0000000000000000LL, 0x0002000000000000LL);
+const unicode_block B_KATAKANA_BLOCK(						/* 30A0 - 30FF			*/	0x0000000000000000LL, 0x0004000000000000LL);
+const unicode_block B_BOPOMOFO_BLOCK(						/* 3100 - 312F			*/	0x0000000000000000LL, 0x0008000000000000LL);
+const unicode_block B_HANGUL_COMPATIBILITY_JAMO_BLOCK(		/* 3130 - 318F			*/	0x0000000000000000LL, 0x0010000000000000LL);
+const unicode_block B_CJK_MISCELLANEOUS_BLOCK(				/* 3190 - 319F			*/	0x0000000000000000LL, 0x0020000000000000LL);
+const unicode_block B_ENCLOSED_CJK_LETTERS_AND_MONTHS_BLOCK(/* 3200 - 32FF			*/	0x0000000000000000LL, 0x0040000000000000LL);
+const unicode_block B_CJK_COMPATIBILITY_BLOCK(				/* 3300 - 33FF			*/	0x0000000000000000LL, 0x0080000000000000LL);
+const unicode_block B_HANGUL_BLOCK(							/* AC00 - D7AF			*/	0x0000000000000000LL, 0x0100000000000000LL);
+const unicode_block B_HIGH_SURROGATES_BLOCK(				/* D800 - DBFF			*/	0x0000000000000000LL, 0x0200000000000000LL);
+const unicode_block B_LOW_SURROGATES_BLOCK(					/* DC00 - DFFF			*/	0x0000000000000000LL, 0x0400000000000000LL);
+const unicode_block B_CJK_UNIFIED_IDEOGRAPHS_BLOCK(			/* 4E00 - 9FFF			*/	0x0000000000000000LL, 0x0800000000000000LL);
+const unicode_block B_PRIVATE_USE_AREA_BLOCK(				/* E000 - F8FF			*/	0x0000000000000000LL, 0x1000000000000000LL);
+const unicode_block B_CJK_COMPATIBILITY_IDEOGRAPHS_BLOCK(	/* F900 - FAFF			*/	0x0000000000000000LL, 0x2000000000000000LL);
+const unicode_block B_ALPHABETIC_PRESENTATION_FORMS_BLOCK(	/* FB00 - FB4F			*/	0x0000000000000000LL, 0x4000000000000000LL);
+const unicode_block B_ARABIC_PRESENTATION_FORMS_A_BLOCK(	/* FB50 - FDFF			*/	0x0000000000000000LL, 0x8000000000000000LL);
+const unicode_block B_COMBINING_HALF_MARKS_BLOCK(			/* FE20 - FE2F			*/	0x0000000000000001LL, 0x0000000000000000LL);
+const unicode_block B_CJK_COMPATIBILITY_FORMS_BLOCK(		/* FE30 - FE4F			*/	0x0000000000000002LL, 0x0000000000000000LL);
+const unicode_block B_SMALL_FORM_VARIANTS_BLOCK(			/* FE50 - FE6F			*/	0x0000000000000004LL, 0x0000000000000000LL);
+const unicode_block B_ARABIC_PRESENTATION_FORMS_B_BLOCK(	/* FE70 - FEFE			*/	0x0000000000000008LL, 0x0000000000000000LL);
+const unicode_block B_HALFWIDTH_AND_FULLWIDTH_FORMS_BLOCK(	/* FF00 - FFEF			*/	0x0000000000000010LL, 0x0000000000000000LL);
+const unicode_block B_SPECIALS_BLOCK(						/* FEFF and FFF0 - FFFF	*/	0x0000000000000020LL, 0x0000000000000000LL);
+const unicode_block B_TIBETAN_BLOCK(						/* 0F00 - 0FBF			*/	0x0000000000000040LL, 0x0000000000000000LL);
 
 #endif	// _UNICODEBLOCKOBJECTS_H
-
-/*
- * $Log $
- *
- * $Id  $
- *
- */
-



From axeld at mail.berlios.de  Wed Apr  8 16:13:36 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 8 Apr 2009 16:13:36 +0200
Subject: [Haiku-commits] r30029 - in haiku/trunk: headers/os/media
	src/kits/media
Message-ID: <200904081413.n38EDaaE031634@sheep.berlios.de>

Author: axeld
Date: 2009-04-08 16:13:33 +0200 (Wed, 08 Apr 2009)
New Revision: 30029
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30029&view=rev

Modified:
   haiku/trunk/headers/os/media/ParameterWeb.h
   haiku/trunk/src/kits/media/Controllable.cpp
   haiku/trunk/src/kits/media/ParameterWeb.cpp
Log:
* Rewrote ParameterWeb.h.
* Adapted and cleaned up ParameterWeb.cpp.
* Fixed some copy&paste bugs in the BTextParameter.


Modified: haiku/trunk/headers/os/media/ParameterWeb.h
===================================================================
--- haiku/trunk/headers/os/media/ParameterWeb.h	2009-04-08 14:12:45 UTC (rev 30028)
+++ haiku/trunk/headers/os/media/ParameterWeb.h	2009-04-08 14:13:33 UTC (rev 30029)
@@ -1,309 +1,254 @@
-/*******************************************************************************
-/
-/	File:			ParameterWeb.h
-/
-/   Description:  A BParameterWeb is a description of media controls within a BControllable
-/	Media Kit Node.
-/	BParameter, BParameterGroup, BContinuousParameter, BDiscreteParameter and 
-/	BNullParameter are "data classes" used to describe the relation within a 
-/	BParameterWeb. These are NOT direct visible classes like BControls; just data 
-/	containers which applications can use to decide what kind of views to create.
-/
-/	Copyright 1997-98, Be Incorporated, All Rights Reserved
-/
-*******************************************************************************/
-
-#if !defined(_CONTROL_WEB_H)
+/*
+ * Copyright 2009, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT license.
+ */
+#ifndef _CONTROL_WEB_H
 #define _CONTROL_WEB_H
 
+
 #include <Flattenable.h>
 #include <MediaDefs.h>
 #include <MediaNode.h>
 #include <TypeConstants.h>
 
 
-//	It is highly unfortunate that a linker bug forces these symbols out
-//	from the BParameter class. Hope they don't collide with anything else.
+// Parameter Kinds
 
-/* These are control KINDs */
-	/* kind used when you don't know or care */
-extern const char * const B_GENERIC;
-	/* kinds used for sliders */
-extern const char * const B_MASTER_GAIN;	/* Main Volume */
-extern const char * const B_GAIN;
-extern const char * const B_BALANCE;
-extern const char * const B_FREQUENCY;	/* like a radio tuner */
-extern const char * const B_LEVEL;		/* like for effects */
-extern const char * const B_SHUTTLE_SPEED;	/* Play, SloMo, Scan 1.0 == regular */
-extern const char * const B_CROSSFADE;		/* 0 == first input, +100 == second input */
-extern const char * const B_EQUALIZATION;		/* depth (dB) */
+extern const char* const B_GENERIC;
 
-	/* kinds used for compressors */
-extern const char * const B_COMPRESSION;	/* 0% == no compression, 99% == 100:1 compression */
-extern const char * const B_QUALITY;		/* 0% == full compression, 100% == no compression */
-extern const char * const B_BITRATE;		/* in bits/second */
-extern const char * const B_GOP_SIZE;			/* Group Of Pictures. a k a "Keyframe every N frames" */
-	/* kinds used for selectors */
-extern const char * const B_MUTE;		/* 0 == thru, 1 == mute */
-extern const char * const B_ENABLE;		/* 0 == disable, 1 == enable */
-extern const char * const B_INPUT_MUX;	/* "value" 1-N == input selected */
-extern const char * const B_OUTPUT_MUX;	/* "value" 1-N == output selected */
-extern const char * const B_TUNER_CHANNEL;		/* like cable TV */
-extern const char * const B_TRACK;		/* like a CD player; "value" should be 1-N */
-extern const char * const B_RECSTATE;	/* like mutitrack tape deck, 0 == silent, 1 == play, 2 == record */
-extern const char * const B_SHUTTLE_MODE;	/* -1 == backwards, 0 == stop, 1 == play, 2 == pause/cue */
-extern const char * const B_RESOLUTION;
-extern const char * const B_COLOR_SPACE;		/* "value" should be color_space */
-extern const char * const B_FRAME_RATE;
-extern const char * const B_VIDEO_FORMAT;	/* 1 == NTSC-M, 2 == NTSC-J, 3 == PAL-BDGHI, 4 == PAL-M, 5 == PAL-N, 6 == SECAM, 7 == MPEG-1, 8 == MPEG-2 */
-	/* kinds used for junctions */
-	//	the prefix of "WEB" is to avoid collission with an enum in Defs.h
-extern const char * const B_WEB_PHYSICAL_INPUT;		/* a jack on the back of the card */
-extern const char * const B_WEB_PHYSICAL_OUTPUT;
-extern const char * const B_WEB_ADC_CONVERTER;		/* from analog to digital signals */
-extern const char * const B_WEB_DAC_CONVERTER;		/* from digital to analog signals */
-extern const char * const B_WEB_LOGICAL_INPUT;		/* an "input" that may not be physical */
-extern const char * const B_WEB_LOGICAL_OUTPUT;
-extern const char * const B_WEB_LOGICAL_BUS;			/* a logical connection point that is neither input nor output; auxilliary bus */
-extern const char * const B_WEB_BUFFER_INPUT;		/* an input that corresponds to a media_input */
-extern const char * const B_WEB_BUFFER_OUTPUT;
+// slider controls
+extern const char* const B_MASTER_GAIN;
+extern const char* const B_GAIN;
+extern const char* const B_BALANCE;
+extern const char* const B_FREQUENCY;
+extern const char* const B_LEVEL;
+extern const char* const B_SHUTTLE_SPEED;
+extern const char* const B_CROSSFADE;		// 0-100 (first - second)
+extern const char* const B_EQUALIZATION;	// dB
 
-	// a simple transport control is a discrete parameter with five values (states):
-	// rewinding, stopped, playing, paused, and fast-forwarding
-extern const char * const B_SIMPLE_TRANSPORT;
+// compression controls
+extern const char* const B_COMPRESSION;
+extern const char* const B_QUALITY;
+extern const char* const B_BITRATE;			// bits/s
+extern const char* const B_GOP_SIZE;
 
-class BList;
-class BParameterGroup;
-class BParameter;
-class BNullParameter;
+// selector controls
+extern const char* const B_MUTE;
+extern const char* const B_ENABLE;
+extern const char* const B_INPUT_MUX;
+extern const char* const B_OUTPUT_MUX;
+extern const char* const B_TUNER_CHANNEL;
+extern const char* const B_TRACK;
+extern const char* const B_RECSTATE;
+extern const char* const B_SHUTTLE_MODE;
+extern const char* const B_RESOLUTION;
+extern const char* const B_COLOR_SPACE;
+extern const char* const B_FRAME_RATE;
+extern const char* const B_VIDEO_FORMAT;
+	// 1 = NTSC-M, 2 = NTSC-J, 3 = PAL-BDGHI, 4 = PAL-M, 5 = PAL-N, 6 = SECAM,
+	// 7 = MPEG-1, 8 = MPEG-2
+
+// junction controls
+extern const char* const B_WEB_PHYSICAL_INPUT;
+extern const char* const B_WEB_PHYSICAL_OUTPUT;
+extern const char* const B_WEB_ADC_CONVERTER;
+extern const char* const B_WEB_DAC_CONVERTER;
+extern const char* const B_WEB_LOGICAL_INPUT;
+extern const char* const B_WEB_LOGICAL_OUTPUT;
+extern const char* const B_WEB_LOGICAL_BUS;
+extern const char* const B_WEB_BUFFER_INPUT;
+extern const char* const B_WEB_BUFFER_OUTPUT;
+
+// transport control
+extern const char* const B_SIMPLE_TRANSPORT;
+	// 0-4: rewind, stop, play, pause, fast-forward
+
 class BContinuousParameter;
 class BDiscreteParameter;
+class BList;
+class BNullParameter;
+class BParameter;
+class BParameterGroup;
 class BTextParameter;
 
-
-/*	Set these flags on parameters and groups to control how a Theme will	*/
-/*	render the Web. Hidden means, generally, "don't show". Advanced means,	*/
-/*	generally, that you can show it or not depending on your whim.		*/
+// Parameter flags for influencing Media Themes
 enum media_parameter_flags {
-	B_HIDDEN_PARAMETER = 0x1,
-	B_ADVANCED_PARAMETER = 0x2
+	B_HIDDEN_PARAMETER		= 1,
+	B_ADVANCED_PARAMETER	= 2
 };
 
-
-class BParameterWeb :
-	public BFlattenable
-{
+class BParameterWeb : public BFlattenable {
 public:
-		BParameterWeb();
-		~BParameterWeb();
+								BParameterWeb();
+								~BParameterWeb();
 
-		media_node Node();
+			media_node			Node();
 
-		BParameterGroup * MakeGroup(
-				const char * name);
+			BParameterGroup*	MakeGroup(const char* name);
+			int32				CountGroups();
+			BParameterGroup*	GroupAt(int32 index);
 
-		int32 CountGroups();
-		BParameterGroup * GroupAt(
-				int32 index);
-		int32 CountParameters();
-		BParameter * ParameterAt(
-				int32 index);
+			int32				CountParameters();
+			BParameter*			ParameterAt(int32 index);
 
-virtual	bool		IsFixedSize() const;
-virtual	type_code	TypeCode() const;
-virtual	ssize_t		FlattenedSize() const;
-virtual	status_t	Flatten(void *buffer, ssize_t size) const;
-virtual	bool		AllowsTypeCode(type_code code) const;
-virtual	status_t	Unflatten(type_code c, const void *buf, ssize_t size);
+	// BFlattenable implementation
+	virtual	bool				IsFixedSize() const;
+	virtual type_code			TypeCode() const;
+	virtual	ssize_t				FlattenedSize() const;
+	virtual	status_t			Flatten(void* buffer, ssize_t size) const;
+	virtual	bool				AllowsTypeCode(type_code code) const;
+	virtual	status_t			Unflatten(type_code code, const void* buffer,
+									ssize_t size);
 
 private:
-
 	friend class BParameterGroup;
 	friend class BControllable;
 
-		BParameterWeb(
-				const BParameterWeb & clone);
-		BParameterWeb & operator=(
-				const BParameterWeb & clone);
+								BParameterWeb(const BParameterWeb& other);
+			BParameterWeb&		operator=(const BParameterWeb& other);
 
-		/* Mmmh, stuffing! */
-virtual		status_t _Reserved_ControlWeb_0(void *);
-virtual		status_t _Reserved_ControlWeb_1(void *);
-virtual		status_t _Reserved_ControlWeb_2(void *);
-virtual		status_t _Reserved_ControlWeb_3(void *);
-virtual		status_t _Reserved_ControlWeb_4(void *);
-virtual		status_t _Reserved_ControlWeb_5(void *);
-virtual		status_t _Reserved_ControlWeb_6(void *);
-virtual		status_t _Reserved_ControlWeb_7(void *);
+	// reserved
+	virtual	status_t			_Reserved_ControlWeb_0(void*);
+	virtual	status_t			_Reserved_ControlWeb_1(void*);
+	virtual	status_t			_Reserved_ControlWeb_2(void*);
+	virtual	status_t			_Reserved_ControlWeb_3(void*);
+	virtual	status_t			_Reserved_ControlWeb_4(void*);
+	virtual	status_t			_Reserved_ControlWeb_5(void*);
+	virtual	status_t			_Reserved_ControlWeb_6(void*);
+	virtual	status_t			_Reserved_ControlWeb_7(void*);
 
-		BList * mGroups;
-		media_node mNode;
-		uint32 _reserved_control_web_[8];
+			void				AddRefFix(void* oldItem, void* newItem);
 
-		BList * mOldRefs;
-		BList * mNewRefs;
-
-		void AddRefFix(
-				void * oldItem,
-				void * newItem);
+private:
+			BList*				fGroups;
+			media_node			fNode;
+			uint32				_reserved[8];
+			BList*				fOldRefs;
+			BList*				fNewRefs;
 };
 
 
-class BParameterGroup :
-	public BFlattenable
-{
+class BParameterGroup : public BFlattenable {
 private:
+								BParameterGroup(BParameterWeb* web,
+									const char* name);
+	virtual						~BParameterGroup();
 
-		BParameterGroup(
-				BParameterWeb * web,
-				const char * name);
-virtual	~BParameterGroup();
-
 public:
+			BParameterWeb*		Web() const;
+			const char*			Name() const;
 
-		BParameterWeb * Web() const;
-		const char * Name() const;
+			void				SetFlags(uint32 flags);
+			uint32				Flags() const;
 
-		void SetFlags(uint32 flags);
-		uint32 Flags() const;
+			BNullParameter*		MakeNullParameter(int32 id, media_type type,
+									const char* name, const char* kind);
+			BContinuousParameter* MakeContinuousParameter(int32 id,
+									media_type type, const char* name,
+									const char* kind, const char* unit,
+									float min, float max, float step);
+			BDiscreteParameter*	MakeDiscreteParameter(int32 id, media_type type,
+									const char* name, const char* kind);
+			BTextParameter*		MakeTextParameter(int32 id, media_type type,
+									const char* name, const char* kind,
+									size_t maxBytes);
 
-		BNullParameter * MakeNullParameter(
-				int32 id,
-				media_type m_type,
-				const char * name,
-				const char * kind);
-		BContinuousParameter * MakeContinuousParameter(
-				int32 id,
-				media_type m_type,
-				const char * name,
-				const char * kind,
-				const char * unit,
-				float minimum,
-				float maximum,
-				float stepping);
-		BDiscreteParameter * MakeDiscreteParameter(
-				int32 id,
-				media_type m_type,
-				const char * name,
-				const char * kind);
-		BTextParameter * MakeTextParameter(
-				int32 id,
-				media_type m_type,
-				const char * name,
-				const char * kind,
-				size_t max_bytes);
-		BParameterGroup * MakeGroup(
-				const char * name);
+			BParameterGroup*	MakeGroup(const char* name);
 
-		int32 CountParameters();
-		BParameter * ParameterAt(
-				int32 index);
-		int32 CountGroups();
-		BParameterGroup * GroupAt(
-				int32 index);
+			int32				CountParameters();
+			BParameter*			ParameterAt(int32 index);
 
-virtual	bool		IsFixedSize() const;
-virtual	type_code	TypeCode() const;
-virtual	ssize_t		FlattenedSize() const;
-virtual	status_t	Flatten(void *buffer, ssize_t size) const;
-virtual	bool		AllowsTypeCode(type_code code) const;
-virtual	status_t	Unflatten(type_code c, const void *buf, ssize_t size);
+			int32				CountGroups();
+			BParameterGroup*	GroupAt(int32 index);
 
+	// BFlattenable implementation
+	virtual	bool				IsFixedSize() const;
+	virtual type_code			TypeCode() const;
+	virtual	ssize_t				FlattenedSize() const;
+	virtual	status_t			Flatten(void* buffer, ssize_t size) const;
+	virtual	bool				AllowsTypeCode(type_code code) const;
+	virtual	status_t			Unflatten(type_code code, const void* buffer,
+									ssize_t size);
+
 private:
+	friend class BParameterWeb;
 
-		BParameterGroup();	/* private unimplemented */
-		BParameterGroup(
-				const BParameterGroup & clone);
-		BParameterGroup & operator=(
-				const BParameterGroup & clone);
+								BParameterGroup();
+								BParameterGroup(const BParameterGroup& other);
+			BParameterGroup&	operator=(const BParameterGroup& other);
 
-		/* Mmmh, stuffing! */
-virtual		status_t _Reserved_ControlGroup_0(void *);
-virtual		status_t _Reserved_ControlGroup_1(void *);
-virtual		status_t _Reserved_ControlGroup_2(void *);
-virtual		status_t _Reserved_ControlGroup_3(void *);
-virtual		status_t _Reserved_ControlGroup_4(void *);
-virtual		status_t _Reserved_ControlGroup_5(void *);
-virtual		status_t _Reserved_ControlGroup_6(void *);
-virtual		status_t _Reserved_ControlGroup_7(void *);
+			BParameter*			MakeControl(int32 type);
 
-	friend class BParameterWeb;
+	// reserved
+	virtual	status_t			_Reserved_ControlGroup_0(void*);
+	virtual	status_t			_Reserved_ControlGroup_1(void*);
+	virtual	status_t			_Reserved_ControlGroup_2(void*);
+	virtual	status_t			_Reserved_ControlGroup_3(void*);
+	virtual	status_t			_Reserved_ControlGroup_4(void*);
+	virtual	status_t			_Reserved_ControlGroup_5(void*);
+	virtual	status_t			_Reserved_ControlGroup_6(void*);
+	virtual	status_t			_Reserved_ControlGroup_7(void*);
 
-		BParameterWeb * mWeb;
-		BList * mControls;
-		BList * mGroups;
-		char * mName;
-		uint32 mFlags;
-		uint32 _reserved_control_group_[7];
-
-		BParameter * MakeControl(
-				int32 type);
+private:
+			BParameterWeb*		fWeb;
+			BList*				fControls;
+			BList*				fGroups;
+			char*				fName;
+			uint32				fFlags;
+			uint32				_reserved[7];
 };
 
 
-/* After you create a BParameter, hook it up by calling AddInput() and/or AddOutput() */
-/* (which will call the reciprocal in the target) and optionally call SetChannelCount() and SetMediaType() */
-class BParameter :
-	public BFlattenable
-{
+class BParameter : public BFlattenable {
 public:
+	enum media_parameter_type {
+		B_NULL_PARAMETER,
+		B_DISCRETE_PARAMETER,
+		B_CONTINUOUS_PARAMETER,
+		B_TEXT_PARAMETER
+	};
 
-		/* This is a parameter TYPE */
-		enum media_parameter_type
-		{
-			B_NULL_PARAMETER,
-			B_DISCRETE_PARAMETER,
-			B_CONTINUOUS_PARAMETER,
-			B_TEXT_PARAMETER
-		};
+			media_parameter_type Type() const;
+			BParameterWeb*		Web() const;
+			BParameterGroup*	Group() const;
+			const char*			Name() const;
+			const char*			Kind() const;
+			const char*			Unit() const;
+			int32				ID() const;
+			
+			void				SetFlags(uint32 flags);
+			uint32				Flags() const;
+	
+	virtual	type_code			ValueType() = 0;
+	
+			status_t			GetValue(void* buffer, size_t* _size,
+									bigtime_t* _when);
+			status_t			SetValue(const void* buffer, size_t size,
+									bigtime_t when);
 
-		media_parameter_type Type() const;
-		BParameterWeb * Web() const;
-		BParameterGroup * Group() const;
-		const char * Name() const;
-		const char * Kind() const;
-		const char * Unit() const;
-		int32 ID() const;
+			int32				CountChannels();
+			void				SetChannelCount(int32 count);
 
-		void SetFlags(uint32 flags);
-		uint32 Flags() const;
+			media_type			MediaType();
+			void				SetMediaType(media_type type);
 
-virtual	type_code ValueType() = 0;
-		/* These functions are typically used by client apps; they will result in */
-		/* your BControllable getting called to read/write values. */
-		status_t GetValue(
-				void * buffer,
-				size_t * ioSize,
-				bigtime_t * when);
-		status_t SetValue(
-				const void * buffer,
-				size_t size,
-				bigtime_t when);
-		int32 CountChannels();		/* Number of ValueType() values; default is 1 */
-		void SetChannelCount(		/* One value could still control e g a stereo pair */
-				int32 channel_count);
+			int32				CountInputs();
+			BParameter*			InputAt(int32 index);
+			void				AddInput(BParameter* input);
 
-		media_type MediaType();	/* Optional (default is B_MEDIA_NO_TYPE) */
-		void SetMediaType(media_type m_type);
+			int32				CountOutputs();
+			BParameter*			OutputAt(int32 index);
+			void				AddOutput(BParameter* output);
 
-		int32 CountInputs();
-		BParameter * InputAt(
-				int32 index);
-		void AddInput(
-				BParameter * input);
-		int32 CountOutputs();
-		BParameter * OutputAt(
-				int32 index);
-		void AddOutput(
-				BParameter * output);
+	// BFlattenable implementation
+	virtual	bool				IsFixedSize() const;
+	virtual type_code			TypeCode() const;
+	virtual	ssize_t				FlattenedSize() const;
+	virtual	status_t			Flatten(void* buffer, ssize_t size) const;
+	virtual	bool				AllowsTypeCode(type_code code) const;
+	virtual	status_t			Unflatten(type_code code, const void* buffer,
+									ssize_t size);
 
-virtual	bool		IsFixedSize() const;
-virtual	type_code	TypeCode() const;
-virtual	ssize_t		FlattenedSize() const;
-virtual	status_t	Flatten(void *buffer, ssize_t size) const;
-virtual	bool		AllowsTypeCode(type_code code) const;
-virtual	status_t	Unflatten(type_code c, const void *buf, ssize_t size);
-
 private:
 	friend class BNullParameter;
 	friend class BContinuousParameter;
@@ -312,253 +257,216 @@
 	friend class BParameterGroup;
 	friend class BParameterWeb;
 
-		bool SwapOnUnflatten() { return mSwapDetected; }
+								BParameter(int32 id, media_type mediaType,
+									media_parameter_type type,
+									BParameterWeb* web, const char* name,
+									const char* kind, const char* unit);
+								~BParameter();
 
-		/* Mmmh, stuffing! */
-virtual		status_t _Reserved_Control_0(void *);
-virtual		status_t _Reserved_Control_1(void *);
-virtual		status_t _Reserved_Control_2(void *);
-virtual		status_t _Reserved_Control_3(void *);
-virtual		status_t _Reserved_Control_4(void *);
-virtual		status_t _Reserved_Control_5(void *);
-virtual		status_t _Reserved_Control_6(void *);
-virtual		status_t _Reserved_Control_7(void *);
+	// reserved
+	virtual	status_t			_Reserved_Control_0(void*);
+	virtual	status_t			_Reserved_Control_1(void*);
+	virtual	status_t			_Reserved_Control_2(void*);
+	virtual	status_t			_Reserved_Control_3(void*);
+	virtual	status_t			_Reserved_Control_4(void*);
+	virtual	status_t			_Reserved_Control_5(void*);
+	virtual	status_t			_Reserved_Control_6(void*);
+	virtual	status_t			_Reserved_Control_7(void*);
 
+			bool				SwapOnUnflatten() { return fSwapDetected; }
+	virtual	void				FixRefs(BList& old, BList& updated);
 
-		BParameter(
-				int32 id,
-				media_type m_type,
-				media_parameter_type type,
-				BParameterWeb * web,
-				const char * name,
-				const char * kind,
-				const char * unit);
-		~BParameter();
+private:
+			int32				fID;
+			media_parameter_type fType;
+			BParameterWeb*		fWeb;
+			BParameterGroup*	fGroup;
+			char*				fName;
+			char*				fKind;
+			char*				fUnit;
+			BList*				fInputs;
+			BList*				fOutputs;
+			bool				fSwapDetected;
+			media_type			fMediaType;
+			int32				fChannels;
+			uint32				fFlags;
 
-		int32 mID;
-		media_parameter_type mType;
-		BParameterWeb * mWeb;
-		BParameterGroup * mGroup;
-		char * mName;
-		char * mKind;
-		char * mUnit;
-		BList * mInputs;
-		BList * mOutputs;
-		bool mSwapDetected;
-		media_type mMediaType;
-		int32 mChannels;
-		uint32 mFlags;
-		uint32 _reserved_control_[7];
-
-virtual	void FixRefs(
-				BList & old,
-				BList & updated);
+			uint32				_reserved[7];
 };
 
 
-class BContinuousParameter :
-	public BParameter
-{
+class BContinuousParameter : public BParameter {
 public:
+	enum response {
+		B_UNKNOWN = 0,
+		B_LINEAR,
+		B_POLYNOMIAL,
+		B_EXPONENTIAL,
+		B_LOGARITHMIC
+	};
 
-virtual	type_code ValueType();
+	virtual	type_code			ValueType();
 
-		float MinValue();
-		float MaxValue();
-		float ValueStep();
+			float				MinValue();
+			float				MaxValue();
+			float				ValueStep();
 
-		/* The "response" specifies what value to display to the user. */
-		/* Thus, if response is B_POLYNOMIAL with factor 2, an actual */
-		/* control value of 10 would be displayed to the user as 100, and */
-		/* if response was B_EXPONENTIAL and factor was 2, an actual */
-		/* value of 3 would display 8 (two to the third). The ValueStep() */
-		/* is given in actual control values, before the transformation for */
-		/* display is done. Thus, with min 0, max 4 and value step 1, and an */
-		/* exponential response with factor 10, you will get the displayed */
-		/* values 1, 10, 100, 1000 and 10000 equally spaced across a slider */
-		/* (or whatever UI the app puts to the parameter). */
-		/* The "offset" is added to the value after transformation, before display. */
-		/* If "resp" is negative, the resulting value/display relation is turned upside down. */
-		enum response {
-			B_UNKNOWN = 0,
-			B_LINEAR = 1,	/* factor is direct multiplier >= 0 */
-			B_POLYNOMIAL,	/* factor should be power; typically "2" for squared or "-1" for inverse */
-			B_EXPONENTIAL,	/* factor should be base, typically 2 or 10 */
-			B_LOGARITHMIC	/* factor should be base, typically 2 or 10 */
-		};
-		void SetResponse(
-				int resp,
-				float factor,
-				float offset);
-		void GetResponse(
-				int * resp,
-				float * factor,
-				float * offset);
+			void				SetResponse(int response, float factor,
+									float offset);
+			void				GetResponse(int* _response, float* factor,
+									float* offset);
 
-virtual	ssize_t		FlattenedSize() const;
-virtual	status_t	Flatten(void *buffer, ssize_t size) const;
-virtual	status_t	Unflatten(type_code c, const void *buf, ssize_t size);
+	virtual	ssize_t				FlattenedSize() const;
+	virtual	status_t			Flatten(void* buffer, ssize_t size) const;
+	virtual	status_t			Unflatten(type_code code, const void* buffer,
+									ssize_t size);
 
 private:
-
-		/* Mmmh, stuffing! */
-virtual		status_t _Reserved_ContinuousParameter_0(void *);
-virtual		status_t _Reserved_ContinuousParameter_1(void *);
-virtual		status_t _Reserved_ContinuousParameter_2(void *);
-virtual		status_t _Reserved_ContinuousParameter_3(void *);
-virtual		status_t _Reserved_ContinuousParameter_4(void *);
-virtual		status_t _Reserved_ContinuousParameter_5(void *);
-virtual		status_t _Reserved_ContinuousParameter_6(void *);
-virtual		status_t _Reserved_ContinuousParameter_7(void *);
 	friend class BParameterGroup;
 
-		BContinuousParameter(
-				int32 id,
-				media_type m_type,
-				BParameterWeb * web,
-				const char * name,
-				const char * kind,
-				const char * unit,
-				float minimum,
-				float maximum,
-				float stepping);
-		~BContinuousParameter();
+								BContinuousParameter(int32 id,
+									media_type mediaType,
+									BParameterWeb* web, const char* name,
+									const char* kind, const char* unit,
+									float min, float max, float step);
+								~BContinuousParameter();
 
-		float mMinimum;
-		float mMaximum;
-		float mStepping;
-		response mResponse;
-		float mFactor; 
-		float mOffset;
-		uint32 _reserved_control_slider_[8];
+	// reserved
+	virtual	status_t			_Reserved_ContinuousParameter_0(void*);
+	virtual	status_t			_Reserved_ContinuousParameter_1(void*);
+	virtual	status_t			_Reserved_ContinuousParameter_2(void*);
+	virtual	status_t			_Reserved_ContinuousParameter_3(void*);
+	virtual	status_t			_Reserved_ContinuousParameter_4(void*);
+	virtual	status_t			_Reserved_ContinuousParameter_5(void*);
+	virtual	status_t			_Reserved_ContinuousParameter_6(void*);
+	virtual	status_t			_Reserved_ContinuousParameter_7(void*);
 
+private:
+			float				fMinimum;
+			float				fMaximum;
+			float				fStepping;
+			response			fResponse;
+			float				fFactor;
+			float				fOffset;
+			
+			uint32				_reserved[8];
 };
 
 
-class BDiscreteParameter :
-	public BParameter
-{
+class BDiscreteParameter : public BParameter {
 public:
+	virtual	type_code			ValueType();
 
-virtual	type_code ValueType();
+			int32				CountItems();
+			const char*			ItemNameAt(int32 index);
+			int32				ItemValueAt(int32 index);
+			status_t			AddItem(int32 value, const char* name);
 
-		int32 CountItems();
-		const char * ItemNameAt(
-				int32 index);
-		int32 ItemValueAt(
-				int32 index);
-		status_t AddItem(
-				int32 value,
-				const char * name);
-		status_t MakeItemsFromInputs();
-		status_t MakeItemsFromOutputs();
-		void MakeEmpty();
+			status_t			MakeItemsFromInputs();
+			status_t			MakeItemsFromOutputs();
 
-virtual	ssize_t		FlattenedSize() const;
-virtual	status_t	Flatten(void *buffer, ssize_t size) const;
-virtual	status_t	Unflatten(type_code c, const void *buf, ssize_t size);
+			void				MakeEmpty();
 
-private:
-		/* Mmmh, stuffing! */
-virtual		status_t _Reserved_DiscreteParameter_0(void *);
-virtual		status_t _Reserved_DiscreteParameter_1(void *);
-virtual		status_t _Reserved_DiscreteParameter_2(void *);
-virtual		status_t _Reserved_DiscreteParameter_3(void *);
-virtual		status_t _Reserved_DiscreteParameter_4(void *);
-virtual		status_t _Reserved_DiscreteParameter_5(void *);
-virtual		status_t _Reserved_DiscreteParameter_6(void *);
-virtual		status_t _Reserved_DiscreteParameter_7(void *);
+	virtual	ssize_t				FlattenedSize() const;
+	virtual	status_t			Flatten(void* buffer, ssize_t size) const;
+	virtual	status_t			Unflatten(type_code code, const void* buffer,
+									ssize_t size);
 
+private:
 	friend class BParameterGroup;
 
-		BList * mSelections;
-		BList * mValues;
-		uint32 _reserved_control_selector_[8];
+								BDiscreteParameter(int32 id,
+									media_type mediaType,
+									BParameterWeb* web, const char* name,
+									const char* kind);
+								~BDiscreteParameter();
 
-		BDiscreteParameter(
-				int32 id,
-				media_type m_type,
-				BParameterWeb * web,
-				const char * name,
-				const char * kind);
-		~BDiscreteParameter();
+	// reserved
+	virtual	status_t			_Reserved_DiscreteParameter_0(void*);
+	virtual	status_t			_Reserved_DiscreteParameter_1(void*);
+	virtual	status_t			_Reserved_DiscreteParameter_2(void*);
+	virtual	status_t			_Reserved_DiscreteParameter_3(void*);
+	virtual	status_t			_Reserved_DiscreteParameter_4(void*);
+	virtual	status_t			_Reserved_DiscreteParameter_5(void*);
+	virtual	status_t			_Reserved_DiscreteParameter_6(void*);
+	virtual	status_t			_Reserved_DiscreteParameter_7(void*);
+
+private:
+			BList*				fSelections;
+			BList*				fValues;
+			
+			uint32				_reserved[8];
 };
 
 
-class BNullParameter :
-	public BParameter
-{
+class BTextParameter : public BParameter {
 public:
+	virtual	type_code			ValueType();
 
-virtual	type_code ValueType();
+			size_t				MaxBytes() const;
 
-virtual	ssize_t		FlattenedSize() const;
-virtual	status_t	Flatten(void *buffer, ssize_t size) const;
-virtual	status_t	Unflatten(type_code c, const void *buf, ssize_t size);
+	virtual	ssize_t				FlattenedSize() const;
+	virtual	status_t			Flatten(void* buffer, ssize_t size) const;
+	virtual	status_t			Unflatten(type_code code, const void* buffer,
+									ssize_t size);
 
 private:
-		/* Mmmh, stuffing! */
-virtual		status_t _Reserved_NullParameter_0(void *);
-virtual		status_t _Reserved_NullParameter_1(void *);
-virtual		status_t _Reserved_NullParameter_2(void *);
-virtual		status_t _Reserved_NullParameter_3(void *);
-virtual		status_t _Reserved_NullParameter_4(void *);
-virtual		status_t _Reserved_NullParameter_5(void *);
-virtual		status_t _Reserved_NullParameter_6(void *);
-virtual		status_t _Reserved_NullParameter_7(void *);
-
 	friend class BParameterGroup;
 
-		uint32 _reserved_control_junction_[8];
+								BTextParameter(int32 id,
+									media_type mediaType,
+									BParameterWeb* web, const char* name,
+									const char* kind, size_t maxBytes);
+								~BTextParameter();
 
-		BNullParameter(
-				int32 id,
-				media_type m_type,
-				BParameterWeb * web,
-				const char * name,
-				const char * kind);
-		~BNullParameter();
+	// reserved
+	virtual	status_t			_Reserved_TextParameter_0(void*);
+	virtual	status_t			_Reserved_TextParameter_1(void*);
+	virtual	status_t			_Reserved_TextParameter_2(void*);
+	virtual	status_t			_Reserved_TextParameter_3(void*);
+	virtual	status_t			_Reserved_TextParameter_4(void*);
+	virtual	status_t			_Reserved_TextParameter_5(void*);
+	virtual	status_t			_Reserved_TextParameter_6(void*);
+	virtual	status_t			_Reserved_TextParameter_7(void*);
 
+private:
+			uint32				fMaxBytes;
+			
+			uint32				_reserved[8];
 };
 
 
-class BTextParameter :
-	public BParameter
-{
+class BNullParameter : public BParameter {
 public:
+	virtual	type_code			ValueType();
 
-	size_t	MaxBytes() const;
-virtual	type_code ValueType();
+	virtual	ssize_t				FlattenedSize() const;
+	virtual	status_t			Flatten(void* buffer, ssize_t size) const;
+	virtual	status_t			Unflatten(type_code code, const void* buffer,
+									ssize_t size);
 
-virtual	ssize_t		FlattenedSize() const;
-virtual	status_t	Flatten(void *buffer, ssize_t size) const;
-virtual	status_t	Unflatten(type_code c, const void *buf, ssize_t size);
-
 private:
-		/* Mmmh, stuffing! */
-virtual		status_t _Reserved_TextParameter_0(void *);
-virtual		status_t _Reserved_TextParameter_1(void *);
-virtual		status_t _Reserved_TextParameter_2(void *);
-virtual		status_t _Reserved_TextParameter_3(void *);
-virtual		status_t _Reserved_TextParameter_4(void *);
-virtual		status_t _Reserved_TextParameter_5(void *);
-virtual		status_t _Reserved_TextParameter_6(void *);
-virtual		status_t _Reserved_TextParameter_7(void *);
-
 	friend class BParameterGroup;
 
-		uint32 mMaxBytes;
-		uint32 _reserved_control_junction_[8];
+								BNullParameter(int32 id,
+									media_type mediaType,
+									BParameterWeb* web, const char* name,
+									const char* kind);
+								~BNullParameter();
 
-		BTextParameter(
-				int32 id,
-				media_type m_type,
-				BParameterWeb * web,
-				const char * name,
-				const char * kind,
-				size_t max_bytes);
-		~BTextParameter();
+	// reserved
+	virtual	status_t			_Reserved_NullParameter_0(void*);
+	virtual	status_t			_Reserved_NullParameter_1(void*);
+	virtual	status_t			_Reserved_NullParameter_2(void*);
+	virtual	status_t			_Reserved_NullParameter_3(void*);
+	virtual	status_t			_Reserved_NullParameter_4(void*);
+	virtual	status_t			_Reserved_NullParameter_5(void*);
+	virtual	status_t			_Reserved_NullParameter_6(void*);
+	virtual	status_t			_Reserved_NullParameter_7(void*);
 
+private:
+			uint32				_reserved[8];
 };
 
-#endif /* _CONTROL_WEB_H */
+
+#endif	// _CONTROL_WEB_H

Modified: haiku/trunk/src/kits/media/Controllable.cpp
===================================================================
--- haiku/trunk/src/kits/media/Controllable.cpp	2009-04-08 14:12:45 UTC (rev 30028)
+++ haiku/trunk/src/kits/media/Controllable.cpp	2009-04-08 14:13:33 UTC (rev 30029)
@@ -116,13 +116,12 @@
 	fWeb = web;
 
 	if (fWeb)
-		fWeb->mNode = Node(); // initialize BParameterWeb member variable
+		fWeb->fNode = Node(); // initialize BParameterWeb member variable
 		
 	UnlockParameterWeb();
 	if (old != web && web != 0)
 		BPrivate::media::notifications::WebChanged(Node());
-	if (old)
-		delete old;
+	delete old;
 	return B_OK;
 }
 

Modified: haiku/trunk/src/kits/media/ParameterWeb.cpp
===================================================================
--- haiku/trunk/src/kits/media/ParameterWeb.cpp	2009-04-08 14:12:45 UTC (rev 30028)
+++ haiku/trunk/src/kits/media/ParameterWeb.cpp	2009-04-08 14:13:33 UTC (rev 30029)
@@ -13,12 +13,14 @@
 */
 
 #include <ParameterWeb.h>
+
+#include <new>
+
 #include <MediaNode.h>
 #include <string.h>
 #include "DataExchange.h"
 #include "MediaMisc.h"
 
-
 #include "debug.h"
 
 
@@ -292,31 +294,19 @@
 }
 
 
-/** Copies the source string into a new buffer with the specified
- *	maximum size. This always includes a trailing zero byte.
- *	Returns NULL if the source string is either NULL or empty, or
- *	if there wasn't enough memory to allocate the buffer.
- *	The buffer returned is to be freed by the caller using free().
- */
+//	#pragma mark - BParameterWeb
 
-//	#pragma mark -
 
-/*************************************************************
- * public BParameterWeb
- *************************************************************/
-
-
 BParameterWeb::BParameterWeb()
-	:	mNode(media_node::null) // mNode is set in BControllable::SetParameterWeb()
+	:
+	fNode(media_node::null)
+		// fNode is set in BControllable::SetParameterWeb()
 {
 	CALLED();
 
-	mGroups = new BList();
-
-	mOldRefs = new BList();
-	mNewRefs = new BList();
-
-	ASSERT(mGroups != NULL && mOldRefs != NULL && mNewRefs != NULL);
+	fGroups = new BList();
+	fOldRefs = new BList();
+	fNewRefs = new BList();
 }
 
 
@@ -324,35 +314,37 @@
 {

[... truncated: 2274 lines follow ...]


From axeld at mail.berlios.de  Wed Apr  8 16:21:31 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 8 Apr 2009 16:21:31 +0200
Subject: [Haiku-commits] r30030 - in haiku/trunk: headers/os/media
	src/kits/media
Message-ID: <200904081421.n38ELVdp032535@sheep.berlios.de>

Author: axeld
Date: 2009-04-08 16:21:29 +0200 (Wed, 08 Apr 2009)
New Revision: 30030
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30030&view=rev

Modified:
   haiku/trunk/headers/os/media/ParameterWeb.h
   haiku/trunk/src/kits/media/ParameterWeb.cpp
Log:
* Added Dano-compatible BParameterWeb::StartWatching()/StopWatching() method
  stubs.
* However, without a working Dano at hand, I can't really implement something
  compatible, so I'll postpone this to some later point.


Modified: haiku/trunk/headers/os/media/ParameterWeb.h
===================================================================
--- haiku/trunk/headers/os/media/ParameterWeb.h	2009-04-08 14:13:33 UTC (rev 30029)
+++ haiku/trunk/headers/os/media/ParameterWeb.h	2009-04-08 14:21:29 UTC (rev 30030)
@@ -91,6 +91,11 @@
 			int32				CountParameters();
 			BParameter*			ParameterAt(int32 index);
 
+			status_t			StartWatching(const BMessenger& target,
+									int32 notificationType);
+			status_t			StopWatching(const BMessenger& target,
+									int32 notificationType);
+
 	// BFlattenable implementation
 	virtual	bool				IsFixedSize() const;
 	virtual type_code			TypeCode() const;

Modified: haiku/trunk/src/kits/media/ParameterWeb.cpp
===================================================================
--- haiku/trunk/src/kits/media/ParameterWeb.cpp	2009-04-08 14:13:33 UTC (rev 30029)
+++ haiku/trunk/src/kits/media/ParameterWeb.cpp	2009-04-08 14:21:29 UTC (rev 30030)
@@ -419,6 +419,20 @@
 }
 
 
+status_t
+BParameterWeb::StartWatching(const BMessenger& target, int32 notificationType)
+{
+	return B_ERROR;
+}
+
+
+status_t
+BParameterWeb::StopWatching(const BMessenger& target, int32 notificationType)
+{
+	return B_ERROR;
+}
+
+
 bool
 BParameterWeb::IsFixedSize() const
 {



From axeld at mail.berlios.de  Wed Apr  8 16:59:31 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 8 Apr 2009 16:59:31 +0200
Subject: [Haiku-commits] r30031 - haiku/trunk/src/bin/desklink
Message-ID: <200904081459.n38ExVuW004324@sheep.berlios.de>

Author: axeld
Date: 2009-04-08 16:59:25 +0200 (Wed, 08 Apr 2009)
New Revision: 30031
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30031&view=rev

Added:
   haiku/trunk/src/bin/desklink/MediaReplicant.cpp
   haiku/trunk/src/bin/desklink/VolumeControl.cpp
   haiku/trunk/src/bin/desklink/VolumeControl.h
   haiku/trunk/src/bin/desklink/VolumeWindow.cpp
   haiku/trunk/src/bin/desklink/VolumeWindow.h
   haiku/trunk/src/bin/desklink/desklink.h
Removed:
   haiku/trunk/src/bin/desklink/VolumeSlider.cpp
   haiku/trunk/src/bin/desklink/VolumeSlider.h
Modified:
   haiku/trunk/src/bin/desklink/Jamfile
   haiku/trunk/src/bin/desklink/MixerControl.cpp
   haiku/trunk/src/bin/desklink/MixerControl.h
   haiku/trunk/src/bin/desklink/desklink.cpp
Log:
* Restructured the sources a bit, renamed SliderView to VolumeControl,
  VolumeSlider to VolumeWindow.
* The VolumeControl is now a replicant, and be be dragged to the Tracker.
* Hence, moved all volume control stuff from VolumeWindow into the
  VolumeControl class directly.
* Changed menu a bit. Note that controlling the physical output currently
  does not work, but that's a problem of the media node in question (probably
  the multi audio add-on, I'll have a look).
* Added a small delay when clicking on the slider directly before the window
  is hidden, so that you'll get some feedback of your action.
* Added --add-volume, and --volume-control options to "desklink", the former
  adds the volume control icon to the deskbar, the latter opens the volume
  control window directly.
* Further cleanup.


Modified: haiku/trunk/src/bin/desklink/Jamfile
===================================================================
--- haiku/trunk/src/bin/desklink/Jamfile	2009-04-08 14:21:29 UTC (rev 30030)
+++ haiku/trunk/src/bin/desklink/Jamfile	2009-04-08 14:59:25 UTC (rev 30031)
@@ -2,11 +2,15 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+UsePrivateHeaders app ;
+
 BinCommand desklink :
 	desklink.cpp
-	VolumeSlider.cpp
 	DeskButton.cpp
+	MediaReplicant.cpp
 	MixerControl.cpp
+	VolumeControl.cpp
+	VolumeWindow.cpp
 
 	: be libmedia.so
 	: desklink.rdef

Copied: haiku/trunk/src/bin/desklink/MediaReplicant.cpp (from rev 30014, haiku/trunk/src/bin/desklink/desklink.cpp)
===================================================================
--- haiku/trunk/src/bin/desklink/desklink.cpp	2009-04-07 23:35:43 UTC (rev 30014)
+++ haiku/trunk/src/bin/desklink/MediaReplicant.cpp	2009-04-08 14:59:25 UTC (rev 30031)
@@ -0,0 +1,401 @@
+/*
+ * Copyright 2003-2009, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		J?r?me Duval
+ *		Fran?ois Revol
+ *		Marcus Overhagen
+ *		Jonas Sundstr?m
+ *		Axel D?rfler, axeld at pinc-software.de.
+ */
+
+//! Volume control, and media shortcuts in Deskbar
+
+#include <new>
+#include <stdio.h>
+
+#include <Alert.h>
+#include <Bitmap.h>
+#include <Entry.h>
+#include <File.h>
+#include <FindDirectory.h>
+#include <MenuItem.h>
+#include <Path.h>
+#include <PopUpMenu.h>
+#include <Roster.h>
+#include <String.h>
+
+#include "desklink.h"
+#include "iconfile.h"
+#include "MixerControl.h"
+#include "VolumeWindow.h"
+
+
+static const uint32 kMsgOpenMediaSettings = 'mese';
+static const uint32 kMsgOpenSoundSettings = 'sose';
+static const uint32 kMsgOpenMediaPlayer = 'omep';
+static const uint32 kMsgToggleBeep = 'tdbp';
+static const uint32 kMsgVolumeWhich = 'svwh';
+
+static const char* kReplicantName = "MediaReplicant";
+	// R5 name needed, Media prefs manel removes by name
+
+static const char* kSettingsFile = "x-vnd.Haiku-desklink";
+
+
+class MediaReplicant : public BView {
+public:
+							MediaReplicant(BRect frame, const char* name,
+								uint32 resizeMask = B_FOLLOW_ALL, 
+								uint32 flags = B_WILL_DRAW | B_NAVIGABLE);
+							MediaReplicant(BMessage* archive);
+
+	virtual					~MediaReplicant();
+
+	// archiving overrides
+	static	MediaReplicant*	Instantiate(BMessage* data);
+	virtual	status_t		Archive(BMessage* data, bool deep = true) const;
+
+	// BView overrides
+	virtual void			AttachedToWindow();
+	virtual void			MouseDown(BPoint point);
+	virtual void			Draw(BRect updateRect);
+	virtual void			MessageReceived(BMessage* message);
+
+private:
+			status_t		_LaunchByPath(const char* path);
+			status_t		_LaunchBySignature(const char* signature);
+			void			_Launch(const char* prettyName,
+								const char* signature, directory_which base,
+								const char* fileName);
+			void			_LoadSettings();
+			void			_SaveSettings();
+			void			_Init();
+
+			BBitmap*		fIcon;
+			VolumeWindow*	fVolumeSlider;
+			bool 			fDontBeep;
+				// don't beep on volume change
+			int32 			fVolumeWhich;
+				// which volume parameter to act on (Mixer/Phys.Output)
+};
+
+
+MediaReplicant::MediaReplicant(BRect frame, const char* name,
+		uint32 resizeMask, uint32 flags)
+	: BView(frame, name, resizeMask, flags),
+	fVolumeSlider(NULL)
+{
+	_Init();
+}
+
+
+MediaReplicant::MediaReplicant(BMessage* message)
+	: BView(message),
+	fVolumeSlider(NULL)
+{
+	_Init();
+}
+
+
+MediaReplicant::~MediaReplicant()
+{
+	delete fIcon;
+	_SaveSettings();
+}
+
+
+MediaReplicant*
+MediaReplicant::Instantiate(BMessage* data)
+{
+	if (!validate_instantiation(data, kReplicantName))
+		return NULL;
+
+	return new(std::nothrow) MediaReplicant(data);
+}
+
+
+status_t 
+MediaReplicant::Archive(BMessage* data, bool deep) const
+{
+	status_t status = BView::Archive(data, deep);
+	if (status < B_OK)
+		return status;
+
+	return data->AddString("add_on", kAppSignature);
+}
+
+
+void
+MediaReplicant::AttachedToWindow()
+{
+	BView *parent = Parent();
+	if (parent)
+		SetViewColor(parent->ViewColor());
+
+	BView::AttachedToWindow();
+}
+
+
+void 
+MediaReplicant::Draw(BRect rect)
+{
+	BView::Draw(rect);
+	
+	SetDrawingMode(B_OP_OVER);
+	DrawBitmap(fIcon);
+}
+
+
+void
+MediaReplicant::MouseDown(BPoint point)
+{
+	int32 buttons = B_PRIMARY_MOUSE_BUTTON;
+	if (Looper() != NULL && Looper()->CurrentMessage() != NULL)
+		Looper()->CurrentMessage()->FindInt32("buttons", &buttons);
+
+	BPoint where = ConvertToScreen(point);
+
+	if ((buttons & B_SECONDARY_MOUSE_BUTTON) != 0) {
+		BPopUpMenu* menu = new BPopUpMenu("", false, false);
+		menu->SetFont(be_plain_font);
+
+		menu->AddItem(new BMenuItem("Media Preferences" B_UTF8_ELLIPSIS,
+			new BMessage(kMsgOpenMediaSettings)));
+		menu->AddItem(new BMenuItem("Sound Preferences" B_UTF8_ELLIPSIS,
+			new BMessage(kMsgOpenSoundSettings)));
+
+		menu->AddSeparatorItem();
+
+		menu->AddItem(new BMenuItem("Open MediaPlayer",
+			new BMessage(kMsgOpenMediaPlayer)));
+
+		menu->AddSeparatorItem();
+
+		BMenu* subMenu = new BMenu("Options");
+		menu->AddItem(subMenu);
+
+		BMenuItem* item = new BMenuItem("Control Physical Output",
+			new BMessage(kMsgVolumeWhich));
+		item->SetMarked(fVolumeWhich == VOLUME_USE_PHYS_OUTPUT);
+		subMenu->AddItem(item);
+
+		item = new BMenuItem("Beep", new BMessage(kMsgToggleBeep));
+		item->SetMarked(!fDontBeep);
+		subMenu->AddItem(item);
+
+		menu->AddSeparatorItem();
+
+		menu->AddItem(new BMenuItem("About" B_UTF8_ELLIPSIS,
+			new BMessage(B_ABOUT_REQUESTED)));
+
+		menu->SetTargetForItems(this);
+		subMenu->SetTargetForItems(this);
+
+		menu->Go(where, true, true, BRect(where - BPoint(4, 4), 
+			where + BPoint(4, 4)));
+	} else {
+		// Show VolumeWindow
+		fVolumeSlider = new VolumeWindow(BRect(where.x, where.y,
+			where.x + 207, where.y + 19), fDontBeep, fVolumeWhich);
+		fVolumeSlider->Show();
+	}
+}
+
+
+void
+MediaReplicant::MessageReceived(BMessage *message)
+{
+	switch (message->what) {
+		case B_ABOUT_REQUESTED:
+			(new BAlert("About Volume Control", "Volume Control\n"
+					"  Brought to you by J?r?me DUVAL.\n\n"
+					"Copyright " B_UTF8_COPYRIGHT "2003-2009, Haiku",
+				"OK"))->Go(NULL);
+			break;
+
+		case kMsgOpenMediaPlayer:
+			_Launch("MediaPlayer", "application/x-vnd.Haiku-MediaPlayer",
+				B_SYSTEM_APPS_DIRECTORY, "MediaPlayer");
+			break;
+
+		case kMsgOpenMediaSettings:
+			_Launch("Media Preferences", "application/x-vnd.Haiku-Media",
+				B_SYSTEM_PREFERENCES_DIRECTORY, "Media");
+			break;
+
+		case kMsgOpenSoundSettings:
+			_Launch("Sounds Preferences", "application/x-vnd.Haiku-Sounds",
+				B_SYSTEM_PREFERENCES_DIRECTORY, "Sounds");
+			break;
+
+		case kMsgToggleBeep:
+		{
+			BMenuItem* item;
+			if (message->FindPointer("source", (void**)&item) != B_OK)
+				return;
+
+			item->SetMarked(!item->IsMarked());
+			fDontBeep = !item->IsMarked();
+			break;
+		}
+
+		case kMsgVolumeWhich:
+		{
+			BMenuItem* item;
+			if (message->FindPointer("source", (void**)&item) != B_OK)
+				return;
+
+			item->SetMarked(!item->IsMarked());
+			fVolumeWhich = item->IsMarked()
+				? VOLUME_USE_PHYS_OUTPUT : VOLUME_USE_MIXER;
+			break;
+		}
+
+		case B_MOUSE_WHEEL_CHANGED:
+		{
+			float deltaY;
+			if (message->FindFloat("be:wheel_delta_y", &deltaY) == B_OK
+				&& deltaY != 0.0) {
+				MixerControl mixerControl(fVolumeWhich);
+				mixerControl.ChangeVolumeBy(deltaY < 0 ? 6 : -6);
+			}
+			break;
+		}
+
+		default:
+			BView::MessageReceived(message);
+			break;		
+	}
+}
+
+
+status_t
+MediaReplicant::_LaunchByPath(const char* path)
+{
+	entry_ref ref;
+	status_t status = get_ref_for_path(path, &ref);
+	if (status != B_OK)
+		return status;
+
+	status = be_roster->Launch(&ref);
+	if (status != B_ALREADY_RUNNING)
+		return status;
+
+	// The application runs already, bring it to front
+
+	app_info appInfo;
+	status = be_roster->GetAppInfo(&ref, &appInfo);
+	if (status != B_OK)
+		return status;
+
+	return be_roster->ActivateApp(appInfo.team);
+}
+
+
+status_t
+MediaReplicant::_LaunchBySignature(const char* signature)
+{
+	status_t status = be_roster->Launch(signature);
+	if (status != B_ALREADY_RUNNING)
+		return status;
+
+	// The application runs already, bring it to front
+
+	app_info appInfo;
+	status = be_roster->GetAppInfo(signature, &appInfo);
+	if (status != B_OK)
+		return status;
+
+	return be_roster->ActivateApp(appInfo.team);
+}
+
+
+void
+MediaReplicant::_Launch(const char* prettyName, const char* signature,
+	directory_which base, const char* fileName)
+{
+	BPath path;
+	status_t status = find_directory(base, &path);
+	if (status == B_OK)
+		path.Append(fileName);
+
+	// launch the application
+	if (_LaunchBySignature(signature) != B_OK
+		&& _LaunchByPath(path.Path()) != B_OK) {
+		BString message = "Couldn't launch ";
+		message << prettyName;
+
+		(new BAlert("desklink", message.String(), "OK"))->Go();
+	}
+}
+
+
+void
+MediaReplicant::_LoadSettings()
+{
+	fDontBeep = false;
+	fVolumeWhich = VOLUME_USE_MIXER;
+
+	BPath path;
+	if (find_directory(B_USER_SETTINGS_DIRECTORY, &path, false) < B_OK)
+		return;
+
+	path.Append(kSettingsFile);
+
+	BFile settings(path.Path(), B_READ_ONLY);
+	if (settings.InitCheck() < B_OK)
+		return;
+
+	BMessage msg;
+	if (msg.Unflatten(&settings) < B_OK)
+		return;
+
+	msg.FindInt32("volwhich", &fVolumeWhich);
+	msg.FindBool("dontbeep", &fDontBeep);
+}
+
+
+void
+MediaReplicant::_SaveSettings()
+{
+	BPath path;
+	if (find_directory(B_USER_SETTINGS_DIRECTORY, &path, false) < B_OK)
+		return;
+
+	path.Append(kSettingsFile);
+
+	BFile settings(path.Path(), B_WRITE_ONLY | B_CREATE_FILE | B_ERASE_FILE);
+	if (settings.InitCheck() < B_OK)
+		return;
+
+	BMessage msg('CNFG');
+	msg.AddInt32("volwhich", fVolumeWhich);
+	msg.AddBool("dontbeep", fDontBeep);
+
+	ssize_t size = 0;
+	msg.Flatten(&settings, &size);
+}
+
+
+void 
+MediaReplicant::_Init()
+{
+	fIcon = new BBitmap(BRect(0, 0, kSpeakerWidth - 1, kSpeakerHeight - 1),
+		B_CMAP8);
+	fIcon->SetBits(kSpeakerBits, kSpeakerWidth*kSpeakerHeight, 0, B_CMAP8);
+
+	_LoadSettings();
+}
+
+
+//	#pragma mark -
+
+
+extern "C" BView*
+instantiate_deskbar_item(void)
+{
+	return new MediaReplicant(BRect(0, 0, 16, 16), kReplicantName);
+}
+

Modified: haiku/trunk/src/bin/desklink/MixerControl.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/MixerControl.cpp	2009-04-08 14:21:29 UTC (rev 30030)
+++ haiku/trunk/src/bin/desklink/MixerControl.cpp	2009-04-08 14:59:25 UTC (rev 30031)
@@ -5,6 +5,7 @@
  * Authors:
  *		J?r?me Duval
  *		Fran?ois Revol
+ *		Axel D?rfler, axeld at pinc-software.de.
  */
 
 
@@ -17,6 +18,7 @@
 MixerControl::MixerControl(int32 volumeWhich, float* _value,
 		const char** _error)
 	:
+	fVolumeWhich(volumeWhich),
 	fAudioMixerNode(NULL),
 	fParameterWeb(NULL),
 	fMixerParameter(NULL),
@@ -170,6 +172,28 @@
 }
 
 
+int32
+MixerControl::VolumeWhich() const
+{
+	return fVolumeWhich;
+}
+
+
+float
+MixerControl::Volume() const
+{
+	if (fMixerParameter == NULL)
+		return 0.0f;
+
+	float volume = 0;
+	bigtime_t lastChange;
+	size_t size = sizeof(float);
+	fMixerParameter->GetValue(&volume, &size, &lastChange);
+
+	return volume;
+}
+
+
 void
 MixerControl::SetVolume(float volume)
 {
@@ -181,7 +205,7 @@
 	else if (volume > fMax)
 		volume = fMax;
 
-	if (volume != _GetVolume())
+	if (volume != Volume())
 		fMixerParameter->SetValue(&volume, sizeof(float), system_time());
 }
 
@@ -192,21 +216,7 @@
 	if (fMixerParameter == NULL || value == 0.0f)
 		return;
 
-	float volume = _GetVolume();
+	float volume = Volume();
 	SetVolume(volume + value);
 }
 
-
-float
-MixerControl::_GetVolume()
-{
-	if (fMixerParameter == NULL)
-		return 0.0f;
-
-	float volume = 0;
-	bigtime_t lastChange;
-	size_t size = sizeof(float);
-	fMixerParameter->GetValue(&volume, &size, &lastChange);
-
-	return volume;
-}

Modified: haiku/trunk/src/bin/desklink/MixerControl.h
===================================================================
--- haiku/trunk/src/bin/desklink/MixerControl.h	2009-04-08 14:21:29 UTC (rev 30030)
+++ haiku/trunk/src/bin/desklink/MixerControl.h	2009-04-08 14:59:25 UTC (rev 30031)
@@ -23,10 +23,14 @@
 
 class MixerControl {
 public:
-							MixerControl(int32 volumeWhich, float *value = NULL,
-								const char **error = NULL);
+							MixerControl(int32 volumeWhich,
+								float* _value = NULL,
+								const char** _error = NULL);
 							~MixerControl();
 
+			int32			VolumeWhich() const;
+			float			Volume() const;
+
 			void			SetVolume(float volume);
 			void			ChangeVolumeBy(float value);
 
@@ -34,13 +38,13 @@
 			float			Maximum() const { return fMax; }
 
 private:
-			float			_GetVolume();
-			void			_SetVolume(float volume);
-
+			int32			fVolumeWhich;
 			media_node*		fAudioMixerNode;
 			BParameterWeb*	fParameterWeb;
 			BContinuousParameter* fMixerParameter;
-			float			fMin, fMax, fStep;
+			float			fMin;
+			float			fMax;
+			float			fStep;
 };
 
 #endif	// MIXER_CONTROL_H

Copied: haiku/trunk/src/bin/desklink/VolumeControl.cpp (from rev 30016, haiku/trunk/src/bin/desklink/VolumeSlider.cpp)
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeSlider.cpp	2009-04-08 07:45:59 UTC (rev 30016)
+++ haiku/trunk/src/bin/desklink/VolumeControl.cpp	2009-04-08 14:59:25 UTC (rev 30031)
@@ -0,0 +1,250 @@
+/*
+ * Copyright 2003-2009, Haiku, Inc.
+ * Distributed under the terms of the MIT license.
+ *
+ * Authors:
+ *		J?r?me Duval
+ *		Fran?ois Revol
+ *		Axel D?rfler, axeld at pinc-software.de.
+ */
+
+
+#include "VolumeControl.h"
+
+#include <string.h>
+#include <stdio.h>
+
+#include <Application.h>
+#include <Beep.h>
+#include <ControlLook.h>
+#include <Dragger.h>
+#include <Roster.h>
+
+#include <AppMisc.h>
+
+#include "desklink.h"
+#include "MixerControl.h"
+#include "VolumeWindow.h"
+
+
+VolumeControl::VolumeControl(int32 volumeWhich, bool beep, BMessage* message)
+	: BSlider("VolumeControl", "Volume", message, 0, 1, B_HORIZONTAL),
+	fBeep(beep)
+{
+	font_height fontHeight;
+	GetFontHeight(&fontHeight);
+	SetBarThickness(ceilf((fontHeight.ascent + fontHeight.descent) * 0.7));
+
+	_InitVolume(volumeWhich);
+
+	BRect rect(Bounds());
+	rect.top = rect.bottom - 7;
+	rect.left = rect.right - 7;
+	BDragger* dragger = new BDragger(rect, this,
+		B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
+	AddChild(dragger);
+}
+
+
+VolumeControl::VolumeControl(BMessage* archive)
+	: BSlider(archive)
+{
+	if (archive->FindBool("beep", &fBeep) != B_OK)
+		fBeep = false;
+
+	int32 volumeWhich;
+	if (archive->FindInt32("volume which", &volumeWhich) != B_OK)
+		volumeWhich = VOLUME_USE_MIXER;
+
+	_InitVolume(volumeWhich);
+}
+
+
+VolumeControl::~VolumeControl()
+{
+	delete fMixerControl;
+}
+
+
+status_t
+VolumeControl::Archive(BMessage* into, bool deep) const
+{
+	status_t status;
+
+	status = BView::Archive(into, deep);
+	if (status < B_OK)
+		return status;
+
+	status = into->AddString("add_on", kAppSignature);
+	if (status < B_OK)
+		return status;
+
+	status = into->AddBool("beep", fBeep);
+	if (status != B_OK)
+		return status;
+
+	return into->AddInt32("volume which", fMixerControl->VolumeWhich());
+}
+
+
+VolumeControl*
+VolumeControl::Instantiate(BMessage* archive)
+{
+	if (!validate_instantiation(archive, "VolumeControl"))
+		return NULL;
+
+	return new VolumeControl(archive);
+}
+
+
+void
+VolumeControl::AttachedToWindow()
+{
+	BSlider::AttachedToWindow();
+
+	SetEventMask(_IsReplicant() ? 0 : B_POINTER_EVENTS, B_NO_POINTER_HISTORY);
+}
+
+
+void
+VolumeControl::MouseDown(BPoint where)
+{
+	// Ignore clicks on the dragger
+	int32 viewToken;
+	if (Bounds().Contains(where) && Looper()->CurrentMessage() != NULL
+		&& Looper()->CurrentMessage()->FindInt32("_view_token",
+				&viewToken) == B_OK
+		&& viewToken != _get_object_token_(this))
+		return;
+
+	// TODO: investigate why this does not work as expected (the dragger
+	// frame seems to be off)
+#if 0
+	if (BView* dragger = ChildAt(0)) {
+		if (!dragger->IsHidden() && dragger->Frame().Contains(where))
+			return;
+	}
+#endif
+
+	if (!IsEnabled() || !Bounds().Contains(where)) {
+		Invoke();
+		return;
+	}
+
+	BSlider::MouseDown(where);
+}
+
+
+void
+VolumeControl::MessageReceived(BMessage* msg)
+{
+	switch (msg->what) {
+		case B_MOUSE_WHEEL_CHANGED:
+		{
+			if (Value() == -1)
+				return;
+
+			// Even though the volume bar is horizontal, we use the more common
+			// vertical mouse wheel change
+			float deltaY = 0.0f;
+
+			msg->FindFloat("be:wheel_delta_y", &deltaY);
+
+			if (deltaY == 0.0f)
+				return;
+
+			int32 currentValue = Value();
+			int32 newValue = currentValue - int32(deltaY) * 3;
+
+			if (newValue != currentValue) {
+				SetValue(newValue);
+				if (ModificationMessage() != NULL)
+					Messenger().SendMessage(ModificationMessage());
+			}
+			break;
+		}
+
+		default:
+			return BView::MessageReceived(msg);
+	}
+}
+
+
+status_t
+VolumeControl::Invoke(BMessage* message = NULL)
+{
+	if (fBeep && fOriginalValue != Value() && message == NULL) {
+		beep();
+		fOriginalValue = Value();
+	}
+
+	fMixerControl->SetVolume(Value());
+
+	return BSlider::Invoke(message);
+}
+
+
+void
+VolumeControl::DrawBar()
+{
+	BRect frame = BarFrame();
+	BView* view = OffscreenView();
+
+	if (be_control_look != NULL) {
+		uint32 flags = be_control_look->Flags(this);
+		rgb_color base = LowColor();
+		rgb_color rightFillColor = (rgb_color){255, 109, 38, 255};
+		rgb_color leftFillColor = (rgb_color){116, 224, 0, 255};
+
+		int32 min, max;
+		GetLimits(&min, &max);
+		float position = 1.0f * (max - min - max) / (max - min);
+
+		be_control_look->DrawSliderBar(view, frame, frame, base, leftFillColor,
+			rightFillColor, position, flags, Orientation());
+		return;
+	}
+
+	BSlider::DrawBar();
+}
+
+
+const char*
+VolumeControl::UpdateText() const
+{
+	if (!IsEnabled())
+		return NULL;
+
+	snprintf(fText, sizeof(fText), "%ld dB", Value());
+	return fText;
+}
+
+
+void
+VolumeControl::_InitVolume(int32 volumeWhich)
+{
+	const char* errorString = NULL;
+	float volume = 0.0;
+	fMixerControl = new MixerControl(volumeWhich, &volume, &errorString);
+
+	if (errorString != NULL) {
+		SetLabel(errorString);
+		SetLimits(-60, 18);
+	} else {
+		SetLabel("Volume");
+		SetLimits((int32)floorf(fMixerControl->Minimum()),
+			(int32)ceilf(fMixerControl->Maximum()));
+	}
+
+	SetEnabled(errorString == NULL);
+
+	fOriginalValue = (int32)volume;
+	SetValue((int32)volume);
+}
+
+
+bool
+VolumeControl::_IsReplicant() const
+{
+	return dynamic_cast<VolumeWindow*>(Window()) == NULL;
+}

Copied: haiku/trunk/src/bin/desklink/VolumeControl.h (from rev 30016, haiku/trunk/src/bin/desklink/VolumeSlider.h)
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeSlider.h	2009-04-08 07:45:59 UTC (rev 30016)
+++ haiku/trunk/src/bin/desklink/VolumeControl.h	2009-04-08 14:59:25 UTC (rev 30031)
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2003-2009, Haiku, Inc.
+ * Distributed under the terms of the MIT license.
+ *
+ * Authors:
+ *		J?r?me Duval
+ *		Fran?ois Revol
+ *		Axel D?rfler, axeld at pinc-software.de.
+ */
+#ifndef VOLUME_SLIDER_H
+#define VOLUME_SLIDER_H
+
+
+#include <Slider.h>
+
+class MixerControl;
+
+
+class VolumeControl : public BSlider {
+public:
+							VolumeControl(int32 volumeWhich, bool beep,
+								BMessage* message);
+							VolumeControl(BMessage* archive);
+	virtual					~VolumeControl();
+
+	static	VolumeControl*	Instantiate(BMessage* archive);
+	virtual	status_t		Archive(BMessage* archive, bool deep = true) const;
+
+protected:
+	virtual	void			AttachedToWindow();
+	virtual	void			MouseDown(BPoint where);
+	virtual	void			MessageReceived(BMessage* message);
+	virtual status_t		Invoke(BMessage* message = NULL);
+
+	virtual void			DrawBar();
+	virtual const char*		UpdateText() const;
+
+private:
+			void			_InitVolume(int32 volumeWhich);
+			bool			_IsReplicant() const;
+
+			mutable	char	fText[64];
+			MixerControl*	fMixerControl;
+			int32			fOriginalValue;
+			bool			fBeep;
+};
+
+#endif	// VOLUME_SLIDER_H

Deleted: haiku/trunk/src/bin/desklink/VolumeSlider.cpp

Deleted: haiku/trunk/src/bin/desklink/VolumeSlider.h

Added: haiku/trunk/src/bin/desklink/VolumeWindow.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeWindow.cpp	2009-04-08 14:21:29 UTC (rev 30030)
+++ haiku/trunk/src/bin/desklink/VolumeWindow.cpp	2009-04-08 14:59:25 UTC (rev 30031)
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2003-2009, Haiku, Inc.
+ * Distributed under the terms of the MIT license.
+ *
+ * Authors:
+ *		J?r?me Duval
+ *		Fran?ois Revol
+ *		Axel D?rfler, axeld at pinc-software.de.
+ */
+
+
+#include "VolumeWindow.h"
+
+#include <Box.h>
+#include <GroupLayout.h>
+#include <MessageRunner.h>
+#include <Screen.h>
+
+#include "VolumeControl.h"
+
+
+static const uint32 kMsgVolumeUpdate = 'vlup';
+static const uint32 kMsgVolumeChanged = 'vlcg';
+
+
+VolumeWindow::VolumeWindow(BRect frame, bool dontBeep, int32 volumeWhich)
+	: BWindow(frame, "VolumeWindow", B_BORDERED_WINDOW_LOOK,
+		B_FLOATING_ALL_WINDOW_FEEL,
+		B_ASYNCHRONOUS_CONTROLS | B_WILL_ACCEPT_FIRST_CLICK
+		| B_AUTO_UPDATE_SIZE_LIMITS, 0),
+	fUpdatedCount(0)
+{
+	SetLayout(new BGroupLayout(B_HORIZONTAL));
+
+	BGroupLayout* layout = new BGroupLayout(B_HORIZONTAL);
+	layout->SetInsets(5, 5, 5, 5);
+
+	BBox* box = new BBox("sliderbox");
+	box->SetLayout(layout);
+	box->SetBorder(B_PLAIN_BORDER);
+	AddChild(box);
+
+	BSlider* slider = new VolumeControl(volumeWhich, !dontBeep,
+		new BMessage(kMsgVolumeChanged));
+	slider->SetModificationMessage(new BMessage(kMsgVolumeUpdate));
+	box->AddChild(slider);
+
+	slider->SetTarget(this);
+	ResizeTo(300, 50);
+
+	// Make sure it's not outside the screen.
+	const int32 kMargin = 3;
+	BRect windowRect = Frame();
+	BRect screenFrame(BScreen(B_MAIN_SCREEN_ID).Frame());
+	if (screenFrame.right < windowRect.right + kMargin)
+		MoveBy(- kMargin - windowRect.right + screenFrame.right, 0);
+	if (screenFrame.bottom < windowRect.bottom + kMargin)
+		MoveBy(0, - kMargin - windowRect.bottom + screenFrame.bottom);
+	if (screenFrame.left > windowRect.left - kMargin)
+		MoveBy(kMargin + screenFrame.left - windowRect.left, 0);
+	if (screenFrame.top > windowRect.top - kMargin)
+		MoveBy(0, kMargin + screenFrame.top - windowRect.top);
+}
+
+
+VolumeWindow::~VolumeWindow()
+{
+}
+
+#include <stdio.h>
+void
+VolumeWindow::MessageReceived(BMessage *msg)
+{
+	switch (msg->what) {
+		case kMsgVolumeUpdate:
+			fUpdatedCount++;
+			break;
+
+		case kMsgVolumeChanged:
+			if (fUpdatedCount < 2) {
+				// If the slider was set by click only, wait a bit until
+				// closing the window to give some feedback that how volume
+				// was changed, and that it is.
+				BMessage quit(B_QUIT_REQUESTED);
+				BMessageRunner::StartSending(this, &quit, 150000, 1);
+			} else
+				Quit();
+			break;
+
+		default:
+			BWindow::MessageReceived(msg);
+			break;
+	}
+}
+

Added: haiku/trunk/src/bin/desklink/VolumeWindow.h
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeWindow.h	2009-04-08 14:21:29 UTC (rev 30030)
+++ haiku/trunk/src/bin/desklink/VolumeWindow.h	2009-04-08 14:59:25 UTC (rev 30031)
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2003-2009, Haiku, Inc.
+ * Distributed under the terms of the MIT license.
+ *
+ * Authors:
+ *		J?r?me Duval
+ *		Fran?ois Revol
+ *		Axel D?rfler, axeld at pinc-software.de.
+ */
+#ifndef VOLUME_WINDOW_H
+#define VOLUME_WINDOW_H
+
+
+#include <Window.h>
+
+#include "MixerControl.h"
+
+
+class VolumeWindow : public BWindow {
+public:
+							VolumeWindow(BRect frame, bool dontBeep = false,
+								int32 volumeWhich = VOLUME_USE_MIXER);
+	virtual					~VolumeWindow();
+
+protected:
+	virtual	void			MessageReceived(BMessage* message);
+
+private:
+			int32			fUpdatedCount;

[... truncated: 518 lines follow ...]


From axeld at mail.berlios.de  Wed Apr  8 17:24:49 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 8 Apr 2009 17:24:49 +0200
Subject: [Haiku-commits] r30032 -
	haiku/trunk/src/add-ons/kernel/network/stack
Message-ID: <200904081524.n38FOngk007918@sheep.berlios.de>

Author: axeld
Date: 2009-04-08 17:24:45 +0200 (Wed, 08 Apr 2009)
New Revision: 30032
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30032&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
Log:
* Added missing SO_TYPE.


Modified: haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-08 14:59:25 UTC (rev 30031)
+++ haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-04-08 15:24:45 UTC (rev 30032)
@@ -1056,6 +1056,14 @@
 			return B_OK;
 		}
 
+		case SO_TYPE:
+		{
+			int32* _set = (int32*)value;
+			*_set = socket->type;
+			*_length = sizeof(int32);
+			return B_OK;
+		}
+	
 		case SO_ERROR:
 		{
 			int32* _set = (int32*)value;



From stippi at mail.berlios.de  Wed Apr  8 17:28:57 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 8 Apr 2009 17:28:57 +0200
Subject: [Haiku-commits] r30033 - haiku/trunk/src/kits/tracker
Message-ID: <200904081528.n38FSvqK008479@sheep.berlios.de>

Author: stippi
Date: 2009-04-08 17:28:53 +0200 (Wed, 08 Apr 2009)
New Revision: 30033
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30033&view=rev

Modified:
   haiku/trunk/src/kits/tracker/Pose.cpp
   haiku/trunk/src/kits/tracker/Pose.h
   haiku/trunk/src/kits/tracker/PoseView.cpp
   haiku/trunk/src/kits/tracker/PoseView.h
Log:
Sorry for mixing some cleanups into this patch...
* When changing icon sizes, invalidate before scrolling. This causes silent
  scrolling in app_server and avoids a visual jerk. Everything needs to be
  re-drawn at the new icon size anyways.
* Removed the fUpdateRegion member from BPoseView. It was supposed to make
  drawing quicker, but it only made it slower. Checking for intersection with
  the update rect passed to Draw() should be much more straight forward and
  does not involve app_server communication...
* Refactored some misnamed methods, ScrollIntoView() would always draw and
  only sometimes scroll - I couldn't agree with that.
* There is a very confusing mix of "fullDraw" and "minimalRect" booleans which
  seem to be used with wrong semantics. The minimalRect flag passed to BPose::
  CalcRect() means to get the pose rect for the icon and the first column only,
  not all columns. Contrary to that, some pose rect calculation happens with
  minimalRect == fullDraw... I tried to fix some of that.
* The visible changes of this patch are when adding poses. The
  SynchronousUpate() wasn't working so well, I made it work reliably by invoking
  Invalidate() and Window()->UpdateIfNeeded(), which also takes care of any
  drawing that the app_server has to do for the background. And it's flicker
  free in double buffered mode...
  -> This fixes poses being drawn multiple times and the text getting darker.
* And there was another bug when adding poses. The extent (bottom of last item
  in list view for example) can be just above the current view bounds. When the
  next item is added above the view bounds, then the extent scrolls into view,
  but there is nothing to be scrolled in this case. srcRect is still invalid
  and so is dstRect. But destRect should be valid in this case.
  -> This fixes some poses being cut off at the bottom when opening Tracker
  windows.


Modified: haiku/trunk/src/kits/tracker/Pose.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/Pose.cpp	2009-04-08 15:24:45 UTC (rev 30032)
+++ haiku/trunk/src/kits/tracker/Pose.cpp	2009-04-08 15:28:53 UTC (rev 30033)
@@ -524,8 +524,8 @@
 
 
 void
-BPose::Draw(BRect rect, BPoseView *poseView, BView *drawView, bool fullDraw,
-	const BRegion *updateRgn, BPoint offset, bool selected)
+BPose::Draw(BRect rect, const BRect& updateRect, BPoseView *poseView, BView *drawView,
+	bool fullDraw, BPoint offset, bool selected)
 {
 	// If the background wasn't cleared and Draw() is not called after
 	// having edited a name or similar (with fullDraw)
@@ -550,7 +550,7 @@
 		iconRect.left += kListOffset;
 		iconRect.right = iconRect.left + size;
 		iconRect.top = iconRect.bottom - size;
-		if (!updateRgn || updateRgn->Intersects(iconRect)) {
+		if (updateRect.Intersects(iconRect)) {
 			DrawIcon(iconRect.LeftTop(), drawView, poseView->IconSize(), directDraw,
 				!windowActive && !showSelectionWhenInactive);
 		}
@@ -572,7 +572,7 @@
 				BRect widgetRect(widget->ColumnRect(rect.LeftTop(), column,
 					poseView));
 				
-				if (!updateRgn || updateRgn->Intersects(widgetRect)) {
+				if (updateRect.Intersects(widgetRect)) {
 					BRect widgetTextRect(widget->CalcRect(rect.LeftTop(), column,
 						poseView));
 					
@@ -613,10 +613,8 @@
 	} else {
 
 		// draw in icon mode
-		if (updateRgn && !updateRgn->Intersects(rect))
-			return;
-
-		BPoint iconOrigin(Location(poseView));
+		BPoint location(Location(poseView));
+		BPoint iconOrigin(location);
 		iconOrigin += offset;
 
 		DrawIcon(iconOrigin, drawView, poseView->IconSize(), directDraw,
@@ -630,7 +628,7 @@
 		if (!widget || !widget->IsVisible())
 			return;
 
-		rect = widget->CalcRect(Location(poseView), 0, poseView);
+		rect = widget->CalcRect(location, 0, poseView);
 
 		bool selectDuringDraw = directDraw && selected
 			&& (poseView->IsDesktopWindow() || windowActive);

Modified: haiku/trunk/src/kits/tracker/Pose.h
===================================================================
--- haiku/trunk/src/kits/tracker/Pose.h	2009-04-08 15:24:45 UTC (rev 30032)
+++ haiku/trunk/src/kits/tracker/Pose.h	2009-04-08 15:28:53 UTC (rev 30033)
@@ -63,10 +63,10 @@
 		void SetLocation(BPoint, const BPoseView *);
 		void MoveTo(BPoint, BPoseView *, bool inval = true);
 
-		void Draw(BRect, BPoseView *, bool fullDraw = true,
-			const BRegion * = 0);
-		void Draw(BRect, BPoseView *, BView *drawView, bool fullDraw,
-			const BRegion *, BPoint offset, bool selected);
+		void Draw(BRect poseRect, const BRect& updateRect, BPoseView *,
+			bool fullDraw = true);
+		void Draw(BRect poseRect, const BRect& updateRect, BPoseView *,
+			BView *drawView, bool fullDraw, BPoint offset, bool selected);
 		void DeselectWithoutErasingBackground(BRect rect, BPoseView *poseView);
 			// special purpose draw call for deselecting over a textured
 			// background
@@ -236,10 +236,10 @@
 
 
 inline void
-BPose::Draw(BRect rect, BPoseView *view, bool fullDraw,
-	const BRegion *updateRgn)
+BPose::Draw(BRect poseRect, const BRect& updateRect, BPoseView *view,
+	bool fullDraw)
 {
-	Draw(rect, view, (BView *)view, fullDraw, updateRgn, BPoint(0, 0),
+	Draw(poseRect, updateRect, view, (BView *)view, fullDraw, BPoint(0, 0),
 		IsSelected());
 }
 

Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-08 15:24:45 UTC (rev 30032)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-08 15:28:53 UTC (rev 30033)
@@ -206,7 +206,6 @@
 	fViewState(new BViewState),
 	fStateNeedsSaving(false),
 	fCountView(NULL),
-	fUpdateRegion(new BRegion),				// does this need to be allocated ??
 	fDropTarget(NULL),
 	fAlreadySelectedDropTarget(NULL),
 	fSelectionHandler(be_app),
@@ -257,7 +256,6 @@
 	delete fSelectionList;
 	delete fMimeTypeList;
 	delete fZombieList;
-	delete fUpdateRegion;
 	delete fViewState;
 	delete fModel;
 	delete fKeyRunner;
@@ -1122,8 +1120,8 @@
 	if (model)
 		params->ref = *model->EntryRef();
 
-	thread_id addPosesThread = spawn_thread(&BPoseView::AddPosesTask, "add poses",
-			B_DISPLAY_PRIORITY, params);
+	thread_id addPosesThread = spawn_thread(&BPoseView::AddPosesTask,
+		"add poses", B_DISPLAY_PRIORITY, params);
 
 	if (addPosesThread >= B_OK) {
 		fAddPosesThreads.insert(addPosesThread);
@@ -1308,8 +1306,8 @@
 			}
 
 			if (!view->IsValidAddPosesThread(threadID)) {
-				// this handles the case of a file panel when the directory is switched
-				// and and old AddPosesTask needs to die.
+				// this handles the case of a file panel when the directory is
+				// switched and and old AddPosesTask needs to die.
 				// we might no longer be the current async thread
 				// for this view - if not then we're done
 				view->HideBarberPole();
@@ -1320,20 +1318,24 @@
 			}
 
 			if (count) {
-					// try to watch the model, no matter what
+				// try to watch the model, no matter what
 
 				if (result != B_OK) {
-					// failed to init pose, model is a zombie, add to zombie list
-					PRINT(("1 adding model %s to zombie list, error %s\n", model->Name(),
-						strerror(model->InitCheck())));
+					// failed to init pose, model is a zombie, add to zombie
+					// list
+					PRINT(("1 adding model %s to zombie list, error %s\n",
+						model->Name(), strerror(model->InitCheck())));
 					view->fZombieList->AddItem(model);
 					continue;
 				}
 
-				view->ReadPoseInfo(model, &(posesResult->fPoseInfos[modelChunkIndex]));
-				if (!view->ShouldShowPose(model, &(posesResult->fPoseInfos[modelChunkIndex]))
+				view->ReadPoseInfo(model,
+					&(posesResult->fPoseInfos[modelChunkIndex]));
+				if (!view->ShouldShowPose(model,
+						&(posesResult->fPoseInfos[modelChunkIndex]))
 					// filter out models we do not want to show
-					|| model->IsSymLink() && !view->CreateSymlinkPoseTarget(model)) {
+					|| model->IsSymLink()
+						&& !view->CreateSymlinkPoseTarget(model)) {
 					// filter out symlinks whose target models we do not
 					// want to show
 
@@ -1352,7 +1354,8 @@
 
 			bigtime_t now = system_time();
 
-			if (!count || modelChunkIndex >= kMaxAddPosesChunk || now > nextChunkTime) {
+			if (!count || modelChunkIndex >= kMaxAddPosesChunk
+				|| now > nextChunkTime) {
 				// keep getting models until we get <kMaxAddPosesChunk> of them
 				// or until 300000 runs out
 
@@ -1579,18 +1582,22 @@
 
 
 void
-BPoseView::FinishPendingScroll(float &listViewScrollBy, BRect bounds)
+BPoseView::FinishPendingScroll(float &listViewScrollBy, BRect srcRect)
 {
-	if (!listViewScrollBy)
+	if (listViewScrollBy == 0.0)
 		return;
 
-	BRect srcRect(bounds);
-	BRect dstRect = srcRect;
-	srcRect.bottom -= listViewScrollBy;
-	dstRect.top += listViewScrollBy;
-	CopyBits(srcRect, dstRect);
-	listViewScrollBy = 0;
-	srcRect.bottom = dstRect.top;
+	// copy top contents to bottom and
+	// redraw from top to top of part that could be copied
+
+	if (srcRect.Width() > listViewScrollBy) {
+		BRect dstRect = srcRect;
+		srcRect.bottom -= listViewScrollBy;
+		dstRect.top += listViewScrollBy;
+		CopyBits(srcRect, dstRect);
+		listViewScrollBy = 0;
+		srcRect.bottom = dstRect.top;
+	}
 	SynchronousUpdate(srcRect);
 }
 
@@ -1636,7 +1643,7 @@
 			fInsertedNodes.insert(*(model->NodeRef()));
 		}
 
-		if ((clipboardMode = FSClipboardFindNodeMode(model,false,true)) != 0
+		if ((clipboardMode = FSClipboardFindNodeMode(model, false, true)) != 0
 			&& !HasPosesInClipboard()) {
 			SetHasPosesInClipboard(true);
 		}
@@ -1672,22 +1679,40 @@
 					if (orientation == kInsertAfter)
 						poseIndex++;
 
-					poseBounds = CalcPoseRect(pose, poseIndex);
+					poseBounds = CalcPoseRectList(pose, poseIndex);
 					havePoseBounds = true;
 					BRect srcRect(Extent());
 					srcRect.top = poseBounds.top;
 					srcRect = srcRect & viewBounds;
 					BRect destRect(srcRect);
 					destRect.OffsetBy(0, fListElemHeight);
+					// special case the addition of a pose that scrolls
+					// the extent into the view for the first time:
+					if (destRect.bottom > viewBounds.top
+						&& destRect.top > destRect.bottom) {
+						// make destRect valid
+						destRect.top = viewBounds.top;
+					}
 
 					if (srcRect.Intersects(viewBounds)
 						|| destRect.Intersects(viewBounds)) {
+						// The visual area is affected by the insertion.
+						// If items have been added above the visual area,
+						// delay the scrolling. srcRect.bottom holds the
+						// current Extent(). So if the bottom is still above
+						// the viewBounds top, it means the view is scrolled
+						// to show the area below the items that have already
+						// been added.
 						if (srcRect.top == viewBounds.top
-							&& srcRect.bottom == viewBounds.bottom) {
+							&& srcRect.bottom >= viewBounds.top) {
 							// if new pose above current view bounds, cache up
 							// the draw and do it later
 							listViewScrollBy += fListElemHeight;
 							forceDraw = false;
+						} else if (!srcRect.IsValid()) {
+							// nothing to be scrolled, but extent became
+							// visible
+							SynchronousUpdate(destRect);
 						} else {
 							FinishPendingScroll(listViewScrollBy, viewBounds);
 							fPoseList->AddItem(pose, poseIndex);
@@ -1696,8 +1721,7 @@
 							CopyBits(srcRect, destRect);
 							srcRect.bottom = destRect.top;
 
-							//SynchronousUpdate(srcRect);
-							Invalidate(srcRect);
+							SynchronousUpdate(srcRect);
 						}
 					}
 				}
@@ -1708,7 +1732,7 @@
 
 				if (forceDraw) {
 					if (!havePoseBounds)
-						poseBounds = CalcPoseRect(pose, poseIndex);
+						poseBounds = CalcPoseRectList(pose, poseIndex);
 		 			if (viewBounds.Intersects(poseBounds))
 						Invalidate(poseBounds);
 				}
@@ -1862,7 +1886,7 @@
 	BRect bounds(Bounds());
 	// copy the good bits in the list
 	BRect srcRect(Extent());
-	srcRect.top = CalcPoseRect(pose, *index).top;
+	srcRect.top = CalcPoseRectList(pose, *index).top;
 	srcRect = srcRect & bounds;
 	BRect destRect(srcRect);
 	destRect.OffsetBy(0, fListElemHeight);
@@ -1992,11 +2016,13 @@
 		{
 			AddPosesResult *currentPoses;
 			entry_ref ref;
-			message->FindPointer("currentPoses", reinterpret_cast<void **>(&currentPoses));
+			message->FindPointer("currentPoses",
+				reinterpret_cast<void **>(&currentPoses));
 			message->FindRef("ref", &ref);
 
-			// check if CreatePoses should be called (abort if dir has been switched
-			// under normal circumstances, ignore in several special cases
+			// check if CreatePoses should be called (abort if dir has been
+			// switched under normal circumstances, ignore in several special
+			// cases
 			if (AddPosesThreadValid(&ref)) {
 				CreatePoses(currentPoses->fModels, currentPoses->fPoseInfos,
 					currentPoses->fCount, NULL, true, 0, 0, true);
@@ -2829,6 +2855,11 @@
 		}
 	}
 
+	// invalidate before anything else to avoid flickering, especially when
+	// scrolling is also performed (invalidating before scrolling will cause
+	// app_server to scroll silently, ie not visibly)
+	Invalidate();
+
 	// update origin in case of a list <-> icon mode transition
 	BPoint newOrigin;
 	if (newMode == kListMode)
@@ -2860,7 +2891,6 @@
 	SetScrollBarsTo(newOrigin);
 	EnableScrollBars();
 	ContainerWindow()->ViewModeChanged(oldMode, newMode);
-	Invalidate();
 }
 
 
@@ -3607,30 +3637,27 @@
 
 
 void
-BPoseView::ScrollIntoView(BPose *pose, int32 index, bool drawOnly)
+BPoseView::ScrollIntoView(BPose *pose, int32 index)
 {
-	BRect poseRect;
+	ScrollIntoView(CalcPoseRect(pose, index, true));
+}
 
-	if (ViewMode() == kListMode)
-		poseRect = CalcPoseRect(pose, index);
-	else
-		poseRect = pose->CalcRect(this);
 
-	if (!IsDesktopWindow() && !drawOnly) {
-		BRect testRect(poseRect);
+void
+BPoseView::ScrollIntoView(BRect poseRect)
+{
+	if (IsDesktopWindow())
+		return;
 
-		if (ViewMode() == kListMode) {
-			// if we're in list view then we only care that the entire
-			// pose is visible vertically, not horizontally
-			testRect.left = 0;
-			testRect.right = testRect.left + 1;
-		}
-		if (!Bounds().Contains(testRect))
-			SetScrollBarsTo(testRect.LeftTop());
+	if (ViewMode() == kListMode) {
+		// if we're in list view then we only care that the entire
+		// pose is visible vertically, not horizontally
+		poseRect.left = 0;
+		poseRect.right = poseRect.left + 1;
 	}
 
-	if (Bounds().Intersects(poseRect))
-		pose->Draw(poseRect, this, false);
+	if (!Bounds().Contains(poseRect))
+		SetScrollBarsTo(poseRect.LeftTop());
 }
 
 
@@ -3652,8 +3679,12 @@
 		pose->Select(true);
 		fSelectionList->AddItem(pose);
 
-		ScrollIntoView(pose, index, !scrollIntoView);
+		BRect poseRect = CalcPoseRect(pose, index);
+		Invalidate(poseRect);
 
+		if (scrollIntoView)
+			ScrollIntoView(poseRect);
+
 		if (fSelectionChangedHook)
 			ContainerWindow()->SelectionChanged();
 	}
@@ -5738,7 +5769,7 @@
 				poseRect = pose->CalcRect(loc, this);
 
 			if (bounds.Intersects(poseRect)) {
-				pose->Draw(poseRect, this, false);
+				pose->Draw(poseRect, bounds, this, false);
 				Flush();
 			}
 		}
@@ -5843,8 +5874,8 @@
 
 	// There is room for optimizations here: If regexp-type match, the Matches()
 	// function compiles the expression for every entry. One could use
-	// TrackerString::CompileRegExp and reuse the expression. However, then we have
-	// to take care of the case sensitivity ourselves.
+	// TrackerString::CompileRegExp and reuse the expression. However, then we
+	// have to take care of the case sensitivity ourselves.
 	for (int32 index = 0; index < count; index++) {
 		BPose *pose = fPoseList->ItemAt(index);
 		name = pose->TargetModel()->Name();
@@ -5890,7 +5921,7 @@
 				if (pose->IsSelected()) {
 					RemovePoseFromSelection(fSelectionList->LastItem());
 					fSelectionPivotPose = pose;
-					ScrollIntoView(pose, index, false);
+					ScrollIntoView(pose, index);
 				} else
 					AddPoseToSelection(pose, index, true);
 			} else
@@ -6333,7 +6364,8 @@
 
 	window->Activate();
 	window->UpdateIfNeeded();
-	window->ShowContextMenu(where, pose ? pose->TargetModel()->EntryRef() : 0, this);
+	window->ShowContextMenu(where, pose ? pose->TargetModel()->EntryRef() : 0,
+		this);
 
 	if (fSelectionChangedHook)
 		window->SelectionChanged();
@@ -6745,7 +6777,8 @@
 				BRect poseRect(pose->CalcRect(loc, this, true));
 				if (poseRect.Intersects(inner)) {
 					BPoint offsetBy(-inner.LeftTop().x, -inner.LeftTop().y);
-					pose->Draw(poseRect, this, view, true, 0, offsetBy, false);
+					pose->Draw(poseRect, poseRect, this, view, true, offsetBy,
+						false);
 				}
 			}
 			loc.y += fListElemHeight;
@@ -6765,7 +6798,8 @@
 					continue;
 
 				BPoint offsetBy(-inner.LeftTop().x, -inner.LeftTop().y);
-				pose->Draw(poseRect, this, view, true, 0, offsetBy, false);
+				pose->Draw(poseRect, poseRect, this, view, true, offsetBy,
+					false);
 			}
 		}
 	}
@@ -6804,7 +6838,7 @@
 	BPose *pose = fPoseList->ItemAt(clickedPoseIndex);
 	if (ViewMode() == kListMode) {
 		// get starting rect of clicked pose
-		result = CalcPoseRect(pose, clickedPoseIndex, true);
+		result = CalcPoseRectList(pose, clickedPoseIndex, true);
 
 		// add rects for visible poses only
 		int32 count = fPoseList->CountItems();
@@ -7309,7 +7343,7 @@
 
 		BRect invalidRect;
 		if (ViewMode() == kListMode)
-			invalidRect = CalcPoseRect(pose, index);
+			invalidRect = CalcPoseRectList(pose, index);
 		else
 			invalidRect = pose->CalcRect(this);
 
@@ -7479,7 +7513,7 @@
 	if (clickedPose) {
 		ASSERT(poseIndex);
 		if (ViewMode() == kListMode)
-			DrawOpenAnimation(CalcPoseRect(clickedPose, *poseIndex, true));
+			DrawOpenAnimation(CalcPoseRectList(clickedPose, *poseIndex, true));
 		else
 			DrawOpenAnimation(clickedPose->CalcRect(this));
 	}
@@ -7929,7 +7963,8 @@
 					if (pose->IsSelected() != show || fShowSelectionWhenInactive) {
 						if (!fShowSelectionWhenInactive)
 							pose->Select(show);
-						pose->Draw(BRect(pose->CalcRect(loc, this, false)), this, false);
+						pose->Draw(BRect(pose->CalcRect(loc, this, false)),
+							bounds, this, false);
 					}
 
 				loc.y += fListElemHeight;
@@ -7937,7 +7972,8 @@
 					break;
 			}
 		} else {
-			int32 startIndex = FirstIndexAtOrBelow((int32)(bounds.top - IconPoseHeight()), true);
+			int32 startIndex = FirstIndexAtOrBelow(
+				(int32)(bounds.top - IconPoseHeight()), true);
 			int32 count = fVSPoseList->CountItems();
 			for (int32 index = startIndex; index < count; index++) {
 				BPose *pose = fVSPoseList->ItemAt(index);
@@ -8157,16 +8193,13 @@
 void
 BPoseView::DrawPose(BPose *pose, int32 index, bool fullDraw)
 {
-	BRect rect;
-	if (ViewMode() == kListMode)
-		rect = pose->CalcRect(BPoint(0, index * fListElemHeight), this, fullDraw);
-	else
-		rect = pose->CalcRect(this);
+	BRect rect = CalcPoseRect(pose, index, fullDraw);
 
-	if (TrackerSettings().ShowVolumeSpaceBar() && pose->TargetModel()->IsVolume())
+	if (TrackerSettings().ShowVolumeSpaceBar()
+		&& pose->TargetModel()->IsVolume()) {
 		Invalidate(rect);
-	else
-		pose->Draw(rect, this, fullDraw);
+	} else
+		pose->Draw(rect, rect, this, fullDraw);
 }
 
 
@@ -8265,19 +8298,17 @@
 		ConstrainClippingRegion(&updateRegion);
 	}
 
-	FillRect(updateRect, B_SOLID_LOW);
-	DrawViewCommon(updateRect);
+	Invalidate(updateRect);
+	Window()->UpdateIfNeeded();
 
 	if (clip)
-		ConstrainClippingRegion(0);
+		ConstrainClippingRegion(NULL);
 }
 
 
 void
 BPoseView::DrawViewCommon(const BRect &updateRect)
 {
-	GetClippingRegion(fUpdateRegion);
-
 	int32 count = fPoseList->CountItems();
 	if (ViewMode() == kListMode) {
 		int32 startIndex = (int32)((updateRect.top - fListElemHeight) / fListElemHeight);
@@ -8289,7 +8320,7 @@
 		for (int32 index = startIndex; index < count; index++) {
 			BPose *pose = fPoseList->ItemAt(index);
 			BRect poseRect(pose->CalcRect(loc, this, true));
-			pose->Draw(poseRect, this, true, fUpdateRegion);
+			pose->Draw(poseRect, updateRect, this, true);
 			loc.y += fListElemHeight;
 			if (loc.y >= updateRect.bottom)
 				break;
@@ -8298,8 +8329,8 @@
 		for (int32 index = 0; index < count; index++) {
 			BPose *pose = fPoseList->ItemAt(index);
 			BRect poseRect(pose->CalcRect(this));
-			if (fUpdateRegion->Intersects(poseRect))
-				pose->Draw(poseRect, this, true, fUpdateRegion);
+			if (updateRect.Intersects(poseRect))
+				pose->Draw(poseRect, updateRect, this, true);
 		}
 	}
 }
@@ -8347,7 +8378,7 @@
 		dstRect.OffsetTo(loc);
 
 		BPoint offsetBy(0, -(index * ListElemHeight()));
-		pose->Draw(dstRect, this, offscreenView, true, &updateRegion,
+		pose->Draw(dstRect, updateRect, this, offscreenView, true,
 			offsetBy, pose->IsSelected());
 
 		offscreenView->Sync();
@@ -8409,7 +8440,7 @@
 		return;
 	}
 
-	BRect invalidRect(CalcPoseRect(pose, oldIndex));
+	BRect invalidRect(CalcPoseRectList(pose, oldIndex));
 	CloseGapInList(&invalidRect);
 	Invalidate(invalidRect);
 		// need to invalidate for the last item in the list
@@ -9050,7 +9081,7 @@
 		for (int32 index = startIndex; index < count; index++) {
 			if (fDropTarget == fPoseList->ItemAt(index)) {
 				BRect poseRect = fDropTarget->CalcRect(loc, this, false);
-				fDropTarget->Draw(poseRect, this, false);
+				fDropTarget->Draw(poseRect, poseRect, this, false);
 				break;
 			}
 
@@ -9066,14 +9097,15 @@
 			BPose *pose = fVSPoseList->ItemAt(index);
 			if (pose) {
 				if (pose == fDropTarget) {
+					BRect poseRect = pose->CalcRect(this);
 					// TODO: maybe leave just the else part
 					if (!hiliteState)
 						// deselecting an icon with widget drawn over background
 						// have to be a little tricky here - draw just the icon,
 						// invalidate the widget
-						pose->DeselectWithoutErasingBackground(pose->CalcRect(this), this);
+						pose->DeselectWithoutErasingBackground(poseRect, this);
 					else
-						pose->Draw(pose->CalcRect(this), this, false);
+						pose->Draw(poseRect, poseRect, this, false);
 					break;
 				}
 
@@ -9254,12 +9286,32 @@
 
 
 BRect
-BPoseView::CalcPoseRect(BPose *pose, int32 index, bool min) const
+BPoseView::CalcPoseRect(const BPose *pose, int32 index,
+	bool firstColumnOnly) const
 {
-	return pose->CalcRect(BPoint(0, index * fListElemHeight), this, min);
+	if (ViewMode() == kListMode)
+		return CalcPoseRectList(pose, index, firstColumnOnly);
+	else
+		return CalcPoseRectIcon(pose);
 }
 
 
+BRect
+BPoseView::CalcPoseRectIcon(const BPose *pose) const
+{
+	return pose->CalcRect(this);
+}
+
+
+BRect
+BPoseView::CalcPoseRectList(const BPose *pose, int32 index,
+	bool firstColumnOnly) const
+{
+	return pose->CalcRect(BPoint(0, index * fListElemHeight), this,
+		firstColumnOnly);
+}
+
+
 bool
 BPoseView::Represents(const node_ref *node) const
 {

Modified: haiku/trunk/src/kits/tracker/PoseView.h
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.h	2009-04-08 15:24:45 UTC (rev 30032)
+++ haiku/trunk/src/kits/tracker/PoseView.h	2009-04-08 15:28:53 UTC (rev 30033)
@@ -131,7 +131,7 @@
 		virtual void RestoreColumnState(AttributeStreamNode *);
 		void AddColumnList(BObjectList<BColumn> *list);
 		virtual void SaveColumnState(AttributeStreamNode *);
-		virtual void SavePoseLocations(BRect *frameIfDesktop = 0);
+		virtual void SavePoseLocations(BRect *frameIfDesktop = NULL);
 		void DisableSaveLocation();
 
 		virtual	void SaveState(BMessage &) const;
@@ -146,7 +146,8 @@
 		uint32 ViewMode() const;
 
 		// re-use the pose view for a new directory
-	 	virtual void SwitchDir(const entry_ref *, AttributeStreamNode *node = 0);
+	 	virtual void SwitchDir(const entry_ref *,
+	 		AttributeStreamNode *node = NULL);
 
 		// in the rare cases where a pose view needs to be explicitly refreshed
 		// (for instance in a query window with a dynamic date query), this is
@@ -308,13 +309,15 @@
 
 		// pose selection
 		void SelectPose(BPose *, int32 index, bool scrollIntoView = true);
-		void AddPoseToSelection(BPose *, int32 index, bool scrollIntoView = true);
+		void AddPoseToSelection(BPose *, int32 index,
+			bool scrollIntoView = true);
 		void RemovePoseFromSelection(BPose *);
 		void SelectPoseAtLocation(BPoint);
 		void SelectPoses(int32 start, int32 end);
 
 		// pose handling
-		void ScrollIntoView(BPose *pose, int32 index, bool drawOnly = false);
+		void ScrollIntoView(BPose *pose, int32 index);
+		void ScrollIntoView(BRect poseRect);
 		void SetActivePose(BPose *);
 		BPose *ActivePose() const;
 		void CommitActivePose(bool saveChanges = true);
@@ -492,7 +495,11 @@
 		BPose *ConvertZombieToPose(Model *zombie, int32 index);
 
 		// pose handling
-		BRect CalcPoseRect(BPose *, int32 index, bool minimal = false) const;
+		BRect CalcPoseRect(const BPose *, int32 index,
+			bool firstColumnOnly = false) const;
+		BRect CalcPoseRectIcon(const BPose *) const;
+		BRect CalcPoseRectList(const BPose *, int32 index,
+			bool firstColumnOnly = false) const;
 		void DrawPose(BPose *, int32 index, bool fullDraw = true);
 		void DrawViewCommon(const BRect &updateRect);
 
@@ -637,7 +644,6 @@
 		BCountView *fCountView;
 		float fListElemHeight;
 		float fIconPoseHeight;
-		BRegion *fUpdateRegion;
 		BPose *fDropTarget;
 		BPose *fAlreadySelectedDropTarget;
 		BLooper *fSelectionHandler;



From revol at free.fr  Wed Apr  8 17:34:16 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Wed, 08 Apr 2009 17:34:16 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r30030_-_in_haiku/trunk=3A_headers/os/m?=
 =?utf-8?q?edia_src/kits/media?=
In-Reply-To: <200904081421.n38ELVdp032535@sheep.berlios.de>
Message-ID: <1267339067-BeMail@laptop>

> Author: axeld
> Date: 2009-04-08 16:21:29 +0200 (Wed, 08 Apr 2009)
> New Revision: 30030
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30030&view=rev
> 
> Modified:
>    haiku/trunk/headers/os/media/ParameterWeb.h
>    haiku/trunk/src/kits/media/ParameterWeb.cpp
> Log:
> * Added Dano-compatible BParameterWeb::StartWatching()/StopWatching() 
> method
>   stubs.
> * However, without a working Dano at hand, I can't really implement 
> something
>   compatible, so I'll postpone this to some later point.

Here is a sample test app and what it gives when muting/unmuting 3 
channels and changing the master volume...

Fran?ois.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: test_parameterweb_watching.cpp
Type: text/x-source-code
Size: 776 bytes
Desc: not available
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20090408/ca3f039f/attachment.bin>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: test_parameterweb_watching.log
URL: <https://lists.berlios.de/pipermail/haiku-commits/attachments/20090408/ca3f039f/attachment.ksh>

From mmu_man at mail.berlios.de  Wed Apr  8 17:35:46 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Wed, 8 Apr 2009 17:35:46 +0200
Subject: [Haiku-commits] r30034 - haiku/trunk/src/bin/desklink
Message-ID: <200904081535.n38FZkJY009148@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-08 17:35:45 +0200 (Wed, 08 Apr 2009)
New Revision: 30034
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30034&view=rev

Modified:
   haiku/trunk/src/bin/desklink/VolumeControl.cpp
Log:
Fix gcc4.


Modified: haiku/trunk/src/bin/desklink/VolumeControl.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeControl.cpp	2009-04-08 15:28:53 UTC (rev 30033)
+++ haiku/trunk/src/bin/desklink/VolumeControl.cpp	2009-04-08 15:35:45 UTC (rev 30034)
@@ -171,7 +171,7 @@
 
 
 status_t
-VolumeControl::Invoke(BMessage* message = NULL)
+VolumeControl::Invoke(BMessage* message)
 {
 	if (fBeep && fOriginalValue != Value() && message == NULL) {
 		beep();



From mmu_man at mail.berlios.de  Wed Apr  8 17:45:10 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Wed, 8 Apr 2009 17:45:10 +0200
Subject: [Haiku-commits] r30035 - haiku/trunk/src/bin/desklink
Message-ID: <200904081545.n38FjA6J010194@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-08 17:45:09 +0200 (Wed, 08 Apr 2009)
New Revision: 30035
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30035&view=rev

Modified:
   haiku/trunk/src/bin/desklink/MixerControl.cpp
Log:
Missing include for strcmp.


Modified: haiku/trunk/src/bin/desklink/MixerControl.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/MixerControl.cpp	2009-04-08 15:35:45 UTC (rev 30034)
+++ haiku/trunk/src/bin/desklink/MixerControl.cpp	2009-04-08 15:45:09 UTC (rev 30035)
@@ -11,6 +11,8 @@
 
 #include "MixerControl.h"
 
+#include <string.h>
+
 #include <Debug.h>
 #include <ParameterWeb.h>
 



From bonefish at mail.berlios.de  Wed Apr  8 18:47:48 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 8 Apr 2009 18:47:48 +0200
Subject: [Haiku-commits] r30036 - in haiku/trunk: headers/private/kernel
	src/system/kernel
Message-ID: <200904081647.n38Glmeu027078@sheep.berlios.de>

Author: bonefish
Date: 2009-04-08 18:47:45 +0200 (Wed, 08 Apr 2009)
New Revision: 30036
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30036&view=rev

Modified:
   haiku/trunk/headers/private/kernel/elf.h
   haiku/trunk/src/system/kernel/elf.cpp
Log:
Added elf_get_kernel_image() returning the image for the kernel.


Modified: haiku/trunk/headers/private/kernel/elf.h
===================================================================
--- haiku/trunk/headers/private/kernel/elf.h	2009-04-08 15:45:09 UTC (rev 30035)
+++ haiku/trunk/headers/private/kernel/elf.h	2009-04-08 16:47:45 UTC (rev 30036)
@@ -32,6 +32,7 @@
 status_t elf_debug_lookup_user_symbol_address(struct team* team, addr_t address,
 			addr_t *_baseAddress, const char **_symbolName,
 			const char **_imageName, bool *_exactMatch);
+struct elf_image_info* elf_get_kernel_image();
 status_t elf_get_image_info_for_address(addr_t address, image_info* info);
 image_id elf_create_memory_image(const char* imageName, addr_t text,
 			size_t textSize, addr_t data, size_t dataSize);

Modified: haiku/trunk/src/system/kernel/elf.cpp
===================================================================
--- haiku/trunk/src/system/kernel/elf.cpp	2009-04-08 15:45:09 UTC (rev 30035)
+++ haiku/trunk/src/system/kernel/elf.cpp	2009-04-08 16:47:45 UTC (rev 30036)
@@ -1849,6 +1849,13 @@
 }
 
 
+struct elf_image_info*
+elf_get_kernel_image()
+{
+	return sKernelImage;
+}
+
+
 status_t
 elf_get_image_info_for_address(addr_t address, image_info* info)
 {



From bonefish at mail.berlios.de  Wed Apr  8 18:48:37 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 8 Apr 2009 18:48:37 +0200
Subject: [Haiku-commits] r30037 - haiku/trunk/src/system/libroot/posix/stdlib
Message-ID: <200904081648.n38GmbL4027727@sheep.berlios.de>

Author: bonefish
Date: 2009-04-08 18:48:32 +0200 (Wed, 08 Apr 2009)
New Revision: 30037
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30037&view=rev

Modified:
   haiku/trunk/src/system/libroot/posix/stdlib/strtod.c
Log:
Don't use exit() when compiling for the kernel.


Modified: haiku/trunk/src/system/libroot/posix/stdlib/strtod.c
===================================================================
--- haiku/trunk/src/system/libroot/posix/stdlib/strtod.c	2009-04-08 16:47:45 UTC (rev 30036)
+++ haiku/trunk/src/system/libroot/posix/stdlib/strtod.c	2009-04-08 16:48:32 UTC (rev 30037)
@@ -130,8 +130,13 @@
 typedef	u_int32_t ULong;
 
 #ifdef DEBUG
-#	include <stdio.h>
-#	define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}
+#	if	_KERNEL_MODE
+#		include <KernelExport.h>
+#		define Bug(x) {dprintf("%s\n", x);}
+#	else
+#		include <stdio.h>
+#		define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}
+#	endif
 #endif
 
 #include <locale.h>



From bonefish at mail.berlios.de  Wed Apr  8 18:54:59 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 8 Apr 2009 18:54:59 +0200
Subject: [Haiku-commits] r30038 - haiku/trunk/src/system/kernel/debug
Message-ID: <200904081654.n38GsxJM032409@sheep.berlios.de>

Author: bonefish
Date: 2009-04-08 18:54:57 +0200 (Wed, 08 Apr 2009)
New Revision: 30038
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30038&view=rev

Modified:
   haiku/trunk/src/system/kernel/debug/gdb.cpp
Log:
* Fixed the "qOffsets" return value. At least how I understand the
  documentation the segment offsets it shall return are relative to the
  address specified in the program header.
* Added "qSupported".
* Added the mandatory commands and some additional ones. Partially implemented
  only.


Modified: haiku/trunk/src/system/kernel/debug/gdb.cpp
===================================================================
--- haiku/trunk/src/system/kernel/debug/gdb.cpp	2009-04-08 16:48:32 UTC (rev 30037)
+++ haiku/trunk/src/system/kernel/debug/gdb.cpp	2009-04-08 16:54:57 UTC (rev 30038)
@@ -18,6 +18,8 @@
 
 #include <arch/debug_console.h>
 #include <debug.h>
+#include <elf.h>
+#include <elf_priv.h>
 #include <smp.h>
 #include <vm.h>
 
@@ -183,6 +185,14 @@
 		gdb_ack();
 
 	switch (sCommand[0]) {
+		case '?':
+			// command '?' is used for retrieving the signal
+			// that stopped the program. Fully implemeting
+			// this command requires help from the debugger,
+			// by now we just fake a SIGKILL
+			gdb_reply("S09");	/* SIGKILL = 9 */
+			break;
+
 		case 'H':
 			// Command H (actually Hct) is used to select
 			// the current thread (-1 meaning all threads)
@@ -193,42 +203,28 @@
 
 		case 'q':
 		{
-			extern unsigned __data_start;
-			extern unsigned __bss_start;
+			// query commands
 
-			// There are several q commands:
-			//
-			//     qXXXX        Request info about XXXX.
-			//     QXXXX=yyyy   Set value of XXXX to yyyy.
-			//     qOffsets     Get segment offsets
-			//
-			// Currently we only support the 'qOffsets'
-			// form.
-			//
-			// *Note* that we actually have to lie,
-			// At first thought looks like we should
-			// return '_start', '__data_start' &
-			// '__bss_start', however gdb gets
-			// confused because the kernel link script
-			// pre-links at 0x80000000. To keep gdb
-			// gdb happy we just substract that amount.
-			if (strcmp(sCommand + 1, "Offsets") == 0) {
-				gdb_reply("Text=%x;Data=%x;Bss=%x", 0,
-					((unsigned)(&__data_start)) - 0x80000000,
-					((unsigned)(&__bss_start)) - 0x80000000);
+			if (strcmp(sCommand + 1, "Supported") == 0) {
+				// get the supported features
+				gdb_reply("");
+			} else if (strcmp(sCommand + 1, "Offsets") == 0) {
+				// get the segment offsets
+				elf_image_info* kernelImage = elf_get_kernel_image();
+				gdb_reply("Text=%lx;Data=%lx;Bss=%lx",
+					kernelImage->text_region.delta,
+					kernelImage->data_region.delta,
+					kernelImage->data_region.delta);
 			} else
-				gdb_reply("ENS");
+				gdb_reply("");
 
 			break;
 		}
 
-		case '?':
-			// command '?' is used for retrieving the signal
-			// that stopped the program. Fully implemeting
-			// this command requires help from the debugger,
-			// by now we just fake a SIGKILL
-			gdb_reply("S09");	/* SIGKILL = 9 */
-			break;
+		case 'c':
+			// continue at address
+			// TODO: Parse the address and resume there!
+			return QUIT;
 
 		case 'g':
 		{
@@ -255,6 +251,13 @@
 			break;
 		}
 
+		case 'G':
+			// write registers
+			// TODO: Implement!
+			gdb_reply("E01");
+			break;
+
+
 		case 'm':
 		{
 			char* ptr;
@@ -296,6 +299,10 @@
 			break;
 		}
 
+		case 'D':
+			// detach
+			return QUIT;
+
 		case 'k':
 			// Command 'k' actual semantics is 'kill the damn thing'.
 			// However gdb sends that command when you disconnect
@@ -306,9 +313,15 @@
 			// kernel debugger command prompt.
 			return QUIT;
 
-		default:
+		case 's':
+			// "step" -- resume (?) at address
+			// TODO: Implement!
 			gdb_reply("E01");
 			break;
+
+		default:
+			gdb_reply("");
+			break;
 	}
 
 	return WAITACK;



From bonefish at mail.berlios.de  Wed Apr  8 20:03:19 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Wed, 8 Apr 2009 20:03:19 +0200
Subject: [Haiku-commits] r30039 - haiku/trunk/build/jam
Message-ID: <200904081803.n38I3JCT031919@sheep.berlios.de>

Author: bonefish
Date: 2009-04-08 20:03:18 +0200 (Wed, 08 Apr 2009)
New Revision: 30039
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30039&view=rev

Modified:
   haiku/trunk/build/jam/FileRules
Log:
Don't use MakeLocate to make sure that the parent directory exists, since
that also sets LOCATE, which could cause jam to incorrectly place our
directory. Should fix the problems with the SSL build feature some people
have been seeing.


Modified: haiku/trunk/build/jam/FileRules
===================================================================
--- haiku/trunk/build/jam/FileRules	2009-04-08 16:54:57 UTC (rev 30038)
+++ haiku/trunk/build/jam/FileRules	2009-04-08 18:03:18 UTC (rev 30039)
@@ -224,8 +224,12 @@
 
 	# one-time initialization for the main target (the directory)
 	if ! [ on $(directory) return $(INITIALIZED) ] {
+		# make sure the parent dir exists
+		local parentDir = $(directory:PG=dir) ;
+		Depends $(directory) : $(parentDir) ;
+		MkDir $(parentDir) ;
+
 		NoUpdate $(directory) ;
-		MakeLocate $(directory) : $(directory:P) ;
 		Depends $(directory) : $(zipFile) ;
 		UnzipArchive1 $(directory) : $(zipFile) ;
 		INITIALIZED on $(directory) = 1 ;



From stippi at mail.berlios.de  Wed Apr  8 20:23:19 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Wed, 8 Apr 2009 20:23:19 +0200
Subject: [Haiku-commits] r30040 - haiku/trunk/src/preferences/filetypes
Message-ID: <200904081823.n38INJht001154@sheep.berlios.de>

Author: stippi
Date: 2009-04-08 20:23:16 +0200 (Wed, 08 Apr 2009)
New Revision: 30040
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30040&view=rev

Modified:
   haiku/trunk/src/preferences/filetypes/ExtensionWindow.cpp
   haiku/trunk/src/preferences/filetypes/ExtensionWindow.h
   haiku/trunk/src/preferences/filetypes/FileTypesWindow.cpp
Log:
axeld+stippi, inspired on a patch by Maxime Simon:
* Renamed add_extensions() to merge_extensions(), since that is what it does.
* Improved some other variable names in that function for clarity.
* Fixed the duplicate extension detection code, also extended it to the list
  of extensions which are supposed to be added, just in case it already
  contains duplicates.


Modified: haiku/trunk/src/preferences/filetypes/ExtensionWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/filetypes/ExtensionWindow.cpp	2009-04-08 18:03:18 UTC (rev 30039)
+++ haiku/trunk/src/preferences/filetypes/ExtensionWindow.cpp	2009-04-08 18:23:16 UTC (rev 30040)
@@ -38,8 +38,10 @@
 }
 
 
+//! newExtensionsList contains all the entries (char*) which are to be added.
 status_t
-add_extensions(BMimeType& type, BList& list, const char* removeExtension)
+merge_extensions(BMimeType& type, const BList& newExtensionsList,
+	const char* removeExtension)
 {
 	BMessage extensions;
 	status_t status = type.GetFileExtensions(&extensions);
@@ -47,32 +49,38 @@
 		return status;
 
 	// replace the entry, and remove any equivalent entries
-	BList newList;
-	newList.AddList(&list);
+	BList mergedList;
+	mergedList.AddList(&newExtensionsList);
+	int32 originalCount = mergedList.CountItems();
 
 	const char* extension;
 	for (int32 i = 0; extensions.FindString("extensions", i,
 			&extension) == B_OK; i++) {
-		bool add = true;
-		for (int32 j = list.CountItems(); j-- > 0;) {
-			if ((removeExtension && !strcmp(removeExtension, extension))
-				|| !strcmp((const char*)list.ItemAt(j), extension)) {
-				// remove this item
-				continue;
+
+		for (int32 j = originalCount; j-- > 0;) {
+			if (!strcmp((const char*)mergedList.ItemAt(j), extension)) {
+				// Do not add this old item again, since it's already
+				// there.
+				mergedList.RemoveItem(j);
+				originalCount--;
 			}
 		}
 
-		if (add)
-			newList.AddItem((void *)extension);
+		// The item will be added behind "originalCount", so we cannot
+		// remove it accidentally in the next iterations, it's is added
+		// for good.
+		if (removeExtension == NULL || strcmp(removeExtension, extension))
+			mergedList.AddItem((void *)extension);
 	}
 
-	newList.SortItems(compare_extensions);
+	mergedList.SortItems(compare_extensions);
 
 	// Copy them to a new message (their memory is still part of the
 	// original BMessage)
 	BMessage newExtensions;
-	for (int32 i = 0; i < newList.CountItems(); i++) {
-		newExtensions.AddString("extensions", (const char*)newList.ItemAt(i));
+	for (int32 i = 0; i < mergedList.CountItems(); i++) {
+		newExtensions.AddString("extensions",
+			(const char*)mergedList.ItemAt(i));
 	}
 
 	return type.SetFileExtensions(&newExtensions);
@@ -80,12 +88,13 @@
 
 
 status_t
-replace_extension(BMimeType& type, const char* newExtension, const char* oldExtension)
+replace_extension(BMimeType& type, const char* newExtension,
+	const char* oldExtension)
 {
 	BList list;
 	list.AddItem((void *)newExtension);
 
-	return add_extensions(type, list, oldExtension);
+	return merge_extensions(type, list, oldExtension);
 }
 
 

Modified: haiku/trunk/src/preferences/filetypes/ExtensionWindow.h
===================================================================
--- haiku/trunk/src/preferences/filetypes/ExtensionWindow.h	2009-04-08 18:03:18 UTC (rev 30039)
+++ haiku/trunk/src/preferences/filetypes/ExtensionWindow.h	2009-04-08 18:23:16 UTC (rev 30040)
@@ -33,7 +33,7 @@
 		BButton*		fAcceptButton;
 };
 
-extern status_t add_extensions(BMimeType& type, BList& list,
+extern status_t merge_extensions(BMimeType& type, const BList& newExtensions,
 	const char* removeExtension = NULL);
 extern status_t replace_extension(BMimeType& type, const char* newExtension,
 	const char* oldExtension);

Modified: haiku/trunk/src/preferences/filetypes/FileTypesWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/filetypes/FileTypesWindow.cpp	2009-04-08 18:03:18 UTC (rev 30039)
+++ haiku/trunk/src/preferences/filetypes/FileTypesWindow.cpp	2009-04-08 18:23:16 UTC (rev 30040)
@@ -227,7 +227,7 @@
 				list.AddItem(strdup(++point));
 		}
 
-		add_extensions(fType, list);
+		merge_extensions(fType, list);
 
 		// delete extension list
 		for (int32 index = list.CountItems(); index-- > 0;) {



From korli at mail.berlios.de  Wed Apr  8 20:56:58 2009
From: korli at mail.berlios.de (korli at BerliOS)
Date: Wed, 8 Apr 2009 20:56:58 +0200
Subject: [Haiku-commits] r30041 - in haiku/vendor/mesa/current:
	glu/libnurbs/interface glu/libnurbs/internals
	glu/libnurbs/nurbtess glu/libtess glut headers/public
	src/drivers/common src/glapi src/main src/math src/ppc
	src/shader src/shader/grammar src/shader/slang
	src/shader/slang/library src/sparc src/swrast
	src/swrast_setup src/tnl src/vbo src/x86 src/x86/rtasm src/x86-64
Message-ID: <200904081856.n38Iuw0m005679@sheep.berlios.de>

Author: korli
Date: 2009-04-08 20:56:38 +0200 (Wed, 08 Apr 2009)
New Revision: 30041
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30041&view=rev

Added:
   haiku/vendor/mesa/current/src/glapi/glapi_getproc.c
   haiku/vendor/mesa/current/src/main/api_exec.c
   haiku/vendor/mesa/current/src/main/api_exec.h
   haiku/vendor/mesa/current/src/main/clear.c
   haiku/vendor/mesa/current/src/main/clear.h
   haiku/vendor/mesa/current/src/main/dlopen.c
   haiku/vendor/mesa/current/src/main/dlopen.h
   haiku/vendor/mesa/current/src/main/ffvertex_prog.c
   haiku/vendor/mesa/current/src/main/ffvertex_prog.h
   haiku/vendor/mesa/current/src/main/mfeatures.h
   haiku/vendor/mesa/current/src/main/multisample.c
   haiku/vendor/mesa/current/src/main/multisample.h
   haiku/vendor/mesa/current/src/main/pixelstore.c
   haiku/vendor/mesa/current/src/main/pixelstore.h
   haiku/vendor/mesa/current/src/main/readpix.c
   haiku/vendor/mesa/current/src/main/readpix.h
   haiku/vendor/mesa/current/src/main/scissor.c
   haiku/vendor/mesa/current/src/main/scissor.h
   haiku/vendor/mesa/current/src/main/texenv.c
   haiku/vendor/mesa/current/src/main/texenv.h
   haiku/vendor/mesa/current/src/main/texgen.c
   haiku/vendor/mesa/current/src/main/texgen.h
   haiku/vendor/mesa/current/src/main/texparam.c
   haiku/vendor/mesa/current/src/main/texparam.h
   haiku/vendor/mesa/current/src/shader/prog_cache.c
   haiku/vendor/mesa/current/src/shader/prog_cache.h
   haiku/vendor/mesa/current/src/shader/prog_noise.c
   haiku/vendor/mesa/current/src/shader/prog_noise.h
   haiku/vendor/mesa/current/src/tnl/t_rasterpos.c
Removed:
   haiku/vendor/mesa/current/src/main/api_eval.h
   haiku/vendor/mesa/current/src/shader/slang/slang_library_noise.c
   haiku/vendor/mesa/current/src/shader/slang/slang_library_noise.h
   haiku/vendor/mesa/current/src/swrast/s_drawpix.h
Modified:
   haiku/vendor/mesa/current/glu/libnurbs/interface/bezierEval.h
   haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatch.cc
   haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatch.h
   haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatchMesh.cc
   haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatchMesh.h
   haiku/vendor/mesa/current/glu/libnurbs/interface/glcurveval.cc
   haiku/vendor/mesa/current/glu/libnurbs/interface/glimports.h
   haiku/vendor/mesa/current/glu/libnurbs/interface/glinterface.cc
   haiku/vendor/mesa/current/glu/libnurbs/interface/glrenderer.h
   haiku/vendor/mesa/current/glu/libnurbs/interface/incurveeval.cc
   haiku/vendor/mesa/current/glu/libnurbs/interface/insurfeval.cc
   haiku/vendor/mesa/current/glu/libnurbs/interface/mystdio.h
   haiku/vendor/mesa/current/glu/libnurbs/interface/mystdlib.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/arc.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/arcsorter.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/arcsorter.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/arctess.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/backend.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/backend.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/basiccrveval.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/basicsurfeval.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/bezierarc.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/bin.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/bin.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/bufpool.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/bufpool.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/cachingeval.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/cachingeval.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/ccw.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/coveandtiler.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/curve.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/curve.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/curvelist.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/curvelist.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/curvesub.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/dataTransform.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/dataTransform.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/defines.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/displaylist.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/displaylist.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/displaymode.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/flist.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/flist.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/flistsorter.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/flistsorter.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/gridline.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/gridtrimvertex.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/gridvertex.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/hull.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/hull.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/intersect.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/jarcloc.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/knotvector.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/mapdesc.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/mapdesc.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/mapdescv.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/maplist.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/maplist.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/mesher.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/mesher.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/monoTriangulationBackend.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/monotonizer.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/monotonizer.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/myassert.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/mycode.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/mystring.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/nurbsconsts.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/nurbstess.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/patch.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/patch.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/patchlist.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/patchlist.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/pwlarc.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/quilt.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/quilt.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/reader.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/reader.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/renderhints.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/renderhints.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/simplemath.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/slicer.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/slicer.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/sorter.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/sorter.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/splitarcs.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/subdivider.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/tobezier.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/trimline.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/trimline.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/trimregion.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/trimregion.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/trimvertex.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/trimvertpool.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/trimvertpool.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/types.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/uarray.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/uarray.h
   haiku/vendor/mesa/current/glu/libnurbs/internals/varray.cc
   haiku/vendor/mesa/current/glu/libnurbs/internals/varray.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/definitions.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/directedLine.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/glimports.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/gridWrap.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/gridWrap.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/monoChain.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/monoChain.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/monoPolyPart.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/monoTriangulation.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/monoTriangulation.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/mystdio.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/mystdlib.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/partitionX.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/partitionX.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/partitionY.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/partitionY.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/polyDBG.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/polyUtil.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/polyUtil.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/primitiveStream.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/primitiveStream.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/quicksort.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/quicksort.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/rectBlock.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/rectBlock.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/sampleComp.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/sampleComp.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/sampleCompBot.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/sampleCompBot.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/sampleCompRight.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/sampleCompRight.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/sampleCompTop.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/sampleCompTop.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/sampleMonoPoly.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/sampleMonoPoly.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/sampledLine.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/sampledLine.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/searchTree.cc
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/searchTree.h
   haiku/vendor/mesa/current/glu/libnurbs/nurbtess/zlassert.h
   haiku/vendor/mesa/current/glu/libtess/README
   haiku/vendor/mesa/current/glu/libtess/alg-outline
   haiku/vendor/mesa/current/glu/libtess/dict-list.h
   haiku/vendor/mesa/current/glu/libtess/dict.c
   haiku/vendor/mesa/current/glu/libtess/dict.h
   haiku/vendor/mesa/current/glu/libtess/geom.c
   haiku/vendor/mesa/current/glu/libtess/memalloc.c
   haiku/vendor/mesa/current/glu/libtess/memalloc.h
   haiku/vendor/mesa/current/glu/libtess/mesh.c
   haiku/vendor/mesa/current/glu/libtess/mesh.h
   haiku/vendor/mesa/current/glu/libtess/normal.h
   haiku/vendor/mesa/current/glu/libtess/priorityq-heap.c
   haiku/vendor/mesa/current/glu/libtess/priorityq-heap.h
   haiku/vendor/mesa/current/glu/libtess/priorityq-sort.h
   haiku/vendor/mesa/current/glu/libtess/priorityq.c
   haiku/vendor/mesa/current/glu/libtess/priorityq.h
   haiku/vendor/mesa/current/glu/libtess/render.c
   haiku/vendor/mesa/current/glu/libtess/render.h
   haiku/vendor/mesa/current/glu/libtess/sweep.h
   haiku/vendor/mesa/current/glu/libtess/tess.h
   haiku/vendor/mesa/current/glu/libtess/tessmono.c
   haiku/vendor/mesa/current/glu/libtess/tessmono.h
   haiku/vendor/mesa/current/glut/beos_x11.cpp
   haiku/vendor/mesa/current/headers/public/gl.h
   haiku/vendor/mesa/current/headers/public/glext.h
   haiku/vendor/mesa/current/headers/public/glu.h
   haiku/vendor/mesa/current/src/drivers/common/driverfuncs.c
   haiku/vendor/mesa/current/src/glapi/dispatch.h
   haiku/vendor/mesa/current/src/glapi/glapi.c
   haiku/vendor/mesa/current/src/glapi/glapi.h
   haiku/vendor/mesa/current/src/glapi/glapitable.h
   haiku/vendor/mesa/current/src/glapi/glthread.h
   haiku/vendor/mesa/current/src/main/api_arrayelt.c
   haiku/vendor/mesa/current/src/main/api_loopback.c
   haiku/vendor/mesa/current/src/main/api_noop.c
   haiku/vendor/mesa/current/src/main/api_validate.c
   haiku/vendor/mesa/current/src/main/arrayobj.c
   haiku/vendor/mesa/current/src/main/attrib.c
   haiku/vendor/mesa/current/src/main/blend.c
   haiku/vendor/mesa/current/src/main/bufferobj.c
   haiku/vendor/mesa/current/src/main/buffers.c
   haiku/vendor/mesa/current/src/main/buffers.h
   haiku/vendor/mesa/current/src/main/colormac.h
   haiku/vendor/mesa/current/src/main/colortab.c
   haiku/vendor/mesa/current/src/main/config.h
   haiku/vendor/mesa/current/src/main/context.c
   haiku/vendor/mesa/current/src/main/context.h
   haiku/vendor/mesa/current/src/main/dd.h
   haiku/vendor/mesa/current/src/main/debug.c
   haiku/vendor/mesa/current/src/main/depthstencil.c
   haiku/vendor/mesa/current/src/main/dispatch.c
   haiku/vendor/mesa/current/src/main/dlist.c
   haiku/vendor/mesa/current/src/main/drawpix.c
   haiku/vendor/mesa/current/src/main/drawpix.h
   haiku/vendor/mesa/current/src/main/enable.c
   haiku/vendor/mesa/current/src/main/enums.c
   haiku/vendor/mesa/current/src/main/execmem.c
   haiku/vendor/mesa/current/src/main/extensions.c
   haiku/vendor/mesa/current/src/main/fbobject.c
   haiku/vendor/mesa/current/src/main/framebuffer.c
   haiku/vendor/mesa/current/src/main/framebuffer.h
   haiku/vendor/mesa/current/src/main/get.c
   haiku/vendor/mesa/current/src/main/getstring.c
   haiku/vendor/mesa/current/src/main/glheader.h
   haiku/vendor/mesa/current/src/main/hash.c
   haiku/vendor/mesa/current/src/main/histogram.c
   haiku/vendor/mesa/current/src/main/histogram.h
   haiku/vendor/mesa/current/src/main/image.c
   haiku/vendor/mesa/current/src/main/image.h
   haiku/vendor/mesa/current/src/main/imports.c
   haiku/vendor/mesa/current/src/main/imports.h
   haiku/vendor/mesa/current/src/main/light.c
   haiku/vendor/mesa/current/src/main/macros.h
   haiku/vendor/mesa/current/src/main/mipmap.c
   haiku/vendor/mesa/current/src/main/mipmap.h
   haiku/vendor/mesa/current/src/main/mm.c
   haiku/vendor/mesa/current/src/main/mm.h
   haiku/vendor/mesa/current/src/main/mtypes.h
   haiku/vendor/mesa/current/src/main/pixel.c
   haiku/vendor/mesa/current/src/main/pixel.h
   haiku/vendor/mesa/current/src/main/points.c
   haiku/vendor/mesa/current/src/main/points.h
   haiku/vendor/mesa/current/src/main/queryobj.c
   haiku/vendor/mesa/current/src/main/queryobj.h
   haiku/vendor/mesa/current/src/main/rastpos.c
   haiku/vendor/mesa/current/src/main/shaders.c
   haiku/vendor/mesa/current/src/main/state.c
   haiku/vendor/mesa/current/src/main/state.h
   haiku/vendor/mesa/current/src/main/stencil.c
   haiku/vendor/mesa/current/src/main/texcompress.c
   haiku/vendor/mesa/current/src/main/texcompress_s3tc.c
   haiku/vendor/mesa/current/src/main/texenvprogram.c
   haiku/vendor/mesa/current/src/main/texenvprogram.h
   haiku/vendor/mesa/current/src/main/texformat.c
   haiku/vendor/mesa/current/src/main/texformat.h
   haiku/vendor/mesa/current/src/main/texformat_tmp.h
   haiku/vendor/mesa/current/src/main/teximage.c
   haiku/vendor/mesa/current/src/main/teximage.h
   haiku/vendor/mesa/current/src/main/texobj.c
   haiku/vendor/mesa/current/src/main/texrender.c
   haiku/vendor/mesa/current/src/main/texstate.c
   haiku/vendor/mesa/current/src/main/texstate.h
   haiku/vendor/mesa/current/src/main/texstore.c
   haiku/vendor/mesa/current/src/main/texstore.h
   haiku/vendor/mesa/current/src/main/varray.c
   haiku/vendor/mesa/current/src/main/varray.h
   haiku/vendor/mesa/current/src/main/version.h
   haiku/vendor/mesa/current/src/math/m_debug_clip.c
   haiku/vendor/mesa/current/src/math/m_debug_norm.c
   haiku/vendor/mesa/current/src/math/m_debug_util.h
   haiku/vendor/mesa/current/src/math/m_debug_xform.c
   haiku/vendor/mesa/current/src/math/m_matrix.c
   haiku/vendor/mesa/current/src/math/m_matrix.h
   haiku/vendor/mesa/current/src/math/m_translate.c
   haiku/vendor/mesa/current/src/math/m_vector.c
   haiku/vendor/mesa/current/src/math/m_vector.h
   haiku/vendor/mesa/current/src/math/m_xform.h
   haiku/vendor/mesa/current/src/ppc/common_ppc.c
   haiku/vendor/mesa/current/src/ppc/common_ppc_features.h
   haiku/vendor/mesa/current/src/shader/arbprogparse.c
   haiku/vendor/mesa/current/src/shader/arbprogparse.h
   haiku/vendor/mesa/current/src/shader/arbprogram.c
   haiku/vendor/mesa/current/src/shader/atifragshader.c
   haiku/vendor/mesa/current/src/shader/grammar/grammar_crt.c
   haiku/vendor/mesa/current/src/shader/grammar/grammar_mesa.h
   haiku/vendor/mesa/current/src/shader/nvfragparse.c
   haiku/vendor/mesa/current/src/shader/nvprogram.c
   haiku/vendor/mesa/current/src/shader/nvvertparse.c
   haiku/vendor/mesa/current/src/shader/prog_debug.c
   haiku/vendor/mesa/current/src/shader/prog_execute.c
   haiku/vendor/mesa/current/src/shader/prog_execute.h
   haiku/vendor/mesa/current/src/shader/prog_instruction.c
   haiku/vendor/mesa/current/src/shader/prog_instruction.h
   haiku/vendor/mesa/current/src/shader/prog_parameter.c
   haiku/vendor/mesa/current/src/shader/prog_parameter.h
   haiku/vendor/mesa/current/src/shader/prog_print.c
   haiku/vendor/mesa/current/src/shader/prog_print.h
   haiku/vendor/mesa/current/src/shader/prog_statevars.c
   haiku/vendor/mesa/current/src/shader/prog_statevars.h
   haiku/vendor/mesa/current/src/shader/prog_uniform.c
   haiku/vendor/mesa/current/src/shader/prog_uniform.h
   haiku/vendor/mesa/current/src/shader/program.c
   haiku/vendor/mesa/current/src/shader/program.h
   haiku/vendor/mesa/current/src/shader/shader_api.c
   haiku/vendor/mesa/current/src/shader/shader_api.h
   haiku/vendor/mesa/current/src/shader/slang/library/slang_120_core_gc.h
   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
   haiku/vendor/mesa/current/src/shader/slang/library/slang_common_builtin.gc
   haiku/vendor/mesa/current/src/shader/slang/library/slang_common_builtin_gc.h
   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/library/slang_fragment_builtin_gc.h
   haiku/vendor/mesa/current/src/shader/slang/library/slang_pp_directives.syn
   haiku/vendor/mesa/current/src/shader/slang/library/slang_pp_directives_syn.h
   haiku/vendor/mesa/current/src/shader/slang/library/slang_shader.syn
   haiku/vendor/mesa/current/src/shader/slang/library/slang_shader_syn.h
   haiku/vendor/mesa/current/src/shader/slang/library/slang_vertex_builtin.gc
   haiku/vendor/mesa/current/src/shader/slang/library/slang_vertex_builtin_gc.h
   haiku/vendor/mesa/current/src/shader/slang/slang_builtin.c
   haiku/vendor/mesa/current/src/shader/slang/slang_builtin.h
   haiku/vendor/mesa/current/src/shader/slang/slang_codegen.c
   haiku/vendor/mesa/current/src/shader/slang/slang_codegen.h
   haiku/vendor/mesa/current/src/shader/slang/slang_compile.c
   haiku/vendor/mesa/current/src/shader/slang/slang_compile.h
   haiku/vendor/mesa/current/src/shader/slang/slang_compile_function.c
   haiku/vendor/mesa/current/src/shader/slang/slang_compile_function.h
   haiku/vendor/mesa/current/src/shader/slang/slang_compile_operation.c
   haiku/vendor/mesa/current/src/shader/slang/slang_compile_operation.h
   haiku/vendor/mesa/current/src/shader/slang/slang_compile_variable.c
   haiku/vendor/mesa/current/src/shader/slang/slang_compile_variable.h
   haiku/vendor/mesa/current/src/shader/slang/slang_emit.c
   haiku/vendor/mesa/current/src/shader/slang/slang_emit.h
   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/shader/slang/slang_log.c
   haiku/vendor/mesa/current/src/shader/slang/slang_mem.c
   haiku/vendor/mesa/current/src/shader/slang/slang_preprocess.c
   haiku/vendor/mesa/current/src/shader/slang/slang_preprocess.h
   haiku/vendor/mesa/current/src/shader/slang/slang_print.c
   haiku/vendor/mesa/current/src/shader/slang/slang_simplify.c
   haiku/vendor/mesa/current/src/shader/slang/slang_storage.h
   haiku/vendor/mesa/current/src/shader/slang/slang_typeinfo.c
   haiku/vendor/mesa/current/src/shader/slang/slang_typeinfo.h
   haiku/vendor/mesa/current/src/shader/slang/slang_vartable.c
   haiku/vendor/mesa/current/src/shader/slang/slang_vartable.h
   haiku/vendor/mesa/current/src/sparc/norm.S
   haiku/vendor/mesa/current/src/sparc/sparc.c
   haiku/vendor/mesa/current/src/sparc/sparc.h
   haiku/vendor/mesa/current/src/sparc/xform.S
   haiku/vendor/mesa/current/src/swrast/s_aaline.c
   haiku/vendor/mesa/current/src/swrast/s_aaline.h
   haiku/vendor/mesa/current/src/swrast/s_aalinetemp.h
   haiku/vendor/mesa/current/src/swrast/s_aatriangle.c
   haiku/vendor/mesa/current/src/swrast/s_aatriangle.h
   haiku/vendor/mesa/current/src/swrast/s_accum.c
   haiku/vendor/mesa/current/src/swrast/s_accum.h
   haiku/vendor/mesa/current/src/swrast/s_alpha.c
   haiku/vendor/mesa/current/src/swrast/s_alpha.h
   haiku/vendor/mesa/current/src/swrast/s_atifragshader.c
   haiku/vendor/mesa/current/src/swrast/s_bitmap.c
   haiku/vendor/mesa/current/src/swrast/s_blend.c
   haiku/vendor/mesa/current/src/swrast/s_blend.h
   haiku/vendor/mesa/current/src/swrast/s_blit.c
   haiku/vendor/mesa/current/src/swrast/s_buffers.c
   haiku/vendor/mesa/current/src/swrast/s_context.c
   haiku/vendor/mesa/current/src/swrast/s_copypix.c
   haiku/vendor/mesa/current/src/swrast/s_depth.c
   haiku/vendor/mesa/current/src/swrast/s_depth.h
   haiku/vendor/mesa/current/src/swrast/s_drawpix.c
   haiku/vendor/mesa/current/src/swrast/s_feedback.c
   haiku/vendor/mesa/current/src/swrast/s_feedback.h
   haiku/vendor/mesa/current/src/swrast/s_fog.c
   haiku/vendor/mesa/current/src/swrast/s_fog.h
   haiku/vendor/mesa/current/src/swrast/s_fragprog.c
   haiku/vendor/mesa/current/src/swrast/s_imaging.c
   haiku/vendor/mesa/current/src/swrast/s_lines.c
   haiku/vendor/mesa/current/src/swrast/s_lines.h
   haiku/vendor/mesa/current/src/swrast/s_logic.c
   haiku/vendor/mesa/current/src/swrast/s_logic.h
   haiku/vendor/mesa/current/src/swrast/s_masking.c
   haiku/vendor/mesa/current/src/swrast/s_masking.h
   haiku/vendor/mesa/current/src/swrast/s_points.c
   haiku/vendor/mesa/current/src/swrast/s_points.h
   haiku/vendor/mesa/current/src/swrast/s_readpix.c
   haiku/vendor/mesa/current/src/swrast/s_span.c
   haiku/vendor/mesa/current/src/swrast/s_span.h
   haiku/vendor/mesa/current/src/swrast/s_spantemp.h
   haiku/vendor/mesa/current/src/swrast/s_stencil.c
   haiku/vendor/mesa/current/src/swrast/s_stencil.h
   haiku/vendor/mesa/current/src/swrast/s_texcombine.c
   haiku/vendor/mesa/current/src/swrast/s_texcombine.h
   haiku/vendor/mesa/current/src/swrast/s_texfilter.c
   haiku/vendor/mesa/current/src/swrast/s_texfilter.h
   haiku/vendor/mesa/current/src/swrast/s_texstore.c
   haiku/vendor/mesa/current/src/swrast/s_triangle.c
   haiku/vendor/mesa/current/src/swrast/s_triangle.h
   haiku/vendor/mesa/current/src/swrast/s_zoom.c
   haiku/vendor/mesa/current/src/swrast/s_zoom.h
   haiku/vendor/mesa/current/src/swrast_setup/ss_context.c
   haiku/vendor/mesa/current/src/swrast_setup/ss_context.h
   haiku/vendor/mesa/current/src/swrast_setup/ss_triangle.c
   haiku/vendor/mesa/current/src/swrast_setup/ss_triangle.h
   haiku/vendor/mesa/current/src/swrast_setup/ss_vb.h
   haiku/vendor/mesa/current/src/tnl/t_context.c
   haiku/vendor/mesa/current/src/tnl/t_context.h
   haiku/vendor/mesa/current/src/tnl/t_draw.c
   haiku/vendor/mesa/current/src/tnl/t_pipeline.h
   haiku/vendor/mesa/current/src/tnl/t_vb_cull.c
   haiku/vendor/mesa/current/src/tnl/t_vb_fog.c
   haiku/vendor/mesa/current/src/tnl/t_vb_light.c
   haiku/vendor/mesa/current/src/tnl/t_vb_normals.c
   haiku/vendor/mesa/current/src/tnl/t_vb_points.c
   haiku/vendor/mesa/current/src/tnl/t_vb_render.c
   haiku/vendor/mesa/current/src/tnl/t_vb_texgen.c
   haiku/vendor/mesa/current/src/tnl/t_vb_texmat.c
   haiku/vendor/mesa/current/src/tnl/t_vb_vertex.c
   haiku/vendor/mesa/current/src/tnl/t_vertex.c
   haiku/vendor/mesa/current/src/tnl/t_vertex.h
   haiku/vendor/mesa/current/src/tnl/t_vertex_generic.c
   haiku/vendor/mesa/current/src/tnl/t_vertex_sse.c
   haiku/vendor/mesa/current/src/tnl/t_vp_build.c
   haiku/vendor/mesa/current/src/tnl/t_vp_build.h
   haiku/vendor/mesa/current/src/tnl/tnl.h
   haiku/vendor/mesa/current/src/vbo/vbo.h
   haiku/vendor/mesa/current/src/vbo/vbo_context.c
   haiku/vendor/mesa/current/src/vbo/vbo_context.h
   haiku/vendor/mesa/current/src/vbo/vbo_exec.c
   haiku/vendor/mesa/current/src/vbo/vbo_exec_api.c
   haiku/vendor/mesa/current/src/vbo/vbo_exec_array.c
   haiku/vendor/mesa/current/src/vbo/vbo_exec_draw.c
   haiku/vendor/mesa/current/src/vbo/vbo_exec_eval.c
   haiku/vendor/mesa/current/src/vbo/vbo_save_draw.c
   haiku/vendor/mesa/current/src/vbo/vbo_split_inplace.c
   haiku/vendor/mesa/current/src/x86-64/x86-64.c
   haiku/vendor/mesa/current/src/x86-64/x86-64.h
   haiku/vendor/mesa/current/src/x86-64/xform4.S
   haiku/vendor/mesa/current/src/x86/3dnow.c
   haiku/vendor/mesa/current/src/x86/3dnow.h
   haiku/vendor/mesa/current/src/x86/3dnow_normal.S
   haiku/vendor/mesa/current/src/x86/3dnow_xform1.S
   haiku/vendor/mesa/current/src/x86/3dnow_xform2.S
   haiku/vendor/mesa/current/src/x86/3dnow_xform3.S
   haiku/vendor/mesa/current/src/x86/3dnow_xform4.S
   haiku/vendor/mesa/current/src/x86/clip_args.h
   haiku/vendor/mesa/current/src/x86/common_x86.c
   haiku/vendor/mesa/current/src/x86/common_x86_asm.S
   haiku/vendor/mesa/current/src/x86/common_x86_asm.h
   haiku/vendor/mesa/current/src/x86/common_x86_features.h
   haiku/vendor/mesa/current/src/x86/common_x86_macros.h
   haiku/vendor/mesa/current/src/x86/gen_matypes.c
   haiku/vendor/mesa/current/src/x86/glapi_x86.S
   haiku/vendor/mesa/current/src/x86/mmx_blend.S
   haiku/vendor/mesa/current/src/x86/norm_args.h
   haiku/vendor/mesa/current/src/x86/rtasm/x86sse.c
   haiku/vendor/mesa/current/src/x86/sse.c
   haiku/vendor/mesa/current/src/x86/sse.h
   haiku/vendor/mesa/current/src/x86/sse_normal.S
   haiku/vendor/mesa/current/src/x86/sse_xform1.S
   haiku/vendor/mesa/current/src/x86/sse_xform2.S
   haiku/vendor/mesa/current/src/x86/sse_xform3.S
   haiku/vendor/mesa/current/src/x86/sse_xform4.S
   haiku/vendor/mesa/current/src/x86/x86.c
   haiku/vendor/mesa/current/src/x86/x86.h
   haiku/vendor/mesa/current/src/x86/x86_cliptest.S
   haiku/vendor/mesa/current/src/x86/x86_xform2.S
   haiku/vendor/mesa/current/src/x86/x86_xform3.S
   haiku/vendor/mesa/current/src/x86/x86_xform4.S
   haiku/vendor/mesa/current/src/x86/xform_args.h
Log:
updating mesa vendor with version 7.4


Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/bezierEval.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/bezierEval.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/bezierEval.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -28,7 +28,6 @@
  * Silicon Graphics, Inc.
  */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/bezierEval.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
 */
 
 #ifndef _BEZIEREVAL_H

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatch.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatch.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatch.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,10 +31,8 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/bezierPatch.cc,v 1.1 2001/03/17 00:25:40 brianp Exp $
 */
 
 #include "gluos.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatch.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatch.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatch.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -28,7 +28,6 @@
  * Silicon Graphics, Inc.
  */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/bezierPatch.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
 */
 
 #ifndef _BEZIERPATCH_H

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatchMesh.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatchMesh.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatchMesh.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,10 +31,8 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc,v 1.1 2001/03/17 00:25:40 brianp Exp $
 */
 
 #include "gluos.h"
@@ -105,23 +103,22 @@
   int dimension;
   int the_ustride;
   int the_vstride;
-  
-  bezierPatchMesh *ret = (bezierPatchMesh*) malloc(sizeof(bezierPatchMesh));
-  assert(ret);
 
-  ret->bpatch = NULL;
-  ret->bpatch_normal = NULL;
-  ret->bpatch_color  = NULL;
-  ret->bpatch_texcoord = NULL;
- 
   if(maptype == GL_MAP2_VERTEX_3) dimension = 3;
   else if (maptype==GL_MAP2_VERTEX_4) dimension = 4;
   else {
     fprintf(stderr, "error in inMap2f, maptype=%i is wrong, maptype,map is invalid\n", maptype);
     return NULL;
   }
-  
+
+  bezierPatchMesh *ret = (bezierPatchMesh*) malloc(sizeof(bezierPatchMesh));
+  assert(ret);
+
+  ret->bpatch_normal = NULL;
+  ret->bpatch_color  = NULL;
+  ret->bpatch_texcoord = NULL;
   ret->bpatch = bezierPatchMake(umin, vmin, umax, vmax, uorder, vorder, dimension);
+
   /*copy the control points there*/
   the_ustride = vorder * dimension;
   the_vstride = dimension;

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatchMesh.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatchMesh.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/bezierPatchMesh.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -28,7 +28,6 @@
  * Silicon Graphics, Inc.
  */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/bezierPatchMesh.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
 */
 
 #ifndef _BEZIERPATCHMESH_H

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/glcurveval.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/glcurveval.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/glcurveval.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * glcurveval.c++
  *
- * $Date: 2006/03/29 18:46:46 $ $Revision: 1.7 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glcurveval.cc,v 1.7 2006/03/29 18:46:46 brianp Exp $
  */
 
 /* Polynomial Evaluator Interface */

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/glimports.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/glimports.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/glimports.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * glimports.h
  *
- * $Date: 2001/03/19 17:52:02 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glimports.h,v 1.3 2001/03/19 17:52:02 pesco Exp $
  */
 
 #ifndef __gluimports_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/glinterface.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/glinterface.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/glinterface.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,10 +31,8 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/07/16 15:46:42 $ $Revision: 1.2 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glinterface.cc,v 1.2 2001/07/16 15:46:42 brianp Exp $
 */
 
 #include "gluos.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/glrenderer.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/glrenderer.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/glrenderer.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * glrenderer.h
  *
- * $Date: 2004/02/26 14:58:11 $ $Revision: 1.4 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glrenderer.h,v 1.4 2004/02/26 14:58:11 brianp Exp $
  */
 
 #ifndef __gluglrenderer_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/incurveeval.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/incurveeval.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/incurveeval.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,10 +31,8 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2004/05/12 15:29:36 $ $Revision: 1.2 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/incurveeval.cc,v 1.2 2004/05/12 15:29:36 brianp Exp $
 */
 
 #include <stdlib.h>

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/insurfeval.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/insurfeval.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/insurfeval.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,10 +31,8 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2004/05/12 15:29:36 $ $Revision: 1.3 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/insurfeval.cc,v 1.3 2004/05/12 15:29:36 brianp Exp $
 */
 
 #include "gluos.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/mystdio.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/mystdio.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/mystdio.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * mystdio.h
  *
- * $Date: 2006/03/14 15:08:52 $ $Revision: 1.4 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/mystdio.h,v 1.4 2006/03/14 15:08:52 brianp Exp $
  */
 
 #ifndef __glumystdio_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/interface/mystdlib.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/interface/mystdlib.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/interface/mystdlib.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * mystdlib.h
  *
- * $Date: 2001/03/19 17:52:02 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/mystdlib.h,v 1.3 2001/03/19 17:52:02 pesco Exp $
  */
 
 #ifndef __glumystdlib_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/arc.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/arc.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/arc.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * arc.h
  *
- * $Date: 2001/08/07 17:34:11 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/arc.h,v 1.2 2001/08/07 17:34:11 brianp Exp $
  */
 
 #ifndef __gluarc_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/arcsorter.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/arcsorter.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/arcsorter.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * arcsorter.c++
  *
- * $Date: 2006/03/14 15:08:52 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/arcsorter.cc,v 1.2 2006/03/14 15:08:52 brianp Exp $
  */
 
 #ifndef __gluarcsorter_c_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/arcsorter.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/arcsorter.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/arcsorter.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * arcsorter.h
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/arcsorter.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #ifndef __gluarcsorter_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/arctess.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/arctess.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/arctess.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * arctess.h
  *
- * $Date: 2001/08/07 17:34:11 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/arctess.h,v 1.2 2001/08/07 17:34:11 brianp Exp $
  */
 
 #ifndef __gluarctess_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/backend.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/backend.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/backend.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * backend.c++
  *
- * $Date: 2004/05/12 15:29:36 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/backend.cc,v 1.2 2004/05/12 15:29:36 brianp Exp $
  */
 
 /* Bezier surface backend

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/backend.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/backend.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/backend.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * backend.h
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/backend.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #ifndef __glubackend_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/basiccrveval.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/basiccrveval.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/basiccrveval.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * basiccurveeval.h
  *
- * $Date: 2006/03/29 18:54:00 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/basiccrveval.h,v 1.2 2006/03/29 18:54:00 brianp Exp $
  */
 
 #ifndef __glubasiccrveval_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/basicsurfeval.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/basicsurfeval.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/basicsurfeval.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * basicsurfeval.h
  *
- * $Date: 2006/03/29 18:54:00 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/basicsurfeval.h,v 1.2 2006/03/29 18:54:00 brianp Exp $
  */
 
 #ifndef __glubasicsurfeval_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/bezierarc.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/bezierarc.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/bezierarc.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * bezierarc.h
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/bezierarc.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #ifndef __glubezierarc_h

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/bin.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/bin.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/bin.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * bin.c++
  *
- * $Date: 2006/03/14 15:08:52 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/bin.cc,v 1.3 2006/03/14 15:08:52 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/bin.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/bin.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/bin.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * bin.h
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/bin.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #ifndef __glubin_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/bufpool.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/bufpool.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/bufpool.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  *  bufpool.c++
  *
- * $Date: 2004/05/12 15:29:36 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/bufpool.cc,v 1.2 2004/05/12 15:29:36 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/bufpool.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/bufpool.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/bufpool.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * bufpool.h
  *
- * $Date: 2006/03/29 18:46:46 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/bufpool.h,v 1.3 2006/03/29 18:46:46 brianp Exp $
  */
 
 #ifndef __glubufpool_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/cachingeval.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/cachingeval.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/cachingeval.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * cachingeval.c++
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/cachingeval.cc,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #include "cachingeval.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/cachingeval.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/cachingeval.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/cachingeval.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * cachingeval.h
  *
- * $Date: 2006/03/29 18:54:00 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/cachingeval.h,v 1.2 2006/03/29 18:54:00 brianp Exp $
  */
 
 #ifndef __glucachingval_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/ccw.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/ccw.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/ccw.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * ccw.c++
  *
- * $Date: 2006/03/14 15:08:52 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/ccw.cc,v 1.3 2006/03/14 15:08:52 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/coveandtiler.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/coveandtiler.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/coveandtiler.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * coveandtiler.h
  *
- * $Date: 2001/07/16 15:46:42 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/coveandtiler.h,v 1.2 2001/07/16 15:46:42 brianp Exp $
  */
 
 #ifndef __glucoveandtiler_h

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/curve.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/curve.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/curve.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * curve.c++
  *
- * $Date: 2004/05/12 15:29:36 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/curve.cc,v 1.3 2004/05/12 15:29:36 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/curve.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/curve.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/curve.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * curve.h
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/curve.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #ifndef __glucurve_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/curvelist.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/curvelist.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/curvelist.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * curvelist.c++
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/curvelist.cc,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/curvelist.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/curvelist.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/curvelist.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * curvelist.h
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/curvelist.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #ifndef __glucurvelist_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/curvesub.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/curvesub.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/curvesub.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * curvesub.c++
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/curvesub.cc,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/dataTransform.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/dataTransform.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/dataTransform.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,10 +31,8 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2005/10/28 13:09:23 $ $Revision: 1.2 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/dataTransform.cc,v 1.2 2005/10/28 13:09:23 brianp Exp $
 */
 
 #include <stdlib.h>

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/dataTransform.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/dataTransform.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/dataTransform.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -28,7 +28,6 @@
  * Silicon Graphics, Inc.
  */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/dataTransform.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
 */
 
 #ifndef _DATA_TRANSFORM_H

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/defines.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/defines.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/defines.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * defines.h
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/defines.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #ifndef __gludefines_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/displaylist.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/displaylist.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/displaylist.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * displaylist.c++
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/displaylist.cc,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/displaylist.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/displaylist.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/displaylist.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * displaylist.h
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/displaylist.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #ifndef __gludisplaylist_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/displaymode.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/displaymode.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/displaymode.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -28,7 +28,6 @@
  * Silicon Graphics, Inc.
  */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/displaymode.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
 */
 
 #ifndef __gludisplaymode_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/flist.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/flist.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/flist.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * flist.c++
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/flist.cc,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/flist.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/flist.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/flist.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * flist.h
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/flist.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #ifndef __gluflist_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/flistsorter.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/flistsorter.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/flistsorter.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * flistsorter.c++
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/flistsorter.cc,v 1.1 2001/03/17 00:25:40 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/flistsorter.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/flistsorter.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/flistsorter.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * flistsorter.h
  *
- * $Date: 2006/03/29 18:54:00 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/flistsorter.h,v 1.2 2006/03/29 18:54:00 brianp Exp $
  */
 
 #ifndef __gluflistsorter_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/gridline.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/gridline.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/gridline.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * gridline.h
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/gridline.h,v 1.1 2001/03/17 00:25:41 brianp Exp $
  */
 
 #ifndef __glugridline_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/gridtrimvertex.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/gridtrimvertex.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/gridtrimvertex.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * gridtrimvertex.h
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/gridtrimvertex.h,v 1.1 2001/03/17 00:25:41 brianp Exp $
  */
 
 #ifndef __glugridtrimvertex_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/gridvertex.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/gridvertex.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/gridvertex.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * gridvertex.h
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/gridvertex.h,v 1.1 2001/03/17 00:25:41 brianp Exp $
  */
 
 #ifndef __glugridvertex_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/hull.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/hull.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/hull.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * hull.c++
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/hull.cc,v 1.1 2001/03/17 00:25:41 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/hull.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/hull.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/hull.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * hull.h
  *
- * $Date: 2001/08/07 17:34:11 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/hull.h,v 1.2 2001/08/07 17:34:11 brianp Exp $
  */
 
 #ifndef __gluhull_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/intersect.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/intersect.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/intersect.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * intersect.c++
  *
- * $Date: 2005/10/28 13:09:23 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/intersect.cc,v 1.3 2005/10/28 13:09:23 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/jarcloc.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/jarcloc.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/jarcloc.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * jarcloc.h
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/jarcloc.h,v 1.1 2001/03/17 00:25:41 brianp Exp $
  */
 
 #ifndef __glujarcloc_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/knotvector.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/knotvector.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/knotvector.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * knotvector.h
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/knotvector.h,v 1.1 2001/03/17 00:25:41 brianp Exp $
  */
 
 #ifndef __gluknotvector_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/mapdesc.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/mapdesc.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/mapdesc.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * mapdesc.c++
  *
- * $Date: 2001/11/29 16:16:55 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/mapdesc.cc,v 1.2 2001/11/29 16:16:55 kschultz Exp $
  */
 
 #include <stdio.h>

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/mapdesc.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/mapdesc.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/mapdesc.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * mapdesc.h
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/mapdesc.h,v 1.1 2001/03/17 00:25:41 brianp Exp $
  */
 
 #ifndef __glumapdesc_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/mapdescv.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/mapdescv.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/mapdescv.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * mapdescv.c++
  *
- * $Date: 2004/05/12 15:29:36 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/mapdescv.cc,v 1.3 2004/05/12 15:29:36 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/maplist.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/maplist.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/maplist.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * maplist.c++
  *
- * $Date: 2005/10/28 13:09:23 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/maplist.cc,v 1.2 2005/10/28 13:09:23 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/maplist.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/maplist.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/maplist.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * maplist.h
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/maplist.h,v 1.1 2001/03/17 00:25:41 brianp Exp $
  */
 
 #ifndef __glumaplist_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/mesher.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/mesher.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/mesher.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * mesher.c++
  *
- * $Date: 2001/11/29 16:16:55 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/mesher.cc,v 1.3 2001/11/29 16:16:55 kschultz Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/mesher.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/mesher.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/mesher.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * mesher.h
  *
- * $Date: 2001/08/07 17:34:11 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/mesher.h,v 1.2 2001/08/07 17:34:11 brianp Exp $
  */
 
 #ifndef __glumesher_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/monoTriangulationBackend.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/monoTriangulationBackend.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/monoTriangulationBackend.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,10 +31,8 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2005/10/28 13:09:23 $ $Revision: 1.3 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/monoTriangulationBackend.cc,v 1.3 2005/10/28 13:09:23 brianp Exp $
 */
 
 #include "monoTriangulation.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/monotonizer.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/monotonizer.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/monotonizer.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * monotonizer.c++
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/monotonizer.cc,v 1.1 2001/03/17 00:25:41 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/monotonizer.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/monotonizer.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/monotonizer.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,7 +31,6 @@
 /*
  * monotonizer.h
  *
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/monotonizer.h,v 1.2 2006/04/03 22:23:52 ajax Exp $
  */
 
 #ifndef __glumonotonizer_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/myassert.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/myassert.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/myassert.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * myassert.h
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/myassert.h,v 1.1 2001/03/17 00:25:41 brianp Exp $
  */
 
 #ifndef __glumyassert_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/mycode.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/mycode.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/mycode.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,10 +31,8 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/mycode.cc,v 1.1 2001/03/17 00:25:41 brianp Exp $
 */
 
 #include "mymath.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/mystring.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/mystring.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/mystring.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * mystring.h
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/mystring.h,v 1.1 2001/03/17 00:25:41 brianp Exp $
  */
 
 #ifndef __glumystring_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/nurbsconsts.h
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/nurbsconsts.h	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/nurbsconsts.h	2009-04-08 18:56:38 UTC (rev 30041)
@@ -31,8 +31,6 @@
 /*
  * nurbsconsts.h
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/nurbsconsts.h,v 1.1 2001/03/17 00:25:41 brianp Exp $
  */
 
 #ifndef __glunurbsconsts_h_

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/nurbstess.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/nurbstess.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/nurbstess.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*
  * nurbstess.c++
  *
- * $Date: 2006/03/14 15:08:52 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/nurbstess.cc,v 1.2 2006/03/14 15:08:52 brianp Exp $
  */
 
 #include "glimports.h"

Modified: haiku/vendor/mesa/current/glu/libnurbs/internals/patch.cc
===================================================================
--- haiku/vendor/mesa/current/glu/libnurbs/internals/patch.cc	2009-04-08 18:23:16 UTC (rev 30040)
+++ haiku/vendor/mesa/current/glu/libnurbs/internals/patch.cc	2009-04-08 18:56:38 UTC (rev 30041)
@@ -35,8 +35,6 @@
 /*

[... truncated: 55032 lines follow ...]


From korli at mail.berlios.de  Wed Apr  8 21:19:54 2009
From: korli at mail.berlios.de (korli at BerliOS)
Date: Wed, 8 Apr 2009 21:19:54 +0200
Subject: [Haiku-commits] r30042 - haiku/vendor/mesa
Message-ID: <200904081919.n38JJsO8008245@sheep.berlios.de>

Author: korli
Date: 2009-04-08 21:19:54 +0200 (Wed, 08 Apr 2009)
New Revision: 30042
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30042&view=rev

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


Copied: haiku/vendor/mesa/7.4 (from rev 30041, haiku/vendor/mesa/current)



From jonas at kirilla.com  Wed Apr  8 21:55:51 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Wed, 08 Apr 2009 21:55:51 +0200 CEST
Subject: [Haiku-commits] r30018 - haiku/trunk/src/kits/tracker
In-Reply-To: <200904080823.n388N8Nc013822@sheep.berlios.de>
Message-ID: <5106575279-BeMail@kirilla>

axeld at mail.berlios.de wrote:
> Author: axeld
> Date: 2009-04-08 10:23:07 +0200 (Wed, 08 Apr 2009)
> New Revision: 30018
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30018&view=rev
 ...
> * The alert escape check was broken in several
> ways. First of all, the buttons can be NULL
> which suddenly crashed apps. Second of all,
> the check didn't even work as it was reversed.

*slaps forehead*

I should definitely have seen this.
(Too little coding in too long.)

I?m sorry. I will be more careful in the future.

/Jonas.



From superstippi at gmx.de  Wed Apr  8 22:02:28 2009
From: superstippi at gmx.de (=?utf-8?q?Stephan_A=C3=9Fmus?=)
Date: Wed, 08 Apr 2009 22:02:28 +0200
Subject: [Haiku-commits] r30041 - in haiku/vendor/mesa/current:
 glu/libnurbs/interface glu/libnurbs/internals glu/libnurbs/nurbtess
 glu/libtess glut headers/public src/drivers/common src/glapi src/main
 src/math src/ppc src/shader src/shader/grammar src/shader/slang
 src/shader/slang/library src/sparc src/swrast src/swrast_setup src/tnl
 src/vbo src/x86 src/x86/rtasm src/x86-64
In-Reply-To: <200904081856.n38Iuw0m005679@sheep.berlios.de>
References: <200904081856.n38Iuw0m005679@sheep.berlios.de>
Message-ID: <20090408220228.11399.3@bepc.1239202488.fake>

Hi,

> +  bezierPatchMesh *ret = (bezierPatchMesh*)malloc(
> +			sizeof(bezierPatchMesh));
> +  assert(ret);

I know this isn't your code, Korli, but  -- puh. How often do I have to see 
broken code to deal with allocations?

Best regards,
-Stephan
 


From marcusoverhagen at arcor.de  Wed Apr  8 22:12:54 2009
From: marcusoverhagen at arcor.de (Marcus Overhagen)
Date: Wed, 08 Apr 2009 22:12:54 +0200
Subject: [Haiku-commits] r30041 - in haiku/vendor/mesa/current:
 glu/libnurbs/interface glu/libnurbs/internals glu/libnurbs/nurbtess
 glu/libtess glut headers/public src/drivers/common src/glapi src/main
 src/math src/ppc src/shader src/shader/grammar src/shader/slang
 src/shader/slang/library src/sparc src/swrast src/swrast_setup src/tnl
 src/vbo src/x86 src/x86/rtasm src/x86-64
In-Reply-To: <20090408220228.11399.3@bepc.1239202488.fake>
References: <200904081856.n38Iuw0m005679@sheep.berlios.de>
	<20090408220228.11399.3@bepc.1239202488.fake>
Message-ID: <49DD0546.3010609@arcor.de>

Stephan A?mus schrieb:
> Hi,
> 
>> +  bezierPatchMesh *ret = (bezierPatchMesh*)malloc(
>> +			sizeof(bezierPatchMesh));
>> +  assert(ret);
> 
> I know this isn't your code, Korli, but  -- puh. How often do I have to see 
> broken code to deal with allocations?

Well, it isn't really broken. In a debug build, the assert is
triggered, in a release build, it crashes in the next line ;)

+  ret->bpatch_normal = NULL;

regards
Marcus


From superstippi at gmx.de  Wed Apr  8 22:14:14 2009
From: superstippi at gmx.de (=?iso-8859-1?q?Stephan_A=DFmus?=)
Date: Wed, 08 Apr 2009 22:14:14 +0200
Subject: [Haiku-commits] r30041 - in haiku/vendor/mesa/current:
 glu/libnurbs/interface glu/libnurbs/internals glu/libnurbs/nurbtess
 glu/libtess glut headers/public src/drivers/common src/glapi src/main
 src/math src/ppc src/shader src/shader/grammar src/shader/slang
 src/shader/slang/library src/sparc src/swrast src/swrast_setup src/tnl
 src/vbo src/x86 src/x86/rtasm src/x86-64
In-Reply-To: <49DD0546.3010609@arcor.de>
References: <200904081856.n38Iuw0m005679@sheep.berlios.de>
	<20090408220228.11399.3@bepc.1239202488.fake>
	<49DD0546.3010609@arcor.de>
Message-ID: <20090408221414.11885.5@bepc.1239202488.fake>


On 2009-04-08 at 22:12:59 [+0200], Marcus Overhagen 
<marcusoverhagen at arcor.de> wrote:
> Stephan A?mus schrieb:
> >> +  bezierPatchMesh *ret = (bezierPatchMesh*)malloc(
> >> +            sizeof(bezierPatchMesh));
> >> +  assert(ret);
> > 
> > I know this isn't your code, Korli, but  -- puh. How often do I have to 
> > see broken code to deal with allocations?
> 
> Well, it isn't really broken. In a debug build, the assert is triggered, 
> in a release build, it crashes in the next line ;)
> 
> +  ret->bpatch_normal = NULL;


Just what I meant... ;-)

Best regards,
-Stephan


From korli at mail.berlios.de  Wed Apr  8 22:18:28 2009
From: korli at mail.berlios.de (korli at BerliOS)
Date: Wed, 8 Apr 2009 22:18:28 +0200
Subject: [Haiku-commits] r30043 - in haiku/trunk: headers/os/opengl/GL
	src/kits/opengl/glu/libnurbs/interface
	src/kits/opengl/glu/libnurbs/internals
	src/kits/opengl/glu/libnurbs/nurbtess
	src/kits/opengl/glu/libtess src/kits/opengl/glut
	src/kits/opengl/mesa src/kits/opengl/mesa/drivers/common
	src/kits/opengl/mesa/glapi src/kits/opengl/mesa/main
	src/kits/opengl/mesa/math src/kits/opengl/mesa/ppc
	src/kits/opengl/mesa/shader src/kits/opengl/mesa/shader/grammar
	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/swrast_setup src/kits/opengl/mesa/tnl
	src/kits/opengl/mesa/vbo src/kits/opengl/mesa/x86
	src/kits/opengl/mesa/x86/rtasm src/kits/opengl/mesa/x86-64
Message-ID: <200904082018.n38KISi9014958@sheep.berlios.de>

Author: korli
Date: 2009-04-08 22:18:04 +0200 (Wed, 08 Apr 2009)
New Revision: 30043
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30043&view=rev

Added:
   haiku/trunk/src/kits/opengl/mesa/glapi/glapi_getproc.c
   haiku/trunk/src/kits/opengl/mesa/main/api_exec.c
   haiku/trunk/src/kits/opengl/mesa/main/api_exec.h
   haiku/trunk/src/kits/opengl/mesa/main/clear.c
   haiku/trunk/src/kits/opengl/mesa/main/clear.h
   haiku/trunk/src/kits/opengl/mesa/main/dlopen.c
   haiku/trunk/src/kits/opengl/mesa/main/dlopen.h
   haiku/trunk/src/kits/opengl/mesa/main/ffvertex_prog.c
   haiku/trunk/src/kits/opengl/mesa/main/ffvertex_prog.h
   haiku/trunk/src/kits/opengl/mesa/main/mfeatures.h
   haiku/trunk/src/kits/opengl/mesa/main/multisample.c
   haiku/trunk/src/kits/opengl/mesa/main/multisample.h
   haiku/trunk/src/kits/opengl/mesa/main/pixelstore.c
   haiku/trunk/src/kits/opengl/mesa/main/pixelstore.h
   haiku/trunk/src/kits/opengl/mesa/main/readpix.c
   haiku/trunk/src/kits/opengl/mesa/main/readpix.h
   haiku/trunk/src/kits/opengl/mesa/main/scissor.c
   haiku/trunk/src/kits/opengl/mesa/main/scissor.h
   haiku/trunk/src/kits/opengl/mesa/main/texenv.c
   haiku/trunk/src/kits/opengl/mesa/main/texenv.h
   haiku/trunk/src/kits/opengl/mesa/main/texgen.c
   haiku/trunk/src/kits/opengl/mesa/main/texgen.h
   haiku/trunk/src/kits/opengl/mesa/main/texparam.c
   haiku/trunk/src/kits/opengl/mesa/main/texparam.h
   haiku/trunk/src/kits/opengl/mesa/shader/prog_cache.c
   haiku/trunk/src/kits/opengl/mesa/shader/prog_cache.h
   haiku/trunk/src/kits/opengl/mesa/shader/prog_noise.c
   haiku/trunk/src/kits/opengl/mesa/shader/prog_noise.h
   haiku/trunk/src/kits/opengl/mesa/tnl/t_rasterpos.c
Removed:
   haiku/trunk/src/kits/opengl/mesa/main/api_eval.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_library_noise.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_library_noise.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_drawpix.h
Modified:
   haiku/trunk/headers/os/opengl/GL/gl.h
   haiku/trunk/headers/os/opengl/GL/glext.h
   haiku/trunk/headers/os/opengl/GL/glu.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/bezierEval.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/bezierPatch.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/bezierPatch.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/bezierPatchMesh.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/bezierPatchMesh.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glcurveval.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glimports.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glinterface.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/glrenderer.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/incurveeval.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/insurfeval.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/mystdio.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/interface/mystdlib.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/arc.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/arcsorter.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/arcsorter.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/arctess.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/backend.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/backend.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/basiccrveval.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/basicsurfeval.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/bezierarc.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/bin.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/bin.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/bufpool.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/bufpool.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/cachingeval.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/cachingeval.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/ccw.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/coveandtiler.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/curve.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/curve.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/curvelist.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/curvelist.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/curvesub.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/dataTransform.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/dataTransform.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/defines.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/displaylist.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/displaylist.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/displaymode.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/flist.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/flist.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/flistsorter.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/flistsorter.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/gridline.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/gridtrimvertex.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/gridvertex.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/hull.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/hull.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/intersect.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/jarcloc.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/knotvector.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/mapdesc.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/mapdesc.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/mapdescv.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/maplist.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/maplist.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/mesher.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/mesher.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/monoTriangulationBackend.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/monotonizer.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/monotonizer.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/myassert.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/mycode.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/mystring.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/nurbsconsts.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/nurbstess.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/patch.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/patch.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/patchlist.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/patchlist.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/pwlarc.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/quilt.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/quilt.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/reader.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/reader.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/renderhints.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/renderhints.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/simplemath.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/slicer.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/slicer.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/sorter.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/sorter.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/splitarcs.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/subdivider.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/tobezier.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/trimline.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/trimline.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/trimregion.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/trimregion.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/trimvertex.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/trimvertpool.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/trimvertpool.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/types.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/uarray.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/uarray.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/varray.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/internals/varray.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/definitions.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/directedLine.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/glimports.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/gridWrap.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/gridWrap.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/monoChain.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/monoChain.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/monoPolyPart.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/monoTriangulation.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/monoTriangulation.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/mystdio.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/mystdlib.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/partitionX.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/partitionX.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/partitionY.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/partitionY.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/polyDBG.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/polyUtil.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/polyUtil.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/primitiveStream.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/primitiveStream.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/quicksort.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/quicksort.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/rectBlock.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/rectBlock.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/sampleComp.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/sampleComp.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/sampleCompBot.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/sampleCompBot.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/sampleCompRight.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/sampleCompRight.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/sampleCompTop.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/sampleCompTop.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/sampleMonoPoly.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/sampleMonoPoly.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/sampledLine.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/sampledLine.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/searchTree.cc
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/searchTree.h
   haiku/trunk/src/kits/opengl/glu/libnurbs/nurbtess/zlassert.h
   haiku/trunk/src/kits/opengl/glu/libtess/README
   haiku/trunk/src/kits/opengl/glu/libtess/alg-outline
   haiku/trunk/src/kits/opengl/glu/libtess/dict-list.h
   haiku/trunk/src/kits/opengl/glu/libtess/dict.c
   haiku/trunk/src/kits/opengl/glu/libtess/dict.h
   haiku/trunk/src/kits/opengl/glu/libtess/geom.c
   haiku/trunk/src/kits/opengl/glu/libtess/memalloc.c
   haiku/trunk/src/kits/opengl/glu/libtess/memalloc.h
   haiku/trunk/src/kits/opengl/glu/libtess/mesh.c
   haiku/trunk/src/kits/opengl/glu/libtess/mesh.h
   haiku/trunk/src/kits/opengl/glu/libtess/normal.h
   haiku/trunk/src/kits/opengl/glu/libtess/priorityq-heap.c
   haiku/trunk/src/kits/opengl/glu/libtess/priorityq-heap.h
   haiku/trunk/src/kits/opengl/glu/libtess/priorityq-sort.h
   haiku/trunk/src/kits/opengl/glu/libtess/priorityq.c
   haiku/trunk/src/kits/opengl/glu/libtess/priorityq.h
   haiku/trunk/src/kits/opengl/glu/libtess/render.c
   haiku/trunk/src/kits/opengl/glu/libtess/render.h
   haiku/trunk/src/kits/opengl/glu/libtess/sweep.h
   haiku/trunk/src/kits/opengl/glu/libtess/tess.h
   haiku/trunk/src/kits/opengl/glu/libtess/tessmono.c
   haiku/trunk/src/kits/opengl/glu/libtess/tessmono.h
   haiku/trunk/src/kits/opengl/glut/beos_x11.cpp
   haiku/trunk/src/kits/opengl/mesa/Jamfile
   haiku/trunk/src/kits/opengl/mesa/drivers/common/driverfuncs.c
   haiku/trunk/src/kits/opengl/mesa/glapi/dispatch.h
   haiku/trunk/src/kits/opengl/mesa/glapi/glapi.c
   haiku/trunk/src/kits/opengl/mesa/glapi/glapi.h
   haiku/trunk/src/kits/opengl/mesa/glapi/glapitable.h
   haiku/trunk/src/kits/opengl/mesa/glapi/glthread.h
   haiku/trunk/src/kits/opengl/mesa/main/api_arrayelt.c
   haiku/trunk/src/kits/opengl/mesa/main/api_loopback.c
   haiku/trunk/src/kits/opengl/mesa/main/api_noop.c
   haiku/trunk/src/kits/opengl/mesa/main/api_validate.c
   haiku/trunk/src/kits/opengl/mesa/main/arrayobj.c
   haiku/trunk/src/kits/opengl/mesa/main/attrib.c
   haiku/trunk/src/kits/opengl/mesa/main/blend.c
   haiku/trunk/src/kits/opengl/mesa/main/bufferobj.c
   haiku/trunk/src/kits/opengl/mesa/main/buffers.c
   haiku/trunk/src/kits/opengl/mesa/main/buffers.h
   haiku/trunk/src/kits/opengl/mesa/main/colormac.h
   haiku/trunk/src/kits/opengl/mesa/main/colortab.c
   haiku/trunk/src/kits/opengl/mesa/main/config.h
   haiku/trunk/src/kits/opengl/mesa/main/context.c
   haiku/trunk/src/kits/opengl/mesa/main/context.h
   haiku/trunk/src/kits/opengl/mesa/main/dd.h
   haiku/trunk/src/kits/opengl/mesa/main/debug.c
   haiku/trunk/src/kits/opengl/mesa/main/depthstencil.c
   haiku/trunk/src/kits/opengl/mesa/main/dispatch.c
   haiku/trunk/src/kits/opengl/mesa/main/dlist.c
   haiku/trunk/src/kits/opengl/mesa/main/drawpix.c
   haiku/trunk/src/kits/opengl/mesa/main/drawpix.h
   haiku/trunk/src/kits/opengl/mesa/main/enable.c
   haiku/trunk/src/kits/opengl/mesa/main/enums.c
   haiku/trunk/src/kits/opengl/mesa/main/execmem.c
   haiku/trunk/src/kits/opengl/mesa/main/extensions.c
   haiku/trunk/src/kits/opengl/mesa/main/fbobject.c
   haiku/trunk/src/kits/opengl/mesa/main/framebuffer.c
   haiku/trunk/src/kits/opengl/mesa/main/framebuffer.h
   haiku/trunk/src/kits/opengl/mesa/main/get.c
   haiku/trunk/src/kits/opengl/mesa/main/getstring.c
   haiku/trunk/src/kits/opengl/mesa/main/glheader.h
   haiku/trunk/src/kits/opengl/mesa/main/hash.c
   haiku/trunk/src/kits/opengl/mesa/main/histogram.c
   haiku/trunk/src/kits/opengl/mesa/main/histogram.h
   haiku/trunk/src/kits/opengl/mesa/main/image.c
   haiku/trunk/src/kits/opengl/mesa/main/image.h
   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/light.c
   haiku/trunk/src/kits/opengl/mesa/main/macros.h
   haiku/trunk/src/kits/opengl/mesa/main/mipmap.c
   haiku/trunk/src/kits/opengl/mesa/main/mipmap.h
   haiku/trunk/src/kits/opengl/mesa/main/mm.c
   haiku/trunk/src/kits/opengl/mesa/main/mm.h
   haiku/trunk/src/kits/opengl/mesa/main/mtypes.h
   haiku/trunk/src/kits/opengl/mesa/main/pixel.c
   haiku/trunk/src/kits/opengl/mesa/main/pixel.h
   haiku/trunk/src/kits/opengl/mesa/main/points.c
   haiku/trunk/src/kits/opengl/mesa/main/points.h
   haiku/trunk/src/kits/opengl/mesa/main/queryobj.c
   haiku/trunk/src/kits/opengl/mesa/main/queryobj.h
   haiku/trunk/src/kits/opengl/mesa/main/rastpos.c
   haiku/trunk/src/kits/opengl/mesa/main/shaders.c
   haiku/trunk/src/kits/opengl/mesa/main/state.c
   haiku/trunk/src/kits/opengl/mesa/main/state.h
   haiku/trunk/src/kits/opengl/mesa/main/stencil.c
   haiku/trunk/src/kits/opengl/mesa/main/texcompress.c
   haiku/trunk/src/kits/opengl/mesa/main/texcompress_s3tc.c
   haiku/trunk/src/kits/opengl/mesa/main/texenvprogram.c
   haiku/trunk/src/kits/opengl/mesa/main/texenvprogram.h
   haiku/trunk/src/kits/opengl/mesa/main/texformat.c
   haiku/trunk/src/kits/opengl/mesa/main/texformat.h
   haiku/trunk/src/kits/opengl/mesa/main/texformat_tmp.h
   haiku/trunk/src/kits/opengl/mesa/main/teximage.c
   haiku/trunk/src/kits/opengl/mesa/main/teximage.h
   haiku/trunk/src/kits/opengl/mesa/main/texobj.c
   haiku/trunk/src/kits/opengl/mesa/main/texrender.c
   haiku/trunk/src/kits/opengl/mesa/main/texstate.c
   haiku/trunk/src/kits/opengl/mesa/main/texstate.h
   haiku/trunk/src/kits/opengl/mesa/main/texstore.c
   haiku/trunk/src/kits/opengl/mesa/main/texstore.h
   haiku/trunk/src/kits/opengl/mesa/main/varray.c
   haiku/trunk/src/kits/opengl/mesa/main/varray.h
   haiku/trunk/src/kits/opengl/mesa/main/version.h
   haiku/trunk/src/kits/opengl/mesa/math/m_debug_clip.c
   haiku/trunk/src/kits/opengl/mesa/math/m_debug_norm.c
   haiku/trunk/src/kits/opengl/mesa/math/m_debug_util.h
   haiku/trunk/src/kits/opengl/mesa/math/m_debug_xform.c
   haiku/trunk/src/kits/opengl/mesa/math/m_matrix.c
   haiku/trunk/src/kits/opengl/mesa/math/m_matrix.h
   haiku/trunk/src/kits/opengl/mesa/math/m_translate.c
   haiku/trunk/src/kits/opengl/mesa/math/m_vector.c
   haiku/trunk/src/kits/opengl/mesa/math/m_vector.h
   haiku/trunk/src/kits/opengl/mesa/math/m_xform.h
   haiku/trunk/src/kits/opengl/mesa/ppc/common_ppc.c
   haiku/trunk/src/kits/opengl/mesa/ppc/common_ppc_features.h
   haiku/trunk/src/kits/opengl/mesa/shader/arbprogparse.c
   haiku/trunk/src/kits/opengl/mesa/shader/arbprogparse.h
   haiku/trunk/src/kits/opengl/mesa/shader/arbprogram.c
   haiku/trunk/src/kits/opengl/mesa/shader/atifragshader.c
   haiku/trunk/src/kits/opengl/mesa/shader/grammar/grammar_crt.c
   haiku/trunk/src/kits/opengl/mesa/shader/grammar/grammar_mesa.h
   haiku/trunk/src/kits/opengl/mesa/shader/nvfragparse.c
   haiku/trunk/src/kits/opengl/mesa/shader/nvprogram.c
   haiku/trunk/src/kits/opengl/mesa/shader/nvvertparse.c
   haiku/trunk/src/kits/opengl/mesa/shader/prog_debug.c
   haiku/trunk/src/kits/opengl/mesa/shader/prog_execute.c
   haiku/trunk/src/kits/opengl/mesa/shader/prog_execute.h
   haiku/trunk/src/kits/opengl/mesa/shader/prog_instruction.c
   haiku/trunk/src/kits/opengl/mesa/shader/prog_instruction.h
   haiku/trunk/src/kits/opengl/mesa/shader/prog_parameter.c
   haiku/trunk/src/kits/opengl/mesa/shader/prog_parameter.h
   haiku/trunk/src/kits/opengl/mesa/shader/prog_print.c
   haiku/trunk/src/kits/opengl/mesa/shader/prog_print.h
   haiku/trunk/src/kits/opengl/mesa/shader/prog_statevars.c
   haiku/trunk/src/kits/opengl/mesa/shader/prog_statevars.h
   haiku/trunk/src/kits/opengl/mesa/shader/prog_uniform.c
   haiku/trunk/src/kits/opengl/mesa/shader/prog_uniform.h
   haiku/trunk/src/kits/opengl/mesa/shader/program.c
   haiku/trunk/src/kits/opengl/mesa/shader/program.h
   haiku/trunk/src/kits/opengl/mesa/shader/shader_api.c
   haiku/trunk/src/kits/opengl/mesa/shader/shader_api.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/library/slang_120_core_gc.h
   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
   haiku/trunk/src/kits/opengl/mesa/shader/slang/library/slang_common_builtin.gc
   haiku/trunk/src/kits/opengl/mesa/shader/slang/library/slang_common_builtin_gc.h
   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/library/slang_fragment_builtin_gc.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/library/slang_pp_directives.syn
   haiku/trunk/src/kits/opengl/mesa/shader/slang/library/slang_pp_directives_syn.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/library/slang_shader.syn
   haiku/trunk/src/kits/opengl/mesa/shader/slang/library/slang_shader_syn.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/library/slang_vertex_builtin.gc
   haiku/trunk/src/kits/opengl/mesa/shader/slang/library/slang_vertex_builtin_gc.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_builtin.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_builtin.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_codegen.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_codegen.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_compile.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_compile.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_compile_function.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_compile_function.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_compile_operation.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_compile_operation.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_compile_variable.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_compile_variable.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_emit.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_emit.h
   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/shader/slang/slang_log.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_mem.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_preprocess.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_preprocess.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_print.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_simplify.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_storage.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_typeinfo.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_typeinfo.h
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_vartable.c
   haiku/trunk/src/kits/opengl/mesa/shader/slang/slang_vartable.h
   haiku/trunk/src/kits/opengl/mesa/sparc/norm.S
   haiku/trunk/src/kits/opengl/mesa/sparc/sparc.c
   haiku/trunk/src/kits/opengl/mesa/sparc/sparc.h
   haiku/trunk/src/kits/opengl/mesa/sparc/xform.S
   haiku/trunk/src/kits/opengl/mesa/swrast/s_aaline.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_aaline.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_aalinetemp.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_aatriangle.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_aatriangle.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_accum.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_accum.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_alpha.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_alpha.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_atifragshader.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_bitmap.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_blend.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_blend.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_blit.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_buffers.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_context.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_copypix.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_depth.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_depth.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_drawpix.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_feedback.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_feedback.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_fog.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_fog.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_fragprog.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_imaging.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_lines.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_lines.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_logic.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_logic.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_masking.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_masking.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_points.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_points.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_readpix.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_span.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_span.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_spantemp.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_stencil.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_stencil.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_texcombine.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_texcombine.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_texfilter.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_texfilter.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_texstore.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_triangle.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_triangle.h
   haiku/trunk/src/kits/opengl/mesa/swrast/s_zoom.c
   haiku/trunk/src/kits/opengl/mesa/swrast/s_zoom.h
   haiku/trunk/src/kits/opengl/mesa/swrast_setup/ss_context.c
   haiku/trunk/src/kits/opengl/mesa/swrast_setup/ss_context.h
   haiku/trunk/src/kits/opengl/mesa/swrast_setup/ss_triangle.c
   haiku/trunk/src/kits/opengl/mesa/swrast_setup/ss_triangle.h
   haiku/trunk/src/kits/opengl/mesa/swrast_setup/ss_vb.h
   haiku/trunk/src/kits/opengl/mesa/tnl/t_context.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_context.h
   haiku/trunk/src/kits/opengl/mesa/tnl/t_draw.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_pipeline.h
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vb_cull.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vb_fog.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vb_light.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vb_normals.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vb_points.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vb_render.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vb_texgen.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vb_texmat.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vb_vertex.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vertex.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vertex.h
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vertex_generic.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vertex_sse.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vp_build.c
   haiku/trunk/src/kits/opengl/mesa/tnl/t_vp_build.h
   haiku/trunk/src/kits/opengl/mesa/tnl/tnl.h
   haiku/trunk/src/kits/opengl/mesa/vbo/vbo.h
   haiku/trunk/src/kits/opengl/mesa/vbo/vbo_context.c
   haiku/trunk/src/kits/opengl/mesa/vbo/vbo_context.h
   haiku/trunk/src/kits/opengl/mesa/vbo/vbo_exec.c
   haiku/trunk/src/kits/opengl/mesa/vbo/vbo_exec_api.c
   haiku/trunk/src/kits/opengl/mesa/vbo/vbo_exec_array.c
   haiku/trunk/src/kits/opengl/mesa/vbo/vbo_exec_draw.c
   haiku/trunk/src/kits/opengl/mesa/vbo/vbo_exec_eval.c
   haiku/trunk/src/kits/opengl/mesa/vbo/vbo_save_draw.c
   haiku/trunk/src/kits/opengl/mesa/vbo/vbo_split_inplace.c
   haiku/trunk/src/kits/opengl/mesa/x86-64/x86-64.c
   haiku/trunk/src/kits/opengl/mesa/x86-64/x86-64.h
   haiku/trunk/src/kits/opengl/mesa/x86-64/xform4.S
   haiku/trunk/src/kits/opengl/mesa/x86/3dnow.c
   haiku/trunk/src/kits/opengl/mesa/x86/3dnow.h
   haiku/trunk/src/kits/opengl/mesa/x86/3dnow_normal.S
   haiku/trunk/src/kits/opengl/mesa/x86/3dnow_xform1.S
   haiku/trunk/src/kits/opengl/mesa/x86/3dnow_xform2.S
   haiku/trunk/src/kits/opengl/mesa/x86/3dnow_xform3.S
   haiku/trunk/src/kits/opengl/mesa/x86/3dnow_xform4.S
   haiku/trunk/src/kits/opengl/mesa/x86/clip_args.h
   haiku/trunk/src/kits/opengl/mesa/x86/common_x86.c
   haiku/trunk/src/kits/opengl/mesa/x86/common_x86_asm.S
   haiku/trunk/src/kits/opengl/mesa/x86/common_x86_asm.h
   haiku/trunk/src/kits/opengl/mesa/x86/common_x86_features.h
   haiku/trunk/src/kits/opengl/mesa/x86/common_x86_macros.h
   haiku/trunk/src/kits/opengl/mesa/x86/gen_matypes.c
   haiku/trunk/src/kits/opengl/mesa/x86/glapi_x86.S
   haiku/trunk/src/kits/opengl/mesa/x86/mmx_blend.S
   haiku/trunk/src/kits/opengl/mesa/x86/norm_args.h
   haiku/trunk/src/kits/opengl/mesa/x86/rtasm/x86sse.c
   haiku/trunk/src/kits/opengl/mesa/x86/sse.c
   haiku/trunk/src/kits/opengl/mesa/x86/sse.h
   haiku/trunk/src/kits/opengl/mesa/x86/sse_normal.S
   haiku/trunk/src/kits/opengl/mesa/x86/sse_xform1.S
   haiku/trunk/src/kits/opengl/mesa/x86/sse_xform2.S
   haiku/trunk/src/kits/opengl/mesa/x86/sse_xform3.S
   haiku/trunk/src/kits/opengl/mesa/x86/sse_xform4.S
   haiku/trunk/src/kits/opengl/mesa/x86/x86.c
   haiku/trunk/src/kits/opengl/mesa/x86/x86.h
   haiku/trunk/src/kits/opengl/mesa/x86/x86_cliptest.S
   haiku/trunk/src/kits/opengl/mesa/x86/x86_xform2.S
   haiku/trunk/src/kits/opengl/mesa/x86/x86_xform3.S
   haiku/trunk/src/kits/opengl/mesa/x86/x86_xform4.S
   haiku/trunk/src/kits/opengl/mesa/x86/xform_args.h
Log:
updated mesa to 7.4. It was difficult to merge the glu part (svn conflicts on keywords deletion it seems), so it was copied.


Modified: haiku/trunk/headers/os/opengl/GL/gl.h
===================================================================
--- haiku/trunk/headers/os/opengl/GL/gl.h	2009-04-08 19:19:54 UTC (rev 30042)
+++ haiku/trunk/headers/os/opengl/GL/gl.h	2009-04-08 20:18:04 UTC (rev 30043)
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.1
+ * Version:  7.4
  *
  * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *

Modified: haiku/trunk/headers/os/opengl/GL/glext.h
===================================================================
--- haiku/trunk/headers/os/opengl/GL/glext.h	2009-04-08 19:19:54 UTC (rev 30042)
+++ haiku/trunk/headers/os/opengl/GL/glext.h	2009-04-08 20:18:04 UTC (rev 30043)
@@ -46,9 +46,9 @@
 /*************************************************************/
 
 /* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated 2008/08/10 */
+/* glext.h last updated 2009/03/19 */
 /* Current version at http://www.opengl.org/registry/ */
-#define GL_GLEXT_VERSION 41
+#define GL_GLEXT_VERSION 48
 
 #ifndef GL_VERSION_1_2
 #define GL_UNSIGNED_BYTE_3_3_2            0x8032
@@ -588,6 +588,132 @@
 #define GL_QUERY_NO_WAIT                  0x8E14
 #define GL_QUERY_BY_REGION_WAIT           0x8E15
 #define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
+/* Reuse tokens from ARB_depth_buffer_float */
+/* reuse GL_DEPTH_COMPONENT32F */
+/* reuse GL_DEPTH32F_STENCIL8 */
+/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
+/* Reuse tokens from ARB_framebuffer_object */
+/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_DEFAULT */
+/* reuse GL_FRAMEBUFFER_UNDEFINED */
+/* reuse GL_DEPTH_STENCIL_ATTACHMENT */
+/* reuse GL_INDEX */
+/* reuse GL_MAX_RENDERBUFFER_SIZE */
+/* reuse GL_DEPTH_STENCIL */
+/* reuse GL_UNSIGNED_INT_24_8 */
+/* reuse GL_DEPTH24_STENCIL8 */
+/* reuse GL_TEXTURE_STENCIL_SIZE */
+/* reuse GL_TEXTURE_RED_TYPE */
+/* reuse GL_TEXTURE_GREEN_TYPE */
+/* reuse GL_TEXTURE_BLUE_TYPE */
+/* reuse GL_TEXTURE_ALPHA_TYPE */
+/* reuse GL_TEXTURE_LUMINANCE_TYPE */
+/* reuse GL_TEXTURE_INTENSITY_TYPE */
+/* reuse GL_TEXTURE_DEPTH_TYPE */
+/* reuse GL_UNSIGNED_NORMALIZED */
+/* reuse GL_FRAMEBUFFER_BINDING */
+/* reuse GL_DRAW_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_BINDING */
+/* reuse GL_READ_FRAMEBUFFER */
+/* reuse GL_DRAW_FRAMEBUFFER */
+/* reuse GL_READ_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_SAMPLES */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+/* reuse GL_FRAMEBUFFER_COMPLETE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+/* reuse GL_FRAMEBUFFER_UNSUPPORTED */
+/* reuse GL_MAX_COLOR_ATTACHMENTS */
+/* reuse GL_COLOR_ATTACHMENT0 */
+/* reuse GL_COLOR_ATTACHMENT1 */
+/* reuse GL_COLOR_ATTACHMENT2 */
+/* reuse GL_COLOR_ATTACHMENT3 */
+/* reuse GL_COLOR_ATTACHMENT4 */
+/* reuse GL_COLOR_ATTACHMENT5 */
+/* reuse GL_COLOR_ATTACHMENT6 */
+/* reuse GL_COLOR_ATTACHMENT7 */
+/* reuse GL_COLOR_ATTACHMENT8 */
+/* reuse GL_COLOR_ATTACHMENT9 */
+/* reuse GL_COLOR_ATTACHMENT10 */
+/* reuse GL_COLOR_ATTACHMENT11 */
+/* reuse GL_COLOR_ATTACHMENT12 */
+/* reuse GL_COLOR_ATTACHMENT13 */
+/* reuse GL_COLOR_ATTACHMENT14 */
+/* reuse GL_COLOR_ATTACHMENT15 */
+/* reuse GL_DEPTH_ATTACHMENT */
+/* reuse GL_STENCIL_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER */
+/* reuse GL_RENDERBUFFER */
+/* reuse GL_RENDERBUFFER_WIDTH */
+/* reuse GL_RENDERBUFFER_HEIGHT */
+/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */
+/* reuse GL_STENCIL_INDEX1 */
+/* reuse GL_STENCIL_INDEX4 */
+/* reuse GL_STENCIL_INDEX8 */
+/* reuse GL_STENCIL_INDEX16 */
+/* reuse GL_RENDERBUFFER_RED_SIZE */
+/* reuse GL_RENDERBUFFER_GREEN_SIZE */
+/* reuse GL_RENDERBUFFER_BLUE_SIZE */
+/* reuse GL_RENDERBUFFER_ALPHA_SIZE */
+/* reuse GL_RENDERBUFFER_DEPTH_SIZE */
+/* reuse GL_RENDERBUFFER_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+/* reuse GL_MAX_SAMPLES */
+/* Reuse tokens from ARB_framebuffer_sRGB */
+/* reuse GL_FRAMEBUFFER_SRGB */
+/* Reuse tokens from ARB_half_float_vertex */
+/* reuse GL_HALF_FLOAT */
+/* Reuse tokens from ARB_map_buffer_range */
+/* reuse GL_MAP_READ_BIT */
+/* reuse GL_MAP_WRITE_BIT */
+/* reuse GL_MAP_INVALIDATE_RANGE_BIT */
+/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */
+/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */
+/* reuse GL_MAP_UNSYNCHRONIZED_BIT */
+/* Reuse tokens from ARB_texture_compression_rgtc */
+/* reuse GL_COMPRESSED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_RG_RGTC2 */
+/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */
+/* Reuse tokens from ARB_texture_rg */
+/* reuse GL_RG */
+/* reuse GL_RG_INTEGER */
+/* reuse GL_R8 */
+/* reuse GL_R16 */
+/* reuse GL_RG8 */
+/* reuse GL_RG16 */
+/* reuse GL_R16F */
+/* reuse GL_R32F */
+/* reuse GL_RG16F */
+/* reuse GL_RG32F */
+/* reuse GL_R8I */
+/* reuse GL_R8UI */
+/* reuse GL_R16I */
+/* reuse GL_R16UI */
+/* reuse GL_R32I */
+/* reuse GL_R32UI */
+/* reuse GL_RG8I */
+/* reuse GL_RG8UI */
+/* reuse GL_RG16I */
+/* reuse GL_RG16UI */
+/* reuse GL_RG32I */
+/* reuse GL_RG32UI */
+/* Reuse tokens from ARB_vertex_array_object */
+/* reuse GL_VERTEX_ARRAY_BINDING */
 #endif
 
 #ifndef GL_ARB_multitexture
@@ -1192,6 +1318,8 @@
 #define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
 #define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
 #define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
+/* reuse GL_MAX_VARYING_COMPONENTS */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
 #endif
 
 #ifndef GL_ARB_half_float_vertex
@@ -3696,7 +3824,81 @@
 #define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76
 #endif
 
+#ifndef GL_EXT_direct_state_access
+#define GL_PROGRAM_MATRIX_EXT             0x8E2D
+#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT   0x8E2E
+#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F
+#endif
 
+#ifndef GL_EXT_vertex_array_bgra
+/* reuse GL_BGRA */
+#endif
+
+#ifndef GL_EXT_texture_swizzle
+#define GL_TEXTURE_SWIZZLE_R_EXT          0x8E42
+#define GL_TEXTURE_SWIZZLE_G_EXT          0x8E43
+#define GL_TEXTURE_SWIZZLE_B_EXT          0x8E44
+#define GL_TEXTURE_SWIZZLE_A_EXT          0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA_EXT       0x8E46
+#endif
+
+#ifndef GL_NV_explicit_multisample
+#define GL_SAMPLE_POSITION_NV             0x8E50
+#define GL_SAMPLE_MASK_NV                 0x8E51
+#define GL_SAMPLE_MASK_VALUE_NV           0x8E52
+#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53
+#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54
+#define GL_MAX_SAMPLE_MASK_WORDS_NV       0x8E59
+#define GL_TEXTURE_RENDERBUFFER_NV        0x8E55
+#define GL_SAMPLER_RENDERBUFFER_NV        0x8E56
+#define GL_INT_SAMPLER_RENDERBUFFER_NV    0x8E57
+#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58
+#endif
+
+#ifndef GL_NV_transform_feedback2
+#define GL_TRANSFORM_FEEDBACK_NV          0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING_NV  0x8E25
+#endif
+
+#ifndef GL_ATI_meminfo
+#define GL_VBO_FREE_MEMORY_ATI            0x87FB
+#define GL_TEXTURE_FREE_MEMORY_ATI        0x87FC
+#define GL_RENDERBUFFER_FREE_MEMORY_ATI   0x87FD
+#endif
+
+#ifndef GL_AMD_performance_monitor
+#define GL_COUNTER_TYPE_AMD               0x8BC0
+#define GL_COUNTER_RANGE_AMD              0x8BC1
+#define GL_UNSIGNED_INT64_AMD             0x8BC2
+#define GL_PERCENTAGE_AMD                 0x8BC3
+#define GL_PERFMON_RESULT_AVAILABLE_AMD   0x8BC4
+#define GL_PERFMON_RESULT_SIZE_AMD        0x8BC5
+#define GL_PERFMON_RESULT_AMD             0x8BC6
+#endif
+
+#ifndef GL_AMD_texture_texture4
+#endif
+
+#ifndef GL_AMD_vertex_shader_tesselator
+#define GL_SAMPLER_BUFFER_AMD             0x9001
+#define GL_INT_SAMPLER_BUFFER_AMD         0x9002
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003
+#define GL_TESSELLATION_MODE_AMD          0x9004
+#define GL_TESSELLATION_FACTOR_AMD        0x9005
+#define GL_DISCRETE_AMD                   0x9006
+#define GL_CONTINUOUS_AMD                 0x9007
+#endif
+
+#ifndef GL_EXT_provoking_vertex
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION_EXT    0x8E4D
+#define GL_LAST_VERTEX_CONVENTION_EXT     0x8E4E
+#define GL_PROVOKING_VERTEX_EXT           0x8E4F
+#endif
+
+
 /*************************************************************/
 
 #include <stddef.h>
@@ -4306,6 +4508,128 @@
 
 #ifndef GL_VERSION_3_0
 #define GL_VERSION_3_0 1
+/* OpenGL 3.0 also reuses entry points from these extensions: */
+/* ARB_framebuffer_object */
+/* ARB_map_buffer_range */
+/* ARB_vertex_array_object */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaski (GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
+GLAPI void APIENTRY glGetBooleani_v (GLenum, GLuint, GLboolean *);
+GLAPI void APIENTRY glGetIntegeri_v (GLenum, GLuint, GLint *);
+GLAPI void APIENTRY glEnablei (GLenum, GLuint);
+GLAPI void APIENTRY glDisablei (GLenum, GLuint);
+GLAPI GLboolean APIENTRY glIsEnabledi (GLenum, GLuint);
+GLAPI void APIENTRY glBeginTransformFeedback (GLenum);
+GLAPI void APIENTRY glEndTransformFeedback (void);
+GLAPI void APIENTRY glBindBufferRange (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
+GLAPI void APIENTRY glBindBufferBase (GLenum, GLuint, GLuint);
+GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint, GLsizei, const GLchar* *, GLenum);
+GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
+GLAPI void APIENTRY glClampColor (GLenum, GLenum);
+GLAPI void APIENTRY glBeginConditionalRender (GLuint, GLenum);
+GLAPI void APIENTRY glEndConditionalRender (void);
+GLAPI void APIENTRY glVertexAttribI1i (GLuint, GLint);
+GLAPI void APIENTRY glVertexAttribI2i (GLuint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI3i (GLuint, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI4i (GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI1ui (GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI2ui (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI3ui (GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI4ui (GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI1iv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI2iv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI3iv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI4iv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI1uiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI2uiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI3uiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI4uiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI4bv (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttribI4sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttribI4ubv (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttribI4usv (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttribIPointer (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetVertexAttribIiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint, GLenum, GLuint *);
+GLAPI void APIENTRY glGetUniformuiv (GLuint, GLint, GLuint *);
+GLAPI void APIENTRY glBindFragDataLocation (GLuint, GLuint, const GLchar *);
+GLAPI GLint APIENTRY glGetFragDataLocation (GLuint, const GLchar *);
+GLAPI void APIENTRY glUniform1ui (GLint, GLuint);
+GLAPI void APIENTRY glUniform2ui (GLint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform3ui (GLint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform4ui (GLint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform1uiv (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform2uiv (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform3uiv (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform4uiv (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glTexParameterIiv (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glTexParameterIuiv (GLenum, GLenum, const GLuint *);
+GLAPI void APIENTRY glGetTexParameterIiv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetTexParameterIuiv (GLenum, GLenum, GLuint *);
+GLAPI void APIENTRY glClearBufferiv (GLenum, GLint, const GLint *);
+GLAPI void APIENTRY glClearBufferuiv (GLenum, GLint, const GLuint *);
+GLAPI void APIENTRY glClearBufferfv (GLenum, GLint, const GLfloat *);
+GLAPI void APIENTRY glClearBufferfi (GLenum, GLint, GLfloat, GLint);
+GLAPI const GLubyte * APIENTRY glGetStringi (GLenum, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
 #endif
 
 #ifndef GL_ARB_multitexture
@@ -4893,10 +5217,58 @@
 
 #ifndef GL_ARB_draw_instanced
 #define GL_ARB_draw_instanced 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
 #endif
 
 #ifndef GL_ARB_framebuffer_object
 #define GL_ARB_framebuffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint);
+GLAPI void APIENTRY glBindRenderbuffer (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenRenderbuffers (GLsizei, GLuint *);
+GLAPI void APIENTRY glRenderbufferStorage (GLenum, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum, GLenum, GLint *);
+GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint);
+GLAPI void APIENTRY glBindFramebuffer (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteFramebuffers (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenFramebuffers (GLsizei, GLuint *);
+GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum);
+GLAPI void APIENTRY glFramebufferTexture1D (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTexture2D (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTexture3D (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGenerateMipmap (GLenum);
+GLAPI void APIENTRY glBlitFramebuffer (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
+GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glFramebufferTextureLayer (GLenum, GLenum, GLuint, GLint, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
 #endif
 
 #ifndef GL_ARB_framebuffer_sRGB
@@ -4905,6 +5277,16 @@
 
 #ifndef GL_ARB_geometry_shader4
 #define GL_ARB_geometry_shader4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriARB (GLuint, GLenum, GLint);
+GLAPI void APIENTRY glFramebufferTextureARB (GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum, GLenum, GLuint, GLint, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
 #endif
 
 #ifndef GL_ARB_half_float_vertex
@@ -4913,14 +5295,28 @@
 
 #ifndef GL_ARB_instanced_arrays
 #define GL_ARB_instanced_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribDivisor (GLuint, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
 #endif
 
 #ifndef GL_ARB_map_buffer_range
 #define GL_ARB_map_buffer_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLvoid* APIENTRY glMapBufferRange (GLenum, GLintptr, GLsizeiptr, GLbitfield);
+GLAPI void APIENTRY glFlushMappedBufferRange (GLenum, GLintptr, GLsizeiptr);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
 #endif
 
 #ifndef GL_ARB_texture_buffer_object
 #define GL_ARB_texture_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferARB (GLenum, GLenum, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer);
 #endif
 
 #ifndef GL_ARB_texture_compression_rgtc
@@ -4933,6 +5329,16 @@
 
 #ifndef GL_ARB_vertex_array_object
 #define GL_ARB_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArray (GLuint);
+GLAPI void APIENTRY glDeleteVertexArrays (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenVertexArrays (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsVertexArray (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
 #endif
 
 #ifndef GL_EXT_abgr
@@ -7631,17 +8037,527 @@
 
 #ifndef GL_NV_conditional_render
 #define GL_NV_conditional_render 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint, GLenum);
+GLAPI void APIENTRY glEndConditionalRenderNV (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void);
 #endif
 
 #ifndef GL_NV_present_video
 #define GL_NV_present_video 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPresentFrameKeyedNV (GLuint, GLuint64EXT, GLuint, GLuint, GLenum, GLenum, GLuint, GLuint, GLenum, GLuint, GLuint);
+GLAPI void APIENTRY glPresentFrameDualFillNV (GLuint, GLuint64EXT, GLuint, GLuint, GLenum, GLenum, GLuint, GLenum, GLuint, GLenum, GLuint, GLenum, GLuint);
+GLAPI void APIENTRY glGetVideoivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVideouivNV (GLuint, GLenum, GLuint *);
+GLAPI void APIENTRY glGetVideoi64vNV (GLuint, GLenum, GLint64EXT *);
+GLAPI void APIENTRY glGetVideoui64vNV (GLuint, GLenum, GLuint64EXT *);
+GLAPI void APIENTRY glVideoParameterivNV (GLuint, GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
+typedef void (APIENTRYP PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
+typedef void (APIENTRYP PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLVIDEOPARAMETERIVNVPROC) (GLuint video_slot, GLenum pname, const GLint *params);
 #endif
 
 #ifndef GL_EXT_transform_feedback
 #define GL_EXT_transform_feedback 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackEXT (GLenum);
+GLAPI void APIENTRY glEndTransformFeedbackEXT (void);
+GLAPI void APIENTRY glBindBufferRangeEXT (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
+GLAPI void APIENTRY glBindBufferOffsetEXT (GLenum, GLuint, GLuint, GLintptr);
+GLAPI void APIENTRY glBindBufferBaseEXT (GLenum, GLuint, GLuint);
+GLAPI void APIENTRY glTransformFeedbackVaryingsEXT (GLuint, GLsizei, const GLchar* *, GLenum);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingEXT (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
 #endif
 
+#ifndef GL_EXT_direct_state_access
+#define GL_EXT_direct_state_access 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield);
+GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield);
+GLAPI void APIENTRY glMatrixLoadfEXT (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMatrixLoaddEXT (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMatrixMultfEXT (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMatrixMultdEXT (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum);
+GLAPI void APIENTRY glMatrixRotatefEXT (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMatrixRotatedEXT (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMatrixScalefEXT (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMatrixScaledEXT (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMatrixFrustumEXT (GLenum, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMatrixOrthoEXT (GLenum, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMatrixPopEXT (GLenum);
+GLAPI void APIENTRY glMatrixPushEXT (GLenum);
+GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum, const GLdouble *);
+GLAPI void APIENTRY glTextureParameterfEXT (GLuint, GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glTextureParameterfvEXT (GLuint, GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glTextureParameteriEXT (GLuint, GLenum, GLenum, GLint);
+GLAPI void APIENTRY glTextureParameterivEXT (GLuint, GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glTextureImage1DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTextureImage2DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint, GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint, GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint, GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
+GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint, GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
+GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetTextureImageEXT (GLuint, GLenum, GLint, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint, GLenum, GLint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint, GLenum, GLint, GLenum, GLint *);
+GLAPI void APIENTRY glTextureImage3DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum, GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum, GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum, GLenum, GLenum, GLint);
+GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum, GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum, GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum, GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
+GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum, GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
+GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum, GLenum, GLint, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum, GLenum, GLint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum, GLenum, GLint, GLenum, GLint *);
+GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glBindMultiTextureEXT (GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum, GLuint);
+GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum, GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum, GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum, GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexEnviEXT (GLenum, GLenum, GLenum, GLint);
+GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum, GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexGendEXT (GLenum, GLenum, GLenum, GLdouble);
+GLAPI void APIENTRY glMultiTexGendvEXT (GLenum, GLenum, GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexGenfEXT (GLenum, GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum, GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexGeniEXT (GLenum, GLenum, GLenum, GLint);
+GLAPI void APIENTRY glMultiTexGenivEXT (GLenum, GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum, GLenum, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum, GLuint, GLfloat *);
+GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum, GLuint, GLdouble *);
+GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum, GLuint, GLvoid* *);
+GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint, GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint, GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint, GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint, GLenum, GLint, GLvoid *);
+GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum, GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum, GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum, GLenum, GLint, GLvoid *);
+GLAPI void APIENTRY glNamedProgramStringEXT (GLuint, GLenum, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint, GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint, GLenum, GLuint, const GLdouble *);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint, GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint, GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint, GLenum, GLuint, GLdouble *);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint, GLenum, GLuint, GLfloat *);
+GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint, GLenum, GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint, GLenum, GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint, GLenum, GLuint, const GLint *);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint, GLenum, GLuint, GLsizei, const GLint *);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint, GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint, GLenum, GLuint, const GLuint *);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint, GLenum, GLuint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint, GLenum, GLuint, GLint *);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint, GLenum, GLuint, GLuint *);
+GLAPI void APIENTRY glTextureParameterIivEXT (GLuint, GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint, GLenum, GLenum, const GLuint *);
+GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint, GLenum, GLenum, GLuint *);
+GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum, GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum, GLenum, GLenum, const GLuint *);
+GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum, GLenum, GLenum, GLuint *);
+GLAPI void APIENTRY glProgramUniform1fEXT (GLuint, GLint, GLfloat);
+GLAPI void APIENTRY glProgramUniform2fEXT (GLuint, GLint, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramUniform3fEXT (GLuint, GLint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramUniform4fEXT (GLuint, GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramUniform1iEXT (GLuint, GLint, GLint);
+GLAPI void APIENTRY glProgramUniform2iEXT (GLuint, GLint, GLint, GLint);
+GLAPI void APIENTRY glProgramUniform3iEXT (GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glProgramUniform4iEXT (GLuint, GLint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint, GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint, GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint, GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint, GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint, GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint, GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint, GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint, GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint, GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint, GLint, GLuint);
+GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint, GLint, GLuint, GLuint);
+GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint, GLint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint, GLint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint, GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint, GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint, GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint, GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glNamedBufferDataEXT (GLuint, GLsizeiptr, const GLvoid *, GLenum);
+GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint, GLintptr, GLsizeiptr, const GLvoid *);
+GLAPI GLvoid* APIENTRY glMapNamedBufferEXT (GLuint, GLenum);
+GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint);
+GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint, GLenum, GLvoid* *);
+GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint, GLintptr, GLsizeiptr, GLvoid *);
+GLAPI void APIENTRY glTextureBufferEXT (GLuint, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glMultiTexBufferEXT (GLenum, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint, GLenum, GLint *);
+GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint, GLenum);
+GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint, GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint, GLenum);
+GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum, GLenum);
+GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint, GLenum);
+GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint, GLsizei, const GLenum *);
+GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint, GLenum);
+GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint, GLsizei, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint, GLsizei, GLsizei, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint, GLenum, GLuint, GLint, GLenum);
+GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint, GLenum, GLuint);
+GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum, GLenum, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data);
+typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLvoid* *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, GLvoid *img);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, GLvoid *img);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, GLvoid *string);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, GLvoid* *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
+typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target);
+typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer);
+#endif
 
+#ifndef GL_EXT_vertex_array_bgra
+#define GL_EXT_vertex_array_bgra 1
+#endif
+
+#ifndef GL_EXT_texture_swizzle
+#define GL_EXT_texture_swizzle 1
+#endif
+
+#ifndef GL_NV_explicit_multisample
+#define GL_NV_explicit_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetMultisamplefvNV (GLenum, GLuint, GLfloat *);
+GLAPI void APIENTRY glSampleMaskIndexedNV (GLuint, GLbitfield);
+GLAPI void APIENTRY glTexRenderbufferNV (GLenum, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat *val);
+typedef void (APIENTRYP PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask);
+typedef void (APIENTRYP PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer);
+#endif
+
+#ifndef GL_NV_transform_feedback2
+#define GL_NV_transform_feedback2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindTransformFeedbackNV (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteTransformFeedbacksNV (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenTransformFeedbacksNV (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsTransformFeedbackNV (GLuint);
+GLAPI void APIENTRY glPauseTransformFeedbackNV (void);
+GLAPI void APIENTRY glResumeTransformFeedbackNV (void);
+GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id);
+#endif
+
+#ifndef GL_ATI_meminfo
+#define GL_ATI_meminfo 1
+#endif
+
+#ifndef GL_AMD_performance_monitor
+#define GL_AMD_performance_monitor 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetPerfMonitorGroupsAMD (GLint *, GLsizei, GLuint *);
+GLAPI void APIENTRY glGetPerfMonitorCountersAMD (GLuint, GLint *, GLint *, GLsizei, GLuint *);
+GLAPI void APIENTRY glGetPerfMonitorGroupStringAMD (GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI void APIENTRY glGetPerfMonitorCounterStringAMD (GLuint, GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI void APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint, GLuint, GLenum, void *);
+GLAPI void APIENTRY glGenPerfMonitorsAMD (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeletePerfMonitorsAMD (GLsizei, GLuint *);
+GLAPI void APIENTRY glSelectPerfMonitorCountersAMD (GLuint, GLboolean, GLuint, GLint, GLuint *);
+GLAPI void APIENTRY glBeginPerfMonitorAMD (GLuint);
+GLAPI void APIENTRY glEndPerfMonitorAMD (GLuint);
+GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint, GLenum, GLsizei, GLuint *, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, void *data);
+typedef void (APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);

[... truncated: 46184 lines follow ...]


From korli at users.berlios.de  Wed Apr  8 22:21:49 2009
From: korli at users.berlios.de (=?ISO-8859-1?B?Suly9G1lIER1dmFs?=)
Date: Wed, 8 Apr 2009 22:21:49 +0200
Subject: [Haiku-commits] r30041 - in haiku/vendor/mesa/current:
	glu/libnurbs/interface glu/libnurbs/internals
	glu/libnurbs/nurbtess glu/libtess glut headers/public
	src/drivers/common src/glapi src/main src/math src/ppc
	src/shader src/shader/grammar src/sh
Message-ID: <c47b1d430904081321i398d6b4bpdb08db996b395aee@mail.gmail.com>

2009/4/8 Stephan A?mus <superstippi at gmx.de>:
> I know this isn't your code, Korli, but ?-- puh. How often do I have to see
> broken code to deal with allocations?

True. This specific code was just moved around and comes from the SGI legacy :)

Bye,
J?r?me


From axeld at mail.berlios.de  Wed Apr  8 23:10:14 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 8 Apr 2009 23:10:14 +0200
Subject: [Haiku-commits] r30044 - haiku/trunk/src/servers/media
Message-ID: <200904082110.n38LAEeQ020370@sheep.berlios.de>

Author: axeld
Date: 2009-04-08 23:10:08 +0200 (Wed, 08 Apr 2009)
New Revision: 30044
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30044&view=rev

Modified:
   haiku/trunk/src/servers/media/media_server.cpp
Log:
* Fixed warning.
* Minor cleanup.


Modified: haiku/trunk/src/servers/media/media_server.cpp
===================================================================
--- haiku/trunk/src/servers/media/media_server.cpp	2009-04-08 20:18:04 UTC (rev 30043)
+++ haiku/trunk/src/servers/media/media_server.cpp	2009-04-08 21:10:08 UTC (rev 30044)
@@ -124,6 +124,7 @@
 	typedef BApplication inherited;
 };
 
+
 ServerApp::ServerApp()
  	: BApplication(B_MEDIA_SERVER_SIGNATURE),
 	fLocker(new BLocker("media server locker"))
@@ -142,7 +143,9 @@
 	resume_thread(control_thread);
 }
 
-void ServerApp::ReadyToRun()
+
+void
+ServerApp::ReadyToRun()
 {
 	gNodeManager->LoadState();
 	gFormatManager->LoadState();
@@ -155,6 +158,7 @@
 	gAddOnManager->LoadState();
 }
 
+
 ServerApp::~ServerApp()
 {
 	TRACE("ServerApp::~ServerApp()\n");
@@ -185,7 +189,8 @@
 }
 
 
-void ServerApp::ArgvReceived(int32 argc, char **argv)
+void
+ServerApp::ArgvReceived(int32 argc, char **argv)
 {
 	for (int arg = 1; arg < argc; arg++) {
 		if (strstr(argv[arg], "dump")) {
@@ -208,7 +213,8 @@
 }
 
 
-void ServerApp::StartAddonServer()
+void
+ServerApp::StartAddonServer()
 {
 	status_t err;
 
@@ -245,7 +251,8 @@
 }
 
 
-void ServerApp::TerminateAddonServer()
+void
+ServerApp::TerminateAddonServer()
 {
 	// nothing to do if it's already terminated
 	if (!be_roster->IsRunning(B_MEDIA_ADDON_SERVER_SIGNATURE))
@@ -259,9 +266,9 @@
 		BMessage msg(B_QUIT_REQUESTED);
 		status_t err = msger.SendMessage(&msg, (BHandler *)NULL, 2000000);
 			// 2 sec timeout
-		if (err) {
-			ERROR("Trouble terminating media_addon_server (2). Error %d "
-				"(%s)\n", err, strerror(err));
+		if (err != B_OK) {
+			ERROR("Trouble terminating media_addon_server (2): %s\n",
+				strerror(err));
 		}
 	}
 
@@ -886,6 +893,7 @@
 	TRACE("ServerApp::HandleMessage %#lx leave\n", code);
 }
 
+
 int32
 ServerApp::controlthread(void *arg)
 {
@@ -903,6 +911,7 @@
 	return 0;
 }
 
+
 void
 ServerApp::MessageReceived(BMessage *msg)
 {
@@ -938,6 +947,10 @@
 	TRACE("ServerApp::MessageReceived %lx leave\n", msg->what);
 }
 
+
+//	#pragma mark -
+
+
 int
 main()
 {



From axeld at mail.berlios.de  Wed Apr  8 23:17:07 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Wed, 8 Apr 2009 23:17:07 +0200
Subject: [Haiku-commits] r30045 - in haiku/trunk: headers/private/media
	src/kits/media
Message-ID: <200904082117.n38LH7VG020999@sheep.berlios.de>

Author: axeld
Date: 2009-04-08 23:17:03 +0200 (Wed, 08 Apr 2009)
New Revision: 30045
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30045&view=rev

Modified:
   haiku/trunk/headers/private/media/DataExchange.h
   haiku/trunk/src/kits/media/Controllable.cpp
   haiku/trunk/src/kits/media/MediaRoster.cpp
   haiku/trunk/src/kits/media/ParameterWeb.cpp
Log:
* BParameterWeb::StartWatching() now just calls BMediaRoster::StartWatching()
  as on Dano - since the functionality is already there, those two functions
  aren't really needed, though, so we could remove them again.
* Cleaned up DataExchange.h, and added basic reply/request structs for anything
  that needs an area.
* BControllable now uses a helper class ReceiveTransfer to deal with requests
  with areas.
* Major style cleanup of MediaRoster.cpp, though one could still bury some
  hours there...


Modified: haiku/trunk/headers/private/media/DataExchange.h
===================================================================
--- haiku/trunk/headers/private/media/DataExchange.h	2009-04-08 21:10:08 UTC (rev 30044)
+++ haiku/trunk/headers/private/media/DataExchange.h	2009-04-08 21:17:03 UTC (rev 30045)
@@ -1,8 +1,9 @@
 /* 
  * Copyright 2002, Marcus Overhagen. All rights reserved.
+ * Copyright 2009, Axel D?rfler, axeld at pinc-software.de.
+ *
  * Distributed under the terms of the MIT License.
  */
-
 #ifndef _DATA_EXCHANGE_H
 #define _DATA_EXCHANGE_H
 
@@ -15,6 +16,7 @@
 #include <Buffer.h>
 #include <Entry.h>
 
+
 namespace BPrivate {
 namespace media {
 namespace dataexchange {
@@ -29,40 +31,51 @@
 
 // Raw data based data exchange with the media_server
 status_t SendToServer(int32 msgcode, command_data *msg, int size);
-status_t QueryServer(int32 msgcode, request_data *request, int requestsize, reply_data *reply, int replysize);
+status_t QueryServer(int32 msgcode, request_data *request, int requestsize,
+	reply_data *reply, int replysize);
 
 // Raw data based data exchange with the media_addon_server
 status_t SendToAddonServer(int32 msgcode, command_data *msg, int size);
-status_t QueryAddonServer(int32 msgcode, request_data *request, int requestsize, reply_data *reply, int replysize);
+status_t QueryAddonServer(int32 msgcode, request_data *request, int requestSize,
+	reply_data *reply, int replysize);
 
 // Raw data based data exchange with any (media node control-) port
-status_t SendToPort(port_id sendport, int32 msgcode, command_data *msg, int size);
-status_t QueryPort(port_id requestport, int32 msgcode, request_data *request, int requestsize, reply_data *reply, int replysize);
+status_t SendToPort(port_id sendport, int32 msgcode, command_data *msg,
+	int size);
+status_t QueryPort(port_id requestport, int32 msgcode, request_data *request,
+	int requestsize, reply_data *reply, int replysize);
 
 // The base struct used for all raw requests
-struct request_data
-{
-	port_id reply_port;
+struct request_data {
+	port_id					reply_port;
 
 	status_t SendReply(status_t result, reply_data *reply, int replysize) const;
 };
 
 // The base struct used for all raw replys
-struct reply_data
-{
-	status_t result;
+struct reply_data {
+	status_t				result;
 };
 
 // The base struct used for all raw commands (asynchronous, no answer)
-struct command_data
-{
+struct command_data {
 	// yes, it's empty ;)
 };
 
-}; // dataexchange
-}; // media
-}; // BPrivate
+// The base struct used for all requests using an area
+struct area_request_data : request_data {
+	area_id					area;
+};
 
+// The base struct used for all replies using an area
+struct area_reply_data : reply_data {
+	area_id					area;
+};
+
+} // namespace dataexchange
+} // namespace media
+} // namespace BPrivate
+
 using namespace BPrivate::media::dataexchange;
 
 // BMessage based server communication
@@ -82,7 +95,6 @@
 	MEDIA_ADDON_SERVER_PLAY_MEDIA = '_TRU'
 };
 
-
 // Raw port based communication
 enum {
 	ADDONSERVER_RESCAN_MEDIAADDON_FLAVORS = 0x50,
@@ -196,40 +208,41 @@
  * but we can assign it to an xfer_entry_ref and send this one,
  * when we receive it we can assign it to a normal entry_ref
  */
-struct xfer_entry_ref
-{
+struct xfer_entry_ref {
 public:
 	xfer_entry_ref()
-		{
-			device = -1;
-			directory = -1;
-			name[0] = 0;
-		}
+	{
+		device = -1;
+		directory = -1;
+		name[0] = 0;
+	}
+
 	operator entry_ref() const
-		{
-			entry_ref ref(device, directory, name);
-			return ref;
-		}
-	void operator=(const entry_ref &ref)
-		{
-			device = ref.device;
-			directory = ref.directory;
-			if(ref.name)
-				strcpy(name, ref.name);
-			else
-				name[0] = 0;
-		}
+	{
+		entry_ref ref(device, directory, name);
+		return ref;
+	}
+
+	xfer_entry_ref& operator=(const entry_ref& ref)
+	{
+		device = ref.device;
+		directory = ref.directory;
+		if (ref.name)
+			strcpy(name, ref.name);
+		else
+			name[0] = 0;
+
+		return *this;
+	}
+
 private:
 	dev_t	device;
 	ino_t	directory;
-	char	name[B_FILE_NAME_LENGTH]; // == 256 bytes
+	char	name[B_FILE_NAME_LENGTH];
 };
 
-
-
 // used by SERVER_GET_NODE and SERVER_SET_NODE
-enum node_type 
-{ 
+enum node_type { 
 	VIDEO_INPUT, 
 	AUDIO_INPUT, 
 	VIDEO_OUTPUT, 
@@ -241,835 +254,695 @@
 };
 
 // used by SERVER_PUBLISH_INPUTS and SERVER_PUBLISH_OUTPUTS
-enum
-{
+enum {
 	MAX_OUTPUTS = 8,
 	MAX_INPUTS = 8,
 };
 
 // used by SERVER_GET_LIVE_NODES
-enum
-{
+enum {
 	MAX_LIVE_INFO = 16,
 };
 
 // used by SERVER_GET_INSTANCES_FOR
-enum
-{
+enum {
 	MAX_NODE_ID = 4000,
 };
 
 // used by SERVER_GET_READERS
-enum
-{
+enum {
 	MAX_READERS = 40,
 };
 
-struct addonserver_instantiate_dormant_node_request : public request_data
-{
-	media_addon_id addonid;
-	int32 flavorid;
-	team_id creator_team;
+struct addonserver_instantiate_dormant_node_request : request_data {
+	media_addon_id			addonid;
+	int32					flavorid;
+	team_id					creator_team;
 };
 
-struct addonserver_instantiate_dormant_node_reply : public reply_data
-{
-	media_node node;
+struct addonserver_instantiate_dormant_node_reply : reply_data {
+	media_node				node;
 };
 
-struct server_set_node_request : public request_data
-{
-	node_type type;
-	bool use_node;
-	media_node node;
-	bool use_dni;
-	dormant_node_info dni;
-	bool use_input;
-	media_input input;
+struct server_set_node_request : request_data {
+	node_type				type;
+	bool					use_node;
+	media_node				node;
+	bool					use_dni;
+	dormant_node_info		dni;
+	bool					use_input;
+	media_input				input;
 };
 
-struct server_set_node_reply : public reply_data
-{
+struct server_set_node_reply : reply_data {
 };
 
-struct server_get_node_request : public request_data
-{
-	node_type type;
-	team_id team;
+struct server_get_node_request : request_data {
+	node_type				type;
+	team_id					team;
 };
 
-struct server_get_node_reply : public reply_data
-{
-	media_node node;
+struct server_get_node_reply : public reply_data {
+	media_node				node;
 
 	// for AUDIO_OUTPUT_EX
-	char input_name[B_MEDIA_NAME_LENGTH];
-	int32 input_id;
+	char					input_name[B_MEDIA_NAME_LENGTH];
+	int32					input_id;
 };
 
-struct producer_format_proposal_request : public request_data
-{
-	media_source output;
-	media_format format;
+struct producer_format_proposal_request : public request_data {
+	media_source			output;
+	media_format			format;
 };
 
-struct producer_format_proposal_reply : public reply_data
-{
-	media_format format;
+struct producer_format_proposal_reply : reply_data {
+	media_format			format;
 };
 
-struct producer_prepare_to_connect_request : public request_data
-{
-	media_source source;
-	media_destination destination;
-	media_format format;
-	char name[B_MEDIA_NAME_LENGTH];
+struct producer_prepare_to_connect_request : request_data {
+	media_source			source;
+	media_destination		destination;
+	media_format			format;
+	char					name[B_MEDIA_NAME_LENGTH];
 };
 
-struct producer_prepare_to_connect_reply : public reply_data
-{
-	media_format format;
-	media_source out_source;
-	char name[B_MEDIA_NAME_LENGTH];
+struct producer_prepare_to_connect_reply : reply_data {
+	media_format			format;
+	media_source			out_source;
+	char					name[B_MEDIA_NAME_LENGTH];
 };
 
-struct producer_connect_request : public request_data
-{
-	status_t error;
-	media_source source;
-	media_destination destination;
-	media_format format;
-	char name[B_MEDIA_NAME_LENGTH];
+struct producer_connect_request : request_data {
+	status_t				error;
+	media_source			source;
+	media_destination		destination;
+	media_format			format;
+	char					name[B_MEDIA_NAME_LENGTH];
 };
 
-struct producer_connect_reply : public reply_data
-{
-	char name[B_MEDIA_NAME_LENGTH];
+struct producer_connect_reply : reply_data {
+	char					name[B_MEDIA_NAME_LENGTH];
 };
 
-struct producer_disconnect_request : public request_data
-{
-	media_source source;
-	media_destination destination;
+struct producer_disconnect_request : request_data {
+	media_source			source;
+	media_destination		destination;
 };
 
-struct producer_disconnect_reply : public reply_data
-{
+struct producer_disconnect_reply : reply_data {
 };
 
-struct producer_format_suggestion_requested_request : public request_data
-{
-	media_type type;
-	int32 quality;
+struct producer_format_suggestion_requested_request : request_data {
+	media_type				type;
+	int32					quality;
 };
 
-struct producer_format_suggestion_requested_reply : public reply_data
-{
-	media_format format;
+struct producer_format_suggestion_requested_reply : reply_data {
+	media_format			format;
 };
 
-struct producer_set_play_rate_request : public request_data
-{
-	int32 numer;
-	int32 denom;
+struct producer_set_play_rate_request : request_data {
+	int32					numer;
+	int32					denom;
 };
 
-struct producer_set_play_rate_reply : public reply_data
-{
+struct producer_set_play_rate_reply : reply_data {
 };
 
-struct producer_get_initial_latency_request : public request_data
-{
+struct producer_get_initial_latency_request : request_data {
 };
 
-struct producer_get_initial_latency_reply : public reply_data
-{
-	bigtime_t initial_latency;
-	uint32 flags;
+struct producer_get_initial_latency_reply : reply_data {
+	bigtime_t				initial_latency;
+	uint32					flags;
 };
 
-struct producer_get_latency_request : public request_data
-{
+struct producer_get_latency_request : request_data {
 };
 
-struct producer_get_latency_reply : public reply_data
-{
-	bigtime_t latency;
+struct producer_get_latency_reply : reply_data {
+	bigtime_t				latency;
 };
 
-struct producer_set_buffer_group_command : public command_data
-{
-	media_source source;
-	media_destination destination;
-	void *user_data;
-	int32 change_tag;
-	int32 buffer_count;
-	media_buffer_id buffers[1];
+struct producer_set_buffer_group_command : command_data {
+	media_source			source;
+	media_destination		destination;
+	void*					user_data;
+	int32					change_tag;
+	int32					buffer_count;
+	media_buffer_id			buffers[1];
 };
 
-struct producer_format_change_requested_command : public command_data
-{
-	media_source source;
-	media_destination destination;
-	media_format format;
-	void *user_data;
-	int32 change_tag;
+struct producer_format_change_requested_command : command_data {
+	media_source			source;
+	media_destination		destination;
+	media_format			format;
+	void*					user_data;
+	int32					change_tag;
 };
 
-struct producer_video_clipping_changed_command : public command_data
-{
-	media_source source;
-	media_destination destination;
+struct producer_video_clipping_changed_command : command_data {
+	media_source			source;
+	media_destination		destination;
 	media_video_display_info display;
-	void *user_data;
-	int32 change_tag;
-	int32 short_count;
-	int16 shorts[1];
+	void*					user_data;
+	int32					change_tag;
+	int32					short_count;
+	int16					shorts[1];
 };
 
-struct producer_additional_buffer_requested_command : public command_data
-{
-	media_source source;
-	media_buffer_id prev_buffer;
-	bigtime_t prev_time;
-	bool has_seek_tag;
-	media_seek_tag prev_tag;
+struct producer_additional_buffer_requested_command : command_data {
+	media_source			source;
+	media_buffer_id			prev_buffer;
+	bigtime_t				prev_time;
+	bool					has_seek_tag;
+	media_seek_tag			prev_tag;
 };
 
-struct producer_latency_changed_command : public command_data
-{
-	media_source source;
-	media_destination destination;
-	bigtime_t latency;
-	uint32 flags;
+struct producer_latency_changed_command : command_data {
+	media_source			source;
+	media_destination		destination;
+	bigtime_t				latency;
+	uint32					flags;
 };
 
-struct producer_enable_output_command : public command_data
-{
-	media_source source;
-	media_destination destination;
-	bool enabled;
-	void *user_data;
-	int32 change_tag;
+struct producer_enable_output_command : command_data {
+	media_source			source;
+	media_destination		destination;
+	bool					enabled;
+	void*					user_data;
+	int32					change_tag;
 };
 
-struct producer_late_notice_received_command : public command_data
-{
-	media_source source;
-	bigtime_t how_much;
-	bigtime_t performance_time;
+struct producer_late_notice_received_command : command_data {
+	media_source			source;
+	bigtime_t				how_much;
+	bigtime_t				performance_time;
 };
 
-struct producer_set_run_mode_delay_command : public command_data
-{
-	BMediaNode::run_mode mode;
-	bigtime_t delay;
+struct producer_set_run_mode_delay_command : command_data {
+	BMediaNode::run_mode	mode;
+	bigtime_t				delay;
 };
 
-struct consumer_accept_format_request : public request_data
-{
-	media_destination dest;
-	media_format format;
+struct consumer_accept_format_request : request_data {
+	media_destination		dest;
+	media_format			format;
 };
 
-struct consumer_accept_format_reply : public reply_data
-{
-	media_format format;
+struct consumer_accept_format_reply : reply_data {
+	media_format			format;
 };
 
-struct consumer_connected_request : public request_data
-{
-	media_input input;
+struct consumer_connected_request : request_data {
+	media_input				input;
 };
 
-struct consumer_connected_reply : public reply_data
-{
-	media_input input;
+struct consumer_connected_reply : reply_data {
+	media_input				input;
 };
 
-struct server_publish_inputs_request : public request_data
-{
-	media_node node;
-	int32 count;
+struct server_publish_inputs_request : request_data {
+	media_node				node;
+	int32					count;
 	area_id area;	// if count > MAX_INPUTS, inputs are in the area
 					// area is created in the library, and also deleted
 					// in the library after the reply has been received
 	media_input inputs[MAX_INPUTS];
 };
 
-struct server_publish_inputs_reply : public reply_data
-{
+struct server_publish_inputs_reply : reply_data {
 };
 
-struct server_publish_outputs_request : public request_data
-{
-	media_node node;
-	int32 count;
-	area_id area; // if count > MAX_OUTPUTS, outputs are in the area
-					// area is created in the library, and also deleted
-					// in the library after the reply has been received
+struct server_publish_outputs_request : area_request_data {
+	media_node				node;
+	int32					count;
+		// if count > MAX_OUTPUTS, outputs are in the area
+		// area is created in the library, and also deleted
+		// in the library after the reply has been received
 	media_output outputs[MAX_OUTPUTS];
 };
 
-struct server_publish_outputs_reply : public reply_data
-{
+struct server_publish_outputs_reply : reply_data {
 };
 
-struct producer_get_next_output_request : public request_data
-{
-	int32 cookie;
+struct producer_get_next_output_request : request_data {
+	int32					cookie;
 };
 
-struct producer_get_next_output_reply : public reply_data
+struct producer_get_next_output_reply : reply_data
 {
-	int32 cookie;
-	media_output output;
+	int32					cookie;
+	media_output			output;
 };
 
-struct producer_dispose_output_cookie_request : public request_data
+struct producer_dispose_output_cookie_request : request_data
 {
-	int32 cookie;
+	int32					cookie;
 };
 
-struct producer_dispose_output_cookie_reply : public reply_data
-{
+struct producer_dispose_output_cookie_reply : reply_data {
 };
 
-struct consumer_get_next_input_request : public request_data
-{
-	int32 cookie;
+struct consumer_get_next_input_request : request_data {
+	int32					cookie;
 };
 
-struct consumer_get_next_input_reply : public reply_data
-{
-	int32 cookie;
-	media_input input;
+struct consumer_get_next_input_reply : reply_data {
+	int32					cookie;
+	media_input				input;
 };
 
-struct consumer_dispose_input_cookie_request : public request_data
-{
-	int32 cookie;
+struct consumer_dispose_input_cookie_request : request_data {
+	int32					cookie;
 };
 
-struct consumer_dispose_input_cookie_reply : public reply_data
-{
+struct consumer_dispose_input_cookie_reply : reply_data {
 };
 
-struct consumer_disconnected_request : public request_data
-{
-	media_source source;
-	media_destination destination;
+struct consumer_disconnected_request : request_data {
+	media_source			source;
+	media_destination		destination;
 };
 
-struct consumer_disconnected_reply : public reply_data
-{
+struct consumer_disconnected_reply : reply_data {
 };
 
-struct consumer_buffer_received_command : public command_data
-{
-	media_buffer_id buffer;
-	media_header header;
+struct consumer_buffer_received_command : command_data {
+	media_buffer_id			buffer;
+	media_header			header;
 };
 
-struct consumer_producer_data_status_command : public command_data
-{
-	media_destination for_whom;
-	int32 status;
-	bigtime_t at_performance_time;
+struct consumer_producer_data_status_command : command_data {
+	media_destination		for_whom;
+	int32					status;
+	bigtime_t				at_performance_time;
 };
 
-struct consumer_get_latency_for_request : public request_data
-{
-	media_destination for_whom;
+struct consumer_get_latency_for_request : request_data {
+	media_destination		for_whom;
 };
 
-struct consumer_get_latency_for_reply : public reply_data
-{
-	bigtime_t latency;
-	media_node_id timesource;
+struct consumer_get_latency_for_reply : reply_data {
+	bigtime_t				latency;
+	media_node_id			timesource;
 };
 
-struct consumer_format_changed_request : public request_data
-{
-	media_source producer;
-	media_destination consumer;
-	int32 change_tag;
-	media_format format;
+struct consumer_format_changed_request : request_data {
+	media_source			producer;
+	media_destination		consumer;
+	int32					change_tag;
+	media_format			format;
 };
 
-struct consumer_format_changed_reply : public reply_data
-{
+struct consumer_format_changed_reply : reply_data {
 };
 
-struct consumer_seek_tag_requested_request : public request_data
-{
-	media_destination destination;
-	bigtime_t target_time;
-	uint32 flags;
+struct consumer_seek_tag_requested_request : request_data {
+	media_destination		destination;
+	bigtime_t				target_time;
+	uint32					flags;
 };
 
-struct consumer_seek_tag_requested_reply : public reply_data
-{
-	media_seek_tag seek_tag;
-	bigtime_t tagged_time;
-	uint32 flags;
+struct consumer_seek_tag_requested_reply : reply_data {
+	media_seek_tag			seek_tag;
+	bigtime_t				tagged_time;
+	uint32					flags;
 };
 
-struct server_register_app_request : public request_data
-{
-	team_id team;
-	BMessenger messenger;
+struct server_register_app_request : request_data {
+	team_id					team;
+	BMessenger				messenger;
 };
 
-struct server_register_app_reply : public reply_data
-{
+struct server_register_app_reply : reply_data {
 };
 
-struct server_unregister_app_request : public request_data
-{
-	team_id team;
+struct server_unregister_app_request : request_data {
+	team_id					team;
 };
 
-struct server_unregister_app_reply : public reply_data
-{
+struct server_unregister_app_reply : reply_data {
 };
 
-struct server_set_node_creator_request : public request_data
-{
-	media_node_id node;
-	team_id creator;
+struct server_set_node_creator_request : request_data {
+	media_node_id			node;
+	team_id					creator;
 };
 
-struct server_set_node_creator_reply : public reply_data
-{
+struct server_set_node_creator_reply : reply_data {
 };
 
-struct server_change_addon_flavor_instances_count_request : public request_data
-{
-	media_addon_id addonid;
-	int32 flavorid;
-	int32 delta; // must be +1 or -1
-	team_id team;
+struct server_change_addon_flavor_instances_count_request : request_data {
+	media_addon_id			addonid;
+	int32					flavorid;
+	int32					delta; // must be +1 or -1
+	team_id					team;
 };
 
-struct server_change_addon_flavor_instances_count_reply : public reply_data
-{
+struct server_change_addon_flavor_instances_count_reply : reply_data {
 };
 
-struct server_register_node_request : public request_data
-{
-	media_addon_id addon_id;
-	int32 addon_flavor_id;
-	char name[B_MEDIA_NAME_LENGTH];
-	uint64 kinds;
-	port_id port;
-	team_id team;
+struct server_register_node_request : request_data {
+	media_addon_id			addon_id;
+	int32					addon_flavor_id;
+	char					name[B_MEDIA_NAME_LENGTH];
+	uint64					kinds;
+	port_id					port;
+	team_id					team;
 };
 
-struct server_register_node_reply : public reply_data
-{
-	media_node_id nodeid;
+struct server_register_node_reply : reply_data {
+	media_node_id			nodeid;
 };
 
-struct server_unregister_node_request : public request_data
-{
-	media_node_id nodeid;
-	team_id team;
+struct server_unregister_node_request : request_data {
+	media_node_id			nodeid;
+	team_id					team;
 };
 
-struct server_unregister_node_reply : public reply_data
-{
-	media_addon_id addonid;
-	int32 flavorid;
+struct server_unregister_node_reply : reply_data {
+	media_addon_id			addonid;
+	int32					flavorid;
 };
 
-struct server_get_live_node_info_request : public request_data
-{
-	media_node node;
+struct server_get_live_node_info_request : request_data {
+	media_node				node;
 };
 
-struct server_get_live_node_info_reply : public reply_data
-{
-	live_node_info live_info;
+struct server_get_live_node_info_reply : reply_data {
+	live_node_info			live_info;
 };
 
-struct server_get_live_nodes_request : public request_data
-{
-	int32 maxcount;
-	bool has_input;
-	bool has_output;
-	bool has_name;
-	media_format inputformat;
-	media_format outputformat;
-	char name[B_MEDIA_NAME_LENGTH + 1]; // 1 for a trailing "*"
-	uint64 require_kinds;
+struct server_get_live_nodes_request : request_data {
+	int32					maxcount;
+	bool					has_input;
+	bool					has_output;
+	bool					has_name;
+	media_format			inputformat;
+	media_format			outputformat;
+	char					name[B_MEDIA_NAME_LENGTH + 1];
+								// +1 for a trailing "*"
+	uint64					require_kinds;
 };
 
-struct server_get_live_nodes_reply : public reply_data
-{
-	int32 count;
-	area_id area; 	// if count > MAX_LIVE_INFO, live_node_infos are in the area
-					// area is created in the server, but deleted in the library
-	live_node_info live_info[MAX_LIVE_INFO]; 
+struct server_get_live_nodes_reply : area_reply_data {
+	int32					count;
+		// if count > MAX_LIVE_INFO, live_node_infos are in the area
+		// area is created in the server, but deleted in the library
+	live_node_info			live_info[MAX_LIVE_INFO]; 
 };
 
-struct server_node_id_for_request : public request_data
-{
-	port_id port;
+struct server_node_id_for_request : request_data {
+	port_id					port;
 };
 
-struct server_node_id_for_reply : public reply_data
-{
-	media_node_id nodeid;
+struct server_node_id_for_reply : reply_data {
+	media_node_id			nodeid;
 };
 
-struct server_get_node_for_request : public request_data
-{
-	media_node_id nodeid;
-	team_id team;
+struct server_get_node_for_request : request_data {
+	media_node_id			nodeid;
+	team_id					team;
 };
 
-struct server_get_node_for_reply : public reply_data
-{
-	media_node clone;
+struct server_get_node_for_reply : reply_data {
+	media_node				clone;
 };
 
-struct server_release_node_request : public request_data
-{
-	media_node node;
-	team_id team;
+struct server_release_node_request : request_data {
+	media_node				node;
+	team_id					team;
 };
 
-struct server_release_node_reply : public reply_data
-{
+struct server_release_node_reply : reply_data {
 };
 
-struct server_get_dormant_node_for_request : public request_data
-{
-	media_node node;
+struct server_get_dormant_node_for_request : request_data {
+	media_node				node;
 };
 
-struct server_get_dormant_node_for_reply : public reply_data
-{
-	dormant_node_info node_info;
+struct server_get_dormant_node_for_reply : reply_data {
+	dormant_node_info		node_info;
 };
 
-struct server_get_instances_for_request : public request_data
-{
-	int32 maxcount;
-	media_addon_id addon_id;
-	int32 addon_flavor_id;
+struct server_get_instances_for_request : request_data {
+	int32					maxcount;
+	media_addon_id			addon_id;
+	int32					addon_flavor_id;
 };
 
-struct server_get_instances_for_reply : public reply_data
-{
-	int32 count;
-	media_node_id node_id[MAX_NODE_ID]; // no area here, MAX_NODE_ID is really large
+struct server_get_instances_for_reply : reply_data {
+	int32					count;
+	media_node_id			node_id[MAX_NODE_ID];
+		// no area here, MAX_NODE_ID is really large
 };
 
-struct server_rescan_defaults_command : public command_data
-{
+struct server_rescan_defaults_command : command_data {
 };
 
-struct addonserver_rescan_mediaaddon_flavors_command : public command_data
-{
-	media_addon_id addonid;
+struct addonserver_rescan_mediaaddon_flavors_command : command_data {
+	media_addon_id			addonid;
 };
 
-struct server_register_mediaaddon_request : public request_data
-{
-	xfer_entry_ref	ref; // a ref to the file
+struct server_register_mediaaddon_request : request_data {
+	xfer_entry_ref			ref;
 };
 
-struct server_register_mediaaddon_reply : public reply_data
-{
-	media_addon_id addonid;
+struct server_register_mediaaddon_reply : reply_data {
+	media_addon_id			addonid;
 };
 
-struct server_unregister_mediaaddon_command : public command_data
-{
-	media_addon_id addonid;
+struct server_unregister_mediaaddon_command : command_data {
+	media_addon_id			addonid;
 };
 
-struct server_get_mediaaddon_ref_request : public request_data
-{
-	media_addon_id addonid;
+struct server_get_mediaaddon_ref_request : request_data {
+	media_addon_id			addonid;
 };
 
-struct server_get_mediaaddon_ref_reply : public reply_data
-{
-	xfer_entry_ref	ref; // a ref to the file
+struct server_get_mediaaddon_ref_reply : reply_data {
+	xfer_entry_ref			ref;
 };
 
-struct server_get_shared_buffer_area_request : public request_data
-{
+struct server_get_shared_buffer_area_request : request_data {
 };

[... truncated: 4810 lines follow ...]


From marcusoverhagen at arcor.de  Wed Apr  8 23:59:22 2009
From: marcusoverhagen at arcor.de (Marcus Overhagen)
Date: Wed, 08 Apr 2009 23:59:22 +0200
Subject: [Haiku-commits] r30045 - in haiku/trunk: headers/private/media
 src/kits/media
In-Reply-To: <200904082117.n38LH7VG020999@sheep.berlios.de>
References: <200904082117.n38LH7VG020999@sheep.berlios.de>
Message-ID: <49DD1E3A.1050400@arcor.de>

axeld at mail.berlios.de schrieb:

> Log:
> * BParameterWeb::StartWatching() now just calls BMediaRoster::StartWatching()
>   as on Dano - since the functionality is already there, those two functions
>   aren't really needed, though, so we could remove them again.

Can you please remove those two calls again? They just bloat the API and
make it inconsistent. BMediaNode also doesn't have those functions, and
Dano isn't really a reference, more a failed experiment.

regards
Marcus



From stippi at mail.berlios.de  Thu Apr  9 00:10:30 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Thu, 9 Apr 2009 00:10:30 +0200
Subject: [Haiku-commits] r30046 - haiku/trunk/src/kits/interface
Message-ID: <200904082210.n38MAU1K028863@sheep.berlios.de>

Author: stippi
Date: 2009-04-09 00:10:27 +0200 (Thu, 09 Apr 2009)
New Revision: 30046
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30046&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextInput.cpp
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
Some BTextView fixes, most importantly the annoying up/down ping pong when
triggering auto-scrolling in BTextControls...
* _BTextInput_::MinSize() added 1 to the line height, but when aligning the
  text rect, at least one pixel is added at the top and bottom, which makes
  for at least two extra pixels.
* BTextView::_PerformAutoScrolling() had some code which was supposed to
  prevent from out-of-bounds scrolling, but the bottom maximum coordinate
  was not correctly calculated. This and the above item led to the ping-pong
  effect.
* Additionally, I prevented scrolling vertically for one-line text views
  completely.
* On mouse-up, reset the cursor. It may have to be the I-Beam cursor again,
  for example after de-selecting.
* While mouse tracking the selection, always use the I-Beam cursor.
* Also when mouse tracking, do not use the minimum/maximum text offset when
  the mouse is above/below the text rect. Do this only when it's also outside
  on left/right sides. This is less irritating and works like on other
  platforms. It means the first/last line can still be selected, without
  having to constrain the mouse to the inside of the text view.
* When calculating the selection region, don't make the bottom one pixel too
  far up. Lines which contain glyphs that extend below the base-line have
  one more pixel below the glyphs that is inverted now.


Modified: haiku/trunk/src/kits/interface/TextInput.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextInput.cpp	2009-04-08 21:17:03 UTC (rev 30045)
+++ haiku/trunk/src/kits/interface/TextInput.cpp	2009-04-08 22:10:27 UTC (rev 30046)
@@ -153,7 +153,9 @@
 _BTextInput_::MinSize()
 {
 	BSize min;
-	min.height = ceilf(LineHeight(0) + 1.0);
+	min.height = ceilf(LineHeight(0) + 2.0);
+		// we always add at least one pixel vertical inset top/bottom for
+		// the text rect.
 	min.width = min.height * 3;
 	return BLayoutUtils::ComposeSize(ExplicitMinSize(), min);
 }

Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-04-08 21:17:03 UTC (rev 30045)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-04-08 22:10:27 UTC (rev 30046)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008, Haiku Inc. All rights reserved.
+ * Copyright 2001-2009, Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -1831,14 +1831,27 @@
 	const int32 textLength = fText->Length();
 
 	// should we even bother?
-	if (point.y >= fTextRect.bottom)
+	if (point.y >= fTextRect.bottom && point.x >= fTextRect.right)
 		return textLength;
-	else if (point.y < fTextRect.top)
+	else if (point.y < fTextRect.top && point.x <= fTextRect.left)
 		return 0;
 
+#define COMPILE_PROBABLY_BAD_CODE 1
+
+#if COMPILE_PROBABLY_BAD_CODE
+// NOTE: I have not been able to test what happens if all this is removed.
+// For one-line text views (BTextControl), it works just fine. But I would
+// need to check StyledEdit or something in various situations (new lines
+// at end and other stuff)...
+	// special case one line text views
+	if (CountLines() <= 1)
+		point.y = fTextRect.top;
+#endif
+
 	int32 lineNum = LineAt(point);
 	STELine* line = (*fLines)[lineNum];
 
+#if COMPILE_PROBABLY_BAD_CODE
 	// special case: if point is within the text rect and PixelToLine()
 	// tells us that it's on the last line, but if point is actually
 	// lower than the bottom of the last line, return the last offset
@@ -1847,6 +1860,7 @@
 		if (point.y >= ((line + 1)->origin + fTextRect.top))
 			return textLength;
 	}
+#endif
 
 	// convert to text rect coordinates
 	if (fAlignment != B_ALIGN_LEFT) {
@@ -2033,14 +2047,14 @@
 		selRect.left = max_c(startPt.x, fTextRect.left);
 		selRect.top = startPt.y;
 		selRect.right = endPt.x - 1.0;
-		selRect.bottom = endPt.y + endLineHeight - 1.0;
+		selRect.bottom = endPt.y + endLineHeight;
 		outRegion->Include(selRect);
 	} else {
 		// more than one line in the specified offset range
 		selRect.left = max_c(startPt.x, fTextRect.left);
 		selRect.top = startPt.y;
 		selRect.right = fTextRect.right;
-		selRect.bottom = startPt.y + startLineHeight - 1.0;
+		selRect.bottom = startPt.y + startLineHeight;
 		outRegion->Include(selRect);
 
 		if (startPt.y + startLineHeight < endPt.y) {
@@ -2048,14 +2062,14 @@
 			selRect.left = fTextRect.left;
 			selRect.top = startPt.y + startLineHeight;
 			selRect.right = fTextRect.right;
-			selRect.bottom = endPt.y - 1.0;
+			selRect.bottom = endPt.y;
 			outRegion->Include(selRect);
 		}
 
 		selRect.left = fTextRect.left;
 		selRect.top = endPt.y;
 		selRect.right = endPt.x - 1.0;
-		selRect.bottom = endPt.y + endLineHeight - 1.0;
+		selRect.bottom = endPt.y + endLineHeight;
 		outRegion->Include(selRect);
 	}
 }
@@ -2145,11 +2159,16 @@
 	if (rect == fTextRect)
 		return;
 
+	// The text rect height is always calculated anyways to contain the
+	// whole text. But it is used here to remember the inset the user
+	// wanted.
 	bool needsRefresh = fTextRect.left != rect.left
 		 || fTextRect.right != rect.right || fTextRect.top != rect.top;
 
 	fLayoutData->UpdateInsets(Bounds().OffsetToCopy(B_ORIGIN), rect);
 
+	// When we already know we don't want to recalculate anything, we
+	// can just ignore the bottom coordinate the user provided.
 	if (!needsRefresh)
 		rect.bottom = fTextRect.bottom;
 
@@ -4298,6 +4317,8 @@
 		Select(fTrackingMouse->clickOffset, fTrackingMouse->clickOffset);
 
 	_StopMouseTracking();
+	// adjust cursor if necessary
+	_TrackMouse(where, NULL, true);
 
 	return true;
 }
@@ -4394,9 +4415,10 @@
 
 	if (message && AcceptsDrop(message))
 		_TrackDrag(where);
-	else if ((fSelectable || fEditable) && !textRegion.Contains(where))
+	else if ((fSelectable || fEditable)
+		&& (fTrackingMouse != NULL || !textRegion.Contains(where))) {
 		SetViewCursor(B_CURSOR_I_BEAM, force);
-	else
+	} else
 		SetViewCursor(B_CURSOR_SYSTEM_DEFAULT, force);
 }
 
@@ -4518,7 +4540,7 @@
 {
 	// Scroll the view a bit if mouse is outside the view bounds
 	BRect bounds = Bounds();
-	BPoint scrollBy;
+	BPoint scrollBy(B_ORIGIN);
 
 	BPoint constraint = fWhere;
 	constraint.ConstrainTo(bounds);
@@ -4533,27 +4555,35 @@
 			scrollBy.x = -value;
 	}
 
-	float lineHeight = 0;
-	float vertDiff = 0;
-	if (fWhere.y > bounds.bottom) {
-		lineHeight = LineHeight(LineAt(bounds.LeftBottom()));
-		vertDiff = fWhere.y - bounds.bottom;
-	} else if (fWhere.y < bounds.top) {
-		lineHeight = LineHeight(LineAt(bounds.LeftTop()));
-		vertDiff = fWhere.y - bounds.top; // negative value
+	if (CountLines() > 1) {
+		// scroll in Y only if multiple lines!
+
+		float lineHeight = 0;
+		float vertDiff = 0;
+		if (fWhere.y > bounds.bottom) {
+			lineHeight = LineHeight(LineAt(bounds.LeftBottom()));
+			vertDiff = fWhere.y - bounds.bottom;
+		} else if (fWhere.y < bounds.top) {
+			lineHeight = LineHeight(LineAt(bounds.LeftTop()));
+			vertDiff = fWhere.y - bounds.top; // negative value
+		}
+		// Always scroll vertically line by line or by multiples of that
+		// based on the distance of the cursor from the border of the view
+		// TODO: Refine this, I can't even remember how beos works here
+		scrollBy.y = lineHeight > 0 ? lineHeight * (int32)(floorf(vertDiff)
+			/ lineHeight) : 0;
+	
+		// prevent from scrolling out of view
+		if (scrollBy.y != 0.0) {
+			float bottomMax = floorf(fTextRect.bottom
+				+ fLayoutData->bottomInset);
+			if (bounds.bottom + scrollBy.y > bottomMax)
+				scrollBy.y = bottomMax - bounds.bottom;
+			else if (bounds.top + scrollBy.y < 0)
+				scrollBy.y = -bounds.top;
+		}
 	}
 
-	// Always scroll vertically line by line or by multiples of that
-	// based on the distance of the cursor from the border of the view
-	// TODO: Refine this, I can't even remember how beos works here
-	scrollBy.y = lineHeight > 0 ? lineHeight * (int32)(floorf(vertDiff)
-		/ lineHeight) : 0;
-
-	if (bounds.bottom + scrollBy.y > fTextRect.Height())
-		scrollBy.y = fTextRect.Height() - bounds.bottom;
-	else if (bounds.top + scrollBy.y < 0)
-		scrollBy.y = -bounds.top;
-
 	if (scrollBy != B_ORIGIN)
 		ScrollBy(scrollBy.x, scrollBy.y);
 }



From axeld at mail.berlios.de  Thu Apr  9 00:18:30 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 00:18:30 +0200
Subject: [Haiku-commits] r30047 - haiku/trunk/src/kits/mail
Message-ID: <200904082218.n38MIU7K029942@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 00:18:29 +0200 (Thu, 09 Apr 2009)
New Revision: 30047
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30047&view=rev

Modified:
   haiku/trunk/src/kits/mail/MailSettings.cpp
Log:
* Better defaults: the status window should be visible on all workspaces.


Modified: haiku/trunk/src/kits/mail/MailSettings.cpp
===================================================================
--- haiku/trunk/src/kits/mail/MailSettings.cpp	2009-04-08 22:10:27 UTC (rev 30046)
+++ haiku/trunk/src/kits/mail/MailSettings.cpp	2009-04-08 22:18:29 UTC (rev 30047)
@@ -1,6 +1,6 @@
 /*
  * Copyright 2001-2003 Dr. Zoidberg Enterprises. All rights reserved.
- * Copyright 2004-2007, Haiku Inc. All rights reserved.
+ * Copyright 2004-2009, Haiku Inc. All rights reserved.
  *
  * Distributed under the terms of the MIT License.
  */
@@ -10,14 +10,15 @@
 
 #include <MailSettings.h>
 
-#include <Message.h>
-#include <FindDirectory.h>
 #include <Directory.h>
+#include <Entry.h>
 #include <File.h>
-#include <Entry.h>
+#include <FindDirectory.h>
+#include <Message.h>
+#include <Messenger.h>
 #include <Path.h>
 #include <String.h>
-#include <Messenger.h>
+#include <Window.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -34,9 +35,8 @@
 
 //	#pragma mark - Chain methods
 
-//
-// To do
-//
+
+// TODO!
 BMailChain*
 NewMailChain()
 {
@@ -220,7 +220,7 @@
 			path.Path(), strerror(ret));
 		return ret;
 	}
-	
+
 	// clobber old settings
 	data = tmp;
 	return B_OK;
@@ -312,7 +312,11 @@
 int32
 BMailSettings::StatusWindowWorkspaces()
 {
-	return data.FindInt32("StatusWindowWorkSpace");
+	uint32 workspaces;
+	if (data.FindInt32("StatusWindowWorkSpace", (int32*)&workspaces) != B_OK)
+		return B_ALL_WORKSPACES;
+
+	return workspaces;
 }
 
 



From axeld at pinc-software.de  Wed Apr  8 22:26:41 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Wed, 08 Apr 2009 22:26:41
Subject: [Haiku-commits] r30045 - in haiku/trunk: headers/private/media
 src/kits/media
In-Reply-To: <49DD1E3A.1050400@arcor.de>
Message-ID: <53022201508-BeMail@quad>

Marcus Overhagen wrote:
> axeld at mail.berlios.de schrieb:
> > Log:
> > * BParameterWeb::StartWatching() now just calls 
> > BMediaRoster::StartWatching()
> >   as on Dano - since the functionality is already there, those two 
> > functions
> >   aren't really needed, though, so we could remove them again.
> Can you please remove those two calls again? They just bloat the API 
> and
> make it inconsistent. BMediaNode also doesn't have those functions, 
> and
> Dano isn't really a reference, more a failed experiment.

Okay, I'll do that; I didn't notice one can achieve the same thing 
using the BMediaRoster when I added them.

Bye,
   Axel.



From revol at free.fr  Thu Apr  9 00:30:15 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Thu, 09 Apr 2009 00:30:15 +0200 CEST
Subject: [Haiku-commits] r30045 - in haiku/trunk: headers/private/media
 src/kits/media
In-Reply-To: <53022201508-BeMail@quad>
Message-ID: <7915556659-BeMail@laptop>

> Marcus Overhagen wrote:
> > axeld at mail.berlios.de schrieb:
> > > Log:
> > > * BParameterWeb::StartWatching() now just calls 
> > > BMediaRoster::StartWatching()
> > >   as on Dano - since the functionality is already there, those 
> > > two 
> > > functions
> > >   aren't really needed, though, so we could remove them again.
> > Can you please remove those two calls again? They just bloat the 
> > API 
> > and
> > make it inconsistent. BMediaNode also doesn't have those functions, 
> > and
> > Dano isn't really a reference, more a failed experiment.
> 
> Okay, I'll do that; I didn't notice one can achieve the same thing 
> using the BMediaRoster when I added them.
> 

Again, Dano does handle watching even when the web doesn't belong to a 
media_node, which is not possible with the media roster...

Fran?ois.


From stippi at mail.berlios.de  Thu Apr  9 00:50:38 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Thu, 9 Apr 2009 00:50:38 +0200
Subject: [Haiku-commits] r30048 - haiku/trunk/src/kits/interface
Message-ID: <200904082250.n38MocnK013567@sheep.berlios.de>

Author: stippi
Date: 2009-04-09 00:50:35 +0200 (Thu, 09 Apr 2009)
New Revision: 30048
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30048&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
Changing the text selection region calculation was not such a good idea, it
needs more testing before I can do that, but in principle, I think the idea
was an ok one... :-)


Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-04-08 22:18:29 UTC (rev 30047)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-04-08 22:50:35 UTC (rev 30048)
@@ -2047,14 +2047,14 @@
 		selRect.left = max_c(startPt.x, fTextRect.left);
 		selRect.top = startPt.y;
 		selRect.right = endPt.x - 1.0;
-		selRect.bottom = endPt.y + endLineHeight;
+		selRect.bottom = endPt.y + endLineHeight - 1.0;
 		outRegion->Include(selRect);
 	} else {
 		// more than one line in the specified offset range
 		selRect.left = max_c(startPt.x, fTextRect.left);
 		selRect.top = startPt.y;
 		selRect.right = fTextRect.right;
-		selRect.bottom = startPt.y + startLineHeight;
+		selRect.bottom = startPt.y + startLineHeight - 1.0;
 		outRegion->Include(selRect);
 
 		if (startPt.y + startLineHeight < endPt.y) {
@@ -2062,14 +2062,14 @@
 			selRect.left = fTextRect.left;
 			selRect.top = startPt.y + startLineHeight;
 			selRect.right = fTextRect.right;
-			selRect.bottom = endPt.y;
+			selRect.bottom = endPt.y - 1.0;
 			outRegion->Include(selRect);
 		}
 
 		selRect.left = fTextRect.left;
 		selRect.top = endPt.y;
 		selRect.right = endPt.x - 1.0;
-		selRect.bottom = endPt.y + endLineHeight;
+		selRect.bottom = endPt.y + endLineHeight - 1.0;
 		outRegion->Include(selRect);
 	}
 }



From mmlr at mail.berlios.de  Thu Apr  9 01:54:59 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Thu, 9 Apr 2009 01:54:59 +0200
Subject: [Haiku-commits] r30049 - in haiku/trunk: headers/os/drivers/bus
	headers/private/drivers src/add-ons/kernel/bus_managers/ata
Message-ID: <200904082354.n38Nsxpj013126@sheep.berlios.de>

Author: mmlr
Date: 2009-04-09 01:54:52 +0200 (Thu, 09 Apr 2009)
New Revision: 30049
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30049&view=rev

Added:
   haiku/trunk/headers/os/drivers/bus/ATA.h
   haiku/trunk/headers/private/drivers/ata_types.h
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATACommands.h
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATATracing.h
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ata_device_infoblock.h
Log:
* Work in progress commit of a reworked ATA bus_manager. It's now object based,
  but doesn't really do anything more than before.
* It also replaces everything IDE with ATA counterparts and cleans up a lot
  of the definitions.
* Cleaning up the old ATA bus_manager as well as some license headers missing.


Added: haiku/trunk/headers/os/drivers/bus/ATA.h
===================================================================
--- haiku/trunk/headers/os/drivers/bus/ATA.h	2009-04-08 22:50:35 UTC (rev 30048)
+++ haiku/trunk/headers/os/drivers/bus/ATA.h	2009-04-08 23:54:52 UTC (rev 30049)
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2002/03, Thomas Kurschel. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef __ATA_H__
+#define __ATA_H__
+
+#include <device_manager.h>
+#include <KernelExport.h>
+
+// Controller Driver Node
+
+// attributes:
+
+// node type
+#define ATA_BUS_TYPE_NAME "bus/ide/v1"
+// maximum number of devices connected to controller (uint8, optional, default:2)
+#define ATA_CONTROLLER_MAX_DEVICES_ITEM "ide/max_devices"
+// set to not-0 if DMA is supported (uint8, optional, default:0)
+#define ATA_CONTROLLER_CAN_DMA_ITEM "ide/can_dma"
+// name of controller (string, required)
+#define ATA_CONTROLLER_CONTROLLER_NAME_ITEM "ide/controller_name"
+
+union ata_task_file;
+typedef unsigned int ata_reg_mask;
+
+// channel cookie, issued by ata bus manager
+typedef void *ata_channel;
+
+// interface of controller driver
+typedef struct {
+	driver_module_info info;
+
+	void (*set_channel)(void *cookie, ata_channel channel);
+
+	status_t (*write_command_block_regs)(void *channelCookie,
+		union ata_task_file *file, ata_reg_mask mask);
+	status_t (*read_command_block_regs)(void *channelCookie,
+		union ata_task_file *file, ata_reg_mask mask);
+
+	uint8 (*get_altstatus)(void *channelCookie);
+	status_t (*write_device_control)(void *channelCookie, uint8 val);
+
+	status_t (*write_pio)(void *channelCookie, uint16 *data, int count,
+		bool force16Bit);
+	status_t (*read_pio)(void *channelCookie, uint16 *data, int count,
+		bool force16Bit);
+
+	status_t (*prepare_dma)(void *channelCookie, const physical_entry *sg_list,
+		size_t sg_list_count, bool write);
+	status_t (*start_dma)(void *channelCookie);
+	status_t (*finish_dma)(void *channelCookie);
+} ata_controller_interface;
+
+
+// Interface for Controller Driver
+
+// interface of bus manager as seen from controller driver
+// use this interface as the fixed consumer of your controller driver
+typedef struct {
+	driver_module_info info;
+
+	// status - status read from controller (_not_ alt_status, as reading
+	//          normal status acknowledges IRQ request of device)
+	status_t	(*interrupt_handler)(ata_channel channel, uint8 status);
+} ata_for_controller_interface;
+
+#define ATA_FOR_CONTROLLER_MODULE_NAME "bus_managers/ide/controller/driver_v1"
+
+#endif	/* __ATA_H__ */

Added: haiku/trunk/headers/private/drivers/ata_types.h
===================================================================
--- haiku/trunk/headers/private/drivers/ata_types.h	2009-04-08 22:50:35 UTC (rev 30048)
+++ haiku/trunk/headers/private/drivers/ata_types.h	2009-04-08 23:54:52 UTC (rev 30049)
@@ -0,0 +1,284 @@
+/*
+ * Copyright 2002/03, Thomas Kurschel. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef __ATA_TYPES_H__
+#define __ATA_TYPES_H__
+
+#include <iovec.h>
+#include <lendian_bitfield.h>
+
+// ATA task file.
+// contains the command block interpreted under different conditions with
+// first byte being first command register, second byte second command register
+// etc.; for lba48, registers must be written twice, therefore there
+// are twice as many bytes as registers - the first eight bytes are those
+// that must be written first, the second eight bytes are those that
+// must be written second.
+union ata_task_file {
+	struct {
+		uint8	features;
+		uint8	sector_count;
+		uint8	sector_number;
+		uint8	cylinder_0_7;
+		uint8	cylinder_8_15;
+		LBITFIELD8_3(
+			head				: 4,
+			device				: 1,
+			mode				: 3
+		);
+		uint8	command;
+	} chs;
+	struct {
+		uint8	features;
+		uint8	sector_count;
+		uint8	lba_0_7;
+		uint8	lba_8_15;
+		uint8	lba_16_23;
+		LBITFIELD8_3(
+			lba_24_27			: 4,
+			device				: 1,
+			mode				: 3
+		);
+		uint8	command;
+	} lba;
+	struct {
+		LBITFIELD8_3(
+			dma					: 1,
+			ovl					: 1,
+			_0_res2				: 6
+		);
+		LBITFIELD8_2(
+			_1_res0				: 3,
+			tag					: 5
+		);
+		uint8	_2_res;
+		uint8	byte_count_0_7;
+		uint8	byte_count_8_15;
+		LBITFIELD8_6(
+			lun					: 3,
+			_5_res3				: 1,
+			device				: 1,
+			_5_one5				: 1,
+			_5_res6				: 1,
+			_5_one7				: 1
+		);
+		uint8	command;
+	} packet;
+	struct {
+		LBITFIELD8_5(
+			ili					: 1,
+			eom					: 1,
+			abrt				: 1,
+			_0_res3				: 1,
+			sense_key			: 4
+		);
+		LBITFIELD8_4(
+			cmd_or_data			: 1,	// 1 - cmd, 0 - data
+			input_or_output	 	: 1,	// 0 - input (to device), 1 - output
+			release				: 1,
+			tag					: 5
+		);
+		uint8	_2_res;
+		uint8	byte_count_0_7;
+		uint8	byte_count_8_15;
+		LBITFIELD8_5(
+			_4_res0				: 4,
+			device				: 1,
+			_4_obs5				: 1,
+			_4_res6				: 1,
+			_4_obs7				: 1
+		);
+		LBITFIELD8_7(
+			chk					: 1,
+			_7_res1 			: 2,
+			drq					: 1,
+			serv				: 1,
+			dmrd				: 1,
+			drdy				: 1,
+			bsy					: 1
+		);
+	} packet_res;
+	struct {
+		uint8	sector_count;
+		LBITFIELD8_4(					// only <tag> is defined for write
+			cmd_or_data			: 1,	// 1 - cmd, 0 - data
+			input_or_output		: 1,	// 0 - input (to device), 1 - output
+			release				: 1,
+			tag					: 5
+		);
+		uint8	lba_0_7;
+		uint8	lba_8_15;
+		uint8	lba_16_23;
+		LBITFIELD8_3(
+			lba_24_27			: 4,
+			device				: 1,
+			mode				: 3
+		);
+		uint8	command;
+	} queued;
+	struct {
+		// low order bytes
+		uint8	features;
+		uint8	sector_count_0_7;
+		uint8	lba_0_7;
+		uint8	lba_8_15;
+		uint8	lba_16_23;
+		LBITFIELD8_3(
+			_5low_res0			: 4,
+			device				: 1,
+			mode				: 3
+		);
+		uint8	command;
+
+		// high order bytes
+		uint8	_0high_res;
+		uint8	sector_count_8_15;
+		uint8	lba_24_31;
+		uint8	lba_32_39;
+		uint8	lba_40_47;
+	} lba48;
+	struct {
+		// low order bytes
+		uint8	sector_count_0_7;
+		LBITFIELD8_4(
+			cmd_or_data			: 1,	// 1 - cmd, 0 - data
+			input_or_output	 	: 1,	// 0 - input (to device), 1 - output
+			release				: 1,
+			tag					: 5
+		);
+		uint8	lba_0_7;
+		uint8	lba_8_15;
+		uint8	lba_16_23;
+		LBITFIELD8_3(
+			_5low_res0			: 4,
+			device				: 1,
+			mode				: 3
+		);
+		uint8	command;
+
+		// high order bytes
+		uint8	sector_count_8_15;
+		uint8	_1high_res;
+		uint8	lba_24_31;
+		uint8	lba_32_39;
+		uint8	lba_40_47;
+	} queued48;
+	struct {
+		uint8	r[7+5];
+	} raw;
+	struct {
+		uint8	features;
+		uint8	sector_count;
+		uint8	sector_number;
+		uint8	cylinder_low;
+		uint8	cylinder_high;
+		uint8	device_head;
+		uint8	command;
+	} write;
+	struct {
+		uint8	error;
+		uint8	sector_count;
+		uint8	sector_number;
+		uint8	cylinder_low;
+		uint8	cylinder_high;
+		uint8	device_head;
+		uint8	status;
+	} read;
+};
+
+typedef union ata_task_file ata_task_file;
+
+// content of "mode" field
+enum {
+	ATA_MODE_CHS = 5,
+	ATA_MODE_LBA = 7
+};
+
+// mask for ata_task_file fields to be written
+enum {
+	ATA_MASK_FEATURES	 				= 0x01,
+	ATA_MASK_SECTOR_COUNT				= 0x02,
+
+	// CHS
+	ATA_MASK_SECTOR_NUMBER				= 0x04,
+	ATA_MASK_CYLINDER_LOW				= 0x08,
+	ATA_MASK_CYLINDER_HIGH				= 0x10,
+
+	// LBA
+	ATA_MASK_LBA_LOW					= 0x04,
+	ATA_MASK_LBA_MID					= 0x08,
+	ATA_MASK_LBA_HIGH					= 0x10,
+
+	// packet
+	ATA_MASK_BYTE_COUNT					= 0x18,
+	
+	// packet and dma queued result
+	ATA_MASK_ERROR						= 0x01,
+	ATA_MASK_IREASON					= 0x02,
+
+	ATA_MASK_DEVICE_HEAD				= 0x20,
+	ATA_MASK_COMMAND					= 0x40,
+	
+	ATA_MASK_STATUS						= 0x40,
+
+	// for 48 bits, the following flags tell which registers to load twice
+	ATA_MASK_FEATURES_48				= 0x80 | ATA_MASK_FEATURES,
+	ATA_MASK_SECTOR_COUNT_48			= 0x100 | ATA_MASK_SECTOR_COUNT,
+	ATA_MASK_LBA_LOW_48					= 0x200 | ATA_MASK_LBA_LOW,
+	ATA_MASK_LBA_MID_48					= 0x400 | ATA_MASK_LBA_MID,
+	ATA_MASK_LBA_HIGH_48				= 0x800 | ATA_MASK_LBA_HIGH,
+	
+	ATA_MASK_HOB						= 0xf80
+};
+
+// status register
+enum {
+	ATA_STATUS_ERROR					= 0x01,		// error
+	ATA_STATUS_INDEX					= 0x02,		// obsolete
+	ATA_STATUS_CORR						= 0x04,		// obsolete
+	ATA_STATUS_DATA_REQUEST				= 0x08,		// data request
+	ATA_STATUS_DSC						= 0x10,		// reserved
+	ATA_STATUS_SERVICE					= 0x10,		// ready to service device
+	ATA_STATUS_DWF						= 0x20,		// reserved
+	ATA_STATUS_DMA						= 0x20,		// reserved
+	ATA_STATUS_DMA_READY				= 0x20,		// packet: DMA ready
+	ATA_STATUS_DISK_FAILURE				= 0x20,		// packet: disk failure
+	ATA_STATUS_DEVICE_READY				= 0x40,		// device ready
+	ATA_STATUS_BUSY						= 0x80		// busy
+};
+
+// device control register
+enum {
+												// bit 0 must be zero
+	ATA_DEVICE_CONTROL_DISABLE_INTS		= 0x02,	// disable INTRQ
+	ATA_DEVICE_CONTROL_SOFT_RESET		= 0x04,	// software device reset
+	ATA_DEVICE_CONTROL_BIT3				= 0x08,	// don't know, but must be set
+												// bits inbetween are reserved
+	ATA_DEVICE_CONTROL_HIGH_ORDER_BYTE	= 0x80	// read high order byte
+												// (for 48-bit lba)
+};
+
+// error register - most bits are command specific
+enum {
+	// always used
+	ATA_ERROR_ABORTED					= 0x04,		// command aborted
+
+	// used for Ultra DMA modes
+	ATA_ERROR_INTERFACE_CRC				= 0x80,		// interface CRC error
+
+	// used by reading data transfers
+	ATA_ERROR_UNCORRECTABLE				= 0x40,		// uncorrectable data error
+	// used by writing data transfers
+	ATA_ERROR_WRITE_PROTECTED			= 0x40,		// media write protect
+
+	// used by all data transfer commands
+	ATA_ERROR_MEDIUM_CHANGED			= 0x20,		// medium changed
+	ATA_ERROR_INVALID_ADDRESS			= 0x10,		// invalid CHS address
+	ATA_ERROR_MEDIA_CHANGE_REQUESTED	= 0x08,		// media change requested
+	ATA_ERROR_NO_MEDIA					= 0x02,		// no media
+};
+
+typedef struct ata_channel_info *ata_channel_cookie;
+
+#endif	/* __ATA_TYPES_H__ */

Added: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-08 22:50:35 UTC (rev 30048)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-08 23:54:52 UTC (rev 30049)
@@ -0,0 +1,888 @@
+#include "ATAPrivate.h"
+
+ATAChannel::ATAChannel(device_node *node)
+	:	fNode(node),
+		fChannelID(0),
+		fController(NULL),
+		fCookie(NULL),
+		fStatus(B_NO_INIT),
+		fSCSIBus(NULL),
+		fDeviceCount(0),
+		fDevices(NULL),
+		fUseDMA(false),
+		fRequest(NULL)
+{
+	mutex_init(&fLock, "ata channel");
+
+	if (fUseDMA) {
+		void *settings = load_driver_settings(B_SAFEMODE_DRIVER_SETTINGS);
+		if (settings != NULL) {
+			if (get_driver_boolean_parameter(settings,
+				B_SAFEMODE_DISABLE_IDE_DMA, false, false)) {
+				TRACE("disabling dma because of safemode setting\n");
+				fUseDMA = false;
+			}
+
+			unload_driver_settings(settings);
+		}
+	}
+
+	if (fUseDMA) {
+		uint8 canDMA;
+		if (gDeviceManager->get_attr_uint8(node, ATA_CONTROLLER_CAN_DMA_ITEM,
+			&canDMA, true) != B_OK || canDMA == 0) {
+			fUseDMA = false;
+		}
+	}
+
+	fRequest = new(std::nothrow) ATARequest();
+	if (fRequest == NULL) {
+		fStatus = B_NO_MEMORY;
+		return;
+	}
+
+	uint8 maxDevices = 2;
+	if (gDeviceManager->get_attr_uint8(node, ATA_CONTROLLER_MAX_DEVICES_ITEM,
+		&maxDevices, true) != B_OK) {
+		maxDevices = 2;
+	}
+
+	fDeviceCount = MIN(maxDevices, 2);
+	fDevices = new(std::nothrow) ATADevice *[fDeviceCount];
+	if (fDevices == NULL) {
+		fStatus = B_NO_MEMORY;
+		return;
+	}
+
+	for (uint8 i = 0; i < fDeviceCount; i++)
+		fDevices[i] = NULL;
+
+
+	gDeviceManager->get_attr_uint32(node, ATA_CHANNEL_ID_ITEM, &fChannelID,
+		true);
+	snprintf(fDebugContext, sizeof(fDebugContext), " %lu", fChannelID);
+
+	device_node *parent = gDeviceManager->get_parent_node(node);
+	fStatus = gDeviceManager->get_driver(parent,
+		(driver_module_info **)&fController, &fCookie);
+	gDeviceManager->put_node(parent);
+}
+
+
+ATAChannel::~ATAChannel()
+{
+	mutex_lock(&fLock);
+
+	if (fDevices) {
+		for (uint8 i = 0; i < fDeviceCount; i++)
+			delete fDevices[i];
+		delete [] fDevices;
+	}
+
+	delete fRequest;
+	mutex_destroy(&fLock);
+}
+
+
+status_t
+ATAChannel::InitCheck()
+{
+	return fStatus;
+}
+
+
+void
+ATAChannel::SetBus(scsi_bus bus)
+{
+	fSCSIBus = bus;
+}
+
+
+status_t
+ATAChannel::ScanBus()
+{
+	bool devicePresent[fDeviceCount];
+	uint32 deviceSignature[fDeviceCount];
+	status_t result = Reset(devicePresent, deviceSignature);
+	if (result != B_OK) {
+		TRACE_ERROR("resetting the channel failed\n");
+		return result;
+	}
+
+	for (uint8 i = 0; i < fDeviceCount; i++) {
+		if (!devicePresent[i])
+			continue;
+
+		ATADevice *device = NULL;
+		if (deviceSignature[i] == ATA_SIGNATURE_ATAPI)
+			device = new(std::nothrow) ATAPIDevice(this, i);
+		else
+			device = new(std::nothrow) ATADevice(this, i);
+
+		if (device == NULL)
+			return B_NO_MEMORY;
+
+		TRACE("trying ATA%s device %u\n", device->IsATAPI() ? "PI" : "", i);
+
+		bool identified = device->Identify() == B_OK;
+		if (!identified && !device->IsATAPI()) {
+			// retry as atapi
+			delete device;
+			device = new(std::nothrow) ATAPIDevice(this, i);
+			if (device == NULL)
+				return B_NO_MEMORY;
+
+			identified = device->Identify() == B_OK;
+		}
+
+		if (!identified) {
+			delete device;
+			continue;
+		}
+
+		TRACE_ALWAYS("identified ATA%s device %u\n", device->IsATAPI()
+			? "PI" : "", i);
+
+		if (device->Configure() != B_OK) {
+			TRACE_ERROR("failed to configure device\n");
+			delete device;
+			continue;
+		}
+
+		fDevices[i] = device;
+	}
+
+	return B_OK;
+}
+
+
+void
+ATAChannel::PathInquiry(scsi_path_inquiry *info)
+{
+	info->hba_inquiry = SCSI_PI_TAG_ABLE | SCSI_PI_WIDE_16;
+	info->hba_misc = 0;
+	info->sim_priv = 0;
+	info->initiator_id = 2;
+	info->hba_queue_size = 1;
+	memset(info->vuhba_flags, 0, sizeof(info->vuhba_flags));
+
+	strlcpy(info->sim_vid, "Haiku", SCSI_SIM_ID);
+
+	const char *controllerName = NULL;
+	if (gDeviceManager->get_attr_string(fNode,
+		SCSI_DESCRIPTION_CONTROLLER_NAME, &controllerName, true) == B_OK)
+		strlcpy(info->hba_vid, controllerName, SCSI_HBA_ID);
+	else
+		strlcpy(info->hba_vid, "unknown", SCSI_HBA_ID);
+
+	strlcpy(info->sim_version, "1.0", SCSI_VERS);
+	strlcpy(info->hba_version, "1.0", SCSI_VERS);
+	strlcpy(info->controller_family, "ATA", SCSI_FAM_ID);
+	strlcpy(info->controller_type, "ATA", SCSI_TYPE_ID);
+}
+
+
+void
+ATAChannel::GetRestrictions(uint8 targetID, bool *isATAPI, bool *noAutoSense,
+	uint32 *maxBlocks)
+{
+	// we always indicate ATAPI so we have to emulate fewer commands
+	*isATAPI = true;
+	*noAutoSense = false;
+
+	if (targetID < fDeviceCount && fDevices[targetID] != NULL
+		&& fDevices[targetID]->IsATAPI()) {
+		*noAutoSense = true;
+	}
+
+	*maxBlocks = 255;
+}
+
+
+status_t
+ATAChannel::ExecuteIO(scsi_ccb *ccb)
+{
+	TRACE_FUNCTION("%p\n", ccb);
+	if (mutex_trylock(&fLock) != B_OK)
+		return B_BUSY;
+
+	MutexLocker _(&fLock, true);
+
+	fRequest->SetCCB(ccb);
+	if (ccb->cdb[0] == SCSI_OP_REQUEST_SENSE) {
+		fRequest->RequestSense();
+		fRequest->Finish(false);
+		return B_OK;
+	}
+
+	if (ccb->target_id >= fDeviceCount) {
+		TRACE_ERROR("invalid target device\n");
+		fRequest->SetStatus(SCSI_SEL_TIMEOUT);
+		fRequest->Finish(false);
+		return B_BAD_INDEX;
+	}
+
+	ATADevice *device = fDevices[ccb->target_id];
+	if (device == NULL) {
+		TRACE_ERROR("target device not present\n");
+		fRequest->SetStatus(SCSI_SEL_TIMEOUT);
+		fRequest->Finish(false);
+		return B_BAD_INDEX;
+	}
+
+	fRequest->SetTimeout(ccb->timeout > 0 ? ccb->timeout * 1000 * 1000
+		: ATA_STANDARD_TIMEOUT);
+
+	status_t result = device->ExecuteIO(fRequest);
+	fRequest->Finish(false);
+	return result;
+}
+
+
+status_t
+ATAChannel::SelectDevice(uint8 device)
+{
+	TRACE_FUNCTION("device: %u\n", device);
+
+	if (device > 1)
+		return B_BAD_INDEX;
+
+	ata_task_file taskFile;
+	taskFile.chs.head = 0;
+	taskFile.chs.mode = ATA_MODE_LBA;
+	taskFile.chs.device = device;
+
+	_WriteRegs(&taskFile, ATA_MASK_DEVICE_HEAD);
+	_FlushAndWait(1);
+
+#if KDEBUG > 0
+	// for debugging only
+	_ReadRegs(&taskFile, ATA_MASK_DEVICE_HEAD);
+	if (taskFile.chs.device != device) {
+		TRACE_ERROR("device %d not selected! head 0x%x, mode 0x%x, device %d\n",
+			device, taskFile.chs.head, taskFile.chs.mode, taskFile.chs.device);
+		return B_ERROR;
+	}
+#endif
+
+	return B_OK;
+}
+
+
+bool
+ATAChannel::IsDevicePresent(uint8 device)
+{
+	if (SelectDevice(device) != B_OK)
+		return false;
+
+	ata_task_file taskFile;
+	taskFile.chs.device = device;
+	taskFile.chs.mode = ATA_MODE_LBA;
+	taskFile.chs.command = ATA_COMMAND_NOP;
+	_WriteRegs(&taskFile, ATA_MASK_DEVICE_HEAD);
+
+	_FlushAndWait(10);
+
+	_ReadRegs(&taskFile, ATA_MASK_STATUS | ATA_MASK_ERROR);
+	TRACE("status: 0x%02x; error: 0x%02x\n", taskFile.read.status,
+		taskFile.read.error);
+	return (taskFile.read.status & 0xf8) != 0xf8
+		&& taskFile.read.status != 0xa5;
+}
+
+
+status_t
+ATAChannel::Reset(bool *presence, uint32 *signatures)
+{
+	TRACE_FUNCTION("%p, %p\n", presence, signatures);
+
+	bool devicePresent[fDeviceCount];
+	for (uint8 i = 0; i < fDeviceCount; i++) {
+		devicePresent[i] = IsDevicePresent(i);
+		TRACE("device %d: %s present\n", i, devicePresent[i] ? "might be" : "is not");
+	}
+
+	SelectDevice(0);
+
+	// disable interrupts and assert SRST for at least 5 usec
+	if (_WriteControl(ATA_DEVICE_CONTROL_DISABLE_INTS
+		| ATA_DEVICE_CONTROL_SOFT_RESET) != B_OK) {
+		TRACE_ERROR("failed to set reset signaling\n");
+		return B_ERROR;
+	}
+
+	_FlushAndWait(20);
+
+	// clear reset and wait for at least 2 ms (wait 150ms like everyone else)
+	if (_WriteControl(ATA_DEVICE_CONTROL_DISABLE_INTS) != B_OK) {
+		TRACE_ERROR("failed to clear reset signaling\n");
+		return B_ERROR;
+	}
+
+	_FlushAndWait(150 * 1000);
+
+	for (uint8 i = 0; i < fDeviceCount; i++) {
+		if (presence != NULL)
+			presence[i] = devicePresent[i];
+
+		if (!devicePresent[i])
+			continue;
+
+		SelectDevice(i);
+
+		// wait up to 31 seconds for busy to clear
+		if (Wait(0, ATA_STATUS_BUSY, 0, 31 * 1000 * 1000) != B_OK) {
+			TRACE_ERROR("reset timeout\n");
+			return B_TIMED_OUT;
+		}
+
+		ata_task_file taskFile;
+		if (_ReadRegs(&taskFile, ATA_MASK_SECTOR_COUNT | ATA_MASK_LBA_LOW
+			| ATA_MASK_LBA_MID | ATA_MASK_LBA_HIGH | ATA_MASK_ERROR) != B_OK) {
+			TRACE_ERROR("reading status failed\n");
+			return B_ERROR;
+		}
+
+		if (taskFile.read.error != 0x01
+			&& (i > 0 || taskFile.read.error != 0x81)) {
+			TRACE_ERROR("device %d failed, error code is 0x%02x\n", i,
+				taskFile.read.error);
+		}
+
+		if (i == 0 && taskFile.read.error >= 0x80) {
+			TRACE_ERROR("device %d indicates that other device failed"
+				" with code 0x%02x\n", i, taskFile.read.error);
+		}
+
+		if (signatures != NULL) {
+			signatures[i] = taskFile.lba.sector_count
+				| (((uint32)taskFile.lba.lba_0_7) << 8)
+				| (((uint32)taskFile.lba.lba_8_15) << 16)
+				| (((uint32)taskFile.lba.lba_16_23) << 24);
+		}
+	}
+
+	return B_OK;
+}
+
+
+status_t
+ATAChannel::Wait(uint8 setBits, uint8 clearedBits, uint32 flags,
+	bigtime_t timeout)
+{
+	bigtime_t startTime = system_time();
+	_FlushAndWait(1);
+
+	while (true) {
+		uint8 status = _AltStatus();
+		if ((flags & ATA_CHECK_ERROR_BIT) != 0
+			&& (status & ATA_STATUS_ERROR) != 0)
+			return B_ERROR;
+
+		if ((status & setBits) == setBits && (status & clearedBits) == 0)
+			return B_OK;
+
+		bigtime_t elapsedTime = system_time() - startTime;
+		//TRACE("wait status after %lld: %u\n", elapsedTime, status);
+		if (elapsedTime > timeout)
+			return B_TIMED_OUT;
+
+		// The device may be ready almost immediatelly. If it isn't,
+		// poll often during the first 20ms, otherwise poll lazyly.
+		if (elapsedTime < 500)
+			spin(1);
+		else if (elapsedTime < 20000)
+			snooze(1000);
+		else
+			snooze(50000);
+	}
+
+	return B_ERROR;
+}
+
+
+status_t
+ATAChannel::WaitDataRequest(bool high)
+{
+	return Wait(high ? ATA_STATUS_DATA_REQUEST : 0,
+		high ? 0 : ATA_STATUS_DATA_REQUEST,
+		ATA_CHECK_ERROR_BIT, (high ? 10 : 1) * 1000 * 1000);
+}
+
+
+status_t
+ATAChannel::WaitDeviceReady()
+{
+	return Wait(ATA_STATUS_DEVICE_READY, 0, 0, 5 * 1000 * 1000);
+}
+
+
+status_t
+ATAChannel::WaitForIdle()
+{
+	return Wait(0, ATA_STATUS_BUSY | ATA_STATUS_DATA_REQUEST, 0, 20 * 1000);
+}
+
+
+status_t
+ATAChannel::SendRequest(ATARequest *request, uint32 flags)
+{
+	ATADevice *device = request->Device();
+	if (device->Select() != B_OK || WaitForIdle() != B_OK) {
+		// resetting the device here will discard current configuration,
+		// it's better when the SCSI bus manager requests an external reset.
+		TRACE_ERROR("device selection timeout\n");
+		request->SetStatus(SCSI_SEL_TIMEOUT);
+		return B_TIMED_OUT;
+	}
+
+	if ((flags & ATA_DEVICE_READY_REQUIRED) != 0
+		&& (_AltStatus() & ATA_STATUS_DEVICE_READY) == 0) {
+		TRACE_ERROR("device ready not set\n");
+		request->SetStatus(SCSI_SEQUENCE_FAIL);
+		return B_ERROR;
+	}
+
+	if (_WriteRegs(device->TaskFile(), device->RegisterMask()
+		| ATA_MASK_COMMAND) != B_OK) {
+		TRACE_ERROR("can't write command\n");
+		request->SetStatus(SCSI_HBA_ERR);
+		return B_ERROR;
+	}
+
+	return B_OK;
+}
+
+
+status_t
+ATAChannel::FinishRequest(ATARequest *request, uint32 flags, uint8 errorMask)
+{
+	if (flags & ATA_WAIT_FINISH) {
+		// wait for the device to finish current command (device no longer busy)
+		status_t result = Wait(0, ATA_STATUS_BUSY, 0, request->Timeout());
+		if (result != B_OK) {
+			TRACE_ERROR("timeout\n");
+			request->SetStatus(SCSI_CMD_TIMEOUT);
+			return result;
+		}
+	}
+
+	ata_task_file *taskFile = request->Device()->TaskFile();
+
+	// read status, this also acknowledges pending interrupts
+	status_t result = _ReadRegs(taskFile, ATA_MASK_STATUS | ATA_MASK_ERROR);
+	if (result != B_OK) {
+		TRACE("reading status failed\n");
+		request->SetStatus(SCSI_SEQUENCE_FAIL);
+		return result;
+	}
+
+	if (taskFile->read.status & ATA_STATUS_BUSY) {
+		TRACE("command failed, device still busy\n");
+		request->SetStatus(SCSI_SEQUENCE_FAIL);
+		return B_ERROR;
+	}
+
+	if ((flags & ATA_DEVICE_READY_REQUIRED)
+		&& (taskFile->read.status & ATA_STATUS_DEVICE_READY) == 0) {
+		TRACE("command failed, device ready required but not set\n");
+		request->SetStatus(SCSI_SEQUENCE_FAIL);
+		return B_ERROR;
+	}
+
+	if ((taskFile->read.status & ATA_STATUS_ERROR) == 0)
+		return B_OK;
+
+	request->SetStatus(SCSI_SEQUENCE_FAIL);
+	TRACE_ERROR("command failed, error bit is set\n");
+	uint8 error = taskFile->read.error & errorMask;
+	if (error & ATA_ERROR_INTERFACE_CRC) {
+		TRACE_ERROR("interface crc error\n");
+		request->SetSense(SCSIS_KEY_HARDWARE_ERROR, SCSIS_ASC_LUN_COM_CRC);
+		return B_ERROR;
+	}
+
+	if (flags & ATA_IS_WRITE) {
+		if (error & ATA_ERROR_WRITE_PROTECTED) {
+			request->SetSense(SCSIS_KEY_DATA_PROTECT, SCSIS_ASC_WRITE_PROTECTED);
+			return B_ERROR;
+		}
+	} else {
+		if (error & ATA_ERROR_UNCORRECTABLE) {
+			request->SetSense(SCSIS_KEY_MEDIUM_ERROR, SCSIS_ASC_UNREC_READ_ERR);
+			return B_ERROR;
+		}
+	}
+
+	if (error & ATA_ERROR_MEDIUM_CHANGED) {
+		request->SetSense(SCSIS_KEY_UNIT_ATTENTION, SCSIS_ASC_MEDIUM_CHANGED);
+		return B_ERROR;
+	}
+
+	if (error & ATA_ERROR_INVALID_ADDRESS) {
+		// XXX strange error code, don't really know what it means
+		request->SetSense(SCSIS_KEY_MEDIUM_ERROR, SCSIS_ASC_RANDOM_POS_ERROR);
+		return B_ERROR;
+	}
+
+	if (error & ATA_ERROR_MEDIA_CHANGE_REQUESTED) {
+		request->SetSense(SCSIS_KEY_UNIT_ATTENTION, SCSIS_ASC_REMOVAL_REQUESTED);
+		return B_ERROR;
+	}
+
+	if (error & ATA_ERROR_NO_MEDIA) {
+		request->SetSense(SCSIS_KEY_MEDIUM_ERROR, SCSIS_ASC_NO_MEDIUM);
+		return B_ERROR;
+	}
+
+	if (error & ATA_ERROR_ABORTED) {
+		request->SetSense(SCSIS_KEY_ABORTED_COMMAND, SCSIS_ASC_NO_SENSE);
+		return B_ERROR;
+	}
+
+	// either there was no error bit set or it was masked out
+	request->SetSense(SCSIS_KEY_HARDWARE_ERROR, SCSIS_ASC_INTERNAL_FAILURE);
+	return B_ERROR;
+}
+
+
+status_t
+ATAChannel::ExecuteDMATransfer(ATARequest *request)
+{
+	TRACE_ERROR("dma transfers unimplemented\n");
+	request->SetStatus(SCSI_SEQUENCE_FAIL);
+	return B_ERROR;
+}
+
+
+status_t
+ATAChannel::ExecutePIOTransfer(ATARequest *request)
+{
+	bigtime_t timeout = request->Timeout();
+	status_t result = B_OK;
+	uint32 *blocksLeft = request->BlocksLeft();
+	while (*blocksLeft > 0) {
+		if (Wait(ATA_STATUS_DATA_REQUEST, ATA_STATUS_BUSY, 0, timeout) != B_OK) {
+			TRACE_ERROR("timeout waiting for device to request data\n");
+			result = B_TIMED_OUT;
+			break;
+		}
+
+		if (request->IsWrite()) {
+			result = _WritePIOBlock(request, 512);
+			if (result != B_OK) {
+				TRACE_ERROR("failed to write pio block\n");
+				break;
+			}
+		} else {
+			result = _ReadPIOBlock(request, 512);
+			if (result != B_OK) {
+				TRACE_ERROR("failed to read pio block\n");
+				break;
+			}
+		}
+
+		(*blocksLeft)--;
+
+		// wait 1 pio cycle
+		if (*blocksLeft > 0)
+			_AltStatus();
+	}
+
+	if (result == B_OK && WaitDataRequest(false) != B_OK) {
+		TRACE_ERROR("device still expects data transfer\n");
+		result = B_ERROR;
+	}
+
+	if (result == B_OK) {
+		result = FinishRequest(request, ATA_WAIT_FINISH
+			| ATA_DEVICE_READY_REQUIRED, ATA_ERROR_ABORTED);
+	}
+
+	if (result != B_OK)
+		request->SetStatus(SCSI_SEQUENCE_FAIL);
+
+	return result;
+}
+
+
+status_t
+ATAChannel::ReadPIO(uint8 *buffer, size_t length)
+{
+	return fController->read_pio(fCookie, (uint16 *)buffer,
+		length / sizeof(uint16), false);
+}
+
+
+status_t
+ATAChannel::_ReadRegs(ata_task_file *taskFile, ata_reg_mask mask)
+{
+	return fController->read_command_block_regs(fCookie, taskFile, mask);
+}
+
+
+status_t
+ATAChannel::_WriteRegs(ata_task_file *taskFile, ata_reg_mask mask)
+{
+	return fController->write_command_block_regs(fCookie, taskFile, mask);
+}
+

[... truncated: 2010 lines follow ...]


From phoudoin at mail.berlios.de  Thu Apr  9 02:35:30 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Thu, 9 Apr 2009 02:35:30 +0200
Subject: [Haiku-commits] r30050 - in haiku/trunk/src/kits/opengl: . mesa
	mesa/glapi
Message-ID: <200904090035.n390ZULx017428@sheep.berlios.de>

Author: phoudoin
Date: 2009-04-09 02:35:23 +0200 (Thu, 09 Apr 2009)
New Revision: 30050
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30050&view=rev

Modified:
   haiku/trunk/src/kits/opengl/Jamfile
   haiku/trunk/src/kits/opengl/mesa/Jamfile
   haiku/trunk/src/kits/opengl/mesa/glapi/glthread.h
Log:
* Reworked Mesa's GL API dispatching/implementation separation: 
  
  Before, it was spread in libmesa.a *and* mesa_arch_$(TARGET_ARCH).o, 
  the later was broken for non-x86 targets.
  
  Now, GL API dispatching is entirely in glapi-dispatching.o, 
  while libmesa.a contains only the software GL implementation.
  
* This should fix PPC libGL.so build - UNTESTED
* Added SPARC assembly code introduced by Mesa 7.2 and sooner - UNTESTED
* Removed a non-longer need workaround in glthread.h.



Modified: haiku/trunk/src/kits/opengl/Jamfile
===================================================================
--- haiku/trunk/src/kits/opengl/Jamfile	2009-04-08 23:54:52 UTC (rev 30049)
+++ haiku/trunk/src/kits/opengl/Jamfile	2009-04-09 00:35:23 UTC (rev 30050)
@@ -29,6 +29,8 @@
 	} else if $(TARGET_ARCH) = ppc {
 		# Not yet supported, as current Mesa3D PPC assembly is Linux-dependent!
 		# defines += USE_PPC_ASM ;
+	} else if $(TARGET_ARCH) = sparc {
+		defines += USE_SPARC_ASM ;
 	}
 
 	defines = [ FDefines $(defines) ] ;
@@ -44,8 +46,8 @@
 
 	:
 
-	# Mesa optimized GL dispatching code (if any) for this target architecture 
-	<opengl>mesa_arch_$(TARGET_ARCH).o
+	# Mesa GL API dispatching code
+	<mesa>glapi-dispatching.o
 
 	# GLU API is included in libGL.so under BeOS R5, not a separate libglu.so library
 	<opengl>sgi-glu.o
@@ -53,8 +55,6 @@
 	# GLUT API is included in libGL.so under Haiku, not a separate libglut.so library
 	<opengl>glut.o 
 
-	libmesa.a		# For GL API dispatching, mostly 
-
 	# External libs:
 	be 
 	game			# BWindowScreen needed by BGLScreen stub class 

Modified: haiku/trunk/src/kits/opengl/mesa/Jamfile
===================================================================
--- haiku/trunk/src/kits/opengl/mesa/Jamfile	2009-04-08 23:54:52 UTC (rev 30049)
+++ haiku/trunk/src/kits/opengl/mesa/Jamfile	2009-04-09 00:35:23 UTC (rev 30050)
@@ -62,9 +62,11 @@
 
 	if $(TARGET_ARCH) = x86 {
 		defines += USE_X86_ASM USE_MMX_ASM USE_3DNOW_ASM USE_SSE_ASM ;
-	} else {
+	} else if $(TARGET_ARCH) = ppc {
 		# Not yet supported, as current Mesa3D PPC assembly is Linux-dependent!
 		# defines += USE_PPC_ASM ;
+	} else if $(TARGET_ARCH) = sparc {
+		defines += USE_SPARC_ASM ;
 	}
 
 	defines = [ FDefines $(defines) ] ;
@@ -115,18 +117,21 @@
 
 	arch_sources = 
 		common_ppc.c
-		t_vtx_generic.c
 		;
 
+	SEARCH_SOURCE += [ FDirName $(SUBDIR) ppc ] ;
+
 } else if $(TARGET_ARCH) = sparc {
 
 	arch_sources = 
 		sparc.c 
-		t_vtx_generic.c 
+		clip.S
+		norm.S 
+		xform.S
 		;
 
-} else {
-	arch_sources = t_vtx_generic.c ;
+	SEARCH_SOURCE += [ FDirName $(SUBDIR) sparc ] ;
+
 }
 
 
@@ -330,24 +335,27 @@
 	vbo_split_copy.c
 	vbo_split_inplace.c
 
+	# arch specific assembly optimization
 	$(arch_sources)
-
-	# glapi
-	glapi.c
-	glthread.c
 ;
 
 
 local arch_sources ;
+# Use the faster GL API dispatching assembly code for the platform, if any!
 if $(TARGET_ARCH) = x86 {
-	# On x86 platform, use the faster GL API dispatching assembly code!
 	arch_sources = glapi_x86.S ;
+} else if $(TARGET_ARCH) = sparc {
+	arch_sources = glapi_sparc.S ;
 } else {
-	# For non-X86 platforms, no assembly code yet.
 	arch_sources = ;
 }
 
-MergeObject <opengl>mesa_arch_$(TARGET_ARCH).o :
+MergeObject <mesa>glapi-dispatching.o :
+
+	dispatch.c
+	glapi.c
+	glthread.c
+
 	$(arch_sources)
 ;
 

Modified: haiku/trunk/src/kits/opengl/mesa/glapi/glthread.h
===================================================================
--- haiku/trunk/src/kits/opengl/mesa/glapi/glthread.h	2009-04-08 23:54:52 UTC (rev 30049)
+++ haiku/trunk/src/kits/opengl/mesa/glapi/glthread.h	2009-04-09 00:35:23 UTC (rev 30050)
@@ -221,25 +221,13 @@
 
 
 /*
- * BeOS threads. R5.x required.
+ * BeOS threads. R5.x or sooner required.
  */
 #ifdef BEOS_THREADS
 
-/* Problem with OS.h and this file on haiku */
-#ifndef __HAIKU__
-#include <kernel/OS.h>
-#endif
+#include <OS.h>
+#include <TLS.h>
 
-#include <support/TLS.h>
-
-/* The only two typedefs required here
- * this is cause of the OS.h problem
- */
-#ifdef __HAIKU__
-typedef int32 thread_id;
-typedef int32 sem_id;
-#endif
-
 typedef struct {
    int32        key;
    int          initMagic;



From phoudoin at mail.berlios.de  Thu Apr  9 04:48:05 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Thu, 9 Apr 2009 04:48:05 +0200
Subject: [Haiku-commits] r30051 -
	haiku/trunk/src/add-ons/input_server/devices/keyboard
Message-ID: <200904090248.n392m5RE000527@sheep.berlios.de>

Author: phoudoin
Date: 2009-04-09 04:48:02 +0200 (Thu, 09 Apr 2009)
New Revision: 30051
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30051&view=rev

Modified:
   haiku/trunk/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp
Log:
* Removed hardcoded system location, now use find_directory()
* Fixed a bug I've miss last time: everything under /boot/system was considered 
  a server team, including system apps and demos!


Modified: haiku/trunk/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp
===================================================================
--- haiku/trunk/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp	2009-04-09 00:35:23 UTC (rev 30050)
+++ haiku/trunk/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp	2009-04-09 02:48:02 UTC (rev 30051)
@@ -10,7 +10,9 @@
 
 #include <string.h>
 
+#include <FindDirectory.h>
 #include <NodeInfo.h>
+#include <Path.h>
 #include <View.h>
 
 
@@ -115,15 +117,31 @@
 bool
 TeamListItem::IsSystemServer()
 {
-    // TODO: use find_directory() in place of hardcoded paths
+	static bool firstCall = true;
+	static BPath systemServersPath;
+	static BPath trackerPath;
+	static BPath deskbarPath;
+	
+	if (firstCall) {
+		find_directory(B_SYSTEM_SERVERS_DIRECTORY, &systemServersPath);
 
-	char* system = "/boot/system/";
-	if (strncmp(system, fInfo.args, strlen(system)) == 0)
+		find_directory(B_SYSTEM_DIRECTORY, &trackerPath);
+		trackerPath.Append("Tracker");
+		
+		find_directory(B_SYSTEM_DIRECTORY, &deskbarPath);
+		deskbarPath.Append("Deskbar");
+		
+		firstCall = false;
+	}
+	
+	if (strncmp(systemServersPath.Path(), fInfo.args, strlen(systemServersPath.Path())) == 0)
 		return true;
 
-	system = "/system/servers/";
-	if (strncmp(system, fInfo.args, strlen(system)) == 0)
+	if (strncmp(trackerPath.Path(), fInfo.args, strlen(trackerPath.Path())) == 0)
 		return true;
 
-	return false;
+	if (strncmp(deskbarPath.Path(), fInfo.args, strlen(deskbarPath.Path())) == 0)
+		return true;
+	
+	return false;		
 }



From umccullough at gmail.com  Thu Apr  9 05:44:27 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Wed, 8 Apr 2009 20:44:27 -0700
Subject: [Haiku-commits] r30050 - in haiku/trunk/src/kits/opengl: . mesa
	mesa/glapi
In-Reply-To: <200904090035.n390ZULx017428@sheep.berlios.de>
References: <200904090035.n390ZULx017428@sheep.berlios.de>
Message-ID: <1e80d8750904082044o5e00c67et3057275d0936177e@mail.gmail.com>

On Wed, Apr 8, 2009 at 5:35 PM,  <phoudoin at mail.berlios.de> wrote:
> * This should fix PPC libGL.so build - UNTESTED

I'll test that out shortly here - thanks :)

- Urias


From umccullough at gmail.com  Thu Apr  9 07:41:20 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Wed, 8 Apr 2009 22:41:20 -0700
Subject: [Haiku-commits] r30050 - in haiku/trunk/src/kits/opengl: . mesa
	mesa/glapi
In-Reply-To: <200904090035.n390ZULx017428@sheep.berlios.de>
References: <200904090035.n390ZULx017428@sheep.berlios.de>
Message-ID: <1e80d8750904082241u3e0e7ff7o76cfb71483248e85@mail.gmail.com>

On Wed, Apr 8, 2009 at 5:35 PM,  <phoudoin at mail.berlios.de> wrote:
> Author: phoudoin
> Date: 2009-04-09 02:35:23 +0200 (Thu, 09 Apr 2009)
> New Revision: 30050
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30050&view=rev
>
> Modified:
> ? haiku/trunk/src/kits/opengl/Jamfile
> ? haiku/trunk/src/kits/opengl/mesa/Jamfile
> ? haiku/trunk/src/kits/opengl/mesa/glapi/glthread.h
> Log:
> * Reworked Mesa's GL API dispatching/implementation separation:
>
> ?Before, it was spread in libmesa.a *and* mesa_arch_$(TARGET_ARCH).o,
> ?the later was broken for non-x86 targets.
>
> ?Now, GL API dispatching is entirely in glapi-dispatching.o,
> ?while libmesa.a contains only the software GL implementation.
>
> * This should fix PPC libGL.so build - UNTESTED

Seem to get further, but fails to link still:

http://haiku.pastebin.com/f5fac4636


> - * BeOS threads. R5.x required.
> + * BeOS threads. R5.x or sooner required.

May I recommend using: "R5.x or newer required."

"sooner" vs. "later" is somewhat ambiguous when discussing version numbers.


From mmlr at mail.berlios.de  Thu Apr  9 10:44:27 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Thu, 9 Apr 2009 10:44:27 +0200
Subject: [Haiku-commits] r30052 -
	haiku/trunk/src/add-ons/kernel/bus_managers/ata
Message-ID: <200904090844.n398iRPC014359@sheep.berlios.de>

Author: mmlr
Date: 2009-04-09 10:44:25 +0200 (Thu, 09 Apr 2009)
New Revision: 30052
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30052&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
Log:
Additional to the normal detection of device presence, use the trick previously
present in the IDE bus_manager when detecting devices to avoid long timeouts
when waiting for possible ATAPI devices.


Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-09 02:48:02 UTC (rev 30051)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-09 08:44:25 UTC (rev 30052)
@@ -379,8 +379,12 @@
 			&& (status & ATA_STATUS_ERROR) != 0)
 			return B_ERROR;
 
-		if ((status & setBits) == setBits && (status & clearedBits) == 0)
-			return B_OK;
+		if ((status & clearedBits) == 0) {
+			if ((flags & ATA_WAIT_ANY_BIT) != 0 && (status & setBits) != 0)
+				return B_OK;
+			if ((status & setBits) == setBits)
+				return B_OK;
+		}
 
 		bigtime_t elapsedTime = system_time() - startTime;
 		//TRACE("wait status after %lld: %u\n", elapsedTime, status);

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-09 02:48:02 UTC (rev 30051)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-09 08:44:25 UTC (rev 30052)
@@ -432,6 +432,13 @@
 		return B_ERROR;
 	}
 
+	if (fChannel->Wait(ATA_STATUS_BUSY | ATA_STATUS_DATA_REQUEST, 0,
+		ATA_WAIT_ANY_BIT, 100 * 1000) != B_OK) {
+		TRACE_ALWAYS("no data request and not busy within 100ms, assuming "
+			"no device present\n");
+		return B_TIMED_OUT;
+	}
+
 	if (fChannel->Wait(ATA_STATUS_DATA_REQUEST, ATA_STATUS_BUSY, 0,
 			IsATAPI() ? 20 * 1000 * 1000 : 500 * 1000) != B_OK) {
 		TRACE_ERROR("timeout waiting for identify request\n");

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-09 02:48:02 UTC (rev 30051)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-09 08:44:25 UTC (rev 30052)
@@ -29,7 +29,8 @@
 	ATA_IS_WRITE				= 0x02,
 	ATA_DMA_TRANSFER			= 0x03,
 	ATA_CHECK_ERROR_BIT			= 0x04,
-	ATA_WAIT_FINISH				= 0x08
+	ATA_WAIT_FINISH				= 0x08,
+	ATA_WAIT_ANY_BIT			= 0x10
 };
 
 



From mmlr at mail.berlios.de  Thu Apr  9 10:54:50 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Thu, 9 Apr 2009 10:54:50 +0200
Subject: [Haiku-commits] r30053 -
	haiku/trunk/src/add-ons/kernel/bus_managers/ata
Message-ID: <200904090854.n398soIv015800@sheep.berlios.de>

Author: mmlr
Date: 2009-04-09 10:54:46 +0200 (Thu, 09 Apr 2009)
New Revision: 30053
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30053&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATACommands.h
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATATracing.h
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/Jamfile
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ata_device_infoblock.h
Log:
* Adding/updating license headers.
* Add the standalone ata module to the Jamfile.


Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-09 08:44:25 UTC (rev 30052)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-09 08:54:46 UTC (rev 30053)
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr at mlotz.ch.
+ * Copyright 2008, Marcus Overhagen.
+ * Copyright 2004-2008, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2002-2003, Thomas Kurschel.
+ *
+ * Distributed under the terms of the MIT License.
+ */
+
 #include "ATAPrivate.h"
 
 ATAChannel::ATAChannel(device_node *node)

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATACommands.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATACommands.h	2009-04-09 08:44:25 UTC (rev 30052)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATACommands.h	2009-04-09 08:54:46 UTC (rev 30053)
@@ -1,3 +1,9 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr at mlotz.ch.
+ * Copyright 2002-2003, Thomas Kurschel.
+ *
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef ATA_COMMANDS_H
 #define ATA_COMMANDS_H
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-09 08:44:25 UTC (rev 30052)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-09 08:54:46 UTC (rev 30053)
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr at mlotz.ch.
+ * Copyright 2008, Marcus Overhagen.
+ * Copyright 2004-2008, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2002-2003, Thomas Kurschel.
+ *
+ * Distributed under the terms of the MIT License.
+ */
+
 #include "ATAPrivate.h"
 
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp	2009-04-09 08:44:25 UTC (rev 30052)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp	2009-04-09 08:54:46 UTC (rev 30053)
@@ -1,5 +1,6 @@
 /*
- * Copyright 2004-2007, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2009, Michael Lotz, mmlr at mlotz.ch.
+ * Copyright 2004-2007, Axel D?rfler, axeld at pinc-software.de.
  * Copyright 2002/03, Thomas Kurschel. All rights reserved.
  *
  * Distributed under the terms of the MIT License.

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp	2009-04-09 08:44:25 UTC (rev 30052)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp	2009-04-09 08:54:46 UTC (rev 30053)
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr at mlotz.ch.
+ * Copyright 2008, Marcus Overhagen.
+ * Copyright 2004-2008, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2002-2003, Thomas Kurschel.
+ *
+ * Distributed under the terms of the MIT License.
+ */
+
 #include "ATAPrivate.h"
 
 scsi_for_sim_interface *gSCSIModule = NULL;

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp	2009-04-09 08:44:25 UTC (rev 30052)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp	2009-04-09 08:54:46 UTC (rev 30053)
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr at mlotz.ch.
+ * Copyright 2008, Marcus Overhagen.
+ * Copyright 2004-2008, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2002-2003, Thomas Kurschel.
+ *
+ * Distributed under the terms of the MIT License.
+ */
+
 #include "ATAPrivate.h"
 
 ATAPIDevice::ATAPIDevice(ATAChannel *channel, uint8 index)

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-09 08:44:25 UTC (rev 30052)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-09 08:54:46 UTC (rev 30053)
@@ -1,3 +1,11 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr at mlotz.ch.
+ * Copyright 2008, Marcus Overhagen.
+ * Copyright 2004-2008, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2002-2003, Thomas Kurschel.
+ *
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef ATA_PRIVATE_H
 #define ATA_PRIVATE_H
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp	2009-04-09 08:44:25 UTC (rev 30052)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp	2009-04-09 08:54:46 UTC (rev 30053)
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr at mlotz.ch.
+ * Distributed under the terms of the MIT License.
+ */
+
 #include "ATAPrivate.h"
 
 ATARequest::ATARequest()

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATATracing.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATATracing.h	2009-04-09 08:44:25 UTC (rev 30052)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATATracing.h	2009-04-09 08:54:46 UTC (rev 30053)
@@ -1,3 +1,7 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr at mlotz.ch.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef ATA_TRACING_H
 #define ATA_TRACING_H
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/Jamfile	2009-04-09 08:44:25 UTC (rev 30052)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/Jamfile	2009-04-09 08:54:46 UTC (rev 30053)
@@ -20,3 +20,11 @@
 	virtual_memory.c
 	;
 
+KernelAddon ata :
+	ATAChannel.cpp
+	ATADevice.cpp
+	ATAHelper.cpp
+	ATAModule.cpp
+	ATAPIDevice.cpp
+	ATARequest.cpp
+	;

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ata_device_infoblock.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ata_device_infoblock.h	2009-04-09 08:44:25 UTC (rev 30052)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ata_device_infoblock.h	2009-04-09 08:54:46 UTC (rev 30053)
@@ -1,6 +1,6 @@
 /*
- * Copyright 2004-2006, Haiku, Inc. All RightsReserved.
- * Copyright 2002/03, Thomas Kurschel. All rights reserved.
+ * Copyright 2004-2009, Haiku, Inc.
+ * Copyright 2002/03, Thomas Kurschel.
  *
  * Distributed under the terms of the MIT License.
  */
@@ -16,7 +16,6 @@
 	have a rough time when you messed up the offsets.
 */
 
-
 #include <lendian_bitfield.h>
 
 #define ATA_GET_INFO_BLOCK	0x2710



From mmlr at mail.berlios.de  Thu Apr  9 11:21:49 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Thu, 9 Apr 2009 11:21:49 +0200
Subject: [Haiku-commits] r30054 - in haiku/trunk: headers/os/drivers/bus
	src/add-ons/kernel/bus_managers/ata
Message-ID: <200904090921.n399LnMV019509@sheep.berlios.de>

Author: mmlr
Date: 2009-04-09 11:21:46 +0200 (Thu, 09 Apr 2009)
New Revision: 30054
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30054&view=rev

Modified:
   haiku/trunk/headers/os/drivers/bus/ATA.h
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
Log:
Adding DMA detection and generally allow DMA. Not used yet though.


Modified: haiku/trunk/headers/os/drivers/bus/ATA.h
===================================================================
--- haiku/trunk/headers/os/drivers/bus/ATA.h	2009-04-09 08:54:46 UTC (rev 30053)
+++ haiku/trunk/headers/os/drivers/bus/ATA.h	2009-04-09 09:21:46 UTC (rev 30054)
@@ -17,7 +17,7 @@
 // maximum number of devices connected to controller (uint8, optional, default:2)
 #define ATA_CONTROLLER_MAX_DEVICES_ITEM "ide/max_devices"
 // set to not-0 if DMA is supported (uint8, optional, default:0)
-#define ATA_CONTROLLER_CAN_DMA_ITEM "ide/can_dma"
+#define ATA_CONTROLLER_CAN_DMA_ITEM "ide/can_DMA"
 // name of controller (string, required)
 #define ATA_CONTROLLER_CONTROLLER_NAME_ITEM "ide/controller_name"
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-09 08:54:46 UTC (rev 30053)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-09 09:21:46 UTC (rev 30054)
@@ -18,17 +18,21 @@
 		fSCSIBus(NULL),
 		fDeviceCount(0),
 		fDevices(NULL),
-		fUseDMA(false),
+		fUseDMA(true),
 		fRequest(NULL)
 {
 	mutex_init(&fLock, "ata channel");
 
+	gDeviceManager->get_attr_uint32(node, ATA_CHANNEL_ID_ITEM, &fChannelID,
+		true);
+	snprintf(fDebugContext, sizeof(fDebugContext), " %lu", fChannelID);
+
 	if (fUseDMA) {
 		void *settings = load_driver_settings(B_SAFEMODE_DRIVER_SETTINGS);
 		if (settings != NULL) {
 			if (get_driver_boolean_parameter(settings,
 				B_SAFEMODE_DISABLE_IDE_DMA, false, false)) {
-				TRACE("disabling dma because of safemode setting\n");
+				TRACE_ALWAYS("disabling DMA because of safemode setting\n");
 				fUseDMA = false;
 			}
 
@@ -39,9 +43,15 @@
 	if (fUseDMA) {
 		uint8 canDMA;
 		if (gDeviceManager->get_attr_uint8(node, ATA_CONTROLLER_CAN_DMA_ITEM,
-			&canDMA, true) != B_OK || canDMA == 0) {
+			&canDMA, true) != B_OK) {
+			TRACE_ERROR("unknown if controller supports DMA, not using it\n");
 			fUseDMA = false;
 		}
+
+		if (canDMA == 0) {
+			TRACE_ALWAYS("controller doesn't support DMA, disabling\n");
+			fUseDMA = false;
+		}
 	}
 
 	fRequest = new(std::nothrow) ATARequest();
@@ -66,11 +76,6 @@
 	for (uint8 i = 0; i < fDeviceCount; i++)
 		fDevices[i] = NULL;
 
-
-	gDeviceManager->get_attr_uint32(node, ATA_CHANNEL_ID_ITEM, &fChannelID,
-		true);
-	snprintf(fDebugContext, sizeof(fDebugContext), " %lu", fChannelID);
-
 	device_node *parent = gDeviceManager->get_parent_node(node);
 	fStatus = gDeviceManager->get_driver(parent,
 		(driver_module_info **)&fController, &fCookie);
@@ -149,15 +154,15 @@
 			continue;
 		}
 
-		TRACE_ALWAYS("identified ATA%s device %u\n", device->IsATAPI()
-			? "PI" : "", i);
-
 		if (device->Configure() != B_OK) {
 			TRACE_ERROR("failed to configure device\n");
 			delete device;
 			continue;
 		}
 
+		TRACE_ALWAYS("identified ATA%s device %u\n", device->IsATAPI()
+			? "PI" : "", i);
+
 		fDevices[i] = device;
 	}
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-09 08:54:46 UTC (rev 30053)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-09 09:21:46 UTC (rev 30054)
@@ -16,6 +16,7 @@
 		fUseLBA(false),
 		fUse48Bits(false),
 		fUseDMA(channel->UseDMA()),
+		fDMAMode(0),
 		fTotalSectors(0),
 		fRegisterMask(0)
 {
@@ -361,7 +362,43 @@
 	if (!fUseDMA)
 		return B_OK;
 
-	fUseDMA = false;
+	if (!fInfoBlock.DMA_supported) {
+		TRACE_ALWAYS("DMA not supported by device\n");
+		fUseDMA = false;
+		return B_OK;
+	}
+
+	#define CHECK_DMA_MODE(element, mode) \
+		if (fInfoBlock.element) { \
+			fDMAMode = mode; \
+			modeCount++; \
+		}
+
+	uint32 modeCount = 0;
+
+	CHECK_DMA_MODE(MDMA0_selected, 0x00);
+	CHECK_DMA_MODE(MDMA1_selected, 0x01);
+	CHECK_DMA_MODE(MDMA2_selected, 0x02);
+
+	if (fInfoBlock._88_valid) {
+		CHECK_DMA_MODE(UDMA0_selected, 0x10);
+		CHECK_DMA_MODE(UDMA1_selected, 0x11);
+		CHECK_DMA_MODE(UDMA2_selected, 0x12);
+		CHECK_DMA_MODE(UDMA3_selected, 0x13);
+		CHECK_DMA_MODE(UDMA4_selected, 0x14);
+		CHECK_DMA_MODE(UDMA5_selected, 0x15);
+		CHECK_DMA_MODE(UDMA6_selected, 0x16);
+	}
+
+	#undef CHECK_DMA_MODE
+
+	if (modeCount != 1) {
+		TRACE_ERROR("more than on DMA mode selected, not using DMA\n");
+		fUseDMA = false;
+		return B_OK;
+	}
+
+	TRACE_ALWAYS("using DMA mode 0x%02x\n", fDMAMode);
 	return B_OK;
 }
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-09 08:54:46 UTC (rev 30053)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-09 09:21:46 UTC (rev 30054)
@@ -188,6 +188,7 @@
 		bool						fUseLBA;
 		bool						fUse48Bits;
 		bool						fUseDMA;
+		uint8						fDMAMode;
 		uint64						fTotalSectors;
 		ata_device_infoblock		fInfoBlock;
 		ata_task_file				fTaskFile;



From stippi at mail.berlios.de  Thu Apr  9 11:29:09 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Thu, 9 Apr 2009 11:29:09 +0200
Subject: [Haiku-commits] r30055 - haiku/trunk/src/kits/tracker
Message-ID: <200904090929.n399T9Tn020303@sheep.berlios.de>

Author: stippi
Date: 2009-04-09 11:29:07 +0200 (Thu, 09 Apr 2009)
New Revision: 30055
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30055&view=rev

Modified:
   haiku/trunk/src/kits/tracker/Tests.cpp
Log:
Fix hardcoded paths for this *test* component.


Modified: haiku/trunk/src/kits/tracker/Tests.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/Tests.cpp	2009-04-09 09:21:46 UTC (rev 30054)
+++ haiku/trunk/src/kits/tracker/Tests.cpp	2009-04-09 09:29:07 UTC (rev 30055)
@@ -55,7 +55,11 @@
 
 const char *pathsToSearch[] = {
 //	"/boot/home/config/settings/NetPositive/Bookmarks/",
+#ifdef __HAIKU__
+	"/boot/system",
+#else
 	"/boot/beos",
+#endif
 	"/boot/apps",
 	"/boot/home",
 	0



From stippi at mail.berlios.de  Thu Apr  9 11:29:34 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Thu, 9 Apr 2009 11:29:34 +0200
Subject: [Haiku-commits] r30056 - haiku/trunk/src/kits/tracker
Message-ID: <200904090929.n399TYuT020349@sheep.berlios.de>

Author: stippi
Date: 2009-04-09 11:29:33 +0200 (Thu, 09 Apr 2009)
New Revision: 30056
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30056&view=rev

Modified:
   haiku/trunk/src/kits/tracker/StatusWindow.cpp
Log:
Small coding style cleanup.


Modified: haiku/trunk/src/kits/tracker/StatusWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/StatusWindow.cpp	2009-04-09 09:29:07 UTC (rev 30055)
+++ haiku/trunk/src/kits/tracker/StatusWindow.cpp	2009-04-09 09:29:33 UTC (rev 30056)
@@ -249,12 +249,13 @@
 	{
 		AutoLock<BLooper> lock(be_app);
 		int32 count = be_app->CountWindows();
-		for (int32 index = 0; index < count; index++)
+		for (int32 index = 0; index < count; index++) {
 			if (dynamic_cast<BDeskWindow *>(be_app->WindowAt(index))
 				&& be_app->WindowAt(index)->IsActive()) {
 				desktopActive = true;
 				break;
 			}
+		}
 	}
 
 	if (IsHidden()) {



From stippi at mail.berlios.de  Thu Apr  9 11:30:36 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Thu, 9 Apr 2009 11:30:36 +0200
Subject: [Haiku-commits] r30057 - haiku/trunk/src/kits/tracker
Message-ID: <200904090930.n399Ua5F020696@sheep.berlios.de>

Author: stippi
Date: 2009-04-09 11:30:33 +0200 (Thu, 09 Apr 2009)
New Revision: 30057
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30057&view=rev

Modified:
   haiku/trunk/src/kits/tracker/FSUtils.cpp
Log:
Fixed logic to detect and warn about changes in the system folder. Merged
the "system" folder and "system folder or it's contents" case.


Modified: haiku/trunk/src/kits/tracker/FSUtils.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/FSUtils.cpp	2009-04-09 09:29:33 UTC (rev 30056)
+++ haiku/trunk/src/kits/tracker/FSUtils.cpp	2009-04-09 09:30:33 UTC (rev 30057)
@@ -471,18 +471,12 @@
 	const char *warning = NULL;
 	bool requireOverride = true;
 
-	if (DirectoryMatches(entry, B_BEOS_DIRECTORY))
-		warning = "If you %s the system folder, you won't be able to "
-			"boot " OS_NAME "! Are you sure you want to do this? To %s the folder "
-			"anyway, hold down the Shift key and click \"Do it\".";
-#ifndef __HAIKU__
-	else if (DirectoryMatchesOrContains(entry, B_BEOS_SYSTEM_DIRECTORY))
+	if (DirectoryMatchesOrContains(entry, B_BEOS_DIRECTORY)) {
 		warning = "If you %s the system folder or its contents, you "
 			"won't be able to boot " OS_NAME "! Are you sure you want to do this? "
 			"To %s the system folder or its contents anyway, hold down "
 			"the Shift key and click \"Do it\".";
-#endif
-	else if (DirectoryMatches(entry, B_USER_DIRECTORY)) {
+	} else if (DirectoryMatches(entry, B_USER_DIRECTORY)) {
 		warning = "If you %s the home folder, " OS_NAME " may not "
 			"behave properly! Are you sure you want to do this? "
 			"To %s the home anyway, click \"Do it\".";



From axeld at mail.berlios.de  Thu Apr  9 11:39:59 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 11:39:59 +0200
Subject: [Haiku-commits] r30058 - in haiku/trunk: headers/os/media
	src/kits/media
Message-ID: <200904090939.n399dx1m021421@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 11:39:58 +0200 (Thu, 09 Apr 2009)
New Revision: 30058
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30058&view=rev

Modified:
   haiku/trunk/headers/os/media/ParameterWeb.h
   haiku/trunk/src/kits/media/ParameterWeb.cpp
Log:
* Fixed bug I introduced when deleting parameters (no more crashing).
* Removed the BParameterWeb::{Start|Stop}Watching() methods again, as the same
  thing can be achieved using the BMediaRoster already (even though it doesn't
  seem to work yet).


Modified: haiku/trunk/headers/os/media/ParameterWeb.h
===================================================================
--- haiku/trunk/headers/os/media/ParameterWeb.h	2009-04-09 09:30:33 UTC (rev 30057)
+++ haiku/trunk/headers/os/media/ParameterWeb.h	2009-04-09 09:39:58 UTC (rev 30058)
@@ -91,11 +91,6 @@
 			int32				CountParameters();
 			BParameter*			ParameterAt(int32 index);
 
-			status_t			StartWatching(const BMessenger& target,
-									int32 notificationType);
-			status_t			StopWatching(const BMessenger& target,
-									int32 notificationType);
-
 	// BFlattenable implementation
 	virtual	bool				IsFixedSize() const;
 	virtual type_code			TypeCode() const;

Modified: haiku/trunk/src/kits/media/ParameterWeb.cpp
===================================================================
--- haiku/trunk/src/kits/media/ParameterWeb.cpp	2009-04-09 09:30:33 UTC (rev 30057)
+++ haiku/trunk/src/kits/media/ParameterWeb.cpp	2009-04-09 09:39:58 UTC (rev 30058)
@@ -420,28 +420,6 @@
 }
 
 
-status_t
-BParameterWeb::StartWatching(const BMessenger& target, int32 notificationType)
-{
-	if (BMediaRoster::CurrentRoster() == NULL)
-		return B_ERROR;
-
-	return BMediaRoster::CurrentRoster()->StartWatching(target, fNode,
-		notificationType);
-}
-
-
-status_t
-BParameterWeb::StopWatching(const BMessenger& target, int32 notificationType)
-{
-	if (BMediaRoster::CurrentRoster() == NULL)
-		return B_ERROR;
-
-	return BMediaRoster::CurrentRoster()->StopWatching(target, fNode,
-		notificationType);
-}
-
-
 bool
 BParameterWeb::IsFixedSize() const
 {
@@ -685,12 +663,12 @@
 	CALLED();
 
 	for (int i = fControls->CountItems(); i-- > 0;) {
-		delete static_cast<BParameter*>(fControls->ItemAt(0));
+		delete static_cast<BParameter*>(fControls->ItemAt(i));
 	}
 	delete fControls;
 
 	for (int i = fGroups->CountItems(); i-- > 0;) {
-		delete static_cast<BParameterGroup*>(fGroups->ItemAt(0));
+		delete static_cast<BParameterGroup*>(fGroups->ItemAt(i));
 	}
 	delete fGroups;
 



From philippe.houdoin at gmail.com  Thu Apr  9 12:25:16 2009
From: philippe.houdoin at gmail.com (Philippe Houdoin)
Date: Thu, 9 Apr 2009 12:25:16 +0200
Subject: [Haiku-commits] r30050 - in haiku/trunk/src/kits/opengl: . mesa
	mesa/glapi
Message-ID: <ce99af780904090325g538f31b7n38fb6dee72f4f7a2@mail.gmail.com>

[Haiku-commits] r30050 - in haiku/trunk/src/kits/opengl: . mesa mesa/glapi

Urias McCullough umccullough at gmail.com wrote:

>> * This should fix PPC libGL.so build - UNTESTED
>
> Seem to get further, but fails to link still:
>
> http://haiku.pastebin.com/f5fac4636

Okay, I should not have added back dispatch.c to <mesa>glapi-dispatching.o!
GLDispatcher.cpp does this already, but only when there is no assembly
optimized dispatcher, hence why it clash on duplicated symbols on PPC.

Retry after removing dispatch.c from <mesa>glapi_dispatching.o in mesa/Jamfile.
Should works for both x86 and ppc (and sparc ;-) ) that way.

>> - * BeOS threads. R5.x required.
>> + * BeOS threads. R5.x or sooner required.
>
> May I recommend using: "R5.x or newer required."
>
> "sooner" vs. "later" is somewhat ambiguous when discussing version numbers.

Will fix that too, indeed.
Thanks.

Unfortunatly, I'm at work: can't commit any working fix before tonigh...
Guys, feel free to do it.

Bye,
  Philippe.


From dlmcpaul at mail.berlios.de  Thu Apr  9 13:19:26 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Thu, 9 Apr 2009 13:19:26 +0200
Subject: [Haiku-commits] r30059 - in buildtools/trunk: . yasm yasm/Mkfiles
 yasm/Mkfiles/dj yasm/Mkfiles/vc yasm/Mkfiles/vc/genmacro
 yasm/Mkfiles/vc/genmodule yasm/Mkfiles/vc/genperf yasm/Mkfiles/vc/genstring
 yasm/Mkfiles/vc/genversion yasm/Mkfiles/vc/libyasm yasm/Mkfiles/vc/modules
 yasm/Mkfiles/vc/re2c yasm/Mkfiles/vc8 yasm/Mkfiles/vc8/genmacro
 yasm/Mkfiles/vc8/genmodule yasm/Mkfiles/vc8/genperf
 yasm/Mkfiles/vc8/genstring yasm/Mkfiles/vc8/genversion
 yasm/Mkfiles/vc8/libyasm yasm/Mkfiles/vc8/modules yasm/Mkfiles/vc8/re2c
 yasm/Mkfiles/vc9 yasm/Mkfiles/vc9/genmacro yasm/Mkfiles/vc9/genmodule
 yasm/Mkfiles/vc9/genperf yasm/Mkfiles/vc9/genstring
 yasm/Mkfiles/vc9/genversion yasm/Mkfiles/vc9/libyasm
 yasm/Mkfiles/vc9/modules yasm/Mkfiles/vc9/re2c yasm/config yasm/frontends
 yasm/frontends/yasm yasm/libyasm yasm/libyasm/tests yasm/m4 yasm/modules
 yasm/modules/arch yasm/modules/arch/lc3b yasm/modules/arch/lc3b/tests
 yasm/modules/arch/x86 yasm/modules/arch/x86/tests
 yasm/modules/arch/x86/tests/gas32 yas! m/modules/arch/x86/tests/gas64
 yasm/modules/dbgfmts yasm/modules/dbgfmts/codeview
 yasm/modules/dbgfmts/dwarf2 yasm/modules/dbgfmts/dwarf2/tests
 yasm/modules/dbgfmts/dwarf2/tests/pass32
 yasm/modules/dbgfmts/dwarf2/tests/pass64
 yasm/modules/dbgfmts/dwarf2/tests/passwin64 yasm/modules/dbgfmts/null
 yasm/modules/dbgfmts/stabs yasm/modules/dbgfmts/stabs/tests
 yasm/modules/listfmts yasm/modules/listfmts/nasm yasm/modules/objfmts
 yasm/modules/objfmts/bin yasm/modules/objfmts/bin/tests
 yasm/modules/objfmts/bin/tests/multisect yasm/modules/objfmts/coff
 yasm/modules/objfmts/coff/tests yasm/modules/objfmts/dbg
 yasm/modules/objfmts/elf yasm/modules/objfmts/elf/tests
 yasm/modules/objfmts/elf/tests/amd64 yasm/modules/objfmts/elf/tests/gas32
 yasm/modules/objfmts/elf/tests/gas64 yasm/modules/objfmts/macho
 yasm/modules/objfmts/macho/tests yasm/modules/objfmts/macho/tests/gas32
 yasm/modules/objfmts/macho/tests/gas64
 yasm/modules/objfmts/macho/tests/nasm32
 yasm/modules/objfmts/macho/tests/nasm! 64 yasm/modules/objfmts/rdf
 yasm/modules/objfmts/rdf/tests yas! m/module
Message-ID: <200904091119.n39BJQcC008091@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-09 13:16:39 +0200 (Thu, 09 Apr 2009)
New Revision: 30059
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30059&view=rev

Added:
   buildtools/trunk/yasm/
   buildtools/trunk/yasm/ABOUT-NLS
   buildtools/trunk/yasm/AUTHORS
   buildtools/trunk/yasm/Artistic.txt
   buildtools/trunk/yasm/BSD.txt
   buildtools/trunk/yasm/COPYING
   buildtools/trunk/yasm/ChangeLog
   buildtools/trunk/yasm/GNU_GPL-2.0
   buildtools/trunk/yasm/GNU_LGPL-2.0
   buildtools/trunk/yasm/INSTALL
   buildtools/trunk/yasm/Makefile.am
   buildtools/trunk/yasm/Makefile.in
   buildtools/trunk/yasm/Mkfiles/
   buildtools/trunk/yasm/Mkfiles/Makefile.dj
   buildtools/trunk/yasm/Mkfiles/Makefile.flat
   buildtools/trunk/yasm/Mkfiles/dj/
   buildtools/trunk/yasm/Mkfiles/dj/config.h
   buildtools/trunk/yasm/Mkfiles/dj/libyasm-stdint.h
   buildtools/trunk/yasm/Mkfiles/vc/
   buildtools/trunk/yasm/Mkfiles/vc/config.h
   buildtools/trunk/yasm/Mkfiles/vc/genmacro/
   buildtools/trunk/yasm/Mkfiles/vc/genmacro/genmacro.vcproj
   buildtools/trunk/yasm/Mkfiles/vc/genmacro/run.bat
   buildtools/trunk/yasm/Mkfiles/vc/genmodule/
   buildtools/trunk/yasm/Mkfiles/vc/genmodule/genmodule.vcproj
   buildtools/trunk/yasm/Mkfiles/vc/genmodule/run.bat
   buildtools/trunk/yasm/Mkfiles/vc/genperf/
   buildtools/trunk/yasm/Mkfiles/vc/genperf/genperf.vcproj
   buildtools/trunk/yasm/Mkfiles/vc/genperf/run.bat
   buildtools/trunk/yasm/Mkfiles/vc/genstring/
   buildtools/trunk/yasm/Mkfiles/vc/genstring/genstring.vcproj
   buildtools/trunk/yasm/Mkfiles/vc/genstring/run.bat
   buildtools/trunk/yasm/Mkfiles/vc/genversion/
   buildtools/trunk/yasm/Mkfiles/vc/genversion/genversion.vcproj
   buildtools/trunk/yasm/Mkfiles/vc/genversion/run.bat
   buildtools/trunk/yasm/Mkfiles/vc/libyasm-stdint.h
   buildtools/trunk/yasm/Mkfiles/vc/libyasm/
   buildtools/trunk/yasm/Mkfiles/vc/libyasm/libyasm.vcproj
   buildtools/trunk/yasm/Mkfiles/vc/modules/
   buildtools/trunk/yasm/Mkfiles/vc/modules/modules.vcproj
   buildtools/trunk/yasm/Mkfiles/vc/re2c/
   buildtools/trunk/yasm/Mkfiles/vc/re2c/re2c.vcproj
   buildtools/trunk/yasm/Mkfiles/vc/re2c/run.bat
   buildtools/trunk/yasm/Mkfiles/vc/yasm.sln
   buildtools/trunk/yasm/Mkfiles/vc/yasm.vcproj
   buildtools/trunk/yasm/Mkfiles/vc8/
   buildtools/trunk/yasm/Mkfiles/vc8/config.h
   buildtools/trunk/yasm/Mkfiles/vc8/crt_secure_no_deprecate.vsprops
   buildtools/trunk/yasm/Mkfiles/vc8/genmacro/
   buildtools/trunk/yasm/Mkfiles/vc8/genmacro/genmacro.vcproj
   buildtools/trunk/yasm/Mkfiles/vc8/genmacro/run.bat
   buildtools/trunk/yasm/Mkfiles/vc8/genmodule/
   buildtools/trunk/yasm/Mkfiles/vc8/genmodule/genmodule.vcproj
   buildtools/trunk/yasm/Mkfiles/vc8/genmodule/run.bat
   buildtools/trunk/yasm/Mkfiles/vc8/genperf/
   buildtools/trunk/yasm/Mkfiles/vc8/genperf/genperf.vcproj
   buildtools/trunk/yasm/Mkfiles/vc8/genperf/run.bat
   buildtools/trunk/yasm/Mkfiles/vc8/genstring/
   buildtools/trunk/yasm/Mkfiles/vc8/genstring/genstring.vcproj
   buildtools/trunk/yasm/Mkfiles/vc8/genstring/run.bat
   buildtools/trunk/yasm/Mkfiles/vc8/genversion/
   buildtools/trunk/yasm/Mkfiles/vc8/genversion/genversion.vcproj
   buildtools/trunk/yasm/Mkfiles/vc8/genversion/run.bat
   buildtools/trunk/yasm/Mkfiles/vc8/libyasm-stdint.h
   buildtools/trunk/yasm/Mkfiles/vc8/libyasm/
   buildtools/trunk/yasm/Mkfiles/vc8/libyasm/libyasm.vcproj
   buildtools/trunk/yasm/Mkfiles/vc8/modules/
   buildtools/trunk/yasm/Mkfiles/vc8/modules/modules.vcproj
   buildtools/trunk/yasm/Mkfiles/vc8/re2c/
   buildtools/trunk/yasm/Mkfiles/vc8/re2c/re2c.vcproj
   buildtools/trunk/yasm/Mkfiles/vc8/re2c/run.bat
   buildtools/trunk/yasm/Mkfiles/vc8/readme.vc8.txt
   buildtools/trunk/yasm/Mkfiles/vc8/yasm.rules
   buildtools/trunk/yasm/Mkfiles/vc8/yasm.sln
   buildtools/trunk/yasm/Mkfiles/vc8/yasm.vcproj
   buildtools/trunk/yasm/Mkfiles/vc9/
   buildtools/trunk/yasm/Mkfiles/vc9/config.h
   buildtools/trunk/yasm/Mkfiles/vc9/crt_secure_no_deprecate.vsprops
   buildtools/trunk/yasm/Mkfiles/vc9/genmacro/
   buildtools/trunk/yasm/Mkfiles/vc9/genmacro/genmacro.vcproj
   buildtools/trunk/yasm/Mkfiles/vc9/genmacro/run.bat
   buildtools/trunk/yasm/Mkfiles/vc9/genmodule/
   buildtools/trunk/yasm/Mkfiles/vc9/genmodule/genmodule.vcproj
   buildtools/trunk/yasm/Mkfiles/vc9/genmodule/run.bat
   buildtools/trunk/yasm/Mkfiles/vc9/genperf/
   buildtools/trunk/yasm/Mkfiles/vc9/genperf/genperf.vcproj
   buildtools/trunk/yasm/Mkfiles/vc9/genperf/run.bat
   buildtools/trunk/yasm/Mkfiles/vc9/genstring/
   buildtools/trunk/yasm/Mkfiles/vc9/genstring/genstring.vcproj
   buildtools/trunk/yasm/Mkfiles/vc9/genstring/run.bat
   buildtools/trunk/yasm/Mkfiles/vc9/genversion/
   buildtools/trunk/yasm/Mkfiles/vc9/genversion/genversion.vcproj
   buildtools/trunk/yasm/Mkfiles/vc9/genversion/run.bat
   buildtools/trunk/yasm/Mkfiles/vc9/libyasm-stdint.h
   buildtools/trunk/yasm/Mkfiles/vc9/libyasm/
   buildtools/trunk/yasm/Mkfiles/vc9/libyasm/libyasm.vcproj
   buildtools/trunk/yasm/Mkfiles/vc9/modules/
   buildtools/trunk/yasm/Mkfiles/vc9/modules/modules.vcproj
   buildtools/trunk/yasm/Mkfiles/vc9/re2c/
   buildtools/trunk/yasm/Mkfiles/vc9/re2c/re2c.vcproj
   buildtools/trunk/yasm/Mkfiles/vc9/re2c/run.bat
   buildtools/trunk/yasm/Mkfiles/vc9/readme.vc9.txt
   buildtools/trunk/yasm/Mkfiles/vc9/vc928.c
   buildtools/trunk/yasm/Mkfiles/vc9/yasm.rules
   buildtools/trunk/yasm/Mkfiles/vc9/yasm.sln
   buildtools/trunk/yasm/Mkfiles/vc9/yasm.vcproj
   buildtools/trunk/yasm/NEWS
   buildtools/trunk/yasm/README
   buildtools/trunk/yasm/aclocal.m4
   buildtools/trunk/yasm/config.h.in
   buildtools/trunk/yasm/config/
   buildtools/trunk/yasm/config/config.guess
   buildtools/trunk/yasm/config/config.rpath
   buildtools/trunk/yasm/config/config.sub
   buildtools/trunk/yasm/config/depcomp
   buildtools/trunk/yasm/config/install-sh
   buildtools/trunk/yasm/config/ltmain.sh
   buildtools/trunk/yasm/config/missing
   buildtools/trunk/yasm/config/mkinstalldirs
   buildtools/trunk/yasm/configure
   buildtools/trunk/yasm/configure.ac
   buildtools/trunk/yasm/frontends/
   buildtools/trunk/yasm/frontends/Makefile.inc
   buildtools/trunk/yasm/frontends/yasm/
   buildtools/trunk/yasm/frontends/yasm/Makefile.inc
   buildtools/trunk/yasm/frontends/yasm/yasm-options.c
   buildtools/trunk/yasm/frontends/yasm/yasm-options.h
   buildtools/trunk/yasm/frontends/yasm/yasm.c
   buildtools/trunk/yasm/frontends/yasm/yasm.xml
   buildtools/trunk/yasm/genstring.c
   buildtools/trunk/yasm/libyasm.h
   buildtools/trunk/yasm/libyasm/
   buildtools/trunk/yasm/libyasm/Makefile.inc
   buildtools/trunk/yasm/libyasm/arch.h
   buildtools/trunk/yasm/libyasm/assocdat.c
   buildtools/trunk/yasm/libyasm/assocdat.h
   buildtools/trunk/yasm/libyasm/bc-align.c
   buildtools/trunk/yasm/libyasm/bc-data.c
   buildtools/trunk/yasm/libyasm/bc-incbin.c
   buildtools/trunk/yasm/libyasm/bc-org.c
   buildtools/trunk/yasm/libyasm/bc-reserve.c
   buildtools/trunk/yasm/libyasm/bitvect.c
   buildtools/trunk/yasm/libyasm/bitvect.h
   buildtools/trunk/yasm/libyasm/bytecode.c
   buildtools/trunk/yasm/libyasm/bytecode.h
   buildtools/trunk/yasm/libyasm/compat-queue.h
   buildtools/trunk/yasm/libyasm/coretype.h
   buildtools/trunk/yasm/libyasm/dbgfmt.h
   buildtools/trunk/yasm/libyasm/errwarn.c
   buildtools/trunk/yasm/libyasm/errwarn.h
   buildtools/trunk/yasm/libyasm/expr.c
   buildtools/trunk/yasm/libyasm/expr.h
   buildtools/trunk/yasm/libyasm/file.c
   buildtools/trunk/yasm/libyasm/file.h
   buildtools/trunk/yasm/libyasm/floatnum.c
   buildtools/trunk/yasm/libyasm/floatnum.h
   buildtools/trunk/yasm/libyasm/genmodule.c
   buildtools/trunk/yasm/libyasm/hamt.c
   buildtools/trunk/yasm/libyasm/hamt.h
   buildtools/trunk/yasm/libyasm/insn.c
   buildtools/trunk/yasm/libyasm/insn.h
   buildtools/trunk/yasm/libyasm/intnum.c
   buildtools/trunk/yasm/libyasm/intnum.h
   buildtools/trunk/yasm/libyasm/inttree.c
   buildtools/trunk/yasm/libyasm/inttree.h
   buildtools/trunk/yasm/libyasm/linemap.c
   buildtools/trunk/yasm/libyasm/linemap.h
   buildtools/trunk/yasm/libyasm/listfmt.h
   buildtools/trunk/yasm/libyasm/md5.c
   buildtools/trunk/yasm/libyasm/md5.h
   buildtools/trunk/yasm/libyasm/mergesort.c
   buildtools/trunk/yasm/libyasm/module.h
   buildtools/trunk/yasm/libyasm/module.in
   buildtools/trunk/yasm/libyasm/objfmt.h
   buildtools/trunk/yasm/libyasm/parser.h
   buildtools/trunk/yasm/libyasm/phash.c
   buildtools/trunk/yasm/libyasm/phash.h
   buildtools/trunk/yasm/libyasm/preproc.h
   buildtools/trunk/yasm/libyasm/section.c
   buildtools/trunk/yasm/libyasm/section.h
   buildtools/trunk/yasm/libyasm/strcasecmp.c
   buildtools/trunk/yasm/libyasm/strsep.c
   buildtools/trunk/yasm/libyasm/symrec.c
   buildtools/trunk/yasm/libyasm/symrec.h
   buildtools/trunk/yasm/libyasm/tests/
   buildtools/trunk/yasm/libyasm/tests/1shl0.asm
   buildtools/trunk/yasm/libyasm/tests/1shl0.hex
   buildtools/trunk/yasm/libyasm/tests/Makefile.inc
   buildtools/trunk/yasm/libyasm/tests/absloop-err.asm
   buildtools/trunk/yasm/libyasm/tests/absloop-err.errwarn
   buildtools/trunk/yasm/libyasm/tests/bitvect_test.c
   buildtools/trunk/yasm/libyasm/tests/charconst64.asm
   buildtools/trunk/yasm/libyasm/tests/charconst64.hex
   buildtools/trunk/yasm/libyasm/tests/combpath_test.c
   buildtools/trunk/yasm/libyasm/tests/data-rawvalue.asm
   buildtools/trunk/yasm/libyasm/tests/data-rawvalue.hex
   buildtools/trunk/yasm/libyasm/tests/duplabel-err.asm
   buildtools/trunk/yasm/libyasm/tests/duplabel-err.errwarn
   buildtools/trunk/yasm/libyasm/tests/emptydata.asm
   buildtools/trunk/yasm/libyasm/tests/emptydata.hex
   buildtools/trunk/yasm/libyasm/tests/equ-expand.asm
   buildtools/trunk/yasm/libyasm/tests/equ-expand.hex
   buildtools/trunk/yasm/libyasm/tests/expr-fold-level.asm
   buildtools/trunk/yasm/libyasm/tests/expr-fold-level.hex
   buildtools/trunk/yasm/libyasm/tests/expr-wide-ident.asm
   buildtools/trunk/yasm/libyasm/tests/expr-wide-ident.hex
   buildtools/trunk/yasm/libyasm/tests/externdef.asm
   buildtools/trunk/yasm/libyasm/tests/externdef.errwarn
   buildtools/trunk/yasm/libyasm/tests/externdef.hex
   buildtools/trunk/yasm/libyasm/tests/floatnum_test.c
   buildtools/trunk/yasm/libyasm/tests/incbin.asm
   buildtools/trunk/yasm/libyasm/tests/incbin.hex
   buildtools/trunk/yasm/libyasm/tests/jmpsize1-err.asm
   buildtools/trunk/yasm/libyasm/tests/jmpsize1-err.errwarn
   buildtools/trunk/yasm/libyasm/tests/jmpsize1.asm
   buildtools/trunk/yasm/libyasm/tests/jmpsize1.hex
   buildtools/trunk/yasm/libyasm/tests/leb128_test.c
   buildtools/trunk/yasm/libyasm/tests/libyasm_test.sh
   buildtools/trunk/yasm/libyasm/tests/opt-align1.asm
   buildtools/trunk/yasm/libyasm/tests/opt-align1.hex
   buildtools/trunk/yasm/libyasm/tests/opt-align2.asm
   buildtools/trunk/yasm/libyasm/tests/opt-align2.hex
   buildtools/trunk/yasm/libyasm/tests/opt-align3.asm
   buildtools/trunk/yasm/libyasm/tests/opt-align3.hex
   buildtools/trunk/yasm/libyasm/tests/opt-circular1-err.asm
   buildtools/trunk/yasm/libyasm/tests/opt-circular1-err.errwarn
   buildtools/trunk/yasm/libyasm/tests/opt-circular2-err.asm
   buildtools/trunk/yasm/libyasm/tests/opt-circular2-err.errwarn
   buildtools/trunk/yasm/libyasm/tests/opt-circular3-err.asm
   buildtools/trunk/yasm/libyasm/tests/opt-circular3-err.errwarn
   buildtools/trunk/yasm/libyasm/tests/opt-gvmat64.asm
   buildtools/trunk/yasm/libyasm/tests/opt-gvmat64.hex
   buildtools/trunk/yasm/libyasm/tests/opt-immexpand.asm
   buildtools/trunk/yasm/libyasm/tests/opt-immexpand.hex
   buildtools/trunk/yasm/libyasm/tests/opt-immnoexpand.asm
   buildtools/trunk/yasm/libyasm/tests/opt-immnoexpand.hex
   buildtools/trunk/yasm/libyasm/tests/opt-oldalign.asm
   buildtools/trunk/yasm/libyasm/tests/opt-oldalign.hex
   buildtools/trunk/yasm/libyasm/tests/opt-struc.asm
   buildtools/trunk/yasm/libyasm/tests/opt-struc.hex
   buildtools/trunk/yasm/libyasm/tests/reserve-err1.asm
   buildtools/trunk/yasm/libyasm/tests/reserve-err1.errwarn
   buildtools/trunk/yasm/libyasm/tests/reserve-err2.asm
   buildtools/trunk/yasm/libyasm/tests/reserve-err2.errwarn
   buildtools/trunk/yasm/libyasm/tests/splitpath_test.c
   buildtools/trunk/yasm/libyasm/tests/strucsize.asm
   buildtools/trunk/yasm/libyasm/tests/strucsize.hex
   buildtools/trunk/yasm/libyasm/tests/times-res.asm
   buildtools/trunk/yasm/libyasm/tests/times-res.errwarn
   buildtools/trunk/yasm/libyasm/tests/times-res.hex
   buildtools/trunk/yasm/libyasm/tests/times0.asm
   buildtools/trunk/yasm/libyasm/tests/times0.hex
   buildtools/trunk/yasm/libyasm/tests/timesover-err.asm
   buildtools/trunk/yasm/libyasm/tests/timesover-err.errwarn
   buildtools/trunk/yasm/libyasm/tests/timesunder.asm
   buildtools/trunk/yasm/libyasm/tests/timesunder.hex
   buildtools/trunk/yasm/libyasm/tests/unary.asm
   buildtools/trunk/yasm/libyasm/tests/unary.hex
   buildtools/trunk/yasm/libyasm/tests/uncstring_test.c
   buildtools/trunk/yasm/libyasm/tests/value-err.asm
   buildtools/trunk/yasm/libyasm/tests/value-err.errwarn
   buildtools/trunk/yasm/libyasm/tests/value-mask.asm
   buildtools/trunk/yasm/libyasm/tests/value-mask.errwarn
   buildtools/trunk/yasm/libyasm/tests/value-mask.hex
   buildtools/trunk/yasm/libyasm/tests/value-samesym.asm
   buildtools/trunk/yasm/libyasm/tests/value-samesym.errwarn
   buildtools/trunk/yasm/libyasm/tests/value-samesym.hex
   buildtools/trunk/yasm/libyasm/valparam.c
   buildtools/trunk/yasm/libyasm/valparam.h
   buildtools/trunk/yasm/libyasm/value.c
   buildtools/trunk/yasm/libyasm/value.h
   buildtools/trunk/yasm/libyasm/xmalloc.c
   buildtools/trunk/yasm/libyasm/xstrdup.c
   buildtools/trunk/yasm/m4/
   buildtools/trunk/yasm/m4/Makefile.inc
   buildtools/trunk/yasm/m4/ax_create_stdint_h.m4
   buildtools/trunk/yasm/m4/codeset.m4
   buildtools/trunk/yasm/m4/gettext.m4
   buildtools/trunk/yasm/m4/glibc21.m4
   buildtools/trunk/yasm/m4/iconv.m4
   buildtools/trunk/yasm/m4/intdiv0.m4
   buildtools/trunk/yasm/m4/intmax.m4
   buildtools/trunk/yasm/m4/inttypes-pri.m4
   buildtools/trunk/yasm/m4/inttypes.m4
   buildtools/trunk/yasm/m4/inttypes_h.m4
   buildtools/trunk/yasm/m4/isc-posix.m4
   buildtools/trunk/yasm/m4/lcmessage.m4
   buildtools/trunk/yasm/m4/lib-ld.m4
   buildtools/trunk/yasm/m4/lib-link.m4
   buildtools/trunk/yasm/m4/lib-prefix.m4
   buildtools/trunk/yasm/m4/longdouble.m4
   buildtools/trunk/yasm/m4/longlong.m4
   buildtools/trunk/yasm/m4/nls.m4
   buildtools/trunk/yasm/m4/po.m4
   buildtools/trunk/yasm/m4/printf-posix.m4
   buildtools/trunk/yasm/m4/progtest.m4
   buildtools/trunk/yasm/m4/pyrex.m4
   buildtools/trunk/yasm/m4/pythonhead.m4
   buildtools/trunk/yasm/m4/signed.m4
   buildtools/trunk/yasm/m4/size_max.m4
   buildtools/trunk/yasm/m4/stdint_h.m4
   buildtools/trunk/yasm/m4/uintmax_t.m4
   buildtools/trunk/yasm/m4/ulonglong.m4
   buildtools/trunk/yasm/m4/wchar_t.m4
   buildtools/trunk/yasm/m4/wint_t.m4
   buildtools/trunk/yasm/m4/xsize.m4
   buildtools/trunk/yasm/modules/
   buildtools/trunk/yasm/modules/Makefile.inc
   buildtools/trunk/yasm/modules/arch/
   buildtools/trunk/yasm/modules/arch/Makefile.inc
   buildtools/trunk/yasm/modules/arch/lc3b/
   buildtools/trunk/yasm/modules/arch/lc3b/Makefile.inc
   buildtools/trunk/yasm/modules/arch/lc3b/lc3barch.c
   buildtools/trunk/yasm/modules/arch/lc3b/lc3barch.h
   buildtools/trunk/yasm/modules/arch/lc3b/lc3bbc.c
   buildtools/trunk/yasm/modules/arch/lc3b/lc3bid.re
   buildtools/trunk/yasm/modules/arch/lc3b/tests/
   buildtools/trunk/yasm/modules/arch/lc3b/tests/Makefile.inc
   buildtools/trunk/yasm/modules/arch/lc3b/tests/lc3b-basic.asm
   buildtools/trunk/yasm/modules/arch/lc3b/tests/lc3b-basic.errwarn
   buildtools/trunk/yasm/modules/arch/lc3b/tests/lc3b-basic.hex
   buildtools/trunk/yasm/modules/arch/lc3b/tests/lc3b-br.asm
   buildtools/trunk/yasm/modules/arch/lc3b/tests/lc3b-br.hex
   buildtools/trunk/yasm/modules/arch/lc3b/tests/lc3b-ea-err.asm
   buildtools/trunk/yasm/modules/arch/lc3b/tests/lc3b-ea-err.errwarn
   buildtools/trunk/yasm/modules/arch/lc3b/tests/lc3b-mp22NC.asm
   buildtools/trunk/yasm/modules/arch/lc3b/tests/lc3b-mp22NC.hex
   buildtools/trunk/yasm/modules/arch/lc3b/tests/lc3b_test.sh
   buildtools/trunk/yasm/modules/arch/x86/
   buildtools/trunk/yasm/modules/arch/x86/Makefile.inc
   buildtools/trunk/yasm/modules/arch/x86/gen_x86_insn.py
   buildtools/trunk/yasm/modules/arch/x86/tests/
   buildtools/trunk/yasm/modules/arch/x86/tests/Makefile.inc
   buildtools/trunk/yasm/modules/arch/x86/tests/addbyte.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/addbyte.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/addbyte.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/addrop-err.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/addrop-err.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/addrop.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/addrop.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/addrop.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/aes.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/aes.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/amd200707.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/amd200707.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/arithsmall.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/arithsmall.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/arithsmall.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/avx.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/avx.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/avxcc.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/avxcc.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/bittest.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/bittest.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/bswap64.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/bswap64.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/clmul.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/clmul.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/cmpxchg.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/cmpxchg.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/cpubasic-err.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/cpubasic-err.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/cyrix.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/cyrix.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/div-err.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/div-err.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/ea-nonzero.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/ea-nonzero.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/ea-over.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/ea-over.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/ea-over.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/ea-warn.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/ea-warn.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/ea-warn.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/ebpindex.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/ebpindex.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/effaddr.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/effaddr.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/enter.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/enter.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/enter.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/far64.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/far64.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/farbasic.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/farbasic.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/farithr.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/farithr.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/fcmov.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/fcmov.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/fma.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/fma.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/fwdequ64.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/fwdequ64.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas32/
   buildtools/trunk/yasm/modules/arch/x86/tests/gas32/Makefile.inc
   buildtools/trunk/yasm/modules/arch/x86/tests/gas32/align32.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas32/align32.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas32/gas-farithr.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas32/gas-farithr.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas32/gas-movdq32.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas32/gas-movdq32.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas32/gas-movsd.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas32/gas-movsd.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas32/gas32-jmpcall.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas32/gas32-jmpcall.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas32/x86_gas32_test.sh
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/Makefile.inc
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/align64.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/align64.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-cbw.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-cbw.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-fp.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-fp.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-inout.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-inout.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-moreinsn.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-moreinsn.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-movabs.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-movabs.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-movdq64.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-movdq64.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-movsxs.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-movsxs.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-muldiv.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-muldiv.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-prefix.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-prefix.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-prefix.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-retenter.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-retenter.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-shift.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas-shift.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas64-jmpcall.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/gas64-jmpcall.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/riprel.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/riprel.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/gas64/x86_gas64_test.sh
   buildtools/trunk/yasm/modules/arch/x86/tests/genopcode.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/genopcode.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/imm64.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/imm64.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/imm64.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/iret.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/iret.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/jmp64-1.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/jmp64-1.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/jmp64-2.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/jmp64-2.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/jmp64-3.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/jmp64-3.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/jmp64-4.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/jmp64-4.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/jmp64-5.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/jmp64-5.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/jmp64-6.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/jmp64-6.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/jmpfar.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/jmpfar.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/lds-err.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/lds-err.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/loopadsz.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/loopadsz.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/lsahf.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/lsahf.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/mem64-err.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/mem64-err.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/mem64.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/mem64.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/mem64.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/mem64hi32.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/mem64hi32.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/mem64rip.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/mem64rip.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/mixcase.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/mixcase.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/movdq32.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/movdq32.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/movdq64.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/movdq64.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/negequ.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/negequ.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/nomem64-err.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/nomem64-err.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/nomem64-err2.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/nomem64-err2.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/nomem64.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/nomem64.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/nomem64.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/o64.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/o64.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/o64loop.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/o64loop.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/o64loop.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/opersize.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/opersize.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/opsize-err.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/opsize-err.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/overflow.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/overflow.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/overflow.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/padlock.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/padlock.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/pshift.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/pshift.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/push64.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/push64.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/push64.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/pushf-err.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/pushf-err.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/pushf.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/pushf.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/pushnosize.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/pushnosize.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/pushnosize.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/rep.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/rep.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/ret.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/ret.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/riprel1.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/riprel1.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/riprel2.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/riprel2.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/riprel2.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/ripseg.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/ripseg.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/ripseg.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/segmov.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/segmov.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/segoff-err.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/segoff-err.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/segoff.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/segoff.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/shift.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/shift.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/simd-1.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/simd-1.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/simd-2.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/simd-2.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/simd64-1.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/simd64-1.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/simd64-2.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/simd64-2.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/sse-prefix.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/sse-prefix.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/sse3.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/sse3.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/sse4-err.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/sse4-err.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/sse4.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/sse4.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/sse5-all.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/sse5-all.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/sse5-basic.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/sse5-basic.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/sse5-cc.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/sse5-cc.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/sse5-err.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/sse5-err.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/ssewidth.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/ssewidth.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/ssse3.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/ssse3.c
   buildtools/trunk/yasm/modules/arch/x86/tests/ssse3.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/stos.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/stos.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/str.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/str.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/strict-err.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/strict-err.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/strict.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/strict.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/strict.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/stringseg.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/stringseg.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/stringseg.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/svm.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/svm.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/twobytemem.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/twobytemem.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/twobytemem.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/vmx-err.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/vmx-err.errwarn
   buildtools/trunk/yasm/modules/arch/x86/tests/vmx.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/vmx.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/vpermil2.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/vpermil2.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/x86_test.sh
   buildtools/trunk/yasm/modules/arch/x86/tests/x86label.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/x86label.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/xchg64.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/xchg64.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/xmm64.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/xmm64.hex
   buildtools/trunk/yasm/modules/arch/x86/tests/xsave.asm
   buildtools/trunk/yasm/modules/arch/x86/tests/xsave.hex
   buildtools/trunk/yasm/modules/arch/x86/x86arch.c
   buildtools/trunk/yasm/modules/arch/x86/x86arch.h
   buildtools/trunk/yasm/modules/arch/x86/x86bc.c
   buildtools/trunk/yasm/modules/arch/x86/x86cpu.gperf
   buildtools/trunk/yasm/modules/arch/x86/x86expr.c
   buildtools/trunk/yasm/modules/arch/x86/x86id.c
   buildtools/trunk/yasm/modules/arch/x86/x86regtmod.gperf
   buildtools/trunk/yasm/modules/arch/yasm_arch.xml
   buildtools/trunk/yasm/modules/dbgfmts/
   buildtools/trunk/yasm/modules/dbgfmts/Makefile.inc
   buildtools/trunk/yasm/modules/dbgfmts/codeview/
   buildtools/trunk/yasm/modules/dbgfmts/codeview/Makefile.inc
   buildtools/trunk/yasm/modules/dbgfmts/codeview/cv-dbgfmt.c
   buildtools/trunk/yasm/modules/dbgfmts/codeview/cv-dbgfmt.h
   buildtools/trunk/yasm/modules/dbgfmts/codeview/cv-symline.c
   buildtools/trunk/yasm/modules/dbgfmts/codeview/cv-type.c
   buildtools/trunk/yasm/modules/dbgfmts/codeview/cv8.txt
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/Makefile.inc
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/dwarf2-aranges.c
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/dwarf2-dbgfmt.c
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/dwarf2-dbgfmt.h
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/dwarf2-info.c
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/dwarf2-line.c
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/Makefile.inc
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/pass32/
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/pass32/Makefile.inc
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/pass32/dwarf2_pass32_test.sh
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/pass32/dwarf32-err.asm
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/pass32/dwarf32-err.errwarn
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/pass32/dwarf32_testhd.asm
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/pass32/dwarf32_testhd.hex
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/pass64/
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/pass64/Makefile.inc
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/pass64/dwarf2_pass64_test.sh
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/pass64/dwarf64_2loc.asm
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/pass64/dwarf64_2loc.hex
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/pass64/dwarf64_leb128.asm
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/pass64/dwarf64_leb128.hex
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/passwin64/
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/passwin64/Makefile.inc
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/passwin64/dwarf2_passwin64_test.sh
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/passwin64/dwarfwin64_testhd.asm
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/passwin64/dwarfwin64_testhd.errwarn
   buildtools/trunk/yasm/modules/dbgfmts/dwarf2/tests/passwin64/dwarfwin64_testhd.hex
   buildtools/trunk/yasm/modules/dbgfmts/null/
   buildtools/trunk/yasm/modules/dbgfmts/null/Makefile.inc
   buildtools/trunk/yasm/modules/dbgfmts/null/null-dbgfmt.c
   buildtools/trunk/yasm/modules/dbgfmts/stabs/
   buildtools/trunk/yasm/modules/dbgfmts/stabs/Makefile.inc
   buildtools/trunk/yasm/modules/dbgfmts/stabs/stabs-dbgfmt.c
   buildtools/trunk/yasm/modules/dbgfmts/stabs/tests/
   buildtools/trunk/yasm/modules/dbgfmts/stabs/tests/Makefile.inc
   buildtools/trunk/yasm/modules/dbgfmts/stabs/tests/stabs-elf.asm
   buildtools/trunk/yasm/modules/dbgfmts/stabs/tests/stabs-elf.hex
   buildtools/trunk/yasm/modules/dbgfmts/stabs/tests/stabs_test.sh
   buildtools/trunk/yasm/modules/dbgfmts/yasm_dbgfmts.xml
   buildtools/trunk/yasm/modules/listfmts/
   buildtools/trunk/yasm/modules/listfmts/Makefile.inc
   buildtools/trunk/yasm/modules/listfmts/nasm/
   buildtools/trunk/yasm/modules/listfmts/nasm/Makefile.inc
   buildtools/trunk/yasm/modules/listfmts/nasm/nasm-listfmt.c
   buildtools/trunk/yasm/modules/objfmts/
   buildtools/trunk/yasm/modules/objfmts/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/bin/
   buildtools/trunk/yasm/modules/objfmts/bin/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/bin/bin-objfmt.c
   buildtools/trunk/yasm/modules/objfmts/bin/tests/
   buildtools/trunk/yasm/modules/objfmts/bin/tests/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/bin/tests/abs.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/abs.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/bigorg.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/bigorg.errwarn
   buildtools/trunk/yasm/modules/objfmts/bin/tests/bigorg.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/bin-farabs.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/bin-farabs.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/bin-rip.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/bin-rip.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/bin_test.sh
   buildtools/trunk/yasm/modules/objfmts/bin/tests/bintest.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/bintest.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/float-err.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/float-err.errwarn
   buildtools/trunk/yasm/modules/objfmts/bin/tests/float.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/float.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/integer-warn.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/integer-warn.errwarn
   buildtools/trunk/yasm/modules/objfmts/bin/tests/integer-warn.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/integer.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/integer.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/levelop.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/levelop.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/bin-align.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/bin-align.errwarn
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/bin-align.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/bin-align.map
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/bin-ssym.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/bin-ssym.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/bin-ssym.map
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/bin_multi_test.sh
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/follows-loop1-err.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/follows-loop1-err.errwarn
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/follows-loop2-err.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/follows-loop2-err.errwarn
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/follows-notfound-err.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/follows-notfound-err.errwarn
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/initbss.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/initbss.errwarn
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/initbss.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/initbss.map
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/ldlinux-sects.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/ldlinux-sects.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/ldlinux-sects.map
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect1.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect1.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect1.map
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect2.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect2.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect2.map
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect3.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect3.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect3.map
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect4.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect4.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect4.map
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect5.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect5.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/multisect5.map
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/nomultisect1.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/nomultisect1.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/nomultisect1.map
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/nomultisect2.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/nomultisect2.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/nomultisect2.map
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/vfollows-loop1-err.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/vfollows-loop1-err.errwarn
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/vfollows-loop2-err.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/vfollows-loop2-err.errwarn
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/vfollows-notfound-err.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/multisect/vfollows-notfound-err.errwarn
   buildtools/trunk/yasm/modules/objfmts/bin/tests/reserve.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/reserve.errwarn
   buildtools/trunk/yasm/modules/objfmts/bin/tests/reserve.hex
   buildtools/trunk/yasm/modules/objfmts/bin/tests/shr.asm
   buildtools/trunk/yasm/modules/objfmts/bin/tests/shr.hex
   buildtools/trunk/yasm/modules/objfmts/coff/
   buildtools/trunk/yasm/modules/objfmts/coff/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/coff/coff-objfmt.c
   buildtools/trunk/yasm/modules/objfmts/coff/coff-objfmt.h
   buildtools/trunk/yasm/modules/objfmts/coff/tests/
   buildtools/trunk/yasm/modules/objfmts/coff/tests/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/coff/tests/coff_test.sh
   buildtools/trunk/yasm/modules/objfmts/coff/tests/cofftest.asm
   buildtools/trunk/yasm/modules/objfmts/coff/tests/cofftest.c
   buildtools/trunk/yasm/modules/objfmts/coff/tests/cofftest.hex
   buildtools/trunk/yasm/modules/objfmts/coff/tests/cofftimes.asm
   buildtools/trunk/yasm/modules/objfmts/coff/tests/cofftimes.hex
   buildtools/trunk/yasm/modules/objfmts/coff/tests/x86id.asm
   buildtools/trunk/yasm/modules/objfmts/coff/tests/x86id.errwarn
   buildtools/trunk/yasm/modules/objfmts/coff/tests/x86id.hex
   buildtools/trunk/yasm/modules/objfmts/coff/win64-except.c
   buildtools/trunk/yasm/modules/objfmts/dbg/
   buildtools/trunk/yasm/modules/objfmts/dbg/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/dbg/dbg-objfmt.c
   buildtools/trunk/yasm/modules/objfmts/elf/
   buildtools/trunk/yasm/modules/objfmts/elf/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/elf/elf-machine.h
   buildtools/trunk/yasm/modules/objfmts/elf/elf-objfmt.c
   buildtools/trunk/yasm/modules/objfmts/elf/elf-x86-amd64.c
   buildtools/trunk/yasm/modules/objfmts/elf/elf-x86-x86.c
   buildtools/trunk/yasm/modules/objfmts/elf/elf.c
   buildtools/trunk/yasm/modules/objfmts/elf/elf.h
   buildtools/trunk/yasm/modules/objfmts/elf/tests/
   buildtools/trunk/yasm/modules/objfmts/elf/tests/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/elf/tests/amd64/
   buildtools/trunk/yasm/modules/objfmts/elf/tests/amd64/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/elf/tests/amd64/elf-rip.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/amd64/elf-rip.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/amd64/elf_amd64_test.sh
   buildtools/trunk/yasm/modules/objfmts/elf/tests/amd64/elfso64.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/amd64/elfso64.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/amd64/gotpcrel.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/amd64/gotpcrel.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/curpos-err.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/curpos-err.errwarn
   buildtools/trunk/yasm/modules/objfmts/elf/tests/curpos.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/curpos.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elf-overdef.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elf-overdef.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elf-x86id.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elf-x86id.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elf_test.sh
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfabssect.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfabssect.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfcond.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfcond.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfequabs.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfequabs.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfglobal.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfglobal.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfglobext.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfglobext.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfglobext2.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfglobext2.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfmanysym.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfmanysym.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfreloc-ext.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfreloc-ext.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfreloc.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfreloc.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfsectalign.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfsectalign.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfso.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfso.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elftest.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elftest.c
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elftest.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elftimes.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elftimes.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elftypesize.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elftypesize.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfvisibility.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfvisibility.errwarn
   buildtools/trunk/yasm/modules/objfmts/elf/tests/elfvisibility.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas32/
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas32/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas32/elf_gas32_ssym.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas32/elf_gas32_ssym.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas32/elf_gas32_test.sh
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas64/
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas64/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas64/crosssect.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas64/crosssect.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas64/elf_gas64_curpos.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas64/elf_gas64_curpos.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas64/elf_gas64_reloc.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas64/elf_gas64_reloc.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas64/elf_gas64_ssym.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas64/elf_gas64_ssym.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/gas64/elf_gas64_test.sh
   buildtools/trunk/yasm/modules/objfmts/elf/tests/nasm-forceident.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/nasm-forceident.hex
   buildtools/trunk/yasm/modules/objfmts/elf/tests/nasm-sectname.asm
   buildtools/trunk/yasm/modules/objfmts/elf/tests/nasm-sectname.hex
   buildtools/trunk/yasm/modules/objfmts/macho/
   buildtools/trunk/yasm/modules/objfmts/macho/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/macho/macho-objfmt.c
   buildtools/trunk/yasm/modules/objfmts/macho/tests/
   buildtools/trunk/yasm/modules/objfmts/macho/tests/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/macho/tests/gas32/
   buildtools/trunk/yasm/modules/objfmts/macho/tests/gas32/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/macho/tests/gas32/gas-macho32.asm
   buildtools/trunk/yasm/modules/objfmts/macho/tests/gas32/gas-macho32.hex
   buildtools/trunk/yasm/modules/objfmts/macho/tests/gas32/gas_macho32_test.sh
   buildtools/trunk/yasm/modules/objfmts/macho/tests/gas64/
   buildtools/trunk/yasm/modules/objfmts/macho/tests/gas64/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/macho/tests/gas64/gas-macho64-pic.asm
   buildtools/trunk/yasm/modules/objfmts/macho/tests/gas64/gas-macho64-pic.hex
   buildtools/trunk/yasm/modules/objfmts/macho/tests/gas64/gas-macho64.asm
   buildtools/trunk/yasm/modules/objfmts/macho/tests/gas64/gas-macho64.hex
   buildtools/trunk/yasm/modules/objfmts/macho/tests/gas64/gas_macho64_test.sh
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm32/
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm32/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm32/macho-reloc.asm
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm32/macho-reloc.hex
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm32/macho32-sect.asm
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm32/macho32-sect.errwarn
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm32/macho32-sect.hex
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm32/macho32_test.sh
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm32/machotest.asm
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm32/machotest.c
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm32/machotest.hex
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm64/
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm64/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm64/macho-reloc64-err.asm
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm64/macho-reloc64-err.errwarn
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm64/macho64_test.sh
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm64/machotest64.asm
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm64/machotest64.c
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm64/machotest64.hex
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm64/nasm-macho64-pic.asm
   buildtools/trunk/yasm/modules/objfmts/macho/tests/nasm64/nasm-macho64-pic.hex
   buildtools/trunk/yasm/modules/objfmts/rdf/
   buildtools/trunk/yasm/modules/objfmts/rdf/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/rdf/rdf-objfmt.c
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdf_test.sh
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdfabs.asm
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdfabs.errwarn
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdfabs.hex
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdfext.asm
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdfext.hex
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdfseg.asm
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdfseg.hex
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdfseg2.asm
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdfseg2.hex
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdftest1.asm
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdftest1.hex
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdftest2.asm
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdftest2.hex
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdtlib.asm
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdtlib.hex
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdtmain.asm
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/rdtmain.hex
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/testlib.asm
   buildtools/trunk/yasm/modules/objfmts/rdf/tests/testlib.hex
   buildtools/trunk/yasm/modules/objfmts/win32/
   buildtools/trunk/yasm/modules/objfmts/win32/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/win32/tests/
   buildtools/trunk/yasm/modules/objfmts/win32/tests/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/win32/tests/export.asm
   buildtools/trunk/yasm/modules/objfmts/win32/tests/export.hex
   buildtools/trunk/yasm/modules/objfmts/win32/tests/win32-curpos.asm
   buildtools/trunk/yasm/modules/objfmts/win32/tests/win32-curpos.hex
   buildtools/trunk/yasm/modules/objfmts/win32/tests/win32-overdef.asm
   buildtools/trunk/yasm/modules/objfmts/win32/tests/win32-overdef.hex
   buildtools/trunk/yasm/modules/objfmts/win32/tests/win32-safeseh.asm
   buildtools/trunk/yasm/modules/objfmts/win32/tests/win32-safeseh.hex
   buildtools/trunk/yasm/modules/objfmts/win32/tests/win32-safeseh.masm
   buildtools/trunk/yasm/modules/objfmts/win32/tests/win32-segof.asm
   buildtools/trunk/yasm/modules/objfmts/win32/tests/win32-segof.hex
   buildtools/trunk/yasm/modules/objfmts/win32/tests/win32_test.sh
   buildtools/trunk/yasm/modules/objfmts/win32/tests/win32test.asm
   buildtools/trunk/yasm/modules/objfmts/win32/tests/win32test.c
   buildtools/trunk/yasm/modules/objfmts/win32/tests/win32test.hex
   buildtools/trunk/yasm/modules/objfmts/win64/
   buildtools/trunk/yasm/modules/objfmts/win64/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/win64/tests/
   buildtools/trunk/yasm/modules/objfmts/win64/tests/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce1-err.asm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce1-err.errwarn
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce1.asm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce1.hex
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce2-err.asm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce2-err.errwarn
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce2.asm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce2.hex
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce3.asm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce3.hex
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce3.masm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce4-err.asm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce4-err.errwarn
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce4.asm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce4.hex
   buildtools/trunk/yasm/modules/objfmts/win64/tests/sce4.masm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/win64-abs.asm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/win64-abs.hex
   buildtools/trunk/yasm/modules/objfmts/win64/tests/win64-curpos.asm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/win64-curpos.hex
   buildtools/trunk/yasm/modules/objfmts/win64/tests/win64-dataref.asm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/win64-dataref.hex
   buildtools/trunk/yasm/modules/objfmts/win64/tests/win64-dataref.masm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/win64-dataref2.asm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/win64-dataref2.hex
   buildtools/trunk/yasm/modules/objfmts/win64/tests/win64-dataref2.masm
   buildtools/trunk/yasm/modules/objfmts/win64/tests/win64_test.sh
   buildtools/trunk/yasm/modules/objfmts/xdf/
   buildtools/trunk/yasm/modules/objfmts/xdf/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/Makefile.inc
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdf-overdef.asm
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdf-overdef.hex
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdf_test.sh
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdflong.asm
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdflong.errwarn
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdflong.hex
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdfother.asm
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdfother.hex
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdfprotect.asm
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdfprotect.hex
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdfsect-err.asm
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdfsect-err.errwarn
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdfsect.asm
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdfsect.hex
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdfvirtual.asm
   buildtools/trunk/yasm/modules/objfmts/xdf/tests/xdfvirtual.hex
   buildtools/trunk/yasm/modules/objfmts/xdf/xdf-objfmt.c
   buildtools/trunk/yasm/modules/objfmts/yasm_objfmts.xml
   buildtools/trunk/yasm/modules/parsers/
   buildtools/trunk/yasm/modules/parsers/Makefile.inc
   buildtools/trunk/yasm/modules/parsers/gas/
   buildtools/trunk/yasm/modules/parsers/gas/Makefile.inc
   buildtools/trunk/yasm/modules/parsers/gas/gas-parse.c
   buildtools/trunk/yasm/modules/parsers/gas/gas-parser.c
   buildtools/trunk/yasm/modules/parsers/gas/gas-parser.h
   buildtools/trunk/yasm/modules/parsers/gas/gas-token.re
   buildtools/trunk/yasm/modules/parsers/gas/tests/
   buildtools/trunk/yasm/modules/parsers/gas/tests/Makefile.inc
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/Makefile.inc
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/gas-comment.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/gas-comment.errwarn
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/gas-comment.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/gas-llabel.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/gas-llabel.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/gas-set.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/gas-set.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/gas_bin_test.sh
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/rept-err.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/rept-err.errwarn
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/reptempty.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/reptempty.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/reptlong.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/reptlong.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/reptnested-err.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/reptnested-err.errwarn
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/reptsimple.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/reptsimple.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/reptwarn.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/reptwarn.errwarn
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/reptwarn.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/reptzero.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/bin/reptzero.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/dataref-imm.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/dataref-imm.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/datavis.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/datavis.errwarn
   buildtools/trunk/yasm/modules/parsers/gas/tests/datavis.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/datavis2.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/datavis2.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/execsect.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/execsect.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/gas-fill.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/gas-fill.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/gas-instlabel.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/gas-instlabel.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/gas-line-err.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/gas-line-err.errwarn
   buildtools/trunk/yasm/modules/parsers/gas/tests/gas-line2-err.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/gas-line2-err.errwarn
   buildtools/trunk/yasm/modules/parsers/gas/tests/gas-push.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/gas-push.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/gas-semi.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/gas-semi.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/gas_test.sh
   buildtools/trunk/yasm/modules/parsers/gas/tests/gassectalign.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/gassectalign.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/jmpcall.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/jmpcall.errwarn
   buildtools/trunk/yasm/modules/parsers/gas/tests/jmpcall.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/leb128.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/leb128.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/localcomm.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/localcomm.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/reggroup-err.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/reggroup-err.errwarn
   buildtools/trunk/yasm/modules/parsers/gas/tests/reggroup.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/reggroup.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/strzero.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/strzero.hex
   buildtools/trunk/yasm/modules/parsers/gas/tests/varinsn.asm
   buildtools/trunk/yasm/modules/parsers/gas/tests/varinsn.hex
   buildtools/trunk/yasm/modules/parsers/nasm/
   buildtools/trunk/yasm/modules/parsers/nasm/Makefile.inc
   buildtools/trunk/yasm/modules/parsers/nasm/nasm-parse.c
   buildtools/trunk/yasm/modules/parsers/nasm/nasm-parser.c
   buildtools/trunk/yasm/modules/parsers/nasm/nasm-parser.h
   buildtools/trunk/yasm/modules/parsers/nasm/nasm-token.re
   buildtools/trunk/yasm/modules/parsers/nasm/tests/
   buildtools/trunk/yasm/modules/parsers/nasm/tests/Makefile.inc
   buildtools/trunk/yasm/modules/parsers/nasm/tests/alignnop16.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/alignnop16.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/alignnop32.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/alignnop32.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/charconstmath.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/charconstmath.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/dy.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/dy.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/endcomma.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/endcomma.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/equcolon.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/equcolon.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/equlocal.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/equlocal.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/hexconst.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/hexconst.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/locallabel.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/locallabel.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/long.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/long.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/nasm-prefix.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/nasm-prefix.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/nasm_test.sh
   buildtools/trunk/yasm/modules/parsers/nasm/tests/newsect.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/newsect.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/orphannowarn.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/orphannowarn.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/prevlocalwarn.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/prevlocalwarn.errwarn
   buildtools/trunk/yasm/modules/parsers/nasm/tests/prevlocalwarn.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/strucalign.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/strucalign.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/struczero.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/struczero.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/syntax-err.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/syntax-err.errwarn
   buildtools/trunk/yasm/modules/parsers/nasm/tests/uscore.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/uscore.hex
   buildtools/trunk/yasm/modules/parsers/nasm/tests/worphan/
   buildtools/trunk/yasm/modules/parsers/nasm/tests/worphan/Makefile.inc
   buildtools/trunk/yasm/modules/parsers/nasm/tests/worphan/nasm_worphan_test.sh
   buildtools/trunk/yasm/modules/parsers/nasm/tests/worphan/orphanwarn.asm
   buildtools/trunk/yasm/modules/parsers/nasm/tests/worphan/orphanwarn.errwarn
   buildtools/trunk/yasm/modules/parsers/nasm/tests/worphan/orphanwarn.hex
   buildtools/trunk/yasm/modules/parsers/yasm_parsers.xml
   buildtools/trunk/yasm/modules/preprocs/
   buildtools/trunk/yasm/modules/preprocs/Makefile.inc
   buildtools/trunk/yasm/modules/preprocs/cpp/
   buildtools/trunk/yasm/modules/preprocs/cpp/Makefile.inc
   buildtools/trunk/yasm/modules/preprocs/cpp/cpp-preproc.c
   buildtools/trunk/yasm/modules/preprocs/nasm/
   buildtools/trunk/yasm/modules/preprocs/nasm/Makefile.inc
   buildtools/trunk/yasm/modules/preprocs/nasm/genmacro.c
   buildtools/trunk/yasm/modules/preprocs/nasm/genversion.c
   buildtools/trunk/yasm/modules/preprocs/nasm/nasm-eval.c
   buildtools/trunk/yasm/modules/preprocs/nasm/nasm-eval.h
   buildtools/trunk/yasm/modules/preprocs/nasm/nasm-pp.c
   buildtools/trunk/yasm/modules/preprocs/nasm/nasm-pp.h
   buildtools/trunk/yasm/modules/preprocs/nasm/nasm-preproc.c
   buildtools/trunk/yasm/modules/preprocs/nasm/nasm.h
   buildtools/trunk/yasm/modules/preprocs/nasm/nasmlib.c
   buildtools/trunk/yasm/modules/preprocs/nasm/nasmlib.h
   buildtools/trunk/yasm/modules/preprocs/nasm/standard.mac
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/16args.asm
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/16args.hex
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/Makefile.inc
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/ifcritical-err.asm
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/ifcritical-err.errwarn
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/longline.asm
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/longline.hex
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/nasmpp-bigint.asm
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/nasmpp-bigint.hex
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/nasmpp-decimal.asm
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/nasmpp-decimal.hex
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/nasmpp-nested.asm
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/nasmpp-nested.errwarn
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/nasmpp-nested.hex
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/nasmpp_test.sh
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/noinclude-err.asm
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/noinclude-err.errwarn
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/orgsect.asm
   buildtools/trunk/yasm/modules/preprocs/nasm/tests/orgsect.hex
   buildtools/trunk/yasm/modules/preprocs/raw/
   buildtools/trunk/yasm/modules/preprocs/raw/Makefile.inc
   buildtools/trunk/yasm/modules/preprocs/raw/raw-preproc.c
   buildtools/trunk/yasm/out_test.sh
   buildtools/trunk/yasm/po/
   buildtools/trunk/yasm/po/ChangeLog
   buildtools/trunk/yasm/po/Makefile.in.in
   buildtools/trunk/yasm/po/Makevars
   buildtools/trunk/yasm/po/POTFILES.in
   buildtools/trunk/yasm/po/Rules-quot
   buildtools/trunk/yasm/po/boldquot.sed
   buildtools/trunk/yasm/po/en at boldquot.header
   buildtools/trunk/yasm/po/en at quot.header
   buildtools/trunk/yasm/po/insert-header.sin
   buildtools/trunk/yasm/po/quot.sed
   buildtools/trunk/yasm/po/remove-potcdate.sin
   buildtools/trunk/yasm/po/stamp-po
   buildtools/trunk/yasm/po/yasm.pot
   buildtools/trunk/yasm/splint.sh
   buildtools/trunk/yasm/test_hd.c
   buildtools/trunk/yasm/tools/
   buildtools/trunk/yasm/tools/Makefile.inc
   buildtools/trunk/yasm/tools/genperf/
   buildtools/trunk/yasm/tools/genperf/Makefile.inc
   buildtools/trunk/yasm/tools/genperf/genperf.c
   buildtools/trunk/yasm/tools/genperf/perfect.c
   buildtools/trunk/yasm/tools/genperf/perfect.h
   buildtools/trunk/yasm/tools/genperf/standard.h
   buildtools/trunk/yasm/tools/python-yasm/
   buildtools/trunk/yasm/tools/python-yasm/Makefile.inc
   buildtools/trunk/yasm/tools/python-yasm/bytecode.pxi
   buildtools/trunk/yasm/tools/python-yasm/errwarn.pxi
   buildtools/trunk/yasm/tools/python-yasm/expr.pxi
   buildtools/trunk/yasm/tools/python-yasm/floatnum.pxi
   buildtools/trunk/yasm/tools/python-yasm/intnum.pxi
   buildtools/trunk/yasm/tools/python-yasm/pyxelator/
   buildtools/trunk/yasm/tools/python-yasm/pyxelator/cparse.py
   buildtools/trunk/yasm/tools/python-yasm/pyxelator/genpyx.py
   buildtools/trunk/yasm/tools/python-yasm/pyxelator/ir.py
   buildtools/trunk/yasm/tools/python-yasm/pyxelator/lexer.py
   buildtools/trunk/yasm/tools/python-yasm/pyxelator/node.py
   buildtools/trunk/yasm/tools/python-yasm/pyxelator/parse_core.py
   buildtools/trunk/yasm/tools/python-yasm/pyxelator/work_unit.py
   buildtools/trunk/yasm/tools/python-yasm/pyxelator/wrap_yasm.py
   buildtools/trunk/yasm/tools/python-yasm/setup.py
   buildtools/trunk/yasm/tools/python-yasm/symrec.pxi
   buildtools/trunk/yasm/tools/python-yasm/tests/
   buildtools/trunk/yasm/tools/python-yasm/tests/Makefile.inc
   buildtools/trunk/yasm/tools/python-yasm/tests/__init__.py
   buildtools/trunk/yasm/tools/python-yasm/tests/python_test.sh
   buildtools/trunk/yasm/tools/python-yasm/tests/test_bytecode.py
   buildtools/trunk/yasm/tools/python-yasm/tests/test_expr.py
   buildtools/trunk/yasm/tools/python-yasm/tests/test_intnum.py
   buildtools/trunk/yasm/tools/python-yasm/tests/test_symrec.py
   buildtools/trunk/yasm/tools/python-yasm/value.pxi
   buildtools/trunk/yasm/tools/python-yasm/yasm.pyx
   buildtools/trunk/yasm/tools/re2c/
   buildtools/trunk/yasm/tools/re2c/CHANGELOG
   buildtools/trunk/yasm/tools/re2c/Makefile.inc
   buildtools/trunk/yasm/tools/re2c/NO_WARRANTY
   buildtools/trunk/yasm/tools/re2c/README
   buildtools/trunk/yasm/tools/re2c/actions.c
   buildtools/trunk/yasm/tools/re2c/basics.h
   buildtools/trunk/yasm/tools/re2c/bootstrap/
   buildtools/trunk/yasm/tools/re2c/bootstrap/scanner.c
   buildtools/trunk/yasm/tools/re2c/code.c
   buildtools/trunk/yasm/tools/re2c/dfa.c
   buildtools/trunk/yasm/tools/re2c/dfa.h
   buildtools/trunk/yasm/tools/re2c/doc/
   buildtools/trunk/yasm/tools/re2c/doc/loplas.ps.gz
   buildtools/trunk/yasm/tools/re2c/doc/sample.bib
   buildtools/trunk/yasm/tools/re2c/examples/
   buildtools/trunk/yasm/tools/re2c/examples/basemmap.c
   buildtools/trunk/yasm/tools/re2c/examples/c.re
   buildtools/trunk/yasm/tools/re2c/examples/cmmap.re
   buildtools/trunk/yasm/tools/re2c/examples/cnokw.re
   buildtools/trunk/yasm/tools/re2c/examples/cunroll.re
   buildtools/trunk/yasm/tools/re2c/examples/modula.re
   buildtools/trunk/yasm/tools/re2c/examples/repeater.re
   buildtools/trunk/yasm/tools/re2c/examples/rexx/
   buildtools/trunk/yasm/tools/re2c/examples/rexx/README
   buildtools/trunk/yasm/tools/re2c/examples/rexx/rexx.l
   buildtools/trunk/yasm/tools/re2c/examples/rexx/scanio.c
   buildtools/trunk/yasm/tools/re2c/examples/sample.re
   buildtools/trunk/yasm/tools/re2c/examples/simple.re
   buildtools/trunk/yasm/tools/re2c/globals.h
   buildtools/trunk/yasm/tools/re2c/ins.h
   buildtools/trunk/yasm/tools/re2c/main.c
   buildtools/trunk/yasm/tools/re2c/mbo_getopt.c
   buildtools/trunk/yasm/tools/re2c/mbo_getopt.h
   buildtools/trunk/yasm/tools/re2c/parse.h
   buildtools/trunk/yasm/tools/re2c/parser.c
   buildtools/trunk/yasm/tools/re2c/parser.h
   buildtools/trunk/yasm/tools/re2c/re.h
   buildtools/trunk/yasm/tools/re2c/re2c.1
   buildtools/trunk/yasm/tools/re2c/scanner.c
   buildtools/trunk/yasm/tools/re2c/scanner.h
   buildtools/trunk/yasm/tools/re2c/scanner.re
   buildtools/trunk/yasm/tools/re2c/substr.c
   buildtools/trunk/yasm/tools/re2c/substr.h
   buildtools/trunk/yasm/tools/re2c/token.h
   buildtools/trunk/yasm/tools/re2c/translate.c
   buildtools/trunk/yasm/util.h
   buildtools/trunk/yasm/x86insn_gas.gperf
   buildtools/trunk/yasm/x86insn_nasm.gperf
   buildtools/trunk/yasm/x86insns.c
   buildtools/trunk/yasm/yasm.1
   buildtools/trunk/yasm/yasm_arch.7
   buildtools/trunk/yasm/yasm_dbgfmts.7
   buildtools/trunk/yasm/yasm_objfmts.7
   buildtools/trunk/yasm/yasm_parsers.7
Log:
Add yasm 0.7.2 to build tools

Added: buildtools/trunk/yasm/ABOUT-NLS
===================================================================
--- buildtools/trunk/yasm/ABOUT-NLS	2009-04-09 09:39:58 UTC (rev 30058)
+++ buildtools/trunk/yasm/ABOUT-NLS	2009-04-09 11:16:39 UTC (rev 30059)
@@ -0,0 +1,1101 @@
+1 Notes on the Free Translation Project
+***************************************
+
+Free software is going international!  The Free Translation Project is
+a way to get maintainers of free software, translators, and users all
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do _not_
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work on translations can contact the appropriate team.
+
+   When reporting bugs in the `intl/' directory or bugs which may be
+related to internationalization, you should tell about the version of
+`gettext' which is used.  The information can be found in the
+`intl/VERSION' file, in internationalized packages.
+
+1.1 Quick configuration advice
+==============================
+
+If you want to exploit the full power of internationalization, you
+should configure it using
+
+     ./configure --with-included-gettext
+
+to force usage of internationalizing routines provided within this
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias, message inheritance, automatic
+charset conversion or plural form handling) as the implementation here.
+It is also not possible to offer this additional functionality on top
+of a `catgets' implementation.  Future versions of GNU `gettext' will
+very likely convey even more functionality.  So it might be a good idea
+to change to GNU `gettext' as soon as possible.
+
+   So you need _not_ provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
+
+1.2 INSTALL Matters
+===================
+
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system already
+provides the GNU `gettext' functions.  If not, the included GNU
+`gettext' library will be used.  This library is wholly contained
+within this package, usually in the `intl/' subdirectory, so prior
+installation of the GNU `gettext' package is _not_ required.
+Installers may use special options at configuration time for changing
+the default behaviour.  The commands:
+
+     ./configure --with-included-gettext
+     ./configure --disable-nls
+
+will, respectively, bypass any pre-existing `gettext' to use the
+internationalizing routines provided within this package, or else,
+_totally_ disable translation of messages.
+
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl.a' file and
+will decide to use this.  This might not be desirable.  You should use
+the more recent version of the GNU `gettext' library.  I.e. if the file
+`intl/VERSION' shows that the library which comes with this package is
+more recent, you should use
+
+     ./configure --with-included-gettext
+
+to prevent auto-detection.
+
+   The configuration process will not test for the `catgets' function
+and therefore it will not be used.  The reason is that even an
+emulation of `gettext' on top of `catgets' could not provide all the
+extensions of the GNU `gettext' library.
+
+   Internationalized packages usually have many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+1.3 Using This Package
+======================
+
+As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
+and `CC' is an ISO 3166 two-letter country code.  For example, let's
+suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
+
+   You might think that the country code specification is redundant.
+But in fact, some languages have dialects in different countries.  For
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
+country code serves to distinguish the dialects.
+
+   The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc.  On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
+locales supported by your system for your language by running the
+command `locale -a | grep '^LL''.
+
+   Not all programs have translations for all languages.  By default, an
+English message is shown in place of a nonexistent translation.  If you
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
+set to the primary language; this is required by other parts of the
+system libraries.  For example, some Swedish users who would rather
+read translations in German than English for when Swedish is not
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
+
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
+   In the `LANGUAGE' environment variable, but not in the `LANG'
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect.  For example, `de' is equivalent
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
+(Portuguese as spoken in Portugal) in this context.
+
+1.4 Translating Teams
+=====================
+
+For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list.  The up-to-date list of
+teams can be found at the Free Translation Project's homepage,
+`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
+area.
+
+   If you'd like to volunteer to _work_ at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is _not_ the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request at li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+_actively_ in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `translation at iro.umontreal.ca' to reach the
+coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skills are praised more than
+programming skills, here.
+
+1.5 Available Packages
+======================
+
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of October
+2006.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination, with a
+translation percentage of at least 50%.
+
+     Ready PO files       af am ar az be bg bs ca cs cy da de el en en_GB eo
+                        +----------------------------------------------------+
+     GNUnet             |                                  []                |
+     a2ps               |             []                [] [] []     []      |
+     aegis              |                                  ()                |
+     ant-phone          |                                  ()                |
+     anubis             |                                  []                |
+     ap-utils           |                                                    |
+     aspell             |                      [] []    [] []        []      |
+     bash               |                      []          []             [] |
+     batchelor          |                                  []                |
+     bfd                |                                                    |
+     bibshelf           |                                  []                |
+     binutils           |                               []                   |
+     bison              |                               [] []                |
+     bison-runtime      |                                                    |
+     bluez-pin          | []                      []       [] []          [] |
+     cflow              |                               []                   |
+     clisp              |                                  []    []          |
+     console-tools      |                         []       []                |
+     coreutils          |                []    []          []                |
+     cpio               |                                                    |
+     cpplib             |                      []       [] []                |
+     cryptonit          |                                  []                |
+     darkstat           |                []             () []                |
+     dialog             |                      [] [] [] [] [] []             |
+     diffutils          |                      [] []    [] [] []          [] |
+     doodle             |                                  []                |
+     e2fsprogs          |                         []       []                |
+     enscript           |                      []       [] []        []      |
+     error              |                      []       [] []        []      |
+     fetchmail          |                      []       [] () []             |
+     fileutils          |                               [] []                |
+     findutils          |                []    []       []                   |
+     flex               |                      []       [] []                |
+     fslint             |                                  []                |
+     gas                |                                                    |
+     gawk               |                      []       [] []                |
+     gbiff              |                                  []                |
+     gcal               |                      []                            |
+     gcc                |                                  []                |
+     gettext-examples   | []                   []          [] []          [] |
+     gettext-runtime    |             []       []       [] []             [] |
+     gettext-tools      |                      []          []                |
+     gimp-print         |                         []    [] []        []      |
+     gip                |                []                                  |
+     gliv               |                                  []                |
+     glunarclock        |                []                                  |
+     gmult              | []                               []                |
+     gnubiff            |                                  ()                |
+     gnucash            |                                  () ()     []      |
+     gnucash-glossary   |                               [] ()                |
+     gnuedu             |                                                    |
+     gnulib             | []          [] []    []       [] []                |
+     gnunet-gtk         |                                                    |
+     gnutls             |                                                    |
+     gpe-aerial         |                         []       []                |
+     gpe-beam           |                         []       []                |
+     gpe-calendar       |                                                    |
+     gpe-clock          |                         []       []                |
+     gpe-conf           |                         []       []                |
+     gpe-contacts       |                                                    |
+     gpe-edit           |                         []                         |
+     gpe-filemanager    |                                                    |
+     gpe-go             |                         []                         |
+     gpe-login          |                         []       []                |
+     gpe-ownerinfo      |                         []       []                |
+     gpe-package        |                                                    |
+     gpe-sketchbook     |                         []       []                |
+     gpe-su             |                         []       []                |
+     gpe-taskmanager    |                         []       []                |
+     gpe-timesheet      |                         []                         |
+     gpe-today          |                         []       []                |
+     gpe-todo           |                                                    |
+     gphoto2            |                         []    [] []        []      |
+     gprof              |                               [] []                |
+     gpsdrive           |                                  ()    ()          |
+     gramadoir          | []                               []                |
+     grep               | []          [] []    []          [] []             |
+     gretl              |                                                    |
+     gsasl              |                                                    |
+     gss                |                                                    |
+     gst-plugins        | []                   [] []    []                   |
+     gst-plugins-base   |                []    []       []                   |
+     gst-plugins-good   | []       []    []    [] []    []           []      |
+     gstreamer          | []             []    [] []    [] []        []      |
+     gtick              |                                  ()                |
+     gtkam              |                         []    [] []                |
+     gtkorphan          |                []                []                |
+     gtkspell           |             []                   [] []          [] |
+     gutenprint         |                               []                   |
+     hello              |                []    []       [] []             [] |
+     id-utils           |                               [] []                |
+     impost             |                                                    |
+     indent             |                      []          []             [] |
+     iso_3166           |                                  []             [] |
+     iso_3166_2         |                                                    |
+     iso_4217           |                                  []                |
+     iso_639            |                                  []             [] |
+     jpilot             |                         []                         |
+     jtag               |                                                    |
+     jwhois             |                                                    |
+     kbd                |                         []    [] [] []             |
+     keytouch           |                                                    |
+     keytouch-editor    |                                                    |
+     keytouch-keyboa... |                                                    |
+     latrine            |                                  ()                |
+     ld                 |                               []                   |
+     leafpad            |                []    [] []       [] []             |
+     libc               |                      [] []    [] [] []             |
+     libexif            |                                  []                |
+     libextractor       |                                  []                |
+     libgpewidget       |                         []    [] []                |
+     libgpg-error       |                                  []                |
+     libgphoto2         |                               [] []                |
+     libgphoto2_port    |                               [] []                |
+     libgsasl           |                                                    |
+     libiconv           |                                  []             [] |
+     libidn             |                               []                [] |
+     lifelines          |                               [] ()                |
+     lilypond           |                                  []                |
+     lingoteach         |                                                    |
+     lynx               |                      [] []    [] []                |
+     m4                 |                         []    [] [] []             |
+     mailutils          |                      []                            |
+     make               |                               [] []                |
+     man-db             |                      [] ()    [] []                |
+     minicom            |                         []    [] []                |
+     mysecretdiary      |                               [] []                |
+     nano               |                []    []          []                |
+     nano_1_0           |                      [] ()    [] []                |
+     opcodes            |                                  []                |
+     parted             |                                                    |
+     pilot-qof          |                                            []      |
+     psmisc             |                []                                  |
+     pwdutils           |                                                    |
+     python             |                                                    |
+     qof                |                                                    |
+     radius             |                      []                            |
+     recode             |             []       []       [] [] []          [] |
+     rpm                |                         []    []                   |
+     screem             |                                                    |
+     scrollkeeper       |          [] []       [] [] [] [] []        []      |
+     sed                |                      []          []             [] |
+     sh-utils           |                               [] []                |
+     shared-mime-info   |                []       []                 []   [] |
+     sharutils          |                []    [] []    [] [] []             |
+     shishi             |                                                    |
+     silky              |                                                    |
+     skencil            |                               [] ()                |
+     sketch             |                               [] ()                |
+     solfege            |                                                    |
+     soundtracker       |                               [] []                |
+     sp                 |                                  []                |
+     stardict           |                         []                         |
+     system-tools-ba... |       []       [] [] [] []    [] [] []     []      |
+     tar                |                []                                  |
+     texinfo            |                               [] []             [] |
+     textutils          |                      []       [] []                |
+     tin                |                                  ()        ()      |
+     tp-robot           |                                  []                |
+     tuxpaint           | []             []             [] []        []      |
+     unicode-han-tra... |                                                    |
+     unicode-transla... |                                                    |
+     util-linux         |                      [] []    [] []                |
+     vorbis-tools       |             []          []    []           []      |
+     wastesedge         |                                  ()                |
+     wdiff              |                      []       [] []        []      |
+     wget               |                      []          []                |
+     xchat              |             [] []    []          [] []     []      |
+     xkeyboard-config   |                                                    |
+     xpad               |                []             []                   |
+                        +----------------------------------------------------+
+                          af am ar az be bg bs ca cs cy da de el en en_GB eo
+                          10  0  1  2  9 22  1 42 41  2 60 95 16  1  17   16
+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                        +--------------------------------------------------+
+     GNUnet             |                                                  |
+     a2ps               |    []       [] []                             () |
+     aegis              |                                                  |
+     ant-phone          |                []                                |
+     anubis             |                []                                |
+     ap-utils           |             [] []                                |
+     aspell             |                []  []                         [] |
+     bash               | []             []                    []          |
+     batchelor          |                []  []                            |
+     bfd                | []                                               |
+     bibshelf           | []                 []                         [] |
+     binutils           | []          [] []                                |
+     bison              | [] []          []  []                   []    [] |
+     bison-runtime      |    []          []  []                   []    [] |
+     bluez-pin          |             [] []  []                [] []       |
+     cflow              |                    []                            |
+     clisp              | []             []                                |
+     console-tools      |                                                  |
+     coreutils          | [] []       [] []  []                []          |
+     cpio               | []             []  []                            |
+     cpplib             | []             []                                |
+     cryptonit          |                []                                |
+     darkstat           | []             ()  []                [] []       |
+     dialog             | [] [] []    [] []  []                []       [] |
+     diffutils          | []          [] []  [] []    []       [] []    [] |
+     doodle             |                    []                         [] |
+     e2fsprogs          | []             []                             [] |
+     enscript           |                []  []             []             |
+     error              | []          [] []  []                []          |
+     fetchmail          | []                                               |
+     fileutils          | [] []          []  []                []       [] |
+     findutils          |    []          []  []                []          |
+     flex               | []             []  []                            |
+     fslint             |                []                                |
+     gas                | []             []                                |
+     gawk               | []             []  []       []                   |
+     gbiff              |                []                                |
+     gcal               | []             []                                |
+     gcc                | []                                               |
+     gettext-examples   | []             []  []                [] []    [] |
+     gettext-runtime    | []          [] []  []                   []    [] |
+     gettext-tools      | []             []                             [] |
+     gimp-print         | []             []                                |
+     gip                | []    []       []                                |
+     gliv               |                ()                                |
+     glunarclock        |             []     []                []          |
+     gmult              |       []       []                             [] |
+     gnubiff            |                ()                             () |
+     gnucash            | ()             ()                    ()          |
+     gnucash-glossary   | []                                            [] |
+     gnuedu             | []                                               |
+     gnulib             | [] [] []    [] []  [] []             []          |
+     gnunet-gtk         |                                                  |
+     gnutls             |                                                  |
+     gpe-aerial         | []             []                                |
+     gpe-beam           | []             []                                |
+     gpe-calendar       |                                                  |
+     gpe-clock          | []          [] []                    []          |
+     gpe-conf           |                []                                |
+     gpe-contacts       | []             []                                |
+     gpe-edit           | []             []                    [] []       |
+     gpe-filemanager    | []                                               |
+     gpe-go             | []             []                    []          |
+     gpe-login          | []             []                    []          |
+     gpe-ownerinfo      | []          [] []                    [] []       |
+     gpe-package        | []                                               |
+     gpe-sketchbook     | []             []                                |
+     gpe-su             | []          [] []                    []          |
+     gpe-taskmanager    | []          [] []                                |
+     gpe-timesheet      | []             []  []                   []       |
+     gpe-today          | []          [] []  []                            |
+     gpe-todo           | []                                               |
+     gphoto2            | []          [] []                    []       [] |
+     gprof              | []             []  []                   []       |
+     gpsdrive           | ()             ()                    []       () |
+     gramadoir          |                []  []                            |
+     grep               | [] [] []    [] []  [] []    []    [] [] []    [] |
+     gretl              | []             []                             [] |
+     gsasl              |                    []                   []       |
+     gss                |                []                                |
+     gst-plugins        |                []                    []       [] |
+     gst-plugins-base   |                                      []       [] |
+     gst-plugins-good   |       []                             []       [] |
+     gstreamer          |             []                       []       [] |
+     gtick              |                    []                            |
+     gtkam              | []             []                    []       [] |
+     gtkorphan          |                []                             [] |
+     gtkspell           | []    []    [] []  []                         [] |
+     gutenprint         |                                      []          |
+     hello              | [] [] [] [] [] []  [] []    []    [] [] []    [] |
+     id-utils           |                []  []                [] []    [] |
+     impost             |                []  []                            |
+     indent             | [] [] []    [] []  [] []             [] []    [] |
+     iso_3166           |             [] []                    []          |
+     iso_3166_2         |                []                                |
+     iso_4217           |    []       []        []             []          |
+     iso_639            |          [] [] []  []                []          |
+     jpilot             | []             []                                |
+     jtag               |                []                                |
+     jwhois             | []             []                    [] []    [] |
+     kbd                | []             []                                |
+     keytouch           |                    []                            |
+     keytouch-editor    |                    []                            |
+     keytouch-keyboa... |                    []                            |
+     latrine            |                []  []                         [] |
+     ld                 | []             []                                |
+     leafpad            | []             []  []       []       []       [] |
+     libc               | []          [] []     []             []          |
+     libexif            | []                                               |
+     libextractor       |                    []                            |
+     libgpewidget       | []             []  []                [] []       |
+     libgpg-error       |                                                  |
+     libgphoto2         | []             []                             [] |
+     libgphoto2_port    |                []                             [] |
+     libgsasl           |                []  []                            |
+     libiconv           |    []              []                            |
+     libidn             |                []                             [] |
+     lifelines          |                ()                                |
+     lilypond           |                []                                |
+     lingoteach         |                []                       []    [] |
+     lynx               |    []                                []       [] |
+     m4                 |                []  [] []                []       |
+     mailutils          | []             []                                |
+     make               | []          [] []  [] []    []    []    []       |
+     man-db             | ()                                               |
+     minicom            | []          [] []                    []          |
+     mysecretdiary      | []             []                       []       |
+     nano               | []    []       []  []                []       [] |
+     nano_1_0           | []             []     []                []    [] |
+     opcodes            | []          [] []  []                            |
+     parted             | []             []                       []    [] |
+     pilot-qof          |                                                  |
+     psmisc             |       []                             []       [] |
+     pwdutils           |                                                  |
+     python             |                                                  |
+     qof                |                                         []       |
+     radius             | []             []                                |
+     recode             | []             []  [] []    []       [] []    [] |
+     rpm                |                []                       []       |
+     screem             |                                                  |
+     scrollkeeper       | []          []                       []          |
+     sed                | [] []          []  []                []          |
+     sh-utils           | [] []       [] []  []                []       [] |
+     shared-mime-info   | []    []    [] []                    []       [] |
+     sharutils          | [] []       [] []  [] []             []       [] |
+     shishi             |                                                  |
+     silky              |                []                                |
+     skencil            | []             []                                |
+     sketch             | []             []                                |
+     solfege            |                                               [] |
+     soundtracker       | []             []                             [] |
+     sp                 |                []                                |
+     stardict           |                                      []          |
+     system-tools-ba... | []    []    [] []                 [] [] []    [] |
+     tar                | [] []       [] []  []                []       [] |
+     texinfo            |                []           []                   |
+     textutils          | []             []  [] []             []          |
+     tin                |    []          ()                                |
+     tp-robot           |             [] []  []                []          |
+     tuxpaint           |                    []                []          |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                []  []                            |
+     util-linux         | [] []       [] []                    [] []    [] |
+     vorbis-tools       | []             []                                |
+     wastesedge         |                ()                                |
+     wdiff              | [] []          []  [] []             [] []    [] |
+     wget               |    []       [] []  []             [] [] []    [] |
+     xchat              | []    []    [] []        []    []    []       [] |
+     xkeyboard-config   |             [] []                    []       [] |
+     xpad               | []                 []                []          |
+                        +--------------------------------------------------+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                          88 22 14  2 40 115 61 14  1  8  1  6 59 31  0 52
+
+                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
+                        +-------------------------------------------------+
+     GNUnet             |                                                 |
+     a2ps               |    ()                      []          []    () |
+     aegis              |                                        ()       |
+     ant-phone          |                                        []       |
+     anubis             |                            []    []    []       |
+     ap-utils           |                            []                   |
+     aspell             |                         []             []       |
+     bash               |                                        []       |
+     batchelor          |                            []          []       |
+     bfd                |                                                 |
+     bibshelf           |                            []                   |
+     binutils           |                                                 |
+     bison              |                            []    []    []       |
+     bison-runtime      |                            []    []    []       |
+     bluez-pin          |       []                   []          []       |
+     cflow              |                                                 |
+     clisp              |                                        []       |
+     console-tools      |                                                 |
+     coreutils          |                                        []       |
+     cpio               |                                                 |
+     cpplib             |                                        []       |
+     cryptonit          |                                        []       |
+     darkstat           |                            []          []       |
+     dialog             |                            []          []       |
+     diffutils          | []                         []          []       |
+     doodle             |                                                 |
+     e2fsprogs          |                                        []       |
+     enscript           |                                        []       |
+     error              |                                        []       |
+     fetchmail          | []                                     []       |
+     fileutils          | []          []                                  |
+     findutils          |                                        []       |
+     flex               |    []                                  []       |
+     fslint             |                            []          []       |
+     gas                |                                                 |
+     gawk               | []                                     []       |
+     gbiff              |                                        []       |
+     gcal               |                                                 |
+     gcc                |                                                 |
+     gettext-examples   | []                                     []       |
+     gettext-runtime    | [] []                                  []       |
+     gettext-tools      | [] []                                           |
+     gimp-print         | []                                     []       |
+     gip                |                            []          []       |
+     gliv               |                                        []       |
+     glunarclock        |                            []          []       |
+     gmult              | []                         []                   |
+     gnubiff            |                                                 |
+     gnucash            | ()                               ()             |
+     gnucash-glossary   |                                        []       |
+     gnuedu             |                                                 |
+     gnulib             | [] []                      []          []       |
+     gnunet-gtk         |                                                 |
+     gnutls             |                                                 |
+     gpe-aerial         |                                        []       |
+     gpe-beam           |                                        []       |
+     gpe-calendar       | []                                              |
+     gpe-clock          | [] []                                  []       |
+     gpe-conf           |    []                                  []       |
+     gpe-contacts       |    []                                           |
+     gpe-edit           | [] []                                  []       |
+     gpe-filemanager    | [] []                                           |
+     gpe-go             | [] []                                  []       |
+     gpe-login          | [] []                                  []       |
+     gpe-ownerinfo      | []                                     []       |
+     gpe-package        | [] []                                           |
+     gpe-sketchbook     |    []                                  []       |
+     gpe-su             | [] []                                  []       |
+     gpe-taskmanager    | [] [] []                               []       |
+     gpe-timesheet      |                                        []       |
+     gpe-today          | []                                     []       |
+     gpe-todo           | []                                              |
+     gphoto2            | []                                     []       |
+     gprof              |                                                 |
+     gpsdrive           | ()                                     ()    () |
+     gramadoir          |                                        ()       |
+     grep               | []       []                      []    []       |
+     gretl              |                                                 |
+     gsasl              |                                        []       |
+     gss                |                                                 |
+     gst-plugins        |                                        []       |
+     gst-plugins-base   |                                                 |
+     gst-plugins-good   |                                        []       |
+     gstreamer          |                                        []       |
+     gtick              |                                                 |
+     gtkam              | []                                              |
+     gtkorphan          |                                        []       |
+     gtkspell           |                         []             []       |
+     gutenprint         |                                                 |
+     hello              | [] []                      []    []    [] []    |
+     id-utils           |                                        []       |
+     impost             |                                                 |
+     indent             | []                                     []       |
+     iso_3166           |                                        []       |
+     iso_3166_2         |                                        []       |
+     iso_4217           | []                      []             []       |
+     iso_639            | []                                     []       |
+     jpilot             | ()                                     ()    () |
+     jtag               |                                                 |
+     jwhois             |                                        []       |
+     kbd                |                                        []       |
+     keytouch           |                                        []       |
+     keytouch-editor    |                                                 |
+     keytouch-keyboa... |                                                 |
+     latrine            |                                        []       |
+     ld                 |                                                 |
+     leafpad            | []             []                               |
+     libc               | [] []                            []    []    [] |
+     libexif            |                                                 |
+     libextractor       |                                                 |
+     libgpewidget       |                                        []       |
+     libgpg-error       |                                                 |
+     libgphoto2         | []                                              |
+     libgphoto2_port    | []                                              |
+     libgsasl           |                                        []       |
+     libiconv           |                                                 |
+     libidn             | []                                     []       |
+     lifelines          |                                        []       |
+     lilypond           |                                                 |
+     lingoteach         |                                        []       |
+     lynx               | []                                     []       |
+     m4                 | []                                     []       |
+     mailutils          |                                                 |
+     make               | [] []                                  []       |
+     man-db             | ()                                              |
+     minicom            | []                                              |
+     mysecretdiary      |                                        []       |
+     nano               |                            []    []    []       |
+     nano_1_0           |                            []    []       []    |
+     opcodes            |                                        []       |
+     parted             | []                                     []       |
+     pilot-qof          |                                                 |
+     psmisc             | []                               []    []       |
+     pwdutils           |                                                 |
+     python             |                                                 |
+     qof                |                                                 |
+     radius             |                                                 |
+     recode             |                                        []       |
+     rpm                | [] []                                           |
+     screem             | []                                              |
+     scrollkeeper       |                                  [] [] [] []    |
+     sed                | []                                     []       |
+     sh-utils           | []                               []             |
+     shared-mime-info   |    []          []                []    [] []    |
+     sharutils          | []                                     []       |
+     shishi             |                                                 |
+     silky              |                                        []       |
+     skencil            |                                                 |
+     sketch             |                                                 |
+     solfege            |                                                 |
+     soundtracker       |                                                 |
+     sp                 | ()                                              |
+     stardict           |                      []                []       |
+     system-tools-ba... | [] []          []                      []       |
+     tar                | []       []                            []       |
+     texinfo            | []                               []    []       |
+     textutils          | [] []                            []             |
+     tin                |                                                 |
+     tp-robot           |                                        []       |
+     tuxpaint           |                                           []    |
+     unicode-han-tra... |                                                 |
+     unicode-transla... |                                                 |
+     util-linux         | []                                     []       |
+     vorbis-tools       |                                        []       |
+     wastesedge         |                                        []       |
+     wdiff              |                            []    []             |
+     wget               | []                                     []       |
+     xchat              | [] []                []                []       |
+     xkeyboard-config   |                                        []       |
+     xpad               |    []                      []          []       |
+                        +-------------------------------------------------+
+                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
+                          52 24  2  2  1  3  0  2  3 21  0 15  1 97  5  1
+
+                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                        +------------------------------------------------------+
+     GNUnet             |                                                      |
+     a2ps               |           ()     []      [] []       []    [] []     |
+     aegis              |                          () ()                       |
+     ant-phone          |                          []                   []     |
+     anubis             |           []             [] []                       |
+     ap-utils           |           ()                                         |
+     aspell             |                          [] []                       |
+     bash               |                  []      [] []                       |
+     batchelor          |                          []                   []     |
+     bfd                |                                                      |
+     bibshelf           |                                               []     |
+     binutils           |                             []                []     |
+     bison              |           []     []      [] []                []     |
+     bison-runtime      |           []             []          []       []     |
+     bluez-pin          |           []     []   [] [] []    [] []    [] []     |
+     cflow              |           []                                         |
+     clisp              |                             []                       |
+     console-tools      |                             []                       |
+     coreutils          |           []                []       []       []     |
+     cpio               |           []                []                []     |
+     cpplib             |                                               []     |
+     cryptonit          |                  []                           []     |
+     darkstat           |           []     []      []       []       [] []     |
+     dialog             |           [] []  []   [] [] [] []          [] []     |
+     diffutils          |           []     []      [] []             [] []     |
+     doodle             |                                         []    []     |
+     e2fsprogs          |           []                                  []     |
+     enscript           |                  []      [] []       []       []     |
+     error              |                  []      []       []          []     |
+     fetchmail          |           []                []          []           |
+     fileutils          |           []             [] []       []       []     |
+     findutils          |           [] []          []       [] []       []     |
+     flex               |           []     []      [] []                []     |
+     fslint             |                  []      []                [] []     |
+     gas                |                                                      |
+     gawk               |           []     []      []                   []     |
+     gbiff              |                          []                          |
+     gcal               |                                               []     |
+     gcc                |                                               []     |
+     gettext-examples   |           [] []          [] []    [] []    [] []     |
+     gettext-runtime    |           [] []          [] []    [] []    [] []     |
+     gettext-tools      |           []             [] []    [] []    [] []     |
+     gimp-print         |                                   []          []     |
+     gip                |                       []          []       [] []     |
+     gliv               |                  []      []       []          []     |
+     glunarclock        |                  []      [] []    []       [] []     |
+     gmult              |                       [] []                [] []     |
+     gnubiff            |                          ()                          |
+     gnucash            |           ()                                  []     |
+     gnucash-glossary   |              []                   []          []     |
+     gnuedu             |                                                      |
+     gnulib             |           []             [] []       []       []     |
+     gnunet-gtk         |                                               []     |
+     gnutls             |           []                                  []     |
+     gpe-aerial         |              []  []      [] []       []    [] []     |
+     gpe-beam           |              []  []      [] []       []    [] []     |
+     gpe-calendar       |                             []                       |
+     gpe-clock          |              []  []      [] []    [] []    [] []     |
+     gpe-conf           |              []  []      [] []    [] []       []     |
+     gpe-contacts       |                          [] []       []    [] []     |
+     gpe-edit           |              []  []      [] []    [] []    [] []     |
+     gpe-filemanager    |                                      []       []     |
+     gpe-go             |                  []      [] []       []    [] []     |
+     gpe-login          |              []  []      [] []    [] []    [] []     |
+     gpe-ownerinfo      |              []  []      [] []    [] []    [] []     |
+     gpe-package        |                                      []       []     |
+     gpe-sketchbook     |              []  []      [] []    [] []    [] []     |
+     gpe-su             |              []  []      [] []    [] []    [] []     |
+     gpe-taskmanager    |              []  []      [] []    [] []    [] []     |
+     gpe-timesheet      |              []  []      [] []    [] []    [] []     |
+     gpe-today          |              []  []      [] []    [] []    [] []     |
+     gpe-todo           |                             []       []    [] []     |
+     gphoto2            |           []             []       []       [] []     |
+     gprof              |                  []      []                   []     |
+     gpsdrive           |        []                []                   []     |
+     gramadoir          |                                   []          []     |
+     grep               |           [] []  []      [] []       []    [] []     |
+     gretl              |           []                                         |
+     gsasl              |           []                               [] []     |
+     gss                |           []             []                   []     |
+     gst-plugins        |     []                                  [] [] []     |
+     gst-plugins-base   |                                               []     |
+     gst-plugins-good   |     []                                  [] [] []     |
+     gstreamer          |                                         [] [] []     |
+     gtick              |                             []                       |
+     gtkam              |           []     []         []                []     |
+     gtkorphan          |                                               []     |
+     gtkspell           |                  []   [] [] []    [] []    [] []     |
+     gutenprint         |                                               []     |
+     hello              |           []     []      [] []    [] []    [] []     |
+     id-utils           |                  []      [] []                []     |
+     impost             |                                               []     |
+     indent             |                  []      [] []    []       [] []     |
+     iso_3166           |              []                []    [] [] [] []     |
+     iso_3166_2         |                                                      |
+     iso_4217           |                                []    []    [] []     |
+     iso_639            |                                []    []    [] []     |
+     jpilot             |                                                      |
+     jtag               |                                   []                 |
+     jwhois             |           []     []      []                   []     |
+     kbd                |           []             []                   []     |
+     keytouch           |                                               []     |
+     keytouch-editor    |                                               []     |
+     keytouch-keyboa... |                                               []     |
+     latrine            |                          []                   []     |
+     ld                 |                                               []     |
+     leafpad            |           [] []             []    []          []  [] |
+     libc               |           []     []         []    []          []     |
+     libexif            |           []                                         |
+     libextractor       |                          []                   []     |
+     libgpewidget       |              []  []      []       [] []    [] []     |
+     libgpg-error       |           []             []                          |
+     libgphoto2         |           []                                         |
+     libgphoto2_port    |           []                []                []     |
+     libgsasl           |           []             []                [] []     |
+     libiconv           |                                      []    []        |
+     libidn             |           []                               [] ()     |
+     lifelines          |           []                                  []     |
+     lilypond           |                                                      |
+     lingoteach         |                  []                                  |
+     lynx               |                  []         []                []     |
+     m4                 |           []     []      [] []                []     |
+     mailutils          |           []             [] []                []     |
+     make               |           []     []         []                []     |
+     man-db             |                          []                   []     |
+     minicom            |           []     []      [] []                []     |
+     mysecretdiary      |                  []      [] []                []     |
+     nano               |                  []      []                   []     |
+     nano_1_0           |           []             [] []                []     |
+     opcodes            |                          []                   []     |
+     parted             |           []                                         |
+     pilot-qof          |                                               []     |
+     psmisc             |           []                                  []     |
+     pwdutils           |           []                                  []     |
+     python             |                                                      |
+     qof                |                  []                           []     |
+     radius             |           []                []                       |
+     recode             |           [] []  []      [] []       []       []     |
+     rpm                |           [] []             []                []     |
+     screem             |                                                      |
+     scrollkeeper       |           []             [] []    []    [] [] []     |
+     sed                |           [] []  []      [] []    [] []    [] []     |
+     sh-utils           |                             []       []    []        |
+     shared-mime-info   |              []  []                     [] [] []     |
+     sharutils          |           []                []             [] []     |
+     shishi             |           []                                         |
+     silky              |                                   []                 |
+     skencil            |              []  []                           []     |
+     sketch             |              []  []                           []     |
+     solfege            |                                               []     |
+     soundtracker       |                                   []          []     |
+     sp                 |                                                      |
+     stardict           |                             []    []          []     |
+     system-tools-ba... |        [] [] []  []      []             [] [] []  [] |
+     tar                |           []             [] []       []       []     |
+     texinfo            |           []             [] []                []     |
+     textutils          |                             []       []       []     |
+     tin                |                             ()                       |
+     tp-robot           |                             []                       |
+     tuxpaint           |              []                      [] [] [] []     |
+     unicode-han-tra... |                                                      |
+     unicode-transla... |                                                      |
+     util-linux         |                  []         []       []       []     |
+     vorbis-tools       |                          [] []                       |
+     wastesedge         |                                                      |
+     wdiff              |           []     []      [] []    []          []     |
+     wget               |              []             []    []          []     |
+     xchat              |        []                   []    [] [] [] [] []     |
+     xkeyboard-config   |                                      []       []     |
+     xpad               |                                   [] []       []     |
+                        +------------------------------------------------------+
+                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                           0   2  3 58 30  54    5 73 72  4 40 46 11 50 128  2
+
+                          tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+                        +---------------------------------------------------+
+     GNUnet             |                    []                             |  2
+     a2ps               |          [] []     []                             | 19
+     aegis              |                                                   |  0
+     ant-phone          |          []        []                             |  6
+     anubis             |          [] []     []                             | 11
+     ap-utils           |             ()     []                             |  4
+     aspell             |             []     []  []                         | 15
+     bash               |                    []                             | 11
+     batchelor          |          []        []                             |  9
+     bfd                |                                                   |  1
+     bibshelf           |                    []                             |  7
+     binutils           |          []        []                     []      |  9
+     bison              |          []        []                     []      | 19
+     bison-runtime      |                    []         []          []      | 15
+     bluez-pin          |          [] []     []  []     []          []      | 28
+     cflow              |             []     []                             |  5
+     clisp              |                                                   |  6
+     console-tools      |          []        []                             |  5
+     coreutils          |          []        []                             | 16
+     cpio               |          [] []     []                             |  9
+     cpplib             |          []        []         []          []      | 11
+     cryptonit          |                                                   |  5
+     darkstat           |                    []         ()          ()      | 15
+     dialog             |          [] []     []         []          []      | 30
+     diffutils          |          []        []         []          []      | 28
+     doodle             |                    []                             |  6
+     e2fsprogs          |          []        []                             | 10
+     enscript           |          [] []     []                             | 16
+     error              |          []        []         []          []      | 18
+     fetchmail          |          []        []                             | 12
+     fileutils          |          []                   []          []      | 18
+     findutils          |          []        []                     []      | 17
+     flex               |          []        []                             | 15
+     fslint             |                    []                             |  9
+     gas                |          []                                       |  3
+     gawk               |          []        []                             | 15
+     gbiff              |                    []                             |  5
+     gcal               |          []                                       |  5
+     gcc                |          []                   []          []      |  6
+     gettext-examples   |          [] []     []         []    []    []      | 27
+     gettext-runtime    |          [] []     []         []    []    []      | 28
+     gettext-tools      |          [] []     []         []          []      | 19
+     gimp-print         |             []     []                             | 12
+     gip                |                    []                     []      | 12
+     gliv               |          []        []                             |  8
+     glunarclock        |                    []  []                 []      | 15
+     gmult              |          []        []         []          []      | 15
+     gnubiff            |                    []                             |  1
+     gnucash            |          ()                                       |  2
+     gnucash-glossary   |                    []                     []      |  9
+     gnuedu             |                    []                             |  2
+     gnulib             |          [] []     []         []          []      | 28
+     gnunet-gtk         |                                                   |  1
+     gnutls             |                                                   |  2
+     gpe-aerial         |                    []         []                  | 14
+     gpe-beam           |                    []         []                  | 14
+     gpe-calendar       |                    []                             |  3
+     gpe-clock          |          []        []  []     []                  | 21
+     gpe-conf           |                    []         []                  | 14
+     gpe-contacts       |                    []         []                  | 10
+     gpe-edit           |          []        []  []                 []      | 20
+     gpe-filemanager    |                    []                             |  6
+     gpe-go             |          []        []                             | 15
+     gpe-login          |          []        []  []     []          []      | 21
+     gpe-ownerinfo      |          []        []         []          []      | 21
+     gpe-package        |                    []                             |  6
+     gpe-sketchbook     |          []        []                             | 16
+     gpe-su             |          []        []         []                  | 20
+     gpe-taskmanager    |          []        []         []                  | 20
+     gpe-timesheet      |          []        []         []          []      | 18
+     gpe-today          |          []        []  []     []          []      | 21
+     gpe-todo           |                    []                             |  7
+     gphoto2            |             []     []         []          []      | 20
+     gprof              |          []        []                             | 11
+     gpsdrive           |                                                   |  4
+     gramadoir          |                    []                             |  7
+     grep               |          [] []     []                     []      | 34
+     gretl              |                                                   |  4
+     gsasl              |                    []         []                  |  8
+     gss                |                    []                             |  5
+     gst-plugins        |             []     []                     []      | 15
+     gst-plugins-base   |             []     []         []                  |  9
+     gst-plugins-good   |             []     []         []    []    []      | 20
+     gstreamer          |          [] []     []                             | 17
+     gtick              |                    []                             |  3
+     gtkam              |                    []                             | 13
+     gtkorphan          |                    []                             |  7
+     gtkspell           |             []     []  []     []    []    []      | 26
+     gutenprint         |                                                   |  3
+     hello              |          [] []     []         []          []      | 37
+     id-utils           |          []        []                             | 14
+     impost             |                    []                             |  4
+     indent             |          []        []         []          []      | 25
+     iso_3166           |       [] []        []               []            | 16
+     iso_3166_2         |                                                   |  2
+     iso_4217           |          []        []                             | 14
+     iso_639            |                    []                             | 14
+     jpilot             |          [] []     []         []                  |  7
+     jtag               |                    []                             |  3
+     jwhois             |          []        []                     []      | 13
+     kbd                |          []        []                             | 12
+     keytouch           |                    []                             |  4
+     keytouch-editor    |                                                   |  2

[... truncated: 808570 lines follow ...]


From axeld at mail.berlios.de  Thu Apr  9 13:25:26 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 13:25:26 +0200
Subject: [Haiku-commits] r30060 - haiku/trunk/src/bin/desklink
Message-ID: <200904091125.n39BPQjd015017@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 13:25:23 +0200 (Thu, 09 Apr 2009)
New Revision: 30060
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30060&view=rev

Modified:
   haiku/trunk/src/bin/desklink/MixerControl.cpp
   haiku/trunk/src/bin/desklink/MixerControl.h
Log:
* The mixer node is now exported.
* The node is no longer allocated separately.
* Cleanup.


Modified: haiku/trunk/src/bin/desklink/MixerControl.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/MixerControl.cpp	2009-04-09 11:16:39 UTC (rev 30059)
+++ haiku/trunk/src/bin/desklink/MixerControl.cpp	2009-04-09 11:25:23 UTC (rev 30060)
@@ -21,7 +21,7 @@
 		const char** _error)
 	:
 	fVolumeWhich(volumeWhich),
-	fAudioMixerNode(NULL),
+	fGainMediaNode(media_node::null),
 	fParameterWeb(NULL),
 	fMixerParameter(NULL),
 	fMin(0.0f),
@@ -29,7 +29,6 @@
 	fStep(0.0f)
 {
 	bool retrying = false;
-	fAudioMixerNode = new media_node();
 
 	status_t err = B_OK;
 		/* BMediaRoster::Roster() doesn't set it if all is ok */
@@ -56,14 +55,14 @@
 	if (roster && err == B_OK) {
 		switch (volumeWhich) {
 			case VOLUME_USE_MIXER:
-				err = roster->GetAudioMixer(fAudioMixerNode);
+				err = roster->GetAudioMixer(&fGainMediaNode);
 				break;
 			case VOLUME_USE_PHYS_OUTPUT:
-				err = roster->GetAudioOutput(fAudioMixerNode);
+				err = roster->GetAudioOutput(&fGainMediaNode);
 				break;
 		}
 		if (err == B_OK) {
-			err = roster->GetParameterWebFor(*fAudioMixerNode, &fParameterWeb);
+			err = roster->GetParameterWebFor(fGainMediaNode, &fParameterWeb);
 			if (err == B_OK) {
 				// Finding the Mixer slider in the audio output ParameterWeb 
 				int32 numParams = fParameterWeb->CountParameters();
@@ -112,11 +111,11 @@
 					p = NULL;
 				}
 				if (p == NULL) {
-					errorString = volumeWhich
-						? "Could not find the soundcard":"Could not find the mixer";
+					errorString = volumeWhich ? "Could not find the soundcard"
+						: "Could not find the mixer";
 				} else if (p->Type() != BParameter::B_CONTINUOUS_PARAMETER) {
-					errorString = volumeWhich
-						? "Soundcard control unknown":"Mixer control unknown";
+					errorString = volumeWhich ? "Soundcard control unknown"
+						: "Mixer control unknown";
 				} else {
 					fMixerParameter = dynamic_cast<BContinuousParameter*>(p);
 					fMin = fMixerParameter->MinValue();
@@ -150,10 +149,9 @@
 		errorString = "No Media Roster";
 	}
 
-	if (err != B_OK) {
-		delete fAudioMixerNode;
-		fAudioMixerNode = NULL;
-	}
+	if (err != B_OK)
+		fGainMediaNode = media_node::null;
+
 	if (errorString) {
 		fprintf(stderr, "MixerControl: %s.\n", errorString);
 		if (_error)
@@ -169,8 +167,8 @@
 	delete fParameterWeb;
 
 	BMediaRoster* roster = BMediaRoster::CurrentRoster();
-	if (roster != NULL && fAudioMixerNode != NULL)
-		roster->ReleaseNode(*fAudioMixerNode);
+	if (roster != NULL && fGainMediaNode != media_node::null)
+		roster->ReleaseNode(fGainMediaNode);
 }
 
 

Modified: haiku/trunk/src/bin/desklink/MixerControl.h
===================================================================
--- haiku/trunk/src/bin/desklink/MixerControl.h	2009-04-09 11:16:39 UTC (rev 30059)
+++ haiku/trunk/src/bin/desklink/MixerControl.h	2009-04-09 11:25:23 UTC (rev 30060)
@@ -37,9 +37,11 @@
 			float			Minimum() const { return fMin; }
 			float			Maximum() const { return fMax; }
 
+			media_node		GainNode() { return fGainMediaNode; }
+
 private:
 			int32			fVolumeWhich;
-			media_node*		fAudioMixerNode;
+			media_node		fGainMediaNode;
 			BParameterWeb*	fParameterWeb;
 			BContinuousParameter* fMixerParameter;
 			float			fMin;



From axeld at mail.berlios.de  Thu Apr  9 13:26:21 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 13:26:21 +0200
Subject: [Haiku-commits] r30061 - haiku/trunk/src/bin/desklink
Message-ID: <200904091126.n39BQLob016282@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 13:26:19 +0200 (Thu, 09 Apr 2009)
New Revision: 30061
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30061&view=rev

Modified:
   haiku/trunk/src/bin/desklink/VolumeControl.cpp
   haiku/trunk/src/bin/desklink/VolumeControl.h
Log:
* The volume now listens to parameter changes, and adapts itself automatically.


Modified: haiku/trunk/src/bin/desklink/VolumeControl.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeControl.cpp	2009-04-09 11:25:23 UTC (rev 30060)
+++ haiku/trunk/src/bin/desklink/VolumeControl.cpp	2009-04-09 11:26:19 UTC (rev 30061)
@@ -103,10 +103,21 @@
 	BSlider::AttachedToWindow();
 
 	SetEventMask(_IsReplicant() ? 0 : B_POINTER_EVENTS, B_NO_POINTER_HISTORY);
+
+	BMediaRoster::CurrentRoster()->StartWatching(this,
+		fMixerControl->GainNode(), B_MEDIA_NEW_PARAMETER_VALUE);
 }
 
 
 void
+VolumeControl::DetachedFromWindow()
+{
+	BMediaRoster::CurrentRoster()->StopWatching(this, fMixerControl->GainNode(),
+		B_MEDIA_NEW_PARAMETER_VALUE);
+}
+
+
+void
 VolumeControl::MouseDown(BPoint where)
 {
 	// Ignore clicks on the dragger
@@ -164,6 +175,13 @@
 			break;
 		}
 
+		case B_MEDIA_NEW_PARAMETER_VALUE:
+			if (IsTracking())
+				break;
+
+			SetValue((int32)fMixerControl->Volume());
+			break;
+
 		default:
 			return BView::MessageReceived(msg);
 	}

Modified: haiku/trunk/src/bin/desklink/VolumeControl.h
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeControl.h	2009-04-09 11:25:23 UTC (rev 30060)
+++ haiku/trunk/src/bin/desklink/VolumeControl.h	2009-04-09 11:26:19 UTC (rev 30061)
@@ -28,6 +28,7 @@
 
 protected:
 	virtual	void			AttachedToWindow();
+	virtual	void			DetachedFromWindow();
 	virtual	void			MouseDown(BPoint where);
 	virtual	void			MessageReceived(BMessage* message);
 	virtual status_t		Invoke(BMessage* message = NULL);



From axeld at pinc-software.de  Thu Apr  9 11:34:30 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 09 Apr 2009 11:34:30
Subject: [Haiku-commits] r30045 - in haiku/trunk: headers/private/media
 src/kits/media
In-Reply-To: <7915556659-BeMail@laptop>
Message-ID: <1379936952-BeMail@quad>

Fran?ois Revol wrote:
> > Okay, I'll do that; I didn't notice one can achieve the same thing 
> > using the BMediaRoster when I added them.
> Again, Dano does handle watching even when the web doesn't belong
> to a media_node, which is not possible with the media roster...

What would be the use case of that?
And also: why not? You don't have to restrict watching something to a 
certain media node.

Bye,
   Axel.



From axeld at mail.berlios.de  Thu Apr  9 13:45:52 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 13:45:52 +0200
Subject: [Haiku-commits] r30062 - haiku/trunk/src/bin/desklink
Message-ID: <200904091145.n39BjqBZ011341@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 13:45:50 +0200 (Thu, 09 Apr 2009)
New Revision: 30062
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30062&view=rev

Modified:
   haiku/trunk/src/bin/desklink/VolumeControl.cpp
Log:
* As Stephan pointed out, the roster will be NULL if the media server is not
  running. Thanks! That's just another thing we should improve in R2.


Modified: haiku/trunk/src/bin/desklink/VolumeControl.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeControl.cpp	2009-04-09 11:26:19 UTC (rev 30061)
+++ haiku/trunk/src/bin/desklink/VolumeControl.cpp	2009-04-09 11:45:50 UTC (rev 30062)
@@ -104,16 +104,22 @@
 
 	SetEventMask(_IsReplicant() ? 0 : B_POINTER_EVENTS, B_NO_POINTER_HISTORY);
 
-	BMediaRoster::CurrentRoster()->StartWatching(this,
-		fMixerControl->GainNode(), B_MEDIA_NEW_PARAMETER_VALUE);
+	BMediaRoster* roster = BMediaRoster::CurrentRoster();
+	if (roster != NULL && fMixerControl->GainNode() != media_node::null) {
+		roster->StartWatching(this, fMixerControl->GainNode(),
+			B_MEDIA_NEW_PARAMETER_VALUE);
+	}
 }
 
 
 void
 VolumeControl::DetachedFromWindow()
 {
-	BMediaRoster::CurrentRoster()->StopWatching(this, fMixerControl->GainNode(),
-		B_MEDIA_NEW_PARAMETER_VALUE);
+	BMediaRoster* roster = BMediaRoster::CurrentRoster();
+	if (roster != NULL && fMixerControl->GainNode() != media_node::null) {
+		roster->StopWatching(this, fMixerControl->GainNode(),
+			B_MEDIA_NEW_PARAMETER_VALUE);
+	}
 }
 
 



From mmlr at mail.berlios.de  Thu Apr  9 14:35:36 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Thu, 9 Apr 2009 14:35:36 +0200
Subject: [Haiku-commits] r30063 - in haiku/trunk/src/add-ons/kernel:
	bus_managers/usb busses/usb
Message-ID: <200904091235.n39CZaqi017047@sheep.berlios.de>

Author: mmlr
Date: 2009-04-09 14:35:32 +0200 (Thu, 09 Apr 2009)
New Revision: 30063
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30063&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.h
   haiku/trunk/src/add-ons/kernel/bus_managers/usb/usb.cpp
   haiku/trunk/src/add-ons/kernel/busses/usb/ehci.cpp
   haiku/trunk/src/add-ons/kernel/busses/usb/ohci.cpp
   haiku/trunk/src/add-ons/kernel/busses/usb/uhci.cpp
Log:
* Add the kernel debugger extensions only for the haiku target.
* Acknowledge non-enabled interrupts in UHCI as done in EHCI as well.


Modified: haiku/trunk/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.cpp	2009-04-09 11:45:50 UTC (rev 30062)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.cpp	2009-04-09 12:35:32 UTC (rev 30063)
@@ -66,7 +66,7 @@
 	fManagedMemory = fBlockSize[0] * fArrayLength[0];
 
 	size_t roundedSize = biggestSize * minCountPerBlock;
-#if KDEBUG
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 	fDebugBase = roundedSize;
 	fDebugChunkSize = 64;
 	fDebugUseMap = 0;
@@ -128,7 +128,7 @@
 PhysicalMemoryAllocator::Allocate(size_t size, void **logicalAddress,
 	void **physicalAddress)
 {
-#if KDEBUG
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 	if (debug_debugger_running()) {
 		for (int32 i = 0; i < 64; i++) {
 			uint64 mask = 1LL << i;
@@ -222,7 +222,7 @@
 PhysicalMemoryAllocator::Deallocate(size_t size, void *logicalAddress,
 	void *physicalAddress)
 {
-#if KDEBUG
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 	if (debug_debugger_running()) {
 		uint32 index = ((uint8 *)logicalAddress - (uint8 *)fLogicalBase
 			- fDebugBase) / fDebugChunkSize;

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.h	2009-04-09 11:45:50 UTC (rev 30062)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/usb/PhysicalMemoryAllocator.h	2009-04-09 12:35:32 UTC (rev 30063)
@@ -58,7 +58,7 @@
 		size_t						*fArrayOffset;
 		uint8						**fArray;
 
-#if KDEBUG
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 		uint32						fDebugBase;
 		uint32						fDebugChunkSize;
 		uint64						fDebugUseMap;

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/usb/usb.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/usb/usb.cpp	2009-04-09 11:45:50 UTC (rev 30062)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/usb/usb.cpp	2009-04-09 12:35:32 UTC (rev 30063)
@@ -16,6 +16,7 @@
 Stack *gUSBStack = NULL;
 
 
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 static int
 debug_get_pipe_for_id(int argc, char **argv)
 {
@@ -33,6 +34,7 @@
 	set_debug_variable("_usbPipe", (uint64)object);
 	return 0;
 }
+#endif
 
 
 static int32
@@ -44,7 +46,7 @@
 			if (gUSBStack)
 				return B_OK;
 
-#ifndef __HAIKU__
+#ifndef HAIKU_TARGET_PLATFORM_BEOS
 			// This code is to handle plain R5 (non-BONE) where the same module
 			// gets loaded multiple times (once for each exported module
 			// interface, the USB v2 and v3 API in our case). We don't want to
@@ -62,7 +64,7 @@
 
 #ifdef TRACE_USB
 			set_dprintf_enabled(true);
-#ifndef __HAIKU__
+#ifndef HAIKU_TARGET_PLATFORM_HAIKU
 			load_driver_symbols("usb");
 #endif
 #endif
@@ -77,10 +79,12 @@
 			}
 
 			gUSBStack = stack;
+
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 			add_debugger_command("get_usb_pipe_for_id",
 				&debug_get_pipe_for_id,
 				"Gets the config for a USB pipe");
-#ifndef __HAIKU__
+#elif HAIKU_TARGET_PLATFORM_BEOS
 			// Plain R5 workaround, see comment above.
 			shared = create_area("shared usb stack", &address,
 				B_ANY_KERNEL_ADDRESS, B_PAGE_SIZE, B_NO_LOCK,
@@ -95,8 +99,11 @@
 			TRACE_MODULE("uninit\n");
 			delete gUSBStack;
 			gUSBStack = NULL;
+
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 			remove_debugger_command("get_usb_pipe_for_id",
 				&debug_get_pipe_for_id);
+#endif
 			break;
 
 		default:

Modified: haiku/trunk/src/add-ons/kernel/busses/usb/ehci.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/usb/ehci.cpp	2009-04-09 11:45:50 UTC (rev 30062)
+++ haiku/trunk/src/add-ons/kernel/busses/usb/ehci.cpp	2009-04-09 12:35:32 UTC (rev 30063)
@@ -520,7 +520,7 @@
 {
 #ifdef TRACE_USB
 	set_dprintf_enabled(true); 
-#ifndef __HAIKU__
+#ifndef HAIKU_TARGET_PLATFORM_HAIKU
 	load_driver_symbols("ehci");
 #endif
 #endif

Modified: haiku/trunk/src/add-ons/kernel/busses/usb/ohci.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/usb/ohci.cpp	2009-04-09 11:45:50 UTC (rev 30062)
+++ haiku/trunk/src/add-ons/kernel/busses/usb/ohci.cpp	2009-04-09 12:35:32 UTC (rev 30063)
@@ -511,7 +511,7 @@
 {
 #ifdef TRACE_USB
 	set_dprintf_enabled(true);
-#ifndef __HAIKU__
+#ifndef HAIKU_TARGET_PLATFORM_HAIKU
 	load_driver_symbols("ohci");
 #endif
 #endif

Modified: haiku/trunk/src/add-ons/kernel/busses/usb/uhci.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/usb/uhci.cpp	2009-04-09 11:45:50 UTC (rev 30062)
+++ haiku/trunk/src/add-ons/kernel/busses/usb/uhci.cpp	2009-04-09 12:35:32 UTC (rev 30063)
@@ -22,6 +22,7 @@
 static int32 sDebuggerCommandAdded = 0;
 
 
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 static int
 debug_process_transfer(int argc, char **argv)
 {
@@ -45,6 +46,7 @@
 	transfer.SetData(data, length);
 	return ((UHCI *)pipe->GetBusManager())->ProcessDebugTransfer(&transfer);
 }
+#endif
 
 
 static int32
@@ -494,11 +496,13 @@
 	WriteReg16(UHCI_USBINTR, UHCI_USBINTR_CRC | UHCI_USBINTR_IOC
 		| UHCI_USBINTR_SHORT);
 
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 	if (atomic_add(&sDebuggerCommandAdded, 1) == 0) {
 		add_debugger_command("uhci_process_transfer",
 			&debug_process_transfer,
 			"Processes a USB transfer with the given variables");
 	}
+#endif
 
 	TRACE("UHCI host controller driver constructed\n");
 	fInitOK = true;
@@ -507,10 +511,12 @@
 
 UHCI::~UHCI()
 {
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 	if (atomic_add(&sDebuggerCommandAdded, -1) == 1) {
 		remove_debugger_command("uhci_process_transfer",
 			&debug_process_transfer);
 	}
+#endif
 
 	int32 result = 0;
 	fStopFinishThread = true;
@@ -1674,6 +1680,11 @@
 	// Check if we really had an interrupt
 	uint16 status = ReadReg16(UHCI_USBSTS);
 	if ((status & fEnabledInterrupts) == 0) {
+		if (status != 0) {
+			TRACE("discarding not enabled interrupts 0x%08lx\n", status);
+			WriteReg16(UHCI_USBSTS, status);
+		}
+
 		release_spinlock(&lock);
 		return B_UNHANDLED_INTERRUPT;
 	}
@@ -1737,7 +1748,7 @@
 {
 #ifdef TRACE_USB
 	set_dprintf_enabled(true); 
-#ifndef __HAIKU__
+#ifndef HAIKU_TARGET_PLATFORM_HAIKU
 	load_driver_symbols("uhci");
 #endif
 #endif



From mmlr at mail.berlios.de  Thu Apr  9 15:02:49 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Thu, 9 Apr 2009 15:02:49 +0200
Subject: [Haiku-commits] r30064 -
	haiku/trunk/src/add-ons/kernel/bus_managers/usb
Message-ID: <200904091302.n39D2nFw020992@sheep.berlios.de>

Author: mmlr
Date: 2009-04-09 15:02:46 +0200 (Thu, 09 Apr 2009)
New Revision: 30064
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30064&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/usb/Jamfile
Log:
Make it buildable on BeOS again... The last time now, the next time BeOS support will simply be removed.

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/usb/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/usb/Jamfile	2009-04-09 12:35:32 UTC (rev 30063)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/usb/Jamfile	2009-04-09 13:02:46 UTC (rev 30064)
@@ -4,10 +4,15 @@
 
 SubDirC++Flags -fno-rtti ;
 
+local compatSources ;
+
 SubDirSysHdrs $(SUBDIR) ;
 if $(TARGET_PLATFORM) != haiku {
 	UsePrivateHeaders kernel ;
 	UsePublicHeaders drivers ;
+	if ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
+		compatSources = kernel_cpp.cpp ;
+	}
 } else {
 	UsePrivateKernelHeaders ;
 }
@@ -22,6 +27,7 @@
 	Interface.cpp
 	Object.cpp
 	PhysicalMemoryAllocator.cpp
+	$(compatSources)
 	: -fno-pic
 ;	
 
@@ -31,3 +37,5 @@
 	: usb.rdef
 	;
 
+SEARCH on [ FGristFiles $(compatSources) ]
+	= [ FDirName $(HAIKU_TOP) src system kernel util ] ;



From dlmcpaul at gmail.com  Thu Apr  9 15:05:35 2009
From: dlmcpaul at gmail.com (David McPaul)
Date: Thu, 9 Apr 2009 23:05:35 +1000
Subject: [Haiku-commits] r30064 -
	haiku/trunk/src/add-ons/kernel/bus_managers/usb
In-Reply-To: <200904091302.n39D2nFw020992@sheep.berlios.de>
References: <200904091302.n39D2nFw020992@sheep.berlios.de>
Message-ID: <da2be3d70904090605l699dd77ch211a0dee39090ab9@mail.gmail.com>

2009/4/9  <mmlr at mail.berlios.de>:
> Make it buildable on BeOS again... The last time now, the next time BeOS support will simply be removed.

That would make me sad :-(

-- 
Cheers
David


From mmlr at mlotz.ch  Thu Apr  9 15:29:31 2009
From: mmlr at mlotz.ch (Michael Lotz)
Date: Thu, 09 Apr 2009 15:29:31
Subject: [Haiku-commits]
 =?windows-1252?q?r30064_-_haiku/trunk/src/add-ons?=
 =?windows-1252?q?/kernel/bus=5Fmanagers/usb?=
In-Reply-To: <da2be3d70904090605l699dd77ch211a0dee39090ab9@mail.gmail.com>
Message-ID: <1638877918-BeMail@haiku>

> 2009/4/9  <mmlr at mail.berlios.de>:
> > Make it buildable on BeOS again... The last time now, the next time 
> > BeOS support will simply be removed.
> 
> That would make me sad :-(

The solution is quite simple: install Haiku. Many of the devs do already 
use Haiku as their main platform. At least Axel, Stephan and me do so. 
If there is a technical reason preventing you from using Haiku you 
should report those problems so they can be fixed.

Regards
Michael


From stippi at mail.berlios.de  Thu Apr  9 15:49:53 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Thu, 9 Apr 2009 15:49:53 +0200
Subject: [Haiku-commits] r30065 - haiku/trunk/src/servers/app/drawing/Painter
Message-ID: <200904091349.n39Dnr12027007@sheep.berlios.de>

Author: stippi
Date: 2009-04-09 15:49:51 +0200 (Thu, 09 Apr 2009)
New Revision: 30065
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30065&view=rev

Modified:
   haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.cpp
   haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.h
Log:
Style cleanup


Modified: haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.cpp	2009-04-09 13:02:46 UTC (rev 30064)
+++ haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.cpp	2009-04-09 13:49:51 UTC (rev 30065)
@@ -1,10 +1,9 @@
 /*
- * Copyright 2005-2007, Stephan A?mus <superstippi at gmx.de>.
+ * Copyright 2005-2009, Stephan A?mus <superstippi at gmx.de>.
  * Copyright 2008, Andrej Spielmann <andrej.spielmann at seh.ox.ac.uk>.
  * All rights reserved. Distributed under the terms of the MIT License.
  */
 
-
 #include "AGGTextRenderer.h"
 
 #include <agg_basics.h>
@@ -30,47 +29,47 @@
 #include "IntRect.h"
 
 
-// constructor
 AGGTextRenderer::AGGTextRenderer(renderer_subpix_type& subpixRenderer,
 		renderer_type& solidRenderer, renderer_bin_type& binRenderer,
 		scanline_unpacked_type& scanline,
 		scanline_unpacked_subpix_type& subpixScanline,
 		rasterizer_subpix_type& subpixRasterizer)
-	: fPathAdaptor()
-	, fGray8Adaptor()
-	, fGray8Scanline()
-	, fMonoAdaptor()
-	, fMonoScanline()
-	, fSubpixAdaptor()
+	:
+	fPathAdaptor(),
+	fGray8Adaptor(),
+	fGray8Scanline(),
+	fMonoAdaptor(),
+	fMonoScanline(),
+	fSubpixAdaptor(),
 
-	, fCurves(fPathAdaptor)
-	, fContour(fCurves)
+	fCurves(fPathAdaptor),
+	fContour(fCurves),
 
-	, fSolidRenderer(solidRenderer)
-	, fBinRenderer(binRenderer)
-	, fSubpixRenderer(subpixRenderer)
-	, fScanline(scanline)
-	, fSubpixScanline(subpixScanline)
-	, fSubpixRasterizer(subpixRasterizer)
-	, fRasterizer()
+	fSolidRenderer(solidRenderer),
+	fBinRenderer(binRenderer),
+	fSubpixRenderer(subpixRenderer),
+	fScanline(scanline),
+	fSubpixScanline(subpixScanline),
+	fSubpixRasterizer(subpixRasterizer),
+	fRasterizer(),
 
-	, fHinted(true)
-	, fAntialias(true)
-	, fKerning(true)
-	, fEmbeddedTransformation()
+	fHinted(true),
+	fAntialias(true),
+	fKerning(true),
+	fEmbeddedTransformation()
 {
 	fCurves.approximation_scale(2.0);
 	fContour.auto_detect_orientation(false);
 }
 
-// destructor
+
 AGGTextRenderer::~AGGTextRenderer()
 {
 }
 
-// SetFont
+
 void
-AGGTextRenderer::SetFont(const ServerFont &font)
+AGGTextRenderer::SetFont(const ServerFont& font)
 {
 	fFont = font;
 
@@ -84,7 +83,7 @@
 	fContour.width(font.FalseBoldWidth() * 2.0);
 }
 
-// SetHinting
+
 void
 AGGTextRenderer::SetHinting(bool hinting)
 {
@@ -92,7 +91,7 @@
 //	fFontEngine.hinting(fEmbeddedTransformation.IsIdentity() && fHinted);
 }
 
-// SetAntialiasing
+
 void
 AGGTextRenderer::SetAntialiasing(bool antialiasing)
 {
@@ -115,7 +114,7 @@
 
 
 class AGGTextRenderer::StringRenderer {
- public:
+public:
 	StringRenderer(const IntRect& clippingFrame, bool dryRun,
 			FontCacheEntry::TransformedOutline& transformedGlyph,
 			FontCacheEntry::TransformedContourOutline& transformedContour,
@@ -123,19 +122,19 @@
 			const BPoint& transformOffset,
 			BPoint* nextCharPos,
 			AGGTextRenderer& renderer)
+		:
+		fTransform(transform),
+		fTransformOffset(transformOffset),
+		fClippingFrame(clippingFrame),
+		fDryRun(dryRun),
+		fBounds(LONG_MAX, LONG_MAX, LONG_MIN, LONG_MIN),
+		fNextCharPos(nextCharPos),
+		fVector(false),
 
-		: fTransform(transform)
-		, fTransformOffset(transformOffset)
-		, fClippingFrame(clippingFrame)
-		, fDryRun(dryRun)
-		, fBounds(LONG_MAX, LONG_MAX, LONG_MIN, LONG_MIN)
-		, fNextCharPos(nextCharPos)
-		, fVector(false)
+		fTransformedGlyph(transformedGlyph),
+		fTransformedContour(transformedContour),
 
-		, fTransformedGlyph(transformedGlyph)
-		, fTransformedContour(transformedContour)
-
-		, fRenderer(renderer)
+		fRenderer(renderer)
 	{
 	}
 
@@ -291,7 +290,7 @@
 		return fBounds;
 	}
 
- private:
+private:
  	const Transformable& fTransform;
 	const BPoint&		fTransformOffset;
 	const IntRect&		fClippingFrame;
@@ -307,14 +306,10 @@
 
 // RenderString
 BRect
-AGGTextRenderer::RenderString(const char* string,
-							  uint32 length,
-							  const BPoint& baseLine,
-							  const BRect& clippingFrame,
-							  bool dryRun,
-							  BPoint* nextCharPos,
-							  const escapement_delta* delta,
-							  FontCacheReference* cacheReference)
+AGGTextRenderer::RenderString(const char* string, uint32 length,
+	const BPoint& baseLine, const BRect& clippingFrame, bool dryRun,
+	BPoint* nextCharPos, const escapement_delta* delta,
+	FontCacheReference* cacheReference)
 {
 //printf("RenderString(\"%s\", length: %ld, dry: %d)\n", string, length, dryRun);
 

Modified: haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.h
===================================================================
--- haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.h	2009-04-09 13:02:46 UTC (rev 30064)
+++ haiku/trunk/src/servers/app/drawing/Painter/AGGTextRenderer.h	2009-04-09 13:49:51 UTC (rev 30065)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007, Stephan A?mus <superstippi at gmx.de>.
+ * Copyright 2005-2009, Stephan A?mus <superstippi at gmx.de>.
  * Copyright 2008, Andrej Spielmann <andrej.spielmann at seh.ox.ac.uk>.
  * All rights reserved. Distributed under the terms of the MIT License.
  */
@@ -21,8 +21,9 @@
 class FontCacheReference;
 
 class AGGTextRenderer {
- public:
-								AGGTextRenderer(renderer_subpix_type& subpixRenderer,
+public:
+								AGGTextRenderer(
+									renderer_subpix_type& subpixRenderer,
 									renderer_type& solidRenderer,
 									renderer_bin_type& binRenderer,
 									scanline_unpacked_type& scanline,
@@ -47,15 +48,13 @@
 									{ return fKerning; }
 
 			BRect				RenderString(const char* utf8String,
-											 uint32 length,
-											 const BPoint& baseLine,
-											 const BRect& clippingFrame,
-											 bool dryRun,
-											 BPoint* nextCharPos,
-											 const escapement_delta* delta,
-											 FontCacheReference* cacheReference);
+									uint32 length, const BPoint& baseLine,
+									const BRect& clippingFrame, bool dryRun,
+									BPoint* nextCharPos,
+									const escapement_delta* delta,
+									FontCacheReference* cacheReference);
 
- private:
+private:
 
 	class StringRenderer;
 	friend class StringRenderer;
@@ -83,10 +82,12 @@
 		// to support non-anti-aliased text rendering
 
 	ServerFont					fFont;
-	bool						fHinted;		// is glyph hinting active?
+	bool						fHinted;
+									// is glyph hinting active?
 	bool						fAntialias;
 	bool						fKerning;
-	Transformable				fEmbeddedTransformation;	// rotated or sheared font?
+	Transformable				fEmbeddedTransformation;
+									// rotated or sheared font?
 };
 
 #endif // AGG_TEXT_RENDERER_H



From stippi at mail.berlios.de  Thu Apr  9 15:51:17 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Thu, 9 Apr 2009 15:51:17 +0200
Subject: [Haiku-commits] r30066 - haiku/trunk/src/servers/app
Message-ID: <200904091351.n39DpHM1027359@sheep.berlios.de>

Author: stippi
Date: 2009-04-09 15:51:16 +0200 (Thu, 09 Apr 2009)
New Revision: 30066
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30066&view=rev

Modified:
   haiku/trunk/src/servers/app/ServerWindow.cpp
Log:
Also improve the BPicture version of drawing line arrays.


Modified: haiku/trunk/src/servers/app/ServerWindow.cpp
===================================================================
--- haiku/trunk/src/servers/app/ServerWindow.cpp	2009-04-09 13:49:51 UTC (rev 30065)
+++ haiku/trunk/src/servers/app/ServerWindow.cpp	2009-04-09 13:51:16 UTC (rev 30066)
@@ -2751,7 +2751,7 @@
 			// To speed things up, try to use a stack allocation and only
 			// fall back to the heap if there are enough lines...
 			ViewLineArrayInfo* lineData;
-			static const int32 kStackBufferLineDataCount = 64;
+			const int32 kStackBufferLineDataCount = 64;
 			ViewLineArrayInfo lineDataStackBuffer[kStackBufferLineDataCount];
 			if (lineCount > kStackBufferLineDataCount) {
 				lineData = new(std::nothrow) ViewLineArrayInfo[lineCount];
@@ -2770,10 +2770,10 @@
 
 			// Convert to screen coords and draw
 			for (int32 i = 0; i < lineCount; i++) {
-				ViewLineArrayInfo* index = &lineData[i];
-
-				fCurrentView->ConvertToScreenForDrawing(&index->startPoint);
-				fCurrentView->ConvertToScreenForDrawing(&index->endPoint);
+				fCurrentView->ConvertToScreenForDrawing(
+					&lineData[i].startPoint);
+				fCurrentView->ConvertToScreenForDrawing(
+					&lineData[i].endPoint);
 			}
 			drawingEngine->StrokeLineArray(lineCount, lineData);
 
@@ -3104,23 +3104,41 @@
 		case AS_STROKE_LINEARRAY:
 		{
 			int32 lineCount;
-			link.Read<int32>(&lineCount);
-			if (lineCount <= 0)
+			if (link.Read<int32>(&lineCount) != B_OK || lineCount <= 0)
 				break;
 
+			// To speed things up, try to use a stack allocation and only
+			// fall back to the heap if there are enough lines...
+			ViewLineArrayInfo* lineData;
+			const int32 kStackBufferLineDataCount = 64;
+			ViewLineArrayInfo lineDataStackBuffer[kStackBufferLineDataCount];
+			if (lineCount > kStackBufferLineDataCount) {
+				lineData = new(std::nothrow) ViewLineArrayInfo[lineCount];
+				if (lineData == NULL)
+					break;
+			} else
+				lineData = lineDataStackBuffer;
+
+			// Read them all in one go
+			size_t dataSize = lineCount * sizeof(ViewLineArrayInfo);
+			if (link.Read(lineData, dataSize) != B_OK) {
+				if (lineData != lineDataStackBuffer)
+					delete[] lineData;
+				break;
+			}
+
 			picture->WritePushState();
 
 			for (int32 i = 0; i < lineCount; i++) {
-				ViewLineArrayInfo lineData;
-				if (link.Read<ViewLineArrayInfo >(&lineData) != B_OK)
-					break;
-
-				picture->WriteSetHighColor(lineData.color);
-				picture->WriteStrokeLine(lineData.startPoint,
-					lineData.endPoint);
+				picture->WriteSetHighColor(lineData[i].color);
+				picture->WriteStrokeLine(lineData[i].startPoint,
+					lineData[i].endPoint);
 			}
 
 			picture->WritePopState();
+
+			if (lineData != lineDataStackBuffer)
+				delete[] lineData;
 			break;
 		}
 



From stippi at mail.berlios.de  Thu Apr  9 16:05:33 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Thu, 9 Apr 2009 16:05:33 +0200
Subject: [Haiku-commits] r30067 - haiku/trunk/src/kits/tracker
Message-ID: <200904091405.n39E5XO4028990@sheep.berlios.de>

Author: stippi
Date: 2009-04-09 16:05:31 +0200 (Thu, 09 Apr 2009)
New Revision: 30067
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30067&view=rev

Modified:
   haiku/trunk/src/kits/tracker/PoseView.cpp
Log:
Fixed some weird fallback code, I don't think it's used and added a TODO
for whoever stumbles there next...


Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-09 13:51:16 UTC (rev 30066)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-09 14:05:31 UTC (rev 30067)
@@ -8093,15 +8093,19 @@
 void
 BPoseView::SetScrollBarsTo(BPoint point)
 {
-	BPoint origin;
-
 	if (fHScrollBar && fVScrollBar) {
 		fHScrollBar->SetValue(point.x);
 		fVScrollBar->SetValue(point.y);
 	} else {
-		origin = LeftTop();
-		ScrollTo(BPoint(point.x, origin.y));
-		ScrollTo(BPoint(origin.x, point.y));
+		// TODO: I don't know what this was supposed to work around
+		// (ie why it wasn't calling ScrollTo(point) simply). Although
+		// it cannot have been tested, since it was broken before, I am
+		// still leaving this, since I know there can be a subtle change in
+		// behaviour (BView<->BScrollBar feedback effects) when scrolling
+		// both directions at once versus separately.
+		BPoint origin = LeftTop();
+		ScrollTo(BPoint(point.x, point.y));
+		ScrollTo(point);
 	}
 }
 



From stippi at mail.berlios.de  Thu Apr  9 16:19:11 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Thu, 9 Apr 2009 16:19:11 +0200
Subject: [Haiku-commits] r30068 - haiku/trunk/src/servers/app
Message-ID: <200904091419.n39EJBMW030601@sheep.berlios.de>

Author: stippi
Date: 2009-04-09 16:19:09 +0200 (Thu, 09 Apr 2009)
New Revision: 30068
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30068&view=rev

Modified:
   haiku/trunk/src/servers/app/Window.cpp
Log:
* Some cleanup in the commented out debug code.
* Fixed a problem when scrolling. Basically, the region that could be copied
  should be removed from the pending dirty region. Before a region is copied,
  the dirty regions are removed from it. So the region at the target offset
  can always be considered clean. This fixes the problem in Tracker when
  enlarging windows that are already scrolled to the right or bottom. This then
  triggers the Tracker window to scroll the pose view in such a way that the
  bottom/right stays fixed, but would trigger this exact situation: The bottom
  is already pending dirty, but then the clean contents are copied on top of it.
Fixes ticket #1849 and perhaps also #2975.


Modified: haiku/trunk/src/servers/app/Window.cpp
===================================================================
--- haiku/trunk/src/servers/app/Window.cpp	2009-04-09 14:05:31 UTC (rev 30067)
+++ haiku/trunk/src/servers/app/Window.cpp	2009-04-09 14:19:09 UTC (rev 30068)
@@ -67,6 +67,10 @@
 // the update session, which tells us the cause of the update
 
 
+//static rgb_color sPendingColor = (rgb_color){ 255, 255, 0, 255 };
+//static rgb_color sCurrentColor = (rgb_color){ 255, 0, 255, 255 };
+
+
 Window::Window(const BRect& frame, const char *name,
 		window_look look, window_feel feel, uint32 flags, uint32 workspaces,
 		::ServerWindow* window, DrawingEngine* drawingEngine)
@@ -411,8 +415,8 @@
 
 	view->ScrollBy(dx, dy, dirty);
 
-//fDrawingEngine->FillRegion(dirty, rgb_color{ 255, 0, 255, 255 });
-//snooze(2000);
+//fDrawingEngine->FillRegion(*dirty, (rgb_color){ 255, 0, 255, 255 });
+//snooze(20000);
 
 	if (!IsOffscreenWindow() && IsVisible() && view->IsVisible()) {
 		dirty->IntersectWith(&VisibleContentRegion());
@@ -471,6 +475,18 @@
 					copyRegion->Exclude(allDirtyRegions);
 
 				fDrawingEngine->CopyRegion(copyRegion, xOffset, yOffset);
+
+				// The parts that could be copied are not dirty (at the
+				// target location!)
+				copyRegion->OffsetBy(xOffset, yOffset);
+				// Prevent those parts to being transfered to the dirty
+				// region...
+				if (allDirtyRegions != NULL)
+					allDirtyRegions->Exclude(copyRegion);
+				// ... and even exclude them from the pending dirty region!
+				if (fPendingUpdateSession->IsUsed())
+					fPendingUpdateSession->DirtyRegion().Exclude(copyRegion);
+
 				fRegionPool.Recycle(copyRegion);
 			} else {
 				// Fallback, should never be here.
@@ -1807,6 +1823,15 @@
 				fDrawingEngine->SetCopyToFrontEnabled(true);
 				fDrawingEngine->SuspendAutoSync();
 
+//sCurrentColor.red = rand() % 255;
+//sCurrentColor.green = rand() % 255;
+//sCurrentColor.blue = rand() % 255;
+//sPendingColor.red = rand() % 255;
+//sPendingColor.green = rand() % 255;
+//sPendingColor.blue = rand() % 255;
+//fDrawingEngine->FillRegion(*backgroundClearingRegion, sCurrentColor);
+//snooze(10000);
+
 				fTopView->Draw(fDrawingEngine, backgroundClearingRegion,
 					&fContentRegion, true);
 
@@ -1863,9 +1888,6 @@
 }
 
 
-//static rgb_color sPendingColor;
-//static rgb_color sCurrentColor;
-
 /*!
 	pre: the clipping is readlocked (this function is
 	only called from _TriggerContentRedraw()), which
@@ -1879,7 +1901,7 @@
 		return;
 
 //fDrawingEngine->FillRegion(*contentDirtyRegion, sPendingColor);
-//snooze(10000);
+//snooze(20000);
 
 	// add to pending
 	fPendingUpdateSession->SetUsed(true);
@@ -1964,14 +1986,16 @@
 
 	dirty->IntersectWith(&VisibleContentRegion());
 
-//sCurrentColor.red = rand() % 255;
-//sCurrentColor.green = rand() % 255;
-//sCurrentColor.blue = rand() % 255;
-//sPendingColor.red = rand() % 255;
-//sPendingColor.green = rand() % 255;
-//sPendingColor.blue = rand() % 255;
+//if (!fCurrentUpdateSession->IsExpose()) {
+////sCurrentColor.red = rand() % 255;
+////sCurrentColor.green = rand() % 255;
+////sCurrentColor.blue = rand() % 255;
+////sPendingColor.red = rand() % 255;
+////sPendingColor.green = rand() % 255;
+////sPendingColor.blue = rand() % 255;
 //fDrawingEngine->FillRegion(*dirty, sCurrentColor);
 //snooze(10000);
+//}
 
 	link.StartMessage(B_OK);
 	// append the current window geometry to the
@@ -1990,7 +2014,6 @@
 	fDrawingEngine->SetCopyToFrontEnabled(false);
 
 	if (!fCurrentUpdateSession->IsExpose() && fDrawingEngine->LockParallelAccess()) {
-//fDrawingEngine->FillRegion(dirty, (rgb_color){ 255, 0, 0, 255 });
 		fDrawingEngine->SuspendAutoSync();
 
 		fTopView->Draw(fDrawingEngine, dirty, &fContentRegion, true);



From bga at bug-br.org.br  Thu Apr  9 16:23:18 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Thu, 09 Apr 2009 11:23:18 -0300
Subject: [Haiku-commits] r30068 - haiku/trunk/src/servers/app
In-Reply-To: <200904091419.n39EJBMW030601@sheep.berlios.de>
References: <200904091419.n39EJBMW030601@sheep.berlios.de>
Message-ID: <49DE04D6.5090705@bug-br.org.br>

stippi at mail.berlios.de wrote:

> * Fixed a problem when scrolling. Basically, the region that could be copied
>   should be removed from the pending dirty region. Before a region is copied,
>   the dirty regions are removed from it. So the region at the target offset
>   can always be considered clean. This fixes the problem in Tracker when
>   enlarging windows that are already scrolled to the right or bottom. This then
>   triggers the Tracker window to scroll the pose view in such a way that the
>   bottom/right stays fixed, but would trigger this exact situation: The bottom
>   is already pending dirty, but then the clean contents are copied on top of it.

Not related to this, but I guess one of your recent changes broke 
redrawing for BeOS apps (when using the VESA driver at least). Both 
Firefox and SoundPlay are not redrawing themselves correctly and the 
result is that controls disappear in SoundPlay and parts of the page are 
not rendered in Firefox.

I can file a proper bug when I have access to a Haiku machine again. 
Just thought I would mention this before I forgot about it.

-Bruno


From superstippi at gmx.de  Thu Apr  9 16:37:59 2009
From: superstippi at gmx.de (=?utf-8?q?Stephan_A=C3=9Fmus?=)
Date: Thu, 09 Apr 2009 16:37:59 +0200
Subject: [Haiku-commits] r30068 - haiku/trunk/src/servers/app
In-Reply-To: <49DE04D6.5090705@bug-br.org.br>
References: <200904091419.n39EJBMW030601@sheep.berlios.de>
	<49DE04D6.5090705@bug-br.org.br>
Message-ID: <20090409163759.2661.2@bepc.1239286967.fake>


On 2009-04-09 at 16:23:13 [+0200], Bruno Albuquerque <bga at bug-br.org.br> 
wrote:
> stippi at mail.berlios.de wrote:
> 
> > * Fixed a problem when scrolling. Basically, the region that could be 
> > copied
> >   should be removed from the pending dirty region. Before a region is 
> >   copied, the dirty regions are removed from it. So the region at the 
> >   target offset can always be considered clean. This fixes the problem 
> >   in Tracker when enlarging windows that are already scrolled to the 
> >   right or bottom. This then triggers the Tracker window to scroll the 
> >   pose view in such a way that the bottom/right stays fixed, but would 
> >   trigger this exact situation: The bottom is already pending dirty, 
> >   but then the clean contents are copied on top of it.
> 
> Not related to this, but I guess one of your recent changes broke 
> redrawing for BeOS apps (when using the VESA driver at least). Both 
> Firefox and SoundPlay are not redrawing themselves correctly and the 
> result is that controls disappear in SoundPlay and parts of the page are 
> not rendered in Firefox.
> 
> I can file a proper bug when I have access to a Haiku machine again. Just 
> thought I would mention this before I forgot about it.

Yes please do so. I am using Haiku full time, including BeOS apps (Firefox, 
WonderBrush, Beam (both also liblayout.so based as SoundPlay)), also in 
VESA and have not seen any problems.

Technically, there is also no difference between BeOS and native apps. So 
it could only be some subtle differences in behaviour that affect only 
certain apps. At least it shouldn't have to do with the fact that they are 
BeOS compiled apps, since I use many of those.

Best regards,
-Stephan


From mattmadia at gmail.com  Thu Apr  9 16:46:44 2009
From: mattmadia at gmail.com (Matt Madia)
Date: Thu, 9 Apr 2009 10:46:44 -0400
Subject: [Haiku-commits] r30068 - haiku/trunk/src/servers/app
In-Reply-To: <20090409163759.2661.2@bepc.1239286967.fake>
References: <200904091419.n39EJBMW030601@sheep.berlios.de>
	<49DE04D6.5090705@bug-br.org.br>
	<20090409163759.2661.2@bepc.1239286967.fake>
Message-ID: <1e42d8c50904090746q127c7eecp519743ae882b0c97@mail.gmail.com>

On Thu, Apr 9, 2009 at 10:37 AM, Stephan A?mus <superstippi at gmx.de> wrote:
>> Not related to this, but I guess one of your recent changes broke
>> redrawing for BeOS apps (when using the VESA driver at least). Both
>> Firefox and SoundPlay are not redrawing themselves correctly and the
>> result is that controls disappear in SoundPlay and parts of the page are
>> not rendered in Firefox.
>>
>> I can file a proper bug when I have access to a Haiku machine again. Just
>> thought I would mention this before I forgot about it.
>
> Yes please do so. I am using Haiku full time, including BeOS apps (Firefox,
> WonderBrush, Beam (both also liblayout.so based as SoundPlay)), also in
> VESA and have not seen any problems.

Are you guys using BeOS binaries of Firefox for testing purposes?
The BeZilla* builds are true Haiku binaries.

--mmadia


From superstippi at gmx.de  Thu Apr  9 16:50:47 2009
From: superstippi at gmx.de (=?iso-8859-1?q?Stephan_A=DFmus?=)
Date: Thu, 09 Apr 2009 16:50:47 +0200
Subject: [Haiku-commits] r30068 - haiku/trunk/src/servers/app
In-Reply-To: <1e42d8c50904090746q127c7eecp519743ae882b0c97@mail.gmail.com>
References: <200904091419.n39EJBMW030601@sheep.berlios.de>
	<49DE04D6.5090705@bug-br.org.br>
	<20090409163759.2661.2@bepc.1239286967.fake>
	<1e42d8c50904090746q127c7eecp519743ae882b0c97@mail.gmail.com>
Message-ID: <20090409165047.2878.5@bepc.1239286967.fake>


On 2009-04-09 at 16:49:09 [+0200], Matt Madia <mattmadia at gmail.com> wrote:
> On Thu, Apr 9, 2009 at 10:37 AM, Stephan A?mus <superstippi at gmx.de> wrote:
> >> Not related to this, but I guess one of your recent changes broke 
> >> redrawing for BeOS apps (when using the VESA driver at least). Both 
> >> Firefox and SoundPlay are not redrawing themselves correctly and the 
> >> result is that controls disappear in SoundPlay and parts of the page 
> >> are not rendered in Firefox.
> >>
> >> I can file a proper bug when I have access to a Haiku machine again. 
> >> Just thought I would mention this before I forgot about it.
> >
> > Yes please do so. I am using Haiku full time, including BeOS apps 
> > (Firefox, WonderBrush, Beam (both also liblayout.so based as 
> > SoundPlay)), also in VESA and have not seen any problems.
> 
> Are you guys using BeOS binaries of Firefox for testing purposes? The 
> BeZilla* builds are true Haiku binaries.

Hm. Now that you mention it. Even WonderBrush is a true Haiku binary... 
Maybe we broke something, but then it should be in the interface kit, not 
app_server.

Best regards,
-Stephan


From mattmadia at gmail.com  Thu Apr  9 16:57:17 2009
From: mattmadia at gmail.com (Matt Madia)
Date: Thu, 9 Apr 2009 10:57:17 -0400
Subject: [Haiku-commits] r30068 - haiku/trunk/src/servers/app
In-Reply-To: <20090409165047.2878.5@bepc.1239286967.fake>
References: <200904091419.n39EJBMW030601@sheep.berlios.de>
	<49DE04D6.5090705@bug-br.org.br>
	<20090409163759.2661.2@bepc.1239286967.fake>
	<1e42d8c50904090746q127c7eecp519743ae882b0c97@mail.gmail.com>
	<20090409165047.2878.5@bepc.1239286967.fake>
Message-ID: <1e42d8c50904090757u18e04ca7o8de57e420b9f1721@mail.gmail.com>

On Thu, Apr 9, 2009 at 10:50 AM, Stephan A?mus <superstippi at gmx.de> wrote:
>> Are you guys using BeOS binaries of Firefox for testing purposes? The
>> BeZilla* builds are true Haiku binaries.
>
> Hm. Now that you mention it. Even WonderBrush is a true Haiku binary...
> Maybe we broke something, but then it should be in the interface kit, not
> app_server.

Just to note : even in rev <30,000,  BeZillaBrowser does have
occasional rendering issues. It seems like every so often, a new tab's
content will display partially and will not accept any user input.
I've no idea how to go about debugging it, let alone fixing it,  so I
personally just put up with it.  heh.

--mmadia


From alex at zappotek.com  Thu Apr  9 16:58:19 2009
From: alex at zappotek.com (Alexandre Deckner)
Date: Thu, 09 Apr 2009 16:58:19 +0200
Subject: [Haiku-commits] r30068 - haiku/trunk/src/servers/app
In-Reply-To: <200904091419.n39EJBMW030601@sheep.berlios.de>
References: <200904091419.n39EJBMW030601@sheep.berlios.de>
Message-ID: <49DE0D0B.30009@zappotek.com>

stippi at mail.berlios.de wrote:
> Author: stippi
> Date: 2009-04-09 16:19:09 +0200 (Thu, 09 Apr 2009)
> New Revision: 30068
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30068&view=rev
>
> Modified:
>    haiku/trunk/src/servers/app/Window.cpp
> Log:
> * Some cleanup in the commented out debug code.
> * Fixed a problem when scrolling. Basically, the region that could be copied
>   should be removed from the pending dirty region. Before a region is copied,
>   the dirty regions are removed from it. So the region at the target offset
>   can always be considered clean. This fixes the problem in Tracker when
>   enlarging windows that are already scrolled to the right or bottom. This then
>   triggers the Tracker window to scroll the pose view in such a way that the
>   bottom/right stays fixed, but would trigger this exact situation: The bottom
>   is already pending dirty, but then the clean contents are copied on top of it.
> Fixes ticket #1849 and perhaps also #2975.
>
>   
Wunderbar :) one of the rare visual glitches left! I remember spending 
hours on this one, was looking in the wrong place obviously!

Alex (from the train)


From anevilyak at gmail.com  Thu Apr  9 16:59:24 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Thu, 9 Apr 2009 09:59:24 -0500
Subject: [Haiku-commits] r30068 - haiku/trunk/src/servers/app
In-Reply-To: <1e42d8c50904090757u18e04ca7o8de57e420b9f1721@mail.gmail.com>
References: <200904091419.n39EJBMW030601@sheep.berlios.de>
	<49DE04D6.5090705@bug-br.org.br>
	<20090409163759.2661.2@bepc.1239286967.fake>
	<1e42d8c50904090746q127c7eecp519743ae882b0c97@mail.gmail.com>
	<20090409165047.2878.5@bepc.1239286967.fake>
	<1e42d8c50904090757u18e04ca7o8de57e420b9f1721@mail.gmail.com>
Message-ID: <f019d2f30904090759g3a88b94ey4be2b52ba5826326@mail.gmail.com>

On Thu, Apr 9, 2009 at 9:57 AM, Matt Madia <mattmadia at gmail.com> wrote:
> Just to note : even in rev <30,000, ?BeZillaBrowser does have
> occasional rendering issues. It seems like every so often, a new tab's
> content will display partially and will not accept any user input.
> I've no idea how to go about debugging it, let alone fixing it, ?so I
> personally just put up with it. ?heh.
>

That one I believe is a problem in NSPR that tqh hadn't managed to track down.

Regards,

Rene


From superstippi at gmx.de  Thu Apr  9 17:04:22 2009
From: superstippi at gmx.de (=?utf-8?q?Stephan_A=C3=9Fmus?=)
Date: Thu, 09 Apr 2009 17:04:22 +0200
Subject: [Haiku-commits] r30068 - haiku/trunk/src/servers/app
In-Reply-To: <f019d2f30904090759g3a88b94ey4be2b52ba5826326@mail.gmail.com>
References: <200904091419.n39EJBMW030601@sheep.berlios.de>
	<49DE04D6.5090705@bug-br.org.br>
	<20090409163759.2661.2@bepc.1239286967.fake>
	<1e42d8c50904090746q127c7eecp519743ae882b0c97@mail.gmail.com>
	<20090409165047.2878.5@bepc.1239286967.fake>
	<1e42d8c50904090757u18e04ca7o8de57e420b9f1721@mail.gmail.com>
	<f019d2f30904090759g3a88b94ey4be2b52ba5826326@mail.gmail.com>
Message-ID: <20090409170422.3011.8@bepc.1239286967.fake>


On 2009-04-09 at 16:59:58 [+0200], Rene Gollent <anevilyak at gmail.com> wrote:
> On Thu, Apr 9, 2009 at 9:57 AM, Matt Madia <mattmadia at gmail.com> wrote:
> > Just to note : even in rev <30,000,  BeZillaBrowser does have 
> > occasional rendering issues. It seems like every so often, a new tab's 
> > content will display partially and will not accept any user input. I've 
> > no idea how to go about debugging it, let alone fixing it,  so I 
> > personally just put up with it.  heh.
> >
> 
> That one I believe is a problem in NSPR that tqh hadn't managed to track 
> down.

BTW, I only ever saw this when I use Command-T to create the respective 
tab. But then it had been 100% reproducable at the time.

Best regards,
-Stephan


From anevilyak at gmail.com  Thu Apr  9 17:06:51 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Thu, 9 Apr 2009 10:06:51 -0500
Subject: [Haiku-commits] r30068 - haiku/trunk/src/servers/app
In-Reply-To: <20090409170422.3011.8@bepc.1239286967.fake>
References: <200904091419.n39EJBMW030601@sheep.berlios.de>
	<49DE04D6.5090705@bug-br.org.br>
	<20090409163759.2661.2@bepc.1239286967.fake>
	<1e42d8c50904090746q127c7eecp519743ae882b0c97@mail.gmail.com>
	<20090409165047.2878.5@bepc.1239286967.fake>
	<1e42d8c50904090757u18e04ca7o8de57e420b9f1721@mail.gmail.com>
	<f019d2f30904090759g3a88b94ey4be2b52ba5826326@mail.gmail.com>
	<20090409170422.3011.8@bepc.1239286967.fake>
Message-ID: <f019d2f30904090806v13c616ahd710287d2ab359dc@mail.gmail.com>

On Thu, Apr 9, 2009 at 10:04 AM, Stephan A?mus <superstippi at gmx.de> wrote:
> BTW, I only ever saw this when I use Command-T to create the respective
> tab. But then it had been 100% reproducable at the time.

Really? That's about the only way I ever create tabs, and I only see
it at random.

Regards,

Rene


From mmlr at mail.berlios.de  Thu Apr  9 17:24:42 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Thu, 9 Apr 2009 17:24:42 +0200
Subject: [Haiku-commits] r30069 -
	haiku/trunk/src/add-ons/kernel/bus_managers/ata
Message-ID: <200904091524.n39FOgWu005640@sheep.berlios.de>

Author: mmlr
Date: 2009-04-09 17:24:40 +0200 (Thu, 09 Apr 2009)
New Revision: 30069
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30069&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
Log:
Implement DMA transfers in the new ATA bus_manager.


Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-09 14:19:09 UTC (rev 30068)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-09 15:24:40 UTC (rev 30069)
@@ -14,6 +14,7 @@
 		fChannelID(0),
 		fController(NULL),
 		fCookie(NULL),
+		fExpectsDMATransfer(false),
 		fStatus(B_NO_INIT),
 		fSCSIBus(NULL),
 		fDeviceCount(0),
@@ -21,7 +22,9 @@
 		fUseDMA(true),
 		fRequest(NULL)
 {
-	mutex_init(&fLock, "ata channel");
+	mutex_init(&fExecutionLock, "ata io execution");
+	B_INITIALIZE_SPINLOCK(&fDMATransferLock);
+	fDMATransferCondition.Init(this, "ata dma transfer");
 
 	gDeviceManager->get_attr_uint32(node, ATA_CHANNEL_ID_ITEM, &fChannelID,
 		true);
@@ -80,12 +83,14 @@
 	fStatus = gDeviceManager->get_driver(parent,
 		(driver_module_info **)&fController, &fCookie);
 	gDeviceManager->put_node(parent);
+
+	fController->set_channel(fCookie, this);
 }
 
 
 ATAChannel::~ATAChannel()
 {
-	mutex_lock(&fLock);
+	mutex_lock(&fExecutionLock);
 
 	if (fDevices) {
 		for (uint8 i = 0; i < fDeviceCount; i++)
@@ -94,7 +99,7 @@
 	}
 
 	delete fRequest;
-	mutex_destroy(&fLock);
+	mutex_destroy(&fExecutionLock);
 }
 
 
@@ -217,10 +222,10 @@
 ATAChannel::ExecuteIO(scsi_ccb *ccb)
 {
 	TRACE_FUNCTION("%p\n", ccb);
-	if (mutex_trylock(&fLock) != B_OK)
+	if (mutex_trylock(&fExecutionLock) != B_OK)
 		return B_BUSY;
 
-	MutexLocker _(&fLock, true);
+	MutexLocker _(&fExecutionLock, true);
 
 	fRequest->SetCCB(ccb);
 	if (ccb->cdb[0] == SCSI_OP_REQUEST_SENSE) {
@@ -445,6 +450,10 @@
 status_t
 ATAChannel::SendRequest(ATARequest *request, uint32 flags)
 {
+	// disable interrupts for PIO transfers, enable them for DMA
+	_WriteControl((flags & ATA_DMA_TRANSFER) != 0 ? 0
+		: ATA_DEVICE_CONTROL_DISABLE_INTS);
+
 	ATADevice *device = request->Device();
 	if (device->Select() != B_OK || WaitForIdle() != B_OK) {
 		// resetting the device here will discard current configuration,
@@ -479,7 +488,7 @@
 		// wait for the device to finish current command (device no longer busy)
 		status_t result = Wait(0, ATA_STATUS_BUSY, 0, request->Timeout());
 		if (result != B_OK) {
-			TRACE_ERROR("timeout\n");
+			TRACE_ERROR("timeout waiting for request finish\n");
 			request->SetStatus(SCSI_CMD_TIMEOUT);
 			return result;
 		}
@@ -565,11 +574,44 @@
 
 
 status_t
+ATAChannel::PrepareDMA(ATARequest *request)
+{
+	scsi_ccb *ccb = request->CCB();
+	return fController->prepare_dma(fCookie, ccb->sg_list, ccb->sg_count,
+		request->IsWrite());
+}
+
+
+status_t
+ATAChannel::FinishDMA()
+{
+	return fController->finish_dma(fCookie);
+}
+
+
+status_t
 ATAChannel::ExecuteDMATransfer(ATARequest *request)
 {
-	TRACE_ERROR("dma transfers unimplemented\n");
-	request->SetStatus(SCSI_SEQUENCE_FAIL);
-	return B_ERROR;
+	InterruptsSpinLocker locker(fDMATransferLock);
+	fExpectsDMATransfer = true;
+	ConditionVariableEntry entry;
+	fDMATransferCondition.Add(&entry);
+	locker.Unlock();
+
+	fController->start_dma(fCookie);
+	bigtime_t timeout = system_time() + request->Timeout();
+	status_t waitResult = entry.Wait(B_ABSOLUTE_TIMEOUT, timeout);
+
+	locker.Lock();
+	fExpectsDMATransfer = false;
+	locker.Unlock();
+
+	if (waitResult != B_OK) {
+		TRACE_ERROR("timeout waiting for DMA transfer\n");
+		return B_TIMED_OUT;
+	}
+
+	return B_OK;
 }
 
 
@@ -612,14 +654,6 @@
 		result = B_ERROR;
 	}
 
-	if (result == B_OK) {
-		result = FinishRequest(request, ATA_WAIT_FINISH
-			| ATA_DEVICE_READY_REQUIRED, ATA_ERROR_ABORTED);
-	}
-
-	if (result != B_OK)
-		request->SetStatus(SCSI_SEQUENCE_FAIL);
-
 	return result;
 }
 
@@ -632,6 +666,24 @@
 }
 
 
+void
+ATAChannel::Interrupt(uint8 status)
+{
+	SpinLocker locker(fDMATransferLock);
+	if (!fExpectsDMATransfer) {
+		TRACE_ERROR("interrupt when not expecting transfer\n");
+		return;
+	}
+
+	if ((status & ATA_STATUS_BUSY) != 0) {
+		TRACE_ERROR(("interrupt while device is busy\n"));
+		return;
+	}
+
+	fDMATransferCondition.NotifyAll();
+}
+
+
 status_t
 ATAChannel::_ReadRegs(ata_task_file *taskFile, ata_reg_mask mask)
 {

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-09 14:19:09 UTC (rev 30068)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-09 15:24:40 UTC (rev 30069)
@@ -17,6 +17,7 @@
 		fUse48Bits(false),
 		fUseDMA(channel->UseDMA()),
 		fDMAMode(0),
+		fDMAFailures(0),
 		fTotalSectors(0),
 		fRegisterMask(0)
 {
@@ -513,18 +514,15 @@
 ATADevice::ExecuteReadWrite(ATARequest *request, uint64 address,
 	uint32 sectorCount)
 {
-	request->SetUseDMA(fUseDMA && _PrepareDMA(request) == B_OK);
-	if (!request->UseDMA()) {
-		status_t result = _PreparePIO(request);
-		if (result != B_OK) {
-			TRACE_ERROR("failed to prepare pio transfer\n");
-			return result;
-		}
-	}
+	request->SetUseDMA(fUseDMA && fChannel->PrepareDMA(request) == B_OK);
+	if (!request->UseDMA())
+		request->PrepareSGInfo();
 
 	request->SetBlocksLeft(sectorCount);
 	if (_FillTaskFile(request, address) != B_OK) {
 		TRACE_ERROR("failed to setup transfer request\n");
+		if (request->UseDMA())
+			fChannel->FinishDMA();
 		return B_ERROR;
 	}
 
@@ -537,13 +535,39 @@
 	status_t result = fChannel->SendRequest(request, flags);
 	if (result != B_OK) {
 		TRACE_ERROR("failed to send transfer request\n");
+		if (request->UseDMA())
+			fChannel->FinishDMA();
 		return result;
 	}
 
-	if (request->UseDMA())
-		return fChannel->ExecuteDMATransfer(request);
+	if (request->UseDMA()) {
+		result = fChannel->ExecuteDMATransfer(request);
+		status_t dmaResult = fChannel->FinishDMA();
+		if (result == B_OK && dmaResult == B_OK) {
+			fDMAFailures = 0;
+			request->CCB()->data_resid = 0;
+		} else {
+			if (dmaResult != B_OK) {
+				request->SetSense(SCSIS_KEY_HARDWARE_ERROR,
+					SCSIS_ASC_LUN_COM_FAILURE);
+				fDMAFailures++;
+				if (fDMAFailures >= ATA_MAX_DMA_FAILURES) {
+					TRACE_ALWAYS("disabling DMA after %u failures\n",
+						fDMAFailures);
+					fUseDMA = false;
+				}
+			} else {
+				// timeout
+				request->SetStatus(SCSI_CMD_TIMEOUT);
+			}
+		}
+	} else {
+		if (fChannel->ExecutePIOTransfer(request) != B_OK)
+			request->SetStatus(SCSI_SEQUENCE_FAIL);
+	}
 
-	return fChannel->ExecutePIOTransfer(request);
+	return fChannel->FinishRequest(request, ATA_WAIT_FINISH
+		| ATA_DEVICE_READY_REQUIRED, ATA_ERROR_ABORTED);
 }
 
 
@@ -621,18 +645,3 @@
 
 	return B_OK;
 }
-
-
-status_t
-ATADevice::_PrepareDMA(ATARequest *request)
-{
-	return B_ERROR;
-}
-
-
-status_t
-ATADevice::_PreparePIO(ATARequest *request)
-{
-	request->PrepareSGInfo();
-	return B_OK;
-}

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp	2009-04-09 14:19:09 UTC (rev 30068)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp	2009-04-09 15:24:40 UTC (rev 30069)
@@ -205,7 +205,13 @@
 status_t
 ata_interrupt_handler(void *cookie, uint8 status)
 {
-	return B_UNHANDLED_INTERRUPT;
+	ATAChannel *channel = (ATAChannel *)cookie;
+	channel->Interrupt(status);
+
+	// the controller driver already checks if its interrupt status indicates
+	// that the interrupt was for this device, so we are only here if that's
+	// the case.
+	return B_HANDLED_INTERRUPT;
 }
 
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-09 14:19:09 UTC (rev 30068)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-09 15:24:40 UTC (rev 30069)
@@ -25,6 +25,7 @@
 #include "ATATracing.h"
 #include "ata_device_infoblock.h"
 
+#define ATA_MAX_DMA_FAILURES		3
 #define ATA_STANDARD_TIMEOUT		10 * 1000 * 1000
 #define ATA_RELEASE_TIMEOUT			10 * 1000 * 1000
 #define ATA_SIGNATURE_ATAPI			0xeb140101
@@ -35,10 +36,10 @@
 enum {
 	ATA_DEVICE_READY_REQUIRED	= 0x01,
 	ATA_IS_WRITE				= 0x02,
-	ATA_DMA_TRANSFER			= 0x03,
-	ATA_CHECK_ERROR_BIT			= 0x04,
-	ATA_WAIT_FINISH				= 0x08,
-	ATA_WAIT_ANY_BIT			= 0x10
+	ATA_DMA_TRANSFER			= 0x04,
+	ATA_CHECK_ERROR_BIT			= 0x08,
+	ATA_WAIT_FINISH				= 0x10,
+	ATA_WAIT_ANY_BIT			= 0x20
 };
 
 
@@ -91,11 +92,16 @@
 										uint32 flags, uint8 errorMask);
 
 		// data transfers
+		status_t					PrepareDMA(ATARequest *request);
+		status_t					FinishDMA();
+
 		status_t					ExecuteDMATransfer(ATARequest *request);
 		status_t					ExecutePIOTransfer(ATARequest *request);
 
 		status_t					ReadPIO(uint8 *buffer, size_t length);
 
+		void						Interrupt(uint8 status);
+
 private:
 		status_t					_ReadRegs(ata_task_file *taskFile,
 										ata_reg_mask mask);
@@ -125,7 +131,12 @@
 		uint32						fChannelID;
 		ata_controller_interface *	fController;
 		void *						fCookie;
-		mutex						fLock;
+
+		mutex						fExecutionLock;
+		spinlock					fDMATransferLock;
+		ConditionVariable			fDMATransferCondition;
+		bool						fExpectsDMATransfer;
+
 		status_t					fStatus;
 		scsi_bus					fSCSIBus;
 		uint8						fDeviceCount;
@@ -178,9 +189,6 @@
 		status_t					_FillTaskFile(ATARequest *request,
 										uint64 address);
 
-		status_t					_PrepareDMA(ATARequest *request);
-		status_t					_PreparePIO(ATARequest *request);
-
 		const char *				_DebugContext() { return fDebugContext; };
 
 		ATAChannel *				fChannel;
@@ -189,6 +197,7 @@
 		bool						fUse48Bits;
 		bool						fUseDMA;
 		uint8						fDMAMode;
+		uint8						fDMAFailures;
 		uint64						fTotalSectors;
 		ata_device_infoblock		fInfoBlock;
 		ata_task_file				fTaskFile;



From axeld at mail.berlios.de  Thu Apr  9 17:41:13 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 17:41:13 +0200
Subject: [Haiku-commits] r30070 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200904091541.n39FfDZ9007630@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 17:41:10 +0200 (Thu, 09 Apr 2009)
New Revision: 30070
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30070&view=rev

Modified:
   haiku/trunk/headers/os/interface/Slider.h
   haiku/trunk/src/kits/interface/Slider.cpp
Log:
* Added const version of GetLimits() (the non-const version is still around
  for binary compatibility).
* Always round the bar thickness, or we get drawing artefacts.
* Cleaned up the header following our coding style.


Modified: haiku/trunk/headers/os/interface/Slider.h
===================================================================
--- haiku/trunk/headers/os/interface/Slider.h	2009-04-09 15:24:40 UTC (rev 30069)
+++ haiku/trunk/headers/os/interface/Slider.h	2009-04-09 15:41:10 UTC (rev 30070)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2006, Haiku.
+ * Copyright 2001-2009, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -28,199 +28,205 @@
 };
 
 
-#define USE_OFF_SCREEN_VIEW 1 
+class BSlider : public BControl {
+public:
+								BSlider(BRect frame, const char* name,
+									const char* label, BMessage* message,
+									int32 minValue, int32 maxValue,
+									thumb_style thumbType = B_BLOCK_THUMB,
+									uint32 resizingMode
+										= B_FOLLOW_LEFT | B_FOLLOW_TOP,
+									uint32 flags = B_NAVIGABLE | B_WILL_DRAW
+										| B_FRAME_EVENTS);
 
+								BSlider(BRect frame, const char* name,
+									const char* label, BMessage* message,
+									int32 minValue, int32 maxValue,
+									orientation posture,
+									thumb_style thumbType = B_BLOCK_THUMB,
+									uint32 resizingMode
+										= B_FOLLOW_LEFT | B_FOLLOW_TOP,
+									uint32 flags = B_NAVIGABLE | B_WILL_DRAW
+										| B_FRAME_EVENTS);
 
-class BSlider : public BControl {
-	public:
-		BSlider(BRect frame, const char *name, const char *label,
-			BMessage *message, int32 minValue, int32 maxValue,
-			thumb_style thumbType = B_BLOCK_THUMB,
-			uint32 resizingMode = B_FOLLOW_LEFT | B_FOLLOW_TOP,
-			uint32 flags = B_NAVIGABLE | B_WILL_DRAW | B_FRAME_EVENTS);
+								BSlider(const char* name, const char* label,
+									BMessage* message, int32 minValue,
+									int32 maxValue, orientation posture,
+									thumb_style thumbType = B_BLOCK_THUMB,
+									uint32 flags = B_NAVIGABLE | B_WILL_DRAW
+										| B_FRAME_EVENTS);
 
-		BSlider(BRect frame, const char *name, const char *label,
-			BMessage *message, int32 minValue, int32 maxValue,
-			orientation posture, thumb_style thumbType = B_BLOCK_THUMB,
-			uint32 resizingMode = B_FOLLOW_LEFT | B_FOLLOW_TOP,
-			uint32 flags = B_NAVIGABLE | B_WILL_DRAW | B_FRAME_EVENTS);
+								BSlider(BMessage* data);
+	virtual						~BSlider();
 
-		BSlider(const char *name, const char *label,
-			BMessage *message, int32 minValue, int32 maxValue,
-			orientation posture, thumb_style thumbType = B_BLOCK_THUMB,
-			uint32 flags = B_NAVIGABLE | B_WILL_DRAW | B_FRAME_EVENTS);
+	static 	BArchivable*		Instantiate(BMessage* data);
+	virtual	status_t 			Archive(BMessage* data, bool deep = true) const;
+	virtual status_t			Perform(perform_code code, void* data);
 
-		BSlider(BMessage *data);
-		virtual	~BSlider();
+	virtual void				WindowActivated(bool state);
+	virtual	void				AttachedToWindow();
+	virtual	void				AllAttached();
+	virtual	void				AllDetached();
+	virtual	void				DetachedFromWindow();
 
-		static 	BArchivable	*Instantiate(BMessage *data);
-		virtual	status_t 	Archive(BMessage *data, bool deep = true) const;
-		virtual status_t	Perform(perform_code code, void* data);
+	virtual	void				MessageReceived(BMessage* message);
+	virtual void				FrameMoved(BPoint newPosition);
+	virtual void				FrameResized(float width, float height);
+	virtual void				KeyDown(const char* bytes, int32 numBytes);
+	virtual void				MouseDown(BPoint point);
+	virtual void				MouseUp(BPoint point);
+	virtual void				MouseMoved(BPoint point, uint32 transit,
+									const BMessage* dragMessage);
+	virtual	void				Pulse();
 
-		virtual void		WindowActivated(bool state);
-		virtual	void		AttachedToWindow();
-		virtual	void		AllAttached();
-		virtual	void		AllDetached();
-		virtual	void		DetachedFromWindow();
+	virtual void				SetLabel(const char* label);
+	virtual	void				SetLimitLabels(const char* minLabel,
+									const char* maxLabel);
+			const char*			MinLimitLabel() const;
+			const char*			MaxLimitLabel() const;							
+	virtual	void				SetValue(int32);
+	virtual int32				ValueForPoint(BPoint) const;
+	virtual void				SetPosition(float);
+			float				Position() const;
+	virtual void				SetEnabled(bool on);
+			void				GetLimits(int32* minimum, int32* maximum) const;
 
-		virtual	void		MessageReceived(BMessage *msg);
-		virtual void		FrameMoved(BPoint new_position);
-		virtual void		FrameResized(float w,float h);
-		virtual void		KeyDown(const char * bytes, int32 n);
-		virtual void		MouseDown(BPoint);
-		virtual void		MouseUp(BPoint pt);
-		virtual void		MouseMoved(BPoint pt, uint32 c, const BMessage *m);
-		virtual	void		Pulse();
+	virtual	void				Draw(BRect);
+	virtual void				DrawSlider();
+	virtual void				DrawBar();
+	virtual void				DrawHashMarks();
+	virtual void				DrawThumb();
+	virtual void				DrawFocusMark();
+	virtual	void				DrawText();
+	virtual const char*			UpdateText() const;
+			void				UpdateTextChanged();
 
-		virtual void		SetLabel(const char *label);
-		virtual	void		SetLimitLabels(const char *minLabel,
-								const char *maxLabel);
-		const char*			MinLimitLabel() const;
-		const char*			MaxLimitLabel() const;							
-		virtual	void		SetValue(int32);
-		virtual int32		ValueForPoint(BPoint) const;
-		virtual void		SetPosition(float);
-				float		Position() const;
-		virtual void		SetEnabled(bool on); 
-				void		GetLimits(int32 * minimum, int32 * maximum);	
+	virtual BRect				BarFrame() const;
+	virtual BRect				HashMarksFrame() const;
+	virtual BRect				ThumbFrame() const;
 
-		virtual	void		Draw(BRect);
-		virtual void		DrawSlider();
-		virtual void		DrawBar();
-		virtual void		DrawHashMarks();
-		virtual void		DrawThumb();
-		virtual void		DrawFocusMark();
-		virtual	void		DrawText();
-		virtual const char*	UpdateText() const;
-				void		UpdateTextChanged();
+	virtual	void				SetFlags(uint32 flags);
+	virtual	void				SetResizingMode(uint32 mode);
 
-		virtual BRect		BarFrame() const;
-		virtual BRect		HashMarksFrame() const;
-		virtual BRect		ThumbFrame() const;
+	virtual void				GetPreferredSize(float* width, float* height);
+	virtual void				ResizeToPreferred();
 
-		virtual	void		SetFlags(uint32 flags);
-		virtual	void		SetResizingMode(uint32 mode);
+	virtual status_t			Invoke(BMessage* message = NULL);
+	virtual BHandler*			ResolveSpecifier(BMessage* message, int32 index,
+									BMessage* specifier, int32 form,
+									const char* property);
+	virtual	status_t			GetSupportedSuites(BMessage* data);
 
-		virtual void		GetPreferredSize( float *width, float *height);
-		virtual void		ResizeToPreferred();
+	virtual	void				SetModificationMessage(BMessage* message);
+			BMessage*			ModificationMessage() const;
 
-		virtual status_t	Invoke(BMessage *msg=NULL);
-		virtual BHandler*	ResolveSpecifier(BMessage *msg, int32 index,
-								BMessage *specifier, int32 form,
-								const char *property);
-		virtual	status_t	GetSupportedSuites(BMessage* data);
+	virtual void				SetSnoozeAmount(int32);
+			int32				SnoozeAmount() const;
 
-		virtual	void		SetModificationMessage(BMessage *message);
-				BMessage*	ModificationMessage() const;
+	virtual	void				SetKeyIncrementValue(int32 value);
+			int32				KeyIncrementValue()	const;
 
-		virtual void		SetSnoozeAmount(int32);
-				int32		SnoozeAmount() const;
+	virtual	void				SetHashMarkCount(int32 count);
+			int32				HashMarkCount() const;
 
-		virtual	void		SetKeyIncrementValue(int32 value);
-				int32		KeyIncrementValue()	const;
+	virtual	void				SetHashMarks(hash_mark_location where);
+			hash_mark_location	HashMarks() const;
 
-		virtual	void		SetHashMarkCount(int32 count);
-				int32		HashMarkCount() const;
+	virtual	void				SetStyle(thumb_style style);
+			thumb_style			Style() const;
 
-		virtual	void		SetHashMarks(hash_mark_location where);
-		hash_mark_location	HashMarks() const;
+	virtual	void				SetBarColor(rgb_color color);
+			rgb_color			BarColor() const;
+	virtual	void				UseFillColor(bool useFill,
+									const rgb_color* color = NULL);
+			bool				FillColor(rgb_color* color) const;
 
-		virtual	void		SetStyle(thumb_style s);
-				thumb_style	Style() const;
+			BView*				OffscreenView() const;
 
-		virtual	void		SetBarColor(rgb_color);
-				rgb_color	BarColor() const;
-		virtual	void		UseFillColor(bool, const rgb_color* c=NULL);
-				bool		FillColor(rgb_color*) const;
+			orientation			Orientation() const;
+	virtual void				SetOrientation(orientation);
 
-				BView*		OffscreenView() const;
+			float				BarThickness() const;
+	virtual void				SetBarThickness(float thickness);
 
-				orientation	Orientation() const;
-		virtual void		SetOrientation(orientation);
+	virtual void				SetFont(const BFont* font,
+									uint32 properties = B_FONT_ALL);
 
-				float		BarThickness() const;
-		virtual void		SetBarThickness(float thickness);
+	virtual void				SetLimits(int32 minimum, int32 maximum);
 
-		virtual void		SetFont(const BFont *font,
-								uint32 properties = B_FONT_ALL);
+	virtual	float				MaxUpdateTextWidth();
 
-		virtual void		SetLimits(int32 minimum, int32 maximum);
+	virtual	void				InvalidateLayout(bool descendants = false);
 
-		virtual	float		MaxUpdateTextWidth();
+	virtual	BSize				MinSize();
+	virtual	BSize				MaxSize();
+	virtual	BSize				PreferredSize();
 
-		virtual	void		InvalidateLayout(bool descendants = false);
+private:
+			// deprecated leftover of BeOS compatibility
+			void				GetLimits(int32* minimum, int32* maximum);	
 
-		virtual	BSize		MinSize();
-		virtual	BSize		MaxSize();
-		virtual	BSize		PreferredSize();
+			void				_DrawBlockThumb();
+			void				_DrawTriangleThumb();
 
-	private:
-				void		_DrawBlockThumb();
-				void		_DrawTriangleThumb();
+			BPoint				_Location() const;
+			void				_SetLocation(BPoint point);
 
-				BPoint		_Location() const;
-				void		_SetLocation(BPoint p);
+			float				_MinPosition() const;
+			float				_MaxPosition() const;
+			bool				_ConstrainPoint(BPoint& point,
+									BPoint compare) const;
 
-				float		_MinPosition() const;
-				float		_MaxPosition() const;
-				bool		_ConstrainPoint(BPoint& point, BPoint compare) const;
+			BSize				_ValidateMinSize();
 
-				BSize		_ValidateMinSize();
+	virtual	void				_ReservedSlider6();
+	virtual	void				_ReservedSlider7();
+	virtual	void				_ReservedSlider8();
+	virtual	void				_ReservedSlider9();
+	virtual	void				_ReservedSlider10();
+	virtual	void				_ReservedSlider11();
+	virtual	void				_ReservedSlider12();
 
-		virtual	void		_ReservedSlider6();
-		virtual	void		_ReservedSlider7();
-		virtual	void		_ReservedSlider8();
-		virtual	void		_ReservedSlider9();
-		virtual	void		_ReservedSlider10();
-		virtual	void		_ReservedSlider11();
-		virtual	void		_ReservedSlider12();
+			BSlider&			operator=(const BSlider& other);
 
-				BSlider&	operator=(const BSlider &);
+			void				_InitBarColor();
+			void				_InitObject();
 
-				void		_InitBarColor();
-				void		_InitObject();
+private:
+			BMessage*			fModificationMessage;
+			int32				fSnoozeAmount;
 
-	private:
-		BMessage*			fModificationMessage;
-		int32				fSnoozeAmount;
+			rgb_color 			fBarColor;
+			rgb_color 			fFillColor;
+			bool				fUseFillColor;
 
-		rgb_color 			fBarColor;
-		rgb_color 			fFillColor;
-		bool				fUseFillColor;
+			char*				fMinLimitLabel;
+			char*				fMaxLimitLabel;
+			const char*			fUpdateText;
 
-		char*				fMinLimitLabel;
-		char*				fMaxLimitLabel;
-		const char*			fUpdateText;
+			int32 				fMinValue;
+			int32 				fMaxValue;
+			int32 				fKeyIncrementValue;
 
-		int32 				fMinValue;
-		int32 				fMaxValue;
-		int32 				fKeyIncrementValue;
+			int32 				fHashMarkCount;
+			hash_mark_location 	fHashMarks;
 
-		int32 				fHashMarkCount;
-		hash_mark_location 	fHashMarks;
+			BBitmap*			fOffScreenBits;
+			BView*				fOffScreenView;
 
-#if USE_OFF_SCREEN_VIEW
-		BBitmap*			fOffScreenBits;
-		BView*				fOffScreenView;
-#endif
+			thumb_style			fStyle;
 
-		thumb_style			fStyle;
+			BPoint 				fLocation;
+			BPoint				fInitialLocation;
 
-		BPoint 				fLocation;
-		BPoint				fInitialLocation;
+			orientation			fOrientation;
+			float				fBarThickness;
 
-		orientation			fOrientation;
-		float				fBarThickness;
+			BSize				fMinSize;
 
-		BSize				fMinSize;
+			float				fMaxUpdateTextWidth;
 
-		float				fMaxUpdateTextWidth;
-
-#if USE_OFF_SCREEN_VIEW
-		uint32				_reserved[4];
-#else
-		uint32				_reserved[6];
-#endif
+			uint32				_reserved[4];
 };
 
 #endif	// _SLIDER_H

Modified: haiku/trunk/src/kits/interface/Slider.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Slider.cpp	2009-04-09 15:24:40 UTC (rev 30069)
+++ haiku/trunk/src/kits/interface/Slider.cpp	2009-04-09 15:41:10 UTC (rev 30070)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2006, Haiku.
+ * Copyright 2001-2009, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -27,6 +27,9 @@
 #include <binary_compatibility/Interface.h>
 
 
+#define USE_OFF_SCREEN_VIEW 1 
+
+
 BSlider::BSlider(BRect frame, const char* name, const char* label,
 			BMessage* message, int32 minValue, int32 maxValue,
 			thumb_style thumbType, uint32 resizingMode, uint32 flags)
@@ -778,10 +781,23 @@
 
 
 void
+BSlider::GetLimits(int32 *minimum, int32 *maximum) const
+{
+	if (minimum != NULL)
+		*minimum = fMinValue;
+	if (maximum != NULL)
+		*maximum = fMaxValue;
+}
+
+
+//! This one is deprecated, and only left for binary compatiblity (it's private)
+void
 BSlider::GetLimits(int32 *minimum, int32 *maximum)
 {
-	*minimum = fMinValue;
-	*maximum = fMaxValue;
+	if (minimum != NULL)
+		*minimum = fMinValue;
+	if (maximum != NULL)
+		*maximum = fMaxValue;
 }
 
 
@@ -1594,6 +1610,9 @@
 {
 	if (thickness < 1.0)
 		thickness = 1.0;
+	else
+		thickness = roundf(thickness);
+
 	if (thickness != fBarThickness) {
 		// calculate invalid barframe and extend by hashmark size
 		float hInset = 0.0;



From axeld at mail.berlios.de  Thu Apr  9 17:50:06 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 17:50:06 +0200
Subject: [Haiku-commits] r30071 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200904091550.n39Fo6VR008712@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 17:50:03 +0200 (Thu, 09 Apr 2009)
New Revision: 30071
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30071&view=rev

Modified:
   haiku/trunk/headers/os/interface/Slider.h
   haiku/trunk/src/kits/interface/Slider.cpp
Log:
* Making it private doesn't help unless you have a const BSlider. Therefore,
  removed it from the public namespace, and made it only visible when linking.


Modified: haiku/trunk/headers/os/interface/Slider.h
===================================================================
--- haiku/trunk/headers/os/interface/Slider.h	2009-04-09 15:41:10 UTC (rev 30070)
+++ haiku/trunk/headers/os/interface/Slider.h	2009-04-09 15:50:03 UTC (rev 30071)
@@ -163,9 +163,6 @@
 	virtual	BSize				PreferredSize();
 
 private:
-			// deprecated leftover of BeOS compatibility
-			void				GetLimits(int32* minimum, int32* maximum);	
-
 			void				_DrawBlockThumb();
 			void				_DrawTriangleThumb();
 

Modified: haiku/trunk/src/kits/interface/Slider.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Slider.cpp	2009-04-09 15:41:10 UTC (rev 30070)
+++ haiku/trunk/src/kits/interface/Slider.cpp	2009-04-09 15:50:03 UTC (rev 30071)
@@ -790,17 +790,6 @@
 }
 
 
-//! This one is deprecated, and only left for binary compatiblity (it's private)
-void
-BSlider::GetLimits(int32 *minimum, int32 *maximum)
-{
-	if (minimum != NULL)
-		*minimum = fMinValue;
-	if (maximum != NULL)
-		*maximum = fMaxValue;
-}
-
-
 // #pragma mark - drawing
 
 
@@ -2125,39 +2114,41 @@
 
 #if __GNUC__ < 3
 
-extern "C"
-void
+extern "C" void
+GetLimits__7BSliderPlT1(BSlider* slider, int32* minimum, int32* maximum)
+{
+	slider->GetLimits(minimum, maximum);
+}
+
+
+extern "C" void
 _ReservedSlider4__7BSlider(BSlider *slider, int32 minimum, int32 maximum)
 {
 	slider->BSlider::SetLimits(minimum, maximum);
 }
 
-extern "C"
-float
+extern "C" float
 _ReservedSlider5__7BSlider(BSlider *slider)
 {
 	return slider->BSlider::MaxUpdateTextWidth();
 }
 
 
-extern "C"
-void
+extern "C" void
 _ReservedSlider1__7BSlider(BSlider* slider, orientation _orientation)
 {
 	slider->BSlider::SetOrientation(_orientation);
 }
 
 
-extern "C"
-void
+extern "C" void
 _ReservedSlider2__7BSlider(BSlider* slider, float thickness)
 {
 	slider->BSlider::SetBarThickness(thickness);
 }
 
 
-extern "C"
-void
+extern "C" void
 _ReservedSlider3__7BSlider(BSlider* slider, const BFont* font,
 	uint32 properties)
 {



From umccullough at gmail.com  Thu Apr  9 18:11:10 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Thu, 9 Apr 2009 09:11:10 -0700
Subject: [Haiku-commits] r30050 - in haiku/trunk/src/kits/opengl: . mesa
	mesa/glapi
In-Reply-To: <ce99af780904090325g538f31b7n38fb6dee72f4f7a2@mail.gmail.com>
References: <ce99af780904090325g538f31b7n38fb6dee72f4f7a2@mail.gmail.com>
Message-ID: <1e80d8750904090911y4c1e0dc4p44af38942b7eadd1@mail.gmail.com>

On Thu, Apr 9, 2009 at 3:25 AM, Philippe Houdoin
<philippe.houdoin at gmail.com> wrote:
> [Haiku-commits] r30050 - in haiku/trunk/src/kits/opengl: . mesa mesa/glapi
>
> Urias McCullough umccullough at gmail.com wrote:
>
>>> * This should fix PPC libGL.so build - UNTESTED
>>
>> Seem to get further, but fails to link still:
>>
>> http://haiku.pastebin.com/f5fac4636
>
> Okay, I should not have added back dispatch.c to <mesa>glapi-dispatching.o!
> GLDispatcher.cpp does this already, but only when there is no assembly
> optimized dispatcher, hence why it clash on duplicated symbols on PPC.
>
> Retry after removing dispatch.c from <mesa>glapi_dispatching.o in mesa/Jamfile.
> Should works for both x86 and ppc (and sparc ;-) ) that way.

That does indeed allow libGL.so to compile :)

Unfortunately, I am unable to comple the "Mesa Software Renderer"
still due to some header inclusion problems in glheader.h.

Specifically this section:

#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
#if defined(__linux__)
#include <byteswap.h>
#define CPU_TO_LE32( x )        bswap_32( x )
#else /*__linux__*/
#include <sys/endian.h>
#define CPU_TO_LE32( x )        bswap32( x )
#endif /*__linux__*/
#define MESA_BIG_ENDIAN 1
#else
#define CPU_TO_LE32( x )        ( x )
#define MESA_LITTLE_ENDIAN 1
#endif
#define LE32_TO_CPU( x )        CPU_TO_LE32( x )

Apparently sys/endian.h is not there, but endian.h is in
headers/posix/endian.h (is this a bug?)

I changed the include and it seems to build successfully (along with
the other GL-related targets)

Patch is here currently:
ftp://ftp.binarychicken.com/umccullough/opengl-ppc-fix.diff

Unfortunately, however, I don't know if these compile for m68k due to
the lack of working gcc4 toolchain for m68k now :(

Is there a proper way to exclude arch's that aren't known to work yet?

NOTE: there's also a fix in there for compiling UserlandFS on gcc4

- Urias


From axeld at mail.berlios.de  Thu Apr  9 19:10:47 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 19:10:47 +0200
Subject: [Haiku-commits] r30072 - haiku/trunk/src/kits/interface
Message-ID: <200904091710.n39HAlll013760@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 19:10:43 +0200 (Thu, 09 Apr 2009)
New Revision: 30072
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30072&view=rev

Modified:
   haiku/trunk/src/kits/interface/Slider.cpp
Log:
* The slider position was actually computed incorrectly.


Modified: haiku/trunk/src/kits/interface/Slider.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Slider.cpp	2009-04-09 15:50:03 UTC (rev 30071)
+++ haiku/trunk/src/kits/interface/Slider.cpp	2009-04-09 17:10:43 UTC (rev 30072)
@@ -679,7 +679,7 @@
 		range = 1;
 
 	float pos = (float)(value - fMinValue) / range *
-		_MaxPosition() - _MinPosition();
+		(_MaxPosition() - _MinPosition());
 
 	if (fOrientation == B_HORIZONTAL) {
 		loc.x = ceil(_MinPosition() + pos);



From axeld at mail.berlios.de  Thu Apr  9 19:19:42 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 19:19:42 +0200
Subject: [Haiku-commits] r30073 - haiku/trunk/src/bin/desklink
Message-ID: <200904091719.n39HJgO8019280@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 19:19:38 +0200 (Thu, 09 Apr 2009)
New Revision: 30073
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30073&view=rev

Modified:
   haiku/trunk/src/bin/desklink/VolumeControl.cpp
   haiku/trunk/src/bin/desklink/VolumeControl.h
Log:
* The slider now snaps to 0 dB when crossing that to ease finding the maximum
  volume without distortion.
* Added about window.


Modified: haiku/trunk/src/bin/desklink/VolumeControl.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeControl.cpp	2009-04-09 17:10:43 UTC (rev 30072)
+++ haiku/trunk/src/bin/desklink/VolumeControl.cpp	2009-04-09 17:19:38 UTC (rev 30073)
@@ -14,6 +14,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include <Alert.h>
 #include <Application.h>
 #include <Beep.h>
 #include <ControlLook.h>
@@ -29,7 +30,8 @@
 
 VolumeControl::VolumeControl(int32 volumeWhich, bool beep, BMessage* message)
 	: BSlider("VolumeControl", "Volume", message, 0, 1, B_HORIZONTAL),
-	fBeep(beep)
+	fBeep(beep),
+	fSnapping(false)
 {
 	font_height fontHeight;
 	GetFontHeight(&fontHeight);
@@ -123,6 +125,13 @@
 }
 
 
+/*!	Since we have set a mouse event mask, we don't want to forward all
+	mouse downs to the slider - instead, we only invoke it, which causes a
+	message to our target. Within the VolumeWindow, this will actually
+	cause the window to close.
+	Also, we need to mask out the dragger in this case, or else dragging
+	us will also cause a volume update.
+*/
 void
 VolumeControl::MouseDown(BPoint where)
 {
@@ -153,6 +162,67 @@
 
 
 void
+VolumeControl::MouseUp(BPoint where)
+{
+	fSnapping = false;
+	BSlider::MouseUp(where);
+}
+
+
+/*!	Override the BSlider functionality to be able to grab the knob when
+	it's over 0 dB for some pixels.
+*/
+void
+VolumeControl::MouseMoved(BPoint where, uint32 transit,
+	const BMessage* dragMessage)
+{
+	if (!IsTracking()) {
+		BSlider::MouseMoved(where, transit, dragMessage);
+		return;
+	}
+
+	float cursorPosition = Orientation() == B_HORIZONTAL ? where.x : where.y;
+
+	if (fSnapping && cursorPosition >= fMinSnap && cursorPosition <= fMaxSnap) {
+		// Don't move the slider, keep the current value for a few
+		// more pixels
+		return;
+	}
+
+	fSnapping = false;
+
+	int32 oldValue = Value();
+	int32 newValue = ValueForPoint(where);
+	if (oldValue == newValue) {
+		BSlider::MouseMoved(where, transit, dragMessage);
+		return;
+	}
+
+	// Check if there is a 0 dB transition at all
+	if ((oldValue < 0 && newValue >= 0) || (oldValue > 0 && newValue <= 0)) {
+		SetValue(0);
+		if (ModificationMessage() != NULL)
+			Messenger().SendMessage(ModificationMessage());
+
+		if (oldValue > newValue) {
+			// movement from right to left
+			fMinSnap = _PointForValue(-4);
+			fMaxSnap = _PointForValue(1);
+		} else {
+			// movement from left to right
+			fMinSnap = _PointForValue(-1);
+			fMaxSnap = _PointForValue(4);
+		}
+
+		fSnapping = true;
+		return;
+	}
+
+	BSlider::MouseMoved(where, transit, dragMessage);
+}
+
+
+void
 VolumeControl::MessageReceived(BMessage* msg)
 {
 	switch (msg->what) {
@@ -188,6 +258,13 @@
 			SetValue((int32)fMixerControl->Volume());
 			break;
 
+		case B_ABOUT_REQUESTED:
+			(new BAlert("About Volume Control", "Volume Control\n"
+					"  Written by J?r?me DUVAL, and Axel D?rfler.\n\n"
+					"Copyright " B_UTF8_COPYRIGHT "2003-2009, Haiku",
+				"OK"))->Go(NULL);
+			break;
+
 		default:
 			return BView::MessageReceived(msg);
 	}
@@ -267,6 +344,22 @@
 }
 
 
+float
+VolumeControl::_PointForValue(int32 value) const
+{
+	int32 min, max;
+	GetLimits(&min, &max);
+
+	if (Orientation() == B_HORIZONTAL) {
+		return ceilf(1.0f * (value - min) / (max - min)
+			* (BarFrame().Width() - 2) + BarFrame().left + 1);
+	} else {
+		return ceilf(BarFrame().top - 1.0f * (value - min) / (max - min)
+			* BarFrame().Height());
+	}
+}
+
+
 bool
 VolumeControl::_IsReplicant() const
 {

Modified: haiku/trunk/src/bin/desklink/VolumeControl.h
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeControl.h	2009-04-09 17:10:43 UTC (rev 30072)
+++ haiku/trunk/src/bin/desklink/VolumeControl.h	2009-04-09 17:19:38 UTC (rev 30073)
@@ -29,7 +29,12 @@
 protected:
 	virtual	void			AttachedToWindow();
 	virtual	void			DetachedFromWindow();
+
 	virtual	void			MouseDown(BPoint where);
+	virtual	void			MouseUp(BPoint where);
+	virtual	void			MouseMoved(BPoint where, uint32 transit,
+								const BMessage* dragMessage);
+
 	virtual	void			MessageReceived(BMessage* message);
 	virtual status_t		Invoke(BMessage* message = NULL);
 
@@ -39,11 +44,16 @@
 private:
 			void			_InitVolume(int32 volumeWhich);
 			bool			_IsReplicant() const;
+			float			_PointForValue(int32 value) const;
 
 			mutable	char	fText[64];
 			MixerControl*	fMixerControl;
 			int32			fOriginalValue;
 			bool			fBeep;
+
+			bool			fSnapping;
+			float			fMinSnap;
+			float			fMaxSnap;
 };
 
 #endif	// VOLUME_SLIDER_H



From axeld at mail.berlios.de  Thu Apr  9 19:22:03 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 19:22:03 +0200
Subject: [Haiku-commits] r30074 -
	haiku/trunk/src/add-ons/media/media-add-ons/mixer
Message-ID: <200904091722.n39HM37g020338@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 19:22:00 +0200 (Thu, 09 Apr 2009)
New Revision: 30074
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30074&view=rev

Modified:
   haiku/trunk/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
Log:
* Minor cleanup.


Modified: haiku/trunk/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
===================================================================
--- haiku/trunk/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp	2009-04-09 17:19:38 UTC (rev 30073)
+++ haiku/trunk/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp	2009-04-09 17:22:00 UTC (rev 30074)
@@ -1,9 +1,11 @@
 /*
  * Copyright 2002 David Shipman,
  * Copyright 2003-2007 Marcus Overhagen
- * Copyright 2007 Haiku Inc. All rights reserved.
+ * Copyright 2007-2009 Haiku Inc. All rights reserved.
+ *
  * Distributed under the terms of the MIT License.
  */
+
 #include "AudioMixer.h"
 #include "MixerCore.h"
 #include "MixerInput.h"
@@ -31,29 +33,69 @@
 
 #define USE_MEDIA_FORMAT_WORKAROUND 1
 
+#define DB_TO_GAIN(db)			dB_to_Gain((db))
+#define GAIN_TO_DB(gain)		Gain_to_dB((gain))
+#define PERCENT_TO_GAIN(pct)	((pct) / 100.0)
+#define GAIN_TO_PERCENT(gain)	((gain)  * 100.0)
+
+// the id is encoded with 16 bits
+// then chan and src (or dst) are encoded with 6 bits
+// the unique number with 4 bits
+// the PARAM_ETC etc is encoded with 26 bits
+#define PARAM_SRC_ENABLE(id, chan, src)		(((id) << 16) | ((chan) << 10) | ((src) << 4) | 0x1)
+#define PARAM_SRC_GAIN(id, chan, src)		(((id) << 16) | ((chan) << 10) | ((src) << 4) | 0x2)
+#define PARAM_DST_ENABLE(id, chan, dst)		(((id) << 16) | ((chan) << 10) | ((dst) << 4) | 0x3)
+#define PARAM_ETC(etc)						(((etc) << 16) | 0x4)
+#define PARAM_SRC_STR(id, chan)				(((id) << 16) | ((chan) << 10) | 0x5)
+#define PARAM_DST_STR(id, chan)				(((id) << 16) | ((chan) << 10) | 0x6)
+#define PARAM_MUTE(id)						(((id) << 16) | 0x7)
+#define PARAM_GAIN(id)						(((id) << 16) | 0x8)
+#define PARAM_BALANCE(id)					(((id) << 16) | 0x9)
+#define PARAM_STR1(id)						(((id) << 16) | ((1) << 10) | 0xa)
+#define PARAM_STR2(id)						(((id) << 16) | ((2) << 10) | 0xa)
+#define PARAM_STR3(id)						(((id) << 16) | ((3) << 10) | 0xa)
+#define PARAM_STR4(id)						(((id) << 16) | ((4) << 10) | 0xa)
+#define PARAM_STR5(id)						(((id) << 16) | ((5) << 10) | 0xa)
+#define PARAM_STR6(id)						(((id) << 16) | ((6) << 10) | 0xa)
+#define PARAM_STR7(id)						(((id) << 16) | ((7) << 10) | 0xa)
+
+#define PARAM(id)							((id) >> 16)
+#define ETC(id)								((id) >> 16)
+#define PARAM_CHAN(id)						(((id) >> 10) & 0x3f)
+#define PARAM_SRC(id)						(((id) >> 4) & 0x3f)
+#define PARAM_DST(id)						(((id) >> 4) & 0x3f)
+#define PARAM_IS_SRC_ENABLE(id)				(((id) & 0xf) == 0x1)
+#define PARAM_IS_SRC_GAIN(id)				(((id) & 0xf) == 0x2)
+#define PARAM_IS_DST_ENABLE(id)				(((id) & 0xf) == 0x3)
+#define PARAM_IS_ETC(id)					(((id) & 0xf) == 0x4)
+#define PARAM_IS_MUTE(id)					(((id) & 0xf) == 0x7)
+#define PARAM_IS_GAIN(id)					(((id) & 0xf) == 0x8)
+#define PARAM_IS_BALANCE(id)				(((id) & 0xf) == 0x9)
+
 #if USE_MEDIA_FORMAT_WORKAROUND
-static void 
+static void
 multi_audio_format_specialize(media_multi_audio_format *format,
-								const media_multi_audio_format *other);
+	const media_multi_audio_format *other);
 #endif
 
 #define FORMAT_USER_DATA_TYPE 		0x7294a8f3
 #define FORMAT_USER_DATA_MAGIC_1	0xc84173bd
 #define FORMAT_USER_DATA_MAGIC_2	0x4af62b7d
 
+
 AudioMixer::AudioMixer(BMediaAddOn *addOn, bool isSystemMixer)
-		:	BMediaNode("Audio Mixer"),
-			BBufferConsumer(B_MEDIA_RAW_AUDIO),
-			BBufferProducer(B_MEDIA_RAW_AUDIO),
-			BControllable(),
-			BMediaEventLooper(),
-			fAddOn(addOn),
-			fCore(new MixerCore(this)),
-			fWeb(0),
-			fBufferGroup(0),
-			fDownstreamLatency(1),
-			fInternalLatency(1),
-			fDisableStop(false)
+	: BMediaNode("Audio Mixer"),
+	BBufferConsumer(B_MEDIA_RAW_AUDIO),
+	BBufferProducer(B_MEDIA_RAW_AUDIO),
+	BControllable(),
+	BMediaEventLooper(),
+	fAddOn(addOn),
+	fCore(new MixerCore(this)),
+	fWeb(0),
+	fBufferGroup(0),
+	fDownstreamLatency(1),
+	fInternalLatency(1),
+	fDisableStop(false)
 {
 	BMediaNode::AddNodeKind(B_SYSTEM_MIXER);
 
@@ -67,7 +109,7 @@
 	fDefaultFormat.u.raw_audio.channel_mask = 0;
 	fDefaultFormat.u.raw_audio.valid_bits = 0;
 	fDefaultFormat.u.raw_audio.matrix_mask = 0;
-	
+
 	if (isSystemMixer) {
 		// to get persistent settings, assign a settings file
 		BPath path;
@@ -75,18 +117,19 @@
 			path.SetTo("/boot/home/config/settings/");
 		path.Append("System Audio Mixer");
 		fCore->Settings()->SetSettingsFile(path.Path());
-		
+
 		// disable stop on the auto started (system) mixer
 		DisableNodeStop();
 	}
-	
+
 	ApplySettings();
 }
 
+
 AudioMixer::~AudioMixer()
 {
 	BMediaEventLooper::Quit();
-	SetParameterWeb(NULL); 
+	SetParameterWeb(NULL);
 
 	// stop the mixer
 	fCore->Lock();
@@ -95,13 +138,14 @@
 
 	// disconnect all nodes from the mixer
 	// XXX todo
-	
+
 	delete fCore;
 	delete fBufferGroup;
-	
+
 	DEBUG_ONLY(fCore = 0; fBufferGroup = 0; fWeb = 0);
 }
 
+
 void
 AudioMixer::ApplySettings()
 {
@@ -110,17 +154,19 @@
 	fCore->Unlock();
 }
 
+
 void
 AudioMixer::DisableNodeStop()
 {
 	fDisableStop = true;
 }
 
-//
-// BMediaNode methods
-//
 
-void AudioMixer::Stop(bigtime_t performance_time, bool immediate)
+//	#pragma mark - BMediaNode methods
+
+
+void
+AudioMixer::Stop(bigtime_t performance_time, bool immediate)
 {
 	if (fDisableStop) {
 		TRACE("AudioMixer STOP is disabled\n");
@@ -130,17 +176,18 @@
 	}
 }
 
-BMediaAddOn * 
+
+BMediaAddOn*
 AudioMixer::AddOn(int32 *internal_id) const
 {
 	*internal_id = 0;
 	return fAddOn;
 }
 
-//
-// BBufferConsumer methods
-//
 
+//	#pragma mark - BBufferConsumer methods
+
+
 status_t
 AudioMixer::HandleMessage(int32 message, const void *data, size_t size)
 {
@@ -148,27 +195,28 @@
 	return B_ERROR;
 }
 
+
 status_t
 AudioMixer::AcceptFormat(const media_destination &dest, media_format *ioFormat)
 {
 	PRINT_FORMAT("AudioMixer::AcceptFormat: ", *ioFormat);
 
 	// check that the specified format is reasonable for the specified destination, and
-	// fill in any wildcard fields for which our BBufferConsumer has specific requirements. 
+	// fill in any wildcard fields for which our BBufferConsumer has specific requirements.
 
 	// we have multiple inputs with different IDs, but
 	// the port number must match our ControlPort()
 	if (dest.port != ControlPort())
-		return B_MEDIA_BAD_DESTINATION;	
+		return B_MEDIA_BAD_DESTINATION;
 
 	// specialize to raw audio format if necessary
 	if (ioFormat->type == B_MEDIA_UNKNOWN_TYPE)
 		ioFormat->type = B_MEDIA_RAW_AUDIO;
-	
+
 	// we require a raw audio format
 	if (ioFormat->type != B_MEDIA_RAW_AUDIO)
 		return B_MEDIA_BAD_FORMAT;
-	
+
 	// We do not have special requirements, but just in case
 	// another mixer is connecting to us and may need a hint
 	// to create a connection at optimal frame rate and
@@ -187,11 +235,12 @@
 	return B_OK;
 }
 
+
 status_t
 AudioMixer::GetNextInput(int32 *cookie, media_input *out_input)
 {
 	TRACE("AudioMixer::GetNextInput\n");
-	
+
 	// our 0th input is always a wildcard and free one
 	if (*cookie == 0) {
 		out_input->node = Node();
@@ -219,12 +268,14 @@
 	return B_OK;
 }
 
+
 void
 AudioMixer::DisposeInputCookie(int32 cookie)
 {
 	// nothing to do
 }
 
+
 void
 AudioMixer::BufferReceived(BBuffer *buffer)
 {
@@ -248,9 +299,8 @@
 	// to receive the buffer at the right time,
 	// push it through the event looper
 	media_timed_event event(buffer->Header()->start_time,
-							BTimedEventQueue::B_HANDLE_BUFFER,
-							buffer,
-							BTimedEventQueue::B_RECYCLE_BUFFER);
+		BTimedEventQueue::B_HANDLE_BUFFER, buffer,
+		BTimedEventQueue::B_RECYCLE_BUFFER);
 	EventQueue()->AddEvent(event);
 }
 
@@ -274,7 +324,7 @@
 	*/
 
 	//	printf("Received buffer with lateness %Ld\n", lateness);
-	
+
 	fCore->Lock();
 	fCore->BufferReceived(buffer, lateness);
 	fCore->Unlock();
@@ -289,49 +339,51 @@
 	*/
 }
 
+
 void
-AudioMixer::ProducerDataStatus( const media_destination &for_whom, 
-								int32 status, bigtime_t at_performance_time)
+AudioMixer::ProducerDataStatus(const media_destination& for_whom,
+	int32 status, bigtime_t at_performance_time)
 {
-/*	
+/*
 	if (IsValidDest(for_whom))
 	{
 		media_timed_event event(at_performance_time, BTimedEventQueue::B_DATA_STATUS,
 			(void *)(&for_whom), BTimedEventQueue::B_NO_CLEANUP, status, 0, NULL);
 		EventQueue()->AddEvent(event);
-		
+
 		// FIX_THIS
 		// the for_whom destination is not being sent correctly - verify in HandleEvent loop
-		
+
 	}
 */
 }
 
+
 status_t
 AudioMixer::GetLatencyFor(const media_destination &for_whom,
-						  bigtime_t *out_latency,
-						  media_node_id *out_timesource)
+	bigtime_t *out_latency, media_node_id *out_timesource)
 {
 	// we have multiple inputs with different IDs, but
 	// the port number must match our ControlPort()
 	if (for_whom.port != ControlPort())
-		return B_MEDIA_BAD_DESTINATION;	
-		
-	// return our event latency - this includes our internal + downstream 
+		return B_MEDIA_BAD_DESTINATION;
+
+	// return our event latency - this includes our internal + downstream
 	// latency, but _not_ the scheduling latency
 	*out_latency = EventLatency();
 	*out_timesource = TimeSource()->ID();
 
-	printf("AudioMixer::GetLatencyFor %Ld, timesource is %ld\n", 
-							*out_latency,
-							*out_timesource);
+	printf("AudioMixer::GetLatencyFor %Ld, timesource is %ld\n",
+		*out_latency, *out_timesource);
 
 	return B_OK;
 }
 
+
 status_t
-AudioMixer::Connected(const media_source &producer, const media_destination &where,
-					  const media_format &with_format, media_input *out_input)
+AudioMixer::Connected(const media_source &producer,
+	const media_destination &where, const media_format &with_format,
+	media_input *out_input)
 {
 	PRINT_FORMAT("AudioMixer::Connected: ", with_format);
 
@@ -339,32 +391,33 @@
 	// BBufferProducer::PrepareToConnect() should have removed all wildcards.
 	if (out_input->format.u.raw_audio.frame_rate == 0) {
 		fprintf(stderr, "Audio Mixer Warning: "
-					"Producer (port %ld, id %ld) connected with frame_rate=0\n",
-					producer.port,
-					producer.id);
+			"Producer (port %ld, id %ld) connected with frame_rate=0\n",
+			producer.port, producer.id);
 		MixerOutput *output = fCore->Output();
-		float frame_rate = output ? output->MediaOutput().format.u.raw_audio.frame_rate : 44100.0f;
+		float frame_rate = output
+			? output->MediaOutput().format.u.raw_audio.frame_rate : 44100.0f;
 		out_input->format.u.raw_audio.frame_rate = frame_rate;
 	}
-	
+
 	// a BBufferProducer is connecting to our BBufferConsumer
-			
+
 	// incoming connections should always have an incoming ID=0,
 	// and the port number must match our ControlPort()
 	if (where.id != 0 || where.port != ControlPort())
 		return B_MEDIA_BAD_DESTINATION;
-	
+
 	fCore->Lock();
-	
+
 	// we assign a new id (!= 0) to the newly created input
 	out_input->destination.id = fCore->CreateInputID();
 
-	// We need to make sure that the outInput's name field contains a valid name,
-	// the name given the connection by the producer may still be an empty string.
+	// We need to make sure that the outInput's name field contains a valid
+	// name, the name given the connection by the producer may still be an
+	// empty string.
 	// if the input has no name, assign one
 	if (strlen(out_input->name) == 0)
 		sprintf(out_input->name, "Input %ld", out_input->destination.id);
-	
+
 	// add a new input to the mixer engine
 	MixerInput *input;
 	input = fCore->AddInput(*out_input);
@@ -372,9 +425,10 @@
 	fCore->Settings()->LoadConnectionSettings(input);
 
 	fCore->Unlock();
-	
-	// If we want the producer to use a specific BBufferGroup, we now need to call
-	// BMediaRoster::SetOutputBuffersFor() here to set the producer's buffer group.
+
+	// If we want the producer to use a specific BBufferGroup, we now need
+	// to call BMediaRoster::SetOutputBuffersFor() here to set the producer's
+	// buffer group.
 	// But we have no special buffer requirements anyway...
 
 	UpdateParameterWeb();
@@ -382,8 +436,10 @@
 	return B_OK;
 }
 
+
 void
-AudioMixer::Disconnected(const media_source &producer, const media_destination &where)
+AudioMixer::Disconnected(const media_source &producer,
+	const media_destination &where)
 {
 	// One of our inputs has been disconnected
 
@@ -392,20 +448,22 @@
 		TRACE("AudioMixer::Disconnected wrong input port\n");
 		return;
 	}
-	
+
 	fCore->Lock();
-	
+
 	if (!fCore->RemoveInput(where.id)) {
 		TRACE("AudioMixer::Disconnected can't remove input\n");
 	}
-	
+
 	fCore->Unlock();
 	UpdateParameterWeb();
 }
 
+
 status_t
-AudioMixer::FormatChanged(const media_source &producer, const media_destination &consumer, 
-						  int32 change_tag, const media_format &format)
+AudioMixer::FormatChanged(const media_source &producer,
+	const media_destination &consumer, int32 change_tag,
+	const media_format &format)
 {
 	// at some point in the future (indicated by change_tag and RequestCompleted()),
 	// we will receive buffers in a different format
@@ -419,26 +477,27 @@
 		TRACE("AudioMixer::FormatChanged: input format change refused\n");
 		return B_ERROR;
 	}
-	
+
 	// XXX we should not apply the format change at this point
 
 	// tell core about format change
 	fCore->Lock();
 	fCore->InputFormatChanged(consumer.id, format.u.raw_audio);
 	fCore->Unlock();
-	
+
 	return B_OK;
 }
 
-//
-// BBufferProducer methods
-//
 
+//	#pragma mark - BBufferProducer methods
+
+
 status_t
-AudioMixer::FormatSuggestionRequested(media_type type, int32 quality, media_format *format)
+AudioMixer::FormatSuggestionRequested(media_type type, int32 quality,
+	media_format *format)
 {
 	TRACE("AudioMixer::FormatSuggestionRequested\n");
-	
+
 	// BBufferProducer function, a downstream consumer
 	// is asking for our output format
 
@@ -451,6 +510,7 @@
 	return B_OK;
 }
 
+
 status_t
 AudioMixer::FormatProposal(const media_source &output, media_format *ioFormat)
 {
@@ -460,7 +520,7 @@
 	// those fields to match our requirements before returning.
 
 	TRACE("AudioMixer::FormatProposal\n");
-	
+
 	// we only have one output (id=0, port=ControlPort())
 	if (output.id != 0 || output.port != ControlPort())
 		return B_MEDIA_BAD_SOURCE;
@@ -468,7 +528,7 @@
 	// specialize to raw audio format if necessary
 	if (ioFormat->type == B_MEDIA_UNKNOWN_TYPE)
 		ioFormat->type = B_MEDIA_RAW_AUDIO;
-	
+
 	// we require a raw audio format
 	if (ioFormat->type != B_MEDIA_RAW_AUDIO)
 		return B_MEDIA_BAD_FORMAT;
@@ -476,19 +536,21 @@
 	return B_OK;
 }
 
-//	If the format isn't good, put a good format into *io_format and return error
-//	If format has wildcard, specialize to what you can do (and change).
-//	If you can change the format, return OK.
-//	The request comes from your destination sychronously, so you cannot ask it
-//	whether it likes it -- you should assume it will since it asked.
+/*!	If the format isn't good, put a good format into *io_format and return error
+	If format has wildcard, specialize to what you can do (and change).
+	If you can change the format, return OK.
+	The request comes from your destination sychronously, so you cannot ask it
+	whether it likes it -- you should assume it will since it asked.
+*/
 status_t
-AudioMixer::FormatChangeRequested(const media_source &source, const media_destination &destination, 
-								  media_format *io_format, int32 *_deprecated_)
+AudioMixer::FormatChangeRequested(const media_source &source,
+	const media_destination &destination, media_format *io_format,
+	int32 *_deprecated_)
 {
 	// the downstream consumer node (soundcard) requested that we produce
 	// another format, we need to check if the format is acceptable and
 	// remove any wildcards before returning OK.
-	
+
 	TRACE("AudioMixer::FormatChangeRequested\n");
 
 	if (fCore->Settings()->RefuseOutputFormatChange()) {
@@ -508,26 +570,31 @@
 		goto err;
 	}
 	if (destination != output->MediaOutput().destination) {
-		ERROR("AudioMixer::FormatChangeRequested: wrong output destination (port %ld, id %ld), our is (port %ld, id %ld)\n", destination.port, destination.id, output->MediaOutput().destination.port, output->MediaOutput().destination.id);
-		if (destination.port == output->MediaOutput().destination.port && destination.id == output->MediaOutput().destination.id + 1) {
-			ERROR("AudioMixer::FormatChangeRequested: this might be the broken R5 multi audio add-on\n");
-			goto err;
-		} else {
-			goto err;
+		ERROR("AudioMixer::FormatChangeRequested: wrong output destination "
+			"(port %ld, id %ld), our is (port %ld, id %ld)\n", destination.port,
+			destination.id, output->MediaOutput().destination.port,
+			output->MediaOutput().destination.id);
+		if (destination.port == output->MediaOutput().destination.port
+			&& destination.id == output->MediaOutput().destination.id + 1) {
+			ERROR("AudioMixer::FormatChangeRequested: this might be the broken "
+				"R5 multi audio add-on\n");
 		}
+		goto err;
 	}
-	if (io_format->type != B_MEDIA_RAW_AUDIO && io_format->type != B_MEDIA_UNKNOWN_TYPE) {
+	if (io_format->type != B_MEDIA_RAW_AUDIO
+		&& io_format->type != B_MEDIA_UNKNOWN_TYPE) {
 		ERROR("AudioMixer::FormatChangeRequested: wrong format type\n");
 		goto err;
 	}
-	
+
 	/* remove wildcards */
-	#if USE_MEDIA_FORMAT_WORKAROUND
-		multi_audio_format_specialize(&io_format->u.raw_audio, &fDefaultFormat.u.raw_audio);
-	#else 
-		io_format->SpecializeTo(&fDefaultFormat);
-	#endif
-	
+#if USE_MEDIA_FORMAT_WORKAROUND
+	multi_audio_format_specialize(&io_format->u.raw_audio,
+		&fDefaultFormat.u.raw_audio);
+#else
+	io_format->SpecializeTo(&fDefaultFormat);
+#endif
+
 	media_node_id id;
 	FindLatencyFor(destination, &fDownstreamLatency, &id);
 	TRACE("AudioMixer: Downstream Latency is %Ld usecs\n", fDownstreamLatency);
@@ -537,16 +604,18 @@
 	TRACE("AudioMixer: buffer duration is %Ld usecs\n", BufferDuration());
 
 	// Our internal latency is at least the length of a full output buffer
-	fInternalLatency = BufferDuration() + max(4500LL, bigtime_t(0.5 * BufferDuration()));
+	fInternalLatency = BufferDuration()
+		+ max(4500LL, bigtime_t(0.5 * BufferDuration()));
 	TRACE("AudioMixer: Internal latency is %Ld usecs\n", fInternalLatency);
-	
+
 	SetEventLatency(fDownstreamLatency + fInternalLatency);
-	
+
 	// we need to inform all connected *inputs* about *our* change in latency
 	PublishEventLatencyChange();
-	
-	// XXX we might need to create more buffers, to span a larger downstream latency
 
+	// TODO: we might need to create more buffers, to span a larger downstream
+	// latency
+
 	// apply latency change
 	fCore->SetTimingInfo(TimeSource(), fDownstreamLatency);
 
@@ -559,13 +628,14 @@
 
 	fCore->Unlock();
 	return B_OK;
-	
+
 err:
 	fCore->Unlock();
 	return B_ERROR;
 }
 
-status_t 
+
+status_t
 AudioMixer::GetNextOutput(int32 *cookie, media_output *out_output)
 {
 	TRACE("AudioMixer::GetNextOutput\n");
@@ -592,15 +662,18 @@
 	return B_OK;
 }
 
-status_t 
+
+status_t
 AudioMixer::DisposeOutputCookie(int32 cookie)
 {
 	// nothing to do
 	return B_OK;
 }
 
-status_t 
-AudioMixer::SetBufferGroup(const media_source &for_source, BBufferGroup *newGroup)
+
+status_t
+AudioMixer::SetBufferGroup(const media_source &for_source,
+	BBufferGroup *newGroup)
 {
 	PRINT("AudioMixer::SetBufferGroup\n");
 	// the downstream consumer (soundcard) node asks us to use another
@@ -612,7 +685,7 @@
 		// we're already using this buffergroup
 		return B_OK;
 	}
-	
+
 	fCore->Lock();
 	if (!newGroup)
 		newGroup = CreateBufferGroup();
@@ -624,6 +697,7 @@
 	return B_OK;
 }
 
+
 status_t
 AudioMixer::GetLatency(bigtime_t *out_latency)
 {
@@ -635,17 +709,20 @@
 	return B_OK;
 }
 
+
 void
-AudioMixer::LatencyChanged(const media_source & source, const media_destination & destination,
-						   bigtime_t new_latency, uint32 flags)
+AudioMixer::LatencyChanged(const media_source& source,
+	const media_destination& destination, bigtime_t new_latency, uint32 flags)
 {
 	if (source.port != ControlPort() || source.id != 0) {
-		ERROR("AudioMixer::LatencyChanged: received but has wrong source %ld/%ld\n", source.port, source.id);
+		ERROR("AudioMixer::LatencyChanged: received but has wrong source "
+			"%ld/%ld\n", source.port, source.id);
 		return;
 	}
 
-	TRACE("AudioMixer::LatencyChanged: downstream latency from %ld/%ld to %ld/%ld changed from %Ld to %Ld\n",
-		source.port, source.id, destination.port, destination.id, fDownstreamLatency, new_latency);
+	TRACE("AudioMixer::LatencyChanged: downstream latency from %ld/%ld to "
+		"%ld/%ld changed from %Ld to %Ld\n", source.port, source.id,
+		destination.port, destination.id, fDownstreamLatency, new_latency);
 
 #if DEBUG
 	{
@@ -659,8 +736,9 @@
 	fDownstreamLatency = new_latency;
 	SetEventLatency(fDownstreamLatency + fInternalLatency);
 
-	// XXX we might need to create more buffers, to span a larger downstream latency
-	
+	// XXX we might need to create more buffers, to span a larger downstream
+	// latency
+
 	fCore->Lock();
 	fCore->SetTimingInfo(TimeSource(), fDownstreamLatency);
 	PublishEventLatencyChange();
@@ -668,17 +746,16 @@
 }
 
 status_t
-AudioMixer::PrepareToConnect(const media_source &what, 
-								const media_destination &where,
-								media_format *format, 
-								media_source *out_source,
-								char *out_name)
+AudioMixer::PrepareToConnect(const media_source &what,
+	const media_destination &where, media_format *format,
+	media_source *out_source, char *out_name)
 {
 	TRACE("AudioMixer::PrepareToConnect\n");
-	// PrepareToConnect() is the second stage of format negotiations that happens
-	// inside BMediaRoster::Connect(). At this point, the consumer's AcceptFormat()
-	// method has been called, and that node has potentially changed the proposed
-	// format. It may also have left wildcards in the format. PrepareToConnect()
+	// PrepareToConnect() is the second stage of format negotiations that
+	// happens inside BMediaRoster::Connect(). At this point, the consumer's
+	// AcceptFormat() method has been called, and that node has potentially
+	// changed the proposed format.
+	// It may also have left wildcards in the format. PrepareToConnect()
 	// *must* fully specialize the format before returning!
 	// we also create the new output connection and return it in out_source.
 
@@ -693,7 +770,8 @@
 		return B_MEDIA_BAD_SOURCE;
 
 	// is the format acceptable?
-	if (format->type != B_MEDIA_RAW_AUDIO && format->type != B_MEDIA_UNKNOWN_TYPE) {
+	if (format->type != B_MEDIA_RAW_AUDIO
+		&& format->type != B_MEDIA_UNKNOWN_TYPE) {
 		PRINT_FORMAT("AudioMixer::PrepareToConnect: bad format", *format);
 		return B_MEDIA_BAD_FORMAT;
 	}
@@ -732,14 +810,23 @@
 			media_output out;
 			media_input in;
 			int32 count;
-			if (B_OK == roster->GetAudioMixer(&node) && B_OK == roster->GetConnectedOutputsFor(node, &out, 1, &count) && count == 1) {
+			if (roster->GetAudioMixer(&node) == B_OK
+				&& roster->GetConnectedOutputsFor(node, &out, 1, &count)
+						== B_OK
+				&& count == 1) {
 				// use mixer output format
-				format->u.raw_audio.channel_count = out.format.u.raw_audio.channel_count;
-				format->u.raw_audio.frame_rate = out.format.u.raw_audio.frame_rate;
-			} else if (B_OK == roster->GetAudioOutput(&node) && B_OK == roster->GetAllInputsFor(node, &in, 1, &count) && count == 1) {
+				format->u.raw_audio.channel_count
+					= out.format.u.raw_audio.channel_count;
+				format->u.raw_audio.frame_rate
+					= out.format.u.raw_audio.frame_rate;
+			} else if (roster->GetAudioOutput(&node) == B_OK
+				&& roster->GetAllInputsFor(node, &in, 1, &count) == B_OK
+				&& count == 1) {
 				// use DAC input format
-				format->u.raw_audio.channel_count = in.format.u.raw_audio.channel_count;
-				format->u.raw_audio.frame_rate = in.format.u.raw_audio.frame_rate;
+				format->u.raw_audio.channel_count
+					= in.format.u.raw_audio.channel_count;
+				format->u.raw_audio.frame_rate
+					= in.format.u.raw_audio.frame_rate;
 			}
 		}
 	}
@@ -749,22 +836,23 @@
 	strcpy(out_name, "Mixer Output");
 
 	/* remove wildcards */
-	#if USE_MEDIA_FORMAT_WORKAROUND
-		multi_audio_format_specialize(&format->u.raw_audio, &fDefaultFormat.u.raw_audio);
-	#else 
-		format->SpecializeTo(&fDefaultFormat);
-	#endif
+#if USE_MEDIA_FORMAT_WORKAROUND
+	multi_audio_format_specialize(&format->u.raw_audio,
+		&fDefaultFormat.u.raw_audio);
+#else
+	format->SpecializeTo(&fDefaultFormat);
+#endif
 
 	PRINT_FORMAT("AudioMixer::PrepareToConnect: final format", *format);
 
-	/* add output to core */	
+	/* add output to core */
 	media_output output;
 	output.node = Node();
 	output.source = *out_source;
 	output.destination = where;
 	output.format = *format;
 	strcpy(output.name, out_name);
-	
+
 	fCore->EnableOutput(false);
 	fCore->AddOutput(output);
 
@@ -772,11 +860,10 @@
 	return B_OK;
 }
 
-void 
-AudioMixer::Connect(status_t error, const media_source &source, 
-					const media_destination &dest, 
-					const media_format &format,
-					char *io_name)
+
+void
+AudioMixer::Connect(status_t error, const media_source &source,
+	const media_destination &dest, const media_format &format, char *io_name)
 {
 	TRACE("AudioMixer::Connect\n");
 
@@ -791,7 +878,8 @@
 
 	if (error != B_OK) {
 		// if an error occured, remove output from core
-		ERROR("AudioMixer::Connect failed with error 0x%08lX, removing connection\n", error);
+		ERROR("AudioMixer::Connect failed with error 0x%08lX, removing "
+			"connection\n", error);
 		fCore->Lock();
 		fCore->RemoveOutput();
 		fCore->Unlock();
@@ -807,7 +895,7 @@
 	// if the connection has no name, we set it now
 	if (strlen(io_name) == 0)
 		strcpy(io_name, "Mixer Output");
-		
+
 	// Now that we're connected, we can determine our downstream latency.
 	media_node_id id;
 	FindLatencyFor(dest, &fDownstreamLatency, &id);
@@ -818,29 +906,30 @@
 	TRACE("AudioMixer: buffer duration is %Ld usecs\n", BufferDuration());
 
 	// Our internal latency is at least the length of a full output buffer
-	fInternalLatency = BufferDuration() + max(4500LL, bigtime_t(0.5 * BufferDuration()));
+	fInternalLatency = BufferDuration()
+		+ max(4500LL, bigtime_t(0.5 * BufferDuration()));
 	TRACE("AudioMixer: Internal latency is %Ld usecs\n", fInternalLatency);
-	
+
 	SetEventLatency(fDownstreamLatency + fInternalLatency);
-	
+
 	// we need to inform all connected *inputs* about *our* change in latency
 	PublishEventLatencyChange();
 
-	// Set up the buffer group for our connection, as long as nobody handed us a
-	// buffer group (via SetBufferGroup()) prior to this.  That can happen, for example,
-	// if the consumer calls SetOutputBuffersFor() on us from within its Connected()
-	// method.
+	// Set up the buffer group for our connection, as long as nobody handed
+	// us a buffer group (via SetBufferGroup()) prior to this.  That can
+	// happen, for example, if the consumer calls SetOutputBuffersFor() on
+	// us from within its Connected() method.
 	if (!fBufferGroup)
 		fBufferGroup = CreateBufferGroup();
 
 	fCore->Lock();
 
 	ASSERT(fCore->Output() != 0);
-	
+
 	// our source should still be valid, too
 	ASSERT(fCore->Output()->MediaOutput().source.id == 0);
 	ASSERT(fCore->Output()->MediaOutput().source.port == ControlPort());
-	
+
 	// BBufferConsumer::Connected() may return a different input for the
 	// newly created connection. The destination can have changed since
 	// AudioMixer::PrepareToConnect() and we need to update it.
@@ -849,14 +938,14 @@
 	fCore->EnableOutput(true);
 	fCore->SetTimingInfo(TimeSource(), fDownstreamLatency);
 	fCore->SetOutputBufferGroup(fBufferGroup);
-	
+
 	fCore->Settings()->LoadConnectionSettings(fCore->Output());
 
 	fCore->Unlock();
 	UpdateParameterWeb();
 }
 
-void 
+void
 AudioMixer::Disconnect(const media_source &what, const media_destination &where)
 {
 	TRACE("AudioMixer::Disconnect\n");
@@ -864,7 +953,10 @@
 
 	// Make sure that our connection is the one being disconnected
 	MixerOutput * output = fCore->Output();
-	if (!output || output->MediaOutput().node != Node() || output->MediaOutput().source != what || output->MediaOutput().destination != where) {
+	if (!output
+		|| output->MediaOutput().node != Node()
+		|| output->MediaOutput().source != what
+		|| output->MediaOutput().destination != where) {
 		ERROR("AudioMixer::Disconnect can't disconnect (wrong connection)\n");
 		fCore->Unlock();
 		return;
@@ -874,32 +966,34 @@
 	// frame rate and channel count.
 	fDefaultFormat.u.raw_audio.frame_rate = 96000;
 	fDefaultFormat.u.raw_audio.channel_count = 2;
-	
+
 	// force a stop
 	fCore->Stop();
-	
+
 	fCore->RemoveOutput();
 
 	// destroy buffer group
 	delete fBufferGroup;
 	fBufferGroup = 0;
 	fCore->SetOutputBufferGroup(0);
-	
+
 	fCore->Unlock();
 	UpdateParameterWeb();
 }
 
 
-void 
-AudioMixer::LateNoticeReceived(const media_source &what, bigtime_t how_much, bigtime_t performance_time)
+void
+AudioMixer::LateNoticeReceived(const media_source &what, bigtime_t how_much,
+	bigtime_t performance_time)
 {
-	// We've produced some late buffers... Increase Latency 
+	// We've produced some late buffers... Increase Latency
 	// is the only runmode in which we can do anything about this
 
-	ERROR("AudioMixer::LateNoticeReceived, %Ld too late at %Ld\n", how_much, performance_time);
+	ERROR("AudioMixer::LateNoticeReceived, %Ld too late at %Ld\n", how_much,
+		performance_time);
 	// Note: The following code is outcommented on purpose
 	// and is about to be modified at a later point
-	/*	
+	/*
 	if (what == fOutput.source) {
 		if (RunMode() == B_INCREASE_LATENCY) {
 			fInternalLatency += how_much;
@@ -909,7 +1003,7 @@
 
 			printf("AudioMixer: increasing internal latency to %Ld usec\n", fInternalLatency);
 			SetEventLatency(fDownstreamLatency + fInternalLatency);
-			
+
 			PublishEventLatencyChange();
 		}
 	}
@@ -917,23 +1011,23 @@
 }
 
 
-void 
-AudioMixer::EnableOutput(const media_source &what, bool enabled, int32 *_deprecated_)
+void
+AudioMixer::EnableOutput(const media_source &what, bool enabled,
+	int32 *_deprecated_)
 {
 	// we only have one output
 	if (what.id != 0 || what.port != ControlPort())
 		return;
-		
+
 	fCore->Lock();
 	fCore->EnableOutput(enabled);
 	fCore->Unlock();
 }
 
 
-//
-// BMediaEventLooper methods
-//
+//	#pragma mark - BMediaEventLooper methods
 
+
 void
 AudioMixer::NodeRegistered()
 {
@@ -942,21 +1036,23 @@
 	UpdateParameterWeb();
 }
 
+
 void
 AudioMixer::SetTimeSource(BTimeSource * time_source)
 {
-	TRACE("AudioMixer::SetTimeSource: timesource is now %ld\n", time_source->ID());
+	TRACE("AudioMixer::SetTimeSource: timesource is now %ld\n",
+		time_source->ID());
 	fCore->Lock();
 	fCore->SetTimingInfo(time_source, fDownstreamLatency);
 	fCore->Unlock();
 }
 

[... truncated: 398 lines follow ...]


From stippi at mail.berlios.de  Thu Apr  9 19:54:08 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Thu, 9 Apr 2009 19:54:08 +0200
Subject: [Haiku-commits] r30075 - haiku/trunk/src/kits/interface
Message-ID: <200904091754.n39Hs86O008806@sheep.berlios.de>

Author: stippi
Date: 2009-04-09 19:54:01 +0200 (Thu, 09 Apr 2009)
New Revision: 30075
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30075&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
Improve the word wrapping a bit. This should eventually use the LocalKit when
it's ready. For now, I just tried to fix stuff like breaking before
punctuations. I had trouble wrapping my mind around the wrapping code, so I
didn't include as much cases as I wanted. Basically, the wrapping code assumes
that a spot where CanEndLine() returns true must be a white space character,
which wouldn't be the case.


Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-04-09 17:22:00 UTC (rev 30074)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-04-09 17:54:01 UTC (rev 30075)
@@ -100,7 +100,9 @@
 
 enum {
 	B_SEPARATOR_CHARACTER,
-	B_OTHER_CHARACTER
+	B_PUNCTUATION_CHARACTER,
+	B_OTHER_CHARACTER,
+	B_END_OF_TEXT
 };
 
 
@@ -1953,8 +1955,35 @@
 bool
 BTextView::CanEndLine(int32 offset)
 {
-	// TODO: Could be improved, the bebook says there are other checks to do
-	return (_CharClassification(offset) == B_SEPARATOR_CHARACTER);
+	// TODO: This has to be improved a lot, but also the wrapping code.
+	// It should use the forthcomming LocalKit.
+	uint32 classification = _CharClassification(offset);
+	if (classification == B_END_OF_TEXT
+		|| classification == B_SEPARATOR_CHARACTER) {
+		return true;
+	}
+
+	uint32 nextClassification = _CharClassification(offset + 1);
+	if (nextClassification == B_END_OF_TEXT)
+		return true;
+
+	if (classification == B_PUNCTUATION_CHARACTER
+		&& nextClassification == B_OTHER_CHARACTER) {
+		return true;
+	}
+
+// TODO: This cannot be enabled, since the wrapping code things the char
+// is a trailing space or something. Otherwise it would allow to treat
+// something like "..." as a word.
+//	uint32 nextNextClassification = _CharClassification(offset + 2);
+//
+//	if (classification == B_OTHER_CHARACTER
+//		&& nextClassification == B_PUNCTUATION_CHARACTER
+//		&& nextClassification == nextNextClassification) {
+//		return true;
+//	}
+
+	return false;
 }
 
 
@@ -3679,9 +3708,9 @@
 
 	int32 offset = fromOffset;
 
-	// Text wrapping is turned off.
-	// Just find the offset of the first \n character
 	if (!fWrap) {
+		// Text wrapping is turned off.
+		// Just find the offset of the first \n character
 		offset = limit - fromOffset;
 		fText->FindChar(B_ENTER, fromOffset, &offset);
 		offset += fromOffset;
@@ -4823,16 +4852,17 @@
 uint32
 BTextView::_CharClassification(int32 offset) const
 {
-	// TODO:Should check against a list of characters containing also
+	// TODO: Should check against a list of characters containing also
 	// japanese word breakers.
 	// And what about other languages ? Isn't there a better way to check
 	// for separator characters ?
 	// Andrew suggested to have a look at UnicodeBlockObject.h
 	switch (fText->RealCharAt(offset)) {
+		case '\0':
+			return B_END_OF_TEXT;
+
 		case B_SPACE:
 		case '_':
-		case '.':
-		case '\0':
 		case B_TAB:
 		case B_ENTER:
 		case '&':
@@ -4847,6 +4877,11 @@
 		case '^':
 		case '|':
 			return B_SEPARATOR_CHARACTER;
+
+		case '.':
+		case ',':
+			return B_PUNCTUATION_CHARACTER;
+
 		default:
 			return B_OTHER_CHARACTER;
 	}



From stippi at mail.berlios.de  Thu Apr  9 20:29:57 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Thu, 9 Apr 2009 20:29:57 +0200
Subject: [Haiku-commits] r30076 - haiku/trunk/src/kits/interface
Message-ID: <200904091829.n39ITvFN030806@sheep.berlios.de>

Author: stippi
Date: 2009-04-09 20:29:55 +0200 (Thu, 09 Apr 2009)
New Revision: 30076
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30076&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
Should fix the problems with dirty selection left-overs when editing and also
other situations. Basically, I made DeleteText() adjust the selection according
to the deleted range. Some places where DeleteText() was called forgot to
adopt the selection. Other places adopted the selection. Maybe some of those
could be removed now, but some also change fClickOffset, so I just left them
as they are.


Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-04-09 17:54:01 UTC (rev 30075)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-04-09 18:29:55 UTC (rev 30076)
@@ -3037,6 +3037,28 @@
 
 	// remove any style runs that have been obliterated
 	fStyles->RemoveStyleRange(fromOffset, toOffset);
+
+	// adjust the selection accordingly, assumes fSelEnd >= fSelStart!
+	int32 range = toOffset - fromOffset;
+	if (fSelStart >= toOffset) {
+		// selection is behind the range that was removed
+		fSelStart -= range;
+		fSelEnd -= range;
+	} else if (fSelStart >= fromOffset && fSelEnd <= toOffset) {
+		// the selection is within the range that was removed
+		fSelStart = fSelEnd = fromOffset;
+	} else if (fSelStart >= fromOffset && fSelEnd > toOffset) {
+		// the selection starts within and ends after the range
+		// the remaining part is the part that was after the range
+		fSelStart = fromOffset;
+		fSelEnd = fromOffset + fSelEnd - toOffset;
+	} else if (fSelStart < fromOffset && fSelEnd < toOffset) {
+		// the selection starts before, but ends within the range
+		fSelEnd = fromOffset;
+	} else if (fSelStart < fromOffset && fSelEnd >= toOffset) {
+		// the selection starts before and ends after the range
+		fSelEnd -= range;
+	}
 }
 
 
@@ -3341,7 +3363,6 @@
 		Highlight(fSelStart, fSelEnd);
 
 	DeleteText(fSelStart, fSelEnd);
-
 	fClickOffset = fSelEnd = fSelStart;
 
 	_Refresh(fSelStart, fSelEnd, true, true);



From axeld at mail.berlios.de  Thu Apr  9 21:13:09 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 21:13:09 +0200
Subject: [Haiku-commits] r30077 - haiku/trunk/src/servers/media
Message-ID: <200904091913.n39JD9Pu002847@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 21:13:07 +0200 (Thu, 09 Apr 2009)
New Revision: 30077
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30077&view=rev

Modified:
   haiku/trunk/src/servers/media/NodeManager.h
   haiku/trunk/src/servers/media/NotificationManager.cpp
   haiku/trunk/src/servers/media/NotificationManager.h
Log:
* Made the NotificationManager.h header self contained.
* Changed some members to be part of the NotificationManager instead of
  allocated objects.
* Use BAutolock where appropriate.
* Cleanup.


Modified: haiku/trunk/src/servers/media/NodeManager.h
===================================================================
--- haiku/trunk/src/servers/media/NodeManager.h	2009-04-09 18:29:55 UTC (rev 30076)
+++ haiku/trunk/src/servers/media/NodeManager.h	2009-04-09 19:13:07 UTC (rev 30077)
@@ -2,13 +2,14 @@
  * Copyright 2002, Marcus Overhagen. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
+
 #include "TList.h"
 #include "TMap.h"
 #include "TStack.h"
 #include "DataExchange.h"
 
-struct registered_node
-{
+
+struct registered_node {
 	media_node_id nodeid;
 	media_addon_id addon_id;
 	int32 addon_flavor_id;
@@ -23,8 +24,7 @@
 	List<media_output> outputlist;
 };
 
-struct dormant_addon_flavor_info
-{
+struct dormant_addon_flavor_info {
 	media_addon_id AddonID;
 	int32 AddonFlavorID;	
 
@@ -40,8 +40,7 @@
 class DefaultManager;
 class BufferManager;
 
-class NodeManager
-{
+class NodeManager {
 public:
 	NodeManager();
 	~NodeManager();

Modified: haiku/trunk/src/servers/media/NotificationManager.cpp
===================================================================
--- haiku/trunk/src/servers/media/NotificationManager.cpp	2009-04-09 18:29:55 UTC (rev 30076)
+++ haiku/trunk/src/servers/media/NotificationManager.cpp	2009-04-09 19:13:07 UTC (rev 30077)
@@ -27,103 +27,108 @@
  *
  */
 
-#include <OS.h>
+#include "NotificationManager.h"
+
+#include <Autolock.h>
 #include <Locker.h>
-#include <Autolock.h>
 #include <Message.h>
-#include <Messenger.h>
-#include <MediaNode.h>
+#include <OS.h>
+
+#include "DataExchange.h"
 #include "debug.h"
+#include "media_server.h"
 #include "NodeManager.h"
-#include "DataExchange.h"
 #include "Notifications.h"
-#include "NotificationManager.h"
-#include "media_server.h"
-#include "Queue.h"
 
 
 #define NOTIFICATION_THREAD_PRIORITY 19
 #define TIMEOUT 100000
 
+
 NotificationManager::NotificationManager()
- :	fNotificationQueue(new Queue),
+	:
 	fNotificationThreadId(-1),
-	fLocker(new BLocker("notification manager locker")),
-	fNotificationList(new List<Notification>)
+	fLocker("notification manager locker")
 {
-	fNotificationThreadId = spawn_thread(NotificationManager::worker_thread, "notification broadcast", NOTIFICATION_THREAD_PRIORITY, this);
+	fNotificationThreadId = spawn_thread(NotificationManager::worker_thread,
+		"notification broadcast", NOTIFICATION_THREAD_PRIORITY, this);
 	resume_thread(fNotificationThreadId);
 }
 
+
 NotificationManager::~NotificationManager()
 {
 	// properly terminate the queue and wait until the worker thread has finished
+	fNotificationQueue.Terminate();
+
 	status_t dummy;
-	fNotificationQueue->Terminate();
 	wait_for_thread(fNotificationThreadId, &dummy);
-	delete fNotificationQueue;
-	delete fLocker;
-	delete fNotificationList;
 }
 
+
 void
 NotificationManager::EnqueueMessage(BMessage *msg)
 {
 	// queue a copy of the message to be processed later
-	fNotificationQueue->AddItem(new BMessage(*msg));
+	fNotificationQueue.AddItem(new BMessage(*msg));
 }
 
+
 void
 NotificationManager::RequestNotifications(BMessage *msg)
 {
 	BMessenger messenger;
 	const media_node *node;
-	ssize_t nodesize;
+	ssize_t nodeSize;
 	team_id team;
 	int32 what;
 
 	msg->FindMessenger(NOTIFICATION_PARAM_MESSENGER, &messenger);
 	msg->FindInt32(NOTIFICATION_PARAM_TEAM, &team);
 	msg->FindInt32(NOTIFICATION_PARAM_WHAT, &what);
-	msg->FindData("node", B_RAW_TYPE, reinterpret_cast<const void **>(&node), &nodesize);
-	ASSERT(nodesize == sizeof(media_node));
+	msg->FindData("node", B_RAW_TYPE, reinterpret_cast<const void **>(&node),
+		&nodeSize);
+	ASSERT(nodeSize == sizeof(media_node));
 
 	Notification n;
 	n.messenger = messenger;
 	n.node = *node;
 	n.what = what;
 	n.team = team;
-	
-	TRACE("NotificationManager::RequestNotifications node %ld, team %ld, what %#lx\n",node->node, team, what);
 
-	fLocker->Lock();
-	fNotificationList->Insert(n);
-	fLocker->Unlock();
+	TRACE("NotificationManager::RequestNotifications node %ld, team %ld, "
+		"what %#lx\n",node->node, team, what);
 
+	fLocker.Lock();
+	fNotificationList.Insert(n);
+	fLocker.Unlock();
+
 	// send the initial B_MEDIA_NODE_CREATED containing all existing live nodes
 	BMessage initmsg(B_MEDIA_NODE_CREATED);
-	if (B_OK == gNodeManager->GetLiveNodes(&initmsg)) {
+	if (gNodeManager->GetLiveNodes(&initmsg) == B_OK)
 		messenger.SendMessage(&initmsg, static_cast<BHandler *>(NULL), TIMEOUT);
-	}
 }
 
+
 void
 NotificationManager::CancelNotifications(BMessage *msg)
 {
 	BMessenger messenger;
 	const media_node *node;
-	ssize_t nodesize;
+	ssize_t nodeSize;
 	team_id team;
 	int32 what;
 
 	msg->FindMessenger(NOTIFICATION_PARAM_MESSENGER, &messenger);
 	msg->FindInt32(NOTIFICATION_PARAM_TEAM, &team);
 	msg->FindInt32(NOTIFICATION_PARAM_WHAT, &what);
-	msg->FindData("node", B_RAW_TYPE, reinterpret_cast<const void **>(&node), &nodesize);
-	ASSERT(nodesize == sizeof(media_node));
+	msg->FindData("node", B_RAW_TYPE, reinterpret_cast<const void **>(&node),
+		&nodeSize);
+	ASSERT(nodeSize == sizeof(media_node));
 
-	TRACE("NotificationManager::CancelNotifications node %ld, team %ld, what %#lx\n",node->node, team, what);
-	
+	TRACE("NotificationManager::CancelNotifications node %ld, team %ld, what "
+		"%#lx\n", node->node, team, what);
+
 	/* if 		what == B_MEDIA_WILDCARD && node == media_node::null
 	 *		=> delete all notifications for the matching team & messenger 
 	 * else if 	what != B_MEDIA_WILDCARD && node == media_node::null
@@ -131,35 +136,40 @@
 	 * else if 	what == B_MEDIA_WILDCARD && node != media_node::null
 	 *		=> delete all notifications for the matching team & messenger & node
 	 * else if 	what != B_MEDIA_WILDCARD && node != media_node::null
-	 *		=> delete all notifications for the matching what & team & messenger & node
+	 *		=> delete all notifications for the matching what & team & messenger
+	 *				& node
 	 */
 	 
-	fLocker->Lock();
+	BAutolock _(fLocker);
 
 	Notification *n;
-	for (fNotificationList->Rewind(); fNotificationList->GetNext(&n); ) {
+	for (fNotificationList.Rewind(); fNotificationList.GetNext(&n); ) {
 		bool remove;
-		if (what == B_MEDIA_WILDCARD && *node == media_node::null && team == n->team && messenger == n->messenger)
+		if (what == B_MEDIA_WILDCARD && *node == media_node::null
+			&& team == n->team && messenger == n->messenger)
 			remove = true;
-		else if (what != B_MEDIA_WILDCARD && *node == media_node::null && what == n->what && team == n->team && messenger == n->messenger)
+		else if (what != B_MEDIA_WILDCARD && *node == media_node::null
+			&& what == n->what && team == n->team && messenger == n->messenger)
 			remove = true;
-		else if (what == B_MEDIA_WILDCARD && *node != media_node::null && team == n->team && messenger == n->messenger && n->node == *node)
+		else if (what == B_MEDIA_WILDCARD && *node != media_node::null
+			&& team == n->team && messenger == n->messenger && n->node == *node)
 			remove = true;
-		else if (what != B_MEDIA_WILDCARD && *node != media_node::null && what == n->what && team == n->team && messenger == n->messenger && n->node == *node)
+		else if (what != B_MEDIA_WILDCARD && *node != media_node::null
+			&& what == n->what && team == n->team && messenger == n->messenger
+			&& n->node == *node)
 			remove = true;
 		else
 			remove = false;
+
 		if (remove) {
-			if (fNotificationList->RemoveCurrent()) {
-			} else {
+			if (!fNotificationList.RemoveCurrent()) {
 				ASSERT(false);
 			}
 		}
 	}
-
-	fLocker->Unlock();
 }
 
+
 void
 NotificationManager::SendNotifications(BMessage *msg)
 {
@@ -175,10 +185,10 @@
 
 	TRACE("NotificationManager::SendNotifications what %#lx\n", what);
 
-	fLocker->Lock();
+	BAutolock _(fLocker);
 
 	Notification *n;
-	for (fNotificationList->Rewind(); fNotificationList->GetNext(&n); ) {
+	for (fNotificationList.Rewind(); fNotificationList.GetNext(&n); ) {
 		if (n->what != B_MEDIA_WILDCARD && n->what != what)
 			continue;
 		
@@ -200,18 +210,23 @@
 			case B_MEDIA_PARAMETER_CHANGED:
 			case B_MEDIA_NODE_STOPPED:
 			case B_MEDIA_WEB_CHANGED:
-				msg->FindData("node", B_RAW_TYPE, reinterpret_cast<const void **>(&node), &size);
+				msg->FindData("node", B_RAW_TYPE,
+					reinterpret_cast<const void **>(&node), &size);
 				ASSERT(size == sizeof(media_node));
 				if (n->node != *node)
 					continue;
 				break;
 
 			case B_MEDIA_FORMAT_CHANGED:
-				msg->FindData("source", B_RAW_TYPE, reinterpret_cast<const void **>(&source), &size);
+				msg->FindData("source", B_RAW_TYPE,
+					reinterpret_cast<const void **>(&source), &size);
 				ASSERT(size == sizeof(media_source));
-				msg->FindData("destination", B_RAW_TYPE, reinterpret_cast<const void **>(&destination), &size);
+				msg->FindData("destination", B_RAW_TYPE,
+					reinterpret_cast<const void **>(&destination), &size);
 				ASSERT(size == sizeof(media_destination));
-				if (n->node.port != source->port && n->node.port != destination->port)
+
+				if (n->node.port != source->port
+					&& n->node.port != destination->port)
 					continue;
 				break;
 		}
@@ -219,39 +234,39 @@
 		TRACE("NotificationManager::SendNotifications sending\n");
 		n->messenger.SendMessage(msg, static_cast<BHandler *>(NULL), TIMEOUT);
 	}
-
-	fLocker->Unlock();
 }
 	
+
 void
 NotificationManager::CleanupTeam(team_id team)
 {
 	TRACE("NotificationManager::CleanupTeam team %ld\n", team);
-	fLocker->Lock();
+	BAutolock _(fLocker);
 
-	int debugcount = 0;
+	int debugCount = 0;
 	Notification *n;
-	for (fNotificationList->Rewind(); fNotificationList->GetNext(&n); ) {
+	for (fNotificationList.Rewind(); fNotificationList.GetNext(&n); ) {
 		if (n->team == team) {
-			if (fNotificationList->RemoveCurrent()) {
-				debugcount++;
+			if (fNotificationList.RemoveCurrent()) {
+				debugCount++;
 			} else {
 				ASSERT(false);
 			}
 		}
 	}
-	
-	if (debugcount != 0)
-		ERROR("NotificationManager::CleanupTeam: removed  %d notifications for team %ld\n", debugcount, team);
 
-	fLocker->Unlock();
+	if (debugCount != 0) {
+		ERROR("NotificationManager::CleanupTeam: removed  %d notifications for "
+			"team %ld\n", debugCount, team);
+	}
 }
 
+
 void
 NotificationManager::WorkerThread()
 {
-	BMessage *msg;
-	while (NULL != (msg = static_cast<BMessage *>(fNotificationQueue->RemoveItem()))) {
+	while (BMessage *msg
+			= static_cast<BMessage *>(fNotificationQueue.RemoveItem())) {
 		switch (msg->what) {
 			case MEDIA_SERVER_REQUEST_NOTIFICATIONS:
 				RequestNotifications(msg);
@@ -269,6 +284,7 @@
 	}
 }
 
+
 int32
 NotificationManager::worker_thread(void *arg)
 {
@@ -276,16 +292,19 @@
 	return 0;
 }
 
+
 void
 NotificationManager::Dump()
 {
 	BAutolock lock(fLocker);
+
 	printf("\n");
 	printf("NotificationManager: list of subscribers follows:\n");
 	Notification *n;	
-	for (fNotificationList->Rewind(); fNotificationList->GetNext(&n); ) {
-		printf(" team %ld, what %#08lx, node-id %ld, node-port %ld, messenger %svalid\n",
-			n->team, n->what, n->node.node, n->node.port, n->messenger.IsValid() ? "" : "NOT ");
+	for (fNotificationList.Rewind(); fNotificationList.GetNext(&n); ) {
+		printf(" team %ld, what %#08lx, node-id %ld, node-port %ld, messenger "
+			"%svalid\n", n->team, n->what, n->node.node, n->node.port,
+			n->messenger.IsValid() ? "" : "NOT ");
 	}
 	printf("NotificationManager: list end\n");
 }

Modified: haiku/trunk/src/servers/media/NotificationManager.h
===================================================================
--- haiku/trunk/src/servers/media/NotificationManager.h	2009-04-09 18:29:55 UTC (rev 30076)
+++ haiku/trunk/src/servers/media/NotificationManager.h	2009-04-09 19:13:07 UTC (rev 30077)
@@ -2,43 +2,48 @@
  * Copyright 2002, Marcus Overhagen. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
+#ifndef NOTIFICATION_MANAGER_H
+#define NOTIFICATION_MANAGER_H
 
+#include <Locker.h>
 #include <MediaNode.h>
+#include <Messenger.h>
+
+#include "Queue.h"
 #include "TList.h"
 
-class Queue;
 
-struct Notification
-{
-	BMessenger messenger;
-	media_node node;
-	int32 what;
-	team_id team;
+struct Notification {
+	BMessenger	messenger;
+	media_node	node;
+	int32		what;
+	team_id		team;
 };
 
-class NotificationManager
-{
+class NotificationManager {
 public:
-	NotificationManager();
-	~NotificationManager();
+								NotificationManager();
+								~NotificationManager();
 	
-	void Dump();
+			void				Dump();
 	
-	void EnqueueMessage(BMessage *msg);
+			void				EnqueueMessage(BMessage* message);
 
-	void CleanupTeam(team_id team);
+			void				CleanupTeam(team_id team);
 
 private:
-	void RequestNotifications(BMessage *msg);
-	void CancelNotifications(BMessage *msg);
-	void SendNotifications(BMessage *msg);
+			void				RequestNotifications(BMessage* message);
+			void				CancelNotifications(BMessage* message);
+			void				SendNotifications(BMessage* message);
 
-	void WorkerThread();
-	static int32 worker_thread(void *arg);
+			void				WorkerThread();
+	static	int32				worker_thread(void* arg);
 
 private:
-	Queue *		fNotificationQueue;
-	thread_id	fNotificationThreadId;
-	BLocker	*	fLocker;
-	List<Notification> *fNotificationList;
+			Queue				fNotificationQueue;
+			thread_id			fNotificationThreadId;
+			BLocker				fLocker;
+			List<Notification>	fNotificationList;
 };
+
+#endif	// NOTIFICATION_MANAGER_H



From stippi at mail.berlios.de  Thu Apr  9 21:24:49 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Thu, 9 Apr 2009 21:24:49 +0200
Subject: [Haiku-commits] r30078 - haiku/trunk/src/kits/tracker
Message-ID: <200904091924.n39JOn3Y004333@sheep.berlios.de>

Author: stippi
Date: 2009-04-09 21:24:45 +0200 (Thu, 09 Apr 2009)
New Revision: 30078
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30078&view=rev

Modified:
   haiku/trunk/src/kits/tracker/PoseView.cpp
Log:
* Set forceDraw to false when we have already drawn the pose, not when
  there is only some pending scrolling.
* Fixed my previous ScrollTo() change to actually scroll in the two directions
  in two steps...


Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-09 19:13:07 UTC (rev 30077)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-09 19:24:45 UTC (rev 30078)
@@ -1708,11 +1708,11 @@
 							// if new pose above current view bounds, cache up
 							// the draw and do it later
 							listViewScrollBy += fListElemHeight;
-							forceDraw = false;
 						} else if (!srcRect.IsValid()) {
 							// nothing to be scrolled, but extent became
 							// visible
 							SynchronousUpdate(destRect);
+							forceDraw = false;
 						} else {
 							FinishPendingScroll(listViewScrollBy, viewBounds);
 							fPoseList->AddItem(pose, poseIndex);
@@ -1720,8 +1720,8 @@
 							addedItem = true;
 							CopyBits(srcRect, destRect);
 							srcRect.bottom = destRect.top;
-
 							SynchronousUpdate(srcRect);
+							forceDraw = false;
 						}
 					}
 				}
@@ -1734,7 +1734,7 @@
 					if (!havePoseBounds)
 						poseBounds = CalcPoseRectList(pose, poseIndex);
 		 			if (viewBounds.Intersects(poseBounds))
-						Invalidate(poseBounds);
+			 			SynchronousUpdate(poseBounds);
 				}
 				break;
 			}
@@ -8104,7 +8104,7 @@
 		// behaviour (BView<->BScrollBar feedback effects) when scrolling
 		// both directions at once versus separately.
 		BPoint origin = LeftTop();
-		ScrollTo(BPoint(point.x, point.y));
+		ScrollTo(BPoint(origin.x, point.y));
 		ScrollTo(point);
 	}
 }



From revol at free.fr  Thu Apr  9 21:38:19 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Thu, 09 Apr 2009 21:38:19 +0200 CEST
Subject: [Haiku-commits] r30073 - haiku/trunk/src/bin/desklink
In-Reply-To: <200904091719.n39HJgO8019280@sheep.berlios.de>
Message-ID: <2531396525-BeMail@laptop>

> Author: axeld
> Date: 2009-04-09 19:19:38 +0200 (Thu, 09 Apr 2009)
> New Revision: 30073
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30073&view=rev
> 
> Modified:
>    haiku/trunk/src/bin/desklink/VolumeControl.cpp
>    haiku/trunk/src/bin/desklink/VolumeControl.h
> Log:
> * The slider now snaps to 0 dB when crossing that to ease finding the 
> maximum
>   volume without distortion.
> * Added about window.
> 

I'm not really fond of it yet, guess I'll get used to it...

Fran?ois.


From axeld at mail.berlios.de  Thu Apr  9 21:50:05 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 21:50:05 +0200
Subject: [Haiku-commits] r30079 -
	haiku/trunk/src/add-ons/kernel/file_systems/bfs
Message-ID: <200904091950.n39Jo587007531@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 21:50:03 +0200 (Thu, 09 Apr 2009)
New Revision: 30079
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30079&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/bfs/Debug.cpp
Log:
* Improved tracing of the allocations at block level.
* Turned on extra check on allocation when KDEBUG is set.
* The "bfs" KDL command now also prints the block bitmap block for the
  specified block.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp	2009-04-09 19:24:45 UTC (rev 30078)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp	2009-04-09 19:50:03 UTC (rev 30079)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2001-2009, Axel D?rfler, axeld at pinc-software.de.
  * This file may be used under the terms of the MIT License.
  */
 
@@ -103,9 +103,9 @@
 		fBlock(blockNumber),
 		fData(data),
 		fStart(start),
-		fLength(length)
+		fLength(length),
+		fLabel(label)
 	{
-		strlcpy(fLabel, label, sizeof(fLabel));
 		fSum = checksum(data, size);
 		Initialized();
 	}
@@ -122,9 +122,35 @@
 	uint32		fStart;
 	uint32		fLength;
 	uint32		fSum;
-	char		fLabel[12];
+	const char*	fLabel;
 };
 
+
+class BlockChange : public AbstractTraceEntry {
+public:
+	BlockChange(const char* label, int32 block, uint32 oldData, uint32 newData)
+		:
+		fBlock(block),
+		fOldData(oldData),
+		fNewData(newData),
+		fLabel(label)
+	{
+		Initialized();
+	}
+
+	virtual void AddDump(TraceOutput& out)
+	{
+		out.Print("bfs:%s: block %ld, %08lx -> %08lx", fLabel,
+			fBlock, fOldData, fNewData);
+	}
+
+private:
+	int32		fBlock;
+	uint32		fOldData;
+	uint32		fNewData;
+	const char*	fLabel;
+};
+
 }	// namespace BFSBlockTracing
 
 #	define T(x) new(std::nothrow) BFSBlockTracing::x;
@@ -263,12 +289,6 @@
 	ASSERT(fWritable);
 #endif
 
-	if (uint32(start + numBlocks) > fNumBits) {
-		FATAL(("Allocation::Allocate(): tried to allocate too many blocks: %u "
-			"(numBlocks = %u)!\n", numBlocks, (unsigned)fNumBits));
-		DIE(("Allocation::Allocate(): tried to allocate too many blocks"));
-	}
-
 	T(Block("b-alloc-in", fBlockNumber, fBlock, fVolume->BlockSize(),
 		start, numBlocks));
 
@@ -278,14 +298,19 @@
 		uint32 mask = 0;
 		for (int32 i = start % 32; i < 32 && numBlocks; i++, numBlocks--)
 			mask |= 1UL << i;
-#ifdef DEBUG
+
+		T(BlockChange("b-alloc", block, Block(block),
+			Block(block) | HOST_ENDIAN_TO_BFS_INT32(mask)));
+
+#if KDEBUG
 		// check for already set blocks
 		if (HOST_ENDIAN_TO_BFS_INT32(mask) & ((uint32*)fBlock)[block]) {
 			FATAL(("AllocationBlock::Allocate(): some blocks are already "
 				"allocated, start = %u, numBlocks = %u\n", start, numBlocks));
-			DEBUGGER(("blocks already set!"));
+			panic("blocks already set!");
 		}
 #endif
+
 		Block(block++) |= HOST_ENDIAN_TO_BFS_INT32(mask);
 		start = 0;
 	}
@@ -303,12 +328,6 @@
 	ASSERT(fWritable);
 #endif
 
-	if (uint32(start + numBlocks) > fNumBits) {
-		FATAL(("Allocation::Free(): tried to free too many blocks: %u "
-			"(numBlocks = %u)!\n", numBlocks, (unsigned)fNumBits));
-		DIE(("Allocation::Free(): tried to free too many blocks"));
-	}
-
 	int32 block = start >> 5;
 
 	while (numBlocks > 0) {
@@ -316,6 +335,9 @@
 		for (int32 i = start % 32; i < 32 && numBlocks; i++, numBlocks--)
 			mask |= 1UL << (i % 32);
 
+		T(BlockChange("b-free", block, Block(block),
+			Block(block) & HOST_ENDIAN_TO_BFS_INT32(~mask)));
+
 		Block(block++) &= HOST_ENDIAN_TO_BFS_INT32(~mask);
 		start = 0;
 	}

Modified: haiku/trunk/src/add-ons/kernel/file_systems/bfs/Debug.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/bfs/Debug.cpp	2009-04-09 19:24:45 UTC (rev 30078)
+++ haiku/trunk/src/add-ons/kernel/file_systems/bfs/Debug.cpp	2009-04-09 19:50:03 UTC (rev 30079)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008, Axel D?rfler, axeld at pinc-software.de.
+ * Copyright 2001-2009, Axel D?rfler, axeld at pinc-software.de.
  * Some code is based on work previously done by Marcus Overhagen.
  *
  * This file may be used under the terms of the MIT License.
@@ -329,15 +329,19 @@
 				run.start = HOST_ENDIAN_TO_BFS_INT16(strtoul(arg + 1, NULL, 0));
 				run.length = 0;
 
-				kprintf("%ld.%u -> block %Ld\n", run.AllocationGroup(),
-					run.Start(), volume->ToBlock(run));
+				kprintf("%ld.%u -> block %Ld, bitmap block %ld\n",
+					run.AllocationGroup(), run.Start(), volume->ToBlock(run),
+					volume->SuperBlock().BlocksPerAllocationGroup()
+						* run.AllocationGroup() + 1);
 			} else {
 				// offset to block_run
 				off_t offset = parse_expression(arg);
 				block_run run = volume->ToBlockRun(offset);
 
-				kprintf("block %Ld -> %ld.%u\n", offset, run.AllocationGroup(),
-					run.Start());
+				kprintf("block %Ld -> %ld.%u, bitmap block %ld\n", offset,
+					run.AllocationGroup(), run.Start(),
+					volume->SuperBlock().BlocksPerAllocationGroup()
+						* run.AllocationGroup() + 1);
 			}
 		}
 		return 0;



From mmlr at mail.berlios.de  Thu Apr  9 21:53:29 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Thu, 9 Apr 2009 21:53:29 +0200
Subject: [Haiku-commits] r30080 -
	haiku/trunk/src/add-ons/kernel/bus_managers/ata
Message-ID: <200904091953.n39JrT7u008080@sheep.berlios.de>

Author: mmlr
Date: 2009-04-09 21:53:26 +0200 (Thu, 09 Apr 2009)
New Revision: 30080
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30080&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
Log:
Adding ATAPI support to the new ATA bus_manager. Only tested in QEMU.


Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-09 19:50:03 UTC (rev 30079)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-09 19:53:26 UTC (rev 30080)
@@ -14,7 +14,7 @@
 		fChannelID(0),
 		fController(NULL),
 		fCookie(NULL),
-		fExpectsDMATransfer(false),
+		fExpectsInterrupt(false),
 		fStatus(B_NO_INIT),
 		fSCSIBus(NULL),
 		fDeviceCount(0),
@@ -23,8 +23,8 @@
 		fRequest(NULL)
 {
 	mutex_init(&fExecutionLock, "ata io execution");
-	B_INITIALIZE_SPINLOCK(&fDMATransferLock);
-	fDMATransferCondition.Init(this, "ata dma transfer");
+	B_INITIALIZE_SPINLOCK(&fInterruptLock);
+	fInterruptCondition.Init(this, "ata dma transfer");
 
 	gDeviceManager->get_attr_uint32(node, ATA_CHANNEL_ID_ITEM, &fChannelID,
 		true);
@@ -234,6 +234,9 @@
 		return B_OK;
 	}
 
+	// we aren't a check sense request, clear sense data for new request
+	fRequest->ClearSense();
+
 	if (ccb->target_id >= fDeviceCount) {
 		TRACE_ERROR("invalid target device\n");
 		fRequest->SetStatus(SCSI_SEL_TIMEOUT);
@@ -393,7 +396,7 @@
 	_FlushAndWait(1);
 
 	while (true) {
-		uint8 status = _AltStatus();
+		uint8 status = AltStatus();
 		if ((flags & ATA_CHECK_ERROR_BIT) != 0
 			&& (status & ATA_STATUS_ERROR) != 0)
 			return B_ERROR;
@@ -443,11 +446,41 @@
 status_t
 ATAChannel::WaitForIdle()
 {
-	return Wait(0, ATA_STATUS_BUSY | ATA_STATUS_DATA_REQUEST, 0, 20 * 1000);
+	return Wait(0, ATA_STATUS_BUSY | ATA_STATUS_DATA_REQUEST, 0, 50 * 1000);
 }
 
 
+void
+ATAChannel::PrepareWaitingForInterrupt()
+{
+	TRACE_FUNCTION("\n");
+	InterruptsSpinLocker locker(fInterruptLock);
+	fExpectsInterrupt = true;
+	fInterruptCondition.Add(&fInterruptConditionEntry);
+}
+
+
 status_t
+ATAChannel::WaitForInterrupt(bigtime_t timeout)
+{
+	TRACE_FUNCTION("timeout: %lld\n", timeout);
+	status_t result = fInterruptConditionEntry.Wait(B_RELATIVE_TIMEOUT,
+		timeout);
+
+	InterruptsSpinLocker locker(fInterruptLock);
+	fExpectsInterrupt = false;
+	locker.Unlock();
+
+	if (result != B_OK) {
+		TRACE_ERROR("timeout waiting for interrupt\n");
+		return B_TIMED_OUT;
+	}
+
+	return B_OK;
+}
+
+
+status_t
 ATAChannel::SendRequest(ATARequest *request, uint32 flags)
 {
 	// disable interrupts for PIO transfers, enable them for DMA
@@ -464,7 +497,7 @@
 	}
 
 	if ((flags & ATA_DEVICE_READY_REQUIRED) != 0
-		&& (_AltStatus() & ATA_STATUS_DEVICE_READY) == 0) {
+		&& (AltStatus() & ATA_STATUS_DEVICE_READY) == 0) {
 		TRACE_ERROR("device ready not set\n");
 		request->SetStatus(SCSI_SEQUENCE_FAIL);
 		return B_ERROR;
@@ -583,35 +616,16 @@
 
 
 status_t
-ATAChannel::FinishDMA()
+ATAChannel::StartDMA()
 {
-	return fController->finish_dma(fCookie);
+	return fController->start_dma(fCookie);
 }
 
 
 status_t
-ATAChannel::ExecuteDMATransfer(ATARequest *request)
+ATAChannel::FinishDMA()
 {
-	InterruptsSpinLocker locker(fDMATransferLock);
-	fExpectsDMATransfer = true;
-	ConditionVariableEntry entry;
-	fDMATransferCondition.Add(&entry);
-	locker.Unlock();
-
-	fController->start_dma(fCookie);
-	bigtime_t timeout = system_time() + request->Timeout();
-	status_t waitResult = entry.Wait(B_ABSOLUTE_TIMEOUT, timeout);
-
-	locker.Lock();
-	fExpectsDMATransfer = false;
-	locker.Unlock();
-
-	if (waitResult != B_OK) {
-		TRACE_ERROR("timeout waiting for DMA transfer\n");
-		return B_TIMED_OUT;
-	}
-
-	return B_OK;
+	return fController->finish_dma(fCookie);
 }
 
 
@@ -646,7 +660,7 @@
 
 		// wait 1 pio cycle
 		if (*blocksLeft > 0)
-			_AltStatus();
+			AltStatus();
 	}
 
 	if (result == B_OK && WaitDataRequest(false) != B_OK) {
@@ -659,6 +673,20 @@
 
 
 status_t
+ATAChannel::ReadRegs(ATADevice *device)
+{
+	return _ReadRegs(device->TaskFile(), device->RegisterMask());
+}
+
+
+uint8
+ATAChannel::AltStatus()
+{
+	return fController->get_altstatus(fCookie);
+}
+
+
+status_t
 ATAChannel::ReadPIO(uint8 *buffer, size_t length)
 {
 	return fController->read_pio(fCookie, (uint16 *)buffer,
@@ -666,11 +694,19 @@
 }
 
 
+status_t
+ATAChannel::WritePIO(uint8 *buffer, size_t length)
+{
+	return fController->write_pio(fCookie, (uint16 *)buffer,
+		length / sizeof(uint16), true);
+}
+
+
 void
 ATAChannel::Interrupt(uint8 status)
 {
-	SpinLocker locker(fDMATransferLock);
-	if (!fExpectsDMATransfer) {
+	SpinLocker locker(fInterruptLock);
+	if (!fExpectsInterrupt) {
 		TRACE_ERROR("interrupt when not expecting transfer\n");
 		return;
 	}
@@ -680,7 +716,7 @@
 		return;
 	}
 
-	fDMATransferCondition.NotifyAll();
+	fInterruptCondition.NotifyAll();
 }
 
 
@@ -706,17 +742,10 @@
 }
 
 
-uint8
-ATAChannel::_AltStatus()
-{
-	return fController->get_altstatus(fCookie);
-}
-
-
 void
 ATAChannel::_FlushAndWait(bigtime_t waitTime)
 {
-	_AltStatus();
+	AltStatus();
 	if (waitTime > 100)
 		snooze(waitTime);
 	else
@@ -749,7 +778,7 @@
 	if (transferred >= length)
 		return B_OK;
 
-	TRACE_ERROR("pio read: discarding after %lu bytes", transferred);
+	TRACE_ERROR("pio read: discarding after %lu bytes\n", transferred);
 
 	uint8 buffer[32];
 	length -= transferred;
@@ -799,7 +828,7 @@
 	// only solution is to send zero bytes, though it's BAD
 	static const uint8 buffer[32] = {};
 
-	TRACE_ERROR("pio write: discarding after %lu bytes", transferred);
+	TRACE_ERROR("pio write: discarding after %lu bytes\n", transferred);
 
 	length -= transferred;
 	while (length > 0) {

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-09 19:50:03 UTC (rev 30079)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-09 19:53:26 UTC (rev 30080)
@@ -12,14 +12,14 @@
 
 ATADevice::ATADevice(ATAChannel *channel, uint8 index)
 	:	fChannel(channel),
+		fRegisterMask(0),
+		fUseDMA(channel->UseDMA()),
+		fDMAMode(0),
+		fDMAFailures(0),
 		fIndex(index),
 		fUseLBA(false),
 		fUse48Bits(false),
-		fUseDMA(channel->UseDMA()),
-		fDMAMode(0),
-		fDMAFailures(0),
-		fTotalSectors(0),
-		fRegisterMask(0)
+		fTotalSectors(0)
 {
 	memset(&fInfoBlock, 0, sizeof(fInfoBlock));
 	memset(&fTaskFile, 0, sizeof(fTaskFile));
@@ -202,7 +202,6 @@
 
 	TRACE("request: 0x%02x\n", ccb->cdb[0]);
 
-	request->ClearSense();
 	switch (ccb->cdb[0]) {
 		case SCSI_OP_TEST_UNIT_READY:
 			return TestUnitReady(request);
@@ -541,7 +540,10 @@
 	}
 
 	if (request->UseDMA()) {
-		result = fChannel->ExecuteDMATransfer(request);
+		fChannel->PrepareWaitingForInterrupt();
+		fChannel->StartDMA();
+
+		result = fChannel->WaitForInterrupt(request->Timeout());
 		status_t dmaResult = fChannel->FinishDMA();
 		if (result == B_OK && dmaResult == B_OK) {
 			fDMAFailures = 0;

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp	2009-04-09 19:50:03 UTC (rev 30079)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp	2009-04-09 19:53:26 UTC (rev 30080)
@@ -10,8 +10,7 @@
 #include "ATAPrivate.h"
 
 ATAPIDevice::ATAPIDevice(ATAChannel *channel, uint8 index)
-	:	ATADevice(channel, index),
-		fLastLun(1)
+	:	ATADevice(channel, index)
 {
 }
 
@@ -22,9 +21,203 @@
 
 
 status_t
+ATAPIDevice::SendPacket(ATARequest *request)
+{
+	TRACE_FUNCTION("%p\n", request);
+
+	// only READ/WRITE commands can use DMA
+	// (the device may support it always, but IDE controllers don't
+	// report how much data is transmitted, and this information is
+	// crucial for the SCSI protocol)
+	// special offer: let READ_CD commands use DMA too
+	uint8 command = fPacket[0];
+	request->SetUseDMA(UseDMA()
+		&& (command == SCSI_OP_READ_6 || command == SCSI_OP_WRITE_6
+		|| command == SCSI_OP_READ_10 || command == SCSI_OP_WRITE_10
+		|| command == SCSI_OP_READ_12 || command == SCSI_OP_WRITE_12
+		|| command == SCSI_OP_READ_CD)
+		&& fChannel->PrepareDMA(request) == B_OK);
+	TRACE("using dma: %s\n", request->UseDMA() ? "yes" : "no");
+
+	if (!request->UseDMA())
+		request->PrepareSGInfo();
+
+	if (_FillTaskFilePacket(request) != B_OK) {
+		TRACE_ERROR("failed to setup transfer request\n");
+		if (request->UseDMA())
+			fChannel->FinishDMA();
+		return B_ERROR;
+	}
+
+	if (fInterruptsForPacket)
+		fChannel->PrepareWaitingForInterrupt();
+
+	status_t result = fChannel->SendRequest(request, ATA_DMA_TRANSFER);
+	if (result != B_OK) {
+		TRACE_ERROR("failed to send packet request\n");
+		if (request->UseDMA())
+			fChannel->FinishDMA();
+		return result;
+	}
+
+	// wait for device to get ready for packet transmission
+	bool timedOut = false;
+	if (fInterruptsForPacket)
+		timedOut = fChannel->WaitForInterrupt(request->Timeout()) != B_OK;
+	else {
+		timedOut = fChannel->Wait(ATA_STATUS_DATA_REQUEST, ATA_STATUS_BUSY, 0,
+			100 * 1000) != B_OK;
+	}
+
+	if (timedOut) {
+		TRACE_ERROR("timeout waiting for data request\n");
+		if (request->UseDMA())
+			fChannel->FinishDMA();
+
+		request->SetStatus(SCSI_SEQUENCE_FAIL);
+		return B_TIMED_OUT;
+	}
+
+	// make sure device really asks for command packet
+	fRegisterMask = ATA_MASK_IREASON;
+	fChannel->ReadRegs(this);
+
+	if (!fTaskFile.packet_res.cmd_or_data
+		|| fTaskFile.packet_res.input_or_output) {
+		TRACE_ERROR("device doesn't ask for packet\n");
+		if (request->UseDMA())
+			fChannel->FinishDMA();
+
+		request->SetStatus(SCSI_SEQUENCE_FAIL);
+		return B_ERROR;
+	}
+
+	// some old drives need a delay before submitting the packet
+	spin(10);
+
+	fChannel->PrepareWaitingForInterrupt();
+
+	// write packet
+	if (fChannel->WritePIO(fPacket, sizeof(fPacket)) != B_OK) {
+		TRACE_ERROR("failed to write packet\n");
+		if (request->UseDMA())
+			fChannel->FinishDMA();
+
+		request->SetStatus(SCSI_HBA_ERR);
+		return B_ERROR;
+	}
+
+	if (request->UseDMA()) {
+		fChannel->StartDMA();
+		result = fChannel->WaitForInterrupt(request->Timeout());
+		status_t dmaResult = fChannel->FinishDMA();
+		if (result == B_OK && dmaResult == B_OK) {
+			fDMAFailures = 0;
+			request->CCB()->data_resid = 0;
+		} else {
+			if (dmaResult != B_OK) {
+				request->SetSense(SCSIS_KEY_HARDWARE_ERROR,
+					SCSIS_ASC_LUN_COM_FAILURE);
+				fDMAFailures++;
+				if (fDMAFailures >= ATA_MAX_DMA_FAILURES) {
+					TRACE_ALWAYS("disabling DMA after %u failures\n",
+						fDMAFailures);
+					fUseDMA = false;
+				}
+			} else {
+				// timeout
+				request->SetStatus(SCSI_CMD_TIMEOUT);
+			}
+		}
+	} else {
+		result = fChannel->WaitForInterrupt(request->Timeout());
+		if (result != B_OK) {
+			TRACE_ERROR("timeout waiting for device to request data\n");
+			request->SetStatus(SCSI_SEQUENCE_FAIL);
+			return B_TIMED_OUT;
+		}
+
+		while (true) {
+			uint8 altStatus = fChannel->AltStatus();
+			if ((altStatus & ATA_STATUS_DATA_REQUEST) == 0)
+				break;
+
+			fRegisterMask = ATA_MASK_ERROR | ATA_MASK_IREASON;
+			fChannel->ReadRegs(this);
+
+			if (fTaskFile.packet_res.cmd_or_data) {
+				TRACE_ERROR("device expecting command instead of data\n");
+				request->SetStatus(SCSI_SEQUENCE_FAIL);
+				return B_ERROR;
+			}
+
+			fRegisterMask = ATA_MASK_BYTE_COUNT;
+			fChannel->ReadRegs(this);
+			size_t length = fTaskFile.packet_res.byte_count_0_7
+				| ((size_t)fTaskFile.packet_res.byte_count_8_15 << 8);
+			TRACE("about to transfer %lu bytes\n", length);
+
+			request->SetBlocksLeft((length + 511) / 512);
+			if (fChannel->ExecutePIOTransfer(request) != B_OK) {
+				TRACE_ERROR("failed to transfer data\n");
+				request->SetStatus(SCSI_SEQUENCE_FAIL);
+				return B_ERROR;
+			}
+		}
+	}
+
+	return fChannel->FinishRequest(request, ATA_WAIT_FINISH, ATA_ERROR_ABORTED);
+}
+
+
+status_t
 ATAPIDevice::ExecuteIO(ATARequest *request)
 {
-	request->SetStatus(SCSI_SEL_TIMEOUT);
-	request->SetSense(SCSIS_KEY_ILLEGAL_REQUEST, SCSIS_ASC_INV_CDB_FIELD);
-	return B_ERROR;
+	scsi_ccb *ccb = request->CCB();
+	if (ccb->target_lun > fInfoBlock.last_lun) {
+		TRACE_ERROR("invalid target lun %d, last lun is %d\n", ccb->target_lun,
+			fInfoBlock.last_lun);
+		request->SetStatus(SCSI_SEL_TIMEOUT);
+		return B_BAD_INDEX;
+	}
+
+	// ATAPI command packets are 12 bytes long;
+	// if the command is shorter, remaining bytes must be padded with zeros
+	memset(fPacket, 0, sizeof(fPacket));
+	memcpy(fPacket, ccb->cdb, ccb->cdb_length);
+
+	request->SetDevice(this);
+	request->SetIsWrite((ccb->flags & SCSI_DIR_MASK) == SCSI_DIR_OUT);
+	return SendPacket(request);
 }
+
+
+status_t
+ATAPIDevice::Configure()
+{
+	if (fInfoBlock._0.atapi.ATAPI != 2)
+		return B_ERROR;
+
+	fTaskFile.packet.lun = 0;
+	fInterruptsForPacket = fInfoBlock._0.atapi.drq_speed == 1;
+
+	status_t result = ConfigureDMA();
+	if (result != B_OK)
+		return result;
+
+	return B_OK;
+}
+
+
+status_t
+ATAPIDevice::_FillTaskFilePacket(ATARequest *request)
+{
+	scsi_ccb *ccb = request->CCB();
+	fRegisterMask = ATA_MASK_FEATURES | ATA_MASK_BYTE_COUNT;
+	fTaskFile.packet.dma = request->UseDMA();
+	fTaskFile.packet.ovl = 0;
+	fTaskFile.packet.byte_count_0_7 = ccb->data_length & 0xff;
+	fTaskFile.packet.byte_count_8_15 = ccb->data_length >> 8;
+	fTaskFile.packet.command = ATA_COMMAND_PACKET;
+	return B_OK;
+}

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-09 19:50:03 UTC (rev 30079)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-09 19:53:26 UTC (rev 30080)
@@ -85,6 +85,9 @@
 		status_t					WaitDeviceReady();
 		status_t					WaitForIdle();
 
+		void						PrepareWaitingForInterrupt();
+		status_t					WaitForInterrupt(bigtime_t timeout);
+
 		// request handling
 		status_t					SendRequest(ATARequest *request,
 										uint32 flags);
@@ -93,12 +96,16 @@
 
 		// data transfers
 		status_t					PrepareDMA(ATARequest *request);
+		status_t					StartDMA();
 		status_t					FinishDMA();
 
-		status_t					ExecuteDMATransfer(ATARequest *request);
 		status_t					ExecutePIOTransfer(ATARequest *request);
 
+		status_t					ReadRegs(ATADevice *device);
+		uint8						AltStatus();
+
 		status_t					ReadPIO(uint8 *buffer, size_t length);
+		status_t					WritePIO(uint8 *buffer, size_t length);
 
 		void						Interrupt(uint8 status);
 
@@ -109,7 +116,6 @@
 										ata_reg_mask mask);
 		status_t					_WriteControl(uint8 value);
 
-		uint8						_AltStatus();
 		void						_FlushAndWait(bigtime_t waitTime);
 
 		status_t					_ReadPIOBlock(ATARequest *request,
@@ -133,9 +139,10 @@
 		void *						fCookie;
 
 		mutex						fExecutionLock;
-		spinlock					fDMATransferLock;
-		ConditionVariable			fDMATransferCondition;
-		bool						fExpectsDMATransfer;
+		spinlock					fInterruptLock;
+		ConditionVariable			fInterruptCondition;
+		ConditionVariableEntry		fInterruptConditionEntry;
+		bool						fExpectsInterrupt;
 
 		status_t					fStatus;
 		scsi_bus					fSCSIBus;
@@ -179,29 +186,32 @@
 		status_t					DisableCommandQueueing();
 		status_t					ConfigureDMA();
 
-		status_t					Configure();
+virtual	status_t					Configure();
 		status_t					Identify();
 
 		status_t					ExecuteReadWrite(ATARequest *request,
 										uint64 address, uint32 sectorCount);
 
+protected:
+		const char *				_DebugContext() { return fDebugContext; };
+
+		ATAChannel *				fChannel;
+		ata_device_infoblock		fInfoBlock;
+		ata_task_file				fTaskFile;
+		ata_reg_mask				fRegisterMask;
+
+		bool						fUseDMA;
+		uint8						fDMAMode;
+		uint8						fDMAFailures;
+
 private:
 		status_t					_FillTaskFile(ATARequest *request,
 										uint64 address);
 
-		const char *				_DebugContext() { return fDebugContext; };
-
-		ATAChannel *				fChannel;
 		uint8						fIndex;
 		bool						fUseLBA;
 		bool						fUse48Bits;
-		bool						fUseDMA;
-		uint8						fDMAMode;
-		uint8						fDMAFailures;
 		uint64						fTotalSectors;
-		ata_device_infoblock		fInfoBlock;
-		ata_task_file				fTaskFile;
-		ata_reg_mask				fRegisterMask;
 
 		char						fDebugContext[16];
 };
@@ -213,12 +223,18 @@
 										uint8 index);
 virtual								~ATAPIDevice();
 
+		status_t					SendPacket(ATARequest *request);
 virtual	status_t					ExecuteIO(ATARequest *request);
 
 virtual	bool						IsATAPI() { return true; };
 
+virtual	status_t					Configure();
+
 private:
-		uint8						fLastLun;
+		status_t					_FillTaskFilePacket(ATARequest *request);
+
+		bool						fInterruptsForPacket;
+		uint8						fPacket[12];
 };
 
 



From axeld at mail.berlios.de  Thu Apr  9 22:45:20 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 22:45:20 +0200
Subject: [Haiku-commits] r30081 - haiku/trunk/src/apps/charactermap
Message-ID: <200904092045.n39KjK7i016310@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 22:45:18 +0200 (Thu, 09 Apr 2009)
New Revision: 30081
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30081&view=rev

Modified:
   haiku/trunk/src/apps/charactermap/CharacterView.cpp
Log:
* Fixed that you would drag the wrong character when the drag was started
  while you were already over another character.


Modified: haiku/trunk/src/apps/charactermap/CharacterView.cpp
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterView.cpp	2009-04-09 19:53:26 UTC (rev 30080)
+++ haiku/trunk/src/apps/charactermap/CharacterView.cpp	2009-04-09 20:45:18 UTC (rev 30081)
@@ -297,7 +297,12 @@
 
 	if (fClickPoint.x >= 0 && (fabs(where.x - fClickPoint.x) > 4
 			|| fabs(where.y - fClickPoint.y) > 4)) {
-		// start dragging
+		// Start dragging
+
+		// Update character - we want to drag the one we originally clicked
+		// on, not the one the mouse might be over now.
+		_GetCharacterAt(fClickPoint, character, &frame);
+
 		BPoint offset = fClickPoint - frame.LeftTop();
 		frame.OffsetTo(B_ORIGIN);
 



From mmlr at mail.berlios.de  Thu Apr  9 22:47:15 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Thu, 9 Apr 2009 22:47:15 +0200
Subject: [Haiku-commits] r30082 -
	haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk
Message-ID: <200904092047.n39KlFZv016526@sheep.berlios.de>

Author: mmlr
Date: 2009-04-09 22:47:10 +0200 (Thu, 09 Apr 2009)
New Revision: 30082
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30082&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
   haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.h
   haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk_scsi.h
Log:
Adding mode sense command to retrieve the write protected status. Doesn't work
yet, so not enabled for now.


Modified: haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp	2009-04-09 20:45:18 UTC (rev 30081)
+++ haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.cpp	2009-04-09 20:47:10 UTC (rev 30082)
@@ -134,6 +134,7 @@
 				bool directionIn);
 
 status_t	usb_disk_request_sense(device_lun *lun);
+status_t	usb_disk_mode_sense(device_lun *lun);
 status_t	usb_disk_test_unit_ready(device_lun *lun);
 status_t	usb_disk_inquiry(device_lun *lun);
 status_t	usb_disk_reset_capacity(device_lun *lun);
@@ -280,6 +281,10 @@
 			commandBlock->operation = operation;
 			commandBlock->lun = lun->logical_unit_number << 5;
 			commandBlock->allocation_length = (uint8)transferLength;
+			if (operation == SCSI_MODE_SENSE_6) {
+				// we hijack the lba argument to transport the desired page
+				commandBlock->reserved[1] = (uint8)logicalBlockAddress;
+			}
 			break;
 		}
 
@@ -465,6 +470,26 @@
 
 
 status_t
+usb_disk_mode_sense(device_lun *lun)
+{
+	uint32 dataLength = sizeof(scsi_mode_sense_6_parameter);
+	scsi_mode_sense_6_parameter parameter;
+	status_t result = usb_disk_operation(lun, SCSI_MODE_SENSE_6, 6,
+		SCSI_MODE_PAGE_DEVICE_CONFIGURATION, dataLength, &parameter,
+		&dataLength, true);
+	if (result != B_OK) {
+		TRACE_ALWAYS("getting mode sense data failed\n");
+		return result;
+	}
+
+	lun->write_protected
+		= (parameter.device_specific & SCSI_DEVICE_SPECIFIC_WRITE_PROTECT) != 0;
+	TRACE_ALWAYS("write protected: %s\n", lun->write_protected ? "yes" : "no");	
+	return B_OK;
+}
+
+
+status_t
 usb_disk_test_unit_ready(device_lun *lun)
 {
 	return usb_disk_operation(lun, SCSI_TEST_UNIT_READY_6, 6, 0, 0, NULL, NULL,
@@ -699,8 +724,16 @@
 		result = usb_disk_inquiry(lun);
 		for (uint32 tries = 0; tries < 3; tries++) {
 			status_t ready = usb_disk_test_unit_ready(lun);
-			if (ready == B_OK || ready == B_DEV_NO_MEDIA)
+			if (ready == B_OK || ready == B_DEV_NO_MEDIA) {
+				if (ready == B_OK) {
+					// TODO: check for write protection
+					//if (usb_disk_mode_sense(lun) != B_OK)
+						lun->write_protected = false;
+				}
+
 				break;
+			}
+
 			snooze(10000);
 		}
 
@@ -956,7 +989,7 @@
 			geometry->sectors_per_track = geometry->head_count = 1;
 			geometry->device_type = lun->device_type;
 			geometry->removable = lun->removable;
-			geometry->read_only = (lun->device_type == B_CD);
+			geometry->read_only = lun->write_protected;
 			geometry->write_once = (lun->device_type == B_WORM);
 			TRACE("B_GET_GEOMETRY: %ld sectors at %ld bytes per sector\n",
 				geometry->cylinder_count, geometry->bytes_per_sector);

Modified: haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.h	2009-04-09 20:45:18 UTC (rev 30081)
+++ haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk.h	2009-04-09 20:47:10 UTC (rev 30082)
@@ -69,6 +69,7 @@
 	uint32		block_size;
 	uint8		device_type;
 	bool		removable;
+	bool		write_protected;
 };
 
 

Modified: haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk_scsi.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk_scsi.h	2009-04-09 20:45:18 UTC (rev 30081)
+++ haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_disk/usb_disk_scsi.h	2009-04-09 20:47:10 UTC (rev 30082)
@@ -13,6 +13,7 @@
 	SCSI_TEST_UNIT_READY_6 = 0x00,
 	SCSI_REQUEST_SENSE_6 = 0x03,
 	SCSI_INQUIRY_6 = 0x12,
+	SCSI_MODE_SENSE_6 = 0x1a,
 	SCSI_START_STOP_UNIT_6 = 0x1b,
 	SCSI_READ_CAPACITY_10 = 0x25,
 	SCSI_READ_10 = 0x28,
@@ -69,6 +70,17 @@
 	char	product_revision_level[4];
 } _PACKED scsi_inquiry_6_parameter;
 
+typedef struct scsi_mode_sense_6_parameter_s {
+	uint8	data_length;
+	uint8	medium_type;
+	uint8	device_specific;
+	uint8	block_descriptor_length;
+	uint8	densitiy;
+	uint8	num_blocks[3];
+	uint8	reserved;
+	uint8	block_length[3];
+} _PACKED scsi_mode_sense_6_parameter;
+
 typedef struct scsi_read_capacity_10_parameter_s {
 	uint32	last_logical_block_address;
 	uint32	logical_block_length;
@@ -87,4 +99,8 @@
 	SCSI_SENSE_KEY_ABORTED_COMMAND = 0x0b,
 } scsi_sense_key;
 
+// mode sense page code/parameter
+#define SCSI_MODE_PAGE_DEVICE_CONFIGURATION	0x10
+#define SCSI_DEVICE_SPECIFIC_WRITE_PROTECT	0x80
+
 #endif // _USB_DISK_SCSI_H_



From axeld at mail.berlios.de  Thu Apr  9 23:21:44 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 23:21:44 +0200
Subject: [Haiku-commits] r30083 - haiku/trunk/src/kits/media
Message-ID: <200904092121.n39LLi2k020645@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 23:21:42 +0200 (Thu, 09 Apr 2009)
New Revision: 30083
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30083&view=rev

Modified:
   haiku/trunk/src/kits/media/DefaultMediaTheme.cpp
Log:
* Changed ContinuousMessageFilter to register for parameter value changes,
  and change its slider value when such a message arrives.
* Currently, this will only work if such a view already received a message;
  added a TODO about how it should be done, but since those would require
  some more changes, I don't want to do that as long as Sean Healy is working
  on that file.


Modified: haiku/trunk/src/kits/media/DefaultMediaTheme.cpp
===================================================================
--- haiku/trunk/src/kits/media/DefaultMediaTheme.cpp	2009-04-09 20:47:10 UTC (rev 30082)
+++ haiku/trunk/src/kits/media/DefaultMediaTheme.cpp	2009-04-09 21:21:42 UTC (rev 30083)
@@ -1,29 +1,30 @@
 /*
- * Copyright 2003-2007, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2003-2009, Axel D?rfler, axeld at pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
 
 #include "DefaultMediaTheme.h"
-#include "debug.h"
 
-#include <ParameterWeb.h>
-
-#include <Slider.h>
-#include <ScrollBar.h>
-#include <StringView.h>
+#include <Box.h>
 #include <Button.h>
-#include <TextControl.h>
-#include <OptionPopUp.h>
 #include <ChannelSlider.h>
-#include <Box.h>
 #include <CheckBox.h>
-#include <TabView.h>
+#include <MediaRoster.h>
 #include <MenuField.h>
 #include <MessageFilter.h>
+#include <OptionPopUp.h>
+#include <ParameterWeb.h>
+#include <ScrollBar.h>
+#include <Slider.h>
+#include <StringView.h>
+#include <TabView.h>
+#include <TextControl.h>
 #include <Window.h>
 
+#include "debug.h"
 
+
 using namespace BPrivate;
 
 
@@ -121,7 +122,11 @@
 		virtual filter_result Filter(BMessage *message, BHandler **target);
 
 	private:
+		void _UpdateControl();
+
+		BControl				*fControl;
 		BContinuousParameter	&fParameter;
+		bool					fRegistered;
 };
 
 class DiscreteMessageFilter : public MessageFilter {
@@ -588,33 +593,22 @@
 ContinuousMessageFilter::ContinuousMessageFilter(BControl *control,
 		BContinuousParameter &parameter)
 	: MessageFilter(),
-	fParameter(parameter)
+	fControl(control),
+	fParameter(parameter),
+	fRegistered(false)
 {
 	// initialize view for us
 	control->SetMessage(new BMessage(kMsgParameterChanged));
 
-	// set initial value
-	// ToDo: response support!
-
-	float value[fParameter.CountChannels()];
-	size_t size = sizeof(value);
-	if (parameter.GetValue((void *)&value, &size, NULL) < B_OK) {
-		ERROR("ContinuousMessageFilter: Could not get value for continuous "
-			"parameter %p (name '%s', node %d)\n", &parameter,
-			parameter.Name(), (int)(parameter.Web()->Node().node));
-		return;
-	}
-
-	if (BSlider *slider = dynamic_cast<BSlider *>(control)) {
-		slider->SetValue((int32) (1000 * value[0]));
+	if (BSlider *slider = dynamic_cast<BSlider *>(fControl))
 		slider->SetModificationMessage(new BMessage(kMsgParameterChanged));
-	} else if (BChannelSlider *slider = dynamic_cast<BChannelSlider *>(control)) {
-		for (int32 i = 0; i < fParameter.CountChannels(); i++)
-			slider->SetValueFor(i, (int32) (1000 * value[i]));
-
+	else if (BChannelSlider *slider = dynamic_cast<BChannelSlider *>(fControl))
 		slider->SetModificationMessage(new BMessage(kMsgParameterChanged));
-	} else
+	else
 		ERROR("ContinuousMessageFilter: unknown continuous parameter view\n");
+
+	// set initial value
+	_UpdateControl();
 }
 
 
@@ -626,32 +620,87 @@
 filter_result 
 ContinuousMessageFilter::Filter(BMessage *message, BHandler **target)
 {
-	BControl *control;
-
-	if (message->what != kMsgParameterChanged
-		|| (control = dynamic_cast<BControl *>(*target)) == NULL)
+	if (*target != fControl)
 		return B_DISPATCH_MESSAGE;
 
-	// update view
-	// ToDo: support for response!
+	// TODO: remove this work-around! We can solve this by subclassing the
+	// slider classes, and start watching in their AttachedToWindow() method
+	if (!fRegistered) {
+		if (BMediaRoster* roster = BMediaRoster::CurrentRoster()) {
+			roster->StartWatching(fControl, fParameter.Web()->Node(),
+				B_MEDIA_NEW_PARAMETER_VALUE);
+		}
+		fRegistered = true;
+	}
+		
+	if (message->what == kMsgParameterChanged) {
+		// update parameter from control
+		// TODO: support for response!
 
-	float value[fParameter.CountChannels()];
+		float value[fParameter.CountChannels()];
 
-	if (BSlider *slider = dynamic_cast<BSlider *>(control)) {
-		value[0] = (float)(slider->Value() / 1000.0);
-	} else if (BChannelSlider *slider = dynamic_cast<BChannelSlider *>(control)) {
-		for (int32 i = 0; i < fParameter.CountChannels(); i++)
-			value[i] = (float)(slider->ValueFor(i) / 1000.0);
+		if (BSlider *slider = dynamic_cast<BSlider *>(fControl)) {
+			value[0] = (float)(slider->Value() / 1000.0);
+		} else if (BChannelSlider *slider
+				= dynamic_cast<BChannelSlider *>(fControl)) {
+			for (int32 i = 0; i < fParameter.CountChannels(); i++)
+				value[i] = (float)(slider->ValueFor(i) / 1000.0);
+		}
+
+		TRACE("ContinuousMessageFilter::Filter: update view %s, %ld "
+			"channels\n", control->Name(), fParameter.CountChannels());
+
+		if (fParameter.SetValue((void *)value, sizeof(value),
+				system_time()) < B_OK) {
+			ERROR("ContinuousMessageFilter::Filter: Could not set parameter "
+				"value for %p\n", &fParameter);
+			return B_DISPATCH_MESSAGE;
+		}
+		return B_SKIP_MESSAGE;
 	}
+	if (message->what == B_MEDIA_NEW_PARAMETER_VALUE) {
+		// update view from parameter -- if the message concerns us
+		const media_node* node;
+		int32 parameterID;
+		ssize_t size;
+		if (message->FindInt32("parameter", &parameterID) != B_OK
+			|| fParameter.ID() != parameterID
+			|| message->FindData("node", B_RAW_TYPE, (const void**)&node,
+					&size) != B_OK
+			|| fParameter.Web()->Node() != *node)
+			return B_DISPATCH_MESSAGE;
 
-	TRACE("ContinuousMessageFilter::Filter: update view %s, %ld channels\n", control->Name(), fParameter.CountChannels());
+		_UpdateControl();
+		return B_SKIP_MESSAGE;
+	}
 
-	if (fParameter.SetValue((void *)value, sizeof(value), system_time()) < B_OK) {
-		ERROR("ContinuousMessageFilter::Filter: Could not set parameter value for %p\n", &fParameter);
-		return B_DISPATCH_MESSAGE;
+	return B_DISPATCH_MESSAGE;
+}
+
+
+void
+ContinuousMessageFilter::_UpdateControl()
+{
+	// TODO: response support!
+
+	float value[fParameter.CountChannels()];
+	size_t size = sizeof(value);
+	if (fParameter.GetValue((void *)&value, &size, NULL) < B_OK) {
+		ERROR("ContinuousMessageFilter: Could not get value for continuous "
+			"parameter %p (name '%s', node %d)\n", &fParameter,
+			fParameter.Name(), (int)fParameter.Web()->Node().node);
+		return;
 	}
 
-	return B_SKIP_MESSAGE;
+	if (BSlider *slider = dynamic_cast<BSlider *>(fControl)) {
+		slider->SetValue((int32) (1000 * value[0]));
+		slider->SetModificationMessage(new BMessage(kMsgParameterChanged));
+	} else if (BChannelSlider *slider
+			= dynamic_cast<BChannelSlider *>(fControl)) {
+		for (int32 i = 0; i < fParameter.CountChannels(); i++) {
+			slider->SetValueFor(i, (int32) (1000 * value[i]));
+		}
+	}
 }
 
 



From axeld at pinc-software.de  Thu Apr  9 21:27:02 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 09 Apr 2009 21:27:02
Subject: [Haiku-commits] r30073 - haiku/trunk/src/bin/desklink
In-Reply-To: <2531396525-BeMail@laptop>
Message-ID: <3245659892-BeMail@quad>

Fran?ois Revol wrote:
> > Log:
> > * The slider now snaps to 0 dB when crossing that to ease finding 
> > the 
> > maximum
> >   volume without distortion.
> > * Added about window.
> I'm not really fond of it yet, guess I'll get used to it...

Hm, you don't like the about window? :-)

Bye,
   Axel.



From axeld at mail.berlios.de  Thu Apr  9 23:40:38 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Thu, 9 Apr 2009 23:40:38 +0200
Subject: [Haiku-commits] r30084 - haiku/trunk/src/bin/desklink
Message-ID: <200904092140.n39LeckY022578@sheep.berlios.de>

Author: axeld
Date: 2009-04-09 23:40:35 +0200 (Thu, 09 Apr 2009)
New Revision: 30084
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30084&view=rev

Modified:
   haiku/trunk/src/bin/desklink/VolumeControl.cpp
Log:
* Fixed the non-working volume update when using the mouse wheel - only
  the slider position was updated, not the actual volume.
* Use InvokeNotify() for wheel changes so that we correctly notify listeners.


Modified: haiku/trunk/src/bin/desklink/VolumeControl.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeControl.cpp	2009-04-09 21:21:42 UTC (rev 30083)
+++ haiku/trunk/src/bin/desklink/VolumeControl.cpp	2009-04-09 21:40:35 UTC (rev 30084)
@@ -245,8 +245,7 @@
 
 			if (newValue != currentValue) {
 				SetValue(newValue);
-				if (ModificationMessage() != NULL)
-					Messenger().SendMessage(ModificationMessage());
+				InvokeNotify(ModificationMessage(), B_CONTROL_MODIFIED);
 			}
 			break;
 		}



From korli at users.berlios.de  Thu Apr  9 23:49:59 2009
From: korli at users.berlios.de (=?ISO-8859-1?B?Suly9G1lIER1dmFs?=)
Date: Thu, 9 Apr 2009 23:49:59 +0200
Subject: [Haiku-commits] r30084 - haiku/trunk/src/bin/desklink
In-Reply-To: <200904092140.n39LeckY022578@sheep.berlios.de>
References: <200904092140.n39LeckY022578@sheep.berlios.de>
Message-ID: <c47b1d430904091449y59b1a22xf6ab2b26a6a1d4b3@mail.gmail.com>

Hi Axel,

2009/4/9  <axeld at mail.berlios.de>:
> Modified:
> ? haiku/trunk/src/bin/desklink/VolumeControl.cpp
> Log:
> * Fixed the non-working volume update when using the mouse wheel - only
> ?the slider position was updated, not the actual volume.
> * Use InvokeNotify() for wheel changes so that we correctly notify listeners.

Thanks for working on this !
I know there was at least one related bug (
http://dev.haiku-os.org/ticket/3118 ). Might be worth having a look.

Bye,
J?r?me


From axeld at mail.berlios.de  Fri Apr 10 00:40:35 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Fri, 10 Apr 2009 00:40:35 +0200
Subject: [Haiku-commits] r30085 -
	haiku/trunk/src/add-ons/kernel/bus_managers/agp_gart
Message-ID: <200904092240.n39MeZkI003562@sheep.berlios.de>

Author: axeld
Date: 2009-04-10 00:40:15 +0200 (Fri, 10 Apr 2009)
New Revision: 30085
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30085&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp
Log:
* Don't try to free the pages area when all you had was a single page (in the
  union).
* This fixes a crash on restart that has been revealed by Oco's change to the
  reboot process.


Modified: haiku/trunk/src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp	2009-04-09 21:40:35 UTC (rev 30084)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp	2009-04-09 22:40:15 UTC (rev 30085)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008, Axel D?rfler, axeld at pinc-software.de. All rights reserved.
+ * Copyright 2008-2009, Axel D?rfler, axeld at pinc-software.de.
  * Copyright 2004-2006, Rudolf Cornelissen. All rights reserved.
  *
  * Distributed under the terms of the MIT License.
@@ -690,14 +690,16 @@
 		for (uint32 i = 0; i < count; i++, page++) {
 			vm_page_set_state(page, PAGE_STATE_FREE);
 		}
+
+		memory->page = NULL;
 	} else {
 		for (uint32 i = 0; i < count; i++) {
 			vm_page_set_state(memory->pages[i], PAGE_STATE_FREE);
 		}
+
+		free(memory->pages);
+		memory->pages = NULL;
 	}
-
-	free(memory->pages);
-	memory->pages = NULL;
 #else
 	delete_area(memory->area);
 	memory->area = -1;



From axeld at pinc-software.de  Thu Apr  9 22:45:44 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Thu, 09 Apr 2009 22:45:44
Subject: [Haiku-commits] r30084 - haiku/trunk/src/bin/desklink
In-Reply-To: <c47b1d430904091449y59b1a22xf6ab2b26a6a1d4b3@mail.gmail.com>
Message-ID: <7967524571-BeMail@quad>

J?r?me Duval wrote:
> 2009/4/9  <axeld at mail.berlios.de>:
> > Modified:
> > ? haiku/trunk/src/bin/desklink/VolumeControl.cpp
> > Log:
> > * Fixed the non-working volume update when using the mouse wheel - 
> > only
> > ?the slider position was updated, not the actual volume.
> > * Use InvokeNotify() for wheel changes so that we correctly notify 
> > listeners.
> Thanks for working on this !
> I know there was at least one related bug (
> http://dev.haiku-os.org/ticket/3118 ). Might be worth having a look.

I am not sure if an actual tooltip was requested (as the current volume 
is now shown while changing). In any case, I left it open, thanks for 
the note!

Bye,
   Axel.



From anevilyak at mail.berlios.de  Fri Apr 10 01:14:11 2009
From: anevilyak at mail.berlios.de (anevilyak at BerliOS)
Date: Fri, 10 Apr 2009 01:14:11 +0200
Subject: [Haiku-commits] r30086 -
	haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse
Message-ID: <200904092314.n39NEBEC026598@sheep.berlios.de>

Author: anevilyak
Date: 2009-04-10 01:14:09 +0200 (Fri, 10 Apr 2009)
New Revision: 30086
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30086&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c
Log:
gcc4 build fix.


Modified: haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c	2009-04-09 22:40:15 UTC (rev 30085)
+++ haiku/trunk/src/add-ons/kernel/file_systems/userlandfs/server/fuse/fuse_config.c	2009-04-09 23:14:09 UTC (rev 30086)
@@ -8,6 +8,7 @@
 
 #include "fuse_config.h"
 
+#include <string.h>
 
 enum {
 	KEY_KERN_FLAG,



From stippi at mail.berlios.de  Fri Apr 10 01:46:42 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 10 Apr 2009 01:46:42 +0200
Subject: [Haiku-commits] r30087 - haiku/trunk/src/apps/drivesetup
Message-ID: <200904092346.n39NkgsI027382@sheep.berlios.de>

Author: stippi
Date: 2009-04-10 01:46:38 +0200 (Fri, 10 Apr 2009)
New Revision: 30087
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30087&view=rev

Modified:
   haiku/trunk/src/apps/drivesetup/MainWindow.cpp
   haiku/trunk/src/apps/drivesetup/PartitionList.cpp
Log:
Small style cleanups.


Modified: haiku/trunk/src/apps/drivesetup/MainWindow.cpp
===================================================================
--- haiku/trunk/src/apps/drivesetup/MainWindow.cpp	2009-04-09 23:14:09 UTC (rev 30086)
+++ haiku/trunk/src/apps/drivesetup/MainWindow.cpp	2009-04-09 23:46:38 UTC (rev 30087)
@@ -155,7 +155,8 @@
 	BMenuBar* menuBar = new BMenuBar(Bounds(), "root menu");
 
 	// create all the menu items
-	fFormatMI = new BMenuItem("Format (not implemented)", new BMessage(MSG_FORMAT));
+	fFormatMI = new BMenuItem("Format (not implemented)",
+		new BMessage(MSG_FORMAT));
 	fEjectMI = new BMenuItem("Eject", new BMessage(MSG_EJECT), 'E');
 	fSurfaceTestMI = new BMenuItem("Surface Test (not implemented)",
 		new BMessage(MSG_SURFACE_TEST));

Modified: haiku/trunk/src/apps/drivesetup/PartitionList.cpp
===================================================================
--- haiku/trunk/src/apps/drivesetup/PartitionList.cpp	2009-04-09 23:14:09 UTC (rev 30086)
+++ haiku/trunk/src/apps/drivesetup/PartitionList.cpp	2009-04-09 23:46:38 UTC (rev 30087)
@@ -240,6 +240,9 @@
 }
 
 
+// #pragma mark - PartitionListView
+
+
 PartitionListView::PartitionListView(const BRect& frame, uint32 resizeMode)
 	: Inherited(frame, "storagelist", resizeMode, 0, B_NO_BORDER, true)
 {



From stippi at mail.berlios.de  Fri Apr 10 01:47:19 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 10 Apr 2009 01:47:19 +0200
Subject: [Haiku-commits] r30088 - haiku/trunk/headers/os/interface
Message-ID: <200904092347.n39NlJ3M027842@sheep.berlios.de>

Author: stippi
Date: 2009-04-10 01:47:17 +0200 (Fri, 10 Apr 2009)
New Revision: 30088
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30088&view=rev

Modified:
   haiku/trunk/headers/os/interface/Region.h
Log:
Small style cleanups again...


Modified: haiku/trunk/headers/os/interface/Region.h
===================================================================
--- haiku/trunk/headers/os/interface/Region.h	2009-04-09 23:46:38 UTC (rev 30087)
+++ haiku/trunk/headers/os/interface/Region.h	2009-04-09 23:47:17 UTC (rev 30088)
@@ -25,7 +25,7 @@
 
 
 class BRegion {
- public:
+public:
 								BRegion();
 								BRegion(const BRegion& region);
 								BRegion(const BRect rect);
@@ -73,7 +73,7 @@
 
 			void				ExclusiveInclude(const BRegion* region);
 
- private:
+private:
 	friend class BDirectWindow;
 	friend class BPrivate::ServerLink;
 	friend class BPrivate::LinkReceiver;
@@ -81,7 +81,7 @@
 	class Support;
 	friend class Support;
 
- private:
+private:
 								BRegion(const clipping_rect& rect);
 
 			void				_AdoptRegionData(BRegion& region);
@@ -92,7 +92,7 @@
 			clipping_rect		_ConvertToInternal(
 									const clipping_rect& rect) const;
 
- private:
+private:
 			long				fCount;
 			long				fDataSize;
 			clipping_rect		fBounds;



From stippi at mail.berlios.de  Fri Apr 10 01:47:57 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 10 Apr 2009 01:47:57 +0200
Subject: [Haiku-commits] r30089 - haiku/trunk/src/kits/interface
Message-ID: <200904092347.n39NlvnK029300@sheep.berlios.de>

Author: stippi
Date: 2009-04-10 01:47:54 +0200 (Fri, 10 Apr 2009)
New Revision: 30089
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30089&view=rev

Modified:
   haiku/trunk/src/kits/interface/ControlLook.cpp
Log:
Also draw the scroll corner when there is no border.


Modified: haiku/trunk/src/kits/interface/ControlLook.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ControlLook.cpp	2009-04-09 23:47:17 UTC (rev 30088)
+++ haiku/trunk/src/kits/interface/ControlLook.cpp	2009-04-09 23:47:54 UTC (rev 30089)
@@ -696,13 +696,6 @@
 	BRect horizontalScrollBarFrame, const rgb_color& base,
 	border_style border, uint32 flags, uint32 _borders)
 {
-	if (border == B_NO_BORDER)
-		return;
-
-	bool excludeScrollCorner = border == B_FANCY_BORDER
-		&& horizontalScrollBarFrame.IsValid()
-		&& verticalScrollBarFrame.IsValid();
-
 	// calculate scroll corner rect before messing with the "rect"
 	BRect scrollCornerFillRect(rect.right, rect.bottom,
 		rect.right, rect.bottom);
@@ -711,6 +704,18 @@
 	if (verticalScrollBarFrame.IsValid())
 		scrollCornerFillRect.top = verticalScrollBarFrame.bottom + 1;
 
+	if (border == B_NO_BORDER) {
+		if (scrollCornerFillRect.IsValid()) {
+			view->SetHighColor(base);
+			view->FillRect(scrollCornerFillRect);
+		}
+		return;
+	}
+
+	bool excludeScrollCorner = border == B_FANCY_BORDER
+		&& horizontalScrollBarFrame.IsValid()
+		&& verticalScrollBarFrame.IsValid();
+
 	uint32 borders = _borders;
 	if (excludeScrollCorner) {
 		rect.bottom = horizontalScrollBarFrame.top;



From stippi at mail.berlios.de  Fri Apr 10 01:49:52 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 10 Apr 2009 01:49:52 +0200
Subject: [Haiku-commits] r30090 - haiku/trunk/src/kits/interface
Message-ID: <200904092349.n39Nnq2e000350@sheep.berlios.de>

Author: stippi
Date: 2009-04-10 01:49:49 +0200 (Fri, 10 Apr 2009)
New Revision: 30090
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30090&view=rev

Modified:
   haiku/trunk/src/kits/interface/ColumnListView.cpp
Log:
Fixes for the B_NO_BORDER LOOK:
* Draw the left/top border anyways, since it just looks bad with scrollbars
  where the frame cannot be turned off. But, don't draw the focus indication
  in this mode.
* Fixed layout of the views for B_NO_BORDER_LOOK. There was a one pixel
  overlap.


Modified: haiku/trunk/src/kits/interface/ColumnListView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ColumnListView.cpp	2009-04-09 23:47:54 UTC (rev 30089)
+++ haiku/trunk/src/kits/interface/ColumnListView.cpp	2009-04-09 23:49:49 UTC (rev 30090)
@@ -1539,11 +1539,10 @@
 	if (fBorderStyle != B_NO_BORDER) {
 		// Redraw focus marks around view
 		Invalidate();
+		fHorizontalScrollBar->SetBorderHighlighted(isFocus);
+		fVerticalScrollBar->SetBorderHighlighted(isFocus);
 	}
 
-	fHorizontalScrollBar->SetBorderHighlighted(isFocus);
-	fVerticalScrollBar->SetBorderHighlighted(isFocus);
-
 	BView::MakeFocus(isFocus);
 }
 
@@ -1696,9 +1695,23 @@
 		if (!fHorizontalScrollBar->IsHidden())
 			horizontalScrollBarFrame = fHorizontalScrollBar->Frame();
 
+		if (fBorderStyle == B_NO_BORDER) {
+			// We still draw the left/top border, but not focused.
+			// The scrollbars cannot be displayed without frame and
+			// it looks bad to have no frame only along the left/top
+			// side.
+			rgb_color borderColor = tint_color(base, B_DARKEN_2_TINT);
+			SetHighColor(borderColor);
+			StrokeLine(BPoint(rect.left, rect.bottom),
+				BPoint(rect.left, rect.top));
+			StrokeLine(BPoint(rect.left + 1, rect.top),
+				BPoint(rect.right, rect.top));
+		}
+
 		be_control_look->DrawScrollViewFrame(this, rect, updateRect,
 			verticalScrollBarFrame, horizontalScrollBarFrame,
 			base, fBorderStyle, flags);
+
 		return;
 	}
 
@@ -1960,7 +1973,7 @@
 	hScrollBarRect.right -= B_V_SCROLL_BAR_WIDTH;
 
 	// Adjust stuff so the border will fit.
-	if (fBorderStyle == B_PLAIN_BORDER) {
+	if (fBorderStyle == B_PLAIN_BORDER || fBorderStyle == B_NO_BORDER) {
 		titleRect.InsetBy(1, 0);
 		titleRect.OffsetBy(0, 1);
 		outlineRect.InsetBy(1, 1);



From mmlr at mail.berlios.de  Fri Apr 10 02:14:10 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Fri, 10 Apr 2009 02:14:10 +0200
Subject: [Haiku-commits] r30091 -
	haiku/trunk/src/add-ons/kernel/bus_managers/ata
Message-ID: <200904100014.n3A0EA4D014070@sheep.berlios.de>

Author: mmlr
Date: 2009-04-10 02:14:07 +0200 (Fri, 10 Apr 2009)
New Revision: 30091
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30091&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp
Log:
* Fix race condition between finishing a request and returning a busy status
  when the channel is in use, which would cause the SCSI scheduler to stop
  sending requests.
* Indeed we need to return a status from the interrupt handler, as for PIO
  transfers there is no way of knowning whether or not the interrupt at hand
  was ours.
* Add some debug output.


Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-09 23:49:49 UTC (rev 30090)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-10 00:14:07 UTC (rev 30091)
@@ -222,15 +222,16 @@
 ATAChannel::ExecuteIO(scsi_ccb *ccb)
 {
 	TRACE_FUNCTION("%p\n", ccb);
-	if (mutex_trylock(&fExecutionLock) != B_OK)
+	if (mutex_trylock(&fExecutionLock) != B_OK) {
+		TRACE("channel is busy\n");
 		return B_BUSY;
+	}
 
-	MutexLocker _(&fExecutionLock, true);
-
 	fRequest->SetCCB(ccb);
 	if (ccb->cdb[0] == SCSI_OP_REQUEST_SENSE) {
+		TRACE("request sense\n");
 		fRequest->RequestSense();
-		fRequest->Finish(false);
+		fRequest->Finish(false, &fExecutionLock);
 		return B_OK;
 	}
 
@@ -240,7 +241,7 @@
 	if (ccb->target_id >= fDeviceCount) {
 		TRACE_ERROR("invalid target device\n");
 		fRequest->SetStatus(SCSI_SEL_TIMEOUT);
-		fRequest->Finish(false);
+		fRequest->Finish(false, &fExecutionLock);
 		return B_BAD_INDEX;
 	}
 
@@ -248,7 +249,7 @@
 	if (device == NULL) {
 		TRACE_ERROR("target device not present\n");
 		fRequest->SetStatus(SCSI_SEL_TIMEOUT);
-		fRequest->Finish(false);
+		fRequest->Finish(false, &fExecutionLock);
 		return B_BAD_INDEX;
 	}
 
@@ -256,7 +257,7 @@
 		: ATA_STANDARD_TIMEOUT);
 
 	status_t result = device->ExecuteIO(fRequest);
-	fRequest->Finish(false);
+	fRequest->Finish(false, &fExecutionLock);
 	return result;
 }
 
@@ -554,7 +555,8 @@
 		return B_OK;
 
 	request->SetStatus(SCSI_SEQUENCE_FAIL);
-	TRACE_ERROR("command failed, error bit is set\n");
+	TRACE_ERROR("command failed, error bit is set: 0x%02x\n",
+		taskFile->read.error);
 	uint8 error = taskFile->read.error & errorMask;
 	if (error & ATA_ERROR_INTERFACE_CRC) {
 		TRACE_ERROR("interface crc error\n");
@@ -702,21 +704,22 @@
 }
 
 
-void
+status_t
 ATAChannel::Interrupt(uint8 status)
 {
 	SpinLocker locker(fInterruptLock);
 	if (!fExpectsInterrupt) {
-		TRACE_ERROR("interrupt when not expecting transfer\n");
-		return;
+		TRACE("interrupt when not expecting transfer\n");
+		return B_UNHANDLED_INTERRUPT;
 	}
 
 	if ((status & ATA_STATUS_BUSY) != 0) {
-		TRACE_ERROR(("interrupt while device is busy\n"));
-		return;
+		TRACE(("interrupt while device is busy\n"));
+		return B_UNHANDLED_INTERRUPT;
 	}
 
 	fInterruptCondition.NotifyAll();
+	return B_HANDLED_INTERRUPT;
 }
 
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-09 23:49:49 UTC (rev 30090)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-10 00:14:07 UTC (rev 30091)
@@ -23,9 +23,6 @@
 {
 	memset(&fInfoBlock, 0, sizeof(fInfoBlock));
 	memset(&fTaskFile, 0, sizeof(fTaskFile));
-
-	snprintf(fDebugContext, sizeof(fDebugContext), "%s %lu-%u",
-		IsATAPI() ? "pi " : "", channel->ChannelID(), index);
 }
 
 
@@ -464,6 +461,9 @@
 status_t
 ATADevice::Identify()
 {
+	snprintf(fDebugContext, sizeof(fDebugContext), "%s %lu-%u",
+		IsATAPI() ? "pi " : "", fChannel->ChannelID(), fIndex);
+
 	ATARequest request;
 	request.SetDevice(this);
 	request.SetTimeout(20 * 1000 * 1000);
@@ -564,8 +564,10 @@
 			}
 		}
 	} else {
-		if (fChannel->ExecutePIOTransfer(request) != B_OK)
+		if (fChannel->ExecutePIOTransfer(request) != B_OK) {
+			TRACE_ERROR("executing pio transfer failed\n");
 			request->SetStatus(SCSI_SEQUENCE_FAIL);
+		}
 	}
 
 	return fChannel->FinishRequest(request, ATA_WAIT_FINISH

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp	2009-04-09 23:49:49 UTC (rev 30090)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp	2009-04-10 00:14:07 UTC (rev 30091)
@@ -206,12 +206,7 @@
 ata_interrupt_handler(void *cookie, uint8 status)
 {
 	ATAChannel *channel = (ATAChannel *)cookie;
-	channel->Interrupt(status);
-
-	// the controller driver already checks if its interrupt status indicates
-	// that the interrupt was for this device, so we are only here if that's
-	// the case.
-	return B_HANDLED_INTERRUPT;
+	return channel->Interrupt(status);
 }
 
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-09 23:49:49 UTC (rev 30090)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-10 00:14:07 UTC (rev 30091)
@@ -107,7 +107,7 @@
 		status_t					ReadPIO(uint8 *buffer, size_t length);
 		status_t					WritePIO(uint8 *buffer, size_t length);
 
-		void						Interrupt(uint8 status);
+		status_t					Interrupt(uint8 status);
 
 private:
 		status_t					_ReadRegs(ata_task_file *taskFile,
@@ -266,7 +266,8 @@
 		void						SetBlocksLeft(uint32 blocksLeft);
 		uint32 *					BlocksLeft() { return &fBlocksLeft; };
 
-		status_t					Finish(bool resubmit);
+		status_t					Finish(bool resubmit,
+										mutex *mutexToUnlock);
 
 		// SCSI stuff
 		void						SetCCB(scsi_ccb *ccb);

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp	2009-04-09 23:49:49 UTC (rev 30090)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp	2009-04-10 00:14:07 UTC (rev 30091)
@@ -76,7 +76,7 @@
 
 
 status_t
-ATARequest::Finish(bool resubmit)
+ATARequest::Finish(bool resubmit, mutex *mutexToUnlock)
 {
 	// when the request completed and has set sense
     // data, report this to the scsi stack by setting
@@ -102,6 +102,8 @@
 	} else
 		fCCB->subsys_status = fStatus;
 
+	mutex_unlock(mutexToUnlock);
+
 	if (resubmit)
 		gSCSIModule->resubmit(fCCB);
 	else



From anevilyak at gmail.com  Fri Apr 10 03:55:31 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Thu, 9 Apr 2009 20:55:31 -0500
Subject: [Haiku-commits] r30091 -
	haiku/trunk/src/add-ons/kernel/bus_managers/ata
In-Reply-To: <200904100014.n3A0EA4D014070@sheep.berlios.de>
References: <200904100014.n3A0EA4D014070@sheep.berlios.de>
Message-ID: <f019d2f30904091855n4bf2167cu51e05995b9f6bbd9@mail.gmail.com>

On Thu, Apr 9, 2009 at 7:14 PM,  <mmlr at mail.berlios.de> wrote:
> Author: mmlr
> Date: 2009-04-10 02:14:07 +0200 (Fri, 10 Apr 2009)
> New Revision: 30091
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30091&view=rev
>
> Modified:
> ? haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
> ? haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
> ? haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp
> ? haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
> ? haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp
> Log:
> * Fix race condition between finishing a request and returning a busy status
> ?when the channel is in use, which would cause the SCSI scheduler to stop
> ?sending requests.
> * Indeed we need to return a status from the interrupt handler, as for PIO
> ?transfers there is no way of knowning whether or not the interrupt at hand
> ?was ours.
> * Add some debug output.

I'm curious, does swapping the ide and ata subdirs in
bus_managers/Jamfile currently result in this bus manager being
included in the image? If so, it now seems to work here, though ATAPI
still seems to be a no-go (I see neither the CD drive, nor any error
messages in syslog).

Regards.

Rene


From anevilyak at gmail.com  Fri Apr 10 04:03:11 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Thu, 9 Apr 2009 21:03:11 -0500
Subject: [Haiku-commits] r30091 -
	haiku/trunk/src/add-ons/kernel/bus_managers/ata
In-Reply-To: <f019d2f30904091855n4bf2167cu51e05995b9f6bbd9@mail.gmail.com>
References: <200904100014.n3A0EA4D014070@sheep.berlios.de>
	<f019d2f30904091855n4bf2167cu51e05995b9f6bbd9@mail.gmail.com>
Message-ID: <f019d2f30904091903jdeb2b56y6c06fac26053e863@mail.gmail.com>

On Thu, Apr 9, 2009 at 8:55 PM, Rene Gollent <anevilyak at gmail.com> wrote:
> I'm curious, does swapping the ide and ata subdirs in
> bus_managers/Jamfile currently result in this bus manager being
> included in the image? If so, it now seems to work here, though ATAPI
> still seems to be a no-go (I see neither the CD drive, nor any error
> messages in syslog).

Never mind, I see now it's a separate target.

Regards,

Rene


From anevilyak at gmail.com  Fri Apr 10 04:13:10 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Thu, 9 Apr 2009 21:13:10 -0500
Subject: [Haiku-commits] r30091 -
	haiku/trunk/src/add-ons/kernel/bus_managers/ata
In-Reply-To: <f019d2f30904091903jdeb2b56y6c06fac26053e863@mail.gmail.com>
References: <200904100014.n3A0EA4D014070@sheep.berlios.de>
	<f019d2f30904091855n4bf2167cu51e05995b9f6bbd9@mail.gmail.com>
	<f019d2f30904091903jdeb2b56y6c06fac26053e863@mail.gmail.com>
Message-ID: <f019d2f30904091913w18486951u61a4a9373698c953@mail.gmail.com>

On Thu, Apr 9, 2009 at 9:03 PM, Rene Gollent <anevilyak at gmail.com> wrote:
> Never mind, I see now it's a separate target.
>

Appears to work here, even the CD drive browses correctly! Seems quite
a bit slower than ide still though, and there was a *very* long pause
after it detected the CD drive at the 4th boot icon. Anything that
might be helpful there? This is a controller that's enabled via
legacy_sata (nforce4).

Regards,

Rene


From umccullough at gmail.com  Fri Apr 10 04:17:55 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Thu, 9 Apr 2009 19:17:55 -0700
Subject: [Haiku-commits] r30050 - in haiku/trunk/src/kits/opengl: . mesa
	mesa/glapi
In-Reply-To: <1e80d8750904090911y4c1e0dc4p44af38942b7eadd1@mail.gmail.com>
References: <ce99af780904090325g538f31b7n38fb6dee72f4f7a2@mail.gmail.com>
	<1e80d8750904090911y4c1e0dc4p44af38942b7eadd1@mail.gmail.com>
Message-ID: <1e80d8750904091917i970864ama641b9c786507d46@mail.gmail.com>

On Thu, Apr 9, 2009 at 9:11 AM, Urias McCullough <umccullough at gmail.com> wrote:
> Patch is here currently:
> ftp://ftp.binarychicken.com/umccullough/opengl-ppc-fix.diff

Updated the patch above. I removed the UserlandFS fix for gcc4 since
that was committed in the meantime.

I also changed the #if logic that includes endian.h to be less hacky.

- Urias


From anevilyak at gmail.com  Fri Apr 10 04:19:22 2009
From: anevilyak at gmail.com (Rene Gollent)
Date: Thu, 9 Apr 2009 21:19:22 -0500
Subject: [Haiku-commits] r30091 -
	haiku/trunk/src/add-ons/kernel/bus_managers/ata
In-Reply-To: <f019d2f30904091913w18486951u61a4a9373698c953@mail.gmail.com>
References: <200904100014.n3A0EA4D014070@sheep.berlios.de>
	<f019d2f30904091855n4bf2167cu51e05995b9f6bbd9@mail.gmail.com>
	<f019d2f30904091903jdeb2b56y6c06fac26053e863@mail.gmail.com>
	<f019d2f30904091913w18486951u61a4a9373698c953@mail.gmail.com>
Message-ID: <f019d2f30904091919o578451eeme602391f020cdc73@mail.gmail.com>

On Thu, Apr 9, 2009 at 9:13 PM, Rene Gollent <anevilyak at gmail.com> wrote:
> Appears to work here, even the CD drive browses correctly! Seems quite
> a bit slower than ide still though, and there was a *very* long pause
> after it detected the CD drive at the 4th boot icon. Anything that
> might be helpful there? This is a controller that's enabled via
> legacy_sata (nforce4).

To be exact...

ata 4: identified ATAPI device 0
ata 4 error: device ready not set

-- Here it sat for around 20 seconds or so.

ata 4-1 error: sending identify request failed
atapi  4-1 error: timeout waiting for identify request
ata 4 error: pio read: discarding after 96 bytes
publish device: node 0x811be730, path disk/scsi/4/0/0/raw, module
drivers/disk/scsi/scsi_cd/device_v1

Regards,

Rene


From phoudoin at mail.berlios.de  Fri Apr 10 04:53:45 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Fri, 10 Apr 2009 04:53:45 +0200
Subject: [Haiku-commits] r30092 -
	haiku/trunk/src/add-ons/opengl/mesa_software_renderer
Message-ID: <200904100253.n3A2rjiY030552@sheep.berlios.de>

Author: phoudoin
Date: 2009-04-10 04:53:41 +0200 (Fri, 10 Apr 2009)
New Revision: 30092
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30092&view=rev

Modified:
   haiku/trunk/src/add-ons/opengl/mesa_software_renderer/Jamfile
Log:
Forgot to enable SPARC assembly support there too. Still UNTESTED.


Modified: haiku/trunk/src/add-ons/opengl/mesa_software_renderer/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/opengl/mesa_software_renderer/Jamfile	2009-04-10 00:14:07 UTC (rev 30091)
+++ haiku/trunk/src/add-ons/opengl/mesa_software_renderer/Jamfile	2009-04-10 02:53:41 UTC (rev 30092)
@@ -9,17 +9,19 @@
 
 
 {
-        local defines ;
-        defines = BEOS_THREADS GNU_ASSEMBLER ;
+	local defines ;
+	defines = BEOS_THREADS GNU_ASSEMBLER ;
 
-        if $(TARGET_ARCH) = x86 {
-                defines += USE_X86_ASM USE_MMX_ASM USE_3DNOW_ASM USE_SSE_ASM ; 
-        } else {
-                # Not yet supported, as current Mesa3D PPC assembly is Linux-dependent!
-                # defines += USE_PPC_ASM ;
-        }
+	if $(TARGET_ARCH) = x86 {
+		defines += USE_X86_ASM USE_MMX_ASM USE_3DNOW_ASM USE_SSE_ASM ; 
+	} else if $(TARGET_ARCH) = ppc {
+		# Not yet supported, as current Mesa3D PPC assembly is Linux-dependent!
+		# defines += USE_PPC_ASM ;
+	} else if $(TARGET_ARCH) = sparc {
+		defines += USE_SPARC_ASM ;
+	}
 
-        SubDirC++Flags [ FDefines $(defines) ] ;
+	SubDirC++Flags [ FDefines $(defines) ] ;
 }
 
 UsePrivateHeaders interface opengl ;
@@ -30,6 +32,7 @@
 UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa tnl ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa x86 ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa ppc ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa sparc ] ;
 
 Addon Mesa\ Software\ Renderer :
 	MesaSoftwareRenderer.cpp



From phoudoin at mail.berlios.de  Fri Apr 10 04:56:31 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Fri, 10 Apr 2009 04:56:31 +0200
Subject: [Haiku-commits] r30093 - in haiku/trunk/src/kits/opengl/mesa: . main
Message-ID: <200904100256.n3A2uVlf030682@sheep.berlios.de>

Author: phoudoin
Date: 2009-04-10 04:56:26 +0200 (Fri, 10 Apr 2009)
New Revision: 30093
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30093&view=rev

Modified:
   haiku/trunk/src/kits/opengl/mesa/Jamfile
   haiku/trunk/src/kits/opengl/mesa/main/glheader.h
Log:
* Removed dispatch.c from glapi-dispatching.o: GLDispatcher.cpp does 
  the job instead of dispatch.c.
* Fixed BYTE_ORDER support for BIG_ENDIAN targets (PPC).


Modified: haiku/trunk/src/kits/opengl/mesa/Jamfile
===================================================================
--- haiku/trunk/src/kits/opengl/mesa/Jamfile	2009-04-10 02:53:41 UTC (rev 30092)
+++ haiku/trunk/src/kits/opengl/mesa/Jamfile	2009-04-10 02:56:26 UTC (rev 30093)
@@ -352,7 +352,6 @@
 
 MergeObject <mesa>glapi-dispatching.o :
 
-	dispatch.c
 	glapi.c
 	glthread.c
 

Modified: haiku/trunk/src/kits/opengl/mesa/main/glheader.h
===================================================================
--- haiku/trunk/src/kits/opengl/mesa/main/glheader.h	2009-04-10 02:53:41 UTC (rev 30092)
+++ haiku/trunk/src/kits/opengl/mesa/main/glheader.h	2009-04-10 02:56:26 UTC (rev 30093)
@@ -142,17 +142,20 @@
  * For now, only used by some DRI hardware drivers for color/texel packing.
  */
 #if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
-#if defined(__linux__)
-#include <byteswap.h>
-#define CPU_TO_LE32( x )	bswap_32( x )
-#else /*__linux__*/
-#include <sys/endian.h>
-#define CPU_TO_LE32( x )	bswap32( x )
-#endif /*__linux__*/
-#define MESA_BIG_ENDIAN 1
+	#if defined(__linux__)
+		#include <byteswap.h>
+		#define CPU_TO_LE32( x )	bswap_32( x )
+	#elif defined(__BEOS__) || defined(__HAIKU__) 
+		#include <ByteOrder.h>
+		#define CPU_TO_LE32( x )	B_HOST_TO_LENDIAN_INT32( x )
+	#else
+		#include <sys/endian.h>
+		#define CPU_TO_LE32( x )	bswap32( x )
+	#endif
+	#define MESA_BIG_ENDIAN 1
 #else
-#define CPU_TO_LE32( x )	( x )
-#define MESA_LITTLE_ENDIAN 1
+	#define CPU_TO_LE32( x )	( x )
+	#define MESA_LITTLE_ENDIAN 1
 #endif
 #define LE32_TO_CPU( x )	CPU_TO_LE32( x )
 



From phoudoin at mail.berlios.de  Fri Apr 10 05:09:12 2009
From: phoudoin at mail.berlios.de (phoudoin at mail.berlios.de)
Date: Fri, 10 Apr 2009 05:09:12 +0200
Subject: [Haiku-commits] r30094 - haiku/trunk/build/jam
Message-ID: <200904100309.n3A39CYX002195@sheep.berlios.de>

Author: phoudoin
Date: 2009-04-10 05:09:05 +0200 (Fri, 10 Apr 2009)
New Revision: 30094
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30094&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
As Urias reports, OpenGL kit and stuffs build on PPC target too now, so let's add
them to the image. Thanks Urias for testing, submitting patches and... being 
patient ;)


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-10 02:56:26 UTC (rev 30093)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-10 03:09:05 UTC (rev 30094)
@@ -59,14 +59,14 @@
 	ScreenSaver Sounds Time Touchpad <preference>Tracker VirtualMemory
 ;
 SYSTEM_DEMOS = BSnow Chart Clock $(X86_ONLY)Cortex FontDemo
-	$(X86_ONLY)GLDirectMode $(X86_ONLY)GLTeapot Mandelbrot Pairs
+	GLDirectMode GLTeapot Mandelbrot Pairs
 	Playground Pulse Sudoku Gradients
 ;
 SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
 	libtranslation.so libbnetapi.so libnetwork.so libdebug.so libbsd.so
 	libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so
 	libmidi2.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so
-	$(X86_ONLY)libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so
+	libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so
 	libilmimf.so libiconv.so
 ;
 SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server
@@ -119,7 +119,7 @@
 SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port
 	Print\ To\ File Serial\ Port USB\ Port
 ;
-SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow $(X86_ONLY)Flurry Haiku IFS Spider Message ;
+SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow Flurry Haiku IFS Spider Message ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ;
 SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
@@ -417,7 +417,7 @@
 AddFilesToHaikuImage system add-ons accelerants
 	: $(SYSTEM_ADD_ONS_ACCELERANTS) ;
 AddFilesToHaikuImage system add-ons opengl
-	: $(X86_ONLY)Mesa\ Software\ Renderer ;
+	: Mesa\ Software\ Renderer ;
 AddFilesToHaikuImage system add-ons Translators
 	: $(SYSTEM_ADD_ONS_TRANSLATORS) ;
 AddFilesToHaikuImage system add-ons mail_daemon inbound_protocols : POP3 IMAP ;



From dlmcpaul at mail.berlios.de  Fri Apr 10 05:15:17 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Fri, 10 Apr 2009 05:15:17 +0200
Subject: [Haiku-commits] r30095 - haiku/trunk/src/add-ons/media/plugins
Message-ID: <200904100315.n3A3FHbX003042@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-10 05:15:16 +0200 (Fri, 10 Apr 2009)
New Revision: 30095
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30095&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/Jamfile
Log:
Include APE_reader in build

Modified: haiku/trunk/src/add-ons/media/plugins/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/Jamfile	2009-04-10 03:09:05 UTC (rev 30094)
+++ haiku/trunk/src/add-ons/media/plugins/Jamfile	2009-04-10 03:15:16 UTC (rev 30095)
@@ -7,6 +7,7 @@
 SubInclude HAIKU_TOP src add-ons media plugins avi_reader ;
 SubInclude HAIKU_TOP src add-ons media plugins mp3_reader ;
 SubInclude HAIKU_TOP src add-ons media plugins wav_reader ;
+SubInclude HAIKU_TOP src add-ons media plugins APE_reader ;
 
 SubInclude HAIKU_TOP src add-ons media plugins matroska ;
 SubInclude HAIKU_TOP src add-ons media plugins musepack ;



From dlmcpaul at mail.berlios.de  Fri Apr 10 05:21:08 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Fri, 10 Apr 2009 05:21:08 +0200
Subject: [Haiku-commits] r30096 - haiku/trunk/build/jam
Message-ID: <200904100321.n3A3L8l8003383@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-10 05:21:06 +0200 (Fri, 10 Apr 2009)
New Revision: 30096
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30096&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/build/jam/MainBuildRules
Log:
use yasm instead of nasm

Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-10 03:15:16 UTC (rev 30095)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-10 03:21:06 UTC (rev 30096)
@@ -110,6 +110,7 @@
 	mp3_decoder mp3_reader
 	mp4_reader musepack
 	ogg raw_decoder speex
+	$(X86_ONLY)APE_reader
 	# theora
 	vorbis wav_reader
 ;

Modified: haiku/trunk/build/jam/MainBuildRules
===================================================================
--- haiku/trunk/build/jam/MainBuildRules	2009-04-10 03:15:16 UTC (rev 30095)
+++ haiku/trunk/build/jam/MainBuildRules	2009-04-10 03:21:06 UTC (rev 30096)
@@ -174,7 +174,7 @@
 
 actions AssembleNasm
 {
-	nasm -d $(ASFLAGS) -f elf -o $(1) $(2)
+	yasm -d $(ASFLAGS) -f elf -o $(1) $(2)
 }
 
 rule Ld



From dlmcpaul at mail.berlios.de  Fri Apr 10 05:21:58 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Fri, 10 Apr 2009 05:21:58 +0200
Subject: [Haiku-commits] r30097 - in
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
Message-ID: <200904100321.n3A3Lwn0003487@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-10 05:21:56 +0200 (Fri, 10 Apr 2009)
New Revision: 30097
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30097&view=rev

Added:
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_yasm.nasm
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_mmx.nasm
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_deblock_sse2.nasm
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.nasm
Removed:
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_yasm.asm
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_mmx.asm
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_deblock_sse2.asm
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.asm
Modified:
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/config.h
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/cavsdsp_mmx.c
Log:
Build avcodec with assembly targets using yasm

Modified: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile	2009-04-10 03:21:06 UTC (rev 30096)
+++ haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile	2009-04-10 03:21:56 UTC (rev 30097)
@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src add-ons media plugins avcodec libavcodec ;
 
 SubDirHdrs [ FDirName $(SUBDIR) .. ] ;
+SubDirHdrs [ FDirName $(SUBDIR) x86 ] ;
 SubDirHdrs [ FDirName $(SUBDIR) ../libavutil ] ;
 SubDirHdrs [ FDirName $(SUBDIR) ../libswscale ] ;
 
@@ -281,4 +282,26 @@
 	xl.c
 	xsubdec.c
 	zmbv.c
+	x86/cpuid.c
+	x86/cavsdsp_mmx.c
+	x86/idct_mmx.c
+	x86/idct_mmx_xvid.c
+	x86/idct_sse2_xvid.c
+	x86/dsputil_mmx.c
+	x86/fft_sse.c
+	x86/h264_idct_sse2.nasm
+	x86/h264_deblock_sse2.nasm
+	x86/fft_mmx.nasm
+	x86/dsputil_yasm.nasm
+	x86/simple_idct_mmx.c
+	x86/motion_est_mmx.c
+	x86/mpegvideo_mmx.c
+	x86/rv40dsp_mmx.c
+	x86/vc1dsp_mmx.c
+	x86/vp3dsp_mmx.c
+	x86/vp3dsp_sse2.c
+	x86/vp6dsp_mmx.c
+	x86/vp6dsp_sse2.c
+	x86/fft_sse.c
+	x86/fdct_mmx.c
 ;

Modified: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/config.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/config.h	2009-04-10 03:21:06 UTC (rev 30096)
+++ haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/config.h	2009-04-10 03:21:56 UTC (rev 30097)
@@ -27,12 +27,12 @@
 #define HAVE_ARMVFP 0
 #define HAVE_IWMMXT 0
 #define HAVE_MMI 0
-#define HAVE_MMX 0
-#define HAVE_MMX2 0
+#define HAVE_MMX 1
+#define HAVE_MMX2 1
 #define HAVE_NEON 0
 #define HAVE_PPC4XX 0
-#define HAVE_SSE 0
-#define HAVE_SSSE3 0
+#define HAVE_SSE 1
+#define HAVE_SSSE3 1
 #define HAVE_VIS 0
 #define HAVE_BEOSTHREADS 0
 #define HAVE_OS2THREADS 0

Modified: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/cavsdsp_mmx.c
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/cavsdsp_mmx.c	2009-04-10 03:21:06 UTC (rev 30096)
+++ haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/cavsdsp_mmx.c	2009-04-10 03:21:56 UTC (rev 30097)
@@ -423,10 +423,12 @@
 "pavgb " #temp ", " #a "          \n\t"\
 "mov" #size " " #a ", " #b "      \n\t"
 
+#ifndef __HAIKU__
 QPEL_CAVS(put_,       PUT_OP, 3dnow)
 QPEL_CAVS(avg_, AVG_3DNOW_OP, 3dnow)
 QPEL_CAVS(put_,       PUT_OP, mmx2)
 QPEL_CAVS(avg_,  AVG_MMX2_OP, mmx2)
+#endif
 
 CAVS_MC(put_, 8, 3dnow)
 CAVS_MC(put_, 16,3dnow)

Deleted: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_yasm.asm

Copied: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_yasm.nasm (from rev 30080, haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_yasm.asm)

Deleted: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_mmx.asm

Copied: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_mmx.nasm (from rev 30080, haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_mmx.asm)

Deleted: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_deblock_sse2.asm

Copied: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_deblock_sse2.nasm (from rev 30080, haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_deblock_sse2.asm)

Deleted: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.asm

Copied: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.nasm (from rev 30080, haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.asm)



From dlmcpaul at mail.berlios.de  Fri Apr 10 05:27:27 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Fri, 10 Apr 2009 05:27:27 +0200
Subject: [Haiku-commits] r30098 - haiku/trunk/headers/private/system
Message-ID: <200904100327.n3A3RRvC003909@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-10 05:27:27 +0200 (Fri, 10 Apr 2009)
New Revision: 30098
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30098&view=rev

Modified:
   haiku/trunk/headers/private/system/elf32.h
Log:
define Stack Program Header type

Modified: haiku/trunk/headers/private/system/elf32.h
===================================================================
--- haiku/trunk/headers/private/system/elf32.h	2009-04-10 03:21:56 UTC (rev 30097)
+++ haiku/trunk/headers/private/system/elf32.h	2009-04-10 03:27:27 UTC (rev 30098)
@@ -144,6 +144,7 @@
 #define PT_NOTE		4
 #define PT_SHLIB	5
 #define PT_PHDR		6
+#define PT_STACK	0x6474e551
 
 #define PT_LOPROC	0x70000000
 #define PT_HIPROC	0x7fffffff



From dlmcpaul at mail.berlios.de  Fri Apr 10 05:28:00 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Fri, 10 Apr 2009 05:28:00 +0200
Subject: [Haiku-commits] r30099 - haiku/trunk/src/system/runtime_loader
Message-ID: <200904100328.n3A3S0oJ004045@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-10 05:28:00 +0200 (Fri, 10 Apr 2009)
New Revision: 30099
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30099&view=rev

Modified:
   haiku/trunk/src/system/runtime_loader/elf.cpp
Log:
ignore Stack type in elf loader

Modified: haiku/trunk/src/system/runtime_loader/elf.cpp
===================================================================
--- haiku/trunk/src/system/runtime_loader/elf.cpp	2009-04-10 03:27:27 UTC (rev 30098)
+++ haiku/trunk/src/system/runtime_loader/elf.cpp	2009-04-10 03:28:00 UTC (rev 30099)
@@ -460,8 +460,11 @@
 			case PT_PHDR:
 				/* we don't use it */
 				break;
+			case PT_STACK:
+				/* we don't use it */
+				break;
 			default:
-				FATAL("unhandled pheader type 0x%lx\n", pheaders[i].p_type);
+				FATAL("unhandled pheader type in count 0x%lx\n", pheaders->p_type);
 				return B_BAD_DATA;
 		}
 	}
@@ -678,8 +681,11 @@
 			case PT_PHDR:
 				/* we don't use it */
 				break;
+			case PT_STACK:
+				/* we don't use it */
+				break;
 			default:
-				FATAL("unhandled pheader type 0x%lx\n", pheader[i].p_type);
+				FATAL("unhandled pheader type in parse 0x%lx\n", pheader->p_type);
 				return B_BAD_DATA;
 		}
 	}



From umccullough at gmail.com  Fri Apr 10 06:27:18 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Thu, 9 Apr 2009 21:27:18 -0700
Subject: [Haiku-commits] r30097 - in
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <200904100321.n3A3Lwn0003487@sheep.berlios.de>
References: <200904100321.n3A3Lwn0003487@sheep.berlios.de>
Message-ID: <1e80d8750904092127i3999fc28m16082eb3d1182061@mail.gmail.com>

On Thu, Apr 9, 2009 at 8:21 PM, dlmcpaul at BerliOS
<dlmcpaul at mail.berlios.de> wrote:
> Author: dlmcpaul
> Date: 2009-04-10 05:21:56 +0200 (Fri, 10 Apr 2009)
> New Revision: 30097
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30097&view=rev
>
> Added:
> ? haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_yasm.nasm
> ? haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_mmx.nasm
> ? haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_deblock_sse2.nasm
> ? haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.nasm
> Removed:
> ? haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_yasm.asm
> ? haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/fft_mmx.asm
> ? haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_deblock_sse2.asm
> ? haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.asm
> Modified:
> ? haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
> ? haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/config.h
> ? haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/cavsdsp_mmx.c
> Log:
> Build avcodec with assembly targets using yasm

I'm assuming this is the checkin responsible for this output?

Cc /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/cpuid.o
Assembler messages:
Fatal error: can't create
/work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/cpuid.o:
No such file or directory

/work/haiku/haiku/trunk/generated-gcc4/cross-tools/bin/i586-pc-haiku-gcc
-O -Wno-trigraphs -Wcast-align -Wno-multichar -pipe
-fno-strict-aliasing -fno-tree-vrp -nostdinc -fomit-frame-pointer
-fno-pic -DHAVE_AV_CONFIG_H=1 -c
"/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/cpuid.c"
-D__HAIKU__ -DHAIKU_DISTRO_COMPATIBILITY_DEFAULT -D__INTEL__
-DARCH_x86 -DBOOT_ARCHIVE_IMAGE_OFFSET=300
-DHAIKU_TARGET_PLATFORM_HAIKU -iquote
/work/haiku/haiku/trunk/build/user_config_headers -iquote
/work/haiku/haiku/trunk/build/config_headers -iquote
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec
-iquote /work/haiku/haiku/trunk/generated-gcc4/objects/common/add-ons/media/plugins/avcodec/libavcodec
-iquote /work/haiku/haiku/trunk/generated-gcc4/objects/linux/x86/common/add-ons/media/plugins/avcodec/libavcodec
-iquote /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/common/add-ons/media/plugins/avcodec/libavcodec
-iquote /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/..
-iquote /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86
-iquote /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/../libavutil
-iquote /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/../libswscale
-I /work/haiku/haiku/trunk/headers/libs/zlib -I
/work/haiku/haiku/trunk/generated-gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/../../../../i586-pc-haiku/include/c++/4.3.3
-I /work/haiku/haiku/trunk/generated-gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/../../../../i586-pc-haiku/include/c++/4.3.3/i586-pc-haiku
-I /work/haiku/haiku/trunk/generated-gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/../../../../i586-pc-haiku/include/c++/4.3.3/backward
-I /work/haiku/haiku/trunk/generated-gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/../../../../i586-pc-haiku/include/c++/4.3.3/ext
-I /work/haiku/haiku/trunk/generated-gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/include
-I /work/haiku/haiku/trunk/generated-gcc4/cross-tools/lib/gcc/i586-pc-haiku/4.3.3/include-fixed
-I /work/haiku/haiku/trunk/headers -I
/work/haiku/haiku/trunk/headers/posix -I
/work/haiku/haiku/trunk/headers/gnu -I
/work/haiku/haiku/trunk/headers/glibc -I
/work/haiku/haiku/trunk/headers/os -I
/work/haiku/haiku/trunk/headers/os/add-ons -I
/work/haiku/haiku/trunk/headers/os/add-ons/file_system -I
/work/haiku/haiku/trunk/headers/os/add-ons/graphics -I
/work/haiku/haiku/trunk/headers/os/add-ons/input_server -I
/work/haiku/haiku/trunk/headers/os/add-ons/registrar -I
/work/haiku/haiku/trunk/headers/os/add-ons/screen_saver -I
/work/haiku/haiku/trunk/headers/os/add-ons/tracker -I
/work/haiku/haiku/trunk/headers/os/app -I
/work/haiku/haiku/trunk/headers/os/device -I
/work/haiku/haiku/trunk/headers/os/drivers -I
/work/haiku/haiku/trunk/headers/os/game -I
/work/haiku/haiku/trunk/headers/os/interface -I
/work/haiku/haiku/trunk/headers/os/kernel -I
/work/haiku/haiku/trunk/headers/os/media -I
/work/haiku/haiku/trunk/headers/os/mail -I
/work/haiku/haiku/trunk/headers/os/midi -I
/work/haiku/haiku/trunk/headers/os/midi2 -I
/work/haiku/haiku/trunk/headers/os/net -I
/work/haiku/haiku/trunk/headers/os/opengl -I
/work/haiku/haiku/trunk/headers/os/storage -I
/work/haiku/haiku/trunk/headers/os/support -I
/work/haiku/haiku/trunk/headers/os/translation -I
/work/haiku/haiku/trunk/headers/private/. -o
"/work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/cpuid.o"
;

...failed Cc /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/cpuid.o
...
...skipped libavcodec.a for lack of libavcodec.a(cpuid.o)...
...skipped avcodec for lack of libavcodec.a...
...skipped <HaikuImage>haiku.image-copy-files-dummy-system/add-ons/media/plugins
for lack of avcodec...
...skipped haiku.image for lack of <HaikuImage>haiku.image-copy-files...
...failed updating 1 target(s)...
...skipped 4 target(s)...
...updated 1507 target(s)...

I guess yasm is now a requirement...I'll suppose I should install it
on my debian box now...

- Urias


From umccullough at gmail.com  Fri Apr 10 06:40:36 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Thu, 9 Apr 2009 21:40:36 -0700
Subject: [Haiku-commits] r30097 - in
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <1e80d8750904092127i3999fc28m16082eb3d1182061@mail.gmail.com>
References: <200904100321.n3A3Lwn0003487@sheep.berlios.de>
	<1e80d8750904092127i3999fc28m16082eb3d1182061@mail.gmail.com>
Message-ID: <1e80d8750904092140k42850e20gf2109fe3ac2bd471@mail.gmail.com>

On Thu, Apr 9, 2009 at 9:27 PM, Urias McCullough <umccullough at gmail.com> wrote:
> I guess yasm is now a requirement...I'll suppose I should install it
> on my debian box now...

which doesn't seem to help...

Do I need to use the version of yasm that was added to the buildtools?
does --build-cross-tools create it now?

- Urias


From dlmcpaul at gmail.com  Fri Apr 10 06:54:16 2009
From: dlmcpaul at gmail.com (David McPaul)
Date: Fri, 10 Apr 2009 14:54:16 +1000
Subject: [Haiku-commits] r30097 - in
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <1e80d8750904092127i3999fc28m16082eb3d1182061@mail.gmail.com>
References: <200904100321.n3A3Lwn0003487@sheep.berlios.de>
	<1e80d8750904092127i3999fc28m16082eb3d1182061@mail.gmail.com>
Message-ID: <da2be3d70904092154s1a889cd7h30d7f9db10094ac7@mail.gmail.com>

2009/4/10 Urias McCullough <umccullough at gmail.com>:
> On Thu, Apr 9, 2009 at 8:21 PM, dlmcpaul at BerliOS
>
> Cc /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/cpuid.o
> Assembler messages:
> Fatal error: can't create
> /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/cpuid.o:
> No such file or directory

I think the issue here is that the x86 directory in generated is not
being created.

Try to create it manually and see if that works.  I may not have done
the right thing in my Jamfile

> I guess yasm is now a requirement...I'll suppose I should install it
> on my debian box now...

Yes, avcodec expects yasm rather than nasm.

-- 
Cheers
David


From umccullough at gmail.com  Fri Apr 10 06:56:58 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Thu, 9 Apr 2009 21:56:58 -0700
Subject: [Haiku-commits] r30097 - in
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <da2be3d70904092154s1a889cd7h30d7f9db10094ac7@mail.gmail.com>
References: <200904100321.n3A3Lwn0003487@sheep.berlios.de>
	<1e80d8750904092127i3999fc28m16082eb3d1182061@mail.gmail.com>
	<da2be3d70904092154s1a889cd7h30d7f9db10094ac7@mail.gmail.com>
Message-ID: <1e80d8750904092156u6f594b87t944d61d94b1815fb@mail.gmail.com>

On Thu, Apr 9, 2009 at 9:54 PM, David McPaul <dlmcpaul at gmail.com> wrote:
> 2009/4/10 Urias McCullough <umccullough at gmail.com>:
>> On Thu, Apr 9, 2009 at 8:21 PM, dlmcpaul at BerliOS
>>
>> Cc /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/cpuid.o
>> Assembler messages:
>> Fatal error: can't create
>> /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/cpuid.o:
>> No such file or directory
>
> I think the issue here is that the x86 directory in generated is not
> being created.
>
> Try to create it manually and see if that works. ?I may not have done
> the right thing in my Jamfile

I will do so shortly, i ended up reverting back so I could test something else.

>> I guess yasm is now a requirement...I'll suppose I should install it
>> on my debian box now...
>
> Yes, avcodec expects yasm rather than nasm.

Well - I didn't have nasm installed either...so either of these is a
new requirement now ;)

It seems we have a bit of documentation to update as a result.

- Urias


From dlmcpaul at gmail.com  Fri Apr 10 06:51:17 2009
From: dlmcpaul at gmail.com (David McPaul)
Date: Fri, 10 Apr 2009 14:51:17 +1000
Subject: [Haiku-commits] r30097 - in
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <1e80d8750904092140k42850e20gf2109fe3ac2bd471@mail.gmail.com>
References: <200904100321.n3A3Lwn0003487@sheep.berlios.de>
	<1e80d8750904092127i3999fc28m16082eb3d1182061@mail.gmail.com>
	<1e80d8750904092140k42850e20gf2109fe3ac2bd471@mail.gmail.com>
Message-ID: <da2be3d70904092151x66eb52ebjfc4de5a0c9aeac44@mail.gmail.com>

2009/4/10 Urias McCullough <umccullough at gmail.com>:
> On Thu, Apr 9, 2009 at 9:27 PM, Urias McCullough <umccullough at gmail.com> wrote:
>> I guess yasm is now a requirement...I'll suppose I should install it
>> on my debian box now...
>
> which doesn't seem to help...
>
> Do I need to use the version of yasm that was added to the buildtools?
> does --build-cross-tools create it now?

Any version of yasm should work

I imported the current version into buildtools (0.7.2) but I
previously did it with 0.6.2

-- 
Cheers
David


From umccullough at gmail.com  Fri Apr 10 06:59:59 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Thu, 9 Apr 2009 21:59:59 -0700
Subject: [Haiku-commits] r30097 - in
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <da2be3d70904092151x66eb52ebjfc4de5a0c9aeac44@mail.gmail.com>
References: <200904100321.n3A3Lwn0003487@sheep.berlios.de>
	<1e80d8750904092127i3999fc28m16082eb3d1182061@mail.gmail.com>
	<1e80d8750904092140k42850e20gf2109fe3ac2bd471@mail.gmail.com>
	<da2be3d70904092151x66eb52ebjfc4de5a0c9aeac44@mail.gmail.com>
Message-ID: <1e80d8750904092159o10b602c3oc59eaecddc3eb4a8@mail.gmail.com>

On Thu, Apr 9, 2009 at 9:51 PM, David McPaul <dlmcpaul at gmail.com> wrote:
> 2009/4/10 Urias McCullough <umccullough at gmail.com>:
>> On Thu, Apr 9, 2009 at 9:27 PM, Urias McCullough <umccullough at gmail.com> wrote:
>>> I guess yasm is now a requirement...I'll suppose I should install it
>>> on my debian box now...
>>
>> which doesn't seem to help...
>>
>> Do I need to use the version of yasm that was added to the buildtools?
>> does --build-cross-tools create it now?
>
> Any version of yasm should work
>
> I imported the current version into buildtools (0.7.2) but I
> previously did it with 0.6.2

Wow, default version on my debian install is even older than that:

umccullough at debsrv3:~$ yasm --version
yasm 0.5.0.1591
Compiled on Mar 25 2007.
Copyright (c) 2001-2006 Peter Johnson and other Yasm developers.
Run yasm --license for licensing overview and summary.
umccullough at debsrv3:~$ uname -a
Linux debsrv3 2.6.18-6-686 #1 SMP Sat Dec 27 09:31:05 UTC 2008 i686 GNU/Linux
umccullough at debsrv3:~$


From umccullough at gmail.com  Fri Apr 10 07:15:26 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Thu, 9 Apr 2009 22:15:26 -0700
Subject: [Haiku-commits] r30094 - haiku/trunk/build/jam
In-Reply-To: <200904100309.n3A39CYX002195@sheep.berlios.de>
References: <200904100309.n3A39CYX002195@sheep.berlios.de>
Message-ID: <1e80d8750904092215m7c5f37farce461cc8107c1c84@mail.gmail.com>

On Thu, Apr 9, 2009 at 8:09 PM,  <phoudoin at mail.berlios.de> wrote:
> Author: phoudoin
> Date: 2009-04-10 05:09:05 +0200 (Fri, 10 Apr 2009)
> New Revision: 30094
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30094&view=rev
>
> Modified:
> ? haiku/trunk/build/jam/HaikuImage
> Log:
> As Urias reports, OpenGL kit and stuffs build on PPC target too now, so let's add
> them to the image. Thanks Urias for testing, submitting patches and... being
> patient ;)

Seems to be working fine with these commits, btw :)


From umccullough at gmail.com  Fri Apr 10 07:25:31 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Thu, 9 Apr 2009 22:25:31 -0700
Subject: [Haiku-commits] r30097 - in
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <da2be3d70904092154s1a889cd7h30d7f9db10094ac7@mail.gmail.com>
References: <200904100321.n3A3Lwn0003487@sheep.berlios.de>
	<1e80d8750904092127i3999fc28m16082eb3d1182061@mail.gmail.com>
	<da2be3d70904092154s1a889cd7h30d7f9db10094ac7@mail.gmail.com>
Message-ID: <1e80d8750904092225w4b00a128uea5f920d29294f0b@mail.gmail.com>

On Thu, Apr 9, 2009 at 9:54 PM, David McPaul <dlmcpaul at gmail.com> wrote:
> Try to create it manually and see if that works. ?I may not have done
> the right thing in my Jamfile

Indeed, creating the x86 dir did allow it to get further, but then it
fails here:

In file included from
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c:31:
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/mmx.h:24:
warning: #warning Everything in this header is deprecated, use plain
__asm__()! New code using this header will be rejected.
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c:
In function `gmc_mmx':
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c:1753:
Invalid `asm' statement:
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c:1753:
fixed or forbidden register 6 (bp) was spilled for class GENERAL_REGS.
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264dsp_mmx.c:
In function `h264_loop_filter_strength_mmx2':
In file included from
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c:1772:
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264dsp_mmx.c:855:
`asm' operand constraint incompatible with operand size
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264dsp_mmx.c:855:
invalid `asm': invalid expression as operand
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264dsp_mmx.c:855:
invalid `asm': invalid expression as operand

/work/haiku/haiku/trunk/generated-gcc2/cross-tools/bin/i586-pc-haiku-gcc
-O -Wno-trigraphs -Wcast-align -Wno-multichar -pipe -nostdinc
-fomit-frame-pointer -DPIC -DHAVE_AV_CONFIG_H=1 -c
"/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c"
-D__HAIKU__ -DHAIKU_DISTRO_COMPATIBILITY_DEFAULT -D__INTEL__
-DARCH_x86 -DBOOT_ARCHIVE_IMAGE_OFFSET=300 -D_BEOS_R5_COMPATIBLE_
-DHAIKU_TARGET_PLATFORM_HAIKU
-I/work/haiku/haiku/trunk/build/user_config_headers
-I/work/haiku/haiku/trunk/build/config_headers
-I/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec
-I/work/haiku/haiku/trunk/generated-gcc2/objects/common/add-ons/media/plugins/avcodec/libavcodec
-I/work/haiku/haiku/trunk/generated-gcc2/objects/linux/x86/common/add-ons/media/plugins/avcodec/libavcodec
-I/work/haiku/haiku/trunk/generated-gcc2/objects/haiku/x86/common/add-ons/media/plugins/avcodec/libavcodec
-I/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/..
-I/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86
-I/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/../libavutil
-I/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/../libswscale
-I- -I/work/haiku/haiku/trunk/headers/libs/zlib
-I/work/haiku/haiku/trunk/headers/cpp
-I/work/haiku/haiku/trunk/headers/build/gcc-2.95.3
-I/work/haiku/haiku/trunk/headers
-I/work/haiku/haiku/trunk/headers/posix
-I/work/haiku/haiku/trunk/headers/gnu
-I/work/haiku/haiku/trunk/headers/glibc
-I/work/haiku/haiku/trunk/headers/os
-I/work/haiku/haiku/trunk/headers/os/add-ons
-I/work/haiku/haiku/trunk/headers/os/add-ons/file_system
-I/work/haiku/haiku/trunk/headers/os/add-ons/graphics
-I/work/haiku/haiku/trunk/headers/os/add-ons/input_server
-I/work/haiku/haiku/trunk/headers/os/add-ons/registrar
-I/work/haiku/haiku/trunk/headers/os/add-ons/screen_saver
-I/work/haiku/haiku/trunk/headers/os/add-ons/tracker
-I/work/haiku/haiku/trunk/headers/os/app
-I/work/haiku/haiku/trunk/headers/os/device
-I/work/haiku/haiku/trunk/headers/os/drivers
-I/work/haiku/haiku/trunk/headers/os/game
-I/work/haiku/haiku/trunk/headers/os/interface
-I/work/haiku/haiku/trunk/headers/os/kernel
-I/work/haiku/haiku/trunk/headers/os/media
-I/work/haiku/haiku/trunk/headers/os/mail
-I/work/haiku/haiku/trunk/headers/os/midi
-I/work/haiku/haiku/trunk/headers/os/midi2
-I/work/haiku/haiku/trunk/headers/os/net
-I/work/haiku/haiku/trunk/headers/os/opengl
-I/work/haiku/haiku/trunk/headers/os/storage
-I/work/haiku/haiku/trunk/headers/os/support
-I/work/haiku/haiku/trunk/headers/os/translation
-I/work/haiku/haiku/trunk/headers/private/. -o
"/work/haiku/haiku/trunk/generated-gcc2/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.o"
;

...failed Cc /work/haiku/haiku/trunk/generated-gcc2/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.o
...

Perhaps this is due to my old version of yasm...

btw, i switched back to my gcc2 build just to be sure that wasn't the cause :)

- Urias


From umccullough at gmail.com  Fri Apr 10 07:36:41 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Thu, 9 Apr 2009 22:36:41 -0700
Subject: [Haiku-commits] r30097 - in
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <1e80d8750904092225w4b00a128uea5f920d29294f0b@mail.gmail.com>
References: <200904100321.n3A3Lwn0003487@sheep.berlios.de>
	<1e80d8750904092127i3999fc28m16082eb3d1182061@mail.gmail.com>
	<da2be3d70904092154s1a889cd7h30d7f9db10094ac7@mail.gmail.com>
	<1e80d8750904092225w4b00a128uea5f920d29294f0b@mail.gmail.com>
Message-ID: <1e80d8750904092236u355ec85cvde6080c0cc268f4@mail.gmail.com>

On Thu, Apr 9, 2009 at 10:25 PM, Urias McCullough <umccullough at gmail.com> wrote:
> btw, i switched back to my gcc2 build just to be sure that wasn't the cause :)

on gcc4 it gets a bit further:

AssembleNasm /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o
yasm: warning: unrecognized option `-d'
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
invalid argument to [SECTION]
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
undefined symbol `.note.GNU' (first use)
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
undefined symbol `stack' (first use)
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
 (Each undefined symbol is reported only once.)

yasm -d  -f elf -o
/work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o
/work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.nasm

...failed AssembleNasm
/work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o
...


From dlmcpaul at gmail.com  Fri Apr 10 07:43:58 2009
From: dlmcpaul at gmail.com (David McPaul)
Date: Fri, 10 Apr 2009 15:43:58 +1000
Subject: [Haiku-commits] r30097 - in
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <1e80d8750904092236u355ec85cvde6080c0cc268f4@mail.gmail.com>
References: <200904100321.n3A3Lwn0003487@sheep.berlios.de>
	<1e80d8750904092127i3999fc28m16082eb3d1182061@mail.gmail.com>
	<da2be3d70904092154s1a889cd7h30d7f9db10094ac7@mail.gmail.com>
	<1e80d8750904092225w4b00a128uea5f920d29294f0b@mail.gmail.com>
	<1e80d8750904092236u355ec85cvde6080c0cc268f4@mail.gmail.com>
Message-ID: <da2be3d70904092243t77827392w546542cb69ee512d@mail.gmail.com>

2009/4/10 Urias McCullough <umccullough at gmail.com>:
> On Thu, Apr 9, 2009 at 10:25 PM, Urias McCullough <umccullough at gmail.com> wrote:
>> btw, i switched back to my gcc2 build just to be sure that wasn't the cause :)
>
> on gcc4 it gets a bit further:
>
> AssembleNasm /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o
> yasm: warning: unrecognized option `-d'
> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
> invalid argument to [SECTION]
> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
> undefined symbol `.note.GNU' (first use)
> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
> undefined symbol `stack' (first use)
> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
> ?(Each undefined symbol is reported only once.)
>
> yasm -d ?-f elf -o
> /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o
> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.nasm
>
> ...failed AssembleNasm
> /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o

Definately need newer yasm

-- 
Cheers
David


From mmlr at mail.berlios.de  Fri Apr 10 10:05:20 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Fri, 10 Apr 2009 10:05:20 +0200
Subject: [Haiku-commits] r30100 -
	haiku/trunk/src/add-ons/kernel/bus_managers/ata
Message-ID: <200904100805.n3A85KMf001916@sheep.berlios.de>

Author: mmlr
Date: 2009-04-10 10:05:17 +0200 (Fri, 10 Apr 2009)
New Revision: 30100
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30100&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp
Log:
Move the lock into the request.


Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-10 03:28:00 UTC (rev 30099)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-10 08:05:17 UTC (rev 30100)
@@ -22,7 +22,6 @@
 		fUseDMA(true),
 		fRequest(NULL)
 {
-	mutex_init(&fExecutionLock, "ata io execution");
 	B_INITIALIZE_SPINLOCK(&fInterruptLock);
 	fInterruptCondition.Init(this, "ata dma transfer");
 
@@ -57,7 +56,7 @@
 		}
 	}
 
-	fRequest = new(std::nothrow) ATARequest();
+	fRequest = new(std::nothrow) ATARequest(true);
 	if (fRequest == NULL) {
 		fStatus = B_NO_MEMORY;
 		return;
@@ -90,8 +89,6 @@
 
 ATAChannel::~ATAChannel()
 {
-	mutex_lock(&fExecutionLock);
-
 	if (fDevices) {
 		for (uint8 i = 0; i < fDeviceCount; i++)
 			delete fDevices[i];
@@ -99,7 +96,6 @@
 	}
 
 	delete fRequest;
-	mutex_destroy(&fExecutionLock);
 }
 
 
@@ -222,16 +218,14 @@
 ATAChannel::ExecuteIO(scsi_ccb *ccb)
 {
 	TRACE_FUNCTION("%p\n", ccb);
-	if (mutex_trylock(&fExecutionLock) != B_OK) {
-		TRACE("channel is busy\n");
-		return B_BUSY;
-	}
+	status_t result = fRequest->Start(ccb);
+	if (result != B_OK)
+		return result;
 
-	fRequest->SetCCB(ccb);
 	if (ccb->cdb[0] == SCSI_OP_REQUEST_SENSE) {
 		TRACE("request sense\n");
 		fRequest->RequestSense();
-		fRequest->Finish(false, &fExecutionLock);
+		fRequest->Finish(false);
 		return B_OK;
 	}
 
@@ -241,7 +235,7 @@
 	if (ccb->target_id >= fDeviceCount) {
 		TRACE_ERROR("invalid target device\n");
 		fRequest->SetStatus(SCSI_SEL_TIMEOUT);
-		fRequest->Finish(false, &fExecutionLock);
+		fRequest->Finish(false);
 		return B_BAD_INDEX;
 	}
 
@@ -249,15 +243,15 @@
 	if (device == NULL) {
 		TRACE_ERROR("target device not present\n");
 		fRequest->SetStatus(SCSI_SEL_TIMEOUT);
-		fRequest->Finish(false, &fExecutionLock);
+		fRequest->Finish(false);
 		return B_BAD_INDEX;
 	}
 
 	fRequest->SetTimeout(ccb->timeout > 0 ? ccb->timeout * 1000 * 1000
 		: ATA_STANDARD_TIMEOUT);
 
-	status_t result = device->ExecuteIO(fRequest);
-	fRequest->Finish(false, &fExecutionLock);
+	result = device->ExecuteIO(fRequest);
+	fRequest->Finish(false);
 	return result;
 }
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-10 03:28:00 UTC (rev 30099)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-10 08:05:17 UTC (rev 30100)
@@ -299,7 +299,7 @@
 {
 	TRACE("device_set_feature: feature %d\n", feature);
 
-	ATARequest request;
+	ATARequest request(false);
 	request.SetDevice(this);
 	request.SetTimeout(1 * 1000 * 1000);
 
@@ -464,7 +464,7 @@
 	snprintf(fDebugContext, sizeof(fDebugContext), "%s %lu-%u",
 		IsATAPI() ? "pi " : "", fChannel->ChannelID(), fIndex);
 
-	ATARequest request;
+	ATARequest request(false);
 	request.SetDevice(this);
 	request.SetTimeout(20 * 1000 * 1000);
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-10 03:28:00 UTC (rev 30099)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-10 08:05:17 UTC (rev 30100)
@@ -138,7 +138,6 @@
 		ata_controller_interface *	fController;
 		void *						fCookie;
 
-		mutex						fExecutionLock;
 		spinlock					fInterruptLock;
 		ConditionVariable			fInterruptCondition;
 		ConditionVariableEntry		fInterruptConditionEntry;
@@ -240,7 +239,8 @@
 
 class ATARequest {
 public:
-									ATARequest();
+									ATARequest(bool hasLock);
+									~ATARequest();
 
 		void						SetStatus(uint8 status);
 		uint8						Status() { return fStatus; };
@@ -266,11 +266,10 @@
 		void						SetBlocksLeft(uint32 blocksLeft);
 		uint32 *					BlocksLeft() { return &fBlocksLeft; };
 
-		status_t					Finish(bool resubmit,
-										mutex *mutexToUnlock);
+		status_t					Finish(bool resubmit);
 
 		// SCSI stuff
-		void						SetCCB(scsi_ccb *ccb);
+		status_t					Start(scsi_ccb *ccb);
 		scsi_ccb *					CCB() { return fCCB; };
 
 		void						PrepareSGInfo();
@@ -293,6 +292,9 @@
 
 		const char *				_DebugContext() { return " request"; };
 
+		mutex						fLock;
+		bool						fHasLock;
+
 		uint8						fStatus;
 		uint8						fSenseKey;
 		uint8						fSenseCode;

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp	2009-04-10 03:28:00 UTC (rev 30099)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp	2009-04-10 08:05:17 UTC (rev 30100)
@@ -5,18 +5,29 @@
 
 #include "ATAPrivate.h"
 
-ATARequest::ATARequest()
-	:	fDevice(NULL),
+ATARequest::ATARequest(bool hasLock)
+	:	fHasLock(hasLock),
+		fDevice(NULL),
 		fTimeout(0),
 		fBlocksLeft(0),
 		fIsWrite(false),
 		fUseDMA(false),
 		fCCB(NULL)
 {
+	if (hasLock)
+		mutex_init(&fLock, "ata request");
+
 	ClearSense();
 }
 
 
+ATARequest::~ATARequest()
+{
+	if (fHasLock)
+		mutex_destroy(&fLock);
+}
+
+
 void
 ATARequest::SetStatus(uint8 status)
 {
@@ -76,8 +87,20 @@
 
 
 status_t
-ATARequest::Finish(bool resubmit, mutex *mutexToUnlock)
+ATARequest::Start(scsi_ccb *ccb)
 {
+	if (mutex_trylock(&fLock) != B_OK)
+		return B_BUSY;
+
+	fCCB = ccb;
+	fStatus = SCSI_REQ_CMP;
+	return B_OK;
+}
+
+
+status_t
+ATARequest::Finish(bool resubmit)
+{
 	// when the request completed and has set sense
     // data, report this to the scsi stack by setting
     // CHECK CONDITION status
@@ -102,7 +125,7 @@
 	} else
 		fCCB->subsys_status = fStatus;
 
-	mutex_unlock(mutexToUnlock);
+	mutex_unlock(&fLock);
 
 	if (resubmit)
 		gSCSIModule->resubmit(fCCB);
@@ -114,14 +137,6 @@
 
 
 void
-ATARequest::SetCCB(scsi_ccb *ccb)
-{
-	fCCB = ccb;
-	fStatus = SCSI_REQ_CMP;
-}
-
-
-void
 ATARequest::RequestSense()
 {
 	// Copy sense data from last request into data buffer of current request.



From axeld at pinc-software.de  Fri Apr 10 10:06:23 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Fri, 10 Apr 2009 10:06:23 +0200
Subject: [Haiku-commits] r30096 - haiku/trunk/build/jam
In-Reply-To: <200904100321.n3A3L8l8003383@sheep.berlios.de>
Message-ID: <578273979-BeMail@quad>

dlmcpaul at BerliOS wrote:
> Log:
> use yasm instead of nasm

Unfortunately, yasm is not completely compatible with nasm. At least 
our boot loader cannot be assembled with the former -- yasm obviously 
is not flexible enough when using the %if stuff. It wouldn't really be 
nice to port that code, so I guess we'll have to wait until yasm catches 
up before we can switch.
Porting would result in lessen the code quality :-/

Bye,
   Axel.



From fekdahl at gmail.com  Fri Apr 10 10:16:26 2009
From: fekdahl at gmail.com (Fredrik Ekdahl)
Date: Fri, 10 Apr 2009 10:16:26 +0200
Subject: [Haiku-commits] r30097 - in
 haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <da2be3d70904092243t77827392w546542cb69ee512d@mail.gmail.com>
References: <200904100321.n3A3Lwn0003487@sheep.berlios.de>	<1e80d8750904092127i3999fc28m16082eb3d1182061@mail.gmail.com>	<da2be3d70904092154s1a889cd7h30d7f9db10094ac7@mail.gmail.com>	<1e80d8750904092225w4b00a128uea5f920d29294f0b@mail.gmail.com>	<1e80d8750904092236u355ec85cvde6080c0cc268f4@mail.gmail.com>
	<da2be3d70904092243t77827392w546542cb69ee512d@mail.gmail.com>
Message-ID: <49DF005A.8010905@gmail.com>

David McPaul skrev:
> 2009/4/10 Urias McCullough <umccullough at gmail.com>:
>> On Thu, Apr 9, 2009 at 10:25 PM, Urias McCullough <umccullough at gmail.com> wrote:
>>> btw, i switched back to my gcc2 build just to be sure that wasn't the cause :)
>> on gcc4 it gets a bit further:
>>
>> AssembleNasm /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o
>> yasm: warning: unrecognized option `-d'
>> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
>> invalid argument to [SECTION]
>> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
>> undefined symbol `.note.GNU' (first use)
>> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
>> undefined symbol `stack' (first use)
>> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
>>  (Each undefined symbol is reported only once.)
>>
>> yasm -d  -f elf -o
>> /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o
>> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.nasm
>>
>> ...failed AssembleNasm
>> /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o
> 
> Definately need newer yasm
> 

I also get an error:

AssembleNasm 
generated/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o 

yasm: option `-d' needs an argument!

yasm -d  -f elf -o 
generated/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o 
src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.nasm

WEith this version of yasm:
yasm --version
yasm 0.7.1.2093
Compiled on Nov 25 2008.

Seems to be a missing argument in the command line.

-- 
/Fredrik Ekdahl


From ingo_weinhold at gmx.de  Fri Apr 10 10:03:17 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Fri, 10 Apr 2009 10:03:17 +0200
Subject: [Haiku-commits] r30097 - in
 haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <da2be3d70904092151x66eb52ebjfc4de5a0c9aeac44@mail.gmail.com>
References: <200904100321.n3A3Lwn0003487@sheep.berlios.de>
	<1e80d8750904092127i3999fc28m16082eb3d1182061@mail.gmail.com>
	<1e80d8750904092140k42850e20gf2109fe3ac2bd471@mail.gmail.com>
	<da2be3d70904092151x66eb52ebjfc4de5a0c9aeac44@mail.gmail.com>
Message-ID: <20090410100317.436.1@knochen-vm.localdomain>


On 2009-04-10 at 06:51:17 [+0200], David McPaul <dlmcpaul at gmail.com> wrote:
> 2009/4/10 Urias McCullough <umccullough at gmail.com>:
> > On Thu, Apr 9, 2009 at 9:27 PM, Urias McCullough <umccullough at gmail.com> 
> > wrote:
> >> I guess yasm is now a requirement...I'll suppose I should install it
> >> on my debian box now...
> >
> > which doesn't seem to help...
> >
> > Do I need to use the version of yasm that was added to the buildtools?
> > does --build-cross-tools create it now?
> 
> Any version of yasm should work
> 
> I imported the current version into buildtools (0.7.2) but I
> previously did it with 0.6.2

If an unmodified version of yasm should work, why did you import it into 
buildtools in the first place?

Also, when importing third party software that is still maintained, please 
always use a vendor branch.

CU, Ingo


From stippi at mail.berlios.de  Fri Apr 10 10:29:07 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 10 Apr 2009 10:29:07 +0200
Subject: [Haiku-commits] r30101 - haiku/trunk/src/apps/deskcalc
Message-ID: <200904100829.n3A8T7Wt004811@sheep.berlios.de>

Author: stippi
Date: 2009-04-10 10:29:05 +0200 (Fri, 10 Apr 2009)
New Revision: 30101
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30101&view=rev

Modified:
   haiku/trunk/src/apps/deskcalc/CalcView.cpp
Log:
Patch by Philippe Saint-Pierre: Don't use BTextView::LineHeight() when the font
has not yet been set... Thanks a lot!

D'oh, this one made me slap my hand against my forehead!


Modified: haiku/trunk/src/apps/deskcalc/CalcView.cpp
===================================================================
--- haiku/trunk/src/apps/deskcalc/CalcView.cpp	2009-04-10 08:05:17 UTC (rev 30100)
+++ haiku/trunk/src/apps/deskcalc/CalcView.cpp	2009-04-10 08:29:05 UTC (rev 30101)
@@ -6,6 +6,7 @@
  * Authors:
  *		Timothy Wayper <timmy at wunderbear.com>
  *		Stephan A?mus <superstippi at gmx.de>
+ *		Philippe Saint-Pierre, stpere at gmail.com
  */
 
 #include "CalcView.h"
@@ -656,16 +657,16 @@
 	fExpressionTextView->MoveTo(frame.LeftTop());
 	fExpressionTextView->ResizeTo(frame.Width(), frame.Height());
 
-	frame.OffsetTo(B_ORIGIN);
-	float inset = (frame.Height() - fExpressionTextView->LineHeight(0)) / 2;
-	frame.InsetBy(inset, inset);
-	fExpressionTextView->SetTextRect(frame);
-
 	// configure expression text view font size and color
 	float sizeDisp = fShowKeypad ? fHeight * kDisplayScaleY : fHeight;
 	BFont font(be_bold_font);
 	font.SetSize(sizeDisp * kExpressionFontScaleY);
 	fExpressionTextView->SetFontAndColor(&font, B_FONT_ALL);
+
+	frame.OffsetTo(B_ORIGIN);
+	float inset = (frame.Height() - fExpressionTextView->LineHeight(0)) / 2;
+	frame.InsetBy(inset, inset);
+	fExpressionTextView->SetTextRect(frame);
 }
 
 



From fekdahl at gmail.com  Fri Apr 10 10:32:24 2009
From: fekdahl at gmail.com (Fredrik Ekdahl)
Date: Fri, 10 Apr 2009 10:32:24 +0200
Subject: [Haiku-commits] r30097 - in
 haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <200904100321.n3A3Lwn0003487@sheep.berlios.de>
References: <200904100321.n3A3Lwn0003487@sheep.berlios.de>
Message-ID: <49DF0418.2060506@gmail.com>

dlmcpaul at BerliOS skrev:
> Modified: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
> ===================================================================
> --- haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile	2009-04-10 03:21:06 UTC (rev 30096)
> +++ haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile	2009-04-10 03:21:56 UTC (rev 30097)
> @@ -1,6 +1,7 @@
>  SubDir HAIKU_TOP src add-ons media plugins avcodec libavcodec ;
>  
>  SubDirHdrs [ FDirName $(SUBDIR) .. ] ;
> +SubDirHdrs [ FDirName $(SUBDIR) x86 ] ;
>  SubDirHdrs [ FDirName $(SUBDIR) ../libavutil ] ;
>  SubDirHdrs [ FDirName $(SUBDIR) ../libswscale ] ;
>  
> @@ -281,4 +282,26 @@
>  	xl.c
>  	xsubdec.c
>  	zmbv.c
> +	x86/cpuid.c
> +	x86/cavsdsp_mmx.c
> +	x86/idct_mmx.c
> +	x86/idct_mmx_xvid.c
> +	x86/idct_sse2_xvid.c
> +	x86/dsputil_mmx.c
> +	x86/fft_sse.c
> +	x86/h264_idct_sse2.nasm
> +	x86/h264_deblock_sse2.nasm
> +	x86/fft_mmx.nasm
> +	x86/dsputil_yasm.nasm
> +	x86/simple_idct_mmx.c
> +	x86/motion_est_mmx.c
> +	x86/mpegvideo_mmx.c
> +	x86/rv40dsp_mmx.c
> +	x86/vc1dsp_mmx.c
> +	x86/vp3dsp_mmx.c
> +	x86/vp3dsp_sse2.c
> +	x86/vp6dsp_mmx.c
> +	x86/vp6dsp_sse2.c
> +	x86/fft_sse.c
> +	x86/fdct_mmx.c

I think these should be put in a separate Jamfile in their own directory 
to solve the problem that the generated x86/ isn't created.

-- 
/Fredrik Ekdahl


From humdingerb at googlemail.com  Fri Apr 10 10:37:53 2009
From: humdingerb at googlemail.com (Humdinger)
Date: Fri, 10 Apr 2009 10:37:53 +0200
Subject: [Haiku-commits] r30012 - in haiku/trunk: headers/os/interface
 src/kits/interface
In-Reply-To: <200904072240.n37Meuwt009015@sheep.berlios.de>
References: <200904072240.n37Meuwt009015@sheep.berlios.de>
Message-ID: <49DF0561.1070705@googlemail.com>

zooey at mail.berlios.de wrote:
> Log:
> * implemented wordwise navigation via control + arrow keys

Sniff. This one almost brought tears to my eyes. I've been wishing for that feature for 
many, many years... Thank you, thank you!

Regards,
Humdinger

-- 
--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-
Deutsche Haiku News @ http://www.haiku-gazette.de


From revol at free.fr  Fri Apr 10 10:42:00 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Fri, 10 Apr 2009 10:42:00 +0200 CEST
Subject: [Haiku-commits] r30095 - haiku/trunk/src/add-ons/media/plugins
In-Reply-To: <200904100315.n3A3FHbX003042@sheep.berlios.de>
Message-ID: <582038489-BeMail@laptop>

>  SubInclude HAIKU_TOP src add-ons media plugins avi_reader ;
>  SubInclude HAIKU_TOP src add-ons media plugins mp3_reader ;
>  SubInclude HAIKU_TOP src add-ons media plugins wav_reader ;
> +SubInclude HAIKU_TOP src add-ons media plugins APE_reader ;

Hmmm I believe it should be lowercase...

Fran?ois.


From revol at free.fr  Fri Apr 10 10:48:44 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Fri, 10 Apr 2009 10:48:44 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r30097_-_in_haiku/trunk/src/add-ons/med?=
 =?utf-8?q?ia/plugins/avcodec/libavcodec=3A_=2E_x86?=
In-Reply-To: <1e80d8750904092159o10b602c3oc59eaecddc3eb4a8@mail.gmail.com>
Message-ID: <986437410-BeMail@laptop>

> On Thu, Apr 9, 2009 at 9:51 PM, David McPaul <dlmcpaul at gmail.com> 
> wrote:
> > 2009/4/10 Urias McCullough <umccullough at gmail.com>:
> >> On Thu, Apr 9, 2009 at 9:27 PM, Urias McCullough <
> > > umccullough at gmail.com> wrote:
> >>> I guess yasm is now a requirement...I'll suppose I should install 
> > > > it
> >>> on my debian box now...
> >>
> >> which doesn't seem to help...
> >>
> >> Do I need to use the version of yasm that was added to the 
> > > buildtools?
> >> does --build-cross-tools create it now?
> >
> > Any version of yasm should work
> >
> > I imported the current version into buildtools (0.7.2) but I
> > previously did it with 0.6.2
> 
> Wow, default version on my debian install is even older than that:
> 
> umccullough at debsrv3:~$ yasm --version
> yasm 0.5.0.1591


Debian 4.0 should probably be upgraded :)
(I don't have enough disk here to do this)


From stippi at mail.berlios.de  Fri Apr 10 10:58:15 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Fri, 10 Apr 2009 10:58:15 +0200
Subject: [Haiku-commits] r30102 - haiku/trunk/src/kits/tracker
Message-ID: <200904100858.n3A8wF0h007449@sheep.berlios.de>

Author: stippi
Date: 2009-04-10 10:58:13 +0200 (Fri, 10 Apr 2009)
New Revision: 30102
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30102&view=rev

Modified:
   haiku/trunk/src/kits/tracker/PoseView.cpp
Log:
My previous fixes had an oversight and the very last fix introduced new drawing
problems. Basically, forceDraw was set to false which then prevented any new
items to be drawn when there was no scrolling necessary. Now we use a local
variable "needToDraw" that starts with "true" on each iteration. I don't really
know why forceDraw is even passed to the function in the first place. Maybe
it should be called "disabledDrawing" with reversed meaning and should be used
for windows that open on another workspace....


Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-10 08:29:05 UTC (rev 30101)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp	2009-04-10 08:58:13 UTC (rev 30102)
@@ -1672,6 +1672,7 @@
 
 				bool havePoseBounds = false;
 				bool addedItem = false;
+				bool needToDraw = true;
 
 				if (insertionSort && fPoseList->CountItems()) {
 					int32 orientation = BSearchList(pose, &poseIndex);
@@ -1708,20 +1709,20 @@
 							// if new pose above current view bounds, cache up
 							// the draw and do it later
 							listViewScrollBy += fListElemHeight;
-						} else if (!srcRect.IsValid()) {
-							// nothing to be scrolled, but extent became
-							// visible
-							SynchronousUpdate(destRect);
-							forceDraw = false;
+							needToDraw = false;
 						} else {
 							FinishPendingScroll(listViewScrollBy, viewBounds);
 							fPoseList->AddItem(pose, poseIndex);
 							fMimeTypeListIsDirty = true;
 							addedItem = true;
-							CopyBits(srcRect, destRect);
-							srcRect.bottom = destRect.top;
-							SynchronousUpdate(srcRect);
-							forceDraw = false;
+							if (srcRect.IsValid()) {
+								CopyBits(srcRect, destRect);
+								srcRect.bottom = destRect.top;
+								SynchronousUpdate(srcRect);
+							} else {
+								SynchronousUpdate(destRect);
+							}
+							needToDraw = false;
 						}
 					}
 				}
@@ -1730,7 +1731,7 @@
 					fMimeTypeListIsDirty = true;
 				}
 
-				if (forceDraw) {
+				if (needToDraw && forceDraw) {
 					if (!havePoseBounds)
 						poseBounds = CalcPoseRectList(pose, poseIndex);
 		 			if (viewBounds.Intersects(poseBounds))



From axeld at mail.berlios.de  Fri Apr 10 11:53:52 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Fri, 10 Apr 2009 11:53:52 +0200
Subject: [Haiku-commits] r30103 - haiku/trunk/src/system/kernel/debug
Message-ID: <200904100953.n3A9rq4q012205@sheep.berlios.de>

Author: axeld
Date: 2009-04-10 11:53:50 +0200 (Fri, 10 Apr 2009)
New Revision: 30103
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30103&view=rev

Modified:
   haiku/trunk/src/system/kernel/debug/tracing.cpp
Log:
Extremely important cleanup.


Modified: haiku/trunk/src/system/kernel/debug/tracing.cpp
===================================================================
--- haiku/trunk/src/system/kernel/debug/tracing.cpp	2009-04-10 08:58:13 UTC (rev 30102)
+++ haiku/trunk/src/system/kernel/debug/tracing.cpp	2009-04-10 09:53:50 UTC (rev 30103)
@@ -822,7 +822,6 @@
 	static uint32 _previousOutputFlags = 0;
 	static TraceEntryIterator iterator;
 
-
 	// Note: start and index are Pascal-like indices (i.e. in [1, sEntries]).
 	int32 start = 0;	// special index: print the last count entries
 	int32 count = 0;



From axeld at mail.berlios.de  Fri Apr 10 11:55:05 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Fri, 10 Apr 2009 11:55:05 +0200
Subject: [Haiku-commits] r30104 - haiku/trunk/src/system/kernel/cache
Message-ID: <200904100955.n3A9t55C012297@sheep.berlios.de>

Author: axeld
Date: 2009-04-10 11:55:04 +0200 (Fri, 10 Apr 2009)
New Revision: 30104
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30104&view=rev

Modified:
   haiku/trunk/src/system/kernel/cache/block_cache.cpp
Log:
* Added an insane block cache tracing mode that will also log the whole block
  data. This is available when BLOCK_CACHE_BLOCK_TRACING is 2 or greater.
* Completely untested as of now, though. Will do so soon.


Modified: haiku/trunk/src/system/kernel/cache/block_cache.cpp
===================================================================
--- haiku/trunk/src/system/kernel/cache/block_cache.cpp	2009-04-10 09:53:50 UTC (rev 30103)
+++ haiku/trunk/src/system/kernel/cache/block_cache.cpp	2009-04-10 09:55:04 UTC (rev 30104)
@@ -292,6 +292,115 @@
 	status_t		fStatus;
 };
 
+#if BLOCK_CACHE_BLOCK_TRACING >= 2
+class BlockData : public AbstractTraceEntry {
+public:
+	enum {
+		kCurrent	= 0x01,
+		kParent		= 0x02,
+		kOriginal	= 0x04
+	};
+
+	BlockData(block_cache* cache, cached_block* block, const char* message)
+		:
+		fCache(cache),
+		fSize(cache->block_size),
+		fBlockNumber(block->block_number),
+		fMessage(message)
+	{
+		_Allocate(fCurrent, block->current_data);
+		_Allocate(fParent, block->parent_data);
+		_Allocate(fOriginal, block->original_data);
+
+		Initialized();
+	}
+
+	virtual void AddDump(TraceOutput& out)
+	{
+		out.Print("block cache %p, block %Ld, data %c%c%c: %s",
+			fCache, fBlockNumber, fCurrent != NULL ? 'c' : '-',
+			fParent != NULL ? 'p' : '-', fOriginal != NULL ? 'o' : '-',
+			fMessage);
+	}
+
+	void DumpBlocks(uint32 which, uint32 offset, uint32 size)
+	{
+		if ((which & kCurrent) != 0)
+			DumpBlock(kCurrent, offset, size);
+		if ((which & kParent) != 0)
+			DumpBlock(kParent, offset, size);
+		if ((which & kOriginal) != 0)
+			DumpBlock(kOriginal, offset, size);
+	}
+
+	void DumpBlock(uint32 which, uint32 offset, uint32 size)
+	{
+		if (offset > fSize) {
+			kprintf("invalid offset (block size %lu)\n", fSize);
+			return;
+		}
+		if (offset + size > fSize)
+			size = fSize - offset;
+
+		const char* label;
+		uint8* data;
+
+		if ((which & kCurrent) != 0) {
+			label = "current";
+			data = fCurrent;
+		} else if ((which & kParent) != 0) {
+			label = "parent";
+			data = fParent;
+		} else if ((which & kOriginal) != 0) {
+			label = "original";
+			data = fOriginal;
+		} else
+			return;
+
+		kprintf("%s: offset %lu, %lu bytes\n", label, offset, size);
+
+		static const uint32 kBlockSize = 16;
+		data += offset;
+
+		for (uint32 i = 0; i < size;) {
+			int start = i;
+
+			kprintf("  %04lx ", i);
+			for (; i < start + kBlockSize; i++) {
+				if (!(i % 4))
+					kprintf(" ");
+	
+				if (i >= size)
+					kprintf("  ");
+				else
+					kprintf("%02x", data[i]);
+			}
+
+			kprintf("\n");
+		}
+	}
+
+private:
+	void _Allocate(uint8*& target, void* source)
+	{
+		if (source == NULL) {
+			target = NULL;
+			return;
+		}
+
+		target = alloc_tracing_buffer_memcpy(source, fSize, false);
+	}
+
+	block_cache*	fCache;
+	uint32			fSize;
+	uint64			fBlockNumber;
+	const char*		fMessage;
+	uint8*			fCurrent;
+	uint8*			fParent;
+	uint8*			fOriginal;
+};
+#endif	// BLOCK_CACHE_BLOCK_TRACING >= 2
+
 }	// namespace BlockTracing
 
 #	define TB(x) new(std::nothrow) BlockTracing::x;
@@ -299,6 +408,13 @@
 #	define TB(x) ;
 #endif
 
+#if BLOCK_CACHE_BLOCK_TRACING >= 2
+#	define TB2(x) new(std::nothrow) BlockTracing::x;
+#else
+#	define TB2(x) ;
+#endif
+
+
 #if BLOCK_CACHE_TRANSACTION_TRACING
 namespace TransactionTracing {
 
@@ -1287,6 +1403,7 @@
 
 	block->is_dirty = true;
 	TB(Get(cache, block));
+	TB2(BlockData(cache, block, "get writable"));
 
 	return block->current_data;
 }
@@ -1311,6 +1428,7 @@
 
 	TRACE(("write_cached_block(block %Ld)\n", block->block_number));
 	TB(Write(cache, block));
+	TB2(BlockData(cache, block, "before write"));
 
 	ssize_t written = write_pos(cache->fd, block->block_number * blockSize,
 		data, blockSize);
@@ -1358,6 +1476,7 @@
 		cache->unused_blocks.Add(block);
 	}
 
+	TB2(BlockData(cache, block, "after write"));
 	return B_OK;
 }
 
@@ -1621,6 +1740,96 @@
 	return 0;
 }
 
+
+#if BLOCK_CACHE_BLOCK_TRACING >= 2
+static int
+dump_block_data(int argc, char** argv)
+{
+	using namespace BlockTracing;
+
+	if (argc < 3) {
+		print_debugger_command_usage(argv[0]);
+		return 0;
+	}
+
+	// Determine which blocks to show
+
+	uint32 which = 0;
+	int32 i = 1;
+	while (argv[i][0] == '-') {
+		char* arg = &argv[i][1];
+		while (arg[0]) {
+			switch (arg[0]) {
+				case 'c':
+					which |= BlockData::kCurrent;
+					break;
+				case 'p':
+					which |= BlockData::kParent;
+					break;
+				case 'o':
+					which |= BlockData::kOriginal;
+					break;
+
+				default:
+					kprintf("invalid block specifier (only o/c/p are "
+						"allowed).\n");
+					return 0;
+			}
+			arg++;
+		}
+	
+		i++;
+	}
+	if (which == 0)
+		which = BlockData::kCurrent | BlockData::kParent | BlockData::kOriginal;
+
+	// Get the range of blocks to print
+
+	int64 from = parse_expression(argv[i]);
+	int64 to = from;
+	if (argc > i + 1)
+		to = parse_expression(argv[i + 1]);
+	if (to < from)
+		to = from;
+
+	uint32 offset = 0;
+	uint32 size = LONG_MAX;
+	if (argc > i + 2)
+		offset = parse_expression(argv[i + 2]);
+	if (argc > i + 3)
+		size = parse_expression(argv[i + 3]);
+
+	TraceEntryIterator iterator;
+	iterator.MoveTo(from);
+
+	static char sBuffer[1024];
+	LazyTraceOutput out(sBuffer, sizeof(sBuffer), TRACE_OUTPUT_TEAM_ID);
+
+	while (TraceEntry* entry = iterator.Next()) {
+		if (iterator.Index() > to)
+			break;
+
+		Action* action = dynamic_cast<Action*>(entry);
+		if (action != NULL) {
+			out.Clear();
+			out.DumpEntry(action);
+			continue;
+		}
+
+		BlockData* blockData = dynamic_cast<BlockData*>(entry);
+		if (blockData == NULL)
+			continue;
+
+		out.Clear();
+		out.DumpEntry(blockData);
+
+		blockData->DumpBlocks(which, offset, size);
+	}
+
+	return 0;
+}
+#endif	// BLOCK_CACHE_BLOCK_TRACING >= 2
+
 #endif	// DEBUG_BLOCK_CACHE
 
 
@@ -1836,7 +2045,20 @@
 		"dumps a specific transaction", "[-b] ((<cache> <id>) | <transaction>)\n"
 		"Either use a block cache pointer and an ID or a pointer to the transaction.\n"
 		"  -b lists all blocks that are part of this transaction\n", 0);
-#endif
+#	if BLOCK_CACHE_BLOCK_TRACING >= 2
+	add_debugger_command_etc("block_cache_data", &dump_block_data,
+		"dumps the data blocks logged for the actions",
+		"[-cpo] <from> [<to> [<offset> [<size>]]]\n"
+		"If no data specifier is used, all blocks are shown by default.\n"
+		" -c       the current data is shown, if available.\n"
+		" -p       the parent data is shown, if available.\n"
+		" -o       the original data is shown, if available.\n"
+		" <from>   first index of tracing entries to show.\n"
+		" <to>     if given, the last entry. If not, only <from> is shown.\n"
+		" <offset> the offset of the block data.\n"
+		" <from>   the size of the block data that is dumped\n", 0);
+#	endif
+#endif	// DEBUG_BLOCK_CACHE
 
 	return B_OK;
 }



From mmu_man at mail.berlios.de  Fri Apr 10 12:05:07 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Fri, 10 Apr 2009 12:05:07 +0200
Subject: [Haiku-commits] r30105 -
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec
Message-ID: <200904101005.n3AA57nD013387@sheep.berlios.de>

Author: mmu_man
Date: 2009-04-10 12:05:07 +0200 (Fri, 10 Apr 2009)
New Revision: 30105
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30105&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
Log:
Make it less ugly. At least it doesn't try to create files in non existent dirs. But it should really be split. Besides it only supports x86.


Modified: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile	2009-04-10 09:55:04 UTC (rev 30104)
+++ haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile	2009-04-10 10:05:07 UTC (rev 30105)
@@ -18,6 +18,37 @@
 }
 SubDirCcFlags -DHAVE_AV_CONFIG_H=1 ;
 
+local libavcodecSourcesX86 = 
+	cpuid.c
+	cavsdsp_mmx.c
+	idct_mmx.c
+	idct_mmx_xvid.c
+	idct_sse2_xvid.c
+	dsputil_mmx.c
+	fft_sse.c
+	h264_idct_sse2.nasm
+	h264_deblock_sse2.nasm
+	fft_mmx.nasm
+	dsputil_yasm.nasm
+	simple_idct_mmx.c
+	motion_est_mmx.c
+	mpegvideo_mmx.c
+	rv40dsp_mmx.c
+	vc1dsp_mmx.c
+	vp3dsp_mmx.c
+	vp3dsp_sse2.c
+	vp6dsp_mmx.c
+	vp6dsp_sse2.c
+	fft_sse.c
+	fdct_mmx.c
+;
+
+SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons media plugins avcodec libavcodec x86 ] ;
+SEARCH on $(libavcodecSourcesX86) = $(SEARCH_SOURCE) ;
+StaticLibrary libavcodec_x86.a :
+	$(libavcodecSourcesX86)
+;
+
 StaticLibrary libavcodec.a :
 	4xm.c
 	8bps.c
@@ -282,26 +313,6 @@
 	xl.c
 	xsubdec.c
 	zmbv.c
-	x86/cpuid.c
-	x86/cavsdsp_mmx.c
-	x86/idct_mmx.c
-	x86/idct_mmx_xvid.c
-	x86/idct_sse2_xvid.c
-	x86/dsputil_mmx.c
-	x86/fft_sse.c
-	x86/h264_idct_sse2.nasm
-	x86/h264_deblock_sse2.nasm
-	x86/fft_mmx.nasm
-	x86/dsputil_yasm.nasm
-	x86/simple_idct_mmx.c
-	x86/motion_est_mmx.c
-	x86/mpegvideo_mmx.c
-	x86/rv40dsp_mmx.c
-	x86/vc1dsp_mmx.c
-	x86/vp3dsp_mmx.c
-	x86/vp3dsp_sse2.c
-	x86/vp6dsp_mmx.c
-	x86/vp6dsp_sse2.c
-	x86/fft_sse.c
-	x86/fdct_mmx.c
+	:
+	libavcodec_x86.a
 ;



From revol at free.fr  Fri Apr 10 12:33:09 2009
From: revol at free.fr (=?utf-8?q?Fran=C3=A7ois?= Revol)
Date: Fri, 10 Apr 2009 12:33:09 +0200 CEST
Subject: [Haiku-commits] r30097 - in
 haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <986437410-BeMail@laptop>
Message-ID: <7251902661-BeMail@laptop>

> > >> Do I need to use the version of yasm that was added to the 
> > > > buildtools?
> > >> does --build-cross-tools create it now?
> > >
> > > Any version of yasm should work
> > >
> > > I imported the current version into buildtools (0.7.2) but I
> > > previously did it with 0.6.2
> > 
> > Wow, default version on my debian install is even older than that:
> > 
> > umccullough at debsrv3:~$ yasm --version
> > yasm 0.5.0.1591
> 
> 
> Debian 4.0 should probably be upgraded :)
> (I don't have enough disk here to do this)

Indeed, the yasm with debian 4.0 is too old..

Can't we just stick to nasm for a while ?

Fran?ois.



From marcusoverhagen at arcor.de  Fri Apr 10 13:29:05 2009
From: marcusoverhagen at arcor.de (Marcus Overhagen)
Date: Fri, 10 Apr 2009 13:29:05 +0200
Subject: [Haiku-commits] r30091
	-	haiku/trunk/src/add-ons/kernel/bus_managers/ata
In-Reply-To: <200904100014.n3A0EA4D014070@sheep.berlios.de>
References: <200904100014.n3A0EA4D014070@sheep.berlios.de>
Message-ID: <49DF2D81.1080804@arcor.de>

mmlr at mail.berlios.de schrieb:

> * Indeed we need to return a status from the interrupt handler, as for PIO
>   transfers there is no way of knowning whether or not the interrupt at hand
>   was ours.

That is the reason why PIO transfers should be done with polling. You 
simply don't know if the interrupt that happend was done by the IDE 
controller, which IDE controller, etc.

Especially with interrupt sharing, not using interrupts is much saver.
I don't think there is a benefit in trying to do PIO with interrupts.
PIO transfers are rare anyway, so this is no performance impact.

DMA transfers are save to do with interrupt, as the controller can tell 
when it caused the interrupt.

The idea when doing the ata bus manager was to reduce complexity by 
avoiding PIO interrupt handling and tagged command queuing.

regards
Marcus


From dlmcpaul at gmail.com  Fri Apr 10 16:13:10 2009
From: dlmcpaul at gmail.com (David McPaul)
Date: Sat, 11 Apr 2009 00:13:10 +1000
Subject: [Haiku-commits] r30097 - in
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <49DF005A.8010905@gmail.com>
References: <200904100321.n3A3Lwn0003487@sheep.berlios.de>
	<1e80d8750904092127i3999fc28m16082eb3d1182061@mail.gmail.com>
	<da2be3d70904092154s1a889cd7h30d7f9db10094ac7@mail.gmail.com>
	<1e80d8750904092225w4b00a128uea5f920d29294f0b@mail.gmail.com>
	<1e80d8750904092236u355ec85cvde6080c0cc268f4@mail.gmail.com>
	<da2be3d70904092243t77827392w546542cb69ee512d@mail.gmail.com>
	<49DF005A.8010905@gmail.com>
Message-ID: <da2be3d70904100713j205a745cre1f0f8fdbf052012@mail.gmail.com>

2009/4/10 Fredrik Ekdahl <fekdahl at gmail.com>:
> David McPaul skrev:
>> 2009/4/10 Urias McCullough <umccullough at gmail.com>:
>>> On Thu, Apr 9, 2009 at 10:25 PM, Urias McCullough <umccullough at gmail.com> wrote:
>>>> btw, i switched back to my gcc2 build just to be sure that wasn't the cause :)
>>> on gcc4 it gets a bit further:
>>>
>>> AssembleNasm /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o
>>> yasm: warning: unrecognized option `-d'
>>> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
>>> invalid argument to [SECTION]
>>> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
>>> undefined symbol `.note.GNU' (first use)
>>> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
>>> undefined symbol `stack' (first use)
>>> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/x86inc.asm:402:
>>> ?(Each undefined symbol is reported only once.)
>>>
>>> yasm -d ?-f elf -o
>>> /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o
>>> /work/haiku/haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.nasm
>>>
>>> ...failed AssembleNasm
>>> /work/haiku/haiku/trunk/generated-gcc4/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o
>>
>> Definately need newer yasm
>>
>
> I also get an error:
>
> AssembleNasm
> generated/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o
>
> yasm: option `-d' needs an argument!
>
> yasm -d ?-f elf -o
> generated/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.o
> src/add-ons/media/plugins/avcodec/libavcodec/x86/h264_idct_sse2.nasm
>
> WEith this version of yasm:
> yasm --version
> yasm 0.7.1.2093
> Compiled on Nov 25 2008.
>
> Seems to be a missing argument in the command line.

It is just a warning it should still compile the file.

But I will look at that.

-- 
Cheers
David


From dlmcpaul at gmail.com  Fri Apr 10 16:14:03 2009
From: dlmcpaul at gmail.com (David McPaul)
Date: Sat, 11 Apr 2009 00:14:03 +1000
Subject: [Haiku-commits] r30097 - in
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec: . x86
In-Reply-To: <7251902661-BeMail@laptop>
References: <986437410-BeMail@laptop> <7251902661-BeMail@laptop>
Message-ID: <da2be3d70904100714j19141e41r5e37898163f18bbe@mail.gmail.com>

2009/4/10 Fran?ois Revol <revol at free.fr>:
>> > >> Do I need to use the version of yasm that was added to the
>> > > > buildtools?
>> > >> does --build-cross-tools create it now?
>> > >
>> > > Any version of yasm should work
>> > >
>> > > I imported the current version into buildtools (0.7.2) but I
>> > > previously did it with 0.6.2
>> >
>> > Wow, default version on my debian install is even older than that:
>> >
>> > umccullough at debsrv3:~$ yasm --version
>> > yasm 0.5.0.1591
>>
>>
>> Debian 4.0 should probably be upgraded :)
>> (I don't have enough disk here to do this)
>
> Indeed, the yasm with debian 4.0 is too old..
>
> Can't we just stick to nasm for a while ?

nasm won't compile avcodec.

-- 
Cheers
David


From dlmcpaul at gmail.com  Fri Apr 10 16:18:17 2009
From: dlmcpaul at gmail.com (David McPaul)
Date: Sat, 11 Apr 2009 00:18:17 +1000
Subject: [Haiku-commits] r30096 - haiku/trunk/build/jam
In-Reply-To: <578273979-BeMail@quad>
References: <200904100321.n3A3L8l8003383@sheep.berlios.de>
	<578273979-BeMail@quad>
Message-ID: <da2be3d70904100718q24b1bf46jef8a9762d6daf887@mail.gmail.com>

2009/4/10 Axel D?rfler <axeld at pinc-software.de>:
> dlmcpaul at BerliOS wrote:
>> Log:
>> use yasm instead of nasm
>
> Unfortunately, yasm is not completely compatible with nasm. At least
> our boot loader cannot be assembled with the former -- yasm obviously
> is not flexible enough when using the %if stuff. It wouldn't really be
> nice to port that code, so I guess we'll have to wait until yasm catches
> up before we can switch.
> Porting would result in lessen the code quality :-/

Really, I thought yasm handled all of nasm code.

The main difference is how include files are searched for.

-- 
Cheers
David


From umccullough at gmail.com  Fri Apr 10 17:09:54 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Fri, 10 Apr 2009 08:09:54 -0700
Subject: [Haiku-commits] r30096 - haiku/trunk/build/jam
In-Reply-To: <da2be3d70904100718q24b1bf46jef8a9762d6daf887@mail.gmail.com>
References: <200904100321.n3A3L8l8003383@sheep.berlios.de>
	<578273979-BeMail@quad>
	<da2be3d70904100718q24b1bf46jef8a9762d6daf887@mail.gmail.com>
Message-ID: <1e80d8750904100809j42fc097ax680be93fe7697254@mail.gmail.com>

On Fri, Apr 10, 2009 at 7:18 AM, David McPaul <dlmcpaul at gmail.com> wrote:
> Really, I thought yasm handled all of nasm code.
>
> The main difference is how include files are searched for.

Well, there is at least one still-known issue:

http://www.tortall.net/projects/yasm/ticket/17

I ran into that one with dnetc.

- Urias


From oruizdorantes at mail.berlios.de  Fri Apr 10 17:13:20 2009
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Fri, 10 Apr 2009 17:13:20 +0200
Subject: [Haiku-commits] r30106 - in haiku/trunk/headers: os/kernel
	private/shared
Message-ID: <200904101513.n3AFDKW6016572@sheep.berlios.de>

Author: oruizdorantes
Date: 2009-04-10 17:13:20 +0200 (Fri, 10 Apr 2009)
New Revision: 30106
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30106&view=rev

Modified:
   haiku/trunk/headers/os/kernel/OS.h
   haiku/trunk/headers/private/shared/cpu_type.h
Log:
(Joerg Meyer) - Add Via processors IDs(Esther/Isaiah)

Modified: haiku/trunk/headers/os/kernel/OS.h
===================================================================
--- haiku/trunk/headers/os/kernel/OS.h	2009-04-10 10:05:07 UTC (rev 30105)
+++ haiku/trunk/headers/os/kernel/OS.h	2009-04-10 15:13:20 UTC (rev 30106)
@@ -557,6 +557,9 @@
 	B_CPU_VIA_C3_SAMUEL_2				= 0x1367,
 	B_CPU_VIA_C3_EZRA_T					= 0x1368,
 	B_CPU_VIA_C3_NEHEMIAH				= 0x1369,
+	B_CPU_VIA_C7_ESTHER					= 0x136a,
+	B_CPU_VIA_C7_ESTHER_2				= 0x136d,
+	B_CPU_VIA_NANO_ISAIAH				= 0x136f,
 
 	/* Transmeta */
 	B_CPU_TRANSMETA_x86					= 0x1600,

Modified: haiku/trunk/headers/private/shared/cpu_type.h
===================================================================
--- haiku/trunk/headers/private/shared/cpu_type.h	2009-04-10 10:05:07 UTC (rev 30105)
+++ haiku/trunk/headers/private/shared/cpu_type.h	2009-04-10 15:13:20 UTC (rev 30106)
@@ -189,6 +189,11 @@
 			if ((info->cpu_revision & 0xf) < 8)
 				return "C3 Nehemiah";
 			return "C3 Eden-N";
+		case B_CPU_VIA_C7_ESTHER:
+		case B_CPU_VIA_C7_ESTHER_2:
+			return "C7";
+		case B_CPU_VIA_NANO_ISAIAH:
+			return "Nano";
 
 		/* Cyrix/VIA */
 		case B_CPU_CYRIX_GXm:



From czeidler at mail.berlios.de  Fri Apr 10 17:15:55 2009
From: czeidler at mail.berlios.de (czeidler at mail.berlios.de)
Date: Fri, 10 Apr 2009 17:15:55 +0200
Subject: [Haiku-commits] r30107 - haiku/trunk/src/preferences/mail
Message-ID: <200904101515.n3AFFt7j016832@sheep.berlios.de>

Author: czeidler
Date: 2009-04-10 17:15:53 +0200 (Fri, 10 Apr 2009)
New Revision: 30107
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30107&view=rev

Modified:
   haiku/trunk/src/preferences/mail/AutoConfigWindow.cpp
Log:
On default for pop3 accounts the mails are leaved on the server now. This was a bad trap especially for new MDR users.


Modified: haiku/trunk/src/preferences/mail/AutoConfigWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/AutoConfigWindow.cpp	2009-04-10 15:13:20 UTC (rev 30106)
+++ haiku/trunk/src/preferences/mail/AutoConfigWindow.cpp	2009-04-10 15:15:53 UTC (rev 30107)
@@ -179,6 +179,7 @@
 			inboundArchive.AddInt32("flavor", ssl);
 			inboundArchive.AddString("username", fAccountInfo.loginName);
 			inboundArchive.AddString("password", fAccountInfo.password);
+			inboundArchive.AddBool("leave_mail_on_server", bool(true));
 			inbound->SetFilter(0, inboundArchive, fAccountInfo.inboundProtocol);
 		}
 



From alex at zappotek.com  Fri Apr 10 21:27:40 2009
From: alex at zappotek.com (Alexandre Deckner)
Date: Fri, 10 Apr 2009 21:27:40 +0200
Subject: [Haiku-commits] r29962 - in haiku/trunk: headers/os/interface
 src/kits/interface
In-Reply-To: <200904061131.n36BVNcq012984@sheep.berlios.de>
References: <200904061131.n36BVNcq012984@sheep.berlios.de>
Message-ID: <49DF9DAC.3090709@zappotek.com>

zooey at mail.berlios.de wrote:
> Author: zooey
> Date: 2009-04-06 13:31:10 +0200 (Mon, 06 Apr 2009)
> New Revision: 29962
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29962&view=rev
>
> Modified:
>    haiku/trunk/headers/os/interface/TextView.h
>    haiku/trunk/src/kits/interface/TextView.cpp
> Log:
> * Instead of invoking _DrawLines out of the app-server drawing context,
>   we request the drawing via Invalidate() - this make use of the app-server's
>   potential double buffering, whenever that is active. This change reduces 
>   flickering in VESA mode considerably.
Strangely, after this change, BColorControls shows redrawing leftovers. 
(ie: r29961 doesn't exhibit the problem)
Won't have the time to look at the code today, probably a bug in 
BColorControl that got revealed, unless i  did something strange when 
searching the offending revision :)

Best regards,
Alex


From bga at bug-br.org.br  Fri Apr 10 16:56:11 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Fri, 10 Apr 2009 16:56:11
Subject: [Haiku-commits] r29962 - in haiku/trunk: headers/os/interface
 src/kits/interface
In-Reply-To: <49DF9DAC.3090709@zappotek.com>
Message-ID: <619845752-BeMail@Gaspode>

On Fri, 10 Apr 2009 21:27:40 +0200, Alexandre Deckner said:

> Strangely, after this change, BColorControls shows redrawing 
> leftovers. 
> (ie: r29961 doesn't exhibit the problem)
> Won't have the time to look at the code today, probably a bug in 
> BColorControl that got revealed, unless i  did something strange when 
> searching the offending revision :)

Actually this is one of the redrawing bugs I am seeing (r30084 here). 
When mentioning SoundPlay and Firefox (although it seems that the 
Firefox problem I was seeing was network-related after all). In 
BColorControl, when you change the value of one color component (by 
typing the new value), the old position will not be erased so you will 
see 2 markers in different positions. This is probably all related.

-Bruno


From mmlr at mail.berlios.de  Fri Apr 10 22:47:36 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Fri, 10 Apr 2009 22:47:36 +0200
Subject: [Haiku-commits] r30108 -
	haiku/trunk/src/add-ons/kernel/bus_managers/ata
Message-ID: <200904102047.n3AKlau0019034@sheep.berlios.de>

Author: mmlr
Date: 2009-04-10 22:47:23 +0200 (Fri, 10 Apr 2009)
New Revision: 30108
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30108&view=rev

Added:
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATATracing.cpp
Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATATracing.h
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/Jamfile
Log:
Extend and rework tracing. If ATA_TRACING is enabled in the tracing config it
will now log all the tracing details with ktrace_printf. Additionally messages
that should always be printed are outputted to the syslog.


Added: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATATracing.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATATracing.cpp	2009-04-10 15:15:53 UTC (rev 30107)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATATracing.cpp	2009-04-10 20:47:23 UTC (rev 30108)
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr at mlotz.ch.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include "ATATracing.h"
+
+#include <stdarg.h>
+
+static char sTraceBuffer[256];
+static uint32 sTraceBufferOffset = 0;
+
+void
+ata_trace_printf(uint32 flags, const char *format, ...)
+{
+	va_list arguments;
+	va_start(arguments, format);
+	sTraceBufferOffset += vsnprintf(sTraceBuffer + sTraceBufferOffset,
+		sizeof(sTraceBuffer) - sTraceBufferOffset, format, arguments);
+	va_end(arguments);
+
+	if (flags & ATA_TRACE_FLUSH) {
+#if ATA_TRACING
+		ktrace_printf(sTraceBuffer);
+#endif
+		if (flags & ATA_TRACE_SYSLOG)
+			dprintf(sTraceBuffer);
+
+		sTraceBufferOffset = 0;
+	}
+}

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATATracing.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATATracing.h	2009-04-10 15:15:53 UTC (rev 30107)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATATracing.h	2009-04-10 20:47:23 UTC (rev 30108)
@@ -5,16 +5,24 @@
 #ifndef ATA_TRACING_H
 #define ATA_TRACING_H
 
-//#define TRACE_ATA
-#ifdef TRACE_ATA
+#include <tracing.h>
+
+#define ATA_TRACE_START			0x00
+#define ATA_TRACE_FLUSH			0x01
+#define	ATA_TRACE_SYSLOG		0x02
+#define ATA_TRACE_FLUSH_SYSLOG	0x03
+
+#if ATA_TRACING
 #define TRACE(x...)				{ \
-									dprintf("ata%s: ", _DebugContext()); \
-									dprintf(x); \
+									ata_trace_printf(ATA_TRACE_START, \
+										"ata%s: ", _DebugContext()); \
+									ata_trace_printf(ATA_TRACE_FLUSH, x); \
 								}
 #define TRACE_FUNCTION(x...)	{ \
-									dprintf("ata%s: %s: ", _DebugContext(), \
+									ata_trace_printf(ATA_TRACE_START, \
+										"ata%s: %s: ", _DebugContext(), \
 										__FUNCTION__); \
-									dprintf(x); \
+									ata_trace_printf(ATA_TRACE_FLUSH, x); \
 								}
 #else
 #define TRACE(x...)				/* nothing */
@@ -22,14 +30,18 @@
 #endif
 
 #define TRACE_ALWAYS(x...)		{ \
-									dprintf("ata%s: ", _DebugContext()); \
-									dprintf(x); \
+									ata_trace_printf(ATA_TRACE_START, \
+										"ata%s: ", _DebugContext()); \
+									ata_trace_printf(ATA_TRACE_FLUSH_SYSLOG, x); \
 								}
 #define TRACE_ERROR(x...)		{ \
-									dprintf("ata%s error: ", _DebugContext()); \
-									dprintf(x); \
+									ata_trace_printf(ATA_TRACE_START, \
+										"ata%s error: ", _DebugContext()); \
+									ata_trace_printf(ATA_TRACE_FLUSH_SYSLOG, x); \
 								}
 
+void ata_trace_printf(uint32 flags, const char *format, ...);
+
 inline const char *
 _DebugContext()
 {

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/Jamfile	2009-04-10 15:15:53 UTC (rev 30107)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/Jamfile	2009-04-10 20:47:23 UTC (rev 30108)
@@ -27,4 +27,5 @@
 	ATAModule.cpp
 	ATAPIDevice.cpp
 	ATARequest.cpp
+	ATATracing.cpp
 	;



From mmlr at mail.berlios.de  Sat Apr 11 00:30:03 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Sat, 11 Apr 2009 00:30:03 +0200
Subject: [Haiku-commits] r30109 -
	haiku/trunk/src/add-ons/kernel/bus_managers/ata
Message-ID: <200904102230.n3AMU36B028394@sheep.berlios.de>

Author: mmlr
Date: 2009-04-11 00:29:59 +0200 (Sat, 11 Apr 2009)
New Revision: 30109
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30109&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
   haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp
Log:
* Rework ATAPI handling, removing all PIO interrupts. As Marcus pointed out the
  complication is not really worth it and it would in any case be unreliable
  in the shared interrupt case (even though you could always check the poll
  condition in the interrupt handler).
* Probably broke ATAPI with those changes though.
* Change blocksLeft to bytesLeft to allow using it for arbitrary ATAPI requests.
* Check some more error conditions and actually let those states get through
  to the SCSI layer.


Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-10 20:47:23 UTC (rev 30108)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp	2009-04-10 22:29:59 UTC (rev 30109)
@@ -393,9 +393,17 @@
 	while (true) {
 		uint8 status = AltStatus();
 		if ((flags & ATA_CHECK_ERROR_BIT) != 0
-			&& (status & ATA_STATUS_ERROR) != 0)
+			&& (status & ATA_STATUS_ERROR) != 0) {
+			TRACE("error bit set while waiting\n");
 			return B_ERROR;
+		}
 
+		if ((flags & ATA_CHECK_DISK_FAILURE) != 0
+			&& (status & ATA_STATUS_DISK_FAILURE) != 0) {
+			TRACE("disk failure bit set while waiting\n");
+			return B_ERROR;
+		}
+
 		if ((status & clearedBits) == 0) {
 			if ((flags & ATA_WAIT_ANY_BIT) != 0 && (status & setBits) != 0)
 				return B_OK;
@@ -426,8 +434,7 @@
 ATAChannel::WaitDataRequest(bool high)
 {
 	return Wait(high ? ATA_STATUS_DATA_REQUEST : 0,
-		high ? 0 : ATA_STATUS_DATA_REQUEST,
-		ATA_CHECK_ERROR_BIT, (high ? 10 : 1) * 1000 * 1000);
+		high ? 0 : ATA_STATUS_DATA_REQUEST, 0, (high ? 10 : 1) * 1000 * 1000);
 }
 
 
@@ -514,7 +521,7 @@
 {
 	if (flags & ATA_WAIT_FINISH) {
 		// wait for the device to finish current command (device no longer busy)
-		status_t result = Wait(0, ATA_STATUS_BUSY, 0, request->Timeout());
+		status_t result = Wait(0, ATA_STATUS_BUSY, flags, request->Timeout());
 		if (result != B_OK) {
 			TRACE_ERROR("timeout waiting for request finish\n");
 			request->SetStatus(SCSI_CMD_TIMEOUT);
@@ -545,12 +552,19 @@
 		return B_ERROR;
 	}
 
-	if ((taskFile->read.status & ATA_STATUS_ERROR) == 0)
+	uint8 checkFlags = ATA_STATUS_ERROR;
+	if (flags & ATA_CHECK_DISK_FAILURE)
+		checkFlags |= ATA_STATUS_DISK_FAILURE;
+
+	if ((taskFile->read.status & checkFlags) == 0)
 		return B_OK;
 
-	request->SetStatus(SCSI_SEQUENCE_FAIL);
-	TRACE_ERROR("command failed, error bit is set: 0x%02x\n",
-		taskFile->read.error);
+	if ((taskFile->read.error & ATA_ERROR_MEDIUM_CHANGED)
+		!= ATA_ERROR_MEDIUM_CHANGED) {
+		TRACE_ERROR("command failed, error bit is set: 0x%02x\n",
+			taskFile->read.error);
+	}
+
 	uint8 error = taskFile->read.error & errorMask;
 	if (error & ATA_ERROR_INTERFACE_CRC) {
 		TRACE_ERROR("interface crc error\n");
@@ -558,7 +572,7 @@
 		return B_ERROR;
 	}
 
-	if (flags & ATA_IS_WRITE) {
+	if (request->IsWrite()) {
 		if (error & ATA_ERROR_WRITE_PROTECTED) {
 			request->SetSense(SCSIS_KEY_DATA_PROTECT, SCSIS_ASC_WRITE_PROTECTED);
 			return B_ERROR;
@@ -630,32 +644,34 @@
 {
 	bigtime_t timeout = request->Timeout();
 	status_t result = B_OK;
-	uint32 *blocksLeft = request->BlocksLeft();
-	while (*blocksLeft > 0) {
-		if (Wait(ATA_STATUS_DATA_REQUEST, ATA_STATUS_BUSY, 0, timeout) != B_OK) {
+	size_t *bytesLeft = request->BytesLeft();
+	while (*bytesLeft > 0) {
+		if (Wait(ATA_STATUS_DATA_REQUEST, ATA_STATUS_BUSY, ATA_CHECK_ERROR_BIT
+			| ATA_CHECK_DISK_FAILURE, timeout) != B_OK) {
 			TRACE_ERROR("timeout waiting for device to request data\n");
 			result = B_TIMED_OUT;
 			break;
 		}
 
+		size_t currentLength = MIN(*bytesLeft, ATA_BLOCK_SIZE);
 		if (request->IsWrite()) {
-			result = _WritePIOBlock(request, 512);
+			result = _WritePIOBlock(request, currentLength);
 			if (result != B_OK) {
 				TRACE_ERROR("failed to write pio block\n");
 				break;
 			}
 		} else {
-			result = _ReadPIOBlock(request, 512);
+			result = _ReadPIOBlock(request, currentLength);
 			if (result != B_OK) {
 				TRACE_ERROR("failed to read pio block\n");
 				break;
 			}
 		}
 
-		(*blocksLeft)--;
+		*bytesLeft -= currentLength;
 
 		// wait 1 pio cycle
-		if (*blocksLeft > 0)
+		if (*bytesLeft > 0)
 			AltStatus();
 	}
 

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-10 20:47:23 UTC (rev 30108)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp	2009-04-10 22:29:59 UTC (rev 30109)
@@ -169,8 +169,7 @@
 	}
 
 	scsi_res_read_capacity data;
-	data.block_size = B_HOST_TO_BENDIAN_INT32(512);
-		// TODO: 512 bytes fixed block size?
+	data.block_size = B_HOST_TO_BENDIAN_INT32(ATA_BLOCK_SIZE);
 
 	uint32 lastBlock = fTotalSectors - 1;
 	data.lba = B_HOST_TO_BENDIAN_INT32(lastBlock);
@@ -462,7 +461,7 @@
 ATADevice::Identify()
 {
 	snprintf(fDebugContext, sizeof(fDebugContext), "%s %lu-%u",
-		IsATAPI() ? "pi " : "", fChannel->ChannelID(), fIndex);
+		IsATAPI() ? "pi" : "", fChannel->ChannelID(), fIndex);
 
 	ATARequest request(false);
 	request.SetDevice(this);
@@ -485,8 +484,9 @@
 		return B_TIMED_OUT;
 	}
 
-	if (fChannel->Wait(ATA_STATUS_DATA_REQUEST, ATA_STATUS_BUSY, 0,
-			IsATAPI() ? 20 * 1000 * 1000 : 500 * 1000) != B_OK) {
+	if (fChannel->Wait(ATA_STATUS_DATA_REQUEST, ATA_STATUS_BUSY,
+		ATA_CHECK_ERROR_BIT | ATA_CHECK_DISK_FAILURE, IsATAPI()
+		? 20 * 1000 * 1000 : 500 * 1000) != B_OK) {
 		TRACE_ERROR("timeout waiting for identify request\n");
 		return B_TIMED_OUT;
 	}
@@ -517,7 +517,7 @@
 	if (!request->UseDMA())
 		request->PrepareSGInfo();
 
-	request->SetBlocksLeft(sectorCount);
+	request->SetBytesLeft(sectorCount * ATA_BLOCK_SIZE);
 	if (_FillTaskFile(request, address) != B_OK) {
 		TRACE_ERROR("failed to setup transfer request\n");
 		if (request->UseDMA())
@@ -571,7 +571,7 @@
 	}
 
 	return fChannel->FinishRequest(request, ATA_WAIT_FINISH
-		| ATA_DEVICE_READY_REQUIRED, ATA_ERROR_ABORTED);
+		| ATA_DEVICE_READY_REQUIRED, ATA_ERROR_ALL);
 }
 
 
@@ -590,7 +590,7 @@
 		{ ATA_COMMAND_READ_DMA, ATA_COMMAND_WRITE_DMA }
 	};
 
-	uint32 sectorCount = *request->BlocksLeft();
+	uint32 sectorCount = *request->BytesLeft() / ATA_BLOCK_SIZE;
 	if (fUseLBA) {
 		if (fUse48Bits
 			&& (address + sectorCount > 0xfffffff || sectorCount > 0x100)) {

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp	2009-04-10 20:47:23 UTC (rev 30108)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp	2009-04-10 22:29:59 UTC (rev 30109)
@@ -49,10 +49,8 @@
 		return B_ERROR;
 	}
 
-	if (fInterruptsForPacket)
-		fChannel->PrepareWaitingForInterrupt();
-
-	status_t result = fChannel->SendRequest(request, ATA_DMA_TRANSFER);
+	status_t result = fChannel->SendRequest(request, request->UseDMA()
+		? ATA_DMA_TRANSFER : 0);
 	if (result != B_OK) {
 		TRACE_ERROR("failed to send packet request\n");
 		if (request->UseDMA())
@@ -61,15 +59,8 @@
 	}
 
 	// wait for device to get ready for packet transmission
-	bool timedOut = false;
-	if (fInterruptsForPacket)
-		timedOut = fChannel->WaitForInterrupt(request->Timeout()) != B_OK;
-	else {
-		timedOut = fChannel->Wait(ATA_STATUS_DATA_REQUEST, ATA_STATUS_BUSY, 0,
-			100 * 1000) != B_OK;
-	}
-
-	if (timedOut) {
+	if (fChannel->Wait(ATA_STATUS_DATA_REQUEST, ATA_STATUS_BUSY,
+		ATA_CHECK_ERROR_BIT | ATA_CHECK_DISK_FAILURE, 100 * 1000) != B_OK) {
 		TRACE_ERROR("timeout waiting for data request\n");
 		if (request->UseDMA())
 			fChannel->FinishDMA();
@@ -95,8 +86,6 @@
 	// some old drives need a delay before submitting the packet
 	spin(10);
 
-	fChannel->PrepareWaitingForInterrupt();
-
 	// write packet
 	if (fChannel->WritePIO(fPacket, sizeof(fPacket)) != B_OK) {
 		TRACE_ERROR("failed to write packet\n");
@@ -108,65 +97,73 @@
 	}
 
 	if (request->UseDMA()) {
+		fChannel->PrepareWaitingForInterrupt();
 		fChannel->StartDMA();
+
 		result = fChannel->WaitForInterrupt(request->Timeout());
 		status_t dmaResult = fChannel->FinishDMA();
-		if (result == B_OK && dmaResult == B_OK) {
-			fDMAFailures = 0;
-			request->CCB()->data_resid = 0;
-		} else {
-			if (dmaResult != B_OK) {
-				request->SetSense(SCSIS_KEY_HARDWARE_ERROR,
-					SCSIS_ASC_LUN_COM_FAILURE);
-				fDMAFailures++;
-				if (fDMAFailures >= ATA_MAX_DMA_FAILURES) {
-					TRACE_ALWAYS("disabling DMA after %u failures\n",
-						fDMAFailures);
-					fUseDMA = false;
-				}
-			} else {
-				// timeout
-				request->SetStatus(SCSI_CMD_TIMEOUT);
-			}
-		}
-	} else {
-		result = fChannel->WaitForInterrupt(request->Timeout());
 		if (result != B_OK) {
-			TRACE_ERROR("timeout waiting for device to request data\n");
-			request->SetStatus(SCSI_SEQUENCE_FAIL);
+			request->SetStatus(SCSI_CMD_TIMEOUT);
 			return B_TIMED_OUT;
 		}
 
-		while (true) {
-			uint8 altStatus = fChannel->AltStatus();
-			if ((altStatus & ATA_STATUS_DATA_REQUEST) == 0)
-				break;
+		result = fChannel->FinishRequest(request, ATA_CHECK_DISK_FAILURE,
+			ATA_ERROR_ALL);
+		if (result != B_OK) {
+			TRACE_ERROR("device indicates transfer error after dma\n");
+			return result;
+		}
 
-			fRegisterMask = ATA_MASK_ERROR | ATA_MASK_IREASON;
-			fChannel->ReadRegs(this);
+		// for ATAPI it's ok for the device to send too much
+		if (dmaResult == B_OK || dmaResult == B_DEV_DATA_OVERRUN) {
+			fDMAFailures = 0;
+			request->CCB()->data_resid = 0;
+			return B_OK;
+		}
 
-			if (fTaskFile.packet_res.cmd_or_data) {
-				TRACE_ERROR("device expecting command instead of data\n");
-				request->SetStatus(SCSI_SEQUENCE_FAIL);
-				return B_ERROR;
-			}
+		TRACE_ERROR("dma transfer failed\n");
+		request->SetSense(SCSIS_KEY_HARDWARE_ERROR,
+			SCSIS_ASC_LUN_COM_FAILURE);
+		fDMAFailures++;
+		if (fDMAFailures >= ATA_MAX_DMA_FAILURES) {
+			TRACE_ALWAYS("disabling DMA after %u failures\n", fDMAFailures);
+			fUseDMA = false;
+		}
 
-			fRegisterMask = ATA_MASK_BYTE_COUNT;
-			fChannel->ReadRegs(this);
-			size_t length = fTaskFile.packet_res.byte_count_0_7
-				| ((size_t)fTaskFile.packet_res.byte_count_8_15 << 8);
-			TRACE("about to transfer %lu bytes\n", length);
+		return B_ERROR;
+	}
 
-			request->SetBlocksLeft((length + 511) / 512);
-			if (fChannel->ExecutePIOTransfer(request) != B_OK) {
-				TRACE_ERROR("failed to transfer data\n");
-				request->SetStatus(SCSI_SEQUENCE_FAIL);
-				return B_ERROR;
-			}
-		}
+	// PIO data transfer
+	if (fChannel->Wait(ATA_STATUS_DATA_REQUEST, ATA_STATUS_BUSY,
+		ATA_CHECK_ERROR_BIT | ATA_CHECK_DISK_FAILURE,
+		request->Timeout()) != B_OK) {
+		TRACE_ERROR("timeout waiting for device to request data\n");
+		request->SetStatus(SCSI_CMD_TIMEOUT);
+		return B_TIMED_OUT;
 	}
 
-	return fChannel->FinishRequest(request, ATA_WAIT_FINISH, ATA_ERROR_ABORTED);
+	fRegisterMask = ATA_MASK_IREASON | ATA_MASK_BYTE_COUNT;
+	fChannel->ReadRegs(this);
+
+	if (fTaskFile.packet_res.cmd_or_data) {
+		TRACE_ERROR("device expecting command instead of data\n");
+		request->SetStatus(SCSI_SEQUENCE_FAIL);
+		return B_ERROR;
+	}
+
+	size_t length = fTaskFile.packet_res.byte_count_0_7
+		| ((size_t)fTaskFile.packet_res.byte_count_8_15 << 8);
+	TRACE("about to transfer %lu bytes\n", length);
+
+	request->SetBytesLeft(length);
+	fChannel->ExecutePIOTransfer(request);
+
+	result = fChannel->FinishRequest(request, ATA_WAIT_FINISH
+		| ATA_CHECK_DISK_FAILURE, ATA_ERROR_ALL);
+	if (result != B_OK)
+		TRACE_ERROR("device indicates transfer error after pio\n");
+
+	return result;
 }
 
 
@@ -199,7 +196,6 @@
 		return B_ERROR;
 
 	fTaskFile.packet.lun = 0;
-	fInterruptsForPacket = fInfoBlock._0.atapi.drq_speed == 1;
 
 	status_t result = ConfigureDMA();
 	if (result != B_OK)

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-10 20:47:23 UTC (rev 30108)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h	2009-04-10 22:29:59 UTC (rev 30109)
@@ -25,6 +25,7 @@
 #include "ATATracing.h"
 #include "ata_device_infoblock.h"
 
+#define ATA_BLOCK_SIZE				512 /* TODO: retrieve */
 #define ATA_MAX_DMA_FAILURES		3
 #define ATA_STANDARD_TIMEOUT		10 * 1000 * 1000
 #define ATA_RELEASE_TIMEOUT			10 * 1000 * 1000
@@ -39,7 +40,8 @@
 	ATA_DMA_TRANSFER			= 0x04,
 	ATA_CHECK_ERROR_BIT			= 0x08,
 	ATA_WAIT_FINISH				= 0x10,
-	ATA_WAIT_ANY_BIT			= 0x20
+	ATA_WAIT_ANY_BIT			= 0x20,
+	ATA_CHECK_DISK_FAILURE		= 0x40
 };
 
 
@@ -103,6 +105,7 @@
 
 		status_t					ReadRegs(ATADevice *device);
 		uint8						AltStatus();
+		bool						IsDMAInterruptSet();
 
 		status_t					ReadPIO(uint8 *buffer, size_t length);
 		status_t					WritePIO(uint8 *buffer, size_t length);
@@ -232,7 +235,6 @@
 private:
 		status_t					_FillTaskFilePacket(ATARequest *request);
 
-		bool						fInterruptsForPacket;
 		uint8						fPacket[12];
 };
 
@@ -263,8 +265,8 @@
 		void						SetUseDMA(bool useDMA);
 		bool						UseDMA() { return fUseDMA; };
 
-		void						SetBlocksLeft(uint32 blocksLeft);
-		uint32 *					BlocksLeft() { return &fBlocksLeft; };
+		void						SetBytesLeft(uint32 bytesLeft);
+		size_t *					BytesLeft() { return &fBytesLeft; };
 
 		status_t					Finish(bool resubmit);
 
@@ -302,7 +304,7 @@
 
 		ATADevice *					fDevice;
 		bigtime_t					fTimeout;
-		uint32						fBlocksLeft;
+		size_t						fBytesLeft;
 		bool						fIsWrite;
 		bool						fUseDMA;
 		scsi_ccb *					fCCB;

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp	2009-04-10 20:47:23 UTC (rev 30108)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp	2009-04-10 22:29:59 UTC (rev 30109)
@@ -9,7 +9,7 @@
 	:	fHasLock(hasLock),
 		fDevice(NULL),
 		fTimeout(0),
-		fBlocksLeft(0),
+		fBytesLeft(0),
 		fIsWrite(false),
 		fUseDMA(false),
 		fCCB(NULL)
@@ -80,9 +80,9 @@
 
 
 void
-ATARequest::SetBlocksLeft(uint32 blocksLeft)
+ATARequest::SetBytesLeft(uint32 bytesLeft)
 {
-	fBlocksLeft = blocksLeft;
+	fBytesLeft = bytesLeft;
 }
 
 
@@ -94,6 +94,7 @@
 
 	fCCB = ccb;
 	fStatus = SCSI_REQ_CMP;
+	fIsWrite = false;
 	return B_OK;
 }
 



From mmlr at mail.berlios.de  Sat Apr 11 01:13:27 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Sat, 11 Apr 2009 01:13:27 +0200
Subject: [Haiku-commits] r30110 - haiku/trunk/headers/private/drivers
Message-ID: <200904102313.n3ANDRam005829@sheep.berlios.de>

Author: mmlr
Date: 2009-04-11 01:13:25 +0200 (Sat, 11 Apr 2009)
New Revision: 30110
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30110&view=rev

Modified:
   haiku/trunk/headers/private/drivers/ata_types.h
Log:
Forgot this in the last commit.


Modified: haiku/trunk/headers/private/drivers/ata_types.h
===================================================================
--- haiku/trunk/headers/private/drivers/ata_types.h	2009-04-10 22:29:59 UTC (rev 30109)
+++ haiku/trunk/headers/private/drivers/ata_types.h	2009-04-10 23:13:25 UTC (rev 30110)
@@ -277,6 +277,8 @@
 	ATA_ERROR_INVALID_ADDRESS			= 0x10,		// invalid CHS address
 	ATA_ERROR_MEDIA_CHANGE_REQUESTED	= 0x08,		// media change requested
 	ATA_ERROR_NO_MEDIA					= 0x02,		// no media
+
+	ATA_ERROR_ALL						= 0xfe
 };
 
 typedef struct ata_channel_info *ata_channel_cookie;



From mmlr at mail.berlios.de  Sat Apr 11 02:00:23 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Sat, 11 Apr 2009 02:00:23 +0200
Subject: [Haiku-commits] r30111 - in haiku/trunk: build/jam
	src/add-ons/media/plugins/avcodec/libavcodec
Message-ID: <200904110000.n3B00NqX020323@sheep.berlios.de>

Author: mmlr
Date: 2009-04-11 02:00:19 +0200 (Sat, 11 Apr 2009)
New Revision: 30111
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30111&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/config.h
Log:
* Don't build avcodec with assembly targets using yasm - because it breaks the
  build.
* Remove the APE reader from the image as it also depends on the non-working
  yasm rule.

Please don't just leave the build in such a broken state. It's really annoying
when you're held up by stuff like that when you want to work on something.
Just leave changes like those disabled until you have verified that they work.


Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-10 23:13:25 UTC (rev 30110)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-11 00:00:19 UTC (rev 30111)
@@ -110,7 +110,6 @@
 	mp3_decoder mp3_reader
 	mp4_reader musepack
 	ogg raw_decoder speex
-	$(X86_ONLY)APE_reader
 	# theora
 	vorbis wav_reader
 ;

Modified: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile	2009-04-10 23:13:25 UTC (rev 30110)
+++ haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile	2009-04-11 00:00:19 UTC (rev 30111)
@@ -314,5 +314,5 @@
 	xsubdec.c
 	zmbv.c
 	:
-	libavcodec_x86.a
+#	libavcodec_x86.a
 ;

Modified: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/config.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/config.h	2009-04-10 23:13:25 UTC (rev 30110)
+++ haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/config.h	2009-04-11 00:00:19 UTC (rev 30111)
@@ -27,12 +27,12 @@
 #define HAVE_ARMVFP 0
 #define HAVE_IWMMXT 0
 #define HAVE_MMI 0
-#define HAVE_MMX 1
-#define HAVE_MMX2 1
+#define HAVE_MMX 0
+#define HAVE_MMX2 0
 #define HAVE_NEON 0
 #define HAVE_PPC4XX 0
-#define HAVE_SSE 1
-#define HAVE_SSSE3 1
+#define HAVE_SSE 0
+#define HAVE_SSSE3 0
 #define HAVE_VIS 0
 #define HAVE_BEOSTHREADS 0
 #define HAVE_OS2THREADS 0



From dlmcpaul at mail.berlios.de  Sat Apr 11 08:23:15 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Sat, 11 Apr 2009 08:23:15 +0200
Subject: [Haiku-commits] r30112 - haiku/trunk/build/jam
Message-ID: <200904110623.n3B6NF5Q008411@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-11 08:23:14 +0200 (Sat, 11 Apr 2009)
New Revision: 30112
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30112&view=rev

Modified:
   haiku/trunk/build/jam/MainBuildRules
Log:
test for valid ASFLAGS before calling yasm

Modified: haiku/trunk/build/jam/MainBuildRules
===================================================================
--- haiku/trunk/build/jam/MainBuildRules	2009-04-11 00:00:19 UTC (rev 30111)
+++ haiku/trunk/build/jam/MainBuildRules	2009-04-11 06:23:14 UTC (rev 30112)
@@ -174,7 +174,11 @@
 
 actions AssembleNasm
 {
-	yasm -d $(ASFLAGS) -f elf -o $(1) $(2)
+	if test $(ASFLAGS) ; then
+		yasm -d $(ASFLAGS) -f elf32 -o $(1) $(2);
+	else
+		yasm -f elf32 -o $(1) $(2);
+	fi
 }
 
 rule Ld



From dlmcpaul at mail.berlios.de  Sat Apr 11 08:30:55 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Sat, 11 Apr 2009 08:30:55 +0200
Subject: [Haiku-commits] r30113 - in
	haiku/trunk/src/add-ons/media/plugins/avcodec: . libavcodec
Message-ID: <200904110630.n3B6UtBk009513@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-11 08:30:53 +0200 (Sat, 11 Apr 2009)
New Revision: 30113
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30113&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/avcodec/Jamfile
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/config.h
Log:
correct avcodec build

Modified: haiku/trunk/src/add-ons/media/plugins/avcodec/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avcodec/Jamfile	2009-04-11 06:23:14 UTC (rev 30112)
+++ haiku/trunk/src/add-ons/media/plugins/avcodec/Jamfile	2009-04-11 06:30:53 UTC (rev 30113)
@@ -17,6 +17,7 @@
  	gfx_util.cpp
 	:  
 	libavcodec.a
+	libavcodec_x86.a
 	libavutil.a
 	libswscale.a
 	be

Modified: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile	2009-04-11 06:23:14 UTC (rev 30112)
+++ haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/Jamfile	2009-04-11 06:30:53 UTC (rev 30113)
@@ -39,7 +39,6 @@
 	vp3dsp_sse2.c
 	vp6dsp_mmx.c
 	vp6dsp_sse2.c
-	fft_sse.c
 	fdct_mmx.c
 ;
 
@@ -313,6 +312,4 @@
 	xl.c
 	xsubdec.c
 	zmbv.c
-	:
-#	libavcodec_x86.a
 ;

Modified: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/config.h
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/config.h	2009-04-11 06:23:14 UTC (rev 30112)
+++ haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/config.h	2009-04-11 06:30:53 UTC (rev 30113)
@@ -27,12 +27,12 @@
 #define HAVE_ARMVFP 0
 #define HAVE_IWMMXT 0
 #define HAVE_MMI 0
-#define HAVE_MMX 0
-#define HAVE_MMX2 0
+#define HAVE_MMX 1
+#define HAVE_MMX2 1
 #define HAVE_NEON 0
 #define HAVE_PPC4XX 0
-#define HAVE_SSE 0
-#define HAVE_SSSE3 0
+#define HAVE_SSE 1
+#define HAVE_SSSE3 1
 #define HAVE_VIS 0
 #define HAVE_BEOSTHREADS 0
 #define HAVE_OS2THREADS 0



From dlmcpaul at mail.berlios.de  Sat Apr 11 08:48:19 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Sat, 11 Apr 2009 08:48:19 +0200
Subject: [Haiku-commits] r30114 - in haiku/trunk/src/add-ons/media/plugins:
	. ape_reader ape_reader/LibMonkeysAudio ape_reader/MAClib
Message-ID: <200904110648.n3B6mJLC013561@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-11 08:48:18 +0200 (Sat, 11 Apr 2009)
New Revision: 30114
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30114&view=rev

Added:
   haiku/trunk/src/add-ons/media/plugins/ape_reader/
Modified:
   haiku/trunk/src/add-ons/media/plugins/ape_reader/Jamfile
   haiku/trunk/src/add-ons/media/plugins/ape_reader/LibMonkeysAudio/Jamfile
   haiku/trunk/src/add-ons/media/plugins/ape_reader/MAClib/Assembly.nasm
   haiku/trunk/src/add-ons/media/plugins/ape_reader/MAClib/Jamfile
Log:
change to lower case

Copied: haiku/trunk/src/add-ons/media/plugins/ape_reader (from rev 30110, haiku/trunk/src/add-ons/media/plugins/APE_reader)

Modified: haiku/trunk/src/add-ons/media/plugins/ape_reader/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/APE_reader/Jamfile	2009-04-10 23:13:25 UTC (rev 30110)
+++ haiku/trunk/src/add-ons/media/plugins/ape_reader/Jamfile	2009-04-11 06:48:18 UTC (rev 30114)
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons media plugins APE_reader ;
+SubDir HAIKU_TOP src add-ons media plugins ape_reader ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
@@ -7,10 +7,10 @@
 SubDirHdrs [ FDirName $(SUBDIR) LibMonkeysAudio ] ;
 SubDirHdrs [ FDirName $(SUBDIR) MAClib ] ;
 
-Addon APE_reader :
+Addon ape_reader :
 	APEReader.cpp
 	: libMonkeysAudio.a MAClib.a be libmedia.so
 ;
 
-SubInclude HAIKU_TOP src add-ons media plugins APE_reader LibMonkeysAudio ;
-SubInclude HAIKU_TOP src add-ons media plugins APE_reader MAClib ;
+SubInclude HAIKU_TOP src add-ons media plugins ape_reader LibMonkeysAudio ;
+SubInclude HAIKU_TOP src add-ons media plugins ape_reader MAClib ;

Modified: haiku/trunk/src/add-ons/media/plugins/ape_reader/LibMonkeysAudio/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/APE_reader/LibMonkeysAudio/Jamfile	2009-04-10 23:13:25 UTC (rev 30110)
+++ haiku/trunk/src/add-ons/media/plugins/ape_reader/LibMonkeysAudio/Jamfile	2009-04-11 06:48:18 UTC (rev 30114)
@@ -1,9 +1,7 @@
-SubDir HAIKU_TOP src add-ons media plugins APE_reader LibMonkeysAudio ;
+SubDir HAIKU_TOP src add-ons media plugins ape_reader LibMonkeysAudio ;
 
 SubDirHdrs [ FDirName $(SUBDIR) ../MAClib ] ;
 
-SubDirAsFlags -DWIN32=1 ;
-
 StaticLibrary libMonkeysAudio.a :
 	PositionBridgeIO.cpp
 	LibMonkeysAudio.cpp

Modified: haiku/trunk/src/add-ons/media/plugins/ape_reader/MAClib/Assembly.nasm
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/APE_reader/MAClib/Assembly.nasm	2009-04-10 23:13:25 UTC (rev 30110)
+++ haiku/trunk/src/add-ons/media/plugins/ape_reader/MAClib/Assembly.nasm	2009-04-11 06:48:18 UTC (rev 30114)
@@ -1,5 +1,5 @@
 
-%include "MAClib/Tools.inc"
+%include "Tools.inc"
 
 segment_code
 

Modified: haiku/trunk/src/add-ons/media/plugins/ape_reader/MAClib/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/APE_reader/MAClib/Jamfile	2009-04-10 23:13:25 UTC (rev 30110)
+++ haiku/trunk/src/add-ons/media/plugins/ape_reader/MAClib/Jamfile	2009-04-11 06:48:18 UTC (rev 30114)
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons media plugins APE_reader MAClib ;
+SubDir HAIKU_TOP src add-ons media plugins ape_reader MAClib ;
 
 SubDirHdrs [ FDirName $(SUBDIR) ../LibMonkeysAudio ] ;
 



From dlmcpaul at mail.berlios.de  Sat Apr 11 08:48:44 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Sat, 11 Apr 2009 08:48:44 +0200
Subject: [Haiku-commits] r30115 - haiku/trunk/src/add-ons/media/plugins
Message-ID: <200904110648.n3B6miQD013647@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-11 08:48:44 +0200 (Sat, 11 Apr 2009)
New Revision: 30115
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30115&view=rev

Removed:
   haiku/trunk/src/add-ons/media/plugins/APE_reader/
Log:
cleanup



From dlmcpaul at mail.berlios.de  Sat Apr 11 08:49:47 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Sat, 11 Apr 2009 08:49:47 +0200
Subject: [Haiku-commits] r30116 - haiku/trunk/src/add-ons/media/plugins
Message-ID: <200904110649.n3B6nluW013809@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-11 08:49:46 +0200 (Sat, 11 Apr 2009)
New Revision: 30116
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30116&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/Jamfile
Log:
change ape_reader to lower case

Modified: haiku/trunk/src/add-ons/media/plugins/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/Jamfile	2009-04-11 06:48:44 UTC (rev 30115)
+++ haiku/trunk/src/add-ons/media/plugins/Jamfile	2009-04-11 06:49:46 UTC (rev 30116)
@@ -7,7 +7,7 @@
 SubInclude HAIKU_TOP src add-ons media plugins avi_reader ;
 SubInclude HAIKU_TOP src add-ons media plugins mp3_reader ;
 SubInclude HAIKU_TOP src add-ons media plugins wav_reader ;
-SubInclude HAIKU_TOP src add-ons media plugins APE_reader ;
+SubInclude HAIKU_TOP src add-ons media plugins ape_reader ;
 
 SubInclude HAIKU_TOP src add-ons media plugins matroska ;
 SubInclude HAIKU_TOP src add-ons media plugins musepack ;



From dlmcpaul at mail.berlios.de  Sat Apr 11 08:52:44 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Sat, 11 Apr 2009 08:52:44 +0200
Subject: [Haiku-commits] r30117 - haiku/trunk/build/jam
Message-ID: <200904110652.n3B6qi3G014348@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-11 08:52:43 +0200 (Sat, 11 Apr 2009)
New Revision: 30117
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30117&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
put ape_reader back in image

Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-11 06:49:46 UTC (rev 30116)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-11 06:52:43 UTC (rev 30117)
@@ -110,6 +110,7 @@
 	mp3_decoder mp3_reader
 	mp4_reader musepack
 	ogg raw_decoder speex
+	$(X86_ONLY)ape_reader
 	# theora
 	vorbis wav_reader
 ;



From dlmcpaul at mail.berlios.de  Sat Apr 11 15:26:02 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Sat, 11 Apr 2009 15:26:02 +0200
Subject: [Haiku-commits] r30118 -
	haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86
Message-ID: <200904111326.n3BDQ2YC031338@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-11 15:26:01 +0200 (Sat, 11 Apr 2009)
New Revision: 30118
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30118&view=rev

Modified:
   haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264dsp_mmx.c
Log:
ifdef out function that has a problem asm instruction.  It does not seem to be called anyway

Modified: haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264dsp_mmx.c
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264dsp_mmx.c	2009-04-11 06:52:43 UTC (rev 30117)
+++ haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86/h264dsp_mmx.c	2009-04-11 13:26:01 UTC (rev 30118)
@@ -792,6 +792,8 @@
     transpose4x4(pix-2+4*stride, trans+4, stride, 8);
 }
 
+#ifndef __HAIKU__
+
 static void h264_loop_filter_strength_mmx2( int16_t bS[2][4][4], uint8_t nnz[40], int8_t ref[2][40], int16_t mv[2][40][2],
                                             int bidir, int edges, int step, int mask_mv0, int mask_mv1, int field ) {
     int dir;
@@ -895,6 +897,12 @@
     );
 }
 
+#else
+static void h264_loop_filter_strength_mmx2( int16_t bS[2][4][4], uint8_t nnz[40], int8_t ref[2][40], int16_t mv[2][40][2],
+                                            int bidir, int edges, int step, int mask_mv0, int mask_mv1, int field ) {
+}
+#endif
+
 /***********************************/
 /* motion compensation */
 



From dlmcpaul at mail.berlios.de  Sat Apr 11 15:56:17 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Sat, 11 Apr 2009 15:56:17 +0200
Subject: [Haiku-commits] r30119 - buildtools/trunk/yasm
Message-ID: <200904111356.n3BDuHU5001408@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-11 15:56:16 +0200 (Sat, 11 Apr 2009)
New Revision: 30119
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30119&view=rev

Added:
   buildtools/trunk/yasm/make_beos
   buildtools/trunk/yasm/make_haiku
Log:
scripts to build yasm on beos and haiku

Added: buildtools/trunk/yasm/make_beos
===================================================================
--- buildtools/trunk/yasm/make_beos	2009-04-11 13:26:01 UTC (rev 30118)
+++ buildtools/trunk/yasm/make_beos	2009-04-11 13:56:16 UTC (rev 30119)
@@ -0,0 +1,3 @@
+#! /bin/sh
+./configure
+make
\ No newline at end of file


Property changes on: buildtools/trunk/yasm/make_beos
___________________________________________________________________
Name: svn:executable
   + *

Added: buildtools/trunk/yasm/make_haiku
===================================================================
--- buildtools/trunk/yasm/make_haiku	2009-04-11 13:26:01 UTC (rev 30118)
+++ buildtools/trunk/yasm/make_haiku	2009-04-11 13:56:16 UTC (rev 30119)
@@ -0,0 +1,4 @@
+#! /bin/sh
+cp /boot/common/share/libtool/config/config.* config/
+./configure --prefix=/boot/common LDFLAGS=-L/boot/common/lib CPPFLAGS=-I/boot/common/include
+make
\ No newline at end of file


Property changes on: buildtools/trunk/yasm/make_haiku
___________________________________________________________________
Name: svn:executable
   + *



From dlmcpaul at mail.berlios.de  Sat Apr 11 16:00:39 2009
From: dlmcpaul at mail.berlios.de (dlmcpaul at BerliOS)
Date: Sat, 11 Apr 2009 16:00:39 +0200
Subject: [Haiku-commits] r30120 - buildtools/trunk/yasm
Message-ID: <200904111400.n3BE0dTo001872@sheep.berlios.de>

Author: dlmcpaul
Date: 2009-04-11 16:00:39 +0200 (Sat, 11 Apr 2009)
New Revision: 30120
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30120&view=rev

Modified:
   buildtools/trunk/yasm/make_beos
   buildtools/trunk/yasm/make_haiku
Log:
add newline to end of file

Modified: buildtools/trunk/yasm/make_beos
===================================================================
--- buildtools/trunk/yasm/make_beos	2009-04-11 13:56:16 UTC (rev 30119)
+++ buildtools/trunk/yasm/make_beos	2009-04-11 14:00:39 UTC (rev 30120)
@@ -1,3 +1,3 @@
 #! /bin/sh
 ./configure
-make
\ No newline at end of file
+make

Modified: buildtools/trunk/yasm/make_haiku
===================================================================
--- buildtools/trunk/yasm/make_haiku	2009-04-11 13:56:16 UTC (rev 30119)
+++ buildtools/trunk/yasm/make_haiku	2009-04-11 14:00:39 UTC (rev 30120)
@@ -1,4 +1,4 @@
 #! /bin/sh
 cp /boot/common/share/libtool/config/config.* config/
 ./configure --prefix=/boot/common LDFLAGS=-L/boot/common/lib CPPFLAGS=-I/boot/common/include
-make
\ No newline at end of file
+make



From bga at bug-br.org.br  Sat Apr 11 16:35:06 2009
From: bga at bug-br.org.br (Bruno G. Albuquerque)
Date: Sat, 11 Apr 2009 11:35:06 -0300 (BRT)
Subject: [Haiku-commits] r30118 -
 haiku/trunk/src/add-ons/media/plugins/avcodec/libavcodec/x86
In-Reply-To: <200904111326.n3BDQ2YC031338@sheep.berlios.de>
References: <200904111326.n3BDQ2YC031338@sheep.berlios.de>
Message-ID: <41011.187.20.131.93.1239460506.squirrel@www.bug-br.org.br>

Em Sab, Abril 11, 2009 10:26 am, dlmcpaul at BerliOS escreveu:
> Log:
> ifdef out function that has a problem asm instruction.  It does not seem
> to be called anyway

unfortunatelly, it is still not being compiled here. Now I get:

Cc
generated/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/dsputil_mmx.o
In file included from
src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c:31:
src/add-ons/media/plugins/avcodec/libavcodec/x86/mmx.h:24: warning:
#warning Everything in this header is deprecated, use plain __asm__()! New
code using this header will be rejected.
src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c: In
function `gmc_mmx':
src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c:1753:
Invalid `asm' statement:
src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c:1753: fixed
or forbidden register 6 (bp) was spilled for class GENERAL_REGS.

-Bruno



From stippi at mail.berlios.de  Sat Apr 11 21:42:03 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sat, 11 Apr 2009 21:42:03 +0200
Subject: [Haiku-commits] r30121 - haiku/trunk/src/apps/diskusage
Message-ID: <200904111942.n3BJg3Xh011206@sheep.berlios.de>

Author: stippi
Date: 2009-04-11 21:42:01 +0200 (Sat, 11 Apr 2009)
New Revision: 30121
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30121&view=rev

Modified:
   haiku/trunk/src/apps/diskusage/Common.h
Log:
Patch by Chico CHEN: Just use the new path of the userguide in DiskUsage and
the help button comes to live. Thanks a lot!


Modified: haiku/trunk/src/apps/diskusage/Common.h
===================================================================
--- haiku/trunk/src/apps/diskusage/Common.h	2009-04-11 14:00:39 UTC (rev 30120)
+++ haiku/trunk/src/apps/diskusage/Common.h	2009-04-11 19:42:01 UTC (rev 30121)
@@ -56,7 +56,7 @@
 
 // Non-resources :)
 PUBLIC_CONST char*	kAppSignature		EQ("application/x-vnd.haiku-diskusage");
-PUBLIC_CONST char*	kHelpFileName		EQ("apps/diskusage/DiskUsage.html");
+PUBLIC_CONST char*	kHelpFileName		EQ("userguide/en/applications/apps-diskusage.html");
 PUBLIC_CONST char*	kPieRectAttrName	EQ("mainrect");
 
 PUBLIC_CONST char*	kHelpBtnLabel		EQ("?");



From bonefish at mail.berlios.de  Sat Apr 11 22:22:12 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Sat, 11 Apr 2009 22:22:12 +0200
Subject: [Haiku-commits] r30122 - haiku/trunk/build/jam
Message-ID: <200904112022.n3BKMCjX015418@sheep.berlios.de>

Author: bonefish
Date: 2009-04-11 22:22:10 +0200 (Sat, 11 Apr 2009)
New Revision: 30122
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30122&view=rev

Modified:
   haiku/trunk/build/jam/HaikuImage
Log:
Removed avcodec from the build as long as it is broken.

gcc 2.95.3 build:

Cc /home/bonefish/develop/haiku/haiku/generated-gcc2/objects/haiku/x86/release/add-ons/media/plugins/avcodec/libavcodec/dsputil_mmx.o
In file included from /home/bonefish/develop/haiku/haiku/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c:31:
/home/bonefish/develop/haiku/haiku/src/add-ons/media/plugins/avcodec/libavcodec/x86/mmx.h:24: warning: #warning Everything in this header is deprecated, use plain __asm__()! New code using this header will be rejected.
/home/bonefish/develop/haiku/haiku/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c: In function `gmc_mmx':
/home/bonefish/develop/haiku/haiku/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c:1753: Invalid `asm' statement:
/home/bonefish/develop/haiku/haiku/src/add-ons/media/plugins/avcodec/libavcodec/x86/dsputil_mmx.c:1753: fixed or forbidden register 6 (bp) was spilled for class GENERAL_REGS.



Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage	2009-04-11 19:42:01 UTC (rev 30121)
+++ haiku/trunk/build/jam/HaikuImage	2009-04-11 20:22:10 UTC (rev 30122)
@@ -105,7 +105,8 @@
 	#legacy.media_addon
 ;
 SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder
-	aiff_reader au_reader $(X86_ONLY)avcodec avi_reader
+	aiff_reader au_reader avi_reader
+	# $(X86_ONLY)avcodec
 	matroska mov_reader
 	mp3_decoder mp3_reader
 	mp4_reader musepack



From ingo_weinhold at gmx.de  Sat Apr 11 21:57:57 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Sat, 11 Apr 2009 21:57:57 +0200
Subject: [Haiku-commits] r30112 - haiku/trunk/build/jam
In-Reply-To: <200904110623.n3B6NF5Q008411@sheep.berlios.de>
References: <200904110623.n3B6NF5Q008411@sheep.berlios.de>
Message-ID: <20090411215757.583.3@knochen-vm.localdomain>


On 2009-04-11 at 08:23:15 [+0200], dlmcpaul at BerliOS 
<dlmcpaul at mail.berlios.de> wrote:
> Author: dlmcpaul
> Date: 2009-04-11 08:23:14 +0200 (Sat, 11 Apr 2009)
> New Revision: 30112
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30112&view=rev
> 
> Modified:
>    haiku/trunk/build/jam/MainBuildRules
> Log:
> test for valid ASFLAGS before calling yasm
> 
> Modified: haiku/trunk/build/jam/MainBuildRules
> ===================================================================
> --- haiku/trunk/build/jam/MainBuildRules    2009-04-11 00:00:19 UTC (rev 
> 30111)
> +++ haiku/trunk/build/jam/MainBuildRules    2009-04-11 06:23:14 UTC (rev 
> 30112)
> @@ -174,7 +174,11 @@
>  
>  actions AssembleNasm
>  {
> -    yasm -d $(ASFLAGS) -f elf -o $(1) $(2)
> +    if test $(ASFLAGS) ; then
> +        yasm -d $(ASFLAGS) -f elf32 -o $(1) $(2);
> +    else
> +        yasm -f elf32 -o $(1) $(2);
> +    fi
>  }

I'm not familiar with the yasm command line, but it looks like one should 
just add the "-d" to ASFLAGS as well instead of this check, no?

CU, Ingo


From bonefish at mail.berlios.de  Sat Apr 11 23:24:52 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Sat, 11 Apr 2009 23:24:52 +0200
Subject: [Haiku-commits] r30123 - in haiku/trunk: headers/private/shared
	src/add-ons/disk_systems/intel src/apps/diskprobe
	src/apps/drivesetup src/kits/storage/disk_device
	src/kits/tracker src/preferences/backgrounds
	src/preferences/mail src/preferences/print src/servers/app
	src/servers/input src/servers/media_addon src/servers/print
Message-ID: <200904112124.n3BLOq4D022135@sheep.berlios.de>

Author: bonefish
Date: 2009-04-11 23:24:32 +0200 (Sat, 11 Apr 2009)
New Revision: 30123
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30123&view=rev

Removed:
   haiku/trunk/src/kits/tracker/OpenHashTable.h
Modified:
   haiku/trunk/headers/private/shared/ObjectList.h
   haiku/trunk/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp
   haiku/trunk/src/apps/diskprobe/AttributeWindow.cpp
   haiku/trunk/src/apps/diskprobe/DataEditor.cpp
   haiku/trunk/src/apps/diskprobe/DataView.cpp
   haiku/trunk/src/apps/diskprobe/TypeEditors.cpp
   haiku/trunk/src/apps/drivesetup/MainWindow.cpp
   haiku/trunk/src/apps/drivesetup/Support.cpp
   haiku/trunk/src/kits/storage/disk_device/DiskDeviceJobGenerator.cpp
   haiku/trunk/src/kits/storage/disk_device/DiskDeviceJobQueue.cpp
   haiku/trunk/src/kits/storage/disk_device/Partition.cpp
   haiku/trunk/src/kits/tracker/AttributeStream.cpp
   haiku/trunk/src/kits/tracker/AutoMounter.cpp
   haiku/trunk/src/kits/tracker/Bitmaps.cpp
   haiku/trunk/src/kits/tracker/FilePermissionsView.cpp
   haiku/trunk/src/kits/tracker/IconCache.cpp
   haiku/trunk/src/kits/tracker/MountMenu.cpp
   haiku/trunk/src/kits/tracker/TaskLoop.cpp
   haiku/trunk/src/kits/tracker/Thread.h
   haiku/trunk/src/kits/tracker/TrackerSettings.cpp
   haiku/trunk/src/kits/tracker/Utilities.h
   haiku/trunk/src/preferences/backgrounds/BackgroundImage.cpp
   haiku/trunk/src/preferences/backgrounds/BackgroundsView.cpp
   haiku/trunk/src/preferences/mail/DNSQuery.cpp
   haiku/trunk/src/preferences/print/JobListView.cpp
   haiku/trunk/src/servers/app/Desktop.cpp
   haiku/trunk/src/servers/app/ServerApp.cpp
   haiku/trunk/src/servers/app/ServerPicture.cpp
   haiku/trunk/src/servers/app/ServerWindow.cpp
   haiku/trunk/src/servers/input/PathList.cpp
   haiku/trunk/src/servers/media_addon/MediaFilePlayer.cpp
   haiku/trunk/src/servers/print/ConfigWindow.cpp
Log:
* Removed src/kits/tracker/OpenHashTable.h. The shared version in
  headers/private/shared is newer, though with small interface changes.
* Removed the unnecessary Debug.h include in
  headers/private/shared/ObjectList.h.
* Adjusted sources using these headers, mostly by adding missing includes.
* Lots of automatic whitespace cleanup.


Modified: haiku/trunk/headers/private/shared/ObjectList.h
===================================================================
--- haiku/trunk/headers/private/shared/ObjectList.h	2009-04-11 20:22:10 UTC (rev 30122)
+++ haiku/trunk/headers/private/shared/ObjectList.h	2009-04-11 21:24:32 UTC (rev 30123)
@@ -65,8 +65,9 @@
 #include <List.h>
 #endif
 
-#include <Debug.h>
+#include <SupportDefs.h>
 
+
 template<class T> class BObjectList;
 
 template<class T>
@@ -79,12 +80,12 @@
 
 private:
 	static int _unary_predicate_glue(const void *item, void *context);
-	
+
 friend class BObjectList<T>;
 };
 
 template<class T>
-int 
+int
 UnaryPredicate<T>::_unary_predicate_glue(const void *item, void *context)
 {
 	return ((UnaryPredicate<T> *)context)->operator()((const T *)item);
@@ -96,7 +97,7 @@
 	_PointerList_(const _PointerList_ &list);
 	_PointerList_(int32 itemsPerBlock = 20, bool owning = false);
 	~_PointerList_();
-	
+
 	typedef void *(* GenericEachFunction)(void *, void *);
 	typedef int (* GenericCompareFunction)(const void *, const void *);
 	typedef int (* GenericCompareFunctionWithState)(const void *, const void *,
@@ -108,7 +109,7 @@
 	void SortItems(GenericCompareFunctionWithState, void *state);
 	void HSortItems(GenericCompareFunction);
 	void HSortItems(GenericCompareFunctionWithState, void *state);
-	
+
 	void *BinarySearch(const void *, GenericCompareFunction) const;
 	void *BinarySearch(const void *, GenericCompareFunctionWithState, void *state) const;
 
@@ -147,7 +148,7 @@
 
 	// adding and removing
 	// ToDo:
-	// change Add calls to return const item 
+	// change Add calls to return const item
 	bool AddItem(T *);
 	bool AddItem(T *, int32);
 	bool AddList(BObjectList *);
@@ -228,14 +229,14 @@
 private:
 	void SetItem(int32, T *);
 };
-	
+
 template<class Item, class Result, class Param1>
-Result 
+Result
 WhileEachListItem(BObjectList<Item> *list, Result (Item::*func)(Param1), Param1 p1)
 {
-	Result result = 0; 
+	Result result = 0;
 	int32 count = list->CountItems();
-	
+
 	for (int32 index = 0; index < count; index++)
 		if ((result = (list->ItemAt(index)->*func)(p1)) != 0)
 			break;
@@ -244,12 +245,12 @@
 }
 
 template<class Item, class Result, class Param1>
-Result 
+Result
 WhileEachListItem(BObjectList<Item> *list, Result (*func)(Item *, Param1), Param1 p1)
 {
-	Result result = 0; 
+	Result result = 0;
 	int32 count = list->CountItems();
-	
+
 	for (int32 index = 0; index < count; index++)
 		if ((result = (*func)(list->ItemAt(index), p1)) != 0)
 			break;
@@ -258,13 +259,13 @@
 }
 
 template<class Item, class Result, class Param1, class Param2>
-Result 
+Result
 WhileEachListItem(BObjectList<Item> *list, Result (Item::*func)(Param1, Param2),
 	Param1 p1, Param2 p2)
 {
-	Result result = 0; 
+	Result result = 0;
 	int32 count = list->CountItems();
-	
+
 	for (int32 index = 0; index < count; index++)
 		if ((result = (list->ItemAt(index)->*func)(p1, p2)) != 0)
 			break;
@@ -273,13 +274,13 @@
 }
 
 template<class Item, class Result, class Param1, class Param2>
-Result 
+Result
 WhileEachListItem(BObjectList<Item> *list, Result (*func)(Item *, Param1, Param2),
 	Param1 p1, Param2 p2)
 {
-	Result result = 0; 
+	Result result = 0;
 	int32 count = list->CountItems();
-	
+
 	for (int32 index = 0; index < count; index++)
 		if ((result = (*func)(list->ItemAt(index), p1, p2)) != 0)
 			break;
@@ -288,13 +289,13 @@
 }
 
 template<class Item, class Result, class Param1, class Param2, class Param3, class Param4>
-Result 
+Result
 WhileEachListItem(BObjectList<Item> *list, Result (*func)(Item *, Param1, Param2,
 	Param3, Param4), Param1 p1, Param2 p2, Param3 p3, Param4 p4)
 {
-	Result result = 0; 
+	Result result = 0;
 	int32 count = list->CountItems();
-	
+
 	for (int32 index = 0; index < count; index++)
 		if ((result = (*func)(list->ItemAt(index), p1, p2, p3, p4)) != 0)
 			break;
@@ -303,7 +304,7 @@
 }
 
 template<class Item, class Result>
-void 
+void
 EachListItemIgnoreResult(BObjectList<Item> *list, Result (Item::*func)())
 {
 	int32 count = list->CountItems();
@@ -312,7 +313,7 @@
 }
 
 template<class Item, class Param1>
-void 
+void
 EachListItem(BObjectList<Item> *list, void (*func)(Item *, Param1), Param1 p1)
 {
 	int32 count = list->CountItems();
@@ -321,7 +322,7 @@
 }
 
 template<class Item, class Param1, class Param2>
-void 
+void
 EachListItem(BObjectList<Item> *list, void (Item::*func)(Param1, Param2),
 	Param1 p1, Param2 p2)
 {
@@ -331,7 +332,7 @@
 }
 
 template<class Item, class Param1, class Param2>
-void 
+void
 EachListItem(BObjectList<Item> *list, void (*func)(Item *,Param1, Param2),
 	Param1 p1, Param2 p2)
 {
@@ -341,7 +342,7 @@
 }
 
 template<class Item, class Param1, class Param2, class Param3>
-void 
+void
 EachListItem(BObjectList<Item> *list, void (*func)(Item *,Param1, Param2,
 	Param3), Param1 p1, Param2 p2, Param3 p3)
 {
@@ -352,7 +353,7 @@
 
 
 template<class Item, class Param1, class Param2, class Param3, class Param4>
-void 
+void
 EachListItem(BObjectList<Item> *list, void (*func)(Item *,Param1, Param2,
 	Param3, Param4), Param1 p1, Param2 p2, Param3 p3, Param4 p4)
 {
@@ -369,13 +370,13 @@
 	return owning;
 }
 
-template<class T> 
+template<class T>
 BObjectList<T>::BObjectList(int32 itemsPerBlock, bool owning)
 	:	_PointerList_(itemsPerBlock, owning)
 {
 }
 
-template<class T> 
+template<class T>
 BObjectList<T>::BObjectList(const BObjectList<T> &list)
 	:	_PointerList_(list)
 {
@@ -392,7 +393,7 @@
 	}
 }
 
-template<class T> 
+template<class T>
 BObjectList<T>::~BObjectList()
 {
 	if (Owning())
@@ -400,7 +401,7 @@
 		MakeEmpty();
 }
 
-template<class T> 
+template<class T>
 BObjectList<T> &
 BObjectList<T>::operator=(const BObjectList<T> &list)
 {
@@ -419,56 +420,56 @@
 	return result;
 }
 
-template<class T> 
-bool 
+template<class T>
+bool
 BObjectList<T>::AddItem(T *item)
 {
 	// need to cast to void * to make T work for const pointers
 	return _PointerList_::AddItem((void *)item);
 }
 
-template<class T> 
-bool 
+template<class T>
+bool
 BObjectList<T>::AddItem(T *item, int32 atIndex)
 {
 	return _PointerList_::AddItem((void *)item, atIndex);
 }
 
-template<class T> 
-bool 
+template<class T>
+bool
 BObjectList<T>::AddList(BObjectList<T> *newItems)
 {
 	return _PointerList_::AddList(newItems);
 }
 
-template<class T> 
-bool 
+template<class T>
+bool
 BObjectList<T>::AddList(BObjectList<T> *newItems, int32 atIndex)
 {
 	return _PointerList_::AddList(newItems, atIndex);
 }
 
 
-template<class T> 
-bool 
+template<class T>
+bool
 BObjectList<T>::RemoveItem(T *item, bool deleteIfOwning)
 {
 	bool result = _PointerList_::RemoveItem((void *)item);
-	
+
 	if (result && Owning() && deleteIfOwning)
 		delete item;
 
 	return result;
 }
 
-template<class T> 
+template<class T>
 T *
 BObjectList<T>::RemoveItemAt(int32 index)
 {
 	return (T *)_PointerList_::RemoveItem(index);
 }
 
-template<class T> 
+template<class T>
 inline T *
 BObjectList<T>::ItemAt(int32 index) const
 {
@@ -476,7 +477,7 @@
 }
 
 template<class T>
-bool 
+bool
 BObjectList<T>::ReplaceItem(int32 index, T *item)
 {
 	if (owning)
@@ -494,56 +495,56 @@
 }
 
 template<class T>
-void 
+void
 BObjectList<T>::SetItem(int32 index, T *newItem)
 {
 	_PointerList_::ReplaceItem(index, (void *)newItem);
 }
 
-template<class T> 
-int32 
+template<class T>
+int32
 BObjectList<T>::IndexOf(const T *item) const
 {
 	return _PointerList_::IndexOf((void *)item);
 }
 
-template<class T> 
+template<class T>
 T *
 BObjectList<T>::FirstItem() const
 {
 	return (T *)_PointerList_::FirstItem();
 }
 
-template<class T> 
+template<class T>
 T *
 BObjectList<T>::LastItem() const
 {
 	return (T *)_PointerList_::LastItem();
 }
 
-template<class T> 
-bool 
+template<class T>
+bool
 BObjectList<T>::HasItem(const T *item) const
 {
 	return _PointerList_::HasItem((void *)item);
 }
 
-template<class T> 
-bool 
+template<class T>
+bool
 BObjectList<T>::IsEmpty() const
 {
 	return _PointerList_::IsEmpty();
 }
 
-template<class T> 
-int32 
+template<class T>
+int32
 BObjectList<T>::CountItems() const
 {
 	return _PointerList_::CountItems();
 }
 
-template<class T> 
-void 
+template<class T>
+void
 BObjectList<T>::MakeEmpty()
 {
 	if (owning) {
@@ -554,21 +555,21 @@
 	_PointerList_::MakeEmpty();
 }
 
-template<class T> 
+template<class T>
 T *
 BObjectList<T>::EachElement(EachFunction func, void *params)
-{ 
-	return (T *)_PointerList_::EachElement((GenericEachFunction)func, params); 
+{
+	return (T *)_PointerList_::EachElement((GenericEachFunction)func, params);
 }
 
 
-template<class T> 
+template<class T>
 const T *
 BObjectList<T>::EachElement(ConstEachFunction func, void *params) const
-{ 
+{
 	return (const T *)
 		const_cast<BObjectList<T> *>(this)->_PointerList_::EachElement(
-		(GenericEachFunction)func, params); 
+		(GenericEachFunction)func, params);
 }
 
 template<class T>
@@ -594,32 +595,32 @@
 }
 
 
-template<class T> 
+template<class T>
 void
 BObjectList<T>::SortItems(CompareFunction function)
-{ 
-	_PointerList_::SortItems((GenericCompareFunction)function); 
+{
+	_PointerList_::SortItems((GenericCompareFunction)function);
 }
 
 template<class T>
-void 
+void
 BObjectList<T>::SortItems(CompareFunctionWithState function, void *state)
 {
-	_PointerList_::SortItems((GenericCompareFunctionWithState)function, state); 
+	_PointerList_::SortItems((GenericCompareFunctionWithState)function, state);
 }
 
-template<class T> 
+template<class T>
 void
 BObjectList<T>::HSortItems(CompareFunction function)
-{ 
-	_PointerList_::HSortItems((GenericCompareFunction)function); 
+{
+	_PointerList_::HSortItems((GenericCompareFunction)function);
 }
 
 template<class T>
-void 
+void
 BObjectList<T>::HSortItems(CompareFunctionWithState function, void *state)
 {
-	_PointerList_::HSortItems((GenericCompareFunctionWithState)function, state); 
+	_PointerList_::HSortItems((GenericCompareFunctionWithState)function, state);
 }
 
 template<class T>
@@ -667,7 +668,7 @@
 }
 
 template<class T>
-bool 
+bool
 BObjectList<T>::BinaryInsertUnique(T *item, CompareFunction func)
 {
 	int32 index = _PointerList_::BinarySearchIndex(item,
@@ -679,7 +680,7 @@
 }
 
 template<class T>
-bool 
+bool
 BObjectList<T>::BinaryInsertUnique(T *item, CompareFunctionWithState func, void *state)
 {
 	int32 index = _PointerList_::BinarySearchIndex(item,
@@ -702,7 +703,7 @@
 		index++;
 	else
 		index = -index - 1;
-		
+
 	T *newItem = new T(copyThis);
 	AddItem(newItem, index);
 	return newItem;
@@ -733,7 +734,7 @@
 		(GenericCompareFunction)func);
 	if (index >= 0)
 		return ItemAt(index);
-	
+
 	index = -index - 1;
 	T *newItem = new T(copyThis);
 	AddItem(newItem, index);
@@ -749,7 +750,7 @@
 		(GenericCompareFunctionWithState)func, state);
 	if (index >= 0)
 		return ItemAt(index);
-	
+
 	index = -index - 1;
 	T *newItem = new T(copyThis);
 	AddItem(newItem, index);
@@ -757,19 +758,19 @@
 }
 
 template<class T>
-int32 
+int32
 BObjectList<T>::FindBinaryInsertionIndex(const UnaryPredicate<T> &pred, bool *alreadyInList)
 	const
 {
 	int32 index = _PointerList_::BinarySearchIndexByPredicate(&pred,
 		(UnaryPredicateGlue)&UnaryPredicate<T>::_unary_predicate_glue);
-	
+
 	if (alreadyInList)
 		*alreadyInList = index >= 0;
 
-	if (index < 0) 
+	if (index < 0)
 		index = -index - 1;
-	
+
 	return index;
 }
 

Modified: haiku/trunk/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp
===================================================================
--- haiku/trunk/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp	2009-04-11 20:22:10 UTC (rev 30122)
+++ haiku/trunk/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp	2009-04-11 21:24:32 UTC (rev 30123)
@@ -5,6 +5,8 @@
 
 #include "ExtendedPartitionAddOn.h"
 
+#include <stdio.h>
+
 #include <new>
 
 #include <DiskDeviceTypes.h>
@@ -17,7 +19,7 @@
 using std::nothrow;
 
 
-static const uint32 kDiskSystemFlags = 
+static const uint32 kDiskSystemFlags =
 	0
 //	| B_DISK_SYSTEM_SUPPORTS_CHECKING
 //	| B_DISK_SYSTEM_SUPPORTS_REPAIRING

Modified: haiku/trunk/src/apps/diskprobe/AttributeWindow.cpp
===================================================================
--- haiku/trunk/src/apps/diskprobe/AttributeWindow.cpp	2009-04-11 20:22:10 UTC (rev 30122)
+++ haiku/trunk/src/apps/diskprobe/AttributeWindow.cpp	2009-04-11 21:24:32 UTC (rev 30123)
@@ -8,6 +8,9 @@
 #include "ProbeView.h"
 #include "TypeEditors.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <MenuBar.h>
 #include <MenuItem.h>
 #include <TabView.h>
@@ -62,7 +65,7 @@
 }
 
 
-void 
+void
 EditorTabView::FrameResized(float width, float height)
 {
 	BRect rect = Bounds();
@@ -84,7 +87,7 @@
 }
 
 
-void 
+void
 EditorTabView::Select(int32 tab)
 {
 	if (tab != fRawTab && fRawEditorView != NULL && !fRawEditorView->IsHidden(fRawEditorView))
@@ -131,7 +134,7 @@
 }
 
 
-void 
+void
 EditorTabView::SetTypeEditorTab(BView *view)
 {
 	if (fTypeEditorView == view)
@@ -257,7 +260,7 @@
 }
 
 
-void 
+void
 AttributeWindow::MessageReceived(BMessage *message)
 {
 	switch (message->what) {
@@ -289,7 +292,7 @@
 }
 
 
-bool 
+bool
 AttributeWindow::QuitRequested()
 {
 	if (fTypeEditorView != NULL)

Modified: haiku/trunk/src/apps/diskprobe/DataEditor.cpp
===================================================================
--- haiku/trunk/src/apps/diskprobe/DataEditor.cpp	2009-04-11 20:22:10 UTC (rev 30122)
+++ haiku/trunk/src/apps/diskprobe/DataEditor.cpp	2009-04-11 21:24:32 UTC (rev 30123)
@@ -8,11 +8,13 @@
 
 #include <Autolock.h>
 #include <NodeMonitor.h>
+#include <Debug.h>
 #include <Directory.h>
 #include <Drivers.h>
 #include <fs_attr.h>
 #include <fs_info.h>
 
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>
@@ -178,7 +180,7 @@
 }
 
 
-bool 
+bool
 DataChange::Merge(DataChange *change)
 {
 	return false;
@@ -196,7 +198,7 @@
 	fOldData = (uint8 *)malloc(size);
 	if (fNewData != NULL && fOldData != NULL) {
 		memcpy(fNewData, data, size);
-		fSize = size;		
+		fSize = size;
 	} else
 		fSize = 0;
 }
@@ -215,7 +217,7 @@
  *	method.
  */
 
-void 
+void
 ReplaceChange::Normalize(off_t bufferOffset, size_t bufferSize, off_t &offset,
 	size_t &dataOffset, size_t &size)
 {
@@ -230,7 +232,7 @@
 }
 
 
-void 
+void
 ReplaceChange::Apply(off_t bufferOffset, uint8 *buffer, size_t bufferSize)
 {
 	// is it in our range?
@@ -257,7 +259,7 @@
 }
 
 
-void 
+void
 ReplaceChange::Revert(off_t bufferOffset, uint8 *buffer, size_t bufferSize)
 {
 	// is it in our range?
@@ -283,7 +285,7 @@
 }
 
 
-bool 
+bool
 ReplaceChange::Merge(DataChange *_change)
 {
 	ReplaceChange *change = dynamic_cast<ReplaceChange *>(_change);
@@ -323,7 +325,7 @@
 			// if this fails, we can't do anything about it
 		return false;
 	}
-	
+
 	if (fOffset < change->fOffset) {
 		memcpy(newData + fSize, change->fNewData, change->fSize);
 		memcpy(oldData + fSize, change->fOldData, change->fSize);
@@ -350,7 +352,7 @@
 }
 
 
-void 
+void
 ReplaceChange::GetRange(off_t /*fileSize*/, off_t &_offset, off_t &_size)
 {
 	_offset = fOffset;
@@ -392,7 +394,7 @@
 }
 
 
-status_t 
+status_t
 DataEditor::SetTo(const char *path, const char *attribute)
 {
 	BEntry entry(path);
@@ -400,7 +402,7 @@
 }
 
 
-status_t 
+status_t
 DataEditor::SetTo(entry_ref &ref, const char *attribute)
 {
 	BEntry entry(&ref);
@@ -408,7 +410,7 @@
 }
 
 
-status_t 
+status_t
 DataEditor::SetTo(BEntry &entry, const char *attribute)
 {
 	fSize = 0;
@@ -516,7 +518,7 @@
 }
 
 
-status_t 
+status_t
 DataEditor::InitCheck()
 {
 	return fFile.InitCheck();
@@ -747,7 +749,7 @@
 }
 
 
-status_t 
+status_t
 DataEditor::Undo()
 {
 	BAutolock locker(this);
@@ -776,7 +778,7 @@
 }
 
 
-status_t 
+status_t
 DataEditor::Redo()
 {
 	BAutolock locker(this);
@@ -863,7 +865,7 @@
 }
 
 
-status_t 
+status_t
 DataEditor::SetViewSize(size_t size, bool sendNotices)
 {
 	BAutolock locker(this);
@@ -979,7 +981,7 @@
 }
 
 
-status_t 
+status_t
 DataEditor::ForceUpdate()
 {
 	BAutolock locker(this);
@@ -1045,7 +1047,7 @@
 }
 
 
-off_t 
+off_t
 DataEditor::Find(off_t startPosition, const uint8 *data, size_t dataSize,
 	bool caseInsensitive, bool cyclic, BMessenger progressMonitor,
 	volatile bool *stop)
@@ -1191,7 +1193,7 @@
 }
 
 
-void 
+void
 DataEditor::SendNotices(uint32 what, BMessage *message)
 {
 	if (fObservers.CountItems() == 0)
@@ -1213,7 +1215,7 @@
 }
 
 
-status_t 
+status_t
 DataEditor::StartWatching(BMessenger target)
 {
 	BAutolock locker(this);
@@ -1236,7 +1238,7 @@
 }
 
 
-void 
+void
 DataEditor::StopWatching(BMessenger target)
 {
 	BAutolock locker(this);
@@ -1254,7 +1256,7 @@
 }
 
 
-void 
+void
 DataEditor::StopWatching(BHandler *handler, BLooper *looper)
 {
 	StopWatching(BMessenger(handler, looper));

Modified: haiku/trunk/src/apps/diskprobe/DataView.cpp
===================================================================
--- haiku/trunk/src/apps/diskprobe/DataView.cpp	2009-04-11 20:22:10 UTC (rev 30122)
+++ haiku/trunk/src/apps/diskprobe/DataView.cpp	2009-04-11 21:24:32 UTC (rev 30123)
@@ -7,6 +7,9 @@
 #include "DataView.h"
 #include "DataEditor.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <Window.h>
 #include <ScrollBar.h>
 #include <Autolock.h>

Modified: haiku/trunk/src/apps/diskprobe/TypeEditors.cpp
===================================================================
--- haiku/trunk/src/apps/diskprobe/TypeEditors.cpp	2009-04-11 20:22:10 UTC (rev 30122)
+++ haiku/trunk/src/apps/diskprobe/TypeEditors.cpp	2009-04-11 21:24:32 UTC (rev 30123)
@@ -11,6 +11,9 @@
 #	include <IconUtils.h>
 #endif
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <Alert.h>
 #include <Autolock.h>
 #include <Bitmap.h>
@@ -27,9 +30,7 @@
 #include <TranslationUtils.h>
 #include <TranslatorFormats.h>
 
-#include <stdlib.h>
 
-
 static const uint32 kMsgValueChanged = 'vlch';
 static const uint32 kMsgScaleChanged = 'scch';
 static const uint32 kMimeTypeItem = 'miti';
@@ -254,7 +255,7 @@
 }
 
 
-void 
+void
 StringEditor::DetachedFromWindow()
 {
 	fEditor.StopWatching(this);
@@ -305,7 +306,7 @@
 }
 
 
-void 
+void
 MimeTypeEditor::CommitChanges()
 {
 	if (fPreviousText != fTextControl->Text()) {
@@ -333,7 +334,7 @@
 }
 
 
-void 
+void
 MimeTypeEditor::DetachedFromWindow()
 {
 	fEditor.StopWatching(this);
@@ -379,7 +380,7 @@
 }
 
 
-void 
+void
 NumberEditor::_UpdateText()
 {
 	if (fEditor.Lock()) {
@@ -625,7 +626,7 @@
 }
 
 
-size_t 
+size_t
 NumberEditor::_Size()
 {
 	switch (fEditor.Type()) {
@@ -711,7 +712,7 @@
 }
 
 
-void 
+void
 NumberEditor::DetachedFromWindow()
 {
 	fEditor.StopWatching(this);
@@ -774,7 +775,7 @@
 }
 
 
-void 
+void
 BooleanEditor::_UpdateMenuField()
 {
 	if (fEditor.FileSize() != 1)
@@ -790,14 +791,14 @@
 }
 
 
-void 
+void
 BooleanEditor::CommitChanges()
 {
 	// we're commiting the changes as they happen
 }
 
 
-void 
+void
 BooleanEditor::AttachedToWindow()
 {
 	fTrueMenuItem->SetTarget(this);
@@ -807,14 +808,14 @@
 }
 
 
-void 
+void
 BooleanEditor::DetachedFromWindow()
 {
 	fEditor.StopWatching(this);
 }
 
 
-void 
+void
 BooleanEditor::MessageReceived(BMessage *message)
 {
 	switch (message->what) {
@@ -842,7 +843,7 @@
 	fBitmap(NULL),
 	fScaleSlider(NULL)
 {
-	if (editor.Type() == B_MINI_ICON_TYPE || editor.Type() == B_LARGE_ICON_TYPE 
+	if (editor.Type() == B_MINI_ICON_TYPE || editor.Type() == B_LARGE_ICON_TYPE
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
 		|| editor.Type() == B_VECTOR_ICON_TYPE
 #endif
@@ -876,7 +877,7 @@
 }
 
 
-void 
+void
 ImageView::AttachedToWindow()
 {
 	if (Parent() != NULL)
@@ -892,7 +893,7 @@
 }
 
 
-void 
+void
 ImageView::DetachedFromWindow()
 {
 	fEditor.StopWatching(this);
@@ -1034,7 +1035,7 @@
 			case B_MESSAGE_TYPE:
 				type = "Flattened Bitmap";
 				break;
-			default:	
+			default:
 				break;
 		}
 		const char *colorSpace;
@@ -1283,7 +1284,7 @@
 }
 
 
-void 
+void
 MessageView::DetachedFromWindow()
 {
 	fEditor.StopWatching(this);

Modified: haiku/trunk/src/apps/drivesetup/MainWindow.cpp
===================================================================
--- haiku/trunk/src/apps/drivesetup/MainWindow.cpp	2009-04-11 20:22:10 UTC (rev 30122)
+++ haiku/trunk/src/apps/drivesetup/MainWindow.cpp	2009-04-11 21:24:32 UTC (rev 30123)
@@ -14,6 +14,9 @@
 #include "PartitionList.h"

[... truncated: 3457 lines follow ...]


From bonefish at mail.berlios.de  Sat Apr 11 23:29:23 2009
From: bonefish at mail.berlios.de (bonefish at mail.berlios.de)
Date: Sat, 11 Apr 2009 23:29:23 +0200
Subject: [Haiku-commits] r30124 - haiku/trunk/headers/private/kernel/util
Message-ID: <200904112129.n3BLTNOE022457@sheep.berlios.de>

Author: bonefish
Date: 2009-04-11 23:29:22 +0200 (Sat, 11 Apr 2009)
New Revision: 30124
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30124&view=rev

Modified:
   haiku/trunk/headers/private/kernel/util/KMessage.h
Log:
Added data accessors for B_POINTER_TYPE.


Modified: haiku/trunk/headers/private/kernel/util/KMessage.h
===================================================================
--- haiku/trunk/headers/private/kernel/util/KMessage.h	2009-04-11 21:24:32 UTC (rev 30123)
+++ haiku/trunk/headers/private/kernel/util/KMessage.h	2009-04-11 21:29:22 UTC (rev 30124)
@@ -66,6 +66,7 @@
 	inline status_t AddInt16(const char *name, int16 value);
 	inline status_t AddInt32(const char *name, int32 value);
 	inline status_t AddInt64(const char *name, int64 value);
+	inline status_t AddPointer(const char *name, const void* value);
 	inline status_t AddString(const char *name, const char *value);
 
 	status_t FindData(const char *name, type_code type,
@@ -82,6 +83,9 @@
 	inline status_t FindInt32(const char *name, int32 index, int32 *value) const;
 	inline status_t FindInt64(const char *name, int64 *value) const;
 	inline status_t FindInt64(const char *name, int32 index, int64 *value) const;
+	inline status_t FindPointer(const char *name, void** value) const;
+	inline status_t FindPointer(const char *name, int32 index,
+		void** value) const;
 	inline status_t FindString(const char *name, const char **value) const;
 	inline status_t FindString(const char *name, int32 index,
 		const char **value) const;
@@ -99,6 +103,9 @@
 	inline int64 GetInt64(const char* name, int64 defaultValue) const;
 	inline int64 GetInt64(const char* name, int32 index,
 		int64 defaultValue) const;
+	inline void* GetPointer(const char* name, const void* defaultValue) const;
+	inline void* GetPointer(const char* name, int32 index,
+		const void* defaultValue) const;
 	inline const char* GetString(const char* name,
 		const char* defaultValue) const;
 	inline const char* GetString(const char* name, int32 index,
@@ -112,6 +119,7 @@
 	inline status_t SetInt16(const char* name, int16 value);
 	inline status_t SetInt32(const char* name, int32 value);
 	inline status_t SetInt64(const char* name, int64 value);
+	inline status_t SetPointer(const char* name, const void* value);
 
 	// message delivery
 	team_id Sender() const;
@@ -261,13 +269,21 @@
 }
 
 // AddInt64
-inline
-status_t
+inline status_t
 KMessage::AddInt64(const char *name, int64 value)
 {
 	return AddData(name, B_INT64_TYPE, &value, sizeof(int64), true);
 }
 
+
+// AddPointer
+inline status_t
+KMessage::AddPointer(const char *name, const void* value)
+{
+	return AddData(name, B_POINTER_TYPE, &value, sizeof(value), true);
+}
+
+
 // AddString
 inline
 status_t
@@ -382,6 +398,23 @@
 	return _FindType(name, B_INT64_TYPE, index, value);
 }
 
+
+// FindPointer
+inline status_t
+KMessage::FindPointer(const char *name, void** value) const
+{
+	return FindPointer(name, 0, value);
+}
+
+
+// FindPointer
+inline status_t
+KMessage::FindPointer(const char *name, int32 index, void** value) const
+{
+	return _FindType(name, B_POINTER_TYPE, index, value);
+}
+
+
 // FindString
 inline
 status_t
@@ -492,6 +525,24 @@
 }
 
 
+// GetPointer
+inline void*
+KMessage::GetPointer(const char* name, const void* defaultValue) const
+{
+	return const_cast<void*>(_GetType(name, B_POINTER_TYPE, 0, defaultValue));
+}
+
+
+// GetPointer
+inline void*
+KMessage::GetPointer(const char* name, int32 index,
+	const void* defaultValue) const
+{
+	return const_cast<void*>(_GetType(name, B_POINTER_TYPE, index,
+		defaultValue));
+}
+
+
 // GetString
 inline const char*
 KMessage::GetString(const char* name, int32 index,
@@ -556,6 +607,14 @@
 }
 
 
+// SetPointer
+inline status_t
+KMessage::SetPointer(const char* name, const void* value)
+{
+	return SetData(name, B_POINTER_TYPE, &value, sizeof(value));
+}
+
+
 #else	// !__cplusplus
 
 



From axeld at mail.berlios.de  Sat Apr 11 23:37:53 2009
From: axeld at mail.berlios.de (axeld at mail.berlios.de)
Date: Sat, 11 Apr 2009 23:37:53 +0200
Subject: [Haiku-commits] r30125 - haiku/trunk/src/apps/packageinstaller
Message-ID: <200904112137.n3BLbrBL023324@sheep.berlios.de>

Author: axeld
Date: 2009-04-11 23:37:51 +0200 (Sat, 11 Apr 2009)
New Revision: 30125
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30125&view=rev

Modified:
   haiku/trunk/src/apps/packageinstaller/PackageInfo.cpp
   haiku/trunk/src/apps/packageinstaller/PackageInfo.h
   haiku/trunk/src/apps/packageinstaller/PackageItem.cpp
   haiku/trunk/src/apps/packageinstaller/PackageItem.h
   haiku/trunk/src/apps/packageinstaller/PackageView.cpp
Log:
* Applied patch by sil2001 that fixes bug #3666 (handling of existing symlinks).
* Refactored PkgItem classes, and pulled out a PackageItem base class. Renamed
  other classes to Package*.
* The ItemExists() method should really get a "Apply this choice to all files"
  kind of option...
* Style cleanups.


Modified: haiku/trunk/src/apps/packageinstaller/PackageInfo.cpp
===================================================================
--- haiku/trunk/src/apps/packageinstaller/PackageInfo.cpp	2009-04-11 21:29:22 UTC (rev 30124)
+++ haiku/trunk/src/apps/packageinstaller/PackageInfo.cpp	2009-04-11 21:37:51 UTC (rev 30125)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Haiku, Inc.
+ * Copyright (c) 2007-2009, Haiku, Inc.
  * Distributed under the terms of the MIT license.
  *
  * Author:
@@ -67,23 +67,22 @@
 	pkg_profile *iter = 0;
 	while (1) {
 		iter = static_cast<pkg_profile *>(fProfiles.RemoveItem((long int)0));
-		if (iter)
-			delete iter;
-		else
+		if (iter == NULL)
 			break;
+
+		delete iter;
 	}
 
-	PkgItem *file = 0;
-	while (1) {
-		file = static_cast<PkgItem *>(fFiles.RemoveItem((long int)0));
-		if (file)
-			delete file;
-		else
+	PackageItem *file = 0;
+	while (true) {
+		file = static_cast<PackageItem *>(fFiles.RemoveItem((long int)0));
+		if (file == NULL)
 			break;
+
+		delete file;
 	}
 
-	if (fPackageFile)
-		delete fPackageFile;
+	delete fPackageFile;
 }
 
 
@@ -116,7 +115,7 @@
 	off_t actualSize = 0;
 	fPackageFile->GetSize(&actualSize);
 	uint64 fileSize = 0;
-	
+
 	const char padding[7] = { 0, 0, 0, 0, 0, 0, 0 };
 
 	system_info sysinfo;
@@ -124,9 +123,9 @@
 	
 	uint64 infoOffset = 0, groupsOffset = 0;
 	uint64 length = 0;
-	
+
 	// Parse the file header
-	while (1) {
+	while (true) {
 		bytesRead = fPackageFile->Read(buffer, 7);
 		if (bytesRead != 7) {
 			fStatus = B_ERROR;
@@ -134,36 +133,30 @@
 		}
 
 		if (!memcmp(buffer, "PhIn", 5)) {
-		}
-		else if (!memcmp(buffer, "FVer", 5)) {
+		} else if (!memcmp(buffer, "FVer", 5)) {
 			// Not used right now
 			fPackageFile->Seek(4, SEEK_CUR);
 			parser_debug("FVer\n");
-		}
-		else if (!memcmp(buffer, "AFla", 5)) {
+		} else if (!memcmp(buffer, "AFla", 5)) {
 			// Not used right now TODO: Check what this tag is for
 			fPackageFile->Seek(8, SEEK_CUR);
 			parser_debug("AFla\n");
-		}
-		else if (!memcmp(buffer, "FSiz", 5)) {
+		} else if (!memcmp(buffer, "FSiz", 5)) {
 			fPackageFile->Read(&fileSize, 8);
 			swap_data(B_UINT64_TYPE, &fileSize, sizeof(uint64),
 					B_SWAP_BENDIAN_TO_HOST);
 			parser_debug("FSiz %llu\n", fileSize);
-		}
-		else if (!memcmp(buffer, "COff", 5)) {
+		} else if (!memcmp(buffer, "COff", 5)) {
 			fPackageFile->Read(&infoOffset, 8);
 			swap_data(B_UINT64_TYPE, &infoOffset, sizeof(uint64),
 					B_SWAP_BENDIAN_TO_HOST);
 			parser_debug("COff %llu\n", infoOffset);
-		}
-		else if (!memcmp(buffer, "AOff", 5)) {
+		} else if (!memcmp(buffer, "AOff", 5)) {
 			fPackageFile->Read(&groupsOffset, 8);
 			swap_data(B_UINT64_TYPE, &groupsOffset, sizeof(uint64),
 					B_SWAP_BENDIAN_TO_HOST);
 			parser_debug("AOff %llu\n", groupsOffset);
-		}
-		else if (!memcmp(buffer, padding, 7)) {
+		} else if (!memcmp(buffer, padding, 7)) {
 			// This means the end of this section - we should move to the
 			// groups section.
 			if (groupsOffset) {
@@ -171,8 +164,7 @@
 			}
 			parser_debug("End!\n");
 			break;
-		}
-		else {
+		} else {
 			fStatus = B_ERROR;
 			return fStatus;
 		}
@@ -183,7 +175,7 @@
 		fStatus = B_ERROR;
 		return fStatus;
 	}
-	
+
 	// Section header identifying constant byte sequences:
 	const char groupsMarker[7] = { 0, 0, 0, 1, 0, 0, 4 };
 	const char idMarker[7] = { 0, 0, 0, 2, 0, 0, 4 };
@@ -195,7 +187,7 @@
 
 	const char splashScreenMarker[7] = { 0, 0, 0, 8, 0, 0, 3 };
 	const char disclaimerMarker[7] = { 0, 0, 0, 7, 0, 0, 3 };
-	
+
 	const char nameMarker[7] = { 0, 0, 0, 13, 0, 0, 2 };
 	const char versionMarker[7] = { 0, 0, 0, 14, 0, 0, 2 };
 	const char devMarker[7] = { 0, 0, 0, 15, 0, 0, 2 };
@@ -211,7 +203,7 @@
 	//	everytime would be a good idea
 
 	// Parse the package info section
-	while (1) {
+	while (true) {
 		bytesRead = fPackageFile->Read(buffer, 7);
 		if (bytesRead != 7) {
 			parser_debug("EOF!\n");
@@ -222,45 +214,46 @@
 			section = P_GROUPS_SECTION;
 			parser_debug("Got to Groups section\n");
 			continue;
-		}
-		else if (!memcmp(buffer, pathMarker, 7)) {
+		} else if (!memcmp(buffer, pathMarker, 7)) {
 			section = P_PATH_SECTION;
 			parser_debug("Got to System Paths\n");
 			continue;
-		}
-		else if (!memcmp(buffer, upathMarker, 7)) {
+		} else if (!memcmp(buffer, upathMarker, 7)) {
 			section = P_USER_PATH_SECTION;
 			parser_debug("Got to User Paths\n");
 			continue;
-		}
-		else if (!memcmp(buffer, licenseMarker, 7)) {
+		} else if (!memcmp(buffer, licenseMarker, 7)) {
 			section = P_LICENSE_SECTION;
 			parser_debug("Got to License\n");
 			continue;
-		} // After this, non sectioned tags follow
-		else if (!memcmp(buffer, disclaimerMarker, 7)) {
+			// After this, non sectioned tags follow
+		} else if (!memcmp(buffer, disclaimerMarker, 7)) {
 			uint64 length;
 			fPackageFile->Read(&length, 8);
-			swap_data(B_UINT64_TYPE, &length, sizeof(uint64), B_SWAP_BENDIAN_TO_HOST);
+			swap_data(B_UINT64_TYPE, &length, sizeof(uint64),
+				B_SWAP_BENDIAN_TO_HOST);
 
 			uint64 original;
 			if (fPackageFile->Read(&original, 8) != 8) {
 				fStatus = B_ERROR;
 				return fStatus;
 			}
-			swap_data(B_UINT64_TYPE, &original, sizeof(uint64), B_SWAP_BENDIAN_TO_HOST);
+			swap_data(B_UINT64_TYPE, &original, sizeof(uint64),
+				B_SWAP_BENDIAN_TO_HOST);
 
 			fPackageFile->Seek(4, SEEK_CUR);
 
 			uint8 *compressed = new uint8[length];
-			if (fPackageFile->Read(compressed, length) != static_cast<int64>(length)) {
+			if (fPackageFile->Read(compressed, length)
+					!= static_cast<int64>(length)) {
 				fStatus = B_ERROR;
 				delete compressed;
 				return fStatus;
 			}
-			
+
 			uint8 *disclaimer = new uint8[original + 1];
-			status_t ret = inflate_data(compressed, length, disclaimer, original);
+			status_t ret = inflate_data(compressed, length, disclaimer,
+				original);
 			disclaimer[original] = 0;
 			delete compressed;
 			if (ret != B_OK) {
@@ -273,23 +266,25 @@
 			delete disclaimer;
 
 			continue;		
-		}
-		else if (!memcmp(buffer, splashScreenMarker, 7)) {
+		} else if (!memcmp(buffer, splashScreenMarker, 7)) {
 			uint64 length;
 			fPackageFile->Read(&length, 8);
-			swap_data(B_UINT64_TYPE, &length, sizeof(uint64), B_SWAP_BENDIAN_TO_HOST);
+			swap_data(B_UINT64_TYPE, &length, sizeof(uint64),
+				B_SWAP_BENDIAN_TO_HOST);
 
 			uint64 original;
 			if (fPackageFile->Read(&original, 8) != 8) {
 				fStatus = B_ERROR;
 				return fStatus;
 			}
-			swap_data(B_UINT64_TYPE, &original, sizeof(uint64), B_SWAP_BENDIAN_TO_HOST);
+			swap_data(B_UINT64_TYPE, &original, sizeof(uint64),
+				B_SWAP_BENDIAN_TO_HOST);
 
 			fPackageFile->Seek(4, SEEK_CUR);
 
 			uint8 *compressed = new uint8[length];
-			if (fPackageFile->Read(compressed, length) != static_cast<int64>(length)) {
+			if (fPackageFile->Read(compressed, length)
+					!= static_cast<int64>(length)) {
 				fStatus = B_ERROR;
 				delete compressed;
 				return fStatus;
@@ -297,7 +292,8 @@
 			
 			fImage.SetSize(original);
 			status_t ret = inflate_data(compressed, length, 
-				static_cast<uint8 *>(const_cast<void *>(fImage.Buffer())), original);
+				static_cast<uint8 *>(const_cast<void *>(fImage.Buffer())),
+				original);
 			delete compressed;
 			if (ret != B_OK) {
 				fStatus = B_ERROR;
@@ -313,15 +309,15 @@
 				if (!memcmp(buffer, "DPat", 5)) {
 					parser_debug("DPat\n");
 					continue;
-				}
-				else if (!memcmp(buffer, "FDst", 5)) {
+				} else if (!memcmp(buffer, "FDst", 5)) {
 					parser_debug("FDst - ");
 					directory_which dir;
 					if (fPackageFile->Read(&dir, 4) != 4) {
 						fStatus = B_ERROR;
 						return fStatus;
 					}
-					swap_data(B_UINT32_TYPE, &dir, sizeof(uint32), B_SWAP_BENDIAN_TO_HOST);
+					swap_data(B_UINT32_TYPE, &dir, sizeof(uint32),
+						B_SWAP_BENDIAN_TO_HOST);
 					BPath *path = new BPath();
 					status_t ret = find_directory(dir, path);
 					if (ret != B_OK) {
@@ -332,23 +328,21 @@
 					parser_debug("%s\n", path->Path());
 
 					systemPaths.AddItem(path);
-				}
-				else if (!memcmp(buffer, "PaNa", 5)) {
+				} else if (!memcmp(buffer, "PaNa", 5)) {
 					parser_debug("PaNa\n");
 					if (fPackageFile->Read(&length, 4) != 4) {
 						fStatus = B_ERROR;
 						return fStatus;
 					}
-					swap_data(B_UINT32_TYPE, &length, sizeof(uint32), B_SWAP_BENDIAN_TO_HOST);
-					// Since its a default, system path, we can ignore the path name
-					// - all information needed is beside the FDst tag.
+					swap_data(B_UINT32_TYPE, &length, sizeof(uint32),
+						B_SWAP_BENDIAN_TO_HOST);
+					// Since its a default, system path, we can ignore the path
+					// name - all information needed is beside the FDst tag.
 					fPackageFile->Seek(length, SEEK_CUR);
-				}
-				else if (!memcmp(buffer, padding, 7)) {
+				} else if (!memcmp(buffer, padding, 7)) {
 					parser_debug("Padding!\n");
 					continue;
-				}
-				else {
+				} else {
 					fStatus = B_ERROR;
 					return fStatus;
 				}
@@ -362,40 +356,39 @@
 					groupStarted = true;
 					group = pkg_profile();
 					parser_debug("IGrp\n");
-				}
-				else if (!memcmp(buffer, "GrpN", 5)) {
+				} else if (!memcmp(buffer, "GrpN", 5)) {
 					if (!groupStarted) {
 						fStatus = B_ERROR;
 						return fStatus;
 					}
-					
+
 					parser_debug("GrpN\n");
 					fPackageFile->Read(&length, 4);
-					swap_data(B_UINT32_TYPE, &length, sizeof(uint32), B_SWAP_BENDIAN_TO_HOST);
+					swap_data(B_UINT32_TYPE, &length, sizeof(uint32),
+						B_SWAP_BENDIAN_TO_HOST);
 
 					char *name = new char[length + 1];
 					fPackageFile->Read(name, length);
 					name[length] = 0;
 					group.name = name;
 					delete name;
-				}
-				else if (!memcmp(buffer, "GrpD", 5)) {
+				} else if (!memcmp(buffer, "GrpD", 5)) {
 					if (!groupStarted) {
 						fStatus = B_ERROR;
 						return fStatus;
 					}
-					
+
 					parser_debug("GrpD\n");
 					fPackageFile->Read(&length, 4);
-					swap_data(B_UINT32_TYPE, &length, sizeof(uint32), B_SWAP_BENDIAN_TO_HOST);
+					swap_data(B_UINT32_TYPE, &length, sizeof(uint32),
+						B_SWAP_BENDIAN_TO_HOST);
 
 					char *desc = new char[length + 1];
 					fPackageFile->Read(desc, length);
 					desc[length] = 0;
 					group.description = desc;
 					delete desc;
-				}
-				else if (!memcmp(buffer, "GrHt", 5)) {
+				} else if (!memcmp(buffer, "GrHt", 5)) {
 					if (!groupStarted) {
 						fStatus = B_ERROR;
 						return fStatus;
@@ -404,10 +397,10 @@
 					parser_debug("GrHt\n");
 					// For now, we don't need group help
 					fPackageFile->Read(&length, 4);
-					swap_data(B_UINT32_TYPE, &length, sizeof(uint32), B_SWAP_BENDIAN_TO_HOST);
+					swap_data(B_UINT32_TYPE, &length, sizeof(uint32),
+						B_SWAP_BENDIAN_TO_HOST);
 					fPackageFile->Seek(length, SEEK_CUR);
-				}
-				else if (!memcmp(buffer, padding, 5)) {
+				} else if (!memcmp(buffer, padding, 5)) {
 					if (!groupStarted) {
 						parser_debug("No group - padding!\n");
 						continue;
@@ -415,28 +408,26 @@
 
 					fProfiles.AddItem(new pkg_profile(group));
 					parser_debug("Group added: %s %s\n", group.name.String(), 
-							group.description.String());
-					
+						group.description.String());
+
 					groupStarted = false;
-				}
-				else if (!memcmp(buffer, "GrId", 5)) {
+				} else if (!memcmp(buffer, "GrId", 5)) {
 					uint32 id;
 					fPackageFile->Read(&id, 4);
-					swap_data(B_UINT32_TYPE, &id, sizeof(uint32), B_SWAP_BENDIAN_TO_HOST);
+					swap_data(B_UINT32_TYPE, &id, sizeof(uint32),
+						B_SWAP_BENDIAN_TO_HOST);
 
 					parser_debug("GrId\n");
-					
+
 					if (id == 0xffffffff)
 						groups.AddItem(NULL);
 					else
 						groups.AddItem(fProfiles.ItemAt(id));
-				}
-				else if (!memcmp(buffer, idMarker, 7) || 
-						!memcmp(buffer, groupsMarker, 7)) {
+				} else if (!memcmp(buffer, idMarker, 7)
+					|| !memcmp(buffer, groupsMarker, 7)) {
 					parser_debug("Marker, jumping!\n");
 					continue;
-				}
-				else {
+				} else {
 					fStatus = B_ERROR;
 					return fStatus;
 				}
@@ -447,25 +438,24 @@
 			{
 				if (!memcmp(buffer, "Lic?", 5)) {
 					parser_debug("Lic?\n");
-					// This tag informs whether a license is present in the package
-					// or not. Since we don't care about licenses right now, just
-					// skip this section
+					// This tag informs whether a license is present in the
+					// package or not. Since we don't care about licenses right
+					// now, just skip this section
 					fPackageFile->Seek(4, SEEK_CUR);
-				}
-				else if (!memcmp(buffer, "LicP", 5)) {
+				} else if (!memcmp(buffer, "LicP", 5)) {
 					parser_debug("LicP\n");
 					fPackageFile->Read(&length, 4);
-					swap_data(B_UINT32_TYPE, &length, sizeof(uint32), B_SWAP_BENDIAN_TO_HOST);
-					
+					swap_data(B_UINT32_TYPE, &length, sizeof(uint32),
+						B_SWAP_BENDIAN_TO_HOST);
+
 					fPackageFile->Seek(length, SEEK_CUR);
-				}
-				else if (!memcmp(buffer, padding, 7)) {
+				} else if (!memcmp(buffer, padding, 7)) {
 					continue;
-				}
-				else if (!memcmp(buffer, descMarker, 7)) {
+				} else if (!memcmp(buffer, descMarker, 7)) {
 					parser_debug("Description text reached\n");
 					fPackageFile->Read(&length, 4);
-					swap_data(B_UINT32_TYPE, &length, sizeof(uint32), B_SWAP_BENDIAN_TO_HOST);
+					swap_data(B_UINT32_TYPE, &length, sizeof(uint32),
+						B_SWAP_BENDIAN_TO_HOST);
 
 					char *description = new char[length + 1];
 					fPackageFile->Read(description, length);
@@ -473,22 +463,24 @@
 					fDescription = description;
 
 					// Truncate all leading newlines
-					for (i = 0;i < length;i++)
+					for (i = 0; i < length; i++) {
 						if (fDescription[i] != '\n')
 							break;
+					}
 					fDescription.Remove(0, i);
 
 					delete description;
 					parser_debug("Description text reached\n");
-					
-					// After this, there's a known size sequence of bytes, which meaning
-					// is yet to be determined.
 
-					// One is already known. The byte (or just its least significant bit)
-					// at offset 21 from the description text is responsible for the
-					// install folder existence information. If it is 0, there is no
-					// install folder, if it is 1 (or the least significant bit is set)
-					// it means we should install all 0xffffffff files/directories to
+					// After this, there's a known size sequence of bytes, which
+					// meaning is yet to be determined.
+
+					// One is already known. The byte (or just its least
+					// significant bit) at offset 21 from the description text
+					// is responsible for the install folder existence
+					// information. If it is 0, there is no install folder, if
+					// it is 1 (or the least significant bit is set) it means
+					// we should install all 0xffffffff files/directories to
 					// the first directory existing in the package
 					fPackageFile->Seek(21, SEEK_CUR);
 					if (fPackageFile->Read(&installDirectoryFlag, 1) != 1) {
@@ -497,52 +489,51 @@
 					}
 
 					fPackageFile->Seek(11, SEEK_CUR);
-				}
-				else if (!memcmp(buffer, nameMarker, 7)) {
+				} else if (!memcmp(buffer, nameMarker, 7)) {
 					parser_debug("Package name reached\n");
 					fPackageFile->Read(&length, 4);
-					swap_data(B_UINT32_TYPE, &length, sizeof(uint32), B_SWAP_BENDIAN_TO_HOST);
+					swap_data(B_UINT32_TYPE, &length, sizeof(uint32),
+						B_SWAP_BENDIAN_TO_HOST);
 
 					char *name = new char[length + 1];
 					fPackageFile->Read(name, length);
 					name[length] = 0;
 					fName = name;
 					delete name;
-				}
-				else if (!memcmp(buffer, versionMarker, 7)) {
+				} else if (!memcm