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

set back a safe copy/past and middle button

Browse Source
This commit is contained in:
Edouard Dupin 2012-05-27 10:59:08 +02:00
parent be4a593346
commit 2ee4d9f071
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/libewol/ewol/ClipBoard.cpp
View File

@ -63,14 +63,12 @@ void ewol::clipBoard::Set(uint8_t clipboardID, etk::UString &data)
if(0 == data.Size()) { if(0 == data.Size()) {
EWOL_INFO("request a copy of nothing"); EWOL_INFO("request a copy of nothing");
return; return;
/*
} else if (ewol::clipBoard::CLIPBOARD_STD == clipboardID) { } else if (ewol::clipBoard::CLIPBOARD_STD == clipboardID) {
guiAbstraction::ClipBoardSet(data, guiAbstraction::CLIPBOARD_MODE_STD); guiAbstraction::ClipBoardSet(data, guiAbstraction::CLIPBOARD_MODE_STD);
return; return;
} else if (ewol::clipBoard::CLIPBOARD_SELECTION == clipboardID) { } else if (ewol::clipBoard::CLIPBOARD_SELECTION == clipboardID) {
guiAbstraction::ClipBoardSet(data, guiAbstraction::CLIPBOARD_MODE_PRIMARY); guiAbstraction::ClipBoardSet(data, guiAbstraction::CLIPBOARD_MODE_PRIMARY);
return; return;
*/
}else if(clipboardID >= ewol::clipBoard::TOTAL_OF_CLICKBOARD) { }else if(clipboardID >= ewol::clipBoard::TOTAL_OF_CLICKBOARD) {
EWOL_WARNING("request ClickBoard id error"); EWOL_WARNING("request ClickBoard id error");
return; return;
@ -81,14 +79,13 @@ void ewol::clipBoard::Set(uint8_t clipboardID, etk::UString &data)
void ewol::clipBoard::Get(uint8_t clipboardID, etk::UString &data) void ewol::clipBoard::Get(uint8_t clipboardID, etk::UString &data)
{ {
/*
if (ewol::clipBoard::CLIPBOARD_STD == clipboardID) { if (ewol::clipBoard::CLIPBOARD_STD == clipboardID) {
guiAbstraction::ClipBoardGet(data, guiAbstraction::CLIPBOARD_MODE_STD); guiAbstraction::ClipBoardGet(data, guiAbstraction::CLIPBOARD_MODE_STD);
return; return;
} else if (ewol::clipBoard::CLIPBOARD_SELECTION == clipboardID) { } else if (ewol::clipBoard::CLIPBOARD_SELECTION == clipboardID) {
guiAbstraction::ClipBoardGet(data, guiAbstraction::CLIPBOARD_MODE_PRIMARY); guiAbstraction::ClipBoardGet(data, guiAbstraction::CLIPBOARD_MODE_PRIMARY);
return; return;
} else */ if(clipboardID >= ewol::clipBoard::TOTAL_OF_CLICKBOARD) { } else if(clipboardID >= ewol::clipBoard::TOTAL_OF_CLICKBOARD) {
EWOL_WARNING("request ClickBoard id error"); EWOL_WARNING("request ClickBoard id error");
return; return;
} }

8
Sources/libewol/ewol/WidgetManager.cpp
View File

@ -220,9 +220,9 @@ static bool needRedraw = true;
void ewol::widgetManager::DoubleBufferLock(void) void ewol::widgetManager::DoubleBufferLock(void)
{ {
if (IsInit) { if (IsInit) {
EWOL_DEBUG("DoubleBuffer-Lock"); //EWOL_DEBUG("DoubleBuffer-Lock");
pthread_mutex_lock(&localMutex); pthread_mutex_lock(&localMutex);
EWOL_DEBUG("DoubleBuffer-Lock (DONE)"); //EWOL_DEBUG("DoubleBuffer-Lock (DONE)");
} }
} }
@ -243,9 +243,9 @@ bool ewol::widgetManager::GetDoubleBufferNeedDraw(void)
void ewol::widgetManager::DoubleBufferUnLock(void) void ewol::widgetManager::DoubleBufferUnLock(void)
{ {
if (IsInit) { if (IsInit) {
EWOL_DEBUG("DoubleBuffer-UnLock"); //EWOL_DEBUG("DoubleBuffer-UnLock");
pthread_mutex_unlock(&localMutex); pthread_mutex_unlock(&localMutex);
EWOL_DEBUG("DoubleBuffer-UnLock (DONE)"); //EWOL_DEBUG("DoubleBuffer-UnLock (DONE)");
} }
} }

10
Sources/libewol/ewol/base/guiX11.cpp
View File

@ -43,7 +43,7 @@
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <sys/times.h> #include <sys/times.h>
#define DEBUG_X11_EVENT //#define DEBUG_X11_EVENT
int64_t GetCurrentTime(void) int64_t GetCurrentTime(void)
{ {
@ -129,14 +129,14 @@ int32_t offsetMoveClickedDouble = 20000;
#ifdef PTHREAD_GUI_LOCK_MULTITHREAD #ifdef PTHREAD_GUI_LOCK_MULTITHREAD
static pthread_mutex_t l_mutex; static pthread_mutex_t l_mutex;
#define GUI_LOCK() do { \ #define GUI_LOCK() do { \
EWOL_DEBUG("GUI-Lock"); \ /*EWOL_DEBUG("GUI-Lock");*/ \
pthread_mutex_lock(&l_mutex); \ pthread_mutex_lock(&l_mutex); \
EWOL_DEBUG("GUI-Lock (done)"); \ /*EWOL_DEBUG("GUI-Lock (done)");*/ \
}while(0) }while(0)
#define GUI_UNLOCK() do { \ #define GUI_UNLOCK() do { \
EWOL_DEBUG("GUI-UnLock"); \ /*EWOL_DEBUG("GUI-UnLock");*/ \
pthread_mutex_unlock(&l_mutex); \ pthread_mutex_unlock(&l_mutex); \
EWOL_DEBUG("GUI-UnLock (done)"); \ /*EWOL_DEBUG("GUI-UnLock (done)");*/ \
}while(0) }while(0)
#else #else
#define GUI_LOCK() XLockDisplay(m_display) #define GUI_LOCK() XLockDisplay(m_display)