nsxiva1165df
Rename variable toggledidx to markidx
+9 −9
2 files changed
- M commands.c +6 −6
- M main.c +3 −3
| @@ -46,7 +46,7 @@ extern fileinfo_t *files; | |||
| 46 | 46 | extern int filecnt, fileidx; | |
| 47 | 47 | extern int alternate; | |
| 48 | 48 | extern int markcnt; | |
| 49 | − | extern int toggledidx; | |
| 49 | + | extern int markidx; | |
| 50 | 50 | ||
| 51 | 51 | extern int prefix; | |
| 52 | 52 | extern bool extprefix; | |
| @@ -197,7 +197,7 @@ bool cg_toggle_image_mark(arg_t _) | |||
| 197 | 197 | markcnt += files[fileidx].flags & FF_MARK ? 1 : -1; | |
| 198 | 198 | if (mode == MODE_THUMB) | |
| 199 | 199 | tns_mark(&tns, fileidx, !!(files[fileidx].flags & FF_MARK)); | |
| 200 | − | toggledidx = fileidx; | |
| 200 | + | markidx = fileidx; | |
| 201 | 201 | return true; | |
| 202 | 202 | } | |
| 203 | 203 | ||
| @@ -218,14 +218,14 @@ bool cg_mark_range(arg_t _) | |||
| 218 | 218 | { | |
| 219 | 219 | int i, from, to; | |
| 220 | 220 | ||
| 221 | − | from = toggledidx; | |
| 221 | + | from = markidx; | |
| 222 | 222 | to = fileidx; | |
| 223 | − | if (fileidx < toggledidx) { | |
| 223 | + | if (fileidx < markidx) { | |
| 224 | 224 | from = fileidx; | |
| 225 | − | to = toggledidx; | |
| 225 | + | to = markidx; | |
| 226 | 226 | } | |
| 227 | 227 | for (i = from; i <= to; i++) { | |
| 228 | − | if (files[toggledidx].flags & FF_MARK) { | |
| 228 | + | if (files[markidx].flags & FF_MARK) { | |
| 229 | 229 | if (!(files[i].flags & FF_MARK)) { | |
| 230 | 230 | files[i].flags |= FF_MARK; | |
| 231 | 231 | markcnt += 1; | |
| @@ -57,7 +57,7 @@ fileinfo_t *files; | |||
| 57 | 57 | int filecnt, fileidx; | |
| 58 | 58 | int alternate; | |
| 59 | 59 | int markcnt; | |
| 60 | − | int toggledidx; | |
| 60 | + | int markidx; | |
| 61 | 61 | ||
| 62 | 62 | int prefix; | |
| 63 | 63 | bool extprefix; | |
| @@ -159,8 +159,8 @@ void remove_file(int n, bool manual) | |||
| 159 | 159 | fileidx--; | |
| 160 | 160 | if (n < alternate) | |
| 161 | 161 | alternate--; | |
| 162 | − | if (n < toggledidx) | |
| 163 | − | toggledidx--; | |
| 162 | + | if (n < markidx) | |
| 163 | + | markidx--; | |
| 164 | 164 | } | |
| 165 | 165 | ||
| 166 | 166 | void set_timeout(timeout_f handler, int time, bool overwrite) | |