SF.net SVN: frontierkernel: [1605] Frontier/branches/ Frontier_Long_File_Paths/Common/source/about.c

[<cre...@us...>]

Revision: 1605
          http://svn.sourceforge.net/frontierkernel/?rev=1605&view=rev
Author:   creecode
Date:     2007-01-17 10:10:34 -0800 (Wed, 17 Jan 2007)

Log Message:
-----------
in ccdrawmsg function ellipsize from middle of message

formatting tweaks

Modified Paths:
--------------
    Frontier/branches/Frontier_Long_File_Paths/Common/source/about.c

Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/about.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/about.c	2007-01-16 19:43:18 UTC (rev 1604)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/about.c	2007-01-17 18:10:34 UTC (rev 1605)
@@ -549,17 +549,19 @@
 
 static boolean ccdrawmsg (void) {
 	
-	/*
-	2.1b5 dmb: don't need flbitmapactive logic; openbitmap will return 
-	false if one's already open.
-	*/
+	//
+	// 2007-01-17 creedon: support for long odb item names and file paths
+	// 
+	// 2.1b5 dmb: don't need flbitmapactive logic; openbitmap will return false
+	// if one's already open.
+	//
 	
+	register boolean flbitmap = false;
 	register hdlcancoonrecord hc = cancoonglobals;
-	//register hdlwindowinfo hw = aboutwindowinfo;
 	register hdlstring hstring;
-	register boolean flbitmap = false;
+	
+	Rect r;
 	bigstring bs;
-	Rect r;
 	
 	if (hc == nil || aboutdata == nil)
 		return (false);
@@ -572,23 +574,14 @@
 	
 	if (!flbitmap)
 		pushclip (r);
-
+		
 	eraserect (r);
 	
-	/*
-	grayframerect (r);
-	*/
-	
 	hstring = (**hc).hprimarymsg;
 	
-	/*
-	if (hstring == nil) /%no primary message, display file name%/
-		hstring = (**hw).hfilename;
-	*/
-	
 	copyheapstring (hstring, bs);
 	
-//	centerstring (r, bs);
+	ellipsizemiddle ( bs, r.right - r.left );
 	
 	movepento (r.left, r.top + globalfontinfo.ascent);
 	
@@ -924,11 +917,11 @@
 			popclip ();
 
 		popport ();
+		
 		}
+		
+	return (true);
 	
-//	shellpopglobals ();
-
-	return (true);
 	} /*aboutsetmiscstring*/
 
 
@@ -991,7 +984,7 @@
 		goto pop;
 		
 	if (flbackgroundmsg && (**hc).flbackgroundmsgblocked) {
-		
+	
 		disposehandle ((Handle) (**hc).hsecondarymsg);
 		
 		(**hc).hsecondarymsg = hstring;
@@ -1372,131 +1365,136 @@
 
 #ifndef version42orgreater
 
-static void drawtextitem (WindowPtr w, short item, short font, short size, short style) {
-	
-	Rect ritem;
-	bigstring bsitem;
-	
-	getdialogtext ((DialogPtr) w, item, bsitem);
-	
-	dialoggetobjectrect ((DialogPtr) w, item, &ritem);
-	
-	edittextbox (bsitem, ritem, font, size, style);
-	
-	} /*drawtextitem*/
+	static void drawtextitem (WindowPtr w, short item, short font, short size, short style) {
+		
+		Rect ritem;
+		bigstring bsitem;
+		
+		getdialogtext ((DialogPtr) w, item, bsitem);
+		
+		dialoggetobjectrect ((DialogPtr) w, item, &ritem);
+		
+		edittextbox (bsitem, ritem, font, size, style);
+		
+		} /*drawtextitem*/
 
 
-static boolean runurlscript () {
+	static boolean runurlscript () {
 
-	bigstring bsurl;
-	bigstring bsscript;
-	//this is a problem. aboutwindow is a window
-	getdialogtext ((DialogPtr) aboutwindow, urlitem, bsurl);
-	
-	if (!getsystemtablescript (idopenurlscript, bsscript))
-		return (false);
-	
-	parsedialogstring (bsscript, bsurl, nil, nil, nil, bsscript);
-	
-	return (processrunstring (bsscript));
-	} /*runurlscript*/
+		bigstring bsurl;
+		bigstring bsscript;
+		//this is a problem. aboutwindow is a window
+		getdialogtext ((DialogPtr) aboutwindow, urlitem, bsurl);
+		
+		if (!getsystemtablescript (idopenurlscript, bsscript))
+			return (false);
+		
+		parsedialogstring (bsscript, bsurl, nil, nil, nil, bsscript);
+		
+		return (processrunstring (bsscript));
+		
+		} /*runurlscript*/
 
 
-static void drawurlitem (boolean flpressed) {
-	
-	RGBColor rgb = {0, 0, 0};
-	
-	if (flpressed)
-		rgb.red = 0xA000;	
-	else
-		rgb.blue = 0xA000;
-	
-	pushforecolor (&rgb);
-	
-	drawtextitem (aboutwindow, urlitem, geneva, 9, underline);
-	
-	popforecolor ();
-	} /*drawurlitem*/
+	static void drawurlitem (boolean flpressed) {
+		
+		RGBColor rgb = {0, 0, 0};
+		
+		if (flpressed)
+			rgb.red = 0xA000;	
+		else
+			rgb.blue = 0xA000;
+		
+		pushforecolor (&rgb);
+		
+		drawtextitem (aboutwindow, urlitem, geneva, 9, underline);
+		
+		popforecolor ();
+		
+		} /*drawurlitem*/
 
 
-#define aboutresnumber 128 /*the id of the various "about" resources*/
+	#define aboutresnumber 128 /*the id of the various "about" resources*/
 
-static void drawabout (WindowPtr w, boolean flliveurl) { 
+	static void drawabout (WindowPtr w, boolean flliveurl) { 
 
-	/*
-	10/18/91 DW: color!
-	
-	10/18/91 DW: added PICT #128 to shell.\xB9.rsrc.
-	
-	12/19/91 dmb: use version resource instead of buildinfo routine
-	*/
-	
-	/*draw the icon*/ {
+		/*
+		10/18/91 DW: color!
 		
-		Rect rcicn;
+		10/18/91 DW: added PICT #128 to shell.\xB9.rsrc.
 		
-		dialoggetobjectrect (w, iconitem, &rcicn);
+		12/19/91 dmb: use version resource instead of buildinfo routine
+		*/
 		
-		ploticon (&rcicn, aboutresnumber);
-		}
-	
-	drawtextitem (w, userlanditem, systemFont, 12, 0);
-	
-	drawtextitem (w, sloganitem, helv, 9, 0);
-	
-	drawtextitem (w, copyrightitem, helv, 9, 0);
-	
-	if (flliveurl)
-		drawurlitem (false);
-	else
-		drawtextitem (w, urlitem, helv, 9, 0);
-	
-	#if __powerc
-	
-		drawtextitem (w, nativeitem, helv, 9, 0);
-	
-	#else
-	
-		drawtextitem (w, emulateditem, helv, 9, 0);
-	
-	#endif
-	
-	/*draw the version string*/ {
-	
-		Rect ritem;
+		/*draw the icon*/ {
+			
+			Rect rcicn;
+			
+			dialoggetobjectrect (w, iconitem, &rcicn);
+			
+			ploticon (&rcicn, aboutresnumber);
+			}
 		
-		bigstring bsbuildinfo;
+		drawtextitem (w, userlanditem, systemFont, 12, 0);
 		
-		filegetprogramversion (bsbuildinfo);
+		drawtextitem (w, sloganitem, helv, 9, 0);
 		
-		setfontsizestyle (geneva, 9, normal);
+		drawtextitem (w, copyrightitem, helv, 9, 0);
 		
-		dialoggetobjectrect (w, versionitem, &ritem);
+		if (flliveurl)
+			drawurlitem (false);
+		else
+			drawtextitem (w, urlitem, helv, 9, 0);
 		
-		movepento (ritem.right - stringpixels (bsbuildinfo), ritem.bottom - 6);
-	
-		pendrawstring (bsbuildinfo);
-		}
-	} /*drawabout*/
+		#if __powerc
+		
+			drawtextitem (w, nativeitem, helv, 9, 0);
+		
+		#else
+		
+			drawtextitem (w, emulateditem, helv, 9, 0);
+		
+		#endif
+		
+		/*draw the version string*/ {
+		
+			Rect ritem;
+			
+			bigstring bsbuildinfo;
+			
+			filegetprogramversion (bsbuildinfo);
+			
+			setfontsizestyle (geneva, 9, normal);
+			
+			dialoggetobjectrect (w, versionitem, &ritem);
+			
+			movepento (ritem.right - stringpixels (bsbuildinfo), ritem.bottom - 6);
+		
+			pendrawstring (bsbuildinfo);
+			}
+			
+		} /*drawabout*/
 
 
-static void updateabout (WindowPtr w, boolean flliveurl) {
-	
-	shellupdatenow (w);
-	} /*updateabout*/
+	static void updateabout (WindowPtr w, boolean flliveurl) {
+		
+		shellupdatenow (w);
+		
+		} /*updateabout*/
 
 
-static boolean abouteventhook (EventRecord *ev, WindowPtr w) {
-	
-	if (w != aboutwindow) /*don't hook if not our dialog*/
-		return (true);
-	
-	if ((*ev).what == updateEvt)
-		updateabout (w, false);
-	
-	return (false); /*don't process this event any further*/
-	} /*abouteventhook*/
-
+	static boolean abouteventhook (EventRecord *ev, WindowPtr w) {
+		
+		if (w != aboutwindow) /*don't hook if not our dialog*/
+			return (true);
+		
+		if ((*ev).what == updateEvt)
+			updateabout (w, false);
+		
+		return (false); /*don't process this event any further*/
+		
+		} /*abouteventhook*/
+		
 #endif
 
 
@@ -1516,6 +1514,7 @@
 		}
 	
 	return (true);
+	
 	} /*aboutsave*/
 
 
@@ -1533,6 +1532,7 @@
 	aboutwindow = nil;
 	
 	return (true);
+	
 	} /*aboutclose*/
 
 
@@ -1547,6 +1547,7 @@
 	aboutport = nil;
 
 	return (true);
+	
 	} /*aboutdisposerecord*/
 
 
@@ -1564,6 +1565,7 @@
 		}
 	
 	return (true);
+	
 	} /*aboutsetsuperglobals*/
 
 
@@ -1599,7 +1601,9 @@
 		shellpopglobals ();
 
 		detachabout ();
+		
 		}
+		
 	} /*aboutwindowsetup*/
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.