… | |
… | |
23 | while (my ($k, $v) = each %PLAYERINFO) { |
23 | while (my ($k, $v) = each %PLAYERINFO) { |
24 | my $label = (delete $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}->need_face ("res/map-arrow"), |
|
|
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}) { |
… | |
… | |
41 | if $k eq $name; |
51 | if $k eq $name; |
42 | } |
52 | } |
43 | } |
53 | } |
44 | |
54 | |
45 | $ws->{labels} = $new; |
55 | $ws->{labels} = $new; |
46 | |
|
|
47 | #$_->destroy for values %$old;#d# |
|
|
48 | } |
56 | } |
49 | |
57 | |
50 | sub create_widgets { |
58 | sub create_widgets { |
51 | my ($ns) = @_; |
59 | my ($ns) = @_; |
52 | |
60 | |
… | |
… | |
65 | $_[0]{visibility} = $_[1]; |
73 | $_[0]{visibility} = $_[1]; |
66 | update_worldmap $_[0]{ws} if $_[1]; |
74 | update_worldmap $_[0]{ws} if $_[1]; |
67 | }, |
75 | }, |
68 | ); |
76 | ); |
69 | |
77 | |
70 | my $face = cf::face::find "res/worldmap.jpg"; |
|
|
71 | $ns->send_face ($face); |
|
|
72 | $ns->flush_fx; |
|
|
73 | |
|
|
74 | $w->add (my $sw = $ws->{window} = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1)); |
78 | $w->add (my $sw = $ws->{window} = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1)); |
75 | $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1)); |
79 | $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1)); |
76 | |
80 | |
77 | $ws->{mapface} = $ws->new (Face => |
81 | $ws->{mapface} = $ws->new (Face => |
78 | expand => 1, |
|
|
79 | size_w => undef, |
82 | size_w => undef, |
80 | size_h => undef, |
83 | size_h => undef, |
81 | face => $face, |
84 | face => $ws->{ns}->need_face ("res/worldmap"), |
82 | ); |
85 | ); |
83 | |
86 | |
84 | $ws->{canvas}->add ($ws->{mapface}); |
87 | $ws->{canvas}->add ($ws->{mapface}); |
85 | |
88 | |
86 | $ws |
89 | $ws |
… | |
… | |
102 | cf::override 1; |
105 | cf::override 1; |
103 | }, |
106 | }, |
104 | ; |
107 | ; |
105 | |
108 | |
106 | cf::async_ext { |
109 | cf::async_ext { |
|
|
110 | $Coro::current->{desc} = "worldmap updater"; |
107 | my $schedule_interval = Coro::Event->timer (after => 1); |
111 | my $schedule_interval = Coro::Event->timer (after => 1, data => cf::WF_AUTOCANCEL); |
108 | |
112 | |
109 | while () { |
113 | while () { |
110 | $schedule_interval->interval ($WORLDMAP_UPDATE_INTERVAL); |
114 | $schedule_interval->interval ($WORLDMAP_UPDATE_INTERVAL); |
111 | $schedule_interval->next; |
115 | $schedule_interval->next; |
112 | |
116 | |