Extracted the settings stuff from the Desktop class. If you now need to access

the desktop's settings, you have to do something like this:
	DesktopSettings settings(desktop);
	settings.SetMouseMode(mode);
The advantage of this is that this object is fully locked, and cannot lead to
corrupted settings anymore. Also, the settings will stay the same until you
delete the object again.
Updated all accesses to use this new API.
Removed no longer used FFM messages.
Implemented AS_{GET|SET}_MENU_INFO for future use.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13719 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/servers/app/DesktopSettings.cpp

@@ -0,0 +1,252 @@
+/*
+ * Copyright 2005, Haiku.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Stephan Aßmus <[email protected]>
+ *		Axel Dörfler, [email protected]
+ */
+
+
+#include "DesktopSettings.h"
+#include "DesktopSettingsPrivate.h"
+#include "Desktop.h"
+
+
+DesktopSettings::Private::Private()
+	: BLocker("desktop settings")
+{
+	// if the on-disk settings are not complete, the defaults will be kept
+	_SetDefaults();
+	_Load();
+}
+
+
+DesktopSettings::Private::~Private()
+{
+}
+
+
+void
+DesktopSettings::Private::_SetDefaults()
+{
+	fMouseMode = B_NORMAL_MOUSE;
+
+	// init scrollbar info
+	fScrollBarInfo.proportional = true;
+	fScrollBarInfo.double_arrows = false;
+	// look of the knob (R5: (0, 1, 2), 1 = default)
+	fScrollBarInfo.knob = 1;
+	fScrollBarInfo.min_knob_size = 15;
+
+	// init menu info
+	fMenuInfo.font_size = 12.0;
+// TODO: ...
+//	fMenuInfo.f_family;
+//	fMenuInfo.f_style;
+//	fMenuInfo.background_color = gColorSet->menu_background;
+	// look of the separator (R5: (0, 1, 2), default ?)
+	fMenuInfo.separator = 0;
+	fMenuInfo.click_to_open = true;
+	fMenuInfo.triggers_always_shown = false;
+
+	fWorkspacesCount = 1;
+}
+
+
+status_t
+DesktopSettings::Private::_Load()
+{
+	// TODO: add support for old app_server_settings file as well
+	return B_ERROR;
+}
+
+
+status_t
+DesktopSettings::Private::Save()
+{
+	return B_ERROR;
+}
+
+
+void
+DesktopSettings::Private::SetScrollBarInfo(const scroll_bar_info& info)
+{
+	fScrollBarInfo = info;
+}
+
+
+const scroll_bar_info&
+DesktopSettings::Private::ScrollBarInfo() const
+{
+	return fScrollBarInfo;
+}
+
+
+void
+DesktopSettings::Private::SetMenuInfo(const menu_info& info)
+{
+	fMenuInfo = info;
+}
+
+
+const menu_info&
+DesktopSettings::Private::MenuInfo() const
+{
+	return fMenuInfo;
+}
+
+
+void
+DesktopSettings::Private::SetMouseMode(const mode_mouse mode)
+{
+	fMouseMode = mode;
+}
+
+
+mode_mouse
+DesktopSettings::Private::MouseMode() const
+{
+	return fMouseMode;
+}
+
+
+bool
+DesktopSettings::Private::FocusFollowsMouse() const
+{
+	return MouseMode() != B_NORMAL_MOUSE;
+}
+
+
+void
+DesktopSettings::Private::SetWorkspacesCount(int32 number)
+{
+	if (number < 1)
+		number = 1;
+	else if (number > kMaxWorkspaces)
+		number = kMaxWorkspaces;
+
+	fWorkspacesCount = number;
+}
+
+
+int32
+DesktopSettings::Private::WorkspacesCount() const
+{
+	return fWorkspacesCount;
+}
+
+
+void
+DesktopSettings::Private::SetWorkspacesMessage(int32 index, BMessage& message)
+{
+	if (index < 0 || index > kMaxWorkspaces)
+		return;
+
+	fWorkspaceMessages[index] = message;
+}
+
+
+const BMessage*
+DesktopSettings::Private::WorkspacesMessage(int32 index) const
+{
+	if (index < 0 || index > kMaxWorkspaces)
+		return NULL;
+
+	return &fWorkspaceMessages[index];
+}
+
+
+
+//	#pragma mark -
+
+
+DesktopSettings::DesktopSettings(Desktop* desktop)
+{
+	fSettings = desktop->fSettings;
+	fSettings->Lock();
+}
+
+
+DesktopSettings::~DesktopSettings()
+{
+	fSettings->Unlock();
+}
+
+
+void
+DesktopSettings::SetScrollBarInfo(const scroll_bar_info& info)
+{
+	fSettings->SetScrollBarInfo(info);
+}
+
+
+void
+DesktopSettings::GetScrollBarInfo(scroll_bar_info& info) const
+{
+	info = fSettings->ScrollBarInfo();
+}
+
+
+void
+DesktopSettings::SetMenuInfo(const menu_info& info)
+{
+	fSettings->SetMenuInfo(info);
+}
+
+
+void
+DesktopSettings::GetMenuInfo(menu_info& info) const
+{
+	info = fSettings->MenuInfo();
+}
+
+
+void
+DesktopSettings::SetMouseMode(const mode_mouse mode)
+{
+	fSettings->SetMouseMode(mode);
+}
+
+
+mode_mouse
+DesktopSettings::MouseMode() const
+{
+	return fSettings->MouseMode();
+}
+
+
+bool
+DesktopSettings::FocusFollowsMouse() const
+{
+	return fSettings->FocusFollowsMouse();
+}
+
+
+void
+DesktopSettings::SetWorkspacesCount(int32 number)
+{
+	fSettings->SetWorkspacesCount(number);
+}
+
+
+int32
+DesktopSettings::WorkspacesCount() const
+{
+	return fSettings->WorkspacesCount();
+}
+
+
+void
+DesktopSettings::SetWorkspacesMessage(int32 index, BMessage& message)
+{
+	fSettings->SetWorkspacesMessage(index, message);
+}
+
+
+const BMessage*
+DesktopSettings::WorkspacesMessage(int32 index) const
+{
+	return fSettings->WorkspacesMessage(index);
+}
+