| … | |
… | |
| 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 | ); |
28 | ); |
| 29 | |
29 | |
| 30 | my $marker = cf::face::find "res/map-arrow.png"; |
|
|
| 31 | $ws->{ns}->send_face ($marker); |
|
|
| 32 | $ws->{ns}->flush_fx; |
|
|
| 33 | $marker = $ws->new (Face => |
30 | my $marker = $ws->new (Face => |
| 34 | size_w => undef, |
31 | face => $ws->{ns}->need_face ("res/map-arrow"), |
| 35 | size_h => undef, |
|
|
| 36 | face => $marker, |
|
|
| 37 | ); |
32 | ); |
| 38 | my $children = [$label, $marker]; |
33 | my $children = [$label, $marker]; |
| 39 | |
34 | |
| 40 | $ws->{canvas}->add (my $vbox = $ws->new (VBox => |
35 | $ws->{canvas}->add (my $vbox = $ws->new (VBox => |
| 41 | children => $children, |
36 | children => $children, |
| … | |
… | |
| 73 | x => "center", |
68 | x => "center", |
| 74 | y => "center", |
69 | y => "center", |
| 75 | has_close_button => 1, |
70 | has_close_button => 1, |
| 76 | on_delete => sub { shift->hide }, |
71 | on_delete => sub { shift->hide }, |
| 77 | on_visibility_change => sub { |
72 | on_visibility_change => sub { |
| 78 | warn "VCHANGE <@_>\n";#d# |
|
|
| 79 | $_[0]{visibility} = $_[1]; |
73 | $_[0]{visibility} = $_[1]; |
| 80 | update_worldmap $_[0]{ws} if $_[1]; |
74 | update_worldmap $_[0]{ws} if $_[1]; |
| 81 | }, |
75 | }, |
| 82 | ); |
76 | ); |
| 83 | |
77 | |
| 84 | my $face = cf::face::find "res/worldmap.jpg"; |
|
|
| 85 | $ns->send_face ($face); |
|
|
| 86 | $ns->flush_fx; |
|
|
| 87 | |
|
|
| 88 | $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)); |
| 89 | $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1)); |
79 | $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1)); |
| 90 | |
80 | |
| 91 | $ws->{mapface} = $ws->new (Face => |
81 | $ws->{mapface} = $ws->new (Face => |
| 92 | expand => 1, |
|
|
| 93 | size_w => undef, |
82 | size_w => undef, |
| 94 | size_h => undef, |
83 | size_h => undef, |
| 95 | face => $face, |
84 | face => $ws->{ns}->need_face ("res/worldmap"), |
| 96 | ); |
85 | ); |
| 97 | |
86 | |
| 98 | $ws->{canvas}->add ($ws->{mapface}); |
87 | $ws->{canvas}->add ($ws->{mapface}); |
| 99 | |
88 | |
| 100 | $ws |
89 | $ws |
| … | |
… | |
| 108 | |
97 | |
| 109 | if ($ns->{can_widget}) { |
98 | if ($ns->{can_widget}) { |
| 110 | my $ws = $ns->{ws_worldmap} ||= create_widgets $ns; |
99 | my $ws = $ns->{ws_worldmap} ||= create_widgets $ns; |
| 111 | $ws->{toplevel}->toggle_visibility; |
100 | $ws->{toplevel}->toggle_visibility; |
| 112 | } else { |
101 | } else { |
| 113 | $ns->send_msg ("log", "Your client doesn't support the (required) widget extension. Try CFPlus at http://crossfire.schmorp.de/.", cf::NDI_RED); |
102 | $ns->send_msg ("log", "Your client doesn't support the (required) widget extension. Try the deliantra client at http://www.deliantra.net/.", cf::NDI_RED); |
| 114 | } |
103 | } |
| 115 | |
104 | |
| 116 | cf::override 1; |
105 | cf::override 1; |
| 117 | }, |
106 | }, |
| 118 | ; |
107 | ; |
| 119 | |
108 | |
| 120 | cf::async_ext { |
109 | cf::async_ext { |
| 121 | my $schedule_interval = Coro::Event->timer (after => 1); |
110 | $Coro::current->{desc} = "worldmap updater"; |
| 122 | |
111 | |
| 123 | while () { |
112 | while () { |
| 124 | $schedule_interval->interval ($WORLDMAP_UPDATE_INTERVAL); |
113 | Coro::EV::timer_once $WORLDMAP_UPDATE_INTERVAL; |
| 125 | $schedule_interval->next; |
|
|
| 126 | |
114 | |
| 127 | cf::get_slot 0.01, -50, "worldmap update"; |
115 | cf::get_slot 0.01, -50, "worldmap update"; |
| 128 | |
116 | |
| 129 | ++$GENCOUNT; |
117 | ++$GENCOUNT; |
| 130 | |
118 | |
