dan/TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'pr/456'

Browse Source
This commit is contained in:
BADIM-PC\Vadim
2017-12-11 13:08:50 +03:00
parent 4d1685bfe7 2c8b10a0c2
commit b25ed2a188
2 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/studio.c
View File

@@ -373,21 +373,16 @@ void str2buf(const char* str, s32 size, void* buf, bool flip)
} }
} }
void removeWhiteSpaces(char* str) static void removeWhiteSpaces(char* str)
{ {
int i = 0; s32 i = 0;
int len = strlen(str); s32 len = strlen(str);
for (int j = 0; j < len; j++) { for (s32 j = 0; j < len; j++)
if (!isspace(str[j])) { if(!SDL_isspace(str[j]))
str[i] = str[j]; str[i++] = str[j];
i++;
} str[i] = '\0';
}
if (i < len - 1) {
str[i] = '\0';
}
} }
bool fromClipboard(void* data, s32 size, bool flip, bool remove_white_spaces) bool fromClipboard(void* data, s32 size, bool flip, bool remove_white_spaces)
@@ -400,10 +395,9 @@ bool fromClipboard(void* data, s32 size, bool flip, bool remove_white_spaces)
if(clipboard) if(clipboard)
{ {
if (remove_white_spaces) if (remove_white_spaces)
removeWhiteSpaces(clipboard); removeWhiteSpaces(clipboard);
bool valid = strlen(clipboard) == size * 2; bool valid = strlen(clipboard) == size * 2;
if(valid) str2buf(clipboard, strlen(clipboard), data, flip); if(valid) str2buf(clipboard, strlen(clipboard), data, flip);
@@ -802,7 +796,7 @@ void setStudioMode(EditorMode mode)
EditorMode prev = studio.mode; EditorMode prev = studio.mode;
if(prev == TIC_RUN_MODE) if(prev == TIC_RUN_MODE)
studio.tic->api.pause(studio.tic); studio.tic->api.pause(studio.tic);
if(mode != TIC_RUN_MODE) if(mode != TIC_RUN_MODE)
studio.tic->api.reset(studio.tic); studio.tic->api.reset(studio.tic);
@@ -838,8 +832,8 @@ void setStudioMode(EditorMode mode)
else if ((prev == TIC_MENU_MODE || prev == TIC_SURF_MODE) && studio.mode != TIC_RUN_MODE) else if ((prev == TIC_MENU_MODE || prev == TIC_SURF_MODE) && studio.mode != TIC_RUN_MODE)
enableScreenTextInput(); enableScreenTextInput();
if(SDL_HasScreenKeyboardSupport() && if(SDL_HasScreenKeyboardSupport() &&
(studio.mode == TIC_RUN_MODE || studio.mode == TIC_SURF_MODE || studio.mode == TIC_MENU_MODE)) (studio.mode == TIC_RUN_MODE || studio.mode == TIC_SURF_MODE || studio.mode == TIC_MENU_MODE))
SDL_StopTextInput(); SDL_StopTextInput();
} }
} }
@@ -1998,7 +1992,7 @@ static void blitTexture()
SDL_Rect srcRect = {Left, Top, TIC80_WIDTH, TIC80_HEIGHT}; SDL_Rect srcRect = {Left, Top, TIC80_WIDTH, TIC80_HEIGHT};
SDL_RenderCopy(studio.renderer, studio.texture, &srcRect, &rect); SDL_RenderCopy(studio.renderer, studio.texture, &srcRect, &rect);
} }
} }

1
src/studio.h
View File

@@ -154,7 +154,6 @@ void exitStudio();
u32 unzip(u8** dest, const u8* source, size_t size); u32 unzip(u8** dest, const u8* source, size_t size);
void str2buf(const char* str, s32 size, void* buf, bool flip); void str2buf(const char* str, s32 size, void* buf, bool flip);
void removeWhiteSpaces(char* str);
void toClipboard(const void* data, s32 size, bool flip); void toClipboard(const void* data, s32 size, bool flip);
bool fromClipboard(void* data, s32 size, bool flip, bool remove_white_spaces); bool fromClipboard(void* data, s32 size, bool flip, bool remove_white_spaces);