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.6 by pcg, Sat May 31 14:55:55 2003 UTC vs.
Revision 1.25 by pcg, Sun Jun 1 11:02:41 2003 UTC

1package game::goclock;
2
3use Time::HiRes ();
4
5use KGS::Constants;
6
7use base gtk::widget;
8
9sub new {
10 my $class = shift;
11 my $self = $class->SUPER::new(@_);
12
13 $self->{widget} = new Gtk2::Label;
14
15 $self->{set} = sub { };
16 $self->{format} = sub { "ERROR" };
17
18 $self;
19}
20
21sub append_text {
22 my ($self, $text) = @_;
23
24 $self->{buffer}->insert ($self->{buffer}->get_end_iter, $text);
25}
26
27sub format_time {
28 my ($time) = @_;
29
30 $time > 60*60
31 ? sprintf "%d:%02d:%02d", $time / (60 * 60), $time / 60 % 60, $time % 60
32 : sprintf "%d:%02d", $time / 60 % 60, $time % 60;
33}
34
35sub set_rules {
36 my ($self, $timesys, $main, $interval, $count) = @_;
37
38 if ($timesys == TIMESYS_ABSOLUTE) {
39 $self->{set} = sub { $self->{time} = $_[0] };
40 $self->{format} = sub { format_time $_[0] };
41
42 } elsif ($timesys == TIMESYS_BYO_YOMI) {
43 my $low = $interval * $count;
44
45 $self->{set} = sub { $self->{time} = $_[0] };
46
47 $self->{format} = sub {
48 if ($_[0] > $low) {
49 format_time $_[0];
50 } else {
51 sprintf "%s (%d)", (format_time int ($_[0] % $interval) || $interval), $_[0] / $interval;
52 }
53 };
54
55 } elsif ($timesys == TIMESYS_CANADIAN) {
56 my $low = $interval;
57
58 $self->{set} = sub { $self->{time} = $_[0]; $self->{moves} = $_[1] };
59
60 $self->{format} = sub {
61 if ($_[0] > $low) {
62 format_time $_[0];
63 } else {
64 sprintf "%s / %d", (format_time int($_[0] % $interval) || $interval), $self->{moves};
65 }
66 };
67
68 } else {
69 # none, or unknown
70 $self->{set} = sub { };
71 $self->{format} = sub { "---" }
72 }
73}
74
75sub refresh {
76 my ($self, $timestamp) = @_;
77 my $timer = $self->{time} + $self->{start} - $timestamp;
78 $self->{widget}->set_text ($self->{format}->($timer));
79
80 $timer - int $timer;
81}
82
83sub set_time {
84 my ($self, $time) = @_;
85
86 $self->{start} = $time->[0];
87 $self->{set}->($time->[1], $time->[2]);
88
89 $self->refresh ($time->[0]);
90}
91
92sub start {
93 my ($self) = @_;
94
95 return if $self->{timeout};
96
97 my $timeout; $timeout = sub {
98 my $next = int ($self->refresh (Time::HiRes::time) * 1000);
99 $self->{timeout} = add Glib::Timeout $next, $timeout;
100 0;
101 };
102
103 $timeout->();
104}
105
106sub stop {
107 my ($self) = @_;
108
109 remove Glib::Source delete $self->{timeout} if $self->{timeout};
110}
111
112sub destroy {
113 my ($self) = @_;
114 $self->stop;
115 $self->SUPER::destroy;
116}
117
118package game::userpanel;
119
120use base gtk::widget;
121
122sub new {
123 my $class = shift;
124 my $self = $class->SUPER::new(@_);
125
126 $self->{widget} = new Gtk2::VBox;
127
128 $self->{widget}->add ($self->{name} = new Gtk2::Label $self->{name});
129 $self->{widget}->add ($self->{info} = new Gtk2::Label "");
130 $self->{widget}->add (($self->{clock} = new game::goclock)->widget);
131
132 $self;
133}
134
135sub set_rules {
136 my ($self, $rules) = @_;
137
138 $self->{name}->set_text ($rules->{player}[$self->{colour}]);
139 $self->{clock}->set_rules (@{$rules->{rules}}{qw(timesys time interval count)});
140}
141
142sub set_state {
143 my ($self, $captures, $timer, $running) = @_;
144
145 $self->{clock}->set_time ($timer);
146 $running ? $self->{clock}->start : $self->{clock}->stop;
147 $self->{info}->set_text ("$captures pris.");
148}
149
1package game; 150package game;
2 151
3use KGS::Constants; 152use KGS::Constants;
4use KGS::Game::Board; 153use KGS::Game::Board;
5 154
6use base KGS::Listener::Game; 155use base KGS::Listener::Game;
7use base KGS::Game; 156use base KGS::Game;
8 157
9use base gtk::widget; 158use base gtk::widget;
159
160use POSIX qw(ceil);
10 161
11sub new { 162sub new {
12 my $self = shift; 163 my $self = shift;
13 $self = $self->SUPER::new(@_); 164 $self = $self->SUPER::new(@_);
14 165
… …
18 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window"; 169 my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window";
19 $self->{window}->set_title("KGS Game $title"); 170 $self->{window}->set_title("KGS Game $title");
20 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; 171 gtk::state $self->{window}, "game::window", undef, window_size => [600, 500];
21 172
22 $self->{window}->signal_connect(delete_event => sub { 173 $self->{window}->signal_connect(delete_event => sub {
23 if ($self->{joined}) {
24 $self->part; 174 $self->part;
25 } else { 175 $self->destroy;
26 $self->event_part;
27 }
28 1; 176 1;
29 }); 177 });
30 178
31 $self->{window}->add($self->{hpane} = new Gtk2::HPaned); 179 $self->{window}->add($self->{hpane} = new Gtk2::HPaned);
32 gtk::state $self->{hpane}, "game::hpane", undef, position => 500; 180 gtk::state $self->{hpane}, "game::hpane", undef, position => 500;
… …
38 { 186 {
39 # grrr... 187 # grrr...
40 $frame->add(my $vbox = new Gtk2::VBox); 188 $frame->add(my $vbox = new Gtk2::VBox);
41 $vbox->add($self->{title} = new Gtk2::Label $title); 189 $vbox->add($self->{title} = new Gtk2::Label $title);
42 190
43 $self->{moveadj} = new Gtk2::Adjustment 1, 0, 1, 0.01, 0.1, 0; 191 $self->{moveadj} = new Gtk2::Adjustment 1, 0, 1, 0.001, 0.05, 0;
44 192
45 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); 193 $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj});
46 $scale->set_draw_value (0); 194 $scale->set_draw_value (0);
47 195
48 $self->{moveadj}->signal_connect (value_changed => sub { 196 $self->{moveadj}->signal_connect (value_changed => sub { $self->update_board });
49 return unless $self->{path};
50
51 my $move = int (@{$self->{path}} * $_[0]->get_value);
52
53 $self->{board} = new KGS::Game::Board $self->{size};
54 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
55
56 $self->redraw ($self->repaint_board);
57
58 $self->{text}->set_text(KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
59 });
60 } 197 }
61 198
62 $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0); 199 $vbox->pack_start((my $aspect_frame = new Gtk2::AspectFrame "", 0.5, 0.5, 1, 0), 1, 1, 0);
200 $aspect_frame->set (border_width => 0, shadow_type => 'none', label_xalign => 0.5);
201 $self->{board_label} = $aspect_frame->get_label_widget;
202
203 $aspect_frame->add($self->{canvas} = new Gtk2::DrawingArea);
204 $self->{canvas}->double_buffered (0) if $::config->{conserve_memory};
63 205
64 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); 206 $self->{canvas}->signal_connect(configure_event => \&configure_event, $self);
65 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); 207 $self->{canvas}->signal_connect(expose_event => \&expose_event, $self);
208
209 # RIGHT PANE
66 210
67 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0); 211 $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0);
68 $self->{hpane}->set(position_set => 1); 212 $self->{hpane}->set(position_set => 1);
69 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80; 213 gtk::state $self->{vpane}, "game::vpane", $self->{name}, position => 80;
70 214
71 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow); 215 $self->{vpane}->add(my $sw = new Gtk2::ScrolledWindow);
72 $sw->set_policy("automatic", "always"); 216 $sw->set_policy("automatic", "always");
73 217
74 $sw->add(($self->{userlist} = new gtk::userlist)->widget); 218 $sw->add(($self->{userlist} = new userlist)->widget);
75 219
76 $self->{vpane}->add(my $vbox = new Gtk2::VBox); 220 $self->{vpane}->add(my $vbox = new Gtk2::VBox);
221
222 $vbox->pack_start((my $hbox = new Gtk2::HBox 1), 0, 1, 0);
223 $hbox->add (($self->{user0} = new game::userpanel colour => WHITE)->widget);
224 $hbox->add (($self->{user1} = new game::userpanel colour => BLACK)->widget);
77 225
78 $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0); 226 $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0);
79 $sw->set_policy("automatic", "always"); 227 $sw->set_policy("never", "always");
80 228
81 $sw->add(($self->{text} = new gtk::text)->widget); 229 $sw->add(($self->{text} = new gtk::text)->widget);
82 230
83 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); 231 $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0);
84 $self->{entry}->signal_connect(activate => sub { 232 $self->{entry}->signal_connect(activate => sub {
85 my $text = $self->{entry}->get_text; 233 my $text = $self->{entry}->get_text;
86 # add message 234 $self->say($text) if $text =~ /\S/;
87 $self->{entry}->set_text(""); 235 $self->{entry}->set_text("");
88 }); 236 });
89 237
90 $self; 238 $self;
91} 239}
92 240
93sub event_update_users { 241sub event_update_users {
94 my ($self) = @_; 242 my ($self, $add, $update, $remove) = @_;
95 243
96 $self->{userlist}->update($self->{users}); 244 $self->{userlist}->update ($add, $update, $remove);
97} 245}
98 246
99sub join { 247sub join {
100 my ($self) = @_; 248 my ($self) = @_;
249 return if $self->{joined};
250
101 $self->SUPER::join; 251 $self->SUPER::join;
102 252
103 $self->{window}->show_all; 253 $self->{window}->show_all;
104} 254}
105 255
106sub part { 256sub part {
107 my ($self) = @_; 257 my ($self) = @_;
258
108 $self->SUPER::part; 259 $self->SUPER::part;
109 260 $self->destroy;
110 $self->{window}->hide;
111} 261}
112 262
113sub configure_event { 263sub configure_event {
114 my ($widget, $event, $self) = @_; 264 my ($widget, $event, $self) = @_;
115 delete $self->{stack}; 265 delete $self->{stack};
… …
124 my ($widget, $event, $self) = @_; 274 my ($widget, $event, $self) = @_;
125 275
126 $self->{pixbuf} or return; 276 $self->{pixbuf} or return;
127 277
128 my $area = $event->area; 278 my $area = $event->area;
129 my ($ox, $oy, $s) = @{$self->{offsets}};
130 279
131 $self->redraw ( 280 $self->redraw ($area);
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 281
136 0; 282 0;
137} 283}
138 284
139# something Gtk2 fixed 285# something Gtk2 fixed
… …
176 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) { 322 for my $stone ($mark & (MARK_W | MARK_GRAY_W) ? @::white_img : @::black_img) {
177 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000; 323 my $base = new_pixbuf $size + $shadow, $size + $shadow, 1, 0x00000000;
178 324
179 # zeroeth the shadow 325 # zeroeth the shadow
180 if ($mark & (MARK_B | MARK_W)) { 326 if ($mark & (MARK_B | MARK_W)) {
181 $::black_img[0]->composite ( 327 $::shadow_img->composite (
182 $base, $shadow, $shadow, $size, $size, $shadow-0.5, $shadow-0.5, 328 $base, $shadow, $shadow, $size, $size, $shadow - 0.5, $shadow - 0.5,
183 $size / $stone->get_width, $size / $stone->get_height, 329 $size / $stone->get_width, $size / $stone->get_height,
184 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 128 330 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192
185 ); 331 );
186 } 332 }
187 333
188 # first the big stones (handicap stones different for effect) 334 # first the big stones (handicap stones different for effect)
189 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192], 335 for ([MARK_B, $mark & MARK_MOVE ? 255 : 192],
… …
191 [MARK_GRAY_B, 128], 337 [MARK_GRAY_B, 128],
192 [MARK_GRAY_W, 128]) { 338 [MARK_GRAY_W, 128]) {
193 my ($mask, $alpha) = @$_; 339 my ($mask, $alpha) = @$_;
194 if ($mark & $mask) { 340 if ($mark & $mask) {
195 $stone->composite ( 341 $stone->composite (
196 $base, 0, 0, $size, $size, -0.5, -0.5, 342 $base, 0, 0, $size, $size, 0, 0,
197 $size / $stone->get_width, $size / $stone->get_height, 343 $size / $stone->get_width, $size / $stone->get_height,
198 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha 344 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha
199 ); 345 );
200 } 346 }
201 } 347 }
202 348
203 # then the samll stones 349 # then the small stones
204 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], 350 for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]],
205 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { 351 [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) {
206 my ($mask, $img) = @$_; 352 my ($mask, $img) = @$_;
207 if ($mark & $mask) { 353 if ($mark & $mask) {
208 $img->composite ( 354 $img->composite (
209 $base, ($size / 4) x2, (int ($size / 2 + 0.5)) x2, ($size / 4 - 0.5) x 2, 355 $base, (ceil ($size / 4)) x2, (ceil ($size / 2)) x2, (ceil ($size / 4)) x2,
210 $size / $img->get_width / 2, $size / $img->get_height / 2, 356 $size / $img->get_width / 2, $size / $img->get_height / 2,
211 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 357 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 224
212 ); 358 );
213 } 359 }
214 } 360 }
215 361
216 # and lastly any markers 362 # and lastly any markers
… …
251 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5; 397 $x -= ($W * $s + $spacing * (@c - 1)) * 0.5;
252 $y -= $height * 0.5; 398 $y -= $height * 0.5;
253 399
254 for (@c) { 400 for (@c) {
255 my $w = $_->get_width * $s; 401 my $w = $_->get_width * $s;
402 # +2 == don't fight the rounding
256 $_->composite ($pixbuf, 403 $_->composite ($pixbuf,
257 $x, $y, $w+0.999, $height+0.999, $x, $y, $s, $s, 404 $x, $y, $w+2, $height+2, $x, $y, $s, $s,
258 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255); 405 $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255);
259 406
260 $x += $w + $spacing; 407 $x += $w + $spacing;
261 } 408 }
262 } 409 }
… …
276 my $expose_area = undef; 423 my $expose_area = undef;
277 424
278 return $expose_area unless $self->{board}; 425 return $expose_area unless $self->{board};
279 426
280 my ($w, $h) = ($canvas->allocation->values)[2,3]; 427 my ($w, $h) = ($canvas->allocation->values)[2,3];
428
429 die "FATAL: board aspect ratio != 1" unless $w == $h;
281 430
282 my $s = $w > $h ? $h : $w; 431 my $s = $w;
283 432
284 return unless $s > 128; 433 return unless $s >= 200;
285 434
286 $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s];
287
288 my $size = $self->{size}; 435 my $size = $self->{size};
289 436
437 # we leave enough space for the shadows.. I like smaller stones, and we
438 # do no need to do the nifty recursive screen updates that goban2 does
290 my $border = int ($s / ($size + 3) * 0.5); 439 my $border = int ($s / ($size + 3) * 0.5);
291 my $s2 = $s - $border * 2; 440 my $s2 = $s - $border * 2;
292 my $edge = int ($s2 / ($size + 1) * 0.95) - ($::config->{randomize} ? 3 : 0); 441 my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0);
293 my $ofs = int ($edge / 2); 442 my $ofs = int ($edge / 2);
294 443
295 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size; 444 my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size;
296 445
297 my $pixbuf; 446 my $pixbuf;
… …
340 489
341 $a++; 490 $a++;
342 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK... 491 $a++ if $a eq "I"; # not correct, instead of AA AB, we should get HH JJ KK...
343 } 492 }
344 493
345 unless ($::config->{conserve_memory}) { 494 unless ($::config->{conserve_memory} > 1) {
346 $self->{background} = $pixbuf; 495 $self->{background} = $pixbuf;
347 $pixbuf = $pixbuf->copy; 496 $pixbuf = $pixbuf->copy;
348 } 497 }
349 } 498 }
350 499
… …
419sub redraw { 568sub redraw {
420 my ($self, $area) = @_; 569 my ($self, $area) = @_;
421 570
422 if ($area && $self->{pixbuf}) { 571 if ($area && $self->{pixbuf}) {
423 my ($x, $y, $w, $h) = $area->values; 572 my ($x, $y, $w, $h) = $area->values;
424 my ($ox, $oy, $s) = @{$self->{offsets}};
425 573
426 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf}, 574 $self->{canvas}->window->draw_pixbuf ($self->{canvas}->style->white_gc, $self->{pixbuf},
427 $x, $y, $x + $ox, $y + $oy, $w, $h, 575 $x, $y, $x, $y, $w, $h,
428 "normal", 0, 0); 576 "normal", 0, 0);
429 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0, 577 $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0,
430 $x + $ox - 1, $y + $oy - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE; 578 $x - 1, $y - 1, $w + 2, $h + 2) if $::DEBUG_EXPOSE;
431 } 579 }
432} 580}
433 581
582sub update_board {
583 my ($self) = @_;
584 return unless $self->{path};
585
586 $self->{NOW} = Time::HiRes::time; #d# get from msg(!)
587
588 my $move = int (@{$self->{path}} * $self->{moveadj}->get_value);
589
590 my $running = $move == @{$self->{path}};
591
592 $self->{board_label}->set_text ("Move $move");
593
594 $self->{board} = new KGS::Game::Board $self->{size};
595 $self->{board}->interpret_path ([@{$self->{path}}[0 .. $move - 1]]);
596
597 $self->{user0}->set_state ($self->{board}{captures}[0],
598 $self->{board}{timer}[0],
599 $running && $self->{board}{last} == WHITE);
600 $self->{user1}->set_state ($self->{board}{captures}[1],
601 $self->{board}{timer}[1],
602 $running && $self->{board}{last} == BLACK);
603
604 $self->redraw ($self->repaint_board);
605
606 $self->{text}->set_text(KGS::Listener::Debug::dumpval([$self->{board}{time},$self->{board}{captures}]). $self->{board}{comment});
607}
608
434sub event_update_tree { 609sub event_update_tree {
435 my ($self) = @_; 610 my ($self) = @_;
436 611
437 $self->{path} = $self->get_path; 612 $self->{path} = $self->get_path;
613 $self->{user0}->set_rules ($self->{path}[0]);
614 $self->{user1}->set_rules ($self->{path}[0]);
615
438 $self->{moveadj}->value_changed if $self->{moveadj}; 616 $self->{moveadj}->value_changed if $self->{moveadj};
439} 617}
440 618
441sub event_part { 619sub event_part {
442 my ($self) = @_; 620 my ($self) = @_;
443 $self->SUPER::event_part; 621 $self->SUPER::event_part;
444 delete $appwin::gamelist->{game}{$self->{channel}};
445 $self->destroy;
446} 622}
447 623
448sub event_move { 624sub event_move {
449 my ($self, $pass) = @_; 625 my ($self, $pass) = @_;
450 sound::play 1, $pass ? "pass" : "move"; 626 sound::play 1, $pass ? "pass" : "move";
451} 627}
452 628
629sub event_update_game {
630 my ($self) = @_;
631 $self->SUPER::event_update_game;
632 warn "UPDATE GAME";#d#
633}
634
635sub destroy {
636 my ($self) = @_;
637 $self->SUPER::destroy;
638 delete $appwin::gamelist->{game}{$self->{channel}};
639}
640
4531; 6411;
454 642

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines