[DEBUG] stop correction
This commit is contained in:
parent
90eb3d1ae3
commit
aee421c216
@ -175,8 +175,8 @@ class X11Interface : public ewol::eContext {
|
|||||||
glXSwapBuffers(m_display, m_WindowHandle);
|
glXSwapBuffers(m_display, m_WindowHandle);
|
||||||
XSync(m_display,0);
|
XSync(m_display,0);
|
||||||
}
|
}
|
||||||
CreateX11Context();
|
createX11Context();
|
||||||
CreateOGlContext();
|
createOGlContext();
|
||||||
// reset the Atom properties ...
|
// reset the Atom properties ...
|
||||||
XAtomeSelection = XInternAtom(m_display, "PRIMARY", 0);
|
XAtomeSelection = XInternAtom(m_display, "PRIMARY", 0);
|
||||||
XAtomeClipBoard = XInternAtom(m_display, "CLIPBOARD", 0);
|
XAtomeClipBoard = XInternAtom(m_display, "CLIPBOARD", 0);
|
||||||
@ -192,7 +192,7 @@ class X11Interface : public ewol::eContext {
|
|||||||
// TODO : ...
|
// TODO : ...
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t Run(void) {
|
int32_t run(void) {
|
||||||
bool specialEventThatNeedARedraw = false;
|
bool specialEventThatNeedARedraw = false;
|
||||||
// main cycle
|
// main cycle
|
||||||
while(true == m_run) {
|
while(true == m_run) {
|
||||||
@ -712,7 +712,7 @@ class X11Interface : public ewol::eContext {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
/****************************************************************************************/
|
/****************************************************************************************/
|
||||||
virtual void Stop(void) {
|
virtual void stop(void) {
|
||||||
X11_INFO("X11-API: Stop");
|
X11_INFO("X11-API: Stop");
|
||||||
m_run = false;
|
m_run = false;
|
||||||
}
|
}
|
||||||
@ -831,7 +831,7 @@ class X11Interface : public ewol::eContext {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/****************************************************************************************/
|
/****************************************************************************************/
|
||||||
void GrabPointerEvents(bool _isGrabbed, const vec2& _forcedPosition) {
|
void grabPointerEvents(bool _isGrabbed, const vec2& _forcedPosition) {
|
||||||
if (true == _isGrabbed) {
|
if (true == _isGrabbed) {
|
||||||
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,
|
||||||
@ -881,7 +881,7 @@ class X11Interface : public ewol::eContext {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/****************************************************************************************/
|
/****************************************************************************************/
|
||||||
bool CreateX11Context(void) {
|
bool createX11Context(void) {
|
||||||
X11_INFO("X11: CreateX11Context");
|
X11_INFO("X11: CreateX11Context");
|
||||||
int x,y, attr_mask;
|
int x,y, attr_mask;
|
||||||
XSizeHints hints;
|
XSizeHints hints;
|
||||||
@ -1187,7 +1187,7 @@ class X11Interface : public ewol::eContext {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/****************************************************************************************/
|
/****************************************************************************************/
|
||||||
bool CreateOGlContext(void) {
|
bool createOGlContext(void) {
|
||||||
X11_INFO("X11:CreateOGlContext");
|
X11_INFO("X11:CreateOGlContext");
|
||||||
/* create a GLX context */
|
/* create a GLX context */
|
||||||
GLXContext RenderContext = glXCreateContext(m_display, m_visual, 0, GL_TRUE);
|
GLXContext RenderContext = glXCreateContext(m_display, m_visual, 0, GL_TRUE);
|
||||||
@ -1220,7 +1220,7 @@ class X11Interface : public ewol::eContext {
|
|||||||
X11_INFO("X11: set Title (END)");
|
X11_INFO("X11: set Title (END)");
|
||||||
}
|
}
|
||||||
/****************************************************************************************/
|
/****************************************************************************************/
|
||||||
void ClipBoardGet(ewol::clipBoard::clipboardListe_te _clipboardID) {
|
void clipBoardGet(ewol::clipBoard::clipboardListe_te _clipboardID) {
|
||||||
switch (_clipboardID)
|
switch (_clipboardID)
|
||||||
{
|
{
|
||||||
case ewol::clipBoard::clipboardSelection:
|
case ewol::clipBoard::clipboardSelection:
|
||||||
@ -1259,7 +1259,7 @@ class X11Interface : public ewol::eContext {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/****************************************************************************************/
|
/****************************************************************************************/
|
||||||
void ClipBoardSet(ewol::clipBoard::clipboardListe_te _clipboardID) {
|
void clipBoardSet(ewol::clipBoard::clipboardListe_te _clipboardID) {
|
||||||
switch (_clipboardID)
|
switch (_clipboardID)
|
||||||
{
|
{
|
||||||
case ewol::clipBoard::clipboardSelection:
|
case ewol::clipBoard::clipboardSelection:
|
||||||
@ -1296,7 +1296,7 @@ int ewol::run(int _argc, const char *_argv[]) {
|
|||||||
EWOL_CRITICAL("Can not create the X11 interface ... MEMORY allocation error");
|
EWOL_CRITICAL("Can not create the X11 interface ... MEMORY allocation error");
|
||||||
return -2;
|
return -2;
|
||||||
}
|
}
|
||||||
int32_t retValue = interface->Run();
|
int32_t retValue = interface->run();
|
||||||
delete(interface);
|
delete(interface);
|
||||||
interface = NULL;
|
interface = NULL;
|
||||||
return retValue;
|
return retValue;
|
||||||
|
@ -543,3 +543,27 @@ void ewol::eContext::OS_Resume(void) {
|
|||||||
m_widgetManager.periodicCallResume(m_previousDisplayTime);
|
m_widgetManager.periodicCallResume(m_previousDisplayTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void ewol::eContext::stop(void) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void ewol::eContext::setSize(const vec2& _size) {
|
||||||
|
EWOL_INFO("NOT implemented ...");
|
||||||
|
};
|
||||||
|
|
||||||
|
void ewol::eContext::setPos(const vec2& _pos) {
|
||||||
|
EWOL_INFO("NOT implemented ...");
|
||||||
|
}
|
||||||
|
|
||||||
|
void ewol::eContext::hide(void) {
|
||||||
|
EWOL_INFO("NOT implemented ...");
|
||||||
|
};
|
||||||
|
|
||||||
|
void ewol::eContext::show(void) {
|
||||||
|
EWOL_INFO("NOT implemented ...");
|
||||||
|
}
|
||||||
|
|
||||||
|
void ewol::eContext::setTitle(const etk::UString& _title) {
|
||||||
|
EWOL_INFO("NOT implemented ...");
|
||||||
|
}
|
||||||
|
@ -185,7 +185,7 @@ namespace ewol {
|
|||||||
/**
|
/**
|
||||||
* @brief The application request that the Window will be killed
|
* @brief The application request that the Window will be killed
|
||||||
*/
|
*/
|
||||||
virtual void stop(void) { };
|
virtual void stop(void);
|
||||||
private:
|
private:
|
||||||
ewol::Windows* m_windowsCurrent; //!< curent displayed windows
|
ewol::Windows* m_windowsCurrent; //!< curent displayed windows
|
||||||
public:
|
public:
|
||||||
@ -198,7 +198,9 @@ namespace ewol {
|
|||||||
* @brief get the current windows that is displayed
|
* @brief get the current windows that is displayed
|
||||||
* @return the current handle on the windows (can be null)
|
* @return the current handle on the windows (can be null)
|
||||||
*/
|
*/
|
||||||
ewol::Windows* getWindows(void) { return m_windowsCurrent; };
|
ewol::Windows* getWindows(void) {
|
||||||
|
return m_windowsCurrent;
|
||||||
|
};
|
||||||
private:
|
private:
|
||||||
vec2 m_windowsSize; //!< current size of the system
|
vec2 m_windowsSize; //!< current size of the system
|
||||||
public:
|
public:
|
||||||
@ -206,7 +208,9 @@ namespace ewol {
|
|||||||
* @brief get the current windows size
|
* @brief get the current windows size
|
||||||
* @return the current size ...
|
* @return the current size ...
|
||||||
*/
|
*/
|
||||||
const vec2& getSize(void) { return m_windowsSize; };
|
const vec2& getSize(void) {
|
||||||
|
return m_windowsSize;
|
||||||
|
};
|
||||||
/**
|
/**
|
||||||
* @brief The OS inform that the current windows has change his size.
|
* @brief The OS inform that the current windows has change his size.
|
||||||
* @param[in] _size new size of the windows.
|
* @param[in] _size new size of the windows.
|
||||||
@ -216,7 +220,7 @@ namespace ewol {
|
|||||||
* @brief The application request a change of his curent size.
|
* @brief The application request a change of his curent size.
|
||||||
* @param[in] _size new Requested size of the windows.
|
* @param[in] _size new Requested size of the windows.
|
||||||
*/
|
*/
|
||||||
virtual void setSize(const vec2& _size) { };
|
virtual void setSize(const vec2& _size);
|
||||||
/**
|
/**
|
||||||
* @brief The OS inform that the current windows has change his position.
|
* @brief The OS inform that the current windows has change his position.
|
||||||
* @param[in] _pos New position of the Windows.
|
* @param[in] _pos New position of the Windows.
|
||||||
@ -226,7 +230,7 @@ namespace ewol {
|
|||||||
* @brief The Application request that the current windows will change his position.
|
* @brief The Application request that the current windows will change his position.
|
||||||
* @param[in] _pos New position of the Windows requested.
|
* @param[in] _pos New position of the Windows requested.
|
||||||
*/
|
*/
|
||||||
virtual void setPos(const vec2& _pos) { };
|
virtual void setPos(const vec2& _pos);
|
||||||
/**
|
/**
|
||||||
* @brief The OS inform that the Windows is now Hidden.
|
* @brief The OS inform that the Windows is now Hidden.
|
||||||
*/
|
*/
|
||||||
@ -234,7 +238,7 @@ namespace ewol {
|
|||||||
/**
|
/**
|
||||||
* @brief The Application request that the Windows will be Hidden.
|
* @brief The Application request that the Windows will be Hidden.
|
||||||
*/
|
*/
|
||||||
virtual void hide(void) { };
|
virtual void hide(void);
|
||||||
/**
|
/**
|
||||||
* @brief The OS inform that the Windows is now visible.
|
* @brief The OS inform that the Windows is now visible.
|
||||||
*/
|
*/
|
||||||
@ -242,7 +246,7 @@ namespace ewol {
|
|||||||
/**
|
/**
|
||||||
* @brief The Application request that the Windows will be visible.
|
* @brief The Application request that the Windows will be visible.
|
||||||
*/
|
*/
|
||||||
virtual void show(void) { };
|
virtual void show(void);
|
||||||
/**
|
/**
|
||||||
* @brief Redraw all the windows
|
* @brief Redraw all the windows
|
||||||
*/
|
*/
|
||||||
@ -293,7 +297,7 @@ namespace ewol {
|
|||||||
* @brief set the new title of the windows
|
* @brief set the new title of the windows
|
||||||
* @param[in] title New desired title
|
* @param[in] title New desired title
|
||||||
*/
|
*/
|
||||||
virtual void setTitle(const etk::UString& _title) { };
|
virtual void setTitle(const etk::UString& _title);
|
||||||
/**
|
/**
|
||||||
* @brief force the screen orientation (availlable on portable elements ...
|
* @brief force the screen orientation (availlable on portable elements ...
|
||||||
* @param[in] _orientation Selected orientation.
|
* @param[in] _orientation Selected orientation.
|
||||||
|
@ -60,7 +60,9 @@ namespace widget {
|
|||||||
* @brief get the current border size of the current element:
|
* @brief get the current border size of the current element:
|
||||||
* @return the border size (0 if not used)
|
* @return the border size (0 if not used)
|
||||||
*/
|
*/
|
||||||
const ewol::Dimension& getBorderSize(void) { return m_borderSize; };
|
const ewol::Dimension& getBorderSize(void) {
|
||||||
|
return m_borderSize;
|
||||||
|
};
|
||||||
public:
|
public:
|
||||||
typedef enum {
|
typedef enum {
|
||||||
animationNone, //!< No annimation
|
animationNone, //!< No annimation
|
||||||
@ -77,12 +79,16 @@ namespace widget {
|
|||||||
* @brief set an animation mode for the new element set in the Widget container.
|
* @brief set an animation mode for the new element set in the Widget container.
|
||||||
* @param[in] _animation The new animation mode.
|
* @param[in] _animation The new animation mode.
|
||||||
*/
|
*/
|
||||||
void setAnimationMode(animation_te _animation) { m_animation = _animation; };
|
void setAnimationMode(animation_te _animation) {
|
||||||
|
m_animation = _animation;
|
||||||
|
};
|
||||||
/**
|
/**
|
||||||
* @brief get the current animation mode.
|
* @brief get the current animation mode.
|
||||||
* @return The animation mode.
|
* @return The animation mode.
|
||||||
*/
|
*/
|
||||||
animation_te getAnimationMode(void) { return m_animation;};
|
animation_te getAnimationMode(void) {
|
||||||
|
return m_animation;
|
||||||
|
};
|
||||||
private:
|
private:
|
||||||
float m_animationTime; //!< Time in second to generate animation
|
float m_animationTime; //!< Time in second to generate animation
|
||||||
public:
|
public:
|
||||||
@ -90,14 +96,20 @@ namespace widget {
|
|||||||
* @brief set the time to produce animation.
|
* @brief set the time to produce animation.
|
||||||
* @param[in] _time The new animation time.
|
* @param[in] _time The new animation time.
|
||||||
*/
|
*/
|
||||||
void setAnimationTime(float _time) { m_animationTime = _time; };
|
void setAnimationTime(float _time) {
|
||||||
|
m_animationTime = _time;
|
||||||
|
};
|
||||||
/**
|
/**
|
||||||
* @brief get the current animation time.
|
* @brief get the current animation time.
|
||||||
* @return The time to produce the animation.
|
* @return The time to produce the animation.
|
||||||
*/
|
*/
|
||||||
float getAnimationTime(void) { return m_animationTime;};
|
float getAnimationTime(void) {
|
||||||
|
return m_animationTime;
|
||||||
|
};
|
||||||
public: // Derived function
|
public: // Derived function
|
||||||
virtual const char * const getObjectType(void) { return "ewol::widget::sizer"; };
|
virtual const char * const getObjectType(void) {
|
||||||
|
return "ewol::widget::Sizer";
|
||||||
|
};
|
||||||
virtual void calculateSize(const vec2& _availlable);
|
virtual void calculateSize(const vec2& _availlable);
|
||||||
virtual void calculateMinMaxSize(void);
|
virtual void calculateMinMaxSize(void);
|
||||||
virtual bool loadXML(exml::Element* _node);
|
virtual bool loadXML(exml::Element* _node);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user