root/ncdu-zig
1
0
Fork 0
mirror of https://code.blicky.net/yorhel/ncdu.git synced 2026-01-13 01:08:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved minimum screen size handling to main.c

Browse source 
And with that, finally managed to get rid of sflags in ncdu.h
This commit is contained in:
Yorhel 2009-04-18 14:12:30 +02:00
parent b24c3dee40
commit ca11083385
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main.c
View file

@ -35,9 +35,10 @@
#include <unistd.h> #include <unistd.h>
int sflags;
int pstate; int pstate;
int min_rows = 17,
min_cols = 60;
void screen_draw() { void screen_draw() {
int n = 1; int n = 1;
@ -57,8 +58,8 @@ int input_handle(int wait) {
screen_draw(); screen_draw();
while((ch = getch()) != ERR) { while((ch = getch()) != ERR) {
if(ch == KEY_RESIZE) { if(ch == KEY_RESIZE) {
if(ncresize((sflags & SF_IGNS ? 0 : 17), (sflags * SF_IGNS ? 0 : 60))) if(ncresize(min_rows, min_cols))
sflags |= SF_IGNS; min_rows = min_cols = 0;
screen_draw(); screen_draw();
continue; continue;
} }
@ -79,7 +80,6 @@ void argv_parse(int argc, char **argv, char *dir) {
/* load defaults */ /* load defaults */
memset(dir, 0, PATH_MAX); memset(dir, 0, PATH_MAX);
getcwd(dir, PATH_MAX); getcwd(dir, PATH_MAX);
sflags = 0;
calc_delay = 100; calc_delay = 100;
calc_smfs = 0; calc_smfs = 0;
@ -150,8 +150,8 @@ int main(int argc, char **argv) {
noecho(); noecho();
curs_set(0); curs_set(0);
keypad(stdscr, TRUE); keypad(stdscr, TRUE);
if(ncresize((sflags & SF_IGNS ? 0 : 17), (sflags * SF_IGNS ? 0 : 60))) if(ncresize(min_rows, min_cols))
sflags |= SF_IGNS; min_rows = min_cols = 0;
while(pstate != ST_QUIT) { while(pstate != ST_QUIT) {
if(pstate == ST_CALC) if(pstate == ST_CALC)

8
src/ncdu.h
View file

@ -58,11 +58,6 @@
#define FF_SERR 0x20 /* error in subdirectory */ #define FF_SERR 0x20 /* error in subdirectory */
#define FF_BSEL 0x40 /* selected */ #define FF_BSEL 0x40 /* selected */
/* Settings Flags (int sflags) */
#define SF_IGNS 0x04 /* ignore too small terminal sizes */
#define SF_NOCFM 0x08 /* don't confirm file deletion */
#define SF_IGNE 0x10 /* ignore errors when deleting */
/* Program states */ /* Program states */
#define ST_CALC 0 #define ST_CALC 0
#define ST_BROWSE 1 #define ST_BROWSE 1
@ -80,9 +75,6 @@ struct dir {
unsigned char flags; unsigned char flags;
}; };
/* global settings */
extern int sflags;
/* program state */ /* program state */
extern int pstate; extern int pstate;