… | |
… | |
6 | use List::Util qw(min max); |
6 | use List::Util qw(min max); |
7 | |
7 | |
8 | use CFPlus; |
8 | use CFPlus; |
9 | use CFPlus::OpenGL; |
9 | use CFPlus::OpenGL; |
10 | use CFPlus::UI; |
10 | use CFPlus::UI; |
|
|
11 | use CFPlus::Macro; |
11 | |
12 | |
12 | our @ISA = CFPlus::UI::Base::; |
13 | our @ISA = CFPlus::UI::Base::; |
13 | |
14 | |
14 | my $magicmap_tex = |
15 | my $magicmap_tex = |
15 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
16 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
… | |
… | |
19 | my $class = shift; |
20 | my $class = shift; |
20 | |
21 | |
21 | my $self = $class->SUPER::new ( |
22 | my $self = $class->SUPER::new ( |
22 | z => -1, |
23 | z => -1, |
23 | can_focus => 1, |
24 | can_focus => 1, |
24 | list => glGenList, |
25 | tilesize => 32, |
25 | |
|
|
26 | smooth_matrix => [ |
|
|
27 | 0.05, 0.13, 0.05, |
|
|
28 | 0.13, 0.30, 0.13, |
|
|
29 | 0.05, 0.13, 0.05, |
|
|
30 | ], |
|
|
31 | |
|
|
32 | @_ |
26 | @_ |
33 | ); |
27 | ); |
34 | |
28 | |
35 | $self->{completer} = new CFPlus::MapWidget::Command:: |
29 | $self->{completer} = new CFPlus::MapWidget::Command:: |
36 | command => $self->{command}, |
30 | command => $self->{command}, |
… | |
… | |
38 | ; |
32 | ; |
39 | |
33 | |
40 | $self |
34 | $self |
41 | } |
35 | } |
42 | |
36 | |
|
|
37 | sub set_tilesize { |
|
|
38 | my ($self, $tilesize) = @_; |
|
|
39 | |
|
|
40 | $self->{tilesize} = $tilesize; |
|
|
41 | } |
|
|
42 | |
43 | sub add_command { |
43 | sub add_command { |
44 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
44 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
45 | |
45 | |
46 | (my $data = $command) =~ s/\\//g; |
46 | (my $data = $command) =~ s/\\//g; |
47 | |
47 | |
… | |
… | |
59 | |
59 | |
60 | $self->{completer}->hide |
60 | $self->{completer}->hide |
61 | if $self->{completer}; |
61 | if $self->{completer}; |
62 | } |
62 | } |
63 | |
63 | |
64 | sub test_server_login { |
64 | sub server_login { |
65 | return unless |
65 | my ($server) = @_; |
66 | $::CONN && length $::CONN->{test_server}; |
|
|
67 | |
66 | |
68 | my $server = $::CONN->{test_server}; |
|
|
69 | ::stop_game (); |
67 | ::stop_game (); |
70 | local $::PROFILE->{host} = $server; |
68 | local $::PROFILE->{host} = $server; |
71 | ::start_game (); |
69 | ::start_game (); |
72 | } |
70 | } |
73 | |
71 | |
74 | sub editor_invoke { |
72 | sub editor_invoke { |
75 | return unless $::CONN; |
73 | my $editsup = $::CONN && $::CONN->{editor_support} |
|
|
74 | or return; |
76 | |
75 | |
77 | # putting the password into the env is somewhat tasteless |
76 | CFPlus::background { |
78 | local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user}; |
77 | print "preparing editor startup...\n"; |
79 | local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password}; |
|
|
80 | local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload}; |
|
|
81 | local $ENV{CROSSFIRE_MAPDIR} = $::CONN->{cvs_root}; |
|
|
82 | |
78 | |
83 | CFPlus::set_proxy; |
79 | my $server = $editsup->{gameserver} || "default"; |
|
|
80 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
84 | |
81 | |
85 | my $map = "map:$::CONN->{map_info}[0]"; |
82 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
|
|
83 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
86 | |
84 | |
87 | if (fork == 0) { |
85 | print "map directory is $mapdir\n"; |
88 | $SIG{__DIE__} = sub { |
86 | print "lib directory is $libdir\n"; |
89 | warn "@_"; |
87 | |
90 | CFPlus::_exit 99; |
88 | my $ua = CFPlus::lwp_useragent; |
|
|
89 | |
|
|
90 | for my $file (qw(archetypes crossfire.0)) { |
|
|
91 | my $url = "$editsup->{lib_root}$file"; |
|
|
92 | print "mirroring $url...\n"; |
|
|
93 | CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); |
|
|
94 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
91 | }; |
95 | } |
92 | |
96 | |
93 | # TODO: move into editor |
97 | if (1) { # upload a map |
94 | require LWP::UserAgent; |
98 | my $mapname = $::CONN->{map_info}[0]; |
95 | |
99 | |
96 | my $ua = LWP::UserAgent->new ( |
100 | my $mappath = "$mapdir/$mapname"; |
97 | agent => "cfplus $CFPlus::VERSION", |
|
|
98 | keep_alive => 1, |
|
|
99 | env_proxy => 1, |
|
|
100 | ); |
|
|
101 | |
101 | |
102 | if ($map =~ /^map:(.*)/) { |
102 | -e $mappath and die "$mappath already exists\n"; |
103 | my $mapname = $1; |
103 | |
|
|
104 | print "getting map revision for $mapname...\n"; |
|
|
105 | |
104 | # try to get the most recent head revision, what a hack |
106 | # try to get the most recent head revision, what a hack, |
|
|
107 | # this should have been returned while downloading *sigh* |
105 | my $log = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?view=log&logsort=rev")->decoded_content; |
108 | my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
106 | |
109 | |
107 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
110 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
108 | my $rev = $1; |
111 | my $rev = $1; |
109 | my $map = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?rev=$rev")->decoded_content; |
112 | |
110 | warn "revision is $rev " .(length $map)."\n";#d# |
113 | print "downloading revision $rev...\n"; |
|
|
114 | |
|
|
115 | my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
|
|
116 | |
|
|
117 | my $meta = { |
|
|
118 | %$editsup, |
|
|
119 | path => $mapname, |
|
|
120 | revision => $rev, |
|
|
121 | cf_login => $::PROFILE->{user}, |
|
|
122 | }; |
|
|
123 | |
|
|
124 | require File::Basename; |
|
|
125 | require File::Path; |
|
|
126 | |
|
|
127 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
|
|
128 | open my $fh, ">:raw:perlio", "$mappath.meta" |
|
|
129 | or die "$mappath.meta: $!\n"; |
|
|
130 | print $fh CFPlus::to_json $meta; |
|
|
131 | close $fh; |
|
|
132 | open my $fh, ">:raw:perlio:utf8", $mappath |
|
|
133 | or die "$mappath: $!\n"; |
|
|
134 | print $fh $map; |
|
|
135 | close $fh; |
|
|
136 | |
|
|
137 | print "saved as $mappath\n"; |
|
|
138 | |
|
|
139 | print "invoking editor...\n"; |
|
|
140 | exec "/root/s2/gce $mappath";#d# |
111 | |
141 | |
112 | # now upload it |
142 | # now upload it |
113 | my $comment = "some comment"; |
|
|
114 | |
|
|
115 | require HTTP::Request::Common; |
143 | # require HTTP::Request::Common; |
116 | |
144 | # |
117 | my $res = $ua->post ( |
145 | # my $res = $ua->post ( |
118 | $ENV{CFPLUS_UPLOAD}, |
146 | # $ENV{CFPLUS_UPLOAD}, |
119 | Content_Type => 'multipart/form-data', |
147 | # Content_Type => 'multipart/form-data', |
120 | Content => [ |
148 | # Content => [ |
121 | path => $mapname, |
149 | # path => $mapname, |
122 | mapdir => $ENV{CROSSFIRE_MAPDIR}, |
150 | # mapdir => $ENV{CROSSFIRE_MAPDIR}, |
123 | map => $map, |
151 | # map => $map, |
124 | revision => $rev, |
152 | # revision => $rev, |
125 | cf_login => $ENV{CFPLUS_LOGIN}, |
153 | # cf_login => $ENV{CFPLUS_LOGIN}, |
126 | cf_password => $ENV{CFPLUS_PASSWORD}, |
154 | # cf_password => $ENV{CFPLUS_PASSWORD}, |
127 | comment => "", |
155 | # comment => "", |
128 | ] |
156 | # ] |
129 | ); |
157 | # ); |
130 | |
158 | # |
131 | if ($res->is_error) { |
159 | # if ($res->is_error) { |
132 | # fatal condition |
160 | # # fatal condition |
133 | warn $res->status_line; |
161 | # warn $res->status_line; |
134 | } else { |
162 | # } else { |
135 | # script replies are marked as {{..}} |
163 | # # script replies are marked as {{..}} |
136 | my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
164 | # my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
137 | warn map "$_\n", @msgs; |
165 | # warn map "$_\n", @msgs; |
138 | } |
166 | # } |
139 | } else { |
167 | } else { |
140 | # error, could not detect revision |
168 | die "viewvc parse error, unable to detect revision\n"; |
141 | } |
169 | } |
142 | } |
170 | } |
143 | |
|
|
144 | CFPlus::_exit; |
|
|
145 | } |
171 | } |
146 | } |
172 | } |
147 | |
173 | |
148 | sub invoke_button_down { |
174 | sub invoke_button_down { |
149 | my ($self, $ev, $x, $y) = @_; |
175 | my ($self, $ev, $x, $y) = @_; |
150 | |
176 | |
151 | if ($ev->{button} == 1) { |
177 | if ($ev->{button} == 1) { |
152 | $self->grab_focus; |
178 | $self->grab_focus; |
153 | return unless $::CONN; |
179 | return unless $::CONN; |
154 | |
180 | |
155 | my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
181 | my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; |
156 | my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
182 | my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
157 | |
183 | |
158 | $x -= int 0.5 * $self->{sw}; |
184 | $x -= CFPlus::floor $::MAP->w * 0.5; |
159 | $y -= int 0.5 * $self->{sh}; |
185 | $y -= CFPlus::floor $::MAP->h * 0.5; |
160 | |
186 | |
|
|
187 | if ($::CONN) { |
161 | $::CONN->lookat ($x, $y) |
188 | $::CONN->lookat ($x, $y) |
162 | if $::CONN; |
189 | } |
163 | |
190 | |
164 | } elsif ($ev->{button} == 2) { |
191 | } elsif ($ev->{button} == 2) { |
165 | $self->grab_focus; |
192 | $self->grab_focus; |
166 | return unless $::CONN; |
193 | return unless $::CONN; |
167 | |
194 | |
… | |
… | |
177 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
204 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
178 | |
205 | |
179 | $self->update; |
206 | $self->update; |
180 | }; |
207 | }; |
181 | } elsif ($ev->{button} == 3) { |
208 | } elsif ($ev->{button} == 3) { |
182 | (new CFPlus::UI::Menu |
209 | my @items = ( |
183 | items => [ |
|
|
184 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
210 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
185 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
211 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
186 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
212 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
187 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
213 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
188 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
214 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
… | |
… | |
192 | $::PICKUP_ENABLE->{state} |
218 | $::PICKUP_ENABLE->{state} |
193 | ? "Disable automatic pickup" |
219 | ? "Disable automatic pickup" |
194 | : "Enable automatic pickup", |
220 | : "Enable automatic pickup", |
195 | sub { $::PICKUP_ENABLE->toggle } |
221 | sub { $::PICKUP_ENABLE->toggle } |
196 | ], |
222 | ], |
197 | $::CONN && length $::CONN->{cvs_root} |
223 | ); |
|
|
224 | |
|
|
225 | if ($::CONN && $::CONN->{editor_support}) { |
|
|
226 | push @items, [ |
198 | ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
227 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
199 | \&editor_invoke] |
228 | \&editor_invoke, |
200 | : (), |
229 | ]; |
201 | $::CONN && length $::CONN->{test_server} |
230 | |
|
|
231 | for my $type (qw(test name)) { |
|
|
232 | $::CONN->{editor_support}{type} ne $type |
|
|
233 | or next; |
|
|
234 | my $server = $::CONN->{editor_support}{"${type}server"} |
|
|
235 | or next; |
|
|
236 | |
|
|
237 | push @items, [ |
202 | ? ["Login on Test Server <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{test_server}) . ")</span>", |
238 | "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", |
203 | \&test_server_login] |
239 | sub { server_login $server }, |
204 | : (), |
240 | ]; |
|
|
241 | } |
|
|
242 | } |
|
|
243 | |
|
|
244 | push @items, |
205 | ["Quit", |
245 | ["Quit", |
206 | sub { |
246 | sub { |
207 | if ($::CONN) { |
247 | if ($::CONN) { |
208 | &::open_quit_dialog; |
248 | &::open_quit_dialog; |
209 | } else { |
249 | } else { |
210 | exit; |
250 | exit; |
211 | } |
|
|
212 | } |
251 | } |
213 | ], |
252 | } |
214 | ], |
253 | ], |
|
|
254 | ; |
|
|
255 | |
|
|
256 | (new CFPlus::UI::Menu |
|
|
257 | items => \@items, |
215 | )->popup ($ev); |
258 | )->popup ($ev); |
216 | } |
259 | } |
217 | |
260 | |
218 | 1 |
261 | 1 |
219 | } |
262 | } |
… | |
… | |
237 | |
280 | |
238 | 1 |
281 | 1 |
239 | } |
282 | } |
240 | |
283 | |
241 | sub size_request { |
284 | sub size_request { |
|
|
285 | my ($self) = @_; |
|
|
286 | |
242 | ( |
287 | ( |
243 | 32 * CFPlus::ceil $::WIDTH / 32, |
288 | $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize}, |
244 | 32 * CFPlus::ceil $::HEIGHT / 32, |
289 | $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize}, |
245 | ) |
290 | ) |
246 | } |
291 | } |
247 | |
292 | |
248 | sub update { |
293 | sub update { |
249 | my ($self) = @_; |
294 | my ($self) = @_; |
… | |
… | |
251 | $self->{need_update} = 1; |
296 | $self->{need_update} = 1; |
252 | $self->SUPER::update; |
297 | $self->SUPER::update; |
253 | } |
298 | } |
254 | |
299 | |
255 | my %DIR = ( |
300 | my %DIR = ( |
|
|
301 | ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"], |
256 | CFPlus::SDLK_KP8, [1, "north"], |
302 | ( "," . CFPlus::SDLK_KP8 ), [1, "north"], |
257 | CFPlus::SDLK_KP9, [2, "northeast"], |
303 | ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"], |
258 | CFPlus::SDLK_KP6, [3, "east"], |
304 | ( "," . CFPlus::SDLK_KP6 ), [3, "east"], |
259 | CFPlus::SDLK_KP3, [4, "southeast"], |
305 | ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"], |
260 | CFPlus::SDLK_KP2, [5, "south"], |
306 | ( "," . CFPlus::SDLK_KP2 ), [5, "south"], |
261 | CFPlus::SDLK_KP1, [6, "southwest"], |
307 | ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"], |
262 | CFPlus::SDLK_KP4, [7, "west"], |
308 | ( "," . CFPlus::SDLK_KP4 ), [7, "west"], |
263 | CFPlus::SDLK_KP7, [8, "northwest"], |
309 | ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"], |
264 | |
310 | |
265 | CFPlus::SDLK_UP, [1, "north"], |
311 | ( "," . CFPlus::SDLK_UP ), [1, "north"], |
|
|
312 | ("1," . CFPlus::SDLK_UP ), [2, "northeast"], |
266 | CFPlus::SDLK_RIGHT, [3, "east"], |
313 | ( "," . CFPlus::SDLK_RIGHT), [3, "east"], |
|
|
314 | ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"], |
267 | CFPlus::SDLK_DOWN, [5, "south"], |
315 | ( "," . CFPlus::SDLK_DOWN ), [5, "south"], |
|
|
316 | ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"], |
268 | CFPlus::SDLK_LEFT, [7, "west"], |
317 | ( "," . CFPlus::SDLK_LEFT ), [7, "west"], |
|
|
318 | ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"], |
269 | ); |
319 | ); |
270 | |
320 | |
271 | sub invoke_key_down { |
321 | sub invoke_key_down { |
272 | my ($self, $ev) = @_; |
322 | my ($self, $ev) = @_; |
273 | |
323 | |
… | |
… | |
275 | my $sym = $ev->{sym}; |
325 | my $sym = $ev->{sym}; |
276 | my $uni = $ev->{unicode}; |
326 | my $uni = $ev->{unicode}; |
277 | |
327 | |
278 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
328 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
279 | |
329 | |
280 | if ($uni == ord "\t") { |
330 | if ($sym == 9) { |
281 | $::PL_WINDOW->toggle_visibility; |
331 | ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility; |
282 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
332 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
283 | $::HELP_WINDOW->toggle_visibility; |
333 | $::HELP_WINDOW->toggle_visibility; |
284 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
334 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
285 | ::toggle_player_page ($::STATS_PAGE); |
335 | ::toggle_player_page ($::STATS_PAGE); |
286 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
336 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
… | |
… | |
289 | ::toggle_player_page ($::SPELL_PAGE); |
339 | ::toggle_player_page ($::SPELL_PAGE); |
290 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
340 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
291 | ::toggle_player_page ($::INVENTORY_PAGE); |
341 | ::toggle_player_page ($::INVENTORY_PAGE); |
292 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
342 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
293 | $::SETUP_DIALOG->toggle_visibility; |
343 | $::SETUP_DIALOG->toggle_visibility; |
294 | } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { |
344 | } elsif ($uni >= ord "0" && $uni <= ord "9" && $mod & CFPlus::KMOD_ALT) { |
295 | $::BIND_EDITOR->set_binding (undef, undef, [], |
345 | $::MESSAGE_WINDOW->user_switch_to_page (chr $uni); |
296 | sub { |
|
|
297 | my ($mod, $sym, $cmds) = @_; |
|
|
298 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
|
|
299 | }); |
|
|
300 | $::BIND_EDITOR->start; |
|
|
301 | $::BIND_EDITOR->show; |
|
|
302 | #TODO: elmex, what was this supposed to do? it currently crashes the client. |
|
|
303 | # } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { |
|
|
304 | # $::BIND_EDITOR->stop; |
|
|
305 | # $::BIND_EDITOR->ask_for_bind_and_commit; |
|
|
306 | # $::BIND_EDITOR->hide; |
|
|
307 | } elsif (!$::CONN) { |
346 | } elsif (!$::CONN) { |
308 | return 0; # bindings further down need a valid connection |
347 | return 0; # bindings further down need a valid connection |
309 | |
348 | |
310 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
|
|
311 | $::CONN->user_send ("stay fire"); |
|
|
312 | } elsif ($uni == ord ",") { |
349 | } elsif ($uni == ord ",") { |
313 | $::CONN->user_send ("take"); |
350 | $::CONN->user_send ("take"); |
314 | } elsif ($uni == ord " ") { |
351 | } elsif ($uni == ord " ") { |
315 | $::CONN->user_send ("apply"); |
352 | $::CONN->user_send ("apply"); |
316 | } elsif ($uni == 13) { |
353 | } elsif ($uni == 13) { |
317 | $::CONN->user_send ("examine"); |
354 | $::MESSAGE_WINDOW->activate_current; |
318 | } elsif ($uni == ord ".") { |
355 | } elsif ($uni == ord ".") { |
319 | $::CONN->user_send ($self->{completer}{last_command}) |
356 | $::CONN->user_send ($self->{completer}{last_command}) |
320 | if exists $self->{completer}{last_command}; |
357 | if exists $self->{completer}{last_command}; |
321 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
358 | } elsif (my @macros = CFPlus::Macro::match_event $ev) { |
322 | $::CONN->user_send ($_) for @$bind_cmd; |
359 | $::CONN->macro_send ($_) for @macros; |
323 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
360 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
324 | $::CONN->user_send ("rotateshoottype +"); |
361 | $::CONN->user_send ("rotateshoottype +"); |
325 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
362 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
326 | $::CONN->user_send ("rotateshoottype -"); |
363 | $::CONN->user_send ("rotateshoottype -"); |
|
|
364 | } elsif ($uni == ord '!') { |
|
|
365 | $self->{completer}->set_prefix ("shout "); |
|
|
366 | $self->{completer}->show; |
327 | } elsif ($uni == ord '"') { |
367 | } elsif ($uni == ord '"') { |
328 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
368 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
329 | $self->{completer}->show; |
369 | $self->{completer}->show; |
330 | } elsif ($uni == ord "'") { |
370 | } elsif ($uni == ord "'") { |
331 | $self->{completer}->set_prefix (""); |
371 | $self->{completer}->set_prefix (""); |
332 | $self->{completer}->show; |
372 | $self->{completer}->show; |
333 | } elsif (exists $DIR{$sym}) { |
373 | } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) { |
334 | if ($mod & CFPlus::KMOD_SHIFT) { |
374 | if ($mod & CFPlus::KMOD_SHIFT) { |
335 | $self->{shft}++; |
375 | $self->{shft}++; |
336 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
376 | if ($dir->[0] != $self->{fire_dir}) { |
337 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
377 | $::CONN->user_send ("fire $dir->[0]"); |
338 | } |
378 | } |
339 | $self->{fire_dir} = $DIR{$sym}[0]; |
379 | $self->{fire_dir} = $DIR{$sym}[0]; |
340 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
380 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
341 | $self->{ctrl}++; |
381 | $self->{ctrl}++; |
342 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
382 | $::CONN->user_send ("run $dir->[0]"); |
343 | } else { |
383 | } else { |
344 | $::CONN->user_send ("$DIR{$sym}[1]"); |
384 | $::CONN->user_send ("$dir->[1]"); |
345 | } |
385 | } |
346 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
386 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
347 | $self->{completer}->inject_key_down ($ev); |
387 | $self->{completer}->inject_key_down ($ev); |
348 | $self->{completer}->show; |
388 | $self->{completer}->show; |
349 | } else { |
389 | } else { |
… | |
… | |
384 | } |
424 | } |
385 | |
425 | |
386 | $res |
426 | $res |
387 | } |
427 | } |
388 | |
428 | |
|
|
429 | sub invoke_visibility_change { |
|
|
430 | my ($self) = @_; |
|
|
431 | |
|
|
432 | $self->refresh_hook; |
|
|
433 | |
|
|
434 | 0 |
|
|
435 | } |
|
|
436 | |
389 | sub set_magicmap { |
437 | sub set_magicmap { |
390 | my ($self, $w, $h, $x, $y, $data) = @_; |
438 | my ($self, $w, $h, $x, $y, $data) = @_; |
391 | |
439 | |
392 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
440 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
393 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
441 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
394 | |
442 | |
395 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
443 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
396 | |
444 | |
397 | $self->update; |
445 | $self->update; |
398 | } |
446 | } |
399 | |
447 | |
|
|
448 | sub refresh_hook { |
|
|
449 | my ($self) = @_; |
|
|
450 | |
|
|
451 | if ($::MAP && $::CONN) { |
|
|
452 | if (delete $self->{need_update}) { |
|
|
453 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
|
|
454 | |
|
|
455 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
456 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
457 | |
|
|
458 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
|
|
459 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
|
|
460 | |
|
|
461 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
|
|
462 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
|
|
463 | |
|
|
464 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
|
|
465 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
|
|
466 | |
|
|
467 | if ($::CFG->{fow_enable}) { |
|
|
468 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
|
|
469 | |
|
|
470 | $self->{fow_texture} = new CFPlus::Texture |
|
|
471 | w => $w, |
|
|
472 | h => $h, |
|
|
473 | data => $data, |
|
|
474 | internalformat => GL_ALPHA, |
|
|
475 | format => GL_ALPHA; |
|
|
476 | } else { |
|
|
477 | delete $self->{fow_texture}; |
|
|
478 | } |
|
|
479 | |
|
|
480 | glNewList ($self->{list} ||= glGenList); |
|
|
481 | |
|
|
482 | glPushMatrix; |
|
|
483 | glTranslate $sx0, $sy0; |
|
|
484 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
|
|
485 | |
|
|
486 | $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); |
|
|
487 | |
|
|
488 | glScale $self->{tilesize}, $self->{tilesize}; |
|
|
489 | |
|
|
490 | if (my $tex = $self->{fow_texture}) { |
|
|
491 | glPushMatrix; |
|
|
492 | glScale 1/3, 1/3; |
|
|
493 | glEnable GL_TEXTURE_2D; |
|
|
494 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
|
|
495 | |
|
|
496 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
|
|
497 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
|
|
498 | |
|
|
499 | glDisable GL_TEXTURE_2D; |
|
|
500 | glPopMatrix; |
|
|
501 | } |
|
|
502 | |
|
|
503 | if ($self->{magicmap}) { |
|
|
504 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
|
|
505 | |
|
|
506 | $x += $::MAP->ox + $self->{dx}; |
|
|
507 | $y += $::MAP->oy + $self->{dy}; |
|
|
508 | |
|
|
509 | glTranslate - $x - 1, - $y - 1; |
|
|
510 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
|
|
511 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
|
|
512 | } |
|
|
513 | |
|
|
514 | glPopMatrix; |
|
|
515 | glEndList; |
|
|
516 | } |
|
|
517 | } else { |
|
|
518 | glDeleteList delete $self->{list} |
|
|
519 | if $self->{list}; |
|
|
520 | } |
|
|
521 | } |
|
|
522 | |
400 | sub draw { |
523 | sub draw { |
401 | my ($self) = @_; |
524 | my ($self) = @_; |
402 | |
525 | |
403 | return unless $::MAP; |
526 | $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); |
|
|
527 | |
|
|
528 | return unless $self->{list}; |
404 | |
529 | |
405 | my $focused = $CFPlus::UI::FOCUS == $self |
530 | my $focused = $CFPlus::UI::FOCUS == $self |
406 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
531 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
407 | |
532 | |
408 | return |
533 | return |
409 | unless $focused || !$::FAST; |
534 | unless $focused || !$::FAST; |
410 | |
|
|
411 | if (delete $self->{need_update}) { |
|
|
412 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
|
|
413 | |
|
|
414 | my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
|
|
415 | my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
|
|
416 | |
|
|
417 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
|
|
418 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
|
|
419 | |
|
|
420 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
421 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
422 | |
|
|
423 | if ($::CFG->{fow_enable}) { |
|
|
424 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
|
|
425 | |
|
|
426 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
|
|
427 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
|
|
428 | glConvolutionFilter2D ( |
|
|
429 | GL_CONVOLUTION_2D, |
|
|
430 | GL_ALPHA, |
|
|
431 | 3, 3, |
|
|
432 | GL_ALPHA, GL_FLOAT, |
|
|
433 | (pack "f*", @{ $self->{smooth_matrix} }), |
|
|
434 | ); |
|
|
435 | glEnable GL_CONVOLUTION_2D; |
|
|
436 | } |
|
|
437 | |
|
|
438 | $self->{fow_texture} = new CFPlus::Texture |
|
|
439 | w => $w, |
|
|
440 | h => $h, |
|
|
441 | data => $data, |
|
|
442 | internalformat => GL_ALPHA, |
|
|
443 | format => GL_ALPHA; |
|
|
444 | |
|
|
445 | glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; |
|
|
446 | } else { |
|
|
447 | delete $self->{fow_texture}; |
|
|
448 | } |
|
|
449 | |
|
|
450 | glNewList $self->{list}; |
|
|
451 | |
|
|
452 | glPushMatrix; |
|
|
453 | glTranslate $sx0, $sy0; |
|
|
454 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
|
|
455 | |
|
|
456 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
|
|
457 | |
|
|
458 | glScale 32, 32; |
|
|
459 | |
|
|
460 | if (my $tex = $self->{fow_texture}) { |
|
|
461 | glEnable GL_TEXTURE_2D; |
|
|
462 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
|
|
463 | |
|
|
464 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
|
|
465 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
|
|
466 | |
|
|
467 | glDisable GL_TEXTURE_2D; |
|
|
468 | } |
|
|
469 | |
|
|
470 | if ($self->{magicmap}) { |
|
|
471 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
|
|
472 | |
|
|
473 | $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); |
|
|
474 | $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); |
|
|
475 | |
|
|
476 | glTranslate - $x - 1, - $y - 1; |
|
|
477 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
|
|
478 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
|
|
479 | } |
|
|
480 | |
|
|
481 | glPopMatrix; |
|
|
482 | glEndList; |
|
|
483 | } |
|
|
484 | |
535 | |
485 | glCallList $self->{list}; |
536 | glCallList $self->{list}; |
486 | |
537 | |
487 | # TNT2 emulates logops in software (or worse :) |
538 | # TNT2 emulates logops in software (or worse :) |
488 | unless ($focused) { |
539 | unless ($focused) { |
… | |
… | |
507 | $self->SUPER::DESTROY; |
558 | $self->SUPER::DESTROY; |
508 | } |
559 | } |
509 | |
560 | |
510 | package CFPlus::MapWidget::MapMap; |
561 | package CFPlus::MapWidget::MapMap; |
511 | |
562 | |
|
|
563 | use strict; |
|
|
564 | use utf8; |
|
|
565 | |
512 | our @ISA = CFPlus::UI::Base::; |
566 | our @ISA = CFPlus::UI::Base::; |
513 | |
567 | |
514 | use Time::HiRes qw(time); |
568 | use Time::HiRes qw(time); |
515 | use CFPlus::OpenGL; |
569 | use CFPlus::OpenGL; |
516 | |
570 | |
517 | sub size_request { |
571 | sub size_request { |
518 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
572 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
519 | } |
573 | } |
520 | |
574 | |
521 | sub invoke_size_allocate { |
575 | sub refresh_hook { |
522 | my ($self, $w, $h) = @_; |
576 | my ($self) = @_; |
523 | |
577 | |
524 | $self->update; |
578 | if ($::MAP && $self->{texture_atime} < time) { |
525 | |
|
|
526 | 1 |
|
|
527 | } |
|
|
528 | |
|
|
529 | sub update { |
|
|
530 | my ($self) = @_; |
|
|
531 | |
|
|
532 | delete $self->{texture_atime}; |
|
|
533 | $self->SUPER::update; |
|
|
534 | } |
|
|
535 | |
|
|
536 | sub _draw { |
|
|
537 | my ($self) = @_; |
|
|
538 | |
|
|
539 | $::MAP or return; |
|
|
540 | |
|
|
541 | my ($w, $h) = @$self{qw(w h)}; |
579 | my ($w, $h) = @$self{qw(w h)}; |
542 | |
580 | |
543 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
581 | my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
544 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
582 | my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
545 | |
583 | |
546 | my $sx = int $::CFG->{map_shift_x} / 32; |
|
|
547 | my $sy = int $::CFG->{map_shift_y} / 32; |
|
|
548 | |
|
|
549 | my $ox = 0.5 * ($w - $sw); |
584 | my $ox = 0.5 * ($w - $sw); |
550 | my $oy = 0.5 * ($h - $sh); |
585 | my $oy = 0.5 * ($h - $sh); |
551 | |
586 | |
552 | glEnable GL_BLEND; |
587 | my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize}; |
553 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
588 | my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize}; |
554 | glEnable GL_TEXTURE_2D; |
|
|
555 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
|
|
556 | |
589 | |
557 | if ($self->{texture_atime} < time) { |
590 | #TODO: map scale is completely borked |
|
|
591 | |
|
|
592 | my $x0 = int $ox - $sx + 0.5; |
|
|
593 | my $y0 = int $oy - $sy + 0.5; |
|
|
594 | |
|
|
595 | $self->{sw} = $sw; |
|
|
596 | $self->{sh} = $sh; |
|
|
597 | |
|
|
598 | $self->{x0} = $x0; |
|
|
599 | $self->{y0} = $y0; |
|
|
600 | |
558 | $self->{texture_atime} = time + 1/3; |
601 | $self->{texture_atime} = time + 1/3; |
559 | |
602 | |
560 | $self->{texture} = |
603 | $self->{texture} = |
561 | new CFPlus::Texture |
604 | new CFPlus::Texture |
562 | w => $w, |
605 | w => $w, |
563 | h => $h, |
606 | h => $h, |
564 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
607 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
565 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
608 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
566 | } |
609 | } |
|
|
610 | } |
|
|
611 | |
|
|
612 | sub invoke_visibility_change { |
|
|
613 | my ($self) = @_; |
|
|
614 | |
|
|
615 | $self->refresh_hook; |
|
|
616 | |
|
|
617 | 0 |
|
|
618 | } |
|
|
619 | |
|
|
620 | sub invoke_size_allocate { |
|
|
621 | my ($self, $w, $h) = @_; |
|
|
622 | |
|
|
623 | $self->update; |
|
|
624 | |
|
|
625 | 1 |
|
|
626 | } |
|
|
627 | |
|
|
628 | sub update { |
|
|
629 | my ($self) = @_; |
|
|
630 | |
|
|
631 | delete $self->{texture_atime}; |
|
|
632 | $self->SUPER::update; |
|
|
633 | } |
|
|
634 | |
|
|
635 | sub _draw { |
|
|
636 | my ($self) = @_; |
|
|
637 | |
|
|
638 | $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook }); |
|
|
639 | |
|
|
640 | $self->{texture} or return; |
|
|
641 | |
|
|
642 | glEnable GL_BLEND; |
|
|
643 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
|
|
644 | glEnable GL_TEXTURE_2D; |
|
|
645 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
567 | |
646 | |
568 | $self->{texture}->draw_quad (0, 0); |
647 | $self->{texture}->draw_quad (0, 0); |
569 | |
648 | |
570 | glDisable GL_TEXTURE_2D; |
649 | glDisable GL_TEXTURE_2D; |
571 | |
650 | |
572 | glTranslate 0.375, 0.375; |
651 | glTranslate 0.375, 0.375; |
573 | |
|
|
574 | #TODO: map scale is completely borked |
|
|
575 | |
|
|
576 | my $x0 = int $ox - $sx + 0.5; |
|
|
577 | my $y0 = int $oy - $sy + 0.5; |
|
|
578 | |
652 | |
579 | glColor 1, 1, 0, 1; |
653 | glColor 1, 1, 0, 1; |
580 | glBegin GL_LINE_LOOP; |
654 | glBegin GL_LINE_LOOP; |
581 | glVertex $x0 , $y0 ; |
655 | glVertex $self->{x0} , $self->{y0} ; |
582 | glVertex $x0 , $y0 + $sh; |
656 | glVertex $self->{x0} , $self->{y0} + $self->{sh}; |
583 | glVertex $x0 + $sw, $y0 + $sh; |
657 | glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh}; |
584 | glVertex $x0 + $sw, $y0 ; |
658 | glVertex $self->{x0} + $self->{sw}, $self->{y0} ; |
585 | glEnd; |
659 | glEnd; |
586 | |
660 | |
587 | glDisable GL_BLEND; |
661 | glDisable GL_BLEND; |
588 | } |
662 | } |
589 | |
663 | |
… | |
… | |
625 | |
699 | |
626 | if ($ev->{button} == 3) { |
700 | if ($ev->{button} == 3) { |
627 | (new CFPlus::UI::Menu |
701 | (new CFPlus::UI::Menu |
628 | items => [ |
702 | items => [ |
629 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
703 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
630 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
704 | => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
631 | ], |
705 | ], |
632 | )->popup ($ev); |
706 | )->popup ($ev); |
633 | return 1; |
707 | return 1; |
634 | } |
708 | } |
635 | 0 |
709 | 0 |
… | |
… | |
836 | |
910 | |
837 | $self->SUPER::_draw; |
911 | $self->SUPER::_draw; |
838 | } |
912 | } |
839 | |
913 | |
840 | 1 |
914 | 1 |
|
|
915 | |