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 CFClient; |
8 | use CFPlus; |
9 | use CFClient::OpenGL; |
9 | use CFPlus::OpenGL; |
10 | use CFClient::UI; |
10 | use CFPlus::UI; |
11 | |
11 | |
12 | our @ISA = CFClient::UI::Base::; |
12 | our @ISA = CFPlus::UI::Base::; |
13 | |
13 | |
14 | my $magicmap_tex = |
14 | my $magicmap_tex = |
15 | new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", |
15 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
16 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
16 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
17 | |
17 | |
18 | sub new { |
18 | sub new { |
19 | my $class = shift; |
19 | my $class = shift; |
20 | |
20 | |
… | |
… | |
30 | ], |
30 | ], |
31 | |
31 | |
32 | @_ |
32 | @_ |
33 | ); |
33 | ); |
34 | |
34 | |
35 | $self->{completer} = new CFClient::MapWidget::Command:: |
35 | $self->{completer} = new CFPlus::MapWidget::Command:: |
36 | command => $self->{command}, |
36 | command => $self->{command}, |
37 | tooltip => "<b>The Command Completer</b>\n\n" |
37 | tooltip => "#completer_help", |
38 | . "This is your central interface to send text commands to the server. " |
|
|
39 | . "To enter a verbatim command to send to the server, just type the command, " |
|
|
40 | . "followed by a space, and press return. " |
|
|
41 | . "Typing the initial letters of words (or just any letters) displays guesses " |
|
|
42 | . "for commands you might want to use.\n" |
|
|
43 | . "You can use the cursor-up and cursor-down keys to select between those guesses.\n" |
|
|
44 | . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.", |
|
|
45 | ; |
38 | ; |
46 | |
39 | |
47 | $self |
40 | $self |
48 | } |
41 | } |
49 | |
42 | |
… | |
… | |
66 | |
59 | |
67 | $self->{completer}->hide |
60 | $self->{completer}->hide |
68 | if $self->{completer}; |
61 | if $self->{completer}; |
69 | } |
62 | } |
70 | |
63 | |
|
|
64 | sub server_login { |
|
|
65 | my ($server) = @_; |
|
|
66 | |
|
|
67 | ::stop_game (); |
|
|
68 | local $::PROFILE->{host} = $server; |
|
|
69 | ::start_game (); |
|
|
70 | } |
|
|
71 | |
|
|
72 | sub editor_invoke { |
|
|
73 | my $editsup = $::CONN && $::CONN->{editor_support} |
|
|
74 | or return; |
|
|
75 | |
|
|
76 | CFPlus::background { |
|
|
77 | print "preparing editor startup...\n"; |
|
|
78 | |
|
|
79 | my $server = $editsup->{gameserver} || "default"; |
|
|
80 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
|
|
81 | |
|
|
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; |
|
|
84 | |
|
|
85 | print "map directory is $mapdir\n"; |
|
|
86 | print "lib directory is $libdir\n"; |
|
|
87 | |
|
|
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"; |
|
|
95 | } |
|
|
96 | |
|
|
97 | if (1) { # upload a map |
|
|
98 | my $mapname = $::CONN->{map_info}[0]; |
|
|
99 | |
|
|
100 | my $mappath = "$mapdir/$mapname"; |
|
|
101 | |
|
|
102 | -e $mappath and die "$mappath already exists\n"; |
|
|
103 | |
|
|
104 | print "getting map revision for $mapname...\n"; |
|
|
105 | |
|
|
106 | # try to get the most recent head revision, what a hack, |
|
|
107 | # this should have been returned while downloading *sigh* |
|
|
108 | my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
|
|
109 | |
|
|
110 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
|
|
111 | my $rev = $1; |
|
|
112 | |
|
|
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# |
|
|
141 | |
|
|
142 | # now upload it |
|
|
143 | # require HTTP::Request::Common; |
|
|
144 | # |
|
|
145 | # my $res = $ua->post ( |
|
|
146 | # $ENV{CFPLUS_UPLOAD}, |
|
|
147 | # Content_Type => 'multipart/form-data', |
|
|
148 | # Content => [ |
|
|
149 | # path => $mapname, |
|
|
150 | # mapdir => $ENV{CROSSFIRE_MAPDIR}, |
|
|
151 | # map => $map, |
|
|
152 | # revision => $rev, |
|
|
153 | # cf_login => $ENV{CFPLUS_LOGIN}, |
|
|
154 | # cf_password => $ENV{CFPLUS_PASSWORD}, |
|
|
155 | # comment => "", |
|
|
156 | # ] |
|
|
157 | # ); |
|
|
158 | # |
|
|
159 | # if ($res->is_error) { |
|
|
160 | # # fatal condition |
|
|
161 | # warn $res->status_line; |
|
|
162 | # } else { |
|
|
163 | # # script replies are marked as {{..}} |
|
|
164 | # my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
|
|
165 | # warn map "$_\n", @msgs; |
|
|
166 | # } |
|
|
167 | } else { |
|
|
168 | die "viewvc parse error, unable to detect revision\n"; |
|
|
169 | } |
|
|
170 | } |
|
|
171 | } |
|
|
172 | } |
|
|
173 | |
71 | sub invoke_button_down { |
174 | sub invoke_button_down { |
72 | my ($self, $ev, $x, $y) = @_; |
175 | my ($self, $ev, $x, $y) = @_; |
73 | |
176 | |
74 | if ($ev->{button} == 1) { |
177 | if ($ev->{button} == 1) { |
75 | $self->grab_focus; |
178 | $self->grab_focus; |
76 | return unless $::CONN; |
179 | return unless $::CONN; |
77 | |
180 | |
78 | my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
181 | my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; |
79 | my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
182 | my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize}; |
80 | |
183 | |
81 | $x -= int 0.5 * $self->{sw}; |
184 | $x -= CFPlus::floor $::MAP->w * 0.5; |
82 | $y -= int 0.5 * $self->{sh}; |
185 | $y -= CFPlus::floor $::MAP->h * 0.5; |
83 | |
186 | |
|
|
187 | if ($::CONN) { |
|
|
188 | if ($::IN_BUILD_MODE) { |
|
|
189 | $::CONN->buildat ($::IN_BUILD_MODE, $x, $y); |
|
|
190 | } else { |
84 | $::CONN->lookat ($x, $y) |
191 | $::CONN->lookat ($x, $y) |
85 | if $::CONN; |
192 | } |
|
|
193 | } |
86 | |
194 | |
87 | } elsif ($ev->{button} == 2) { |
195 | } elsif ($ev->{button} == 2) { |
88 | $self->grab_focus; |
196 | $self->grab_focus; |
89 | return unless $::CONN; |
197 | return unless $::CONN; |
90 | |
198 | |
… | |
… | |
100 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
208 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
101 | |
209 | |
102 | $self->update; |
210 | $self->update; |
103 | }; |
211 | }; |
104 | } elsif ($ev->{button} == 3) { |
212 | } elsif ($ev->{button} == 3) { |
105 | (new CFClient::UI::Menu |
213 | my @items = ( |
106 | items => [ |
|
|
107 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
214 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
108 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
215 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
109 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
216 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
110 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
217 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
111 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
218 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
… | |
… | |
115 | $::PICKUP_ENABLE->{state} |
222 | $::PICKUP_ENABLE->{state} |
116 | ? "Disable automatic pickup" |
223 | ? "Disable automatic pickup" |
117 | : "Enable automatic pickup", |
224 | : "Enable automatic pickup", |
118 | sub { $::PICKUP_ENABLE->toggle } |
225 | sub { $::PICKUP_ENABLE->toggle } |
119 | ], |
226 | ], |
|
|
227 | ); |
|
|
228 | |
|
|
229 | if ($::CONN && $::CONN->{editor_support}) { |
|
|
230 | push @items, [ |
|
|
231 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
|
|
232 | \&editor_invoke, |
|
|
233 | ]; |
|
|
234 | |
|
|
235 | for my $type (qw(test name)) { |
|
|
236 | $::CONN->{editor_support}{type} ne $type |
|
|
237 | or next; |
|
|
238 | my $server = $::CONN->{editor_support}{"${type}server"} |
|
|
239 | or next; |
|
|
240 | |
|
|
241 | push @items, [ |
|
|
242 | "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", |
|
|
243 | sub { server_login $server }, |
|
|
244 | ]; |
|
|
245 | } |
|
|
246 | } |
|
|
247 | |
|
|
248 | push @items, |
120 | ["Quit", |
249 | ["Quit", |
121 | sub { |
250 | sub { |
122 | if ($::CONN) { |
251 | if ($::CONN) { |
123 | &::open_quit_dialog; |
252 | &::open_quit_dialog; |
124 | } else { |
253 | } else { |
125 | exit; |
254 | exit; |
126 | } |
|
|
127 | } |
255 | } |
128 | ], |
256 | } |
129 | ], |
257 | ], |
|
|
258 | ; |
|
|
259 | |
|
|
260 | (new CFPlus::UI::Menu |
|
|
261 | items => \@items, |
130 | )->popup ($ev); |
262 | )->popup ($ev); |
131 | } |
263 | } |
132 | |
264 | |
133 | 1 |
265 | 1 |
134 | } |
266 | } |
… | |
… | |
153 | 1 |
285 | 1 |
154 | } |
286 | } |
155 | |
287 | |
156 | sub size_request { |
288 | sub size_request { |
157 | ( |
289 | ( |
158 | 32 * CFClient::ceil $::WIDTH / 32, |
290 | 32 * CFPlus::ceil $::WIDTH / 32, |
159 | 32 * CFClient::ceil $::HEIGHT / 32, |
291 | 32 * CFPlus::ceil $::HEIGHT / 32, |
160 | ) |
292 | ) |
161 | } |
293 | } |
162 | |
294 | |
163 | sub update { |
295 | sub update { |
164 | my ($self) = @_; |
296 | my ($self) = @_; |
… | |
… | |
166 | $self->{need_update} = 1; |
298 | $self->{need_update} = 1; |
167 | $self->SUPER::update; |
299 | $self->SUPER::update; |
168 | } |
300 | } |
169 | |
301 | |
170 | my %DIR = ( |
302 | my %DIR = ( |
171 | CFClient::SDLK_KP8, [1, "north"], |
303 | CFPlus::SDLK_KP8, [1, "north"], |
172 | CFClient::SDLK_KP9, [2, "northeast"], |
304 | CFPlus::SDLK_KP9, [2, "northeast"], |
173 | CFClient::SDLK_KP6, [3, "east"], |
305 | CFPlus::SDLK_KP6, [3, "east"], |
174 | CFClient::SDLK_KP3, [4, "southeast"], |
306 | CFPlus::SDLK_KP3, [4, "southeast"], |
175 | CFClient::SDLK_KP2, [5, "south"], |
307 | CFPlus::SDLK_KP2, [5, "south"], |
176 | CFClient::SDLK_KP1, [6, "southwest"], |
308 | CFPlus::SDLK_KP1, [6, "southwest"], |
177 | CFClient::SDLK_KP4, [7, "west"], |
309 | CFPlus::SDLK_KP4, [7, "west"], |
178 | CFClient::SDLK_KP7, [8, "northwest"], |
310 | CFPlus::SDLK_KP7, [8, "northwest"], |
179 | |
311 | |
180 | CFClient::SDLK_UP, [1, "north"], |
312 | CFPlus::SDLK_UP, [1, "north"], |
181 | CFClient::SDLK_RIGHT, [3, "east"], |
313 | CFPlus::SDLK_RIGHT, [3, "east"], |
182 | CFClient::SDLK_DOWN, [5, "south"], |
314 | CFPlus::SDLK_DOWN, [5, "south"], |
183 | CFClient::SDLK_LEFT, [7, "west"], |
315 | CFPlus::SDLK_LEFT, [7, "west"], |
184 | ); |
316 | ); |
185 | |
317 | |
186 | sub invoke_key_down { |
318 | sub invoke_key_down { |
187 | my ($self, $ev) = @_; |
319 | my ($self, $ev) = @_; |
188 | |
320 | |
189 | my $mod = $ev->{mod}; |
321 | my $mod = $ev->{mod}; |
190 | my $sym = $ev->{sym}; |
322 | my $sym = $ev->{sym}; |
191 | my $uni = $ev->{unicode}; |
323 | my $uni = $ev->{unicode}; |
192 | |
324 | |
193 | $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; |
325 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
194 | |
326 | |
195 | if ($uni == ord "\t") { |
327 | if ($uni == ord "\t") { |
196 | $::PL_WINDOW->toggle_visibility; |
328 | $::PL_WINDOW->toggle_visibility; |
197 | } elsif ($sym == CFClient::SDLK_F1 && !$mod) { |
329 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
198 | $::HELP_WINDOW->toggle_visibility; |
330 | $::HELP_WINDOW->toggle_visibility; |
199 | } elsif ($sym == CFClient::SDLK_F2 && !$mod) { |
331 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
200 | ::toggle_player_page ($::STATS_PAGE); |
332 | ::toggle_player_page ($::STATS_PAGE); |
201 | } elsif ($sym == CFClient::SDLK_F3 && !$mod) { |
333 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
202 | ::toggle_player_page ($::SKILL_PAGE); |
334 | ::toggle_player_page ($::SKILL_PAGE); |
203 | } elsif ($sym == CFClient::SDLK_F4 && !$mod) { |
335 | } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { |
204 | ::toggle_player_page ($::SPELL_PAGE); |
336 | ::toggle_player_page ($::SPELL_PAGE); |
205 | } elsif ($sym == CFClient::SDLK_F5 && !$mod) { |
337 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
206 | ::toggle_player_page ($::INVENTORY_PAGE); |
338 | ::toggle_player_page ($::INVENTORY_PAGE); |
207 | } elsif ($sym == CFClient::SDLK_F9 && !$mod) { |
339 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
208 | $::SETUP_DIALOG->toggle_visibility; |
340 | $::SETUP_DIALOG->toggle_visibility; |
209 | } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { |
341 | } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { |
210 | $::BIND_EDITOR->set_binding (undef, undef, [], |
342 | $::BIND_EDITOR->set_binding (undef, undef, [], |
211 | sub { |
343 | sub { |
212 | my ($mod, $sym, $cmds) = @_; |
344 | my ($mod, $sym, $cmds) = @_; |
213 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
345 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
214 | }); |
346 | }); |
215 | $::BIND_EDITOR->start; |
347 | $::BIND_EDITOR->start; |
216 | $::BIND_EDITOR->show; |
348 | $::BIND_EDITOR->show; |
|
|
349 | #TODO: elmex, what was this supposed to do? it currently crashes the client. |
217 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
350 | # } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { |
218 | $::BIND_EDITOR->stop; |
351 | # $::BIND_EDITOR->stop; |
219 | $::BIND_EDITOR->ask_for_bind_and_commit; |
352 | # $::BIND_EDITOR->ask_for_bind_and_commit; |
220 | $::BIND_EDITOR->hide; |
353 | # $::BIND_EDITOR->hide; |
221 | } elsif (!$::CONN) { |
354 | } elsif (!$::CONN) { |
222 | return 0; # bindings further down need a valid connection |
355 | return 0; # bindings further down need a valid connection |
223 | |
356 | |
224 | } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { |
357 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
225 | $::CONN->user_send ("stay fire"); |
358 | $::CONN->user_send ("stay fire"); |
226 | } elsif ($uni == ord ",") { |
359 | } elsif ($uni == ord ",") { |
227 | $::CONN->user_send ("take"); |
360 | $::CONN->user_send ("take"); |
228 | } elsif ($uni == ord " ") { |
361 | } elsif ($uni == ord " ") { |
229 | $::CONN->user_send ("apply"); |
362 | $::CONN->user_send ("apply"); |
|
|
363 | } elsif ($uni == 13) { |
|
|
364 | $::CONN->user_send ("examine"); |
230 | } elsif ($uni == ord ".") { |
365 | } elsif ($uni == ord ".") { |
231 | $::CONN->user_send ($self->{completer}{last_command}) |
366 | $::CONN->user_send ($self->{completer}{last_command}) |
232 | if exists $self->{completer}{last_command}; |
367 | if exists $self->{completer}{last_command}; |
233 | } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { |
368 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
234 | $::CONN->user_send ($_) for @$bind_cmd; |
369 | $::CONN->user_send ($_) for @$bind_cmd; |
235 | } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
370 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
236 | $::CONN->user_send ("rotateshoottype +"); |
371 | $::CONN->user_send ("rotateshoottype +"); |
237 | } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
372 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
238 | $::CONN->user_send ("rotateshoottype -"); |
373 | $::CONN->user_send ("rotateshoottype -"); |
239 | } elsif ($uni == ord '"') { |
374 | } elsif ($uni == ord '"') { |
240 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
375 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
241 | $self->{completer}->show; |
376 | $self->{completer}->show; |
242 | } elsif ($uni == ord "'") { |
377 | } elsif ($uni == ord "'") { |
243 | $self->{completer}->set_prefix (""); |
378 | $self->{completer}->set_prefix (""); |
244 | $self->{completer}->show; |
379 | $self->{completer}->show; |
245 | } elsif (exists $DIR{$sym}) { |
380 | } elsif (exists $DIR{$sym}) { |
246 | if ($mod & CFClient::KMOD_SHIFT) { |
381 | if ($mod & CFPlus::KMOD_SHIFT) { |
247 | $self->{shft}++; |
382 | $self->{shft}++; |
248 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
383 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
249 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
384 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
250 | } |
385 | } |
251 | $self->{fire_dir} = $DIR{$sym}[0]; |
386 | $self->{fire_dir} = $DIR{$sym}[0]; |
252 | } elsif ($mod & CFClient::KMOD_CTRL) { |
387 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
253 | $self->{ctrl}++; |
388 | $self->{ctrl}++; |
254 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
389 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
255 | } else { |
390 | } else { |
256 | $::CONN->user_send ("$DIR{$sym}[1]"); |
391 | $::CONN->user_send ("$DIR{$sym}[1]"); |
257 | } |
392 | } |
… | |
… | |
271 | my $res = 0; |
406 | my $res = 0; |
272 | my $mod = $ev->{mod}; |
407 | my $mod = $ev->{mod}; |
273 | my $sym = $ev->{sym}; |
408 | my $sym = $ev->{sym}; |
274 | |
409 | |
275 | if ($::CFG->{shift_fire_stop}) { |
410 | if ($::CFG->{shift_fire_stop}) { |
276 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
411 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
277 | $::CONN->user_send ("fire_stop"); |
412 | $::CONN->user_send ("fire_stop"); |
278 | delete $self->{fire_dir}; |
413 | delete $self->{fire_dir}; |
279 | $res = 1; |
414 | $res = 1; |
280 | } |
415 | } |
281 | } else { |
416 | } else { |
282 | if (exists $DIR{$sym} && delete $self->{shft}) { |
417 | if (exists $DIR{$sym} && delete $self->{shft}) { |
283 | $::CONN->user_send ("fire_stop"); |
418 | $::CONN->user_send ("fire_stop"); |
284 | delete $self->{fire_dir}; |
419 | delete $self->{fire_dir}; |
285 | $res = 1; |
420 | $res = 1; |
286 | } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
421 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
287 | $::CONN->user_send ("fire_stop"); |
422 | $::CONN->user_send ("fire_stop"); |
288 | delete $self->{fire_dir}; |
423 | delete $self->{fire_dir}; |
289 | $res = 1; |
424 | $res = 1; |
290 | } |
425 | } |
291 | } |
426 | } |
292 | |
427 | |
293 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
428 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
294 | $::CONN->user_send ("run_stop"); |
429 | $::CONN->user_send ("run_stop"); |
295 | $res = 1; |
430 | $res = 1; |
296 | } |
431 | } |
297 | |
432 | |
298 | $res |
433 | $res |
299 | } |
434 | } |
300 | |
435 | |
301 | sub set_magicmap { |
436 | sub set_magicmap { |
302 | my ($self, $w, $h, $x, $y, $data) = @_; |
437 | my ($self, $w, $h, $x, $y, $data) = @_; |
303 | |
438 | |
304 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
439 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
305 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
440 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
306 | |
441 | |
307 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
442 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
308 | |
443 | |
309 | $self->update; |
444 | $self->update; |
310 | } |
445 | } |
… | |
… | |
312 | sub draw { |
447 | sub draw { |
313 | my ($self) = @_; |
448 | my ($self) = @_; |
314 | |
449 | |
315 | return unless $::MAP; |
450 | return unless $::MAP; |
316 | |
451 | |
317 | my $focused = $CFClient::UI::FOCUS == $self |
452 | my $focused = $CFPlus::UI::FOCUS == $self |
318 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
453 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
319 | |
454 | |
320 | return |
455 | return |
321 | unless $focused || !$::FAST; |
456 | unless $focused || !$::FAST; |
322 | |
457 | |
323 | if (delete $self->{need_update}) { |
458 | if (delete $self->{need_update}) { |
324 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
459 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
325 | |
460 | |
|
|
461 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
462 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
463 | |
326 | my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; |
464 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
327 | my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; |
465 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
328 | |
466 | |
329 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
467 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
330 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
468 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
331 | |
469 | |
332 | my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; |
470 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
333 | my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; |
471 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
334 | |
472 | |
335 | if ($::CFG->{fow_enable}) { |
473 | if ($::CFG->{fow_enable}) { |
336 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
474 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
337 | |
475 | |
338 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
476 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
339 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
477 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
340 | glConvolutionFilter2D ( |
478 | glConvolutionFilter2D ( |
341 | GL_CONVOLUTION_2D, |
479 | GL_CONVOLUTION_2D, |
342 | GL_ALPHA, |
480 | GL_ALPHA, |
343 | 3, 3, |
481 | 3, 3, |
… | |
… | |
345 | (pack "f*", @{ $self->{smooth_matrix} }), |
483 | (pack "f*", @{ $self->{smooth_matrix} }), |
346 | ); |
484 | ); |
347 | glEnable GL_CONVOLUTION_2D; |
485 | glEnable GL_CONVOLUTION_2D; |
348 | } |
486 | } |
349 | |
487 | |
350 | $self->{fow_texture} = new CFClient::Texture |
488 | $self->{fow_texture} = new CFPlus::Texture |
351 | w => $w, |
489 | w => $w, |
352 | h => $h, |
490 | h => $h, |
353 | data => $data, |
491 | data => $data, |
354 | internalformat => GL_ALPHA, |
492 | internalformat => GL_ALPHA, |
355 | format => GL_ALPHA; |
493 | format => GL_ALPHA; |
… | |
… | |
363 | |
501 | |
364 | glPushMatrix; |
502 | glPushMatrix; |
365 | glTranslate $sx0, $sy0; |
503 | glTranslate $sx0, $sy0; |
366 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
504 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
367 | |
505 | |
368 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
506 | $::MAP->draw ($dx, $dy, $sw, $sh); |
369 | |
507 | |
370 | glScale 32, 32; |
508 | glScale 32, 32; |
371 | |
509 | |
372 | if (my $tex = $self->{fow_texture}) { |
510 | if (my $tex = $self->{fow_texture}) { |
373 | glEnable GL_TEXTURE_2D; |
511 | glEnable GL_TEXTURE_2D; |
… | |
… | |
380 | } |
518 | } |
381 | |
519 | |
382 | if ($self->{magicmap}) { |
520 | if ($self->{magicmap}) { |
383 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
521 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
384 | |
522 | |
385 | $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); |
523 | $x += $::MAP->ox + $self->{dx}; |
386 | $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); |
524 | $y += $::MAP->oy + $self->{dy}; |
387 | |
525 | |
388 | glTranslate - $x - 1, - $y - 1; |
526 | glTranslate - $x - 1, - $y - 1; |
389 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
527 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
390 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
528 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
391 | } |
529 | } |
… | |
… | |
417 | glDeleteList $self->{list}; |
555 | glDeleteList $self->{list}; |
418 | |
556 | |
419 | $self->SUPER::DESTROY; |
557 | $self->SUPER::DESTROY; |
420 | } |
558 | } |
421 | |
559 | |
422 | package CFClient::MapWidget::MapMap; |
560 | package CFPlus::MapWidget::MapMap; |
423 | |
561 | |
424 | our @ISA = CFClient::UI::Base::; |
562 | our @ISA = CFPlus::UI::Base::; |
425 | |
563 | |
426 | use Time::HiRes qw(time); |
564 | use Time::HiRes qw(time); |
427 | use CFClient::OpenGL; |
565 | use CFPlus::OpenGL; |
428 | |
566 | |
429 | sub size_request { |
567 | sub size_request { |
430 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
568 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
431 | } |
569 | } |
432 | |
570 | |
… | |
… | |
468 | |
606 | |
469 | if ($self->{texture_atime} < time) { |
607 | if ($self->{texture_atime} < time) { |
470 | $self->{texture_atime} = time + 1/3; |
608 | $self->{texture_atime} = time + 1/3; |
471 | |
609 | |
472 | $self->{texture} = |
610 | $self->{texture} = |
473 | new CFClient::Texture |
611 | new CFPlus::Texture |
474 | w => $w, |
612 | w => $w, |
475 | h => $h, |
613 | h => $h, |
476 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
614 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
477 | type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
615 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
478 | } |
616 | } |
479 | |
617 | |
480 | $self->{texture}->draw_quad (0, 0); |
618 | $self->{texture}->draw_quad (0, 0); |
481 | |
619 | |
482 | glDisable GL_TEXTURE_2D; |
620 | glDisable GL_TEXTURE_2D; |
… | |
… | |
497 | glEnd; |
635 | glEnd; |
498 | |
636 | |
499 | glDisable GL_BLEND; |
637 | glDisable GL_BLEND; |
500 | } |
638 | } |
501 | |
639 | |
502 | package CFClient::MapWidget::Command; |
640 | package CFPlus::MapWidget::Command; |
503 | |
641 | |
504 | use strict; |
642 | use strict; |
505 | |
643 | |
506 | use CFClient::OpenGL; |
644 | use CFPlus::OpenGL; |
507 | |
645 | |
508 | our @ISA = CFClient::UI::Frame::; |
646 | our @ISA = CFPlus::UI::Frame::; |
509 | |
647 | |
510 | sub new { |
648 | sub new { |
511 | my $class = shift; |
649 | my $class = shift; |
512 | |
650 | |
513 | my $self = $class->SUPER::new ( |
651 | my $self = $class->SUPER::new ( |
514 | bg => [0, 0, 0, 0.8], |
652 | bg => [0, 0, 0, 0.8], |
515 | @_, |
653 | @_, |
516 | ); |
654 | ); |
517 | |
655 | |
518 | $self->add ($self->{vbox} = new CFClient::UI::VBox); |
656 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
519 | |
657 | |
520 | $self->{label} = [ |
658 | $self->{label} = [ |
521 | map |
659 | map |
522 | CFClient::UI::Label->new ( |
660 | CFPlus::UI::Label->new ( |
523 | can_hover => 1, |
661 | can_hover => 1, |
524 | can_events => 1, |
662 | can_events => 1, |
525 | tooltip_width => 0.33, |
663 | tooltip_width => 0.33, |
526 | fontsize => $_, |
664 | fontsize => $_, |
527 | ), (0.8) x 16 |
665 | ), (0.8) x 16 |
528 | ]; |
666 | ]; |
529 | |
667 | |
530 | $self->{entry} = new CFClient::UI::Entry |
668 | $self->{entry} = new CFPlus::UI::Entry |
531 | on_changed => sub { |
669 | on_changed => sub { |
532 | $self->update_labels; |
670 | $self->update_labels; |
533 | 0 |
671 | 0 |
534 | }, |
672 | }, |
535 | on_button_down => sub { |
673 | on_button_down => sub { |
536 | my ($entry, $ev, $x, $y) = @_; |
674 | my ($entry, $ev, $x, $y) = @_; |
537 | |
675 | |
538 | if ($ev->{button} == 3) { |
676 | if ($ev->{button} == 3) { |
539 | (new CFClient::UI::Menu |
677 | (new CFPlus::UI::Menu |
540 | items => [ |
678 | items => [ |
541 | ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key" |
679 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
542 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
680 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
543 | ], |
681 | ], |
544 | )->popup ($ev); |
682 | )->popup ($ev); |
545 | return 1; |
683 | return 1; |
546 | } |
684 | } |
… | |
… | |
562 | $self->hide; |
700 | $self->hide; |
563 | } |
701 | } |
564 | } elsif ($ev->{sym} == 27) { |
702 | } elsif ($ev->{sym} == 27) { |
565 | $self->{hist_ptr} = 0; |
703 | $self->{hist_ptr} = 0; |
566 | $self->hide; |
704 | $self->hide; |
567 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
705 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
568 | if ($self->{hist_ptr} > 1) { |
706 | if ($self->{hist_ptr} > 1) { |
569 | $self->{hist_ptr}--; |
707 | $self->{hist_ptr}--; |
570 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
708 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
571 | } elsif ($self->{hist_ptr} > 0) { |
709 | } elsif ($self->{hist_ptr} > 0) { |
572 | $self->{hist_ptr}--; |
710 | $self->{hist_ptr}--; |
… | |
… | |
574 | } else { |
712 | } else { |
575 | ++$self->{select_offset} |
713 | ++$self->{select_offset} |
576 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
714 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
577 | } |
715 | } |
578 | $self->update_labels; |
716 | $self->update_labels; |
579 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
717 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
580 | if ($self->{select_offset}) { |
718 | if ($self->{select_offset}) { |
581 | --$self->{select_offset} |
719 | --$self->{select_offset} |
582 | } else { |
720 | } else { |
583 | unless ($self->{hist_ptr}) { |
721 | unless ($self->{hist_ptr}) { |
584 | $self->{hist_saveback} = $self->{entry}->get_text; |
722 | $self->{hist_saveback} = $self->{entry}->get_text; |
… | |
… | |
742 | |
880 | |
743 | sub _draw { |
881 | sub _draw { |
744 | my ($self) = @_; |
882 | my ($self) = @_; |
745 | |
883 | |
746 | # hack |
884 | # hack |
747 | local $CFClient::UI::FOCUS = $self->{entry}; |
885 | local $CFPlus::UI::FOCUS = $self->{entry}; |
748 | |
886 | |
749 | $self->SUPER::_draw; |
887 | $self->SUPER::_draw; |
750 | } |
888 | } |
751 | |
889 | |
752 | 1 |
890 | 1 |
|
|
891 | |