projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: quit on SIGINT
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 98fc9ad5949c3b7d79bc4f0e6edf52d1d4f9eb3e..54a69fd75550eb3485861bd471d27f6e2d6497a7 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-20,6
+20,7
@@
extern "C" {
#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
extern "C" {
#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include <signal.h>
#include <stdint.h>
#include <libsigrok/libsigrok.h>
}
#include <stdint.h>
#include <libsigrok/libsigrok.h>
}
@@
-33,6
+34,8
@@
extern "C" {
#include "config.h"
#include "config.h"
+// Global pointer to our QApplication
+QApplication *g_app = NULL;
void usage()
{
fprintf(stderr,
void usage()
{
fprintf(stderr,
@@
-45,12
+48,30
@@
void usage()
"\n", PV_BIN_NAME, PV_DESCRIPTION);
}
"\n", PV_BIN_NAME, PV_DESCRIPTION);
}
+/*
+ * SIGINT handler (likely recieved Ctrl-C from terminal)
+ */
+void sigint(int param)
+{
+ (void) param;
+
+ qDebug("pv: Recieved SIGINT");
+
+ if (g_app)
+ g_app->quit();
+}
+
int main(int argc, char *argv[])
{
int ret = 0;
struct sr_context *sr_ctx = NULL;
int main(int argc, char *argv[])
{
int ret = 0;
struct sr_context *sr_ctx = NULL;
+ // Register a SIGINT handler
+ signal (SIGINT, sigint);
+
QApplication a(argc, argv);
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);
// Set some application metadata
QApplication::setApplicationVersion(PV_VERSION_STRING);
@@
-60,8
+81,8
@@
int main(int argc, char *argv[])
// Parse arguments
while (1) {
static const struct option long_options[] = {
// 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}
};
{0, 0, 0, 0}
};
@@
-106,7
+127,7
@@
int main(int argc, char *argv[])
}
}
}
}
- if(ret == 0) {
+ if
(ret == 0) {
// Initialise the main window
pv::MainWindow w;
w.show();
// Initialise the main window
pv::MainWindow w;
w.show();