}
}
+int string_to_positive_integer(char *string) {
+ int error = 0;
+ int result = 0;
+
+ if(*string) {
+ for(char *s = string; *s; s++) {
+ if(*s >= '0' && *s <= '9') {
+ result = result * 10 + int(*s - '0');
+ } else error = 1;
+ }
+ } else error = 1;
+
+ if(error) {
+ cerr << "Value `" << string << "' is not a positive integer." << endl;
+ exit(1);
+ }
+
+ return result;
+}
+
//////////////////////////////////////////////////////////////////////
// A quick and dirty hash table
// Draw the modeline
move(0, 0);
+
if(with_colors) {
attron(COLOR_PAIR(1));
} else {
move(0, 0);
+ // There must be a more elegant way of moving the cursor at a
+ // location met during display
+
+ int cursor_x = 0;
+
if(title) {
addstr(title);
addstr(" ");
+ cursor_x += strlen(title) + 1;
}
- printw("%d/%d ", nb_printed_lines, nb_lines);
+ sprintf(buffer, "%d/%d ", nb_printed_lines, nb_lines);
+ addstr(buffer);
+ cursor_x += strlen(buffer);
addnstr(pattern, cursor_position);
-
- // Now we print the cursor. All that mess to have reverse video with
- // and without color.
-
- if(with_colors) {
- attroff(COLOR_PAIR(1));
- attron(COLOR_PAIR(3));
- } else {
- attroff(A_REVERSE);
- }
+ cursor_x += cursor_position;
if(pattern[cursor_position]) {
- addnstr(&pattern[cursor_position], 1);
+ addstr(pattern + cursor_position);
} else {
addstr(" ");
}
- if(with_colors) {
- attroff(COLOR_PAIR(3));
- attron(COLOR_PAIR(1));
- } else {
- attron(A_REVERSE);
+ if(use_regexp) {
+ addstr(" [regexp]");
}
- if(pattern[cursor_position]) {
- addstr(pattern + cursor_position + 1);
+ if(case_sensitive) {
+ addstr(" [case]");
}
- // Finished printing the cursor
-
- if(use_regexp) {
- addstr(" [regexp]");
- }
+ move(0, cursor_x);
if(with_colors) {
attroff(COLOR_PAIR(1));
//////////////////////////////////////////////////////////////////////
+void read_file(const char *input_filename,
+ int nb_lines_max, int *nb_lines, char **lines,
+ int hash_table_size, int *hash_table) {
+
+ char buffer[buffer_size], raw_line[buffer_size];;
+
+ ifstream file(input_filename);
+
+ if(file.fail()) {
+ cerr << "Can not open " << input_filename << endl;
+ exit(1);
+ }
+
+ while(*nb_lines < nb_lines_max && !file.eof()) {
+
+ file.getline(raw_line, buffer_size);
+
+ if(raw_line[0]) {
+
+ if(file.fail()) {
+ cerr << "Line too long:" << endl;
+ cerr << raw_line << endl;
+ exit(1);
+ }
+
+ char *s, *t;
+ const char *u;
+
+ s = buffer;
+ t = raw_line;
+ while(*t) {
+ u = unctrl(*t++);
+ while(*u) { *s++ = *u++; }
+ }
+ *s = '\0';
+
+ s = buffer;
+
+ if(zsh_history && *s == ':') {
+ while(*s && *s != ';') s++;
+ if(*s == ';') s++;
+ }
+
+ if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) {
+ while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
+ }
+
+ int dup;
+
+ if(hash_table) {
+ dup = test_and_add(s, *nb_lines, lines, hash_table, hash_table_size);
+ } else {
+ dup = -1;
+ }
+
+ if(dup < 0) {
+ lines[*nb_lines] = new char[strlen(s) + 1];
+ strcpy(lines[*nb_lines], s);
+ } else {
+ // The string was already in there, so we do not allocate a
+ // new string but use the pointer to the first occurence of it
+ lines[*nb_lines] = lines[dup];
+ lines[dup] = 0;
+ }
+
+ (*nb_lines)++;
+ }
+ }
+}
+
+//////////////////////////////////////////////////////////////////////
+
int main(int argc, char **argv) {
if(!ttyname(STDIN_FILENO)) {
exit(1);
}
- char buffer[buffer_size], raw_line[buffer_size];;
int color_fg_modeline, color_bg_modeline;
int color_fg_highlight, color_bg_highlight;
int i = 1;
int error = 0, show_help = 0;
+ int rest_are_files = 0;
- while(!error && !show_help && i < argc) {
+ while(!error && !show_help && i < argc && argv[i][0] == '-' && !rest_are_files) {
if(strcmp(argv[i], "-o") == 0) {
check_opt(argc, argv, i, 1, "<output filename>");
else if(strcmp(argv[i], "-l") == 0) {
check_opt(argc, argv, i, 1, "<maximum number of lines>");
- nb_lines_max = atoi(argv[i+1]);
+ nb_lines_max = string_to_positive_integer(argv[i+1]);
i += 2;
}
else if(strcmp(argv[i], "-c") == 0) {
check_opt(argc, argv, i, 4, "<fg modeline> <bg modeline> <fg highlight> <bg highlight>");
- color_fg_modeline = atoi(argv[i+1]);
- color_bg_modeline = atoi(argv[i+2]);
- color_fg_highlight = atoi(argv[i+3]);
- color_bg_highlight = atoi(argv[i+4]);
+ color_fg_modeline = string_to_positive_integer(argv[i + 1]);
+ color_bg_modeline = string_to_positive_integer(argv[i + 2]);
+ color_fg_highlight = string_to_positive_integer(argv[i + 3]);
+ color_bg_highlight = string_to_positive_integer(argv[i + 4]);
i += 5;
}
+ else if(strcmp(argv[i], "--") == 0) {
+ rest_are_files = 1;
+ i++;
+ }
+
else if(strcmp(argv[i], "-h") == 0) {
show_help = 1;
i++;
}
else {
- cerr << "Unknown argument " << argv[i] << "." << endl;
+ cerr << "Unknown option " << argv[i] << "." << endl;
error = 1;
}
}
<< "Written by Francois Fleuret <francois@fleuret.org>."
<< endl
<< endl
- << "Usage: " << argv[0] << " [options] -f <file>" << endl
+ << "Usage: " << argv[0] << " [options] [<filename1> [<filename2> ...]]" << endl
<< endl
<< " -h show this help" << endl
<< " -v inject the selected line in the tty" << endl
<< " -e start in regexp mode" << endl
<< " -a case sensitive" << endl
<< " -m monochrome mode" << endl
+ << " -- rest of the arguments are filenames" << endl
<< " -t <title>" << endl
<< " add a title in the modeline" << endl
<< " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl
char **lines = new char *[nb_lines_max];
- if(!input_filename[0]) {
- cerr << "You must specify a input file with -f." << endl;
- exit(1);
- }
-
int nb_lines = 0;
-
- ifstream file(input_filename);
-
- if(file.fail()) {
- cerr << "Can not open " << input_filename << endl;
- return 1;
- }
-
int hash_table_size = nb_lines_max * 10;
int *hash_table = 0;
hash_table = new_hash_table(hash_table_size);
}
- while(nb_lines < nb_lines_max && !file.eof()) {
-
- file.getline(raw_line, buffer_size);
-
- if(raw_line[0]) {
-
- if(file.fail()) {
- cerr << "Line too long:" << endl;
- cerr << raw_line << endl;
- exit(1);
- }
+ // if(i == argc && !input_filename[0]) {
+ // cerr << "You must provide a filename." << endl;
+ // exit(1);
+ // }
- char *s, *t;
- const char *u;
-
- s = buffer;
- t = raw_line;
- while(*t) {
- u = unctrl(*t++);
- while(*u) { *s++ = *u++; }
- }
- *s = '\0';
-
- s = buffer;
-
- if(zsh_history && *s == ':') {
- while(*s && *s != ';') s++;
- if(*s == ';') s++;
- }
-
- if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) {
- while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
- }
-
- int dup;
-
- if(hash_table) {
- dup = test_and_add(s, nb_lines, lines, hash_table, hash_table_size);
- } else {
- dup = -1;
- }
-
- if(dup < 0) {
- lines[nb_lines] = new char[strlen(s) + 1];
- strcpy(lines[nb_lines], s);
- } else {
- // The string was already in there, so we do not allocate a
- // new string but use the pointer to the first occurence of it
- lines[nb_lines] = lines[dup];
- lines[dup] = 0;
- }
+ if(input_filename[0]) {
+ read_file(input_filename,
+ nb_lines_max, &nb_lines, lines,
+ hash_table_size, hash_table);
+ }
- nb_lines++;
- }
+ while(i < argc) {
+ read_file(argv[i],
+ nb_lines_max, &nb_lines, lines,
+ hash_table_size, hash_table);
+ i++;
}
delete[] hash_table;
noecho();
// Hide the cursor
- curs_set(0);
+ // curs_set(0);
// So that the arrow keys work
keypad(stdscr, TRUE);
color_fg_highlight < 0 || color_bg_highlight >= COLORS ||
color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
echo();
- curs_set(1);
+ // curs_set(1);
endwin();
cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl;
exit(1);
}
else if(key == KEY_DOWN ||
- key == '\014') { // ^N
+ key == '\016') { // ^N
motion = 1;
}
else if(key == KEY_UP ||
- key == '\016') { // ^P
+ key == '\020') { // ^P
motion = -1;
}
use_regexp = !use_regexp;
}
+ else if(key == '\011') { // ^R
+ case_sensitive = !case_sensitive;
+ }
+
else if(key == '\025') { // ^U
kill_before_cursor(pattern, &cursor_position);
}
} while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G
echo();
- curs_set(1);
+ // curs_set(1);
endwin();
//////////////////////////////////////////////////////////////////////
}
out.flush();
}
-
+ } else {
+ cout << "Aborted." << endl;
}
for(int l = 0; l < nb_lines; l++) {
projects / selector.git / blobdiff