TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some issues on linux

Browse Source
This commit is contained in:
rdb 2009-07-09 14:52:05 +00:00
parent 474b738f8b
commit 460ea92667
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
direct/src/plugin/p3dX11SplashWindow.cxx
View File

@ -16,6 +16,14 @@
#ifdef HAVE_X11 #ifdef HAVE_X11
#include <time.h>
// Sleeps for a millisecond.
#define MILLISLEEP() \
timespec ts; \
ts.tv_sec = 0; ts.tv_nsec = 1000000; \
nanosleep(&ts, NULL);
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: P3DX11SplashWindow::Constructor // Function: P3DX11SplashWindow::Constructor
// Access: Public // Access: Public
@ -72,8 +80,7 @@ set_image_filename(const string &image_filename,
} }
RELEASE_LOCK(_install_lock); RELEASE_LOCK(_install_lock);
// Post a silly message to spin the message loop. MILLISLEEP();
//PostThreadMessage(_thread_id, WM_USER, 0, 0);
if (!_thread_running && _thread_continue) { if (!_thread_running && _thread_continue) {
// The user must have closed the window. Let's shut down the // The user must have closed the window. Let's shut down the
@ -97,8 +104,7 @@ set_install_label(const string &install_label) {
} }
RELEASE_LOCK(_install_lock); RELEASE_LOCK(_install_lock);
// Post a silly message to spin the message loop. MILLISLEEP();
//PostThreadMessage(_thread_id, WM_USER, 0, 0);
if (!_thread_running && _thread_continue) { if (!_thread_running && _thread_continue) {
// The user must have closed the window. Let's shut down the // The user must have closed the window. Let's shut down the
@ -120,8 +126,7 @@ set_install_progress(double install_progress) {
_install_progress = install_progress; _install_progress = install_progress;
RELEASE_LOCK(_install_lock); RELEASE_LOCK(_install_lock);
// Post a silly message to spin the message loop. MILLISLEEP();
//PostThreadMessage(_thread_id, WM_USER, 0, 0);
if (!_thread_running && _thread_continue) { if (!_thread_running && _thread_continue) {
// The user must have closed the window. Let's shut down the // The user must have closed the window. Let's shut down the
@ -153,8 +158,7 @@ start_thread() {
void P3DX11SplashWindow:: void P3DX11SplashWindow::
stop_thread() { stop_thread() {
_thread_continue = false; _thread_continue = false;
// Post a silly message to spin the message loop. MILLISLEEP();
//PostThreadMessage(_thread_id, WM_USER, 0, 0);
JOIN_THREAD(_thread); JOIN_THREAD(_thread);
} }
@ -231,8 +235,10 @@ make_window() {
Window parent = 0; Window parent = 0;
_display = (Display*) _wparams.get_parent_window()._xdisplay; _display = (Display*) _wparams.get_parent_window()._xdisplay;
_own_display = false;
if (_display == 0) { if (_display == 0) {
_display = XOpenDisplay(NULL); _display = XOpenDisplay(NULL);
_own_display = true;
} }
_screen = DefaultScreen(_display); _screen = DefaultScreen(_display);
@ -287,12 +293,16 @@ setup_gc() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void P3DX11SplashWindow:: void P3DX11SplashWindow::
close_window() { close_window() {
if (_graphics_context != None) {
XFreeGC(_display, _graphics_context);
}
if (_window != None) { if (_window != None) {
XDestroyWindow(_display, _window); XDestroyWindow(_display, _window);
_window = None; _window = None;
} }
if (_display != None) { if (_display != None && _own_display) {
XCloseDisplay(_display); XCloseDisplay(_display);
_display = None; _display = None;
} }

1
direct/src/plugin/p3dX11SplashWindow.h
View File

@ -55,6 +55,7 @@ private:
void close_window(); void close_window();
private: private:
bool _own_display;
bool _got_install; bool _got_install;
bool _image_filename_changed; bool _image_filename_changed;
string _image_filename; string _image_filename;