2007-10-22 [wwp] 3.0.2cvs95

[claws.git] / src / quote_fmt_parse.y

diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 35afce7b4f004c015a13fe764d590bfa0cbca743..ebc349fa6290c2df2b5b32176d180e57baa5214f 100644 (file)
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -55,6 +55,7 @@ static gboolean dry_run = FALSE;
 static gint maxsize = 0;
 static gint stacksize = 0;
 static GHashTable *var_table = NULL;
+static GList *attachments = NULL;
 
 typedef struct st_buffer
 {
@@ -138,6 +139,11 @@ gchar *quote_fmt_get_buffer(void)
                return current->buffer;
 }
 
+GList *quote_fmt_get_attachments_list(void)
+{
+       return attachments;
+}
+
 gint quote_fmt_get_line(void)
 {
        return line;
@@ -166,6 +172,15 @@ void quote_fmt_reset_vartable(void)
                g_hash_table_destroy(var_table);
                var_table = NULL;
        }
+       if (attachments) {
+               GList *cur = attachments;
+               while (cur) {
+                       g_free(cur->data);
+                       cur = g_list_next(cur);
+               }
+               g_list_free(attachments);
+               attachments = NULL;
+       }
 }
 
 #ifdef USE_ASPELL
@@ -503,6 +518,11 @@ static void quote_fmt_insert_user_input(const gchar *varname)
        g_free(text);
 }
 
+static void quote_fmt_attach_file(const gchar *filename)
+{
+       attachments = g_list_append(attachments, g_strdup(filename));
+}
+
 static gchar *quote_fmt_complete_address(const gchar *addr)
 {
        gint count;
@@ -582,6 +602,7 @@ static gchar *quote_fmt_complete_address(const gchar *addr)
 %token QUERY_NOT_TO_FOUND_IN_ADDRESSBOOK
 /* other tokens */
 %token INSERT_FILE INSERT_PROGRAMOUTPUT INSERT_USERINPUT
+%token ATTACH_FILE
 %token OPARENT CPARENT
 %token CHARACTER
 %token SHOW_DATE_EXPR
@@ -613,7 +634,8 @@ character_or_special_or_insert_or_query:
        character_or_special
        | query
        | query_not
-       | insert ;
+       | insert
+       | attach ;
 
 character_or_special:
        special
@@ -634,7 +656,7 @@ string:
        }
        | string CHARACTER
        {
-               int len;
+               size_t len;
                
                strncpy($$, $1, sizeof($$));
                $$[sizeof($$) - 1] = '\0';
@@ -818,7 +840,10 @@ special:
        }
        | SET_CURSOR_POS
        {
-               cursor_pos = current->bufsize;
+               if (current->buffer)
+                       cursor_pos = g_utf8_strlen(current->buffer, -1);
+               else
+                       cursor_pos = 0;
        }
        | SHOW_ADDRESSBOOK_COMPLETION_FOR_CC
        {
@@ -1186,3 +1211,17 @@ insert:
                        quote_fmt_insert_user_input(sub_expr.buffer);
                }
        };
+
+attach:
+       ATTACH_FILE
+       {
+               current = &sub_expr;
+               clear_buffer();
+       }
+       OPARENT sub_expr CPARENT
+       {
+               current = &main_expr;
+               if (!dry_run) {
+                       quote_fmt_attach_file(sub_expr.buffer);
+               }
+       };