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.152 by root, Sat Nov 21 05:17:28 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 $::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
389sub set_magicmap { 413sub set_magicmap {
390 my ($self, $w, $h, $x, $y, $data) = @_; 414 my ($self, $w, $h, $x, $y, $data) = @_;
391 415
392 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 416 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
393 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 417 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
394 418
395 $self->{magicmap} = [$x, $y, $w, $h, $data]; 419 $self->{magicmap} = [$x, $y, $w, $h, $data];
396 420
397 $self->update; 421 $self->update;
398} 422}
399 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 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
528
529 my $a1 = 0.9;
530
531 if (0 && $self->{last_fow_texture}) {
532 my $d1 = ($self->{sdx} ** 2 + $self->{sdy} ** 2) ** 0.5;
533 my $d2 = ($self->{ldx} ** 2 + $self->{ldy} ** 2) ** 0.5;
534
535 if ($d1 * $d2) {
536 my $a2 = $d1 / $d2;
537
538 $a1 = (1/$a2);
539
540 #$a1 *= 0.9;
541 #$a2 *= 0.9;
542
543 printf "%4g %4g %4g\n", $d1, $d2, $a1+$a2;#d#
544
545 #$a1 = 1 - (1-$a1) * 0.707;
546 #$a2 = 1 - (1-$a2) * 0.707;
547
548 glColor 1,0,0,1;
549 glBegin GL_QUADS;
550 glVertex 10 + $sdx_t, 10;
551 glVertex 11 + $sdx_t, 10;
552 glVertex 11 + $sdx_t, 11;
553 glVertex 10 + $sdx_t, 11;
554 glEnd;
555
556 glColor +($::CFG->{fow_intensity}) x 3, $a2;
557 glPushMatrix;
558 glTranslate $sdx_t, $sdy_t; # anchor at player
559 glTranslate $self->{ldx} / -$tilesize, $self->{ldy} / -$tilesize;
560 glScale 1/3, 1/3;
561 $self->{last_fow_texture}->draw_quad_alpha (0, 0);
562 glPopMatrix;
563 } else {
564 delete $self->{last_fow_texture};
565 }
566 }
567
568 glColor +($::CFG->{fow_intensity}) x 3, $a1;
569 glPushMatrix;
570 #d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player
571 glScale 1/3, 1/3;
572 $self->{fow_texture}->draw_quad_alpha (0, 0);
573 glPopMatrix;
574
575 glDisable GL_TEXTURE_2D;
576 }
577
578 if ($self->{magicmap}) {
579 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
580
581 $x += $::MAP->ox + $self->{dx};
582 $y += $::MAP->oy + $self->{dy};
583
584 glTranslate - $x - 1, - $y - 1;
585 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
586 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
587 }
588
589 glPopMatrix;
590 glEndList;
591 }
592 } else {
593 glDeleteList delete $self->{list}
594 if $self->{list};
595 }
596}
597
400sub draw { 598sub draw {
401 my ($self) = @_; 599 my ($self) = @_;
402 600
403 return unless $::MAP; 601 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
404 602
603 return unless $self->{list};
604
405 my $focused = $CFPlus::UI::FOCUS == $self 605 my $focused = $DC::UI::FOCUS == $self
406 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 606 || $DC::UI::FOCUS == $::COMPLETER->{entry};
407 607
408 return 608 return
409 unless $focused || !$::FAST; 609 unless $focused || !$::FAST;
410 610
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}; 611 glCallList $self->{list};
486 612
487 # TNT2 emulates logops in software (or worse :) 613 # TNT2 emulates logops in software (or worse :)
488 unless ($focused) { 614 unless ($focused) {
489 glColor 0.4, 0.2, 0.2, 0.6; 615 glColor_premultiply 0, 0, 1, 0.25;
490 glEnable GL_BLEND; 616 glEnable GL_BLEND;
491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
492 glBegin GL_QUADS; 618 glBegin GL_QUADS;
493 glVertex 0, 0; 619 glVertex 0, 0;
494 glVertex 0, $::HEIGHT; 620 glVertex 0, $::HEIGHT;
495 glVertex $::WIDTH, $::HEIGHT; 621 glVertex $::WIDTH, $::HEIGHT;
496 glVertex $::WIDTH, 0; 622 glVertex $::WIDTH, 0;
… …
505 glDeleteList $self->{list}; 631 glDeleteList $self->{list};
506 632
507 $self->SUPER::DESTROY; 633 $self->SUPER::DESTROY;
508} 634}
509 635
510package CFPlus::MapWidget::MapMap; 636package DC::MapWidget::MapMap;
511 637
638use strict;
639use utf8;
640
512our @ISA = CFPlus::UI::Base::; 641our @ISA = DC::UI::Base::;
513 642
514use Time::HiRes qw(time); 643use Time::HiRes qw(time);
515use CFPlus::OpenGL; 644use DC::OpenGL;
516 645
517sub size_request { 646sub size_request {
518 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 647 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
648}
649
650sub refresh_hook {
651 my ($self) = @_;
652
653 if ($::MAP && $self->{texture_atime} < time) {
654 my ($w, $h) = @$self{qw(w h)};
655
656 return unless $w && $h;
657
658 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
659 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
660
661 my $ox = 0.5 * ($w - $sw);
662 my $oy = 0.5 * ($h - $sh);
663
664 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
665 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
666
667 #TODO: map scale is completely borked
668
669 my $x0 = int $ox - $sx + 0.5;
670 my $y0 = int $oy - $sy + 0.5;
671
672 $self->{sw} = $sw;
673 $self->{sh} = $sh;
674
675 $self->{x0} = $x0;
676 $self->{y0} = $y0;
677
678 $self->{texture_atime} = time + 1/3;
679
680 $self->{texture} =
681 new DC::Texture
682 w => $w,
683 h => $h,
684 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
685 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
686 }
687}
688
689sub invoke_visibility_change {
690 my ($self) = @_;
691
692 $self->refresh_hook;
693
694 0
519} 695}
520 696
521sub invoke_size_allocate { 697sub invoke_size_allocate {
522 my ($self, $w, $h) = @_; 698 my ($self, $w, $h) = @_;
523 699
… …
534} 710}
535 711
536sub _draw { 712sub _draw {
537 my ($self) = @_; 713 my ($self) = @_;
538 714
539 $::MAP or return; 715 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
540 716
541 my ($w, $h) = @$self{qw(w h)}; 717 $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 718
552 glEnable GL_BLEND; 719 glEnable GL_BLEND;
553 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 720 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
554 glEnable GL_TEXTURE_2D; 721 glEnable GL_TEXTURE_2D;
555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 722 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
556 723
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); 724 $self->{texture}->draw_quad (0, 0);
569 725
570 glDisable GL_TEXTURE_2D; 726 glDisable GL_TEXTURE_2D;
571 727
572 glTranslate 0.375, 0.375; 728 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 729
579 glColor 1, 1, 0, 1; 730 glColor 1, 1, 0, 1;
580 glBegin GL_LINE_LOOP; 731 glBegin GL_LINE_LOOP;
581 glVertex $x0 , $y0 ; 732 glVertex $self->{x0} , $self->{y0} ;
582 glVertex $x0 , $y0 + $sh; 733 glVertex $self->{x0} , $self->{y0} + $self->{sh};
583 glVertex $x0 + $sw, $y0 + $sh; 734 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
584 glVertex $x0 + $sw, $y0 ; 735 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
585 glEnd; 736 glEnd;
586 737
587 glDisable GL_BLEND; 738 glDisable GL_BLEND;
588} 739}
589 740
590package CFPlus::MapWidget::Command; 741package DC::MapWidget::Command;
591 742
592use strict; 743use strict;
593 744
594use CFPlus::OpenGL; 745use DC::OpenGL;
595 746
596our @ISA = CFPlus::UI::Frame::; 747our @ISA = DC::UI::Frame::;
597 748
598sub new { 749sub new {
599 my $class = shift; 750 my $class = shift;
600 751
601 my $self = $class->SUPER::new ( 752 my $self = $class->SUPER::new (
602 bg => [0, 0, 0, 0.8], 753 bg => [0, 0, 0, 0.8],
603 @_, 754 @_,
604 ); 755 );
605 756
606 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 757 $self->add ($self->{vbox} = new DC::UI::VBox);
607 758
608 $self->{label} = [ 759 $self->{label} = [
609 map 760 map
610 CFPlus::UI::Label->new ( 761 DC::UI::Label->new (
762 align => 0,
611 can_hover => 1, 763 can_hover => 1,
612 can_events => 1, 764 can_events => 1,
613 tooltip_width => 0.33, 765 tooltip_width => 0.33,
614 fontsize => $_, 766 fontsize => $_,
615 ), (0.8) x 16 767 ), (0.8) x 16
616 ]; 768 ];
617 769
618 $self->{entry} = new CFPlus::UI::Entry 770 $self->{entry} = new DC::UI::Entry
619 on_changed => sub { 771 on_changed => sub {
620 $self->update_labels; 772 $self->update_labels;
621 0 773 0
622 }, 774 },
623 on_button_down => sub { 775 on_button_down => sub {
624 my ($entry, $ev, $x, $y) = @_; 776 my ($entry, $ev, $x, $y) = @_;
625 777
626 if ($ev->{button} == 3) { 778 if ($ev->{button} == 3) {
627 (new CFPlus::UI::Menu 779 (new DC::UI::Menu
628 items => [ 780 items => [
629 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 781 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
630 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 782 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
631 ], 783 ],
632 )->popup ($ev); 784 )->popup ($ev);
633 return 1; 785 return 1;
634 } 786 }
635 0 787 0
… …
650 $self->hide; 802 $self->hide;
651 } 803 }
652 } elsif ($ev->{sym} == 27) { 804 } elsif ($ev->{sym} == 27) {
653 $self->{hist_ptr} = 0; 805 $self->{hist_ptr} = 0;
654 $self->hide; 806 $self->hide;
655 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 807 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
656 if ($self->{hist_ptr} > 1) { 808 if ($self->{hist_ptr} > 1) {
657 $self->{hist_ptr}--; 809 $self->{hist_ptr}--;
658 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 810 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
659 } elsif ($self->{hist_ptr} > 0) { 811 } elsif ($self->{hist_ptr} > 0) {
660 $self->{hist_ptr}--; 812 $self->{hist_ptr}--;
… …
662 } else { 814 } else {
663 ++$self->{select_offset} 815 ++$self->{select_offset}
664 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 816 if $self->{select_offset} < $#{ $self->{last_match} || [] };
665 } 817 }
666 $self->update_labels; 818 $self->update_labels;
667 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 819 } elsif ($ev->{sym} == DC::SDLK_UP) {
668 if ($self->{select_offset}) { 820 if ($self->{select_offset}) {
669 --$self->{select_offset} 821 --$self->{select_offset}
670 } else { 822 } else {
671 unless ($self->{hist_ptr}) { 823 unless ($self->{hist_ptr}) {
672 $self->{hist_saveback} = $self->{entry}->get_text; 824 $self->{hist_saveback} = $self->{entry}->get_text;
… …
738 my $text = $self->{entry}->get_text; 890 my $text = $self->{entry}->get_text;
739 891
740 length $text 892 length $text
741 or return $self->hide; 893 or return $self->hide;
742 894
743 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
744
745 if ($text ne $self->{last_search}) { 895 if ($text ne $self->{last_search}) {
746 my @match; 896 my @match;
747 897
748 if ($text =~ /^(.*?)\s+$/) { 898 if ($text =~ /^(.*?)\s+$/) {
899 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
749 @match = [$cmd, "(appended whitespace suppresses completion)"]; 900 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
750 } else { 901 } else {
902 # @match is [command, penalty, command with arguments] until sort
903
904 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
905
751 my $regexp = do { 906 my $regexp_abbrev = do {
752 my ($beg, @chr) = split //, lc $cmd; 907 my ($beg, @chr) = split //, lc $cmd;
753 908
754 # the following regex is used to match our "completion entry" 909 # the following regex is used to match our "completion entry"
755 # to an actual command - the parentheses match kind of "overhead" 910 # to an actual command - the parentheses match kind of "overhead"
756 # - the more characters the parentheses match, the less attractive 911 # - the more characters the parentheses match, the less attractive
… …
758 my $regexp = "^\Q$beg\E" 913 my $regexp = "^\Q$beg\E"
759 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 914 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
760 qr<$regexp> 915 qr<$regexp>
761 }; 916 };
762 917
763 my @penalty; 918 my $regexp_partial = do {
919 my $regexp = "^\Q$text\E(.*)";
920 qr<$regexp>
921 };
764 922
765 for (keys %{$self->{command}}) { 923 for (keys %{$self->{command}}) {
766 if (@penalty = $_ =~ $regexp) { 924 my @scores;
767 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 925
926 # 1. Complete command [with args]
927 # command is a prefix of the text
928 # score is length of complete command matched
929 # e.g. "invoke summon pet monster bat"
930 # "invoke" "summon pet monster bat" = 6
931 # "invoke summon pet monster" "bat" = 25
932 if ($text =~ /^\Q$_\E(.*)/) {
933 push @scores, [$_, length $_, $text];
768 } 934 }
935
936 # 2. Partial command
937 # text is a prefix of the full command
938 # score is the length of the input text
939 # e.g. "invoke s"
940 # "invoke small fireball" = 8
941 # "invoke summon pet monster" = 8
942
943 if ($_ =~ $regexp_partial) {
944 push @scores, [$_, length $text, $_];
945 }
946
947 # 3. Abbreviation match
948 # attempts to use first word of text as an abbreviated command
949 # score is length of word + 1 - 3 per non-word-initial character
950
951 if (my @penalty = $_ =~ $regexp_abbrev) {
952 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
953 }
954
955 # Pick the best option for this command
956 push @match, (sort {
957 $b->[1] <=> $a->[1]
958 } @scores)[0];
769 } 959 }
770 960
961 # @match is now [command object, command with arguments]
771 @match = map $self->{command}{$_->[0]}, 962 @match = map [$self->{command}{$_->[0]}, $_->[2]],
772 sort { 963 sort {
773 $a->[1] <=> $b->[1] 964 $b->[1] <=> $a->[1]
774 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 965 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
775 or (length $b->[0]) <=> (length $a->[0]) 966 or (length $b->[0]) <=> (length $a->[0])
776 } @match; 967 } @match;
777 } 968 }
778 969
… …
797 $label->{fg} = [1, 1, 1, 1]; 988 $label->{fg} = [1, 1, 1, 1];
798 $label->{bg} = [0, 0, 0, 0]; 989 $label->{bg} = [0, 0, 0, 0];
799 } 990 }
800 991
801 if (@matches) { 992 if (@matches) {
802 $self->{select} = "$matches[0][0]$arg"; 993 $self->{select} = "$matches[0][1]";
803 994
804 $labels[0]->{fg} = [0, 0, 0, 1]; 995 $labels[0]->{fg} = [0, 0, 0, 1];
805 $labels[0]->{bg} = [1, 1, 1, 0.8]; 996 $labels[0]->{bg} = [1, 1, 1, 0.8];
806 } else { 997 } else {
807 $self->{select} = "$cmd$arg"; 998 $self->{select} = "$text";
808 } 999 }
809 1000
810 for my $match (@matches) { 1001 for my $match (@matches) {
811 my $label = shift @labels; 1002 my $label = shift @labels;
812 1003
813 if (@labels) { 1004 if (@labels) {
814 $label->set_text ("$match->[0]$arg"); 1005 $label->set_text ("$match->[1]");
815 $label->set_tooltip ($match->[1]); 1006 $label->set_tooltip ("$match->[0][1]");
816 } else { 1007 } else {
817 $label->set_text ("..."); 1008 $label->set_text ("...");
818 $label->set_tooltip ("Use Cursor-Down to view more matches"); 1009 $label->set_tooltip ("Use Cursor-Down to view more matches");
819 last; 1010 last;
820 } 1011 }
… …
830 1021
831sub _draw { 1022sub _draw {
832 my ($self) = @_; 1023 my ($self) = @_;
833 1024
834 # hack 1025 # hack
835 local $CFPlus::UI::FOCUS = $self->{entry}; 1026 local $DC::UI::FOCUS = $self->{entry};
836 1027
837 $self->SUPER::_draw; 1028 $self->SUPER::_draw;
838} 1029}
839 1030
8401 10311
1032

Diff Legend

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