I/F change.

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

diff --git a/src/confirm.c b/src/confirm.c
index 1bbc72f..33bb57d 100644 (file)
--- a/src/confirm.c
+++ b/src/confirm.c
@@ -123,6 +123,8 @@ LOCAL VOID cfrmwindow_draw(VP arg, RECT *r)
        TC label_from[] = {0x4C3E, 0x4130, TK_COLN, TK_KSP, TNULL};
        TC label_mail[] = {TK_E, 0x213E, TK_m, TK_a, TK_i, TK_l, TK_COLN, TK_KSP, TNULL};
        GID gid;
+       TC *from, *mail, *message;
+       W from_len, mail_len, message_len;
 
        if (window->post == NULL) {
                return;
@@ -130,15 +132,22 @@ LOCAL VOID cfrmwindow_draw(VP arg, RECT *r)
 
        gid = window->gid;
 
+       from = postresdata_getfromstring(window->post);
+       from_len = postresdata_getfromstringlen(window->post);
+       mail = postresdata_getmailstring(window->post);
+       mail_len = postresdata_getmailstringlen(window->post);
+       message = postresdata_getmessagestring(window->post);
+       message_len = postresdata_getmessagestringlen(window->post);
+
        cfrmwindow_resetgenv(window);
        gdra_stp(gid, window->pos_from.x, window->pos_from.y + 16, label_from, 4, G_STORE);
-       tadlib_drawtext(window->post->from, window->post->from_len, gid, 0, 0);
+       tadlib_drawtext(from, from_len, gid, 0, 0);
        cfrmwindow_resetgenv(window);
        gdra_stp(gid, window->pos_mail.x, window->pos_mail.y + 16, label_mail, 8, G_STORE);
-       tadlib_drawtext(window->post->mail, window->post->mail_len, gid, 0, 0);
+       tadlib_drawtext(mail, mail_len, gid, 0, 0);
        cfrmwindow_resetgenv(window);
        gset_chp(gid, window->pos_message.x, window->pos_message.y + 16, True);
-       tadlib_drawtext(window->post->message, window->post->message_len, gid, -window->pos_message.x, -window->pos_message.y);
+       tadlib_drawtext(message, message_len, gid, -window->pos_message.x, -window->pos_message.y);
 
        cdsp_pwd(window->wid, r, P_RDISP);
 }
@@ -221,6 +230,8 @@ LOCAL VOID cfrmwindow_calclayout(cfrmwindow_t *window, SIZE *sz)
        GID gid;
        W width_from, width_mail;
        actionlist_t *alist_from = NULL, *alist_mail = NULL, *alist_message = NULL;
+       TC *from, *mail, *message;
+       W from_len, mail_len, message_len;
 
        sz->h = 0;
        sz->v = 0;
@@ -231,12 +242,19 @@ LOCAL VOID cfrmwindow_calclayout(cfrmwindow_t *window, SIZE *sz)
 
        gid = window->gid;
 
+       from = postresdata_getfromstring(window->post);
+       from_len = postresdata_getfromstringlen(window->post);
+       mail = postresdata_getmailstring(window->post);
+       mail_len = postresdata_getmailstringlen(window->post);
+       message = postresdata_getmessagestring(window->post);
+       message_len = postresdata_getmessagestringlen(window->post);
+
        cfrmwindow_resetgenv(window);
        width_from = gget_stw(gid, label_from, 4, NULL, NULL);
        if (width_from < 0) {
                return;
        }
-       tadlib_calcdrawsize(window->post->from, window->post->from_len, gid, &sz_from, &alist_from);
+       tadlib_calcdrawsize(from, from_len, gid, &sz_from, &alist_from);
        sz_from.h += width_from + CFRMWINDOW_LAYOUT_FROM_MARGIN * 2;
        sz_from.v += CFRMWINDOW_LAYOUT_FROM_MARGIN * 2;
 
@@ -248,7 +266,7 @@ LOCAL VOID cfrmwindow_calclayout(cfrmwindow_t *window, SIZE *sz)
        if (width_mail < 0) {
                return;
        }
-       tadlib_calcdrawsize(window->post->mail, window->post->mail_len, gid, &sz_mail, &alist_mail);
+       tadlib_calcdrawsize(mail, mail_len, gid, &sz_mail, &alist_mail);
        sz_mail.h += width_mail + CFRMWINDOW_LAYOUT_MAIL_MARGIN * 2;
        sz_mail.v += CFRMWINDOW_LAYOUT_MAIL_MARGIN * 2;
 
@@ -256,7 +274,7 @@ LOCAL VOID cfrmwindow_calclayout(cfrmwindow_t *window, SIZE *sz)
                actionlist_delete(alist_mail);
        }
        cfrmwindow_resetgenv(window);
-       tadlib_calcdrawsize(window->post->message, window->post->message_len, gid, &sz_msg, &alist_message);
+       tadlib_calcdrawsize(message, message_len, gid, &sz_msg, &alist_message);
        if (alist_message != NULL) {
                actionlist_delete(alist_message);
        }

diff --git a/src/postres.c b/src/postres.c
index 74d453b..b82a170 100644 (file)
--- a/src/postres.c
+++ b/src/postres.c
@@ -39,6 +39,45 @@
 #include    "sjisstring.h"
 #include    "tadimf.h"
 
+struct postresdata_t_ {
+       TC *from;
+       W from_len;
+       TC *mail;
+       W mail_len;
+       TC *message;
+       W message_len;
+};
+
+EXPORT TC* postresdata_getfromstring(postresdata_t *post)
+{
+       return post->from;
+}
+
+EXPORT W postresdata_getfromstringlen(postresdata_t *post)
+{
+       return post->from_len;
+}
+
+EXPORT TC* postresdata_getmailstring(postresdata_t *post)
+{
+       return post->mail;
+}
+
+EXPORT W postresdata_getmailstringlen(postresdata_t *post)
+{
+       return post->mail_len;
+}
+
+EXPORT TC* postresdata_getmessagestring(postresdata_t *post)
+{
+       return post->message;
+}
+
+EXPORT W postresdata_getmessagestringlen(postresdata_t *post)
+{
+       return post->message_len;
+}
+
 LOCAL W postresdata_appendstring(TC **dest, W *dest_len, TC *str, W len)
 {
        *dest = realloc(*dest, sizeof(TC)*(*dest_len + len + 1));

diff --git a/src/postres.h b/src/postres.h
index c4188b0..b31c06e 100644 (file)
--- a/src/postres.h
+++ b/src/postres.h
@@ -1,7 +1,7 @@
 /*
  * postres.h
  *
- * Copyright (c) 2009 project bchan
+ * Copyright (c) 2009-2010 project bchan
  *
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -31,18 +31,16 @@
 #define __POSTRES_H__
 
 typedef struct postresdata_t_ postresdata_t;
-struct postresdata_t_ {
-       TC *from;
-       W from_len;
-       TC *mail;
-       W mail_len;
-       TC *message;
-       W message_len;
-};
 
 IMPORT postresdata_t* postresdata_new();
 IMPORT VOID postresdata_delete(postresdata_t *post);
 IMPORT W postresdata_readfile(postresdata_t *post, VLINK *vlnk);
 IMPORT W postresdata_genrequestbody(postresdata_t *post, UB *board, W board_len, UB *thread, W thread_len, STIME time, UB **body, W *body_len);
+IMPORT TC* postresdata_getfromstring(postresdata_t *post);
+IMPORT W postresdata_getfromstringlen(postresdata_t *post);
+IMPORT TC* postresdata_getmailstring(postresdata_t *post);
+IMPORT W postresdata_getmailstringlen(postresdata_t *post);
+IMPORT TC* postresdata_getmessagestring(postresdata_t *post);
+IMPORT W postresdata_getmessagestringlen(postresdata_t *post);
 
 #endif