From baa8ca981fa6a57f433a894379266c02138ca3a0 Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Tue, 23 Jan 2001 13:36:23 +0000
Subject: [PATCH] fix loading of colors bug in FormPreferences

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1371 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/xforms/ChangeLog         | 5 +++++
 src/frontends/xforms/FormPreferences.C | 6 +++---
 src/frontends/xforms/forms/.cvsignore  | 1 +
 src/frontends/xforms/forms/makefile    | 7 +++----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 9280cfb33d..f1090fdafb 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-23  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* FormPreferences.C (LoadBrowserLyX): convert unsigned short to
+	unsigned char correctly and so fix 2 bugs loading/changing colors.
+
 2001-01-21  Dekel Tsur  <dekelts@tau.ac.il>
 
 	* FormRef.C (update): Do not update dialog_->{ref,name,type}
diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index c92a65177e..219f606809 100644
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -806,9 +806,9 @@ void FormPreferences::Colors::LoadBrowserLyX()
 		// Note that X stores the RGB values in the range 0 - 65535
 		// whilst we require them in the range 0 - 255.
 		RGBColor col;
-		col.r = static_cast<unsigned char>(xcol.red);
-		col.g = static_cast<unsigned char>(xcol.green);
-		col.b = static_cast<unsigned char>(xcol.blue);
+		col.r = xcol.red   / 256;
+		col.g = xcol.green / 256;
+		col.b = xcol.blue  / 256;
 
 		// Create a valid X11 name of the form "#rrggbb" and change the
 		// LColor X11name to this. Don't want to trigger a redraw,
diff --git a/src/frontends/xforms/forms/.cvsignore b/src/frontends/xforms/forms/.cvsignore
index 4e654d87f3..f4169bd8d8 100644
--- a/src/frontends/xforms/forms/.cvsignore
+++ b/src/frontends/xforms/forms/.cvsignore
@@ -1,3 +1,4 @@
+makefile
 *.c
 *.h
 *.C
diff --git a/src/frontends/xforms/forms/makefile b/src/frontends/xforms/forms/makefile
index 02ef562811..f7472e557b 100644
--- a/src/frontends/xforms/forms/makefile
+++ b/src/frontends/xforms/forms/makefile
@@ -42,15 +42,14 @@ all:
 test: clean $(OBJS)
 
 updatesrc: test
-	for fil in *.C *.h; \
-		do cmp -s $$fil ../$$fil || mv $$fil ..; \
-	done
+	for fil in *.C *.h; do cmp -s $$fil ../$$fil || mv $$fil ..; done
+	rm -f *.[hHcC] *.bak
 
 .fd.C:
 	${SHELL} ./fdfix.sh $<
 
 clean:
-	rm -f *.[hHcC] *.bak
+	rm -f *.[hHcC] *.bak fdfixc_modified.sed
 
 distclean: clean
 	rm -f *.orig *.rej *~
-- 
2.39.2