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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines