ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/kgsueme/kgsueme/game.pl
(Generate patch)

Comparing kgsueme/kgsueme/game.pl (file contents):
Revision 1.1 by pcg, Sat May 31 09:46:51 2003 UTC vs.
Revision 1.8 by pcg, Sat May 31 15:19:55 2003 UTC

3use KGS::Constants; 3use KGS::Constants;
4use KGS::Game::Board; 4use KGS::Game::Board;
5 5
6use base KGS::Listener::Game; 6use base KGS::Listener::Game;
7use base KGS::Game; 7use base KGS::Game;
8
9use base gtk::widget;
8 10
9sub new { 11sub new {
10 my $self = shift; 12 my $self = shift;
11 $self = $self->SUPER::new(@_); 13 $self = $self->SUPER::new(@_);
12 14
13 $self->listen($self->{conn}); 15 $self->listen($self->{conn});
14 16
15 $self->{window} = new Gtk2::Window 'toplevel'; 17 $self->{window} = new Gtk2::Window 'toplevel';
16 my $title = $self->{channel} ? $self->user0." ".$self->user1 : "Game Window"; 18 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
17 $self->{window}->set_title("KGS Game $title"); 19 $self->{window}->set_title("KGS Game $title");
18 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 20 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500];
19 21
20 $self->{window}->signal_connect(delete_event => sub { $self->part; 1 }); 22 $self->{window}->signal_connect(delete_event => sub {
23 if ($self->{joined}) {
24 $self->part;
25 } else {
26 $self->event_part;
27 }
28 1;
29 });
21 30
22 $self->{window}->add(my $hpane = new Gtk2::HPaned); 31 $self->{window}->add($self->{hpane} = new Gtk2::HPaned);
23 gtk::state $hpane, "game::hpane", undef, hpane_position => 500; 32 gtk::state $self->{hpane}, "game::hpane", undef, position => 500;
24 33
25 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1); 34 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1);
26 35
27 $vbox->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 36 $vbox->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
28 37
29 { 38 {
39 # grrr...
30 $frame->add(my $vbox = new Gtk2::VBox); 40 $frame->add(my $vbox = new Gtk2::VBox);
31 $vbox->add($self->{title} = new Gtk2::Label $title); 41 $vbox->add($self->{title} = new Gtk2::Label $title);
32 42
33 $self->{moveadj} = new Gtk2::Adjustment 0, 0, 0, 1, 10, 0; 43 $self->{moveadj} = new Gtk2::Adjustment 1, 0, 1, 0.01, 0.1, 0;
44
34 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 45 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj});
35 $scale->set_draw_value (1); 46 $scale->set_draw_value (0);
36 $scale->set_digits (0);
37 $scale->set_value_pos('top');
38 47
39 $self->{moveadj}->signal_connect (value_changed => sub { 48 $self->{moveadj}->signal_connect (value_changed => sub {
49 return unless $self->{path};
50
51 my $move = int (@{$self->{path}} * $_[0]->get_value);
52
40 $self->{board} = new KGS::Game::Board $self->{size}; 53 $self->{board} = new KGS::Game::Board $self->{size};
41 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $self->{moveadj}->value - 1]]); 54 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
42 55
43 my $area = $self->repaint_board; 56 $self->redraw ($self->repaint_board);
44 57
45 # force a redraw (not perfect(?))
46 $self->expose ($area);
47
48 $self->{text}->backward_delete($self->{text}->get_length);
49 $self->{text}->insert(undef, undef, undef, KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment}); 58 $self->{text}->set_text(KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
50 }); 59 });
51
52 $self->{moveadj}->upper (scalar @{$self->{path}}) if $self->{path};
53 } 60 }
54 61
55 Gtk2::Widget->push_visual (Gtk2::Gdk::Rgb->get_visual);
56 Gtk2::Widget->push_colormap (Gtk2::Gdk::Rgb->get_cmap);
57 $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0); 62 $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0);
58 Gtk2::Widget->pop_colormap;
59 Gtk2::Widget->pop_visual;
60 63
61 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); 64 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
62 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); 65 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
63 66
64 $hpane->pack2((my $vpane = new Gtk2::VPaned), 0, 0); 67 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0);
68 $self->{hpane}->set(position_set => 1);
65 gtk::state $vpane, "game", $self->{name}, vpane_position => 80; 69 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
66 70
67 $vpane->add(my $sw = new Gtk2::ScrolledWindow); 71 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
68 $sw->set_policy("automatic", "always"); 72 $sw->set_policy("automatic", "always");
69 73
70 $sw->add($self->{userlist} = new_with_titles Gtk2::ListStore "User", "Rank", "Flags"); 74 $sw->add(($self->{userlist} = new gtk::userlist)->widget);
71 ::clist_autosort $self->{userlist};
72 gtk::state $self->{userlist}, "room::userlist", $self->{name}, clist_column_widths => [120, 30];
73 75
74 $vpane->add(my $vbox = new Gtk2::VBox); 76 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
75 77
76 $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0); 78 $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0);
77 $sw->set_policy("automatic", "always"); 79 $sw->set_policy("never", "always");
78 80
79 $sw->add($self->{text} = new Gtk2::Text); 81 $sw->add(($self->{text} = new gtk::text)->widget);
80 82
81 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 83 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
82 $self->{entry}->signal_connect(activate => sub { 84 $self->{entry}->signal_connect(activate => sub {
83 my $text = $self->{entry}->get_text; 85 my $text = $self->{entry}->get_text;
84 # add message 86 # add message
89} 91}
90 92
91sub event_update_users { 93sub event_update_users {
92 my ($self) = @_; 94 my ($self) = @_;
93 95
94 room::event_update_users $self; 96 $self->{userlist}->update($self->{users});
95} 97}
96 98
97sub join { 99sub join {
98 my ($self) = @_; 100 my ($self) = @_;
99 $self->SUPER::join; 101 $self->SUPER::join;
107 109
108 $self->{window}->hide; 110 $self->{window}->hide;
109} 111}
110 112
111sub configure_event { 113sub configure_event {
112 my ($widget, $self, $event) = @_; 114 my ($widget, $event, $self) = @_;
113 delete $self->{stack}; 115 delete $self->{stack};
114 delete $self->{pixbuf}; 116 delete $self->{pixbuf};
115 delete $self->{board_shown}; 117 delete $self->{board_shown};
116 delete $self->{background}; 118 delete $self->{background};
117 $self->repaint_board; 119 $self->repaint_board;
118 1; 120 0;
119} 121}
120 122
123sub expose_event {
124 my ($widget, $event, $self) = @_;
125
126 $self->{pixbuf} or return;
127
128 my $area = $event->area;
129 my ($ox, $oy, $s) = @{$self->{offsets}};
130
131 $self->redraw (
132 (new Gtk2::Gdk::Rectangle $area->x - $ox, $area->y - $oy, $area->width, $area->height)
133 ->intersect(new Gtk2::Gdk::Rectangle 0, 0, $s, $s)
134 );
135
136 0;
137}
138
139# something Gtk2 fixed
121sub INTERP_NEAREST (){ 1 } 140sub INTERP_NEAREST (){ 'nearest' }
122sub INTERP_TILES (){ 1 } 141sub INTERP_TILES (){ 'tiles' }
123sub INTERP_BILINEAR (){ 2 } 142sub INTERP_BILINEAR (){ 'bilinear' }
124sub INTERP_HYPER (){ 3 } 143sub INTERP_HYPER (){ 'hyper' }
125 144
126sub new_pixbuf { 145sub new_pixbuf {
127 my ($w, $h, $alpha, $clear) = @_; 146 my ($w, $h, $alpha, $fill) = @_;
128 147
129 my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h; 148 my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
130 149 $pixbuf->fill ($fill) if defined $fill;
131 if ($clear) { # damn, need to clear it ourselves
132 my $row = "\x00\x00\x00\x00" x $w;
133 $pixbuf->put_pixels ($row, $_, 0) for 0 .. $h - 1;
134 }
135 150
136 $pixbuf; 151 $pixbuf;
137} 152}
138 153
139sub scale_pixbuf { 154sub scale_pixbuf {
157 my $shadow = $size * 0.05; 172 my $shadow = $size * 0.05;
158 173
159 my $c = \$self->{stack}{$mark}; 174 my $c = \$self->{stack}{$mark};
160 unless ($$c) { 175 unless ($$c) {
161 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { 176 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
162 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 1; 177 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
163 178
164 # zeroeth the shadow 179 # zeroeth the shadow
165 if ($mark & (MARK_B | MARK_W)) { 180 if ($mark & (MARK_B | MARK_W)) {
166 $::black_img[0]->composite ( 181 $::black_img[0]->composite (
167 $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5, 182 $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5,
168 $size / $stone->get_width, $size / $stone->get_height, 183 $size / $stone->get_width, $size / $stone->get_height,
169 $::config->{speed} ? INTERP_NEAREST : INTERP_TILES, 128 184 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 128
170 ); 185 );
171 } 186 }
172 187
173 # first the big stones (handicap stones different for effect) 188 # first the big stones (handicap stones different for effect)
174 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192], 189 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192],
178 my ($mask, $alpha) = @$_; 193 my ($mask, $alpha) = @$_;
179 if ($mark & $mask) { 194 if ($mark & $mask) {
180 $stone->composite ( 195 $stone->composite (
181 $base, 0, 0, $size, $size, -0.5, -0.5, 196 $base, 0, 0, $size, $size, -0.5, -0.5,
182 $size / $stone->get_width, $size / $stone->get_height, 197 $size / $stone->get_width, $size / $stone->get_height,
183 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, $alpha 198 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
184 ); 199 );
185 } 200 }
186 } 201 }
187 202
188 # then the samll stones 203 # then the samll stones
191 my ($mask, $img) = @$_; 206 my ($mask, $img) = @$_;
192 if ($mark & $mask) { 207 if ($mark & $mask) {
193 $img->composite ( 208 $img->composite (
194 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2, 209 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2,
195 $size / $img->get_width / 2, $size / $img->get_height / 2, 210 $size / $img->get_width / 2, $size / $img->get_height / 2,
196 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, 192 211 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
197 ); 212 );
198 } 213 }
199 } 214 }
200 215
201 # and lastly any markers 216 # and lastly any markers
207 my ($mask, $img) = @$_; 222 my ($mask, $img) = @$_;
208 if ($mark & $mask) { 223 if ($mark & $mask) {
209 $img->composite ( 224 $img->composite (
210 $base, 0, 0, $size, $size, -0.5, -0.5, 225 $base, 0, 0, $size, $size, -0.5, -0.5,
211 $size / $img->get_width, $size / $img->get_height, 226 $size / $img->get_width, $size / $img->get_height,
212 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, 255 227 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255
213 ); 228 );
214 } 229 }
215 } 230 }
216 231
217 push @$$c, $base; 232 push @$$c, $base;
237 $y -= $height * 0.5; 252 $y -= $height * 0.5;
238 253
239 for (@c) { 254 for (@c) {
240 my $w = $_->get_width * $s; 255 my $w = $_->get_width * $s;
241 $_->composite ($pixbuf, 256 $_->composite ($pixbuf,
242 $x, $y, $w+0.999, $height+0.999, $x, $y, $s, $s, 257 $x, $y, $w+1, $height+1, $x, $y, $s, $s,
243 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255); 258 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
244 259
245 $x += $w + $spacing; 260 $x += $w + $spacing;
246 } 261 }
247 } 262 }
248} 263}
249 264
250sub pixbuf_rect { 265sub pixbuf_rect {
251 my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_; 266 my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_;
252 # we fake lines by... an unspeakable method :/ 267 # we fake lines by... a horrible method :/
253 my $colour_pb = new_pixbuf 1, 1, 0, 0; 268 my $colour_pb = new_pixbuf 1, 1, 0, $colour;
254 $colour_pb->put_pixels ($colour, 0, 0);
255
256 $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, 1, 1, INTERP_NEAREST, $alpha); 269 $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1,
270 INTERP_NEAREST, $alpha);
257} 271}
258 272
259sub repaint_board { 273sub repaint_board {
260 my ($self) = @_; 274 my ($self) = @_;
261 my $canvas = $self->{canvas}; 275 my $canvas = $self->{canvas};
262 my $expose_area = undef; 276 my $expose_area = undef;
263 277
264 return $expose_area unless $self->{board}; 278 return $expose_area unless $self->{board};
265 279
266 my ($w, $h) = @{$canvas->allocation}[2,3]; 280 my ($w, $h) = ($canvas->allocation->values)[2,3];
267 281
268 my $s = $w > $h ? $h : $w; 282 my $s = $w > $h ? $h : $w;
283
284 return unless $s > 128;
269 285
270 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s]; 286 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
271 287
272 my $size = $self->{size}; 288 my $size = $self->{size};
273 289
285 if ($self->{background}) { 301 if ($self->{background}) {
286 if ($oldboard = $self->{board_shown}) { 302 if ($oldboard = $self->{board_shown}) {
287 $pixbuf = $self->{pixbuf}; 303 $pixbuf = $self->{pixbuf};
288 } else { 304 } else {
289 $pixbuf = $self->{background}->copy; 305 $pixbuf = $self->{background}->copy;
290 $expose_area = [0, 0, $s, $s]; 306 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
291 } 307 }
292 } else { 308 } else {
293 $expose_area = [0, 0, $s, $s]; 309 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
294 310
295 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); 311 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
296 312
297 if ($s < $bw && $s < $bh) { 313 if ($s < $bw && $s < $bh) {
298 $pixbuf = new_pixbuf $s, $s, $::config->{conserve_memory} ? 0 : 1, 0; 314 $pixbuf = new_pixbuf $s, $s, 0;
299 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0); 315 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
300 } else { 316 } else {
301 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES; 317 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
302 } 318 }
303 319
304 my $linew = int ($s / 25 / $size); 320 my $linew = int ($s / 25 / $size);
305 321
306 # ornamental border... we have time to waste :/ 322 # ornamental border... we have time to waste :/
307 pixbuf_rect $pixbuf, "\xff\xcc\x77", 0, 0, $s-1, $linew, 255; 323 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
308 pixbuf_rect $pixbuf, "\xff\xcc\x77", 0, 0, $linew, $s-1, 255; 324 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $linew, $s-1, 255;
309 pixbuf_rect $pixbuf, "\xff\xcc\x77", $s-$linew-1, 0, $s-1, $s-1, 255; 325 pixbuf_rect $pixbuf,0xffcc7700, $s-$linew-1, 0, $s-1, $s-1, 255;
310 pixbuf_rect $pixbuf, "\xff\xcc\x77", 0, $s-$linew-1, $s-1, $s-1, 255; 326 pixbuf_rect $pixbuf,0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
311 327
312 for my $i (1 .. $size) { 328 for my $i (1 .. $size) {
313 pixbuf_rect $pixbuf, "\x44\x11\x11", $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192; 329 pixbuf_rect $pixbuf, 0x44111100, $k[$i] - $linew, $k[1] - $linew, $k[$i] + $linew, $k[$size] + $linew, 192;
314 pixbuf_rect $pixbuf, "\x44\x11\x11", $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192; 330 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
315 331
316 # 38 max, but we allow a bit more 332 # 38 max, but we allow a bit more
317 my $label = (qw(- A B C D E F G H J K L M N O P Q R S T U V W X Y Z 333 my $label = (qw(- A B C D E F G H J K L M N O P Q R S T U V W X Y Z
318 AA BB CC DD EE FF GG HH JJ KK LL MM NN OO PP QQ RR SS TT UU VV WW XX YY ZZ))[$i]; 334 AA BB CC DD EE FF GG HH JJ KK LL MM NN OO PP QQ RR SS TT UU VV WW XX YY ZZ))[$i];
319 335
357 if ($oldboard) { 373 if ($oldboard) {
358 next if $old == $mark; # no change 374 next if $old == $mark; # no change
359 375
360 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy); 376 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
361 $expose_area = $expose_area 377 $expose_area = $expose_area
378 ? $expose_area->union (new Gtk2::Gdk::Rectangle @$area)
362 ? Gtk2::Gdk::Rectangle->union ($expose_area, $area) 379 : new Gtk2::Gdk::Rectangle @$area;
363 : $area;
364 } 380 }
365 381
366 if ($mark) { 382 if ($mark) {
367 my $pb = $self->create_stack($mark, $edge, $rand); 383 my $pb = $self->create_stack($mark, $edge, $rand);
368 384
398 #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable"; 414 #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
399 415
400 $expose_area; 416 $expose_area;
401} 417}
402 418
403sub expose { 419sub redraw {
404 my ($self, $area) = @_; 420 my ($self, $area) = @_;
405 421
406 if ($area && $self->{pixbuf}) { 422 if ($area && $self->{pixbuf}) {
407 my ($x, $y, $w, $h) = @$area; 423 my ($x, $y, $w, $h) = $area->values;
408 my ($ox, $oy, $s) = @{$self->{offsets}}; 424 my ($ox, $oy, $s) = @{$self->{offsets}};
409 425
410 $self->{pixbuf}->render_to_drawable ($self->{canvas}->window, $self->{canvas}->style->white_gc, 426 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
411 $x, $y, $x + $ox, $y + $oy, $w, $h); 427 $x, $y, $x + $ox, $y + $oy, $w, $h,
428 "normal", 0, 0);
412 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0, 429 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
413 $x + $ox - 1, $y + $oy - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE; 430 $x + $ox - 1, $y + $oy - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
414
415 #$self->{canvas}->window->draw_pixmap (
416 # $self->{canvas}->style->white_gc,
417 # $self->{pixmap},
418 # $x - $ox, $y - $oy, $x, $y, $w, $h,
419 #);
420 } 431 }
421}
422
423sub expose_event {
424 my ($widget, $self, $event) = @_;
425
426 $self->{pixbuf} or return;
427
428 my $area = $event->{area};
429 my ($ox, $oy, $s) = @{$self->{offsets}};
430
431 $self->expose (Gtk2::Gdk::Rectangle->intersect (
432 [$area->[0] - $ox, $area->[1] - $oy, $area->[2], $area->[3]],
433 [0, 0, $s, $s],
434 ));
435
436 1;
437} 432}
438 433
439sub event_update_tree { 434sub event_update_tree {
440 my ($self) = @_; 435 my ($self) = @_;
441 436
442 $self->{path} = $self->get_path; 437 $self->{path} = $self->get_path;
443
444 my $move = @{$self->{path}};
445
446 $self->{moveadj}->upper($move);
447
448 if ($self->{moveadj}->value >= $move - 1 || !$self->{moveadj}->value) {
449 $self->{moveadj}->value ($move);
450 $self->{moveadj}->value_changed; 438 $self->{moveadj}->value_changed if $self->{moveadj};
451 }
452} 439}
453 440
454sub event_part { 441sub event_part {
455 my ($self) = @_; 442 my ($self) = @_;
456 $self->SUPER::event_part; 443 $self->SUPER::event_part;
457 (delete $self->{window})->destroy; # hmm.. why does this keep the object alive? puzzling.. ahh.. the callbacks ;)
458 delete $self->{room}{game}{$self->{channel}}; 444 delete $appwin::gamelist->{game}{$self->{channel}};
445 $self->destroy;
459} 446}
460 447
461sub event_move { 448sub event_move {
462 my ($self, $pass) = @_; 449 my ($self, $pass) = @_;
463 sound::play 1, $pass ? "pass" : "move"; 450 sound::play 1, $pass ? "pass" : "move";
464} 451}
465 452
466sub DESTROY {#d#
467 warn "DESTROY(@_)\n";#d#
468}
469
4701; 4531;
471 454

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines