summaryrefslogtreecommitdiff
path: root/platform/x11/os_x11.h
diff options
context:
space:
mode:
authorMarcelo Fernandez <marcelofg55@gmail.com>2017-09-07 22:01:49 -0300
committerMarcelo Fernandez <marcelofg55@gmail.com>2017-09-13 10:07:23 -0300
commit83fe9373621ab9f7e175a43868b2eda935107539 (patch)
tree116a92b2c32713b4f3f907b451e457a9a623d50a /platform/x11/os_x11.h
parent06138bf18c25a8c5f7e2e5bb1ebd9dcf0b2f28dd (diff)
Added a crash handler to dump the backtrace on Windows, Linux and OS X
Diffstat (limited to 'platform/x11/os_x11.h')
-rw-r--r--platform/x11/os_x11.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index 51240fa023..14c737d45e 100644
--- a/platform/x11/os_x11.h
+++ b/platform/x11/os_x11.h
@@ -31,6 +31,7 @@
#define OS_X11_H
#include "context_gl_x11.h"
+#include "crash_handler_x11.h"
#include "drivers/unix/os_unix.h"
#include "os/input.h"
#include "servers/visual_server.h"
@@ -170,6 +171,8 @@ class OS_X11 : public OS_Unix {
PowerX11 *power_manager;
+ CrashHandler crash_handler;
+
int audio_driver_index;
unsigned int capture_idle;
bool maximized;
@@ -191,6 +194,7 @@ protected:
virtual int get_audio_driver_count() const;
virtual const char *get_audio_driver_name(int p_driver) const;
+ virtual void initialize_core();
virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver);
virtual void finalize();
@@ -273,6 +277,9 @@ public:
void run();
+ void disable_crash_handler();
+ bool is_disable_crash_handler() const;
+
OS_X11();
};