gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resize improvments, disable direct rendering

This commit is contained in:
Eduardo Bart 2011-11-25 19:18:52 -02:00
parent fb43f72583
commit 921db724f8
2 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/framework/platform/x11platform.cpp
View File

@ -393,6 +393,8 @@ void Platform::poll()
{ {
XEvent event, peekevent; XEvent event, peekevent;
PlatformEvent& platformEvent = x11.platformEvent; PlatformEvent& platformEvent = x11.platformEvent;
static int oldWidth = -1;
static int oldHeight = -1;
while(XPending(x11.display) > 0) { while(XPending(x11.display) > 0) {
XNextEvent(x11.display, &event); XNextEvent(x11.display, &event);
@ -410,10 +412,11 @@ void Platform::poll()
} }
switch(event.type) { switch(event.type) {
case Expose:
// needs redraw
break;
case ConfigureNotify: case ConfigureNotify:
// window resize // window resize
static int oldWidth = -1;
static int oldHeight = -1;
if(oldWidth != event.xconfigure.width || oldHeight != event.xconfigure.height) { if(oldWidth != event.xconfigure.width || oldHeight != event.xconfigure.height) {
x11.listener->onResize(Size(event.xconfigure.width, event.xconfigure.height)); x11.listener->onResize(Size(event.xconfigure.width, event.xconfigure.height));
oldWidth = event.xconfigure.width; oldWidth = event.xconfigure.width;
@ -617,24 +620,29 @@ bool Platform::createWindow(int x, int y, int width, int height, int minWidth, i
logFatal("RGBA/Double buffered visual not supported"); logFatal("RGBA/Double buffered visual not supported");
// create GLX context // create GLX context
x11.glxContext = glXCreateContext(x11.display, x11.visual, 0, GL_TRUE); x11.glxContext = glXCreateContext(x11.display, x11.visual, NULL, False);
if(!x11.glxContext) if(!x11.glxContext)
logFatal("Unable to create GLX context"); logFatal("Unable to create GLX context");
logInfo("Direct rendering: ", glXIsDirect(x11.display, x11.glxContext) ? "Yes" : "No");
// color map // color map
x11.colormap = XCreateColormap(x11.display, x11.colormap = XCreateColormap(x11.display,
RootWindow(x11.display, x11.visual->screen), RootWindow(x11.display, x11.visual->screen),
x11.visual->visual, x11.visual->visual,
AllocNone); AllocNone);
// setup window type // setup window type
XSetWindowAttributes wa; XSetWindowAttributes attr;
wa.colormap = x11.colormap; attr.colormap = x11.colormap;
wa.border_pixel = 0; attr.border_pixel = 0;
wa.event_mask = KeyPressMask | KeyReleaseMask | attr.backing_store = Always;
attr.background_pixel = 0;
attr.event_mask = KeyPressMask | KeyReleaseMask |
ButtonPressMask | ButtonReleaseMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask |
ExposureMask | VisibilityChangeMask | ExposureMask | VisibilityChangeMask |
StructureNotifyMask | FocusChangeMask; StructureNotifyMask | FocusChangeMask;
unsigned int mask = CWBorderPixel | CWColormap | CWEventMask | CWBackingStore | CWBackPixel;
x11.x = x; x11.x = x;
x11.y = y; x11.y = y;
@ -648,11 +656,10 @@ bool Platform::createWindow(int x, int y, int width, int height, int minWidth, i
x11.visual->depth, x11.visual->depth,
InputOutput, InputOutput,
x11.visual->visual, x11.visual->visual,
CWBorderPixel | CWColormap | CWEventMask, mask,
&wa); &attr);
if(!x11.window) if(!x11.window)
logFatal("Unable to create X window"); logFatal("XCreateWindow failed");
// create input context (to have better key input handling) // create input context (to have better key input handling)
if(XSupportsLocale()) { if(XSupportsLocale()) {
@ -673,7 +680,6 @@ bool Platform::createWindow(int x, int y, int width, int height, int minWidth, i
if(!x11.xic) if(!x11.xic)
logWarning("Input of special keys maybe messed up because we couldn't create an input context"); logWarning("Input of special keys maybe messed up because we couldn't create an input context");
// set window minimum size // set window minimum size
XSizeHints xsizehints; XSizeHints xsizehints;
xsizehints.flags = PMinSize; xsizehints.flags = PMinSize;
@ -686,7 +692,8 @@ bool Platform::createWindow(int x, int y, int width, int height, int minWidth, i
XSetWMProtocols(x11.display, x11.window, &x11.atomDeleteWindow , 1); XSetWMProtocols(x11.display, x11.window, &x11.atomDeleteWindow , 1);
// connect the GLX-context to the window // connect the GLX-context to the window
glXMakeCurrent(x11.display, x11.window, x11.glxContext); if(!glXMakeCurrent(x11.display, x11.window, x11.glxContext))
logFatal("glXMakeCurrent failed");
x11.width = width; x11.width = width;
x11.height = height; x11.height = height;
@ -918,6 +925,8 @@ void Platform::setVerticalSync(bool enable)
void Platform::swapBuffers() void Platform::swapBuffers()
{ {
//glFlush();
//glFinish();
glXSwapBuffers(x11.display, x11.window); glXSwapBuffers(x11.display, x11.window);
} }

15
src/otclient/otclient.cpp
View File

@ -271,8 +271,19 @@ void OTClient::onClose()
void OTClient::onResize(const Size& size) void OTClient::onResize(const Size& size)
{ {
g_graphics.resize(size); static bool eventScheduled = false;
g_ui.resize(size); static Size newSize;
newSize = size;
// avoid massive resize updates
if(!eventScheduled) {
g_dispatcher.addEvent([&] {
g_graphics.resize(newSize);
g_ui.resize(newSize);
eventScheduled = false;
});
eventScheduled = true;
}
} }
void OTClient::onPlatformEvent(const PlatformEvent& event) void OTClient::onPlatformEvent(const PlatformEvent& event)