X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=main.cpp;h=e98506fcc0ea19d2d0dc2572252d3ab85748eca4;hb=9fd5bb6e6468eb6d211aff682f3a64e7f070bb44;hp=98fc9ad5949c3b7d79bc4f0e6edf52d1d4f9eb3e;hpb=24ea28e79dfe41eeec311c38f61b8ffe67404b16;p=pulseview.git

diff --git a/main.cpp b/main.cpp
index 98fc9ad..e98506f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -20,6 +20,7 @@
 
 extern "C" {
 #include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include <signal.h>
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
 }
@@ -33,9 +34,12 @@ extern "C" {
 
 #include "config.h"
 
+// Global pointer to our QApplication
+QApplication *g_app = NULL;
+
 void usage()
 {
-	fprintf(stderr,
+	fprintf(stdout,
 		"Usage:\n"
 		"  %s — %s\n"
 		"\n"
@@ -45,12 +49,30 @@ void usage()
 		"\n", PV_BIN_NAME, PV_DESCRIPTION);
 }
 
+/*
+ * SIGINT handler (likely received Ctrl-C from terminal)
+ */
+void sigint_handler(int param)
+{
+	(void)param;
+
+	qDebug("Received SIGINT.");
+
+	if (g_app)
+		g_app->quit();
+}
+
 int main(int argc, char *argv[])
 {
 	int ret = 0;
 	struct sr_context *sr_ctx = NULL;
 
+	// Register a SIGINT handler
+	signal(SIGINT, sigint_handler);
+
 	QApplication a(argc, argv);
+	// Now we have an application to populate our global pointer
+	g_app = &a;
 
 	// Set some application metadata
 	QApplication::setApplicationVersion(PV_VERSION_STRING);
@@ -60,8 +82,8 @@ int main(int argc, char *argv[])
 	// Parse arguments
 	while (1) {
 		static const struct option long_options[] = {
-			{"version", no_argument, 0,  'V'},
-			{"help", no_argument, 0,  'h'},
+			{"version", no_argument, 0, 'V'},
+			{"help", no_argument, 0, 'h'},
 			{0, 0, 0, 0}
 		};
 
@@ -73,7 +95,7 @@ int main(int argc, char *argv[])
 		switch (c) {
 		case 'V':
 			// Print version info
-			fprintf(stderr, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
 			return 0;
 
 		case 'h':
@@ -106,7 +128,7 @@ int main(int argc, char *argv[])
 			}
 		}
 
-		if(ret == 0) {
+		if (ret == 0) {
 			// Initialise the main window
 			pv::MainWindow w;
 			w.show();