From 9bf722bd79fdbaea96eb723da20801f0ae9b61a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Thu, 6 May 2010 15:47:55 +0000
Subject: [PATCH] * Made the se-info attribute endian-aware. * Check in
 LoadAttrs() if the new frame looks valid, and fits on screen, and   ignore it
 if not. * Moved static helper function out of the class definition.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36659 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/stylededit/StyledEditWindow.cpp | 52 +++++++++++++++---------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/apps/stylededit/StyledEditWindow.cpp b/src/apps/stylededit/StyledEditWindow.cpp
index 659ca60811..5749f957e5 100644
--- a/src/apps/stylededit/StyledEditWindow.cpp
+++ b/src/apps/stylededit/StyledEditWindow.cpp
@@ -36,11 +36,13 @@
 #include <PrintJob.h>
 #include <Rect.h>
 #include <Roster.h>
+#include <Screen.h>
 #include <ScrollView.h>
 #include <TextControl.h>
 #include <TextView.h>
 #include <TranslationUtils.h>
 
+
 using namespace BPrivate;
 
 
@@ -52,6 +54,24 @@ const float kLineViewWidth = 30.0;
 #define TR_CONTEXT "StyledEditWindow"
 
 
+// This is a temporary solution for building BString with printf like format.
+// will be removed in the future.
+static void
+bs_printf(BString* string, const char* format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	char* buf;
+	vasprintf(&buf, format, ap);
+	string->SetTo(buf);
+	free(buf);
+	va_end(ap);
+}
+
+
+// #pragma mark -
+
+
 StyledEditWindow::StyledEditWindow(BRect frame, int32 id, uint32 encoding)
 	: BWindow(frame, "untitled", B_DOCUMENT_WINDOW, B_ASYNCHRONOUS_CONTROLS)
 {
@@ -339,14 +359,21 @@ StyledEditWindow::LoadAttrs()
 	if (documentNode.InitCheck() != B_OK)
 		return;
 
-	BRect newFrame(Frame());
+	BRect newFrame;
 	ssize_t bytesRead = documentNode.ReadAttr(ATTRNAME_SE_INFO, B_RECT_TYPE,
 		0, &newFrame, sizeof(BRect));
-	if (bytesRead < 0)
+	if (bytesRead != sizeof(BRect))
 		return;
 
-	MoveTo(newFrame.left, newFrame.top);
-	ResizeTo(newFrame.Width(), newFrame.Height());
+	swap_data(B_RECT_TYPE, &newFrame, sizeof(BRect), B_SWAP_BENDIAN_TO_HOST);
+
+	// Check if the frame in on screen, otherwise, ignore it
+	BScreen screen(this);
+	if (newFrame.Width() > 32 && newFrame.Height() > 32
+		&& screen.Frame().Contains(newFrame)) {
+		MoveTo(newFrame.left, newFrame.top);
+		ResizeTo(newFrame.Width(), newFrame.Height());
+	}
 }
 
 
@@ -370,6 +397,8 @@ StyledEditWindow::SaveAttrs()
 		return;
 
 	BRect frame(Frame());
+	swap_data(B_RECT_TYPE, &frame, sizeof(BRect), B_SWAP_HOST_TO_BENDIAN);
+
 	documentNode.WriteAttr(ATTRNAME_SE_INFO, B_RECT_TYPE, 0, &frame,
 		sizeof(BRect));
 }
@@ -835,21 +864,6 @@ StyledEditWindow::Quit()
 }
 
 
-// This is temporary solution for building BString with printf like format.
-// will be removed in the future.
-static void
-bs_printf(BString* string, const char* format, ...)
-{
-	va_list 	ap;
-	va_start(ap, format);
-	char*	buf;
-	vasprintf(&buf, format, ap);
-	string->SetTo(buf);
-	free(buf);
-	va_end(ap);
-}
-
-
 #undef TR_CONTEXT
 #define TR_CONTEXT "QuitAlert"