[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/MapWidget.pm

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.138 by root, Sun Jul 20 04:17:02 2008 UTC vs.
Revision 1.153 by root, Thu Nov 26 07:19:12 2009 UTC

…		…
11	use DC::Macro;	11	use DC::Macro;
12		12
13	our @ISA = DC::UI::Base::;	13	our @ISA = DC::UI::Base::;
14		14
15	my $magicmap_tex =	15	my $magicmap_tex =
16	new_from_file DC::Texture DC::find_rcfile "magicmap.png",	16	new_from_resource DC::Texture "magicmap.png",
17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;	17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
18		18
19	sub new {	19	sub new {
20	my $class = shift;	20	my $class = shift;
21		21
…		…
163	sub invoke_button_down {	163	sub invoke_button_down {
164	my ($self, $ev, $x, $y) = @_;	164	my ($self, $ev, $x, $y) = @_;
165		165
166	if ($ev->{button} == 1) {	166	if ($ev->{button} == 1) {
167	$self->grab_focus;	167	$self->grab_focus;
168	return unless $::CONN;	168	return unless $::CONN && $self->{ctilesize};
169		169
170	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};	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};	171	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
172		172
173	$x -= DC::floor $::MAP->w * 0.5;	173	$x -= DC::floor $::MAP->w * 0.5;
…		…
201	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	201	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
202	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	202	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
203	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	203	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
204	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],	204	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
205	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],	205	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
206	[
207	$::PICKUP_ENABLE->{state}
208	? "Disable automatic pickup"
209	: "Enable automatic pickup",
210	sub { $::PICKUP_ENABLE->toggle }
211	],
212	);	206	);
213		207
214	if ($::CONN && $::CONN->{editor_support}) {	208	if ($::CONN && $::CONN->{editor_support}) {
215	# push @items, [	209	# push @items, [
216	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",	210	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
…		…
285	$self->{need_update} = 1;	279	$self->{need_update} = 1;
286	$self->SUPER::update;	280	$self->SUPER::update;
287	}	281	}
288		282
289	my %DIR = (	283	my %DIR = (
290	( "," . DC::SDLK_KP5 ), [0, "stay fire"],	284	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
291	( "," . DC::SDLK_KP8 ), [1, "north"],	285	( "," . DC::SDLK_KP8 ), [1, "north"],
292	( "," . DC::SDLK_KP9 ), [2, "northeast"],	286	( "," . DC::SDLK_KP9 ), [2, "northeast"],
293	( "," . DC::SDLK_KP6 ), [3, "east"],	287	( "," . DC::SDLK_KP6 ), [3, "east"],
294	( "," . DC::SDLK_KP3 ), [4, "southeast"],	288	( "," . DC::SDLK_KP3 ), [4, "southeast"],
295	( "," . DC::SDLK_KP2 ), [5, "south"],	289	( "," . DC::SDLK_KP2 ), [5, "south"],
296	( "," . DC::SDLK_KP1 ), [6, "southwest"],	290	( "," . DC::SDLK_KP1 ), [6, "southwest"],
297	( "," . DC::SDLK_KP4 ), [7, "west"],	291	( "," . DC::SDLK_KP4 ), [7, "west"],
298	( "," . DC::SDLK_KP7 ), [8, "northwest"],	292	( "," . DC::SDLK_KP7 ), [8, "northwest"],
299		293
		294	( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
		295	( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
		296	( "," . DC::SDLK_END ), [6, "southwest"],
		297	( "," . DC::SDLK_HOME ), [8, "northwest"],
		298
300	( "," . DC::SDLK_UP ), [1, "north"],	299	( "," . DC::SDLK_UP ), [1, "north"],
301	("1," . DC::SDLK_UP ), [2, "northeast"],	300	("1," . DC::SDLK_UP ), [2, "northeast"],
302	( "," . DC::SDLK_RIGHT), [3, "east"],	301	( "," . DC::SDLK_RIGHT ), [3, "east"],
303	("1," . DC::SDLK_RIGHT), [4, "southeast"],	302	("1," . DC::SDLK_RIGHT ), [4, "southeast"],
304	( "," . DC::SDLK_DOWN ), [5, "south"],	303	( "," . DC::SDLK_DOWN ), [5, "south"],
305	("1," . DC::SDLK_DOWN ), [6, "southwest"],	304	("1," . DC::SDLK_DOWN ), [6, "southwest"],
306	( "," . DC::SDLK_LEFT ), [7, "west"],	305	( "," . DC::SDLK_LEFT ), [7, "west"],
307	("1," . DC::SDLK_LEFT ), [8, "northwest"],	306	("1," . DC::SDLK_LEFT ), [8, "northwest"],
308	);	307	);
309		308
310	sub invoke_key_down {	309	sub invoke_key_down {
311	my ($self, $ev) = @_;	310	my ($self, $ev) = @_;
312		311
313	my $mod = $ev->{mod};	312	my $mod = $ev->{mod};
314	my $sym = $ev->{sym};	313	my $sym = $ev->{sym};
315	my $uni = $ev->{unicode};	314	my $uni = $ev->{unicode};
316		315
317	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_SHIFT;	316	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_META \| DC::KMOD_SHIFT;
318		317
319	# ignore repeated keypresses	318	# ignore repeated keypresses
320	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;	319	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
321	$self->{last_mod} = $mod;	320	$self->{last_mod} = $mod;
322	$self->{last_sym} = $sym;	321	$self->{last_sym} = $sym;
323		322
324	if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {	323	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		324
		325	if ($::CONN && $dir) {
325	if ($mod & DC::KMOD_SHIFT) {	326	if ($mod & DC::KMOD_SHIFT) {
326	$self->{shft}++;	327	$self->{shft}++;
327	if ($dir->[0] != $self->{fire_dir}) {	328	if ($dir->[0] != $self->{fire_dir}) {
328	$::CONN->user_send ("fire $dir->[0]");	329	$::CONN->user_send ("fire $dir->[0]");
329	}	330	}
…		…
356	$::CONN->user_send ("fire_stop");	357	$::CONN->user_send ("fire_stop");
357	delete $self->{fire_dir};	358	delete $self->{fire_dir};
358	$res = 1;	359	$res = 1;
359	}	360	}
360	} else {	361	} else {
361	if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {	362	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		363
		364	if ($dir && delete $self->{shft}) {
362	$::CONN->user_send ("fire_stop");	365	$::CONN->user_send ("fire_stop");
363	delete $self->{fire_dir};	366	delete $self->{fire_dir};
364	$res = 1;	367	$res = 1;
365	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)	368	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
366	&& delete $self->{shft}) { # XXX: is RSHIFT ok?	369	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
…		…
368	delete $self->{fire_dir};	371	delete $self->{fire_dir};
369	$res = 1;	372	$res = 1;
370	}	373	}
371	}	374	}
372		375
373	if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {	376	if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
374	$::CONN->user_send ("run_stop");	377	$::CONN->user_send ("run_stop");
375	$res = 1;	378	$res = 1;
376	}	379	}
377		380
378	$res	381	$res
…		…
394		397
395	sub scroll {	398	sub scroll {
396	my ($self, $dx, $dy) = @_;	399	my ($self, $dx, $dy) = @_;
397		400
398	$::MAP->scroll ($dx, $dy);	401	$::MAP->scroll ($dx, $dy);
		402
		403	$self->{last_fow_texture} = $self->{fow_texture};
		404	$self->{ldx} = $self->{sdx} + $dx * $self->{tilesize}; # smooth displacement
		405	$self->{ldy} = $self->{sdy} + $dy * $self->{tilesize};
399		406
400	$self->movement_update;	407	$self->movement_update;
401		408
402	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement	409	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
403	$self->{sdy} += $dy * $self->{tilesize};	410	$self->{sdy} += $dy * $self->{tilesize};
…		…
421	if ($self->{sdx} \|\| $self->{sdy}) {	428	if ($self->{sdx} \|\| $self->{sdy}) {
422	my $diff = EV::time - ($self->{last_update} \|\| $::LAST_REFRESH);	429	my $diff = EV::time - ($self->{last_update} \|\| $::LAST_REFRESH);
423	my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};	430	my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
424		431
425	# the minimum time for a single tile movement	432	# the minimum time for a single tile movement
426	my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK);	433	my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK \|\| 1);
		434
		435	$spd *= $self->{tilesize};
427		436
428	# jump if "impossibly high" speed	437	# jump if "impossibly high" speed
429	if (	438	if (
430	(max abs $self->{sdx}, abs $self->{sdy})	439	(max abs $self->{sdx}, abs $self->{sdy})
431	> $spd * $self->{tilesize} * $mintime * 1.1	440	> $spd * $mintime * 2.1
432	) {	441	) {
433	#warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d#	442	#warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
434	$self->{sdx} = $self->{sdy} = 0;	443	$self->{sdx} = $self->{sdy} = 0;
435	} else {	444	} else {
436	$spd = $self->{tilesize} $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction	445	$spd = $diff 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
437		446
438	my $dx = $self->{sdx} < 0 ? -$spd : $spd;	447	my $dx = $self->{sdx} < 0 ? -$spd : $spd;
439	my $dy = $self->{sdy} < 0 ? -$spd : $spd;	448	my $dy = $self->{sdy} < 0 ? -$spd : $spd;
440		449
441	if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }	450	if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
442	if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }	451	if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
443
444	$self->update;
445	}	452	}
		453
		454	$self->update;
446	}	455	}
447	} else {	456	} else {
448	$self->{sdx} = $self->{sdy} = 0;	457	$self->{sdx} = $self->{sdy} = 0;
449	}	458	}
450		459
…		…
462		471
463	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;	472	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
464	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;	473	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
465		474
466	# width/height of map, in tiles	475	# width/height of map, in tiles
467	my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;	476	my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
468	my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;	477	my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
469		478
470	# the map displacement, in tiles	479	# the map displacement, in tiles
471	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;	480	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
472	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;	481	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
473		482
…		…
477		486
478	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;	487	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
479	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;	488	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
480		489
481	if ($::CFG->{fow_enable}) {	490	if ($::CFG->{fow_enable}) {
482	$sdx_t = $sdy_t = 0;#d#	491	my ($sdx_t, $sdy_t);#d# do not anchor at player
		492
483	my ($w, $h, $data) = $::MAP->fow_texture (	493	my ($w, $h, $data) = $::MAP->fow_texture (
484	$dx + (min 0, $sdx_t),	494	$dx + (min 0, $sdx_t),
485	$dy + (min 0, $sdy_t),	495	$dy + (min 0, $sdy_t),
486	$sw + abs $sdx_t,	496	$sw + abs $sdx_t,
487	$sh + abs $sdy_t	497	$sh + abs $sdy_t
…		…
500	glNewList ($self->{list} \|\|= glGenList);	510	glNewList ($self->{list} \|\|= glGenList);
501		511
502	glPushMatrix;	512	glPushMatrix;
503	glTranslate $sx0, $sy0;	513	glTranslate $sx0, $sy0;
504	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	514	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
505	glTranslate $self->{sdx}, $self->{sdy};	515	glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
506		516
507	$::MAP->draw ($dx, $dy, $sw, $sh,	517	$::MAP->draw ($dx, $dy, $sw, $sh,
508	$self->{tilesize},	518	$self->{tilesize},
509	$::CONN->{player}{tag},	519	$::CONN->{player}{tag},
510	-$self->{sdx}, -$self->{sdy});	520	-$self->{sdx}, -$self->{sdy});
511		521
512	#glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player	522	#d#glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
513	glScale $self->{tilesize}, $self->{tilesize};	523	glScale $self->{tilesize}, $self->{tilesize};
514		524
515	if (my $tex = $self->{fow_texture}) {	525	if (my $tex = $self->{fow_texture}) {
		526	glEnable GL_TEXTURE_2D;
		527	glEnable GL_BLEND;
		528	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		529	glBlendEquation GL_FUNC_REVERSE_SUBTRACT;
		530	glBlendFunc GL_ONE, GL_ZERO;
		531
		532	my $a1 = 0.9;
		533
		534	if (0 && $self->{last_fow_texture}) {
		535	my $d1 = ($self->{sdx} 2 + $self->{sdy} 2) ** 0.5;
		536	my $d2 = ($self->{ldx} 2 + $self->{ldy} 2) ** 0.5;
		537
		538	if ($d1 * $d2) {
		539	my $a2 = $d1 / $d2;
		540
		541	$a1 = 1 - $a2;
		542
		543	#$a1 *= 0.9;
		544	#$a2 *= 0.9;
		545
		546	printf "%4g %4g %4g %4g\n", $d1, $d2, $a1, $a2;#d#
		547
		548	#$a1 = 1 - (1-$a1) * 0.707;
		549	#$a2 = 1 - (1-$a2) * 0.707;
		550
		551	glColor 1,0,0,1;
		552	glBegin GL_QUADS;
		553	glVertex 10 + $sdx_t, 10;
		554	glVertex 11 + $sdx_t, 10;
		555	glVertex 11 + $sdx_t, 11;
		556	glVertex 10 + $sdx_t, 11;
		557	glEnd;
		558
		559	glColor +($::CFG->{fow_intensity}) x 3, $a2;
		560	glPushMatrix;
		561	glTranslate $sdx_t, $sdy_t; # anchor at player
		562	glTranslate $self->{ldx} / -$tilesize, $self->{ldy} / -$tilesize;
		563	glScale 1/3, 1/3;
		564	$self->{last_fow_texture}->draw_quad_alpha (0, 0);
		565	glPopMatrix;
		566	} else {
		567	delete $self->{last_fow_texture};
		568	}
		569	}
		570
		571	glColor +($::CFG->{fow_intensity}) x 3, $a1;
516	glPushMatrix;	572	glPushMatrix;
517	glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);	573	#d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player
518	glScale 1/3, 1/3;	574	glScale 1/3, 1/3;
519	glEnable GL_TEXTURE_2D;
520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
521
522	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
523	$self->{fow_texture}->draw_quad_alpha (0, 0);	575	$self->{fow_texture}->draw_quad_alpha (0, 0);
		576	glPopMatrix;
524		577
		578	glBlendEquation GL_FUNC_ADD;
525	glDisable GL_TEXTURE_2D;	579	glDisable GL_TEXTURE_2D;
526	glPopMatrix;	580	glDisable GL_BLEND;
527	}	581	}
528		582
529	if ($self->{magicmap}) {	583	if ($self->{magicmap}) {
530	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	584	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
531		585
…		…
601	sub refresh_hook {	655	sub refresh_hook {
602	my ($self) = @_;	656	my ($self) = @_;
603		657
604	if ($::MAP && $self->{texture_atime} < time) {	658	if ($::MAP && $self->{texture_atime} < time) {
605	my ($w, $h) = @$self{qw(w h)};	659	my ($w, $h) = @$self{qw(w h)};
		660
		661	return unless $w && $h;
606		662
607	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;	663	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
608	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;	664	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
609		665
610	my $ox = 0.5 * ($w - $sw);	666	my $ox = 0.5 * ($w - $sw);
…		…
839	my $text = $self->{entry}->get_text;	895	my $text = $self->{entry}->get_text;
840		896
841	length $text	897	length $text
842	or return $self->hide;	898	or return $self->hide;
843		899
844	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
845
846	if ($text ne $self->{last_search}) {	900	if ($text ne $self->{last_search}) {
847	my @match;	901	my @match;
848		902
849	if ($text =~ /^(.*?)\s+$/) {	903	if ($text =~ /^(.*?)\s+$/) {
		904	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
850	@match = [$cmd, "(appended whitespace suppresses completion)"];	905	@match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
851	} else {	906	} else {
		907	# @match is [command, penalty, command with arguments] until sort
		908
		909	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		910
852	my $regexp = do {	911	my $regexp_abbrev = do {
853	my ($beg, @chr) = split //, lc $cmd;	912	my ($beg, @chr) = split //, lc $cmd;
854		913
855	# the following regex is used to match our "completion entry"	914	# the following regex is used to match our "completion entry"
856	# to an actual command - the parentheses match kind of "overhead"	915	# to an actual command - the parentheses match kind of "overhead"
857	# - the more characters the parentheses match, the less attractive	916	# - the more characters the parentheses match, the less attractive
…		…
859	my $regexp = "^\Q$beg\E"	918	my $regexp = "^\Q$beg\E"
860	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;	919	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
861	qr<$regexp>	920	qr<$regexp>
862	};	921	};
863		922
864	my @penalty;	923	my $regexp_partial = do {
		924	my $regexp = "^\Q$text\E(.*)";
		925	qr<$regexp>
		926	};
865		927
866	for (keys %{$self->{command}}) {	928	for (keys %{$self->{command}}) {
867	if (@penalty = $_ =~ $regexp) {	929	my @scores;
868	push @match, [$_, length join "", map "::$_", grep defined, @penalty];	930
		931	# 1. Complete command [with args]
		932	# command is a prefix of the text
		933	# score is length of complete command matched
		934	# e.g. "invoke summon pet monster bat"
		935	# "invoke" "summon pet monster bat" = 6
		936	# "invoke summon pet monster" "bat" = 25
		937	if ($text =~ /^\Q$_\E(.*)/) {
		938	push @scores, [$_, length $_, $text];
869	}	939	}
		940
		941	# 2. Partial command
		942	# text is a prefix of the full command
		943	# score is the length of the input text
		944	# e.g. "invoke s"
		945	# "invoke small fireball" = 8
		946	# "invoke summon pet monster" = 8
		947
		948	if ($_ =~ $regexp_partial) {
		949	push @scores, [$_, length $text, $_];
		950	}
		951
		952	# 3. Abbreviation match
		953	# attempts to use first word of text as an abbreviated command
		954	# score is length of word + 1 - 3 per non-word-initial character
		955
		956	if (my @penalty = $_ =~ $regexp_abbrev) {
		957	push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
		958	}
		959
		960	# Pick the best option for this command
		961	push @match, (sort {
		962	$b->[1] <=> $a->[1]
		963	} @scores)[0];
870	}	964	}
871		965
		966	# @match is now [command object, command with arguments]
872	@match = map $self->{command}{$_->[0]},	967	@match = map [$self->{command}{$_->[0]}, $_->[2]],
873	sort {	968	sort {
874	$a->[1] <=> $b->[1]	969	$b->[1] <=> $a->[1]
875	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]	970	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
876	or (length $b->[0]) <=> (length $a->[0])	971	or (length $b->[0]) <=> (length $a->[0])
877	} @match;	972	} @match;
878	}	973	}
879		974
…		…
898	$label->{fg} = [1, 1, 1, 1];	993	$label->{fg} = [1, 1, 1, 1];
899	$label->{bg} = [0, 0, 0, 0];	994	$label->{bg} = [0, 0, 0, 0];
900	}	995	}
901		996
902	if (@matches) {	997	if (@matches) {
903	$self->{select} = "$matches[0][0]$arg";	998	$self->{select} = "$matches[0][1]";
904		999
905	$labels[0]->{fg} = [0, 0, 0, 1];	1000	$labels[0]->{fg} = [0, 0, 0, 1];
906	$labels[0]->{bg} = [1, 1, 1, 0.8];	1001	$labels[0]->{bg} = [1, 1, 1, 0.8];
907	} else {	1002	} else {
908	$self->{select} = "$cmd$arg";	1003	$self->{select} = "$text";
909	}	1004	}
910		1005
911	for my $match (@matches) {	1006	for my $match (@matches) {
912	my $label = shift @labels;	1007	my $label = shift @labels;
913		1008
914	if (@labels) {	1009	if (@labels) {
915	$label->set_text ("$match->[0]$arg");	1010	$label->set_text ("$match->[1]");
916	$label->set_tooltip ($match->[1]);	1011	$label->set_tooltip ("$match->[0][1]");
917	} else {	1012	} else {
918	$label->set_text ("...");	1013	$label->set_text ("...");
919	$label->set_tooltip ("Use Cursor-Down to view more matches");	1014	$label->set_tooltip ("Use Cursor-Down to view more matches");
920	last;	1015	last;
921	}	1016	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.138 by root, Sun Jul 20 04:17:02 2008 UTC vs. Revision 1.153 by root, Thu Nov 26 07:19:12 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.138 by root, Sun Jul 20 04:17:02 2008 UTC vs.
Revision 1.153 by root, Thu Nov 26 07:19:12 2009 UTC