handle config req's in dispatcher properly.
no more basewidget again.
This commit is contained in:
parent
699de0368c
commit
d691094cf7
1 changed files with 35 additions and 7 deletions
|
@ -35,6 +35,7 @@ void OtkEventDispatcher::clearHandler(Window id)
|
||||||
}
|
}
|
||||||
|
|
||||||
//#include <stdio.h>
|
//#include <stdio.h>
|
||||||
|
#include <stdio.h>
|
||||||
void OtkEventDispatcher::dispatchEvents(void)
|
void OtkEventDispatcher::dispatchEvents(void)
|
||||||
{
|
{
|
||||||
XEvent e;
|
XEvent e;
|
||||||
|
@ -48,15 +49,42 @@ void OtkEventDispatcher::dispatchEvents(void)
|
||||||
printf("Event %d window %lx\n", e.type, e.xany.window);
|
printf("Event %d window %lx\n", e.type, e.xany.window);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
it = _map.find(e.xany.window);
|
// these ConfigureRequests require some special attention
|
||||||
|
if (e.type == ConfigureRequest) {
|
||||||
|
// find the actual window! e.xany.window is the parent window
|
||||||
|
it = _map.find(e.xconfigurerequest.window);
|
||||||
|
|
||||||
if (it != _map.end())
|
if (it != _map.end())
|
||||||
handler = it->second;
|
it->second->handle(e);
|
||||||
else
|
else {
|
||||||
handler = _fallback;
|
// unhandled configure requests must be used to configure the window
|
||||||
|
// directly
|
||||||
|
XWindowChanges xwc;
|
||||||
|
|
||||||
if (handler)
|
xwc.x = e.xconfigurerequest.x;
|
||||||
handler->handle(e);
|
xwc.y = e.xconfigurerequest.y;
|
||||||
|
xwc.width = e.xconfigurerequest.width;
|
||||||
|
xwc.height = e.xconfigurerequest.height;
|
||||||
|
xwc.border_width = e.xconfigurerequest.border_width;
|
||||||
|
xwc.sibling = e.xconfigurerequest.above;
|
||||||
|
xwc.stack_mode = e.xconfigurerequest.detail;
|
||||||
|
|
||||||
|
XConfigureWindow(otk::OBDisplay::display, e.xconfigurerequest.window,
|
||||||
|
e.xconfigurerequest.value_mask, &xwc);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// normal events
|
||||||
|
|
||||||
|
it = _map.find(e.xany.window);
|
||||||
|
|
||||||
|
if (it != _map.end())
|
||||||
|
handler = it->second;
|
||||||
|
else
|
||||||
|
handler = _fallback;
|
||||||
|
|
||||||
|
if (handler)
|
||||||
|
handler->handle(e);
|
||||||
|
}
|
||||||
|
|
||||||
if (_master)
|
if (_master)
|
||||||
_master->handle(e);
|
_master->handle(e);
|
||||||
|
|
Loading…
Reference in a new issue