Merge branch 'master' of ssh://git.haiku-os.org/haiku

build/jam/HaikuImage

@@ -751,10 +751,12 @@ CopyDirectoryToHaikuImage develop sample-code
 	: [ FDirName $(HAIKU_TOP) src libs pdflib bind pdflib ]
 	: pdflib ;
 
-# Copy Mesa3D GL headers into image
+# Copy OpenGL kit headers into image
 if $(TARGET_ARCH) = x86 {
 	CopyDirectoryToHaikuImage develop headers os opengl
 		: [ FDirName $(HAIKU_MESA_HEADERS) GL ] ;
+	CopyDirectoryToHaikuImage develop headers os opengl
+		: [ FDirName $(HAIKU_GLU_HEADERS) GL ] ;
 }
 
 #pragma mark - Optional Packages

build/jam/OptionalPackages

@@ -297,8 +297,8 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] {
 				: $(baseURL)/bepdf-1.1.1b4-x86-gcc4-2012-08-11.zip ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				bepdf-1.1.1b4-r1a4-x86-gcc2-2012-08-30.zip
-				: $(baseURL)/bepdf-1.1.1b4-r1a4-x86-gcc2-2012-08-30.zip ;
+				bepdf-1.1.1b4-r1a4-x86-gcc2-2013-01-02.zip
+				: $(baseURL)/bepdf-1.1.1b4-r1a4-x86-gcc2-2013-01-02.zip ;
 		}
 		AddSymlinkToHaikuImage home config settings deskbar Applications
 			: /boot/apps/BePDF/BePDF ;
@@ -2282,8 +2282,8 @@ if [ IsOptionalHaikuImagePackageAdded WonderBrush ] {
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
 		Echo "No optional package WonderBrush available for gcc4" ;
 	} else {
-		InstallOptionalHaikuImagePackage WonderBrush-2.1.2.zip
-			: $(baseURL)/WonderBrush-2.1.2-x86-gcc2-2008-11-08.zip
+		InstallOptionalHaikuImagePackage WonderBrush-2.1.2-a.zip
+			: $(baseURL)/WonderBrush-2.1.2-x86-gcc2-2013-01-02.zip
 			: apps ;
 		AddSymlinkToHaikuImage home config settings deskbar Applications
 			: /boot/apps/WonderBrush/WonderBrush ;

src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp

@@ -673,10 +673,14 @@ DwarfImageDebugInfo::CreateFrame(Image* image,
 			instructionPointer, functionInstance->Address() - fRelocationDelta,
 			subprogramEntry->Variables(), subprogramEntry->Blocks());
 
+		// TODO: re-enable once PIC and false positive issues
+		// are properly dealt with
+#if 0
 		if (returnFunctionAddress != 0) {
 			_CreateReturnValue(returnFunctionAddress, image, frame,
 				*stackFrameDebugInfo);
 		}
+#endif
 	}
 
 	_frame = frameReference.Detach();

src/apps/installer/InstallerApp.cpp

@@ -10,9 +10,12 @@
 #include <Button.h>
 #include <LayoutBuilder.h>
 #include <Locale.h>
+#include <Roster.h>
 #include <ScrollView.h>
 #include <TextView.h>
 
+#include "tracker_private.h"
+
 
 static const uint32 kMsgAgree = 'agre';
 
@@ -183,7 +186,7 @@ InstallerApp::ReadyToRun()
 	infoText << B_TRANSLATE(
 		"NOTE: While the naming strategy for hard disks is still as described "
 		"under 2.1) the naming scheme for partitions has changed.\n\n");
-	infoText << B_TRANSLATE(		
+	infoText << B_TRANSLATE(
 		"GRUB's naming scheme is still: (hdN,n)\n\n");
 	infoText << B_TRANSLATE(
 		"All hard disks start with \"hd\".\n");
@@ -250,8 +253,11 @@ InstallerApp::ReadyToRun()
 
 	BRect eulaFrame = BRect(0, 0, 600, 450);
 	fEULAWindow = new BWindow(eulaFrame, B_TRANSLATE("README"),
-		B_MODAL_WINDOW, B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE
-			| B_AUTO_UPDATE_SIZE_LIMITS);
+		B_MODAL_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_NOT_ZOOMABLE
+			| B_NOT_MINIMIZABLE | B_AUTO_UPDATE_SIZE_LIMITS);
+
+	if (!be_roster->IsRunning(kTrackerSignature))
+		fEULAWindow->SetWorkspaces(B_ALL_WORKSPACES);
 
 	BLayoutBuilder::Group<>(fEULAWindow, B_VERTICAL, 10)
 		.SetInsets(10)

src/apps/installer/InstallerWindow.cpp

@@ -165,6 +165,9 @@ InstallerWindow::InstallerWindow()
 	fWorkerThread(new WorkerThread(this)),
 	fCopyEngineCancelSemaphore(-1)
 {
+	if (!be_roster->IsRunning(kTrackerSignature))
+		SetWorkspaces(B_ALL_WORKSPACES);
+
 	LogoView* logoView = new LogoView();
 
 	fStatusView = new BTextView("statusView", be_plain_font, NULL,

src/apps/readonlybootprompt/BootPromptWindow.cpp

@@ -137,7 +137,8 @@ compare_void_list_items(const void* _a, const void* _b)
 BootPromptWindow::BootPromptWindow()
 	:
 	BWindow(BRect(0, 0, 530, 400), "",
-		B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_NOT_CLOSABLE),
+		B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_NOT_CLOSABLE,
+		B_ALL_WORKSPACES),
 	fDefaultKeymapItem(NULL)
 {
 	SetSizeLimits(450, 16384, 350, 16384);

src/kits/interface/Window.cpp

@@ -2139,13 +2139,13 @@ BWindow::DecoratorFrame() const
 		// else use fall-back values from above
 	}
 
-	if (fLook & kLeftTitledWindowLook) {
+	if (fLook == kLeftTitledWindowLook) {
 		decoratorFrame.top -= borderWidth;
-		decoratorFrame.left -= tabRect.Width();
+		decoratorFrame.left -= borderWidth + tabRect.Width();
 		decoratorFrame.right += borderWidth;
 		decoratorFrame.bottom += borderWidth;
 	} else {
-		decoratorFrame.top -= tabRect.Height();
+		decoratorFrame.top -= borderWidth + tabRect.Height();
 		decoratorFrame.left -= borderWidth;
 		decoratorFrame.right += borderWidth;
 		decoratorFrame.bottom += borderWidth;

src/kits/tracker/AUTHORS

@@ -7,4 +7,4 @@ Jeff Bush,
 Robert Chinn,
 Doug Fulton,
 Kenny Carruthers,
-Dianne Hackborn
+Dianne Hackborn

src/kits/tracker/AttributeStream.h

@@ -79,7 +79,7 @@ class AttributeInfo {
 	AttributeInfo(const AttributeInfo &);
 	AttributeInfo(const char*, attr_info);
 	AttributeInfo(const char*, uint32, off_t);
-	
+
 	void SetTo(const AttributeInfo &);
 	void SetTo(const char*, attr_info);
 	void SetTo(const char*, uint32, off_t);
@@ -186,7 +186,7 @@ class AttributeStreamFileNode : public AttributeStreamNode {
 private:
 	AttributeInfo fCurrentAttr;
 	BNode* fNode;
-	
+
 	typedef AttributeStreamNode _inherited;
 };
 
@@ -224,7 +224,7 @@ class AttributeStreamMemoryNode : public AttributeStreamNode {
 			{
 				delete [] fData;
 			}
-			
+
 		AttributeInfo fAttr;
 		char* fData;
 	};

src/kits/tracker/Bitmaps.h

@@ -87,7 +87,7 @@ class BImageResources
 
 private:
 	image_id find_image(void* memAddr) const;
-	
+
 	mutable BLocker fLock;
 	BResources fResources;
 };

src/kits/tracker/DeskWindow.h

@@ -67,9 +67,9 @@ class BDeskWindow : public BContainerWindow {
 
 	void UpdateDesktopBackgroundImages();
 		// Desktop window has special background image handling
-		
+
 	void SaveDesktopPoseLocations();
-	
+
 protected:
 	virtual	void AddWindowContextMenus(BMenu*);
 	virtual BPoseView* NewPoseView(Model*, BRect, uint32);
@@ -84,7 +84,7 @@ class BDeskWindow : public BContainerWindow {
 	BPopUpMenu* fTrashContextMenu;
 
 	BRect fOldFrame;
-	
+
 	// in the desktop window addon shortcuts have to be added by AddShortcut
 	// and we don't always get the MenusBeginning call to check for new
 	// addons/update the shortcuts -- instead we need to node monitor the
@@ -93,7 +93,7 @@ class BDeskWindow : public BContainerWindow {
 	bool fShouldUpdateAddonShortcuts;
 	std::set<uint32> fCurrentAddonShortcuts;
 		// keeps track of which shortcuts are installed for Tracker addons
-	
+
 	typedef BContainerWindow _inherited;
 };
 

src/kits/tracker/DesktopPoseView.cpp

@@ -271,11 +271,11 @@ DesktopPoseView::AdaptToDesktopIntegrationChange(BMessage* message)
 {
 	bool mountVolumesOnDesktop = true;
 	bool mountSharedVolumesOntoDesktop = true;
-	
+
 	message->FindBool("MountVolumesOntoDesktop", &mountVolumesOnDesktop);
 	message->FindBool("MountSharedVolumesOntoDesktop",
 		&mountSharedVolumesOntoDesktop);
-	
+
 	ShowVolumes(false, mountSharedVolumesOntoDesktop);
 	ShowVolumes(mountVolumesOnDesktop, mountSharedVolumesOntoDesktop);
 }

src/kits/tracker/DesktopPoseView.h

@@ -31,7 +31,7 @@ of Be Incorporated in the United States and other countries. Other brand product
 names are registered trademarks or trademarks of their respective holders.
 All rights reserved.
 */
-	
+
 //	DesktopPoseView adds support for displaying integrated desktops
 //	from multiple volumes to BPoseView
 #ifndef	_DESKTOP_POSE_VIEW_H

src/kits/tracker/DialogPane.cpp

@@ -505,7 +505,7 @@ PaneSwitch::DrawInState(PaneSwitch::State state)
 	switch (state) {
 		case kCollapsed:
 			BeginLineArray(6);
-			
+
 			if (fLeftAligned) {
 				AddLine(BPoint(rect.left + 3, rect.top + 1),
 					BPoint(rect.left + 3, rect.bottom - 1), outlineColor);

src/kits/tracker/DialogPane.h

@@ -68,15 +68,15 @@ class DialogPane : public BView {
 									uint32 flags = B_WILL_DRAW);
 
 	virtual						~DialogPane();
-	
+
 			BRect				FrameForMode(int32);
 			BRect				BoundsForMode(int32);
-	
+
 			int32				Mode() const;
 	virtual	void				SetMode(int32, bool initialSetup = false);
-	
+
 			void				AddItem(BView*, int32 toMode);
-	
+
 			void				SetSwitch(BControl*);
 
 	virtual	void				AttachedToWindow();
@@ -87,18 +87,18 @@ class DialogPane : public BView {
 		// called only by the constructor
 
 	virtual	void				MessageReceived(BMessage* message);
-	
+
 private:
 			int32				fMode;
 
 			BRect				fMode1Frame;
 			BRect				fMode2Frame;
 			BRect				fMode3Frame;
-	
+
 			ViewList			fMode2Items;
 			ViewList			fMode3Items;
 			BControl*			fLatch;
-	
+
 	typedef BView _inherited;
 };
 

src/kits/tracker/FBCPadding.cpp

@@ -145,6 +145,6 @@ SetPanelDirectory__10BFilePanelFP9entry_ref
 {
 	self->SetPanelDirectory(r);
 }
-	
+
 }
 #endif

src/kits/tracker/FSClipboard.cpp

@@ -266,7 +266,7 @@ FSClipboardAddPoses(const node_ref* directory, PoseList* list,
 						refsAdded++;
 					} else {
 						clip->RemoveName(modeName);
-						
+
 						clipNode.node = *node;
 						clipNode.moveMode = kDelete;	// note removing node
 						updateMessage.AddData("tcnode", T_CLIPBOARD_NODE,
@@ -280,7 +280,7 @@ FSClipboardAddPoses(const node_ref* directory, PoseList* list,
 					if (clip->AddRef(refName, model->EntryRef()) == B_OK
 						&& clip->AddInt32(modeName, (int32)moveMode) == B_OK) {
 						pose->SetClipboardMode(moveMode);
-						
+
 						clipNode.node = *node;
 						updateMessage.AddData("tcnode", T_CLIPBOARD_NODE,
 							&clipNode, sizeof(TClipboardNodeRef), true,
@@ -422,7 +422,7 @@ FSClipboardPaste(Model* model, uint32 linksMode)
 				uint32 newMoveMode = 0;
 				bool sameDirectory = destNodeRef->device == ref.device
 					&& destNodeRef->node == ref.directory;
-				
+
 				if (!entry.Exists()) {
 					// The entry doesn't exist anymore, so we'll remove
 					// that entry from the clipboard as well
@@ -567,7 +567,7 @@ FSClipboardFindNodeMode(Model* model, bool autoLock, bool updateRefIfNeeded)
 	}
 	if (change)
 		be_clipboard->Commit();
-	
+
 	if (autoLock)
 		be_clipboard->Unlock();
 
@@ -744,7 +744,7 @@ BClipboardRefsWatcher::UpdateNode(node_ref* node, entry_ref* ref)
 			clip->RemoveName(name);
 			MakeModeName(name);
 			clip->RemoveName(name);
-			
+
 			RemoveNode(node);
 		}
 		be_clipboard->Commit();

src/kits/tracker/FavoritesMenu.cpp

@@ -166,7 +166,7 @@ FavoritesMenu::AddNextItem()
 			BMenuItem* item = BNavMenu::NewModelItem(&model,
 				model.IsDirectory() ? fOpenFolderMessage : fOpenFileMessage,
 				fTarget);
-				
+
 			if (item == NULL)
 				return true;
 
@@ -314,7 +314,7 @@ FavoritesMenu::ShouldShowModel(const Model* model)
 
 	if (!fRefFilter || model->Node() == NULL)
 		return true;
-	
+
 	struct stat_beos statBeOS;
 	convert_to_stat_beos(model->StatBuf(), &statBeOS);
 

src/kits/tracker/FavoritesMenu.h

@@ -58,7 +58,7 @@ class FavoritesMenu : public BSlowMenu {
 			BMessage* openFileMessage, const BMessenger &,
 			bool isSavePanel, BRefFilter* filter = NULL);
 		virtual ~FavoritesMenu();
-		
+
 		void SetRefFilter(BRefFilter* filter);
 
 	private:
@@ -67,9 +67,9 @@ class FavoritesMenu : public BSlowMenu {
 		virtual bool AddNextItem();
 		virtual void DoneBuildingItemList();
 		virtual void ClearMenuBuildingState();
-				
+
 		bool ShouldShowModel(const Model* model);
-		
+
 		BMessage* fOpenFolderMessage;
 		BMessage* fOpenFileMessage;
 		BMessenger fTarget;

src/kits/tracker/FindPanel.cpp

@@ -219,7 +219,7 @@ FindWindow::FindWindow(const entry_ref* newRef, bool editIfTemplateOnly)
 
 	fFromTemplate = IsQueryTemplate(fFile);
 
-	fBackground = new FindPanel(Bounds(), fFile, this, fFromTemplate, 
+	fBackground = new FindPanel(Bounds(), fFile, this, fFromTemplate,
 		fEditTemplateOnly);
 	AddChild(fBackground);
 }

src/kits/tracker/FunctionObject.h

@@ -240,7 +240,7 @@ class ThreeParamFunctionObject : public FunctionObject {
 			p3(p3)
 		{
 		}
-	
+
 	virtual void operator()() { (function)(p1.Pass(), p2.Pass(), p3.Pass()); }
 
 private:

src/kits/tracker/GroupedMenu.cpp

@@ -24,7 +24,7 @@ TMenuItemGroup::TMenuItemGroup(const char* name)
 TMenuItemGroup::~TMenuItemGroup()
 {
 	free((char*)fName);
-	
+
 	if (fMenu == NULL) {
 		BMenuItem* item;
 		while ((item = RemoveItem((int32)0)) != NULL)

src/kits/tracker/IconCache.cpp

@@ -526,7 +526,7 @@ IconCache::GetIconFromFileTypes(ModelNodeLazyOpener* modelOpener,
 				(SharedCacheEntry*)entry);
 				// OK to cast here, have a runtime check
 			source = kPreferredAppForNode;
-				// set source as preferred for node, so that next time we 
+				// set source as preferred for node, so that next time we
 				// get a hit in the initial find that uses
 				// GetIconForPreferredApp
 		} else