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 | CFPlus::background { |
|
|
86 | print "preparing editor startup...\n"; |
|
|
87 | CFPlus::set_proxy; |
|
|
88 | |
|
|
89 | my $server = $editsup->{gameserver} || "default"; |
|
|
90 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
|
|
91 | |
|
|
92 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
|
|
93 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
|
|
94 | |
|
|
95 | print "map directory is $mapdir\n"; |
|
|
96 | print "lib directory is $libdir\n"; |
|
|
97 | |
|
|
98 | require LWP::UserAgent; |
|
|
99 | |
|
|
100 | my $ua = LWP::UserAgent->new ( |
|
|
101 | agent => "cfplus $CFPlus::VERSION", |
|
|
102 | keep_alive => 1, |
|
|
103 | env_proxy => 1, |
|
|
104 | timeout => 30, |
|
|
105 | ); |
|
|
106 | |
|
|
107 | for my $file (qw(archetypes crossfire.0)) { |
|
|
108 | my $url = "$editsup->{lib_root}$file"; |
|
|
109 | print "mirroring $url...\n"; |
|
|
110 | check_lwp $ua->mirror ($url, "$libdir/$file"); |
|
|
111 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
|
|
112 | } |
|
|
113 | |
|
|
114 | if (1) { # upload a map |
|
|
115 | my $mapname = $::CONN->{map_info}[0]; |
|
|
116 | |
|
|
117 | my $mappath = "$mapdir/$mapname"; |
|
|
118 | |
|
|
119 | -e $mappath and die "$mappath already exists\n"; |
|
|
120 | |
|
|
121 | print "getting map revision for $mapname...\n"; |
|
|
122 | |
|
|
123 | # try to get the most recent head revision, what a hack, |
|
|
124 | # this should have been returned while downloading *sigh* |
|
|
125 | my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
|
|
126 | |
|
|
127 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
|
|
128 | my $rev = $1; |
|
|
129 | |
|
|
130 | print "downloading revision $rev...\n"; |
|
|
131 | |
|
|
132 | my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
|
|
133 | |
|
|
134 | my $meta = { |
|
|
135 | %$editsup, |
|
|
136 | path => $mapname, |
|
|
137 | revision => $rev, |
|
|
138 | cf_login => $::PROFILE->{user}, |
|
|
139 | }; |
|
|
140 | |
|
|
141 | require File::Basename; |
|
|
142 | require File::Path; |
|
|
143 | |
|
|
144 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
|
|
145 | open my $fh, ">:raw:perlio", "$mappath.meta" |
|
|
146 | or die "$mappath.meta: $!\n"; |
|
|
147 | print $fh CFPlus::to_json $meta; |
|
|
148 | close $fh; |
|
|
149 | open my $fh, ">:raw:perlio:utf8", $mappath |
|
|
150 | or die "$mappath: $!\n"; |
|
|
151 | print $fh $map; |
|
|
152 | close $fh; |
|
|
153 | |
|
|
154 | print "saved as $mappath\n"; |
|
|
155 | |
|
|
156 | print "invoking editor...\n"; |
|
|
157 | exec "/root/s2/gce $mappath";#d# |
|
|
158 | |
|
|
159 | # now upload it |
|
|
160 | # require HTTP::Request::Common; |
|
|
161 | # |
|
|
162 | # my $res = $ua->post ( |
|
|
163 | # $ENV{CFPLUS_UPLOAD}, |
|
|
164 | # Content_Type => 'multipart/form-data', |
|
|
165 | # Content => [ |
|
|
166 | # path => $mapname, |
|
|
167 | # mapdir => $ENV{CROSSFIRE_MAPDIR}, |
|
|
168 | # map => $map, |
|
|
169 | # revision => $rev, |
|
|
170 | # cf_login => $ENV{CFPLUS_LOGIN}, |
|
|
171 | # cf_password => $ENV{CFPLUS_PASSWORD}, |
|
|
172 | # comment => "", |
|
|
173 | # ] |
|
|
174 | # ); |
|
|
175 | # |
|
|
176 | # if ($res->is_error) { |
|
|
177 | # # fatal condition |
|
|
178 | # warn $res->status_line; |
|
|
179 | # } else { |
|
|
180 | # # script replies are marked as {{..}} |
|
|
181 | # my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
|
|
182 | # warn map "$_\n", @msgs; |
|
|
183 | # } |
|
|
184 | } else { |
|
|
185 | die "viewvc parse error, unable to detect revision\n"; |
|
|
186 | } |
|
|
187 | } |
|
|
188 | } |
65 | } |
189 | } |
66 | |
190 | |
67 | sub invoke_button_down { |
191 | sub invoke_button_down { |
68 | my ($self, $ev, $x, $y) = @_; |
192 | my ($self, $ev, $x, $y) = @_; |
69 | |
193 | |
70 | if ($ev->{button} == 1) { |
194 | if ($ev->{button} == 1) { |
71 | $self->grab_focus; |
195 | $self->grab_focus; |
72 | return unless $::CONN; |
196 | return unless $::CONN; |
73 | |
197 | |
74 | my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
198 | my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; |
75 | my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
199 | my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize}; |
76 | |
200 | |
77 | $x -= int 0.5 * $self->{sw}; |
201 | $x -= CFPlus::floor $::MAP->w * 0.5; |
78 | $y -= int 0.5 * $self->{sh}; |
202 | $y -= CFPlus::floor $::MAP->h * 0.5; |
79 | |
203 | |
80 | $::CONN->lookat ($x, $y) |
204 | $::CONN->lookat ($x, $y) |
81 | if $::CONN; |
205 | if $::CONN; |
82 | |
206 | |
83 | } elsif ($ev->{button} == 2) { |
207 | } elsif ($ev->{button} == 2) { |
… | |
… | |
96 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
220 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
97 | |
221 | |
98 | $self->update; |
222 | $self->update; |
99 | }; |
223 | }; |
100 | } elsif ($ev->{button} == 3) { |
224 | } elsif ($ev->{button} == 3) { |
101 | (new CFClient::UI::Menu |
225 | my @items = ( |
102 | items => [ |
|
|
103 | ["Help Browser…\t(F1)", sub { $::HELP_WINDOW->toggle_visibility }], |
226 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
104 | ["Stats & Skills…\t(F2)", sub { ::toggle_player_page ($::STATS_PAGE) }], |
227 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
|
|
228 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
|
|
229 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
105 | ["Inventory…\t(F3)", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
230 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
106 | ["Spells…\t(F4)", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
|
|
107 | ["Setup… \t(F5)", sub { $::SETUP_DIALOG->toggle_visibility }], |
231 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
108 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
232 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
109 | [ |
233 | [ |
110 | $::PICKUP_ENABLE->{state} |
234 | $::PICKUP_ENABLE->{state} |
111 | ? "Disable automatic pickup" |
235 | ? "Disable automatic pickup" |
112 | : "Enable automatic pickup", |
236 | : "Enable automatic pickup", |
113 | sub { $::PICKUP_ENABLE->toggle } |
237 | sub { $::PICKUP_ENABLE->toggle } |
114 | ], |
238 | ], |
|
|
239 | ); |
|
|
240 | |
|
|
241 | if ($::CONN && $::CONN->{editor_support}) { |
|
|
242 | push @items, [ |
|
|
243 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
|
|
244 | \&editor_invoke, |
|
|
245 | ]; |
|
|
246 | |
|
|
247 | for my $type (qw(test name)) { |
|
|
248 | $::CONN->{editor_support}{type} ne $type |
|
|
249 | or next; |
|
|
250 | my $server = $::CONN->{editor_support}{"${type}server"} |
|
|
251 | or next; |
|
|
252 | |
|
|
253 | push @items, [ |
|
|
254 | "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", |
|
|
255 | sub { server_login $server }, |
|
|
256 | ]; |
|
|
257 | } |
|
|
258 | } |
|
|
259 | |
|
|
260 | push @items, |
|
|
261 | ["Quit", |
|
|
262 | sub { |
|
|
263 | if ($::CONN) { |
|
|
264 | &::open_quit_dialog; |
|
|
265 | } else { |
|
|
266 | exit; |
|
|
267 | } |
|
|
268 | } |
115 | ], |
269 | ], |
|
|
270 | ; |
|
|
271 | |
|
|
272 | (new CFPlus::UI::Menu |
|
|
273 | items => \@items, |
116 | )->popup ($ev); |
274 | )->popup ($ev); |
117 | } |
275 | } |
118 | |
276 | |
119 | 1 |
277 | 1 |
120 | } |
278 | } |
… | |
… | |
139 | 1 |
297 | 1 |
140 | } |
298 | } |
141 | |
299 | |
142 | sub size_request { |
300 | sub size_request { |
143 | ( |
301 | ( |
144 | 32 * CFClient::ceil $::WIDTH / 32, |
302 | 32 * CFPlus::ceil $::WIDTH / 32, |
145 | 32 * CFClient::ceil $::HEIGHT / 32, |
303 | 32 * CFPlus::ceil $::HEIGHT / 32, |
146 | ) |
304 | ) |
147 | } |
305 | } |
148 | |
306 | |
149 | sub update { |
307 | sub update { |
150 | my ($self) = @_; |
308 | my ($self) = @_; |
… | |
… | |
152 | $self->{need_update} = 1; |
310 | $self->{need_update} = 1; |
153 | $self->SUPER::update; |
311 | $self->SUPER::update; |
154 | } |
312 | } |
155 | |
313 | |
156 | my %DIR = ( |
314 | my %DIR = ( |
157 | CFClient::SDLK_KP8, [1, "north"], |
315 | CFPlus::SDLK_KP8, [1, "north"], |
158 | CFClient::SDLK_KP9, [2, "northeast"], |
316 | CFPlus::SDLK_KP9, [2, "northeast"], |
159 | CFClient::SDLK_KP6, [3, "east"], |
317 | CFPlus::SDLK_KP6, [3, "east"], |
160 | CFClient::SDLK_KP3, [4, "southeast"], |
318 | CFPlus::SDLK_KP3, [4, "southeast"], |
161 | CFClient::SDLK_KP2, [5, "south"], |
319 | CFPlus::SDLK_KP2, [5, "south"], |
162 | CFClient::SDLK_KP1, [6, "southwest"], |
320 | CFPlus::SDLK_KP1, [6, "southwest"], |
163 | CFClient::SDLK_KP4, [7, "west"], |
321 | CFPlus::SDLK_KP4, [7, "west"], |
164 | CFClient::SDLK_KP7, [8, "northwest"], |
322 | CFPlus::SDLK_KP7, [8, "northwest"], |
165 | |
323 | |
166 | CFClient::SDLK_UP, [1, "north"], |
324 | CFPlus::SDLK_UP, [1, "north"], |
167 | CFClient::SDLK_RIGHT, [3, "east"], |
325 | CFPlus::SDLK_RIGHT, [3, "east"], |
168 | CFClient::SDLK_DOWN, [5, "south"], |
326 | CFPlus::SDLK_DOWN, [5, "south"], |
169 | CFClient::SDLK_LEFT, [7, "west"], |
327 | CFPlus::SDLK_LEFT, [7, "west"], |
170 | ); |
328 | ); |
171 | |
329 | |
172 | sub invoke_key_down { |
330 | sub invoke_key_down { |
173 | my ($self, $ev) = @_; |
331 | my ($self, $ev) = @_; |
174 | |
332 | |
175 | my $mod = $ev->{mod}; |
333 | my $mod = $ev->{mod}; |
176 | my $sym = $ev->{sym}; |
334 | my $sym = $ev->{sym}; |
177 | my $uni = $ev->{unicode}; |
335 | my $uni = $ev->{unicode}; |
178 | |
336 | |
179 | $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; |
337 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
180 | |
338 | |
181 | if ($uni == ord "\t") { |
339 | if ($uni == ord "\t") { |
182 | $::PL_WINDOW->toggle_visibility; |
340 | $::PL_WINDOW->toggle_visibility; |
183 | } elsif ($sym == CFClient::SDLK_F1 && !$mod) { |
341 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
184 | $::HELP_WINDOW->toggle_visibility; |
342 | $::HELP_WINDOW->toggle_visibility; |
185 | } elsif ($sym == CFClient::SDLK_F2 && !$mod) { |
343 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
186 | ::toggle_player_page ($::STATS_PAGE); |
344 | ::toggle_player_page ($::STATS_PAGE); |
187 | } elsif ($sym == CFClient::SDLK_F3 && !$mod) { |
345 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
|
|
346 | ::toggle_player_page ($::SKILL_PAGE); |
|
|
347 | } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { |
|
|
348 | ::toggle_player_page ($::SPELL_PAGE); |
|
|
349 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
188 | ::toggle_player_page ($::INVENTORY_PAGE); |
350 | ::toggle_player_page ($::INVENTORY_PAGE); |
189 | } elsif ($sym == CFClient::SDLK_F4 && !$mod) { |
351 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
190 | ::toggle_player_page ($::SPELL_PAGE); |
|
|
191 | } elsif ($sym == CFClient::SDLK_F5 && !$mod) { |
|
|
192 | $::SETUP_DIALOG->toggle_visibility; |
352 | $::SETUP_DIALOG->toggle_visibility; |
193 | } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { |
353 | } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { |
194 | $::BIND_EDITOR->set_binding (undef, undef, [], |
354 | $::BIND_EDITOR->set_binding (undef, undef, [], |
195 | sub { |
355 | sub { |
196 | my ($mod, $sym, $cmds) = @_; |
356 | my ($mod, $sym, $cmds) = @_; |
197 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
357 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
198 | }); |
358 | }); |
199 | $::BIND_EDITOR->start; |
359 | $::BIND_EDITOR->start; |
200 | $::BIND_EDITOR->show; |
360 | $::BIND_EDITOR->show; |
|
|
361 | #TODO: elmex, what was this supposed to do? it currently crashes the client. |
201 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
362 | # } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { |
202 | $::BIND_EDITOR->stop; |
363 | # $::BIND_EDITOR->stop; |
203 | $::BIND_EDITOR->ask_for_bind_and_commit; |
364 | # $::BIND_EDITOR->ask_for_bind_and_commit; |
204 | $::BIND_EDITOR->hide; |
365 | # $::BIND_EDITOR->hide; |
205 | } elsif (!$::CONN) { |
366 | } elsif (!$::CONN) { |
206 | return 0; # bindings further down need a valid connection |
367 | return 0; # bindings further down need a valid connection |
207 | |
368 | |
208 | } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { |
369 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
209 | $::CONN->user_send ("stay fire"); |
370 | $::CONN->user_send ("stay fire"); |
210 | } elsif ($uni == ord ",") { |
371 | } elsif ($uni == ord ",") { |
211 | $::CONN->user_send ("take"); |
372 | $::CONN->user_send ("take"); |
212 | } elsif ($uni == ord " ") { |
373 | } elsif ($uni == ord " ") { |
213 | $::CONN->user_send ("apply"); |
374 | $::CONN->user_send ("apply"); |
|
|
375 | } elsif ($uni == 13) { |
|
|
376 | $::CONN->user_send ("examine"); |
214 | } elsif ($uni == ord ".") { |
377 | } elsif ($uni == ord ".") { |
215 | $::CONN->user_send ($self->{completer}{last_command}) |
378 | $::CONN->user_send ($self->{completer}{last_command}) |
216 | if exists $self->{completer}{last_command}; |
379 | if exists $self->{completer}{last_command}; |
217 | } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { |
380 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
218 | $::CONN->user_send ($_) for @$bind_cmd; |
381 | $::CONN->user_send ($_) for @$bind_cmd; |
219 | } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
382 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
220 | $::CONN->user_send ("rotateshoottype +"); |
383 | $::CONN->user_send ("rotateshoottype +"); |
221 | } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
384 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
222 | $::CONN->user_send ("rotateshoottype -"); |
385 | $::CONN->user_send ("rotateshoottype -"); |
223 | } elsif ($uni == ord '"') { |
386 | } elsif ($uni == ord '"') { |
224 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
387 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
225 | $self->{completer}->show; |
388 | $self->{completer}->show; |
226 | } elsif ($uni == ord "'") { |
389 | } elsif ($uni == ord "'") { |
227 | $self->{completer}->set_prefix (""); |
390 | $self->{completer}->set_prefix (""); |
228 | $self->{completer}->show; |
391 | $self->{completer}->show; |
229 | } elsif (exists $DIR{$sym}) { |
392 | } elsif (exists $DIR{$sym}) { |
230 | if ($mod & CFClient::KMOD_SHIFT) { |
393 | if ($mod & CFPlus::KMOD_SHIFT) { |
231 | $self->{shft}++; |
394 | $self->{shft}++; |
232 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
395 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
233 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
396 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
234 | } |
397 | } |
235 | $self->{fire_dir} = $DIR{$sym}[0]; |
398 | $self->{fire_dir} = $DIR{$sym}[0]; |
236 | } elsif ($mod & CFClient::KMOD_CTRL) { |
399 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
237 | $self->{ctrl}++; |
400 | $self->{ctrl}++; |
238 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
401 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
239 | } else { |
402 | } else { |
240 | $::CONN->user_send ("$DIR{$sym}[1]"); |
403 | $::CONN->user_send ("$DIR{$sym}[1]"); |
241 | } |
404 | } |
242 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
405 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
243 | $self->{completer}->invoke_key_down ($ev); |
406 | $self->{completer}->inject_key_down ($ev); |
244 | $self->{completer}->show; |
407 | $self->{completer}->show; |
245 | } else { |
408 | } else { |
246 | return 0; |
409 | return 0; |
247 | } |
410 | } |
248 | |
411 | |
… | |
… | |
255 | my $res = 0; |
418 | my $res = 0; |
256 | my $mod = $ev->{mod}; |
419 | my $mod = $ev->{mod}; |
257 | my $sym = $ev->{sym}; |
420 | my $sym = $ev->{sym}; |
258 | |
421 | |
259 | if ($::CFG->{shift_fire_stop}) { |
422 | if ($::CFG->{shift_fire_stop}) { |
260 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
423 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
261 | $::CONN->user_send ("fire_stop"); |
424 | $::CONN->user_send ("fire_stop"); |
262 | delete $self->{fire_dir}; |
425 | delete $self->{fire_dir}; |
263 | $res = 1; |
426 | $res = 1; |
264 | } |
427 | } |
265 | } else { |
428 | } else { |
266 | if (exists $DIR{$sym} && delete $self->{shft}) { |
429 | if (exists $DIR{$sym} && delete $self->{shft}) { |
267 | $::CONN->user_send ("fire_stop"); |
430 | $::CONN->user_send ("fire_stop"); |
268 | delete $self->{fire_dir}; |
431 | delete $self->{fire_dir}; |
269 | $res = 1; |
432 | $res = 1; |
270 | } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
433 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
271 | $::CONN->user_send ("fire_stop"); |
434 | $::CONN->user_send ("fire_stop"); |
272 | delete $self->{fire_dir}; |
435 | delete $self->{fire_dir}; |
273 | $res = 1; |
436 | $res = 1; |
274 | } |
437 | } |
275 | } |
438 | } |
276 | |
439 | |
277 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
440 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
278 | $::CONN->user_send ("run_stop"); |
441 | $::CONN->user_send ("run_stop"); |
279 | $res = 1; |
442 | $res = 1; |
280 | } |
443 | } |
281 | |
444 | |
282 | $res |
445 | $res |
… | |
… | |
296 | sub draw { |
459 | sub draw { |
297 | my ($self) = @_; |
460 | my ($self) = @_; |
298 | |
461 | |
299 | return unless $::MAP; |
462 | return unless $::MAP; |
300 | |
463 | |
301 | my $focused = $CFClient::UI::FOCUS == $self |
464 | my $focused = $CFPlus::UI::FOCUS == $self |
302 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
465 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
303 | |
466 | |
304 | return |
467 | return |
305 | unless $focused || !$::FAST; |
468 | unless $focused || !$::FAST; |
306 | |
469 | |
307 | if (delete $self->{need_update}) { |
470 | if (delete $self->{need_update}) { |
308 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
471 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
309 | |
472 | |
|
|
473 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
474 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
475 | |
310 | my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; |
476 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
311 | my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; |
477 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
312 | |
478 | |
313 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
479 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
314 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
480 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
315 | |
481 | |
316 | my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; |
482 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
317 | my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; |
483 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
318 | |
484 | |
319 | if ($::CFG->{fow_enable}) { |
485 | if ($::CFG->{fow_enable}) { |
320 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
486 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
321 | |
487 | |
322 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
488 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
323 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
489 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
324 | glConvolutionFilter2D ( |
490 | glConvolutionFilter2D ( |
325 | GL_CONVOLUTION_2D, |
491 | GL_CONVOLUTION_2D, |
326 | GL_ALPHA, |
492 | GL_ALPHA, |
327 | 3, 3, |
493 | 3, 3, |
… | |
… | |
329 | (pack "f*", @{ $self->{smooth_matrix} }), |
495 | (pack "f*", @{ $self->{smooth_matrix} }), |
330 | ); |
496 | ); |
331 | glEnable GL_CONVOLUTION_2D; |
497 | glEnable GL_CONVOLUTION_2D; |
332 | } |
498 | } |
333 | |
499 | |
334 | $self->{fow_texture} = new CFClient::Texture |
500 | $self->{fow_texture} = new CFPlus::Texture |
335 | w => $w, |
501 | w => $w, |
336 | h => $h, |
502 | h => $h, |
337 | data => $data, |
503 | data => $data, |
338 | internalformat => GL_ALPHA, |
504 | internalformat => GL_ALPHA, |
339 | format => GL_ALPHA; |
505 | format => GL_ALPHA; |
… | |
… | |
347 | |
513 | |
348 | glPushMatrix; |
514 | glPushMatrix; |
349 | glTranslate $sx0, $sy0; |
515 | glTranslate $sx0, $sy0; |
350 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
516 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
351 | |
517 | |
352 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
518 | $::MAP->draw ($dx, $dy, $sw, $sh); |
353 | |
519 | |
354 | glScale 32, 32; |
520 | glScale 32, 32; |
355 | |
521 | |
356 | if (my $tex = $self->{fow_texture}) { |
522 | if (my $tex = $self->{fow_texture}) { |
357 | glEnable GL_TEXTURE_2D; |
523 | glEnable GL_TEXTURE_2D; |
… | |
… | |
401 | glDeleteList $self->{list}; |
567 | glDeleteList $self->{list}; |
402 | |
568 | |
403 | $self->SUPER::DESTROY; |
569 | $self->SUPER::DESTROY; |
404 | } |
570 | } |
405 | |
571 | |
406 | package CFClient::MapWidget::MapMap; |
572 | package CFPlus::MapWidget::MapMap; |
407 | |
573 | |
408 | our @ISA = CFClient::UI::Base::; |
574 | our @ISA = CFPlus::UI::Base::; |
409 | |
575 | |
410 | use Time::HiRes qw(time); |
576 | use Time::HiRes qw(time); |
411 | use CFClient::OpenGL; |
577 | use CFPlus::OpenGL; |
412 | |
578 | |
413 | sub size_request { |
579 | sub size_request { |
414 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
580 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
415 | } |
581 | } |
416 | |
582 | |
… | |
… | |
452 | |
618 | |
453 | if ($self->{texture_atime} < time) { |
619 | if ($self->{texture_atime} < time) { |
454 | $self->{texture_atime} = time + 1/3; |
620 | $self->{texture_atime} = time + 1/3; |
455 | |
621 | |
456 | $self->{texture} = |
622 | $self->{texture} = |
457 | new CFClient::Texture |
623 | new CFPlus::Texture |
458 | w => $w, |
624 | w => $w, |
459 | h => $h, |
625 | h => $h, |
460 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
626 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
461 | type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
627 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
462 | } |
628 | } |
463 | |
629 | |
464 | $self->{texture}->draw_quad (0, 0); |
630 | $self->{texture}->draw_quad (0, 0); |
465 | |
631 | |
466 | glDisable GL_TEXTURE_2D; |
632 | glDisable GL_TEXTURE_2D; |
… | |
… | |
481 | glEnd; |
647 | glEnd; |
482 | |
648 | |
483 | glDisable GL_BLEND; |
649 | glDisable GL_BLEND; |
484 | } |
650 | } |
485 | |
651 | |
486 | package CFClient::MapWidget::Command; |
652 | package CFPlus::MapWidget::Command; |
487 | |
653 | |
488 | use strict; |
654 | use strict; |
489 | |
655 | |
490 | use CFClient::OpenGL; |
656 | use CFPlus::OpenGL; |
491 | |
657 | |
492 | our @ISA = CFClient::UI::Frame::; |
658 | our @ISA = CFPlus::UI::Frame::; |
493 | |
659 | |
494 | sub new { |
660 | sub new { |
495 | my $class = shift; |
661 | my $class = shift; |
496 | |
662 | |
497 | my $self = $class->SUPER::new ( |
663 | my $self = $class->SUPER::new ( |
498 | bg => [0, 0, 0, 0.8], |
664 | bg => [0, 0, 0, 0.8], |
499 | @_, |
665 | @_, |
500 | ); |
666 | ); |
501 | |
667 | |
502 | $self->add ($self->{vbox} = new CFClient::UI::VBox); |
668 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
503 | |
669 | |
504 | $self->{label} = [ |
670 | $self->{label} = [ |
505 | map |
671 | map |
506 | CFClient::UI::Label->new ( |
672 | CFPlus::UI::Label->new ( |
507 | can_hover => 1, |
673 | can_hover => 1, |
508 | can_events => 1, |
674 | can_events => 1, |
509 | tooltip_width => 0.33, |
675 | tooltip_width => 0.33, |
510 | fontsize => $_, |
676 | fontsize => $_, |
511 | ), (0.8) x 16 |
677 | ), (0.8) x 16 |
512 | ]; |
678 | ]; |
513 | |
679 | |
514 | $self->{entry} = new CFClient::UI::Entry |
680 | $self->{entry} = new CFPlus::UI::Entry |
515 | on_changed => sub { |
681 | on_changed => sub { |
516 | $self->update_labels; |
682 | $self->update_labels; |
517 | 0 |
683 | 0 |
518 | }, |
684 | }, |
519 | on_button_down => sub { |
685 | on_button_down => sub { |
520 | my ($entry, $ev, $x, $y) = @_; |
686 | my ($entry, $ev, $x, $y) = @_; |
521 | |
687 | |
522 | if ($ev->{button} == 3) { |
688 | if ($ev->{button} == 3) { |
523 | (new CFClient::UI::Menu |
689 | (new CFPlus::UI::Menu |
524 | items => [ |
690 | items => [ |
525 | ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" |
691 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
526 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
692 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
527 | ], |
693 | ], |
528 | )->popup ($ev); |
694 | )->popup ($ev); |
529 | return 1; |
695 | return 1; |
530 | } |
696 | } |
… | |
… | |
546 | $self->hide; |
712 | $self->hide; |
547 | } |
713 | } |
548 | } elsif ($ev->{sym} == 27) { |
714 | } elsif ($ev->{sym} == 27) { |
549 | $self->{hist_ptr} = 0; |
715 | $self->{hist_ptr} = 0; |
550 | $self->hide; |
716 | $self->hide; |
551 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
717 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
552 | if ($self->{hist_ptr} > 1) { |
718 | if ($self->{hist_ptr} > 1) { |
553 | $self->{hist_ptr}--; |
719 | $self->{hist_ptr}--; |
554 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
720 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
555 | } elsif ($self->{hist_ptr} > 0) { |
721 | } elsif ($self->{hist_ptr} > 0) { |
556 | $self->{hist_ptr}--; |
722 | $self->{hist_ptr}--; |
… | |
… | |
558 | } else { |
724 | } else { |
559 | ++$self->{select_offset} |
725 | ++$self->{select_offset} |
560 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
726 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
561 | } |
727 | } |
562 | $self->update_labels; |
728 | $self->update_labels; |
563 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
729 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
564 | if ($self->{select_offset}) { |
730 | if ($self->{select_offset}) { |
565 | --$self->{select_offset} |
731 | --$self->{select_offset} |
566 | } else { |
732 | } else { |
567 | unless ($self->{hist_ptr}) { |
733 | unless ($self->{hist_ptr}) { |
568 | $self->{hist_saveback} = $self->{entry}->get_text; |
734 | $self->{hist_saveback} = $self->{entry}->get_text; |
… | |
… | |
613 | } |
779 | } |
614 | |
780 | |
615 | sub hide { |
781 | sub hide { |
616 | my ($self) = @_; |
782 | my ($self) = @_; |
617 | |
783 | |
|
|
784 | $self->{hist_ptr} = 0; |
|
|
785 | |
618 | $self->SUPER::hide; |
786 | $self->SUPER::hide; |
619 | $self->{entry}->set_text (""); |
787 | $self->{entry}->set_text (""); |
620 | } |
788 | } |
621 | |
789 | |
622 | sub invoke_key_down { |
790 | sub inject_key_down { |
623 | my ($self, $ev) = @_; |
791 | my ($self, $ev) = @_; |
624 | |
792 | |
|
|
793 | $self->{entry}->grab_focus; |
625 | $self->{entry}->emit (key_down => $ev) |
794 | $self->{entry}->emit (key_down => $ev); |
626 | } |
795 | } |
627 | |
796 | |
628 | sub update_labels { |
797 | sub update_labels { |
629 | my ($self) = @_; |
798 | my ($self) = @_; |
630 | |
799 | |
… | |
… | |
723 | |
892 | |
724 | sub _draw { |
893 | sub _draw { |
725 | my ($self) = @_; |
894 | my ($self) = @_; |
726 | |
895 | |
727 | # hack |
896 | # hack |
728 | local $CFClient::UI::FOCUS = $self->{entry}; |
897 | local $CFPlus::UI::FOCUS = $self->{entry}; |
729 | |
898 | |
730 | $self->SUPER::_draw; |
899 | $self->SUPER::_draw; |
731 | } |
900 | } |
732 | |
901 | |
733 | 1 |
902 | 1 |
|
|
903 | |