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.84 by root, Sun Oct 1 18:17:38 2006 UTC vs.
Revision 1.158 by root, Mon Dec 21 23:52:34 2009 UTC

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

Diff Legend

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