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
0278589
..
9dafd4d
100644
(file)
--- a/
selector.cc
+++ b/
selector.cc
@@
-114,13
+114,17
@@
int test_and_add(char *new_string, int new_index,
code = code % hash_table_size;
while(hash_table[code] >= 0) {
code = code % hash_table_size;
while(hash_table[code] >= 0) {
- if(strcmp(new_string, strings[hash_table[code]]) == 0) return 1;
+ if(strcmp(new_string, strings[hash_table[code]]) == 0) {
+ int result = hash_table[code];
+ hash_table[code] = new_index;
+ return result;
+ }
code = (code + 1) % hash_table_size;
}
hash_table[code] = new_index;
code = (code + 1) % hash_table_size;
}
hash_table[code] = new_index;
- return
0
;
+ return
-1
;
}
//////////////////////////////////////////////////////////////////////
}
//////////////////////////////////////////////////////////////////////
@@
-207,12
+211,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
+362,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] = ' ';
@@
-438,13
+442,13
@@
int main(int argc, char **argv) {
i++;
}
i++;
}
- else if(strcmp(argv[i], "-
z
") == 0) {
-
z
sh_history = 1;
+ else if(strcmp(argv[i], "-
b
") == 0) {
+
ba
sh_history = 1;
i++;
}
i++;
}
- else if(strcmp(argv[i], "-
b
") == 0) {
-
ba
sh_history = 1;
+ else if(strcmp(argv[i], "-
z
") == 0) {
+
z
sh_history = 1;
i++;
}
i++;
}
@@
-487,7
+491,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]"
@@
-495,6
+500,7
@@
int main(int argc, char **argv) {
<< " [-m]"
<< " [-d]"
<< " [-e]"
<< " [-m]"
<< " [-d]"
<< " [-e]"
+ << " [-b]"
<< " [-z]"
<< " [-i]"
<< " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
<< " [-z]"
<< " [-i]"
<< " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
@@
-544,16
+550,40
@@
int main(int argc, char **argv) {
while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
}
while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
}
- if(!hash_table || !test_and_add(s, nb_lines, lines, hash_table, hash_table_size)) {
+ 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);
lines[nb_lines] = new char[strlen(s) + 1];
strcpy(lines[nb_lines], s);
- nb_lines++;
+ } else {
+ // 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++;
}
}
delete[] hash_table;
}
}
delete[] hash_table;
+ // Now remove the null strings
+
+ int n = 0;
+ for(int k = 0; k < nb_lines; k++) {
+ if(lines[k]) {
+ lines[n++] = lines[k];
+ }
+ }
+ nb_lines = n;
+
if(inverse_order) {
for(int i = 0; i < nb_lines/2; i++) {
char *s = lines[nb_lines - 1 - i];
if(inverse_order) {
for(int i = 0; i < nb_lines/2; i++) {
char *s = lines[nb_lines - 1 - i];
@@
-562,13
+592,24
@@
int main(int argc, char **argv) {
}
}
}
}
- char patterns[buffer_size];
- patterns[0] = '\0';
- int patterns_point;
- patterns_point = 0;
+ char pattern[buffer_size];
+ pattern[0] = '\0';
+ int pattern_point;
+ pattern_point = 0;
+
+ //////////////////////////////////////////////////////////////////////
+ // Here we start to display with curse
initscr();
initscr();
+ noecho();
+
+ // Hide the cursor
+ curs_set(0);
+
+ // So that the arrow keys work
+ keypad(stdscr, TRUE);
+
if(with_colors) {
if(has_colors()) {
start_color();
if(with_colors) {
if(has_colors()) {
start_color();
@@
-589,14
+630,10
@@
int main(int argc, char **argv) {
}
}
}
}
- noecho();
- curs_set(0); // Hide the cursor
- keypad(stdscr, TRUE); // So that the arrow keys work
-
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
+642,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
+670,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
+683,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
');
@@
-659,6
+696,9
@@
int main(int argc, char **argv) {
curs_set(1);
endwin();
curs_set(1);
endwin();
+ //////////////////////////////////////////////////////////////////////
+ // Here we come back to standard display
+
if((key == KEY_ENTER || key == '\n')) {
if(output_to_vt_buffer) {
if((key == KEY_ENTER || key == '\n')) {
if(output_to_vt_buffer) {