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.48 by elmex, Sat Jun 3 21:59:55 2006 UTC vs.
Revision 1.154 by root, Fri Dec 4 15:04:56 2009 UTC

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

Diff Legend

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