… | |
… | |
13 | $self = $self->SUPER::new(@_); |
13 | $self = $self->SUPER::new(@_); |
14 | |
14 | |
15 | $self->listen($self->{conn}); |
15 | $self->listen($self->{conn}); |
16 | |
16 | |
17 | $self->{window} = new Gtk2::Window 'toplevel'; |
17 | $self->{window} = new Gtk2::Window 'toplevel'; |
18 | my $title = $self->{channel} ? $self->owner->{name}." ".$self->opponent_string : "Game Window"; |
18 | my $title = $self->{channel} ? $self->owner->as_string." ".$self->opponent_string : "Game Window"; |
19 | $self->{window}->set_title("KGS Game $title"); |
19 | $self->{window}->set_title("KGS Game $title"); |
20 | gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; |
20 | gtk::state $self->{window}, "game::window", undef, window_size => [600, 500]; |
21 | |
21 | |
22 | $self->{window}->signal_connect(delete_event => sub { |
22 | $self->{window}->signal_connect(delete_event => sub { |
23 | if ($self->{joined}) { |
23 | if ($self->{joined}) { |
… | |
… | |
33 | |
33 | |
34 | $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); |
34 | $self->{hpane}->pack1((my $vbox = new Gtk2::VBox), 1, 1); |
35 | |
35 | |
36 | $vbox->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); |
36 | $vbox->pack_start((my $frame = new Gtk2::Frame), 0, 1, 0); |
37 | |
37 | |
38 | # grrr... |
|
|
39 | { |
38 | { |
|
|
39 | # grrr... |
40 | $frame->add(my $vbox = new Gtk2::VBox); |
40 | $frame->add(my $vbox = new Gtk2::VBox); |
41 | $vbox->add($self->{title} = new Gtk2::Label $title); |
41 | $vbox->add($self->{title} = new Gtk2::Label $title); |
42 | |
42 | |
43 | $self->{moveadj} = new Gtk2::Adjustment 0, 0, 1, 0.01, 0.1, 0; |
43 | $self->{moveadj} = new Gtk2::Adjustment 1, 0, 1, 0.001, 0.05, 0; |
44 | |
44 | |
45 | $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); |
45 | $vbox->add(my $scale = new Gtk2::HScale $self->{moveadj}); |
46 | $scale->set_draw_value (0); |
46 | $scale->set_draw_value (0); |
47 | |
47 | |
48 | $self->{moveadj}->signal_connect (value_changed => sub { |
48 | $self->{moveadj}->signal_connect (value_changed => sub { |
… | |
… | |
57 | |
57 | |
58 | $self->{text}->set_text(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}); |
59 | }); |
59 | }); |
60 | } |
60 | } |
61 | |
61 | |
62 | #Gtk2::Widget->push_visual (Gtk2::Gdk::Rgb->get_visual); #d# gdk_rgb_* not yet implemented(?) |
|
|
63 | #Gtk2::Widget->push_colormap (Gtk2::Gdk::Rgb->get_cmap); |
|
|
64 | $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0); |
62 | $vbox->pack_start(($self->{canvas} = new Gtk2::DrawingArea), 1, 1, 0); |
65 | #Gtk2::Widget->pop_colormap; |
|
|
66 | #Gtk2::Widget->pop_visual; |
|
|
67 | |
63 | |
68 | $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); |
64 | $self->{canvas}->signal_connect(configure_event => \&configure_event, $self); |
69 | $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); |
65 | $self->{canvas}->signal_connect(expose_event => \&expose_event, $self); |
70 | |
66 | |
71 | $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0); |
67 | $self->{hpane}->pack2(($self->{vpane} = new Gtk2::VPaned), 0, 0); |
… | |
… | |
78 | $sw->add(($self->{userlist} = new gtk::userlist)->widget); |
74 | $sw->add(($self->{userlist} = new gtk::userlist)->widget); |
79 | |
75 | |
80 | $self->{vpane}->add(my $vbox = new Gtk2::VBox); |
76 | $self->{vpane}->add(my $vbox = new Gtk2::VBox); |
81 | |
77 | |
82 | $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0); |
78 | $vbox->pack_start((my $sw = new Gtk2::ScrolledWindow), 1, 1, 0); |
83 | $sw->set_policy("automatic", "always"); |
79 | $sw->set_policy("never", "always"); |
84 | |
80 | |
85 | $sw->add(($self->{text} = new gtk::text)->widget); |
81 | $sw->add(($self->{text} = new gtk::text)->widget); |
86 | |
82 | |
87 | $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); |
83 | $vbox->pack_start(($self->{entry} = new Gtk2::Entry), 0, 1, 0); |
88 | $self->{entry}->signal_connect(activate => sub { |
84 | $self->{entry}->signal_connect(activate => sub { |
89 | my $text = $self->{entry}->get_text; |
85 | my $text = $self->{entry}->get_text; |
90 | # add message |
86 | $self->say($text) if $text =~ /\S/; |
91 | $self->{entry}->set_text(""); |
87 | $self->{entry}->set_text(""); |
92 | }); |
88 | }); |
93 | |
89 | |
94 | $self; |
90 | $self; |
95 | } |
91 | } |
… | |
… | |
119 | delete $self->{stack}; |
115 | delete $self->{stack}; |
120 | delete $self->{pixbuf}; |
116 | delete $self->{pixbuf}; |
121 | delete $self->{board_shown}; |
117 | delete $self->{board_shown}; |
122 | delete $self->{background}; |
118 | delete $self->{background}; |
123 | $self->repaint_board; |
119 | $self->repaint_board; |
124 | 1; |
120 | 0; |
|
|
121 | } |
|
|
122 | |
|
|
123 | sub 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; |
125 | } |
137 | } |
126 | |
138 | |
127 | # something Gtk2 fixed |
139 | # something Gtk2 fixed |
128 | sub INTERP_NEAREST (){ 'nearest' } |
140 | sub INTERP_NEAREST (){ 'nearest' } |
129 | sub INTERP_TILES (){ 'tiles' } |
141 | sub INTERP_TILES (){ 'tiles' } |
… | |
… | |
179 | [MARK_GRAY_B, 128], |
191 | [MARK_GRAY_B, 128], |
180 | [MARK_GRAY_W, 128]) { |
192 | [MARK_GRAY_W, 128]) { |
181 | my ($mask, $alpha) = @$_; |
193 | my ($mask, $alpha) = @$_; |
182 | if ($mark & $mask) { |
194 | if ($mark & $mask) { |
183 | $stone->composite ( |
195 | $stone->composite ( |
184 | $base, 0, 0, $size, $size, -0.5, -0.5, |
196 | $base, 0, 0, $size, $size, 0, 0, |
185 | $size / $stone->get_width, $size / $stone->get_height, |
197 | $size / $stone->get_width, $size / $stone->get_height, |
186 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha |
198 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, $alpha |
187 | ); |
199 | ); |
188 | } |
200 | } |
189 | } |
201 | } |
… | |
… | |
192 | for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], |
204 | for ([MARK_SMALL_B, $::black_img[$rand % @::black_img]], |
193 | [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { |
205 | [MARK_SMALL_W, $::white_img[$rand % @::white_img]]) { |
194 | my ($mask, $img) = @$_; |
206 | my ($mask, $img) = @$_; |
195 | if ($mark & $mask) { |
207 | if ($mark & $mask) { |
196 | $img->composite ( |
208 | $img->composite ( |
197 | $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) x 2, |
198 | $size / $img->get_width / 2, $size / $img->get_height / 2, |
210 | $size / $img->get_width / 2, $size / $img->get_height / 2, |
199 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 |
211 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 192 |
200 | ); |
212 | ); |
201 | } |
213 | } |
202 | } |
214 | } |
… | |
… | |
240 | $y -= $height * 0.5; |
252 | $y -= $height * 0.5; |
241 | |
253 | |
242 | for (@c) { |
254 | for (@c) { |
243 | my $w = $_->get_width * $s; |
255 | my $w = $_->get_width * $s; |
244 | $_->composite ($pixbuf, |
256 | $_->composite ($pixbuf, |
245 | $x, $y, $w+0.999, $height+0.999, $x, $y, $s, $s, |
257 | $x, $y, $w+1, $height+1, $x, $y, $s, $s, |
246 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255); |
258 | $::config->{speed} ? INTERP_NEAREST : INTERP_BILINEAR, 255); |
247 | |
259 | |
248 | $x += $w + $spacing; |
260 | $x += $w + $spacing; |
249 | } |
261 | } |
250 | } |
262 | } |
… | |
… | |
266 | return $expose_area unless $self->{board}; |
278 | return $expose_area unless $self->{board}; |
267 | |
279 | |
268 | my ($w, $h) = ($canvas->allocation->values)[2,3]; |
280 | my ($w, $h) = ($canvas->allocation->values)[2,3]; |
269 | |
281 | |
270 | my $s = $w > $h ? $h : $w; |
282 | my $s = $w > $h ? $h : $w; |
|
|
283 | |
|
|
284 | return unless $s > 128; |
271 | |
285 | |
272 | $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s]; |
286 | $self->{offsets} = [int (($w - $s) / 2), int (($h - $s) / 2), $s]; |
273 | |
287 | |
274 | my $size = $self->{size}; |
288 | my $size = $self->{size}; |
275 | |
289 | |
276 | my $border = int ($s / ($size + 3) * 0.5); |
290 | my $border = int ($s / ($size + 3) * 0.5); |
277 | my $s2 = $s - $border * 2; |
291 | my $s2 = $s - $border * 2; |
278 | my $edge = int ($s2 / ($size + 1) * 0.95) - ($::config->{randomize} ? 3 : 0); |
292 | my $edge = int ($s2 / ($size + 1) * 0.96) - ($::config->{randomize} ? 3 : 0); |
279 | my $ofs = int ($edge / 2); |
293 | my $ofs = int ($edge / 2); |
280 | |
294 | |
281 | my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size; |
295 | my @k = map int ($s2 * $_ / ($size+1) + $border + 0.5), 0 .. $size; |
282 | |
296 | |
283 | my $pixbuf; |
297 | my $pixbuf; |
… | |
… | |
287 | if ($self->{background}) { |
301 | if ($self->{background}) { |
288 | if ($oldboard = $self->{board_shown}) { |
302 | if ($oldboard = $self->{board_shown}) { |
289 | $pixbuf = $self->{pixbuf}; |
303 | $pixbuf = $self->{pixbuf}; |
290 | } else { |
304 | } else { |
291 | $pixbuf = $self->{background}->copy; |
305 | $pixbuf = $self->{background}->copy; |
292 | $expose_area = [0, 0, $s, $s]; |
306 | $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s; |
293 | } |
307 | } |
294 | } else { |
308 | } else { |
295 | $expose_area = [0, 0, $s, $s]; |
309 | $expose_area = new Gtk2::Gdk::Rectangle 0, 0, $s, $s; |
296 | |
310 | |
297 | my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); |
311 | my ($bw, $bh) = ($::board_img->get_width, $::board_img->get_height); |
298 | |
312 | |
299 | if ($s < $bw && $s < $bh) { |
313 | if ($s < $bw && $s < $bh) { |
300 | $pixbuf = new_pixbuf $s, $s, 0; |
314 | $pixbuf = new_pixbuf $s, $s, 0; |
… | |
… | |
415 | $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0, |
429 | $self->{canvas}->window->draw_rectangle ($self->{canvas}->style->black_gc, 0, |
416 | $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; |
417 | } |
431 | } |
418 | } |
432 | } |
419 | |
433 | |
420 | sub expose_event { |
|
|
421 | my ($widget, $event, $self) = @_; |
|
|
422 | |
|
|
423 | $self->{pixbuf} or return; |
|
|
424 | |
|
|
425 | my $area = $event->area; |
|
|
426 | my ($ox, $oy, $s) = @{$self->{offsets}}; |
|
|
427 | |
|
|
428 | $self->redraw ( |
|
|
429 | (new Gtk2::Gdk::Rectangle $area->x - $ox, $area->y - $oy, $area->width, $area->height) |
|
|
430 | ->intersect(new Gtk2::Gdk::Rectangle 0, 0, $s, $s) |
|
|
431 | ); |
|
|
432 | |
|
|
433 | 1; |
|
|
434 | } |
|
|
435 | |
|
|
436 | sub event_update_tree { |
434 | sub event_update_tree { |
437 | my ($self) = @_; |
435 | my ($self) = @_; |
438 | |
436 | |
439 | $self->{path} = $self->get_path; |
437 | $self->{path} = $self->get_path; |
440 | |
|
|
441 | $self->{moveadj}->value_changed (); |
438 | $self->{moveadj}->value_changed if $self->{moveadj}; |
442 | } |
439 | } |
443 | |
440 | |
444 | sub event_part { |
441 | sub event_part { |
445 | my ($self) = @_; |
442 | my ($self) = @_; |
446 | $self->SUPER::event_part; |
443 | $self->SUPER::event_part; |