Rev 1410 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log
| Rev 1410 | Rev 2018 | ||
|---|---|---|---|
| Line 138... | Line 138... | ||
| 138 | 138 | ||
| 139 | nvfind_gettext |
139 | nvfind_gettext |
| 140 | ld a,(nvfind_curtab) |
140 | ld a,(nvfind_curtab) |
| 141 | or a |
141 | or a |
| 142 | ld hl,cursearchtext |
142 | ld hl,cursearchtext |
| 143 | jr nz,nvfind_gettext_cursearchtext |
143 | ret nz;jr nz,nvfind_gettext_cursearchtext |
| 144 | ld hl,cursearchfilename |
144 | ld hl,cursearchfilename |
| 145 | nvfind_gettext_cursearchtext |
145 | nvfind_gettext_cursearchtext |
| 146 | ret |
146 | ret |
| 147 | 147 | ||
| 148 | nvfind_getx |
148 | nvfind_getx |
| 149 | ld a,(nvfind_curtab) |
149 | ld a,(nvfind_curtab) |
| 150 | or a |
150 | or a |
| 151 | ld a,(nvfind_curtextx) |
151 | ld a,(nvfind_curtextx) |
| 152 | jr nz,nvfind_getx_cursearchtext |
152 | ret nz;jr nz,nvfind_getx_cursearchtext |
| 153 | ld a,(nvfind_curx) |
153 | ld a,(nvfind_curx) |
| 154 | nvfind_getx_cursearchtext |
154 | nvfind_getx_cursearchtext |
| 155 | ret |
155 | ret |
| 156 | 156 | ||
| 157 | nvfind_setx |
157 | nvfind_setx |
| Line 254... | Line 254... | ||
| 254 | pop af ;loop return |
254 | pop af ;loop return |
| 255 | pop af ;reprint return |
255 | pop af ;reprint return |
| 256 | jp editcmd_reprintall |
256 | jp editcmd_reprintall |
| 257 | 257 | ||
| 258 | nvfind_enter |
258 | nvfind_enter |
| - | 259 | ld a,(nvfind_curtab) |
|
| - | 260 | or a |
|
| - | 261 | jr z,nvfind_enter_research ;Enter on filename - new search |
|
| 259 | ld a,(nvfind_curfoundfiles) |
262 | ld a,(nvfind_curfoundfiles) |
| 260 | or a |
263 | or a |
| - | 264 | jr nz,nvfind_enter_select ;Enter on search text - go to result |
|
| 261 | jr nz,nvfind_enter_select |
265 | nvfind_enter_research |
| 262 | - | ||
| 263 | ld (nvfind_sp),sp |
266 | ld (nvfind_sp),sp |
| 264 | call nvfind_reprintmenu |
- | |
| 265 | 267 | ||
| 266 | xor a |
268 | xor a |
| 267 | ld (nvfind_curfoundfiles),a |
269 | ld (nvfind_curfoundfiles),a |
| 268 | ld (nvfind_curfoundfile),a |
270 | ld (nvfind_curfoundfile),a |
| 269 | ld hl,FOUNDFILESTABLE |
271 | ld hl,FOUNDFILESTABLE |
| 270 | ld (nvfind_curfoundnameaddr),hl |
272 | ld (nvfind_curfoundnameaddr),hl |
| 271 | 273 | ||
| - | 274 | call nvfind_reprintmenu |
|
| - | 275 | ||
| 272 | ld de,0x0400 |
276 | ld de,0x0400 |
| 273 | call nv_setxy ;keeps de,hl,ix |
277 | call nv_setxy ;keeps de,hl,ix |
| 274 | 278 | ||
| 275 | ;ld hl,emptypath |
279 | ;ld hl,emptypath |
| 276 | call getcurpaneldir_hl |
280 | call getcurpaneldir_hl |
| Line 331... | Line 335... | ||
| 331 | ld (hl),a |
335 | ld (hl),a |
| 332 | jp pe,mirrorbytes0 |
336 | jp pe,mirrorbytes0 |
| 333 | ret |
337 | ret |
| 334 | 338 | ||
| 335 | nvfind_loaddir |
339 | nvfind_loaddir |
| - | 340 | ld de,nvfind_curpath |
|
| - | 341 | OS_CHDIR |
|
| 336 | ld de,emptypath;nvfind_curpath |
342 | ld de,emptypath;nvfind_curpath |
| 337 | OS_OPENDIR |
343 | OS_OPENDIR ;не понимает путь!!! |
| 338 | 344 | ||
| 339 | ld bc,0 ;file# |
345 | ld bc,0 ;file# |
| 340 | nvfind_loaddir0 |
346 | nvfind_loaddir0 |
| 341 | push bc |
347 | ;push bc |
| 342 | call loaddir_filinfo |
348 | call loaddir_filinfo |
| 343 | pop bc |
349 | ;pop bc |
| 344 | inc bc |
350 | inc bc |
| 345 | jp c,nvfind_loaddirq |
351 | jp c,nvfind_loaddirq |
| 346 | jr z,nvfind_loaddir0 |
352 | jr z,nvfind_loaddir0 |
| 347 | ld hl,filinfo+FILINFO_FATTRIB |
353 | ld hl,filinfo+FILINFO_FATTRIB |
| 348 | ld a,(hl) |
354 | ld a,(hl) |
| Line 384... | Line 390... | ||
| 384 | 390 | ||
| 385 | ;reopen dir |
391 | ;reopen dir |
| 386 | ld hl,nvfind_curpath |
392 | ld hl,nvfind_curpath |
| 387 | STRPOP |
393 | STRPOP |
| 388 | ld de,nvfind_curpath |
394 | ld de,nvfind_curpath |
| 389 | OS_OPENDIR |
395 | OS_CHDIR |
| - | 396 | ld de,emptypath;nvfind_curpath |
|
| - | 397 | OS_OPENDIR ;не понимает путь!!! |
|
| 390 | pop bc |
398 | pop bc |
| 391 | push bc |
399 | push bc |
| 392 | nvfind_loaddir_recreread0 |
400 | nvfind_loaddir_recreread0 |
| 393 | push bc |
401 | ;push bc |
| 394 | call loaddir_filinfo |
402 | call loaddir_filinfo |
| 395 | pop bc |
403 | ;pop bc |
| 396 | dec bc |
404 | dec bc |
| 397 | ld a,b |
405 | ld a,b |
| 398 | or c |
406 | or c |
| 399 | jr nz,nvfind_loaddir_recreread0 |
407 | jr nz,nvfind_loaddir_recreread0 |
| 400 | pop bc |
408 | pop bc |