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

Diff Legend

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