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