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

check in color cursor change that didnt fix the problem

Browse Source
This commit is contained in:
cxgeorge 2001-10-26 03:03:19 +00:00
parent 5fdd7d2623
commit 225a0e55e6
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
panda/src/wgldisplay/wglGraphicsWindow.cxx
View File

@ -367,10 +367,18 @@ void wglGraphicsWindow::config(void) {
_bLoadedCustomCursor = false; _bLoadedCustomCursor = false;
if(!windows_mono_cursor_filename.empty()) { if(!windows_mono_cursor_filename.empty()) {
// Note: LoadImage seems to cause win2k internal heap corruption (outputdbgstr warnings) // Note: LoadImage seems to cause win2k internal heap corruption (outputdbgstr warnings)
// if icon is more than 8bpp // if icon is more than 8bpp (because it was 'mapping' 16bpp colors to the device?)
DWORD load_flags = LR_LOADFROMFILE;
if(_props._fullscreen) {
// I think cursors should use LR_CREATEDIBSECTION since they should not be mapped to the device palette (in the case of 256-color cursors)
// since they are not going to be used on the desktop
load_flags |= LR_CREATEDIBSECTION;
}
// loads a .cur fmt file // loads a .cur fmt file
_hMouseCursor = (HCURSOR) LoadImage(NULL, windows_mono_cursor_filename.c_str(), IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); _hMouseCursor = (HCURSOR) LoadImage(NULL, windows_mono_cursor_filename.c_str(), IMAGE_CURSOR, 0, 0, load_flags);
if(_hMouseCursor==NULL) { if(_hMouseCursor==NULL) {
wgldisplay_cat.warning() << "windows cursor filename '" << windows_mono_cursor_filename << "' not found!!\n"; wgldisplay_cat.warning() << "windows cursor filename '" << windows_mono_cursor_filename << "' not found!!\n";
@ -649,10 +657,21 @@ check_for_color_cursor_support(void) {
if(bSupportsColorCursor) { if(bSupportsColorCursor) {
// Note: LoadImage seems to cause win2k internal heap corruption (outputdbgstr warnings) // Note: LoadImage seems to cause win2k internal heap corruption (outputdbgstr warnings)
// if icon is more than 8bpp // if icon is more than 8bpp (because it was 'mapping' 16bpp colors to the device?)
DWORD load_flags = LR_LOADFROMFILE;
if(_props._fullscreen) {
// I think cursors should use LR_CREATEDIBSECTION since they should not be mapped to the device palette (in the case of 256-color cursors)
// since they are not going to be used on the desktop
load_flags |= LR_CREATEDIBSECTION;
// note: this is still doing weird stuff when it loads 8bpp colors, even with LR_CREATEDIBSECTION
// there is still a bug here BUGBUG
}
// loads a .cur fmt file // loads a .cur fmt file
HCURSOR hNewMouseCursor = (HCURSOR) LoadImage(NULL, windows_color_cursor_filename.c_str(), IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); HCURSOR hNewMouseCursor = (HCURSOR) LoadImage(NULL, windows_color_cursor_filename.c_str(), IMAGE_CURSOR, 0, 0, load_flags);
if(hNewMouseCursor==NULL) { if(hNewMouseCursor==NULL) {
wgldisplay_cat.warning() << "windows color cursor filename '" << windows_color_cursor_filename << "' not found!!\n"; wgldisplay_cat.warning() << "windows color cursor filename '" << windows_color_cursor_filename << "' not found!!\n";