regenerate for script update.

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

diff --git a/src/bchanl_hmi.c b/src/bchanl_hmi.c
index 1a0d775..ad36f15 100644 (file)
--- a/src/bchanl_hmi.c
+++ b/src/bchanl_hmi.c
@@ -546,6 +546,45 @@ EXPORT W subjectoptionwindow_getfiltertext(subjectoptionwindow_t *window, TC *st
        return cp_len;
 }
 
+EXPORT W subjectoptionwindow_cutfiltertext(subjectoptionwindow_t *window, TC *str, W len, Bool cut)
+{
+       W err, len0;
+
+       len0 = ccut_txt(window->filter.id, len, str, cut == False ? 0 : 1);
+       if (len0 < 0) {
+               return len0;
+       }
+
+       if (cut != False) {
+               err = cget_val(window->filter.id, 1000, (W*)(window->filter.buf+7));
+               if (err < 0) {
+                       return err;
+               }
+               window->filter.buf_written = err;
+               return len0;
+       }
+
+       return len0;
+}
+
+EXPORT W subjectoptionwindow_insertfiltertext(subjectoptionwindow_t *window, TC *str, W len)
+{
+       W err;
+
+       err = cins_txt(window->filter.id, (PNT){0x8000, 0x8000}, str);
+       if (err < 0) {
+               return err;
+       }
+
+       err = cget_val(window->filter.id, 1000, (W*)(window->filter.buf+7));
+       if (err < 0) {
+               return err;
+       }
+       window->filter.buf_written = err;
+
+       return err;
+}
+
 LOCAL VOID subjectoptionwindow_actionfilter(subjectoptionwindow_t *window, WEVENT *wev, bchanlhmievent_t *evt)
 {
        W i, len;
@@ -553,8 +592,22 @@ LOCAL VOID subjectoptionwindow_actionfilter(subjectoptionwindow_t *window, WEVEN
        i = cact_par(window->filter.id, wev);
        if (i & 0x2000) {
                window->filter.nextaction = True;
-               subjectoptionwindow_setflag(window, SUBJECTOPTIONWINDOW_FLAG_PARTS_OTHEREVENT);
-               wugt_evt(wev);
+               switch (i) {
+               case    P_MENU:
+                       if ((wev->s.type == EV_KEYDWN)&&(wev->s.stat & ES_CMD)) {
+                               evt->type = BCHANLHMIEVENT_TYPE_SUBJECTOPTIONWINDOW_PARTS_FILTER_KEYMENU;
+                               evt->data.subjectoptionwindow_filter_keymenu.keycode = wev->e.data.key.code;
+                       } else {
+                               evt->type = BCHANLHMIEVENT_TYPE_SUBJECTOPTIONWINDOW_PARTS_FILTER_MENU;
+                               evt->data.subjectoptionwindow_filter_menu.pos = wev->s.pos;
+                       }
+                       subjectoptionwindow_setflag(window, SUBJECTOPTIONWINDOW_FLAG_PARTS_NEXTACTION);
+                       break;
+               default:
+                       wugt_evt(wev);
+                       subjectoptionwindow_setflag(window, SUBJECTOPTIONWINDOW_FLAG_PARTS_OTHEREVENT);
+                       break;
+               }
                return;
        }
        window->filter.nextaction = False;
@@ -588,18 +641,6 @@ LOCAL VOID subjectoptionwindow_actionfilter(subjectoptionwindow_t *window, WEVEN
                evt->data.subjectoptionwindow_filter_copy.rel_wid = wev->s.wid;
                evt->data.subjectoptionwindow_filter_copy.pos = wev->s.pos;
                break;
-       case    P_MENU:
-               if ((wev->s.type == EV_KEYDWN)&&(wev->s.stat & ES_CMD)) {
-                       evt->type = BCHANLHMIEVENT_TYPE_SUBJECTOPTIONWINDOW_PARTS_FILTER_KEYMENU;
-                       evt->data.subjectoptionwindow_filter_keymenu.keycode = wev->e.data.key.code;
-               } else {
-                       evt->type = BCHANLHMIEVENT_TYPE_SUBJECTOPTIONWINDOW_PARTS_FILTER_MENU;
-                       evt->data.subjectoptionwindow_filter_menu.pos = wev->s.pos;
-               }
-               window->filter.nextaction = True;
-               subjectoptionwindow_setflag(window, SUBJECTOPTIONWINDOW_FLAG_PARTS_NEXTACTION);
-               wugt_evt(wev);
-               break;
        }
 }
 
@@ -876,6 +917,45 @@ EXPORT W registerexternalwindow_getboradnametext(registerexternalwindow_t *windo
        return cp_len;
 }
 
+EXPORT W registerexternalwindow_cutboradnametext(registerexternalwindow_t *window, TC *str, W len, Bool cut)
+{
+       W err, len0;
+
+       len0 = ccut_txt(window->boradname.id, len, str, cut == False ? 0 : 1);
+       if (len0 < 0) {
+               return len0;
+       }
+
+       if (cut != False) {
+               err = cget_val(window->boradname.id, 1000, (W*)(window->boradname.buf+7));
+               if (err < 0) {
+                       return err;
+               }
+               window->boradname.buf_written = err;
+               return len0;
+       }
+
+       return len0;
+}
+
+EXPORT W registerexternalwindow_insertboradnametext(registerexternalwindow_t *window, TC *str, W len)
+{
+       W err;
+
+       err = cins_txt(window->boradname.id, (PNT){0x8000, 0x8000}, str);
+       if (err < 0) {
+               return err;
+       }
+
+       err = cget_val(window->boradname.id, 1000, (W*)(window->boradname.buf+7));
+       if (err < 0) {
+               return err;
+       }
+       window->boradname.buf_written = err;
+
+       return err;
+}
+
 LOCAL VOID registerexternalwindow_actionboradname(registerexternalwindow_t *window, WEVENT *wev, bchanlhmievent_t *evt)
 {
        W i, len;
@@ -883,8 +963,22 @@ LOCAL VOID registerexternalwindow_actionboradname(registerexternalwindow_t *wind
        i = cact_par(window->boradname.id, wev);
        if (i & 0x2000) {
                window->boradname.nextaction = True;
-               registerexternalwindow_setflag(window, REGISTEREXTERNALWINDOW_FLAG_PARTS_OTHEREVENT);
-               wugt_evt(wev);
+               switch (i) {
+               case    P_MENU:
+                       if ((wev->s.type == EV_KEYDWN)&&(wev->s.stat & ES_CMD)) {
+                               evt->type = BCHANLHMIEVENT_TYPE_REGISTEREXTERNALWINDOW_PARTS_BORADNAME_KEYMENU;
+                               evt->data.registerexternalwindow_boradname_keymenu.keycode = wev->e.data.key.code;
+                       } else {
+                               evt->type = BCHANLHMIEVENT_TYPE_REGISTEREXTERNALWINDOW_PARTS_BORADNAME_MENU;
+                               evt->data.registerexternalwindow_boradname_menu.pos = wev->s.pos;
+                       }
+                       registerexternalwindow_setflag(window, REGISTEREXTERNALWINDOW_FLAG_PARTS_NEXTACTION);
+                       break;
+               default:
+                       wugt_evt(wev);
+                       registerexternalwindow_setflag(window, REGISTEREXTERNALWINDOW_FLAG_PARTS_OTHEREVENT);
+                       break;
+               }
                return;
        }
        window->boradname.nextaction = False;
@@ -918,18 +1012,6 @@ LOCAL VOID registerexternalwindow_actionboradname(registerexternalwindow_t *wind
                evt->data.registerexternalwindow_boradname_copy.rel_wid = wev->s.wid;
                evt->data.registerexternalwindow_boradname_copy.pos = wev->s.pos;
                break;
-       case    P_MENU:
-               if ((wev->s.type == EV_KEYDWN)&&(wev->s.stat & ES_CMD)) {
-                       evt->type = BCHANLHMIEVENT_TYPE_REGISTEREXTERNALWINDOW_PARTS_BORADNAME_KEYMENU;
-                       evt->data.registerexternalwindow_boradname_keymenu.keycode = wev->e.data.key.code;
-               } else {
-                       evt->type = BCHANLHMIEVENT_TYPE_REGISTEREXTERNALWINDOW_PARTS_BORADNAME_MENU;
-                       evt->data.registerexternalwindow_boradname_menu.pos = wev->s.pos;
-               }
-               window->boradname.nextaction = True;
-               registerexternalwindow_setflag(window, REGISTEREXTERNALWINDOW_FLAG_PARTS_NEXTACTION);
-               wugt_evt(wev);
-               break;
        }
 }
 
@@ -974,6 +1056,45 @@ EXPORT W registerexternalwindow_geturltext(registerexternalwindow_t *window, TC
        return cp_len;
 }
 
+EXPORT W registerexternalwindow_cuturltext(registerexternalwindow_t *window, TC *str, W len, Bool cut)
+{
+       W err, len0;
+
+       len0 = ccut_txt(window->url.id, len, str, cut == False ? 0 : 1);
+       if (len0 < 0) {
+               return len0;
+       }
+
+       if (cut != False) {
+               err = cget_val(window->url.id, 1000, (W*)(window->url.buf+7));
+               if (err < 0) {
+                       return err;
+               }
+               window->url.buf_written = err;
+               return len0;
+       }
+
+       return len0;
+}
+
+EXPORT W registerexternalwindow_inserturltext(registerexternalwindow_t *window, TC *str, W len)
+{
+       W err;
+
+       err = cins_txt(window->url.id, (PNT){0x8000, 0x8000}, str);
+       if (err < 0) {
+               return err;
+       }
+
+       err = cget_val(window->url.id, 1000, (W*)(window->url.buf+7));
+       if (err < 0) {
+               return err;
+       }
+       window->url.buf_written = err;
+
+       return err;
+}
+
 LOCAL VOID registerexternalwindow_actionurl(registerexternalwindow_t *window, WEVENT *wev, bchanlhmievent_t *evt)
 {
        W i, len;
@@ -981,8 +1102,22 @@ LOCAL VOID registerexternalwindow_actionurl(registerexternalwindow_t *window, WE
        i = cact_par(window->url.id, wev);
        if (i & 0x2000) {
                window->url.nextaction = True;
-               registerexternalwindow_setflag(window, REGISTEREXTERNALWINDOW_FLAG_PARTS_OTHEREVENT);
-               wugt_evt(wev);
+               switch (i) {
+               case    P_MENU:
+                       if ((wev->s.type == EV_KEYDWN)&&(wev->s.stat & ES_CMD)) {
+                               evt->type = BCHANLHMIEVENT_TYPE_REGISTEREXTERNALWINDOW_PARTS_URL_KEYMENU;
+                               evt->data.registerexternalwindow_url_keymenu.keycode = wev->e.data.key.code;
+                       } else {
+                               evt->type = BCHANLHMIEVENT_TYPE_REGISTEREXTERNALWINDOW_PARTS_URL_MENU;
+                               evt->data.registerexternalwindow_url_menu.pos = wev->s.pos;
+                       }
+                       registerexternalwindow_setflag(window, REGISTEREXTERNALWINDOW_FLAG_PARTS_NEXTACTION);
+                       break;
+               default:
+                       wugt_evt(wev);
+                       registerexternalwindow_setflag(window, REGISTEREXTERNALWINDOW_FLAG_PARTS_OTHEREVENT);
+                       break;
+               }
                return;
        }
        window->url.nextaction = False;
@@ -1016,18 +1151,6 @@ LOCAL VOID registerexternalwindow_actionurl(registerexternalwindow_t *window, WE
                evt->data.registerexternalwindow_url_copy.rel_wid = wev->s.wid;
                evt->data.registerexternalwindow_url_copy.pos = wev->s.pos;
                break;
-       case    P_MENU:
-               if ((wev->s.type == EV_KEYDWN)&&(wev->s.stat & ES_CMD)) {
-                       evt->type = BCHANLHMIEVENT_TYPE_REGISTEREXTERNALWINDOW_PARTS_URL_KEYMENU;
-                       evt->data.registerexternalwindow_url_keymenu.keycode = wev->e.data.key.code;
-               } else {
-                       evt->type = BCHANLHMIEVENT_TYPE_REGISTEREXTERNALWINDOW_PARTS_URL_MENU;
-                       evt->data.registerexternalwindow_url_menu.pos = wev->s.pos;
-               }
-               window->url.nextaction = True;
-               registerexternalwindow_setflag(window, REGISTEREXTERNALWINDOW_FLAG_PARTS_NEXTACTION);
-               wugt_evt(wev);
-               break;
        }
 }
 

diff --git a/src/bchanl_hmi.h b/src/bchanl_hmi.h
index f58011f..b977e91 100644 (file)
--- a/src/bchanl_hmi.h
+++ b/src/bchanl_hmi.h
@@ -86,7 +86,8 @@ IMPORT W subjectoptionwindow_open(subjectoptionwindow_t *window);
 IMPORT VOID subjectoptionwindow_close(subjectoptionwindow_t *window);
 IMPORT W subjectoptionwindow_setfiltertext(subjectoptionwindow_t *window, TC *str, W len);
 IMPORT W subjectoptionwindow_getfiltertext(subjectoptionwindow_t *window, TC *str, W len);
-IMPORT W subjectoptionwindow_endfilteraction(subjectoptionwindow_t *window);
+IMPORT W subjectoptionwindow_cutfiltertext(subjectoptionwindow_t *window, TC *str, W len, Bool cut);
+IMPORT W subjectoptionwindow_insertfiltertext(subjectoptionwindow_t *window, TC *str, W len);
 enum SUBJECTOPTIONWINDOW_ORDERVALUE_T_ {
        SUBJECTOPTIONWINDOW_ORDERVALUE_NOSEL = 0,
        SUBJECTOPTIONWINDOW_ORDERVALUE_ASCENDING,
@@ -118,10 +119,12 @@ IMPORT W registerexternalwindow_open(registerexternalwindow_t *window);
 IMPORT VOID registerexternalwindow_close(registerexternalwindow_t *window);
 IMPORT W registerexternalwindow_setboradnametext(registerexternalwindow_t *window, TC *str, W len);
 IMPORT W registerexternalwindow_getboradnametext(registerexternalwindow_t *window, TC *str, W len);
-IMPORT W registerexternalwindow_endboradnameaction(registerexternalwindow_t *window);
+IMPORT W registerexternalwindow_cutboradnametext(registerexternalwindow_t *window, TC *str, W len, Bool cut);
+IMPORT W registerexternalwindow_insertboradnametext(registerexternalwindow_t *window, TC *str, W len);
 IMPORT W registerexternalwindow_seturltext(registerexternalwindow_t *window, TC *str, W len);
 IMPORT W registerexternalwindow_geturltext(registerexternalwindow_t *window, TC *str, W len);
-IMPORT W registerexternalwindow_endurlaction(registerexternalwindow_t *window);
+IMPORT W registerexternalwindow_cuturltext(registerexternalwindow_t *window, TC *str, W len, Bool cut);
+IMPORT W registerexternalwindow_inserturltext(registerexternalwindow_t *window, TC *str, W len);
 
 typedef struct externalbbswindow_t_ externalbbswindow_t;
 typedef VOID (*externalbbswindow_scrollcalback)(VP arg, W dh, W dv);