projects
/
selector.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed merge conflict.
[selector.git]
/
selector.cc
diff --git
a/selector.cc
b/selector.cc
index
e854405
..
4950c90
100644
(file)
--- a/
selector.cc
+++ b/
selector.cc
@@
-1,7
+1,7
@@
/*
/*
- * selector is a simple
shell command for selection of strings with a
- * dynamic pattern-matching.
+ * selector is a simple
command line utility for selection of strings
+ *
with a
dynamic pattern-matching.
*
* Copyright (c) 2009 Francois Fleuret
* Written by Francois Fleuret <francois@fleuret.org>
*
* Copyright (c) 2009 Francois Fleuret
* Written by Francois Fleuret <francois@fleuret.org>
@@
-502,12
+502,19
@@
void update_screen(int *current_line, int *temporary_line, int motion,
addstr(" ");
}
addstr(" ");
}
- if(use_regexp) {
- addstr(" [regexp]");
- }
+ if(use_regexp || case_sensitive) {
+ addstr("[");
+ if(use_regexp) {
+ addstr("regexp");
+ }
- if(case_sensitive) {
- addstr(" [case]");
+ if(case_sensitive) {
+ if(use_regexp) {
+ addstr(",");
+ }
+ addstr("case");
+ }
+ addstr("]");
}
move(0, cursor_x);
}
move(0, cursor_x);
@@
-817,9
+824,6
@@
int main(int argc, char **argv) {
noecho();
noecho();
- // Hide the cursor
- // curs_set(0);
-
// So that the arrow keys work
keypad(stdscr, TRUE);
// So that the arrow keys work
keypad(stdscr, TRUE);
@@
-831,7
+835,6
@@
int main(int argc, char **argv) {
color_fg_highlight < 0 || color_bg_highlight >= COLORS ||
color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
echo();
color_fg_highlight < 0 || color_bg_highlight >= COLORS ||
color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
echo();
- // curs_set(1);
endwin();
cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl;
exit(1);
endwin();
cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl;
exit(1);
@@
-935,7
+938,6
@@
int main(int argc, char **argv) {
} while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G
echo();
} while(key != '\n' && key != KEY_ENTER && key != '\007'); // ^G
echo();
- // curs_set(1);
endwin();
//////////////////////////////////////////////////////////////////////
endwin();
//////////////////////////////////////////////////////////////////////