Modified ColorSet to match new color_which defs in InterfaceDefs.h

Added ending newlines to a number of files


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

src/servers/app/server/AccelerantDriver.cpp

@@ -1757,7 +1757,7 @@ bool AccelerantDriver::DumpToFile(const char *path)
 */
 float AccelerantDriver::StringWidth(const char *string, int32 length, LayerData *d)
 {
-		if(!string || !d || !d->font)
+	if(!string || !d || !d->font)
 		return 0.0;
 	_Lock();
 

src/servers/app/server/AppServer.h

@@ -54,4 +54,4 @@ private:
 
 Decorator *instantiate_decorator(BRect rect, const char *title, int32 wlook, int32 wfeel,
 	int32 wflags, DisplayDriver *ddriver);
-#endif
+#endif

src/servers/app/server/ColorSet.cpp

@@ -57,13 +57,20 @@ ColorSet::ColorSet(const ColorSet &cs)
 	menu_selected_background=cs.menu_selected_background;
 	menu_text=cs.menu_text;
 	menu_selected_text=cs.menu_selected_text;
+	menu_selected_border=cs.menu_selected_border;
+
+	keyboard_navigation_base=cs.keyboard_navigation_base;
+	keyboard_navigation_pulse=cs.keyboard_navigation_pulse;
+
+	success=cs.success;
+	failure=cs.failure;
+	shine=cs.shine;
+	shadow=cs.shadow;
 
 	window_tab=cs.window_tab;
 	window_tab_text=cs.window_tab_text;
 	inactive_window_tab=cs.inactive_window_tab;
 	inactive_window_tab_text=cs.inactive_window_tab_text;
-	keyboard_navigation=cs.keyboard_navigation;
-	desktop=cs.desktop;
 }
 
 /*!
@@ -102,14 +109,20 @@ void ColorSet::SetColors(const ColorSet &cs)
 	menu_selected_background=cs.menu_selected_background;
 	menu_text=cs.menu_text;
 	menu_selected_text=cs.menu_selected_text;
+	menu_selected_border=cs.menu_selected_border;
+
+	keyboard_navigation_base=cs.keyboard_navigation_base;
+	keyboard_navigation_pulse=cs.keyboard_navigation_pulse;
+
+	success=cs.success;
+	failure=cs.failure;
+	shine=cs.shine;
+	shadow=cs.shadow;
 
 	window_tab=cs.window_tab;
 	window_tab_text=cs.window_tab_text;
 	inactive_window_tab=cs.inactive_window_tab;
 	inactive_window_tab_text=cs.inactive_window_tab_text;
-	
-	keyboard_navigation=cs.keyboard_navigation;
-	desktop=cs.desktop;
 }
 
 /*!
@@ -135,13 +148,19 @@ void ColorSet::PrintToStream(void)
 	printf("menu_selected_background "); menu_selected_background.PrintToStream();
 	printf("menu_text "); menu_text.PrintToStream();
 	printf("menu_selected_text "); menu_selected_text.PrintToStream();
+	printf("menu_selected_border "); menu_selected_border.PrintToStream();
+
+	printf("keyboard_navigation_base "); keyboard_navigation_base.PrintToStream();
+	printf("keyboard_navigation_pulse "); keyboard_navigation_pulse.PrintToStream();
+
+	printf("success "); success.PrintToStream();
+	printf("failure "); failure.PrintToStream();
+	printf("shine "); shine.PrintToStream();
+	printf("shadow "); shadow.PrintToStream();
 
 	printf("window_tab "); window_tab.PrintToStream();
 	printf("window_tab_text "); window_tab_text.PrintToStream();
 
 	printf("inactive_window_tab "); inactive_window_tab.PrintToStream();
 	printf("inactive_window_tab_text "); inactive_window_tab_text.PrintToStream();
-
-	printf("keyboard_navigation "); keyboard_navigation.PrintToStream();
-	printf("desktop "); desktop.PrintToStream();
 }

src/servers/app/server/ColorSet.h

@@ -61,14 +61,22 @@ public:
 	menu_selected_background,
 	menu_text,
 	menu_selected_text,
+	menu_selected_border,
 
+	keyboard_navigation_base,
+	keyboard_navigation_pulse,
+	
+	success,
+	failure,
+	shine,
+	shadow,
+
+	// Not all of these guys don't exist in InterfaceDefs.h, but we keep 
+	// them as part of the color set anyway - they're important nonetheless
 	window_tab,
 	window_tab_text,
 	inactive_window_tab,
-	inactive_window_tab_text,
+	inactive_window_tab_text;
-
-	keyboard_navigation,
-	desktop;
 };
 
-#endif
+#endif

src/servers/app/server/CursorManager.h

@@ -96,4 +96,4 @@ private:
 
 extern CursorManager *cursormanager;
 
-#endif
+#endif

src/servers/app/server/Decorator.h

@@ -29,6 +29,7 @@
 
 #include <SupportDefs.h>
 #include <Rect.h>
+#include <Region.h>
 #include <String.h>
 #include <Window.h>
 #include "LayerData.h"

src/servers/app/server/Desktop.h

@@ -60,4 +60,4 @@ void set_drag_message(int32 size, int8 *flattened);
 int8* get_drag_message(int32 *size);
 void empty_drag_message(void);
 
-#endif
+#endif

src/servers/app/server/DisplayDriver.h

@@ -29,7 +29,6 @@
 #define _DISPLAY_DRIVER_H_
 
 #include <GraphicsCard.h>
-#include <SupportDefs.h>
 #include <OS.h>
 
 #include <View.h>
@@ -168,4 +167,4 @@ private:
 	ServerCursor *_cursor;
 };
 
-#endif
+#endif

src/servers/app/server/FontFamily.h

@@ -159,4 +159,4 @@ protected:
 	BList *styles;
 };
 
-#endif
+#endif

src/servers/app/server/FontServer.h

@@ -69,12 +69,11 @@ public:
 	bool SetSystemBold(const char *family, const char *style, float size);
 	bool SetSystemFixed(const char *family, const char *style, float size);
 	bool FontsNeedUpdated(void) { return need_update; }
-
-	void FontsUpdated(void) { need_update=false; }
-protected:
 	/*!
 		\brief Called when the fonts list has been updated
 	*/
+	void FontsUpdated(void) { need_update=false; }
+protected:
 	FontFamily *_FindFamily(const char *name);
 	FT_CharMap _GetSupportedCharmap(const FT_Face &face);
 	bool init;
@@ -88,4 +87,4 @@ extern FTC_Manager ftmanager;
 extern FT_Library ftlib;
 extern FontServer *fontserver;
 
-#endif
+#endif

src/servers/app/server/Layer.h

@@ -33,6 +33,7 @@
 #include <List.h>
 #include <String.h>
 #include <OS.h>
+#include <Locker.h>
 #include "LayerData.h"
 
 class ServerWindow;
@@ -120,4 +121,4 @@ protected:
 extern BLocker *layerlock;
 extern BList *layerlist;
 extern Layer *rootlayer;
-#endif
+#endif

src/servers/app/server/LayerData.h

@@ -49,4 +49,4 @@ public:
 	float scale;
 	escapement_delta edelta;
 };
-#endif
+#endif

src/servers/app/server/RGBColor.h

@@ -74,4 +74,4 @@ protected:
 	uint8 color8;
 };
 
-#endif
+#endif

src/servers/app/server/RectUtils.h

@@ -1,3 +1,29 @@
+//------------------------------------------------------------------------------
+//	Copyright (c) 2001-2002, OpenBeOS
+//
+//	Permission is hereby granted, free of charge, to any person obtaining a
+//	copy of this software and associated documentation files (the "Software"),
+//	to deal in the Software without restriction, including without limitation
+//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
+//	and/or sell copies of the Software, and to permit persons to whom the
+//	Software is furnished to do so, subject to the following conditions:
+//
+//	The above copyright notice and this permission notice shall be included in
+//	all copies or substantial portions of the Software.
+//
+//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+//	DEALINGS IN THE SOFTWARE.
+//
+//	File Name:		RectUtils.h
+//	Author:			DarkWyrm <[email protected]>
+//	Description:	Utilities for work around R5 Interface Kit bugs
+//  
+//------------------------------------------------------------------------------
 #ifndef RECTUTILS_H_
 #define RECTUTILS_H_
 
@@ -9,4 +35,4 @@ bool TestRectIntersection(const BRect &r,const BRect &r2);
 bool TestRegionIntersection(BRegion *r,const BRect &r2);
 void IntersectRegionWith(BRegion *r,const BRect &r2);
 void ValidateRect(BRect *r);
-#endif
+#endif

src/servers/app/server/ServerApp.h

@@ -85,4 +85,4 @@ protected:
 	bool _isactive;
 };
 
-#endif
+#endif

src/servers/app/server/ServerBitmap.h

@@ -116,4 +116,4 @@ protected:
 	int _bpp;
 };
 
-#endif
+#endif

src/servers/app/server/ServerConfig.h

@@ -66,4 +66,4 @@
 // and ServerWindows
 #define DEFAULT_MONITOR_PORT_SIZE 30
 
-#endif
+#endif

src/servers/app/server/ServerCursor.h

@@ -63,4 +63,4 @@ private:
 	int32 _token;
 };
 
-#endif
+#endif

src/servers/app/server/ServerProtocol.h

@@ -109,4 +109,4 @@
 #define VIEW_GET_TOKEN 'vgtk'
 #define VIEW_ADD 'vadd'
 #define VIEW_REMOVE 'vrem'
-#endif
+#endif

src/servers/app/server/SharedObject.h

@@ -52,4 +52,4 @@ private:
 	uint32 dependents;
 };
 
-#endif
+#endif

src/servers/app/server/SystemPalette.h

@@ -33,4 +33,4 @@
 void GenerateSystemPalette(rgb_color *palette);
 extern rgb_color system_palette[];
 
-#endif
+#endif

src/servers/app/server/TokenHandler.h

@@ -50,4 +50,4 @@ private:
 	BList *_excludes;
 };
 
-#endif
+#endif

src/servers/app/server/ViewDriver.h

@@ -167,4 +167,4 @@ protected:
 	bool is_initialized;
 };
 
-#endif
+#endif