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

Diff Legend

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