unite res index info.

git-svn-id: http://svn.sourceforge.jp/svnroot/bchan/bchan/trunk@123 20a0b8eb-f62a-4a12-8fe1-b598822500fb

diff --git a/src/Makefile b/src/Makefile
index 447e637..2e250d2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -38,7 +38,7 @@ VPATH = $(S)
 HEADER := $(S) $(HEADER)
 
 # ¥½¡¼¥¹¥Õ¥¡¥¤¥ë
-SRC =  main.c cache.c parser.c layout.c window.c retriever.c tadlib.c confirm.c poptray.c postres.c http.c submit.c sjisstring.c parselib.c submitutil.c bchan_vobj.c tadurl.c bchan_panels.c bchan_menus.c residhash.c
+SRC =  main.c cache.c parser.c layout.c window.c retriever.c tadlib.c confirm.c poptray.c postres.c http.c submit.c sjisstring.c parselib.c submitutil.c bchan_vobj.c tadurl.c bchan_panels.c bchan_menus.c residhash.c resindexhash.c
 
 # ¥Ç¡¼¥¿¥Ü¥Ã¥¯¥¹¥½¡¼¥¹¥Õ¥¡¥¤¥ë
 DBSRC =

diff --git a/src/main.c b/src/main.c
index e006163..1afae13 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -619,8 +619,22 @@ LOCAL VOID bchan_butdn_pressnumber(bchan_t *bchan, WEVENT *wev, W resindex)
        W size, err;
        PNT pos;
        B *data;
+       COLOR color;
+       UW attr = 0;
 
        DP(("press DATDRAW_FINDACTION_TYPE_NUMBER: %d\n", resindex + 1));
+       err = datcache_searchresindexdata(bchan->cache, resindex, &attr, &color);
+       if (err == DATCACHE_SEARCHRESINDEXDATA_FOUND) {
+               if ((attr & DATCACHE_RESINDEXDATA_FLAG_NG) != 0) {
+                       err = bchan_resnumbermenu_setngselected(&bchan->resnumbermenu, True);
+               } else {
+                       err = bchan_resnumbermenu_setngselected(&bchan->resnumbermenu, False);
+               }
+       } else {
+               attr = 0;
+               err = bchan_resnumbermenu_setngselected(&bchan->resnumbermenu, False);
+       }
+
        pos.x = wev->s.pos.x;
        pos.y = wev->s.pos.y;
        gcnv_abs(bchan->gid, &pos);
@@ -634,6 +648,12 @@ LOCAL VOID bchan_butdn_pressnumber(bchan_t *bchan, WEVENT *wev, W resindex)
                datlayout_resindextotraytextdata(bchan->layout, resindex, data, size);
                bchan_pushstringtotray((TC*)data, size/2);
                free(data);
+       } if (err == BCHAN_RESNUMBERMENU_SELECT_NG) {
+               if ((attr & DATCACHE_RESINDEXDATA_FLAG_NG) != 0) {
+                       datcache_removeresindexdata(bchan->cache, resindex);
+               } else {
+                       err = datcache_addresindexdata(bchan->cache, resindex, DATCACHE_RESINDEXDATA_FLAG_NG, 0x10000000);
+               }
        }
 }