Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-25 06:09:50 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Add r_str_crop() will be used by canvas to shifted render text

Browse Source
This commit is contained in:
pancake 2014-05-18 03:41:39 +02:00
parent a708b77a2d
commit 0d68756791
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libr/core/graph.c
View File

@ -59,7 +59,7 @@ static void Node_print(RConsCanvas *can, Node *n, int cur) {
return;
}
if (cur) {
F (n->x,n->y, n->w, n->h, '.');
//F (n->x,n->y, n->w, n->h, '.');
snprintf (title, sizeof (title)-1,
"-[ 0x%08"PFMT64x" ]-", n->addr);
} else {
@ -68,8 +68,11 @@ static void Node_print(RConsCanvas *can, Node *n, int cur) {
}
if (G (n->x+1, n->y+1))
W (title);
if (G (n->x+2, n->y+2))
if (G (n->x+2, n->y+2)) {
// TODO: temporary crop depending on out of screen offsets
//n->text = r_str_crop (n->text, 1,1,4,4);
W (n->text);
}
if (G (n->x+1, n->y+1))
W (title);
B (n->x, n->y, n->w, n->h);

1
libr/include/r_util.h
View File

@ -361,6 +361,7 @@ static inline void r_str_rmch (char *s, char ch) {
R_API const char *r_str_rchr(const char *base, const char *p, int ch);
R_API const char *r_str_closer_chr (const char *b, const char *s);
R_API int r_str_bounds(const char *str, int *h);
R_API char *r_str_crop(const char *str, int x, int y, int w, int h);
R_API int r_str_len_utf8 (const char *s);
R_API int r_str_len_utf8char (const char *s, int left);
R_API void r_str_filter_zeroline(char *str, int len);

16
libr/util/str.c
View File

@ -1314,6 +1314,22 @@ R_API int r_str_bounds(const char *str, int *h) {
R_API char *r_str_crop(const char *str, int x, int y, int w, int h) {
char *ret = strdup (str);
char *r = ret;
int ch = 0, cw = 0;
while (*str) {
if (*str == '\n') {
*r++ = *str;
ch++;
cw = 0;
} else
if (ch>=y && ch<h)
if (cw>=x && cw<w)
*r++ = *str;
str++;
cw++;
}
*r = 0;
return ret;
}
R_API const char * r_str_tok (const char *str1, const char b, size_t len) {

2
sys/ios-sdk.sh
View File

@ -33,7 +33,7 @@ make clean
fi
if [ $? = 0 ]; then
make -j4
time make -j4
if [ $? = 0 ]; then
( cd binr/radare2 ; make ios_sdk_sign )
rm -rf /tmp/r2ios