[GEM-cvs] Gem/src/Base GemWinCreateXWin.cpp,1.10,1.10.4.1
Brought to you by:
zmoelnig
From: IOhannes m z. <zmo...@us...> - 2004-12-07 11:50:45
|
Update of /cvsroot/pd-gem/Gem/src/Base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10737 Modified Files: Tag: multiple_window GemWinCreateXWin.cpp Log Message: changed the EventMask to get focus-events Index: GemWinCreateXWin.cpp =================================================================== RCS file: /cvsroot/pd-gem/Gem/src/Base/GemWinCreateXWin.cpp,v retrieving revision 1.10 retrieving revision 1.10.4.1 diff -C2 -d -r1.10 -r1.10.4.1 *** GemWinCreateXWin.cpp 7 Apr 2004 14:47:57 -0000 1.10 --- GemWinCreateXWin.cpp 7 Dec 2004 11:50:34 -0000 1.10.4.1 *************** *** 24,28 **** #define EVENT_MASK \ ExposureMask|StructureNotifyMask|PointerMotionMask|ButtonMotionMask | \ ! ButtonReleaseMask | ButtonPressMask | KeyPressMask | KeyReleaseMask | ResizeRedirectMask --- 24,29 ---- #define EVENT_MASK \ ExposureMask|StructureNotifyMask|PointerMotionMask|ButtonMotionMask | \ ! ButtonReleaseMask | ButtonPressMask | KeyPressMask | KeyReleaseMask | ResizeRedirectMask | \ ! EnterWindowMask | LeaveWindowMask *************** *** 235,252 **** --- 236,260 ---- void destroyGemWindow(WindowInfo &info) { + post("destroy A"); if (info.dpy) { + post("destroy B"); int error=0; if (info.win) error=XDestroyWindow(info.dpy, info.win); + post("destroy C"); if (info.have_constContext && info.context) glXDestroyContext(info.dpy, info.context); // this crashes sometimes on my laptop + post("destroy D"); if (info.cmap) error=XFreeColormap(info.dpy, info.cmap); + post("destroy E"); if (info.fs){ XF86VidModeSwitchToMode(info.dpy, info.screen, &info.deskMode); + post("destroy E2"); XF86VidModeSetViewPort(info.dpy, info.screen, 0, 0); info.fs=0; } + post("destroy F"); XCloseDisplay(info.dpy); } *************** *** 255,257 **** --- 263,267 ---- info.cmap = 0; info.context = NULL; + post("destroy F"); + } |