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.76 by elmex, Sat Jul 22 12:36:17 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::;
11 14
12my $magicmap_tex = 15my $magicmap_tex =
13 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", 16 new_from_resource DC::Texture "magicmap.png",
14 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
15 18
16sub new { 19sub new {
17 my $class = shift; 20 my $class = shift;
18 21
19 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
20 z => -1, 23 z => -1,
21 can_focus => 1, 24 can_focus => 1,
22 list => glGenList, 25 tilesize => 32,
23
24 smooth_matrix => [
25 0.05, 0.13, 0.05,
26 0.13, 0.30, 0.13,
27 0.05, 0.13, 0.05,
28 ],
29
30 @_ 26 @_
31 ); 27 );
32
33 $self->{completer} = new CFClient::MapWidget::Command::
34 command => $self->{command},
35 can_focus => 1,
36 tooltip => "<b>The Command Completer</b>\n\n"
37 . "This is your central interface to send text commands to the server. "
38 . "To enter a verbatim command to send to the server, just type the command, "
39 . "followed by a space, and press return. "
40 . "Typing the initial letters of words (or just any letters) displays guesses "
41 . "for commands you might want to use.\n"
42 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
44 ;
45 28
46 $self 29 $self
47} 30}
48 31
49sub add_command { 32sub add_command {
… …
53 36
54 $tooltip =~ s/^\s+//; 37 $tooltip =~ s/^\s+//;
55 $tooltip = "<big>$data</big>\n\n$tooltip"; 38 $tooltip = "<big>$data</big>\n\n$tooltip";
56 $tooltip =~ s/\s+$//; 39 $tooltip =~ s/\s+$//;
57 40
58 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 41 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
59} 42}
60 43
61sub clr_commands { 44sub clr_commands {
62 my ($self) = @_; 45 my ($self) = @_;
63 46
64 %{$self->{completer}{command}} = (); 47 %{$::COMPLETER->{command}} = ();
65 48
66 $self->{completer}->hide 49 $::COMPLETER->hide
67 if $self->{completer}; 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 }
68} 161}
69 162
70sub invoke_button_down { 163sub invoke_button_down {
71 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
72 165
73 if ($ev->{button} == 1) { 166 if ($ev->{button} == 1) {
74 $self->grab_focus; 167 $self->grab_focus;
75 return unless $::CONN; 168 return unless $::CONN && $self->{ctilesize};
76 169
77 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
78 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
79 172
80 $x -= int 0.5 * $self->{sw}; 173 $x -= DC::floor $::MAP->w * 0.5;
81 $y -= int 0.5 * $self->{sh}; 174 $y -= DC::floor $::MAP->h * 0.5;
82 175
176 if ($::CONN) {
83 $::CONN->lookat ($x, $y) 177 $::CONN->lookat ($x, $y)
84 if $::CONN; 178 }
85 179
86 } elsif ($ev->{button} == 2) { 180 } elsif ($ev->{button} == 2) {
87 $self->grab_focus; 181 $self->grab_focus;
88 return unless $::CONN; 182 return unless $::CONN;
89 183
… …
99 $::CFG->{map_shift_y} = $bh + $y - $oy; 193 $::CFG->{map_shift_y} = $bh + $y - $oy;
100 194
101 $self->update; 195 $self->update;
102 }; 196 };
103 } elsif ($ev->{button} == 3) { 197 } elsif ($ev->{button} == 3) {
104 (new CFClient::UI::Menu 198 my @items = (
105 items => [
106 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 199 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
107 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 200 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
108 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
109 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
110 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
111 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
112 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
113 [ 206 );
114 $::PICKUP_ENABLE->{state} 207
115 ? "Disable automatic pickup" 208 if ($::CONN && $::CONN->{editor_support}) {
116 : "Enable automatic pickup", 209# push @items, [
117 sub { $::PICKUP_ENABLE->toggle } 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 },
118 ], 223 ];
224 }
225 }
226
227 push @items,
228 ["Quit",
229 sub {
230 if ($::CONN) {
231 &::open_quit_dialog;
232 } else {
233 exit;
234 }
235 }
119 ], 236 ],
237 ;
238
239 (new DC::UI::Menu
240 items => \@items,
120 )->popup ($ev); 241 )->popup ($ev);
121 } 242 }
122 243
123 1 244 1
124} 245}
… …
142 263
143 1 264 1
144} 265}
145 266
146sub size_request { 267sub size_request {
268 my ($self) = @_;
269
147 ( 270 (
148 32 * CFClient::ceil $::WIDTH / 32, 271 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
149 32 * CFClient::ceil $::HEIGHT / 32, 272 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
150 ) 273 )
151} 274}
152 275
153sub update { 276sub update {
154 my ($self) = @_; 277 my ($self) = @_;
… …
156 $self->{need_update} = 1; 279 $self->{need_update} = 1;
157 $self->SUPER::update; 280 $self->SUPER::update;
158} 281}
159 282
160my %DIR = ( 283my %DIR = (
161 CFClient::SDLK_KP8, [1, "north"], 284 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
162 CFClient::SDLK_KP9, [2, "northeast"], 285 ( "," . DC::SDLK_KP8 ), [1, "north"],
163 CFClient::SDLK_KP6, [3, "east"], 286 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
164 CFClient::SDLK_KP3, [4, "southeast"], 287 ( "," . DC::SDLK_KP6 ), [3, "east"],
165 CFClient::SDLK_KP2, [5, "south"], 288 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
166 CFClient::SDLK_KP1, [6, "southwest"], 289 ( "," . DC::SDLK_KP2 ), [5, "south"],
167 CFClient::SDLK_KP4, [7, "west"], 290 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
168 CFClient::SDLK_KP7, [8, "northwest"], 291 ( "," . DC::SDLK_KP4 ), [7, "west"],
292 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
169 293
170 CFClient::SDLK_UP, [1, "north"], 294 ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
171 CFClient::SDLK_RIGHT, [3, "east"], 295 ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
172 CFClient::SDLK_DOWN, [5, "south"], 296 ( "," . DC::SDLK_END ), [6, "southwest"],
173 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"],
174); 307);
175 308
176sub invoke_key_down { 309sub invoke_key_down {
177 my ($self, $ev) = @_; 310 my ($self, $ev) = @_;
178 311
179 my $mod = $ev->{mod}; 312 my $mod = $ev->{mod};
180 my $sym = $ev->{sym}; 313 my $sym = $ev->{sym};
181 my $uni = $ev->{unicode}; 314 my $uni = $ev->{unicode};
182 315
183 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; 316 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
184 317
185 if ($uni == ord "\t") { 318 # ignore repeated keypresses
186 $::PL_WINDOW->toggle_visibility; 319 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
187 } elsif ($sym == CFClient::SDLK_F1 && !$mod) { 320 $self->{last_mod} = $mod;
188 $::HELP_WINDOW->toggle_visibility; 321 $self->{last_sym} = $sym;
189 } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
190 ::toggle_player_page ($::STATS_PAGE);
191 } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
192 ::toggle_player_page ($::SKILL_PAGE);
193 } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
194 ::toggle_player_page ($::SPELL_PAGE);
195 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
196 ::toggle_player_page ($::INVENTORY_PAGE);
197 } elsif ($sym == CFClient::SDLK_F9 && !$mod) {
198 $::SETUP_DIALOG->toggle_visibility;
199 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
200 $::BIND_EDITOR->set_binding (undef, undef, [],
201 sub {
202 my ($mod, $sym, $cmds) = @_;
203 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
204 });
205 $::BIND_EDITOR->start;
206 $::BIND_EDITOR->show;
207 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
208 $::BIND_EDITOR->stop;
209 $::BIND_EDITOR->ask_for_bind_and_commit;
210 $::BIND_EDITOR->hide;
211 } elsif (!$::CONN) {
212 return 0; # bindings further down need a valid connection
213 322
214 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { 323 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
215 $::CONN->user_send ("stay fire"); 324
216 } elsif ($uni == ord ",") { 325 if ($::CONN && $dir) {
217 $::CONN->user_send ("take");
218 } elsif ($uni == ord " ") {
219 $::CONN->user_send ("apply");
220 } elsif ($uni == ord ".") {
221 $::CONN->user_send ($self->{completer}{last_command})
222 if exists $self->{completer}{last_command};
223 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
224 $::CONN->user_send ($_) for @$bind_cmd;
225 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
226 $::CONN->user_send ("rotateshoottype +");
227 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
228 $::CONN->user_send ("rotateshoottype -");
229 } elsif ($uni == ord '"') {
230 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
231 $self->{completer}->show;
232 } elsif ($uni == ord "'") {
233 $self->{completer}->set_prefix ("");
234 $self->{completer}->show;
235 } elsif (exists $DIR{$sym}) {
236 if ($mod & CFClient::KMOD_SHIFT) { 326 if ($mod & DC::KMOD_SHIFT) {
237 $self->{shft}++; 327 $self->{shft}++;
238 if ($DIR{$sym}[0] != $self->{fire_dir}) { 328 if ($dir->[0] != $self->{fire_dir}) {
239 $::CONN->user_send ("fire $DIR{$sym}[0]"); 329 $::CONN->user_send ("fire $dir->[0]");
240 } 330 }
241 $self->{fire_dir} = $DIR{$sym}[0]; 331 $self->{fire_dir} = $dir->[0];
242 } elsif ($mod & CFClient::KMOD_CTRL) { 332 } elsif ($mod & DC::KMOD_CTRL) {
243 $self->{ctrl}++; 333 $self->{ctrl}++;
244 $::CONN->user_send ("run $DIR{$sym}[0]"); 334 $::CONN->user_send ("run $dir->[0]");
245 } else { 335 } else {
246 $::CONN->user_send ("$DIR{$sym}[1]"); 336 $::CONN->user_send ("$dir->[1]");
247 } 337 }
248 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 338
249 $self->{completer}->invoke_key_down ($ev);
250 $self->{completer}->show;
251 } else {
252 return 0; 339 return 1;
253 }
254
255 1 340 }
341
342 0
256} 343}
257 344
258sub invoke_key_up { 345sub invoke_key_up {
259 my ($self, $ev) = @_; 346 my ($self, $ev) = @_;
260 347
261 my $res = 0; 348 my $res = 0;
262 my $mod = $ev->{mod}; 349 my $mod = $ev->{mod};
263 my $sym = $ev->{sym}; 350 my $sym = $ev->{sym};
264 351
352 delete $self->{last_mod};
353 delete $self->{last_sym};
354
265 if ($::CFG->{shift_fire_stop}) { 355 if ($::CFG->{shift_fire_stop}) {
266 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 356 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
267 $::CONN->user_send ("fire_stop"); 357 $::CONN->user_send ("fire_stop");
268 delete $self->{fire_dir}; 358 delete $self->{fire_dir};
269 $res = 1; 359 $res = 1;
270 } 360 }
271 } else { 361 } else {
362 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
363
272 if (exists $DIR{$sym} && delete $self->{shft}) { 364 if ($dir && delete $self->{shft}) {
273 $::CONN->user_send ("fire_stop"); 365 $::CONN->user_send ("fire_stop");
274 delete $self->{fire_dir}; 366 delete $self->{fire_dir};
275 $res = 1; 367 $res = 1;
276 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::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?
277 $::CONN->user_send ("fire_stop"); 370 $::CONN->user_send ("fire_stop");
278 delete $self->{fire_dir}; 371 delete $self->{fire_dir};
279 $res = 1; 372 $res = 1;
280 } 373 }
281 } 374 }
282 375
283 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 376 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
284 $::CONN->user_send ("run_stop"); 377 $::CONN->user_send ("run_stop");
285 $res = 1; 378 $res = 1;
286 } 379 }
287 380
288 $res 381 $res
289} 382}
290 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
291sub set_magicmap { 413sub set_magicmap {
292 my ($self, $w, $h, $x, $y, $data) = @_; 414 my ($self, $w, $h, $x, $y, $data) = @_;
293 415
294 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 416 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
295 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 417 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
296 418
297 $self->{magicmap} = [$x, $y, $w, $h, $data]; 419 $self->{magicmap} = [$x, $y, $w, $h, $data];
298 420
299 $self->update; 421 $self->update;
300} 422}
301 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
302sub draw { 603sub draw {
303 my ($self) = @_; 604 my ($self) = @_;
304 605
305 return unless $::MAP; 606 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
306 607
608 return unless $self->{list};
609
307 my $focused = $CFClient::UI::FOCUS == $self 610 my $focused = $DC::UI::FOCUS == $self
308 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 611 || $DC::UI::FOCUS == $::COMPLETER->{entry};
309 612
310 return 613 return
311 unless $focused || !$::FAST; 614 unless $focused || !$::FAST;
312 615
313 if (delete $self->{need_update}) {
314 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
315
316 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
317 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
318
319 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
320 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
321
322 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
323 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
324
325 if ($::CFG->{fow_enable}) {
326 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
327
328 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
329 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
330 glConvolutionFilter2D (
331 GL_CONVOLUTION_2D,
332 GL_ALPHA,
333 3, 3,
334 GL_ALPHA, GL_FLOAT,
335 (pack "f*", @{ $self->{smooth_matrix} }),
336 );
337 glEnable GL_CONVOLUTION_2D;
338 }
339
340 $self->{fow_texture} = new CFClient::Texture
341 w => $w,
342 h => $h,
343 data => $data,
344 internalformat => GL_ALPHA,
345 format => GL_ALPHA;
346
347 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
348 } else {
349 delete $self->{fow_texture};
350 }
351
352 glNewList $self->{list};
353
354 glPushMatrix;
355 glTranslate $sx0, $sy0;
356 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
357
358 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
359
360 glScale 32, 32;
361
362 if (my $tex = $self->{fow_texture}) {
363 glEnable GL_TEXTURE_2D;
364 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
365
366 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
367 $self->{fow_texture}->draw_quad_alpha (0, 0);
368
369 glDisable GL_TEXTURE_2D;
370 }
371
372 if ($self->{magicmap}) {
373 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
374
375 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
376 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
377
378 glTranslate - $x - 1, - $y - 1;
379 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
380 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
381 }
382
383 glPopMatrix;
384 glEndList;
385 }
386
387 glCallList $self->{list}; 616 glCallList $self->{list};
388 617
389 # TNT2 emulates logops in software (or worse :) 618 # TNT2 emulates logops in software (or worse :)
390 unless ($focused) { 619 unless ($focused) {
391 glColor 0.4, 0.2, 0.2, 0.6; 620 glColor_premultiply 0, 0, 1, 0.25;
392 glEnable GL_BLEND; 621 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS; 623 glBegin GL_QUADS;
395 glVertex 0, 0; 624 glVertex 0, 0;
396 glVertex 0, $::HEIGHT; 625 glVertex 0, $::HEIGHT;
397 glVertex $::WIDTH, $::HEIGHT; 626 glVertex $::WIDTH, $::HEIGHT;
398 glVertex $::WIDTH, 0; 627 glVertex $::WIDTH, 0;
… …
407 glDeleteList $self->{list}; 636 glDeleteList $self->{list};
408 637
409 $self->SUPER::DESTROY; 638 $self->SUPER::DESTROY;
410} 639}
411 640
412package CFClient::MapWidget::MapMap; 641package DC::MapWidget::MapMap;
413 642
643use strict;
644use utf8;
645
414our @ISA = CFClient::UI::Base::; 646our @ISA = DC::UI::Base::;
415 647
416use Time::HiRes qw(time); 648use Time::HiRes qw(time);
417use CFClient::OpenGL; 649use DC::OpenGL;
418 650
419sub size_request { 651sub size_request {
420 ($::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
421} 700}
422 701
423sub invoke_size_allocate { 702sub invoke_size_allocate {
424 my ($self, $w, $h) = @_; 703 my ($self, $w, $h) = @_;
425 704
… …
436} 715}
437 716
438sub _draw { 717sub _draw {
439 my ($self) = @_; 718 my ($self) = @_;
440 719
441 $::MAP or return; 720 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
442 721
443 my ($w, $h) = @$self{qw(w h)}; 722 $self->{texture} or return;
444
445 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
446 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
447
448 my $sx = int $::CFG->{map_shift_x} / 32;
449 my $sy = int $::CFG->{map_shift_y} / 32;
450
451 my $ox = 0.5 * ($w - $sw);
452 my $oy = 0.5 * ($h - $sh);
453 723
454 glEnable GL_BLEND; 724 glEnable GL_BLEND;
455 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
456 glEnable GL_TEXTURE_2D; 726 glEnable GL_TEXTURE_2D;
457 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
458 728
459 if ($self->{texture_atime} < time) {
460 $self->{texture_atime} = time + 1/3;
461
462 $self->{texture} =
463 new CFClient::Texture
464 w => $w,
465 h => $h,
466 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
467 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
468 }
469
470 $self->{texture}->draw_quad (0, 0); 729 $self->{texture}->draw_quad (0, 0);
471 730
472 glDisable GL_TEXTURE_2D; 731 glDisable GL_TEXTURE_2D;
473 732
474 glTranslate 0.375, 0.375; 733 glTranslate 0.375, 0.375;
475
476 #TODO: map scale is completely borked
477
478 my $x0 = int $ox - $sx + 0.5;
479 my $y0 = int $oy - $sy + 0.5;
480 734
481 glColor 1, 1, 0, 1; 735 glColor 1, 1, 0, 1;
482 glBegin GL_LINE_LOOP; 736 glBegin GL_LINE_LOOP;
483 glVertex $x0 , $y0 ; 737 glVertex $self->{x0} , $self->{y0} ;
484 glVertex $x0 , $y0 + $sh; 738 glVertex $self->{x0} , $self->{y0} + $self->{sh};
485 glVertex $x0 + $sw, $y0 + $sh; 739 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
486 glVertex $x0 + $sw, $y0 ; 740 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
487 glEnd; 741 glEnd;
488 742
489 glDisable GL_BLEND; 743 glDisable GL_BLEND;
490} 744}
491 745
492package CFClient::MapWidget::Command; 746package DC::MapWidget::Command;
493 747
494use strict; 748use strict;
495 749
496use CFClient::OpenGL; 750use DC::OpenGL;
497 751
498our @ISA = CFClient::UI::Frame::; 752our @ISA = DC::UI::Frame::;
499 753
500sub new { 754sub new {
501 my $class = shift; 755 my $class = shift;
502 756
503 my $self = $class->SUPER::new ( 757 my $self = $class->SUPER::new (
504 bg => [0, 0, 0, 0.8], 758 bg => [0, 0, 0, 0.8],
505 @_, 759 @_,
506 ); 760 );
507 761
508 $self->add ($self->{vbox} = new CFClient::UI::VBox); 762 $self->add ($self->{vbox} = new DC::UI::VBox);
509 763
510 $self->{label} = [ 764 $self->{label} = [
511 map 765 map
512 CFClient::UI::Label->new ( 766 DC::UI::Label->new (
767 align => 0,
513 can_hover => 1, 768 can_hover => 1,
514 can_events => 1, 769 can_events => 1,
515 tooltip_width => 0.33, 770 tooltip_width => 0.33,
516 fontsize => $_, 771 fontsize => $_,
517 ), (0.8) x 16 772 ), (0.8) x 16
518 ]; 773 ];
519 774
520 $self->{entry} = new CFClient::UI::Entry 775 $self->{entry} = new DC::UI::Entry
521 on_changed => sub { 776 on_changed => sub {
522 $self->update_labels; 777 $self->update_labels;
523 0 778 0
524 }, 779 },
525 on_button_down => sub { 780 on_button_down => sub {
526 my ($entry, $ev, $x, $y) = @_; 781 my ($entry, $ev, $x, $y) = @_;
527 782
528 if ($ev->{button} == 3) { 783 if ($ev->{button} == 3) {
529 (new CFClient::UI::Menu 784 (new DC::UI::Menu
530 items => [ 785 items => [
531 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 786 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
532 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 787 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
533 ], 788 ],
534 )->popup ($ev); 789 )->popup ($ev);
535 return 1; 790 return 1;
536 } 791 }
537 0 792 0
… …
552 $self->hide; 807 $self->hide;
553 } 808 }
554 } elsif ($ev->{sym} == 27) { 809 } elsif ($ev->{sym} == 27) {
555 $self->{hist_ptr} = 0; 810 $self->{hist_ptr} = 0;
556 $self->hide; 811 $self->hide;
557 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 812 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
558 if ($self->{hist_ptr} > 1) { 813 if ($self->{hist_ptr} > 1) {
559 $self->{hist_ptr}--; 814 $self->{hist_ptr}--;
560 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 815 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
561 } elsif ($self->{hist_ptr} > 0) { 816 } elsif ($self->{hist_ptr} > 0) {
562 $self->{hist_ptr}--; 817 $self->{hist_ptr}--;
… …
564 } else { 819 } else {
565 ++$self->{select_offset} 820 ++$self->{select_offset}
566 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 821 if $self->{select_offset} < $#{ $self->{last_match} || [] };
567 } 822 }
568 $self->update_labels; 823 $self->update_labels;
569 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 824 } elsif ($ev->{sym} == DC::SDLK_UP) {
570 if ($self->{select_offset}) { 825 if ($self->{select_offset}) {
571 --$self->{select_offset} 826 --$self->{select_offset}
572 } else { 827 } else {
573 unless ($self->{hist_ptr}) { 828 unless ($self->{hist_ptr}) {
574 $self->{hist_saveback} = $self->{entry}->get_text; 829 $self->{hist_saveback} = $self->{entry}->get_text;
… …
625 880
626 $self->SUPER::hide; 881 $self->SUPER::hide;
627 $self->{entry}->set_text (""); 882 $self->{entry}->set_text ("");
628} 883}
629 884
630sub invoke_key_down { 885sub inject_key_down {
631 my ($self, $ev) = @_; 886 my ($self, $ev) = @_;
632 887
888 $self->{entry}->grab_focus;
633 $self->{entry}->emit (key_down => $ev) 889 $self->{entry}->emit (key_down => $ev);
634} 890}
635 891
636sub update_labels { 892sub update_labels {
637 my ($self) = @_; 893 my ($self) = @_;
638 894
639 my $text = $self->{entry}->get_text; 895 my $text = $self->{entry}->get_text;
640 896
641 length $text 897 length $text
642 or return $self->hide; 898 or return $self->hide;
643 899
644 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
645
646 if ($text ne $self->{last_search}) { 900 if ($text ne $self->{last_search}) {
647 my @match; 901 my @match;
648 902
649 if ($text =~ /^(.*?)\s+$/) { 903 if ($text =~ /^(.*?)\s+$/) {
904 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
650 @match = [$cmd, "(appended whitespace suppresses completion)"]; 905 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
651 } else { 906 } else {
907 # @match is [command, penalty, command with arguments] until sort
908
909 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
910
652 my $regexp = do { 911 my $regexp_abbrev = do {
653 my ($beg, @chr) = split //, lc $cmd; 912 my ($beg, @chr) = split //, lc $cmd;
654 913
655 # the following regex is used to match our "completion entry" 914 # the following regex is used to match our "completion entry"
656 # to an actual command - the parentheses match kind of "overhead" 915 # to an actual command - the parentheses match kind of "overhead"
657 # - the more characters the parentheses match, the less attractive 916 # - the more characters the parentheses match, the less attractive
… …
659 my $regexp = "^\Q$beg\E" 918 my $regexp = "^\Q$beg\E"
660 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 919 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
661 qr<$regexp> 920 qr<$regexp>
662 }; 921 };
663 922
664 my @penalty; 923 my $regexp_partial = do {
924 my $regexp = "^\Q$text\E(.*)";
925 qr<$regexp>
926 };
665 927
666 for (keys %{$self->{command}}) { 928 for (keys %{$self->{command}}) {
667 if (@penalty = $_ =~ $regexp) { 929 my @scores;
668 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];
669 } 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];
670 } 964 }
671 965
966 # @match is now [command object, command with arguments]
672 @match = map $self->{command}{$_->[0]}, 967 @match = map [$self->{command}{$_->[0]}, $_->[2]],
673 sort { 968 sort {
674 $a->[1] <=> $b->[1] 969 $b->[1] <=> $a->[1]
675 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 970 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
676 or (length $b->[0]) <=> (length $a->[0]) 971 or (length $b->[0]) <=> (length $a->[0])
677 } @match; 972 } @match;
678 } 973 }
679 974
… …
698 $label->{fg} = [1, 1, 1, 1]; 993 $label->{fg} = [1, 1, 1, 1];
699 $label->{bg} = [0, 0, 0, 0]; 994 $label->{bg} = [0, 0, 0, 0];
700 } 995 }
701 996
702 if (@matches) { 997 if (@matches) {
703 $self->{select} = "$matches[0][0]$arg"; 998 $self->{select} = "$matches[0][1]";
704 999
705 $labels[0]->{fg} = [0, 0, 0, 1]; 1000 $labels[0]->{fg} = [0, 0, 0, 1];
706 $labels[0]->{bg} = [1, 1, 1, 0.8]; 1001 $labels[0]->{bg} = [1, 1, 1, 0.8];
707 } else { 1002 } else {
708 $self->{select} = "$cmd$arg"; 1003 $self->{select} = "$text";
709 } 1004 }
710 1005
711 for my $match (@matches) { 1006 for my $match (@matches) {
712 my $label = shift @labels; 1007 my $label = shift @labels;
713 1008
714 if (@labels) { 1009 if (@labels) {
715 $label->set_text ("$match->[0]$arg"); 1010 $label->set_text ("$match->[1]");
716 $label->set_tooltip ($match->[1]); 1011 $label->set_tooltip ("$match->[0][1]");
717 } else { 1012 } else {
718 $label->set_text ("..."); 1013 $label->set_text ("...");
719 $label->set_tooltip ("Use Cursor-Down to view more matches"); 1014 $label->set_tooltip ("Use Cursor-Down to view more matches");
720 last; 1015 last;
721 } 1016 }
… …
731 1026
732sub _draw { 1027sub _draw {
733 my ($self) = @_; 1028 my ($self) = @_;
734 1029
735 # hack 1030 # hack
736 local $CFClient::UI::FOCUS = $self->{entry}; 1031 local $DC::UI::FOCUS = $self->{entry};
737 1032
738 $self->SUPER::_draw; 1033 $self->SUPER::_draw;
739} 1034}
740 1035
7411 10361
1037

Diff Legend

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