niklascfw/TegraExplorer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ajust some gfx functions for joycon compatibility

Browse Source
This commit is contained in:
Such Meme, Many Skill
2020-05-02 01:41:43 +02:00
parent 9178813338
commit 2cced5bdac
7 changed files with 73 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/tegraexplorer/gfx/gfxutils.c
View File

@@ -8,6 +8,7 @@
#include "../../utils/util.h"
#include "../../mem/heap.h"
#include "../common/common.h"
#include "../../hid/hid.h"
int printerrors = true;
@@ -22,12 +23,12 @@ void gfx_clearscreen(){
gfx_boxGrey(0, 703, 1279, 719, 0xFF);
gfx_boxGrey(0, 0, 1279, 15, 0xFF);
gfx_con_setpos(0, 0);
gfx_printf("Tegraexplorer v1.5.2 | Battery: %3d%%", battery >> 8);
gfx_printf("Tegraexplorer v1.5.2 | Battery: %3d%%\n", battery >> 8);
RESETCOLOR;
}
int gfx_message(u32 color, const char* message, ...){
u32 gfx_message(u32 color, const char* message, ...){
va_list ap;
va_start(ap, message);
@@ -37,10 +38,10 @@ int gfx_message(u32 color, const char* message, ...){
gfx_vprintf(message, ap);
va_end(ap);
return btn_wait();
return hidWait()->buttons;
}
int gfx_errDisplay(char *src_func, int err, int loc){
u32 gfx_errDisplay(char *src_func, int err, int loc){
if (!printerrors)
return 0;
@@ -61,27 +62,24 @@ int gfx_errDisplay(char *src_func, int err, int loc){
RESETCOLOR;
while (btn_read() != 0);
return btn_wait();
return hidWait()->buttons;
}
int gfx_makewaitmenu(char *hiddenmessage, int timer){
int res;
u32 start = get_tmr_s();
while (btn_read() != 0);
Inputs *input = NULL;
while(1){
res = btn_read();
input = hidRead();
if (res & BTN_VOL_DOWN || res & BTN_VOL_UP)
if (input->buttons & (KEY_VOLM | KEY_VOLP | KEY_B))
return 0;
if (start + timer > get_tmr_s())
gfx_printf("\r<Wait %d seconds> ", timer + start - get_tmr_s());
else if (res & BTN_POWER)
else if (input->a)
return 1;
else

4
source/tegraexplorer/gfx/gfxutils.h
View File

@@ -7,8 +7,8 @@
#define RESETCOLOR gfx_printf("%k%K", COLOR_WHITE, COLOR_DEFAULT)
void gfx_clearscreen();
int gfx_message(u32 color, const char* message, ...);
int gfx_errDisplay(char *src_func, int err, int loc);
u32 gfx_message(u32 color, const char* message, ...);
u32 gfx_errDisplay(char *src_func, int err, int loc);
int gfx_makewaitmenu(char *hiddenmessage, int timer);
void gfx_printlength(int size, char *toprint);
void gfx_printandclear(char *in, int length, int endX);

2
source/tegraexplorer/gfx/menu.c
View File

@@ -153,7 +153,7 @@ int menu_make(menu_entry *entries, int amount, char *toptext){
gfx_printf("Type: %s", (entries[currentpos].property & ISDIR) ? "Dir " : "File");
}
else
gfx_boxGrey(800, 223, 1279, 271, 0x1B);
gfx_boxGrey(800, 144, 1279, 190, 0x1B);
gfx_con_setpos(0, 703);
SWAPCOLOR(COLOR_DEFAULT);