Minor utf8 changes

This commit is contained in:
pancake 2013-09-02 23:16:33 +02:00
parent 38a3d0fa3f
commit f4aa5ab6f3
3 changed files with 16 additions and 3 deletions

View File

@ -124,7 +124,7 @@ R_API char* r_anal_reflines_str(void *core, ut64 addr, int opts) {
}
/* HACK */
if (((RCore*)core)->utf8) {
if (((RCore*)core)->utf8 && ((RCore*)core)->cons->vline) {
RCons *cons = ((RCore*)core)->cons;
//str = r_str_replace (str, "=", "-", 1);
str = r_str_replace (str, "<", cons->vline[ARROW_LEFT], 1);
@ -134,6 +134,7 @@ R_API char* r_anal_reflines_str(void *core, ut64 addr, int opts) {
str = r_str_replace (str, "-", cons->vline[LINE_HORIZ], 1);
//str = r_str_replace (str, ".", "\xe2\x94\x8c", 1);
str = r_str_replace (str, ",", cons->vline[LUP_CORNER], 1);
str = r_str_replace (str, ".", cons->vline[LUP_CORNER], 1);
str = r_str_replace (str, "`", cons->vline[LDWN_CORNER], 1);
}
if (((RCore*)core)->anal->lineswidth>0) {

View File

@ -806,7 +806,19 @@ r_config_set (cfg, "asm.arch", R_SYS_ARCH);
r_config_desc (cfg, "scr.colorops", "colorize in numbers/registers in opcodes");
r_config_set_cb (cfg, "scr.pager", "", &config_pager_callback);
r_config_desc (cfg, "scr.pager", "Select pager program (used if output doesn't fit on window)");
#if 0
{
const char *val;
char *sval = r_sys_getenv ("LC_CTYPE");
r_str_case (sval, 0);
val = strcmp (sval, "utf-8")? "false": "true";
free (sval);
r_config_set_cb (cfg, "scr.utf8", val, &config_utf8_callback);
}
#else
r_config_set_cb (cfg, "scr.utf8", "false", &config_utf8_callback);
#endif
r_config_desc (cfg, "scr.utf8", "show UTF-8 characters instead of ANSI");
//r_config_set_cb (cfg, "scr.nkey", "function", &config_scrnkey_callback);
r_config_set_cb (cfg, "scr.nkey", "hit", &config_scrnkey_callback);

View File

@ -3,7 +3,7 @@
#include "r_core.h"
#include "r_cons.h"
const char* const r_vline_a[] = {
static const char* const r_vline_a[] = {
"|", // LINE_VERT
"|-", // LINE_CROSS
"/", // RUP_CORNER
@ -15,7 +15,7 @@ const char* const r_vline_a[] = {
"`", // LDWN_CORNER
};
const char* const r_vline_u[] = {
static const char* const r_vline_u[] = {
"", // LINE_VERT
"", // LINE_CROSS
"", // RUP_CORNER