summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2011-04-22 23:20:56 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-07-06 12:43:51 (GMT)
commit34774e7829716b4ef7c0bf54db78193a55f0aa61 (patch)
treea0796c5865070d790dc8ffe790bf9359bb74ebb1 /includes
parent3dd82d9ced79467e78be431aa92130542c355645 (diff)
downloadpowder-34774e7829716b4ef7c0bf54db78193a55f0aa61.zip
powder-34774e7829716b4ef7c0bf54db78193a55f0aa61.tar.gz
Basic clipboard_push_text support for linux
Diffstat (limited to 'includes')
-rw-r--r--includes/interface.h8
-rw-r--r--includes/misc.h2
2 files changed, 10 insertions, 0 deletions
diff --git a/includes/interface.h b/includes/interface.h
index da1f30c..aff63e4 100644
--- a/includes/interface.h
+++ b/includes/interface.h
@@ -1,6 +1,9 @@
#ifndef INTERFACE_H
#define INTERFACE_H
#include <SDL/SDL.h>
+#if (defined(LIN32) || defined(LIN64)) && defined(SDL_VIDEO_DRIVER_X11)
+#include <SDL/SDL_syswm.h>
+#endif
#include "graphics.h"
struct menu_section
@@ -130,6 +133,11 @@ typedef struct ui_richtext ui_richtext;
int SLALT;
extern SDLMod sdl_mod;
extern int sdl_key, sdl_wheel, sdl_caps, sdl_ascii, sdl_zoom_trig;
+#if (defined(LIN32) || defined(LIN64)) && defined(SDL_VIDEO_DRIVER_X11)
+extern SDL_SysWMinfo sdl_wminfo;
+extern Atom XA_CLIPBOARD, XA_TARGETS;
+#endif
+
extern char *shift_0;
extern char *shift_1;
extern int svf_messages;
diff --git a/includes/misc.h b/includes/misc.h
index 51d7b98..5c3a874 100644
--- a/includes/misc.h
+++ b/includes/misc.h
@@ -64,6 +64,8 @@ void clipboard_push_text(char * text);
char * clipboard_pull_text();
+extern char *clipboard_text;
+
int register_extension();
int cpu_check(void);