BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Hand-picked Mac OSX cursor and bundle path fixes from https://bitbucket.org/toabi/minetest-mac

Browse Source
This commit is contained in:
Perttu Ahola 2011-06-18 18:44:01 +03:00
parent 13f469073e
commit 5d1ae85ab9
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/game.cpp
View File

@ -1366,7 +1366,11 @@ void the_game(
if((device->isWindowActive() && noMenuActive()) || random_input) if((device->isWindowActive() && noMenuActive()) || random_input)
{ {
if(!random_input) if(!random_input)
device->getCursorControl()->setVisible(false); {
// Mac OSX gets upset if this is set every frame
if(device->getCursorControl()->isVisible())
device->getCursorControl()->setVisible(false);
}
if(first_loop_after_window_activation){ if(first_loop_after_window_activation){
//std::cout<<"window active, first loop"<<std::endl; //std::cout<<"window active, first loop"<<std::endl;
@ -1397,7 +1401,9 @@ void the_game(
input->setMousePos(displaycenter.X, displaycenter.Y); input->setMousePos(displaycenter.X, displaycenter.Y);
} }
else{ else{
device->getCursorControl()->setVisible(true); // Mac OSX gets upset if this is set every frame
if(device->getCursorControl()->isVisible() == false)
device->getCursorControl()->setVisible(true);
//std::cout<<"window inactive"<<std::endl; //std::cout<<"window inactive"<<std::endl;
first_loop_after_window_activation = true; first_loop_after_window_activation = true;

22
src/porting.cpp
View File

@ -214,10 +214,28 @@ void initializePaths()
*/ */
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include <unistd.h> #include <unistd.h>
#include "CoreFoundation/CoreFoundation.h"
// Code based on
// http://stackoverflow.com/questions/516200/relative-paths-not-working-in-xcode-c
CFBundleRef main_bundle = CFBundleGetMainBundle();
CFURLRef resources_url = CFBundleCopyResourcesDirectoryURL(main_bundle);
char path[PATH_MAX];
if(CFURLGetFileSystemRepresentation(resources_url, TRUE, (UInt8 *)path, PATH_MAX))
{
dstream<<"Bundle resource path: "<<path<<std::endl;
//chdir(path);
path_data = std::string(path) + "/data";
}
else
{
// error!
dstream<<"WARNING: Could not determine bundle resource path"<<std::endl;
}
CFRelease(resources_url);
path_userdata = std::string(getenv("HOME")) + "/Library/Application Support/" + APPNAME; path_userdata = std::string(getenv("HOME")) + "/Library/Application Support/" + APPNAME;
path_data = std::string("minetest-mac.app/Contents/Resources/data/");
#endif #endif
#endif // RUN_IN_PLACE #endif // RUN_IN_PLACE