--- kgsueme/kgsueme/room.pl 2003/06/01 15:43:58 1.9
+++ kgsueme/kgsueme/room.pl 2004/05/21 15:32:02 1.18
@@ -1,66 +1,69 @@
package room;
+use KGS::Constants;
+
use base KGS::Listener::Room;
-use base gtk::widget;
+
+use Glib::Object::Subclass
+ Gtk2::Window;
sub new {
- my $self = shift;
- $self = $self->SUPER::new(@_);
+ my ($self, %arg) = @_;
+ $self = $self->Glib::Object::new;
+ $self->{$_} = delete $arg{$_} for keys %arg;
+
+ $self->signal_connect (delete_event => sub { $self->part; 1 });
+ $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->listen($self->{conn}, qw(msg_room:));
+ $self->listen ($self->{conn}, qw(msg_room:));
- $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->set_title ("KGS Room $self->{name}");
+ gtk::state $self, "room::window", $self->{name}, window_size => [600, 400];
- $self->{window}->signal_connect(delete_event => sub { $self->part; 1 });
+ $self->signal_connect (delete_event => sub { $self->part; 1 });
- $self->{window}->add($self->{hpane} = new Gtk2::HPaned);
- $self->{hpane}->set(position_set => 1);
+ $self->add ($self->{hpane} = new Gtk2::HPaned);
+ $self->{hpane}->set (position_set => 1);
gtk::state $self->{hpane}, "room::hpane", $self->{name}, position => 200;
- $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1);
+ $self->{hpane}->pack1 ((my $vbox = new Gtk2::VBox), 1, 1);
- $vbox->add(my $sw = new Gtk2::ScrolledWindow);
- $sw->set_policy("automatic", "always");
+ $vbox->add ($self->{chat} = new chat);
- $sw->add(($self->{text} = new gtk::text)->widget);
-
- $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);
+ $self->{hpane}->pack2 ((my $sw = new Gtk2::ScrolledWindow), 0, 1);
$sw->set_policy("automatic", "always");
- $sw->add(($self->{userlist} = new userlist)->widget);
+ $sw->add ($self->{userlist} = new userlist);
$self;
}
-sub join {
- my ($self) = @_;
- $self->SUPER::join;
-
- $self->{window}->show_all;
-}
+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$msg->{name}: $msg->{message}");
+ $self->{chat}->append_text("\n" . (util::toxml $msg->{name})
+ . ": " . (util::toxml $msg->{message}));
}
sub event_update_users {
@@ -72,7 +75,7 @@
sub event_update_games {
my ($self, $add, $update, $remove) = @_;
- $appwin::gamelist->update ($self, $add, $update, $remove);
+ $self->{app}{gamelist}->update ($self, $add, $update, $remove);
}
sub event_join {
@@ -80,12 +83,28 @@
$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_update_roominfo {
my ($self) = @_;
- $self->{text}->append_text("\n$self->{owner}\n$self->{description}\n");
+ $self->{chat}->append_text("\n" . (util::toxml $self->{owner}) . "\n"
+ . "" . (util::toxml $self->{description}) . "\n");
}
1;