uniting external bbs manager HMI to extbbslist_t.
bchanl/trunk/src/main.c (diff)| @@ -683,21 +683,7 @@ | ||
| 683 | 683 | |
| 684 | 684 | LOCAL VOID bchanl_bbsmenu_registerexternalbbs(bchanl_bbsmenu_t *bchanl, TC *title, W title_len, TC *url, W url_len) |
| 685 | 685 | { |
| 686 | - W url_asc_len; | |
| 687 | - UB *url_asc; | |
| 688 | - | |
| 689 | - url_asc_len = tcstosjs(NULL, url); | |
| 690 | - url_asc = malloc(sizeof(UB)*(url_asc_len+1)); | |
| 691 | - if (url_asc == NULL) { | |
| 692 | - DP_ER("malloc", 0); | |
| 693 | - return; | |
| 694 | - } | |
| 695 | - tcstosjs(url_asc, url); | |
| 696 | - url_asc[url_asc_len] = '\0'; | |
| 697 | - | |
| 698 | - extbbslist_appenditem(bchanl->extbbslist, title, title_len, url_asc, url_asc_len); | |
| 699 | - | |
| 700 | - free(url_asc); | |
| 686 | + extbbslist_editcontext_append(bchanl->editctx, title, title_len, url, url_len); | |
| 701 | 687 | } |
| 702 | 688 | |
| 703 | 689 | LOCAL VOID bchanl_bbsmenu_relayoutcache(bchanl_bbsmenu_t *bchanl) |
| @@ -841,7 +827,10 @@ | ||
| 841 | 827 | |
| 842 | 828 | bchanl_bbsmenu_registerexternalbbs(&bchanl->bbsmenu, title, title_len, url, url_len); |
| 843 | 829 | |
| 844 | - bchanl_bbsmenu_relayout(&bchanl->bbsmenu, bchanl->bbsmenuwindow); | |
| 830 | + registerexternalwindow_setboradnametext(bchanl->registerexternalwindow, NULL, 0); | |
| 831 | + registerexternalwindow_seturltext(bchanl->registerexternalwindow, NULL, 0); | |
| 832 | + | |
| 833 | + externalbbswindow_requestredisp(bchanl->externalbbswindow); | |
| 845 | 834 | } |
| 846 | 835 | |
| 847 | 836 | LOCAL VOID bchanl_externalbbswindow_draw(bchanl_t *bchanl) |
| @@ -872,9 +861,10 @@ | ||
| 872 | 861 | |
| 873 | 862 | LOCAL VOID bchanl_externalbbswindow_close(bchanl_t *bchanl) |
| 874 | 863 | { |
| 875 | - extbbslist_endedit(bchanl->bbsmenu.extbbslist, bchanl->bbsmenu.editctx, False); | |
| 864 | + extbbslist_endedit(bchanl->bbsmenu.extbbslist, bchanl->bbsmenu.editctx, True); | |
| 876 | 865 | bchanl->bbsmenu.editctx = NULL; |
| 877 | 866 | externalbbswindow_close(bchanl->externalbbswindow); |
| 867 | + bchanl_bbsmenu_relayout(&bchanl->bbsmenu, bchanl->bbsmenuwindow); | |
| 878 | 868 | } |
| 879 | 869 | |
| 880 | 870 | LOCAL VOID bchanl_externalbbswindow_butdn(bchanl_t *bchanl, W type, PNT pos) |
| @@ -998,7 +988,7 @@ | ||
| 998 | 988 | { |
| 999 | 989 | static RECT r0 = {{400, 100, 700+7, 200+30}}; |
| 1000 | 990 | static RECT r1 = {{100, 100, 300+7, 300+30}}; |
| 1001 | - static RECT r2 = {{400, 400, 700+7, 600+30}}; | |
| 991 | + static RECT r2 = {{400, 300, 800+7, 400+30}}; | |
| 1002 | 992 | TC *title0 = NULL, *title1 = NULL; |
| 1003 | 993 | W err; |
| 1004 | 994 | WID wid; |
| @@ -1392,12 +1382,19 @@ | ||
| 1392 | 1382 | |
| 1393 | 1383 | LOCAL VOID bchanl_setupmenu(bchanl_t *bchanl) |
| 1394 | 1384 | { |
| 1395 | - Bool isopen, isopen_extbbs; | |
| 1385 | + Bool isopen, isopen_extbbs, selected = False; | |
| 1386 | + W index; | |
| 1396 | 1387 | |
| 1397 | 1388 | isopen = subjectoptionwindow_isopen(bchanl->subjectoptionwindow); |
| 1398 | 1389 | isopen_extbbs = externalbbswindow_isopen(bchanl->externalbbswindow); |
| 1390 | + if (isopen_extbbs != False) { | |
| 1391 | + index = extbbslist_editcontext_getselect(bchanl->bbsmenu.editctx); | |
| 1392 | + if (index >= 0) { | |
| 1393 | + selected = True; | |
| 1394 | + } | |
| 1395 | + } | |
| 1399 | 1396 | |
| 1400 | - bchanl_mainmenu_setup(&bchanl->mainmenu, isopen, isopen_extbbs, False); | |
| 1397 | + bchanl_mainmenu_setup(&bchanl->mainmenu, isopen, isopen_extbbs, selected); | |
| 1401 | 1398 | } |
| 1402 | 1399 | |
| 1403 | 1400 | LOCAL VOID bchanl_selectmenu(bchanl_t *bchanl, W sel) |
| @@ -1404,6 +1401,7 @@ | ||
| 1404 | 1401 | { |
| 1405 | 1402 | Bool isopen; |
| 1406 | 1403 | RECT work; |
| 1404 | + W index; | |
| 1407 | 1405 | |
| 1408 | 1406 | switch(sel) { |
| 1409 | 1407 | case BCHANL_MAINMENU_SELECT_CLOSE: /* [終了] */ |
| @@ -1445,10 +1443,37 @@ | ||
| 1445 | 1443 | } |
| 1446 | 1444 | break; |
| 1447 | 1445 | case BCHANL_MAINMENU_SELECT_EXTBBS_UP: |
| 1446 | + isopen = externalbbswindow_isopen(bchanl->externalbbswindow); | |
| 1447 | + if (isopen != False) { | |
| 1448 | + index = extbbslist_editcontext_getselect(bchanl->bbsmenu.editctx); | |
| 1449 | + if (index < 0) { | |
| 1450 | + break; | |
| 1451 | + } | |
| 1452 | + extbbslist_editcontext_swapitem(bchanl->bbsmenu.editctx, index-1, index); | |
| 1453 | + externalbbswindow_requestredisp(bchanl->externalbbswindow); | |
| 1454 | + } | |
| 1448 | 1455 | break; |
| 1449 | 1456 | case BCHANL_MAINMENU_SELECT_EXTBBS_DOWN: |
| 1457 | + isopen = externalbbswindow_isopen(bchanl->externalbbswindow); | |
| 1458 | + if (isopen != False) { | |
| 1459 | + index = extbbslist_editcontext_getselect(bchanl->bbsmenu.editctx); | |
| 1460 | + if (index < 0) { | |
| 1461 | + break; | |
| 1462 | + } | |
| 1463 | + extbbslist_editcontext_swapitem(bchanl->bbsmenu.editctx, index, index+1); | |
| 1464 | + externalbbswindow_requestredisp(bchanl->externalbbswindow); | |
| 1465 | + } | |
| 1450 | 1466 | break; |
| 1451 | 1467 | case BCHANL_MAINMENU_SELECT_EXTBBS_DELETE: |
| 1468 | + isopen = externalbbswindow_isopen(bchanl->externalbbswindow); | |
| 1469 | + if (isopen != False) { | |
| 1470 | + index = extbbslist_editcontext_getselect(bchanl->bbsmenu.editctx); | |
| 1471 | + if (index < 0) { | |
| 1472 | + break; | |
| 1473 | + } | |
| 1474 | + extbbslist_editcontext_deleteitem(bchanl->bbsmenu.editctx, index); | |
| 1475 | + externalbbswindow_requestredisp(bchanl->externalbbswindow); | |
| 1476 | + } | |
| 1452 | 1477 | break; |
| 1453 | 1478 | } |
| 1454 | 1479 | return; |
| @@ -1598,8 +1623,8 @@ | ||
| 1598 | 1623 | case BCHANLHMIEVENT_TYPE_REGISTEREXTERNALWINDOW_PARTS_URL_KEYMENU: |
| 1599 | 1624 | break; |
| 1600 | 1625 | case BCHANLHMIEVENT_TYPE_REGISTEREXTERNALWINDOW_PARTS_DETERMINE_PUSH: |
| 1626 | + bchanl_registerexternalbbs(bchanl); | |
| 1601 | 1627 | registerexternalwindow_close(bchanl->registerexternalwindow); |
| 1602 | - bchanl_registerexternalbbs(bchanl); | |
| 1603 | 1628 | break; |
| 1604 | 1629 | case BCHANLHMIEVENT_TYPE_REGISTEREXTERNALWINDOW_PARTS_CANCEL_PUSH: |
| 1605 | 1630 | registerexternalwindow_close(bchanl->registerexternalwindow); |
