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.49 by root, Sat Jun 3 22:50:48 2006 UTC vs.
Revision 1.156 by root, Sat Dec 19 05:06:57 2009 UTC

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

Diff Legend

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