--- deliantra/server/ext/widget.ext	2007/12/27 18:35:48	1.20
+++ deliantra/server/ext/widget.ext	2007/12/27 19:41:26	1.21
@@ -5,7 +5,7 @@
 # ws_n       ws                                # widgetset new
 # ws_d       ws                                # widgetset destroy
 # ws_c       ws id class @args                 # widgetset create
-# ws_ct      ws templateface \%cfg             # widgetset create from template
+# ws_ct      ws ttype ttext done_cb \%cfg      # widgetset create from template
 # w_c        id rid name @args                 # widget method call
 # w_s        id @attr                          # widget member set
 # w_g        id rid @attr                      # widget member get
@@ -36,19 +36,83 @@
    }
 }
 
+my $cg_template = eval <<EOF;
+[
+   Toplevel => {
+      s_id    => "toplevel",
+      title   => "Character Creation",
+      x       => "center",
+      y       => "center",
+      z       => 5,
+      force_w => 760,
+      force_h => 440,
+      s_cl => [VBox => { s_cl => [
+         Label => {
+            text     => "Character Creation",
+            fontsize => 1,
+            align    => 0,
+         },
+         Label => {
+            markup   => "View or Edit your character attributes below, then press <b>Finish</b> to create your character",
+            fontsize => 0.8,
+            align    => 0,
+         },
+         HBox  => { s_cl => [
+            Face => {
+               s_id  => "face",
+               face  => 0,
+               bg    => [.2, .2, .2, 1],
+               min_w => 64,
+               min_h => 64,
+            },
+            Label => {
+               s_id      => "desc",
+               fontsize  => 0.8,
+               ellipsize => 0,
+            },
+         ]},
+         Notebook => {
+            expand => 1,
+            s_cl => [
+               Table => {
+                  c_tab => ["Basics", "Title, background and other information of your character."],
+               },
+               Table => {
+                  c_tab => ["Stats", "Your character's primary stats such as strength, dexterity and so on."],
+               },
+               Table => {
+                  c_tab => ["Race", "Your character's race."],
+               },
+               Table => {
+                  c_tab => ["Class", "Your character's initial class."],
+               },
+            ],
+         },
+         Button => {
+            s_id => "finish",
+            text => "Finish",
+         },
+      ]}],
+   },
+]
+EOF
+die if $@;
+
 sub demo_start {
    my ($ns) = @_;
 
    my $ws = $ns->{csc} = $ns->new_widgetset;
 
-   my ($tl, $entry) = $ws->template (undef,
-      toplevel => {},
-      entry    => {
-         text => "xyz",
-         on_changed => sub {
-            warn "changed<@_>\n";#d#
+   my ($tl, $entry) = $ws->template (inline => $cg_template,
+      [
+         toplevel => {},
+         entry    => {
+            text => "xyz",
+            on_changed => sub {
+               warn "changed<@_>\n";#d#
+            },
          },
-      },
+      ],
    );
 
    $tl->show;
@@ -222,13 +286,13 @@
 }
 
 sub template {
-   my ($self, $template, @args) = @_;
+   my ($self, $type, $template, $args, $done_cb) = @_;
 
    my %cfg;
    my @res;
 
-   while (@args) {
-      my ($name, $args) = splice @args, 0, 2, ();
+   while (@$args) {
+      my ($name, $args) = splice @$args, 0, 2, ();
 
       my $proxy = $self->alloc;
 
@@ -247,9 +311,20 @@
       push @res, $proxy;
    }
 
+   if ($done_cb) {
+      my $proxy = $self->alloc;
+      my $ocb = $done_cb;
+      $done_cb = $proxy->cb (sub {
+         undef $proxy;
+         undef $done_cb;
+         &$ocb
+      });
+   }
+
    $self->msg (ws_ct =>
       $self->{id},
-      $template,
+      $type => $template,
+      $done_cb,
       \%cfg,
    );