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

Diff Legend

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