projects
/
selector.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
76fcb8f
)
Cosmetics.
author
Francois Fleuret
<francois@fleuret.org>
Fri, 19 Nov 2010 20:27:23 +0000
(21:27 +0100)
committer
Francois Fleuret
<francois@fleuret.org>
Fri, 19 Nov 2010 20:27:23 +0000
(21:27 +0100)
selector.c
patch
|
blob
|
history
diff --git
a/selector.c
b/selector.c
index
63b7c24
..
d4ddb27
100644
(file)
--- a/
selector.c
+++ b/
selector.c
@@
-306,7
+306,7
@@
typedef struct {
char *splitted_patterns, **patterns;
} matcher_t;
char *splitted_patterns, **patterns;
} matcher_t;
-int match(
char *string, matcher_t *matcher
) {
+int match(
matcher_t *matcher, char *string
) {
int n;
if(matcher->nb_patterns >= 0) {
if(matcher->case_sensitive) {
int n;
if(matcher->nb_patterns >= 0) {
if(matcher->case_sensitive) {
@@
-333,8
+333,9
@@
void free_matcher(matcher_t *matcher) {
}
}
}
}
-void initialize_matcher(int use_regexp, int case_sensitive,
- matcher_t *matcher, const char *pattern) {
+void initialize_matcher(matcher_t *matcher,
+ int use_regexp, int case_sensitive,
+ const char *pattern) {
const char *s;
char *t, *last_pattern_start;
int n;
const char *s;
char *t, *last_pattern_start;
int n;
@@
-437,14
+438,14
@@
void kill_after_cursor(char *buffer, int *position) {
int previous_visible(int current_line, char **lines, matcher_t *matcher) {
int line = current_line - 1;
int previous_visible(int current_line, char **lines, matcher_t *matcher) {
int line = current_line - 1;
- while(line >= 0 && !match(
lines[line], matcher
)) line--;
+ while(line >= 0 && !match(
matcher, lines[line]
)) line--;
return line;
}
int next_visible(int current_line, int nb_lines, char **lines,
matcher_t *matcher) {
int line = current_line + 1;
return line;
}
int next_visible(int current_line, int nb_lines, char **lines,
matcher_t *matcher) {
int line = current_line + 1;
- while(line < nb_lines && !match(
lines[line], matcher
)) line++;
+ while(line < nb_lines && !match(
matcher, lines[line]
)) line++;
if(line < nb_lines)
return line;
if(line < nb_lines)
return line;
@@
-479,7
+480,7
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
int nb_printed_lines = 0;
int cursor_x;
int nb_printed_lines = 0;
int cursor_x;
- initialize_matcher(
use_regexp, case_sensitive, &matcher
, pattern);
+ initialize_matcher(
&matcher, use_regexp, case_sensitive
, pattern);
console_width = getmaxx(stdscr);
console_height = getmaxy(stdscr);
console_width = getmaxx(stdscr);
console_height = getmaxy(stdscr);
@@
-502,7
+503,7
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
else if(nb_lines > 0) {
int new_focus_line;
else if(nb_lines > 0) {
int new_focus_line;
- if(match(
lines[*current_focus_line], &matcher
)) {
+ if(match(
&matcher, lines[*current_focus_line]
)) {
new_focus_line = *current_focus_line;
} else {
new_focus_line = next_visible(*current_focus_line, nb_lines, lines,
new_focus_line = *current_focus_line;
} else {
new_focus_line = next_visible(*current_focus_line, nb_lines, lines,
@@
-552,21
+553,21
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
if(first_line > 0) {
first_line--;
if(first_line > 0) {
first_line--;
- while(first_line > 0 && !match(
lines[first_line], &matcher
)) {
+ while(first_line > 0 && !match(
&matcher, lines[first_line]
)) {
first_line--;
}
first_line--;
}
- if(match(
lines[first_line], &matcher
)) {
+ if(match(
&matcher, lines[first_line]
)) {
nb_match++;
}
}
if(nb_match < console_height - 1 && last_line < nb_lines - 1) {
last_line++;
nb_match++;
}
}
if(nb_match < console_height - 1 && last_line < nb_lines - 1) {
last_line++;
- while(last_line < nb_lines - 1 && !match(
lines[last_line], &matcher
)) {
+ while(last_line < nb_lines - 1 && !match(
&matcher, lines[last_line]
)) {
last_line++;
}
last_line++;
}
- if(match(
lines[last_line], &matcher
)) {
+ if(match(
&matcher, lines[last_line]
)) {
nb_match++;
}
}
nb_match++;
}
}
@@
-575,7
+576,7
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
/* Now we display them */
for(l = first_line; l <= last_line; l++) {
/* Now we display them */
for(l = first_line; l <= last_line; l++) {
- if(match(
lines[l], &matcher
)) {
+ if(match(
&matcher, lines[l]
)) {
int k = 0;
while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width - 2) {
int k = 0;
while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width - 2) {