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

Diff Legend

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