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
+				bepdf-1.1.1b4-r1a4-x86-gcc2-2013-01-02.zip
-				: $(baseURL)/bepdf-1.1.1b4-r1a4-x86-gcc2-2012-08-30.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
+		InstallOptionalHaikuImagePackage WonderBrush-2.1.2-a.zip
-			: $(baseURL)/WonderBrush-2.1.2-x86-gcc2-2008-11-08.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';
 
@@ -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_MODAL_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_NOT_ZOOMABLE
-			| B_AUTO_UPDATE_SIZE_LIMITS);
+			| 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/preferences/appearance/APRWindow.cpp

@@ -21,9 +21,9 @@
 
 #include "AntialiasingSettingsView.h"
 #include "APRView.h"
-#include "LookAndFeelSettingsView.h"
 #include "defs.h"
 #include "FontView.h"
+#include "LookAndFeelSettingsView.h"
 
 
 #undef B_TRANSLATION_CONTEXT
@@ -50,19 +50,19 @@ APRWindow::APRWindow(BRect frame)
 
 	BTabView* tabView = new BTabView("tabview", B_WIDTH_FROM_LABEL);
 
-	fLookAndFeelSettings = new LookAndFeelSettingsView(
-		B_TRANSLATE("Look and feel"));
-
 	fFontSettings = new FontView(B_TRANSLATE("Fonts"));
 
 	fColorsView = new APRView(B_TRANSLATE("Colors"));
 
+	fLookAndFeelSettings = new LookAndFeelSettingsView(
+		B_TRANSLATE("Look and feel"));
+
 	fAntialiasingSettings = new AntialiasingSettingsView(
 		B_TRANSLATE("Antialiasing"));
 
-	tabView->AddTab(fLookAndFeelSettings);
 	tabView->AddTab(fFontSettings);
 	tabView->AddTab(fColorsView);
+	tabView->AddTab(fLookAndFeelSettings);
 	tabView->AddTab(fAntialiasingSettings);
 
 	_UpdateButtons();
@@ -91,8 +91,8 @@ APRWindow::MessageReceived(BMessage *message)
 		case kMsgSetDefaults:
 			fFontSettings->SetDefaults();
 			fColorsView->SetDefaults();
-			fAntialiasingSettings->SetDefaults();
 			fLookAndFeelSettings->SetDefaults();
+			fAntialiasingSettings->SetDefaults();
 
 			_UpdateButtons();
 			break;
@@ -100,8 +100,8 @@ APRWindow::MessageReceived(BMessage *message)
 		case kMsgRevert:
 			fColorsView->Revert();
 			fAntialiasingSettings->Revert();
-			fFontSettings->Revert();
 			fLookAndFeelSettings->Revert();
+			fFontSettings->Revert();
 
 			_UpdateButtons();
 			break;
@@ -128,10 +128,10 @@ APRWindow::_IsDefaultable() const
 //	printf("colors defaultable: %d\n", fColorsView->IsDefaultable());
 //	printf("AA defaultable: %d\n", fAntialiasingSettings->IsDefaultable());
 //	printf("decor defaultable: %d\n", fLookAndFeelSettings->IsDefaultable());
-	return fColorsView->IsDefaultable()
+	return fFontSettings->IsDefaultable()
-		|| fFontSettings->IsDefaultable()
+		|| fColorsView->IsDefaultable()
-		|| fAntialiasingSettings->IsDefaultable()
+		|| fLookAndFeelSettings->IsDefaultable()
-		|| fLookAndFeelSettings->IsDefaultable();
+		|| fAntialiasingSettings->IsDefaultable();
 }
 
 
@@ -142,8 +142,8 @@ APRWindow::_IsRevertable() const
 //	printf("colors revertable: %d\n", fColorsView->IsRevertable());
 //	printf("AA revertable: %d\n", fAntialiasingSettings->IsRevertable());
 //	printf("decor revertable: %d\n", fLookAndFeelSettings->IsRevertable());
-	return fColorsView->IsRevertable()
+	return fFontSettings->IsRevertable()
-		|| fFontSettings->IsRevertable()
+		|| fColorsView->IsRevertable()
-		|| fAntialiasingSettings->IsRevertable()
+		|| fLookAndFeelSettings->IsRevertable()
-		|| fLookAndFeelSettings->IsRevertable();
+		|| fAntialiasingSettings->IsRevertable();
 }