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

Diff Legend

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