Browse Source

dpf updat

tags/1.9.4
falkTX 10 years ago
parent
commit
53a7e394ef
2 changed files with 7 additions and 3 deletions
  1. +6
    -0
      source/modules/dgl/src/Window.cpp
  2. +1
    -3
      source/modules/dgl/src/pugl/pugl_x11.c

+ 6
- 0
source/modules/dgl/src/Window.cpp View File

@@ -14,6 +14,9 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

// we need this for now
#define XKEYFOCUSGRAB 1

#include "../App.hpp"
#include "../Widget.hpp"
#include "../Window.hpp"
@@ -198,8 +201,10 @@ public:

DBG("Success!\n");

#if 0
// process any initial events
puglProcessEvents(fView);
#endif

fApp._addWindow(fSelf);
}
@@ -583,6 +588,7 @@ protected:
//DBG("PUGL: onDisplay\n");

glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glLoadIdentity();

FOR_EACH_WIDGET(it)
{


+ 1
- 3
source/modules/dgl/src/pugl/pugl_x11.c View File

@@ -194,8 +194,6 @@ static void
puglDisplay(PuglView* view)
{
glXMakeCurrent(view->impl->display, view->impl->win, view->impl->ctx);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glLoadIdentity();

if (view->displayFunc) {
view->displayFunc(view);
@@ -364,7 +362,7 @@ puglProcessEvents(PuglView* view)
}
}
break;
#ifdef PUGL_GRAB_FOCUS
#ifdef XKEYFOCUSGRAB
case EnterNotify:
XSetInputFocus(view->impl->display,
view->impl->win,


Loading…
Cancel
Save