Added base of UI.

[anim.git] / a.pl

diff --git a/a.pl b/a.pl
index 59829c7f22767669ee606ec47f0bece6d89a910b..d8df74d3f041f8f1811de63848eea0d5a29006f9 100755 (executable)
--- a/a.pl
+++ b/a.pl
@@ -7,10 +7,16 @@ use Gtk2 -init;
 use Cairo;
 
 use AA;
+use AA::Gfx;
+use AA::UI;
 use AA::Graph;
 use AA::Net;
 use AA::Anim;
 
+my $ui = AA::UI->new('');
+
+my $back = AA::Background->new('bg');
+
 my $v = AA::NetV->new('v');
 $v->Set('x', 100);
 $v->Set('y0', 100);
@@ -24,102 +30,18 @@ $w->Set('label', '2');
 my $e = AA::Edge->new('e', $v, $w);
 $e->Set('arrow', 1);
 
-$v->Set("h", 1);
-$w->Set("h", 2);
-
-AA->calculate;
-
-### G T K ###
-
-my $area = Gtk2::DrawingArea->new();
-my $cairo;
-
-my $pixmap;
-my ($lastw, $lasth, $lastd) = (-1, -1, -1);
-my ($pixw, $pixh) = (-1, -1);
-sub draw($) {
-       my ($force) = @_;
-       my $win = $area->window;
-       my $wgc = Gtk2::Gdk::GC->new($win);
-       my $alloc = $area->allocation;
-       my $w = $alloc->width;
-       my $h = $alloc->height;
-       my $d = $win->get_depth;
-       # print "Area $w x $h x $d, xx=$xx\n";
-
-       if (!defined($pixmap) || $lastw != $w || $lasth != $h || $lastd != $d) {
-               ($lastw, $lasth, $lastd) = ($w, $h, $d);
-               if ($w/$h >= 4/3) {
-                       $pixh = $h;
-                       $pixw = int($h/3*4);
-               } else {
-                       $pixw = $w;
-                       $pixh = int($w/4*3);
-               }
-               print "Resized to ${w}x${h}, pixmap size ${pixw}x${pixh}\n";
-
-               $pixmap = Gtk2::Gdk::Pixmap->new($win, $pixw, $pixh, $d);
-               $cairo = Gtk2::Gdk::Cairo::Context->create($pixmap);
-               $cairo->select_font_face('URW Palladio L', 'normal', 'normal');
-               my $scale = $pixw/1024;
-               $cairo->scale($scale, $scale);
+my $scenario = [
+       sub {
+               $v->Set("h", 1);
+               $w->Set("h", 1);
+       },
+       sub {
+               $v->Set("h", 1);
+               $w->Set("h", 2);
        }
+];
 
-       if ($force) {
-               $wgc->set_rgb_background(0);
-               $wgc->set_rgb_foreground(0);
-               $win->draw_rectangle($wgc, 1, 0, 0, $w, $h);
-       }
-
-       $cairo->rectangle(0, 0, 1024, 768);
-       $cairo->set_source_rgb(0, 0, 0);
-       $cairo->fill;
-
-       AA->draw($cairo);
-
-       $win->draw_drawable($wgc, $pixmap, 0, 0, 0, 0, $pixw, $pixh);
-}
-
-sub step() {
-       AA::Anim->step;
-       draw(0);
-}
-
-my $window = Gtk2::Window->new ('toplevel');
-
-my $timer;
-my $stopped = 1;
-my $fullscreen = 0;
-$area->signal_connect("expose-event" => sub {
-       draw(1);
-       if (!defined $timer) {
-               $timer = Glib::Timeout->add(30, sub { $stopped || step(); return 1; });
-       }
-});
-$area->set_flags('can-focus');
-# $area->add_events('key-press-mask');
-$area->signal_connect('key-press-event' => sub {
-       my ($w, $evt) = @_;
-       my $k = Gtk2::Gdk::keyval_name(0, $evt->keyval);
-       print "Pressed key $k\n";
-       if ($k eq "Escape") {
-               Gtk2->main_quit;
-       } elsif ($k eq "space") {
-               $stopped = !$stopped;
-       } elsif ($k eq "f") {
-               if ($fullscreen = !$fullscreen) {
-                       $window->fullscreen;
-               } else {
-                       $window->unfullscreen;
-               }
-       }
-});
+$ui->RunScenario($scenario, 1);
 
-$window->signal_connect ("delete-event" => sub { Gtk2->main_quit });
-$window->set_title("Brum");
-$window->set_wmclass("brum", "Brum");
-$window->set_default_size(640, 480);
-$window->add ($area);
-$window->show_all;
+exit 0;
 
-Gtk2->main;