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

[DEV] correction of the atom get property at null

Browse Source
This commit is contained in:
Edouard DUPIN 2014-04-17 21:17:19 +02:00
parent 852543d957
commit ab770771cc
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sources/ewol/context/X11/Context.cpp
View File

@ -224,12 +224,24 @@ class X11Interface : public ewol::Context {
#ifdef DEBUG_X11_EVENT #ifdef DEBUG_X11_EVENT
{ {
XSelectionRequestEvent *req=&(event.xselectionrequest); XSelectionRequestEvent *req=&(event.xselectionrequest);
if (req->property == 0) {
EWOL_ERROR("Get NULL ATOM ... property");
break;
}
if (req->target == 0) {
EWOL_ERROR("Get NULL ATOM ... target");
break;
}
char * atomNameProperty = XGetAtomName(m_display, req->property); char * atomNameProperty = XGetAtomName(m_display, req->property);
char * atomNameTarget = XGetAtomName(m_display, req->target); char * atomNameTarget = XGetAtomName(m_display, req->target);
EWOL_INFO("X11 property: \"" << atomNameProperty << "\""); EWOL_INFO("X11 property: \"" << atomNameProperty << "\"");
EWOL_INFO("X11 target: \"" << atomNameTarget << "\""); EWOL_INFO("X11 target: \"" << atomNameTarget << "\"");
if (NULL != atomNameProperty) { XFree(atomNameProperty); } if (atomNameProperty != NULL) {
if (NULL != atomNameTarget) { XFree(atomNameTarget); } XFree(atomNameProperty);
}
if (atomNameTarget != NULL) {
XFree(atomNameTarget);
}
} }
#endif #endif
if (true == m_clipBoardOwnerPrimary) { if (true == m_clipBoardOwnerPrimary) {
@ -281,6 +293,18 @@ class X11Interface : public ewol::Context {
XSelectionRequestEvent *req=&(event.xselectionrequest); XSelectionRequestEvent *req=&(event.xselectionrequest);
#ifdef DEBUG_X11_EVENT #ifdef DEBUG_X11_EVENT
{ {
if (req->property == 0) {
EWOL_ERROR("Get NULL ATOM ... property");
break;
}
if (req->selection == 0) {
EWOL_ERROR("Get NULL ATOM ... selection");
break;
}
if (req->target == 0) {
EWOL_ERROR("Get NULL ATOM ... target");
break;
}
char * atomNameProperty = XGetAtomName(m_display, req->property); char * atomNameProperty = XGetAtomName(m_display, req->property);
char * atomNameSelection = XGetAtomName(m_display, req->selection); char * atomNameSelection = XGetAtomName(m_display, req->selection);
char * atomNameTarget = XGetAtomName(m_display, req->target); char * atomNameTarget = XGetAtomName(m_display, req->target);
@ -664,7 +688,7 @@ class X11Interface : public ewol::Context {
// transform it in unicode // transform it in unicode
m_lastKeyPressed = utf8::convertChar32(buf); m_lastKeyPressed = utf8::convertChar32(buf);
} }
//EWOL_INFO("event Key : " << event.xkey.keycode << " char=\"" << buf << "\"'len=" << strlen(buf) << " unicode=" << unicodeValue); X11_INFO("event Key : " << event.xkey.keycode << " char=\"" << buf << "\"'len=" << strlen(buf) << " unicode=" << m_lastKeyPressed);
OS_SetKeyboard(m_guiKeyBoardMode, m_lastKeyPressed, (event.type == KeyPress), thisIsAReapeateKey); OS_SetKeyboard(m_guiKeyBoardMode, m_lastKeyPressed, (event.type == KeyPress), thisIsAReapeateKey);
if (true == thisIsAReapeateKey) { if (true == thisIsAReapeateKey) {
OS_SetKeyboard(m_guiKeyBoardMode, m_lastKeyPressed, !(event.type == KeyPress), thisIsAReapeateKey); OS_SetKeyboard(m_guiKeyBoardMode, m_lastKeyPressed, !(event.type == KeyPress), thisIsAReapeateKey);

2
sources/ewol/widget/WidgetScrolled.cpp
View File

@ -201,7 +201,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
} }
if ( _event.getId() == m_highSpeedButton if ( _event.getId() == m_highSpeedButton
&& m_highSpeedMode != ewol::widget::Scroll::speedModeDisable) { && m_highSpeedMode != ewol::widget::Scroll::speedModeDisable) {
if (_event.getStatus() == ewol::key::statusUp) { if (_event.getStatus() == ewol::key::statusUpAfter) {
if (m_highSpeedMode == ewol::widget::Scroll::speedModeInit) { if (m_highSpeedMode == ewol::widget::Scroll::speedModeInit) {
// TODO : generate back the down event ... // TODO : generate back the down event ...
m_highSpeedMode = ewol::widget::Scroll::speedModeDisable; m_highSpeedMode = ewol::widget::Scroll::speedModeDisable;