* Reenabled direct window mode, ie. reverted r32693.

* Fixed warnings with DEBUG enabled.
* Minor cleanup.


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

src/kits/game/DirectWindow.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008, Haiku Inc.
+ * Copyright 2003-2009, Haiku Inc.
  * Authors:
  *		Stefano Ceccherini <[email protected]>
  *		Carwyn Jones <[email protected]>
@@ -7,7 +7,12 @@
  * Distributed under the terms of the MIT License.
  */
 
+
 #include <DirectWindow.h>
+
+#include <stdio.h>
+#include <string.h>
+
 #include <Screen.h>
 
 #include <clipping.h>
@@ -15,10 +20,10 @@
 #include <DirectWindowPrivate.h>
 #include <ServerProtocol.h>
 
-#include <stdio.h>
-#include <string.h>
 
-//#define DEBUG 1
+//#define DEBUG		1
+#define OUTPUT		printf
+//#define OUTPUT	debug_printf
 
 
 // We don't need this kind of locking, since the directDaemonFunc
@@ -33,6 +38,8 @@ enum dw_status_bits {
 
 
 #if DEBUG
+
+
 static void
 print_direct_buffer_state(const direct_buffer_state &state)
 {
@@ -54,7 +61,7 @@ print_direct_buffer_state(const direct_buffer_state &state)
 	if (state & B_BUFFER_RESET)
 		strcat(string, " | B_BUFFER_RESET");
 
-	printf("direct_buffer_state: %s\n", string);	
+	OUTPUT("direct_buffer_state: %s\n", string);
 }
 
 
@@ -70,10 +77,13 @@ print_direct_driver_state(const direct_driver_state &state)
 	else if (state == B_MODE_CHANGED)
 		strcpy(string, "B_MODE_CHANGED");
 
-	printf("direct_driver_state: %s\n", string);
+	OUTPUT("direct_driver_state: %s\n", string);
 }
 
 
+#if DEBUG > 1
+
+
 static void
 print_direct_buffer_layout(const buffer_layout &layout)
 {
@@ -83,7 +93,7 @@ print_direct_buffer_layout(const buffer_layout &layout)
 	else
 		strcpy(string, "unknown");
 
-	printf("layout: %s\n", string);
+	OUTPUT("layout: %s\n", string);
 }
 
 
@@ -103,26 +113,30 @@ print_direct_buffer_orientation(const buffer_orientation &orientation)
 			break;
 	}
 
-	printf("orientation: %s\n", string);
+	OUTPUT("orientation: %s\n", string);
 }
 
 
+#endif	// DEBUG > 2
+
+
 static void
 print_direct_buffer_info(const direct_buffer_info &info)
 {
 	print_direct_buffer_state(info.buffer_state);
 	print_direct_driver_state(info.driver_state);
 
-#if DEBUG > 1
+#	if DEBUG > 1
-	printf("bits: %p\n", info.bits);
+	OUTPUT("bits: %p\n", info.bits);
-	printf("pci_bits: %p\n", info.pci_bits);
+	OUTPUT("pci_bits: %p\n", info.pci_bits);
-	printf("bytes_per_row: %ld\n", info.bytes_per_row);
+	OUTPUT("bytes_per_row: %ld\n", info.bytes_per_row);
-	printf("bits_per_pixel: %lu\n", info.bits_per_pixel);
+	OUTPUT("bits_per_pixel: %lu\n", info.bits_per_pixel);
-	printf("pixel_format: %d\n", info.pixel_format);
+	OUTPUT("pixel_format: %d\n", info.pixel_format);
 	print_direct_buffer_layout(info.layout);
 	print_direct_buffer_orientation(info.orientation);
 
-#if DEBUG > 2	
+#		if DEBUG > 2
+	// TODO: this won't work correctly with debug_printf()
 	printf("CLIPPING INFO:\n");
 	printf("clipping_rects count: %ld\n", info.clip_list_count);
 
@@ -137,26 +151,32 @@ print_direct_buffer_info(const direct_buffer_info &info)
 
 	printf("- clip_list:\n");
 	region.PrintToStream();
-#endif
+#		endif
-#endif
+#	endif
 
-	printf("\n\n");
+	OUTPUT("\n");
 }
 
-#endif
+
+#endif	// DEBUG
+
+
+//	#pragma mark -
 
 
 BDirectWindow::BDirectWindow(BRect frame, const char *title, window_type type,
-	uint32 flags, uint32 workspace)
+		uint32 flags, uint32 workspace)
-	: BWindow(frame, title, type, flags, workspace)
+	:
+	BWindow(frame, title, type, flags, workspace)
 {
 	_InitData();
 }
 
 
 BDirectWindow::BDirectWindow(BRect frame, const char *title, window_look look,
-	window_feel feel, uint32 flags, uint32 workspace)
+		window_feel feel, uint32 flags, uint32 workspace)
-	: BWindow(frame, title, look, feel, flags, workspace)
+	:
+	BWindow(frame, title, look, feel, flags, workspace)
 {
 	_InitData();
 }
@@ -168,7 +188,9 @@ BDirectWindow::~BDirectWindow()
 }
 
 
-// start of regular BWindow API
+//	#pragma mark - BWindow API implementation
+
+
 BArchivable *
 BDirectWindow::Instantiate(BMessage *data)
 {
@@ -330,7 +352,6 @@ BDirectWindow::ConvertToMessage(void *raw, int32 code)
 void
 BDirectWindow::DirectConnected(direct_buffer_info *info)
 {
-	fprintf(stderr, "BDirectWindow::DirectConnected(): should not be ever called!!!!\n");
 	// implemented in subclasses
 }
 
@@ -415,30 +436,22 @@ BDirectWindow::IsFullScreen() const
 }
 
 
-/*static*/
+/*static*/ bool
-bool
 BDirectWindow::SupportsWindowMode(screen_id id)
 {
-/*	display_mode mode;
+	display_mode mode;
 	status_t status = BScreen(id).GetMode(&mode);
 	if (status == B_OK)
-		return mode.flags & B_PARALLEL_ACCESS;
+		return (mode.flags & B_PARALLEL_ACCESS) != 0;
 
-	return false;*/
-	// TODO: Apparently, the above is false for the vesa driver,
-	// but enabling it doesn't do any harm... maybe we should just return always true.
-	// At least, I can't see why window mode shouldn't be supported.
-	// additional NOTE: it probably depends on wether hardware cursor is supported or
-	// not
 	return false;
-	// TODO: For now
 }
 
 
 //	#pragma mark - Private methods
 
-/* static */
+
-int32
+/*static*/ int32
 BDirectWindow::_daemon_thread(void *arg)
 {
 	return static_cast<BDirectWindow *>(arg)->_DirectDaemon();
@@ -457,9 +470,8 @@ BDirectWindow::_DirectDaemon()
 			status = acquire_sem(fDisableSem);
 		} while (status == B_INTERRUPTED);
 
-		if (status < B_OK) {
+		if (status != B_OK) {
-			fprintf(stderr,
+			fprintf(stderr, "DirectDaemon: failed to acquire direct sem: %s\n",
-				"DirectDaemon: failed to acquire direct sem\n",
 				 strerror(status));
 			return -1;
 		}
@@ -469,14 +481,16 @@ BDirectWindow::_DirectDaemon()
 #endif
 
 		if (_LockDirect()) {
-			if ((fBufferDesc->buffer_state & B_DIRECT_MODE_MASK) == B_DIRECT_START)
+			if ((fBufferDesc->buffer_state & B_DIRECT_MODE_MASK)
+					== B_DIRECT_START)
 				fConnectionEnable = true;
 
 			fInDirectConnect = true;
 			DirectConnected(fBufferDesc);
 			fInDirectConnect = false;
 
-			if ((fBufferDesc->buffer_state & B_DIRECT_MODE_MASK) == B_DIRECT_STOP)
+			if ((fBufferDesc->buffer_state & B_DIRECT_MODE_MASK)
+					== B_DIRECT_STOP)
 				fConnectionEnable = false;
 
 			_UnlockDirect();
@@ -486,8 +500,7 @@ BDirectWindow::_DirectDaemon()
 		// If we aren't quick enough to release this sem, our app
 		// will be terminated by the app_server
 		if ((status = release_sem(fDisableSemAck)) != B_OK) {
-			fprintf(stderr,
+			fprintf(stderr, "DirectDaemon: failed to release sem: %s\n",
-				"DirectDaemon: failed to release sem: (%s)\n",
 				strerror(status));
 			return -1;
 		}
@@ -497,13 +510,14 @@ BDirectWindow::_DirectDaemon()
 }
 
 
-// LockDirect() and UnlockDirect() are no-op on R5. I tried to call (R5's) LockDirect()
-// repeatedly, from the same thread and from different threads, nothing happened.
-// They're not needed though, as the direct_daemon_thread doesn't change
-// any shared data. They are probably here for future enhancements
 bool
 BDirectWindow::_LockDirect() const
 {
+	// LockDirect() and UnlockDirect() are no-op on BeOS. I tried to call BeOS's
+	// version repeatedly, from the same thread and from different threads,
+	// nothing happened.
+	// They're not needed though, as the direct_daemon_thread doesn't change
+	// any shared data. They are probably here for future enhancements.
 	status_t status = B_OK;
 
 #if DW_NEEDS_LOCKING
@@ -552,10 +566,9 @@ BDirectWindow::_InitData()
 	struct direct_window_sync_data syncData;
 	if (Lock()) {
 		fLink->StartMessage(AS_DIRECT_WINDOW_GET_SYNC_DATA);
-		if (fLink->FlushWithReply(status) == B_OK
+		if (fLink->FlushWithReply(status) == B_OK && status == B_OK)
-			&& status == B_OK) {
 			fLink->Read<direct_window_sync_data>(&syncData);
-		}	
+
 		Unlock();
 	}
 	if (status < B_OK)
@@ -582,7 +595,7 @@ BDirectWindow::_InitData()
 		fInitStatus |= DW_STATUS_AREA_CLONED;
 
 		fDirectDaemonId = spawn_thread(_daemon_thread, "direct daemon",
-				B_DISPLAY_PRIORITY, this);
+			B_DISPLAY_PRIORITY, this);
 
 		if (fDirectDaemonId > 0) {
 			fDaemonKiller = false;