Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8583 → Rev 8584

/programs/cmm/quark/search.h
9,11 → 9,11
collection_int found;
void show();
void hide();
bool draw();
bool edit_key();
bool edit_mouse();
int find_all();
int find_next();
int find_prior();
} search;
 
char found_text[64];
55,36 → 55,9
return false;
}
 
bool SEARCH::draw(dword _btn_find, _btn_hide, _y)
{
char matches[30];
if (!visible) return false;
DrawBar(0, _y, Form.cwidth, 1, sc.work_graph);
DrawBar(0, _y+1, Form.cwidth, SEARCH_H-1, sc.work);
 
search_box.top = _y + 6;
search_box.width = math.min(Form.width - 200, 150);
 
DrawRectangle(search_box.left-1, search_box.top-1, search_box.width+2, 23,sc.work_graph);
 
edit_box_draw stdcall(#search_box);
 
DrawCaptButton(search_box.left+search_box.width+14, search_box.top-1, 100,
TOOLBAR_ICON_HEIGHT+1, _btn_find, sc.work_light, sc.work_text, T_FIND_NEXT);
 
sprintf(#matches, T_MATCHES, found.count);
WriteTextWithBg(search_box.left+search_box.width+14+115,
search_box.top+3, 0xD0, sc.work_text, #matches, sc.work);
 
DefineHiddenButton(Form.cwidth-26, search_box.top-1, TOOLBAR_ICON_HEIGHT+1,
TOOLBAR_ICON_HEIGHT+1, _btn_hide);
WriteText(Form.cwidth-26+7, search_box.top+2, 0x81, sc.work_graph, "x");
return true;
}
 
int SEARCH::find_all()
{
dword haystack = io.buffer_data;
dword haystack = textbuf.p;
int needle_len = strlen(#found_text);
found.drop();
loop() {
94,10 → 67,9
}
}
 
int SEARCH::find_next(int _cur_pos)
int SEARCH::find_next(int _first)
{
int i;
dword t1, t2;
if (!search_text[0]) return false;
 
if (!streq(#found_text, #search_text)) {
107,12 → 79,30
}
 
for (i=0; i<found.count; i++) {
if (signed found.get(i) - lines.get(_cur_pos) > 0) {
t1 = found.get(i);
while(t1 > lines.get(_cur_pos)) _cur_pos++;
return _cur_pos-1;
if (signed found.get(i) - lines.get(_first) > 0) {
while(signed found.get(i) - lines.get(_first) > 0) _first++;
return _first-1;
}
}
return false;
}
 
int SEARCH::find_prior(int _first)
{
int i;
if (!search_text[0]) return false;
 
if (!streq(#found_text, #search_text)) {
strcpy(#found_text, #search_text);
find_all();
draw_window();
}
 
for (i=0; i<found.count; i++) {
if (signed found.get(i) - lines.get(_first) > 0) {
while(signed lines.get(_first) - found.get(i-1) > 0) _first--;
return _first;
}
}
return false;
}