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

Diff Legend

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