1 | package CFPlus::MapWidget; |
1 | package DC::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 DC; |
9 | use CFPlus::OpenGL; |
9 | use DC::OpenGL; |
10 | use CFPlus::UI; |
10 | use DC::UI; |
11 | use CFPlus::Macro; |
11 | use DC::Macro; |
12 | |
12 | |
13 | our @ISA = CFPlus::UI::Base::; |
13 | our @ISA = DC::UI::Base::; |
14 | |
14 | |
15 | my $magicmap_tex = |
15 | my $magicmap_tex = |
16 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
16 | new_from_file DC::Texture DC::find_rcfile "magicmap.png", |
17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
18 | |
18 | |
19 | sub new { |
19 | sub new { |
20 | my $class = shift; |
20 | my $class = shift; |
21 | |
21 | |
22 | my $self = $class->SUPER::new ( |
22 | my $self = $class->SUPER::new ( |
23 | z => -1, |
23 | z => -1, |
24 | can_focus => 1, |
24 | can_focus => 1, |
25 | list => glGenList, |
|
|
26 | tilesize => 32, |
25 | tilesize => 32, |
27 | |
|
|
28 | smooth_matrix => [ |
|
|
29 | 0.30, 0.50, 0.30, |
|
|
30 | 0.50, 0.50, 0.50, |
|
|
31 | 0.30, 0.50, 0.30, |
|
|
32 | ], |
|
|
33 | |
|
|
34 | @_ |
26 | @_ |
35 | ); |
27 | ); |
36 | |
|
|
37 | $self->{completer} = new CFPlus::MapWidget::Command:: |
|
|
38 | command => $self->{command}, |
|
|
39 | tooltip => "#completer_help", |
|
|
40 | ; |
|
|
41 | |
28 | |
42 | $self |
29 | $self |
43 | } |
30 | } |
44 | |
31 | |
45 | sub set_tilesize { |
32 | sub set_tilesize { |
… | |
… | |
55 | |
42 | |
56 | $tooltip =~ s/^\s+//; |
43 | $tooltip =~ s/^\s+//; |
57 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
44 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
58 | $tooltip =~ s/\s+$//; |
45 | $tooltip =~ s/\s+$//; |
59 | |
46 | |
60 | $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
47 | $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
61 | } |
48 | } |
62 | |
49 | |
63 | sub clr_commands { |
50 | sub clr_commands { |
64 | my ($self) = @_; |
51 | my ($self) = @_; |
65 | |
52 | |
66 | %{$self->{completer}{command}} = (); |
53 | %{$::COMPLETER->{command}} = (); |
67 | |
54 | |
68 | $self->{completer}->hide |
55 | $::COMPLETER->hide |
69 | if $self->{completer}; |
56 | if $::COMPLETER; |
70 | } |
57 | } |
71 | |
58 | |
72 | sub server_login { |
59 | sub server_login { |
73 | my ($server) = @_; |
60 | my ($server) = @_; |
74 | |
61 | |
… | |
… | |
79 | |
66 | |
80 | sub editor_invoke { |
67 | sub editor_invoke { |
81 | my $editsup = $::CONN && $::CONN->{editor_support} |
68 | my $editsup = $::CONN && $::CONN->{editor_support} |
82 | or return; |
69 | or return; |
83 | |
70 | |
84 | CFPlus::background { |
71 | DC::background { |
85 | print "preparing editor startup...\n"; |
72 | print "preparing editor startup...\n"; |
86 | |
73 | |
87 | my $server = $editsup->{gameserver} || "default"; |
74 | my $server = $editsup->{gameserver} || "default"; |
88 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
75 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
89 | |
76 | |
90 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
77 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir; |
91 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
78 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir; |
92 | |
79 | |
93 | print "map directory is $mapdir\n"; |
80 | print "map directory is $mapdir\n"; |
94 | print "lib directory is $libdir\n"; |
81 | print "lib directory is $libdir\n"; |
95 | |
82 | |
96 | my $ua = CFPlus::lwp_useragent; |
83 | my $ua = DC::lwp_useragent; |
97 | |
84 | |
98 | for my $file (qw(archetypes crossfire.0)) { |
85 | for my $file (qw(archetypes crossfire.0)) { |
99 | my $url = "$editsup->{lib_root}$file"; |
86 | my $url = "$editsup->{lib_root}$file"; |
100 | print "mirroring $url...\n"; |
87 | print "mirroring $url...\n"; |
101 | CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); |
88 | DC::lwp_check $ua->mirror ($url, "$libdir/$file"); |
102 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
89 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
103 | } |
90 | } |
104 | |
91 | |
105 | if (1) { # upload a map |
92 | if (1) { # upload a map |
106 | my $mapname = $::CONN->{map_info}[0]; |
93 | my $mapname = $::CONN->{map_info}[0]; |
… | |
… | |
111 | |
98 | |
112 | print "getting map revision for $mapname...\n"; |
99 | print "getting map revision for $mapname...\n"; |
113 | |
100 | |
114 | # try to get the most recent head revision, what a hack, |
101 | # try to get the most recent head revision, what a hack, |
115 | # this should have been returned while downloading *sigh* |
102 | # this should have been returned while downloading *sigh* |
116 | my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
103 | my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
117 | |
104 | |
118 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
105 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
119 | my $rev = $1; |
106 | my $rev = $1; |
120 | |
107 | |
121 | print "downloading revision $rev...\n"; |
108 | print "downloading revision $rev...\n"; |
122 | |
109 | |
123 | my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
110 | my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
124 | |
111 | |
125 | my $meta = { |
112 | my $meta = { |
126 | %$editsup, |
113 | %$editsup, |
127 | path => $mapname, |
114 | path => $mapname, |
128 | revision => $rev, |
115 | revision => $rev, |
… | |
… | |
133 | require File::Path; |
120 | require File::Path; |
134 | |
121 | |
135 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
122 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
136 | open my $fh, ">:raw:perlio", "$mappath.meta" |
123 | open my $fh, ">:raw:perlio", "$mappath.meta" |
137 | or die "$mappath.meta: $!\n"; |
124 | or die "$mappath.meta: $!\n"; |
138 | print $fh CFPlus::to_json $meta; |
125 | print $fh DC::encode_json $meta; |
139 | close $fh; |
126 | close $fh; |
140 | open my $fh, ">:raw:perlio:utf8", $mappath |
127 | open my $fh, ">:raw:perlio:utf8", $mappath |
141 | or die "$mappath: $!\n"; |
128 | or die "$mappath: $!\n"; |
142 | print $fh $map; |
129 | print $fh $map; |
143 | close $fh; |
130 | close $fh; |
… | |
… | |
184 | |
171 | |
185 | if ($ev->{button} == 1) { |
172 | if ($ev->{button} == 1) { |
186 | $self->grab_focus; |
173 | $self->grab_focus; |
187 | return unless $::CONN; |
174 | return unless $::CONN; |
188 | |
175 | |
189 | my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; |
176 | my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; |
190 | my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
177 | my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
191 | |
178 | |
192 | $x -= CFPlus::floor $::MAP->w * 0.5; |
179 | $x -= DC::floor $::MAP->w * 0.5; |
193 | $y -= CFPlus::floor $::MAP->h * 0.5; |
180 | $y -= DC::floor $::MAP->h * 0.5; |
194 | |
181 | |
195 | if ($::CONN) { |
182 | if ($::CONN) { |
196 | if ($::IN_BUILD_MODE) { |
|
|
197 | $::CONN->buildat ($::IN_BUILD_MODE, $x, $y); |
|
|
198 | } else { |
|
|
199 | $::CONN->lookat ($x, $y) |
183 | $::CONN->lookat ($x, $y) |
200 | } |
|
|
201 | } |
184 | } |
202 | |
185 | |
203 | } elsif ($ev->{button} == 2) { |
186 | } elsif ($ev->{button} == 2) { |
204 | $self->grab_focus; |
187 | $self->grab_focus; |
205 | return unless $::CONN; |
188 | return unless $::CONN; |
… | |
… | |
223 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
206 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
224 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
207 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
225 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
208 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
226 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
209 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
227 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
210 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
228 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
211 | # ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
229 | [ |
212 | [ |
230 | $::PICKUP_ENABLE->{state} |
213 | $::PICKUP_ENABLE->{state} |
231 | ? "Disable automatic pickup" |
214 | ? "Disable automatic pickup" |
232 | : "Enable automatic pickup", |
215 | : "Enable automatic pickup", |
233 | sub { $::PICKUP_ENABLE->toggle } |
216 | sub { $::PICKUP_ENABLE->toggle } |
234 | ], |
217 | ], |
235 | ); |
218 | ); |
236 | |
219 | |
237 | if ($::CONN && $::CONN->{editor_support}) { |
220 | if ($::CONN && $::CONN->{editor_support}) { |
238 | push @items, [ |
221 | # push @items, [ |
239 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
222 | # "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", |
240 | \&editor_invoke, |
223 | # \&editor_invoke, |
241 | ]; |
224 | # ]; |
242 | |
225 | |
243 | for my $type (qw(test name)) { |
226 | for my $type (qw(test name)) { |
244 | $::CONN->{editor_support}{type} ne $type |
227 | $::CONN->{editor_support}{type} ne $type |
245 | or next; |
228 | or next; |
246 | my $server = $::CONN->{editor_support}{"${type}server"} |
229 | my $server = $::CONN->{editor_support}{"${type}server"} |
247 | or next; |
230 | or next; |
248 | |
231 | |
249 | push @items, [ |
232 | push @items, [ |
250 | "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", |
233 | "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>", |
251 | sub { server_login $server }, |
234 | sub { server_login $server }, |
252 | ]; |
235 | ]; |
253 | } |
236 | } |
254 | } |
237 | } |
255 | |
238 | |
… | |
… | |
263 | } |
246 | } |
264 | } |
247 | } |
265 | ], |
248 | ], |
266 | ; |
249 | ; |
267 | |
250 | |
268 | (new CFPlus::UI::Menu |
251 | (new DC::UI::Menu |
269 | items => \@items, |
252 | items => \@items, |
270 | )->popup ($ev); |
253 | )->popup ($ev); |
271 | } |
254 | } |
272 | |
255 | |
273 | 1 |
256 | 1 |
… | |
… | |
295 | |
278 | |
296 | sub size_request { |
279 | sub size_request { |
297 | my ($self) = @_; |
280 | my ($self) = @_; |
298 | |
281 | |
299 | ( |
282 | ( |
300 | $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize}, |
283 | $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize}, |
301 | $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize}, |
284 | $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize}, |
302 | ) |
285 | ) |
303 | } |
286 | } |
304 | |
287 | |
305 | sub update { |
288 | sub update { |
306 | my ($self) = @_; |
289 | my ($self) = @_; |
… | |
… | |
308 | $self->{need_update} = 1; |
291 | $self->{need_update} = 1; |
309 | $self->SUPER::update; |
292 | $self->SUPER::update; |
310 | } |
293 | } |
311 | |
294 | |
312 | my %DIR = ( |
295 | my %DIR = ( |
313 | CFPlus::SDLK_KP5, [0, "stay fire"], |
296 | ( "," . DC::SDLK_KP5 ), [0, "stay fire"], |
314 | CFPlus::SDLK_KP8, [1, "north"], |
297 | ( "," . DC::SDLK_KP8 ), [1, "north"], |
315 | CFPlus::SDLK_KP9, [2, "northeast"], |
298 | ( "," . DC::SDLK_KP9 ), [2, "northeast"], |
316 | CFPlus::SDLK_KP6, [3, "east"], |
299 | ( "," . DC::SDLK_KP6 ), [3, "east"], |
317 | CFPlus::SDLK_KP3, [4, "southeast"], |
300 | ( "," . DC::SDLK_KP3 ), [4, "southeast"], |
318 | CFPlus::SDLK_KP2, [5, "south"], |
301 | ( "," . DC::SDLK_KP2 ), [5, "south"], |
319 | CFPlus::SDLK_KP1, [6, "southwest"], |
302 | ( "," . DC::SDLK_KP1 ), [6, "southwest"], |
320 | CFPlus::SDLK_KP4, [7, "west"], |
303 | ( "," . DC::SDLK_KP4 ), [7, "west"], |
321 | CFPlus::SDLK_KP7, [8, "northwest"], |
304 | ( "," . DC::SDLK_KP7 ), [8, "northwest"], |
322 | |
305 | |
323 | CFPlus::SDLK_UP, [1, "north"], |
306 | ( "," . DC::SDLK_UP ), [1, "north"], |
|
|
307 | ("1," . DC::SDLK_UP ), [2, "northeast"], |
324 | CFPlus::SDLK_RIGHT, [3, "east"], |
308 | ( "," . DC::SDLK_RIGHT), [3, "east"], |
|
|
309 | ("1," . DC::SDLK_RIGHT), [4, "southeast"], |
325 | CFPlus::SDLK_DOWN, [5, "south"], |
310 | ( "," . DC::SDLK_DOWN ), [5, "south"], |
|
|
311 | ("1," . DC::SDLK_DOWN ), [6, "southwest"], |
326 | CFPlus::SDLK_LEFT, [7, "west"], |
312 | ( "," . DC::SDLK_LEFT ), [7, "west"], |
|
|
313 | ("1," . DC::SDLK_LEFT ), [8, "northwest"], |
327 | ); |
314 | ); |
328 | |
315 | |
329 | sub invoke_key_down { |
316 | sub invoke_key_down { |
330 | my ($self, $ev) = @_; |
317 | my ($self, $ev) = @_; |
331 | |
318 | |
332 | my $mod = $ev->{mod}; |
319 | my $mod = $ev->{mod}; |
333 | my $sym = $ev->{sym}; |
320 | my $sym = $ev->{sym}; |
334 | my $uni = $ev->{unicode}; |
321 | my $uni = $ev->{unicode}; |
335 | |
322 | |
336 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
323 | $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; |
337 | |
324 | |
338 | if ($sym == 9) { |
325 | # ignore repeated keypresses |
339 | ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility; |
326 | return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; |
340 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
327 | $self->{last_mod} = $mod; |
341 | $::HELP_WINDOW->toggle_visibility; |
328 | $self->{last_sym} = $sym; |
342 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
|
|
343 | ::toggle_player_page ($::STATS_PAGE); |
|
|
344 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
|
|
345 | ::toggle_player_page ($::SKILL_PAGE); |
|
|
346 | } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { |
|
|
347 | ::toggle_player_page ($::SPELL_PAGE); |
|
|
348 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
|
|
349 | ::toggle_player_page ($::INVENTORY_PAGE); |
|
|
350 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
|
|
351 | $::SETUP_DIALOG->toggle_visibility; |
|
|
352 | } elsif (!$::CONN) { |
|
|
353 | return 0; # bindings further down need a valid connection |
|
|
354 | |
329 | |
355 | } elsif ($uni == ord ",") { |
330 | if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) { |
356 | $::CONN->user_send ("take"); |
|
|
357 | } elsif ($uni == ord " ") { |
|
|
358 | $::CONN->user_send ("apply"); |
|
|
359 | } elsif ($uni == 13) { |
|
|
360 | $::CONN->user_send ("examine"); |
|
|
361 | } elsif ($uni == ord ".") { |
|
|
362 | $::CONN->user_send ($self->{completer}{last_command}) |
|
|
363 | if exists $self->{completer}{last_command}; |
|
|
364 | } elsif (my @macros = CFPlus::Macro::match_event $ev) { |
|
|
365 | $::CONN->macro_send ($_) for @macros; |
|
|
366 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
|
|
367 | $::CONN->user_send ("rotateshoottype +"); |
|
|
368 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
|
|
369 | $::CONN->user_send ("rotateshoottype -"); |
|
|
370 | } elsif ($uni == ord '!') { |
|
|
371 | $self->{completer}->set_prefix ("shout "); |
|
|
372 | $self->{completer}->show; |
|
|
373 | } elsif ($uni == ord '"') { |
|
|
374 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
|
|
375 | $self->{completer}->show; |
|
|
376 | } elsif ($uni == ord "'") { |
|
|
377 | $self->{completer}->set_prefix (""); |
|
|
378 | $self->{completer}->show; |
|
|
379 | } elsif (exists $DIR{$sym}) { |
|
|
380 | if ($mod & CFPlus::KMOD_SHIFT) { |
331 | if ($mod & DC::KMOD_SHIFT) { |
381 | $self->{shft}++; |
332 | $self->{shft}++; |
382 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
333 | if ($dir->[0] != $self->{fire_dir}) { |
383 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
334 | $::CONN->user_send ("fire $dir->[0]"); |
384 | } |
335 | } |
385 | $self->{fire_dir} = $DIR{$sym}[0]; |
336 | $self->{fire_dir} = $dir->[0]; |
386 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
337 | } elsif ($mod & DC::KMOD_CTRL) { |
387 | $self->{ctrl}++; |
338 | $self->{ctrl}++; |
388 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
339 | $::CONN->user_send ("run $dir->[0]"); |
389 | } else { |
340 | } else { |
390 | $::CONN->user_send ("$DIR{$sym}[1]"); |
341 | $::CONN->user_send ("$dir->[1]"); |
391 | } |
342 | } |
392 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
343 | |
393 | $self->{completer}->inject_key_down ($ev); |
|
|
394 | $self->{completer}->show; |
|
|
395 | } else { |
|
|
396 | return 0; |
344 | return 1; |
397 | } |
|
|
398 | |
|
|
399 | 1 |
345 | } |
|
|
346 | |
|
|
347 | 0 |
400 | } |
348 | } |
401 | |
349 | |
402 | sub invoke_key_up { |
350 | sub invoke_key_up { |
403 | my ($self, $ev) = @_; |
351 | my ($self, $ev) = @_; |
404 | |
352 | |
405 | my $res = 0; |
353 | my $res = 0; |
406 | my $mod = $ev->{mod}; |
354 | my $mod = $ev->{mod}; |
407 | my $sym = $ev->{sym}; |
355 | my $sym = $ev->{sym}; |
408 | |
356 | |
|
|
357 | delete $self->{last_mod}; |
|
|
358 | delete $self->{last_sym}; |
|
|
359 | |
409 | if ($::CFG->{shift_fire_stop}) { |
360 | if ($::CFG->{shift_fire_stop}) { |
410 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
361 | if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) { |
411 | $::CONN->user_send ("fire_stop"); |
362 | $::CONN->user_send ("fire_stop"); |
412 | delete $self->{fire_dir}; |
363 | delete $self->{fire_dir}; |
413 | $res = 1; |
364 | $res = 1; |
414 | } |
365 | } |
415 | } else { |
366 | } else { |
416 | if (exists $DIR{$sym} && delete $self->{shft}) { |
367 | if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { |
417 | $::CONN->user_send ("fire_stop"); |
368 | $::CONN->user_send ("fire_stop"); |
418 | delete $self->{fire_dir}; |
369 | delete $self->{fire_dir}; |
419 | $res = 1; |
370 | $res = 1; |
420 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
371 | } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) |
|
|
372 | && delete $self->{shft}) { # XXX: is RSHIFT ok? |
421 | $::CONN->user_send ("fire_stop"); |
373 | $::CONN->user_send ("fire_stop"); |
422 | delete $self->{fire_dir}; |
374 | delete $self->{fire_dir}; |
423 | $res = 1; |
375 | $res = 1; |
424 | } |
376 | } |
425 | } |
377 | } |
426 | |
378 | |
427 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
379 | if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) { |
428 | $::CONN->user_send ("run_stop"); |
380 | $::CONN->user_send ("run_stop"); |
429 | $res = 1; |
381 | $res = 1; |
430 | } |
382 | } |
431 | |
383 | |
432 | $res |
384 | $res |
433 | } |
385 | } |
434 | |
386 | |
|
|
387 | sub invoke_visibility_change { |
|
|
388 | my ($self) = @_; |
|
|
389 | |
|
|
390 | $self->refresh_hook; |
|
|
391 | |
|
|
392 | 0 |
|
|
393 | } |
|
|
394 | |
435 | sub set_magicmap { |
395 | sub set_magicmap { |
436 | my ($self, $w, $h, $x, $y, $data) = @_; |
396 | my ($self, $w, $h, $x, $y, $data) = @_; |
437 | |
397 | |
438 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
398 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
439 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
399 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
… | |
… | |
441 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
401 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
442 | |
402 | |
443 | $self->update; |
403 | $self->update; |
444 | } |
404 | } |
445 | |
405 | |
|
|
406 | sub refresh_hook { |
|
|
407 | my ($self) = @_; |
|
|
408 | |
|
|
409 | if ($::MAP && $::CONN) { |
|
|
410 | if (delete $self->{need_update}) { |
|
|
411 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
|
|
412 | |
|
|
413 | my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; |
|
|
414 | my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; |
|
|
415 | |
|
|
416 | my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize; |
|
|
417 | my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize; |
|
|
418 | |
|
|
419 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
|
|
420 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
|
|
421 | |
|
|
422 | my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
|
|
423 | my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
|
|
424 | |
|
|
425 | if ($::CFG->{fow_enable}) { |
|
|
426 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
|
|
427 | |
|
|
428 | $self->{fow_texture} = new DC::Texture |
|
|
429 | w => $w, |
|
|
430 | h => $h, |
|
|
431 | data => $data, |
|
|
432 | internalformat => GL_ALPHA, |
|
|
433 | format => GL_ALPHA; |
|
|
434 | } else { |
|
|
435 | delete $self->{fow_texture}; |
|
|
436 | } |
|
|
437 | |
|
|
438 | glNewList ($self->{list} ||= glGenList); |
|
|
439 | |
|
|
440 | glPushMatrix; |
|
|
441 | glTranslate $sx0, $sy0; |
|
|
442 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
|
|
443 | |
|
|
444 | $::MAP->draw ($dx, $dy, $sw, $sh, |
|
|
445 | $self->{tilesize}, |
|
|
446 | $::CONN->{player}{tag}, 0, 0); |
|
|
447 | |
|
|
448 | glScale $self->{tilesize}, $self->{tilesize}; |
|
|
449 | |
|
|
450 | if (my $tex = $self->{fow_texture}) { |
|
|
451 | glPushMatrix; |
|
|
452 | glScale 1/3, 1/3; |
|
|
453 | glEnable GL_TEXTURE_2D; |
|
|
454 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
|
|
455 | |
|
|
456 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
|
|
457 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
|
|
458 | |
|
|
459 | glDisable GL_TEXTURE_2D; |
|
|
460 | glPopMatrix; |
|
|
461 | } |
|
|
462 | |
|
|
463 | if ($self->{magicmap}) { |
|
|
464 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
|
|
465 | |
|
|
466 | $x += $::MAP->ox + $self->{dx}; |
|
|
467 | $y += $::MAP->oy + $self->{dy}; |
|
|
468 | |
|
|
469 | glTranslate - $x - 1, - $y - 1; |
|
|
470 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
|
|
471 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
|
|
472 | } |
|
|
473 | |
|
|
474 | glPopMatrix; |
|
|
475 | glEndList; |
|
|
476 | } |
|
|
477 | } else { |
|
|
478 | glDeleteList delete $self->{list} |
|
|
479 | if $self->{list}; |
|
|
480 | } |
|
|
481 | } |
|
|
482 | |
446 | sub draw { |
483 | sub draw { |
447 | my ($self) = @_; |
484 | my ($self) = @_; |
448 | |
485 | |
449 | return unless $::MAP; |
486 | $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); |
450 | |
487 | |
|
|
488 | return unless $self->{list}; |
|
|
489 | |
451 | my $focused = $CFPlus::UI::FOCUS == $self |
490 | my $focused = $DC::UI::FOCUS == $self |
452 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
491 | || $DC::UI::FOCUS == $::COMPLETER->{entry}; |
453 | |
492 | |
454 | return |
493 | return |
455 | unless $focused || !$::FAST; |
494 | unless $focused || !$::FAST; |
456 | |
495 | |
457 | if (delete $self->{need_update}) { |
|
|
458 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
|
|
459 | |
|
|
460 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
461 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
462 | |
|
|
463 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
|
|
464 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
|
|
465 | |
|
|
466 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
|
|
467 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
|
|
468 | |
|
|
469 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
|
|
470 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
|
|
471 | |
|
|
472 | if ($::CFG->{fow_enable}) { |
|
|
473 | my ($w, $h, $data) = $::MAP->fow_texture ( |
|
|
474 | $dx, $dy, $sw, $sh, |
|
|
475 | $::CFG->{fow_smooth}, |
|
|
476 | pack "f*", @{ $self->{smooth_matrix} }, |
|
|
477 | ); |
|
|
478 | |
|
|
479 | $self->{fow_texture} = new CFPlus::Texture |
|
|
480 | w => $w, |
|
|
481 | h => $h, |
|
|
482 | data => $data, |
|
|
483 | internalformat => GL_ALPHA, |
|
|
484 | format => GL_ALPHA; |
|
|
485 | } else { |
|
|
486 | delete $self->{fow_texture}; |
|
|
487 | } |
|
|
488 | |
|
|
489 | glNewList $self->{list}; |
|
|
490 | |
|
|
491 | glPushMatrix; |
|
|
492 | glTranslate $sx0, $sy0; |
|
|
493 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
|
|
494 | |
|
|
495 | $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); |
|
|
496 | |
|
|
497 | glScale $self->{tilesize}, $self->{tilesize}; |
|
|
498 | |
|
|
499 | if (my $tex = $self->{fow_texture}) { |
|
|
500 | glPushMatrix; |
|
|
501 | #glScale 1/3, 1/3 if $::CFG->{fow_smooth}; |
|
|
502 | glEnable GL_TEXTURE_2D; |
|
|
503 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
|
|
504 | |
|
|
505 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
|
|
506 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
|
|
507 | |
|
|
508 | glDisable GL_TEXTURE_2D; |
|
|
509 | glPopMatrix; |
|
|
510 | } |
|
|
511 | |
|
|
512 | if ($self->{magicmap}) { |
|
|
513 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
|
|
514 | |
|
|
515 | $x += $::MAP->ox + $self->{dx}; |
|
|
516 | $y += $::MAP->oy + $self->{dy}; |
|
|
517 | |
|
|
518 | glTranslate - $x - 1, - $y - 1; |
|
|
519 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
|
|
520 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
|
|
521 | } |
|
|
522 | |
|
|
523 | glPopMatrix; |
|
|
524 | glEndList; |
|
|
525 | } |
|
|
526 | |
|
|
527 | glCallList $self->{list}; |
496 | glCallList $self->{list}; |
528 | |
497 | |
529 | # TNT2 emulates logops in software (or worse :) |
498 | # TNT2 emulates logops in software (or worse :) |
530 | unless ($focused) { |
499 | unless ($focused) { |
531 | glColor 0.4, 0.2, 0.2, 0.6; |
500 | glColor_premultiply 0, 0, 1, 0.25; |
532 | glEnable GL_BLEND; |
501 | glEnable GL_BLEND; |
533 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
502 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
534 | glBegin GL_QUADS; |
503 | glBegin GL_QUADS; |
535 | glVertex 0, 0; |
504 | glVertex 0, 0; |
536 | glVertex 0, $::HEIGHT; |
505 | glVertex 0, $::HEIGHT; |
537 | glVertex $::WIDTH, $::HEIGHT; |
506 | glVertex $::WIDTH, $::HEIGHT; |
538 | glVertex $::WIDTH, 0; |
507 | glVertex $::WIDTH, 0; |
… | |
… | |
547 | glDeleteList $self->{list}; |
516 | glDeleteList $self->{list}; |
548 | |
517 | |
549 | $self->SUPER::DESTROY; |
518 | $self->SUPER::DESTROY; |
550 | } |
519 | } |
551 | |
520 | |
552 | package CFPlus::MapWidget::MapMap; |
521 | package DC::MapWidget::MapMap; |
553 | |
522 | |
554 | use strict; |
523 | use strict; |
555 | use utf8; |
524 | use utf8; |
556 | |
525 | |
557 | our @ISA = CFPlus::UI::Base::; |
526 | our @ISA = DC::UI::Base::; |
558 | |
527 | |
559 | use Time::HiRes qw(time); |
528 | use Time::HiRes qw(time); |
560 | use CFPlus::OpenGL; |
529 | use DC::OpenGL; |
561 | |
530 | |
562 | sub size_request { |
531 | sub size_request { |
563 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
532 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
|
|
533 | } |
|
|
534 | |
|
|
535 | sub refresh_hook { |
|
|
536 | my ($self) = @_; |
|
|
537 | |
|
|
538 | if ($::MAP && $self->{texture_atime} < time) { |
|
|
539 | my ($w, $h) = @$self{qw(w h)}; |
|
|
540 | |
|
|
541 | my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
|
|
542 | my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
|
|
543 | |
|
|
544 | my $ox = 0.5 * ($w - $sw); |
|
|
545 | my $oy = 0.5 * ($h - $sh); |
|
|
546 | |
|
|
547 | my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize}; |
|
|
548 | my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize}; |
|
|
549 | |
|
|
550 | #TODO: map scale is completely borked |
|
|
551 | |
|
|
552 | my $x0 = int $ox - $sx + 0.5; |
|
|
553 | my $y0 = int $oy - $sy + 0.5; |
|
|
554 | |
|
|
555 | $self->{sw} = $sw; |
|
|
556 | $self->{sh} = $sh; |
|
|
557 | |
|
|
558 | $self->{x0} = $x0; |
|
|
559 | $self->{y0} = $y0; |
|
|
560 | |
|
|
561 | $self->{texture_atime} = time + 1/3; |
|
|
562 | |
|
|
563 | $self->{texture} = |
|
|
564 | new DC::Texture |
|
|
565 | w => $w, |
|
|
566 | h => $h, |
|
|
567 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
|
|
568 | type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
|
|
569 | } |
|
|
570 | } |
|
|
571 | |
|
|
572 | sub invoke_visibility_change { |
|
|
573 | my ($self) = @_; |
|
|
574 | |
|
|
575 | $self->refresh_hook; |
|
|
576 | |
|
|
577 | 0 |
564 | } |
578 | } |
565 | |
579 | |
566 | sub invoke_size_allocate { |
580 | sub invoke_size_allocate { |
567 | my ($self, $w, $h) = @_; |
581 | my ($self, $w, $h) = @_; |
568 | |
582 | |
… | |
… | |
579 | } |
593 | } |
580 | |
594 | |
581 | sub _draw { |
595 | sub _draw { |
582 | my ($self) = @_; |
596 | my ($self) = @_; |
583 | |
597 | |
584 | $::MAP or return; |
598 | $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook }); |
585 | |
599 | |
586 | my ($w, $h) = @$self{qw(w h)}; |
600 | $self->{texture} or return; |
587 | |
|
|
588 | my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
|
|
589 | my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
|
|
590 | |
|
|
591 | my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize}; |
|
|
592 | my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize}; |
|
|
593 | |
|
|
594 | my $ox = 0.5 * ($w - $sw); |
|
|
595 | my $oy = 0.5 * ($h - $sh); |
|
|
596 | |
601 | |
597 | glEnable GL_BLEND; |
602 | glEnable GL_BLEND; |
598 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
603 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
599 | glEnable GL_TEXTURE_2D; |
604 | glEnable GL_TEXTURE_2D; |
600 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
605 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
601 | |
606 | |
602 | if ($self->{texture_atime} < time) { |
|
|
603 | $self->{texture_atime} = time + 1/3; |
|
|
604 | |
|
|
605 | $self->{texture} = |
|
|
606 | new CFPlus::Texture |
|
|
607 | w => $w, |
|
|
608 | h => $h, |
|
|
609 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
|
|
610 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
|
|
611 | } |
|
|
612 | |
|
|
613 | $self->{texture}->draw_quad (0, 0); |
607 | $self->{texture}->draw_quad (0, 0); |
614 | |
608 | |
615 | glDisable GL_TEXTURE_2D; |
609 | glDisable GL_TEXTURE_2D; |
616 | |
610 | |
617 | glTranslate 0.375, 0.375; |
611 | glTranslate 0.375, 0.375; |
618 | |
|
|
619 | #TODO: map scale is completely borked |
|
|
620 | |
|
|
621 | my $x0 = int $ox - $sx + 0.5; |
|
|
622 | my $y0 = int $oy - $sy + 0.5; |
|
|
623 | |
612 | |
624 | glColor 1, 1, 0, 1; |
613 | glColor 1, 1, 0, 1; |
625 | glBegin GL_LINE_LOOP; |
614 | glBegin GL_LINE_LOOP; |
626 | glVertex $x0 , $y0 ; |
615 | glVertex $self->{x0} , $self->{y0} ; |
627 | glVertex $x0 , $y0 + $sh; |
616 | glVertex $self->{x0} , $self->{y0} + $self->{sh}; |
628 | glVertex $x0 + $sw, $y0 + $sh; |
617 | glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh}; |
629 | glVertex $x0 + $sw, $y0 ; |
618 | glVertex $self->{x0} + $self->{sw}, $self->{y0} ; |
630 | glEnd; |
619 | glEnd; |
631 | |
620 | |
632 | glDisable GL_BLEND; |
621 | glDisable GL_BLEND; |
633 | } |
622 | } |
634 | |
623 | |
635 | package CFPlus::MapWidget::Command; |
624 | package DC::MapWidget::Command; |
636 | |
625 | |
637 | use strict; |
626 | use strict; |
638 | |
627 | |
639 | use CFPlus::OpenGL; |
628 | use DC::OpenGL; |
640 | |
629 | |
641 | our @ISA = CFPlus::UI::Frame::; |
630 | our @ISA = DC::UI::Frame::; |
642 | |
631 | |
643 | sub new { |
632 | sub new { |
644 | my $class = shift; |
633 | my $class = shift; |
645 | |
634 | |
646 | my $self = $class->SUPER::new ( |
635 | my $self = $class->SUPER::new ( |
647 | bg => [0, 0, 0, 0.8], |
636 | bg => [0, 0, 0, 0.8], |
648 | @_, |
637 | @_, |
649 | ); |
638 | ); |
650 | |
639 | |
651 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
640 | $self->add ($self->{vbox} = new DC::UI::VBox); |
652 | |
641 | |
653 | $self->{label} = [ |
642 | $self->{label} = [ |
654 | map |
643 | map |
655 | CFPlus::UI::Label->new ( |
644 | DC::UI::Label->new ( |
|
|
645 | align => 0, |
656 | can_hover => 1, |
646 | can_hover => 1, |
657 | can_events => 1, |
647 | can_events => 1, |
658 | tooltip_width => 0.33, |
648 | tooltip_width => 0.33, |
659 | fontsize => $_, |
649 | fontsize => $_, |
660 | ), (0.8) x 16 |
650 | ), (0.8) x 16 |
661 | ]; |
651 | ]; |
662 | |
652 | |
663 | $self->{entry} = new CFPlus::UI::Entry |
653 | $self->{entry} = new DC::UI::Entry |
664 | on_changed => sub { |
654 | on_changed => sub { |
665 | $self->update_labels; |
655 | $self->update_labels; |
666 | 0 |
656 | 0 |
667 | }, |
657 | }, |
668 | on_button_down => sub { |
658 | on_button_down => sub { |
669 | my ($entry, $ev, $x, $y) = @_; |
659 | my ($entry, $ev, $x, $y) = @_; |
670 | |
660 | |
671 | if ($ev->{button} == 3) { |
661 | if ($ev->{button} == 3) { |
672 | (new CFPlus::UI::Menu |
662 | (new DC::UI::Menu |
673 | items => [ |
663 | items => [ |
674 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
664 | ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key" |
675 | => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
665 | => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
676 | ], |
666 | ], |
677 | )->popup ($ev); |
667 | )->popup ($ev); |
678 | return 1; |
668 | return 1; |
679 | } |
669 | } |
680 | 0 |
670 | 0 |
… | |
… | |
695 | $self->hide; |
685 | $self->hide; |
696 | } |
686 | } |
697 | } elsif ($ev->{sym} == 27) { |
687 | } elsif ($ev->{sym} == 27) { |
698 | $self->{hist_ptr} = 0; |
688 | $self->{hist_ptr} = 0; |
699 | $self->hide; |
689 | $self->hide; |
700 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
690 | } elsif ($ev->{sym} == DC::SDLK_DOWN) { |
701 | if ($self->{hist_ptr} > 1) { |
691 | if ($self->{hist_ptr} > 1) { |
702 | $self->{hist_ptr}--; |
692 | $self->{hist_ptr}--; |
703 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
693 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
704 | } elsif ($self->{hist_ptr} > 0) { |
694 | } elsif ($self->{hist_ptr} > 0) { |
705 | $self->{hist_ptr}--; |
695 | $self->{hist_ptr}--; |
… | |
… | |
707 | } else { |
697 | } else { |
708 | ++$self->{select_offset} |
698 | ++$self->{select_offset} |
709 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
699 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
710 | } |
700 | } |
711 | $self->update_labels; |
701 | $self->update_labels; |
712 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
702 | } elsif ($ev->{sym} == DC::SDLK_UP) { |
713 | if ($self->{select_offset}) { |
703 | if ($self->{select_offset}) { |
714 | --$self->{select_offset} |
704 | --$self->{select_offset} |
715 | } else { |
705 | } else { |
716 | unless ($self->{hist_ptr}) { |
706 | unless ($self->{hist_ptr}) { |
717 | $self->{hist_saveback} = $self->{entry}->get_text; |
707 | $self->{hist_saveback} = $self->{entry}->get_text; |
… | |
… | |
875 | |
865 | |
876 | sub _draw { |
866 | sub _draw { |
877 | my ($self) = @_; |
867 | my ($self) = @_; |
878 | |
868 | |
879 | # hack |
869 | # hack |
880 | local $CFPlus::UI::FOCUS = $self->{entry}; |
870 | local $DC::UI::FOCUS = $self->{entry}; |
881 | |
871 | |
882 | $self->SUPER::_draw; |
872 | $self->SUPER::_draw; |
883 | } |
873 | } |
884 | |
874 | |
885 | 1 |
875 | 1 |