libretro/libretro-tyrquake
1
0
Fork 0
mirror of https://github.com/libretro/libretro-tyrquake.git synced 2024-11-29 03:00:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] Re-factor console list formatting

Browse Source 
Signed-off-by: Tyrann <tyrann@disenchant.net>
This commit is contained in:
Tyrann 2006-09-10 19:05:59 +09:30
parent 87d896fa44
commit 572e72be3f
2 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
common/console.c
View File

@ -696,3 +696,50 @@ Con_SafePrintf(char *fmt, ...)
Con_Printf("%s", msg);
scr_disabled_for_loading = temp;
}
void
Con_ShowList(const char **list, int cnt)
{
const char *s;
unsigned i, j, max_len, len, cols, rows;
char *line;
/* Lay them out in columns */
max_len = 0;
for (i = 0; i < cnt; ++i) {
len = strlen(list[i]);
if (len > max_len)
max_len = len;
}
line = Z_Malloc(Con_GetWidth() + 1);
cols = Con_GetWidth() / (max_len + 2);
rows = cnt / cols + 1;
/* Looks better if we have a few rows before spreading out */
if (rows < 5) {
cols = cnt / 5 + 1;
rows = cnt / cols + 1;
}
for (i = 0; i < rows; ++i) {
line[0] = '\0';
for (j = 0; j < cols; ++j) {
if (j * rows + i >= cnt)
break;
s = list[j * rows + i];
len = strlen(s);
strcat(line, s);
if (j < cols - 1) {
while (len < max_len) {
strcat(line, " ");
len++;
}
strcat(line, " ");
}
}
Con_Printf("%s\n", line);
}
Z_Free(line);
}

46
common/keys.c
View File

@ -208,11 +208,11 @@ CompleteCommand(void)
}
}
void ShowCompletions(void)
static void
ShowCompletions(void)
{
const char *s;
unsigned cnt, i, j, max_len, len, cols, rows;
char *line;
unsigned cnt;
s = key_lines[edit_line] + 1;
if (*s == '\\' || *s == '/')
@ -221,45 +221,7 @@ void ShowCompletions(void)
cnt = find_completions(s);
if (cnt) {
Con_Printf("%u possible completions:\n", cnt);
/* Lay them out in columns */
max_len = 0;
for (i = 0; i < cnt; ++i) {
len = strlen(completions_list[i]);
if (len > max_len)
max_len = len;
}
line = Z_Malloc(Con_GetWidth() + 1);
cols = Con_GetWidth() / (max_len + 2);
rows = cnt / cols + 1;
/* Looks better if we have a few rows before spreading out */
if (rows < 5) {
cols = cnt / 5 + 1;
rows = cnt / cols + 1;
}
for (i = 0; i < rows; ++i) {
line[0] = '\0';
for (j = 0; j < cols; ++j) {
if (j * rows + i >= cnt)
break;
s = completions_list[j * rows + i];
len = strlen(s);
strcat(line, s);
if (j < cols - 1) {
while (len < max_len) {
strcat(line, " ");
len++;
}
strcat(line, " ");
}
}
Con_Printf("%s\n", line);
}
Z_Free(line);
Con_ShowList(completions_list, cnt);
}
}