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

Diff Legend

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