head (SVN 0.85, Rudolf)

still missing

DefineBuildProfile disk : disk : "/dev/sda7" ;
 DefineBuildProfile vmware : vmware-image ;
 
 switch $(HAIKU_BUILD_PROFILE) {
 	case "disk" : {
-
+		AddOptionalHaikuImagePackages Development ;	
 	}
 
 
@@ -175,7 +175,7 @@
 
 switch $(HAIKU_BUILD_PROFILE) {
 	case "disk" : {
-
+		AddOptionalHaikuImagePackages Development ;
 	}
 
 



From humdingerb at googlemail.com  Thu May 14 18:05:01 2009
From: humdingerb at googlemail.com (Humdinger)
Date: Thu, 14 May 2009 18:05:01 +0200
Subject: [Haiku-commits] r30705
	-	haiku/trunk/docs/userguide/en/installation
In-Reply-To: <1e42d8c50905110913s19f548ceg4dff5f9696b9e630@mail.gmail.com>
References: <200905111536.n4BFafSl014826@sheep.berlios.de>	<1e80d8750905110847u7b820493n15334f89d87495fb@mail.gmail.com>	<4A084C0A.1050809@googlemail.com>
	<1e42d8c50905110913s19f548ceg4dff5f9696b9e630@mail.gmail.com>
Message-ID: <4A0C412D.9070201@googlemail.com>

> On Mon, May 11, 2009 at 4:02 PM, Humdinger  wrote:
>> One thing's now a bit awkward:
>>
>>        case "disk" : {
>>
>>        }
>>
>> The "disk" case is now completely empty. But I don't want to remove it as for this guide
>> it's useful to show how it works.

Matt Madia suggested:
> case "disk" : {
> # When the BuildProfile $(type) = "disk", the following is not necessary.
> #    HAIKU_DONT_CLEAR_IMAGE = 1 ;
> # haiku/trunk/build/jam/MiscRules explicitly sets this variable in this case.
> }

I don't think learning that something is *not* useful is helpful. :)

Stephan said:
> Yes, some other optional package should suffice. Maybe you can use the 
> space to show other tricks that have not already been shown, like adding 
> more targets from the build, or unzipping something located on the host 
> system onto the image.

Unzipping is already an example in that guide, and I don't know enough about adding targets...

Philippe offered:
> 	case "disk" : {
>            HAIKU_IMAGE_LABEL = CustomHaikuBuild ;
> 	}

That would be a possibility, but I guess having it more obviously stated that these 
different case statements can be used for including different packages depending on the 
used build config, I opted for simply including the dev package when building to disk.

Thanks for the input from all of you.

Regards,
Humdinger

-- 
--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-
Deutsche Haiku News @ http://www.haiku-gazette.de


From umccullough at gmail.com  Thu May 14 19:00:36 2009
From: umccullough at gmail.com (Urias McCullough)
Date: Thu, 14 May 2009 10:00:36 -0700
Subject: [Haiku-commits] r30705 -
	haiku/trunk/docs/userguide/en/installation
In-Reply-To: <4A0C412D.9070201@googlemail.com>
References: <200905111536.n4BFafSl014826@sheep.berlios.de>
	<1e80d8750905110847u7b820493n15334f89d87495fb@mail.gmail.com>
	<4A084C0A.1050809@googlemail.com>
	<1e42d8c50905110913s19f548ceg4dff5f9696b9e630@mail.gmail.com>
	<4A0C412D.9070201@googlemail.com>
Message-ID: <1e80d8750905141000y6dfa691chccc1f843bc14519d@mail.gmail.com>

On Thu, May 14, 2009 at 9:05 AM, Humdinger  wrote:
> That would be a possibility, but I guess having it more obviously stated that these
> different case statements can be used for including different packages depending on the
> used build config, I opted for simply including the dev package when building to disk.

While on that topic, it seems that the case is using the type, not the name?

On a couple of my machines at home, I would have two disk profiles,
but with different names (because they point to different partitions),
so I might have something "devdisk" and "testdisk" as the names. It
would probably make more sense to use that for the case statement. I
also usually have one called "usbdisk" which I use to represent the
path to my USB stick when I have it plugged in (although, the device
path sometimes changes... which is obnoxious).

Just some ideas :)

- Urias


From zooey at mail.berlios.de  Thu May 14 19:39:01 2009
From: zooey at mail.berlios.de (zooey at BerliOS)
Date: Thu, 14 May 2009 19:39:01 +0200
Subject: [Haiku-commits] r30761 - haiku/trunk/src/tests/kits/interface
Message-ID: <200905141739.n4EHd1aw031283@sheep.berlios.de>

Author: zooey
Date: 2009-05-14 19:39:00 +0200 (Thu, 14 May 2009)
New Revision: 30761
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30761&view=rev

Modified:
   haiku/trunk/src/tests/kits/interface/TextViewTest.cpp
Log:
* adjusted to allow for switching between alignments (and now makes use of
  the layouting engine, too)

Modified: haiku/trunk/src/tests/kits/interface/TextViewTest.cpp
===================================================================

--- haiku/trunk/src/tests/kits/interface/TextViewTest.cpp	2009-05-14 15:58:15 UTC (rev 30760)
+++ haiku/trunk/src/tests/kits/interface/TextViewTest.cpp	2009-05-14 17:39:00 UTC (rev 30761)
@@ -5,19 +5,33 @@
 
 
 #include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
+#include 
 #include 
+#include 
 
 #include 
 
 
+const static uint32 kMsgAlignLeft = 'alle';
+const static uint32 kMsgAlignCenter = 'alce';
+const static uint32 kMsgAlignRight = 'alri';
+
+
 class Window : public BWindow {
 	public:
 		Window();
 
 		virtual bool QuitRequested();
+		virtual void MessageReceived(BMessage *message);
+
+	private:
+		BTextControl* fTextControl;
+		BTextView* fTextView;
 };
 
 
@@ -28,22 +42,30 @@
 	: BWindow(BRect(100, 100, 800, 500), "TextView-Test",
 			B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS)
 {
-	BRect rect = Bounds().InsetByCopy(20, 20);
+	fTextControl = new BTextControl("text-contr-O",
+		"a single line of text - (c) Conglom-O", NULL);
+	fTextView = new BTextView("text-O");
+	BScrollView* scrollView = new BScrollView("scroll-O", fTextView, 0, true,
+		true, B_FANCY_BORDER);
 
-	BTextView* textView = new BTextView(rect, "text-o-mo",
-		rect.OffsetToCopy(0, 0), B_FOLLOW_ALL);
+	SetLayout(new BGroupLayout(B_HORIZONTAL));
+	AddChild(BGroupLayoutBuilder(B_VERTICAL, 10)
+		.Add(fTextControl)
+		.Add(scrollView)
+		.Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)
+			.Add(new BButton("Align Left", new BMessage(kMsgAlignLeft)))
+			.AddGlue()
+			.Add(new BButton("Align Center", new BMessage(kMsgAlignCenter)))
+			.AddGlue()
+			.Add(new BButton("Align Right", new BMessage(kMsgAlignRight)))
+		)
+		.SetInsets(5, 5, 5, 5)
+	);
 
-	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;
+	// generate some lines of content
+	const int32 kLineCount = 10;
 	const int32 kLineNoSize = 6;
-	BString line
-		= ":	you should see a pretty large text in this textview	...\n";
+	BString line = ": just some text here - nothing special to see\n";
 	BString format = BString("%*d") << line;
 	BString content;
 	int32 lineLength = line.Length() + kLineNoSize;
@@ -55,9 +77,8 @@
 			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());
+	fTextView->SetInsets(2,2,2,2);
+	fTextView->SetText(content.String());
 }
 
 
@@ -69,6 +90,32 @@
 }
 
 
+void
+Window::MessageReceived(BMessage *message)
+{
+	switch (message->what) {
+		case kMsgAlignLeft:
+			fTextControl->SetAlignment(B_ALIGN_LEFT, B_ALIGN_LEFT);
+			fTextView->SetAlignment(B_ALIGN_LEFT);
+			break;
+
+		case kMsgAlignCenter:
+			fTextControl->SetAlignment(B_ALIGN_LEFT, B_ALIGN_CENTER);
+			fTextView->SetAlignment(B_ALIGN_CENTER);
+			break;
+
+		case kMsgAlignRight:
+			fTextControl->SetAlignment(B_ALIGN_LEFT, B_ALIGN_RIGHT);
+			fTextView->SetAlignment(B_ALIGN_RIGHT);
+			break;
+
+		default:
+			BWindow::MessageReceived(message);
+			break;
+	}
+}
+
+
 //	#pragma mark -
 
 



From zooey at mail.berlios.de  Thu May 14 19:44:50 2009
From: zooey at mail.berlios.de (zooey at BerliOS)
Date: Thu, 14 May 2009 19:44:50 +0200
Subject: [Haiku-commits] r30762 - haiku/trunk/src/kits/interface
Message-ID: <200905141744.n4EHiofl032003@sheep.berlios.de>

Author: zooey
Date: 2009-05-14 19:44:49 +0200 (Thu, 14 May 2009)
New Revision: 30762
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30762&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
* corrected the computation of alignment offsets for centered or right-aligned 
  textviews, such that the characters are drawn at their correct positions and 
  there  are no longer any mismatches between caret and character positions
* fixed too large widths returned by LineWidth() for lines ending with a
  newline: the newline character must not contribute to the width
This makes the textcontrol in DiskProbe work properly again.

Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-05-14 17:39:00 UTC (rev 30761)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-05-14 17:44:49 UTC (rev 30762)
@@ -1764,15 +1764,16 @@
 	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
+	bool onEmptyLastLine = _IsOnEmptyLastLine(inOffset);
+
 	if (fStyles->NumRuns() == 0) {
+		// Handle the case where there is only one line (no text inserted)
 		fStyles->SyncNullStyle(0);
 		height = _NullStyleHeight();
 	} else {
 		height = (line + 1)->origin - line->origin;
 
-		if (_IsOnEmptyLastLine(inOffset)) {
+		if (onEmptyLastLine) {
 			// special case: go down one line if inOffset is at the newline
 			// at the end of the buffer ...
 			result.y += height;
@@ -1802,16 +1803,15 @@
 	}
 
 	if (fAlignment != B_ALIGN_LEFT) {
-		float modifier = fTextRect.right - LineWidth(lineNum);
+		float lineWidth = onEmptyLastLine ? 0.0 : LineWidth(lineNum);
+		float alignmentOffset = fTextRect.Width() - lineWidth;
 		if (fAlignment == B_ALIGN_CENTER)
-			modifier /= 2;
-		result.x += modifier;
+			alignmentOffset /= 2;
+		result.x += alignmentOffset;
 	}
+
 	// convert from text rect coordinates
-	// NOTE: I didn't understand why "- 1.0"
-	// and it works only correct without it on Haiku app_server.
-	// Feel free to enlighten me though!
-	result.x += fTextRect.left;// - 1.0;
+	result.x += fTextRect.left;
 
 	// round up
 	result.x = ceilf(result.x);
@@ -1856,10 +1856,10 @@
 
 	// convert to text rect coordinates
 	if (fAlignment != B_ALIGN_LEFT) {
-		float lineWidth = fTextRect.right - LineWidth(lineNum);
+		float alignmentOffset = fTextRect.Width() - LineWidth(lineNum);
 		if (fAlignment == B_ALIGN_CENTER)
-			lineWidth /= 2;
-		point.x -= lineWidth;
+			alignmentOffset /= 2;
+		point.x -= alignmentOffset;
 	}
 
 	point.x -= fTextRect.left;
@@ -1984,7 +1984,14 @@
 		return 0;
 
 	STELine* line = (*fLines)[lineNum];
-	return _StyledWidth(line->offset, (line + 1)->offset - line->offset);
+	int32 length = (line + 1)->offset - line->offset;
+
+	// skip newline at the end of the line, if any, as it does no contribute
+	// to the width
+	if (ByteAt((line + 1)->offset - 1) == B_ENTER)
+		length--;
+
+	return _StyledWidth(line->offset, length);
 }
 
 
@@ -4149,6 +4156,12 @@
 		} else
 			startLeft = PointAt(startOffset).x;
 	}
+	else if (fAlignment != B_ALIGN_LEFT) {
+		float alignmentOffset = fTextRect.Width() - LineWidth(lineNum);
+		if (fAlignment == B_ALIGN_CENTER)
+			alignmentOffset /= 2;
+		startLeft = fTextRect.left + alignmentOffset;
+	}
 
 	int32 length = (line + 1)->offset;
 	if (startOffset != -1)
@@ -4159,20 +4172,12 @@
 	// DrawString() chokes if you draw a newline
 	if (ByteAt((line + 1)->offset - 1) == B_ENTER)
 		length--;
-	if (fAlignment != B_ALIGN_LEFT) {
-		// B_ALIGN_RIGHT
-		startLeft = (fTextRect.right - LineWidth(lineNum));
-		if (fAlignment == B_ALIGN_CENTER)
-			startLeft /= 2;
-		startLeft += fTextRect.left;
-	}
 
 	view->MovePenTo(startLeft, line->origin + line->ascent + fTextRect.top + 1);
 
 	if (erase) {
 		eraseRect.top = line->origin + fTextRect.top;
 		eraseRect.bottom = (line + 1)->origin + fTextRect.top;
-
 		view->FillRect(eraseRect, B_SOLID_LOW);
 	}
 



From humdingerb at googlemail.com  Thu May 14 19:53:36 2009
From: humdingerb at googlemail.com (Humdinger)
Date: Thu, 14 May 2009 19:53:36 +0200
Subject: [Haiku-commits] r30705
	-	haiku/trunk/docs/userguide/en/installation
In-Reply-To: <1e80d8750905141000y6dfa691chccc1f843bc14519d@mail.gmail.com>
References: <200905111536.n4BFafSl014826@sheep.berlios.de>	<1e80d8750905110847u7b820493n15334f89d87495fb@mail.gmail.com>	<4A084C0A.1050809@googlemail.com>	<1e42d8c50905110913s19f548ceg4dff5f9696b9e630@mail.gmail.com>	<4A0C412D.9070201@googlemail.com>
	<1e80d8750905141000y6dfa691chccc1f843bc14519d@mail.gmail.com>
Message-ID: <4A0C5AA0.1070605@googlemail.com>

Urias McCullough wrote:
> While on that topic, it seems that the case is using the type, not the name?

Hmm, you mean this would avoid some confusion:

DefineBuildProfile dev-partition : disk : "/dev/sda7" ;
DefineBuildProfile test-virtual : vmware-image ;

switch $(HAIKU_BUILD_PROFILE) {
	case "dev-partition" : {
		AddOptionalHaikuImagePackages Development ;	
	}


	case "test-virtual" : {
		HAIKU_IMAGE_SIZE = 900 ;
	}


I never really thought about it... So that means, that these profiles inherit the config 
of "disk" or "vmware-image" and extend those with the options listed under the case statement?
Where are those "default" build profiles defined?



Regards,
Humdinger

-- 
--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-
Deutsche Haiku News @ http://www.haiku-gazette.de


From superstippi at gmx.de  Thu May 14 20:06:08 2009
From: superstippi at gmx.de (=?ISO-8859-1?Q?Stephan_A=DFmus?=)
Date: Thu, 14 May 2009 20:06:08 +0200
Subject: [Haiku-commits]
	r30705	-	haiku/trunk/docs/userguide/en/installation
In-Reply-To: <4A0C5AA0.1070605@googlemail.com>
References: <200905111536.n4BFafSl014826@sheep.berlios.de>	<1e80d8750905110847u7b820493n15334f89d87495fb@mail.gmail.com>	<4A084C0A.1050809@googlemail.com>	<1e42d8c50905110913s19f548ceg4dff5f9696b9e630@mail.gmail.com>	<4A0C412D.9070201@googlemail.com>	<1e80d8750905141000y6dfa691chccc1f843bc14519d@mail.gmail.com>
	<4A0C5AA0.1070605@googlemail.com>
Message-ID: <4A0C5D90.1090508@gmx.de>

Humdinger schrieb:
> Urias McCullough wrote:
>> While on that topic, it seems that the case is using the type, not the name?
> 
> Hmm, you mean this would avoid some confusion:
> 
> DefineBuildProfile dev-partition : disk : "/dev/sda7" ;
> DefineBuildProfile test-virtual : vmware-image ;
> 
> switch $(HAIKU_BUILD_PROFILE) {
> 	case "dev-partition" : {
> 		AddOptionalHaikuImagePackages Development ;	
> 	}
> 
> 
> 	case "test-virtual" : {
> 		HAIKU_IMAGE_SIZE = 900 ;
> 	}
> 
> 
> I never really thought about it... So that means, that these profiles inherit the config 
> of "disk" or "vmware-image" and extend those with the options listed under the case statement?
> Where are those "default" build profiles defined?

Not quite, the "disk" and "vmware-image" strings are "keywords", ie they 
are specific types of profiles known to the build system. See 
UserBuildConfig.Readme for all known types.

Best regards,
-Stephan



From humdingerb at googlemail.com  Thu May 14 20:20:20 2009
From: humdingerb at googlemail.com (Humdinger)
Date: Thu, 14 May 2009 20:20:20 +0200
Subject: [Haiku-commits]
	r30705	-	haiku/trunk/docs/userguide/en/installation
In-Reply-To: <4A0C5D90.1090508@gmx.de>
References: <200905111536.n4BFafSl014826@sheep.berlios.de>	<1e80d8750905110847u7b820493n15334f89d87495fb@mail.gmail.com>	<4A084C0A.1050809@googlemail.com>	<1e42d8c50905110913s19f548ceg4dff5f9696b9e630@mail.gmail.com>	<4A0C412D.9070201@googlemail.com>	<1e80d8750905141000y6dfa691chccc1f843bc14519d@mail.gmail.com>	<4A0C5AA0.1070605@googlemail.com>
	<4A0C5D90.1090508@gmx.de>
Message-ID: <4A0C60E4.3010008@googlemail.com>

Stephan A?mus wrote:
> Not quite, the "disk" and "vmware-image" strings are "keywords", ie they 
> are specific types of profiles known to the build system. See 
> UserBuildConfig.Readme for all known types.

OK. I thought "DefineBuildProfile test-virtual : vmware-image ;" means I define a user 
profile named "test-virtual" which has the stuff defined for the vmware-image profile plus 
the stuff listed in the case statement.

Maybe best to leave these build system details to someone more knowledgeable in that area. 
Anyone, feel free to modify stuff.

Regards,
Humdinger

-- 
--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-
Deutsche Haiku News @ http://www.haiku-gazette.de


From ingo_weinhold at gmx.de  Thu May 14 20:12:57 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Thu, 14 May 2009 20:12:57 +0200
Subject: [Haiku-commits] r30705
 -	haiku/trunk/docs/userguide/en/installation
In-Reply-To: <4A0C5AA0.1070605@googlemail.com>
References: <200905111536.n4BFafSl014826@sheep.berlios.de>
	<1e80d8750905110847u7b820493n15334f89d87495fb@mail.gmail.com>
	<4A084C0A.1050809@googlemail.com>
	<1e42d8c50905110913s19f548ceg4dff5f9696b9e630@mail.gmail.com>
	<4A0C412D.9070201@googlemail.com>
	<1e80d8750905141000y6dfa691chccc1f843bc14519d@mail.gmail.com>
	<4A0C5AA0.1070605@googlemail.com>
Message-ID: <20090514201257.368.1@knochen-vm.localdomain>


On 2009-05-14 at 19:53:36 [+0200], Humdinger  
wrote:
> Urias McCullough wrote:
> > While on that topic, it seems that the case is using the type, not the 
> > name?
> 
> Hmm, you mean this would avoid some confusion:
> 
> DefineBuildProfile dev-partition : disk : "/dev/sda7" ;
> DefineBuildProfile test-virtual : vmware-image ;
> 
> switch $(HAIKU_BUILD_PROFILE) {
>     case "dev-partition" : {
>         AddOptionalHaikuImagePackages Development ;    
>     }
> 
> 
>     case "test-virtual" : {
>         HAIKU_IMAGE_SIZE = 900 ;
>     }
> 
> 
> I never really thought about it...

While this makes clearer which is the build profile name and which the type, 
longer names are obviously less handy to use.

> So that means, that these profiles 
> inherit the config
> of "disk" or "vmware-image" and extend those with the options listed under 
> the case statement?

Close, but not quite. When you define a build profile, you specify its type, 
which implies a basic config and build actions (e.g. "disk" never zeroes the 
image, "install" doesn't support the "mount" action). There are three 
default build profiles named like the types "image", "vmware-image", 
"install", which are just defined without any further configuration (i.e. 
the default values are used for image name, dir, size, etc. -- unless the 
respective variables are globally set).

> Where are those "default" build profiles defined?

The default build profiles are defined at the end of Jamrules. The build 
profile types are handled in the DefineBuildProfile rule in 
build/jam/MiscRules.

CU, Ingo


From jonas at kirilla.com  Thu May 14 22:57:19 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Thu, 14 May 2009 22:57:19 +0200 CEST
Subject: [Haiku-commits] r30759 - haiku/trunk/src/bin
In-Reply-To: <2282129403-BeMail@zon>
Message-ID: <5230539062-BeMail@kirilla>

"Axel D?rfler"  wrote:
> "Jonas Sundstr?m"  wrote:
> [...]
> It does belong into neither class. It's *always* 
> up to the application to show a dialog; you cannot
> know in what context BUrl is used, and you should
> not make any assumptions.

That's what the boolean argument to the OpenWith...
method is for: with or without dialog. If the app
doesn't want a user dialog it can say so, and just
check the return value.

It could be made asynchronous optionally, so the
application thread does not have to wait on the 
user dialog. Unless it wants to.

Leaving every application to roll their own dialog,
well.. 

Take AboutSystem. No feedback on a failed URL open.
(IIRC no mouse-over indication on links. No visual
click indication.) Not the ideal user experience.

/Jonas.



From mmu_man at mail.berlios.de  Fri May 15 02:10:33 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Fri, 15 May 2009 02:10:33 +0200
Subject: [Haiku-commits] r30763 - haiku/trunk/src/data/beos_mime/application
Message-ID: <200905150010.n4F0AXtL001064@sheep.berlios.de>

Author: mmu_man
Date: 2009-05-15 02:10:32 +0200 (Fri, 15 May 2009)
New Revision: 30763
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30763&view=rev

Added:
   haiku/trunk/src/data/beos_mime/application/x-vnd.be.url.gopher
Log:
Mozilla handles gopher: urls very well btw :P


Added: haiku/trunk/src/data/beos_mime/application/x-vnd.be.url.gopher
===================================================================
--- haiku/trunk/src/data/beos_mime/application/x-vnd.be.url.gopher	2009-05-14 17:44:49 UTC (rev 30762)
+++ haiku/trunk/src/data/beos_mime/application/x-vnd.be.url.gopher	2009-05-15 00:10:32 UTC (rev 30763)
@@ -0,0 +1,11 @@
+
+resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime";
+
+resource(1, "META:TYPE") "application/x-vnd.Be.URL.gopher";
+
+resource(2, "META:S:DESC") #'MSDC' "Gopher URL";
+
+resource(3, "META:L:DESC") #'MLDC' "Gopher Protocol URL";
+
+resource(4, "META:PREF_APP") #'MSIG' "application/x-vnd.Mozilla-Firefox";
+



From zooey at mail.berlios.de  Fri May 15 12:05:06 2009
From: zooey at mail.berlios.de (zooey at BerliOS)
Date: Fri, 15 May 2009 12:05:06 +0200
Subject: [Haiku-commits] r30764 - haiku/trunk/src/kits/interface
Message-ID: <200905151005.n4FA56Su021000@sheep.berlios.de>

Author: zooey
Date: 2009-05-15 12:05:05 +0200 (Fri, 15 May 2009)
New Revision: 30764
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30764&view=rev

Modified:
   haiku/trunk/src/kits/interface/TextView.cpp
Log:
* adjusted _HandleInputMethodChanged() to not blindly insert the string that
  has been given via the inline input method, but to feed the individual
  UTF8-characters it contains to KeyDown() - this way special keys like
  B_BACKSPACE and cursor keys will be handled correctly instead of producing
  a "unknown char rectangle"


Modified: haiku/trunk/src/kits/interface/TextView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/TextView.cpp	2009-05-15 00:10:32 UTC (rev 30763)
+++ haiku/trunk/src/kits/interface/TextView.cpp	2009-05-15 10:05:05 UTC (rev 30764)
@@ -5250,22 +5250,52 @@
 		clauseCount++;
 	}
 
-	int32 selectionStart = 0;
-	int32 selectionEnd = 0;
-	message->FindInt32("be:selection", 0, &selectionStart);
-	message->FindInt32("be:selection", 1, &selectionEnd);
+	if (confirmed) {
+		_Refresh(fSelStart, fSelEnd, true, true);
+		_ShowCaret();
 
-	fInline->SetSelectionOffset(selectionStart);
-	fInline->SetSelectionLength(selectionEnd - selectionStart);
+		// now we need to feed ourselves the individual characters as if the
+		// user would have pressed them now - this lets KeyDown() pick out all
+		// the special characters like B_BACKSPACE, cursor keys and the like:
+		const char* currPos = string;
+		const char* prevPos = currPos;
+		while (*currPos != '\0') {
+			if ((*currPos & 0xC0) == 0xC0) {
+				// found the start of an UTF-8 char, we collect while it lasts
+				++currPos;
+				while ((*currPos & 0xC0) == 0x80)
+					++currPos;
+			} else if ((*currPos & 0xC0) == 0x80) {
+				// illegal: character starts with utf-8 intermediate byte, skip it
+				prevPos = ++currPos;
+			} else {
+				// single byte character/code, just feed that
+				++currPos;
+			}
+			KeyDown(prevPos, currPos - prevPos);
+			prevPos = currPos;
+		}
 
-	const int32 inlineOffset = fInline->Offset();
-	InsertText(string, stringLen, fSelStart, NULL);
-	fSelStart += stringLen;
-	fClickOffset = fSelEnd = fSelStart;
+		_Refresh(fSelStart, fSelEnd, true, true);
+	} else {
+		// temporarily show transient state of inline input
+		int32 selectionStart = 0;
+		int32 selectionEnd = 0;
+		message->FindInt32("be:selection", 0, &selectionStart);
+		message->FindInt32("be:selection", 1, &selectionEnd);
 
-	_Refresh(inlineOffset, fSelEnd, true, true);
+		fInline->SetSelectionOffset(selectionStart);
+		fInline->SetSelectionLength(selectionEnd - selectionStart);
 
-	_ShowCaret();
+		const int32 inlineOffset = fInline->Offset();
+		InsertText(string, stringLen, fSelStart, NULL);
+		fSelStart += stringLen;
+		fClickOffset = fSelEnd = fSelStart;
+
+		_Refresh(inlineOffset, fSelEnd, true, true);
+		_ShowCaret();
+	}
+
 }
 
 



From zooey at mail.berlios.de  Fri May 15 12:10:49 2009
From: zooey at mail.berlios.de (zooey at BerliOS)
Date: Fri, 15 May 2009 12:10:49 +0200
Subject: [Haiku-commits] r30765 -
	haiku/trunk/src/add-ons/input_server/devices/keyboard
Message-ID: <200905151010.n4FAAnZm022021@sheep.berlios.de>

Author: zooey
Date: 2009-05-15 12:10:47 +0200 (Fri, 15 May 2009)
New Revision: 30765
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30765&view=rev

Modified:
   haiku/trunk/src/add-ons/input_server/devices/keyboard/Keymap.cpp
Log:
* if a dead key sequence does not produce a special character as defined by
  the dead key character map - both the dead key itself and the following
  character are being sent. 
  R5 seems to do the same, at least the resulting behaviour in the terminal
  is now identical: e.g. if you press ^ once, you see nothing, if you press ^ a
  second time, you see '^^'.


Modified: haiku/trunk/src/add-ons/input_server/devices/keyboard/Keymap.cpp
===================================================================
--- haiku/trunk/src/add-ons/input_server/devices/keyboard/Keymap.cpp	2009-05-15 10:05:05 UTC (rev 30764)
+++ haiku/trunk/src/add-ons/input_server/devices/keyboard/Keymap.cpp	2009-05-15 10:10:47 UTC (rev 30765)
@@ -21,7 +21,7 @@
 #include 
 
 
-static void 
+static void
 print_key(char *chars, int32 offset)
 {
 	int size = chars[offset++];
@@ -62,9 +62,9 @@
 void
 Keymap::DumpKeymap()
 {
-	// Print a chart of the normal, shift, option, and option+shift 
-	// keys. 
-	printf("Key #\tNormal\tShift\tCaps\tC+S\tOption\tO+S\tO+C\tO+C+S\tControl\n"); 
+	// Print a chart of the normal, shift, option, and option+shift
+	// keys.
+	printf("Key #\tNormal\tShift\tCaps\tC+S\tOption\tO+S\tO+C\tO+C+S\tControl\n");
 
 	for (int i = 0; i < 128; i++) {
 		printf(" 0x%x\t", i);
@@ -102,10 +102,10 @@
 }
 
 
-/* we need to know if a key is a modifier key to choose 
+/* we need to know if a key is a modifier key to choose
 	a valid key when several are pressed together
 */
-bool 
+bool
 Keymap::IsModifierKey(uint32 keyCode)
 {
 	return keyCode == fKeys.caps_key
@@ -124,7 +124,7 @@
 
 
 //! We need to know a modifier for a key
-uint32 
+uint32
 Keymap::Modifier(uint32 keyCode)
 {
 	if (keyCode == fKeys.caps_key)
@@ -197,7 +197,7 @@
 
 	int32 offset;
 	uint32 tableMask = 0;
-	
+
 	switch (modifiers & 0xcf) {
 		case B_SHIFT_KEY: offset = fKeys.shift_map[keyCode]; tableMask = B_SHIFT_TABLE; break;
 		case B_CAPS_LOCK: offset = fKeys.caps_map[keyCode]; tableMask = B_CAPS_TABLE; break;
@@ -217,9 +217,9 @@
 	if (!numBytes)
 		return 0;
 
-	char chars[4];	
+	char chars[4];
 	strncpy(chars, &(fChars[offset+1]), numBytes );
-	chars[numBytes] = 0; 
+	chars[numBytes] = 0;
 
 	int32 deadOffsets[] = {
 		fKeys.acute_dead_key[1],
@@ -227,7 +227,7 @@
 		fKeys.circumflex_dead_key[1],
 		fKeys.dieresis_dead_key[1],
 		fKeys.tilde_dead_key[1]
-	}; 
+	};
 
 	uint32 deadTables[] = {
 		fKeys.acute_tables,
@@ -277,7 +277,7 @@
 	}
 
 	if (offset <= 0 || offset > fCharsSize)
-		return false;	
+		return false;
 
 	uint32 numBytes = fChars[offset];
 	if (!numBytes)
@@ -291,7 +291,7 @@
 		fKeys.tilde_dead_key
 	};
 
-	int32 *deadOffset = deadOffsets[activeDeadKey-1]; 
+	int32 *deadOffset = deadOffsets[activeDeadKey-1];
 
 	for (int32 i=0; i<32; i++) {
 		if (offset == deadOffset[i])
@@ -414,19 +414,23 @@
 				}
 			}
 			return;
-		}		
+		}
 		i++;
 	}
 
-	// if not found we return the current char mapped	
-	*chars = new (std::nothrow) char[*numBytes + 1];
+	// if not found we return the whole sequence (the dead key itself plus
+	// the following char)
+	int32 deadKeyNumBytes = fChars[deadKey[1]];
+	int32 fullNumBytes = deadKeyNumBytes + *numBytes;
+	*chars = new (std::nothrow) char[fullNumBytes + 1];
 	if (*chars == NULL) {
 		*numBytes = 0;
 		return;
 	}
-
-	strncpy(*chars, &(fChars[offset + 1]), *numBytes );
-	(*chars)[*numBytes] = 0; 	
+	strncpy(*chars, &fChars[deadKey[1] + 1], deadKeyNumBytes);
+	strncpy(*chars + deadKeyNumBytes, &fChars[offset + 1], *numBytes);
+	*numBytes = fullNumBytes;
+	(*chars)[fullNumBytes] = 0;
 }
 
 



From korli at users.berlios.de  Fri May 15 12:36:05 2009
From: korli at users.berlios.de (=?ISO-8859-1?B?Suly9G1lIER1dmFs?=)
Date: Fri, 15 May 2009 12:36:05 +0200
Subject: [Haiku-commits] r30721 - haiku/trunk/src/preferences/keymap
In-Reply-To: <200905121849.n4CInXd5010680@sheep.berlios.de>
References: <200905121849.n4CInXd5010680@sheep.berlios.de>
Message-ID: 

2009/5/12 zooey at BerliOS :
>
> ? ? ? ?ssize_t bytesWritten = file.Write(&fKeys, sizeof(fKeys));
> - ? ? ? if (bytesWritten < (ssize_t)sizeof(fKeys)) {
> - ? ? ? ? ? ? ? if (bytesWritten < 0)
> - ? ? ? ? ? ? ? ? ? ? ? return bytesWritten;
> - ? ? ? ? ? ? ? return B_IO_ERROR;
> - ? ? ? }
> + ? ? ? if (bytesWritten < (ssize_t)sizeof(fKeys))
> + ? ? ? ? ? ? ? status = bytesWritten < 0 ? bytesWritten : B_IO_ERROR;
>

Isn't this use of tertiary operator forbidden or discouraged in our
coding guidelines ?

Bye,
Jerome


From ingo_weinhold at gmx.de  Fri May 15 13:28:16 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Fri, 15 May 2009 13:28:16 +0200
Subject: [Haiku-commits] r30721 - haiku/trunk/src/preferences/keymap
In-Reply-To: 
References: <200905121849.n4CInXd5010680@sheep.berlios.de>
	
Message-ID: <20090515132816.376.1@knochen-vm.localdomain>


On 2009-05-15 at 12:36:05 [+0200], J?r?me Duval  
wrote:
> 2009/5/12 zooey at BerliOS :
> >
> >        ssize_t bytesWritten = file.Write(&fKeys, sizeof(fKeys));
> > -       if (bytesWritten < (ssize_t)sizeof(fKeys)) {
> > -               if (bytesWritten < 0)
> > -                       return bytesWritten;
> > -               return B_IO_ERROR;
> > -       }
> > +       if (bytesWritten < (ssize_t)sizeof(fKeys))
> > +               status = bytesWritten < 0 ? bytesWritten : B_IO_ERROR;
> >
> 
> Isn't this use of tertiary operator forbidden or discouraged in our
> coding guidelines ?

Nope.

CU, Ingo


From ingo_weinhold at gmx.de  Fri May 15 13:41:37 2009
From: ingo_weinhold at gmx.de (Ingo Weinhold)
Date: Fri, 15 May 2009 13:41:37 +0200
Subject: [Haiku-commits] r30759 - haiku/trunk/src/bin
In-Reply-To: <5230539062-BeMail@kirilla>
References: <5230539062-BeMail@kirilla>
Message-ID: <20090515134137.538.2@knochen-vm.localdomain>


On 2009-05-14 at 22:57:19 [+0200], Jonas Sundstr?m  
wrote:
> "Axel D?rfler"  wrote:
> > "Jonas Sundstr?m"  wrote:
> > [...]
> > It does belong into neither class. It's *always*
> > up to the application to show a dialog; you cannot
> > know in what context BUrl is used, and you should
> > not make any assumptions.
> 
> That's what the boolean argument to the OpenWith...
> method is for: with or without dialog. If the app
> doesn't want a user dialog it can say so, and just
> check the return value.
> 
> It could be made asynchronous optionally, so the
> application thread does not have to wait on the
> user dialog. Unless it wants to.
> 
> Leaving every application to roll their own dialog,
> well..

No one said that the functionality shouldn't be provided, it's just a 
question of good design, how that is done. I would image BUrl to be a 
simple support class that deals with the syntactical aspect of URLs (as 
known from other frameworks) and provide other features that use URLs 
elsewhere -- e.g. application launching belongs to BRoster. Regarding the 
dialog, if it is complex enough, make it a separate class or function.

> Take AboutSystem. No feedback on a failed URL open.
> (IIRC no mouse-over indication on links. No visual
> click indication.) Not the ideal user experience.

Great, we have a volunteer! :-)

CU, Ingo


From superstippi at gmx.de  Fri May 15 14:02:09 2009
From: superstippi at gmx.de (=?ISO-8859-1?Q?Stephan_A=DFmus?=)
Date: Fri, 15 May 2009 14:02:09 +0200
Subject: [Haiku-commits] r30759 - haiku/trunk/src/bin
In-Reply-To: <20090515134137.538.2@knochen-vm.localdomain>
References: <5230539062-BeMail@kirilla>
	<20090515134137.538.2@knochen-vm.localdomain>
Message-ID: <4A0D59C1.1010900@gmx.de>

Ingo Weinhold schrieb:
> On 2009-05-14 at 22:57:19 [+0200], Jonas Sundstr?m  
> wrote:
>> "Axel D?rfler"  wrote:
>>> "Jonas Sundstr?m"  wrote:
>>> [...]
>>> It does belong into neither class. It's *always*
>>> up to the application to show a dialog; you cannot
>>> know in what context BUrl is used, and you should
>>> not make any assumptions.
>> That's what the boolean argument to the OpenWith...
>> method is for: with or without dialog. If the app
>> doesn't want a user dialog it can say so, and just
>> check the return value.
>>
>> It could be made asynchronous optionally, so the
>> application thread does not have to wait on the
>> user dialog. Unless it wants to.
>>
>> Leaving every application to roll their own dialog,
>> well..
> 
> No one said that the functionality shouldn't be provided, it's just a 
> question of good design, how that is done. I would image BUrl to be a 
> simple support class that deals with the syntactical aspect of URLs (as 
> known from other frameworks) and provide other features that use URLs 
> elsewhere -- e.g. application launching belongs to BRoster. Regarding the 
> dialog, if it is complex enough, make it a separate class or function.
> 
>> Take AboutSystem. No feedback on a failed URL open.
>> (IIRC no mouse-over indication on links. No visual
>> click indication.) Not the ideal user experience.
> 
> Great, we have a volunteer! :-)

BTW, it does change the mouse cursor on mouse-over-url... I added that 
some time ago. But it's not clear enough, it should be the same cursor 
that Firefox uses for link targets to be more clear. We need to define 
some system cursors... don't we? ;-) Also, it should probably underline 
the link targets too at the same time (on mouse over, I mean).

Best regards,
-Stephan



From stippi at mail.berlios.de  Fri May 15 20:19:11 2009
From: stippi at mail.berlios.de (stippi at BerliOS)
Date: Fri, 15 May 2009 20:19:11 +0200
Subject: [Haiku-commits] r30766 - haiku/trunk/src/apps/drivesetup
Message-ID: <200905151819.n4FIJBm9011048@sheep.berlios.de>

Author: stippi
Date: 2009-05-15 20:19:10 +0200 (Fri, 15 May 2009)
New Revision: 30766
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30766&view=rev

Modified:
   haiku/trunk/src/apps/drivesetup/MainWindow.cpp
   haiku/trunk/src/apps/drivesetup/MainWindow.h
Log:
* Adopt the Init menu to the currently available
  disk systems. For disk devices, we allow not only
  file systems, but any disk system. This gets us
  "Intel Partition Map" and "Intel Extended Partition".
  I managed to initialize a disk with Intel Partition
  Map this way.
* I imported a large chunk of currently disabled code
  from Ingo's partitioner command line tool, which can
  eventually be used to create partitions in the empty
  space. I kept the "Create" menu still disabled, but
  the correct content types are actually retrieved already,
  which are "Intel Primary Partition" and "Intel Extended
  Partition".


Modified: haiku/trunk/src/apps/drivesetup/MainWindow.cpp
===================================================================
--- haiku/trunk/src/apps/drivesetup/MainWindow.cpp	2009-05-15 10:10:47 UTC (rev 30765)
+++ haiku/trunk/src/apps/drivesetup/MainWindow.cpp	2009-05-15 18:19:10 UTC (rev 30766)
@@ -5,6 +5,7 @@
  * Authors:
  *		Erik Jaesler 
  *		Ithamar R. Adema 
+ *		Ingo Weinhold 
  *		Stephan A?mus 
  */
 
@@ -37,6 +38,32 @@
 #include 
 
 
+//static void
+//print_partition_table_header()
+//{
+	//printf("   Index     Start      Size                Content Type      "
+		//"Content Name\n");
+	//printf("--------------------------------------------------------------"
+		//"------------\n");
+//}
+
+
+//static void
+//print_partition(BPartition* partition, int level, int index)
+//{
+	//BString offset, size;
+	//get_size_string(partition->Offset(), offset);
+	//get_size_string(partition->Size(), size);
+
+	//printf("%*s%02d%*s  %8s  %8s  %26.26s  %16.16s\n", 2 * level, "",
+		//index,
+		//2 * max_c(3 - level, 0), "",
+		//offset.String(), size.String(),
+		//(partition->ContentType() ? partition->ContentType() : "-"),
+		//(partition->ContentName() ? partition->ContentName() : ""));
+//}
+
+
 class ListPopulatorVisitor : public BDiskDeviceVisitor {
 public:
 	ListPopulatorVisitor(PartitionListView* list, int32& diskCount,
@@ -228,9 +255,6 @@
 
 	BDiskDeviceRoster().StartWatching(this);
 
-	// populate the Initialiaze menu with the available file systems
-	_ScanFileSystems();
-
 	// visit all disks in the system and show their contents
 	_ScanDrives();
 
@@ -270,7 +294,7 @@
 
 		case MSG_INITIALIZE: {
 			BString diskSystemName;
-			if (message->FindString("format", &diskSystemName) != B_OK)
+			if (message->FindString("disk system", &diskSystemName) != B_OK)
 				break;
 			_Initialize(fCurrentDisk, fCurrentPartitionID, diskSystemName);
 			break;
@@ -388,35 +412,15 @@
 		= fListView->FindRow(fCurrentPartitionID);
 	if (previousSelection) {
 		fListView->AddToSelection(previousSelection);
-		_EnabledDisableMenuItems(fCurrentDisk, fCurrentPartitionID,
+		_UpdateMenus(fCurrentDisk, fCurrentPartitionID,
 			previousSelection->ParentID());
 		fDiskView->ForceUpdate();
 	} else {
-		_EnabledDisableMenuItems(NULL, -1, -1);
+		_UpdateMenus(NULL, -1, -1);
 	}
 }
 
 
-void
-MainWindow::_ScanFileSystems()
-{
-	while (BMenuItem* item = fInitMenu->RemoveItem(0L))
-		delete item;
-
-	BDiskSystem diskSystem;
-	fDDRoster.RewindDiskSystems();
-	while (fDDRoster.GetNextDiskSystem(&diskSystem) == B_OK) {
-		if (diskSystem.IsFileSystem() && diskSystem.SupportsInitializing()) {
-			BMessage* message = new BMessage(MSG_INITIALIZE);
-			message->AddString("format", diskSystem.PrettyName());
-			BString label = diskSystem.PrettyName();
-			label << B_UTF8_ELLIPSIS;
-			fInitMenu->AddItem(new BMenuItem(label.String(), message));
-		}
-	}
-}
-
-
 // #pragma mark -
 
 
@@ -456,6 +460,8 @@
 MainWindow::_SetToDiskAndPartition(partition_id disk, partition_id partition,
 	partition_id parent)
 {
+printf("MainWindow::_SetToDiskAndPartition(disk: %ld, partition: %ld, "
+	"parent: %ld)\n", disk, partition, parent);
 	BDiskDevice* oldDisk = NULL;
 	if (!fCurrentDisk || fCurrentDisk->ID() != disk) {
 		oldDisk = fCurrentDisk;
@@ -474,20 +480,27 @@
 	fCurrentPartitionID = partition;
 
 	fDiskView->SetDisk(fCurrentDisk, fCurrentPartitionID);
-	_EnabledDisableMenuItems(fCurrentDisk, fCurrentPartitionID, parent);
+	_UpdateMenus(fCurrentDisk, fCurrentPartitionID, parent);
 
 	delete oldDisk;
 }
 
 
 void
-MainWindow::_EnabledDisableMenuItems(BDiskDevice* disk,
+MainWindow::_UpdateMenus(BDiskDevice* disk,
 	partition_id selectedPartition, partition_id parentID)
 {
-	// clean out Create menu
+printf("MainWindow::_UpdateMenus(disk: %p, "
+	"selectedPartition: %ld, parentID: %ld)\n", disk, selectedPartition,
+	parentID);
+
+	// clean out Create and Init menu
 	while (BMenuItem* item = fCreateMenu->RemoveItem(0L))
 		delete item;
 
+	while (BMenuItem* item = fInitMenu->RemoveItem(0L))
+		delete item;
+
 	if (!disk) {
 		fFormatMI->SetEnabled(false);
 		fEjectMI->SetEnabled(false);
@@ -508,9 +521,45 @@
 		if (selectedPartition <= -2)
 			parentPartition = disk->FindDescendant(parentID);
 
-		if (parentPartition) {
-			bool prepared = disk->PrepareModifications() == B_OK;
-			fCreateMenu->SetEnabled(true);
+		BPartition* partition = disk->FindDescendant(selectedPartition);
+		if (partition == NULL)
+			partition = disk;
+
+		bool prepared = disk->PrepareModifications() == B_OK;
+printf("  prepared: %d\n", prepared);
+//		fCreateMenu->SetEnabled(prepared);
+// TODO: Enable once _Create() is implemented...
+fCreateMenu->SetEnabled(false);
+		fInitMenu->SetEnabled(prepared);
+
+		BDiskSystem diskSystem;
+		fDDRoster.RewindDiskSystems();
+		while (fDDRoster.GetNextDiskSystem(&diskSystem) == B_OK) {
+			if (!diskSystem.SupportsInitializing())
+				continue;
+
+			if (disk->ID() != selectedPartition
+				&& disk->ContainsPartitioningSystem()
+				&& !diskSystem.IsFileSystem()) {
+				// Do not confuse the user with nested partition maps?
+				continue;
+			}
+			BMessage* message = new BMessage(MSG_INITIALIZE);
+			message->AddInt32("parent id", parentID);
+			message->AddString("disk system", diskSystem.PrettyName());
+
+			BString label = diskSystem.PrettyName();
+			label << B_UTF8_ELLIPSIS;
+			BMenuItem* item = new BMenuItem(label.String(), message);
+
+// TODO: Very unintuitive that we have to use the pretty name here!
+//			item->SetEnabled(partition->CanInitialize(diskSystem.Name()));
+			item->SetEnabled(partition->CanInitialize(diskSystem.PrettyName()));
+			fInitMenu->AddItem(item);
+		}
+
+		if (parentPartition != NULL) {
+printf("  parent partition: %p\n", parentPartition);
 			BString supportedChildType;
 			int32 cookie = 0;
 			status_t ret;
@@ -527,14 +576,15 @@
 			if (fCreateMenu->CountItems() == 0)
 				fprintf(stderr, "Failed to get supported child types: %s\n",
 					strerror(ret));
-			if (prepared)
-				disk->CancelModifications();
 		} else {
+printf("  no parent partition\n");
 			fCreateMenu->SetEnabled(false);
 		}
 
+		if (prepared)
+			disk->CancelModifications();
+
 		// Mount items
-		BPartition* partition = disk->FindDescendant(selectedPartition);
 		if (partition) {
 			fInitMenu->SetEnabled(!partition->IsMounted());
 //			fDeleteMI->SetEnabled(!partition->IsMounted());
@@ -744,7 +794,7 @@
 	fDDRoster.RewindDiskSystems();
 	bool found = false;
 	while (fDDRoster.GetNextDiskSystem(&diskSystem) == B_OK) {
-		if (diskSystem.IsFileSystem() && diskSystem.SupportsInitializing()) {
+		if (diskSystem.SupportsInitializing()) {
 			if (diskSystemName == diskSystem.PrettyName()) {
 				found = true;
 				break;
@@ -762,7 +812,9 @@
 
 	// allow BFS only, since our parameter string
 	// construction only handles BFS at the moment
-	if (diskSystemName != "Be File System") {
+	if (diskSystemName != "Be File System"
+		&& diskSystemName != "Intel Partition Map"
+		&& diskSystemName != "Intel Extended Partition") {
 		_DisplayPartitionError("Don't know how to construct parameters "
 			"for this file system.");
 		return;
@@ -778,14 +830,19 @@
 
 	// TODO: use partition initialization editor
 	// (partition->GetInitializationParameterEditor())
-
 	BString name = partition->ContentName();
-	if (name.Length() == 0)
-		name = "Haiku";
 	BString parameters;
-	InitParamsPanel* panel = new InitParamsPanel(this);
-	if (panel->Go(name, parameters) == GO_CANCELED)
-		return;
+	if (diskSystemName == "Be File System") {
+		if (name.Length() == 0)
+			name = "Haiku";
+		InitParamsPanel* panel = new InitParamsPanel(this);
+		if (panel->Go(name, parameters) == GO_CANCELED)
+			return;
+	} else if (diskSystemName == "Intel Partition Map") {
+		// TODO: parameters?
+	} else if (diskSystemName == "Intel Extended Partition") {
+		// TODO: parameters?
+	}
 
 	bool supportsName = diskSystem.SupportsContentName();
 	BString validatedName(name);
@@ -810,10 +867,16 @@
 	// everything looks fine, we are ready to actually write the changes
 	// to disk
 
+	// Warn the user one more time...
 	message = "Are you sure you want to write the changes back to "
 		"disk now?\n\n";
-	message << "All data on the partition \"" << previousName;
-	message << "\" will be irrevertably lost if you do so!";
+	if (partition->IsDevice())
+		message << "All data on the disk";
+	else
+		message << "All data on the partition";
+	if (previousName.Length() > 0)
+		message << " \"" << previousName << "\"";
+	message << " will be irrevertably lost if you do so!";
 	alert = new BAlert("final notice", message.String(),
 		"Write Changes", "Cancel", NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
 	choice = alert->Go();
@@ -839,3 +902,215 @@
 	_ScanDrives();
 }
 
+
+void
+MainWindow::_Create(BDiskDevice* disk, partition_id selectedPartition,
+	const BString& partitionType)
+{
+	printf("_Create(disk: %p, selectedPartition: %ld)\n", disk,
+		selectedPartition);
+
+	if (disk->IsReadOnly()) {
+		_DisplayPartitionError("The selected disk is read-only.");
+		return;
+	}
+
+	//BPartition* partition = disk->FindDescendant(selectedPartition);
+	//if (!partition) {
+		//_DisplayPartitionError("Unable to find the selected partition by id.");
+		//return;
+	//}
+
+
+#if 0
+	// get the parent partition
+	BPartition* partition = NULL;
+	int32 partitionIndex;
+	if (!_SelectPartition("parent partition index [-1 to abort]: ",
+			partition, partitionIndex)) {
+		return;
+	}
+
+	printf("\nselected partition:\n\n");
+	print_partition_table_header();
+	print_partition(partition, 0, partitionIndex);
+
+	if (!partition->ContainsPartitioningSystem()) {
+		printf("The selected partition does not contain a partitioning "
+			"system.\n");
+		return;
+	}
+
+	// get supported types
+	BObjectList supportedTypes(20, true);
+	BString typeBuffer;
+	int32 cookie = 0;
+	while (partition->GetNextSupportedChildType(&cookie, &typeBuffer)
+			== B_OK) {
+		supportedTypes.AddItem(new BString(typeBuffer));
+	}
+
+	if (supportedTypes.IsEmpty()) {
+		printf("The partitioning system is not able to create any "
+			"child partition (no supported types).\n");
+		return;
+	}
+
+	// get partitioning info
+	BPartitioningInfo partitioningInfo;
+	status_t error = partition->GetPartitioningInfo(&partitioningInfo);
+	if (error != B_OK) {
+		printf("Failed to get partitioning info for partition: %s\n",
+			strerror(error));
+		return;
+	}
+
+	int32 spacesCount = partitioningInfo.CountPartitionableSpaces();
+	if (spacesCount == 0) {
+		printf("There's no space on the partition where a child partition "
+			"could be created\n");
+		return;
+	}
+
+	// let the user select the partition type, if there's more than one
+	int64 typeIndex = 0;
+	int32 supportedTypesCount = supportedTypes.CountItems();
+	if (supportedTypesCount > 1) {
+		// list them
+		printf("Possible partition types:\n");
+		for (int32 i = 0; i < supportedTypesCount; i++)
+			printf("%2ld  %s\n", i, supportedTypes.ItemAt(i)->String());
+
+		if (!_ReadNumber("supported type index [-1 to abort]: ", 0,
+				supportedTypesCount - 1, -1, "invalid index", typeIndex)) {
+			return;
+		}
+	}
+
+	const char* type = supportedTypes.ItemAt(typeIndex)->String();
+
+	// list partitionable spaces
+	printf("Unused regions where the new partition could be created:\n");
+	for (int32 i = 0; i < spacesCount; i++) {
+		off_t _offset;
+		off_t _size;
+		partitioningInfo.GetPartitionableSpaceAt(i, &_offset, &_size);
+		BString offset, size;
+		get_size_string(_offset, offset);
+		get_size_string(_size, size);
+		printf("%2ld  start: %8s,  size:  %8s\n", i, offset.String(),
+			size.String());
+	}
+
+	// let the user select the partitionable space, if there's more than one
+	int64 spaceIndex = 0;
+	if (spacesCount > 1) {
+		if (!_ReadNumber("unused region index [-1 to abort]: ", 0,
+				spacesCount - 1, -1, "invalid index", spaceIndex)) {
+			return;
+		}
+	}
+
+	off_t spaceOffset;
+	off_t spaceSize;
+	partitioningInfo.GetPartitionableSpaceAt(spaceIndex, &spaceOffset,
+		&spaceSize);
+
+	off_t start;
+	off_t size;
+	BString parameters;
+	while (true) {
+		// let the user enter start, size, and parameters
+
+		// start
+		while (true) {
+			BString spaceOffsetString;
+			get_size_string(spaceOffset, spaceOffsetString);
+			BString prompt("partition start [default: ");
+			prompt << spaceOffsetString << "]: ";
+			if (!_ReadSize(prompt.String(), spaceOffset, start))
+				return;
+
+			if (start >= spaceOffset && start <= spaceOffset + spaceSize)
+				break;
+
+			printf("invalid partition start\n");
+		}
+
+		// size
+		off_t maxSize = spaceOffset + spaceSize - start;
+		while (true) {
+			BString maxSizeString;
+			get_size_string(maxSize, maxSizeString);
+			BString prompt("partition size [default: ");
+			prompt << maxSizeString << "]: ";
+			if (!_ReadSize(prompt.String(), maxSize, size))
+				return;
+
+			if (size >= 0 && start + size <= spaceOffset + spaceSize)
+				break;
+
+			printf("invalid partition size\n");
+		}
+
+		// parameters
+		if (!_ReadLine("partition parameters: ", parameters))
+			return;
+
+		// validate parameters
+		off_t validatedStart = start;
+		off_t validatedSize = size;
+// TODO: Support the name parameter!
+		if (partition->ValidateCreateChild(&start, &size, type, NULL,
+				parameters.String()) != B_OK) {
+			printf("Validation of the given values failed. Sorry, can't "
+				"continue.\n");
+			return;
+		}
+
+		// did the disk system change offset or size?
+		if (validatedStart == start && validatedSize == size) {
+			printf("Everything looks dandy.\n");
+		} else {
+			BString startString, sizeString;
+			get_size_string(validatedStart, startString);
+			get_size_string(validatedSize, sizeString);
+			printf("The disk system adjusted the partition start and "
+				"size to %lld (%s) and %lld (%s).\n",
+				validatedStart, startString.String(), validatedSize,
+				sizeString.String());
+			start = validatedStart;
+			size = validatedSize;
+		}
+
+		// let the user decide whether to continue, change parameters, or
+		// abort
+		bool changeParameters = false;
+		while (true) {
+			BString line;
+			_ReadLine("[c]ontinue, change [p]arameters, or [a]bort? ", line);
+			if (line == "a")
+				return;
+			if (line == "p") {
+				changeParameters = true;
+				break;
+			}
+			if (line == "c")
+				break;
+
+			printf("invalid input\n");
+		}
+
+		if (!changeParameters)
+			break;
+	}
+
+	// create child
+	error = partition->CreateChild(start, size, type, NULL,
+		parameters.String());
+	if (error != B_OK)
+		printf("Creating the partition failed: %s\n", strerror(error));
+#endif // 0
+
+	_ScanDrives();
+}

Modified: haiku/trunk/src/apps/drivesetup/MainWindow.h
===================================================================
--- haiku/trunk/src/apps/drivesetup/MainWindow.h	2009-05-15 10:10:47 UTC (rev 30765)
+++ haiku/trunk/src/apps/drivesetup/MainWindow.h	2009-05-15 18:19:10 UTC (rev 30766)
@@ -44,13 +44,12 @@
 
 private:
 			void				_ScanDrives();
-			void				_ScanFileSystems();
 
 			void				_AdaptToSelectedPartition();
 			void				_SetToDiskAndPartition(partition_id diskID,
 									partition_id partitionID,
 									partition_id parentID);
-			void				_EnabledDisableMenuItems(BDiskDevice* disk,
+			void				_UpdateMenus(BDiskDevice* disk,
 									partition_id selectedPartition,
 									partition_id parentID);
 
@@ -67,6 +66,9 @@
 			void				_Initialize(BDiskDevice* disk,
 									partition_id selectedPartition,
 									const BString& diskSystemName);
+			void				_Create(BDiskDevice* disk,
+									partition_id selectedPartition,
+									const BString& partitionType);
 
 
 			BDiskDeviceRoster	fDDRoster;



From oruizdorantes at mail.berlios.de  Sat May 16 00:11:20 2009
From: oruizdorantes at mail.berlios.de (oruizdorantes at BerliOS)
Date: Sat, 16 May 2009 00:11:20 +0200
Subject: [Haiku-commits] r30767 -
	haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic
Message-ID: <200905152211.n4FMBKNx006184@sheep.berlios.de>

Author: oruizdorantes
Date: 2009-05-16 00:11:19 +0200 (Sat, 16 May 2009)
New Revision: 30767
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30767&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.c
   haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.h
   haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.c
   haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.c
Log:
Style cleanup(or not making it worse), fix some statistics(Monni)

Modified: haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.c	2009-05-15 18:19:10 UTC (rev 30766)
+++ haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.c	2009-05-15 22:11:19 UTC (rev 30767)
@@ -1,6 +1,6 @@
 /*
  * Copyright 2007 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
- *
+ * Copyright 2008 Mika Lindqvist, monni1995_at_gmail.com
  * All rights reserved. Distributed under the terms of the MIT License.
  *
  */
@@ -12,9 +12,8 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 
+
 #include "snet_buffer.h"
 
 #include 
@@ -47,41 +46,46 @@
 struct net_buffer_module_info* nb = NULL;
 struct bluetooth_core_data_module_info* btCoreData = NULL;
 
-/* Driver Global data */
+// Driver Global data
 static char	 *publish_names[MAX_BT_GENERIC_USB_DEVICES];
 
-int32 		dev_count = 0;	/* number of connected devices */
-static bt_usb_dev*	bt_usb_devices[MAX_BT_GENERIC_USB_DEVICES];
-sem_id 		dev_table_sem = -1; /* sem to synchronize access to device table */
+int32 dev_count = 0; // number of connected devices
+static bt_usb_dev* bt_usb_devices[MAX_BT_GENERIC_USB_DEVICES];
+sem_id dev_table_sem = -1; // sem to synchronize access to device table
 
 status_t submit_nbuffer(hci_id hid, net_buffer* nbuf);
 
 usb_support_descriptor supported_devices[] =
 {
-    /* Generic Bluetooth USB device */
-    /* Class, SubClass, and Protocol codes that describe a Bluetooth device */
+    // Generic Bluetooth USB device
+    // Class, SubClass, and Protocol codes that describe a Bluetooth device
 	{ UDCLASS_WIRELESS, UDSUBCLASS_RF, UDPROTO_BLUETOOTH , 0 , 0 },
 
-    /* Generic devices	*/
-	/* Broadcom BCM2035 */
+	// Broadcom BCM2035
 	{ 0, 0, 0, 0x0a5c, 0x200a },
 	{ 0, 0, 0, 0x0a5c, 0x2009 },
 
-	/* Devices taken from the linux Driver */
-	/* AVM BlueFRITZ! USB v2.0 */
+	// Devices taken from the linux Driver
+	// AVM BlueFRITZ! USB v2.0
 	{ 0, 0, 0, 0x057c   , 0x3800 },
-	/* Bluetooth Ultraport Module from IBM */
+	// Bluetooth Ultraport Module from IBM
 	{ 0, 0, 0, 0x04bf   , 0x030a },
-	/* ALPS Modules with non-standard id */
+	// ALPS Modules with non-standard id
 	{ 0, 0, 0, 0x044e   , 0x3001 },
 	{ 0, 0, 0, 0x044e   , 0x3002 },
-	/* Ericsson with non-standard id */
+	// Ericsson with non-standard id
 	{ 0, 0, 0, 0x0bdb   , 0x1002 }
 };
 
 /* add a device to the list of connected devices */
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 static bt_usb_dev*
-spawn_device(const usb_device* usb_dev)
+spawn_device(usb_device usb_dev)
+#else
+static bt_usb_dev*
+spawn_device(usb_device* usb_dev)
+#endif
+
 {
 	int32 i;
 	status_t err = B_OK;
@@ -89,7 +93,7 @@
 
 	flowf("add_device()\n");
 
-	/* 16 usb dongles... u are unsane */
+	// 16 usb dongles... 
 	if (dev_count >= MAX_BT_GENERIC_USB_DEVICES) {
 		flowf("device table full\n");
 		goto exit;
@@ -97,11 +101,11 @@
 
 	/* try the allocation */
 	new_bt_dev = (bt_usb_dev*)malloc(sizeof(bt_usb_dev));
-	if ( new_bt_dev == NULL ) {
-		flowf("no memory allocating\n");
+	if (new_bt_dev == NULL) {
+		flowf("no memory\n");
 		goto exit;
 	}
-	memset(new_bt_dev, 0, sizeof(bt_usb_dev) );
+	memset(new_bt_dev, 0, sizeof(bt_usb_dev));
 
 	/* We will need this sem for some flow control */
 	new_bt_dev->cmd_complete = create_sem(1, BLUETOOTH_DEVICE_DEVFS_NAME "cmd_complete");
@@ -210,8 +214,12 @@
 
 
 /* called by USB Manager when device is added to the USB */
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 static status_t
-device_added(const usb_device* dev, void** cookie)
+device_added(usb_device dev, void** cookie)
+#else
+device_added(usb_device* dev, void** cookie)
+#endif
 {
 	const usb_interface_info* 		interface;
 	const usb_device_descriptor* 	desc;
@@ -223,7 +231,7 @@
 	bt_usb_dev* new_bt_dev = spawn_device(dev);
     int e;
 
-	debugf("device_added(%p, %p)\n", dev, new_bt_dev);
+	debugf("device_added(%ld, %p)\n", dev, new_bt_dev);
 
 	if (new_bt_dev == NULL) {
 		flowf("Couldn't allocate device record.\n");
@@ -358,13 +366,13 @@
         return B_ERROR;
     }
 
-	if (!TEST_AND_CLEAR(&bdev->state, RUNNING) ) {
+	if (!TEST_AND_CLEAR(&bdev->state, RUNNING)) {
 		flowf(" wasnt running??\n");
 	}
 
 
 	flowf("Cancelling queues...\n");
-	if ( bdev->intr_in_ep != NULL ) {
+	if (bdev->intr_in_ep != NULL) {
 		usb->cancel_queued_transfers(bdev->intr_in_ep->handle);
 		flowf("Cancelling impossible EVENTS\n");
 	}
@@ -455,7 +463,7 @@
 	}
 
 	// Set RUNNING
-	if ( TEST_AND_SET(&bdev->state, ANCILLYANT) ) {
+	if (TEST_AND_SET(&bdev->state, RUNNING)) {
 	    flowf("dev already running! - reOpened device!\n");
 	    return B_ERROR;
 	}
@@ -486,7 +494,7 @@
 		//	TODO: Fill the transport descriptor
 	    err = btDevices->init_device(bdev->name, &ndev);
 		
-    	if ( err == B_OK ) {
+    	if (err == B_OK) {
     		bdev->hdev = hdev = ndev->index; // get the index
     		bdev->ndev = ndev;  // get the net_device
 
@@ -645,7 +653,7 @@
 			#if BT_DRIVER_SUPPORTS_ACL // ACL
 			for (i = 0; i < MAX_ACL_IN_WINDOW; i++) {
 				err = submit_rx_acl(bdev);
-				if (err != B_OK && i == 0 ) {
+				if (err != B_OK && i == 0) {
 	  			    CLEAR_BIT(bdev->state, ANCILLYANT);	// Set the flaq in the HCI world
 					flowf("Queuing failed device stops running\n");
 					break;

Modified: haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.h	2009-05-15 18:19:10 UTC (rev 30766)
+++ haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.h	2009-05-15 22:11:19 UTC (rev 30767)
@@ -12,7 +12,12 @@
 #include 
 
 #include 
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
+#include 
+#else
+#include 
 #include 
+#endif
 
 #include 
 #include 
@@ -54,7 +59,11 @@
 typedef struct bt_usb_dev bt_usb_dev;
 
 struct bt_usb_dev {
-	const usb_device*		dev;          /* opaque handle */
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
+	usb_device		dev;          /* opaque handle */
+#else
+	usb_device*		dev;          /* opaque handle */
+#endif
 	hci_id					hdev;		  /* HCI device id*/	
 	struct net_device*		ndev;
 	

Modified: haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.c	2009-05-15 18:19:10 UTC (rev 30766)
+++ haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.c	2009-05-15 22:11:19 UTC (rev 30767)
@@ -1,8 +1,7 @@
 /*
  * Copyright 2007 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
- *
+ * Copyright 2008 Mika Lindqvist, monni1995_at_gmail.com
  * All rights reserved. Distributed under the terms of the MIT License.
- *
  */
 
 #include "h2generic.h"
@@ -38,13 +37,13 @@
 
 
 static status_t
-assembly_rx(bt_usb_dev* bdev, bt_packet_t type, void *data, int count)
+assembly_rx(bt_usb_dev* bdev, bt_packet_t type, void* data, int count)
 {
-	net_buffer*		nbuf = NULL;
-	snet_buffer*	snbuf = NULL;
+	net_buffer* nbuf = NULL;
+	snet_buffer* snbuf = NULL;
 
-	size_t      currentPacketLen = 0;
-	size_t      expectedPacketLen = 0;
+	size_t currentPacketLen = 0;
+	size_t expectedPacketLen = 0;
 
 	bdev->stat.bytesRX += count;
 
@@ -55,43 +54,41 @@
 
 	while (count) {
 
-		//debugf("count %d nb=%p sb=%p type=%d\n",count, nbuf, snbuf, type);
+		//debugf("count %d nb=%p sb=%p type=%d\n", count, nbuf, snbuf, type);
 
-		if ( (type != BT_EVENT && nbuf == NULL) ||
-			(type == BT_EVENT && (snbuf == NULL || snb_completed(snbuf))) ) {
+		if ((type != BT_EVENT && nbuf == NULL) 
+			|| (type == BT_EVENT && (snbuf == NULL || snb_completed(snbuf)))) {
 
 			/* new buffer incoming */
 			switch (type) {
 				case BT_EVENT:
 					if (count >= HCI_EVENT_HDR_SIZE) {
-
 						struct hci_event_header* headerPkt = data;
 						expectedPacketLen = HCI_EVENT_HDR_SIZE + headerPkt->elen;
-						snbuf = bdev->eventRx = snb_fetch(&bdev->snetBufferRecycleTrash, expectedPacketLen);
-
+						snbuf = bdev->eventRx = snb_fetch(&bdev->snetBufferRecycleTrash, 
+							expectedPacketLen);
 					} else {
 						flowf("EVENT frame corrupted\n");
 						return EILSEQ;
 					}
-				break;
+					break;
 
 				case BT_ACL:
 					if (count >= HCI_ACL_HDR_SIZE) {
 						int16 index;
 						struct hci_acl_header* headerPkt = data;
 
-						expectedPacketLen = HCI_ACL_HDR_SIZE + B_LENDIAN_TO_HOST_INT16(headerPkt->alen);
+						expectedPacketLen = HCI_ACL_HDR_SIZE
+							+ B_LENDIAN_TO_HOST_INT16(headerPkt->alen);
 
-						/* Create the buffer */
+						// Create the buffer -> TODO: this allocation can fail
 						bdev->nbufferRx[type] = nbuf = nb->create(expectedPacketLen);
-						// TODO: this allocation can fail!!
 						nbuf->protocol = type;
-						debugf("new ACL frame %p\n", nbuf);
-						debugf("### Incoming ACL: len = %d\n", count);
-						for (index = 0 ; index < count; index++ ) {
+
+						debugf("## Incoming ACL frame %p len = %d ", nbuf, count);
+						for (index = 0 ; index < count; index++)
 							dprintf("%x:",((uint8*)data)[index]);
-						}
-						flowf("### \n");
+						dprintf(" ## \n");
 
 					} else {
 						flowf("ACL frame corrupted\n");
@@ -104,14 +101,14 @@
 				break;
 
 				default:
-					panic("unkown packet type in assembly");
+					panic("unknown packet type in assembly");
 				break;
 			}
 
 			currentPacketLen = expectedPacketLen;
 
 		} else {
-			/* Continuation */
+			// Continuation of a packet
 			if (type != BT_EVENT)
 				currentPacketLen = get_expected_size(nbuf) - nbuf->size;
 			else
@@ -125,20 +122,22 @@
 		else
 			nb->append(nbuf, data, currentPacketLen);
 
-		/* Complete frame? */
+		// Complete frame?
 		if (type == BT_EVENT && snb_completed(snbuf)) {
 			post_packet_up(bdev, type, snbuf);
 			snbuf = bdev->eventRx = NULL;
 		}
 
 		if (type != BT_EVENT && (get_expected_size(nbuf) - nbuf->size) == 0 ) {
-
 			post_packet_up(bdev, type, nbuf);
 			bdev->nbufferRx[type] = nbuf = NULL;
-		} /*else {
+		} else {
+#if DEBUG_ACL
 			if (type == BT_ACL)
-				debugf("ACL Packet not filled size=%ld expected=%ld\n", nbuf->size, get_expected_size(nbuf));
-		}*/
+				debugf("ACL Packet not filled size=%ld expected=%ld\n",
+					nbuf->size, get_expected_size(nbuf));
+#endif					
+		}
 
 		/* in case in the pipe there is info about the next buffer ... */
 		count -= currentPacketLen;
@@ -162,16 +161,19 @@
 #endif
 {
 	bt_usb_dev* bdev = cookie;
-	status_t    err;
+	//bt_usb_dev* bdev = fetch_device(cookie, 0); -> safer/slower option
+	status_t    error;
 
-	/* TODO: or not running anymore */
-	if (status == B_CANCELED)
+	if (bdev == NULL)
 		return;
 
+	if (status == B_CANCELED) // or not running anymore...
+		return;
+
 	if (status != B_OK || actual_len == 0)
 		goto resubmit;
 
-	if ( assembly_rx(cookie, BT_EVENT, data, actual_len) == B_OK ) {
+	if (assembly_rx(cookie, BT_EVENT, data, actual_len) == B_OK) {
 		bdev->stat.successfulTX++;
 	} else {
 		bdev->stat.errorRX++;
@@ -179,18 +181,16 @@
 
 resubmit:
 
-	err = usb->queue_interrupt(bdev->intr_in_ep->handle,
-							data, bdev->max_packet_size_intr_in ,
-							event_complete, bdev);
+	error = usb->queue_interrupt(bdev->intr_in_ep->handle, data, 
+		bdev->max_packet_size_intr_in, event_complete, bdev);
 
-	if (err != B_OK)   {
+	if (error != B_OK) {
 		reuse_room(&bdev->eventRoom, data);
 		bdev->stat.rejectedRX++;
-		debugf("RX event resubmittion failed %s\n",strerror(err));
+		debugf("RX event resubmittion failed %s\n", strerror(error));
 	} else {
 		bdev->stat.acceptedRX++;
 	}
-
 }
 
 
@@ -202,12 +202,15 @@
 #endif
 {
 	bt_usb_dev* bdev = cookie;
-	status_t    err;
+	//bt_usb_dev* bdev = fetch_device(cookie, 0); -> safer/slower option
+	status_t error;
 
-	/* TODO: or not running anymore? */
-	if (status == B_CANCELED)
+	if (bdev == NULL)
 		return;
 
+	if (status == B_CANCELED) // or not running anymore...
+		return;
+
 	if (status != B_OK || actual_len == 0)
 		goto resubmit;
 
@@ -219,14 +222,14 @@
 
 resubmit:
 
-	err = usb->queue_bulk(bdev->bulk_in_ep->handle, data,
-						max(HCI_MAX_FRAME_SIZE,bdev->max_packet_size_bulk_in),
-						acl_rx_complete, (void*) bdev);
+	error = usb->queue_bulk(bdev->bulk_in_ep->handle, data,
+		max(HCI_MAX_FRAME_SIZE, bdev->max_packet_size_bulk_in),	
+		acl_rx_complete, (void*) bdev);
 
-	if (err != B_OK)   {
+	if (error != B_OK)   {
 		reuse_room(&bdev->aclRoom, data);
 		bdev->stat.rejectedRX++;
-		debugf("RX acl resubmittion failed %s\n", strerror(err));
+		debugf("RX acl resubmittion failed %s\n", strerror(error));
 	} else {
 		bdev->stat.acceptedRX++;
 	}
@@ -239,16 +242,15 @@
 status_t
 submit_rx_event(bt_usb_dev* bdev)
 {
-	status_t    status;
-	size_t      size = bdev->max_packet_size_intr_in;
-	void*       buf = alloc_room(&bdev->eventRoom, size);
+	size_t size = bdev->max_packet_size_intr_in;
+	void* buf = alloc_room(&bdev->eventRoom, size);
+	status_t status;
 
 	if (buf == NULL)
 		return ENOMEM;
 
-	status = usb->queue_interrupt(bdev->intr_in_ep->handle,
-								buf, size ,
-								event_complete, (void*) bdev);
+	status = usb->queue_interrupt(bdev->intr_in_ep->handle,	buf, size,
+		event_complete, (void*)bdev);
 
 	if (status != B_OK) {
 		reuse_room(&bdev->eventRoom, buf); // reuse allocated one
@@ -264,19 +266,18 @@
 
 status_t
 submit_rx_acl(bt_usb_dev* bdev)
-{
+{	
+	size_t size = max(HCI_MAX_FRAME_SIZE, bdev->max_packet_size_bulk_in);
+	void* buf = alloc_room(&bdev->aclRoom, size);
+	status_t status;
 
-	status_t    status;
-	size_t      size = max(HCI_MAX_FRAME_SIZE,bdev->max_packet_size_bulk_in);
-	void*       buf = alloc_room(&bdev->aclRoom, size);
-
 	if (buf == NULL)
 		return ENOMEM;
 
-	status = usb->queue_bulk(bdev->bulk_in_ep->handle, buf, size ,
-								acl_rx_complete, bdev);
+	status = usb->queue_bulk(bdev->bulk_in_ep->handle, buf, size,
+		acl_rx_complete, bdev);
 
-	if (status != B_OK)   {
+	if (status != B_OK) {
 		reuse_room(&bdev->aclRoom, buf); // reuse allocated
 		bdev->stat.rejectedRX++;
 	} else {
@@ -290,12 +291,11 @@
 status_t
 submit_rx_sco(bt_usb_dev* bdev)
 {
+
 	/* not yet implemented */
 	return B_ERROR;
 }
 
-
-
 #if 0
 #pragma mark --- TX Complete ---
 #endif
@@ -307,18 +307,17 @@
 command_complete(void* cookie, status_t status, void* data, size_t actual_len)
 #endif
 {
-	snet_buffer* snbuf = (snet_buffer*) cookie;
+	snet_buffer* snbuf = (snet_buffer*)cookie;
 	bt_usb_dev* bdev = snb_cookie(snbuf);
 
-	debugf("%ld @ %p\n", actual_len, data);
+	debugf("len = %ld @%p\n", actual_len, data);
 
-	if (status != B_OK) {
+	if (status == B_OK) {
 		bdev->stat.successfulTX++;
 		bdev->stat.bytesTX += actual_len;
 	} else {
 		bdev->stat.errorTX++;
-		/* the packet has been lost */
-		/* too late to requeue it? */
+		// the packet has been lost,too late to requeue it? 
 	}
 
 	snb_park(&bdev->snetBufferRecycleTrash, snbuf);
@@ -337,19 +336,17 @@
 acl_tx_complete(void* cookie, status_t status, void* data, size_t actual_len)
 #endif
 {
-	net_buffer* nbuf = (net_buffer*) cookie;
+	net_buffer* nbuf = (net_buffer*)cookie;
 	bt_usb_dev* bdev = GET_DEVICE(nbuf);
 
 	debugf("fetched=%p status=%ld nbuftype %lx B%p\n",bdev, status, nbuf->type, data);
 
-	if (status != B_OK) {
-
+	if (status == B_OK) {
 		bdev->stat.successfulTX++;
 		bdev->stat.bytesTX += actual_len;
 	} else {
 		bdev->stat.errorTX++;
-		/* the packet has been lost */
-		/* too late to requeue it? */
+		// the packet has been lost,too late to requeue it?
 	}
 
 	nb_destroy(nbuf);
@@ -365,14 +362,13 @@
 status_t
 submit_tx_command(bt_usb_dev* bdev, snet_buffer* snbuf)
 {
-	status_t err;
+	uint8 bRequestType = bdev->ctrl_req;
+	uint8 bRequest = 0;
+	uint16 wIndex = 0;
+	uint16 value = 0;
+	uint16 wLength = B_HOST_TO_LENDIAN_INT16(snb_size(snbuf));
+	status_t error;	
 
-	uint8   bRequestType = bdev->ctrl_req;
-	uint8   bRequest = 0;
-	uint16  wIndex = 0;
-	uint16  value = 0;
-	uint16  wLength = B_HOST_TO_LENDIAN_INT16(snb_size(snbuf));
-
 	if (!GET_BIT(bdev->state, RUNNING)) {
 		return B_DEV_NOT_READY;
 	}
@@ -382,30 +378,33 @@
 
 	debugf("@%p\n", snb_get(snbuf));
 
-	err = usb->queue_request(bdev->dev, bRequestType, bRequest,
-								value, wIndex, wLength,
-								snb_get(snbuf), wLength //???
-								,command_complete, (void*) snbuf);
+	error = usb->queue_request(bdev->dev, bRequestType, bRequest,
+								value, wIndex, wLength,	snb_get(snbuf),
+#ifndef HAIKU_TARGET_PLATFORM_HAIKU								
+								wLength, //???
+#endif								
+								command_complete, (void*) snbuf);
 
-	if (err != B_OK )   {
+	if (error != B_OK) {
 		bdev->stat.rejectedTX++;
 	} else {
 		bdev->stat.acceptedTX++;
 	}
 
-	return err;
+	return error;
 }
 
+
 status_t
 submit_tx_acl(bt_usb_dev* bdev, net_buffer* nbuf)
 {
-	status_t err;
 	int32 index;
+	status_t error;
 
 	/* set cookie */
 	SET_DEVICE(nbuf, bdev->hdev);
 
-	if (!GET_BIT(bdev->state, RUNNING) ) {
+	if (!GET_BIT(bdev->state, RUNNING)) {
 		return B_DEV_NOT_READY;
 	}
 
@@ -415,17 +414,16 @@
 	}
 	flowf("### \n");
 
-	err = usb->queue_bulk(bdev->bulk_out_ep->handle,
-						nb_get_whole_buffer(nbuf), nbuf->size,
-						acl_tx_complete, (void*) nbuf);
+	error = usb->queue_bulk(bdev->bulk_out_ep->handle, nb_get_whole_buffer(nbuf),
+						nbuf->size,	acl_tx_complete, (void*)nbuf);
 
-	if (err != B_OK )   {
+	if (error != B_OK) {
 		bdev->stat.rejectedTX++;
 	} else {
 		bdev->stat.acceptedTX++;
 	}
 
-	return err;
+	return error;
 }
 
 

Modified: haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.c	2009-05-15 18:19:10 UTC (rev 30766)
+++ haiku/trunk/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.c	2009-05-15 22:11:19 UTC (rev 30767)
@@ -1,11 +1,9 @@
 /*
  * Copyright 2007 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
- *
+ * Copyright 2008 Mika Lindqvist, monni1995_at_gmail.com
  * All rights reserved. Distributed under the terms of the MIT License.
- *
  */
 
-
 #include 
 
 #include 
@@ -20,59 +18,61 @@
 #include 
 
 
-/* TODO: split for commands and comunication(ACL&SCO) */
+/* TODO: split for commands and comunication (ACL&SCO) */
 void 
 sched_tx_processing(bt_usb_dev* bdev)
-{
+{    
+	net_buffer* nbuf;
+	snet_buffer* snbuf;
+	status_t err;
+	
+	debugf("(%p)\n", bdev)
     
-    net_buffer* nbuf;
-    snet_buffer* snbuf;
-	status_t 	err;
-	flowf("sched\n")    
     if (!TEST_AND_SET(&bdev->state, PROCESSING)) {
-        /* We are not processing in another thread so... START!! */
+        // We are not processing in another thread so... START!!
                 
         do {
-            /* Do while this bit is on... so someone should set it before we stop the iterations*/
+            /* Do while this bit is on... so someone should set it before we
+             * stop the iterations
+             */
             CLEAR_BIT(bdev->state, SENDING);
-            /* check Commands*/
+            // check Commands
     #ifdef EMPTY_COMMAND_QUEUE        
-            while (!list_is_empty(&bdev->nbuffersTx[BT_COMMAND]) ) {            
+            while (!list_is_empty(&bdev->nbuffersTx[BT_COMMAND])) {
     #else
-            if (!list_is_empty(&bdev->nbuffersTx[BT_COMMAND]) ) {
+            if (!list_is_empty(&bdev->nbuffersTx[BT_COMMAND])) {
     #endif            
                 snbuf = list_remove_head_item(&bdev->nbuffersTx[BT_COMMAND]);       
                 err = submit_tx_command(bdev, snbuf);
                 if (err != B_OK) {
-                    /* re-head it*/
+                    // re-head it
                     list_insert_item_before(&bdev->nbuffersTx[BT_COMMAND], 
-                                            list_get_first_item(&bdev->nbuffersTx[BT_COMMAND]), snbuf);
-                }                                                
+							list_get_first_item(&bdev->nbuffersTx[BT_COMMAND]), snbuf);
+                }
             }
             
-            /* check Acl */
+            // check ACl
     #define EMPTY_ACL_QUEUE
     #ifdef EMPTY_ACL_QUEUE
-            while (!list_is_empty(&bdev->nbuffersTx[BT_ACL]) ) {
+            while (!list_is_empty(&bdev->nbuffersTx[BT_ACL])) {
     #else            
-            if (!list_is_empty(&bdev->nbuffersTx[BT_ACL]) ) {
+            if (!list_is_empty(&bdev->nbuffersTx[BT_ACL])) {
     #endif             
                 nbuf = list_remove_head_item(&bdev->nbuffersTx[BT_ACL]);                
                 err = submit_tx_acl(bdev, nbuf);
                 if (err != B_OK) {
                     /* re-head it*/
                     list_insert_item_before(&bdev->nbuffersTx[BT_ACL], 
-                                            list_get_first_item(&bdev->nbuffersTx[BT_ACL]), nbuf);
-                }                                                                
-                
+							list_get_first_item(&bdev->nbuffersTx[BT_ACL]), nbuf);
+                }
+
             }
-    
-            if (!list_is_empty(&bdev->nbuffersTx[BT_SCO]) ) {
+
+            if (!list_is_empty(&bdev->nbuffersTx[BT_SCO])) {
                 /* TODO to be implemented */    
-                
+
             }
-        
-        
+
         } while (GET_BIT(bdev->state, SENDING));
         
         CLEAR_BIT(bdev->state, PROCESSING);
@@ -81,28 +81,26 @@
         /* We are processing so MARK that we need to still go on with that ... */    
         SET_BIT(bdev->state, SENDING);
     }
-
 }
 
+
 status_t 
 post_packet_up(bt_usb_dev* bdev, bt_packet_t type, void* buf)
 {
-    
-    status_t err = B_OK;
+    status_t err = B_ERROR;
 
 	debugf("Frame up type=%d\n", type);
-            
-	err = B_ERROR;
 
     if (type == BT_EVENT) {
-		snet_buffer* snbuf = (snet_buffer*) buf;
-		btCoreData->PostEvent(bdev->ndev, snb_get(snbuf), (size_t) snb_size(snbuf));
+		snet_buffer* snbuf = (snet_buffer*)buf;
+		flowf("to btDataCore\n");
+		btCoreData->PostEvent(bdev->ndev, snb_get(snbuf), (size_t)snb_size(snbuf));
 		snb_park(&bdev->snetBufferRecycleTrash, snbuf);
 	} else {
 		net_buffer* nbuf = (net_buffer*) buf;
   		/* No need to free the buffer at allocation is gonna be reused */
-  		flowf("HCI not present for acl posting to net_device\n");
-		btDevices->receive_data(bdev->ndev, &nbuf);	
+  		flowf("to net_device\n");
+		btDevices->receive_data(bdev->ndev, &nbuf);
     }
 
     return err;
@@ -133,7 +131,7 @@
                     bdev->nbuffersPendingTx[type]++;
             break;
             default:
-                debugf("Unkown packet type for sending %d\n",type);
+                debugf("Unknown packet type for sending %d\n",type);
                 // TODO: free the net_buffer -> no, allow upper layer 
                 // handle it with the given error
                 err = B_BAD_VALUE;
@@ -144,9 +142,11 @@
     }
 
     // TODO: check if device is actually ready for this
-    // TODO: unLock device
+    // TODO: unlock device
         
-    /* sched in All cases even if nbuf is null (hidden way to provoke re-scheduling)*/
+    /* sched in All cases even if nbuf is null (hidden way to provoke
+     * re-scheduling)
+     */
     sched_tx_processing(bdev);
     
     return err;
@@ -178,7 +178,9 @@
     // TODO: check if device is actually ready for this
     // TODO: mutex?
         
-    /* sched in All cases even if nbuf is null (hidden way to provoke re-scheduling)*/
+    /* sched in All cases even if nbuf is null (hidden way to provoke
+     * re-scheduling)
+     */
     sched_tx_processing(bdev);
     
     return err;



From leavengood at gmail.com  Sat May 16 07:38:52 2009
From: leavengood at gmail.com (Ryan Leavengood)
Date: Sat, 16 May 2009 01:38:52 -0400
Subject: [Haiku-commits] r30759 - haiku/trunk/src/bin
In-Reply-To: <4A0D59C1.1010900@gmx.de>
References: <5230539062-BeMail@kirilla>
	<20090515134137.538.2@knochen-vm.localdomain>
	<4A0D59C1.1010900@gmx.de>
Message-ID: 

On Fri, May 15, 2009 at 8:02 AM, Stephan A?mus  wrote:
>
> BTW, it does change the mouse cursor on mouse-over-url... I added that
> some time ago. But it's not clear enough, it should be the same cursor
> that Firefox uses for link targets to be more clear. We need to define
> some system cursors... don't we? ;-)

Yes definitely. There are quite some that would be useful in the
WebKit port. Maybe whatever the Firefox port uses could be pulled out.

> Also, it should probably underline
> the link targets too at the same time (on mouse over, I mean).

Maybe in the long term About System could be changed to use a future
BHTMLView or similar that will hopefully come out of this browser
project Maxime and I are working on. Otherwise it seems we are
re-inventing some aspects of it. Not that mouse-over highlighting is
that complicated, but why reinvent the wheel :)

Also in regards to the idea of a BUrl class, again let's not reinvent
the wheel but maybe use something from WebKit or Chrome.

Regards,
Ryan


From stippi at mail.berlios.de  Sat May 16 13:29:25 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sat, 16 May 2009 13:29:25 +0200
Subject: [Haiku-commits] r30768 - in haiku/trunk/src/apps/mediaplayer: .
	playlist
Message-ID: <200905161129.n4GBTPwF004520@sheep.berlios.de>

Author: stippi
Date: 2009-05-16 13:29:19 +0200 (Sat, 16 May 2009)
New Revision: 30768
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30768&view=rev

Modified:
   haiku/trunk/src/apps/mediaplayer/ControllerView.cpp
   haiku/trunk/src/apps/mediaplayer/ControllerView.h
   haiku/trunk/src/apps/mediaplayer/MainWin.cpp
   haiku/trunk/src/apps/mediaplayer/playlist/ListViews.cpp
   haiku/trunk/src/apps/mediaplayer/playlist/ListViews.h
   haiku/trunk/src/apps/mediaplayer/playlist/Playlist.cpp
   haiku/trunk/src/apps/mediaplayer/playlist/Playlist.h
   haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.cpp
   haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.h
   haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.cpp
   haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.h
   haiku/trunk/src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp
   haiku/trunk/src/apps/mediaplayer/playlist/RemovePLItemsCommand.h
Log:
* I didn't like so much how the "Remove and Move into Trash" feature was
  implemented. It didn't reuse existing code and didn't integrate well. No
  Undo/Redo except via Tracker, but not in the Playlist... some bugs as well
  (Remove had same shortcut as Randomize, Didn't maintain current playback item
  if last entry was removed)
* I need to reenable the main window short cut though. This is only temporary.


Modified: haiku/trunk/src/apps/mediaplayer/ControllerView.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/ControllerView.cpp	2009-05-15 22:11:19 UTC (rev 30767)
+++ haiku/trunk/src/apps/mediaplayer/ControllerView.cpp	2009-05-16 11:29:19 UTC (rev 30768)
@@ -136,16 +136,6 @@
 
 
 void
-ControllerView::SkipForwardAndDelete()
-{
-	BAutolock _(fPlaylist);
-	int32 index = fPlaylist->CurrentRefIndex();
-	fPlaylist->SetCurrentRefIndex(index + 1);
-	fPlaylist->RemoveRefPermanent(index, true);
-}
-
-
-void
 ControllerView::VolumeChanged(float value)
 {
 	fController->SetVolume(value);

Modified: haiku/trunk/src/apps/mediaplayer/ControllerView.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/ControllerView.h	2009-05-15 22:11:19 UTC (rev 30767)
+++ haiku/trunk/src/apps/mediaplayer/ControllerView.h	2009-05-16 11:29:19 UTC (rev 30768)
@@ -36,7 +36,7 @@
 						ControllerView(BRect frame, Controller* controller,
 							Playlist* playlist);
 						~ControllerView();
-					
+
 	// TransportControlGroup interface
 	virtual	uint32		EnabledButtons();
 	virtual	void		TogglePlaying();
@@ -45,7 +45,6 @@
 	virtual	void		Forward();
 	virtual	void		SkipBackward();
 	virtual	void		SkipForward();
-	virtual	void		SkipForwardAndDelete();
 	virtual	void		VolumeChanged(float value);
 	virtual	void		ToggleMute();
 	virtual	void		PositionChanged(float value);

Modified: haiku/trunk/src/apps/mediaplayer/MainWin.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/MainWin.cpp	2009-05-15 22:11:19 UTC (rev 30767)
+++ haiku/trunk/src/apps/mediaplayer/MainWin.cpp	2009-05-16 11:29:19 UTC (rev 30768)
@@ -63,7 +63,7 @@
 	M_FILE_INFO,
 	M_FILE_PLAYLIST,
 	M_FILE_CLOSE,
-	M_FILE_QUIT,	
+	M_FILE_QUIT,
 	M_VIEW_50,
 	M_VIEW_100,
 	M_VIEW_200,
@@ -93,7 +93,7 @@
 	M_SELECT_VIDEO_TRACK_END	= 0x000fffff,
 
 	M_SET_PLAYLIST_POSITION,
-	
+
 	M_FILE_DELETE
 };
 
@@ -131,7 +131,7 @@
 	static int pos = 0;
 	MoveBy(pos * 25, pos * 25);
 	pos = (pos + 1) % 15;
-	
+
 	BRect rect = Bounds();
 
 	// background
@@ -154,7 +154,7 @@
 		fMenuBarHeight + 10);
 	fVideoView = new VideoView(rect, "video display", B_FOLLOW_NONE);
 	fBackground->AddChild(fVideoView);
-	
+
 	// controls
 	rect = BRect(0, fMenuBarHeight + 11, fBackground->Bounds().right,
 		fBackground->Bounds().bottom);
@@ -165,7 +165,7 @@
 	fControlsWidth = (int)fControls->Frame().Width() + 1;
 	fControls->SetResizingMode(B_FOLLOW_BOTTOM | B_FOLLOW_LEFT_RIGHT);
 //	fControls->MoveTo(0, fBackground->Bounds().bottom - fControlsHeight + 1);
-	
+
 //	fVideoView->ResizeTo(fBackground->Bounds().Width(),
 //		fBackground->Bounds().Height() - fMenuBarHeight - fControlsHeight);
 
@@ -175,14 +175,14 @@
 	PeakView* peakView = fControls->GetPeakView();
 	peakView->SetPeakNotificationWhat(MSG_PEAK_NOTIFICATION);
 	fController->SetPeakListener(peakView);
-	
+
 //	printf("fMenuBarHeight %d\n", fMenuBarHeight);
 //	printf("fControlsHeight %d\n", fControlsHeight);
 //	printf("fControlsWidth %d\n", fControlsWidth);
 
 	_SetupWindow();
 
-	// setup the playlist window now, we need to have it 
+	// setup the playlist window now, we need to have it
 	// running for the undo/redo playlist editing
 	fPlaylistWindow = new PlaylistWindow(BRect(150, 150, 500, 600), fPlaylist,
 		fController);
@@ -217,7 +217,7 @@
 
 	if (fPlaylistWindow && fPlaylistWindow->Lock())
 		fPlaylistWindow->Quit();
-	
+
 	delete fPlaylist;
 
 	// quit the Controller looper thread
@@ -275,7 +275,7 @@
 			fVideoView->Show();
 		y += maxVideoHeight;
 	}
-	
+
 	if (noControls) {
 		if (!fControls->IsHidden())
 			fControls->Hide();
@@ -325,14 +325,14 @@
 			fVideoView->OverlayScreenshotCleanup();
 			return;
 		}
-		
+
 		// every other key gets dispatched to our _KeyDown first
 		if (_KeyDown(msg) == B_OK) {
 			// it got handled, don't pass it on
 			return;
 		}
 	}
-	
+
 	BWindow::DispatchMessage(msg, handler);
 }
 
@@ -501,7 +501,7 @@
 		case M_FILE_CLOSE:
 			PostMessage(B_QUIT_REQUESTED);
 			break;
-		case M_FILE_QUIT:	
+		case M_FILE_QUIT:
 			be_app->PostMessage(B_QUIT_REQUESTED);
 			break;
 
@@ -512,19 +512,19 @@
 		case M_TOGGLE_NO_MENU:
 			_ToggleNoMenu();
 			break;
-			
+
 		case M_TOGGLE_NO_CONTROLS:
 			_ToggleNoControls();
 			break;
-		
+
 		case M_TOGGLE_NO_BORDER:
 			_ToggleNoBorder();
 			break;
-			
+
 		case M_TOGGLE_ALWAYS_ON_TOP:
 			_ToggleAlwaysOnTop();
 			break;
-	
+
 		case M_TOGGLE_KEEP_ASPECT_RATIO:
 			_ToggleKeepAspectRatio();
 			break;
@@ -540,7 +540,7 @@
 				_ToggleFullscreen();
 			_ResizeWindow(50);
 			break;
-			
+
 		case M_VIEW_100:
 			if (!fHasVideo)
 				break;
@@ -572,17 +572,17 @@
 				_ToggleFullscreen();
 			_ResizeWindow(400);
 			break;
-/*		
+/*
 		case B_ACQUIRE_OVERLAY_LOCK:
 			printf("B_ACQUIRE_OVERLAY_LOCK\n");
 			fVideoView->OverlayLockAcquire();
 			break;
-			
+
 		case B_RELEASE_OVERLAY_LOCK:
 			printf("B_RELEASE_OVERLAY_LOCK\n");
 			fVideoView->OverlayLockRelease();
 			break;
-*/	
+*/
 		case B_MOUSE_WHEEL_CHANGED:
 		{
 			float dx = msg->FindFloat("be:wheel_delta_x");
@@ -639,7 +639,7 @@
 			VideoFormatChange(544, 576, 1.41176, 1.0);
 			break;
 
-/*			
+/*
 		default:
 			if (msg->what >= M_SELECT_CHANNEL
 				&& msg->what <= M_SELECT_CHANNEL_END) {
@@ -665,9 +665,7 @@
 			// the global settings instance...
 			_AdoptGlobalSettings();
 			break;
-		case M_FILE_DELETE:
-			fControls->SkipForwardAndDelete();
-			break;
+
 		default:
 			// let BWindow handle the rest
 			BWindow::MessageReceived(msg);
@@ -689,16 +687,16 @@
 		// we will move it so all the window is on the screen.
 		if (frame.right > screenFrame.right)
 			// Move left
-			diffX = screenFrame.right - frame.right; 
+			diffX = screenFrame.right - frame.right;
 		if (frame.bottom > screenFrame.bottom)
 			// Move up
-			diffY = screenFrame.bottom - frame.bottom; 
+			diffY = screenFrame.bottom - frame.bottom;
 		if (frame.left < screenFrame.left)
 			// Move right
-			diffX = screenFrame.left - frame.left; 
+			diffX = screenFrame.left - frame.left;
 		if (frame.top < screenFrame.top)
 			// Move down
-			diffY = screenFrame.top - frame.top; 
+			diffY = screenFrame.top - frame.top;
 
 		MoveBy(diffX, diffY);
 	}
@@ -731,7 +729,7 @@
 			message << "The file '";
 			message << ref.name;
 			message << "' could not be opened.\n\n";
-			
+
 			if (err == B_MEDIA_NO_HANDLER) {
 				// give a more detailed message for the most likely of all
 				// errors
@@ -794,7 +792,7 @@
 	float height_scale)
 {
 	// called when video format or aspect ratio changes
-	
+
 	printf("VideoFormatChange enter: width %d, height %d, width_scale %.6f, "
 		"height_scale %.6f\n", width, height, width_scale, height_scale);
 
@@ -804,12 +802,12 @@
 		printf("inverting! new values: width_scale %.6f, height_scale %.6f\n",
 			width_scale, height_scale);
 	}
-	
+
  	fSourceWidth  = width;
  	fSourceHeight = height;
  	fWidthScale   = width_scale;
  	fHeightScale  = height_scale;
- 	
+
  	FrameResized(Bounds().Width(), Bounds().Height());
 
 	printf("VideoFormatChange leave\n");
@@ -838,7 +836,7 @@
 void
 MainWin::_SetupWindow()
 {
-//	printf("MainWin::_SetupWindow\n");	
+//	printf("MainWin::_SetupWindow\n");
 	// Populate the track menus
 	_SetupTrackMenus();
 	// Enable both if a file was loaded
@@ -900,7 +898,7 @@
 	// Add recent files
 	BRecentFilesList recentFiles(10, false, NULL, kAppSig);
 	BMenuItem *item = new BMenuItem(recentFiles.NewFileListMenu(
-		"Open File"B_UTF8_ELLIPSIS, new BMessage(B_REFS_RECEIVED), 
+		"Open File"B_UTF8_ELLIPSIS, new BMessage(B_REFS_RECEIVED),
 		NULL, this, 10, false, NULL, 0, kAppSig), new BMessage(M_FILE_OPEN));
 	item->SetShortcut('O', 0);
 	fFileMenu->AddItem(item);
@@ -979,9 +977,9 @@
 {
 	fAudioTrackMenu->RemoveItems(0, fAudioTrackMenu->CountItems(), true);
 	fVideoTrackMenu->RemoveItems(0, fVideoTrackMenu->CountItems(), true);
-	
+
 	char s[100];
-	
+
 	int count = fController->AudioTrackCount();
 	int current = fController->CurrentAudioTrack();
 	for (int i = 0; i < count; i++) {
@@ -1021,7 +1019,7 @@
 		minWidth = max_c(minWidth, fMenuBarWidth);
 	int minHeight = (fNoMenu ? 0 : fMenuBarHeight)
 		+ (fNoControls ? 0 : fControlsHeight);
-	
+
 	SetSizeLimits(minWidth - 1, 32000, minHeight - 1, fHasVideo ?
 		32000 : minHeight - 1);
 }
@@ -1033,10 +1031,10 @@
 	// Get required window size
 	int videoWidth = lround(fSourceWidth * fWidthScale);
 	int videoHeight = lround(fSourceHeight * fHeightScale);
-	
+
 	videoWidth = (videoWidth * percent) / 100;
 	videoHeight = (videoHeight * percent) / 100;
-	
+
 	// Calculate and set the initial window size
 	int width = max_c(fControlsWidth, videoWidth);
 	int height = (fNoControls ? 0 : fControlsHeight) + videoHeight;
@@ -1054,7 +1052,7 @@
 {
 	printf("_ResizeVideoView: %d,%d, width %d, height %d\n", x, y,
 		width, height);
-	
+
 	if (fKeepAspectRatio) {
 		// Keep aspect ratio, place video view inside
 		// the background area (may create black bars).
@@ -1111,7 +1109,7 @@
 			return;
 		}
 	}
-	
+
 	if (2 == buttons && msg->FindInt32("clicks") % 2 == 0) {
 		BRect r(screen_where.x - 1, screen_where.y - 1, screen_where.x + 1,
 			screen_where.y + 1);
@@ -1143,7 +1141,7 @@
 	bigtime_t start = system_time();
 	bigtime_t delay = 200000;
 	BPoint location;
-	do { 
+	do {
 		fVideoView->GetMouse(&location, &buttons);
 		if ((buttons & 2) == 0)
 			break;
@@ -1162,9 +1160,9 @@
 
 	BPoint mousePos;
 	uint32 buttons = msg->FindInt32("buttons");
-	
+
 	if (1 == buttons && fMouseDownTracking && !fIsFullscreen) {
-/*		
+/*
 		// very broken in Zeta:
 		BPoint mousePos = msg->FindPoint("where");
 		printf("view where: %.0f, %.0f => ", mousePos.x, mousePos.y);
@@ -1259,14 +1257,14 @@
 MainWin::_KeyDown(BMessage *msg)
 {
 //	msg->PrintToStream();
-	
+
 	uint32 key		 = msg->FindInt32("key");
 	uint32 raw_char  = msg->FindInt32("raw_char");
 	uint32 modifier = msg->FindInt32("modifiers");
-	
+
 	printf("key 0x%lx, raw_char 0x%lx, modifiers 0x%lx\n", key, raw_char,
 		modifier);
-	
+
 	switch (raw_char) {
 		case B_SPACE:
 			fController->TogglePlaying();
@@ -1285,7 +1283,7 @@
 				return B_OK;
 			} else
 				break;
-				
+
 		case B_TAB:
 			if ((modifier & (B_COMMAND_KEY | B_CONTROL_KEY | B_OPTION_KEY
 					| B_MENU_KEY)) == 0) {
@@ -1293,7 +1291,7 @@
 				return B_OK;
 			} else
 				break;
-		
+
 		case B_UP_ARROW:
 			if (modifier & B_COMMAND_KEY) {
 				PostMessage(M_SKIP_NEXT);
@@ -1309,7 +1307,7 @@
 				PostMessage(M_VOLUME_DOWN);
 			}
 			return B_OK;
-			
+
 		case B_RIGHT_ARROW:
 			if (modifier & B_COMMAND_KEY) {
 				PostMessage(M_VOLUME_UP);
@@ -1329,7 +1327,7 @@
 		case B_PAGE_UP:
 			PostMessage(M_SKIP_NEXT);
 			return B_OK;
-			
+
 		case B_PAGE_DOWN:
 			PostMessage(M_SKIP_PREV);
 			return B_OK;
@@ -1359,26 +1357,27 @@
 		case 0x59:			// numeric keypad down arrow
 			PostMessage(M_VOLUME_DOWN);
 			return B_OK;
-			
+
 		case 0x39:			// numeric keypad page up
 		case 0x4a:			// numeric keypad right arrow
 			PostMessage(M_SKIP_NEXT);
 			return B_OK;
-			
+
 		case 0x5a:			// numeric keypad page down
 		case 0x48:			// numeric keypad left arrow
 			PostMessage(M_SKIP_PREV);
 			return B_OK;
-		case 0x34:			//delete button
-		case 0x3e: 			//d for delete
-		case 0x2b:			//t for Trash
-			if (modifiers() & B_COMMAND_KEY) {
-				PostMessage(M_FILE_DELETE);
-				return B_OK;
-			}
-			break;
+// TODO: Reenable this and use Undo/Redo stack...
+//		case 0x34:			//delete button
+//		case 0x3e: 			//d for delete
+//		case 0x2b:			//t for Trash
+//			if (modifiers() & B_COMMAND_KEY) {
+//				PostMessage(M_FILE_DELETE);
+//				return B_OK;
+//			}
+//			break;
 	}
-	
+
 	return B_ERROR;
 }
 
@@ -1415,10 +1414,10 @@
 	}
 
 	fIsFullscreen = !fIsFullscreen;
-	
+
 	if (fIsFullscreen) {
 		// switch to fullscreen
-		
+
 		fSavedFrame = Frame();
 		printf("saving current frame: %d %d %d %d\n", int(fSavedFrame.left),
 			int(fSavedFrame.top), int(fSavedFrame.right),
@@ -1451,7 +1450,7 @@
 	printf("_ToggleNoControls enter\n");
 
 	if (fIsFullscreen) {
-		// fullscreen is always without menu	
+		// fullscreen is always without menu
 		printf("_ToggleNoControls leave, doing nothing, we are fullscreen\n");
 		return;
 	}
@@ -1476,7 +1475,7 @@
 	printf("_ToggleNoMenu enter\n");
 
 	if (fIsFullscreen) {
-		// fullscreen is always without menu	
+		// fullscreen is always without menu
 		printf("_ToggleNoMenu leave, doing nothing, we are fullscreen\n");
 		return;
 	}

Modified: haiku/trunk/src/apps/mediaplayer/playlist/ListViews.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/ListViews.cpp	2009-05-15 22:11:19 UTC (rev 30767)
+++ haiku/trunk/src/apps/mediaplayer/playlist/ListViews.cpp	2009-05-16 11:29:19 UTC (rev 30768)
@@ -264,12 +264,12 @@
 				v->SetHighColor( 0, 0, 0, 255 );
 				v->StrokeRect( v->Bounds() );
 				v->Sync();
-	
+
 				uint8 *bits = (uint8 *)dragBitmap->Bits();
 				int32 height = (int32)dragBitmap->Bounds().Height() + 1;
 				int32 width = (int32)dragBitmap->Bounds().Width() + 1;
 				int32 bpr = dragBitmap->BytesPerRow();
-	
+
 				if (fade) {
 					for ( int32 y = 0; y < height - ALPHA / 2; y++, bits += bpr ) {
 						uint8 *line = bits + 3;
@@ -395,7 +395,7 @@
 {
 	if ( numBytes < 1 )
 		return;
-		
+
 	if ( ( bytes[0] == B_BACKSPACE ) || ( bytes[0] == B_DELETE ) )
 		RemoveSelected();
 
@@ -569,7 +569,7 @@
 			// offset where by half of item height
 			r = ItemFrame(0);
 			where.y += r.Height() / 2.0;
-	
+
 			int32 index = IndexOf(where);
 			if (index < 0)
 				index = CountItems();
@@ -627,7 +627,7 @@
 
 // MoveItems
 void
-DragSortableListView::MoveItems(BList& indices, int32 index)
+DragSortableListView::MoveItems(const BList& indices, int32 index)
 {
 	DeselectAll();
 	// we remove the items while we look at them, the insertion index is decreased
@@ -659,7 +659,7 @@
 
 // CopyItems
 void
-DragSortableListView::CopyItems(BList& indices, int32 toIndex)
+DragSortableListView::CopyItems(const BList& indices, int32 toIndex)
 {
 	DeselectAll();
 	// by inserting the items after we copied all items first, we avoid
@@ -689,7 +689,7 @@
 
 // RemoveItemList
 void
-DragSortableListView::RemoveItemList(BList& indices)
+DragSortableListView::RemoveItemList(const BList& indices)
 {
 	int32 count = indices.CountItems();
 	for (int32 i = 0; i < count; i++) {
@@ -698,11 +698,10 @@
 	}
 }
 
-// RemoveSelected
+// GetSelectedItems
 void
-DragSortableListView::RemoveSelected()
+DragSortableListView::GetSelectedItems(BList& indices)
 {
-	BList indices;
 	for (int32 i = 0; true; i++) {
 		int32 index = CurrentSelection(i);
 		if (index < 0)
@@ -710,7 +709,15 @@
 		if (!indices.AddItem((void*)index))
 			break;
 	}
+}
 
+// RemoveSelected
+void
+DragSortableListView::RemoveSelected()
+{
+	BList indices;
+	GetSelectedItems(indices);
+
 	DeselectAll();
 
 	if (indices.CountItems() > 0)

Modified: haiku/trunk/src/apps/mediaplayer/playlist/ListViews.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/ListViews.h	2009-05-15 22:11:19 UTC (rev 30767)
+++ haiku/trunk/src/apps/mediaplayer/playlist/ListViews.h	2009-05-16 11:29:19 UTC (rev 30768)
@@ -89,9 +89,11 @@
 
 			bool			MouseWheelChanged(float x, float y);
 
-	virtual	void			MoveItems(BList& indices, int32 toIndex);
-	virtual	void			CopyItems(BList& indices, int32 toIndex);
-	virtual	void			RemoveItemList(BList& indices);
+	virtual	void			MoveItems(const BList& indices, int32 toIndex);
+	virtual	void			CopyItems(const BList& indices, int32 toIndex);
+	virtual	void			RemoveItemList(const BList& indices);
+
+			void			GetSelectedItems(BList& indices);
 			void			RemoveSelected(); // uses RemoveItemList()
 			void			RemoveAll(); // uses RemoveItemList()
 			int32			CountSelectedItems() const;

Modified: haiku/trunk/src/apps/mediaplayer/playlist/Playlist.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/Playlist.cpp	2009-05-15 22:11:19 UTC (rev 30767)
+++ haiku/trunk/src/apps/mediaplayer/playlist/Playlist.cpp	2009-05-16 11:29:19 UTC (rev 30768)
@@ -288,18 +288,6 @@
 }
 
 
-void
-Playlist::RemoveRefPermanent(int32 index, bool removeToTrash)
-{
-	if (index != -1) {
-		entry_ref song = RemoveRef(index);
-
-		if(removeToTrash)
-			_DeleteEntry(&song);//Remove with tracker
-	}
-}
-
-
 int32
 Playlist::IndexOf(const entry_ref& _ref) const
 {
@@ -455,7 +443,7 @@
 	BEntry entry(&ref, true);
 	if (entry.InitCheck() < B_OK || !entry.Exists())
 		return;
-	
+
 	if (entry.IsDirectory()) {
 		BDirectory dir(&entry);
 		if (dir.InitCheck() < B_OK)
@@ -490,8 +478,8 @@
 		FileReadWrite lineReader(&file);
 
 		BString str;
-		entry_ref refPath; 
-		status_t err; 
+		entry_ref refPath;
+		status_t err;
 		BPath path;
 		while (lineReader.Next(str)) {
 			str = str.RemoveFirst("file://");
@@ -501,7 +489,7 @@
 			if (path.Path() != NULL) {
 				if ((err = get_ref_for_path(path.Path(), &refPath)) == B_OK) {
 					playlist->AddRef(refPath);
-				} else			
+				} else
 					printf("Error - %s: [%lx]\n", strerror(err), (int32) err);
 			} else
 				printf("Error - No File Found in playlist\n");
@@ -536,7 +524,7 @@
 Playlist::_IsMediaFile(const BString& mimeString)
 {
 	BMimeType superType;
-	BMimeType fileType(mimeString.String()); 
+	BMimeType fileType(mimeString.String());
 
 	if (fileType.GetSupertype(&superType) != B_OK)
 		return false;
@@ -550,21 +538,21 @@
 
 /*static*/ bool
 Playlist::_IsTextPlaylist(const BString& mimeString)
-{    	
+{
 	return mimeString.Compare(kTextPlaylistMimeString) == 0;
 }
 
 
 /*static*/ bool
 Playlist::_IsBinaryPlaylist(const BString& mimeString)
-{    	
+{
 	return mimeString.Compare(kBinaryPlaylistMimeString) == 0;
 }
 
 
 /*static*/ bool
 Playlist::_IsPlaylist(const BString& mimeString)
-{    	
+{
 	return _IsTextPlaylist(mimeString) || _IsBinaryPlaylist(mimeString);
 }
 
@@ -583,22 +571,11 @@
 		strlcpy(mimeString, type.Type(), B_MIME_TYPE_LENGTH);
 		nodeInfo.SetType(type.Type());
 	}
-	return BString(mimeString);	
+	return BString(mimeString);
 }
 
 
 void
-Playlist::_DeleteEntry(const entry_ref* file)
-{
-	// Move entry_ref to Trash
-	BMessage trash(BPrivate::kMoveToTrash);
-	trash.AddRef("refs", file);
-
-	BMessenger("application/x-vnd.Be-TRAK").SendMessage(&trash);		
-}
-
-
-void
 Playlist::_NotifyRefAdded(const entry_ref& ref, int32 index) const
 {
 	BList listeners(fListeners);

Modified: haiku/trunk/src/apps/mediaplayer/playlist/Playlist.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/Playlist.h	2009-05-15 22:11:19 UTC (rev 30767)
+++ haiku/trunk/src/apps/mediaplayer/playlist/Playlist.h	2009-05-16 11:29:19 UTC (rev 30768)
@@ -68,9 +68,6 @@
 			entry_ref			RemoveRef(int32 index,
 									bool careAboutCurrentIndex = true);
 
-			void				RemoveRefPermanent(int32 index, 
-									bool removeToTrash);
-
 			bool				AdoptPlaylist(Playlist& other);
 			bool				AdoptPlaylist(Playlist& other, int32 index);
 
@@ -81,7 +78,7 @@
 			// navigating current ref
 			bool				SetCurrentRefIndex(int32 index);
 			int32				CurrentRefIndex() const;
-		
+
 			void				GetSkipInfo(bool* canSkipPrevious,
 									bool* canSkipNext) const;
 
@@ -89,7 +86,7 @@
 			bool				AddListener(Listener* listener);
 			void				RemoveListener(Listener* listener);
 
-			// support functions			
+			// support functions
 			void				AppendRefs(const BMessage* refsReceivedMessage,
 									int32 appendIndex = -1);
 	static	void				AppendToPlaylistRecursive(const entry_ref& ref,
@@ -103,8 +100,7 @@
 	static	bool				_IsTextPlaylist(const BString& mimeString);
 	static	bool				_IsBinaryPlaylist(const BString& mimeString);
 	static	bool				_IsPlaylist(const BString& mimeString);
-	static	BString				_MIMEString(const entry_ref* entry);
-			void				_DeleteEntry(const entry_ref* file);
+	static	BString				_MIMEString(const entry_ref* ref);
 			void				_NotifyRefAdded(const entry_ref& ref,
 									int32 index) const;
 			void				_NotifyRefRemoved(int32 index) const;

Modified: haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.cpp	2009-05-15 22:11:19 UTC (rev 30767)
+++ haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.cpp	2009-05-16 11:29:19 UTC (rev 30768)
@@ -358,7 +358,7 @@
 {
 	if (numBytes < 1)
 		return;
-		
+
 	if ((bytes[0] == B_BACKSPACE) || (bytes[0] == B_DELETE))
 		RemoveSelected();
 
@@ -367,7 +367,7 @@
 
 
 void
-PlaylistListView::MoveItems(BList& indices, int32 toIndex)
+PlaylistListView::MoveItems(const BList& indices, int32 toIndex)
 {
 	fCommandStack->Perform(new (nothrow) MovePLItemsCommand(fPlaylist,
 		(int32*)indices.Items(), indices.CountItems(), toIndex));
@@ -375,7 +375,7 @@
 
 
 void
-PlaylistListView::CopyItems(BList& indices, int32 toIndex)
+PlaylistListView::CopyItems(const BList& indices, int32 toIndex)
 {
 	fCommandStack->Perform(new (nothrow) CopyPLItemsCommand(fPlaylist,
 		(int32*)indices.Items(), indices.CountItems(), toIndex));
@@ -383,7 +383,7 @@
 
 
 void
-PlaylistListView::RemoveItemList(BList& indices)
+PlaylistListView::RemoveItemList(const BList& indices)
 {
 	fCommandStack->Perform(new (nothrow) RemovePLItemsCommand(fPlaylist,
 		(int32*)indices.Items(), indices.CountItems()));
@@ -444,12 +444,12 @@
 
 
 void
-PlaylistListView::PermanentRemoveSelectedFile(bool permRemove)
+PlaylistListView::RemoveSelectionToTrash()
 {
-	BAutolock _(fPlaylist);
-	int32 index = fPlaylist->CurrentRefIndex();
-	fPlaylist->SetCurrentRefIndex(index + 1);
-	fPlaylist->RemoveRefPermanent(index, permRemove);
+	BList indices;
+	GetSelectedItems(indices);
+	fCommandStack->Perform(new (nothrow) RemovePLItemsCommand(fPlaylist,
+		(int32*)indices.Items(), indices.CountItems(), true));
 }
 
 

Modified: haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.h	2009-05-15 22:11:19 UTC (rev 30767)
+++ haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.h	2009-05-16 11:29:19 UTC (rev 30768)
@@ -33,9 +33,9 @@
 	virtual	void				KeyDown(const char* bytes, int32 numBytes);
 
 	// SimpleListView interface
-	virtual	void				MoveItems(BList& indices, int32 toIndex);
-	virtual	void				CopyItems(BList& indices, int32 toIndex);
-	virtual	void				RemoveItemList(BList& indices);
+	virtual	void				MoveItems(const BList& indices, int32 toIndex);
+	virtual	void				CopyItems(const BList& indices, int32 toIndex);
+	virtual	void				RemoveItemList(const BList& indices);
 
 	virtual	void				DrawListItem(BView* owner, int32 index,
 									BRect frame) const;
@@ -45,7 +45,7 @@
 									int32 appendIndex);
 
 			void				Randomize();
-			void				PermanentRemoveSelectedFile(bool permRemove);
+			void				RemoveSelectionToTrash();
 
  private:
 			void				_FullSync();

Modified: haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.cpp	2009-05-15 22:11:19 UTC (rev 30767)
+++ haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.cpp	2009-05-16 11:29:19 UTC (rev 30768)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008, Haiku. All rights reserved.
+ * Copyright 2007-2009, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -46,18 +46,17 @@
 
 enum {
 	// file
-	M_PLAYLIST_OPEN			= 'open',
-	M_PLAYLIST_SAVE			= 'save',
-	M_PLAYLIST_SAVE_AS		= 'svas',
-	M_PLAYLIST_SAVE_RESULT	= 'psrs',
+	M_PLAYLIST_OPEN							= 'open',
+	M_PLAYLIST_SAVE							= 'save',
+	M_PLAYLIST_SAVE_AS						= 'svas',
+	M_PLAYLIST_SAVE_RESULT					= 'psrs',
 
 	// edit
-	M_PLAYLIST_EMPTY		= 'emty',
-	M_PLAYLIST_RANDOMIZE	= 'rand',
-	
-	// 
-	M_PLAYLIST_DELETE_FILE	= 'dlfi',
-	M_PLAYLIST_PER_DEL_FILE	= 'pdfi'
+	M_PLAYLIST_EMPTY						= 'emty',
+	M_PLAYLIST_RANDOMIZE					= 'rand',
+
+	M_PLAYLIST_REMOVE						= 'rmov',
+	M_PLAYLIST_REMOVE_AND_PUT_INTO_TRASH	= 'rmtr'
 };
 
 #define SPACE 5
@@ -195,12 +194,12 @@
 		case M_PLAYLIST_RANDOMIZE:
 			fListView->Randomize();
 			break;
-		case M_PLAYLIST_DELETE_FILE:
-			fListView->PermanentRemoveSelectedFile(false);
-			break;	
-		case M_PLAYLIST_PER_DEL_FILE:
-			fListView->PermanentRemoveSelectedFile(true);		
+		case M_PLAYLIST_REMOVE:
+			fListView->RemoveSelected();
 			break;
+		case M_PLAYLIST_REMOVE_AND_PUT_INTO_TRASH:
+			fListView->RemoveSelectionToTrash();
+			break;
 		default:
 			BWindow::MessageReceived(message);
 			break;
@@ -208,35 +207,6 @@
 }
 
 
-void
-PlaylistWindow::DispatchMessage(BMessage *message, BHandler *handler)
-{
-	if (message->what == B_KEY_DOWN) {
-
-		uint32 key = message->FindInt32("key");
-	
-		switch (key) {
-			case 0x34:			//delete button
-			case 0x3e: 			//d for delete
-			case 0x2b:			//t for Trash
-				if (modifiers() & B_COMMAND_KEY) {
-					fListView->PermanentRemoveSelectedFile(true);
-					return;
-				}
-				break;
-			case 0x2a:			//r for Remove
-				if (modifiers() & B_COMMAND_KEY) {
-					fListView->PermanentRemoveSelectedFile(false);
-					return;
-				}
-				break;
-		}
-	}
-	
-	BWindow::DispatchMessage(message, handler);
-}
-
-
 // #pragma mark -
 
 
@@ -268,10 +238,10 @@
 	editMenu->AddItem(new BMenuItem("Randomize",
 		new BMessage(M_PLAYLIST_RANDOMIZE), 'R'));
 	editMenu->AddSeparatorItem();
-	editMenu->AddItem(new BMenuItem("Remove",
-		new BMessage(M_PLAYLIST_DELETE_FILE), 'R'));	
-	editMenu->AddItem(new BMenuItem("Remove Permanent",
-		new BMessage(M_PLAYLIST_PER_DEL_FILE), 'T', B_COMMAND_KEY));	
+	editMenu->AddItem(new BMenuItem("Remove (Del)",
+		new BMessage(M_PLAYLIST_REMOVE)/*, B_DELETE, 0*/));
+	editMenu->AddItem(new BMenuItem("Remove and Put into Trash",
+		new BMessage(M_PLAYLIST_REMOVE_AND_PUT_INTO_TRASH), 'T'));
 	editMenu->AddItem(new BMenuItem("Remove All",
 		new BMessage(M_PLAYLIST_EMPTY), 'N'));
 

Modified: haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.h	2009-05-15 22:11:19 UTC (rev 30767)
+++ haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.h	2009-05-16 11:29:19 UTC (rev 30768)
@@ -6,7 +6,7 @@
  *		Stephan A?mus 	
  *		Fredrik Mod?en 	
  */
- 
+
 #ifndef PLAYLIST_WINDOW_H
 #define PLAYLIST_WINDOW_H
 
@@ -36,7 +36,6 @@
 
 	virtual	bool				QuitRequested();
 	virtual	void				MessageReceived(BMessage* message);
-	virtual	void				DispatchMessage(BMessage *msg, BHandler *handler);
 
 private:
 			void				_CreateMenu(BRect& frame);

Modified: haiku/trunk/src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp	2009-05-15 22:11:19 UTC (rev 30767)
+++ haiku/trunk/src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp	2009-05-16 11:29:19 UTC (rev 30768)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007, Haiku. All rights reserved.
+ * Copyright 2007-2009, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -11,7 +11,12 @@
 #include 
 #include 
 
+#include 

[... truncated: 242 lines follow ...]


From bga at mail.berlios.de  Sat May 16 18:23:17 2009
From: bga at mail.berlios.de (bga at BerliOS)
Date: Sat, 16 May 2009 18:23:17 +0200
Subject: [Haiku-commits] r30769 -
	haiku/trunk/src/add-ons/kernel/file_systems/cdda
Message-ID: <200905161623.n4GGNHSZ023353@sheep.berlios.de>

Author: bga
Date: 2009-05-16 18:23:16 +0200 (Sat, 16 May 2009)
New Revision: 30769
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30769&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp
Log:
- Set the CD:do_lookup attribute correctly.



Modified: haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp	2009-05-16 11:29:19 UTC (rev 30768)
+++ haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp	2009-05-16 16:23:16 UTC (rev 30769)
@@ -683,6 +683,8 @@
 			dprintf("CDDA: no CD-Text found.\n");
 		else
 			doLookup = false;	 
+	} else {
+		doLookup = false;
 	}
 		
 	int32 trackCount = toc->last_track + 1 - toc->first_track;



From axeld at pinc-software.de  Sat May 16 18:26:33 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sat, 16 May 2009 18:26:33 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r30769_-_haiku/trunk/src/add-ons/kernel?=
 =?utf-8?q?/file=5Fsystems/cdda?=
In-Reply-To: <200905161623.n4GGNHSZ023353@sheep.berlios.de>
Message-ID: <26274686365-BeMail@zon>

bga at BerliOS  wrote:
> Log:
> - Set the CD:do_lookup attribute correctly.

Why would we need that one, anyway? Can't we just look if the CDDA file 
system already has created a file for the ID of the CD?

Bye,
   Axel.



From axeld at mail.berlios.de  Sat May 16 22:01:00 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 16 May 2009 22:01:00 +0200
Subject: [Haiku-commits] r30770 -
	haiku/trunk/src/system/kernel/device_manager
Message-ID: <200905162001.n4GK10Ue017845@sheep.berlios.de>

Author: axeld
Date: 2009-05-16 22:00:59 +0200 (Sat, 16 May 2009)
New Revision: 30770
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30770&view=rev

Modified:
   haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp
Log:
* Applied a patch by Rene that fixes bug #3856.


Modified: haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp
===================================================================
--- haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp	2009-05-16 16:23:16 UTC (rev 30769)
+++ haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp	2009-05-16 20:00:59 UTC (rev 30770)
@@ -1184,7 +1184,7 @@
 {
 	RecursiveLocker _(sLock);
 
-	if (!fRemovedFromParent)
+	if (!fRemovedFromParent && fDriver != NULL)
 		fDriver->devices.Remove(this);
 
 	delete this;



From axeld at mail.berlios.de  Sat May 16 22:10:02 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 16 May 2009 22:10:02 +0200
Subject: [Haiku-commits] r30771 - haiku/trunk/data/develop
Message-ID: <200905162010.n4GKA2XV018389@sheep.berlios.de>

Author: axeld
Date: 2009-05-16 22:10:01 +0200 (Sat, 16 May 2009)
New Revision: 30771
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30771&view=rev

Modified:
   haiku/trunk/data/develop/makefile
   haiku/trunk/data/develop/makefile-engine
Log:
* Applied patch by Siarzhuk Zharski that adds support for .rdef files to the
  makefile-engine. Thanks!


Modified: haiku/trunk/data/develop/makefile
===================================================================
--- haiku/trunk/data/develop/makefile	2009-05-16 20:00:59 UTC (rev 30770)
+++ haiku/trunk/data/develop/makefile	2009-05-16 20:10:01 UTC (rev 30771)
@@ -32,8 +32,13 @@
 #	in folder names do not work well with this makefile.
 SRCS= 
 
-#	specify the resource files to use
+#	specify the resource definition files to use
 #	full path or a relative path to the resource file can be used.
+RDEFS= 
+	
+#	specify the resource files to use. 
+#	full path or a relative path to the resource file can be used.
+#	both RDEFS and RSRCS can be defined in the same makefile.
 RSRCS= 
 
 # @<-src@ 

Modified: haiku/trunk/data/develop/makefile-engine
===================================================================
--- haiku/trunk/data/develop/makefile-engine	2009-05-16 20:00:59 UTC (rev 30770)
+++ haiku/trunk/data/develop/makefile-engine	2009-05-16 20:10:01 UTC (rev 30771)
@@ -40,6 +40,8 @@
 #	specify the tools for adding and removing resources
 	XRES		= xres
 
+#	specify the tools for compiling resource definition files
+	RESCOMP		= rc
 
 # 	platform specific settings
 
@@ -267,6 +269,23 @@
 	BUILD_LINE = $(LD) -o $@ $(OBJS) $(LDFLAGS)
 endif
 
+# pseudo-function for converting a list of resource definition files in RDEFS 
+# variable to a corresponding list of object files in $(OBJ_DIR)/xxx.rsrc
+# The "function" strips off the rdef file suffix (.rdef) and then strips 
+# of the directory name, leaving just the root file name.
+# It then appends the .rsrc suffix and prepends the $(OBJ_DIR)/ path
+define RDEFS_LIST_TO_RSRCS
+	$(addprefix $(OBJ_DIR)/, $(addsuffix .rsrc, $(foreach file, $(RDEFS), \
+	$(basename $(notdir $(file))))))
+endef
+
+#	create the resource definitions instruction in case RDEFS is not empty
+	ifeq ($(RDEFS), )
+		RSRCS +=
+	else
+		RSRCS += $(RDEFS_LIST_TO_RSRCS)
+	endif
+
 #	create the resource instruction
 	ifeq ($(RSRCS), )
 		DO_RSRCS :=
@@ -329,6 +348,12 @@
 $(OBJ_DIR)/%.o : %.CPP
 	$(CC) -c $< $(INCLUDES) $(CFLAGS) -o $@
 
+# rules to compile resource definition files
+$(OBJ_DIR)/%.rsrc : %.rdef
+	$(RESCOMP) -o $@ $<
+$(OBJ_DIR)/%.rsrc : %.RDEF
+	$(RESCOMP) -o $@ $<
+
 #	rules to handle lex/flex and yacc/bison files
 
 $(OBJ_DIR)/%.o: %.l



From axeld at mail.berlios.de  Sat May 16 23:09:34 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 16 May 2009 23:09:34 +0200
Subject: [Haiku-commits] r30772 - in haiku/trunk/src: bin/desklink
	kits/interface
Message-ID: <200905162109.n4GL9Yfi023191@sheep.berlios.de>

Author: axeld
Date: 2009-05-16 23:09:33 +0200 (Sat, 16 May 2009)
New Revision: 30772
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30772&view=rev

Modified:
   haiku/trunk/src/bin/desklink/VolumeControl.cpp
   haiku/trunk/src/kits/interface/View.cpp
Log:
* The Be API requires that options and mask is 0 to remove a mask using
  BView::SetEventMask(). This fixes bug #3928.
* And while the app_server handled that correctly, BView actually did not, and
  stored the wrong value.


Modified: haiku/trunk/src/bin/desklink/VolumeControl.cpp
===================================================================
--- haiku/trunk/src/bin/desklink/VolumeControl.cpp	2009-05-16 20:10:01 UTC (rev 30771)
+++ haiku/trunk/src/bin/desklink/VolumeControl.cpp	2009-05-16 21:09:33 UTC (rev 30772)
@@ -104,7 +104,10 @@
 {
 	BSlider::AttachedToWindow();
 
-	SetEventMask(_IsReplicant() ? 0 : B_POINTER_EVENTS, B_NO_POINTER_HISTORY);
+	if (_IsReplicant())
+		SetEventMask(0, 0);
+	else
+		SetEventMask(B_POINTER_EVENTS, B_NO_POINTER_HISTORY);
 
 	BMediaRoster* roster = BMediaRoster::CurrentRoster();
 	if (roster != NULL && fMixerControl->GainNode() != media_node::null) {

Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2009-05-16 20:10:01 UTC (rev 30771)
+++ haiku/trunk/src/kits/interface/View.cpp	2009-05-16 21:09:33 UTC (rev 30772)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008, Haiku.
+ * Copyright 2001-2009, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -1587,7 +1587,9 @@
 	if (fEventMask == mask && fEventOptions == options)
 		return B_OK;
 
-	fEventMask = mask | (fEventMask & 0xffff0000);
+	// don't change the mask if it's zero and we've got options
+	if (mask != 0 || options == 0)
+		fEventMask = mask | (fEventMask & 0xffff0000);
 	fEventOptions = options;
 
 	fState->archiving_flags |= B_VIEW_EVENT_MASK_BIT;



From axeld at mail.berlios.de  Sat May 16 23:28:13 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sat, 16 May 2009 23:28:13 +0200
Subject: [Haiku-commits] r30773 - haiku/trunk/src/system/kernel/fs
Message-ID: <200905162128.n4GLSDNq027126@sheep.berlios.de>

Author: axeld
Date: 2009-05-16 23:28:12 +0200 (Sat, 16 May 2009)
New Revision: 30773
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30773&view=rev

Modified:
   haiku/trunk/src/system/kernel/fs/vfs.cpp
Log:
* The covered vnode release was never put when it already was a mount point
  during fs_mount(). This fixes bug #3934.


Modified: haiku/trunk/src/system/kernel/fs/vfs.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/vfs.cpp	2009-05-16 21:09:33 UTC (rev 30772)
+++ haiku/trunk/src/system/kernel/fs/vfs.cpp	2009-05-16 21:28:12 UTC (rev 30773)
@@ -7025,37 +7025,31 @@
 
 		status = mount->volume->file_system->mount(mount->volume, device, flags,
 			args, &rootID);
-		if (status < 0) {
-			// ToDo: why should we hide the error code from the file system here?
-			//status = ERR_VFS_GENERAL;
+		if (status != 0)
 			goto err2;
-		}
 	} else {
-		struct vnode* coveredVnode;
-		status = path_to_vnode(path, true, &coveredVnode, NULL, kernel);
-		if (status < B_OK)
+		status = path_to_vnode(path, true, &mount->covers_vnode, NULL, kernel);
+		if (status != B_OK)
 			goto err2;
 
 		// make sure covered_vnode is a directory
-		if (!S_ISDIR(coveredVnode->type)) {
+		if (!S_ISDIR(mount->covers_vnode->type)) {
 			status = B_NOT_A_DIRECTORY;
-			goto err2;
+			goto err3;
 		}
 
-		if (coveredVnode->mount->root_vnode == coveredVnode) {
+		if (mount->covers_vnode->mount->root_vnode == mount->covers_vnode) {
 			// this is already a mount point
 			status = B_BUSY;
-			goto err2;
+			goto err3;
 		}
 
-		mount->covers_vnode = coveredVnode;
-
 		// mount it/them
 		fs_volume* volume = mount->volume;
 		while (volume) {
 			status = volume->file_system->mount(volume, device, flags, args,
 				&rootID);
-			if (status < B_OK) {
+			if (status != B_OK) {
 				if (volume->sub_volume)
 					goto err4;
 				goto err3;
@@ -7116,7 +7110,7 @@
 err4:
 	FS_MOUNT_CALL_NO_PARAMS(mount, unmount);
 err3:
-	if (mount->covers_vnode)
+	if (mount->covers_vnode != NULL)
 		put_vnode(mount->covers_vnode);
 err2:
 	mutex_lock(&sMountMutex);



From bga at mail.berlios.de  Sat May 16 23:41:33 2009
From: bga at mail.berlios.de (bga at BerliOS)
Date: Sat, 16 May 2009 23:41:33 +0200
Subject: [Haiku-commits] r30774 -
	haiku/trunk/src/system/kernel/disk_device_manager
Message-ID: <200905162141.n4GLfXSZ028678@sheep.berlios.de>

Author: bga
Date: 2009-05-16 23:41:33 +0200 (Sat, 16 May 2009)
New Revision: 30774
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30774&view=rev

Modified:
   haiku/trunk/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp
Log:
- Check if we had any changes in status before sending a notification for a new
  inserted media. This fixes ticket #3921.



Modified: haiku/trunk/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp
===================================================================
--- haiku/trunk/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp	2009-05-16 21:28:12 UTC (rev 30773)
+++ haiku/trunk/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp	2009-05-16 21:41:33 UTC (rev 30774)
@@ -1466,9 +1466,15 @@
 				continue;
 
 			bool hadMedia = device->HasMedia();
+			bool changedMedia = device->MediaChanged();
 			device->UpdateMediaStatusIfNeeded();
 
-			if (!device->MediaChanged() && (device->HasMedia() || !hadMedia))
+			// Detect it there was any status change since last check.
+			bool updated = (hadMedia != device->HasMedia()) ||
+				(changedMedia != device->MediaChanged());		
+
+			if ((!device->MediaChanged() &&
+				(device->HasMedia() || !hadMedia)) || !updated)
 				continue;
 
 			device->MarkBusy(true);



From bga at bug-br.org.br  Sat May 16 18:48:34 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Sat, 16 May 2009 18:48:34
Subject: [Haiku-commits] r30769 -
 haiku/trunk/src/add-ons/kernel/file_systems/cdda
In-Reply-To: <26274686365-BeMail@zon>
Message-ID: <684283861-BeMail@Gaspode>

On Sat, 16 May 2009 18:26:33 +0200 CEST, Axel D?rfler said:

> > - Set the CD:do_lookup attribute correctly.
> 
> Why would we need that one, anyway? Can't we just look if the CDDA 
> file 
> system already has created a file for the ID of the CD?

The file is only created after the disk is unmounted, for one thing (of 
course this could be changed). But also because it is easier to simply 
read an attribute. Other than that, it also takes into account the 
presence of CDText in the CD.

-Bruno



From axeld at mail.berlios.de  Sun May 17 00:48:46 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 17 May 2009 00:48:46 +0200
Subject: [Haiku-commits] r30775 -
	haiku/trunk/src/system/kernel/disk_device_manager
Message-ID: <200905162248.n4GMmkFo013981@sheep.berlios.de>

Author: axeld
Date: 2009-05-17 00:48:45 +0200 (Sun, 17 May 2009)
New Revision: 30775
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30775&view=rev

Modified:
   haiku/trunk/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp
Log:
* So many style violations in so few lines of code...


Modified: haiku/trunk/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp
===================================================================
--- haiku/trunk/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp	2009-05-16 21:41:33 UTC (rev 30774)
+++ haiku/trunk/src/system/kernel/disk_device_manager/KDiskDeviceManager.cpp	2009-05-16 22:48:45 UTC (rev 30775)
@@ -1469,12 +1469,10 @@
 			bool changedMedia = device->MediaChanged();
 			device->UpdateMediaStatusIfNeeded();
 
-			// Detect it there was any status change since last check.
-			bool updated = (hadMedia != device->HasMedia()) ||
-				(changedMedia != device->MediaChanged());		
-
-			if ((!device->MediaChanged() &&
-				(device->HasMedia() || !hadMedia)) || !updated)
+			// Detect if there was any status change since last check.
+			if ((!device->MediaChanged() && (device->HasMedia() || !hadMedia))
+				|| !(hadMedia != device->HasMedia()
+					|| changedMedia != device->MediaChanged()))
 				continue;
 
 			device->MarkBusy(true);



From axeld at pinc-software.de  Sun May 17 00:53:52 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sun, 17 May 2009 00:53:52 +0200 CEST
Subject: [Haiku-commits]
 =?utf-8?q?r30774_-_haiku/trunk/src/system/kernel/?=
 =?utf-8?q?disk=5Fdevice=5Fmanager?=
In-Reply-To: <200905162141.n4GLfXSZ028678@sheep.berlios.de>
Message-ID: <49513853617-BeMail@zon>

bga at BerliOS  wrote:
]> Log:
> - Check if we had any changes in status before sending a notification 
> for a new
>   inserted media. This fixes ticket #3921.
[...]
>  			bool hadMedia = device->HasMedia();
> +			bool changedMedia = device->MediaChanged();
>  			device->UpdateMediaStatusIfNeeded();
>  
> -			if (!device->MediaChanged() && (device->HasMedia() || 
> !hadMedia))
> +			// Detect it there was any status change since last check.
> +			bool updated = (hadMedia != device->HasMedia()) ||
> +				(changedMedia != device->MediaChanged());		

So many style violations...

But anyway, this hides a bug in the disk device itself; according to 
the BeBook, a driver should only return B_DEV_MEDIA_CHANGED once in 
case there was a change: "B_DEV_MEDIA_CHANGED. The media changed since 
the time that the device was opened, or since the time of the last 
B_GET_MEDIA_STATUS request."
While it's good defensive style to fix both ends of an error, the disk 
device driver is still behaving incorrectly, and that should be fixed 
as well.

Bye,
   Axel.



From bga at bug-br.org.br  Sat May 16 20:42:25 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Sat, 16 May 2009 20:42:25
Subject: [Haiku-commits] r30774 -
 haiku/trunk/src/system/kernel/disk_device_manager
In-Reply-To: <49513853617-BeMail@zon>
Message-ID: <510044770-BeMail@Gaspode>

On Sun, 17 May 2009 00:53:52 +0200 CEST, Axel D?rfler said:

> So many style violations...

Heh. You know, altough I am all for consistency and all that, I don' t 
see the point of this comment. you could have pointed out the 
violations (and I would have fixed them) or you could fix it (as you 
did), but there is really no need to act like this specially when your 
fix did not add anything in what concerns readability of the code. I 
would understand the criticism if the code was unreadable or something. 
Oh well... 
 
> But anyway, this hides a bug in the disk device itself; according to 
> the BeBook, a driver should only return B_DEV_MEDIA_CHANGED once in 
> case there was a change: "B_DEV_MEDIA_CHANGED. The media changed 
> since 
> the time that the device was opened, or since the time of the last 
> B_GET_MEDIA_STATUS request."
> While it's good defensive style to fix both ends of an error, the 
> disk 
> device driver is still behaving incorrectly, and that should be fixed 
> as well.

I don't think it is wrong, it is just implemented in a way that works 
for now in the sense that this should be a notification mechanism and 
it is actually implemented with polling. There is a TODO in the code 
mentioning that it should implemented as notifications or something. It 
was probably just the fastest way to get it working when Ingo did it. 
Right now 2 consecutive polls results in MediaChanged() being true and 
this probably happens because the device itself keeps this status for a 
while (althouhg I didn't go that deep). Whenever notifications are 
implemented, this will not be a problem I guess as we would get one 
notification (from the device, I mean. Right now we pool the device) 
and that would be all.

-Bruno
 


From bga at bug-br.org.br  Sat May 16 20:46:08 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Sat, 16 May 2009 20:46:08
Subject: [Haiku-commits]
 =?utf-8?q?r30775_-_haiku/trunk/src/system/kernel/?=
 =?utf-8?q?disk=5Fdevice=5Fmanager?=
In-Reply-To: <200905162248.n4GMmkFo013981@sheep.berlios.de>
Message-ID: <733927683-BeMail@Gaspode>

On Sun, 17 May 2009 00:48:46 +0200, axeld at BerliOS said:

> -			// Detect it there was any status change since last 
> check.
> -			bool updated = (hadMedia != device->HasMedia()) ||
> -				(changedMedia != device->MediaChanged());		
> -
> -			if ((!device->MediaChanged() &&
> -				(device->HasMedia() || !hadMedia)) || !updated)
> +			// Detect if there was any status change since last 
> check.
> +			if ((!device->MediaChanged() && (device->HasMedia() || 
> !hadMedia))
> +				|| !(hadMedia != device->HasMedia()
> +					|| changedMedia != device->MediaChanged()))
>  				continue;

Style issues apart, I think this makes the code less legible than it 
was. It is confusing to parse all the logical operations involved.

-Bruno



From stippi at mail.berlios.de  Sun May 17 02:16:16 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Sun, 17 May 2009 02:16:16 +0200
Subject: [Haiku-commits] r30776 - in haiku/trunk/src/apps/mediaplayer: .
	playlist
Message-ID: <200905170016.n4H0GGWA024556@sheep.berlios.de>

Author: stippi
Date: 2009-05-17 02:16:08 +0200 (Sun, 17 May 2009)
New Revision: 30776
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30776&view=rev

Added:
   haiku/trunk/src/apps/mediaplayer/playlist/EntryRefPlaylistItem.cpp
   haiku/trunk/src/apps/mediaplayer/playlist/EntryRefPlaylistItem.h
   haiku/trunk/src/apps/mediaplayer/playlist/PlaylistItem.cpp
   haiku/trunk/src/apps/mediaplayer/playlist/PlaylistItem.h
Modified:
   haiku/trunk/src/apps/mediaplayer/Jamfile
   haiku/trunk/src/apps/mediaplayer/MainWin.cpp
   haiku/trunk/src/apps/mediaplayer/playlist/Playlist.cpp
   haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.cpp
   haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.h
   haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.cpp
   haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.h
Log:
* Refactor the "Remove and Put into Trash" backend a bit to allow giving it an
  index and not work on the current selection only.
* Reenable the code in MainWin that implements the shortcuts to trigger this
  feature during playback. Now it uses the Undo/Redo stack and profits from
  existing polish.
* Add missing fPlaylist locking in MainWin at several places. Should not have
  caused any realworld problems, though.
* Add Undo/Redo shortcuts to MainWin and forward to Playlist window.
* Make sure the Playlist window opens on the same workspace as the player
  window. This could be seen when launching MediaPlayer on one workspace, later
  moving the window and then opening the Playlist window, it would open on
  the original workspace. The new behavior additionally pulls the playlist
  when it's already open and you invoke the "Playlist" menu item.
* Added the beginnings of a refactoring to make the Playlist and everything
  else use a PlaylistItem class, instead of entry_refs directly. This stuff is
  not yet used, though, just compiles.


Modified: haiku/trunk/src/apps/mediaplayer/Jamfile
===================================================================
--- haiku/trunk/src/apps/mediaplayer/Jamfile	2009-05-16 22:48:45 UTC (rev 30775)
+++ haiku/trunk/src/apps/mediaplayer/Jamfile	2009-05-17 00:16:08 UTC (rev 30776)
@@ -55,10 +55,12 @@
 
 	# playlist
 	CopyPLItemsCommand.cpp
+	EntryRefPlaylistItem.cpp
 	ImportPLItemsCommand.cpp
 	ListViews.cpp
 	MovePLItemsCommand.cpp
 	Playlist.cpp
+	PlaylistItem.cpp
 	PlaylistListView.cpp
 	PlaylistObserver.cpp
 	PlaylistWindow.cpp

Modified: haiku/trunk/src/apps/mediaplayer/MainWin.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/MainWin.cpp	2009-05-16 22:48:45 UTC (rev 30775)
+++ haiku/trunk/src/apps/mediaplayer/MainWin.cpp	2009-05-17 00:16:08 UTC (rev 30776)
@@ -194,6 +194,11 @@
 	Settings::Default()->AddListener(&fGlobalSettingsListener);
 	_AdoptGlobalSettings();
 
+	AddShortcut('z', B_COMMAND_KEY, new BMessage(B_UNDO));
+	AddShortcut('y', B_COMMAND_KEY, new BMessage(B_UNDO));
+	AddShortcut('z', B_COMMAND_KEY | B_SHIFT_KEY, new BMessage(B_REDO));
+	AddShortcut('y', B_COMMAND_KEY | B_SHIFT_KEY, new BMessage(B_REDO));
+
 	Show();
 }
 
@@ -358,6 +363,11 @@
 			}
 			break;
 
+		case B_UNDO:
+		case B_REDO:
+			fPlaylistWindow->PostMessage(msg);
+			break;
+
 		case M_MEDIA_SERVER_STARTED:
 			printf("TODO: implement M_MEDIA_SERVER_STARTED\n");
 			// fController->...
@@ -404,6 +414,8 @@
 		// ControllerObserver messages
 		case MSG_CONTROLLER_FILE_FINISHED:
 		{
+			BAutolock _(fPlaylist);
+
 			bool hadNext = fPlaylist->SetCurrentRefIndex(
 				fPlaylist->CurrentRefIndex() + 1);
 			if (!hadNext) {
@@ -653,6 +665,8 @@
 			}
 */
 		case M_SET_PLAYLIST_POSITION: {
+			BAutolock _(fPlaylist);
+
 			int32 index;
 			if (msg->FindInt32("index", &index) == B_OK)
 				fPlaylist->SetCurrentRefIndex(index);
@@ -723,6 +737,7 @@
 
 	status_t err = fController->SetTo(ref);
 	if (err != B_OK) {
+		BAutolock _(fPlaylist);
 		if (fPlaylist->CountItems() == 1) {
 			// display error if this is the only file we're supposed to play
 			BString message;
@@ -778,10 +793,17 @@
 MainWin::ShowPlaylistWindow()
 {
 	if (fPlaylistWindow->Lock()) {
+		// make sure the window shows on the same workspace as ourself
+		uint32 workspaces = Workspaces();
+		if (fPlaylistWindow->Workspaces() != workspaces)
+			fPlaylistWindow->SetWorkspaces(workspaces);
+
+		// show or activate
 		if (fPlaylistWindow->IsHidden())
 			fPlaylistWindow->Show();
 		else
 			fPlaylistWindow->Activate();
+
 		fPlaylistWindow->Unlock();
 	}
 }
@@ -823,6 +845,7 @@
 	// the playlist ist replaced by dropped files
 	// or the dropped files are appended to the end
 	// of the existing playlist if  is pressed
+	BAutolock _(fPlaylist);
 	int32 appendIndex = modifiers() & B_SHIFT_KEY ?
 		fPlaylist->CountItems() : -1;
 	msg->AddInt32("append_index", appendIndex);
@@ -1367,15 +1390,19 @@
 		case 0x48:			// numeric keypad left arrow
 			PostMessage(M_SKIP_PREV);
 			return B_OK;
-// TODO: Reenable this and use Undo/Redo stack...
-//		case 0x34:			//delete button
-//		case 0x3e: 			//d for delete
-//		case 0x2b:			//t for Trash
-//			if (modifiers() & B_COMMAND_KEY) {
-//				PostMessage(M_FILE_DELETE);
-//				return B_OK;
-//			}
-//			break;
+
+		case 0x34:			//delete button
+		case 0x3e: 			//d for delete
+		case 0x2b:			//t for Trash
+			if (modifiers() & B_COMMAND_KEY) {
+				BAutolock _(fPlaylist);
+				BMessage removeMessage(M_PLAYLIST_REMOVE_AND_PUT_INTO_TRASH);
+				removeMessage.AddInt32("playlist index",
+					fPlaylist->CurrentRefIndex());
+				fPlaylistWindow->PostMessage(&removeMessage);
+				return B_OK;
+			}
+			break;
 	}
 
 	return B_ERROR;
@@ -1541,6 +1568,7 @@
 	if (fHasAudio)
 		enabledButtons |= VOLUME_ENABLED;
 
+	BAutolock _(fPlaylist);
 	bool canSkipPrevious, canSkipNext;
 	fPlaylist->GetSkipInfo(&canSkipPrevious, &canSkipNext);
 	if (canSkipPrevious)

Added: haiku/trunk/src/apps/mediaplayer/playlist/EntryRefPlaylistItem.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/EntryRefPlaylistItem.cpp	2009-05-16 22:48:45 UTC (rev 30775)
+++ haiku/trunk/src/apps/mediaplayer/playlist/EntryRefPlaylistItem.cpp	2009-05-17 00:16:08 UTC (rev 30776)
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2009 Stephan A?mus 
+ * All rights reserved. Distributed under the terms of the MIT license.
+ */
+
+#include "EntryRefPlaylistItem.h"
+
+#include 
+
+#include 
+
+
+EntryRefPlaylistItem::EntryRefPlaylistItem(const entry_ref& ref)
+	:
+	fRef(ref)
+{
+}
+
+
+EntryRefPlaylistItem::~EntryRefPlaylistItem()
+{
+}
+
+
+status_t
+EntryRefPlaylistItem::SetName(const BString& name)
+{
+	BEntry entry(&fRef);
+
+	status_t ret = entry.Rename(name.String(), false);
+	if (ret != B_OK)
+		return ret;
+
+	entry.GetRef(&fRef);
+	_NotifyListeners();
+	return B_OK;
+}
+
+
+
+status_t
+EntryRefPlaylistItem::GetName(BString& name) const
+{
+	name = fRef.name;
+	return B_OK;
+}
+
+
+status_t
+EntryRefPlaylistItem::SetTitle(const BString& title)
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+status_t
+EntryRefPlaylistItem::GetTitle(BString& title) const
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+status_t
+EntryRefPlaylistItem::SetAuthor(const BString& author)
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+status_t
+EntryRefPlaylistItem::GetAuthor(BString& author) const
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+status_t
+EntryRefPlaylistItem::SetAlbum(const BString& album)
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+status_t
+EntryRefPlaylistItem::GetAlbum(BString& album) const
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+status_t
+EntryRefPlaylistItem::SetTrackNumber(int32 trackNumber)
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+status_t
+EntryRefPlaylistItem::GetTrackNumber(int32& trackNumber) const
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+status_t
+EntryRefPlaylistItem::SetBitRate(int32 bitRate)
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+status_t
+EntryRefPlaylistItem::GetBitRate(int32& bitRate) const
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+status_t
+EntryRefPlaylistItem::GetDuration(bigtime_t& duration) const
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+// #pragma mark -
+
+
+status_t
+EntryRefPlaylistItem::MoveIntoTrash()
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+
+status_t
+EntryRefPlaylistItem::RestoreFromTrash()
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+// #pragma mark -
+
+
+BMediaFile*
+EntryRefPlaylistItem::CreateMediaFile() const
+{
+	return new (std::nothrow) BMediaFile(&fRef);
+}
+

Added: haiku/trunk/src/apps/mediaplayer/playlist/EntryRefPlaylistItem.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/EntryRefPlaylistItem.h	2009-05-16 22:48:45 UTC (rev 30775)
+++ haiku/trunk/src/apps/mediaplayer/playlist/EntryRefPlaylistItem.h	2009-05-17 00:16:08 UTC (rev 30776)
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2009 Stephan A?mus 
+ * All rights reserved. Distributed under the terms of the MIT license.
+ */
+#ifndef ENTRY_REF_PLAYLIST_ITEM_H
+#define ENTRY_REF_PLAYLIST_ITEM_H
+
+#include "PlaylistItem.h"
+
+#include 
+
+class EntryRefPlaylistItem : public PlaylistItem {
+public:
+								EntryRefPlaylistItem(const entry_ref& ref);
+	virtual						~EntryRefPlaylistItem();
+
+	// archiving
+//	virtual	status_t			Unarchive(const BMessage* archive);
+//	virtual	status_t			Archive(BMessage* into) const;
+//
+//	virtual	status_t			Unflatten(BDataIO* stream);
+//	virtual	status_t			Flatten(BDataIO* stream) const;
+
+	// properties
+	virtual	status_t			SetName(const BString& name);
+	virtual	status_t			GetName(BString& name) const;
+
+	virtual	status_t			SetTitle(const BString& title);
+	virtual	status_t			GetTitle(BString& title) const;
+
+	virtual	status_t			SetAuthor(const BString& author);
+	virtual	status_t			GetAuthor(BString& author) const;
+
+	virtual	status_t			SetAlbum(const BString& album);
+	virtual	status_t			GetAlbum(BString& album) const;
+
+	virtual	status_t			SetTrackNumber(int32 trackNumber);
+	virtual	status_t			GetTrackNumber(int32& trackNumber) const;
+
+	virtual	status_t			SetBitRate(int32 bitRate);
+	virtual	status_t			GetBitRate(int32& bitRate) const;
+
+	virtual status_t			GetDuration(bigtime_t& duration) const;
+
+	// methods
+	virtual	status_t			MoveIntoTrash();
+	virtual	status_t			RestoreFromTrash();
+
+	// playback
+	virtual	BMediaFile*			CreateMediaFile() const;
+
+private:
+			entry_ref			fRef;
+};
+
+#endif // ENTRY_REF_PLAYLIST_ITEM_H

Modified: haiku/trunk/src/apps/mediaplayer/playlist/Playlist.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/Playlist.cpp	2009-05-16 22:48:45 UTC (rev 30775)
+++ haiku/trunk/src/apps/mediaplayer/playlist/Playlist.cpp	2009-05-17 00:16:08 UTC (rev 30776)
@@ -40,11 +40,6 @@
 
 // TODO: using BList for objects is bad, replace it with a template
 
-// TODO: Remove this and use Tracker's Command.h once it is moved into the private headers
-namespace BPrivate {
-	const uint32 kMoveToTrash = 'Ttrs';
-}
-
 Playlist::Listener::Listener() {}
 Playlist::Listener::~Listener() {}
 void Playlist::Listener::RefAdded(const entry_ref& ref, int32 index) {}

Added: haiku/trunk/src/apps/mediaplayer/playlist/PlaylistItem.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/PlaylistItem.cpp	2009-05-16 22:48:45 UTC (rev 30775)
+++ haiku/trunk/src/apps/mediaplayer/playlist/PlaylistItem.cpp	2009-05-17 00:16:08 UTC (rev 30776)
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2009 Stephan A?mus 
+ * All rights reserved. Distributed under the terms of the MIT license.
+ */
+
+#include "PlaylistItem.h"
+
+
+PlaylistItem::Listener::Listener()
+{
+}
+
+PlaylistItem::Listener::~Listener()
+{
+}
+
+void PlaylistItem::Listener::ItemChanged(const PlaylistItem* item)
+{
+}
+
+
+// #pragma mark -
+
+
+PlaylistItem::PlaylistItem()
+{
+}
+
+
+PlaylistItem::~PlaylistItem()
+{
+}
+
+
+//! You must hold the Playlist lock.
+bool
+PlaylistItem::AddListener(Listener* listener)
+{
+	if (listener && !fListeners.HasItem(listener))
+		return fListeners.AddItem(listener);
+	return false;
+}
+
+
+//! You must hold the Playlist lock.
+void
+PlaylistItem::RemoveListener(Listener* listener)
+{
+	fListeners.RemoveItem(listener);
+}
+
+
+void
+PlaylistItem::_NotifyListeners() const
+{
+	BList listeners(fListeners);
+	int32 count = listeners.CountItems();
+	for (int32 i = 0; i < count; i++) {
+		Listener* listener = (Listener*)listeners.ItemAtFast(i);
+		listener->ItemChanged(this);
+	}
+}
+

Added: haiku/trunk/src/apps/mediaplayer/playlist/PlaylistItem.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/PlaylistItem.h	2009-05-16 22:48:45 UTC (rev 30775)
+++ haiku/trunk/src/apps/mediaplayer/playlist/PlaylistItem.h	2009-05-17 00:16:08 UTC (rev 30776)
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2009 Stephan A?mus 
+ * All rights reserved. Distributed under the terms of the MIT license.
+ */
+#ifndef PLAYLIST_ITEM_H
+#define PLAYLIST_ITEM_H
+
+#include 
+#include 
+
+class BDataIO;
+class BMediaFile;
+class BMessage;
+
+class PlaylistItem {
+public:
+	class Listener {
+	public:
+						Listener();
+		virtual			~Listener();
+
+		virtual	void	ItemChanged(const PlaylistItem* item);
+	};
+
+public:
+								PlaylistItem();
+	virtual						~PlaylistItem();
+
+	// archiving
+//	virtual	status_t			Unarchive(const BMessage* archive) = 0;
+//	virtual	status_t			Archive(BMessage* into) const = 0;
+//
+//	virtual	status_t			Unflatten(BDataIO* stream) = 0;
+//	virtual	status_t			Flatten(BDataIO* stream) const = 0;
+
+	// properties
+	virtual	status_t			SetName(const BString& name) = 0;
+	virtual	status_t			GetName(BString& name) const = 0;
+
+	virtual	status_t			SetTitle(const BString& title) = 0;
+	virtual	status_t			GetTitle(BString& title) const = 0;
+
+	virtual	status_t			SetAuthor(const BString& author) = 0;
+	virtual	status_t			GetAuthor(BString& author) const = 0;
+
+	virtual	status_t			SetAlbum(const BString& album) = 0;
+	virtual	status_t			GetAlbum(BString& album) const = 0;
+
+	virtual	status_t			SetTrackNumber(int32 trackNumber) = 0;
+	virtual	status_t			GetTrackNumber(int32& trackNumber) const = 0;
+
+	virtual	status_t			SetBitRate(int32 bitRate) = 0;
+	virtual	status_t			GetBitRate(int32& bitRate) const = 0;
+
+	virtual status_t			GetDuration(bigtime_t& duration) const = 0;
+
+	// methods
+	virtual	status_t			MoveIntoTrash() = 0;
+	virtual	status_t			RestoreFromTrash() = 0;
+
+	// playback
+	virtual	BMediaFile*			CreateMediaFile() const = 0;
+
+	// listener support
+			bool				AddListener(Listener* listener);
+			void				RemoveListener(Listener* listener);
+
+protected:
+			void				_NotifyListeners() const;
+
+private:
+			BList				fListeners;
+};
+
+#endif // PLAYLIST_ITEM_H

Modified: haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.cpp	2009-05-16 22:48:45 UTC (rev 30775)
+++ haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.cpp	2009-05-17 00:16:08 UTC (rev 30776)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008, Haiku. All rights reserved.
+ * Copyright 2007-2009, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -56,10 +56,10 @@
 }
 
 
-class PlaylistItem : public SimpleItem {
+class PlaylistListView::Item : public SimpleItem {
  public:
-								PlaylistItem(const entry_ref& ref);
-		virtual					~PlaylistItem();
+								Item(const entry_ref& ref);
+		virtual					~Item();
 
 				void			Draw(BView* owner, BRect frame,
 									const font_height& fh,
@@ -73,20 +73,20 @@
 };
 
 
-PlaylistItem::PlaylistItem(const entry_ref& ref)
+PlaylistListView::Item::Item(const entry_ref& ref)
 	: SimpleItem(ref.name),
 	  fRef(ref)
 {
 }
 
 
-PlaylistItem::~PlaylistItem()
+PlaylistListView::Item::~Item()
 {
 }
 
 
 void
-PlaylistItem::Draw(BView* owner, BRect frame, const font_height& fh,
+PlaylistListView::Item::Draw(BView* owner, BRect frame, const font_height& fh,
 	bool tintedLine, uint32 mode, bool active, uint32 playbackState)
 {
 	rgb_color color = (rgb_color){ 255, 255, 255, 255 };
@@ -323,7 +323,7 @@
 	float textOffset = text_offset(fFontHeight);
 
 	for (int32 i = 0;
-		PlaylistItem* item = dynamic_cast(ItemAt(i)); i++) {
+		Item* item = dynamic_cast(ItemAt(i)); i++) {
 		BRect r = ItemFrame(i);
 		if (r.Contains(where)) {
 			if (clicks == 2) {
@@ -385,15 +385,14 @@
 void
 PlaylistListView::RemoveItemList(const BList& indices)
 {
-	fCommandStack->Perform(new (nothrow) RemovePLItemsCommand(fPlaylist,
-		(int32*)indices.Items(), indices.CountItems()));
+	RemoveItemList(indices, false);
 }
 
 
 void
 PlaylistListView::DrawListItem(BView* owner, int32 index, BRect frame) const
 {
-	if (PlaylistItem* item = dynamic_cast(ItemAt(index))) {
+	if (Item* item = dynamic_cast(ItemAt(index))) {
 		item->Draw(owner, frame, fFontHeight, index % 2,
 			DISPLAY_NAME, index == fCurrentPlaylistIndex, fPlaybackState);
 	}
@@ -448,8 +447,24 @@
 {
 	BList indices;
 	GetSelectedItems(indices);
+	RemoveItemList(indices, true);
+}
+
+
+void
+PlaylistListView::RemoveToTrash(int32 index)
+{
+	BList indices;
+	indices.AddItem((void*)index);
+	RemoveItemList(indices, true);
+}
+
+
+void
+PlaylistListView::RemoveItemList(const BList& indices, bool intoTrash)
+{
 	fCommandStack->Perform(new (nothrow) RemovePLItemsCommand(fPlaylist,
-		(int32*)indices.Items(), indices.CountItems(), true));
+		(int32*)indices.Items(), indices.CountItems(), intoTrash));
 }
 
 
@@ -496,7 +511,7 @@
 void
 PlaylistListView::_AddItem(const entry_ref& ref, int32 index)
 {
-	PlaylistItem* item = new (nothrow) PlaylistItem(ref);
+	Item* item = new (nothrow) Item(ref);
 	if (item)
 		AddItem(item, index);
 }

Modified: haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.h	2009-05-16 22:48:45 UTC (rev 30775)
+++ haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.h	2009-05-17 00:16:08 UTC (rev 30776)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007, Haiku. All rights reserved.
+ * Copyright 2007-2009, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -14,11 +14,10 @@
 class Controller;
 class ControllerObserver;
 class Playlist;
-class PlaylistItem;
 class PlaylistObserver;
 
 class PlaylistListView : public SimpleListView {
- public:
+public:
 								PlaylistListView(BRect frame,
 									Playlist* playlist,
 									Controller* controller,
@@ -46,8 +45,13 @@
 
 			void				Randomize();
 			void				RemoveSelectionToTrash();
+			void				RemoveToTrash(int32 index);
+			void				RemoveItemList(const BList& indices,
+									bool intoTrash);
 
- private:
+private:
+	class Item;
+
 			void				_FullSync();
 			void				_AddItem(const entry_ref& ref, int32 index);
 			void				_RemoveItem(int32 index);
@@ -67,7 +71,7 @@
 			uint32				fPlaybackState;
 
 			font_height			fFontHeight;
-			PlaylistItem*		fLastClickedItem;
+			Item*				fLastClickedItem;
 };
 
 #endif // PLAYLIST_LIST_VIEW_H

Modified: haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.cpp
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.cpp	2009-05-16 22:48:45 UTC (rev 30775)
+++ haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.cpp	2009-05-17 00:16:08 UTC (rev 30776)
@@ -55,8 +55,7 @@
 	M_PLAYLIST_EMPTY						= 'emty',
 	M_PLAYLIST_RANDOMIZE					= 'rand',
 
-	M_PLAYLIST_REMOVE						= 'rmov',
-	M_PLAYLIST_REMOVE_AND_PUT_INTO_TRASH	= 'rmtr'
+	M_PLAYLIST_REMOVE						= 'rmov'
 };
 
 #define SPACE 5
@@ -198,8 +197,16 @@
 			fListView->RemoveSelected();
 			break;
 		case M_PLAYLIST_REMOVE_AND_PUT_INTO_TRASH:
-			fListView->RemoveSelectionToTrash();
+		{
+printf("M_PLAYLIST_REMOVE_AND_PUT_INTO_TRASH\n");
+message->PrintToStream();
+			int32 index;
+			if (message->FindInt32("playlist index", &index) == B_OK)
+				fListView->RemoveToTrash(index);
+			else
+				fListView->RemoveSelectionToTrash();
 			break;
+		}
 		default:
 			BWindow::MessageReceived(message);
 			break;

Modified: haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.h
===================================================================
--- haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.h	2009-05-16 22:48:45 UTC (rev 30775)
+++ haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.h	2009-05-17 00:16:08 UTC (rev 30776)
@@ -27,6 +27,10 @@
 class BButton;
 class BFilePanel;
 
+enum {
+	M_PLAYLIST_REMOVE_AND_PUT_INTO_TRASH	= 'rmtr'
+};
+
 class PlaylistWindow : public BWindow {
 public:
 								PlaylistWindow(BRect frame,



From mmu_man at mail.berlios.de  Sun May 17 02:40:45 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 17 May 2009 02:40:45 +0200
Subject: [Haiku-commits] r30777 - haiku/trunk/docs/userguide/en/installation
Message-ID: <200905170040.n4H0ejYQ026913@sheep.berlios.de>

Author: mmu_man
Date: 2009-05-17 02:40:43 +0200 (Sun, 17 May 2009)
New Revision: 30777
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30777&view=rev

Modified:
   haiku/trunk/docs/userguide/en/installation/install-source-linux.html
Log:
- add links to apt: url to install packages for Ubuntu,
- add mention of libc6-dev-i386 which I had to install on a 64bit server,
- fix a typo.


Modified: haiku/trunk/docs/userguide/en/installation/install-source-linux.html
===================================================================
--- haiku/trunk/docs/userguide/en/installation/install-source-linux.html	2009-05-17 00:16:08 UTC (rev 30776)
+++ haiku/trunk/docs/userguide/en/installation/install-source-linux.html	2009-05-17 00:40:43 UTC (rev 30777)
@@ -40,9 +40,13 @@
 Downloading the tools and the Haiku source
 
 Install all needed packages:
+On Ubuntu you can do so by clicking here, or use the command line:
 sudo apt-get install subversion autoconf automake texinfo flex bison gawk build-essential yasm
 
-Create the Haiku development directories and get the Haiku build tools source.:
+On 64-bit systems, you will also need the libc6-dev-i386 package:
+sudo apt-get install libc6-dev-i386
+
+Create the Haiku development directories and get the Haiku build tools source:
 mkdir develop
 cd develop
 mkdir haiku



From mmu_man at mail.berlios.de  Sun May 17 04:31:26 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 17 May 2009 04:31:26 +0200
Subject: [Haiku-commits] r30778 - haiku/trunk/docs/userguide/en/installation
Message-ID: <200905170231.n4H2VQrl005655@sheep.berlios.de>

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

Modified:
   haiku/trunk/docs/userguide/en/installation/install-source-linux.html
Log:
You also need gcc-multilib and g++-multilib on 64bit...


Modified: haiku/trunk/docs/userguide/en/installation/install-source-linux.html
===================================================================
--- haiku/trunk/docs/userguide/en/installation/install-source-linux.html	2009-05-17 00:40:43 UTC (rev 30777)
+++ haiku/trunk/docs/userguide/en/installation/install-source-linux.html	2009-05-17 02:31:25 UTC (rev 30778)
@@ -43,8 +43,8 @@
 On Ubuntu you can do so by clicking here, or use the command line:
 sudo apt-get install subversion autoconf automake texinfo flex bison gawk build-essential yasm
 
-On 64-bit systems, you will also need the libc6-dev-i386 package:
-sudo apt-get install libc6-dev-i386
+On 64-bit systems, you will also need the libc6-dev-i386, gcc-multilib, and g++-multilib packages:
+sudo apt-get install libc6-dev-i386 gcc-multilib g++-multilib
 
 Create the Haiku development directories and get the Haiku build tools source:
 mkdir develop



From mmu_man at mail.berlios.de  Sun May 17 04:44:44 2009
From: mmu_man at mail.berlios.de (mmu_man at BerliOS)
Date: Sun, 17 May 2009 04:44:44 +0200
Subject: [Haiku-commits] r30779 - haiku/trunk
Message-ID: <200905170244.n4H2ii2V006449@sheep.berlios.de>

Author: mmu_man
Date: 2009-05-17 04:44:44 +0200 (Sun, 17 May 2009)
New Revision: 30779
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30779&view=rev

Modified:
   haiku/trunk/configure
Log:
This check doesn't work when used inside linux32... just remove it. Use linux32 ./configure --use-32bit


Modified: haiku/trunk/configure
===================================================================
--- haiku/trunk/configure	2009-05-17 02:31:25 UTC (rev 30778)
+++ haiku/trunk/configure	2009-05-17 02:44:44 UTC (rev 30779)
@@ -349,13 +349,6 @@
 	esac
 done
 
-# check for a 64bit platform
-case "${platformMachine}" in
-	x86_64)	use32bit=1 ;;
-	*)	echo Assuming 32-bit machine: "$platformMachine"
-		use32bit=0 ;;
-esac
-
 # detect the build platform
 case "${platform}" in
 	BeOS)	revision=`uname -r`



From fekdahl at gmail.com  Sun May 17 10:25:00 2009
From: fekdahl at gmail.com (Fredrik Ekdahl)
Date: Sun, 17 May 2009 10:25:00 +0200
Subject: [Haiku-commits] r30749
	-	haiku/trunk/src/add-ons/kernel/file_systems/cdda
In-Reply-To: <4A0C3ECF.80605@bug-br.org.br>
References: <200905131454.n4DEs7c6025202@sheep.berlios.de>	<4A0AE6E5.5090803@gmail.com>
	<4A0C3ECF.80605@bug-br.org.br>
Message-ID: <4A0FC9DC.5010004@gmail.com>

Bruno Albuquerque skrev:
> Fredrik Ekdahl wrote:
> 
>> I guess it would be ~1411 kbps then, since k = 1000 (and not 1024) when 
>> speaking audio/video bit rates.
> 
> Are you sure? Because I used a unit converter to convert from bits per 

Yes, I'll do a wikipedia quote again:

"The bit rate is quantified using the bits per second (bit/s or bps) 
unit, often in conjunction with an SI prefix such as kilo- (kbit/s or 
kbps), mega- (Mbit/s or Mbps), giga- (Gbit/s or Gbps) or tera- (Tbit/s 
or Tbps). 1 kbit/s has almost always meant 1,000 bit/s, not 1,024 bit/s, 
also before 1999 when SI prefixes were defined for units of information 
in an IEC standard."

http://en.wikipedia.org/wiki/Bit_rate

-- 
/Fredrik Ekdahl


From axeld at pinc-software.de  Sun May 17 13:27:56 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sun, 17 May 2009 13:27:56 +0200 CEST
Subject: [Haiku-commits] r30774 -
 haiku/trunk/src/system/kernel/disk_device_manager
In-Reply-To: <510044770-BeMail@Gaspode>
Message-ID: <1111832475-BeMail@zon>

"Bruno Albuquerque"  wrote:
> On Sun, 17 May 2009 00:53:52 +0200 CEST, Axel D?rfler said:
> > So many style violations...
> Heh. You know, altough I am all for consistency and all that, I don' 
> t 
> see the point of this comment. you could have pointed out the 
> violations (and I would have fixed them) or you could fix it (as you 
> did), but there is really no need to act like this specially when 
> your 
> fix did not add anything in what concerns readability of the code. I 
> would understand the criticism if the code was unreadable or 
> something. 
> Oh well... 

The point is, we have a coding style guide, and it's really not that 
hard to follow. The more often I have to point that out, the more 
annoyed I get of it, that's just natural.

> > But anyway, this hides a bug in the disk device itself; according 
> > to 
> > the BeBook, a driver should only return B_DEV_MEDIA_CHANGED once in 
> > case there was a change: "B_DEV_MEDIA_CHANGED. The media changed 
> > since the time that the device was opened, or since the time of the 
> > last 
> > B_GET_MEDIA_STATUS request."
[...]
> I don't think it is wrong, it is just implemented in a way that works 
> for now in the sense that this should be a notification mechanism and 
> it is actually implemented with polling. There is a TODO in the code 
> mentioning that it should implemented as notifications or something. 
> It 
> was probably just the fastest way to get it working when Ingo did it. 

This has nothing to do with what the disk device manager is doing (and 
actually it was me who implemented that).

> Right now 2 consecutive polls results in MediaChanged() being true 
> and 
> this probably happens because the device itself keeps this status for 
> a 
> while (althouhg I didn't go that deep). Whenever notifications are 
> implemented, this will not be a problem I guess as we would get one 
> notification (from the device, I mean. Right now we pool the device) 
> and that would be all.

As I pointed out above, that's a bug in the device driver that should 
be fixed, it's completely independent from any notifications.

Bye,
   Axel.



From axeld at pinc-software.de  Sun May 17 13:28:52 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sun, 17 May 2009 13:28:52 +0200 CEST
Subject: [Haiku-commits] r30775 -
 haiku/trunk/src/system/kernel/disk_device_manager
In-Reply-To: <733927683-BeMail@Gaspode>
Message-ID: <1167210820-BeMail@zon>

"Bruno Albuquerque"  wrote:
> On Sun, 17 May 2009 00:48:46 +0200, axeld at BerliOS said:
> > -			// Detect it there was any status change since last 
> > check.
> > -			bool updated = (hadMedia != device->HasMedia()) ||
> > -				(changedMedia != device->MediaChanged());		
> > -
> > -			if ((!device->MediaChanged() &&
> > -				(device->HasMedia() || !hadMedia)) || !updated)
> > +			// Detect if there was any status change since last 
> > check.
> > +			if ((!device->MediaChanged() && (device->HasMedia() || 
> > !hadMedia))
> > +				|| !(hadMedia != device->HasMedia()
> > +					|| changedMedia != device->MediaChanged()))
> >  				continue;
> Style issues apart, I think this makes the code less legible than it 
> was. It is confusing to parse all the logical operations involved.

Oh, come on. The previous separation just didn't make much sense - both 
conditions checked for a change.

Bye,
   Axel.



From jonas at kirilla.com  Sun May 17 14:30:13 2009
From: jonas at kirilla.com (Jonas =?iso-8859-1?q?Sundstr=F6m?=)
Date: Sun, 17 May 2009 14:30:13 +0200 CEST
Subject: [Haiku-commits] r30774 -
 haiku/trunk/src/system/kernel/disk_device_manager
In-Reply-To: <1111832475-BeMail@zon>
Message-ID: <4569998742-BeMail@kirilla>

"Axel D?rfler"  wrote:
 ...
> we have a coding style guide, and it's really
> not that hard to follow. The more often I have
> to point that out, the more annoyed I get of it,
> that's just natural.

I've been wondering if you guys are under more
stress lately. I think I've seen a decrease in 
commits and an increase in highlighting errors.
(Not just my recent commits. I've had this feeling
longer than that.) Could be alpha release feature
freeze / bug fix mode, I suppose.

You are of course right to safeguard your invest-
ment in Haiku but be aware that there is a limit
to when quality control hurts enthusiasm and will
to contribute.

I'm not saying I know where that limit is, and I
assume it's different for each contributor.

/Jonas.


From bga at mail.berlios.de  Sun May 17 14:44:59 2009
From: bga at mail.berlios.de (bga at BerliOS)
Date: Sun, 17 May 2009 14:44:59 +0200
Subject: [Haiku-commits] r30780 -
	haiku/trunk/src/add-ons/kernel/file_systems/cdda
Message-ID: <200905171244.n4HCix0l029943@sheep.berlios.de>

Author: bga
Date: 2009-05-17 14:44:59 +0200 (Sun, 17 May 2009)
New Revision: 30780
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30780&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp
Log:
- For audio-related stuff, when going from bits per second to kilobits per
  second we should use 1000 as a factor and not 1024. Thanks Fredrik Ekdahl
  for the heads up.



Modified: haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp	2009-05-17 02:44:44 UTC (rev 30779)
+++ haiku/trunk/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp	2009-05-17 12:44:59 UTC (rev 30780)
@@ -740,7 +740,7 @@
 		inode->AddAttribute("Audio:Title", B_STRING_TYPE, text.titles[i]);
 		inode->AddAttribute("Audio:Genre", B_STRING_TYPE, text.genre);
 		inode->AddAttribute("Audio:Track", B_INT32_TYPE, track);
-		inode->AddAttribute("Audio:Bitrate", B_STRING_TYPE, "1378 kbps");
+		inode->AddAttribute("Audio:Bitrate", B_STRING_TYPE, "1411 kbps");
 
 		snprintf(title, sizeof(title), "%02lu:%02lu",
 			uint32(inode->FrameCount() / kFramesPerMinute),



From bga at bug-br.org.br  Sun May 17 09:45:18 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Sun, 17 May 2009 09:45:18
Subject: [Haiku-commits]
 =?utf-8?q?r30749_-_haiku/trunk/src/add-ons/kernel?=
 =?utf-8?q?/file=5Fsystems/cdda?=
In-Reply-To: <4A0FC9DC.5010004@gmail.com>
Message-ID: <1516263387-BeMail@Gaspode>

On Sun, 17 May 2009 10:25:00 +0200, Fredrik Ekdahl said:

> >> I guess it would be ~1411 kbps then, since k = 1000 (and not 1024) 
> > > when 
> >> speaking audio/video bit rates.
> > 
> > Are you sure? Because I used a unit converter to convert from bits 
> > per 
> 
> Yes, I'll do a wikipedia quote again:
> 
> "The bit rate is quantified using the bits per second (bit/s or bps) 
> unit, often in conjunction with an SI prefix such as kilo- (kbit/s or 
> kbps), mega- (Mbit/s or Mbps), giga- (Gbit/s or Gbps) or tera- (Tbit/
> s 
> or Tbps). 1 kbit/s has almost always meant 1,000 bit/s, not 1,024 bit
> /s, 
> also before 1999 when SI prefixes were defined for units of 
> information 
> in an IEC standard."
> 
> http://en.wikipedia.org/wiki/Bit_rate

Yes, I managed to confirm this independently too. Just forgot to change 
it.

-Bruno



From bga at bug-br.org.br  Sun May 17 09:59:06 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Sun, 17 May 2009 09:59:06
Subject: [Haiku-commits] r30774 -
 haiku/trunk/src/system/kernel/disk_device_manager
In-Reply-To: <1111832475-BeMail@zon>
Message-ID: <2344806856-BeMail@Gaspode>

On Sun, 17 May 2009 13:27:56 +0200 CEST, Axel D?rfler said:

> > > But anyway, this hides a bug in the disk device itself; according 
> > > to 
> > > the BeBook, a driver should only return B_DEV_MEDIA_CHANGED once 
> > > in 
> > > case there was a change: "B_DEV_MEDIA_CHANGED. The media changed 
> > > since the time that the device was opened, or since the time of 
> > > the 
> > > last 
> > > B_GET_MEDIA_STATUS request."
> [...]
> > I don't think it is wrong, it is just implemented in a way that 
> > works 
> > for now in the sense that this should be a notification mechanism 
> > and 
> > it is actually implemented with polling. There is a TODO in the 
> > code 
> > mentioning that it should implemented as notifications or 
> > something. 
> > It 
> > was probably just the fastest way to get it working when Ingo did 
> > it. 
> 
> This has nothing to do with what the disk device manager is doing 
> (and 
> actually it was me who implemented that).

I stand corrected. I thought Ingo did the disk device manager stuff.
 
> > Right now 2 consecutive polls results in MediaChanged() being true 
> > and 
> > this probably happens because the device itself keeps this status 
> > for 
> > a 
> > while (althouhg I didn't go that deep). Whenever notifications are 
> > implemented, this will not be a problem I guess as we would get one 
> > notification (from the device, I mean. Right now we pool the device) 
> > and that would be all.
> 
> As I pointed out above, that's a bug in the device driver that should 
> be fixed, it's completely independent from any notifications.

So, if I understand you correctly, MediaChanged() should return true 
only after one call to UpdateMediaStatusIfNeeded(), right (meaning that 
a second call should reset it to false even if immediatelly after a 
disk change is detected)? I will take a look at the relevant ioctl in 
the atapi code. Interesting enough, both the old and new stack have 
exactly the same behaviour so maybe this is just a particularity of 
atapi itself?

-Bruno



From bga at bug-br.org.br  Sun May 17 10:07:42 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Sun, 17 May 2009 10:07:42
Subject: [Haiku-commits] r30775 -
 haiku/trunk/src/system/kernel/disk_device_manager
In-Reply-To: <1167210820-BeMail@zon>
Message-ID: <2860177408-BeMail@Gaspode>

On Sun, 17 May 2009 13:28:52 +0200 CEST, Axel D?rfler said:

> > > -			// Detect it there was any status change since last 
> > > check.
> > > -			bool updated = (hadMedia != device->HasMedia()) ||
> > > -				(changedMedia != device->MediaChanged());		
> > > -
> > > -			if ((!device->MediaChanged() &&
> > > -				(device->HasMedia() || !hadMedia)) || !updated)
> > > +			// Detect if there was any status change since last 
> > > check.
> > > +			if ((!device->MediaChanged() && (device->HasMedia() 
> > > || 
> > > !hadMedia))
> > > +				|| !(hadMedia != device->HasMedia()
> > > +					|| changedMedia != device->
> > > MediaChanged()))
> > >  				continue;
> > Style issues apart, I think this makes the code less legible than 
> > it 
> > was. It is confusing to parse all the logical operations involved.
> 
> Oh, come on. The previous separation just didn't make much sense - 
> both 
> conditions checked for a change.

Then the variable name could be changed. But, really, I rest my case.

-Bruno



From bga at mail.berlios.de  Sun May 17 16:15:01 2009
From: bga at mail.berlios.de (bga at BerliOS)
Date: Sun, 17 May 2009 16:15:01 +0200
Subject: [Haiku-commits] r30781 - in haiku/trunk: data/system/boot
	src/servers/cddb_daemon
Message-ID: <200905171415.n4HEF11r009389@sheep.berlios.de>

Author: bga
Date: 2009-05-17 16:15:00 +0200 (Sun, 17 May 2009)
New Revision: 30781
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30781&view=rev

Modified:
   haiku/trunk/data/system/boot/Bootscript
   haiku/trunk/src/servers/cddb_daemon/cddb_daemon.cpp
   haiku/trunk/src/servers/cddb_daemon/cddb_server.cpp
Log:
- Clean up server output. Added more relevant information.
- Added the server to Bootscript.

This closes ticket #3446.



Modified: haiku/trunk/data/system/boot/Bootscript
===================================================================
--- haiku/trunk/data/system/boot/Bootscript	2009-05-17 12:44:59 UTC (rev 30780)
+++ haiku/trunk/data/system/boot/Bootscript	2009-05-17 14:15:00 UTC (rev 30781)
@@ -147,6 +147,11 @@
 	launch $SERVERS/mail_daemon "" -E
 fi
 
+# Launch CDDB Daemon
+if [ "$SAFEMODE" != "yes" ]; then
+	launch $SERVERS/cddb_daemon ""
+fi
+
 # Check for daily saving time
 launch system/bin/dstcheck
 

Modified: haiku/trunk/src/servers/cddb_daemon/cddb_daemon.cpp
===================================================================
--- haiku/trunk/src/servers/cddb_daemon/cddb_daemon.cpp	2009-05-17 12:44:59 UTC (rev 30780)
+++ haiku/trunk/src/servers/cddb_daemon/cddb_daemon.cpp	2009-05-17 14:15:00 UTC (rev 30781)
@@ -35,11 +35,13 @@
 	fVolumeRoster->StartWatching();
 	
 	BVolume volume;
+	printf("Checking currently mounted volumes ...\n");
 	while (fVolumeRoster->GetNextVolume(&volume) == B_OK) {
 		if (_Lookup(volume.Device()) != B_OK) {
 			continue;
 		}
 	}
+	printf("Checking complete. Listening for device mounts.\n");
 }
 
 
@@ -82,10 +84,11 @@
 	uint32 cddbId;
 	if (!_CanLookup(device, &cddbId, toc)) {
 		free(toc);
+		printf("Skipping device with id %d.\n", device);
 		return B_BAD_TYPE;
 	}
 		
-	printf("CD can be looked up. CDDB id = %08lx.\n", cddbId);
+	printf("Looking up CD with CDDB Id %08lx.\n", cddbId);
 
 	CDDBServer cddb_server("freedb.freedb.org:80");
 
@@ -93,6 +96,7 @@
 
 	BList queryResponse;
 	if ((result = cddb_server.Query(cddbId, toc, &queryResponse)) != B_OK) {
+		printf("Error when querying CD.\n");
 		free(toc);
 		return result;
 	}
@@ -101,6 +105,7 @@
 
 	QueryResponseData* diskData = _SelectResult(&queryResponse);
 	if (diskData == NULL) {
+		printf("Could not find any CD entries in query response.\n");
 		return B_BAD_INDEX;
 	}
 
@@ -112,7 +117,7 @@
 	if (_WriteCDData(device, diskData, &readResponse) == B_OK) {
 		printf("CD data saved.\n");
 	} else {
-		printf("CD data not saved.\n" );
+		printf("Error writting CD data.\n" );
 	}
 
 	// Delete itens in the query response BList;
@@ -179,9 +184,24 @@
 	//
 	// TODO(bga):Right now it just picks the first entry on the list but
 	// someday we may want to let the user choose one.
-	if (response->CountItems() != 0)
+	int32 numItems = response->CountItems();
+	if (numItems > 0) {
+		if (numItems > 1) {
+			printf("Multiple matches found :\n");
+		};
+		for (int32 i = 0; i < numItems; i++) {
+			QueryResponseData* data = (QueryResponseData*)response->ItemAt(i);
+			printf("* %s : %s - %s (%s)\n", (data->cddbId).String(),
+				(data->artist).String(), (data->title).String(),
+				(data->category).String());
+		}
+		if (numItems > 1) {
+			printf("Returning first entry.\n");
+		}
+		
 		return (QueryResponseData*)response->ItemAt(0L);
-	
+	}
+
 	return NULL;
 }
 
@@ -246,6 +266,7 @@
 
 
 int main(void) {
+	printf("CDDB Daemon for Haiku v1.0.0 started.\n");
 	CDDBDaemon* cddbDaemon = new CDDBDaemon();
 	cddbDaemon->Run();
 	delete cddbDaemon; 

Modified: haiku/trunk/src/servers/cddb_daemon/cddb_server.cpp
===================================================================
--- haiku/trunk/src/servers/cddb_daemon/cddb_server.cpp	2009-05-17 12:44:59 UTC (rev 30780)
+++ haiku/trunk/src/servers/cddb_daemon/cddb_server.cpp	2009-05-17 14:15:00 UTC (rev 30781)
@@ -252,8 +252,6 @@
 				trackData->title = line;
 					
 				(readResponse->tracks).AddItem(trackData);
-			} else {
-				printf("Unhandled or unknown prefix: %s\n", prefix.String());
 			}
 			
 			if (output == "" || output == ".\r\n") {



From bga at bug-br.org.br  Sun May 17 11:22:27 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Sun, 17 May 2009 11:22:27
Subject: [Haiku-commits]
 =?utf-8?q?r30781_-_in_haiku/trunk=3A_data/system/?=
 =?utf-8?q?boot_src/servers/cddb=5Fdaemon?=
In-Reply-To: <200905171415.n4HEF11r009389@sheep.berlios.de>
Message-ID: <1045725515-BeMail@Gaspode>

On Sun, 17 May 2009 16:15:01 +0200, bga at BerliOS said:

> - Added the server to Bootscript.

Before this results in some kind of holy war, I added the server to 
Bootscript in response to the enhancement ticket mentioned in the commit 
message. Considering we do not have an easy way for the user to select 
things to be auto-started, I thought this was the best approach. If you 
disagree, please do tell.

-Bruno 


From axeld at pinc-software.de  Sun May 17 17:09:22 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sun, 17 May 2009 17:09:22 +0200 CEST
Subject: [Haiku-commits] r30781 - in haiku/trunk: data/system/boot
 src/servers/cddb_daemon
In-Reply-To: <1045725515-BeMail@Gaspode>
Message-ID: <14397626815-BeMail@zon>

"Bruno Albuquerque"  wrote:
> On Sun, 17 May 2009 16:15:01 +0200, bga at BerliOS said:
> > - Added the server to Bootscript.
> Before this results in some kind of holy war, I added the server to 
> Bootscript in response to the enhancement ticket mentioned in the 
> commit 
> message. Considering we do not have an easy way for the user to 
> select 
> things to be auto-started, I thought this was the best approach. If 
> you 
> disagree, please do tell.

I wouldn't mind if we could integrate it with a future add-on based 
Tracker, but as long as that one is vaporware, I think the end-user 
experience weighs in more than launching another tiny server.

Bye,
   Axel.



From axeld at pinc-software.de  Sun May 17 17:21:54 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sun, 17 May 2009 17:21:54 +0200 CEST
Subject: [Haiku-commits] r30774 -
 haiku/trunk/src/system/kernel/disk_device_manager
In-Reply-To: <4569998742-BeMail@kirilla>
Message-ID: <15149159622-BeMail@zon>

"Jonas Sundstr?m"  wrote:
> "Axel D?rfler"  wrote:
> > we have a coding style guide, and it's really
> > not that hard to follow. The more often I have
> > to point that out, the more annoyed I get of it,
> > that's just natural.
> I've been wondering if you guys are under more
> stress lately. I think I've seen a decrease in 
> commits and an increase in highlighting errors.
> (Not just my recent commits. I've had this feeling
> longer than that.) Could be alpha release feature
> freeze / bug fix mode, I suppose.

I just have less time for coding. Furthermore, we have gained a lot 
more new contributors lately, and it's just natural that everyone needs 
some time to adapt to the specifics of our coding style.

> You are of course right to safeguard your invest-
> ment in Haiku but be aware that there is a limit
> to when quality control hurts enthusiasm and will
> to contribute.

Writing an operating system just needs a very tight ass quality 
control. That's of course not about the coding style.
Following the basic rules of the project is just mandatory for every 
contributor. And really, it's a minor thing to take that into account. 
Even if someone is not used to them yet, everyone can have a second 
look over his code to check if the coding style matches. I don't use 
the Haiku coding style for my personal projects, and I don't use it 
when working either.

> I'm not saying I know where that limit is, and I
> assume it's different for each contributor.

It's about the tone, not the thing. And if Bruno took this personally 
in this case, then that was my fault - but as I said, I can get 
annoyed, too. I think I usually manage to only be a pain in the ass 
without being an ass, though :-)

Bye,
   Axel.



From axeld at pinc-software.de  Sun May 17 17:26:21 2009
From: axeld at pinc-software.de (Axel =?utf-8?q?D=C3=B6rfler?=)
Date: Sun, 17 May 2009 17:26:21 +0200 CEST
Subject: [Haiku-commits] r30774 -
 haiku/trunk/src/system/kernel/disk_device_manager
In-Reply-To: <2344806856-BeMail@Gaspode>
Message-ID: <15416594374-BeMail@zon>

"Bruno Albuquerque"  wrote:
> On Sun, 17 May 2009 13:27:56 +0200 CEST, Axel D?rfler said:
> > > It was probably just the fastest way to get it working when Ingo 
> > > did it. 
> > This has nothing to do with what the disk device manager is doing 
> > (and actually it was me who implemented that).
> I stand corrected. I thought Ingo did the disk device manager stuff.

He did most of it, but it was me that wrote the media change notifier.

> > As I pointed out above, that's a bug in the device driver that 
> > should 
> > be fixed, it's completely independent from any notifications.
> So, if I understand you correctly, MediaChanged() should return true 
> only after one call to UpdateMediaStatusIfNeeded(), right (meaning 
> that 
> a second call should reset it to false even if immediatelly after a 
> disk change is detected)? I will take a look at the relevant ioctl in 
> the atapi code. Interesting enough, both the old and new stack have 
> exactly the same behaviour so maybe this is just a particularity of 
> atapi itself?

It's a problem of the scsi_cd driver, I would guess - that one is 
always used, no matter the stack. The point of B_GET_MEDIA_STATUS is 
that it only returns B_DEV_MEDIA_CHANGED once for every actual media 
change - not twice if the device was not fast enough to load the CD in 
between.

Bye,
   Axel.



From axeld at mail.berlios.de  Sun May 17 18:49:07 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Sun, 17 May 2009 18:49:07 +0200
Subject: [Haiku-commits] r30782 - in haiku/trunk: headers/os/interface
	src/kits/interface
Message-ID: <200905171649.n4HGn7Kk003721@sheep.berlios.de>

Author: axeld
Date: 2009-05-17 18:49:05 +0200 (Sun, 17 May 2009)
New Revision: 30782
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30782&view=rev

Modified:
   haiku/trunk/headers/os/interface/ListView.h
   haiku/trunk/src/kits/interface/ListView.cpp
Log:
* Applied a changed patch by Romain that fixes the non-working double click in
  BListView. This fixes bug #3919. Got rid of the _TryInitiateDrag() method,
  and let MouseMoved() do it all.
* Style cleanup of the header, automatic whitespace cleanup.


Modified: haiku/trunk/headers/os/interface/ListView.h
===================================================================
--- haiku/trunk/headers/os/interface/ListView.h	2009-05-17 14:15:00 UTC (rev 30781)
+++ haiku/trunk/headers/os/interface/ListView.h	2009-05-17 16:49:05 UTC (rev 30782)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2002-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _LIST_VIEW_H
@@ -7,9 +7,9 @@
 
 
 #include 
-#include 
 #include 
 #include 
+#include 
 
 
 struct track_data;
@@ -21,167 +21,170 @@
 
 
 class BListView : public BView, public BInvoker {
-	public:
-		BListView(BRect frame, const char* name,
-			list_view_type type = B_SINGLE_SELECTION_LIST,
-			uint32 resizeMask = B_FOLLOW_LEFT | B_FOLLOW_TOP,
-			uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE);
-		BListView(const char* name,
-			list_view_type type = B_SINGLE_SELECTION_LIST,
-			uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE);
-		BListView(list_view_type type = B_SINGLE_SELECTION_LIST);
-		BListView(BMessage* data);
+public:
+							BListView(BRect frame, const char* name,
+								list_view_type type = B_SINGLE_SELECTION_LIST,
+								uint32 resizeMask = B_FOLLOW_LEFT | B_FOLLOW_TOP,
+								uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS
+									| B_NAVIGABLE);
+							BListView(const char* name,
+								list_view_type type = B_SINGLE_SELECTION_LIST,
+								uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS
+									| B_NAVIGABLE);
+							BListView(
+								list_view_type type = B_SINGLE_SELECTION_LIST);
+							BListView(BMessage* data);
 
-		virtual ~BListView() ;
+	virtual					~BListView();
 
-		static	BArchivable* Instantiate(BMessage* data);
-		virtual status_t	Archive(BMessage* data, bool deep = true) const;
-		virtual void		Draw(BRect updateRect);
-		virtual void		MessageReceived(BMessage* msg);
-		virtual void		MouseDown(BPoint where);
-		virtual void		KeyDown(const char* bytes, int32 numBytes);
-		virtual void		MakeFocus(bool state = true);
-		virtual void		AttachedToWindow();
-		virtual void		FrameResized(float newWidth, float newHeight);
-		virtual void		FrameMoved(BPoint newPosition);
-		virtual	void		SetFont(const BFont* font,
-								uint32 mask = B_FONT_ALL);
-		virtual void		TargetedByScrollView(BScrollView* scroller);
-		virtual void		ScrollTo(BPoint where);
-		inline	void		ScrollTo(float x, float y);
-		virtual bool		AddItem(BListItem* item);
-		virtual bool		AddItem(BListItem* item, int32 atIndex);
-		virtual bool		AddList(BList* newItems);
-		virtual bool		AddList(BList* newItems, int32 atIndex);
-		virtual bool		RemoveItem(BListItem* item);
-		virtual BListItem*	RemoveItem(int32 index);
-		virtual bool		RemoveItems(int32 index, int32 count);
+	static	BArchivable*	Instantiate(BMessage* data);
+	virtual status_t		Archive(BMessage* data, bool deep = true) const;
+	virtual void			Draw(BRect updateRect);
+	virtual void			MessageReceived(BMessage* message);
+	virtual void			MouseDown(BPoint where);
+	virtual void			KeyDown(const char* bytes, int32 numBytes);
+	virtual void			MakeFocus(bool state = true);
+	virtual void			AttachedToWindow();
+	virtual void			FrameResized(float newWidth, float newHeight);
+	virtual void			FrameMoved(BPoint newPosition);
+	virtual	void			SetFont(const BFont* font, uint32 mask = B_FONT_ALL);
+	virtual void			TargetedByScrollView(BScrollView* scroller);
+	virtual void			ScrollTo(BPoint where);
+	inline	void			ScrollTo(float x, float y);
+	virtual bool			AddItem(BListItem* item);
+	virtual bool			AddItem(BListItem* item, int32 atIndex);
+	virtual bool			AddList(BList* newItems);
+	virtual bool			AddList(BList* newItems, int32 atIndex);
+	virtual bool			RemoveItem(BListItem* item);
+	virtual BListItem*		RemoveItem(int32 index);
+	virtual bool			RemoveItems(int32 index, int32 count);
 
-		virtual void		SetSelectionMessage(BMessage* message);
-		virtual void		SetInvocationMessage(BMessage* message);
+	virtual void			SetSelectionMessage(BMessage* message);
+	virtual void			SetInvocationMessage(BMessage* message);
 
-				BMessage*	SelectionMessage() const;
-				uint32		SelectionCommand() const;
-				BMessage*	InvocationMessage() const;
-				uint32		InvocationCommand() const;
+			BMessage*		SelectionMessage() const;
+			uint32			SelectionCommand() const;
+			BMessage*		InvocationMessage() const;
+			uint32			InvocationCommand() const;
 
-		virtual void		SetListType(list_view_type type);
-				list_view_type ListType() const;
+	virtual void			SetListType(list_view_type type);
+			list_view_type	ListType() const;
 
-				BListItem*	ItemAt(int32 index) const;
-				int32		IndexOf(BPoint point) const;
-				int32		IndexOf(BListItem* item) const;
-				BListItem*	FirstItem() const;
-				BListItem*	LastItem() const;
-				bool		HasItem(BListItem* item) const;
-				int32		CountItems() const;
-		virtual void		MakeEmpty();
-				bool		IsEmpty() const;
-				void		DoForEach(bool (*func)(BListItem* item));
-				void		DoForEach(bool (*func)(BListItem* item, void* arg), void* arg);
-		const	BListItem**	Items() const;
-				void		InvalidateItem(int32 index);
-				void		ScrollToSelection();
+			BListItem*		ItemAt(int32 index) const;
+			int32			IndexOf(BPoint point) const;
+			int32			IndexOf(BListItem* item) const;
+			BListItem*		FirstItem() const;
+			BListItem*		LastItem() const;
+			bool			HasItem(BListItem* item) const;
+			int32			CountItems() const;
+	virtual void			MakeEmpty();
+			bool			IsEmpty() const;
+			void			DoForEach(bool (*func)(BListItem* item));
+			void			DoForEach(bool (*func)(BListItem* item, void* arg),
+								void* arg);
+			const BListItem** Items() const;
+			void			InvalidateItem(int32 index);
+			void			ScrollToSelection();
 
-				void		Select(int32 index, bool extend = false);
-				void		Select(int32 from, int32 to, bool extend = false);
-				bool		IsItemSelected(int32 index) const;
-				int32		CurrentSelection(int32 index = 0) const;
-		virtual status_t	Invoke(BMessage* message = NULL);
+			void			Select(int32 index, bool extend = false);
+			void			Select(int32 from, int32 to, bool extend = false);
+			bool			IsItemSelected(int32 index) const;
+			int32			CurrentSelection(int32 index = 0) const;
+	virtual status_t		Invoke(BMessage* message = NULL);
 
-				void		DeselectAll();
-				void		DeselectExcept(int32 exceptFrom, int32 exceptTo);
-				void		Deselect(int32 index);
+			void			DeselectAll();
+			void			DeselectExcept(int32 exceptFrom, int32 exceptTo);
+			void			Deselect(int32 index);
 
-		virtual void		SelectionChanged();
+	virtual void			SelectionChanged();
 
-				void		SortItems(int (*cmp)(const void*, const void*));
+			void			SortItems(int (*cmp)(const void*, const void*));
 
-		/* These functions bottleneck through DoMiscellaneous() */
-				bool		SwapItems(int32 a, int32 b);
-				bool		MoveItem(int32 from, int32 to);
-				bool		ReplaceItem(int32 index, BListItem* item);
+	/* These functions bottleneck through DoMiscellaneous() */
+			bool			SwapItems(int32 a, int32 b);
+			bool			MoveItem(int32 from, int32 to);
+			bool			ReplaceItem(int32 index, BListItem* item);
 
-				BRect		ItemFrame(int32 index);
+			BRect			ItemFrame(int32 index);
 
-		virtual BHandler*	ResolveSpecifier(BMessage* message, int32 index,
-								BMessage* specifier, int32 form, const char* property);
-		virtual status_t	GetSupportedSuites(BMessage* data);
+	virtual BHandler*		ResolveSpecifier(BMessage* message, int32 index,
+								BMessage* specifier, int32 form,
+								const char* property);
+	virtual status_t		GetSupportedSuites(BMessage* data);
 
-		virtual status_t	Perform(perform_code code, void* arg);
+	virtual status_t		Perform(perform_code code, void* arg);
 
-		virtual void		WindowActivated(bool state);
-		virtual void		MouseUp(BPoint point);
-		virtual void		MouseMoved(BPoint point, uint32 code,
-								const BMessage *dragMessage);
-		virtual void		DetachedFromWindow();
-		virtual bool		InitiateDrag(BPoint point, int32 itemIndex,
+	virtual void			WindowActivated(bool state);
+	virtual void			MouseUp(BPoint point);
+	virtual void			MouseMoved(BPoint point, uint32 code,
+								const BMessage* dragMessage);
+	virtual void			DetachedFromWindow();
+	virtual bool			InitiateDrag(BPoint point, int32 itemIndex,
 								bool initialySelected);
 
-		virtual void		ResizeToPreferred();
-		virtual void		GetPreferredSize(float* _width, float* _height);
-		virtual void		AllAttached();
-		virtual void		AllDetached();
+	virtual void			ResizeToPreferred();
+	virtual void			GetPreferredSize(float* _width, float* _height);
+	virtual void			AllAttached();
+	virtual void			AllDetached();
 
-		virtual	BSize		MinSize();
-		virtual	BSize		MaxSize();
-		virtual	BSize		PreferredSize();
+	virtual	BSize			MinSize();
+	virtual	BSize			MaxSize();
+	virtual	BSize			PreferredSize();
 
-	protected:
-		enum MiscCode { B_NO_OP, B_REPLACE_OP, B_MOVE_OP, B_SWAP_OP };
-		union MiscData {
-			struct Spare { int32 data[5]; };
-			struct Replace { int32 index; BListItem *item; } replace;
-			struct Move { int32 from; int32 to; } move;
-			struct Swap { int32 a; int32 b; } swap;
-		};
+protected:
+	enum MiscCode { B_NO_OP, B_REPLACE_OP, B_MOVE_OP, B_SWAP_OP };
+	union MiscData {
+		struct Spare { int32 data[5]; };
+		struct Replace { int32 index; BListItem *item; } replace;
+		struct Move { int32 from; int32 to; } move;
+		struct Swap { int32 a; int32 b; } swap;
+	};
 
-		virtual bool		DoMiscellaneous(MiscCode code, MiscData *data);
-	private:
-		friend class BOutlineListView;
+	virtual bool			DoMiscellaneous(MiscCode code, MiscData* data);
 
-		virtual	void		_ReservedListView2();
-		virtual	void		_ReservedListView3();
-		virtual	void		_ReservedListView4();
+private:
+	friend class BOutlineListView;
 
-				BListView&	operator=(const BListView&);
+	virtual	void			_ReservedListView2();
+	virtual	void			_ReservedListView3();
+	virtual	void			_ReservedListView4();
 
-				void		_InitObject(list_view_type type);
-				void		_FixupScrollBar();
-				void		_InvalidateFrom(int32 index);
-				status_t	_PostMessage(BMessage* message);
-				void		_FontChanged();
-				int32		_RangeCheck(int32 index);
-				bool		_Select(int32 index, bool extend);
-				bool		_Select(int32 from, int32 to, bool extend);
-				bool		_Deselect(int32 index);
-//				void		_Deselect(int32 from, int32 to);
-				bool		_DeselectAll(int32 exceptFrom, int32 exceptTo);
-//				void		PerformDelayedSelect();
-				bool		_TryInitiateDrag(BPoint where);
-				int32		_CalcFirstSelected(int32 after);
-				int32		_CalcLastSelected(int32 before);
-				void		_RecalcItemTops(int32 start, int32 end = -1);
-		virtual void		DrawItem(BListItem* item, BRect itemRect,
+			BListView&		operator=(const BListView& other);
+
+			void			_InitObject(list_view_type type);
+			void			_FixupScrollBar();
+			void			_InvalidateFrom(int32 index);
+			status_t		_PostMessage(BMessage* message);
+			void			_FontChanged();
+			int32			_RangeCheck(int32 index);
+			bool			_Select(int32 index, bool extend);
+			bool			_Select(int32 from, int32 to, bool extend);
+			bool			_Deselect(int32 index);
+			bool			_DeselectAll(int32 exceptFrom, int32 exceptTo);
+			int32			_CalcFirstSelected(int32 after);
+			int32			_CalcLastSelected(int32 before);
+			void			_RecalcItemTops(int32 start, int32 end = -1);
+	virtual void			DrawItem(BListItem* item, BRect itemRect,
 								bool complete = false);
-	
-				bool		_SwapItems(int32 a, int32 b);
-				bool		_MoveItem(int32 from, int32 to);
-				bool		_ReplaceItem(int32 index, BListItem* item);
-				void		_RescanSelection(int32 from, int32 to);
 
-		BList				fList;
-		list_view_type		fListType;
-		int32				fFirstSelected;
-		int32				fLastSelected;
-		int32				fAnchorIndex;
-		BMessage*			fSelectMessage;
-		BScrollView*		fScrollView;
-		track_data*			fTrack;
+			bool			_SwapItems(int32 a, int32 b);
+			bool			_MoveItem(int32 from, int32 to);
+			bool			_ReplaceItem(int32 index, BListItem* item);
+			void			_RescanSelection(int32 from, int32 to);
 
-		uint32				_reserved[4];
+			BList			fList;
+			list_view_type	fListType;
+			int32			fFirstSelected;
+			int32			fLastSelected;
+			int32			fAnchorIndex;
+			BMessage*		fSelectMessage;
+			BScrollView*	fScrollView;
+			track_data*		fTrack;
+
+			uint32			_reserved[4];
 };
 
+
 inline void
 BListView::ScrollTo(float x, float y)
 {

Modified: haiku/trunk/src/kits/interface/ListView.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ListView.cpp	2009-05-17 14:15:00 UTC (rev 30781)
+++ haiku/trunk/src/kits/interface/ListView.cpp	2009-05-17 16:49:05 UTC (rev 30782)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2008, Haiku, Inc.
+ * Copyright (c) 2001-2009, Haiku, Inc.
  * Distributed under the terms of the MIT license.
  *
  * Authors:
@@ -323,13 +323,13 @@
 	bigtime_t doubleClickSpeed;
 	get_click_speed(&doubleClickSpeed);
 	bool doubleClick = false;
-	
+
 	if (timeDelta < doubleClickSpeed
 		&& fabs(delta.x) < kDoubleClickTresh
 		&& fabs(delta.y) < kDoubleClickTresh
 		&& fTrack->item_index == index)
 		doubleClick = true;
-	
+
 	if (doubleClick && index >= fFirstSelected && index <= fLastSelected) {
 		fTrack->drag_start.Set(LONG_MAX, LONG_MAX);
 		Invoke();
@@ -338,7 +338,7 @@
 
 	int32 modifiers;
 	message->FindInt32("modifiers", &modifiers);
-	
+
 	if (!doubleClick) {
 		fTrack->drag_start = point;
 		fTrack->last_click_time = system_time();
@@ -382,22 +382,27 @@
 void
 BListView::MouseUp(BPoint pt)
 {
-	fTrack->item_index = -1;
 	fTrack->try_drag = false;
 }
 
-// MouseMoved
+
 void
-BListView::MouseMoved(BPoint pt, uint32 code, const BMessage *msg)
+BListView::MouseMoved(BPoint where, uint32 code, const BMessage* dragMessage)
 {
-	if (fTrack->item_index == -1) {
+	if (fTrack->item_index == -1 || !fTrack->try_drag) {
 		// mouse was not clicked above any item
 		// or no mouse button pressed
 		return;
 	}
 
-	if (_TryInitiateDrag(pt))
-		return;
+	// Initiate a drag if the mouse was moved far enough
+	BPoint offset = where - fTrack->drag_start;
+	float dragDistance = sqrtf(offset.x * offset.x + offset.y * offset.y);
+	if (dragDistance >= 5.0f) {
+		fTrack->try_drag = false;
+		InitiateDrag(fTrack->drag_start, fTrack->item_index,
+			fTrack->was_selected);
+	}
 }
 
 
@@ -615,7 +620,7 @@
 			ItemAt(i)->SetTop((i > 0) ? ItemAt(i - 1)->Bottom() + 1.0 : 0.0);
 			ItemAt(i)->Update(this, &font);
 		}
-		
+
 		_RecalcItemTops(index + list->CountItems() - 1);
 
 		_FixupScrollBar();
@@ -1553,23 +1558,6 @@
 }
 
 
-bool
-BListView::_TryInitiateDrag(BPoint where)
-{
-	if (!fTrack->try_drag || fTrack->item_index < 0)
-		return false;
-
-	BPoint offset = where - fTrack->drag_start;
-	float dragDistance = sqrtf(offset.x * offset.x + offset.y * offset.y);
-
-	if (dragDistance > 5.0) {
-		fTrack->try_drag = false;
-		return InitiateDrag(fTrack->drag_start, fTrack->item_index, fTrack->was_selected);
-	}
-	return false;
-}
-
-
 int32
 BListView::_CalcFirstSelected(int32 after)
 {



From bga at bug-br.org.br  Sun May 17 14:36:03 2009
From: bga at bug-br.org.br (Bruno Albuquerque)
Date: Sun, 17 May 2009 14:36:03
Subject: [Haiku-commits] r30774 -
 haiku/trunk/src/system/kernel/disk_device_manager
In-Reply-To: <15416594374-BeMail@zon>
Message-ID: <1429768921-BeMail@Gaspode>

On Sun, 17 May 2009 17:26:21 +0200 CEST, Axel D?rfler said:

> > So, if I understand you correctly, MediaChanged() should return 
> > true 
> > only after one call to UpdateMediaStatusIfNeeded(), right (meaning 
> > that 
> > a second call should reset it to false even if immediatelly after a 
> > disk change is detected)? I will take a look at the relevant ioctl 
> > in 
> > the atapi code. Interesting enough, both the old and new stack have 
> > exactly the same behaviour so maybe this is just a particularity of 
> > atapi itself?
> 
> It's a problem of the scsi_cd driver, I would guess - that one is 
> always used, no matter the stack. The point of B_GET_MEDIA_STATUS is 
> that it only returns B_DEV_MEDIA_CHANGED once for every actual media 
> change - not twice if the device was not fast enough to load the CD 
> in 
> between.

periph_get_media_status() in scsi_periph/removable.cpp is what handles 
the B_GET_MEDIA_STATUS. Not being familiar with the code I can not 
really pinpoint any problems in it but one thing that I guess may happen 
is that there is a pending_error in the first read (handle->pending_
error != B_OK) and it returns this the first time (which is interoreted 
as a media change). Then the second time there is no pending error and 
the request is sent to the device itself (scsi ccb request) and it 
returns media changed again. Does it make sense at all? I guess someone 
that knows more about this code will have to take a look at it as with 
what I know I can only guess.

-Bruno



From rudolfc at mail.berlios.de  Sun May 17 22:37:37 2009
From: rudolfc at mail.berlios.de (rudolfc at mail.berlios.de)
Date: Sun, 17 May 2009 22:37:37 +0200
Subject: [Haiku-commits] r30783 - in haiku/trunk/src/add-ons:
	accelerants/nvidia/engine kernel/drivers/graphics/nvidia
Message-ID: <200905172037.n4HKbbTS027014@sheep.berlios.de>

Author: rudolfc
Date: 2009-05-17 22:37:20 +0200 (Sun, 17 May 2009)
New Revision: 30783
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30783&view=rev

Modified:
   haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_acc.c
   haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_acc_dma.c
   haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_general.c
   haiku/trunk/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
Log:
fixed acceleration engine crashes on at least G72 cards by powering up a new part of the engine. This fixes acc on Geforce 7300/7400/7500 cards, and closes tickets #927, #1535 and #3482. In order to test this you need to go back to Haiku R30277 at least since app_server nolonger uses acceleration. Acceleration code was synced to Xfree86 4.8.0. and no chances were found. Bumped version to 0.90, updated docs.

Modified: haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_acc.c
===================================================================
--- haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_acc.c	2009-05-17 16:49:05 UTC (rev 30782)
+++ haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_acc.c	2009-05-17 20:37:20 UTC (rev 30783)
@@ -1,6 +1,6 @@
 /* NV Acceleration functions */
 /* Author:
-   Rudolf Cornelissen 8/2003-5/2005.
+   Rudolf Cornelissen 8/2003-5/2009.
 
    This code was possible thanks to:
     - the Linux XFree86 NV driver,
@@ -85,9 +85,9 @@
 	uint16 cnt;
 
 	/* a hanging engine only recovers from a complete power-down/power-up cycle */
-	NV_REG32(NV32_PWRUPCTRL) = 0x13110011;
+	NV_REG32(NV32_PWRUPCTRL) = 0xffff00ff;
 	snooze(1000);
-	NV_REG32(NV32_PWRUPCTRL) = 0x13111111;
+	NV_REG32(NV32_PWRUPCTRL) = 0xffffffff;
 
 	/* setup PTIMER: */
 	//fixme? how about NV28 setup as just after coldstarting? (see nv_info.c)

Modified: haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_acc_dma.c
===================================================================
--- haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_acc_dma.c	2009-05-17 16:49:05 UTC (rev 30782)
+++ haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_acc_dma.c	2009-05-17 20:37:20 UTC (rev 30783)
@@ -1,7 +1,7 @@
 /* NV Acceleration functions */
 
 /* Author:
-   Rudolf Cornelissen 8/2003-9/2007.
+   Rudolf Cornelissen 8/2003-5/2009.
 
    This code was possible thanks to:
     - the Linux XFree86 NV driver,
@@ -80,9 +80,9 @@
 	err = 0;
 
 	/* a hanging engine only recovers from a complete power-down/power-up cycle */
-	NV_REG32(NV32_PWRUPCTRL) = 0x13110011;
+	NV_REG32(NV32_PWRUPCTRL) = 0xffff00ff;
 	snooze(1000);
-	NV_REG32(NV32_PWRUPCTRL) = 0x13111111;
+	NV_REG32(NV32_PWRUPCTRL) = 0xffffffff;
 
 	/* don't try this on NV20 and later.. */
 	/* note:

Modified: haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_general.c
===================================================================
--- haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_general.c	2009-05-17 16:49:05 UTC (rev 30782)
+++ haiku/trunk/src/add-ons/accelerants/nvidia/engine/nv_general.c	2009-05-17 20:37:20 UTC (rev 30783)
@@ -1,7 +1,7 @@
 /* Authors:
    Mark Watson 12/1999,
    Apsed,
-   Rudolf Cornelissen 10/2002-6/2008
+   Rudolf Cornelissen 10/2002-5/2009
    tst..
 */
 
@@ -92,7 +92,7 @@
 {
 	status_t status;
 
-	LOG(1,("POWERUP: Haiku nVidia Accelerant 0.89 running.\n"));
+	LOG(1,("POWERUP: Haiku nVidia Accelerant 0.90 running.\n"));
 
 	/* log VBLANK INT usability status */
 	if (si->ps.int_assigned)
@@ -1654,17 +1654,18 @@
 
 static void unlock_card(void)
 {
-	/* power-up all nvidia hardware function blocks */
+	/* make sure to power-up all nvidia hardware function blocks */
 	/* bit 28: OVERLAY ENGINE (BES),
 	 * bit 25: CRTC2, (> NV04A)
 	 * bit 24: CRTC1,
 	 * bit 20: framebuffer,
 	 * bit 16: PPMI,
+	 * bit 13: some part of at least the G72 acceleration engine,
 	 * bit 12: PGRAPH,
 	 * bit  8: PFIFO,
 	 * bit  4: PMEDIA,
 	 * bit  0: TVOUT. (> NV04A) */
-	NV_REG32(NV32_PWRUPCTRL) = 0x13111111;
+	NV_REG32(NV32_PWRUPCTRL) = 0xffffffff;
 
 	/* select colormode CRTC registers base adresses */
 	NV_REG8(NV8_MISCW) = 0xcb;
@@ -1689,9 +1690,9 @@
 static status_t nv_general_bios_to_powergraphics()
 {
 	/* let acc engine make power off/power on cycle to start 'fresh' */
-	NV_REG32(NV32_PWRUPCTRL) = 0x13110011;
+	NV_REG32(NV32_PWRUPCTRL) = 0xffff00ff;
 	snooze(1000);
-	NV_REG32(NV32_PWRUPCTRL) = 0x13111111;
+	NV_REG32(NV32_PWRUPCTRL) = 0xffffffff;
 
 	unlock_card();
 

Modified: haiku/trunk/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html	2009-05-17 16:49:05 UTC (rev 30782)
+++ haiku/trunk/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html	2009-05-17 20:37:20 UTC (rev 30783)
@@ -4,7 +4,7 @@
 
 
 
Changes done for each driverversion:

-
head (SVN 0.89, Rudolf)

+
head (SVN 0.90, Rudolf)

 
 Fixed driver assuming enabling AGP mode succeeded on some occasions if it did not block it itself. Blocking AGP mode completely via the AGP busmanager (option 'block_agp') resulted in a crashing acceleration engine because it was setup for AGP transfers instead of using PCI transfers. Error was solved with help from user kraton.
 
Fixed shared_info struct problem occuring when 3D 'accelerant' is used (tested Alpha 4.1): the TVencoder type definition list apparantly gets some memory assigned these days when done inside the definition of shared_info. Moved encoder list outside the shared_info definition.
@@ -20,6 +20,7 @@
 
HDTV video upto/including 1920x1080p can now be played back using overlay on Geforce cards where overlay is supported. On TNT1/TNT2/TNT2-M64 this can't be done and bitmap output is used.
 
Added partial DDC/EDID support: dumping monitor specs to logfile only for now.
 
Added confirmed support for laptop card with ID 0x01d7: Quadro NVS 110M/GeForce 7300 Go. Also fixed support for laptop card with ID 0x01d8: GeForce 7400 Go: the 'laptop' definition was missing here.
+
Fixed acceleration engine crashes on at least G72 cards (Geforce 7300/7400/7500) by powering up new part(s) of the acceleration engines too..
 
 
nv_driver 0.80 (Rudolf)

 



From stippi at mail.berlios.de  Mon May 18 02:20:10 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Mon, 18 May 2009 02:20:10 +0200
Subject: [Haiku-commits] r30784 - haiku/trunk/src/kits/interface
Message-ID: <200905180020.n4I0KA9Z023798@sheep.berlios.de>

Author: stippi
Date: 2009-05-18 02:20:07 +0200 (Mon, 18 May 2009)
New Revision: 30784
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30784&view=rev

Modified:
   haiku/trunk/src/kits/interface/ColorControl.cpp
Log:
* Removed unnecessary code and simplified some places in the drawing code paths.
* Calling BTextView::SetText() will invoke Window()->UpdateIfNeeded(), maybe
  since some recent changes only - we should perhaps look into this... (zooey),
  but the problem was that we called BControl::SetValueNoUpdate() after that,
  and thus we were drawing the color mark at the old offset and the invalidation
  in SetValue() was rendered effectless. Fixes #3719.


Modified: haiku/trunk/src/kits/interface/ColorControl.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ColorControl.cpp	2009-05-17 20:37:20 UTC (rev 30783)
+++ haiku/trunk/src/kits/interface/ColorControl.cpp	2009-05-18 00:20:07 UTC (rev 30784)
@@ -246,7 +246,6 @@
 	c2.green = (value & 0x00FF0000) >> 16;
 	c2.blue = (value & 0x0000FF00) >> 8;
 	c2.alpha = 255;
-	char string[4];
 
 	if (fPaletteMode) {
 		//workaround when two indexes have the same color
@@ -264,7 +263,7 @@
 		
 		fPreviousSelectedPaletteColorIndex = fSelectedPaletteColorIndex;	
 	} else {	
-		float invalidateRadius = kSelectorSize/2 + kSelectorPenSize;
+		float invalidateRadius = kSelectorSize / 2 + kSelectorPenSize;
 		BPoint p;
 		
 		if (c1.red != c2.red) {
@@ -295,26 +294,23 @@
 				 p.x + invalidateRadius, p.y + invalidateRadius));
 		}
 	}
-	
+
+	// Set the value here, since BTextControl will trigger
+	// Window()->UpdateIfNeeded() which will cause us to draw the indicators
+	// at the old offset.
+	if (Value() != value)
+		BControl::SetValueNoUpdate(value);
+
 	// the textcontrols have to be updated even when the color
 	// hasn't changed since the value is clamped upstream
 	// and the textcontrols would still show the unclamped value
+	char string[4];
 	sprintf(string, "%d", c2.red);
 	fRedText->SetText(string);
 	sprintf(string, "%d", c2.green);
 	fGreenText->SetText(string);
 	sprintf(string, "%d", c2.blue);
 	fBlueText->SetText(string);
-
-	if (Value() == value)
-		return;
-
-	BControl::SetValueNoUpdate(value);
-
-	if (LockLooper()) {
-		Window()->UpdateIfNeeded();
-		UnlockLooper();
-	}
 }
 
 
@@ -369,6 +365,7 @@
 	switch (message->what) {
 		case kMsgColorEntered:
 		{
+printf("kMsgColorEntered\n");
 			rgb_color color;
 			color.red = min_c(strtol(fRedText->Text(), NULL, 10), 255);
 			color.green = min_c(strtol(fGreenText->Text(), NULL, 10), 255);
@@ -388,29 +385,17 @@
 void
 BColorControl::Draw(BRect updateRect)
 {
-	if (fBitmap) {
-		if (!fBitmap->Lock())
-			return;
-
-		if (fOffscreenView->Bounds().Intersects(updateRect))
-			DrawBitmap(fBitmap, B_ORIGIN);
-
-		fBitmap->Unlock();
-		_DrawSelectors(this);
-
-	} else {
+	if (fBitmap)
+		DrawBitmap(fBitmap, B_ORIGIN);
+	else
 		_DrawColorArea(this, updateRect);
-		_DrawSelectors(this);
-	}
+	_DrawSelectors(this);
 }
 
 
 void
 BColorControl::_DrawColorArea(BView* target, BRect update)
 {
-	BRegion region(update);
-	target->ConstrainClippingRegion(®ion);
-
 	BRect bevelRect = fPaletteFrame.InsetByCopy(-2.0,-2.0);	//bevel
 	bool enabled = IsEnabled();
 
@@ -509,8 +494,6 @@
 		_ColorRamp(_RampFrame(2), target, green, compColor, 0, false, update);
 		_ColorRamp(_RampFrame(3), target, blue, compColor, 0, false, update);	
 	}
-	
-	target->ConstrainClippingRegion(NULL);
 }
 
 
@@ -710,6 +693,8 @@
 		return;
 	if (!fPaletteFrame.Contains(point))
 		return;
+
+	MakeFocus();
 	
 	if (fPaletteMode) {
 		int column = (int) ( (point.x - fPaletteFrame.left) / fCellSize );
@@ -723,7 +708,8 @@
 		rgb_color color = ValueAsColor();
 	
 		uint8 shade = (unsigned char)max_c(0,
-			min_c((point.x - _RampFrame(0).left) * 255 / _RampFrame(0).Width(), 255));
+			min_c((point.x - _RampFrame(0).left) * 255 / _RampFrame(0).Width(),
+				255));
 		
 		if (_RampFrame(0).Contains(point)) {
 			color.red = color.green = color.blue = shade;
@@ -746,7 +732,6 @@
 	Invoke();
 
 	SetTracking(true);
-	MakeFocus();
 	SetMouseEventMask(B_POINTER_EVENTS, B_NO_POINTER_HISTORY|B_LOCK_WINDOW_FOCUS);
 }
 



From stippi at mail.berlios.de  Mon May 18 02:24:03 2009
From: stippi at mail.berlios.de (stippi at mail.berlios.de)
Date: Mon, 18 May 2009 02:24:03 +0200
Subject: [Haiku-commits] r30785 - haiku/trunk/src/kits/interface
Message-ID: <200905180024.n4I0O3r0024041@sheep.berlios.de>

Author: stippi
Date: 2009-05-18 02:24:01 +0200 (Mon, 18 May 2009)
New Revision: 30785
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30785&view=rev

Modified:
   haiku/trunk/src/kits/interface/ColorControl.cpp
Log:
Removed debugging left-over... sorry.


Modified: haiku/trunk/src/kits/interface/ColorControl.cpp
===================================================================
--- haiku/trunk/src/kits/interface/ColorControl.cpp	2009-05-18 00:20:07 UTC (rev 30784)
+++ haiku/trunk/src/kits/interface/ColorControl.cpp	2009-05-18 00:24:01 UTC (rev 30785)
@@ -365,7 +365,6 @@
 	switch (message->what) {
 		case kMsgColorEntered:
 		{
-printf("kMsgColorEntered\n");
 			rgb_color color;
 			color.red = min_c(strtol(fRedText->Text(), NULL, 10), 255);
 			color.green = min_c(strtol(fGreenText->Text(), NULL, 10), 255);



From mmlr at mail.berlios.de  Mon May 18 03:13:45 2009
From: mmlr at mail.berlios.de (mmlr at mail.berlios.de)
Date: Mon, 18 May 2009 03:13:45 +0200
Subject: [Haiku-commits] r30786 -
	haiku/trunk/src/add-ons/kernel/network/stack
Message-ID: <200905180113.n4I1Dj3q030750@sheep.berlios.de>

Author: mmlr
Date: 2009-05-18 03:13:44 +0200 (Mon, 18 May 2009)
New Revision: 30786
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30786&view=rev

Modified:
   haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
Log:
Implement the FIONREAD ioctl for sockets. We already supported it in userland
but the kernel part was missing. It is used to query for the buffer size that
can be retrieved using recv(). It returns the same value we use for the read
select().


Modified: haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-05-18 00:24:01 UTC (rev 30785)
+++ haiku/trunk/src/add-ons/kernel/network/stack/net_socket.cpp	2009-05-18 01:13:44 UTC (rev 30786)
@@ -70,8 +70,8 @@
 	socklen_t addressLength);
 int socket_setsockopt(net_socket* socket, int level, int option,
 	const void* value, int length);
+ssize_t socket_read_avail(net_socket* socket);
 
-
 static SocketList sSocketList;
 static mutex sSocketLock;
 
@@ -496,6 +496,23 @@
 				sizeof(int));
 		}
 
+		case FIONREAD:
+		{
+			if (data == NULL)
+				return B_BAD_VALUE;
+
+			ssize_t available = socket_read_avail(socket);
+			if (is_syscall()) {
+				if (!IS_USER_ADDRESS(data)
+					|| user_memcpy(data, &available, sizeof(ssize_t)) != B_OK) {
+					return B_BAD_ADDRESS;
+				}
+			} else
+				*(ssize_t *)data = available;
+
+			return B_OK;
+		}
+
 		case B_SET_BLOCKING_IO:
 		case B_SET_NONBLOCKING_IO:
 		{



From axeld at mail.berlios.de  Mon May 18 11:09:24 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 18 May 2009 11:09:24 +0200
Subject: [Haiku-commits] r30787 - in haiku/trunk: headers/os/storage
	src/kits/storage
Message-ID: <200905180909.n4I99Osd031441@sheep.berlios.de>

Author: axeld
Date: 2009-05-18 11:09:23 +0200 (Mon, 18 May 2009)
New Revision: 30787
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30787&view=rev

Modified:
   haiku/trunk/headers/os/storage/Path.h
   haiku/trunk/src/kits/storage/Path.cpp
Log:
* Flatten() would create an invalid entry ref if the path did not exist, or the
  path was not yet initialized. It will now fail instead.
* Got rid of EBadInput - _MustNormalize() can now return an error code instead.
* Style cleanup.


Modified: haiku/trunk/headers/os/storage/Path.h
===================================================================
--- haiku/trunk/headers/os/storage/Path.h	2009-05-18 01:13:44 UTC (rev 30786)
+++ haiku/trunk/headers/os/storage/Path.h	2009-05-18 09:09:23 UTC (rev 30787)
@@ -1,103 +1,79 @@
-//----------------------------------------------------------------------
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
-//---------------------------------------------------------------------
-/*!
-	\file Path.h
-	BPath interface declaration.
-*/
-
+/*
+ * Copyright 2002-2009, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef _PATH_H
 #define _PATH_H
 
+
 #include 
+#include 
 #include 
-#include  /*  for convenience, as in R5 */
 
-#ifdef USE_OPENBEOS_NAMESPACE
-namespace OpenBeOS {
-#endif
 
 // Forward declarations
 class BDirectory;
 class BEntry;
 struct entry_ref;
 
-/*!
-	\class BPath
-	\brief An absolute pathname wrapper class
-	
-	Provides a convenient means of managing pathnames.
 
-	\author Ingo Weinhold
-	\author Tyler Dauwalder
-	
-	\version 0.0.0
-*/
 class BPath : public BFlattenable {
 public:
+							BPath();
+							BPath(const BPath& path);
+							BPath(const entry_ref* ref);
+							BPath(const BEntry* entry);
+							BPath(const char* dir, const char* leaf = NULL,
+								bool normalize = false);
+							BPath(const BDirectory* dir, const char* leaf,
+								bool normalize = false);
 
-	BPath();
-	BPath(const BPath &path);
-	BPath(const entry_ref *ref);
-	BPath(const BEntry *entry);
-	BPath(const char *dir, const char *leaf = NULL, bool normalize = false);
-	BPath(const BDirectory *dir, const char *leaf, bool normalize = false);
-	
-	virtual ~BPath();
+	virtual					~BPath();
 
-	status_t InitCheck() const;
+			status_t		InitCheck() const;
 
-	status_t SetTo(const entry_ref *ref);	
-	status_t SetTo(const BEntry *entry);
-	status_t SetTo(const char *path, const char *leaf = NULL,
-				   bool normalize = false);
-	status_t SetTo(const BDirectory *dir, const char *path,
-				   bool normalize = false);
-	void Unset();
-	
-	status_t Append(const char *path, bool normalize = false);
-	
-	const char *Path() const;
-	const char *Leaf() const;
-	status_t GetParent(BPath *path) const;
-	
-	bool operator==(const BPath &item) const;
-	bool operator==(const char *path) const;
-	bool operator!=(const BPath &item) const;
-	bool operator!=(const char *path) const;
-	BPath& operator=(const BPath &item);
-	BPath& operator=(const char *path);
-	
-	// BFlattenable protocol
-	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);
+			status_t		SetTo(const entry_ref* ref);
+			status_t		SetTo(const BEntry* entry);
+			status_t		SetTo(const char* path, const char* leaf = NULL,
+								bool normalize = false);
+			status_t		SetTo(const BDirectory* dir, const char* path,
+								bool normalize = false);
+			void			Unset();
 
-private:
-	virtual void _WarPath1();
-	virtual void _WarPath2();
-	virtual void _WarPath3();
+			status_t		Append(const char* path, bool normalize = false);
 
-	uint32 _warData[4];
+			const char*		Path() const;
+			const char*		Leaf() const;
+			status_t		GetParent(BPath* path) const;
 
-	char *fName;	
-	status_t fCStatus;
+			bool			operator==(const BPath& item) const;
+			bool			operator==(const char* path) const;
+			bool			operator!=(const BPath& item) const;
+			bool			operator!=(const char* path) const;
+			BPath&			operator=(const BPath& item);
+			BPath&			operator=(const char* path);
 
-	class EBadInput { };
+	// BFlattenable protocol
+	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);
 
-	status_t set_path(const char *path);
+private:
+	virtual void			_WarPath1();
+	virtual void			_WarPath2();
+	virtual void			_WarPath3();
 
-	static bool MustNormalize(const char *path);
-};
+			status_t		_SetPath(const char* path);
+	static	bool			_MustNormalize(const char* path, status_t* _error);
 
-#ifdef USE_OPENBEOS_NAMESPACE
-};		// namespace OpenBeOS
-#endif
+			uint32			_reserved[4];
 
-#endif	// _PATH_H
+			char*			fName;
+			status_t		fCStatus;
+};
 
-
+#endif	// _PATH_H

Modified: haiku/trunk/src/kits/storage/Path.cpp
===================================================================
--- haiku/trunk/src/kits/storage/Path.cpp	2009-05-18 01:13:44 UTC (rev 30786)
+++ haiku/trunk/src/kits/storage/Path.cpp	2009-05-18 09:09:23 UTC (rev 30787)
@@ -1,15 +1,21 @@
-//----------------------------------------------------------------------
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
-//---------------------------------------------------------------------
+/*
+ * Copyright 2002-2009, Haiku Inc.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Tyler Dauwalder
+ *		Ingo Weinhold, bonefish at users.sf.net
+ */
+
 /*!
 	\file Path.cpp
 	BPath implementation.
 */
 
+#include 
+
 #include 
 
-#include 
 #include 
 #include 
 #include 
@@ -21,66 +27,74 @@
 
 using namespace std;
 
-#ifdef USE_OPENBEOS_NAMESPACE
-using namespace OpenBeOS;
-#endif
 
-//! Creates an uninitialized BPath object. 
+//! Creates an uninitialized BPath object.
 BPath::BPath()
-	 : fName(NULL),
-	   fCStatus(B_NO_INIT)
+	:
+	fName(NULL),
+	fCStatus(B_NO_INIT)
 {
 }
-	
-//! Creates a copy of the given BPath object.
-/*!	\param path the object to be copied
+
+
+/*! Creates a copy of the given BPath object.
+	\param path the object to be copied
 */
-BPath::BPath(const BPath &path)
-	 : fName(NULL),
-	   fCStatus(B_NO_INIT)
+BPath::BPath(const BPath& path)
+	:
+	fName(NULL),
+	fCStatus(B_NO_INIT)
 {
 	*this = path;
 }
 
+
 /*!	\brief Creates a BPath object and initializes it to the filesystem entry
 	specified by the given entry_ref struct.
 	\param ref the entry_ref
 */
-BPath::BPath(const entry_ref *ref)
-	 : fName(NULL),
-	   fCStatus(B_NO_INIT)
+BPath::BPath(const entry_ref* ref)
+	:
+	fName(NULL),
+	fCStatus(B_NO_INIT)
 {
 	SetTo(ref);
 }
 
-/*!	Creates a BPath object and initializes it to the filesystem entry
+
+/*!	\brief Creates a BPath object and initializes it to the filesystem entry
 	specified by the given BEntry object.
 	\param entry the BEntry object
 */
-BPath::BPath(const BEntry *entry)
-	 : fName(NULL),
-	   fCStatus(B_NO_INIT)
+BPath::BPath(const BEntry* entry)
+	:
+	fName(NULL),
+	fCStatus(B_NO_INIT)
 {
 	SetTo(entry);
 }
 
+
 /*! \brief Creates a BPath object and initializes it to the specified path or
 		   path and filename combination.
+
 	\param dir The base component of the pathname. May be absolute or relative.
 		   If relative, it is reckoned off the current working directory.
 	\param leaf The (optional) leaf component of the pathname. Must be
 		   relative. The value of leaf is concatenated to the end of \a dir
 		   (a "/" will be added as a separator, if necessary).
 	\param normalize boolean flag used to force normalization; normalization
-		   may occur even if false (see \ref MustNormalize).
+		   may occur even if false (see \ref _MustNormalize).
 */
-BPath::BPath(const char *dir, const char *leaf, bool normalize)
-	 : fName(NULL),
-	   fCStatus(B_NO_INIT)
+BPath::BPath(const char* dir, const char* leaf, bool normalize)
+	:
+	fName(NULL),
+	fCStatus(B_NO_INIT)
 {
 	SetTo(dir, leaf, normalize);
 }
-	
+
+
 /*! \brief Creates a BPath object and initializes it to the specified directory
 	 and filename combination.
 	\param dir Refers to the directory that provides the base component of the
@@ -89,23 +103,26 @@
 		   relative. The value of leaf is concatenated to the end of \a dir
 		   (a "/" will be added as a separator, if necessary).
 	\param normalize boolean flag used to force normalization; normalization
-		   may occur even if false (see \ref MustNormalize).
+		   may occur even if false (see \ref _MustNormalize).
 */
-BPath::BPath(const BDirectory *dir, const char *leaf, bool normalize)
-	 : fName(NULL),
-	   fCStatus(B_NO_INIT)
+BPath::BPath(const BDirectory* dir, const char* leaf, bool normalize)
+	:
+	fName(NULL),
+	fCStatus(B_NO_INIT)
 {
 	SetTo(dir, leaf, normalize);
 }
 
+
 //! Destroys the BPath object and frees any of its associated resources.
 BPath::~BPath()
 {
 	Unset();
 }
 
-//! Returns the status of the most recent construction or SetTo() call.
-/*!	\return \c B_OK, if the BPath object is properly initialized, an error
+
+/*! \brief Returns the status of the most recent construction or SetTo() call.
+	\return \c B_OK, if the BPath object is properly initialized, an error
 			code otherwise.
 */
 status_t
@@ -114,6 +131,7 @@
 	return fCStatus;
 }
 
+
 /*! \brief Reinitializes the object to the filesystem entry specified by the
 	given entry_ref struct.
 	\param ref the entry_ref
@@ -124,21 +142,24 @@
 	- other error codes.
 */
 status_t
-BPath::SetTo(const entry_ref *ref)
+BPath::SetTo(const entry_ref* ref)
 {
 	Unset();
 	if (!ref)
-		return (fCStatus = B_BAD_VALUE);
+		return fCStatus = B_BAD_VALUE;
 
 	char path[B_PATH_NAME_LENGTH];
-	status_t error = _kern_entry_ref_to_path(ref->device, ref->directory,
+	fCStatus = _kern_entry_ref_to_path(ref->device, ref->directory,
 		ref->name, path, sizeof(path));
-	if (error != B_OK)
-		return (fCStatus = error);
-	fCStatus = set_path(path);	// the path is already normalized
+	if (fCStatus != B_OK)
+		return fCStatus;
+
+	fCStatus = _SetPath(path);
+		// the path is already normalized
 	return fCStatus;
 }
 
+
 /*! \brief Reinitializes the object to the specified filesystem entry.
 	\param entry the BEntry
 	\return
@@ -148,25 +169,27 @@
 	- other error codes.
 */
 status_t
-BPath::SetTo(const BEntry *entry)
+BPath::SetTo(const BEntry* entry)
 {
 	Unset();
-	status_t error = (entry ? B_OK : B_BAD_VALUE);
+	if (entry == NULL)
+		return B_BAD_VALUE;
+
 	entry_ref ref;
-	if (error == B_OK)
-		error = entry->GetRef(&ref);
-	if (error == B_OK)
-		error = SetTo(&ref);
-	fCStatus = error;
-	return error;
+	fCStatus = entry->GetRef(&ref);
+	if (fCStatus == B_OK)
+		fCStatus = SetTo(&ref);
+
+	return fCStatus;
 }
-	
+
+
 /*!	\brief Reinitializes the object to the specified path or path and file
 	name combination.
 	\param path the path name
 	\param leaf the leaf name (may be \c NULL)
 	\param normalize boolean flag used to force normalization; normalization
-		   may occur even if false (see \ref MustNormalize).
+		   may occur even if false (see \ref _MustNormalize).
 	\return
 	- \c B_OK: The initialization was successful.
 	- \c B_BAD_VALUE: \c NULL \a path or absolute \a leaf.
@@ -175,7 +198,7 @@
 	\note \code path.SetTo(path.Path(), "new leaf") \endcode is safe.
 */
 status_t
-BPath::SetTo(const char *path, const char *leaf, bool normalize)
+BPath::SetTo(const char* path, const char* leaf, bool normalize)
 {
 	status_t error = (path ? B_OK : B_BAD_VALUE);
 	if (error == B_OK && leaf && BPrivate::Storage::is_absolute_path(leaf))
@@ -207,13 +230,9 @@
 			}
 		}
 		// check, if necessary to normalize
-		if (error == B_OK && !normalize) {
-			try {		
-				normalize = normalize || MustNormalize(newPath);
-			} catch (BPath::EBadInput) {
-				error = B_BAD_VALUE;
-			}
-		}
+		if (error == B_OK && !normalize)
+			normalize = normalize || _MustNormalize(newPath, &error);
+
 		// normalize the path, if necessary, otherwise just set it
 		if (error == B_OK) {
 			if (normalize) {
@@ -223,7 +242,7 @@
 				if (error == B_OK)
 					return SetTo(&entry);
 			} else
-				error = set_path(newPath);
+				error = _SetPath(newPath);
 		}
 	}
 	// cleanup, if something went wrong
@@ -232,14 +251,15 @@
 	fCStatus = error;
 	return error;
 }
-	
+
+
 /*!	\brief Reinitializes the object to the specified directory and relative
 	path combination.
 	\param dir Refers to the directory that provides the base component of the
 		   pathname.
 	\param path the relative path name (may be \c NULL)
 	\param normalize boolean flag used to force normalization; normalization
-		   may occur even if false (see \ref MustNormalize).
+		   may occur even if false (see \ref _MustNormalize).
 	\return
 	- \c B_OK: The initialization was successful.
 	- \c B_BAD_VALUE: \c NULL \a dir or absolute \a path.
@@ -247,7 +267,7 @@
 	- other error codes.
 */
 status_t
-BPath::SetTo(const BDirectory *dir, const char *path, bool normalize)
+BPath::SetTo(const BDirectory* dir, const char* path, bool normalize)
 {
 	status_t error = (dir && dir->InitCheck() == B_OK ? B_OK : B_BAD_VALUE);
 	// get the path of the BDirectory
@@ -265,23 +285,25 @@
 	fCStatus = error;
 	return error;
 }
-	
+
+
 /*!	\brief Returns the object to an uninitialized state. The object frees any
 	resources it allocated and marks itself as uninitialized.
 */
 void
 BPath::Unset()
 {
-	set_path(NULL);
+	_SetPath(NULL);
 	fCStatus = B_NO_INIT;
 }
-	
+
+
 /*!	\brief Appends the given (relative) path to the end of the current path.
 	This call fails if the path is absolute or the object to which you're
 	appending is uninitialized.
 	\param path relative pathname to append to current path (may be \c NULL).
 	\param normalize boolean flag used to force normalization; normalization
-		   may occur even if false (see \ref MustNormalize).
+		   may occur even if false (see \ref _MustNormalize).
 	\return
 	- \c B_OK: The initialization was successful.
 	- \c B_BAD_VALUE: The object is not properly initialized.
@@ -289,7 +311,7 @@
 	- other error codes.
 */
 status_t
-BPath::Append(const char *path, bool normalize)
+BPath::Append(const char* path, bool normalize)
 {
 	status_t error = (InitCheck() == B_OK ? B_OK : B_BAD_VALUE);
 	if (error == B_OK)
@@ -299,41 +321,45 @@
 	fCStatus = error;
 	return error;
 }
-	
-//! Returns the object's complete path name.
-/*!	\return
+
+
+/*! \brief Returns the object's complete path name.
+	\return
 	- the object's path name, or
 	- \c NULL, if it is not properly initialized.
 */
-const char *
+const char*
 BPath::Path() const
 {
 	return fName;
 }
-	
-//! Returns the leaf portion of the object's path name.
-/*!	The leaf portion is defined as the string after the last \c '/'. For
+
+
+/*! \brief Returns the leaf portion of the object's path name.
+	The leaf portion is defined as the string after the last \c '/'. For
 	the root path (\c "/") it is the empty string (\c "").
 	\return
 	- the leaf portion of the object's path name, or
 	- \c NULL, if it is not properly initialized.
 */
-const char *
+const char*
 BPath::Leaf() const
 {
-	const char *result = NULL;
-	if (InitCheck() == B_OK) {
-		result = fName + strlen(fName);
-		// There should be no need for the second condition, since we deal
-		// with absolute paths only and those contain at least one '/'.
-		// However, it doesn't harm.
-		while (*result != '/' && result > fName)
-			result--;
-		result++;
-	}
+	if (InitCheck() != B_OK)
+		return NULL;
+
+	const char* result = fName + strlen(fName);
+	// There should be no need for the second condition, since we deal
+	// with absolute paths only and those contain at least one '/'.
+	// However, it doesn't harm.
+	while (*result != '/' && result > fName)
+		result--;
+	result++;
+
 	return result;
 }
 
+
 /*! \brief Calls the argument's SetTo() method with the name of the
 	object's parent directory.
 	No normalization is done.
@@ -346,96 +372,107 @@
 	- other error code returned by SetTo().
 */
 status_t
-BPath::GetParent(BPath *path) const
+BPath::GetParent(BPath* path) const
 {
-	status_t error = (path ? B_OK : B_BAD_VALUE);
-	if (error == B_OK)
-		error = InitCheck();
-	if (error == B_OK) {
-		int32 len = strlen(fName);
-		if (len == 1)	// handle "/"
-			error = B_ENTRY_NOT_FOUND;
-		else {
-			char parentPath[B_PATH_NAME_LENGTH];
-			len--;
-			while (fName[len] != '/' && len > 0)
-				len--;
-			if (len == 0)	// parent dir is "/"
-				len++;
-			memcpy(parentPath, fName, len);
-			parentPath[len] = 0;
-			error = path->SetTo(parentPath);
-		}
+	if (path == NULL)
+		return B_BAD_VALUE;
+
+	status_t error = InitCheck();
+	if (error != B_OK)
+		return error;
+
+	int32 length = strlen(fName);
+	if (length == 1) {
+		// handle "/" (path is supposed to be absolute)
+		return B_ENTRY_NOT_FOUND;
 	}
-	return error;
+
+	char parentPath[B_PATH_NAME_LENGTH];
+	length--;
+	while (fName[length] != '/' && length > 0)
+		length--;
+	if (length == 0) {
+		// parent dir is "/"
+		length++;
+	}
+	memcpy(parentPath, fName, length);
+	parentPath[length] = '\0';
+
+	return path->SetTo(parentPath);
 }
-	
-//! Performs a simple (string-wise) comparison of paths.
-/*!	No normalization takes place! Uninitialized BPath objects are considered
+
+
+/*! \brief Performs a simple (string-wise) comparison of paths.
+	No normalization takes place! Uninitialized BPath objects are considered
 	to be equal.
 	\param item the BPath object to be compared with
 	\return \c true, if the path names are equal, \c false otherwise.
 */
 bool
-BPath::operator==(const BPath &item) const
+BPath::operator==(const BPath& item) const
 {
-	return (*this == item.Path());
+	return *this == item.Path();
 }
 
-//! Performs a simple (string-wise) comparison of paths.
-/*!	No normalization takes place!
+
+/*! \brief Performs a simple (string-wise) comparison of paths.
+	No normalization takes place!
 	\param path the path name to be compared with
 	\return \c true, if the path names are equal, \c false otherwise.
 */
 bool
-BPath::operator==(const char *path) const
+BPath::operator==(const char* path) const
 {
-	return ((InitCheck() != B_OK && path == NULL)
-			|| (fName != NULL && path != NULL && strcmp(fName, path) == 0));
+	return (InitCheck() != B_OK && path == NULL)
+		|| (fName != NULL && path != NULL && strcmp(fName, path) == 0);
 }
 
-//! Performs a simple (string-wise) comparison of paths.
-/*!	No normalization takes place! Uninitialized BPath objects are considered
+
+/*! \brief Performs a simple (string-wise) comparison of paths.
+	No normalization takes place! Uninitialized BPath objects are considered
 	to be equal.
 	\param item the BPath object to be compared with
 	\return \c true, if the path names are not equal, \c false otherwise.
 */
 bool
-BPath::operator!=(const BPath &item) const
+BPath::operator!=(const BPath& item) const
 {
 	return !(*this == item);
 }
 
-//! Performs a simple (string-wise) comparison of paths.
-/*!	No normalization takes place!
+
+/*! \brief Performs a simple (string-wise) comparison of paths.
+	No normalization takes place!
 	\param path the path name to be compared with
 	\return \c true, if the path names are not equal, \c false otherwise.
 */
 bool
-BPath::operator!=(const char *path) const
+BPath::operator!=(const char* path) const
 {
 	return !(*this == path);
 }
-	
-//! Initializes the object to be a copy of the argument.
-/*!	\param item the BPath object to be copied
+
+
+/*! \brief Initializes the object to be a copy of the argument.
+	\param item the BPath object to be copied
 	\return \c *this
 */
 BPath&
-BPath::operator=(const BPath &item)
+BPath::operator=(const BPath& item)
 {
 	if (this != &item)
 		*this = item.Path();
 	return *this;
 }
 
-//! Initializes the object to be a copy of the argument.
-/*!	Has the same effect as \code SetTo(path) \endcode.
+
+/*! \brief Initializes the object to be a copy of the argument.
+	Has the same effect as \code SetTo(path) \endcode.
 	\param path the path name to be assigned to this object
 	\return \c *this
 */
 BPath&
-BPath::operator=(const char *path)
+BPath::operator=(const char* path)
 {
 	if (path == NULL)
 		Unset();
@@ -445,8 +482,9 @@
 }
 
 
-// BFlattenable functionality
+//	#pragma mark - BFlattenable functionality
 
+
 // that's the layout of a flattened entry_ref
 struct flattened_entry_ref {
 	dev_t device;
@@ -459,8 +497,8 @@
 	= sizeof(dev_t) + sizeof(ino_t);
 
 
-//! Returns \c false.
-/*!	Implements BFlattenable.
+/*! \brief Returns \c false.
+	Implements BFlattenable.
 	\return \c false
 */
 bool
@@ -468,9 +506,10 @@
 {
 	return false;
 }
-	
-//! Returns \c B_REF_TYPE.
-/*!	Implements BFlattenable.
+
+
+/*! \brief Returns \c B_REF_TYPE.
+	Implements BFlattenable.
 	\return \c B_REF_TYPE
 */
 type_code
@@ -478,7 +517,8 @@
 {
 	return B_REF_TYPE;
 }
-	
+
+
 /*!	\brief Returns the size of the flattened entry_ref structure that
 	represents the pathname.
 	Implements BFlattenable.
@@ -497,7 +537,8 @@
 	}
 	return size;
 }
-	
+
+
 /*!	\brief Converts the object's pathname to an entry_ref and writes it into
 	buffer.
 	Implements BFlattenable.
@@ -510,43 +551,52 @@
 	\todo Reimplement for performance reasons: Don't call FlattenedSize().
 */
 status_t
-BPath::Flatten(void *buffer, ssize_t size) const
+BPath::Flatten(void* buffer, ssize_t size) const
 {
-	status_t error = (buffer ? B_OK : B_BAD_VALUE);
-	if (error == B_OK) {
-		ssize_t flattenedSize = FlattenedSize();
-		if (flattenedSize < 0)
-			error = flattenedSize;
-		if (error == B_OK && size < flattenedSize)
-			error = B_BAD_VALUE;
-		if (error == B_OK) {
-			// convert the path to an entry_ref
-			BEntry entry;
-			entry_ref ref;
-			if (InitCheck() == B_OK && entry.SetTo(Path()) == B_OK)
-				entry.GetRef(&ref);
-			// store the entry_ref in the buffer
-			flattened_entry_ref &fref = *(flattened_entry_ref*)buffer;
-			fref.device = ref.device;
-			fref.directory = ref.directory;
-			if (ref.name)
-				strcpy(fref.name, ref.name);
-		}
-	}
-	return error;
+	if (buffer == NULL)
+		return B_BAD_VALUE;
+
+	ssize_t flattenedSize = FlattenedSize();
+	if (flattenedSize < 0)
+		return flattenedSize;
+	if (size < flattenedSize)
+		return B_BAD_VALUE;
+	status_t status = InitCheck();
+	if (status != B_OK)
+		return status;
+
+	// convert the path to an entry_ref
+	BEntry entry;
+	entry_ref ref;
+	status = entry.SetTo(Path());
+	if (status == B_OK)
+		status = entry.GetRef(&ref);
+	if (status != B_OK)
+		return status;
+
+	// store the entry_ref in the buffer
+	flattened_entry_ref& fref = *(flattened_entry_ref*)buffer;
+	fref.device = ref.device;
+	fref.directory = ref.directory;
+	if (ref.name)
+		strcpy(fref.name, ref.name);
+
+	return B_OK;
 }
-	
-//! Returns \c true if code is \c B_REF_TYPE, and false otherwise.
-/*!	Implements BFlattenable.
+
+
+/*! \brief Returns \c true if code is \c B_REF_TYPE, and false otherwise.
+	Implements BFlattenable.
 	\param code the type code in question
 	\return \c true if code is \c B_REF_TYPE, and false otherwise.
 */
 bool
 BPath::AllowsTypeCode(type_code code) const
 {
-	return (code == B_REF_TYPE);
+	return code == B_REF_TYPE;
 }
-	
+
+
 /*!	\brief Initializes the BPath with the flattened entry_ref data that's
 	found in the supplied buffer.
 	The type code must be \c B_REF_TYPE.
@@ -561,12 +611,12 @@
 	- other error codes.
 */
 status_t
-BPath::Unflatten(type_code code, const void *buf, ssize_t size)
+BPath::Unflatten(type_code code, const void* buffer, ssize_t size)
 {
 	Unset();
 	status_t error = B_OK;
 	// check params
-	if (!(code == B_REF_TYPE && buf
+	if (!(code == B_REF_TYPE && buffer != NULL
 		  && size >= (ssize_t)flattened_entry_ref_size)) {
 		error = B_BAD_VALUE;
 	}
@@ -575,7 +625,8 @@
 			// already Unset();
 		} else {
 			// reconstruct the entry_ref from the buffer
-			const flattened_entry_ref &fref = *(const flattened_entry_ref*)buf;
+			const flattened_entry_ref& fref
+				= *(const flattened_entry_ref*)buffer;
 			BString name(fref.name, size - flattened_entry_ref_size);
 			entry_ref ref(fref.device, fref.directory, name.String());
 			error = SetTo(&ref);
@@ -586,10 +637,12 @@
 	return error;
 }
 
+
 void BPath::_WarPath1() {}
 void BPath::_WarPath2() {}
 void BPath::_WarPath3() {}
 
+
 /*!	\brief Sets the supplied path.
 	The path is copied. If \c NULL, the object's path is set to NULL as well.
 	The object's old path is deleted.
@@ -599,10 +652,10 @@
 	- \c B_NO_MEMORY: Insufficient memory.
 */
 status_t
-BPath::set_path(const char *path)
+BPath::_SetPath(const char* path)
 {
 	status_t error = B_OK;
-	const char *oldPath = fName;
+	const char* oldPath = fName;
 	// set the new path
 	if (path) {
 		fName = new(nothrow) char[strlen(path) + 1];
@@ -612,37 +665,39 @@
 			error = B_NO_MEMORY;
 	} else
 		fName = NULL;
+
 	// delete the old one
 	delete[] oldPath;
 	return error;
 }
 
 
-
 /*! \brief Checks a path to see if normalization is required.
 
 	The following items require normalization:
-		- Relative pathnames (after concatenation; e.g. "boot/ltj")	
+		- Relative pathnames (after concatenation; e.g. "boot/ltj")
 		- The presence of "." or ".." ("/boot/ltj/../ltj/./gwar")
 		- Redundant slashes ("/boot//ltj")
 		- A trailing slash ("/boot/ltj/")
-	
+
+	\param _error A pointer to an error variable that will be set if the input
+		is not a valid path.
 	\return
 		- \c true: \a path requires normalization
 		- \c false: \a path does not require normalization
-
-	\exception BPath::EBadInput :  \a path is \c NULL or an empty string.
-
- */
+*/
 bool
-BPath::MustNormalize(const char *path)
+BPath::_MustNormalize(const char* path, status_t* _error)
 {
 	// Check for useless input
-	if (path == NULL || path[0] == 0)
-		throw BPath::EBadInput();
-		
-	int len = strlen(path);	
-		
+	if (path == NULL || path[0] == 0) {
+		if (_error != NULL)
+			*_error = B_BAD_VALUE;
+		return false;
+	}
+
+	int len = strlen(path);
+
 	/* Look for anything in the string that forces us to normalize:
 			+ No leading /
 			+ any occurence of /./ or /../ or //, or a trailing /. or /..
@@ -661,54 +716,52 @@
 			OneDot,
 			TwoDots
 		} state = NoMatch;
-		
+
 		for (int i = 0; path[i] != 0; i++) {
 			switch (state) {
 				case NoMatch:
 					if (path[i] == '/')
 						state = InitialSlash;
 					break;
-				
+
 				case InitialSlash:
 					if (path[i] == '/')
 						return true;		// "*//*"
-					else if (path[i] == '.')
+
+					if (path[i] == '.')
 						state = OneDot;
 					else
 						state = NoMatch;
 					break;
-				
+
 				case OneDot:
 					if (path[i] == '/')
 						return true;		// "*/./*"
-					else if (path[i] == '.')
+
+					if (path[i] == '.')
 						state = TwoDots;
 					else
 						state = NoMatch;
 					break;
-					
+
 				case TwoDots:
 					if (path[i] == '/')
 						return true;		// "*/../*"
-					else

[... truncated: 35 lines follow ...]


From axeld at mail.berlios.de  Mon May 18 11:10:58 2009
From: axeld at mail.berlios.de (axeld at BerliOS)
Date: Mon, 18 May 2009 11:10:58 +0200
Subject: [Haiku-commits] r30788 - haiku/trunk/src/servers/registrar
Message-ID: <200905180910.n4I9Awsf031709@sheep.berlios.de>

Author: axeld
Date: 2009-05-18 11:10:58 +0200 (Mon, 18 May 2009)
New Revision: 30788
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30788&view=rev

Modified:
   haiku/trunk/src/servers/registrar/TRoster.cpp
   haiku/trunk/src/servers/registrar/TRoster.h
Log:
* _IsSystemApp() did not work anymore with the new directory hierarchy. It will
  now check for the complete path instead of just the prefix. This fixes bug
  #3862.
* Made TRoster.h self contained.
* Style cleanup.


Modified: haiku/trunk/src/servers/registrar/TRoster.cpp
===================================================================
--- haiku/trunk/src/servers/registrar/TRoster.cpp	2009-05-18 09:09:23 UTC (rev 30787)
+++ haiku/trunk/src/servers/registrar/TRoster.cpp	2009-05-18 09:10:58 UTC (rev 30788)
@@ -7,8 +7,14 @@
 	applications.
 */
 
+#include "TRoster.h"
+
 #include 
 
+#include 
+#include 
+#include 
+
 #include 
 #include 
 #include 
@@ -18,14 +24,9 @@
 #include 
 #include 
 #include 
-#include 	// for B_BACKGROUND_APP
 #include 
 #include 
 
-#include 
-#include 
-#include 
-
 #include "AppInfoListMessagingTargetSet.h"
 #include "Debug.h"
 #include "EventMaskWatcher.h"
@@ -33,17 +34,12 @@
 #include "RegistrarDefs.h"
 #include "RosterAppInfo.h"
 #include "RosterSettingsCharStream.h"
-#include "TRoster.h"
 
 using std::nothrow;
 using namespace BPrivate;
 
 
-static bool larger_index(const recent_entry *entry1, const recent_entry *entry2);
-
-
-/*!
-	\class TRoster
+/*!	\class TRoster
 	\brief Implements the application roster.
 
 	This class handles the BRoster requests. For each kind a hook method is
@@ -70,21 +66,21 @@
 //! The maximal period of time an app may be early pre-registered (60 s).
 const bigtime_t kMaximalEarlyPreRegistrationPeriod = 60000000LL;
 
-//! Applications living in this tree are considered "vital system apps".
-static const char *const kVitalSystemAppPathPrefix
-	= "/boot/system/servers";
+//! Applications living in these directory are considered "system apps".
+// TODO: move those into a common shared system header
+static const char* const kSystemAppPath = "/boot/system";
+static const char* const kSystemServerPath = "/boot/system/servers";
 
-//! Applications living in this tree are considered "system apps".
-static const char *const kSystemAppPathPrefix = "/boot/system";
 
-// get_default_roster_settings_file
+//	#pragma mark - Private local functions
+
+
 /*!	\brief Returns the path to the default roster settings.
 	\param path BPath to be set to the roster settings path.
 	\return the settings path as C string (\code path.Path() \endcode).
 */
-static
-const char *
-get_default_roster_settings_file(BPath &path)
+static const char*
+get_default_roster_settings_file(BPath& path)
 {
 	// get the path of the settings dir and append the subpath of our file
 	status_t error = find_directory(B_USER_SETTINGS_DIRECTORY, &path);
@@ -99,7 +95,27 @@
 	return path.Path();
 }
 
-// constructor
+
+/*! \brief Returns true if entry1's index is larger than entry2's index.
+
+	Also returns true if either entry is \c NULL.
+
+	Used for sorting the recent entry lists loaded from disk into the
+	proper order.
+*/
+bool
+larger_index(const recent_entry* entry1, const recent_entry* entry2)
+{
+	if (entry1 && entry2)
+		return entry1->index > entry2->index;
+
+	return true;
+}
+
+
+//	#pragma mark -
+
+
 /*!	\brief Creates a new roster.
 
 	The object is completely initialized and ready to handle requests.
@@ -122,19 +138,19 @@
 	_LoadRosterSettings();
 }
 
-// destructor
+
 /*!	\brief Frees all resources associated with this object.
 */
 TRoster::~TRoster()
 {
 }
 
-// HandleAddApplication
+
 /*!	\brief Handles an AddApplication() request.
 	\param request The request message
 */
 void
-TRoster::HandleAddApplication(BMessage *request)
+TRoster::HandleAddApplication(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -142,7 +158,7 @@
 
 	status_t error = B_OK;
 	// get the parameters
-	const char *signature;
+	const char* signature;
 	entry_ref ref;
 	uint32 flags;
 	team_id team;
@@ -163,9 +179,10 @@
 		port = -1;
 	if (request->FindBool("full_registration", &fullReg) != B_OK)
 		fullReg = false;
-PRINT(("team: %ld, signature: %s\n", team, signature));
-PRINT(("full registration: %d\n", fullReg));
 
+	PRINT(("team: %ld, signature: %s\n", team, signature));
+	PRINT(("full registration: %d\n", fullReg));
+
 	if (fShuttingDown)
 		error = B_SHUTTING_DOWN;
 
@@ -183,10 +200,10 @@
 
 	// entry_ref
 	if (error == B_OK) {
-PRINT(("flags: %lx\n", flags));
-PRINT(("ref: %ld, %lld, %s\n", ref.device, ref.directory, ref.name));
+		PRINT(("flags: %lx\n", flags));
+		PRINT(("ref: %ld, %lld, %s\n", ref.device, ref.directory, ref.name));
 		// check single/exclusive launchers
-		RosterAppInfo *info = NULL;
+		RosterAppInfo* info = NULL;
 		if ((launchFlags == B_SINGLE_LAUNCH
 			 || launchFlags ==  B_EXCLUSIVE_LAUNCH)
 			&& ((info = info = fRegisteredApps.InfoFor(&ref)) != NULL
@@ -200,7 +217,7 @@
 	// signature
 	if (error == B_OK && signature) {
 		// check exclusive launchers
-		RosterAppInfo *info = NULL;
+		RosterAppInfo* info = NULL;
 		if (launchFlags == B_EXCLUSIVE_LAUNCH
 			&& (((info = fRegisteredApps.InfoFor(signature)))
 				|| ((info = fEarlyPreRegisteredApps.InfoFor(signature))))) {
@@ -222,7 +239,7 @@
 	// Add the application info.
 	if (error == B_OK) {
 		// alloc and init the info
-		RosterAppInfo *info = new(nothrow) RosterAppInfo;
+		RosterAppInfo* info = new(nothrow) RosterAppInfo;
 		if (info) {
 			info->Init(thread, team, port, flags, &ref, signature);
 			if (fullReg)
@@ -233,14 +250,15 @@
 			// add it to the right list
 			bool addingSuccess = false;
 			if (team >= 0) {
-PRINT(("added ref: %ld, %lld, %s\n", info->ref.device, info->ref.directory, info->ref.name));
+				PRINT(("added ref: %ld, %lld, %s\n", info->ref.device,
+					info->ref.directory, info->ref.name));
 				addingSuccess = (AddApp(info) == B_OK);
 				if (addingSuccess && fullReg)
 					_AppAdded(info);
 			} else {
 				token = info->token = _NextToken();
 				addingSuccess = fEarlyPreRegisteredApps.AddInfo(info);
-PRINT(("added to early pre-regs, token: %lu\n", token));
+				PRINT(("added to early pre-regs, token: %lu\n", token));
 			}
 			if (!addingSuccess)
 				SET_ERROR(error, B_NO_MEMORY);
@@ -258,7 +276,6 @@
 			fRecentApps.Add(signature, flags);
 		else
 			fRecentApps.Add(&ref, flags);
-//		fRecentApps.Print();
 
 		BMessage reply(B_REG_SUCCESS);
 		// The token is valid only when no team ID has been supplied.
@@ -278,12 +295,12 @@
 	FUNCTION_END();
 }
 
-// HandleCompleteRegistration
+
 /*!	\brief Handles a CompleteRegistration() request.
 	\param request The request message
 */
 void
-TRoster::HandleCompleteRegistration(BMessage *request)
+TRoster::HandleCompleteRegistration(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -317,7 +334,7 @@
 	if (error == B_OK) {
 		if (team >= 0) {
 			// everything is fine -- set the values
-			RosterAppInfo *info = fRegisteredApps.InfoFor(team);
+			RosterAppInfo* info = fRegisteredApps.InfoFor(team);
 			if (info && info->state == APP_STATE_PRE_REGISTERED) {
 				info->thread = thread;
 				info->port = port;
@@ -342,12 +359,12 @@
 	FUNCTION_END();
 }
 
-// HandleIsAppRegistered
+
 /*!	\brief Handles an IsAppRegistered() request.
 	\param request The request message
 */
 void
-TRoster::HandleIsAppRegistered(BMessage *request)
+TRoster::HandleIsAppRegistered(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -377,7 +394,7 @@
 		SET_ERROR(error, B_BAD_VALUE);
 
 	// look up the information
-	RosterAppInfo *info = NULL;
+	RosterAppInfo* info = NULL;
 	if (error == B_OK) {
 		if ((info = fRegisteredApps.InfoFor(team)) != NULL) {
 			PRINT(("found team in fRegisteredApps\n"));
@@ -411,12 +428,12 @@
 	FUNCTION_END();
 }
 
-// HandleRemovePreRegApp
+
 /*!	\brief Handles a RemovePreRegApp() request.
 	\param request The request message
 */
 void
-TRoster::HandleRemovePreRegApp(BMessage *request)
+TRoster::HandleRemovePreRegApp(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -429,7 +446,7 @@
 		SET_ERROR(error, B_BAD_VALUE);
 	// remove the app
 	if (error == B_OK) {
-		RosterAppInfo *info = fEarlyPreRegisteredApps.InfoForToken(token);
+		RosterAppInfo* info = fEarlyPreRegisteredApps.InfoForToken(token);
 		if (info) {
 			fEarlyPreRegisteredApps.RemoveInfo(info);
 			delete info;
@@ -449,12 +466,12 @@
 	FUNCTION_END();
 }
 
-// HandleRemoveApp
+
 /*!	\brief Handles a RemoveApp() request.
 	\param request The request message
 */
 void
-TRoster::HandleRemoveApp(BMessage *request)
+TRoster::HandleRemoveApp(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -465,10 +482,12 @@
 	team_id team;
 	if (request->FindInt32("team", &team) != B_OK)
 		team = -1;
-PRINT(("team: %ld\n", team));
+
+	PRINT(("team: %ld\n", team));
+
 	// remove the app
 	if (error == B_OK) {
-		if (RosterAppInfo *info = fRegisteredApps.InfoFor(team)) {
+		if (RosterAppInfo* info = fRegisteredApps.InfoFor(team)) {
 			RemoveApp(info);
 			delete info;
 		} else
@@ -487,18 +506,19 @@
 	FUNCTION_END();
 }
 
-// HandleSetThreadAndTeam
+
 /*!	\brief Handles a SetThreadAndTeam() request.
 	\param request The request message
 */
 void
-TRoster::HandleSetThreadAndTeam(BMessage *request)
+TRoster::HandleSetThreadAndTeam(BMessage* request)
 {
 	FUNCTION_START();
 
 	BAutolock _(fLock);
 
 	status_t error = B_OK;
+
 	// get the parameters
 	team_id team;
 	thread_id thread;
@@ -509,14 +529,17 @@
 		thread = -1;
 	if (request->FindInt32("token", (int32*)&token) != B_OK)
 		SET_ERROR(error, B_BAD_VALUE);
+
 	// check the parameters
 	// team
 	if (error == B_OK && team < 0)
 		SET_ERROR(error, B_BAD_VALUE);
-PRINT(("team: %ld, thread: %ld, token: %lu\n", team, thread, token));
+
+	PRINT(("team: %ld, thread: %ld, token: %lu\n", team, thread, token));
+
 	// update the app_info
 	if (error == B_OK) {
-		RosterAppInfo *info = fEarlyPreRegisteredApps.InfoForToken(token);
+		RosterAppInfo* info = fEarlyPreRegisteredApps.InfoForToken(token);
 		if (info) {
 			// Set thread and team, create a port for the application and
 			// move the app_info from the list of the early pre-registered
@@ -544,7 +567,7 @@
 			// handle pending IsAppRegistered() requests
 			IARRequestMap::iterator it = fIARRequestsByID.find(team);
 			if (it != fIARRequestsByID.end()) {
-				BMessageQueue *requests = it->second;
+				BMessageQueue* requests = it->second;
 				if (error == B_OK)
 					_ReplyToIARRequests(requests, info);
 				delete requests;
@@ -553,7 +576,7 @@
 
 			it = fIARRequestsByToken.find((int32)token);
 			if (it != fIARRequestsByToken.end()) {
-				BMessageQueue *requests = it->second;
+				BMessageQueue* requests = it->second;
 				if (error == B_OK)
 					_ReplyToIARRequests(requests, info);
 				delete requests;
@@ -575,12 +598,12 @@
 	FUNCTION_END();
 }
 
-// HandleSetSignature
+
 /*!	\brief Handles a SetSignature() request.
 	\param request The request message
 */
 void
-TRoster::HandleSetSignature(BMessage *request)
+TRoster::HandleSetSignature(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -589,14 +612,14 @@
 	status_t error = B_OK;
 	// get the parameters
 	team_id team;
-	const char *signature;
+	const char* signature;
 	if (request->FindInt32("team", &team) != B_OK)
 		error = B_BAD_VALUE;
 	if (request->FindString("signature", &signature) != B_OK)
 		error = B_BAD_VALUE;
 	// find the app and set the signature
 	if (error == B_OK) {
-		if (RosterAppInfo *info = fRegisteredApps.InfoFor(team))
+		if (RosterAppInfo* info = fRegisteredApps.InfoFor(team))
 			strcpy(info->signature, signature);
 		else
 			SET_ERROR(error, B_REG_APP_NOT_REGISTERED);
@@ -614,12 +637,12 @@
 	FUNCTION_END();
 }
 
-// HandleGetAppInfo
+
 /*!	\brief Handles a Get{Running,Active,}AppInfo() request.
 	\param request The request message
 */
 void
-TRoster::HandleGetAppInfo(BMessage *request)
+TRoster::HandleGetAppInfo(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -629,7 +652,7 @@
 	// get the parameters
 	team_id team;
 	entry_ref ref;
-	const char *signature;
+	const char* signature;
 	bool hasTeam = true;
 	bool hasRef = true;
 	bool hasSignature = true;
@@ -639,14 +662,16 @@
 		hasRef = false;
 	if (request->FindString("signature", &signature) != B_OK)
 		hasSignature = false;
+
 if (hasTeam)
 PRINT(("team: %ld\n", team));
 if (hasRef)
 PRINT(("ref: %ld, %lld, %s\n", ref.device, ref.directory, ref.name));
 if (hasSignature)
 PRINT(("signature: %s\n", signature));
+
 	// get the info
-	RosterAppInfo *info = NULL;
+	RosterAppInfo* info = NULL;
 	if (error == B_OK) {
 		if (hasTeam) {
 			info = fRegisteredApps.InfoFor(team);
@@ -683,12 +708,12 @@
 	FUNCTION_END();
 }
 
-// HandleGetAppList
+
 /*!	\brief Handles a GetAppList() request.
 	\param request The request message
 */
 void
-TRoster::HandleGetAppList(BMessage *request)
+TRoster::HandleGetAppList(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -696,7 +721,7 @@
 
 	status_t error = B_OK;
 	// get the parameters
-	const char *signature;
+	const char* signature;
 	if (request->FindString("signature", &signature) != B_OK)
 		signature = NULL;
 	// reply to the request
@@ -704,7 +729,7 @@
 		BMessage reply(B_REG_SUCCESS);
 		// get the list
 		for (AppInfoList::Iterator it(fRegisteredApps.It());
-			 RosterAppInfo *info = *it;
+			 RosterAppInfo* info = *it;
 			 ++it) {
 			if (info->state != APP_STATE_REGISTERED)
 				continue;
@@ -730,7 +755,7 @@
 	\param request The request message
 */
 void
-TRoster::HandleUpdateActiveApp(BMessage *request)
+TRoster::HandleUpdateActiveApp(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -744,7 +769,7 @@
 
 	// activate the app
 	if (error == B_OK) {
-		if (RosterAppInfo *info = fRegisteredApps.InfoFor(team))
+		if (RosterAppInfo* info = fRegisteredApps.InfoFor(team))
 			UpdateActiveApp(info);
 		else
 			error = B_BAD_TEAM_ID;
@@ -765,12 +790,12 @@
 	FUNCTION_END();
 }
 
-// HandleBroadcast
+
 /*!	\brief Handles a Broadcast() request.
 	\param request The request message
 */
 void
-TRoster::HandleBroadcast(BMessage *request)
+TRoster::HandleBroadcast(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -806,13 +831,13 @@
 		class BroadcastMessagingTargetSet
 			: public AppInfoListMessagingTargetSet {
 			public:
-				BroadcastMessagingTargetSet(AppInfoList &list, team_id team)
+				BroadcastMessagingTargetSet(AppInfoList& list, team_id team)
 					: AppInfoListMessagingTargetSet(list, true),
 					  fTeam(team)
 				{
 				}
 
-				virtual bool Filter(const RosterAppInfo *info)
+				virtual bool Filter(const RosterAppInfo* info)
 				{
 					return AppInfoListMessagingTargetSet::Filter(info)
 						&& (info->team != fTeam);
@@ -834,12 +859,12 @@
 	FUNCTION_END();
 }
 
-// HandleStartWatching
+
 /*!	\brief Handles a StartWatching() request.
 	\param request The request message
 */
 void
-TRoster::HandleStartWatching(BMessage *request)
+TRoster::HandleStartWatching(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -855,7 +880,7 @@
 		error = B_BAD_VALUE;
 	// add the new watcher
 	if (error == B_OK) {
-		Watcher *watcher = new(nothrow) EventMaskWatcher(target, events);
+		Watcher* watcher = new(nothrow) EventMaskWatcher(target, events);
 		if (watcher) {
 			if (!fWatchingService.AddWatcher(watcher)) {
 				error = B_NO_MEMORY;
@@ -877,12 +902,12 @@
 	FUNCTION_END();
 }
 
-// HandleStopWatching
+
 /*!	\brief Handles a StopWatching() request.
 	\param request The request message
 */
 void
-TRoster::HandleStopWatching(BMessage *request)
+TRoster::HandleStopWatching(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -911,12 +936,12 @@
 	FUNCTION_END();
 }
 
-// HandleGetRecentDocuments
+
 /*!	\brief Handles a GetRecentDocuments() request.
 	\param request The request message
 */
 void
-TRoster::HandleGetRecentDocuments(BMessage *request)
+TRoster::HandleGetRecentDocuments(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -927,12 +952,12 @@
 	FUNCTION_END();
 }
 
-// HandleGetRecentFolders
+
 /*!	\brief Handles a GetRecentFolders() request.
 	\param request The request message
 */
 void
-TRoster::HandleGetRecentFolders(BMessage *request)
+TRoster::HandleGetRecentFolders(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -943,12 +968,12 @@
 	FUNCTION_END();
 }
 
-// HandleGetRecentApps
+
 /*!	\brief Handles a GetRecentApps() request.
 	\param request The request message
 */
 void
-TRoster::HandleGetRecentApps(BMessage *request)
+TRoster::HandleGetRecentApps(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -971,12 +996,12 @@
 	FUNCTION_END();
 }
 
-// HandleAddToRecentDocuments
+
 /*!	\brief Handles an AddToRecentDocuments() request.
 	\param request The request message
 */
 void
-TRoster::HandleAddToRecentDocuments(BMessage *request)
+TRoster::HandleAddToRecentDocuments(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -988,7 +1013,7 @@
 	}
 
 	entry_ref ref;
-	const char *appSig;
+	const char* appSig;
 	BMessage reply(B_REG_RESULT);
 
 	status_t error = request->FindRef("ref", &ref);
@@ -1002,12 +1027,12 @@
 	FUNCTION_END();
 }
 
-// HandleAddToRecentFolders
+
 /*!	\brief Handles an AddToRecentFolders() request.
 	\param request The request message
 */
 void
-TRoster::HandleAddToRecentFolders(BMessage *request)
+TRoster::HandleAddToRecentFolders(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -1019,7 +1044,7 @@
 	}
 
 	entry_ref ref;
-	const char *appSig;
+	const char* appSig;
 	BMessage reply(B_REG_RESULT);
 
 	status_t error = request->FindRef("ref", &ref);
@@ -1033,12 +1058,12 @@
 	FUNCTION_END();
 }
 
-// HandleAddToRecentApps
+
 /*!	\brief Handles an AddToRecentApps() request.
 	\param request The request message
 */
 void
-TRoster::HandleAddToRecentApps(BMessage *request)
+TRoster::HandleAddToRecentApps(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -1049,7 +1074,7 @@
 		return;
 	}
 
-	const char *appSig;
+	const char* appSig;
 	BMessage reply(B_REG_RESULT);
 
 	status_t error = request->FindString("app sig", &appSig);
@@ -1061,8 +1086,9 @@
 	FUNCTION_END();
 }
 
+
 void
-TRoster::HandleLoadRecentLists(BMessage *request)
+TRoster::HandleLoadRecentLists(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -1073,7 +1099,7 @@
 		return;
 	}
 
-	const char *filename;
+	const char* filename;
 	BMessage reply(B_REG_RESULT);
 
 	status_t error = request->FindString("filename", &filename);
@@ -1085,8 +1111,9 @@
 	FUNCTION_END();
 }
 
+
 void
-TRoster::HandleSaveRecentLists(BMessage *request)
+TRoster::HandleSaveRecentLists(BMessage* request)
 {
 	FUNCTION_START();
 
@@ -1097,7 +1124,7 @@
 		return;
 	}
 
-	const char *filename;
+	const char* filename;
 	BMessage reply(B_REG_RESULT);
 
 	status_t error = request->FindString("filename", &filename);
@@ -1109,7 +1136,7 @@
 	FUNCTION_END();
 }
 
-// ClearRecentDocuments
+
 /*!	\brief Clears the current list of recent documents
 */
 void
@@ -1120,7 +1147,7 @@
 	fRecentDocuments.Clear();
 }
 
-// ClearRecentFolders
+
 /*!	\brief Clears the current list of recent folders
 */
 void
@@ -1131,7 +1158,7 @@
 	fRecentFolders.Clear();
 }
 
-// ClearRecentApps
+
 /*!	\brief Clears the current list of recent apps
 */
 void
@@ -1142,7 +1169,7 @@
 	fRecentApps.Clear();
 }
 
-// Init
+
 /*!	\brief Initializes the roster.
 
 	Currently only adds the registrar to the roster.
@@ -1163,7 +1190,7 @@
 		return fLock.Sem();
 
 	// create the info
-	RosterAppInfo *info = new(nothrow) RosterAppInfo;
+	RosterAppInfo* info = new(nothrow) RosterAppInfo;
 	if (!info)
 		error = B_NO_MEMORY;
 
@@ -1175,9 +1202,8 @@
 	// init and add the info
 	if (error == B_OK) {
 		info->Init(be_app->Thread(), be_app->Team(),
-				   BMessenger::Private(be_app_messenger).Port(),
-				   B_EXCLUSIVE_LAUNCH | B_BACKGROUND_APP, &ref,
-				   kRegistrarSignature);
+			BMessenger::Private(be_app_messenger).Port(),
+			B_EXCLUSIVE_LAUNCH | B_BACKGROUND_APP, &ref, kRegistrarSignature);
 		info->state = APP_STATE_REGISTERED;
 		info->registration_time = system_time();
 		error = AddApp(info);
@@ -1190,13 +1216,13 @@
 	return error;
 }
 
-// AddApp
+
 /*!	\brief Add the supplied app info to the list of (pre-)registered apps.
 
 	\param info The app info to be added
 */
 status_t
-TRoster::AddApp(RosterAppInfo *info)
+TRoster::AddApp(RosterAppInfo* info)
 {
 	BAutolock _(fLock);
 
@@ -1208,14 +1234,14 @@
 	return error;
 }
 
-// RemoveApp
+
 /*!	\brief Removes the supplied app info from the list of (pre-)registered
 	apps.
 
 	\param info The app info to be removed
 */
 void
-TRoster::RemoveApp(RosterAppInfo *info)
+TRoster::RemoveApp(RosterAppInfo* info)
 {
 	BAutolock _(fLock);
 
@@ -1239,13 +1265,13 @@
 	\param info The info of the app to be activated
 */
 void
-TRoster::UpdateActiveApp(RosterAppInfo *info)
+TRoster::UpdateActiveApp(RosterAppInfo* info)
 {
 	BAutolock _(fLock);
 
 	if (info != fActiveApp) {
 		// deactivate the currently active app
-		RosterAppInfo *oldActiveApp = fActiveApp;
+		RosterAppInfo* oldActiveApp = fActiveApp;
 		fActiveApp = NULL;
 		if (oldActiveApp)
 			_AppDeactivated(oldActiveApp);
@@ -1258,7 +1284,7 @@
 	}
 }
 
-// CheckSanity
+
 /*!	\brief Checks whether the (pre-)registered applications are still running.
 
 	This is necessary, since killed applications don't unregister properly.
@@ -1301,7 +1327,7 @@
 		// don't delete infos a second time
 }
 
-// SetShuttingDown
+
 /*!	\brief Tells the roster whether a shutdown process is in progess at the
 		   moment.
 
@@ -1319,7 +1345,7 @@
 	fShuttingDown = shuttingDown;
 }
 
-// GetShutdownApps
+
 /*!	\brief Returns lists of applications to be asked to quit on shutdown.
 
 	\param userApps List of RosterAppInfos identifying the user applications.
@@ -1332,8 +1358,8 @@
 	\return \c B_OK, if everything went fine, another error code otherwise.
 */
 status_t
-TRoster::GetShutdownApps(AppInfoList &userApps, AppInfoList &systemApps,
-	AppInfoList &backgroundApps, hash_set &vitalSystemApps)
+TRoster::GetShutdownApps(AppInfoList& userApps, AppInfoList& systemApps,
+	AppInfoList& backgroundApps, hash_set& vitalSystemApps)
 {
 	BAutolock _(fLock);
 
@@ -1362,17 +1388,17 @@
 	}
 
 	// debug server
-	RosterAppInfo *info =
+	RosterAppInfo* info =
 		fRegisteredApps.InfoFor("application/x-vnd.haiku-debug_server");
 	if (info)
 		vitalSystemApps.insert(info->team);
 
 	// populate the other groups
 	for (AppInfoList::Iterator it(fRegisteredApps.It());
-		 RosterAppInfo *info = *it;
+		 RosterAppInfo* info = *it;
 		 ++it) {
 		if (vitalSystemApps.find(info->team) == vitalSystemApps.end()) {
-			RosterAppInfo *clonedInfo = info->Clone();
+			RosterAppInfo* clonedInfo = info->Clone();
 			if (clonedInfo) {
 				if (_IsSystemApp(info)) {
 					if (!systemApps.AddInfo(clonedInfo))
@@ -1410,9 +1436,9 @@
 	return error;
 }
 
-// AddWatcher
+
 status_t
-TRoster::AddWatcher(Watcher *watcher)
+TRoster::AddWatcher(Watcher* watcher)
 {
 	BAutolock _(fLock);
 
@@ -1426,9 +1452,8 @@
 }
 
 
-// RemoveWatcher
 void
-TRoster::RemoveWatcher(Watcher *watcher)
+TRoster::RemoveWatcher(Watcher* watcher)
 {
 	BAutolock _(fLock);
 
@@ -1437,12 +1462,11 @@
 }
 
 
-// _AppAdded
 /*!	\brief Hook method invoked, when an application has been fully registered.
 	\param info The RosterAppInfo of the added application.
 */
 void
-TRoster::_AppAdded(RosterAppInfo *info)
+TRoster::_AppAdded(RosterAppInfo* info)
 {
 	// notify the watchers
 	BMessage message(B_SOME_APP_LAUNCHED);
@@ -1451,12 +1475,13 @@
 	fWatchingService.NotifyWatchers(&message, &filter);
 }
 
-// _AppRemoved
-/*!	\brief Hook method invoked, when a fully registered application has been removed.
+
+/*!	\brief Hook method invoked, when a fully registered application has been
+		removed.
 	\param info The RosterAppInfo of the removed application.
 */
 void
-TRoster::_AppRemoved(RosterAppInfo *info)
+TRoster::_AppRemoved(RosterAppInfo* info)
 {
 	if (info) {
 		// deactivate the app, if it was the active one
@@ -1471,55 +1496,51 @@
 	}
 }
 
-// _AppActivated
+
 /*!	\brief Hook method invoked, when an application has been activated.
 	\param info The RosterAppInfo of the activated application.
 */
 void
-TRoster::_AppActivated(RosterAppInfo *info)
+TRoster::_AppActivated(RosterAppInfo* info)
 {
-	if (info) {
-		if (info->state == APP_STATE_REGISTERED) {
-			// send B_APP_ACTIVATED to the app
-			BMessenger messenger;
-			BMessenger::Private messengerPrivate(messenger);
-			messengerPrivate.SetTo(info->team, info->port, B_NULL_TOKEN);
-			BMessage message(B_APP_ACTIVATED);
-			message.AddBool("active", true);
-			// not sure, if it makes sense to use the MessageDeliverer here
-			MessageDeliverer::Default()->DeliverMessage(&message, messenger);
+	if (info != NULL && info->state == APP_STATE_REGISTERED) {
+		// send B_APP_ACTIVATED to the app
+		BMessenger messenger;
+		BMessenger::Private messengerPrivate(messenger);
+		messengerPrivate.SetTo(info->team, info->port, B_NULL_TOKEN);
+		BMessage message(B_APP_ACTIVATED);
+		message.AddBool("active", true);
+		// not sure, if it makes sense to use the MessageDeliverer here
+		MessageDeliverer::Default()->DeliverMessage(&message, messenger);
 
-			// notify the watchers
-			BMessage watcherMessage(B_SOME_APP_ACTIVATED);
-			_AddMessageWatchingInfo(&watcherMessage, info);
-			EventMaskWatcherFilter filter(B_REQUEST_ACTIVATED);
-			fWatchingService.NotifyWatchers(&watcherMessage, &filter);
-		}
+		// notify the watchers
+		BMessage watcherMessage(B_SOME_APP_ACTIVATED);
+		_AddMessageWatchingInfo(&watcherMessage, info);
+		EventMaskWatcherFilter filter(B_REQUEST_ACTIVATED);
+		fWatchingService.NotifyWatchers(&watcherMessage, &filter);
 	}
 }
 
-// _AppDeactivated
+
 /*!	\brief Hook method invoked, when an application has been deactivated.
 	\param info The RosterAppInfo of the deactivated application.

[... truncated: 511 lines follow ...]


From humdingerb at mail.berlios.de  Mon May 18 17:03:51 2009
From: humdingerb at mail.berlios.de (humdingerb at mail.berlios.de)
Date: Mon, 18 May 2009 17:03:51 +0200
Subject: [Haiku-commits] r30789 - haiku/trunk/docs/userguide/en/applications
Message-ID: <200905181503.n4IF3pSu019556@sheep.berlios.de>

Author: humdingerb
Date: 2009-05-18 17:03:44 +0200 (Mon, 18 May 2009)
New Revision: 30789
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30789&view=rev

Modified:
   haiku/trunk/docs/userguide/en/applications/apps-bepdf.html
   haiku/trunk/docs/userguide/en/applications/apps-bezillabrowser.html
Log:
* Included lelldorin's tip on using the html2pdf add-on to overcome BeZilla's
  aversion to printing.
* Fixed typo in apps-bepdf.html.


Modified: haiku/trunk/docs/userguide/en/applications/apps-bepdf.html
===================================================================
--- haiku/trunk/docs/userguide/en/applications/apps-bepdf.html	2009-05-18 09:10:58 UTC (rev 30788)
+++ haiku/trunk/docs/userguide/en/applications/apps-bepdf.html	2009-05-18 15:03:44 UTC (rev 30789)
@@ -45,7 +45,7 @@
 Settings:/boot/common/settings/BePDF
 
 BePDF is Haiku's fast launching PDF viewer. Besides viewing, it supports annotating and user-defined bookmarking for unencrypted PDFs. It's fully localized for 20 languages at the moment with additional languages being easily added via text files.
-BePDF comes with its own documentation as HTML or as PDF. The later will also open from the menu Help | Show Help...
+BePDF comes with its own documentation as HTML or as PDF. The latter will also open from the menu Help | Show Help...
 
 

Changes done for each driverversion:

head (SVN 0.85, Rudolf)

head (SVN 0.87, Rudolf)

Changes done for each driverversion:

head (SVN 0.87, Rudolf)

head (SVN 0.88, Rudolf)

nv_driver 0.80 (Rudolf)

Changes done for each driverversion:

head (SVN 0.88, Rudolf)

head (SVN 0.89, Rudolf)

nv_driver 0.80 (Rudolf)

nv_driver 0.80 (Rudolf)

The basic boot process

Haiku in a virtual machine

Installing from a downloaded RAW image

Compiling/Installing from source code

Downloading the tools and the Haiku source

Changes done for each driverversion:

head (SVN 0.89, Rudolf)

head (SVN 0.90, Rudolf)

nv_driver 0.80 (Rudolf)