ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.46 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.158 by root, Mon Dec 21 23:52:34 2009 UTC

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

Diff Legend

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