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

Diff Legend

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