Mercurial > controlcenter

changeset 42:9bbda6e774ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switched to using dw_main_quit() and added _dw_pool_drain() to a second thread on Mac. Improved some source code formatting to be more consistent.
author Brian Smith <brian@dbsoft.org>
date Thu, 19 Jan 2012 23:23:10 -0600
parents f3c4bcb83a37
children 77d12a81e467
files cc.c
diffstat 1 files changed, 47 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/cc.c	Thu Jan 19 22:53:43 2012 -0600
+++ b/cc.c	Thu Jan 19 23:23:10 2012 -0600
@@ -20,7 +20,7 @@
 #if 0
 	DISPLAY_DESK,
 #endif
-    DISPLAY_CPU,
+	DISPLAY_CPU,
 	DISPLAY_NET,
 	DISPLAY_NETAVG,
 	DISPLAY_NETMAX,
@@ -68,8 +68,8 @@
 	DW_RGB(0, 0, 128),
 	DW_RGB(200, 204, 200),
 	DW_RGB(2, 130, 130),
-    DW_RGB(2, 254, 250),
-    DW_RGB(250, 254, 2)
+	DW_RGB(2, 254, 250),
+	DW_RGB(250, 254, 2)
 };
 
 unsigned long Sent = 0, Recv = 0, TotalSent = 0, TotalRecv = 0, MaxSent = 0, MaxRecv = 0;
@@ -299,9 +299,9 @@
 	restore_pos();
 
 	dw_window_set_icon(hwndFrame, DW_RESOURCE(MAIN_FRAME));
-   
+
 	dw_window_default(hwndFrame, gList[0].hwndDraw[0]);
-   
+
 	dw_window_show(hwndFrame);
 
 	dw_thread_new((void *)display_update, NULL, 0xFFFF);
@@ -332,9 +332,9 @@
 			z++;
 		}
 		dw_mutex_unlock(hMtx);
-        
+
 #if defined(__MAC__) && !defined(GARBAGE_COLLECT)
-        _dw_pool_drain();
+		_dw_pool_drain();
 #endif
 	}
 	display_destroy();
@@ -401,8 +401,7 @@
 		{
 			update_pos();
 			saveconfig();
-			display_destroy();
-			exit(0);
+			dw_main_quit();
 		}
 		break;
 	case IDM_PROP:
@@ -800,7 +799,7 @@
 				dw_draw_text(0, hPixmap, start1 + LEFT_SIDE, ((((height - (TOP_BOTTOM * 2))/2) - 12)/2), texts->text1);
 				dw_draw_text(0, hPixmap, start2 + LEFT_SIDE, ((height - (TOP_BOTTOM * 2))/2) + ((((height - (TOP_BOTTOM * 2))/2)-12)/2), texts->text2);
 			}
-            else
+			else
 				dw_draw_text(0, hPixmap, start1 + LEFT_SIDE, TOP_BOTTOM, texts->text1);
 
 			/* Blit the image from the memory pixmap to the screen window */
@@ -1027,7 +1026,7 @@
 				for(z=(width - 4);z>2;z-=GRID_STEP)
 				{
 					int point = (int)((float)myheight * ((float)values[item]/(float)max));
-                    if(point)
+					if(point)
 						dw_draw_rect(0, hPixmap, TRUE, z,  (myheight - point) + 3, GRID_STEP, point);
 					item++;
 				}
@@ -1064,41 +1063,41 @@
 
 void ScaledPrint(char *cBuff, long double value, int decimals)
 {
-    char fstr[] = "%.0Lf ", *dec = &fstr[2], *not = &fstr[5];
-    long double real_value = value;
-    static long double giga = 1073741824.0;
+	char fstr[] = "%.0Lf ", *dec = &fstr[2], *not = &fstr[5];
+	long double real_value = value;
+	static long double giga = 1073741824.0;
 
-    *dec = decimals + '0';
+	*dec = decimals + '0';
 
-    if(value >= (giga*1024*1024))
-    {
-        real_value = (long double)value/(giga*1024.0*1024.0);
-        *not = 'P';
-    }
-    else if(value >= (giga*1024))
-    {
-        real_value = (long double)value/(giga*1024.0);
-        *not = 'T';
-    }
-    else if(value >= giga)
-    {
-        real_value = (long double)value/(long double)giga;
-        *not = 'G';
-    }
-    else if(value >= (1024*1024))
-    {
-        real_value = (long double)value/(1024.0*1024.0);
-        *not = 'M';
-    }
-    else if(value >= 1024)
-    {
-        real_value = (long double)value/1024.0;
-        *not = 'K';
-    }
-    else
-        *dec = '0';
+	if(value >= (giga*1024*1024))
+	{
+		real_value = (long double)value/(giga*1024.0*1024.0);
+		*not = 'P';
+	}
+	else if(value >= (giga*1024))
+	{
+		real_value = (long double)value/(giga*1024.0);
+		*not = 'T';
+	}
+	else if(value >= giga)
+	{
+		real_value = (long double)value/(long double)giga;
+		*not = 'G';
+	}
+	else if(value >= (1024*1024))
+	{
+		real_value = (long double)value/(1024.0*1024.0);
+		*not = 'M';
+	}
+	else if(value >= 1024)
+	{
+		real_value = (long double)value/1024.0;
+		*not = 'K';
+	}
+	else
+		*dec = '0';
 
-    sprintf(cBuff, fstr, (long double)real_value);
+	sprintf(cBuff, fstr, (long double)real_value);
 }
 
 void cpu_update(struct _instance *inst, HWND owner)
@@ -1226,6 +1225,9 @@
 			ScaledPrint(&bars->text[bars->len], free, 1);
 			dw_mutex_unlock(hMtx);
 		}
+#if defined(__MAC__) && !defined(GARBAGE_COLLECT)
+		_dw_pool_drain();
+#endif
 		msleep(1000);
 	}
 }
@@ -1303,6 +1305,8 @@
 	display_destroy();
 
 	sockshutdown();
+
+	dw_exit(0);
 	return 0;
 }