1 | package CFClient::MapWidget; |
1 | package CFPlus::MapWidget; |
2 | |
2 | |
3 | use strict; |
3 | use strict; |
4 | use utf8; |
4 | use utf8; |
5 | |
5 | |
6 | use List::Util qw(min max); |
6 | use List::Util qw(min max); |
7 | |
7 | |
|
|
8 | use CFPlus; |
8 | use CFClient::OpenGL; |
9 | use CFPlus::OpenGL; |
|
|
10 | use CFPlus::UI; |
9 | |
11 | |
10 | our @ISA = CFClient::UI::Base::; |
12 | our @ISA = CFPlus::UI::Base::; |
11 | |
13 | |
12 | my $magicmap_tex = |
14 | my $magicmap_tex = |
13 | new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", |
15 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
14 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
16 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
15 | |
17 | |
16 | sub new { |
18 | sub new { |
17 | my $class = shift; |
19 | my $class = shift; |
18 | |
20 | |
… | |
… | |
28 | ], |
30 | ], |
29 | |
31 | |
30 | @_ |
32 | @_ |
31 | ); |
33 | ); |
32 | |
34 | |
33 | $self->{completer} = new CFClient::MapWidget::Command:: |
35 | $self->{completer} = new CFPlus::MapWidget::Command:: |
34 | command => $self->{command}, |
36 | command => $self->{command}, |
35 | can_focus => 1, |
37 | tooltip => "#completer_help", |
36 | tooltip => "<b>The Command Completer</b>\n\n" |
|
|
37 | . "This is your central interface to send text commands to the server. " |
|
|
38 | . "To enter a verbatim command to send to the server, just type the command, " |
|
|
39 | . "followed by a space, and press return. " |
|
|
40 | . "Typing the initial letters of words (or just any letters) displays guesses " |
|
|
41 | . "for commands you might want to use.\n" |
|
|
42 | . "You can use the cursor-up and cursor-down keys to select between those guesses.\n" |
|
|
43 | . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.", |
|
|
44 | ; |
38 | ; |
45 | |
39 | |
46 | $self |
40 | $self |
47 | } |
41 | } |
48 | |
42 | |
… | |
… | |
60 | |
54 | |
61 | sub clr_commands { |
55 | sub clr_commands { |
62 | my ($self) = @_; |
56 | my ($self) = @_; |
63 | |
57 | |
64 | %{$self->{completer}{command}} = (); |
58 | %{$self->{completer}{command}} = (); |
|
|
59 | |
|
|
60 | $self->{completer}->hide |
|
|
61 | if $self->{completer}; |
|
|
62 | } |
|
|
63 | |
|
|
64 | sub server_login { |
|
|
65 | my ($server) = @_; |
|
|
66 | |
|
|
67 | ::stop_game (); |
|
|
68 | local $::PROFILE->{host} = $server; |
|
|
69 | ::start_game (); |
|
|
70 | } |
|
|
71 | |
|
|
72 | sub check_lwp($) { |
|
|
73 | my ($res) = @_; |
|
|
74 | |
|
|
75 | $res->is_error |
|
|
76 | and die $res->status_line; |
|
|
77 | |
|
|
78 | $res |
|
|
79 | } |
|
|
80 | |
|
|
81 | sub editor_invoke { |
|
|
82 | my $editsup = $::CONN && $::CONN->{editor_support} |
|
|
83 | or return; |
|
|
84 | |
|
|
85 | my ($pid, $fh); |
|
|
86 | unless ($pid = open $fh, "-|:utf8", "-") { |
|
|
87 | $SIG{__DIE__} = sub { |
|
|
88 | my $msg = $_[0]; |
|
|
89 | $msg =~ s/\n+/\n/; |
|
|
90 | warn "FATAL: $msg"; |
|
|
91 | CFPlus::_exit 99; |
|
|
92 | }; |
|
|
93 | |
|
|
94 | open STDERR, ">&STDOUT"; |
|
|
95 | binmode STDOUT, ":utf8"; |
|
|
96 | binmode STDERR, ":utf8"; |
|
|
97 | close $fh; |
|
|
98 | |
|
|
99 | $| = 1; |
|
|
100 | print "preparing editor startup...\n"; |
|
|
101 | CFPlus::set_proxy; |
|
|
102 | |
|
|
103 | my $server = $editsup->{gameserver} || "default"; |
|
|
104 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
|
|
105 | |
|
|
106 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
|
|
107 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
|
|
108 | |
|
|
109 | print "map directory is $mapdir\n"; |
|
|
110 | print "lib directory is $libdir\n"; |
|
|
111 | |
|
|
112 | require LWP::UserAgent; |
|
|
113 | |
|
|
114 | my $ua = LWP::UserAgent->new ( |
|
|
115 | agent => "cfplus $CFPlus::VERSION", |
|
|
116 | keep_alive => 1, |
|
|
117 | env_proxy => 1, |
|
|
118 | timeout => 30, |
|
|
119 | ); |
|
|
120 | |
|
|
121 | for my $file (qw(archetypes crossfire.0)) { |
|
|
122 | my $url = "$editsup->{lib_root}$file"; |
|
|
123 | print "mirroring $url...\n"; |
|
|
124 | check_lwp $ua->mirror ($url, "$libdir/$file"); |
|
|
125 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
|
|
126 | } |
|
|
127 | |
|
|
128 | if (1) { # upload a map |
|
|
129 | my $mapname = $::CONN->{map_info}[0]; |
|
|
130 | |
|
|
131 | my $mappath = "$mapdir/$mapname"; |
|
|
132 | |
|
|
133 | -e $mappath and die "$mappath already exists\n"; |
|
|
134 | |
|
|
135 | print "getting map revision for $mapname...\n"; |
|
|
136 | |
|
|
137 | # try to get the most recent head revision, what a hack, |
|
|
138 | # this should have been returned while downloading *sigh* |
|
|
139 | my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
|
|
140 | |
|
|
141 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
|
|
142 | my $rev = $1; |
|
|
143 | |
|
|
144 | print "downloading revision $rev...\n"; |
|
|
145 | |
|
|
146 | my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
|
|
147 | |
|
|
148 | my $meta = { |
|
|
149 | %$editsup, |
|
|
150 | path => $mapname, |
|
|
151 | revision => $rev, |
|
|
152 | cf_login => $::PROFILE->{user}, |
|
|
153 | }; |
|
|
154 | |
|
|
155 | require File::Basename; |
|
|
156 | require File::Path; |
|
|
157 | |
|
|
158 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
|
|
159 | open my $fh, ">:raw:perlio", "$mappath.meta" |
|
|
160 | or die "$mappath.meta: $!\n"; |
|
|
161 | print $fh CFPlus::to_json $meta; |
|
|
162 | close $fh; |
|
|
163 | open my $fh, ">:raw:perlio:utf8", $mappath |
|
|
164 | or die "$mappath: $!\n"; |
|
|
165 | print $fh $map; |
|
|
166 | close $fh; |
|
|
167 | |
|
|
168 | print "saved as $mappath\n"; |
|
|
169 | |
|
|
170 | print "invoking editor...\n"; |
|
|
171 | exec "/root/s2/gce $mappath";#d# |
|
|
172 | |
|
|
173 | # now upload it |
|
|
174 | # require HTTP::Request::Common; |
|
|
175 | # |
|
|
176 | # my $res = $ua->post ( |
|
|
177 | # $ENV{CFPLUS_UPLOAD}, |
|
|
178 | # Content_Type => 'multipart/form-data', |
|
|
179 | # Content => [ |
|
|
180 | # path => $mapname, |
|
|
181 | # mapdir => $ENV{CROSSFIRE_MAPDIR}, |
|
|
182 | # map => $map, |
|
|
183 | # revision => $rev, |
|
|
184 | # cf_login => $ENV{CFPLUS_LOGIN}, |
|
|
185 | # cf_password => $ENV{CFPLUS_PASSWORD}, |
|
|
186 | # comment => "", |
|
|
187 | # ] |
|
|
188 | # ); |
|
|
189 | # |
|
|
190 | # if ($res->is_error) { |
|
|
191 | # # fatal condition |
|
|
192 | # warn $res->status_line; |
|
|
193 | # } else { |
|
|
194 | # # script replies are marked as {{..}} |
|
|
195 | # my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
|
|
196 | # warn map "$_\n", @msgs; |
|
|
197 | # } |
|
|
198 | } else { |
|
|
199 | die "viewvc parse error, unable to detect revision\n"; |
|
|
200 | } |
|
|
201 | } |
|
|
202 | |
|
|
203 | CFPlus::_exit; |
|
|
204 | } |
|
|
205 | |
|
|
206 | my $buffer; |
|
|
207 | |
|
|
208 | Event->io (fd => $fh, poll => 'r', cb => sub { |
|
|
209 | unless (sysread $fh, $buffer, 4096, length $buffer) { |
|
|
210 | $_[0]->w->cancel; |
|
|
211 | $buffer .= "done\n"; |
|
|
212 | } |
|
|
213 | |
|
|
214 | while ($buffer =~ s/^(.*)\n//) { |
|
|
215 | ::message ({ |
|
|
216 | markup => "editor($pid): " . CFPlus::asxml $1, |
|
|
217 | }); |
|
|
218 | } |
|
|
219 | }); |
65 | } |
220 | } |
66 | |
221 | |
67 | sub invoke_button_down { |
222 | sub invoke_button_down { |
68 | my ($self, $ev, $x, $y) = @_; |
223 | my ($self, $ev, $x, $y) = @_; |
69 | |
224 | |
70 | if ($ev->{button} == 1) { |
225 | if ($ev->{button} == 1) { |
71 | $self->grab_focus; |
226 | $self->grab_focus; |
72 | return unless $::CONN; |
227 | return unless $::CONN; |
73 | |
228 | |
74 | my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
229 | my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
75 | my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
230 | my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
76 | |
231 | |
77 | $x -= int 0.5 * $self->{sw}; |
232 | $x -= int 0.5 * $self->{sw}; |
78 | $y -= int 0.5 * $self->{sh}; |
233 | $y -= int 0.5 * $self->{sh}; |
79 | |
234 | |
80 | $::CONN->lookat ($x, $y) |
235 | $::CONN->lookat ($x, $y) |
… | |
… | |
96 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
251 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
97 | |
252 | |
98 | $self->update; |
253 | $self->update; |
99 | }; |
254 | }; |
100 | } elsif ($ev->{button} == 3) { |
255 | } elsif ($ev->{button} == 3) { |
101 | (new CFClient::UI::Menu |
256 | my @items = ( |
102 | items => [ |
|
|
103 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
257 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
104 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
258 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
105 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
259 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
|
|
260 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
106 | ["Inventory…\tF4", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
261 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
107 | ["Spells…\tF5", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
|
|
108 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
262 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
109 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
263 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
110 | [ |
264 | [ |
111 | $::PICKUP_ENABLE->{state} |
265 | $::PICKUP_ENABLE->{state} |
112 | ? "Disable automatic pickup" |
266 | ? "Disable automatic pickup" |
113 | : "Enable automatic pickup", |
267 | : "Enable automatic pickup", |
114 | sub { $::PICKUP_ENABLE->toggle } |
268 | sub { $::PICKUP_ENABLE->toggle } |
115 | ], |
269 | ], |
|
|
270 | ); |
|
|
271 | |
|
|
272 | if ($::CONN && $::CONN->{editor_support}) { |
|
|
273 | push @items, [ |
|
|
274 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
|
|
275 | \&editor_invoke, |
|
|
276 | ]; |
|
|
277 | |
|
|
278 | for my $type (qw(test name)) { |
|
|
279 | $::CONN->{editor_support}{type} ne $type |
|
|
280 | or next; |
|
|
281 | my $server = $::CONN->{editor_support}{"${type}server"} |
|
|
282 | or next; |
|
|
283 | |
|
|
284 | push @items, [ |
|
|
285 | "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", |
|
|
286 | sub { server_login $server }, |
|
|
287 | ]; |
|
|
288 | } |
|
|
289 | } |
|
|
290 | |
|
|
291 | push @items, |
|
|
292 | ["Quit", |
|
|
293 | sub { |
|
|
294 | if ($::CONN) { |
|
|
295 | &::open_quit_dialog; |
|
|
296 | } else { |
|
|
297 | exit; |
|
|
298 | } |
|
|
299 | } |
116 | ], |
300 | ], |
|
|
301 | ; |
|
|
302 | |
|
|
303 | (new CFPlus::UI::Menu |
|
|
304 | items => \@items, |
117 | )->popup ($ev); |
305 | )->popup ($ev); |
118 | } |
306 | } |
119 | |
307 | |
120 | 1 |
308 | 1 |
121 | } |
309 | } |
… | |
… | |
140 | 1 |
328 | 1 |
141 | } |
329 | } |
142 | |
330 | |
143 | sub size_request { |
331 | sub size_request { |
144 | ( |
332 | ( |
145 | 32 * CFClient::ceil $::WIDTH / 32, |
333 | 32 * CFPlus::ceil $::WIDTH / 32, |
146 | 32 * CFClient::ceil $::HEIGHT / 32, |
334 | 32 * CFPlus::ceil $::HEIGHT / 32, |
147 | ) |
335 | ) |
148 | } |
336 | } |
149 | |
337 | |
150 | sub update { |
338 | sub update { |
151 | my ($self) = @_; |
339 | my ($self) = @_; |
… | |
… | |
153 | $self->{need_update} = 1; |
341 | $self->{need_update} = 1; |
154 | $self->SUPER::update; |
342 | $self->SUPER::update; |
155 | } |
343 | } |
156 | |
344 | |
157 | my %DIR = ( |
345 | my %DIR = ( |
158 | CFClient::SDLK_KP8, [1, "north"], |
346 | CFPlus::SDLK_KP8, [1, "north"], |
159 | CFClient::SDLK_KP9, [2, "northeast"], |
347 | CFPlus::SDLK_KP9, [2, "northeast"], |
160 | CFClient::SDLK_KP6, [3, "east"], |
348 | CFPlus::SDLK_KP6, [3, "east"], |
161 | CFClient::SDLK_KP3, [4, "southeast"], |
349 | CFPlus::SDLK_KP3, [4, "southeast"], |
162 | CFClient::SDLK_KP2, [5, "south"], |
350 | CFPlus::SDLK_KP2, [5, "south"], |
163 | CFClient::SDLK_KP1, [6, "southwest"], |
351 | CFPlus::SDLK_KP1, [6, "southwest"], |
164 | CFClient::SDLK_KP4, [7, "west"], |
352 | CFPlus::SDLK_KP4, [7, "west"], |
165 | CFClient::SDLK_KP7, [8, "northwest"], |
353 | CFPlus::SDLK_KP7, [8, "northwest"], |
166 | |
354 | |
167 | CFClient::SDLK_UP, [1, "north"], |
355 | CFPlus::SDLK_UP, [1, "north"], |
168 | CFClient::SDLK_RIGHT, [3, "east"], |
356 | CFPlus::SDLK_RIGHT, [3, "east"], |
169 | CFClient::SDLK_DOWN, [5, "south"], |
357 | CFPlus::SDLK_DOWN, [5, "south"], |
170 | CFClient::SDLK_LEFT, [7, "west"], |
358 | CFPlus::SDLK_LEFT, [7, "west"], |
171 | ); |
359 | ); |
172 | |
360 | |
173 | sub invoke_key_down { |
361 | sub invoke_key_down { |
174 | my ($self, $ev) = @_; |
362 | my ($self, $ev) = @_; |
175 | |
363 | |
176 | my $mod = $ev->{mod}; |
364 | my $mod = $ev->{mod}; |
177 | my $sym = $ev->{sym}; |
365 | my $sym = $ev->{sym}; |
178 | my $uni = $ev->{unicode}; |
366 | my $uni = $ev->{unicode}; |
179 | |
367 | |
180 | $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; |
368 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
181 | |
369 | |
182 | if ($uni == ord "\t") { |
370 | if ($uni == ord "\t") { |
183 | $::PL_WINDOW->toggle_visibility; |
371 | $::PL_WINDOW->toggle_visibility; |
184 | } elsif ($sym == CFClient::SDLK_F1 && !$mod) { |
372 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
185 | $::HELP_WINDOW->toggle_visibility; |
373 | $::HELP_WINDOW->toggle_visibility; |
186 | } elsif ($sym == CFClient::SDLK_F2 && !$mod) { |
374 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
187 | ::toggle_player_page ($::STATS_PAGE); |
375 | ::toggle_player_page ($::STATS_PAGE); |
188 | } elsif ($sym == CFClient::SDLK_F3 && !$mod) { |
376 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
189 | ::toggle_player_page ($::SKILL_PAGE); |
377 | ::toggle_player_page ($::SKILL_PAGE); |
190 | } elsif ($sym == CFClient::SDLK_F4 && !$mod) { |
378 | } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { |
|
|
379 | ::toggle_player_page ($::SPELL_PAGE); |
|
|
380 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
191 | ::toggle_player_page ($::INVENTORY_PAGE); |
381 | ::toggle_player_page ($::INVENTORY_PAGE); |
192 | } elsif ($sym == CFClient::SDLK_F5 && !$mod) { |
|
|
193 | ::toggle_player_page ($::SPELL_PAGE); |
|
|
194 | } elsif ($sym == CFClient::SDLK_F9 && !$mod) { |
382 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
195 | $::SETUP_DIALOG->toggle_visibility; |
383 | $::SETUP_DIALOG->toggle_visibility; |
196 | } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { |
384 | } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { |
197 | $::BIND_EDITOR->set_binding (undef, undef, [], |
385 | $::BIND_EDITOR->set_binding (undef, undef, [], |
198 | sub { |
386 | sub { |
199 | my ($mod, $sym, $cmds) = @_; |
387 | my ($mod, $sym, $cmds) = @_; |
200 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
388 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
201 | }); |
389 | }); |
202 | $::BIND_EDITOR->start; |
390 | $::BIND_EDITOR->start; |
203 | $::BIND_EDITOR->show; |
391 | $::BIND_EDITOR->show; |
|
|
392 | #TODO: elmex, what was this supposed to do? it currently crashes the client. |
204 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
393 | # } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { |
205 | $::BIND_EDITOR->stop; |
394 | # $::BIND_EDITOR->stop; |
206 | $::BIND_EDITOR->ask_for_bind_and_commit; |
395 | # $::BIND_EDITOR->ask_for_bind_and_commit; |
207 | $::BIND_EDITOR->hide; |
396 | # $::BIND_EDITOR->hide; |
208 | } elsif (!$::CONN) { |
397 | } elsif (!$::CONN) { |
209 | return 0; # bindings further down need a valid connection |
398 | return 0; # bindings further down need a valid connection |
210 | |
399 | |
211 | } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { |
400 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
212 | $::CONN->user_send ("stay fire"); |
401 | $::CONN->user_send ("stay fire"); |
213 | } elsif ($uni == ord ",") { |
402 | } elsif ($uni == ord ",") { |
214 | $::CONN->user_send ("take"); |
403 | $::CONN->user_send ("take"); |
215 | } elsif ($uni == ord " ") { |
404 | } elsif ($uni == ord " ") { |
216 | $::CONN->user_send ("apply"); |
405 | $::CONN->user_send ("apply"); |
|
|
406 | } elsif ($uni == 13) { |
|
|
407 | $::CONN->user_send ("examine"); |
217 | } elsif ($uni == ord ".") { |
408 | } elsif ($uni == ord ".") { |
218 | $::CONN->user_send ($self->{completer}{last_command}) |
409 | $::CONN->user_send ($self->{completer}{last_command}) |
219 | if exists $self->{completer}{last_command}; |
410 | if exists $self->{completer}{last_command}; |
220 | } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { |
411 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
221 | $::CONN->user_send ($_) for @$bind_cmd; |
412 | $::CONN->user_send ($_) for @$bind_cmd; |
222 | } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
413 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
223 | $::CONN->user_send ("rotateshoottype +"); |
414 | $::CONN->user_send ("rotateshoottype +"); |
224 | } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
415 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
225 | $::CONN->user_send ("rotateshoottype -"); |
416 | $::CONN->user_send ("rotateshoottype -"); |
226 | } elsif ($uni == ord '"') { |
417 | } elsif ($uni == ord '"') { |
227 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
418 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
228 | $self->{completer}->show; |
419 | $self->{completer}->show; |
229 | } elsif ($uni == ord "'") { |
420 | } elsif ($uni == ord "'") { |
230 | $self->{completer}->set_prefix (""); |
421 | $self->{completer}->set_prefix (""); |
231 | $self->{completer}->show; |
422 | $self->{completer}->show; |
232 | } elsif (exists $DIR{$sym}) { |
423 | } elsif (exists $DIR{$sym}) { |
233 | if ($mod & CFClient::KMOD_SHIFT) { |
424 | if ($mod & CFPlus::KMOD_SHIFT) { |
234 | $self->{shft}++; |
425 | $self->{shft}++; |
235 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
426 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
236 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
427 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
237 | } |
428 | } |
238 | $self->{fire_dir} = $DIR{$sym}[0]; |
429 | $self->{fire_dir} = $DIR{$sym}[0]; |
239 | } elsif ($mod & CFClient::KMOD_CTRL) { |
430 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
240 | $self->{ctrl}++; |
431 | $self->{ctrl}++; |
241 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
432 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
242 | } else { |
433 | } else { |
243 | $::CONN->user_send ("$DIR{$sym}[1]"); |
434 | $::CONN->user_send ("$DIR{$sym}[1]"); |
244 | } |
435 | } |
245 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
436 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
246 | $self->{completer}->invoke_key_down ($ev); |
437 | $self->{completer}->inject_key_down ($ev); |
247 | $self->{completer}->show; |
438 | $self->{completer}->show; |
248 | } else { |
439 | } else { |
249 | return 0; |
440 | return 0; |
250 | } |
441 | } |
251 | |
442 | |
… | |
… | |
258 | my $res = 0; |
449 | my $res = 0; |
259 | my $mod = $ev->{mod}; |
450 | my $mod = $ev->{mod}; |
260 | my $sym = $ev->{sym}; |
451 | my $sym = $ev->{sym}; |
261 | |
452 | |
262 | if ($::CFG->{shift_fire_stop}) { |
453 | if ($::CFG->{shift_fire_stop}) { |
263 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
454 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
264 | $::CONN->user_send ("fire_stop"); |
455 | $::CONN->user_send ("fire_stop"); |
265 | delete $self->{fire_dir}; |
456 | delete $self->{fire_dir}; |
266 | $res = 1; |
457 | $res = 1; |
267 | } |
458 | } |
268 | } else { |
459 | } else { |
269 | if (exists $DIR{$sym} && delete $self->{shft}) { |
460 | if (exists $DIR{$sym} && delete $self->{shft}) { |
270 | $::CONN->user_send ("fire_stop"); |
461 | $::CONN->user_send ("fire_stop"); |
271 | delete $self->{fire_dir}; |
462 | delete $self->{fire_dir}; |
272 | $res = 1; |
463 | $res = 1; |
273 | } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
464 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
274 | $::CONN->user_send ("fire_stop"); |
465 | $::CONN->user_send ("fire_stop"); |
275 | delete $self->{fire_dir}; |
466 | delete $self->{fire_dir}; |
276 | $res = 1; |
467 | $res = 1; |
277 | } |
468 | } |
278 | } |
469 | } |
279 | |
470 | |
280 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
471 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
281 | $::CONN->user_send ("run_stop"); |
472 | $::CONN->user_send ("run_stop"); |
282 | $res = 1; |
473 | $res = 1; |
283 | } |
474 | } |
284 | |
475 | |
285 | $res |
476 | $res |
… | |
… | |
299 | sub draw { |
490 | sub draw { |
300 | my ($self) = @_; |
491 | my ($self) = @_; |
301 | |
492 | |
302 | return unless $::MAP; |
493 | return unless $::MAP; |
303 | |
494 | |
304 | my $focused = $CFClient::UI::FOCUS == $self |
495 | my $focused = $CFPlus::UI::FOCUS == $self |
305 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
496 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
306 | |
497 | |
307 | return |
498 | return |
308 | unless $focused || !$::FAST; |
499 | unless $focused || !$::FAST; |
309 | |
500 | |
310 | if (delete $self->{need_update}) { |
501 | if (delete $self->{need_update}) { |
311 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
502 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
312 | |
503 | |
313 | my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; |
504 | my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
314 | my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; |
505 | my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
315 | |
506 | |
316 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
507 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
317 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
508 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
318 | |
509 | |
319 | my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; |
510 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
320 | my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; |
511 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
321 | |
512 | |
322 | if ($::CFG->{fow_enable}) { |
513 | if ($::CFG->{fow_enable}) { |
323 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
514 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
324 | |
515 | |
325 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
516 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
326 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
517 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
327 | glConvolutionFilter2D ( |
518 | glConvolutionFilter2D ( |
328 | GL_CONVOLUTION_2D, |
519 | GL_CONVOLUTION_2D, |
329 | GL_ALPHA, |
520 | GL_ALPHA, |
330 | 3, 3, |
521 | 3, 3, |
… | |
… | |
332 | (pack "f*", @{ $self->{smooth_matrix} }), |
523 | (pack "f*", @{ $self->{smooth_matrix} }), |
333 | ); |
524 | ); |
334 | glEnable GL_CONVOLUTION_2D; |
525 | glEnable GL_CONVOLUTION_2D; |
335 | } |
526 | } |
336 | |
527 | |
337 | $self->{fow_texture} = new CFClient::Texture |
528 | $self->{fow_texture} = new CFPlus::Texture |
338 | w => $w, |
529 | w => $w, |
339 | h => $h, |
530 | h => $h, |
340 | data => $data, |
531 | data => $data, |
341 | internalformat => GL_ALPHA, |
532 | internalformat => GL_ALPHA, |
342 | format => GL_ALPHA; |
533 | format => GL_ALPHA; |
… | |
… | |
404 | glDeleteList $self->{list}; |
595 | glDeleteList $self->{list}; |
405 | |
596 | |
406 | $self->SUPER::DESTROY; |
597 | $self->SUPER::DESTROY; |
407 | } |
598 | } |
408 | |
599 | |
409 | package CFClient::MapWidget::MapMap; |
600 | package CFPlus::MapWidget::MapMap; |
410 | |
601 | |
411 | our @ISA = CFClient::UI::Base::; |
602 | our @ISA = CFPlus::UI::Base::; |
412 | |
603 | |
413 | use Time::HiRes qw(time); |
604 | use Time::HiRes qw(time); |
414 | use CFClient::OpenGL; |
605 | use CFPlus::OpenGL; |
415 | |
606 | |
416 | sub size_request { |
607 | sub size_request { |
417 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
608 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
418 | } |
609 | } |
419 | |
610 | |
… | |
… | |
455 | |
646 | |
456 | if ($self->{texture_atime} < time) { |
647 | if ($self->{texture_atime} < time) { |
457 | $self->{texture_atime} = time + 1/3; |
648 | $self->{texture_atime} = time + 1/3; |
458 | |
649 | |
459 | $self->{texture} = |
650 | $self->{texture} = |
460 | new CFClient::Texture |
651 | new CFPlus::Texture |
461 | w => $w, |
652 | w => $w, |
462 | h => $h, |
653 | h => $h, |
463 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
654 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
464 | type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
655 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
465 | } |
656 | } |
466 | |
657 | |
467 | $self->{texture}->draw_quad (0, 0); |
658 | $self->{texture}->draw_quad (0, 0); |
468 | |
659 | |
469 | glDisable GL_TEXTURE_2D; |
660 | glDisable GL_TEXTURE_2D; |
… | |
… | |
484 | glEnd; |
675 | glEnd; |
485 | |
676 | |
486 | glDisable GL_BLEND; |
677 | glDisable GL_BLEND; |
487 | } |
678 | } |
488 | |
679 | |
489 | package CFClient::MapWidget::Command; |
680 | package CFPlus::MapWidget::Command; |
490 | |
681 | |
491 | use strict; |
682 | use strict; |
492 | |
683 | |
493 | use CFClient::OpenGL; |
684 | use CFPlus::OpenGL; |
494 | |
685 | |
495 | our @ISA = CFClient::UI::Frame::; |
686 | our @ISA = CFPlus::UI::Frame::; |
496 | |
687 | |
497 | sub new { |
688 | sub new { |
498 | my $class = shift; |
689 | my $class = shift; |
499 | |
690 | |
500 | my $self = $class->SUPER::new ( |
691 | my $self = $class->SUPER::new ( |
501 | bg => [0, 0, 0, 0.8], |
692 | bg => [0, 0, 0, 0.8], |
502 | @_, |
693 | @_, |
503 | ); |
694 | ); |
504 | |
695 | |
505 | $self->add ($self->{vbox} = new CFClient::UI::VBox); |
696 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
506 | |
697 | |
507 | $self->{label} = [ |
698 | $self->{label} = [ |
508 | map |
699 | map |
509 | CFClient::UI::Label->new ( |
700 | CFPlus::UI::Label->new ( |
510 | can_hover => 1, |
701 | can_hover => 1, |
511 | can_events => 1, |
702 | can_events => 1, |
512 | tooltip_width => 0.33, |
703 | tooltip_width => 0.33, |
513 | fontsize => $_, |
704 | fontsize => $_, |
514 | ), (0.8) x 16 |
705 | ), (0.8) x 16 |
515 | ]; |
706 | ]; |
516 | |
707 | |
517 | $self->{entry} = new CFClient::UI::Entry |
708 | $self->{entry} = new CFPlus::UI::Entry |
518 | on_changed => sub { |
709 | on_changed => sub { |
519 | $self->update_labels; |
710 | $self->update_labels; |
520 | 0 |
711 | 0 |
521 | }, |
712 | }, |
522 | on_button_down => sub { |
713 | on_button_down => sub { |
523 | my ($entry, $ev, $x, $y) = @_; |
714 | my ($entry, $ev, $x, $y) = @_; |
524 | |
715 | |
525 | if ($ev->{button} == 3) { |
716 | if ($ev->{button} == 3) { |
526 | (new CFClient::UI::Menu |
717 | (new CFPlus::UI::Menu |
527 | items => [ |
718 | items => [ |
528 | ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" |
719 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
529 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
720 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
530 | ], |
721 | ], |
531 | )->popup ($ev); |
722 | )->popup ($ev); |
532 | return 1; |
723 | return 1; |
533 | } |
724 | } |
… | |
… | |
549 | $self->hide; |
740 | $self->hide; |
550 | } |
741 | } |
551 | } elsif ($ev->{sym} == 27) { |
742 | } elsif ($ev->{sym} == 27) { |
552 | $self->{hist_ptr} = 0; |
743 | $self->{hist_ptr} = 0; |
553 | $self->hide; |
744 | $self->hide; |
554 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
745 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
555 | if ($self->{hist_ptr} > 1) { |
746 | if ($self->{hist_ptr} > 1) { |
556 | $self->{hist_ptr}--; |
747 | $self->{hist_ptr}--; |
557 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
748 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
558 | } elsif ($self->{hist_ptr} > 0) { |
749 | } elsif ($self->{hist_ptr} > 0) { |
559 | $self->{hist_ptr}--; |
750 | $self->{hist_ptr}--; |
… | |
… | |
561 | } else { |
752 | } else { |
562 | ++$self->{select_offset} |
753 | ++$self->{select_offset} |
563 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
754 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
564 | } |
755 | } |
565 | $self->update_labels; |
756 | $self->update_labels; |
566 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
757 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
567 | if ($self->{select_offset}) { |
758 | if ($self->{select_offset}) { |
568 | --$self->{select_offset} |
759 | --$self->{select_offset} |
569 | } else { |
760 | } else { |
570 | unless ($self->{hist_ptr}) { |
761 | unless ($self->{hist_ptr}) { |
571 | $self->{hist_saveback} = $self->{entry}->get_text; |
762 | $self->{hist_saveback} = $self->{entry}->get_text; |
… | |
… | |
616 | } |
807 | } |
617 | |
808 | |
618 | sub hide { |
809 | sub hide { |
619 | my ($self) = @_; |
810 | my ($self) = @_; |
620 | |
811 | |
|
|
812 | $self->{hist_ptr} = 0; |
|
|
813 | |
621 | $self->SUPER::hide; |
814 | $self->SUPER::hide; |
622 | $self->{entry}->set_text (""); |
815 | $self->{entry}->set_text (""); |
623 | } |
816 | } |
624 | |
817 | |
625 | sub invoke_key_down { |
818 | sub inject_key_down { |
626 | my ($self, $ev) = @_; |
819 | my ($self, $ev) = @_; |
627 | |
820 | |
|
|
821 | $self->{entry}->grab_focus; |
628 | $self->{entry}->emit (key_down => $ev) |
822 | $self->{entry}->emit (key_down => $ev); |
629 | } |
823 | } |
630 | |
824 | |
631 | sub update_labels { |
825 | sub update_labels { |
632 | my ($self) = @_; |
826 | my ($self) = @_; |
633 | |
827 | |
… | |
… | |
726 | |
920 | |
727 | sub _draw { |
921 | sub _draw { |
728 | my ($self) = @_; |
922 | my ($self) = @_; |
729 | |
923 | |
730 | # hack |
924 | # hack |
731 | local $CFClient::UI::FOCUS = $self->{entry}; |
925 | local $CFPlus::UI::FOCUS = $self->{entry}; |
732 | |
926 | |
733 | $self->SUPER::_draw; |
927 | $self->SUPER::_draw; |
734 | } |
928 | } |
735 | |
929 | |
736 | 1 |
930 | 1 |
|
|
931 | |