Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix related to #36319: restore SDL_VIDEODRIVER=dummy environment variable, it

Browse Source 
seems that somehow not having this is causing keyboard events to be caught by
SDL. This was removed because it broke addons that could use SDL, now set the
environment variable only temporary during SDL initialization.

This may have been causing issues with keyboard events getting missed in the
game engine, but I couldn't confirm the issue here.
This commit is contained in:
Brecht Van Lommel
2013-09-23 14:48:28 +00:00
parent 97cb65df52
commit eaf354e222
3 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
intern/utfconv/utf_winfunc.c
View File

@@ -166,12 +166,23 @@ int uputenv(const char *name, const char *value)
{
int r = -1;
UTF16_ENCODE(name);
UTF16_ENCODE(value);
if (name_16 && value_16) {
r = (SetEnvironmentVariableW(name_16,value_16)!= 0) ? 0 : -1;
if (value) {
/* set */
UTF16_ENCODE(value);
if (name_16 && value_16) {
r = (SetEnvironmentVariableW(name_16,value_16)!= 0) ? 0 : -1;
}
UTF16_UN_ENCODE(value);
}
UTF16_UN_ENCODE(value);
else {
/* clear */
if (name_16) {
r = (SetEnvironmentVariableW(name_16,NULL)!= 0) ? 0 : -1;
}
}
UTF16_UN_ENCODE(name);
return r;

16
source/blender/blenlib/intern/path_util.c
View File

@@ -1324,15 +1324,20 @@ const char *BLI_get_folder_version(const int id, const int ver, const bool do_ch
#endif
/**
* Sets the specified environment variable to the specified value.
* Sets the specified environment variable to the specified value,
* and clears it if val == NULL.
*/
void BLI_setenv(const char *env, const char *val)
{
/* free windows */
#if (defined(WIN32) || defined(WIN64)) && defined(FREE_WINDOWS)
char *envstr = MEM_mallocN(sizeof(char) * (strlen(env) + strlen(val) + 2), "envstr"); /* one for = another for \0 */
char *envstr;
if (val)
envstr = BLI_sprintfN("%s=%s", env, val);
else
envstr = BLI_sprintfN("%s=", env);
sprintf(envstr, "%s=%s", env, val);
putenv(envstr);
MEM_freeN(envstr);
@@ -1343,7 +1348,10 @@ void BLI_setenv(const char *env, const char *val)
#else
/* linux/osx/bsd */
setenv(env, val, 1);
if (val)
setenv(env, val, 1);
else
unsetenv(env);
#endif
}

22
source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
View File

@@ -39,6 +39,8 @@
#include "SCA_Joystick.h"
#include "SCA_JoystickPrivate.h"
#include "BLI_path_util.h"
SCA_Joystick::SCA_Joystick(short int index)
:
m_joyindex(index),
@@ -88,14 +90,26 @@ SCA_Joystick *SCA_Joystick::GetInstance( short int joyindex )
if (m_refCount == 0)
{
int i;
/* The video subsystem is required for joystick input to work. However,
* when GHOST is running under SDL, video is initialized elsewhere.
* Do this once only. */
* when GHOST is running under SDL, video is initialized elsewhere. We
* also need to set the videodriver to dummy, and do it here to avoid
* interfering with addons that may use SDL too.
*
* We also init SDL once only. */
# ifdef WITH_GHOST_SDL
if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1 ) {
int success = (SDL_InitSubSystem(SDL_INIT_JOYSTICK) != -1 );
# else
if (SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO) == -1 ) {
/* set and restore environment variable */
char *videodriver = getenv("SDL_VIDEODRIVER");
BLI_setenv("SDL_VIDEODRIVER", "dummy");
int success = (SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO) != -1 );
BLI_setenv("SDL_VIDEODRIVER", videodriver);
# endif
if (!success) {
JOYSTICK_ECHO("Error-Initializing-SDL: " << SDL_GetError());
return NULL;
}