ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.85 by root, Sun Oct 8 21:22:30 2006 UTC vs.
Revision 1.153 by root, Thu Nov 26 07:19:12 2009 UTC

1package CFPlus::MapWidget; 1package DC::MapWidget;
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus; 8use DC;
9use CFPlus::OpenGL; 9use DC::OpenGL;
10use CFPlus::UI; 10use DC::UI;
11use DC::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = DC::UI::Base::;
13 14
14my $magicmap_tex = 15my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_resource DC::Texture "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17 18
18sub new { 19sub 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
35 $self->{completer} = new CFPlus::MapWidget::Command::
36 command => $self->{command},
37 tooltip => "#completer_help",
38 ;
39 28
40 $self 29 $self
41} 30}
42 31
43sub add_command { 32sub add_command {
… …
47 36
48 $tooltip =~ s/^\s+//; 37 $tooltip =~ s/^\s+//;
49 $tooltip = "<big>$data</big>\n\n$tooltip"; 38 $tooltip = "<big>$data</big>\n\n$tooltip";
50 $tooltip =~ s/\s+$//; 39 $tooltip =~ s/\s+$//;
51 40
52 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 41 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53} 42}
54 43
55sub clr_commands { 44sub clr_commands {
56 my ($self) = @_; 45 my ($self) = @_;
57 46
58 %{$self->{completer}{command}} = (); 47 %{$::COMPLETER->{command}} = ();
59 48
60 $self->{completer}->hide 49 $::COMPLETER->hide
61 if $self->{completer}; 50 if $::COMPLETER;
62} 51}
63 52
64sub server_login { 53sub server_login {
65 my ($server) = @_; 54 my ($server) = @_;
66 55
67 ::stop_game (); 56 ::stop_game ();
68 local $::PROFILE->{host} = $server; 57 local $::PROFILE->{host} = $server;
69 ::start_game (); 58 ::start_game ();
70} 59}
71 60
72sub check_lwp($) {
73 my ($res) = @_;
74
75 $res->is_error
76 and die $res->status_line;
77
78 $res
79}
80
81sub editor_invoke { 61sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support} 62 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return; 63 or return;
84 64
85 # putting the password into the env is somewhat tasteless 65 DC::background {
86# local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};
87# local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password};
88# local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload};
89
90 my ($pid, $fh);
91 unless ($pid = open $fh, "-|:utf8", "-") {
92 $SIG{__DIE__} = sub {
93 warn "@_\n";
94 CFPlus::_exit 99;
95 };
96
97 open STDERR, ">&STDOUT";
98 binmode STDOUT, ":utf8";
99 binmode STDERR, ":utf8";
100 close $fh;
101
102 $| = 1;
103 print "preparing editor startup...\n"; 66 print "preparing editor startup...\n";
104 CFPlus::set_proxy;
105 67
106 my $server = $editsup->{gameserver} || "default"; 68 my $server = $editsup->{gameserver} || "default";
107 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 69 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
108 70
109 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 71 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
110 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; 72 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
111 73
112 print "map directory is $mapdir\n"; 74 print "map directory is $mapdir\n";
113 print "lib directory is $libdir\n"; 75 print "lib directory is $libdir\n";
114 76
115 require LWP::UserAgent; 77 my $ua = DC::lwp_useragent;
116
117 my $ua = LWP::UserAgent->new (
118 agent => "cfplus $CFPlus::VERSION",
119 keep_alive => 1,
120 env_proxy => 1,
121 timeout => 30,
122 );
123 78
124 for my $file (qw(archetypes crossfire.0)) { 79 for my $file (qw(archetypes crossfire.0)) {
125 my $url = "$editsup->{lib_root}$file"; 80 my $url = "$editsup->{lib_root}$file";
126 print "mirroring $url...\n"; 81 print "mirroring $url...\n";
127 check_lwp $ua->mirror ($url, "$libdir/$file"); 82 DC::lwp_check $ua->mirror ($url, "$libdir/$file");
128 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 83 printf "%s size %d octets\n", $file, -s "$libdir/$file";
129 } 84 }
130 85
131 if (1) { # upload a map 86 if (1) { # upload a map
132 my $mapname = $::CONN->{map_info}[0]; 87 my $mapname = $::CONN->{map_info}[0];
133 88
89 my $mappath = "$mapdir/$mapname";
90
91 -e $mappath and die "$mappath already exists\n";
92
134 print "getting map revision for $mapname...\n"; 93 print "getting map revision for $mapname...\n";
135 94
136 # try to get the most recent head revision, what a hack, 95 # try to get the most recent head revision, what a hack,
137 # this should have been returned while downloading *sigh* 96 # this should have been returned while downloading *sigh*
138 my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; 97 my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
139 98
140 if ($log =~ /\?rev=(\d+\.\d+)"/) { 99 if ($log =~ /\?rev=(\d+\.\d+)"/) {
141 my $rev = $1; 100 my $rev = $1;
142 101
143 print "downloading revision $rev...\n"; 102 print "downloading revision $rev...\n";
144 103
145 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 104 my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
105
106 my $meta = {
107 %$editsup,
108 path => $mapname,
109 revision => $rev,
110 cf_login => $::PROFILE->{user},
111 };
112
113 require File::Basename;
114 require File::Path;
115
116 File::Path::mkpath (File::Basename::dirname ($mappath));
117 open my $fh, ">:raw:perlio", "$mappath.meta"
118 or die "$mappath.meta: $!\n";
119 print $fh DC::encode_json $meta;
120 close $fh;
121 open my $fh, ">:raw:perlio:utf8", $mappath
122 or die "$mappath: $!\n";
123 print $fh $map;
124 close $fh;
125
126 print "saved as $mappath\n";
127
128 print "invoking editor...\n";
129 exec "/root/s2/gce $mappath";#d#
146 130
147 # now upload it 131 # now upload it
148# require HTTP::Request::Common; 132# require HTTP::Request::Common;
149# 133#
150# my $res = $ua->post ( 134# my $res = $ua->post (
… …
171# } 155# }
172 } else { 156 } else {
173 die "viewvc parse error, unable to detect revision\n"; 157 die "viewvc parse error, unable to detect revision\n";
174 } 158 }
175 } 159 }
176
177 print "invoking editor...\n";
178 exec "/root/s2/gce";#d#
179
180 CFPlus::_exit;
181 }
182
183 my $buffer;
184
185 Event->io (fd => $fh, poll => 'r', cb => sub {
186 unless (sysread $fh, $buffer, 4096, length $buffer) {
187 $_[0]->w->cancel;
188 $buffer .= "done\n";
189 }
190
191 while ($buffer =~ s/^(.*)\n//) {
192 ::message ({
193 markup => "editor($pid): " . CFPlus::asxml $1,
194 });
195 }
196 }); 160 }
197} 161}
198 162
199sub invoke_button_down { 163sub invoke_button_down {
200 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
201 165
202 if ($ev->{button} == 1) { 166 if ($ev->{button} == 1) {
203 $self->grab_focus; 167 $self->grab_focus;
204 return unless $::CONN; 168 return unless $::CONN && $self->{ctilesize};
205 169
206 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
207 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
208 172
209 $x -= int 0.5 * $self->{sw}; 173 $x -= DC::floor $::MAP->w * 0.5;
210 $y -= int 0.5 * $self->{sh}; 174 $y -= DC::floor $::MAP->h * 0.5;
211 175
176 if ($::CONN) {
212 $::CONN->lookat ($x, $y) 177 $::CONN->lookat ($x, $y)
213 if $::CONN; 178 }
214 179
215 } elsif ($ev->{button} == 2) { 180 } elsif ($ev->{button} == 2) {
216 $self->grab_focus; 181 $self->grab_focus;
217 return unless $::CONN; 182 return unless $::CONN;
218 183
… …
235 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 200 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
236 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
237 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
238 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
239 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
240 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
241 [
242 $::PICKUP_ENABLE->{state}
243 ? "Disable automatic pickup"
244 : "Enable automatic pickup",
245 sub { $::PICKUP_ENABLE->toggle }
246 ],
247 ); 206 );
248 207
249 if ($::CONN && $::CONN->{editor_support}) { 208 if ($::CONN && $::CONN->{editor_support}) {
250 push @items, [ 209# push @items, [
251 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", 210# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
252 \&editor_invoke, 211# \&editor_invoke,
253 ]; 212# ];
254 213
255 for my $type (qw(test name)) { 214 for my $type (qw(test name)) {
256 $::CONN->{editor_support}{type} ne $type 215 $::CONN->{editor_support}{type} ne $type
257 or next; 216 or next;
258 my $server = $::CONN->{editor_support}{"${type}server"} 217 my $server = $::CONN->{editor_support}{"${type}server"}
259 or next; 218 or next;
260 219
261 push @items, [ 220 push @items, [
262 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", 221 "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
263 sub { server_login $server }, 222 sub { server_login $server },
264 ]; 223 ];
265 } 224 }
266 } 225 }
267 226
… …
275 } 234 }
276 } 235 }
277 ], 236 ],
278 ; 237 ;
279 238
280 (new CFPlus::UI::Menu 239 (new DC::UI::Menu
281 items => \@items, 240 items => \@items,
282 )->popup ($ev); 241 )->popup ($ev);
283 } 242 }
284 243
285 1 244 1
… …
304 263
305 1 264 1
306} 265}
307 266
308sub size_request { 267sub size_request {
268 my ($self) = @_;
269
309 ( 270 (
310 32 * CFPlus::ceil $::WIDTH / 32, 271 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
311 32 * CFPlus::ceil $::HEIGHT / 32, 272 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
312 ) 273 )
313} 274}
314 275
315sub update { 276sub update {
316 my ($self) = @_; 277 my ($self) = @_;
… …
318 $self->{need_update} = 1; 279 $self->{need_update} = 1;
319 $self->SUPER::update; 280 $self->SUPER::update;
320} 281}
321 282
322my %DIR = ( 283my %DIR = (
323 CFPlus::SDLK_KP8, [1, "north"], 284 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
285 ( "," . DC::SDLK_KP8 ), [1, "north"],
324 CFPlus::SDLK_KP9, [2, "northeast"], 286 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
325 CFPlus::SDLK_KP6, [3, "east"], 287 ( "," . DC::SDLK_KP6 ), [3, "east"],
326 CFPlus::SDLK_KP3, [4, "southeast"], 288 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
327 CFPlus::SDLK_KP2, [5, "south"], 289 ( "," . DC::SDLK_KP2 ), [5, "south"],
328 CFPlus::SDLK_KP1, [6, "southwest"], 290 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
329 CFPlus::SDLK_KP4, [7, "west"], 291 ( "," . DC::SDLK_KP4 ), [7, "west"],
330 CFPlus::SDLK_KP7, [8, "northwest"], 292 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
331 293
332 CFPlus::SDLK_UP, [1, "north"], 294 ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
295 ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
296 ( "," . DC::SDLK_END ), [6, "southwest"],
297 ( "," . DC::SDLK_HOME ), [8, "northwest"],
298
299 ( "," . DC::SDLK_UP ), [1, "north"],
300 ("1," . DC::SDLK_UP ), [2, "northeast"],
333 CFPlus::SDLK_RIGHT, [3, "east"], 301 ( "," . DC::SDLK_RIGHT ), [3, "east"],
334 CFPlus::SDLK_DOWN, [5, "south"], 302 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
335 CFPlus::SDLK_LEFT, [7, "west"], 303 ( "," . DC::SDLK_DOWN ), [5, "south"],
304 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
305 ( "," . DC::SDLK_LEFT ), [7, "west"],
306 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
336); 307);
337 308
338sub invoke_key_down { 309sub invoke_key_down {
339 my ($self, $ev) = @_; 310 my ($self, $ev) = @_;
340 311
341 my $mod = $ev->{mod}; 312 my $mod = $ev->{mod};
342 my $sym = $ev->{sym}; 313 my $sym = $ev->{sym};
343 my $uni = $ev->{unicode}; 314 my $uni = $ev->{unicode};
344 315
345 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 316 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
346 317
347 if ($uni == ord "\t") { 318 # ignore repeated keypresses
348 $::PL_WINDOW->toggle_visibility; 319 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
349 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 320 $self->{last_mod} = $mod;
350 $::HELP_WINDOW->toggle_visibility; 321 $self->{last_sym} = $sym;
351 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
352 ::toggle_player_page ($::STATS_PAGE);
353 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
354 ::toggle_player_page ($::SKILL_PAGE);
355 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
356 ::toggle_player_page ($::SPELL_PAGE);
357 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
358 ::toggle_player_page ($::INVENTORY_PAGE);
359 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
360 $::SETUP_DIALOG->toggle_visibility;
361 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
362 $::BIND_EDITOR->set_binding (undef, undef, [],
363 sub {
364 my ($mod, $sym, $cmds) = @_;
365 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
366 });
367 $::BIND_EDITOR->start;
368 $::BIND_EDITOR->show;
369#TODO: elmex, what was this supposed to do? it currently crashes the client.
370# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
371# $::BIND_EDITOR->stop;
372# $::BIND_EDITOR->ask_for_bind_and_commit;
373# $::BIND_EDITOR->hide;
374 } elsif (!$::CONN) {
375 return 0; # bindings further down need a valid connection
376 322
377 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 323 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
378 $::CONN->user_send ("stay fire"); 324
379 } elsif ($uni == ord ",") { 325 if ($::CONN && $dir) {
380 $::CONN->user_send ("take");
381 } elsif ($uni == ord " ") {
382 $::CONN->user_send ("apply");
383 } elsif ($uni == 13) {
384 $::CONN->user_send ("examine");
385 } elsif ($uni == ord ".") {
386 $::CONN->user_send ($self->{completer}{last_command})
387 if exists $self->{completer}{last_command};
388 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
389 $::CONN->user_send ($_) for @$bind_cmd;
390 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
391 $::CONN->user_send ("rotateshoottype +");
392 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
393 $::CONN->user_send ("rotateshoottype -");
394 } elsif ($uni == ord '"') {
395 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
396 $self->{completer}->show;
397 } elsif ($uni == ord "'") {
398 $self->{completer}->set_prefix ("");
399 $self->{completer}->show;
400 } elsif (exists $DIR{$sym}) {
401 if ($mod & CFPlus::KMOD_SHIFT) { 326 if ($mod & DC::KMOD_SHIFT) {
402 $self->{shft}++; 327 $self->{shft}++;
403 if ($DIR{$sym}[0] != $self->{fire_dir}) { 328 if ($dir->[0] != $self->{fire_dir}) {
404 $::CONN->user_send ("fire $DIR{$sym}[0]"); 329 $::CONN->user_send ("fire $dir->[0]");
405 } 330 }
406 $self->{fire_dir} = $DIR{$sym}[0]; 331 $self->{fire_dir} = $dir->[0];
407 } elsif ($mod & CFPlus::KMOD_CTRL) { 332 } elsif ($mod & DC::KMOD_CTRL) {
408 $self->{ctrl}++; 333 $self->{ctrl}++;
409 $::CONN->user_send ("run $DIR{$sym}[0]"); 334 $::CONN->user_send ("run $dir->[0]");
410 } else { 335 } else {
411 $::CONN->user_send ("$DIR{$sym}[1]"); 336 $::CONN->user_send ("$dir->[1]");
412 } 337 }
413 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 338
414 $self->{completer}->inject_key_down ($ev);
415 $self->{completer}->show;
416 } else {
417 return 0; 339 return 1;
418 }
419
420 1 340 }
341
342 0
421} 343}
422 344
423sub invoke_key_up { 345sub invoke_key_up {
424 my ($self, $ev) = @_; 346 my ($self, $ev) = @_;
425 347
426 my $res = 0; 348 my $res = 0;
427 my $mod = $ev->{mod}; 349 my $mod = $ev->{mod};
428 my $sym = $ev->{sym}; 350 my $sym = $ev->{sym};
429 351
352 delete $self->{last_mod};
353 delete $self->{last_sym};
354
430 if ($::CFG->{shift_fire_stop}) { 355 if ($::CFG->{shift_fire_stop}) {
431 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { 356 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
432 $::CONN->user_send ("fire_stop"); 357 $::CONN->user_send ("fire_stop");
433 delete $self->{fire_dir}; 358 delete $self->{fire_dir};
434 $res = 1; 359 $res = 1;
435 } 360 }
436 } else { 361 } else {
362 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
363
437 if (exists $DIR{$sym} && delete $self->{shft}) { 364 if ($dir && delete $self->{shft}) {
438 $::CONN->user_send ("fire_stop"); 365 $::CONN->user_send ("fire_stop");
439 delete $self->{fire_dir}; 366 delete $self->{fire_dir};
440 $res = 1; 367 $res = 1;
441 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 368 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
369 && delete $self->{shft}) { # XXX: is RSHIFT ok?
442 $::CONN->user_send ("fire_stop"); 370 $::CONN->user_send ("fire_stop");
443 delete $self->{fire_dir}; 371 delete $self->{fire_dir};
444 $res = 1; 372 $res = 1;
445 } 373 }
446 } 374 }
447 375
448 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { 376 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
449 $::CONN->user_send ("run_stop"); 377 $::CONN->user_send ("run_stop");
450 $res = 1; 378 $res = 1;
451 } 379 }
452 380
453 $res 381 $res
454} 382}
455 383
384sub invoke_visibility_change {
385 my ($self) = @_;
386
387 $self->refresh_hook;
388
389 0
390}
391
392sub set_tilesize {
393 my ($self, $tilesize) = @_;
394
395 $self->{tilesize} = $tilesize;
396}
397
398sub scroll {
399 my ($self, $dx, $dy) = @_;
400
401 $::MAP->scroll ($dx, $dy);
402
403 $self->{last_fow_texture} = $self->{fow_texture};
404 $self->{ldx} = $self->{sdx} + $dx * $self->{tilesize}; # smooth displacement
405 $self->{ldy} = $self->{sdy} + $dy * $self->{tilesize};
406
407 $self->movement_update;
408
409 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
410 $self->{sdy} += $dy * $self->{tilesize};
411}
412
456sub set_magicmap { 413sub set_magicmap {
457 my ($self, $w, $h, $x, $y, $data) = @_; 414 my ($self, $w, $h, $x, $y, $data) = @_;
458 415
459 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 416 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
460 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 417 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
461 418
462 $self->{magicmap} = [$x, $y, $w, $h, $data]; 419 $self->{magicmap} = [$x, $y, $w, $h, $data];
463 420
464 $self->update; 421 $self->update;
465} 422}
466 423
424sub movement_update {
425 my ($self) = @_;
426
427 if ($::CFG->{smooth_movement}) {
428 if ($self->{sdx} || $self->{sdy}) {
429 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH);
430 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
431
432 # the minimum time for a single tile movement
433 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
434
435 $spd *= $self->{tilesize};
436
437 # jump if "impossibly high" speed
438 if (
439 (max abs $self->{sdx}, abs $self->{sdy})
440 > $spd * $mintime * 2.1
441 ) {
442 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
443 $self->{sdx} = $self->{sdy} = 0;
444 } else {
445 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
446
447 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
448 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
449
450 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
451 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
452 }
453
454 $self->update;
455 }
456 } else {
457 $self->{sdx} = $self->{sdy} = 0;
458 }
459
460 $self->{last_update} = EV::time;
461}
462
463sub refresh_hook {
464 my ($self) = @_;
465
466 if ($::MAP && $::CONN) {
467 if (delete $self->{need_update}) {
468 $self->movement_update;
469
470 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
471
472 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
473 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
474
475 # width/height of map, in tiles
476 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
477 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
478
479 # the map displacement, in tiles
480 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
481 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
482
483 # the upper left "visible" corner, in pixels
484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
486
487 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
488 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
489
490 if ($::CFG->{fow_enable}) {
491 my ($sdx_t, $sdy_t);#d# do not anchor at player
492
493 my ($w, $h, $data) = $::MAP->fow_texture (
494 $dx + (min 0, $sdx_t),
495 $dy + (min 0, $sdy_t),
496 $sw + abs $sdx_t,
497 $sh + abs $sdy_t
498 );
499
500 $self->{fow_texture} = new DC::Texture
501 w => $w,
502 h => $h,
503 data => $data,
504 internalformat => GL_ALPHA,
505 format => GL_ALPHA;
506 } else {
507 delete $self->{fow_texture};
508 }
509
510 glNewList ($self->{list} ||= glGenList);
511
512 glPushMatrix;
513 glTranslate $sx0, $sy0;
514 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
515 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
516
517 $::MAP->draw ($dx, $dy, $sw, $sh,
518 $self->{tilesize},
519 $::CONN->{player}{tag},
520 -$self->{sdx}, -$self->{sdy});
521
522 #d#glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
523 glScale $self->{tilesize}, $self->{tilesize};
524
525 if (my $tex = $self->{fow_texture}) {
526 glEnable GL_TEXTURE_2D;
527 glEnable GL_BLEND;
528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
529 glBlendEquation GL_FUNC_REVERSE_SUBTRACT;
530 glBlendFunc GL_ONE, GL_ZERO;
531
532 my $a1 = 0.9;
533
534 if (0 && $self->{last_fow_texture}) {
535 my $d1 = ($self->{sdx} ** 2 + $self->{sdy} ** 2) ** 0.5;
536 my $d2 = ($self->{ldx} ** 2 + $self->{ldy} ** 2) ** 0.5;
537
538 if ($d1 * $d2) {
539 my $a2 = $d1 / $d2;
540
541 $a1 = 1 - $a2;
542
543 #$a1 *= 0.9;
544 #$a2 *= 0.9;
545
546 printf "%4g %4g %4g %4g\n", $d1, $d2, $a1, $a2;#d#
547
548 #$a1 = 1 - (1-$a1) * 0.707;
549 #$a2 = 1 - (1-$a2) * 0.707;
550
551 glColor 1,0,0,1;
552 glBegin GL_QUADS;
553 glVertex 10 + $sdx_t, 10;
554 glVertex 11 + $sdx_t, 10;
555 glVertex 11 + $sdx_t, 11;
556 glVertex 10 + $sdx_t, 11;
557 glEnd;
558
559 glColor +($::CFG->{fow_intensity}) x 3, $a2;
560 glPushMatrix;
561 glTranslate $sdx_t, $sdy_t; # anchor at player
562 glTranslate $self->{ldx} / -$tilesize, $self->{ldy} / -$tilesize;
563 glScale 1/3, 1/3;
564 $self->{last_fow_texture}->draw_quad_alpha (0, 0);
565 glPopMatrix;
566 } else {
567 delete $self->{last_fow_texture};
568 }
569 }
570
571 glColor +($::CFG->{fow_intensity}) x 3, $a1;
572 glPushMatrix;
573 #d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player
574 glScale 1/3, 1/3;
575 $self->{fow_texture}->draw_quad_alpha (0, 0);
576 glPopMatrix;
577
578 glBlendEquation GL_FUNC_ADD;
579 glDisable GL_TEXTURE_2D;
580 glDisable GL_BLEND;
581 }
582
583 if ($self->{magicmap}) {
584 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
585
586 $x += $::MAP->ox + $self->{dx};
587 $y += $::MAP->oy + $self->{dy};
588
589 glTranslate - $x - 1, - $y - 1;
590 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
591 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
592 }
593
594 glPopMatrix;
595 glEndList;
596 }
597 } else {
598 glDeleteList delete $self->{list}
599 if $self->{list};
600 }
601}
602
467sub draw { 603sub draw {
468 my ($self) = @_; 604 my ($self) = @_;
469 605
470 return unless $::MAP; 606 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
471 607
608 return unless $self->{list};
609
472 my $focused = $CFPlus::UI::FOCUS == $self 610 my $focused = $DC::UI::FOCUS == $self
473 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 611 || $DC::UI::FOCUS == $::COMPLETER->{entry};
474 612
475 return 613 return
476 unless $focused || !$::FAST; 614 unless $focused || !$::FAST;
477 615
478 if (delete $self->{need_update}) {
479 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
480
481 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
482 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
483
484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
486
487 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
488 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
489
490 if ($::CFG->{fow_enable}) {
491 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
492
493 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
494 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
495 glConvolutionFilter2D (
496 GL_CONVOLUTION_2D,
497 GL_ALPHA,
498 3, 3,
499 GL_ALPHA, GL_FLOAT,
500 (pack "f*", @{ $self->{smooth_matrix} }),
501 );
502 glEnable GL_CONVOLUTION_2D;
503 }
504
505 $self->{fow_texture} = new CFPlus::Texture
506 w => $w,
507 h => $h,
508 data => $data,
509 internalformat => GL_ALPHA,
510 format => GL_ALPHA;
511
512 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
513 } else {
514 delete $self->{fow_texture};
515 }
516
517 glNewList $self->{list};
518
519 glPushMatrix;
520 glTranslate $sx0, $sy0;
521 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
522
523 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
524
525 glScale 32, 32;
526
527 if (my $tex = $self->{fow_texture}) {
528 glEnable GL_TEXTURE_2D;
529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
530
531 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
532 $self->{fow_texture}->draw_quad_alpha (0, 0);
533
534 glDisable GL_TEXTURE_2D;
535 }
536
537 if ($self->{magicmap}) {
538 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
539
540 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
541 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
542
543 glTranslate - $x - 1, - $y - 1;
544 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
545 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
546 }
547
548 glPopMatrix;
549 glEndList;
550 }
551
552 glCallList $self->{list}; 616 glCallList $self->{list};
553 617
554 # TNT2 emulates logops in software (or worse :) 618 # TNT2 emulates logops in software (or worse :)
555 unless ($focused) { 619 unless ($focused) {
556 glColor 0.4, 0.2, 0.2, 0.6; 620 glColor_premultiply 0, 0, 1, 0.25;
557 glEnable GL_BLEND; 621 glEnable GL_BLEND;
558 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
559 glBegin GL_QUADS; 623 glBegin GL_QUADS;
560 glVertex 0, 0; 624 glVertex 0, 0;
561 glVertex 0, $::HEIGHT; 625 glVertex 0, $::HEIGHT;
562 glVertex $::WIDTH, $::HEIGHT; 626 glVertex $::WIDTH, $::HEIGHT;
563 glVertex $::WIDTH, 0; 627 glVertex $::WIDTH, 0;
… …
572 glDeleteList $self->{list}; 636 glDeleteList $self->{list};
573 637
574 $self->SUPER::DESTROY; 638 $self->SUPER::DESTROY;
575} 639}
576 640
577package CFPlus::MapWidget::MapMap; 641package DC::MapWidget::MapMap;
578 642
643use strict;
644use utf8;
645
579our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
580 647
581use Time::HiRes qw(time); 648use Time::HiRes qw(time);
582use CFPlus::OpenGL; 649use DC::OpenGL;
583 650
584sub size_request { 651sub size_request {
585 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 652 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
653}
654
655sub refresh_hook {
656 my ($self) = @_;
657
658 if ($::MAP && $self->{texture_atime} < time) {
659 my ($w, $h) = @$self{qw(w h)};
660
661 return unless $w && $h;
662
663 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
664 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
665
666 my $ox = 0.5 * ($w - $sw);
667 my $oy = 0.5 * ($h - $sh);
668
669 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
670 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
671
672 #TODO: map scale is completely borked
673
674 my $x0 = int $ox - $sx + 0.5;
675 my $y0 = int $oy - $sy + 0.5;
676
677 $self->{sw} = $sw;
678 $self->{sh} = $sh;
679
680 $self->{x0} = $x0;
681 $self->{y0} = $y0;
682
683 $self->{texture_atime} = time + 1/3;
684
685 $self->{texture} =
686 new DC::Texture
687 w => $w,
688 h => $h,
689 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
690 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
691 }
692}
693
694sub invoke_visibility_change {
695 my ($self) = @_;
696
697 $self->refresh_hook;
698
699 0
586} 700}
587 701
588sub invoke_size_allocate { 702sub invoke_size_allocate {
589 my ($self, $w, $h) = @_; 703 my ($self, $w, $h) = @_;
590 704
… …
601} 715}
602 716
603sub _draw { 717sub _draw {
604 my ($self) = @_; 718 my ($self) = @_;
605 719
606 $::MAP or return; 720 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
607 721
608 my ($w, $h) = @$self{qw(w h)}; 722 $self->{texture} or return;
609
610 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
611 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
612
613 my $sx = int $::CFG->{map_shift_x} / 32;
614 my $sy = int $::CFG->{map_shift_y} / 32;
615
616 my $ox = 0.5 * ($w - $sw);
617 my $oy = 0.5 * ($h - $sh);
618 723
619 glEnable GL_BLEND; 724 glEnable GL_BLEND;
620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
621 glEnable GL_TEXTURE_2D; 726 glEnable GL_TEXTURE_2D;
622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
623 728
624 if ($self->{texture_atime} < time) {
625 $self->{texture_atime} = time + 1/3;
626
627 $self->{texture} =
628 new CFPlus::Texture
629 w => $w,
630 h => $h,
631 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
632 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
633 }
634
635 $self->{texture}->draw_quad (0, 0); 729 $self->{texture}->draw_quad (0, 0);
636 730
637 glDisable GL_TEXTURE_2D; 731 glDisable GL_TEXTURE_2D;
638 732
639 glTranslate 0.375, 0.375; 733 glTranslate 0.375, 0.375;
640
641 #TODO: map scale is completely borked
642
643 my $x0 = int $ox - $sx + 0.5;
644 my $y0 = int $oy - $sy + 0.5;
645 734
646 glColor 1, 1, 0, 1; 735 glColor 1, 1, 0, 1;
647 glBegin GL_LINE_LOOP; 736 glBegin GL_LINE_LOOP;
648 glVertex $x0 , $y0 ; 737 glVertex $self->{x0} , $self->{y0} ;
649 glVertex $x0 , $y0 + $sh; 738 glVertex $self->{x0} , $self->{y0} + $self->{sh};
650 glVertex $x0 + $sw, $y0 + $sh; 739 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
651 glVertex $x0 + $sw, $y0 ; 740 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
652 glEnd; 741 glEnd;
653 742
654 glDisable GL_BLEND; 743 glDisable GL_BLEND;
655} 744}
656 745
657package CFPlus::MapWidget::Command; 746package DC::MapWidget::Command;
658 747
659use strict; 748use strict;
660 749
661use CFPlus::OpenGL; 750use DC::OpenGL;
662 751
663our @ISA = CFPlus::UI::Frame::; 752our @ISA = DC::UI::Frame::;
664 753
665sub new { 754sub new {
666 my $class = shift; 755 my $class = shift;
667 756
668 my $self = $class->SUPER::new ( 757 my $self = $class->SUPER::new (
669 bg => [0, 0, 0, 0.8], 758 bg => [0, 0, 0, 0.8],
670 @_, 759 @_,
671 ); 760 );
672 761
673 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 762 $self->add ($self->{vbox} = new DC::UI::VBox);
674 763
675 $self->{label} = [ 764 $self->{label} = [
676 map 765 map
677 CFPlus::UI::Label->new ( 766 DC::UI::Label->new (
767 align => 0,
678 can_hover => 1, 768 can_hover => 1,
679 can_events => 1, 769 can_events => 1,
680 tooltip_width => 0.33, 770 tooltip_width => 0.33,
681 fontsize => $_, 771 fontsize => $_,
682 ), (0.8) x 16 772 ), (0.8) x 16
683 ]; 773 ];
684 774
685 $self->{entry} = new CFPlus::UI::Entry 775 $self->{entry} = new DC::UI::Entry
686 on_changed => sub { 776 on_changed => sub {
687 $self->update_labels; 777 $self->update_labels;
688 0 778 0
689 }, 779 },
690 on_button_down => sub { 780 on_button_down => sub {
691 my ($entry, $ev, $x, $y) = @_; 781 my ($entry, $ev, $x, $y) = @_;
692 782
693 if ($ev->{button} == 3) { 783 if ($ev->{button} == 3) {
694 (new CFPlus::UI::Menu 784 (new DC::UI::Menu
695 items => [ 785 items => [
696 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 786 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
697 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 787 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
698 ], 788 ],
699 )->popup ($ev); 789 )->popup ($ev);
700 return 1; 790 return 1;
701 } 791 }
702 0 792 0
… …
717 $self->hide; 807 $self->hide;
718 } 808 }
719 } elsif ($ev->{sym} == 27) { 809 } elsif ($ev->{sym} == 27) {
720 $self->{hist_ptr} = 0; 810 $self->{hist_ptr} = 0;
721 $self->hide; 811 $self->hide;
722 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 812 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
723 if ($self->{hist_ptr} > 1) { 813 if ($self->{hist_ptr} > 1) {
724 $self->{hist_ptr}--; 814 $self->{hist_ptr}--;
725 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 815 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
726 } elsif ($self->{hist_ptr} > 0) { 816 } elsif ($self->{hist_ptr} > 0) {
727 $self->{hist_ptr}--; 817 $self->{hist_ptr}--;
… …
729 } else { 819 } else {
730 ++$self->{select_offset} 820 ++$self->{select_offset}
731 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 821 if $self->{select_offset} < $#{ $self->{last_match} || [] };
732 } 822 }
733 $self->update_labels; 823 $self->update_labels;
734 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 824 } elsif ($ev->{sym} == DC::SDLK_UP) {
735 if ($self->{select_offset}) { 825 if ($self->{select_offset}) {
736 --$self->{select_offset} 826 --$self->{select_offset}
737 } else { 827 } else {
738 unless ($self->{hist_ptr}) { 828 unless ($self->{hist_ptr}) {
739 $self->{hist_saveback} = $self->{entry}->get_text; 829 $self->{hist_saveback} = $self->{entry}->get_text;
… …
805 my $text = $self->{entry}->get_text; 895 my $text = $self->{entry}->get_text;
806 896
807 length $text 897 length $text
808 or return $self->hide; 898 or return $self->hide;
809 899
810 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
811
812 if ($text ne $self->{last_search}) { 900 if ($text ne $self->{last_search}) {
813 my @match; 901 my @match;
814 902
815 if ($text =~ /^(.*?)\s+$/) { 903 if ($text =~ /^(.*?)\s+$/) {
904 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
816 @match = [$cmd, "(appended whitespace suppresses completion)"]; 905 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
817 } else { 906 } else {
907 # @match is [command, penalty, command with arguments] until sort
908
909 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
910
818 my $regexp = do { 911 my $regexp_abbrev = do {
819 my ($beg, @chr) = split //, lc $cmd; 912 my ($beg, @chr) = split //, lc $cmd;
820 913
821 # the following regex is used to match our "completion entry" 914 # the following regex is used to match our "completion entry"
822 # to an actual command - the parentheses match kind of "overhead" 915 # to an actual command - the parentheses match kind of "overhead"
823 # - the more characters the parentheses match, the less attractive 916 # - the more characters the parentheses match, the less attractive
… …
825 my $regexp = "^\Q$beg\E" 918 my $regexp = "^\Q$beg\E"
826 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 919 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
827 qr<$regexp> 920 qr<$regexp>
828 }; 921 };
829 922
830 my @penalty; 923 my $regexp_partial = do {
924 my $regexp = "^\Q$text\E(.*)";
925 qr<$regexp>
926 };
831 927
832 for (keys %{$self->{command}}) { 928 for (keys %{$self->{command}}) {
833 if (@penalty = $_ =~ $regexp) { 929 my @scores;
834 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 930
931 # 1. Complete command [with args]
932 # command is a prefix of the text
933 # score is length of complete command matched
934 # e.g. "invoke summon pet monster bat"
935 # "invoke" "summon pet monster bat" = 6
936 # "invoke summon pet monster" "bat" = 25
937 if ($text =~ /^\Q$_\E(.*)/) {
938 push @scores, [$_, length $_, $text];
835 } 939 }
940
941 # 2. Partial command
942 # text is a prefix of the full command
943 # score is the length of the input text
944 # e.g. "invoke s"
945 # "invoke small fireball" = 8
946 # "invoke summon pet monster" = 8
947
948 if ($_ =~ $regexp_partial) {
949 push @scores, [$_, length $text, $_];
950 }
951
952 # 3. Abbreviation match
953 # attempts to use first word of text as an abbreviated command
954 # score is length of word + 1 - 3 per non-word-initial character
955
956 if (my @penalty = $_ =~ $regexp_abbrev) {
957 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
958 }
959
960 # Pick the best option for this command
961 push @match, (sort {
962 $b->[1] <=> $a->[1]
963 } @scores)[0];
836 } 964 }
837 965
966 # @match is now [command object, command with arguments]
838 @match = map $self->{command}{$_->[0]}, 967 @match = map [$self->{command}{$_->[0]}, $_->[2]],
839 sort { 968 sort {
840 $a->[1] <=> $b->[1] 969 $b->[1] <=> $a->[1]
841 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 970 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
842 or (length $b->[0]) <=> (length $a->[0]) 971 or (length $b->[0]) <=> (length $a->[0])
843 } @match; 972 } @match;
844 } 973 }
845 974
… …
864 $label->{fg} = [1, 1, 1, 1]; 993 $label->{fg} = [1, 1, 1, 1];
865 $label->{bg} = [0, 0, 0, 0]; 994 $label->{bg} = [0, 0, 0, 0];
866 } 995 }
867 996
868 if (@matches) { 997 if (@matches) {
869 $self->{select} = "$matches[0][0]$arg"; 998 $self->{select} = "$matches[0][1]";
870 999
871 $labels[0]->{fg} = [0, 0, 0, 1]; 1000 $labels[0]->{fg} = [0, 0, 0, 1];
872 $labels[0]->{bg} = [1, 1, 1, 0.8]; 1001 $labels[0]->{bg} = [1, 1, 1, 0.8];
873 } else { 1002 } else {
874 $self->{select} = "$cmd$arg"; 1003 $self->{select} = "$text";
875 } 1004 }
876 1005
877 for my $match (@matches) { 1006 for my $match (@matches) {
878 my $label = shift @labels; 1007 my $label = shift @labels;
879 1008
880 if (@labels) { 1009 if (@labels) {
881 $label->set_text ("$match->[0]$arg"); 1010 $label->set_text ("$match->[1]");
882 $label->set_tooltip ($match->[1]); 1011 $label->set_tooltip ("$match->[0][1]");
883 } else { 1012 } else {
884 $label->set_text ("..."); 1013 $label->set_text ("...");
885 $label->set_tooltip ("Use Cursor-Down to view more matches"); 1014 $label->set_tooltip ("Use Cursor-Down to view more matches");
886 last; 1015 last;
887 } 1016 }
… …
897 1026
898sub _draw { 1027sub _draw {
899 my ($self) = @_; 1028 my ($self) = @_;
900 1029
901 # hack 1030 # hack
902 local $CFPlus::UI::FOCUS = $self->{entry}; 1031 local $DC::UI::FOCUS = $self->{entry};
903 1032
904 $self->SUPER::_draw; 1033 $self->SUPER::_draw;
905} 1034}
906 1035
9071 10361

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines