Unified · Split
| @@ -31,6 +31,7 @@ static int charw, charh; · 30 unmodified lines | ||
| 31 | 31 | static Field field; |
| 32 | 32 | static Mbuf_reusable mbuf; |
| 33 | 33 | static Oevent_list events; |
| 34 | +static char filename[256]; | |
| 34 | 35 | |
| 35 | 36 | static char *menu3i[] = { |
| 36 | 37 | "load", |
| @@ -242,6 +243,10 @@ redraw(void) · 205 unmodified lines | ||
| 242 | 243 | runesprint(linebuf, "%d", bpm); |
| 243 | 244 | runestring(screen, p, display->white, ZP, font, linebuf); |
| 244 | 245 | |
| 246 | + /* filename */ | |
| 247 | + p.y += font->height; | |
| 248 | + string(screen, p, display->white, ZP, font, filename); | |
| 249 | + | |
| 245 | 250 | /* cursor bg */ |
| 246 | 251 | p = top; |
| 247 | 252 | p.x += curx*stringwidth(font, " "); |
| @@ -266,6 +271,18 @@ fieldload(char *path) · 18 unmodified lines | ||
| 266 | 271 | return 0; |
| 267 | 272 | } |
| 268 | 273 | |
| 274 | +static int | |
| 275 | +fieldsave(char *path) | |
| 276 | +{ | |
| 277 | + FILE *f; | |
| 278 | + | |
| 279 | + if ((f = fopen(path, "w")) == nil) | |
| 280 | + return -1; | |
| 281 | + field_fput(&field, f); | |
| 282 | + fclose(f); | |
| 283 | + return 0; | |
| 284 | +} | |
| 285 | + | |
| 269 | 286 | static void |
| 270 | 287 | fieldset(Rune key) |
| 271 | 288 | { |
| @@ -295,7 +312,7 @@ threadmain(int argc, char **argv) · 23 unmodified lines | ||
| 295 | 312 | Rune key; |
| 296 | 313 | Mouse m; |
| 297 | 314 | char tmp[256]; |
| 298 | − int oldw, oldh, w, h; | |
| 315 | + int oldw, oldh, w, h, n; | |
| 299 | 316 | Alt a[] = { |
| 300 | 317 | { nil, &m, CHANRCV }, |
| 301 | 318 | { nil, nil, CHANRCV }, |
| @@ -351,18 +368,18 @@ threadmain(int argc, char **argv) · 49 unmodified lines | ||
| 351 | 368 | case 2: |
| 352 | 369 | break; |
| 353 | 370 | case 4: |
| 354 | − switch (menuhit(3, mctl, &menu3, nil)) { | |
| 355 | − case 0: | |
| 356 | − tmp[0] = 0; | |
| 357 | − if (enter("load file:", tmp, sizeof(tmp), mctl, kctl, nil) > 0) { | |
| 358 | − if (fieldload(tmp) == 0) { | |
| 371 | + n = menuhit(3, mctl, &menu3, nil); | |
| 372 | + if (n == 0 || n == 1) { | |
| 373 | + strncpy(tmp, filename, sizeof(tmp)); | |
| 374 | + if (enter("file path:", tmp, sizeof(tmp), mctl, kctl, nil) > 0) { | |
| 375 | + if (n == 0 && fieldload(tmp) == 0) { | |
| 359 | 376 | w = field.width; |
| 360 | 377 | h = field.height; |
| 361 | − } else { | |
| 362 | − /* FIXME display the error */ | |
| 378 | + strncpy(filename, tmp, sizeof(filename)); | |
| 379 | + } else if (n == 1 && fieldsave(tmp) == 0) { | |
| 380 | + strncpy(filename, tmp, sizeof(filename)); | |
| 363 | 381 | } |
| 364 | 382 | } |
| 365 | − break; | |
| 366 | 383 | } |
| 367 | 384 | break; |
| 368 | 385 | } |