mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Ruby: some fixes, optimizations, support for selecting lines on grid...

Browse source 
Originally committed to SVN as r928.
This commit is contained in:
pomyk 2007-02-06 22:58:05 +00:00
parent 317fba2e1e
commit 507de4c4cd
6 changed files with 210 additions and 189 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
aegisub/auto4_ruby.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2006, 2007, Niels Martin Hansen // Copyright (c) 2007, Patryk Pomykalski
// All rights reserved. // All rights reserved.
// //
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
@ -30,7 +30,7 @@
// AEGISUB // AEGISUB
// //
// Website: http://aegisub.cellosoft.com // Website: http://aegisub.cellosoft.com
// Contact: mailto:jiifurusu@gmail.com // Contact: mailto:pomyk@go2.pl
// //
#include "auto4_ruby.h" #include "auto4_ruby.h"
@ -41,6 +41,10 @@
#include "ass_override.h" #include "ass_override.h"
#include "text_file_reader.h" #include "text_file_reader.h"
#include "options.h" #include "options.h"
#include "vfr.h"
#include "main.h"
#include "frame_main.h"
#include "subs_grid.h"
#include <ruby.h> #include <ruby.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wx/filename.h> #include <wx/filename.h>
@ -51,37 +55,10 @@
namespace Automation4 { namespace Automation4 {
// I'm not sure if this will work ?_?
RubyObjects *RubyObjects::inst = NULL; RubyObjects *RubyObjects::inst = NULL;
RubyScript * RubyScript::inst = NULL; // current Ruby Script RubyScript * RubyScript::inst = NULL; // current Ruby Script
RubyProgressSink* RubyProgressSink::inst = NULL; RubyProgressSink* RubyProgressSink::inst = NULL;
VALUE RubyScript::RubyAegisub = Qfalse; VALUE RubyScript::RubyAegisub = Qfalse;
// RubyAssFile *RubyAssFile::raf = NULL;
// RubyScriptReader
RubyScriptReader::RubyScriptReader(const wxString &filename)
{
#ifdef WIN32
f = _tfopen(filename.c_str(), _T("rb"));
#else
f = fopen(filename.fn_str(), "rb");
#endif
first = true;
databuf = new char[bufsize];
}
RubyScriptReader::~RubyScriptReader()
{
if (databuf)
delete databuf;
fclose(f);
}
/* const char* RubyScriptReader::reader_func( void *data, size_t *size)
{
return self->databuf;
}
*/
// RubyScript // RubyScript
@ -112,7 +89,10 @@ namespace Automation4 {
char **argv = 0; char **argv = 0;
NtInitialize(&argc, &argv); NtInitialize(&argc, &argv);
#endif #endif
char **opt = new char*[4];
opt[0] = "-d";
ruby_init(); ruby_init();
//ruby_options(1, opt);
ruby_init_loadpath(); ruby_init_loadpath();
RubyScript::inst = this; RubyScript::inst = this;
if(!RubyAegisub) { if(!RubyAegisub) {
@ -120,6 +100,8 @@ namespace Automation4 {
rb_define_module_function(RubyAegisub, "register_macro",reinterpret_cast<RB_HOOK>(&RubyFeatureMacro::RubyRegister), 4); rb_define_module_function(RubyAegisub, "register_macro",reinterpret_cast<RB_HOOK>(&RubyFeatureMacro::RubyRegister), 4);
rb_define_module_function(RubyAegisub, "register_filter",reinterpret_cast<RB_HOOK>(&RubyFeatureFilter::RubyRegister), 5); rb_define_module_function(RubyAegisub, "register_filter",reinterpret_cast<RB_HOOK>(&RubyFeatureFilter::RubyRegister), 5);
rb_define_module_function(RubyAegisub, "text_extents",reinterpret_cast<RB_HOOK>(&RubyTextExtents), 2); rb_define_module_function(RubyAegisub, "text_extents",reinterpret_cast<RB_HOOK>(&RubyTextExtents), 2);
rb_define_module_function(RubyAegisub, "frame_to_time",reinterpret_cast<RB_HOOK>(&RubyFrameToTime), 1);
rb_define_module_function(RubyAegisub, "time_to_frame",reinterpret_cast<RB_HOOK>(&RubyTimeToFrame), 1);
rb_define_module_function(RubyScript::RubyAegisub, "progress_set",reinterpret_cast<RB_HOOK>(&RubyProgressSink::RubySetProgress), 1); rb_define_module_function(RubyScript::RubyAegisub, "progress_set",reinterpret_cast<RB_HOOK>(&RubyProgressSink::RubySetProgress), 1);
rb_define_module_function(RubyScript::RubyAegisub, "progress_task",reinterpret_cast<RB_HOOK>(&RubyProgressSink::RubySetTask), 1); rb_define_module_function(RubyScript::RubyAegisub, "progress_task",reinterpret_cast<RB_HOOK>(&RubyProgressSink::RubySetTask), 1);
rb_define_module_function(RubyScript::RubyAegisub, "progress_title",reinterpret_cast<RB_HOOK>(&RubyProgressSink::RubySetTitle), 1); rb_define_module_function(RubyScript::RubyAegisub, "progress_title",reinterpret_cast<RB_HOOK>(&RubyProgressSink::RubySetTitle), 1);
@ -221,6 +203,23 @@ namespace Automation4 {
return result; return result;
} }
VALUE RubyScript::RubyFrameToTime(VALUE self, VALUE frame)
{
if(TYPE(frame) == T_FIXNUM && VFR_Output.IsLoaded())
{
return INT2FIX(VFR_Output.GetTimeAtFrame(FIX2INT(frame), true));
}
return Qnil;
}
VALUE RubyScript::RubyTimeToFrame(VALUE self, VALUE time)
{
if(TYPE(time) == T_FIXNUM && VFR_Output.IsLoaded())
{
return INT2FIX(VFR_Output.GetFrameAtTime(FIX2INT(time), true));
}
return Qnil;
}
// RubyFeature // RubyFeature
@ -328,15 +327,41 @@ namespace Automation4 {
wxThread::ExitCode code = call.Wait(); wxThread::ExitCode code = call.Wait();
delete RubyProgressSink::inst; delete RubyProgressSink::inst;
RubyProgressSink::inst = NULL; RubyProgressSink::inst = NULL;
if(code) /*if(code) // error reporting doesn't work in ruby 1.9
{ {
if(TYPE(result) == T_STRING) if(TYPE(result) == T_STRING)
throw StringValueCStr(result); throw StringValueCStr(result);
else throw "Unknown Error"; else throw "Error running macro";
} }
else if(TYPE(result) == T_ARRAY) else*/ if(TYPE(result) == T_ARRAY)
{ {
subsobj->RubyUpdateAssFile(result); bool end = false;
for(int i = 0; i < RARRAY(result)->len && !end; ++i)
{
VALUE p = RARRAY(result)->ptr[i]; // some magic in code below to allow variable output
if(TYPE(p) != T_ARRAY) {
p = result;
end = true;
}
switch(TYPE(RARRAY(p)->ptr[0])) {
case T_HASH: // array of hashes = subs
subsobj->RubyUpdateAssFile(p);
break;
case T_FIXNUM: // array of ints = selection
int num = RARRAY(p)->len;
std::vector<int> sel(num);
for(int i = 0; i < num; ++i) {
sel[i] = FIX2INT(RARRAY(p)->ptr[i]);
}
FrameMain *frame = AegisubApp::Get()->frame;
frame->SubsBox->LoadFromAss(AssFile::top, true, true);
frame->SubsBox->SetSelectionFromAbsolute(sel);
break;
}
}
} }
delete subsobj; delete subsobj;
} catch (const char* e) { } catch (const char* e) {
@ -413,9 +438,8 @@ namespace Automation4 {
cfg = config_dialog->RubyReadBack(); cfg = config_dialog->RubyReadBack();
// TODO, write back stored options here // TODO, write back stored options here
} }
// delete RubyProgressSink::inst; RubyProgressSink::inst = new RubyProgressSink(export_dialog, false);
// RubyProgressSink::inst = new RubyProgressSink(export_dialog, false); RubyProgressSink::inst->SetTitle(GetName());
// RubyProgressSink::inst->SetTitle(GetName());
RubyAssFile *subsobj = new RubyAssFile(subs, true/*modify*/, false/*undo*/); RubyAssFile *subsobj = new RubyAssFile(subs, true/*modify*/, false/*undo*/);
VALUE *argv = ALLOCA_N(VALUE, 2); VALUE *argv = ALLOCA_N(VALUE, 2);
@ -423,18 +447,18 @@ namespace Automation4 {
argv[1] = cfg; // config argv[1] = cfg; // config
RubyCallArguments arg(rb_mKernel, rb_to_id(filter_fun), 2, argv); RubyCallArguments arg(rb_mKernel, rb_to_id(filter_fun), 2, argv);
VALUE result; VALUE result;
delete RubyProgressSink::inst;
RubyProgressSink::inst = NULL;
RubyThreadedCall call(&arg, &result); RubyThreadedCall call(&arg, &result);
// RubyProgressSink::inst->ShowModal(); RubyProgressSink::inst->ShowModal();
RubyProgressSink::inst = NULL;
wxThread::ExitCode code = call.Wait(); wxThread::ExitCode code = call.Wait();
if(code) delete RubyProgressSink::inst;
/*if(code) // error reporting doesn't work in ruby 1.9
{ {
if(TYPE(result) == T_STRING) if(TYPE(result) == T_STRING)
throw StringValueCStr(result); throw StringValueCStr(result);
else throw "Unknown Error"; else throw "Unknown Error";
} }
else if(result != Qnil && result != Qfalse) else*/ if(TYPE(result) == T_ARRAY)
{ {
subsobj->RubyUpdateAssFile(result); subsobj->RubyUpdateAssFile(result);
} }
@ -482,8 +506,6 @@ namespace Automation4 {
RubyProgressSink::~RubyProgressSink() RubyProgressSink::~RubyProgressSink()
{ {
// remove progress reporting stuff
// TODO
} }
VALUE RubyProgressSink::RubySetProgress(VALUE self, VALUE progress) VALUE RubyProgressSink::RubySetProgress(VALUE self, VALUE progress)
@ -578,7 +600,7 @@ namespace Automation4 {
rb_gc_register_address(&objects); rb_gc_register_address(&objects);
} }
RubyObjects::~RubyObjects() RubyObjects::~RubyObjects()
{ {
rb_gc_unregister_address(&objects); rb_gc_unregister_address(&objects);
} }
@ -613,31 +635,8 @@ namespace Automation4 {
} }
VALUE rbExecWrapper(VALUE arg){return ruby_exec();} VALUE rbExecWrapper(VALUE arg){return ruby_exec();}
VALUE rbLoadWrapper(VALUE arg){rb_load(arg, 0); return Qtrue;} VALUE rbLoadWrapper(VALUE arg){rb_load(arg, 0); return Qtrue;}
VALUE rbGcWrapper(VALUE arg){rb_gc_start(); return Qtrue;}
VALUE rbAss2RbWrapper(VALUE arg){return RubyAssFile::AssEntryToRuby(reinterpret_cast<AssEntry*>(arg));} VALUE rbAss2RbWrapper(VALUE arg){return RubyAssFile::AssEntryToRuby(reinterpret_cast<AssEntry*>(arg));}
VALUE rb2AssWrapper(VALUE arg){return reinterpret_cast<VALUE>(RubyAssFile::RubyToAssEntry(arg));} VALUE rb2AssWrapper(VALUE arg){return reinterpret_cast<VALUE>(RubyAssFile::RubyToAssEntry(arg));}
VALUE rbFunCall(VALUE recv, ID id, int n, ...)
{
VALUE *argv = 0;
if (n > 0) {
argv = ALLOCA_N(VALUE, n);
va_list ar;
va_start(ar, n);
int i;
for(i=0;i<n;i++) {
argv[i] = va_arg(ar, VALUE);
}
va_end(ar);
}
RubyCallArguments arg(recv, id, n, argv);
int error = 0;
VALUE result;
result = rb_protect(rbCallWrapper, reinterpret_cast<VALUE>(&arg), &error);
if(error) {
VALUE err = rb_errinfo();
throw StringValueCStr(err);
}
return result;
}
}; };

21
aegisub/auto4_ruby.h
View file

@ -1,4 +1,4 @@
// Copyright (c) 2006, Niels Martin Hansen // Copyright (c) 2007, Patryk Pomykalski
// All rights reserved. // All rights reserved.
// //
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
@ -30,7 +30,7 @@
// AEGISUB // AEGISUB
// //
// Website: http://aegisub.cellosoft.com // Website: http://aegisub.cellosoft.com
// Contact: mailto:jiifurusu@gmail.com // Contact: mailto:pomyk@go2.pl
// //
#pragma once #pragma once
@ -48,17 +48,6 @@ class wxWindow;
namespace Automation4 { namespace Automation4 {
// Manage reading in a Ruby script file
struct RubyScriptReader {
FILE *f;
bool first;
char *databuf;
static const size_t bufsize = 512;
RubyScriptReader(const wxString &filename);
~RubyScriptReader();
// static const char* reader_func( void *data, size_t *size);
};
// Provides access to an AssFile object (and all lines contained) for a Ruby script // Provides access to an AssFile object (and all lines contained) for a Ruby script
class RubyAssFile { class RubyAssFile {
private: private:
@ -70,7 +59,6 @@ namespace Automation4 {
// keep a cursor of last accessed item to avoid walking over the entire file on every access // keep a cursor of last accessed item to avoid walking over the entire file on every access
std::list<AssEntry*>::iterator last_entry_ptr; std::list<AssEntry*>::iterator last_entry_ptr;
int last_entry_id; int last_entry_id;
void GetAssEntry(int n); // set last_entry_ptr to point to item n
static int RubyParseTagData(); static int RubyParseTagData();
static int RubyUnparseTagData(); static int RubyUnparseTagData();
@ -175,6 +163,8 @@ namespace Automation4 {
static RubyScript* GetScriptObject(); static RubyScript* GetScriptObject();
static RubyScript* inst; static RubyScript* inst;
static VALUE RubyTextExtents(VALUE self, VALUE style, VALUE text); static VALUE RubyTextExtents(VALUE self, VALUE style, VALUE text);
static VALUE RubyFrameToTime(VALUE self, VALUE frame);
static VALUE RubyTimeToFrame(VALUE self, VALUE time);
static int RubyInclude(); static int RubyInclude();
public: public:
@ -260,9 +250,10 @@ namespace Automation4 {
VALUE rbCallWrapper(VALUE arg); VALUE rbCallWrapper(VALUE arg);
VALUE rbExecWrapper(VALUE arg); VALUE rbExecWrapper(VALUE arg);
VALUE rbLoadWrapper(VALUE arg); VALUE rbLoadWrapper(VALUE arg);
VALUE rbFunCall(VALUE recv, ID id, int n, ...); VALUE rbGcWrapper(VALUE arg);
VALUE rbAss2RbWrapper(VALUE arg); VALUE rbAss2RbWrapper(VALUE arg);
VALUE rb2AssWrapper(VALUE arg); VALUE rb2AssWrapper(VALUE arg);
VALUE rbError(VALUE arg);
typedef VALUE (*RB_HOOK)(...); typedef VALUE (*RB_HOOK)(...);
typedef VALUE (*RB_HOOK2)(VALUE); typedef VALUE (*RB_HOOK2)(VALUE);

204
aegisub/auto4_ruby_assfile.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2006, Niels Martin Hansen // Copyright (c) 2007, Patryk Pomykalski
// All rights reserved. // All rights reserved.
// //
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
@ -30,7 +30,7 @@
// AEGISUB // AEGISUB
// //
// Website: http://aegisub.cellosoft.com // Website: http://aegisub.cellosoft.com
// Contact: mailto:jiifurusu@gmail.com // Contact: mailto:pomyk@go2.pl
// //
#include "auto4_ruby.h" #include "auto4_ruby.h"
@ -53,118 +53,119 @@ namespace Automation4 {
ass_entry = rb_hash_new(); ass_entry = rb_hash_new();
wxString section(e->group); wxString section(e->group);
rb_hash_aset(ass_entry, rb_str_new2("section"), rb_str_new2(e->group.mb_str(wxConvUTF8))); rb_hash_aset(ass_entry, rb_str_new("section", 7), rb_str_new2(e->group.mb_str(wxConvUTF8)));
wxString raw(e->GetEntryData()); wxString raw(e->GetEntryData());
rb_hash_aset(ass_entry, rb_str_new2("raw"), rb_str_new2(e->GetEntryData().mb_str(wxConvUTF8))); if(!raw.IsEmpty())
rb_hash_aset(ass_entry, rb_str_new("raw", 3), rb_str_new2(e->GetEntryData().mb_str(wxConvUTF8)));
VALUE entry_class; VALUE entry_class;
if (raw.Trim().IsEmpty()) { if (raw.Trim().IsEmpty()) {
entry_class = rb_str_new2("clear"); entry_class = rb_str_new("clear", 5);
} else if (raw[0] == _T(';')) { } else if (raw[0] == _T(';')) {
// "text" field, same as "raw" but with semicolon stripped // "text" field, same as "raw" but with semicolon stripped
wxString text(raw, 1, raw.size()-1); wxString text(raw, 1, raw.size()-1);
rb_hash_aset(ass_entry, rb_str_new2("text"), rb_str_new2(text.mb_str(wxConvUTF8))); rb_hash_aset(ass_entry, rb_str_new("text", 4), rb_str_new2(text.mb_str(wxConvUTF8)));
entry_class = rb_str_new2("comment"); entry_class = rb_str_new("comment", 7);
} else if (raw[0] == _T('[')) { } else if (raw[0] == _T('[')) {
entry_class = rb_str_new2("head"); entry_class = rb_str_new("head", 4);
} else if (section.Lower() == _T("[script info]")) { } else if (section.Lower() == _T("[script info]")) {
// assumed "info" class // assumed "info" class
// first "key" // first "key"
wxString key = raw.BeforeFirst(_T(':')); wxString key = raw.BeforeFirst(_T(':'));
rb_hash_aset(ass_entry, rb_str_new2("key"), rb_str_new2(key.mb_str(wxConvUTF8))); rb_hash_aset(ass_entry, rb_str_new("key", 3), rb_str_new2(key.mb_str(wxConvUTF8)));
// then "value" // then "value"
wxString value = raw.AfterFirst(_T(':')); wxString value = raw.AfterFirst(_T(':'));
rb_hash_aset(ass_entry, rb_str_new2("value"), rb_str_new2(value.mb_str(wxConvUTF8))); rb_hash_aset(ass_entry, rb_str_new("value", 5), rb_str_new2(value.mb_str(wxConvUTF8)));
entry_class = rb_str_new2("info"); entry_class = rb_str_new("info", 4);
} else if (raw.Left(7).Lower() == _T("format:")) { } else if (raw.Left(7).Lower() == _T("format:")) {
// TODO: parse the format line; just use a tokenizer // TODO: parse the format line; just use a tokenizer
entry_class = rb_str_new2("format"); entry_class = rb_str_new("format", 6);
} else if (e->GetType() == ENTRY_DIALOGUE) { } else if (e->GetType() == ENTRY_DIALOGUE) {
AssDialogue *dia = e->GetAsDialogue(e); AssDialogue *dia = e->GetAsDialogue(e);
rb_hash_aset(ass_entry, rb_str_new2("comment"), dia->Comment ? Qtrue : Qfalse); rb_hash_aset(ass_entry, rb_str_new("comment", 7), dia->Comment ? Qtrue : Qfalse);
rb_hash_aset(ass_entry, rb_str_new2("layer"), rb_int2inum(dia->Layer)); rb_hash_aset(ass_entry, rb_str_new("layer", 5), rb_int2inum(dia->Layer));
rb_hash_aset(ass_entry, rb_str_new2("start_time"), rb_int2inum(dia->Start.GetMS())); rb_hash_aset(ass_entry, rb_str_new("start_time", 10), rb_int2inum(dia->Start.GetMS()));
rb_hash_aset(ass_entry, rb_str_new2("end_time"), rb_int2inum(dia->End.GetMS())); rb_hash_aset(ass_entry, rb_str_new("end_time", 8), rb_int2inum(dia->End.GetMS()));
rb_hash_aset(ass_entry, rb_str_new2("style"), rb_str_new2(dia->Style.mb_str(wxConvUTF8))); rb_hash_aset(ass_entry, rb_str_new("style", 5), rb_str_new2(dia->Style.mb_str(wxConvUTF8)));
rb_hash_aset(ass_entry, rb_str_new2("actor"), rb_str_new2(dia->Actor.mb_str(wxConvUTF8))); rb_hash_aset(ass_entry, rb_str_new("actor", 5), rb_str_new2(dia->Actor.mb_str(wxConvUTF8)));
rb_hash_aset(ass_entry, rb_str_new2("margin_l"), rb_int2inum(dia->Margin[0])); rb_hash_aset(ass_entry, rb_str_new("margin_l", 8), rb_int2inum(dia->Margin[0]));
rb_hash_aset(ass_entry, rb_str_new2("margin_r"), rb_int2inum(dia->Margin[1])); rb_hash_aset(ass_entry, rb_str_new("margin_r", 8), rb_int2inum(dia->Margin[1]));
rb_hash_aset(ass_entry, rb_str_new2("margin_t"), rb_int2inum(dia->Margin[2])); rb_hash_aset(ass_entry, rb_str_new("margin_t", 8), rb_int2inum(dia->Margin[2]));
rb_hash_aset(ass_entry, rb_str_new2("margin_b"), rb_int2inum(dia->Margin[3])); rb_hash_aset(ass_entry, rb_str_new("margin_b", 8), rb_int2inum(dia->Margin[3]));
rb_hash_aset(ass_entry, rb_str_new2("effect"), rb_str_new2(dia->Effect.mb_str(wxConvUTF8))); rb_hash_aset(ass_entry, rb_str_new("effect", 6), rb_str_new2(dia->Effect.mb_str(wxConvUTF8)));
rb_hash_aset(ass_entry, rb_str_new2("userdata"), rb_str_new2("")); // rb_hash_aset(ass_entry, rb_str_new("userdata", 8), rb_str_new(""));
rb_hash_aset(ass_entry, rb_str_new2("text"), rb_str_new2(dia->Text.mb_str(wxConvUTF8))); rb_hash_aset(ass_entry, rb_str_new("text", 4), rb_str_new2(dia->Text.mb_str(wxConvUTF8)));
entry_class = rb_str_new2("dialogue"); entry_class = rb_str_new("dialogue", 8);
} else if (e->GetType() == ENTRY_STYLE) { } else if (e->GetType() == ENTRY_STYLE) {
AssStyle *sty = e->GetAsStyle(e); AssStyle *sty = e->GetAsStyle(e);
rb_hash_aset(ass_entry, rb_str_new2("name"), rb_str_new2(sty->name.mb_str(wxConvUTF8))); rb_hash_aset(ass_entry, rb_str_new("name", 4), rb_str_new2(sty->name.mb_str(wxConvUTF8)));
rb_hash_aset(ass_entry, rb_str_new2("fontname"), rb_str_new2(sty->font.mb_str(wxConvUTF8))); rb_hash_aset(ass_entry, rb_str_new("fontname", 8), rb_str_new2(sty->font.mb_str(wxConvUTF8)));
rb_hash_aset(ass_entry, rb_str_new2("fontsize"), rb_int2inum(sty->fontsize)); rb_hash_aset(ass_entry, rb_str_new("fontsize", 8), rb_int2inum(sty->fontsize));
rb_hash_aset(ass_entry, rb_str_new2("color1"), rb_str_new2(sty->primary.GetASSFormatted(true).mb_str(wxConvUTF8))); rb_hash_aset(ass_entry, rb_str_new("color1", 6), rb_str_new2(sty->primary.GetASSFormatted(true).mb_str(wxConvUTF8)));
rb_hash_aset(ass_entry, rb_str_new2("color2"), rb_str_new2(sty->secondary.GetASSFormatted(true).mb_str(wxConvUTF8))); rb_hash_aset(ass_entry, rb_str_new("color2", 6), rb_str_new2(sty->secondary.GetASSFormatted(true).mb_str(wxConvUTF8)));
rb_hash_aset(ass_entry, rb_str_new2("color3"), rb_str_new2(sty->outline.GetASSFormatted(true).mb_str(wxConvUTF8))); rb_hash_aset(ass_entry, rb_str_new("color3", 6), rb_str_new2(sty->outline.GetASSFormatted(true).mb_str(wxConvUTF8)));
rb_hash_aset(ass_entry, rb_str_new2("color4"), rb_str_new2(sty->shadow.GetASSFormatted(true).mb_str(wxConvUTF8))); rb_hash_aset(ass_entry, rb_str_new("color4", 6), rb_str_new2(sty->shadow.GetASSFormatted(true).mb_str(wxConvUTF8)));
rb_hash_aset(ass_entry, rb_str_new2("bold"), rb_int2inum(sty->bold)); rb_hash_aset(ass_entry, rb_str_new("bold", 4), rb_int2inum(sty->bold));
rb_hash_aset(ass_entry, rb_str_new2("italic"), rb_int2inum(sty->italic)); rb_hash_aset(ass_entry, rb_str_new("italic", 6), rb_int2inum(sty->italic));
rb_hash_aset(ass_entry, rb_str_new2("underline"), rb_int2inum(sty->underline)); rb_hash_aset(ass_entry, rb_str_new("underline", 9), rb_int2inum(sty->underline));
rb_hash_aset(ass_entry, rb_str_new2("strikeout"), rb_int2inum(sty->strikeout)); rb_hash_aset(ass_entry, rb_str_new("strikeout", 9), rb_int2inum(sty->strikeout));
rb_hash_aset(ass_entry, rb_str_new2("scale_x"), rb_int2inum(sty->scalex)); rb_hash_aset(ass_entry, rb_str_new("scale_x", 7), rb_int2inum(sty->scalex));
rb_hash_aset(ass_entry, rb_str_new2("scale_y"), rb_int2inum(sty->scaley)); rb_hash_aset(ass_entry, rb_str_new("scale_y", 7), rb_int2inum(sty->scaley));
rb_hash_aset(ass_entry, rb_str_new2("spacing"), rb_int2inum(sty->spacing)); rb_hash_aset(ass_entry, rb_str_new("spacing", 7), rb_int2inum(sty->spacing));
rb_hash_aset(ass_entry, rb_str_new2("angle"), rb_int2inum(sty->angle)); rb_hash_aset(ass_entry, rb_str_new("angle", 5), rb_int2inum(sty->angle));
rb_hash_aset(ass_entry, rb_str_new2("borderstyle"), rb_int2inum(sty->borderstyle)); rb_hash_aset(ass_entry, rb_str_new("borderstyle", 11), rb_int2inum(sty->borderstyle));
rb_hash_aset(ass_entry, rb_str_new2("outline"), rb_int2inum(sty->outline_w)); rb_hash_aset(ass_entry, rb_str_new("outline", 7), rb_int2inum(sty->outline_w));
rb_hash_aset(ass_entry, rb_str_new2("shadow"), rb_int2inum(sty->shadow_w)); rb_hash_aset(ass_entry, rb_str_new("shadow", 6), rb_int2inum(sty->shadow_w));
rb_hash_aset(ass_entry, rb_str_new2("align"), rb_int2inum(sty->alignment)); rb_hash_aset(ass_entry, rb_str_new("align", 5), rb_int2inum(sty->alignment));
rb_hash_aset(ass_entry, rb_str_new2("margin_l"), rb_int2inum(sty->Margin[0])); rb_hash_aset(ass_entry, rb_str_new("margin_l", 8), rb_int2inum(sty->Margin[0]));
rb_hash_aset(ass_entry, rb_str_new2("margin_r"), rb_int2inum(sty->Margin[1])); rb_hash_aset(ass_entry, rb_str_new("margin_r", 8), rb_int2inum(sty->Margin[1]));
rb_hash_aset(ass_entry, rb_str_new2("margin_t"), rb_int2inum(sty->Margin[2])); rb_hash_aset(ass_entry, rb_str_new("margin_t", 8), rb_int2inum(sty->Margin[2]));
rb_hash_aset(ass_entry, rb_str_new2("margin_b"), rb_int2inum(sty->Margin[3])); rb_hash_aset(ass_entry, rb_str_new("margin_b", 8), rb_int2inum(sty->Margin[3]));
rb_hash_aset(ass_entry, rb_str_new2("encoding"), rb_int2inum(sty->encoding)); rb_hash_aset(ass_entry, rb_str_new("encoding", 8), rb_int2inum(sty->encoding));
// From STS.h: "0: window, 1: video, 2: undefined (~window)" // From STS.h: "0: window, 1: video, 2: undefined (~window)"
rb_hash_aset(ass_entry, rb_str_new2("relative_to"), rb_int2inum(2)); rb_hash_aset(ass_entry, rb_str_new("relative_to", 11), rb_int2inum(2));
rb_hash_aset(ass_entry, rb_str_new2("vertical"), Qfalse); rb_hash_aset(ass_entry, rb_str_new("vertical", 8), Qfalse);
entry_class = rb_str_new2("style"); entry_class = rb_str_new("style", 5);
} else { } else {
entry_class = rb_str_new2("unknown"); entry_class = rb_str_new("unknown", 7);
} }
// store class of item; last thing done for each class specific code must be pushing the class name // store class of item; last thing done for each class specific code must be pushing the class name
rb_hash_aset(ass_entry, rb_str_new2("class"), entry_class); rb_hash_aset(ass_entry, rb_str_new("class", 5), entry_class);
return ass_entry; return ass_entry;
} }
AssEntry *RubyAssFile::RubyToAssEntry(VALUE ass_entry) AssEntry *RubyAssFile::RubyToAssEntry(VALUE ass_entry)
{ {
VALUE entry_class = rb_hash_aref(ass_entry, rb_str_new2("class")); VALUE entry_class = rb_hash_aref(ass_entry, rb_str_new("class", 5));
wxString lclass(StringValueCStr(entry_class), wxConvUTF8); wxString lclass(StringValueCStr(entry_class), wxConvUTF8);
lclass.MakeLower(); lclass.MakeLower();
VALUE _section = rb_hash_aref(ass_entry, rb_str_new2("section")); VALUE _section = rb_hash_aref(ass_entry, rb_str_new("section", 7));
wxString section(StringValueCStr(_section), wxConvUTF8); wxString section(StringValueCStr(_section), wxConvUTF8);
AssEntry *result; AssEntry *result;
@ -174,7 +175,7 @@ namespace Automation4 {
} else if (lclass == _T("comment")) { } else if (lclass == _T("comment")) {
// GETSTRING(raw, "text", "comment") // GETSTRING(raw, "text", "comment")
VALUE _text = rb_hash_aref(ass_entry, rb_str_new2("text")); VALUE _text = rb_hash_aref(ass_entry, rb_str_new("text", 4));
wxString raw(StringValueCStr(_text), wxConvUTF8); wxString raw(StringValueCStr(_text), wxConvUTF8);
raw.Prepend(_T(";")); raw.Prepend(_T(";"));
result = new AssEntry(raw); result = new AssEntry(raw);
@ -185,9 +186,9 @@ namespace Automation4 {
result->group = section; result->group = section;
} else if (lclass == _T("info")) { } else if (lclass == _T("info")) {
VALUE _key = rb_hash_aref(ass_entry, rb_str_new2("key")); VALUE _key = rb_hash_aref(ass_entry, rb_str_new("key", 3));
wxString key(StringValueCStr(_key), wxConvUTF8); wxString key(StringValueCStr(_key), wxConvUTF8);
VALUE _value = rb_hash_aref(ass_entry, rb_str_new2("value")); VALUE _value = rb_hash_aref(ass_entry, rb_str_new("value", 5));
wxString value(StringValueCStr(_value), wxConvUTF8); wxString value(StringValueCStr(_value), wxConvUTF8);
result = new AssEntry(wxString::Format(_T("%s: %s"), key.c_str(), value.c_str())); result = new AssEntry(wxString::Format(_T("%s: %s"), key.c_str(), value.c_str()));
result->group = _T("[Script Info]"); // just so it can be read correctly back result->group = _T("[Script Info]"); // just so it can be read correctly back
@ -199,53 +200,53 @@ namespace Automation4 {
result->group = section; result->group = section;
} else if (lclass == _T("style")) { } else if (lclass == _T("style")) {
VALUE _name = rb_hash_aref(ass_entry, rb_str_new2("name")); VALUE _name = rb_hash_aref(ass_entry, rb_str_new("name", 4));
wxString name(StringValueCStr(_name), wxConvUTF8); wxString name(StringValueCStr(_name), wxConvUTF8);
VALUE _fontname = rb_hash_aref(ass_entry, rb_str_new2("fontname")); VALUE _fontname = rb_hash_aref(ass_entry, rb_str_new("fontname", 8));
wxString fontname(StringValueCStr(_fontname), wxConvUTF8); wxString fontname(StringValueCStr(_fontname), wxConvUTF8);
VALUE _fontsize = rb_hash_aref(ass_entry, rb_str_new2("fontsize")); VALUE _fontsize = rb_hash_aref(ass_entry, rb_str_new("fontsize", 8));
float fontsize = rb_num2dbl(_fontsize); float fontsize = rb_num2dbl(_fontsize);
VALUE _color1 = rb_hash_aref(ass_entry, rb_str_new2("color1")); VALUE _color1 = rb_hash_aref(ass_entry, rb_str_new("color1", 6));
wxString color1(StringValueCStr(_color1), wxConvUTF8); wxString color1(StringValueCStr(_color1), wxConvUTF8);
VALUE _color2 = rb_hash_aref(ass_entry, rb_str_new2("color2")); VALUE _color2 = rb_hash_aref(ass_entry, rb_str_new("color2", 6));
wxString color2(StringValueCStr(_color2), wxConvUTF8); wxString color2(StringValueCStr(_color2), wxConvUTF8);
VALUE _color3 = rb_hash_aref(ass_entry, rb_str_new2("color3")); VALUE _color3 = rb_hash_aref(ass_entry, rb_str_new("color3", 6));
wxString color3(StringValueCStr(_color3), wxConvUTF8); wxString color3(StringValueCStr(_color3), wxConvUTF8);
VALUE _color4 = rb_hash_aref(ass_entry, rb_str_new2("color4")); VALUE _color4 = rb_hash_aref(ass_entry, rb_str_new("color4", 6));
wxString color4(StringValueCStr(_color4), wxConvUTF8); wxString color4(StringValueCStr(_color4), wxConvUTF8);
VALUE _bold = rb_hash_aref(ass_entry, rb_str_new2("bold")); VALUE _bold = rb_hash_aref(ass_entry, rb_str_new("bold", 4));
bool bold = (bool)rb_num2long(_bold); bool bold = (bool)rb_num2long(_bold);
VALUE _italic = rb_hash_aref(ass_entry, rb_str_new2("italic")); VALUE _italic = rb_hash_aref(ass_entry, rb_str_new("italic", 6));
bool italic = (bool)rb_num2long(_italic); bool italic = (bool)rb_num2long(_italic);
VALUE _underline = rb_hash_aref(ass_entry, rb_str_new2("underline")); VALUE _underline = rb_hash_aref(ass_entry, rb_str_new("underline", 9));
bool underline = (bool)rb_num2long(_underline); bool underline = (bool)rb_num2long(_underline);
VALUE _strikeout = rb_hash_aref(ass_entry, rb_str_new2("strikeout")); VALUE _strikeout = rb_hash_aref(ass_entry, rb_str_new("strikeout", 9));
bool strikeout = (bool)rb_num2long(_strikeout); bool strikeout = (bool)rb_num2long(_strikeout);
VALUE _scale_x = rb_hash_aref(ass_entry, rb_str_new2("scale_x")); VALUE _scale_x = rb_hash_aref(ass_entry, rb_str_new("scale_x", 7));
float scale_x = rb_num2dbl(_scale_x); float scale_x = rb_num2dbl(_scale_x);
VALUE _scale_y = rb_hash_aref(ass_entry, rb_str_new2("scale_y")); VALUE _scale_y = rb_hash_aref(ass_entry, rb_str_new("scale_y", 7));
float scale_y = rb_num2dbl(_scale_y); float scale_y = rb_num2dbl(_scale_y);
VALUE _spacing = rb_hash_aref(ass_entry, rb_str_new2("spacing")); VALUE _spacing = rb_hash_aref(ass_entry, rb_str_new("spacing", 7));
int spacing = rb_num2long(_spacing); int spacing = rb_num2long(_spacing);
VALUE _angle = rb_hash_aref(ass_entry, rb_str_new2("angle")); VALUE _angle = rb_hash_aref(ass_entry, rb_str_new("angle", 5));
float angle = rb_num2dbl(_angle); float angle = rb_num2dbl(_angle);
VALUE _borderstyle = rb_hash_aref(ass_entry, rb_str_new2("borderstyle")); VALUE _borderstyle = rb_hash_aref(ass_entry, rb_str_new("borderstyle", 11));
int borderstyle = rb_num2long(_borderstyle); int borderstyle = rb_num2long(_borderstyle);
VALUE _outline = rb_hash_aref(ass_entry, rb_str_new2("outline")); VALUE _outline = rb_hash_aref(ass_entry, rb_str_new("outline", 7));
float outline = rb_num2dbl(_outline); float outline = rb_num2dbl(_outline);
VALUE _shadow = rb_hash_aref(ass_entry, rb_str_new2("shadow")); VALUE _shadow = rb_hash_aref(ass_entry, rb_str_new("shadow", 6));
float shadow = rb_num2dbl(_shadow); float shadow = rb_num2dbl(_shadow);
VALUE _align = rb_hash_aref(ass_entry, rb_str_new2("align")); VALUE _align = rb_hash_aref(ass_entry, rb_str_new("align", 5));
int align = rb_num2long(_align); int align = rb_num2long(_align);
VALUE _margin_l = rb_hash_aref(ass_entry, rb_str_new2("margin_l")); VALUE _margin_l = rb_hash_aref(ass_entry, rb_str_new("margin_l", 8));
int margin_l = rb_num2long(_margin_l); int margin_l = rb_num2long(_margin_l);
VALUE _margin_r = rb_hash_aref(ass_entry, rb_str_new2("margin_r")); VALUE _margin_r = rb_hash_aref(ass_entry, rb_str_new("margin_r", 8));
int margin_r = rb_num2long(_margin_r); int margin_r = rb_num2long(_margin_r);
VALUE _margin_t = rb_hash_aref(ass_entry, rb_str_new2("margin_t")); VALUE _margin_t = rb_hash_aref(ass_entry, rb_str_new("margin_t", 8));
int margin_t = rb_num2long(_margin_t); int margin_t = rb_num2long(_margin_t);
VALUE _margin_b = rb_hash_aref(ass_entry, rb_str_new2("margin_b")); VALUE _margin_b = rb_hash_aref(ass_entry, rb_str_new("margin_b", 8));
int margin_b = rb_num2long(_margin_b); int margin_b = rb_num2long(_margin_b);
VALUE _encoding = rb_hash_aref(ass_entry, rb_str_new2("encoding")); VALUE _encoding = rb_hash_aref(ass_entry, rb_str_new("encoding", 8));
int encoding = rb_num2long(_encoding); int encoding = rb_num2long(_encoding);
// leaving out relative_to and vertical // leaving out relative_to and vertical
@ -282,29 +283,29 @@ namespace Automation4 {
return 0; return 0;
} else if (lclass == _T("dialogue")) { } else if (lclass == _T("dialogue")) {
VALUE _comment = rb_hash_aref(ass_entry, rb_str_new2("comment")); VALUE _comment = rb_hash_aref(ass_entry, rb_str_new("comment", 7));
bool comment = _comment == Qfalse ? false : true; bool comment = _comment == Qfalse ? false : true;
VALUE _layer = rb_hash_aref(ass_entry, rb_str_new2("layer")); VALUE _layer = rb_hash_aref(ass_entry, rb_str_new("layer", 5));
int layer = rb_num2long(_layer); int layer = rb_num2long(_layer);
VALUE _start_time = rb_hash_aref(ass_entry, rb_str_new2("start_time")); VALUE _start_time = rb_hash_aref(ass_entry, rb_str_new("start_time", 10));
int start_time = rb_num2long(_start_time); int start_time = rb_num2long(_start_time);
VALUE _end_time = rb_hash_aref(ass_entry, rb_str_new2("end_time")); VALUE _end_time = rb_hash_aref(ass_entry, rb_str_new("end_time", 8));
int end_time = rb_num2long(_end_time); int end_time = rb_num2long(_end_time);
VALUE _style = rb_hash_aref(ass_entry, rb_str_new2("style")); VALUE _style = rb_hash_aref(ass_entry, rb_str_new("style", 5));
wxString style(StringValueCStr(_style), wxConvUTF8); wxString style(StringValueCStr(_style), wxConvUTF8);
VALUE _actor = rb_hash_aref(ass_entry, rb_str_new2("actor")); VALUE _actor = rb_hash_aref(ass_entry, rb_str_new("actor", 5));
wxString actor(StringValueCStr(_actor), wxConvUTF8); wxString actor(StringValueCStr(_actor), wxConvUTF8);
VALUE _margin_l = rb_hash_aref(ass_entry, rb_str_new2("margin_l")); VALUE _margin_l = rb_hash_aref(ass_entry, rb_str_new("margin_l", 8));
int margin_l = rb_num2long(_margin_l); int margin_l = rb_num2long(_margin_l);
VALUE _margin_r = rb_hash_aref(ass_entry, rb_str_new2("margin_r")); VALUE _margin_r = rb_hash_aref(ass_entry, rb_str_new("margin_r", 8));
int margin_r = rb_num2long(_margin_r); int margin_r = rb_num2long(_margin_r);
VALUE _margin_t = rb_hash_aref(ass_entry, rb_str_new2("margin_t")); VALUE _margin_t = rb_hash_aref(ass_entry, rb_str_new("margin_t", 8));
int margin_t = rb_num2long(_margin_t); int margin_t = rb_num2long(_margin_t);
VALUE _margin_b = rb_hash_aref(ass_entry, rb_str_new2("margin_b")); VALUE _margin_b = rb_hash_aref(ass_entry, rb_str_new("margin_b", 8));
int margin_b = rb_num2long(_margin_b); int margin_b = rb_num2long(_margin_b);
VALUE _effect = rb_hash_aref(ass_entry, rb_str_new2("effect")); VALUE _effect = rb_hash_aref(ass_entry, rb_str_new("effect", 6));
wxString effect(StringValueCStr(_effect), wxConvUTF8); wxString effect(StringValueCStr(_effect), wxConvUTF8);
VALUE _text = rb_hash_aref(ass_entry, rb_str_new2("text")); VALUE _text = rb_hash_aref(ass_entry, rb_str_new("text", 4));
wxString text(StringValueCStr(_text), wxConvUTF8); wxString text(StringValueCStr(_text), wxConvUTF8);
//GETSTRING(userdata, "userdata", "dialogue") //GETSTRING(userdata, "userdata", "dialogue")
@ -337,7 +338,6 @@ namespace Automation4 {
// If the first line is dialogue we leave header from the original (styles, info, etc) // If the first line is dialogue we leave header from the original (styles, info, etc)
void RubyAssFile::RubyUpdateAssFile(VALUE subtitles) void RubyAssFile::RubyUpdateAssFile(VALUE subtitles)
{ {
//RubyObjects::Get()->Register(subtitles);
int size = RARRAY(subtitles)->len; int size = RARRAY(subtitles)->len;
if(size <= 0) return; // empty - leave the original if(size <= 0) return; // empty - leave the original
@ -378,7 +378,7 @@ namespace Automation4 {
rb_set_errinfo(Qnil); rb_set_errinfo(Qnil);
} }
} }
//RubyObjects::Get()->Unregister(subtitles); AssFile::top->FlagAsModified(_T(""));
} }
int RubyAssFile::RubyParseTagData() int RubyAssFile::RubyParseTagData()
@ -401,6 +401,13 @@ namespace Automation4 {
RubyAssFile::~RubyAssFile() RubyAssFile::~RubyAssFile()
{ {
RubyObjects::Get()->Unregister(rbAssFile);
int status;
rb_protect(rbGcWrapper, Qnil, &status); // run the gc
if(status != 0)
{
wxMessageBox(_T("Error"), _T("Error while running Ruby garbage collection"));
}
} }
RubyAssFile::RubyAssFile(AssFile *_ass, bool _can_modify, bool _can_set_undo) RubyAssFile::RubyAssFile(AssFile *_ass, bool _can_modify, bool _can_set_undo)
@ -410,6 +417,7 @@ namespace Automation4 {
{ {
rbAssFile = rb_ary_new2(ass->Line.size()); rbAssFile = rb_ary_new2(ass->Line.size());
RubyObjects::Get()->Register(rbAssFile);
std::list<AssEntry*>::iterator entry; std::list<AssEntry*>::iterator entry;
int status; int status;

18
aegisub/auto4_ruby_dialog.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) 2006, 2007, Niels Martin Hansen // Copyright (c) 2006, 2007, Niels Martin Hansen, Patryk Pomykalski
// All rights reserved. // All rights reserved.
// //
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
@ -30,7 +30,7 @@
// AEGISUB // AEGISUB
// //
// Website: http://aegisub.cellosoft.com // Website: http://aegisub.cellosoft.com
// Contact: mailto:jiifurusu@gmail.com // Contact: mailto:pomyk@go2.pl
// //
#include "auto4_ruby.h" #include "auto4_ruby.h"
@ -157,6 +157,7 @@ namespace Automation4 {
VALUE RubyReadBack() VALUE RubyReadBack()
{ {
// if(text.IsEmpty()) return rb_str_new("", 0);
return rb_str_new2(text.mb_str(wxConvUTF8)); return rb_str_new2(text.mb_str(wxConvUTF8));
} }
@ -367,7 +368,9 @@ namespace Automation4 {
wxControl *Create(wxWindow *parent) wxControl *Create(wxWindow *parent)
{ {
return cw = new wxCheckBox(parent, -1, label); cw = new wxCheckBox(parent, -1, label);
((wxCheckBox*)cw)->SetValue(value);
return cw;
} }
void ControlReadBack() void ControlReadBack()
@ -396,12 +399,13 @@ namespace Automation4 {
if(include_buttons && TYPE(btn_data) == T_ARRAY) if(include_buttons && TYPE(btn_data) == T_ARRAY)
{ {
long len = RARRAY(config)->len; long len = RARRAY(btn_data)->len;
VALUE *ptr = RARRAY(config)->ptr; VALUE *ptr = RARRAY(btn_data)->ptr;
for(int i = 0; i < len; i++) for(int i = 0; i < len; i++)
{ {
if(TYPE(ptr[i]) == T_STRING) if(rb_respond_to(ptr[i], rb_intern("to_s")))
{ {
ptr[i] = rb_funcall(ptr[i], rb_intern("to_s"), 0);
wxString s(StringValueCStr(ptr[i]), wxConvUTF8); wxString s(StringValueCStr(ptr[i]), wxConvUTF8);
buttons.push_back(s); buttons.push_back(s);
} }
@ -417,7 +421,7 @@ namespace Automation4 {
long len = RARRAY(config)->len; long len = RARRAY(config)->len;
VALUE *ptr = RARRAY(config)->ptr; VALUE *ptr = RARRAY(config)->ptr;
for(int i = 0; i < len; i++) for(int i = 0; i < len; i++)
{ {
if(TYPE(ptr[i]) != T_HASH) if(TYPE(ptr[i]) != T_HASH)
continue; // skip invalid entry continue; // skip invalid entry

18
aegisub/subs_grid.cpp
View file

@ -1449,3 +1449,21 @@ std::vector<int> SubtitlesGrid::GetAbsoluteSelection() {
return result; return result;
} }
/////////////////////////////////////////////////////////////////////
// Update list of selected lines from absolute selection
// selection vector must be sorted
void SubtitlesGrid::SetSelectionFromAbsolute(std::vector<int> &selection) {
int nrows = GetRows();
std::list<AssEntry*>::iterator j = ass->Line.begin();
int index = 0;
for (int i = 0; i != nrows; ++i) {
entryIter l = diagMap.at(i);
while(j != l && j != ass->Line.end()) ++j, ++index;
if(j == l && binary_search(selection.begin(), selection.end(), index)) {
selMap[i] = true;
} else selMap[i] = false;
}
}

1
aegisub/subs_grid.h
View file

@ -131,6 +131,7 @@ public:
void PasteLines(int pos,bool over=false); void PasteLines(int pos,bool over=false);
std::vector<int> GetAbsoluteSelection(); std::vector<int> GetAbsoluteSelection();
void SetSelectionFromAbsolute(std::vector<int> &selection);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };