m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implementation of X11 pasting

Browse Source
This commit is contained in:
Thomas Bernard 2018-07-02 21:32:26 +02:00
parent 0d3ab36291
commit b67e264026
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/input.c
View File

@ -82,6 +82,10 @@ int Snap_axis_origin_Y;
char * Drop_file_name = NULL;
#if defined(USE_X11)
char * X11_clipboard = NULL;
#endif
// --
// Digital joystick state
@ -1472,6 +1476,25 @@ int Get_input(int sleep_time)
XSendEvent(X11_display, event.xselection.requestor, False, NoEventMask, &reply);
}
}
else if (event.xselection.selection == XInternAtom(X11_display, "CLIPBOARD", False)
|| event.xselection.selection == XInternAtom(X11_display, "PRIMARY", False))
{
Atom type = 0;
int format = 0;
int r;
unsigned long count = 0, bytesAfter = 0;
unsigned char * value = NULL;
r = XGetWindowProperty(X11_display, X11_window, event.xselection.property, 0, LONG_MAX,
False, event.xselection.target /* type */, &type, &format,
&count, &bytesAfter, &value);
if (r == Success && value != NULL)
{
X11_clipboard = strdup((char *)value);
XFree(value);
}
user_feedback_required = 1;
}
break;
default:
printf("event.type = %d\n", event.type);

38
src/readline.c
View File

@ -66,6 +66,13 @@
#endif
#endif
#if defined(USE_X11)
#include <X11/Xlib.h>
extern Display * X11_display;
extern Window X11_window;
extern char * X11_clipboard;
#endif
// Virtual keyboard is ON by default on these platforms:
#if defined(__GP2X__) || defined(__WIZ__) || defined(__CAANOO__) || defined(GCWZERO)
#define VIRT_KEY_DEFAULT_ON 1
@ -300,7 +307,6 @@ void Init_virtual_keyboard(word y_pos, word keyboard_width, word keyboard_height
// Inspired from http://www.libsdl.org/projects/scrap/
// TODO X11 and others
static char* getClipboard(word * * unicode)
{
#ifdef WIN32
@ -399,6 +405,36 @@ bye:
if (unicode)
*unicode = NULL;
return haiku_get_clipboard();
#elif defined(USE_X11)
Atom selection = XInternAtom(X11_display, "CLIPBOARD", False);
Window selection_owner = XGetSelectionOwner(X11_display, selection);
if (selection_owner == None)
{
selection = XInternAtom(X11_display, "PRIMARY", False);
selection_owner = XGetSelectionOwner(X11_display, selection);
}
if (unicode)
*unicode = NULL;
if (selection_owner != None)
{
int i;
XConvertSelection(X11_display, selection, XInternAtom(X11_display, "UTF8_STRING", False),
XInternAtom(X11_display, "GFX2_CLIP", False), /* Property */
X11_window, CurrentTime);
for(i = 0; X11_clipboard == NULL && i < 10; i++)
{
Get_input(20);
}
if (X11_clipboard != NULL)
{
char * tmp = X11_clipboard;
X11_clipboard = NULL;
// TODO : UTF8 -> UTF16 conversion
return tmp;
}
}
return NULL;
#else
// Not implemented (no standard) on Linux systems. Maybe someday...
if (unicode)