|
@@ -34,17 +34,17 @@
|
|
|
#include "context_gl_x11.h"
|
|
|
#include "core/os/input.h"
|
|
|
#include "crash_handler_x11.h"
|
|
|
-#include "drivers/unix/os_unix.h"
|
|
|
-#include "servers/visual_server.h"
|
|
|
-//#include "servers/visual/visual_server_wrap_mt.h"
|
|
|
#include "drivers/alsa/audio_driver_alsa.h"
|
|
|
#include "drivers/alsamidi/alsa_midi.h"
|
|
|
#include "drivers/pulseaudio/audio_driver_pulseaudio.h"
|
|
|
+#include "drivers/unix/os_unix.h"
|
|
|
#include "joypad_linux.h"
|
|
|
#include "main/input_default.h"
|
|
|
#include "power_x11.h"
|
|
|
#include "servers/audio_server.h"
|
|
|
#include "servers/visual/rasterizer.h"
|
|
|
+#include "servers/visual_server.h"
|
|
|
+//#include "servers/visual/visual_server_wrap_mt.h"
|
|
|
|
|
|
#include <X11/Xcursor/Xcursor.h>
|
|
|
#include <X11/Xlib.h>
|
|
@@ -145,7 +145,6 @@ class OS_X11 : public OS_Unix {
|
|
|
void handle_key_event(XKeyEvent *p_event, bool p_echo = false);
|
|
|
void process_xevents();
|
|
|
virtual void delete_main_loop();
|
|
|
- IP_Unix *ip_unix;
|
|
|
|
|
|
bool force_quit;
|
|
|
bool minimized;
|
|
@@ -177,8 +176,6 @@ class OS_X11 : public OS_Unix {
|
|
|
AudioDriverPulseAudio driver_pulseaudio;
|
|
|
#endif
|
|
|
|
|
|
- Atom net_wm_icon;
|
|
|
-
|
|
|
PowerX11 *power_manager;
|
|
|
|
|
|
bool layered_window;
|
|
@@ -186,8 +183,6 @@ class OS_X11 : public OS_Unix {
|
|
|
CrashHandler crash_handler;
|
|
|
|
|
|
int video_driver_index;
|
|
|
- int audio_driver_index;
|
|
|
- unsigned int capture_idle;
|
|
|
bool maximized;
|
|
|
//void set_wm_border(bool p_enabled);
|
|
|
void set_wm_fullscreen(bool p_enabled);
|