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

Diff Legend

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