joel16/VitaShell
1
0
Fork 0
mirror of https://github.com/joel16/VitaShell.git synced 2024-11-23 11:49:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Extended ime dialog methods.

Browse Source
This commit is contained in:
TheFloW 2016-09-07 20:18:43 +02:00
parent 47a6d0b626
commit f7f959501a
5 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ime_dialog.c
View File

@ -21,6 +21,7 @@
#include "utils.h"
static int ime_dialog_running = 0;
static int ime_dialog_option = 0;
static uint16_t ime_title_utf16[SCE_IME_DIALOG_MAX_TITLE_LENGTH];
static uint16_t ime_initial_text_utf16[SCE_IME_DIALOG_MAX_TEXT_LENGTH];
@ -69,7 +70,7 @@ void utf8_to_utf16(uint8_t *src, uint16_t *dst) {
*dst = '\0';
}
int initImeDialog(char *title, char *initial_text, int max_text_length) {
int initImeDialog(char *title, char *initial_text, int max_text_length, int type, int option) {
if (ime_dialog_running)
return -1;
@ -82,15 +83,20 @@ int initImeDialog(char *title, char *initial_text, int max_text_length) {
param.supportedLanguages = 0x0001FFFF;
param.languagesForced = SCE_TRUE;
param.type = SCE_IME_TYPE_BASIC_LATIN;
param.type = type;
param.option = option;
if (option == SCE_IME_OPTION_MULTILINE)
param.dialogMode = SCE_IME_DIALOG_DIALOG_MODE_WITH_CANCEL;
param.title = ime_title_utf16;
param.maxTextLength = max_text_length;
param.initialText = ime_initial_text_utf16;
param.inputTextBuffer = ime_input_text_utf16;
int res = sceImeDialogInit(&param);
if (res >= 0)
if (res >= 0) {
ime_dialog_running = 1;
ime_dialog_option = option;
}
return res;
}
@ -117,11 +123,12 @@ int updateImeDialog() {
memset(&result, 0, sizeof(SceImeDialogResult));
sceImeDialogGetResult(&result);
if (result.button == SCE_IME_DIALOG_BUTTON_CLOSE) {
status = IME_DIALOG_RESULT_CANCELED;
} else {
if ((ime_dialog_option == SCE_IME_OPTION_MULTILINE && result.button == SCE_IME_DIALOG_BUTTON_CLOSE) ||
(ime_dialog_option != SCE_IME_OPTION_MULTILINE && result.button == SCE_IME_DIALOG_BUTTON_ENTER)) {
// Convert UTF16 to UTF8
utf16_to_utf8(ime_input_text_utf16, ime_input_text_utf8);
} else {
status = IME_DIALOG_RESULT_CANCELED;
}
sceImeDialogTerm();

2
ime_dialog.h
View File

@ -24,7 +24,7 @@
#define IME_DIALOG_RESULT_FINISHED 2
#define IME_DIALOG_RESULT_CANCELED 3
int initImeDialog(char *title, char *initial_text, int max_text_length);
int initImeDialog(char *title, char *initial_text, int max_text_length, int type, int option);
uint16_t *getImeDialogInputTextUTF16();
uint8_t *getImeDialogInputTextUTF8();
int isImeDialogRunning();

4
main.c
View File

@ -785,7 +785,7 @@ void contextMenuCtrl() {
strcpy(name, file_entry->name);
removeEndSlash(name);
initImeDialog(language_container[RENAME], name, MAX_NAME_LENGTH);
initImeDialog(language_container[RENAME], name, MAX_NAME_LENGTH, SCE_IME_TYPE_BASIC_LATIN, 0);
dialog_step = DIALOG_STEP_RENAME;
break;
@ -811,7 +811,7 @@ void contextMenuCtrl() {
count++;
}
initImeDialog(language_container[NEW_FOLDER], path + strlen(file_list.path), MAX_NAME_LENGTH);
initImeDialog(language_container[NEW_FOLDER], path + strlen(file_list.path), MAX_NAME_LENGTH, SCE_IME_TYPE_BASIC_LATIN, 0);
dialog_step = DIALOG_STEP_NEW_FOLDER;
break;
}

9
message_dialog.c
View File

@ -58,10 +58,11 @@ int initMessageDialog(int type, char *msg, ...) {
param.mode = SCE_MSG_DIALOG_MODE_USER_MSG;
}
sceMsgDialogInit(&param);
message_dialog_running = 1;
message_dialog_type = type;
int res = sceMsgDialogInit(&param);
if (res >= 0) {
message_dialog_running = 1;
message_dialog_type = type;
}
return 0;
}

2
text.c
View File

@ -263,7 +263,7 @@ int textViewer(char *file) {
char line[MAX_LINE_CHARACTERS];
textReadLine(buffer, line_start, size, line);
initImeDialog(language_container[EDIT_LINE], line, MAX_LINE_CHARACTERS);
initImeDialog(language_container[EDIT_LINE], line, MAX_LINE_CHARACTERS, SCE_IME_TYPE_DEFAULT, SCE_IME_OPTION_MULTILINE);
edit_line = 1;
}