| … | |
… | |
| 19 | my $new; |
19 | my $new; |
| 20 | |
20 | |
| 21 | my $name = $ws->{ns}->pl->ob->name; |
21 | my $name = $ws->{ns}->pl->ob->name; |
| 22 | |
22 | |
| 23 | while (my ($k, $v) = each %PLAYERINFO) { |
23 | while (my ($k, $v) = each %PLAYERINFO) { |
| 24 | my $label = $old->{$k} || do { |
24 | my $label = (delete $old->{$k}) || do { |
| 25 | my $label = $ws->new (Label => |
25 | my $label = $ws->new (Label => |
| 26 | text => $k, |
26 | text => $k, |
| 27 | fontsize => 0.2, |
27 | fontsize => 0.2, |
|
|
28 | ); |
|
|
29 | |
|
|
30 | my $marker = $ws->new (Face => |
|
|
31 | face => $ws->{ns}->find_face ("res/map-arrow.png"), |
|
|
32 | ); |
|
|
33 | my $children = [$label, $marker]; |
|
|
34 | |
|
|
35 | $ws->{canvas}->add (my $vbox = $ws->new (VBox => |
|
|
36 | children => $children, |
| 28 | c_halign => -.5, |
37 | c_halign => -.5, |
| 29 | c_valign => -1, |
38 | c_valign => -1, |
| 30 | ); |
39 | )); |
| 31 | $ws->{canvas}->add ($label); |
40 | $vbox->{children} = $children; |
|
|
41 | |
| 32 | $label |
42 | $vbox |
| 33 | }; |
43 | }; |
| 34 | |
44 | |
| 35 | $new->{$k} = $label; |
45 | $new->{$k} = $label; |
| 36 | |
46 | |
| 37 | if ($v != $label->{prevpos}) { |
47 | if ($v != $label->{prevpos}) { |
| … | |
… | |
| 58 | x => "center", |
68 | x => "center", |
| 59 | y => "center", |
69 | y => "center", |
| 60 | has_close_button => 1, |
70 | has_close_button => 1, |
| 61 | on_delete => sub { shift->hide }, |
71 | on_delete => sub { shift->hide }, |
| 62 | on_visibility_change => sub { |
72 | on_visibility_change => sub { |
|
|
73 | warn "VCHANGE <@_>\n";#d# |
| 63 | $_[0]{visibility} = $_[1]; |
74 | $_[0]{visibility} = $_[1]; |
| 64 | update_worldmap $_[0]{ws} if $_[1]; |
75 | update_worldmap $_[0]{ws} if $_[1]; |
| 65 | }, |
76 | }, |
| 66 | ); |
77 | ); |
| 67 | |
78 | |
| 68 | my $face = cf::face::find "res/worldmap.jpg"; |
|
|
| 69 | $ns->send_face ($face); |
|
|
| 70 | $ns->flush_fx; |
|
|
| 71 | |
|
|
| 72 | $w->add (my $sw = $ws->{window} = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1)); |
79 | $w->add (my $sw = $ws->{window} = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1)); |
| 73 | $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1)); |
80 | $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1)); |
| 74 | |
81 | |
| 75 | $ws->{mapface} = $ws->new (Face => |
82 | $ws->{mapface} = $ws->new (Face => |
| 76 | expand => 1, |
83 | face => $ws->{ns}->find_face ("res/worldmap.jpg"), |
| 77 | size_w => undef, |
|
|
| 78 | size_h => undef, |
|
|
| 79 | face => $face, |
|
|
| 80 | ); |
84 | ); |
| 81 | |
85 | |
| 82 | $ws->{canvas}->add ($ws->{mapface}); |
86 | $ws->{canvas}->add ($ws->{mapface}); |
| 83 | |
87 | |
| 84 | $ws |
88 | $ws |
