--- kgsueme/kgsueme/room.pl	2003/06/01 15:43:58	1.9
+++ kgsueme/kgsueme/room.pl	2004/06/02 05:57:32	1.29
@@ -1,66 +1,72 @@
 package room;
 
+use KGS::Constants;
+
 use base KGS::Listener::Room;
-use base gtk::widget;
+
+use Glib::Object::Subclass
+   Gtk2::Frame;
 
 sub new {
-   my $self = shift;
-   $self = $self->SUPER::new(@_);
+   my ($self, %arg) = @_;
 
-   $self->listen($self->{conn}, qw(msg_room:));
+   $self = $self->Glib::Object::new;
+   $self->{$_} = delete $arg{$_} for keys %arg;
 
-   $self->{window} = new Gtk2::Window 'toplevel';
-   $self->{window}->set_title("KGS Room $self->{name}");
-   gtk::state $self->{window}, "room::window", $self->{name}, window_size => [600, 400];
+   $self->signal_connect (destroy => sub {
+      delete $::config->{rooms}{$self->{channel}};
+      delete $self->{app}{room}{$self->{channel}};
+      (remove Glib::Source delete $self->{gameupdate}) if $self->{gameupdate};
+      $self->unlisten;
+      %{$_[0]} = ();
+   });
 
-   $self->{window}->signal_connect(delete_event => sub { $self->part; 1 });
+   $self->listen ($self->{conn}, qw(msg_room:));
 
-   $self->{window}->add($self->{hpane} = new Gtk2::HPaned);
-   $self->{hpane}->set(position_set => 1);
-   gtk::state $self->{hpane}, "room::hpane", $self->{name}, position => 200;
+   $self->signal_connect (delete_event => sub { $self->part; 1 });
 
-   $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1);
-   
-   $vbox->add(my $sw = new Gtk2::ScrolledWindow);
-   $sw->set_policy("automatic", "always");
+   $self->add (my $hbox = new Gtk2::HBox);
 
-   $sw->add(($self->{text} = new gtk::text)->widget);
+   $hbox->pack_start ((my $vbox = new Gtk2::VBox), 1, 1, 0);
+   
+   $vbox->add ($self->{chat} = new chat);
 
-   $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
-   $self->{entry}->signal_connect(activate => sub {
-      my $text = $self->{entry}->get_text;
-      $self->say($text) if $text =~ /\S/;
-      $self->{entry}->set_text("");
+   $self->{chat}->signal_connect (command => sub {
+      my ($chat, $cmd, $arg) = @_;
+      $self->{app}->do_command ($chat, $cmd, $arg, userlist => $self->{userlist}, room => $self);
    });
 
-   $self->{hpane}->pack2((my $sw = new Gtk2::ScrolledWindow), 0, 1);
-   $sw->set_policy("automatic", "always");
+   $hbox->pack_start ((my $vbox = new Gtk2::VBox), 0, 1, 0);
 
-   $sw->add(($self->{userlist} = new userlist)->widget);
+   $vbox->pack_start ((my $button = new_with_label Gtk2::Button "Leave"), 0, 1, 0);
+   $button->signal_connect (clicked => sub { $self->part });
+   
+   $vbox->pack_start ((my $button = new_with_label Gtk2::Button "New Game"), 0, 1, 0);
+   $button->signal_connect (clicked => sub { $self->new_game });
 
-   $self;
-}
+   $vbox->pack_start ((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0);
+   $sw->set_policy ("automatic", "always");
 
-sub join {
-   my ($self) = @_;
-   $self->SUPER::join;
+   $sw->add ($self->{userlist} = new userlist);
 
-   $self->{window}->show_all;
+   $self;
 }
 
+sub FINALIZE_INSTANCE { print "FIN room\n" } # never called MEMLEAK #d#TODO#
+
 sub part {
    my ($self) = @_;
    $self->SUPER::part;
 
-   delete $::config->{rooms}{$self->{channel}};
-   $self->{window}->hide_all;
+   $self->hide_all;
 }
 
 sub inject_msg_room {
    my ($self, $msg) = @_;
 
    # secret typoe ;-)
-   $self->{text}->append_text("\n<user>$msg->{name}</user><marker>:</marker> $msg->{message}");
+   $self->{chat}->append_text ("\n<user>" . (util::toxml $msg->{name})
+                               . "</user>: " . (util::toxml $msg->{message}));
 }
 
 sub event_update_users {
@@ -72,7 +78,21 @@
 sub event_update_games {
    my ($self, $add, $update, $remove) = @_;
 
-   $appwin::gamelist->update ($self, $add, $update, $remove);
+   $self->{app}{gamelist}->update ($self, $add, $update, $remove);
+
+   # try to identify any new games assigned to us. stupid protocol
+   # first updates the game, joins you and THEN tells you that
+   # which of the games you asked for this is.
+
+   for (@$add) {
+      if (($_->{black}{name} eq $self->{conn}{name}
+           || $_->{white}{name} eq $self->{conn}{name}
+           || $_->{owner}{name} eq $self->{conn}{name})
+          && (my $game = shift @{$self->{new_game}})) {
+         $game->inject_upd_game ({ game => $_ });
+         $game->set_channel ($game->{channel});
+      }
+   }
 }
 
 sub event_join {
@@ -80,12 +100,45 @@
    $self->SUPER::event_join;
 
    $::config->{rooms}{$self->{channel}} = { channel => $self->{channel}, name => $self->{name} };
+
+   # mysteriously enough, we have to request game updates manually
+   $self->{gameupdate} ||= add Glib::Timeout INTERVAL_GAMEUPDATES * 1000, sub {
+      $self->req_games;
+      1;
+   };
+
+   $self->show_all;
+}
+
+sub event_part {
+   my ($self) = @_;
+
+   $self->SUPER::event_part;
+   $self->destroy;
+}
+
+sub event_quit {
+   my ($self) = @_;
+
+   $self->SUPER::event_quit;
+   $self->destroy;
 }
 
 sub event_update_roominfo {
    my ($self) = @_;
 
-   $self->{text}->append_text("\n<owner>$self->{owner}</owner>\n<description>$self->{description}</description>\n");
+   $self->{chat}->append_text("\n<user>" . (util::toxml $self->{owner}) . "</user>\n"
+                              . "<description>" . (util::toxml $self->{description}) . "</description>\n");
+}
+
+sub new_game {
+   my ($self) = @_;
+
+   my $game = new game conn => $self->{conn}, app => $self->{app}, roomid => $self->{channel};
+   $game->new_game_challenge;
+   $game->show_all;
+
+   push @{$self->{new_game}}, $game;
 }
 
 1;