Browse Source

Platform: forgot to initialize variable.

Caused crash on startup for both GlutApplication and *XApplication.
Sorry about that.
pull/51/head
Vladimír Vondruš 13 years ago
parent
commit
a3d4fc0042
  1. 7
      src/Platform/AbstractXApplication.cpp
  2. 2
      src/Platform/GlutApplication.cpp

7
src/Platform/AbstractXApplication.cpp

@ -27,10 +27,9 @@
#include <Utility/utilities.h> #include <Utility/utilities.h>
#include "Context.h" #include "Context.h"
#include "Version.h"
#include "Platform/Implementation/AbstractContextHandler.h" #include "Platform/Implementation/AbstractContextHandler.h"
#define None 0L // redef Xlib nonsense
/* Mask for X events */ /* Mask for X events */
#define INPUT_MASK KeyPressMask|KeyReleaseMask|ButtonPressMask|ButtonReleaseMask|PointerMotionMask|StructureNotifyMask #define INPUT_MASK KeyPressMask|KeyReleaseMask|ButtonPressMask|ButtonReleaseMask|PointerMotionMask|StructureNotifyMask
@ -80,7 +79,7 @@ bool AbstractXApplication::tryCreateContext(const Configuration& configuration)
attr.event_mask = 0; attr.event_mask = 0;
unsigned long mask = CWBackPixel|CWBorderPixel|CWColormap|CWEventMask; unsigned long mask = CWBackPixel|CWBorderPixel|CWColormap|CWEventMask;
window = XCreateWindow(display, root, 20, 20, configuration.size().x(), configuration.size().y(), 0, visInfo->depth, InputOutput, visInfo->visual, mask, &attr); window = XCreateWindow(display, root, 20, 20, configuration.size().x(), configuration.size().y(), 0, visInfo->depth, InputOutput, visInfo->visual, mask, &attr);
XSetStandardProperties(display, window, configuration.title().data(), nullptr, None, nullptr, 0, nullptr); XSetStandardProperties(display, window, configuration.title().data(), nullptr, 0, nullptr, 0, nullptr);
XFree(visInfo); XFree(visInfo);
/* Be notified about closing the window */ /* Be notified about closing the window */
@ -176,7 +175,7 @@ void AbstractXApplication::mousePressEvent(MouseEvent&) {}
void AbstractXApplication::mouseReleaseEvent(MouseEvent&) {} void AbstractXApplication::mouseReleaseEvent(MouseEvent&) {}
void AbstractXApplication::mouseMoveEvent(MouseMoveEvent&) {} void AbstractXApplication::mouseMoveEvent(MouseMoveEvent&) {}
AbstractXApplication::Configuration::Configuration(): _title("Magnum X Application"), _size(800, 600) {} AbstractXApplication::Configuration::Configuration(): _title("Magnum X Application"), _size(800, 600), _version(Version::None) {}
AbstractXApplication::Configuration::~Configuration() = default; AbstractXApplication::Configuration::~Configuration() = default;
}} }}

2
src/Platform/GlutApplication.cpp

@ -133,7 +133,7 @@ void GlutApplication::mousePressEvent(MouseEvent&) {}
void GlutApplication::mouseReleaseEvent(MouseEvent&) {} void GlutApplication::mouseReleaseEvent(MouseEvent&) {}
void GlutApplication::mouseMoveEvent(MouseMoveEvent&) {} void GlutApplication::mouseMoveEvent(MouseMoveEvent&) {}
GlutApplication::Configuration::Configuration(): _title("Magnum GLUT Application"), _size(800, 600), _sampleCount(0) {} GlutApplication::Configuration::Configuration(): _title("Magnum GLUT Application"), _size(800, 600), _sampleCount(0), _version(Version::None) {}
GlutApplication::Configuration::~Configuration() = default; GlutApplication::Configuration::~Configuration() = default;
template class BasicScreen<GlutApplication>; template class BasicScreen<GlutApplication>;

Loading…
Cancel
Save