nold/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate synced 2024-12-22 11:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

hekate/nyx: gfx: changes to putn

Browse source
This commit is contained in:
CTCaer 2022-05-19 15:06:37 +03:00
parent bf00c79edb
commit 8428ce1a2e
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bootloader/gfx/gfx.c
View file

@ -276,13 +276,14 @@ void gfx_puts(char *s)
static void _gfx_putn(u32 v, int base, char fill, int fcnt) static void _gfx_putn(u32 v, int base, char fill, int fcnt)
{ {
char buf[65]; static const char digits[] = "0123456789ABCDEF";
static const char digits[] = "0123456789ABCDEFghijklmnopqrstuvwxyz";
char *p; char *p;
char buf[65];
int c = fcnt; int c = fcnt;
bool negative = false; bool negative = false;
if (base > 36) if (base != 10 && base != 16)
return; return;
// Account for negative numbers. // Account for negative numbers.
@ -342,9 +343,9 @@ void gfx_printf(const char *fmt, ...)
int fill, fcnt; int fill, fcnt;
va_start(ap, fmt); va_start(ap, fmt);
while(*fmt) while (*fmt)
{ {
if(*fmt == '%') if (*fmt == '%')
{ {
fmt++; fmt++;
fill = 0; fill = 0;

2
bootloader/gfx/gfx.h
View file

@ -62,7 +62,7 @@ void gfx_con_getpos(u32 *x, u32 *y);
void gfx_con_setpos(u32 x, u32 y); void gfx_con_setpos(u32 x, u32 y);
void gfx_putc(char c); void gfx_putc(char c);
void gfx_puts(char *s); void gfx_puts(char *s);
void gfx_printf(const char *fmt, ...); void gfx_printf(const char *fmt, ...) /* __attribute__((format(printf, 1, 2))) */;
void gfx_hexdump(u32 base, const void *buf, u32 len); void gfx_hexdump(u32 base, const void *buf, u32 len);
void gfx_set_pixel(u32 x, u32 y, u32 color); void gfx_set_pixel(u32 x, u32 y, u32 color);

9
nyx/nyx_gui/gfx/gfx.c
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (c) 2018 naehrwert * Copyright (c) 2018 naehrwert
* Copyright (c) 2018-2021 CTCaer * Copyright (c) 2018-2022 CTCaer
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@ -308,13 +308,14 @@ void gfx_puts(char *s)
static void _gfx_putn(u32 v, int base, char fill, int fcnt) static void _gfx_putn(u32 v, int base, char fill, int fcnt)
{ {
char buf[65]; static const char digits[] = "0123456789ABCDEF";
static const char digits[] = "0123456789ABCDEFghijklmnopqrstuvwxyz";
char *p; char *p;
char buf[65];
int c = fcnt; int c = fcnt;
bool negative = false; bool negative = false;
if (base > 36) if (base != 10 && base != 16)
return; return;
// Account for negative numbers. // Account for negative numbers.

2
nyx/nyx_gui/gfx/gfx.h
View file

@ -61,7 +61,7 @@ void gfx_con_getpos(u32 *x, u32 *y);
void gfx_con_setpos(u32 x, u32 y); void gfx_con_setpos(u32 x, u32 y);
void gfx_putc(char c); void gfx_putc(char c);
void gfx_puts(char *s); void gfx_puts(char *s);
void gfx_printf(const char *fmt, ...); void gfx_printf(const char *fmt, ...) /* __attribute__((format(printf, 1, 2))) */;
void gfx_hexdump(u32 base, const void *buf, u32 len); void gfx_hexdump(u32 base, const void *buf, u32 len);
void gfx_set_pixel(u32 x, u32 y, u32 color); void gfx_set_pixel(u32 x, u32 y, u32 color);