NextCloud/dlib
1
0
Fork 0
mirror of https://github.com/davisking/dlib.git synced 2024-11-01 10:14:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made X11 code a little more robust (I think).

Browse Source 
--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403857
This commit is contained in:
Davis King 2010-09-25 20:23:11 +00:00
parent 29e07bdf33
commit e68116ca8f
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlib/gui_core/gui_core_kernel_2.cpp
View File

@ -182,8 +182,10 @@ namespace dlib
try
{
/*
// causes dead-lock when using with XIM
// You are supposed to call this if using XLib in a threaded program. Note
// however that at one point I nocied that calling this causes a dead-lock
// when using XIM. But I can't reproduce that anymore and not calling it
// sometimes causes XCloseDisplay() to hang.
if (XInitThreads() == 0)
{
dlog << LFATAL << "Unable to initialize threading support.";
@ -194,7 +196,6 @@ namespace dlib
window_table.get_mutex().unlock();
return;
}
*/
window_table.get_mutex().lock();
disp = XOpenDisplay(NULL);
@ -1675,6 +1676,14 @@ namespace dlib
{
using namespace gui_core_kernel_2_globals;
close_window();
if (x11_stuff.globals->xim != NULL)
{
XDestroyIC(x11_stuff.xic);
x11_stuff.xic = 0;
XFreeFontSet(x11_stuff.globals->disp,x11_stuff.fs);
}
delete &x11_stuff;
}
@ -1691,12 +1700,6 @@ namespace dlib
has_been_destroyed = true;
x11_stuff.globals->window_table.destroy(x11_stuff.hwnd);
if (x11_stuff.globals->xim != NULL)
{
XDestroyIC(x11_stuff.xic);
x11_stuff.xic = 0;
XFreeFontSet(x11_stuff.globals->disp,x11_stuff.fs);
}
XDestroyWindow(x11_stuff.globals->disp,x11_stuff.hwnd);
x11_stuff.hwnd = 0;