projects
/
selector.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automatic commit
[selector.git]
/
selector.cc
diff --git
a/selector.cc
b/selector.cc
index
887b4d0
..
eb44a61
100644
(file)
--- a/
selector.cc
+++ b/
selector.cc
@@
-2,7
+2,7
@@
* selector is a simple shell command for selection of strings with a
* dynamic pattern-matching.
*
* selector is a simple shell command for selection of strings with a
* dynamic pattern-matching.
*
- * Copyright (c) 200
8
Francois Fleuret
+ * Copyright (c) 200
9
Francois Fleuret
* Written by Francois Fleuret <francois.fleuret@idiap.ch>
*
* This file is part of selector.
* Written by Francois Fleuret <francois.fleuret@idiap.ch>
*
* This file is part of selector.
@@
-24,7
+24,8
@@
/*
Here is the magical shell script for a smart bash-history. Note that
/*
Here is the magical shell script for a smart bash-history. Note that
- the line remains in /tmp/selector.out, which may be a scurity concern.
+ the line remains in /tmp/selector.out, which may be a security
+ concern.
./selector -f ~/.bash_history
OLD_SETTINGS=`stty -g`
./selector -f ~/.bash_history
OLD_SETTINGS=`stty -g`
@@
-60,11
+61,10
@@
int match(char *string, int nb_patterns, char **patterns) {
void check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
if(n_opt + n >= argc) {
void check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
if(n_opt + n >= argc) {
- cerr << "Missing argument for "
- << argv[n_opt]
- << ". Expecting "
- << help
- << "." << endl;
+ cerr << "Missing argument for " << argv[n_opt] << "."
+ << " "
+ << "Expecting " << help << "."
+ << endl;
exit(1);
}
}
exit(1);
}
}
@@
-88,7
+88,7
@@
int next_visible(int current_line, int nb_lines, char **lines, int nb_patterns,
void update_screen(int *current_line, int *temporary_line, int motion,
int nb_lines, char **lines,
char *pattern_list,
void update_screen(int *current_line, int *temporary_line, int motion,
int nb_lines, char **lines,
char *pattern_list,
- int noblink) {
+ int no
_
blink) {
char buffer[buffer_size];
char buffer[buffer_size];
@@
-141,24
+141,26
@@
void update_screen(int *current_line, int *temporary_line, int motion,
if(new_line >= 0 && motion != 0) {
int l = new_line;
if(new_line >= 0 && motion != 0) {
int l = new_line;
- l += motion;
-
if(motion > 0) {
// We want to go down, let's find the first visible line below
if(motion > 0) {
// We want to go down, let's find the first visible line below
- l = next_visible(new_line, nb_lines, lines, nb_patterns, patterns);
- if(l >= 0) {
- new_line = l;
+ for(int m = 0; l >= 0 && m < motion; m++) {
+ l = next_visible(l, nb_lines, lines, nb_patterns, patterns);
+ if(l >= 0) {
+ new_line = l;
+ }
}
} else {
// We want to go up, let's find the first visible line above
}
} else {
// We want to go up, let's find the first visible line above
- l = previous_visible(new_line, nb_lines, lines, nb_patterns, patterns);
- if(l >= 0) {
- new_line = l;
+ for(int m = 0; l >= 0 && m < -motion; m++) {
+ l = previous_visible(l, nb_lines, lines, nb_patterns, patterns);
+ if(l >= 0) {
+ new_line = l;
+ }
}
}
}
}
}
}
- if(!noblink) {
+ if(!no
_
blink) {
clear();
}
clear();
}
@@
-210,7
+212,7
@@
void update_screen(int *current_line, int *temporary_line, int motion,
k++;
}
k++;
}
- if(noblink || l == new_line) {
+ if(no
_
blink || l == new_line) {
while(k < console_width) {
buffer[k++] = ' ';
}
while(k < console_width) {
buffer[k++] = ' ';
}
@@
-237,7
+239,12
@@
void update_screen(int *current_line, int *temporary_line, int motion,
}
}
}
}
- if(noblink) { // Erase the rest of the window. That's slightly ugly.
+ // if(nb_printed_lines == 1) {
+ // addnstr("[no selection]\n", console_width);
+ // nb_printed_lines++;
+ // }
+
+ if(no_blink) { // Erase the rest of the window. That's slightly ugly.
int k = 0;
while(k < console_width) {
buffer[k++] = ' ';
int k = 0;
while(k < console_width) {
buffer[k++] = ' ';
@@
-272,7
+279,7
@@
void update_screen(int *current_line, int *temporary_line, int motion,
int main(int argc, char **argv) {
char buffer[buffer_size];
char *lines[nb_lines_max];
int main(int argc, char **argv) {
char buffer[buffer_size];
char *lines[nb_lines_max];
- int noblink = 0;
+ int no
_
blink = 0;
char input_filename[buffer_size], output_filename[buffer_size];
strcpy(input_filename, "/dev/stdin");
char input_filename[buffer_size], output_filename[buffer_size];
strcpy(input_filename, "/dev/stdin");
@@
-304,7
+311,7
@@
int main(int argc, char **argv) {
}
else if(strcmp(argv[i], "-b") == 0) {
}
else if(strcmp(argv[i], "-b") == 0) {
- noblink = 1;
+ no
_
blink = 1;
i++;
}
i++;
}
@@
-364,7
+371,7
@@
int main(int argc, char **argv) {
int current_line = 0, temporary_line = 0;
int current_line = 0, temporary_line = 0;
- update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns, noblink);
+ update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, patterns, no
_
blink);
do {
do {
@@
-384,6
+391,22
@@
int main(int argc, char **argv) {
}
}
}
}
+ else if(key == KEY_HOME) {
+ current_line = 0;
+ }
+
+ else if(key == KEY_END) {
+ current_line = nb_lines - 1;
+ }
+
+ else if(key == KEY_NPAGE) {
+ motion = 10;
+ }
+
+ else if(key == KEY_PPAGE) {
+ motion = -10;
+ }
+
else if(key == KEY_UP || key == '
\10
') {
motion = -1;
}
else if(key == KEY_UP || key == '
\10
') {
motion = -1;
}
@@
-393,7
+416,7
@@
int main(int argc, char **argv) {
}
update_screen(¤t_line, &temporary_line, motion,
}
update_screen(¤t_line, &temporary_line, motion,
- nb_lines, lines, patterns, noblink);
+ nb_lines, lines, patterns, no
_
blink);
} while(key != '\n' && key != KEY_ENTER && key != '
\a
');
echo();
} while(key != '\n' && key != KEY_ENTER && key != '
\a
');
echo();