projects
/
selector.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6041f7d
)
Automatic commit
author
Francois Fleuret
<francois@fleuret.org>
Thu, 12 Mar 2009 07:30:32 +0000
(08:30 +0100)
committer
Francois Fleuret
<francois@fleuret.org>
Thu, 12 Mar 2009 07:30:32 +0000
(08:30 +0100)
selector.cc
patch
|
blob
|
history
diff --git
a/selector.cc
b/selector.cc
index
5b62ca8
..
7d12606
100644
(file)
--- a/
selector.cc
+++ b/
selector.cc
@@
-76,7
+76,7
@@
int next_visible(int current_line, int nb_lines, char **lines, int nb_patterns,
return -1;
}
return -1;
}
-void update_screen(int *current_line, int motion,
+void update_screen(int *current_line, int
*temporary_line, int
motion,
int nb_lines, char **lines,
char *pattern_list,
int noblink) {
int nb_lines, char **lines,
char *pattern_list,
int noblink) {
@@
-113,7
+113,7
@@
void update_screen(int *current_line, int motion,
int console_width = getmaxx(stdscr);
int console_height = getmaxy(stdscr);
int console_width = getmaxx(stdscr);
int console_height = getmaxy(stdscr);
- int nb_printed_lines = 1
, last_printer_line = -1
;
+ int nb_printed_lines = 1;
// First, we find a visible line. In priority: The current, or the
// first visible after it, or the first visible before it.
// First, we find a visible line. In priority: The current, or the
// first visible after it, or the first visible before it.
@@
-218,11
+218,11
@@
void update_screen(int *current_line, int motion,
addnstr(buffer, console_width);
}
addnstr(buffer, console_width);
}
- last_printer_line = l;
nb_printed_lines++;
}
}
nb_printed_lines++;
}
}
+ *temporary_line = new_line;
if(motion != 0) {
*current_line = new_line;
}
if(motion != 0) {
*current_line = new_line;
}
@@
-348,9
+348,9
@@
int main(int argc, char **argv) {
int key;
int key;
- int line = 0;
+ int
current_line = 0, temporary_
line = 0;
- update_screen(&line, 0, nb_lines, lines, patterns, noblink);
+ update_screen(&
current_line, &temporary_
line, 0, nb_lines, lines, patterns, noblink);
do {
do {
@@
-378,7
+378,8
@@
int main(int argc, char **argv) {
motion = 1;
}
motion = 1;
}
- update_screen(&line, motion, nb_lines, lines, patterns, noblink);
+ update_screen(¤t_line, &temporary_line, motion,
+ nb_lines, lines, patterns, noblink);
} while(key != '\n' && key != KEY_ENTER && key != '
\a
');
echo();
} while(key != '\n' && key != KEY_ENTER && key != '
\a
');
echo();
@@
-390,8
+391,8
@@
int main(int argc, char **argv) {
cerr << "Can not open " << output_filename << " for writing." << endl;
exit(1);
} else {
cerr << "Can not open " << output_filename << " for writing." << endl;
exit(1);
} else {
- if((key == KEY_ENTER || key == '\n') &&
line >= 0 &&
line < nb_lines) {
- out << lines[line] << endl;
+ if((key == KEY_ENTER || key == '\n') &&
temporary_line >= 0 && temporary_
line < nb_lines) {
+ out << lines[
temporary_
line] << endl;
} else {
out << endl;
}
} else {
out << endl;
}