projects
/
selector.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cosmetics.
[selector.git]
/
selector.cc
diff --git
a/selector.cc
b/selector.cc
index
d36c836
..
ebbd021
100644
(file)
--- a/
selector.cc
+++ b/
selector.cc
@@
-24,7
+24,7
@@
// To use it as a super-history-search for bash:
//
// To use it as a super-history-search for bash:
//
-// alias h='
./selector
-i -b -v -f <(history)'
+// alias h='
selector -d
-i -b -v -f <(history)'
// This software is highly Linux-specific, but I would be glad to get
// patches to make it work on other OS
// This software is highly Linux-specific, but I would be glad to get
// patches to make it work on other OS
@@
-207,12
+207,12
@@
int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matche
void update_screen(int *current_line, int *temporary_line, int motion,
int nb_lines, char **lines,
void update_screen(int *current_line, int *temporary_line, int motion,
int nb_lines, char **lines,
- char *pattern
_list
) {
+ char *pattern) {
char buffer[buffer_size];
matcher_t matcher;
char buffer[buffer_size];
matcher_t matcher;
- initialize_matcher(use_regexp, &matcher, pattern
_list
);
+ initialize_matcher(use_regexp, &matcher, pattern);
// We now take care of printing the lines per se
// We now take care of printing the lines per se
@@
-358,7
+358,7
@@
void update_screen(int *current_line, int *temporary_line, int motion,
sprintf(buffer, "%d/%d pattern: %s%s",
nb_printed_lines,
nb_lines,
sprintf(buffer, "%d/%d pattern: %s%s",
nb_printed_lines,
nb_lines,
- pattern
_list
,
+ pattern,
use_regexp ? " [regexp]" : "");
for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' ';
use_regexp ? " [regexp]" : "");
for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' ';
@@
-487,7
+487,8
@@
int main(int argc, char **argv) {
if(show_help || error) {
cerr << "Selector version " << VERSION << "-R" << REVISION_NUMBER
<< endl
if(show_help || error) {
cerr << "Selector version " << VERSION << "-R" << REVISION_NUMBER
<< endl
- << "Written by Francois Fleuret <francois@fleuret.org>"
+ << "Written by Francois Fleuret <francois@fleuret.org>."
+ << endl
<< endl
<< argv[0]
<< " [-h]"
<< endl
<< argv[0]
<< " [-h]"
@@
-562,10
+563,10
@@
int main(int argc, char **argv) {
}
}
}
}
- char pattern
s
[buffer_size];
- pattern
s
[0] = '\0';
- int pattern
s
_point;
- pattern
s
_point = 0;
+ char pattern[buffer_size];
+ pattern[0] = '\0';
+ int pattern_point;
+ pattern_point = 0;
initscr();
initscr();
@@
-596,7
+597,7
@@
int main(int argc, char **argv) {
int key;
int current_line = 0, temporary_line = 0;
int key;
int current_line = 0, temporary_line = 0;
- update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, pattern
s
);
+ update_screen(¤t_line, &temporary_line, 0, nb_lines, lines, pattern);
do {
do {
@@
-605,15
+606,15
@@
int main(int argc, char **argv) {
int motion = 0;
if(key >= ' ' && key <= '~') {
int motion = 0;
if(key >= ' ' && key <= '~') {
- pattern
s[patterns
_point++] = key;
- pattern
s[patterns
_point] = '\0';
+ pattern
[pattern
_point++] = key;
+ pattern
[pattern
_point] = '\0';
}
else if(key == KEY_BACKSPACE || key == '
\b
' || key == '
\7f
' ||
key == KEY_DC || key == '
\ 4
') {
}
else if(key == KEY_BACKSPACE || key == '
\b
' || key == '
\7f
' ||
key == KEY_DC || key == '
\ 4
') {
- if(pattern
s
_point > 0) {
- pattern
s
_point--;
- pattern
s[patterns
_point] = '\0';
+ if(pattern_point > 0) {
+ pattern_point--;
+ pattern
[pattern
_point] = '\0';
}
}
}
}
@@
-633,6
+634,10
@@
int main(int argc, char **argv) {
motion = -10;
}
motion = -10;
}
+ else if(key == KEY_DOWN || key == '
\ e
') {
+ motion = 1;
+ }
+
else if(key == KEY_UP || key == '
\10
') {
motion = -1;
}
else if(key == KEY_UP || key == '
\10
') {
motion = -1;
}
@@
-642,16
+647,12
@@
int main(int argc, char **argv) {
}
else if(key == '
\15
') {
}
else if(key == '
\15
') {
- patterns_point = 0;
- patterns[patterns_point] = '\0';
- }
-
- else if(key == KEY_DOWN || key == '
\ e
') {
- motion = 1;
+ pattern_point = 0;
+ pattern[pattern_point] = '\0';
}
update_screen(¤t_line, &temporary_line, motion,
}
update_screen(¤t_line, &temporary_line, motion,
- nb_lines, lines, pattern
s
);
+ nb_lines, lines, pattern);
} while(key != '\n' && key != KEY_ENTER && key != '
\a
');
} while(key != '\n' && key != KEY_ENTER && key != '
\a
');