yvt/openspades
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into swrenderer

Browse Source
This commit is contained in:
yvt 2014-01-01 20:44:09 +09:00
commit 15c315433e
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -3,7 +3,7 @@ project(OpenSpades)
set(OpenSpades_VERSION_MAJOR 0) set(OpenSpades_VERSION_MAJOR 0)
set(OpenSpades_VERSION_MINOR 0) set(OpenSpades_VERSION_MINOR 0)
set(OpenSpades_VERSION_REVISION 95) set(OpenSpades_VERSION_REVISION 10)
set(OS_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(OS_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})

31
Sources/Gui/Main.cpp
View File

@ -52,6 +52,28 @@ SPADES_SETTING(cl_showStartupWindow, "");
#define strncasecmp(x,y,z) _strnicmp(x,y,z) #define strncasecmp(x,y,z) _strnicmp(x,y,z)
#define strcasecmp(x,y) _stricmp(x,y) #define strcasecmp(x,y) _stricmp(x,y)
SPADES_SETTING(core_win32BeginPeriod, "1");
class ThreadQuantumSetter {
public:
ThreadQuantumSetter() {
if(core_win32BeginPeriod){
timeBeginPeriod(1);
SPLog("Thread quantum was modified to 1ms by timeBeginPeriod");
SPLog("(to disable this behavior, set core_win32BeginPeriod to 0)");
}else{
SPLog("Thread quantum is not modified");
SPLog("(to enable this behavior, set core_win32BeginPeriod to 1)");
}
}
~ThreadQuantumSetter() {
if(core_win32BeginPeriod){
timeEndPeriod(1);
SPLog("Thread quantum was restored");
}
}
};
//lm: without doing it this way, we will get a low-res icon or an ugly resampled icon in our window. //lm: without doing it this way, we will get a low-res icon or an ugly resampled icon in our window.
//we cannot use the fltk function on the console window, because it's not an Fl_Window... //we cannot use the fltk function on the console window, because it's not an Fl_Window...
void setIcon( HWND hWnd ) void setIcon( HWND hWnd )
@ -104,6 +126,12 @@ LONG WINAPI UnhandledExceptionProc( LPEXCEPTION_POINTERS lpEx )
ExitProcess( -1 ); ExitProcess( -1 );
//return EXCEPTION_EXECUTE_HANDLER; //return EXCEPTION_EXECUTE_HANDLER;
} }
#else
class ThreadQuantumSetter {
};
#endif #endif
//fltk //fltk
@ -113,6 +141,7 @@ void setWindowIcon( Fl_Window* window )
window->icon( (char *)LoadIconA( GetModuleHandle(NULL), "AppIcon" ) ); window->icon( (char *)LoadIconA( GetModuleHandle(NULL), "AppIcon" ) );
#else #else
//check for mac / linux icon with fltk? //check for mac / linux icon with fltk?
// yvt: no window icon on os x.
#endif #endif
} }
@ -360,6 +389,8 @@ int main(int argc, char ** argv)
delete outs; delete outs;
return 0;*/ return 0;*/
ThreadQuantumSetter quantumSetter;
MainWindow* win = NULL; MainWindow* win = NULL;
if( !cg_autoConnect ) { if( !cg_autoConnect ) {
if(!((int)cl_showStartupWindow != 0 || if(!((int)cl_showStartupWindow != 0 ||