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.44 by pcg, Tue Jun 3 19:03:35 2003 UTC

1use utf8;
2
3package game::goclock;
4
5# Lo and Behold! I admit it! The rounding stuff etc.. in goclock
6# is completely borked.
7
8use Time::HiRes ();
9
10use KGS::Constants;
11
12use base gtk::widget;
13
14sub new {
15 my $class = shift;
16 my $self = $class->SUPER::new(@_);
17
18 $self->{widget} = new Gtk2::Label;
19
20 $self->{set} = sub { };
21 $self->{format} = sub { "ERROR" };
22
23 $self;
24}
25
26sub configure {
27 my ($self, $timesys, $main, $interval, $count) = @_;
28
29 if ($timesys == TIMESYS_ABSOLUTE) {
30 $self->{set} = sub { $self->{time} = $_[0] };
31 $self->{format} = sub { util::format_time $_[0] };
32
33 } elsif ($timesys == TIMESYS_BYO_YOMI) {
34 my $low = $interval * $count;
35
36 $self->{set} = sub { $self->{time} = $_[0] };
37
38 $self->{format} = sub {
39 if ($_[0] > $low) {
40 util::format_time $_[0] - $low;
41 } else {
42 sprintf "%s (%d)",
43 util::format_time int (($_[0] - 1) % $interval + 1),
44 ($_[0] - 1) / $interval;
45 }
46 };
47
48 } elsif ($timesys == TIMESYS_CANADIAN) {
49 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
50
51 $self->{format} = sub {
52 if (!$self->{moves}) {
53 util::format_time $_[0] - $low;
54 } else {
55 my $time = int (($_[0] - 1) % $interval + 1);
56
57 sprintf "%s/%d {%d}",
58 util::format_time $time,
59 $self->{moves},
60 $time / ($self->{moves} || 1);
61
62 }
63 };
64
65 } else {
66 # none, or unknown
67 $self->{set} = sub { };
68 $self->{format} = sub { "---" }
69 }
70}
71
72sub refresh {
73 my ($self, $timestamp) = @_;
74 my $timer = $self->{time} + $self->{start} - $timestamp;
75
76 # we round the timer value slightly... the protocol isn't exact anyways,
77 # and this gives smoother timers ;)
78 my @format = $self->{format}->(int ($timer + 0.4));
79 $self->{widget}->set_text ($self->{format}->(int ($timer + 0.4)));
80
81 $timer - int $timer;
82}
83
84sub set_time {
85 my ($self, $time) = @_;
86
87 # we ignore requests to re-set the time of a running clock.
88 # this is the easiest way to ensure that commentary etc.
89 # doesn't re-set the clock. yes, this is frickle design,
90 # but I think the protocol is to blame here, which gives
91 # very little time information. (cgoban2 also has had quite
92 # a lot of small time update problems...)
93 unless ($self->{timeout}) {
94 $self->{set}->($time->[0], $time->[1]);
95 $self->refresh ($self->{start});
96 }
97}
98
99sub start {
100 my ($self, $when) = @_;
101
102 $self->stop;
103
104 $self->{start} = $when;
105
106 my $timeout; $timeout = sub {
107 my $next = $self->refresh (Time::HiRes::time) * 1000;
108 $next += 1000 if $next < 0;
109 $self->{timeout} = add Glib::Timeout $next, $timeout;
110 0;
111 };
112
113 $timeout->();
114}
115
116sub stop {
117 my ($self) = @_;
118
119 remove Glib::Source delete $self->{timeout} if $self->{timeout};
120}
121
122sub destroy {
123 my ($self) = @_;
124 $self->stop;
125 $self->SUPER::destroy;
126}
127
128package game::userpanel;
129
130use base gtk::widget;
131
132sub new {
133 my $class = shift;
134 my $self = $class->SUPER::new(@_);
135
136 $self->{widget} = new Gtk2::HBox;
137
138 $self->{widget}->add (my $vbox = new Gtk2::VBox);
139
140 $vbox->add ($self->{name} = new Gtk2::Label $self->{name});
141 $vbox->add ($self->{info} = new Gtk2::Label "");
142 $vbox->add (($self->{clock} = new game::goclock)->widget);
143
144 $vbox->add ($self->{imagebox} = new Gtk2::VBox);
145
146 $self;
147}
148
149sub configure {
150 my ($self, $user, $rules) = @_;
151
152 if ($self->{name}->get_text ne $user->as_string) {
153 $self->{name}->set_text ($user->as_string);
154
155 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
156 $self->{imagebox}->add (gtk::image_from_data undef);
157 $self->{imagebox}->show_all;
158
159 # the big picture...
160 appwin::userpic ($user->{name}, sub {
161 return unless $self->{imagebox};
162 if ($_[0]) {
163 $self->{imagebox}->remove ($_) for $self->{imagebox}->get_children;
164 $self->{imagebox}->add (gtk::image_from_data $_[0]);
165 $self->{imagebox}->show_all;
166 }
167 });
168 }
169
170 $self->{clock}->configure (@{$rules}{qw(timesys time interval count)});
171}
172
173sub set_state {
174 my ($self, $captures, $timer, $when) = @_;
175
176 $self->{clock}->stop unless $when;
177 $self->{clock}->set_time ($timer);
178 $self->{clock}->start ($when) if $when;
179
180 $self->{info}->set_text ("$captures pris.");
181}
182
1package game; 183package game;
2 184
3use KGS::Constants; 185use KGS::Constants;
4use KGS::Game::Board; 186use KGS::Game::Board;
5 187
6use base KGS::Listener::Game; 188use base KGS::Listener::Game;
7use base KGS::Game; 189use base KGS::Game;
190
191use base gtk::widget;
192
193use POSIX qw(ceil);
8 194
9sub new { 195sub new {
10 my $self = shift; 196 my $self = shift;
11 $self = $self->SUPER::new(@_); 197 $self = $self->SUPER::new(@_);
12 198
13 $self->listen($self->{conn}); 199 $self->listen($self->{conn});
14 200
15 $self->{window} = new Gtk2::Window 'toplevel'; 201 $self->{window} = new Gtk2::Window 'toplevel';
16 my $title = $self->{channel} ? $self->user0." ".$self->user1 : "Game Window"; 202 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
17 $self->{window}->set_title("KGS Game $title"); 203 $self->{window}->set_title("KGS Game $title");
18 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 204 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500];
19 205
20 $self->{window}->signal_connect(delete_event => sub { $self->part; 1 }); 206 $self->{window}->signal_connect(delete_event => sub {
207 $self->part;
208 $self->destroy;
209 1;
210 });
21 211
22 $self->{window}->add(my $hpane = new Gtk2::HPaned); 212 $self->{window}->add($self->{hpane} = new Gtk2::HPaned);
23 gtk::state $hpane, "game::hpane", undef, hpane_position => 500; 213 gtk::state $self->{hpane}, "game::hpane", undef, position => 500;
24 214
215 # LEFT PANE
216
217 $self->{hpane}->pack1(($self->{left} = new Gtk2::VBox), 1, 0);
218
219 $self->{boardbox} = new Gtk2::VBox;
220
25 $hpane->pack1((my $vbox = new Gtk2::VBox), 1, 1); 221 $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1);
26 222
223 # challenge
224
225 $self->{challenge} = new challenge channel => $self->{channel};
226
227 # board box (aspect/canvas)
228
27 $vbox->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); 229 $self->{boardbox}->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0);
28 230
29 { 231 {
30 $frame->add(my $vbox = new Gtk2::VBox); 232 $frame->add(my $vbox = new Gtk2::VBox);
31 $vbox->add($self->{title} = new Gtk2::Label $title); 233 $vbox->add($self->{title} = new Gtk2::Label $title);
32 234
33 $self->{moveadj} = new Gtk2::Adjustment 0, 0, 0, 1, 10, 0; 235 $self->{moveadj} = new Gtk2::Adjustment 0, 0, 0, 1, 1, 0;
236
34 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 237 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj});
35 $scale->set_draw_value (1); 238 $scale->set_draw_value (0);
36 $scale->set_digits (0); 239 $scale->set_digits (0);
37 $scale->set_value_pos('top');
38 240
39 $self->{moveadj}->signal_connect (value_changed => sub { 241 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
40 $self->{board} = new KGS::Game::Board $self->{size};
41 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $self->{moveadj}->value - 1]]);
42
43 my $area = $self->repaint_board;
44
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});
50 });
51
52 $self->{moveadj}->upper (scalar @{$self->{path}}) if $self->{path};
53 }
54 242 }
55 Gtk2::Widget->push_visual (Gtk2::Gdk::Rgb->get_visual); 243
56 Gtk2::Widget->push_colormap (Gtk2::Gdk::Rgb->get_cmap); 244 $self->{boardbox}->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0);
57 $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0); 245 $aspect_frame->set (border_width => 0, shadow_type => 'none', label_xalign => 0.5);
58 Gtk2::Widget->pop_colormap; 246 $self->{board_label} = $aspect_frame->get_label_widget;
59 Gtk2::Widget->pop_visual; 247
248 $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
249 $self->{canvas}->double_buffered (0) if $::config->{conserve_memory};
60 250
61 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); 251 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
62 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); 252 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
63 253
254 # RIGHT PANE
255
64 $hpane->pack2((my $vpane = new Gtk2::VPaned), 0, 0); 256 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 1, 1);
257 $self->{hpane}->set(position_set => 1);
65 gtk::state $vpane, "game", $self->{name}, vpane_position => 80; 258 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
66 259
67 $vpane->add(my $sw = new Gtk2::ScrolledWindow); 260 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
68 $sw->set_policy("automatic", "always"); 261 $sw->set_policy("automatic", "always");
69 262
70 $sw->add($self->{userlist} = new_with_titles Gtk2::ListStore "User", "Rank", "Flags"); 263 $sw->add(($self->{userlist} = new userlist)->widget);
71 ::clist_autosort $self->{userlist};
72 gtk::state $self->{userlist}, "room::userlist", $self->{name}, clist_column_widths => [120, 30];
73 264
74 $vpane->add(my $vbox = new Gtk2::VBox); 265 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
75 266
76 $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0); 267 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
77 $sw->set_policy("automatic", "always"); 268 $hbox->add (($self->{userpanel}[WHITE] = new game::userpanel colour => WHITE)->widget);
78 269 $hbox->add (($self->{userpanel}[BLACK] = new game::userpanel colour => BLACK)->widget);
79 $sw->add($self->{text} = new Gtk2::Text); 270
271 $vbox->pack_start(($self->{text} = new gtk::text)->widget, 1, 1, 0);
80 272
81 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 273 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
82 $self->{entry}->signal_connect(activate => sub { 274 $self->{entry}->signal_connect(activate => sub {
83 my $text = $self->{entry}->get_text; 275 my $text = $self->{entry}->get_text;
84 # add message 276 $self->say($text) if $text =~ /\S/;
85 $self->{entry}->set_text(""); 277 $self->{entry}->set_text("");
86 }); 278 });
87 279
280 $self->event_update_game;
88 $self; 281 $self;
89} 282}
90 283
91sub event_update_users { 284sub event_update_users {
92 my ($self) = @_; 285 my ($self, $add, $update, $remove) = @_;
93 286
94 room::event_update_users $self; 287 $self->{userlist}->update ($add, $update, $remove);
95} 288}
96 289
97sub join { 290sub join {
98 my ($self) = @_; 291 my ($self) = @_;
292 return if $self->{joined};
293
99 $self->SUPER::join; 294 $self->SUPER::join;
100 295
101 $self->{window}->show_all; 296 $self->{window}->show_all;
102} 297}
103 298
104sub part { 299sub part {
105 my ($self) = @_; 300 my ($self) = @_;
301
106 $self->SUPER::part; 302 $self->SUPER::part;
107 303 $self->destroy;
108 $self->{window}->hide;
109} 304}
110 305
111sub configure_event { 306sub configure_event {
112 my ($widget, $self, $event) = @_; 307 my ($widget, $event, $self) = @_;
113 delete $self->{stack}; 308 delete $self->{stack};
114 delete $self->{pixbuf}; 309 delete $self->{pixbuf};
115 delete $self->{board_shown}; 310 delete $self->{board_shown};
116 delete $self->{background}; 311 delete $self->{background};
117 $self->repaint_board; 312 $self->repaint_board;
118 1; 313 0;
119} 314}
120 315
316sub expose_event {
317 my ($widget, $event, $self) = @_;
318
319 $self->{pixbuf} or return;
320
321 my $area = $event->area;
322
323 $self->redraw ($area);
324
325 0;
326}
327
328# something Gtk2 fixed
121sub INTERP_NEAREST (){ 1 } 329sub INTERP_NEAREST (){ 'nearest' }
122sub INTERP_TILES (){ 1 } 330sub INTERP_TILES (){ 'tiles' }
123sub INTERP_BILINEAR (){ 2 } 331sub INTERP_BILINEAR (){ 'bilinear' }
124sub INTERP_HYPER (){ 3 } 332sub INTERP_HYPER (){ 'hyper' }
125 333
126sub new_pixbuf { 334sub new_pixbuf {
127 my ($w, $h, $alpha, $clear) = @_; 335 my ($w, $h, $alpha, $fill) = @_;
128 336
129 my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h; 337 my $pixbuf = new Gtk2::Gdk::Pixbuf 'rgb', $alpha, 8, $w, $h;
130 338 $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 339
136 $pixbuf; 340 $pixbuf;
137} 341}
138 342
139sub scale_pixbuf { 343sub scale_pixbuf {
157 my $shadow = $size * 0.05; 361 my $shadow = $size * 0.05;
158 362
159 my $c = \$self->{stack}{$mark}; 363 my $c = \$self->{stack}{$mark};
160 unless ($$c) { 364 unless ($$c) {
161 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { 365 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
162 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 1; 366 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
163 367
164 # zeroeth the shadow 368 # zeroeth the shadow
165 if ($mark & (MARK_B | MARK_W)) { 369 if ($mark & (MARK_B | MARK_W)) {
370 # the -0.5's are a mystery to me
166 $::black_img[0]->composite ( 371 $::shadow_img->composite (
167 $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5, 372 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
168 $size / $stone->get_width, $size / $stone->get_height, 373 $size / $::shadow_img->get_width, $size / $::shadow_img->get_height,
169 $::config->{speed} ? INTERP_NEAREST : INTERP_TILES, 128 374 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
170 ); 375 );
171 } 376 }
172 377
173 # first the big stones (handicap stones different for effect) 378 # first the big stones (handicap stones could be different)
174 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192], 379 for ([MARK_B, $mark & MARK_MOVE ? 255 : 255],
175 [MARK_W, $mark & MARK_MOVE ? 255 : 192], 380 [MARK_W, $mark & MARK_MOVE ? 255 : 255],
176 [MARK_GRAY_B, 128], 381 [MARK_GRAY_B, 128],
177 [MARK_GRAY_W, 128]) { 382 [MARK_GRAY_W, 128]) {
178 my ($mask, $alpha) = @$_; 383 my ($mask, $alpha) = @$_;
179 if ($mark & $mask) { 384 if ($mark & $mask) {
180 $stone->composite ( 385 $stone->composite (
181 $base, 0, 0, $size, $size, -0.5, -0.5, 386 $base, 0, 0, $size, $size, 0, 0,
182 $size / $stone->get_width, $size / $stone->get_height, 387 $size / $stone->get_width, $size / $stone->get_height,
183 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, $alpha 388 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
184 ); 389 );
185 } 390 }
186 } 391 }
187 392
188 # then the samll stones 393 # then the small stones
189 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], 394 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
190 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { 395 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
191 my ($mask, $img) = @$_; 396 my ($mask, $img) = @$_;
192 if ($mark & $mask) { 397 if ($mark & $mask) {
193 $img->composite ( 398 $img->composite (
194 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2, 399 $base, (int ($size / 4)) x2, (ceil ($size / 2 + 1)) x2, ($size / 4) x2,
195 $size / $img->get_width / 2, $size / $img->get_height / 2, 400 $size / $img->get_width / 2, $size / $img->get_height / 2,
196 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, 192 401 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
197 ); 402 );
198 } 403 }
199 } 404 }
200 405
201 # and lastly any markers 406 # and lastly any markers
205 [MARK_TRIANGLE, $::triangle_img[$dark_bg]], 410 [MARK_TRIANGLE, $::triangle_img[$dark_bg]],
206 [MARK_SQUARE, $::square_img[$dark_bg]]) { 411 [MARK_SQUARE, $::square_img[$dark_bg]]) {
207 my ($mask, $img) = @$_; 412 my ($mask, $img) = @$_;
208 if ($mark & $mask) { 413 if ($mark & $mask) {
209 $img->composite ( 414 $img->composite (
210 $base, 0, 0, $size, $size, -0.5, -0.5, 415 $base, 0, 0, $size, $size, 0, 0,
211 $size / $img->get_width, $size / $img->get_height, 416 $size / $img->get_width, $size / $img->get_height,
212 $::config->{speed} ? INTERP_NEAREST : INTERP_HYPER, 255 417 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
213 ); 418 );
214 } 419 }
215 } 420 }
216 421
217 push @$$c, $base; 422 push @$$c, $base;
236 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5; 441 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
237 $y -= $height * 0.5; 442 $y -= $height * 0.5;
238 443
239 for (@c) { 444 for (@c) {
240 my $w = $_->get_width * $s; 445 my $w = $_->get_width * $s;
446 # +2 == don't fight the rounding
241 $_->composite ($pixbuf, 447 $_->composite ($pixbuf,
242 $x, $y, $w+0.999, $height+0.999, $x, $y, $s, $s, 448 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
243 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255); 449 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
244 450
245 $x += $w + $spacing; 451 $x += $w + $spacing;
246 } 452 }
247 } 453 }
248} 454}
249 455
250sub pixbuf_rect { 456sub pixbuf_rect {
251 my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_; 457 my ($pb, $colour, $x1, $y1, $x2, $y2, $alpha) = @_;
252 # we fake lines by... an unspeakable method :/ 458 # we fake lines by... a horrible method :/
253 my $colour_pb = new_pixbuf 1, 1, 0, 0; 459 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); 460 $colour_pb->composite ($pb, $x1, $y1, $x2 - $x1 + 1, $y2 - $y1 + 1, $x1, $y1, $x2 + 1, $y2 + 1,
461 INTERP_NEAREST, $alpha);
257} 462}
258 463
259sub repaint_board { 464sub repaint_board {
260 my ($self) = @_; 465 my ($self) = @_;
261 my $canvas = $self->{canvas}; 466 my $canvas = $self->{canvas};
262 my $expose_area = undef; 467 my $expose_area = undef;
263 468
264 return $expose_area unless $self->{board}; 469 return $expose_area unless $self->{board};
265 470
266 my ($w, $h) = @{$canvas->allocation}[2,3]; 471 my ($w, $h) = ($canvas->allocation->values)[2,3];
267
268 my $s = $w > $h ? $h : $w;
269
270 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
271 472
473 die "FATAL: board aspect ratio != 1" unless $w == $h;
474
475 my $s = $w;
476
477 return unless $s >= 200;
478
272 my $size = $self->{size}; 479 my $size = $self->{size};
273 480
481 # we leave enough space for the shadows.. I like smaller stones, and we
482 # do no need to do the nifty recursive screen updates that goban2 does
274 my $border = int ($s / ($size + 3) * 0.5); 483 my $border = int ($s / ($size + 3) * 0.5);
275 my $s2 = $s - $border * 2; 484 my $s2 = $s - $border * 2;
276 my $edge = int ($s2 / ($size + 1) * 0.95) - ($::config->{randomize} ? 3 : 0); 485 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
277 my $ofs = int ($edge / 2); 486 my $ofs = int ($edge / 2);
278 487
279 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size; 488 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
280 489
281 my $pixbuf; 490 my $pixbuf;
285 if ($self->{background}) { 494 if ($self->{background}) {
286 if ($oldboard = $self->{board_shown}) { 495 if ($oldboard = $self->{board_shown}) {
287 $pixbuf = $self->{pixbuf}; 496 $pixbuf = $self->{pixbuf};
288 } else { 497 } else {
289 $pixbuf = $self->{background}->copy; 498 $pixbuf = $self->{background}->copy;
290 $expose_area = [0, 0, $s, $s]; 499 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
291 } 500 }
292 } else { 501 } else {
293 $expose_area = [0, 0, $s, $s]; 502 $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s;
294 503
295 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); 504 my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height);
296 505
297 if ($s < $bw && $s < $bh) { 506 if ($s < $bw && $s < $bh) {
298 $pixbuf = new_pixbuf $s, $s, $::config->{conserve_memory} ? 0 : 1, 0; 507 $pixbuf = new_pixbuf $s, $s, 0;
299 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0); 508 $::board_img->copy_area (0, 0, $s, $s, $pixbuf, 0, 0);
300 } else { 509 } else {
301 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES; 510 $pixbuf = scale_pixbuf $::board_img, $s, $s, $::config->{speed} ? INTERP_NEAREST : INTERP_TILES;
302 } 511 }
303 512
304 my $linew = int ($s / 25 / $size); 513 my $linew = int ($s / 40 / $size);
305 514
306 # ornamental border... we have time to waste :/ 515 # ornamental border... we have time to waste :/
307 pixbuf_rect $pixbuf, "\xff\xcc\x77", 0, 0, $s-1, $linew, 255; 516 pixbuf_rect $pixbuf, 0xffcc7700, 0, 0, $s-1, $linew, 255;
308 pixbuf_rect $pixbuf, "\xff\xcc\x77", 0, 0, $linew, $s-1, 255; 517 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; 518 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; 519 pixbuf_rect $pixbuf, 0xffcc7700, 0, $s-$linew-1, $s-1, $s-1, 255;
311 520
312 for my $i (1 .. $size) { 521 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; 522 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; 523 pixbuf_rect $pixbuf, 0x44111100, $k[1] - $linew, $k[$i] - $linew, $k[$size] + $linew, $k[$i] + $linew, 192;
315 524
316 # 38 max, but we allow a bit more 525 # 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 526 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]; 527 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 528
324 533
325 $a++; 534 $a++;
326 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK... 535 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
327 } 536 }
328 537
538 # hoshi points
539 my $hoshi = sub {
540 my ($x, $y) = @_;
541 my $hs = int ($edge / 4) | 1;
542 $x = $k[$x] - $hs / 2; $y = $k[$y] - $hs / 2;
543
544 # we use the shadow mask... not perfect, but I want to finish this
545 $::shadow_img->composite ($pixbuf,
546 $x, $y, $hs + 1, $hs + 1, $x, $y,
547 $hs / $::shadow_img->get_width, $hs / $::shadow_img->get_height,
548 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
549 };
550
551 my $h1 = $size < 10 ? 3 : 4; # corner / edge offset
552 $hoshi->($h1, $h1);
553 $hoshi->($size - $h1 + 1, $h1);
554 $hoshi->($h1, $size - $h1 + 1);
555 $hoshi->($size - $h1 + 1, $size - $h1 + 1);
556
557 if ($size % 2) { # on odd boards, also the remaining 5
558 my $h2 = ($size + 1) / 2;
559 if ($size > 10) {
560 $hoshi->($h1, $h2);
561 $hoshi->($size - $h1 + 1, $h2);
562 $hoshi->($h2, $size - $h1 + 1);
563 $hoshi->($h2, $h1);
564 }
565 # the tengen
566 $hoshi->($h2, $h2);
567 }
568
329 unless ($::config->{conserve_memory}) { 569 unless ($::config->{conserve_memory} > 1) {
330 $self->{background} = $pixbuf; 570 $self->{background} = $pixbuf;
331 $pixbuf = $pixbuf->copy; 571 $pixbuf = $pixbuf->copy;
332 } 572 }
333 } 573 }
334 574
335 $self->{pixbuf} = $pixbuf; 575 $self->{pixbuf} = $pixbuf;
336
337 # hoshi-points(!)#d#
338 # caching of empty board gfx(!)#d#
339 576
340 for my $x (1 .. $size) { 577 for my $x (1 .. $size) {
341 for my $y (1 .. $size) { 578 for my $y (1 .. $size) {
342 my $rand = ($x ^ $y ^ 0x5555); 579 my $rand = ($x ^ $y ^ 0x5555);
343 580
357 if ($oldboard) { 594 if ($oldboard) {
358 next if $old == $mark; # no change 595 next if $old == $mark; # no change
359 596
360 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy); 597 $self->{background}->copy_area (@$area, $pixbuf, $dx, $dy);
361 $expose_area = $expose_area 598 $expose_area = $expose_area
599 ? $expose_area->union (new Gtk2::Gdk::Rectangle @$area)
362 ? Gtk2::Gdk::Rectangle->union ($expose_area, $area) 600 : new Gtk2::Gdk::Rectangle @$area;
363 : $area;
364 } 601 }
365 602
366 if ($mark) { 603 if ($mark) {
367 my $pb = $self->create_stack($mark, $edge, $rand); 604 my $pb = $self->create_stack($mark, $edge, $rand);
368 605
380 } 617 }
381 pixbuf_text $pixbuf, $white, 618 pixbuf_text $pixbuf, $white,
382 $k[$x], $k[$y], $ofs * 0.7, 619 $k[$x], $k[$y], $ofs * 0.7,
383 $self->{board}{label}[$x-1][$y-1]; 620 $self->{board}{label}[$x-1][$y-1];
384 } 621 }
385
386 # old pixmap&mask-way. that was fast ;(
387 #my ($pm, $bm) = $self->create_stack($gc, $mark, $edge, $x * 17 + $y * 11 );
388
389 #$gc->set_clip_mask ($bm);
390 #$gc->set_clip_origin ($dx, $dy);
391 #$pixmap->draw_pixmap ($gc, $pm, 0, 0, $dx, $dy, $edge, $edge);
392 } 622 }
393 } 623 }
394 } 624 }
395 625
396 $self->{board_shown} = Storable::dclone $self->{board}; 626 $self->{board_shown} = Storable::dclone $self->{board};
398 #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable"; 628 #Storable::nstore { board => $self->{board}, size => $self->{size}, path => $self->{path}}, "testboard.storable";
399 629
400 $expose_area; 630 $expose_area;
401} 631}
402 632
403sub expose { 633sub redraw {
404 my ($self, $area) = @_; 634 my ($self, $area) = @_;
405 635
406 if ($area && $self->{pixbuf}) { 636 if ($area && $self->{pixbuf}) {
407 my ($x, $y, $w, $h) = @$area; 637 my ($x, $y, $w, $h) = $area->values;
408 my ($ox, $oy, $s) = @{$self->{offsets}};
409 638
410 $self->{pixbuf}->render_to_drawable ($self->{canvas}->window, $self->{canvas}->style->white_gc, 639 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
411 $x, $y, $x + $ox, $y + $oy, $w, $h); 640 $x, $y, $x, $y, $w, $h,
641 "normal", 0, 0);
412 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0, 642 $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; 643 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
644 }
645}
414 646
415 #$self->{canvas}->window->draw_pixmap ( 647sub update_board {
416 # $self->{canvas}->style->white_gc, 648 my ($self) = @_;
417 # $self->{pixmap}, 649 return unless $self->{path};
418 # $x - $ox, $y - $oy, $x, $y, $w, $h, 650
651 my $move = int $self->{moveadj}->get_value;
652
653 warn "update_board called $move\n";#d#
654
655 my $running = $move == @{$self->{path}};
656
657 $self->{board_label}->set_text ("Move $move");
658
659 $self->{board} = new KGS::Game::Board $self->{size};
660 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
661
662 for my $colour (WHITE, BLACK) {
663 $self->{userpanel}[$colour]->set_state (
664 $self->{board}{captures}[$colour],
665 $self->{board}{timer}[$colour],
666 ($running && $self->{lastmove_colour} == !$colour)
667 ? $self->{lastmove_time} : 0
419 #); 668 );
420 } 669 }
421}
422 670
423sub expose_event { 671 $self->redraw ($self->repaint_board);
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} 672}
438 673
439sub event_update_tree { 674sub event_update_tree {
440 my ($self) = @_; 675 my ($self) = @_;
441 676
442 $self->{path} = $self->get_path; 677 $self->{path} = $self->get_path;
443
444 my $move = @{$self->{path}};
445 678
446 $self->{moveadj}->upper($move); 679 if ($self->{moveadj}) {
680 my $upper = $self->{moveadj}->upper;
681 my $pos = $self->{moveadj}->get_value;
447 682
448 if ($self->{moveadj}->value >= $move - 1 || !$self->{moveadj}->value) { 683 $self->{moveadj}->upper (scalar @{$self->{path}});
684
685 warn "UPDATE_TREE $pos,$upper";#d#
449 $self->{moveadj}->value ($move); 686 $self->{moveadj}->changed;
687 if ($pos == $upper) {
688 $self->{moveadj}->set_value (scalar @{$self->{path}});
689 } else {
450 $self->{moveadj}->value_changed; 690 $self->{moveadj}->value_changed;
691 }
451 } 692 }
693}
694
695sub event_update_comments {
696 my ($self, $node, $comment, $newnode) = @_;
697 $self->SUPER::event_update_comments($node, $comment, $newnode);
698
699 my $text;
700
701 $text .= "\n<header>Move <move>$node->{move}</move>, Node <node>$node->{id}</node></header>"
702 if $newnode;
703
704 for (split /\n/, $comment) {
705 $text .= "\n";
706 if (s/^([0-9a-zA-Z]+ \[[0-9dkp\?\-]+\])://) {
707 $text .= "<user>" . (util::toxml $1) . "</user>:";
708 }
709
710 # coords only for 19x19 so far
711 $_ = util::toxml $_;
712 s{
713 (
714 \b
715 (?:[bw])?
716 [, ]{0,2}
717 [a-hj-t] # valid for upto 19x19
718 \s?
719 [1-9]?[0-9]
720 \b
721 )
722 }{
723 "<coord>$1</coord>";
724 }sgexi;
725
726 $text .= $_;
727 }
728
729 $self->{text}->append_text ($text);
730}
731
732sub event_join {
733 my ($self) = @_;
734 $self->SUPER::event_join;
452} 735}
453 736
454sub event_part { 737sub event_part {
455 my ($self) = @_; 738 my ($self) = @_;
456 $self->SUPER::event_part; 739 $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}};
459} 740}
460 741
461sub event_move { 742sub event_move {
462 my ($self, $pass) = @_; 743 my ($self, $pass) = @_;
463 sound::play 1, $pass ? "pass" : "move"; 744 sound::play 1, $pass ? "pass" : "move";
464} 745}
465 746
466sub DESTROY {#d# 747sub event_update_game {
467 warn "DESTROY(@_)\n";#d# 748 my ($self) = @_;
749 $self->SUPER::event_update_game;
750
751 $self->{user}[BLACK] = $self->{user1};
752 $self->{user}[WHITE] = $self->{user2};
753
754 # show board
755
756 $self->{left}->remove ($_) for $self->{left}->get_children;
757 if ($self->is_valid) {
758 $self->{left}->add ($self->{boardbox});
759 (delete $self->{challenge})->destroy if $self->{challenge};
760 } else {
761 $self->{left}->add ($self->{challenge}->widget);
762 }
763 $self->{left}->show_all;
764
765 # view text
766
767 $text = "\n<header>Game Update</header>";
768
769 $text .= "\nType: " . (util::toxml $gametype{$self->type})
770 . " (" . (util::toxml $gameopt{$self->option}) . ")";
771 $text .= "\nFlags:";
772 $text .= " valid" if $self->is_valid;
773 $text .= " adjourned" if $self->is_adjourned;
774 $text .= " scored" if $self->is_scored;
775 $text .= " saved" if $self->is_saved;
776
777 $text .= "\nWhite: <user>" . (util::toxml $self->{user2}->as_string) . "</user>";
778 $text .= "\nBlack: <user>" . (util::toxml $self->{user1}->as_string) . "</user>";
779 $text .= "\nOwner: <user>" . (util::toxml $self->{user3}->as_string) . "</user>" if $self->{user3}->is_valid;
780
781 if ($self->is_valid) {
782 $text .= "\nHandicap: " . $self->{handicap};
783 $text .= "\nKomi: " . $self->{komi};
784 $text .= "\nSize: " . $self->size_string;
785 }
786
787 $self->{text}->append_text ("<infoblock>$text</infoblock>");
788}
789
790sub event_update_rules {
791 my ($self, $rules) = @_;
792
793 $self->{userpanel}[$_]->configure ($self->{user}[$_], $rules)
794 for BLACK, WHITE;
795
796 my $text = "\n<header>Game Rules</header>";
797
798 $text .= "\nRuleset: " . $ruleset{$rules->{ruleset}};
799
800 $text .= "\nTime: ";
801
802 if ($rules->{timesys} == TIMESYS_NONE) {
803 $text .= "infinite";
804 } elsif ($rules->{timesys} == TIMESYS_ABSOLUTE) {
805 $text .= util::format_time $rules->{time};
806 } elsif ($rules->{timesys} == TIMESYS_BYO_YOMI) {
807 $text .= util::format_time $rules->{time} - $rules->{interval} * $rules->{count};
808 $text .= sprintf " + %s (%d)", util::format_time $rules->{interval}, $rules->{count};
809 } elsif ($rules->{timesys} == TIMESYS_CANADIAN) {
810 $text .= util::format_time $rules->{time};
811 $text .= sprintf " + %s/%d", util::format_time $rules->{interval}, $rules->{count};
812 }
813
814 $self->{text}->append_text ("<infoblock>$text</infoblock>");
815}
816
817sub inject_resign_game {
818 my ($self, $msg) = @_;
819
820 $self->{text}->append_text ("\n<infoblock><header>Resign</header>"
821 . "\n<user>"
822 . (util::toxml $self->{user}[$msg->{player}]->as_string)
823 . "</user> resigned.</infoblock>");
824}
825
826sub inject_final_result {
827 my ($self, $msg) = @_;
828
829 $self->{text}->append_text ("<infoblock>\n<header>Game Over</header>"
830 . "\nWhite Score " . (util::toxml $msg->{whitescore}->as_string)
831 . "\nBlack Score " . (util::toxml $msg->{blackscore}->as_string)
832 . "</infoblock>"
833 );
834}
835
836sub destroy {
837 my ($self) = @_;
838 $self->{userpanel}[$_] && (delete $self->{userpanel}[$_])->destroy
839 for BLACK, WHITE;
840 $self->SUPER::destroy;
841 delete $appwin::gamelist->{game}{$self->{channel}};
468} 842}
469 843
4701; 8441;
471 845

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines