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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.132 by root, Sun Jul 13 12:17:00 2008 UTC vs.
Revision 1.165 by root, Fri Nov 9 22:53:57 2012 UTC

…		…
1	package DC::MapWidget;	1	package DC::MapWidget;
2		2
3	use strict;	3	use common::sense;
4	use utf8;
5		4
6	use List::Util qw(min max);	5	use List::Util qw(min max);
		6
		7	use AnyEvent ();
7		8
8	use DC;	9	use DC;
9	use DC::OpenGL;	10	use DC::OpenGL;
10	use DC::UI;	11	use DC::UI;
11	use DC::Macro;	12	use DC::Macro;
12		13
13	our @ISA = DC::UI::Base::;	14	our @ISA = DC::UI::Base::;
14		15
		16	our @TEX_HIDDEN = map {
		17	new_from_resource DC::Texture # MUST be POT
		18	"hidden-$_.png", mipmap => 1, wrap => 1
		19	} 0, 1, 2;
		20
15	my $magicmap_tex =	21	my $magicmap_tex =
16	new_from_file DC::Texture DC::find_rcfile "magicmap.png",	22	new_from_resource DC::Texture "magicmap.png",
17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;	23	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
18		24
19	sub new {	25	sub new {
20	my $class = shift;	26	my $class = shift;
21		27
25	tilesize => 32,	31	tilesize => 32,
26	@_	32	@_
27	);	33	);
28		34
29	$self	35	$self
30	}
31
32	sub set_tilesize {
33	my ($self, $tilesize) = @_;
34
35	$self->{tilesize} = $tilesize;
36	}	36	}
37		37
38	sub add_command {	38	sub add_command {
39	my ($self, $command, $tooltip, $widget, $cb) = @_;	39	my ($self, $command, $tooltip, $widget, $cb) = @_;
40		40
…		…
169	sub invoke_button_down {	169	sub invoke_button_down {
170	my ($self, $ev, $x, $y) = @_;	170	my ($self, $ev, $x, $y) = @_;
171		171
172	if ($ev->{button} == 1) {	172	if ($ev->{button} == 1) {
173	$self->grab_focus;	173	$self->grab_focus;
174	return unless $::CONN;	174	return unless $::CONN && $self->{ctilesize};
175		175
176	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};	176	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
177	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};	177	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
178		178
179	$x -= DC::floor $::MAP->w * 0.5;	179	$x -= DC::floor $::MAP->w * 0.5;
…		…
207	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	207	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
208	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	208	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
209	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	209	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
210	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],	210	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
211	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],	211	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
212	[
213	$::PICKUP_ENABLE->{state}
214	? "Disable automatic pickup"
215	: "Enable automatic pickup",
216	sub { $::PICKUP_ENABLE->toggle }
217	],
218	);	212	);
219		213
220	if ($::CONN && $::CONN->{editor_support}) {	214	if ($::CONN && $::CONN->{editor_support}) {
221	# push @items, [	215	# push @items, [
222	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",	216	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
223	# \&editor_invoke,	217	# \&editor_invoke,
224	# ];	218	# ];
225		219
226	for my $type (qw(test name)) {	220	for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
227	$::CONN->{editor_support}{type} ne $type	221	$::CONN->{editor_support}{servertype} ne $type
228	or next;	222	or next;
229	my $server = $::CONN->{editor_support}{"${type}server"}	223	my $server = $::CONN->{editor_support}{"${type}server"}
230	or next;	224	or next;
231		225
232	push @items, [	226	push @items, [
…		…
291	$self->{need_update} = 1;	285	$self->{need_update} = 1;
292	$self->SUPER::update;	286	$self->SUPER::update;
293	}	287	}
294		288
295	my %DIR = (	289	my %DIR = (
296	( "," . DC::SDLK_KP5 ), [0, "stay fire"],	290	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
297	( "," . DC::SDLK_KP8 ), [1, "north"],	291	( "," . DC::SDLK_KP8 ), [1, "north"],
298	( "," . DC::SDLK_KP9 ), [2, "northeast"],	292	( "," . DC::SDLK_KP9 ), [2, "northeast"],
299	( "," . DC::SDLK_KP6 ), [3, "east"],	293	( "," . DC::SDLK_KP6 ), [3, "east"],
300	( "," . DC::SDLK_KP3 ), [4, "southeast"],	294	( "," . DC::SDLK_KP3 ), [4, "southeast"],
301	( "," . DC::SDLK_KP2 ), [5, "south"],	295	( "," . DC::SDLK_KP2 ), [5, "south"],
302	( "," . DC::SDLK_KP1 ), [6, "southwest"],	296	( "," . DC::SDLK_KP1 ), [6, "southwest"],
303	( "," . DC::SDLK_KP4 ), [7, "west"],	297	( "," . DC::SDLK_KP4 ), [7, "west"],
304	( "," . DC::SDLK_KP7 ), [8, "northwest"],	298	( "," . DC::SDLK_KP7 ), [8, "northwest"],
305		299
		300	( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
		301	( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
		302	( "," . DC::SDLK_END ), [6, "southwest"],
		303	( "," . DC::SDLK_HOME ), [8, "northwest"],
		304
306	( "," . DC::SDLK_UP ), [1, "north"],	305	( "," . DC::SDLK_UP ), [1, "north"],
307	("1," . DC::SDLK_UP ), [2, "northeast"],	306	("1," . DC::SDLK_UP ), [2, "northeast"],
308	( "," . DC::SDLK_RIGHT), [3, "east"],	307	( "," . DC::SDLK_RIGHT ), [3, "east"],
309	("1," . DC::SDLK_RIGHT), [4, "southeast"],	308	("1," . DC::SDLK_RIGHT ), [4, "southeast"],
310	( "," . DC::SDLK_DOWN ), [5, "south"],	309	( "," . DC::SDLK_DOWN ), [5, "south"],
311	("1," . DC::SDLK_DOWN ), [6, "southwest"],	310	("1," . DC::SDLK_DOWN ), [6, "southwest"],
312	( "," . DC::SDLK_LEFT ), [7, "west"],	311	( "," . DC::SDLK_LEFT ), [7, "west"],
313	("1," . DC::SDLK_LEFT ), [8, "northwest"],	312	("1," . DC::SDLK_LEFT ), [8, "northwest"],
314	);	313	);
315		314
316	sub invoke_key_down {	315	sub invoke_key_down {
317	my ($self, $ev) = @_;	316	my ($self, $ev) = @_;
318		317
319	my $mod = $ev->{mod};	318	my $mod = $ev->{mod};
320	my $sym = $ev->{sym};	319	my $sym = $ev->{sym};
321	my $uni = $ev->{unicode};	320	my $uni = $ev->{unicode};
322		321
323	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_SHIFT;	322	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_META \| DC::KMOD_SHIFT;
324		323
325	# ignore repeated keypresses	324	# ignore repeated keypresses
326	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;	325	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
327	$self->{last_mod} = $mod;	326	$self->{last_mod} = $mod;
328	$self->{last_sym} = $sym;	327	$self->{last_sym} = $sym;
329		328
330	if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {	329	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		330
		331	if ($::CONN && $dir) {
331	if ($mod & DC::KMOD_SHIFT) {	332	if ($mod & DC::KMOD_SHIFT) {
332	$self->{shft}++;	333	$self->{shft}++;
333	if ($dir->[0] != $self->{fire_dir}) {	334	if ($dir->[0] != $self->{fire_dir}) {
334	$::CONN->user_send ("fire $dir->[0]");	335	$::CONN->user_send ("fire $dir->[0]");
335	}	336	}
…		…
362	$::CONN->user_send ("fire_stop");	363	$::CONN->user_send ("fire_stop");
363	delete $self->{fire_dir};	364	delete $self->{fire_dir};
364	$res = 1;	365	$res = 1;
365	}	366	}
366	} else {	367	} else {
367	if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {	368	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		369
		370	if ($dir && delete $self->{shft}) {
368	$::CONN->user_send ("fire_stop");	371	$::CONN->user_send ("fire_stop");
369	delete $self->{fire_dir};	372	delete $self->{fire_dir};
370	$res = 1;	373	$res = 1;
371	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)	374	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
372	&& delete $self->{shft}) { # XXX: is RSHIFT ok?	375	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
…		…
374	delete $self->{fire_dir};	377	delete $self->{fire_dir};
375	$res = 1;	378	$res = 1;
376	}	379	}
377	}	380	}
378		381
379	if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {	382	if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
380	$::CONN->user_send ("run_stop");	383	$::CONN->user_send ("run_stop");
381	$res = 1;	384	$res = 1;
382	}	385	}
383		386
384	$res	387	$res
…		…
390	$self->refresh_hook;	393	$self->refresh_hook;
391		394
392	0	395	0
393	}	396	}
394		397
		398	sub set_tilesize {
		399	my ($self, $tilesize) = @_;
		400
		401	$self->{tilesize} = $tilesize;
		402	}
		403
		404	sub scroll {
		405	my ($self, $dx, $dy) = @_;
		406
		407	$self->movement_update;
		408
		409	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
		410	$self->{sdy} += $dy * $self->{tilesize};
		411
		412	# save old fow texture, if applicable
		413	$self->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture};
		414	$self->{lfdx} = $dx;
		415	$self->{lfdy} = $dy;
		416	$self->{lmdx} = $self->{dx};
		417	$self->{lmdy} = $self->{dy};
		418
		419	$::MAP->scroll ($dx, $dy);
		420	}
		421
395	sub set_magicmap {	422	sub set_magicmap {
396	my ($self, $w, $h, $x, $y, $data) = @_;	423	my ($self, $w, $h, $x, $y, $data) = @_;
397		424
398	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;	425	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
399	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;	426	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
…		…
401	$self->{magicmap} = [$x, $y, $w, $h, $data];	428	$self->{magicmap} = [$x, $y, $w, $h, $data];
402		429
403	$self->update;	430	$self->update;
404	}	431	}
405		432
		433	sub movement_update {
		434	my ($self) = @_;
		435
		436	if ($::CFG->{smooth_movement}) {
		437	if ($self->{sdx} \|\| $self->{sdy}) {
		438	my $diff = AE::time - ($self->{last_update} \|\| $::LAST_REFRESH);
		439	my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
		440
		441	# the minimum time for a single tile movement
		442	my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK \|\| 1);
		443
		444	$spd *= $self->{tilesize};
		445
		446	# jump if "impossibly high" speed
		447	if (
		448	(max abs $self->{sdx}, abs $self->{sdy})
		449	> $spd * $mintime * 2.1
		450	) {
		451	#warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
		452	$self->{sdx} = $self->{sdy} = 0;
		453	} else {
		454	$spd = $diff 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
		455
		456	my $dx = $self->{sdx} < 0 ? -$spd : $spd;
		457	my $dy = $self->{sdy} < 0 ? -$spd : $spd;
		458
		459	if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
		460	if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
		461	}
		462
		463	$self->update;
		464	}
		465	} else {
		466	$self->{sdx} = $self->{sdy} = 0;
		467	}
		468
		469	$self->{last_update} = AE::time;
		470	}
		471
406	sub refresh_hook {	472	sub refresh_hook {
407	my ($self) = @_;	473	my ($self) = @_;
408		474
409	if ($::MAP && $::CONN) {	475	if ($::MAP && $::CONN) {
410	if (delete $self->{need_update}) {	476	if (delete $self->{need_update}) {
		477	$self->movement_update;
		478
411	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;	479	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
412		480
		481	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
		482	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
		483
		484	# width/height of map, in tiles
413	my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;	485	my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
414	my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;	486	my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
415		487
		488	# the map displacement, in tiles
416	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize;	489	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
417	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize;	490	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
418		491
		492	# the upper left "visible" corner, in pixels
419	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;	493	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
420	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;	494	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
421		495
422	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;	496	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
423	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;	497	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
424		498
425	if ($::CFG->{fow_enable}) {	499	if ($::CFG->{fow_enable}) {
		500	# draw_fow_texture REQUIRES the fow texture to stay the same size.
426	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);	501	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
427		502
428	$self->{fow_texture} = new DC::Texture	503	$self->{fow_texture} = new DC::Texture
429	w => $w,	504	w => $w,
430	h => $h,	505	h => $h,
…		…
438	glNewList ($self->{list} \|\|= glGenList);	513	glNewList ($self->{list} \|\|= glGenList);
439		514
440	glPushMatrix;	515	glPushMatrix;
441	glTranslate $sx0, $sy0;	516	glTranslate $sx0, $sy0;
442	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	517	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		518	glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
443		519
444	$::MAP->draw ($dx, $dy, $sw, $sh,	520	$::MAP->draw ($dx, $dy, $sw, $sh,
445	$self->{tilesize},	521	($self->{tilesize}) x 2,
446	$::CONN->{player}{tag}, 0, 0);	522	$::CONN->{player}{tag},
		523	-$self->{sdx}, -$self->{sdy});
447		524
448	glScale $self->{tilesize}, $self->{tilesize};	525	glScale $self->{tilesize}, $self->{tilesize};
449		526
450	if (my $tex = $self->{fow_texture}) {	527	if (my $tex = $self->{fow_texture}) {
451	glPushMatrix;	528	my @prev_fow_params;
452	glScale 1/3, 1/3;
453	glEnable GL_TEXTURE_2D;
454	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
455		529
		530	if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) {
		531	my $d1 = DC::distance $self->{sdx}, $self->{sdy};
		532	my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
		533
		534	if ($d1 * $d2) {
		535	@prev_fow_params = (
		536	(min 1, $d1 / $d2),
		537	$self->{lmdx} - $dx - $self->{lfdx},
		538	$self->{lmdy} - $dy - $self->{lfdy},
		539	@{$self->{prev_fow_texture}}{qw(name data)}
		540	);
		541	}
		542	}
		543
		544	DC::Texture::draw_fow_texture
456	glColor +($::CFG->{fow_intensity}) x 3, 0.9;	545	$::CFG->{fow_intensity},
457	$self->{fow_texture}->draw_quad_alpha (0, 0);	546	$TEX_HIDDEN[$::CFG->{fow_texture}]{name},
458		547	@{$self->{fow_texture}}{qw(name data s t w h)},
459	glDisable GL_TEXTURE_2D;	548	@prev_fow_params;
460	glPopMatrix;
461	}	549	}
462		550
463	if ($self->{magicmap}) {	551	if ($self->{magicmap}) {
464	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	552	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
465		553
466	$x += $::MAP->ox + $self->{dx};	554	$x += $::MAP->ox + $self->{dx};
467	$y += $::MAP->oy + $self->{dy};	555	$y += $::MAP->oy + $self->{dy};
468		556
469	glTranslate - $x - 1, - $y - 1;	557	glTranslate - $x - 1, - $y - 1;
470	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};	558	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
471	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);	559	$::MAP->draw_magicmap ($w, $h, $data);
472	}	560	}
473		561
474	glPopMatrix;	562	glPopMatrix;
475	glEndList;	563	glEndList;
476	}	564	}
477	} else {	565	} else {
		566	delete $self->{last_fow_texture};
		567	delete $self->{fow_texture};
		568
478	glDeleteList delete $self->{list}	569	glDeleteList delete $self->{list}
479	if $self->{list};	570	if $self->{list};
480	}	571	}
481	}	572	}
482		573
…		…
518	$self->SUPER::DESTROY;	609	$self->SUPER::DESTROY;
519	}	610	}
520		611
521	package DC::MapWidget::MapMap;	612	package DC::MapWidget::MapMap;
522		613
523	use strict;	614	use common::sense;
524	use utf8;
525		615
526	our @ISA = DC::UI::Base::;	616	our @ISA = DC::UI::Base::;
527		617
528	use Time::HiRes qw(time);
529	use DC::OpenGL;	618	use DC::OpenGL;
530		619
531	sub size_request {	620	sub size_request {
532	($::HEIGHT * 0.2, $::HEIGHT * 0.2)	621	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
533	}	622	}
534		623
535	sub refresh_hook {	624	sub refresh_hook {
536	my ($self) = @_;	625	my ($self) = @_;
537		626
538	if ($::MAP && $self->{texture_atime} < time) {	627	if ($::MAP && $self->{texture_atime} < AE::now) {
539	my ($w, $h) = @$self{qw(w h)};	628	my ($w, $h) = @$self{qw(w h)};
		629
		630	return unless $w && $h;
540		631
541	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;	632	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
542	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;	633	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
543		634
544	my $ox = 0.5 * ($w - $sw);	635	my $ox = 0.5 * ($w - $sw);
…		…
556	$self->{sh} = $sh;	647	$self->{sh} = $sh;
557		648
558	$self->{x0} = $x0;	649	$self->{x0} = $x0;
559	$self->{y0} = $y0;	650	$self->{y0} = $y0;
560		651
561	$self->{texture_atime} = time + 1/3;	652	$self->{texture_atime} = AE::now + 1/2;
562		653
563	$self->{texture} =	654	$self->{texture} =
564	new DC::Texture	655	new DC::Texture
565	w => $w,	656	w => $w,
566	h => $h,	657	h => $h,
…		…
621	glDisable GL_BLEND;	712	glDisable GL_BLEND;
622	}	713	}
623		714
624	package DC::MapWidget::Command;	715	package DC::MapWidget::Command;
625		716
626	use strict;	717	use common::sense;
627		718
628	use DC::OpenGL;	719	use DC::OpenGL;
629		720
630	our @ISA = DC::UI::Frame::;	721	our @ISA = DC::UI::Frame::;
631		722
…		…
773	my $text = $self->{entry}->get_text;	864	my $text = $self->{entry}->get_text;
774		865
775	length $text	866	length $text
776	or return $self->hide;	867	or return $self->hide;
777		868
778	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
779
780	if ($text ne $self->{last_search}) {	869	if ($text ne $self->{last_search}) {
781	my @match;	870	my @match;
782		871
783	if ($text =~ /^(.*?)\s+$/) {	872	if ($text =~ /^(.*?)\s+$/) {
		873	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
784	@match = [$cmd, "(appended whitespace suppresses completion)"];	874	@match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
785	} else {	875	} else {
		876	# @match is [command, penalty, command with arguments] until sort
		877
		878	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		879
		880	my $first_char = substr $cmd, 0, 1;
		881
786	my $regexp = do {	882	my $regexp_abbrev = do {
787	my ($beg, @chr) = split //, lc $cmd;	883	my ($beg, @chr) = split //, lc $cmd;
788		884
789	# the following regex is used to match our "completion entry"	885	# the following regex is used to match our "completion entry"
790	# to an actual command - the parentheses match kind of "overhead"	886	# to an actual command - the parentheses match kind of "overhead"
791	# - the more characters the parentheses match, the less attractive	887	# - the more characters the parentheses match, the less attractive
792	# is the match.	888	# is the match.
793	my $regexp = "^\Q$beg\E"	889	my $regexp = "^\Q$beg\E"
794	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;	890	. join "", map "(?:.?[ \\\\]\|(.?))\Q$_\E", @chr;
795	qr<$regexp>	891	qr<$regexp>
796	};	892	};
797		893
798	my @penalty;	894	my $regexp_partial = do {
		895	my $regexp = "^\Q$text\E(.*)";
		896	qr<$regexp>
		897	};
799		898
800	for (keys %{$self->{command}}) {	899	for (keys %{$self->{command}}) {
801	if (@penalty = $_ =~ $regexp) {	900	# we only match and score if the first character matches,
802	push @match, [$_, length join "", map "::$_", grep defined, @penalty];	901	# so quickly rule out all others first.
		902	next unless $first_char = substr $_, 0, 1;
		903
		904	my @scores;
		905
		906	# 1. Complete command [with args]
		907	# command is a prefix of the text
		908	# score is length of complete command matched
		909	# e.g. "invoke summon pet monster bat"
		910	# "invoke" "summon pet monster bat" = 6
		911	# "invoke summon pet monster" "bat" = 25
		912	if ((substr $text, 0, length $_) eq $_) {
		913	push @scores, [$_, length $_, $text];
803	}	914	}
		915
		916	# 2. Partial command
		917	# text is a prefix of the full command
		918	# score is the length of the input text
		919	# e.g. "invoke s"
		920	# "invoke small fireball" = 8
		921	# "invoke summon pet monster" = 8
		922
		923	if ($_ =~ $regexp_partial) {
		924	push @scores, [$_, length $text, $_];
		925	}
		926
		927	# 3. Abbreviation match
		928	# attempts to use first word of text as an abbreviated command
		929	# score is length of word + 1 - 3 per non-word-initial character
		930
		931	if (my @penalty = $_ =~ $regexp_abbrev) {
		932	push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
		933	}
		934
		935	# Pick the best option for this command
		936	push @match, (sort {
		937	$b->[1] <=> $a->[1]
		938	} @scores)[0];
804	}	939	}
805		940
		941	# @match is now [command object, command with arguments]
806	@match = map $self->{command}{$_->[0]},	942	@match = map [$self->{command}{$_->[0]}, $_->[2]],
807	sort {	943	sort {
808	$a->[1] <=> $b->[1]	944	$b->[1] <=> $a->[1]
809	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]	945	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
810	or (length $b->[0]) <=> (length $a->[0])	946	or (length $b->[0]) <=> (length $a->[0])
811	} @match;	947	} @match;
812	}	948	}
813		949
…		…
832	$label->{fg} = [1, 1, 1, 1];	968	$label->{fg} = [1, 1, 1, 1];
833	$label->{bg} = [0, 0, 0, 0];	969	$label->{bg} = [0, 0, 0, 0];
834	}	970	}
835		971
836	if (@matches) {	972	if (@matches) {
837	$self->{select} = "$matches[0][0]$arg";	973	$self->{select} = "$matches[0][1]";
838		974
839	$labels[0]->{fg} = [0, 0, 0, 1];	975	$labels[0]->{fg} = [0, 0, 0, 1];
840	$labels[0]->{bg} = [1, 1, 1, 0.8];	976	$labels[0]->{bg} = [1, 1, 1, 0.8];
841	} else {	977	} else {
842	$self->{select} = "$cmd$arg";	978	$self->{select} = "$text";
843	}	979	}
844		980
845	for my $match (@matches) {	981	for my $match (@matches) {
846	my $label = shift @labels;	982	my $label = shift @labels;
847		983
848	if (@labels) {	984	if (@labels) {
849	$label->set_text ("$match->[0]$arg");	985	$label->set_text ("$match->[1]");
850	$label->set_tooltip ($match->[1]);	986	$label->set_tooltip ("$match->[0][1]");
851	} else {	987	} else {
852	$label->set_text ("...");	988	$label->set_text ("...");
853	$label->set_tooltip ("Use Cursor-Down to view more matches");	989	$label->set_tooltip ("Use Cursor-Down to view more matches");
854	last;	990	last;
855	}	991	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.132 by root, Sun Jul 13 12:17:00 2008 UTC vs. Revision 1.165 by root, Fri Nov 9 22:53:57 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.132 by root, Sun Jul 13 12:17:00 2008 UTC vs.
Revision 1.165 by root, Fri Nov 9 22:53:57 2012 UTC