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.38 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.167 by root, Tue Nov 20 14:32:12 2012 UTC

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

Diff Legend

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