atria-soft/gale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] review interface (step 1)

Browse Source
This commit is contained in:
Edouard DUPIN 2016-03-16 21:42:49 +01:00
parent dd58d4e668
commit 073ae904c6
4 changed files with 86 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gale/Application.cpp
View File

@ -66,8 +66,14 @@ void gale::Application::onDestroy(gale::Context& _context) {
GALE_VERBOSE("Destroy Gale Application"); GALE_VERBOSE("Destroy Gale Application");
} }
void gale::Application::onKillDemand(gale::Context& _context) {
GALE_INFO("Gale request auto destroy ==> no applification specification");
exit(0);
}
void gale::Application::exit(int32_t _value) { void gale::Application::exit(int32_t _value) {
GALE_VERBOSE("Exit Requested"); GALE_VERBOSE("Exit Requested");
gale::getContext().stop();
} }
void gale::Application::onPointer(enum gale::key::type _type, int32_t _pointerID, const vec2& _pos, gale::key::status _state) { void gale::Application::onPointer(enum gale::key::type _type, int32_t _pointerID, const vec2& _pos, gale::key::status _state) {

9
gale/Application.h
View File

@ -60,12 +60,17 @@ namespace gale {
*/ */
virtual void onStop(gale::Context& _context); virtual void onStop(gale::Context& _context);
/** /**
* @brief The application is remoed (call destructor just adter it.). * @brief The application is removed (call destructor just adter it.).
* @param[in] _context Current gale context. * @param[in] _context Current gale context.
*/ */
virtual void onDestroy(gale::Context& _context); virtual void onDestroy(gale::Context& _context);
/** /**
* @brief Exit the application (not availlable on IOs, ==> the user will not understand the comportement. He will think the application crash) * @brief The user request application removing.
* @param[in] _context Current gale context.
*/
virtual void onKillDemand(gale::Context& _context);
/**
* @brief Exit the application (not availlable on IOs, ==> the user will not understand the comportement. He will think the application has crashed (Apple philosophie))
* @param[in] _value value to return on the program * @param[in] _value value to return on the program
*/ */
virtual void exit(int32_t _value); virtual void exit(int32_t _value);

19
gale/context/Context.cpp
View File

@ -635,11 +635,11 @@ void gale::Context::OS_Stop() {
// set the curent interface : // set the curent interface :
lockContext(); lockContext();
GALE_INFO("OS_Stop..."); GALE_INFO("OS_Stop...");
#if 0 if (m_application == nullptr) {
if (m_windowsCurrent != nullptr) { stop();
m_windowsCurrent->sysOnKill(); return;
} }
#endif m_application->onKillDemand(*this);
// release the curent interface : // release the curent interface :
unLockContext(); unLockContext();
} }
@ -732,14 +732,3 @@ void gale::Context::keyboardHide() {
GALE_INFO("keyboardHide: NOT implemented ..."); GALE_INFO("keyboardHide: NOT implemented ...");
} }
#if 0
bool gale::Context::systemKeyboradEvent(enum gale::key::keyboardSystem _key, bool _down) {
if (m_windowsCurrent == nullptr) {
return false;
}
lockContext();
bool ret = m_windowsCurrent->onEventHardwareInput(_key, _down);
unLockContext();
return ret;
}
#endif

133
gale/context/X11/Context.cpp
View File

@ -213,7 +213,8 @@ class X11Interface : public gale::Context {
if(XAtomeDeleteWindows == (uint64_t)event.xclient.data.l[0]) { if(XAtomeDeleteWindows == (uint64_t)event.xclient.data.l[0]) {
GALE_INFO(" == > Kill Requested ..."); GALE_INFO(" == > Kill Requested ...");
OS_Stop(); OS_Stop();
m_run = false; // We do not close here but in the application only:
//m_run = false;
} }
break; break;
} }
@ -246,9 +247,9 @@ class X11Interface : public gale::Context {
} }
} }
#endif #endif
if (true == m_clipBoardOwnerPrimary) { if (m_clipBoardOwnerPrimary == true) {
m_clipBoardOwnerPrimary = false; m_clipBoardOwnerPrimary = false;
} else if (true == m_clipBoardOwnerStd) { } else if (m_clipBoardOwnerStd == true) {
m_clipBoardOwnerStd = false; m_clipBoardOwnerStd = false;
} else { } else {
GALE_ERROR("X11 event SelectionClear == > but no selection requested anymore ..."); GALE_ERROR("X11 event SelectionClear == > but no selection requested anymore ...");
@ -277,7 +278,7 @@ class X11Interface : public gale::Context {
&bytes, // *bytes_after_return &bytes, // *bytes_after_return
&buf// **prop_return); &buf// **prop_return);
); );
if (true == m_clipBoardRequestPrimary) { if (m_clipBoardRequestPrimary == true) {
std::string tmpppp((char*)buf); std::string tmpppp((char*)buf);
gale::context::clipBoard::setSystem(gale::context::clipBoard::clipboardSelection, tmpppp); gale::context::clipBoard::setSystem(gale::context::clipBoard::clipboardSelection, tmpppp);
// just transmit an event , we have the data in the system // just transmit an event , we have the data in the system
@ -383,11 +384,11 @@ class X11Interface : public gale::Context {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
case Expose: case Expose:
X11_INFO("X11 event Expose"); X11_INFO("X11 event Expose");
specialEventThatNeedARedraw=true; specialEventThatNeedARedraw = true;
break; break;
case GraphicsExpose: case GraphicsExpose:
X11_INFO("X11 event GraphicsExpose"); X11_INFO("X11 event GraphicsExpose");
specialEventThatNeedARedraw=true; specialEventThatNeedARedraw = true;
break; break;
case NoExpose: case NoExpose:
X11_INFO("X11 event NoExpose"); X11_INFO("X11 event NoExpose");
@ -471,9 +472,9 @@ class X11Interface : public gale::Context {
break; break;
case MotionNotify: case MotionNotify:
X11_INFO("X11 event MotionNotify"); X11_INFO("X11 event MotionNotify");
if( true == m_grabAllEvent if( m_grabAllEvent == true
&& event.xmotion.x == (int32_t)m_forcePos.x() && event.xmotion.x == int32_t(m_forcePos.x())
&& event.xmotion.y == (int32_t)m_forcePos.y()) { && event.xmotion.y == int32_t(m_forcePos.y()) ) {
X11_VERBOSE("X11 reject mouse move (grab mode)"); X11_VERBOSE("X11 reject mouse move (grab mode)");
// we get our requested position... // we get our requested position...
m_positionChangeRequested = false; m_positionChangeRequested = false;
@ -481,12 +482,12 @@ class X11Interface : public gale::Context {
} else { } else {
m_cursorEventX = event.xmotion.x; m_cursorEventX = event.xmotion.x;
m_cursorEventY = (m_currentHeight-event.xmotion.y); m_cursorEventY = (m_currentHeight-event.xmotion.y);
if(true == m_grabAllEvent) { if(m_grabAllEvent == true) {
m_cursorEventX -= m_forcePos.x(); m_cursorEventX -= m_forcePos.x();
m_cursorEventY -= (m_currentHeight-m_forcePos.y()); m_cursorEventY -= (m_currentHeight-m_forcePos.y());
} }
vec2 newDelta = vec2(m_cursorEventX, m_cursorEventY); vec2 newDelta = vec2(m_cursorEventX, m_cursorEventY);
if(true == m_grabAllEvent) { if(m_grabAllEvent == true) {
m_cursorEventX -= m_curentGrabDelta.x(); m_cursorEventX -= m_curentGrabDelta.x();
m_cursorEventY -= m_curentGrabDelta.y(); m_cursorEventY -= m_curentGrabDelta.y();
} }
@ -494,7 +495,7 @@ class X11Interface : public gale::Context {
// For compatibility of the Android system : // For compatibility of the Android system :
bool findOne = false; bool findOne = false;
for (int32_t iii=0; iii<MAX_MANAGE_INPUT ; iii++) { for (int32_t iii=0; iii<MAX_MANAGE_INPUT ; iii++) {
if (true == m_inputIsPressed[iii]) { if (m_inputIsPressed[iii] == true) {
X11_DEBUG("X11 event: bt=" << iii << " " << event.type << " = \"MotionNotify\" (" << m_cursorEventX << "," << m_cursorEventY << ")"); X11_DEBUG("X11 event: bt=" << iii << " " << event.type << " = \"MotionNotify\" (" << m_cursorEventX << "," << m_cursorEventY << ")");
OS_SetInput(gale::key::type_mouse, OS_SetInput(gale::key::type_mouse,
gale::key::status_move, gale::key::status_move,
@ -503,14 +504,14 @@ class X11Interface : public gale::Context {
findOne = true; findOne = true;
} }
} }
if (false == findOne) { if (findOne == false) {
X11_DEBUG("X11 event: bt=" << 0 << " " << event.type << " = \"MotionNotify\" (" << m_cursorEventX << "," << m_cursorEventY << ")"); X11_DEBUG("X11 event: bt=" << 0 << " " << event.type << " = \"MotionNotify\" (" << m_cursorEventX << "," << m_cursorEventY << ")");
OS_SetInput(gale::key::type_mouse, OS_SetInput(gale::key::type_mouse,
gale::key::status_move, gale::key::status_move,
0, 0,
vec2(m_cursorEventX, m_cursorEventY)); vec2(m_cursorEventX, m_cursorEventY));
} }
if (true == m_grabAllEvent) { if (m_grabAllEvent == true) {
if (m_positionChangeRequested == false) { if (m_positionChangeRequested == false) {
X11_DEBUG("X11 set pointer position : " << m_forcePos); X11_DEBUG("X11 set pointer position : " << m_forcePos);
XWarpPointer(m_display, None, m_WindowHandle, 0,0, 0, 0, m_forcePos.x(), m_forcePos.y()); XWarpPointer(m_display, None, m_WindowHandle, 0,0, 0, 0, m_forcePos.x(), m_forcePos.y());
@ -549,7 +550,7 @@ class X11Interface : public gale::Context {
thisIsAReapeateKey = true; thisIsAReapeateKey = true;
} }
} }
X11_INFO("X11 event : " << event.type << " = \"KeyPress/KeyRelease\" "); X11_INFO("X11 event : " << event.type << " = 'KeyPress/KeyRelease' ");
{ {
X11_DEBUG("eventKey : " << event.xkey.keycode << " state : " << event.xkey.state); X11_DEBUG("eventKey : " << event.xkey.keycode << " state : " << event.xkey.state);
if (event.xkey.state & (1<<0) ) { if (event.xkey.state & (1<<0) ) {
@ -622,7 +623,7 @@ class X11Interface : public gale::Context {
case 118: case 118:
keyInput = gale::key::keyboard_insert; keyInput = gale::key::keyboard_insert;
if(event.type == KeyRelease) { if(event.type == KeyRelease) {
if (true == m_guiKeyBoardMode.getInsert()) { if (m_guiKeyBoardMode.getInsert() == true) {
m_guiKeyBoardMode.setInsert(false); m_guiKeyBoardMode.setInsert(false);
} else { } else {
m_guiKeyBoardMode.setInsert(true); m_guiKeyBoardMode.setInsert(true);
@ -661,7 +662,7 @@ class X11Interface : public gale::Context {
(event.type==KeyPress?gale::key::status_down:gale::key::status_up), (event.type==KeyPress?gale::key::status_down:gale::key::status_up),
thisIsAReapeateKey, thisIsAReapeateKey,
'.'); '.');
if (true == thisIsAReapeateKey) { if (thisIsAReapeateKey == true) {
OS_setKeyboard(m_guiKeyBoardMode, OS_setKeyboard(m_guiKeyBoardMode,
gale::key::keyboard_char, gale::key::keyboard_char,
(event.type!=KeyPress?gale::key::status_down:gale::key::status_up), (event.type!=KeyPress?gale::key::status_down:gale::key::status_up),
@ -674,7 +675,7 @@ class X11Interface : public gale::Context {
(event.type==KeyPress?gale::key::status_down:gale::key::status_up), (event.type==KeyPress?gale::key::status_down:gale::key::status_up),
thisIsAReapeateKey, thisIsAReapeateKey,
0x7F); 0x7F);
if (true == thisIsAReapeateKey) { if (thisIsAReapeateKey == true) {
OS_setKeyboard(m_guiKeyBoardMode, OS_setKeyboard(m_guiKeyBoardMode,
gale::key::keyboard_char, gale::key::keyboard_char,
(event.type!=KeyPress?gale::key::status_down:gale::key::status_up), (event.type!=KeyPress?gale::key::status_down:gale::key::status_up),
@ -690,7 +691,7 @@ class X11Interface : public gale::Context {
(event.type==KeyPress?gale::key::status_down:gale::key::status_up), (event.type==KeyPress?gale::key::status_down:gale::key::status_up),
thisIsAReapeateKey, thisIsAReapeateKey,
0x09); 0x09);
if (true == thisIsAReapeateKey) { if (thisIsAReapeateKey == true) {
OS_setKeyboard(m_guiKeyBoardMode, OS_setKeyboard(m_guiKeyBoardMode,
gale::key::keyboard_char, gale::key::keyboard_char,
(event.type!=KeyPress?gale::key::status_down:gale::key::status_up), (event.type!=KeyPress?gale::key::status_down:gale::key::status_up),
@ -722,7 +723,7 @@ class X11Interface : public gale::Context {
} }
if (count >= 0) { if (count >= 0) {
// repeated kay from previous element : // repeated kay from previous element :
if (count>0) { if (count > 0) {
// transform it in unicode // transform it in unicode
m_lastKeyPressed = utf8::convertChar32(buf); m_lastKeyPressed = utf8::convertChar32(buf);
} }
@ -732,7 +733,7 @@ class X11Interface : public gale::Context {
(event.type==KeyPress?gale::key::status_down:gale::key::status_up), (event.type==KeyPress?gale::key::status_down:gale::key::status_up),
thisIsAReapeateKey, thisIsAReapeateKey,
m_lastKeyPressed); m_lastKeyPressed);
if (true == thisIsAReapeateKey) { if (thisIsAReapeateKey == true) {
OS_setKeyboard(m_guiKeyBoardMode, OS_setKeyboard(m_guiKeyBoardMode,
gale::key::keyboard_char, gale::key::keyboard_char,
(event.type!=KeyPress?gale::key::status_down:gale::key::status_up), (event.type!=KeyPress?gale::key::status_down:gale::key::status_up),
@ -745,13 +746,13 @@ class X11Interface : public gale::Context {
} }
break; break;
} }
if (true == find) { if (find == true) {
//GALE_DEBUG("eventKey Move type : " << getCharTypeMoveEvent(keyInput) ); //GALE_DEBUG("eventKey Move type : " << getCharTypeMoveEvent(keyInput) );
OS_setKeyboard(m_guiKeyBoardMode, OS_setKeyboard(m_guiKeyBoardMode,
keyInput, keyInput,
(event.type==KeyPress?gale::key::status_down:gale::key::status_up), (event.type==KeyPress?gale::key::status_down:gale::key::status_up),
thisIsAReapeateKey); thisIsAReapeateKey);
if (true == thisIsAReapeateKey) { if (thisIsAReapeateKey == true) {
OS_setKeyboard(m_guiKeyBoardMode, OS_setKeyboard(m_guiKeyBoardMode,
keyInput, keyInput,
(event.type!=KeyPress?gale::key::status_down:gale::key::status_up), (event.type!=KeyPress?gale::key::status_down:gale::key::status_up),
@ -778,7 +779,7 @@ class X11Interface : public gale::Context {
break; break;
} }
} }
if(true == m_run) { if(m_run == true) {
if (m_doubleBuffered && hasDisplay) { if (m_doubleBuffered && hasDisplay) {
glXSwapBuffers(m_display, m_WindowHandle); glXSwapBuffers(m_display, m_WindowHandle);
XSync(m_display,0); XSync(m_display,0);
@ -912,7 +913,7 @@ class X11Interface : public gale::Context {
} }
/****************************************************************************************/ /****************************************************************************************/
void grabPointerEvents(bool _isGrabbed, const vec2& _forcedPosition) { void grabPointerEvents(bool _isGrabbed, const vec2& _forcedPosition) {
if (true == _isGrabbed) { if (_isGrabbed == true) {
X11_DEBUG("X11-API: Grab Events"); X11_DEBUG("X11-API: Grab Events");
int32_t test = XGrabPointer(m_display,RootWindow(m_display, DefaultScreen(m_display)), True, int32_t test = XGrabPointer(m_display,RootWindow(m_display, DefaultScreen(m_display)), True,
ButtonPressMask | ButtonPressMask |
@ -926,12 +927,9 @@ class X11Interface : public gale::Context {
RootWindow(m_display, DefaultScreen(m_display)), RootWindow(m_display, DefaultScreen(m_display)),
None, None,
CurrentTime); CurrentTime);
if (GrabSuccess != test) {
if (GrabSuccess != test)
{
GALE_CRITICAL("Display error " << test); GALE_CRITICAL("Display error " << test);
switch (test) switch (test) {
{
case BadCursor: case BadCursor:
GALE_CRITICAL(" BadCursor"); GALE_CRITICAL(" BadCursor");
break; break;
@ -973,7 +971,7 @@ class X11Interface : public gale::Context {
// Connect to the X server // Connect to the X server
m_display = XOpenDisplay(nullptr); m_display = XOpenDisplay(nullptr);
if(nullptr == m_display) { if(m_display == nullptr) {
GALE_CRITICAL("Could not open display X."); GALE_CRITICAL("Could not open display X.");
exit(-1); exit(-1);
} else { } else {
@ -986,7 +984,7 @@ class X11Interface : public gale::Context {
gale::Dimension::Millimeter); gale::Dimension::Millimeter);
// get an appropriate visual // get an appropriate visual
m_visual = glXChooseVisual(m_display, Xscreen, attrListDbl); m_visual = glXChooseVisual(m_display, Xscreen, attrListDbl);
if (nullptr == m_visual) { if (m_visual == nullptr) {
m_visual = glXChooseVisual(m_display, Xscreen, attrListSgl); m_visual = glXChooseVisual(m_display, Xscreen, attrListSgl);
m_doubleBuffered = false; m_doubleBuffered = false;
GALE_INFO("GL-X singlebuffered rendering will be used, no doublebuffering available"); GALE_INFO("GL-X singlebuffered rendering will be used, no doublebuffering available");
@ -1034,15 +1032,15 @@ class X11Interface : public gale::Context {
GALE_INFO("X11 request creating windows at pos=(" << m_originX << "," << m_originY << ") size=(" << tmp_width << "," << tmp_height << ")" ); GALE_INFO("X11 request creating windows at pos=(" << m_originX << "," << m_originY << ") size=(" << tmp_width << "," << tmp_height << ")" );
// Real create of the window // Real create of the window
m_WindowHandle = XCreateWindow(m_display, m_WindowHandle = XCreateWindow(m_display,
Xroot, Xroot,
x, y, tmp_width, tmp_height, x, y, tmp_width, tmp_height,
1, 1,
m_visual->depth, m_visual->depth,
InputOutput, InputOutput,
m_visual->visual, m_visual->visual,
attr_mask, &attr); attr_mask, &attr);
if( !m_WindowHandle ) { if(!m_WindowHandle) {
GALE_CRITICAL("Couldn't create the window"); GALE_CRITICAL("Couldn't create the window");
exit(-1); exit(-1);
} }
@ -1064,10 +1062,10 @@ class X11Interface : public gale::Context {
StartupState->flags = StateHint; StartupState->flags = StateHint;
XSetWMProperties(m_display, m_WindowHandle,&textprop, &textprop,/* Window title/icon title*/ XSetWMProperties(m_display, m_WindowHandle,&textprop, &textprop,/* Window title/icon title*/
nullptr, 0,/* Argv[], argc for program*/ nullptr, 0,/* Argv[], argc for program*/
&hints, /* Start position/size*/ &hints, /* Start position/size*/
StartupState,/* Iconised/not flag */ StartupState,/* Iconised/not flag */
nullptr); nullptr);
XFree(StartupState); XFree(StartupState);
@ -1181,17 +1179,21 @@ class X11Interface : public gale::Context {
} }
XImage* myImage = XCreateImage(m_display, XImage* myImage = XCreateImage(m_display,
m_visual->visual, m_visual->visual,
depth, depth,
ZPixmap, ZPixmap,
0, 0,
(char*)tmpVal, (char*)tmpVal,
dataImage.getWidth(), dataImage.getWidth(),
dataImage.getHeight(), dataImage.getHeight(),
32, 32,
0); 0);
Pixmap tmpPixmap = XCreatePixmap(m_display, m_WindowHandle, dataImage.getWidth(), dataImage.getHeight(), depth); Pixmap tmpPixmap = XCreatePixmap(m_display,
m_WindowHandle,
dataImage.getWidth(),
dataImage.getHeight(),
depth);
switch(tmpPixmap) { switch(tmpPixmap) {
case BadAlloc: case BadAlloc:
GALE_ERROR("X11: BadAlloc"); GALE_ERROR("X11: BadAlloc");
@ -1207,7 +1209,13 @@ class X11Interface : public gale::Context {
break; break;
} }
GC tmpGC = DefaultGC(m_display, DefaultScreen(m_display) ); GC tmpGC = DefaultGC(m_display, DefaultScreen(m_display) );
int error = XPutImage(m_display, tmpPixmap, tmpGC, myImage, 0, 0, 0, 0, dataImage.getWidth(), dataImage.getHeight()); int error = XPutImage(m_display,
tmpPixmap,
tmpGC,
myImage,
0, 0, 0, 0,
dataImage.getWidth(),
dataImage.getHeight());
switch(error) { switch(error) {
case BadDrawable: case BadDrawable:
GALE_ERROR("X11: BadDrawable"); GALE_ERROR("X11: BadDrawable");
@ -1227,7 +1235,7 @@ class X11Interface : public gale::Context {
} }
// allocate a WM hints structure. // allocate a WM hints structure.
XWMHints* win_hints = XAllocWMHints(); XWMHints* win_hints = XAllocWMHints();
if (!win_hints) { if (win_hints == nullptr) {
GALE_ERROR("XAllocWMHints - out of memory"); GALE_ERROR("XAllocWMHints - out of memory");
return; return;
} }
@ -1255,7 +1263,7 @@ class X11Interface : public gale::Context {
typedef int32_t (APIENTRY *PFNWGLSWAPINTERVALPROC)( int ); typedef int32_t (APIENTRY *PFNWGLSWAPINTERVALPROC)( int );
PFNWGLSWAPINTERVALPROC wglSwapIntervalEXT = 0; PFNWGLSWAPINTERVALPROC wglSwapIntervalEXT = 0;
const char *extensions = (char*)glGetString( GL_EXTENSIONS ); const char *extensions = (char*)glGetString( GL_EXTENSIONS );
if( strstr( extensions, "WGL_EXT_swap_control" ) == 0 ) { if (strstr( extensions, "WGL_EXT_swap_control" ) == 0) {
GALE_ERROR("Can not set the vertical synchronisation status" << _sync << " (1)"); GALE_ERROR("Can not set the vertical synchronisation status" << _sync << " (1)");
return; return;
} else { } else {
@ -1279,10 +1287,8 @@ class X11Interface : public gale::Context {
} else { } else {
GALE_INFO("XF86 DRI NOT available\n"); GALE_INFO("XF86 DRI NOT available\n");
} }
// enable vertical synchronisation : (some computer has synchronisation disable) // enable vertical synchronisation : (some computer has synchronisation disable)
setVSync(true); setVSync(true);
return true; return true;
} }
/****************************************************************************************/ /****************************************************************************************/
@ -1299,7 +1305,6 @@ class X11Interface : public gale::Context {
XSetWMIconName(m_display, m_WindowHandle, &tp); XSetWMIconName(m_display, m_WindowHandle, &tp);
X11_INFO("X11: set Title (END)"); X11_INFO("X11: set Title (END)");
} }
void openURL(const std::string& _url) { void openURL(const std::string& _url) {
std::string req = "xdg-open "; std::string req = "xdg-open ";
req += _url; req += _url;
@ -1310,7 +1315,7 @@ class X11Interface : public gale::Context {
void clipBoardGet(enum gale::context::clipBoard::clipboardListe _clipboardID) { void clipBoardGet(enum gale::context::clipBoard::clipboardListe _clipboardID) {
switch (_clipboardID) { switch (_clipboardID) {
case gale::context::clipBoard::clipboardSelection: case gale::context::clipBoard::clipboardSelection:
if (false == m_clipBoardOwnerPrimary) { if (m_clipBoardOwnerPrimary == false) {
m_clipBoardRequestPrimary = true; m_clipBoardRequestPrimary = true;
// generate a request on X11 // generate a request on X11
XConvertSelection(m_display, XConvertSelection(m_display,
@ -1325,7 +1330,7 @@ class X11Interface : public gale::Context {
} }
break; break;
case gale::context::clipBoard::clipboardStd: case gale::context::clipBoard::clipboardStd:
if (false == m_clipBoardOwnerStd) { if (m_clipBoardOwnerStd == false) {
m_clipBoardRequestPrimary = false; m_clipBoardRequestPrimary = false;
// generate a request on X11 // generate a request on X11
XConvertSelection(m_display, XConvertSelection(m_display,
@ -1349,14 +1354,14 @@ class X11Interface : public gale::Context {
switch (_clipboardID) { switch (_clipboardID) {
case gale::context::clipBoard::clipboardSelection: case gale::context::clipBoard::clipboardSelection:
// Request the selection : // Request the selection :
if (false == m_clipBoardOwnerPrimary) { if (m_clipBoardOwnerPrimary == false) {
XSetSelectionOwner(m_display, XAtomeSelection, m_WindowHandle, CurrentTime); XSetSelectionOwner(m_display, XAtomeSelection, m_WindowHandle, CurrentTime);
m_clipBoardOwnerPrimary = true; m_clipBoardOwnerPrimary = true;
} }
break; break;
case gale::context::clipBoard::clipboardStd: case gale::context::clipBoard::clipboardStd:
// Request the clipBoard : // Request the clipBoard :
if (false == m_clipBoardOwnerStd) { if (m_clipBoardOwnerStd == false) {
XSetSelectionOwner(m_display, XAtomeClipBoard, m_WindowHandle, CurrentTime); XSetSelectionOwner(m_display, XAtomeClipBoard, m_WindowHandle, CurrentTime);
m_clipBoardOwnerStd = true; m_clipBoardOwnerStd = true;
} }