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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.127 by root, Sat Dec 29 16:29:00 2007 UTC vs.
Revision 1.167 by root, Tue Nov 20 14:32:12 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
27	);	33	);
28		34
29	$self	35	$self
30	}	36	}
31		37
32	sub set_tilesize {
33	my ($self, $tilesize) = @_;
34
35	$self->{tilesize} = $tilesize;
36	}
37
38	sub add_command {	38	sub add_command {#d# remove
39	my ($self, $command, $tooltip, $widget, $cb) = @_;	39	my ($self, $command, $tooltip, $widget, $cb) = @_;
40		40
41	(my $data = $command) =~ s/\\//g;	41	(my $data = $command) =~ s/\\//g;
42		42
43	$tooltip =~ s/^\s+//;	43	$tooltip =~ s/^\s+//;
44	$tooltip = "<big>$data</big>\n\n$tooltip";	44	$tooltip = "<big>$data</big>\n\n$tooltip";
45	$tooltip =~ s/\s+$//;	45	$tooltip =~ s/\s+$//;
46		46
47	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	47	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
48	}
49
50	sub clr_commands {
51	my ($self) = @_;
52
53	%{$::COMPLETER->{command}} = ();
54
55	$::COMPLETER->hide
56	if $::COMPLETER;
57	}	48	}
58		49
59	sub server_login {	50	sub server_login {
60	my ($server) = @_;	51	my ($server) = @_;
61		52
…		…
169	sub invoke_button_down {	160	sub invoke_button_down {
170	my ($self, $ev, $x, $y) = @_;	161	my ($self, $ev, $x, $y) = @_;
171		162
172	if ($ev->{button} == 1) {	163	if ($ev->{button} == 1) {
173	$self->grab_focus;	164	$self->grab_focus;
174	return unless $::CONN;	165	return unless $::CONN && $self->{ctilesize};
175		166
176	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};	167	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};	168	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
178		169
179	$x -= DC::floor $::MAP->w * 0.5;	170	$x -= DC::floor $::MAP->w * 0.5;
…		…
206	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	197	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
207	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	198	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
208	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	199	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
209	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	200	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
210	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],	201	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
211	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],	202	# ["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	);	203	);
219		204
220	if ($::CONN && $::CONN->{editor_support}) {	205	if ($::CONN && $::CONN->{editor_support}) {
221	push @items, [	206	# push @items, [
222	"Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",	207	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
223	\&editor_invoke,	208	# \&editor_invoke,
224	];	209	# ];
225		210
226	for my $type (qw(test name)) {	211	for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
227	$::CONN->{editor_support}{type} ne $type	212	$::CONN->{editor_support}{servertype} ne $type
228	or next;	213	or next;
229	my $server = $::CONN->{editor_support}{"${type}server"}	214	my $server = $::CONN->{editor_support}{"${type}server"}
230	or next;	215	or next;
231		216
232	push @items, [	217	push @items, [
…		…
291	$self->{need_update} = 1;	276	$self->{need_update} = 1;
292	$self->SUPER::update;	277	$self->SUPER::update;
293	}	278	}
294		279
295	my %DIR = (	280	my %DIR = (
296	( "," . DC::SDLK_KP5 ), [0, "stay fire"],	281	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
297	( "," . DC::SDLK_KP8 ), [1, "north"],	282	( "," . DC::SDLK_KP8 ), [1, "north"],
298	( "," . DC::SDLK_KP9 ), [2, "northeast"],	283	( "," . DC::SDLK_KP9 ), [2, "northeast"],
299	( "," . DC::SDLK_KP6 ), [3, "east"],	284	( "," . DC::SDLK_KP6 ), [3, "east"],
300	( "," . DC::SDLK_KP3 ), [4, "southeast"],	285	( "," . DC::SDLK_KP3 ), [4, "southeast"],
301	( "," . DC::SDLK_KP2 ), [5, "south"],	286	( "," . DC::SDLK_KP2 ), [5, "south"],
302	( "," . DC::SDLK_KP1 ), [6, "southwest"],	287	( "," . DC::SDLK_KP1 ), [6, "southwest"],
303	( "," . DC::SDLK_KP4 ), [7, "west"],	288	( "," . DC::SDLK_KP4 ), [7, "west"],
304	( "," . DC::SDLK_KP7 ), [8, "northwest"],	289	( "," . DC::SDLK_KP7 ), [8, "northwest"],
305		290
		291	( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
		292	( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
		293	( "," . DC::SDLK_END ), [6, "southwest"],
		294	( "," . DC::SDLK_HOME ), [8, "northwest"],
		295
306	( "," . DC::SDLK_UP ), [1, "north"],	296	( "," . DC::SDLK_UP ), [1, "north"],
307	("1," . DC::SDLK_UP ), [2, "northeast"],	297	("1," . DC::SDLK_UP ), [2, "northeast"],
308	( "," . DC::SDLK_RIGHT), [3, "east"],	298	( "," . DC::SDLK_RIGHT ), [3, "east"],
309	("1," . DC::SDLK_RIGHT), [4, "southeast"],	299	("1," . DC::SDLK_RIGHT ), [4, "southeast"],
310	( "," . DC::SDLK_DOWN ), [5, "south"],	300	( "," . DC::SDLK_DOWN ), [5, "south"],
311	("1," . DC::SDLK_DOWN ), [6, "southwest"],	301	("1," . DC::SDLK_DOWN ), [6, "southwest"],
312	( "," . DC::SDLK_LEFT ), [7, "west"],	302	( "," . DC::SDLK_LEFT ), [7, "west"],
313	("1," . DC::SDLK_LEFT ), [8, "northwest"],	303	("1," . DC::SDLK_LEFT ), [8, "northwest"],
314	);	304	);
315		305
316	sub invoke_key_down {	306	sub invoke_key_down {
317	my ($self, $ev) = @_;	307	my ($self, $ev) = @_;
318		308
319	my $mod = $ev->{mod};	309	my $mod = $ev->{mod};
320	my $sym = $ev->{sym};	310	my $sym = $ev->{sym};
321	my $uni = $ev->{unicode};	311	my $uni = $ev->{unicode};
322		312
323	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_SHIFT;	313	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_META \| DC::KMOD_SHIFT;
324		314
325	if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {	315	# ignore repeated keypresses
		316	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
		317	$self->{last_mod} = $mod;
		318	$self->{last_sym} = $sym;
		319
		320	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		321
		322	if ($::CONN && $dir) {
326	if ($mod & DC::KMOD_SHIFT) {	323	if ($mod & DC::KMOD_SHIFT) {
327	$self->{shft}++;	324	$self->{shft}++;
328	if ($dir->[0] != $self->{fire_dir}) {	325	if ($dir->[0] != $self->{fire_dir}) {
329	$::CONN->user_send ("fire $dir->[0]");	326	$::CONN->user_send ("fire $dir->[0]");
330	}	327	}
…		…
347		344
348	my $res = 0;	345	my $res = 0;
349	my $mod = $ev->{mod};	346	my $mod = $ev->{mod};
350	my $sym = $ev->{sym};	347	my $sym = $ev->{sym};
351		348
		349	delete $self->{last_mod};
		350	delete $self->{last_sym};
		351
352	if ($::CFG->{shift_fire_stop}) {	352	if ($::CFG->{shift_fire_stop}) {
353	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {	353	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
354	$::CONN->user_send ("fire_stop");	354	$::CONN->user_send ("fire_stop");
355	delete $self->{fire_dir};	355	delete $self->{fire_dir};
356	$res = 1;	356	$res = 1;
357	}	357	}
358	} else {	358	} else {
359	if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {	359	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		360
		361	if ($dir && delete $self->{shft}) {
360	$::CONN->user_send ("fire_stop");	362	$::CONN->user_send ("fire_stop");
361	delete $self->{fire_dir};	363	delete $self->{fire_dir};
362	$res = 1;	364	$res = 1;
363	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)	365	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
364	&& delete $self->{shft}) { # XXX: is RSHIFT ok?	366	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
…		…
366	delete $self->{fire_dir};	368	delete $self->{fire_dir};
367	$res = 1;	369	$res = 1;
368	}	370	}
369	}	371	}
370		372
371	if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {	373	if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
372	$::CONN->user_send ("run_stop");	374	$::CONN->user_send ("run_stop");
373	$res = 1;	375	$res = 1;
374	}	376	}
375		377
376	$res	378	$res
…		…
382	$self->refresh_hook;	384	$self->refresh_hook;
383		385
384	0	386	0
385	}	387	}
386		388
		389	sub set_tilesize {
		390	my ($self, $tilesize) = @_;
		391
		392	$self->{tilesize} = $tilesize;
		393	}
		394
		395	sub scroll {
		396	my ($self, $dx, $dy) = @_;
		397
		398	$self->movement_update;
		399
		400	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
		401	$self->{sdy} += $dy * $self->{tilesize};
		402
		403	# save old fow texture, if applicable
		404	$self->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture};
		405	$self->{lfdx} = $dx;
		406	$self->{lfdy} = $dy;
		407	$self->{lmdx} = $self->{dx};
		408	$self->{lmdy} = $self->{dy};
		409
		410	$::MAP->scroll ($dx, $dy);
		411	}
		412
387	sub set_magicmap {	413	sub set_magicmap {
388	my ($self, $w, $h, $x, $y, $data) = @_;	414	my ($self, $w, $h, $x, $y, $data) = @_;
389		415
390	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;	416	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
391	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;	417	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
…		…
393	$self->{magicmap} = [$x, $y, $w, $h, $data];	419	$self->{magicmap} = [$x, $y, $w, $h, $data];
394		420
395	$self->update;	421	$self->update;
396	}	422	}
397		423
		424	sub movement_update {
		425	my ($self) = @_;
		426
		427	if ($::CFG->{smooth_movement}) {
		428	if ($self->{sdx} \|\| $self->{sdy}) {
		429	my $diff = AE::time - ($self->{last_update} \|\| $::LAST_REFRESH);
		430	my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
		431
		432	# the minimum time for a single tile movement
		433	my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK \|\| 1);
		434
		435	$spd *= $self->{tilesize};
		436
		437	# jump if "impossibly high" speed
		438	if (
		439	(max abs $self->{sdx}, abs $self->{sdy})
		440	> $spd * $mintime * 2.1
		441	) {
		442	#warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
		443	$self->{sdx} = $self->{sdy} = 0;
		444	} else {
		445	$spd = $diff 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
		446
		447	my $dx = $self->{sdx} < 0 ? -$spd : $spd;
		448	my $dy = $self->{sdy} < 0 ? -$spd : $spd;
		449
		450	if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
		451	if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
		452	}
		453
		454	$self->update;
		455	}
		456	} else {
		457	$self->{sdx} = $self->{sdy} = 0;
		458	}
		459
		460	$self->{last_update} = AE::time;
		461	}
		462
398	sub refresh_hook {	463	sub refresh_hook {
399	my ($self) = @_;	464	my ($self) = @_;
400		465
401	if ($::MAP && $::CONN) {	466	if ($::MAP && $::CONN) {
402	if (delete $self->{need_update}) {	467	if (delete $self->{need_update}) {
		468	$self->movement_update;
		469
403	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;	470	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
404		471
		472	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
		473	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
		474
		475	# width/height of map, in tiles
405	my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;	476	my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
406	my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;	477	my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
407		478
		479	# the map displacement, in tiles
408	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize;	480	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
409	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize;	481	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
410		482
		483	# the upper left "visible" corner, in pixels
411	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;	484	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
412	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;	485	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
413		486
414	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;
415	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;
416		489
417	if ($::CFG->{fow_enable}) {	490	if ($::CFG->{fow_enable}) {
		491	# draw_fow_texture REQUIRES the fow texture to stay the same size.
418	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);	492	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
419		493
420	$self->{fow_texture} = new DC::Texture	494	$self->{fow_texture} = new DC::Texture
421	w => $w,	495	w => $w,
422	h => $h,	496	h => $h,
…		…
430	glNewList ($self->{list} \|\|= glGenList);	504	glNewList ($self->{list} \|\|= glGenList);
431		505
432	glPushMatrix;	506	glPushMatrix;
433	glTranslate $sx0, $sy0;	507	glTranslate $sx0, $sy0;
434	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	508	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		509	glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
435		510
436	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});	511	$::MAP->draw ($dx, $dy, $sw, $sh,
		512	($self->{tilesize}) x 2,
		513	$::CONN->{player}{tag},
		514	-$self->{sdx}, -$self->{sdy});
437		515
438	glScale $self->{tilesize}, $self->{tilesize};	516	glScale $self->{tilesize}, $self->{tilesize};
439		517
440	if (my $tex = $self->{fow_texture}) {	518	if (my $tex = $self->{fow_texture}) {
441	glPushMatrix;	519	my @prev_fow_params;
442	glScale 1/3, 1/3;
443	glEnable GL_TEXTURE_2D;
444	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
445		520
		521	if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) {
		522	my $d1 = DC::distance $self->{sdx}, $self->{sdy};
		523	my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
		524
		525	if ($d1 * $d2) {
		526	@prev_fow_params = (
		527	(min 1, $d1 / $d2),
		528	$self->{lmdx} - $dx - $self->{lfdx},
		529	$self->{lmdy} - $dy - $self->{lfdy},
		530	@{$self->{prev_fow_texture}}{qw(name data)}
		531	);
		532	}
		533	}
		534
		535	DC::Texture::draw_fow_texture
446	glColor +($::CFG->{fow_intensity}) x 3, 0.9;	536	$::CFG->{fow_intensity},
447	$self->{fow_texture}->draw_quad_alpha (0, 0);	537	$TEX_HIDDEN[$::CFG->{fow_texture}]{name},
448		538	@{$self->{fow_texture}}{qw(name data s t w h)},
449	glDisable GL_TEXTURE_2D;	539	@prev_fow_params;
450	glPopMatrix;
451	}	540	}
452		541
453	if ($self->{magicmap}) {	542	if ($self->{magicmap}) {
454	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };	543	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
455		544
456	$x += $::MAP->ox + $self->{dx};	545	$x += $::MAP->ox + $self->{dx};
457	$y += $::MAP->oy + $self->{dy};	546	$y += $::MAP->oy + $self->{dy};
458		547
459	glTranslate - $x - 1, - $y - 1;	548	glTranslate - $x - 1, - $y - 1;
460	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};	549	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
461	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);	550	$::MAP->draw_magicmap ($w, $h, $data);
462	}	551	}
463		552
464	glPopMatrix;	553	glPopMatrix;
465	glEndList;	554	glEndList;
466	}	555	}
467	} else {	556	} else {
		557	delete $self->{last_fow_texture};
		558	delete $self->{fow_texture};
		559
468	glDeleteList delete $self->{list}	560	glDeleteList delete $self->{list}
469	if $self->{list};	561	if $self->{list};
470	}	562	}
471	}	563	}
472		564
…		…
508	$self->SUPER::DESTROY;	600	$self->SUPER::DESTROY;
509	}	601	}
510		602
511	package DC::MapWidget::MapMap;	603	package DC::MapWidget::MapMap;
512		604
513	use strict;	605	use common::sense;
514	use utf8;
515		606
516	our @ISA = DC::UI::Base::;	607	our @ISA = DC::UI::Base::;
517		608
518	use Time::HiRes qw(time);
519	use DC::OpenGL;	609	use DC::OpenGL;
520		610
521	sub size_request {	611	sub size_request {
522	($::HEIGHT * 0.2, $::HEIGHT * 0.2)	612	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
523	}	613	}
524		614
525	sub refresh_hook {	615	sub refresh_hook {
526	my ($self) = @_;	616	my ($self) = @_;
527		617
528	if ($::MAP && $self->{texture_atime} < time) {	618	if ($::MAP && $self->{texture_atime} < AE::now) {
529	my ($w, $h) = @$self{qw(w h)};	619	my ($w, $h) = @$self{qw(w h)};
		620
		621	return unless $w && $h;
530		622
531	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;	623	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
532	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;	624	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
533		625
534	my $ox = 0.5 * ($w - $sw);	626	my $ox = 0.5 * ($w - $sw);
…		…
546	$self->{sh} = $sh;	638	$self->{sh} = $sh;
547		639
548	$self->{x0} = $x0;	640	$self->{x0} = $x0;
549	$self->{y0} = $y0;	641	$self->{y0} = $y0;
550		642
551	$self->{texture_atime} = time + 1/3;	643	$self->{texture_atime} = AE::now + 1/2;
552		644
553	$self->{texture} =	645	$self->{texture} =
554	new DC::Texture	646	new DC::Texture
555	w => $w,	647	w => $w,
556	h => $h,	648	h => $h,
…		…
611	glDisable GL_BLEND;	703	glDisable GL_BLEND;
612	}	704	}
613		705
614	package DC::MapWidget::Command;	706	package DC::MapWidget::Command;
615		707
616	use strict;	708	use common::sense;
617		709
618	use DC::OpenGL;	710	use DC::OpenGL;
619		711
620	our @ISA = DC::UI::Frame::;	712	our @ISA = DC::UI::Frame::;
621		713
…		…
717	);	809	);
718		810
719	$self	811	$self
720	}	812	}
721		813
		814	sub reset {
		815	my ($self) = @_;
		816
		817	$self->hide;
		818	delete $self->{command_list};
		819	}
		820
722	sub set_prefix {	821	sub set_prefix {
723	my ($self, $prefix) = @_;	822	my ($self, $prefix) = @_;
724		823
725	$self->{entry}->set_text ($prefix);	824	$self->{entry}->set_text ($prefix);
726	$self->show;	825	$self->show;
…		…
763	my $text = $self->{entry}->get_text;	862	my $text = $self->{entry}->get_text;
764		863
765	length $text	864	length $text
766	or return $self->hide;	865	or return $self->hide;
767		866
768	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;	867	return unless $::CONN;
		868
		869	# regenerate spell list if necessary
		870	$self->{command_list}{spells} \|\|= [
		871	map { ("cast $_->{name}", "invoke $_->{name}") }
		872	values %{ $::CONN->{spell} }
		873	];
769		874
770	if ($text ne $self->{last_search}) {	875	if ($text ne $self->{last_search}) {
771	my @match;	876	my @match;
772		877
773	if ($text =~ /^(.*?)\s+$/) {	878	if ($text =~ /^(.*?)\s+$/) {
		879	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
774	@match = [$cmd, "(appended whitespace suppresses completion)"];	880	@match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
775	} else {	881	} else {
		882	# @match is [command, penalty, command with arguments] until sort
		883
		884	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		885
		886	my $first_char = substr $cmd, 0, 1;
		887
776	my $regexp = do {	888	my $regexp_abbrev = do {
777	my ($beg, @chr) = split //, lc $cmd;	889	my ($beg, @chr) = split //, lc $cmd;
778		890
779	# the following regex is used to match our "completion entry"	891	# the following regex is used to match our "completion entry"
780	# to an actual command - the parentheses match kind of "overhead"	892	# to an actual command - the parentheses match kind of "overhead"
781	# - the more characters the parentheses match, the less attractive	893	# - the more characters the parentheses match, the less attractive
782	# is the match.	894	# is the match.
783	my $regexp = "^\Q$beg\E"	895	my $regexp = "^\Q$beg\E"
784	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;	896	. join "", map "(?:.?[ _\-]\|(.?))\Q$_\E", @chr;
785	qr<$regexp>	897	qr<$regexp>
786	};	898	};
787		899
788	my @penalty;	900	my $regexp_partial = do {
		901	my $regexp = "^\Q$text\E(.*)";
		902	qr<$regexp>
		903	};
789		904
790	for (keys %{$self->{command}}) {	905	for my $list (values %{ $self->{command_list} }) {
		906	for (@$list) {
		907	# we only match and score if the first character matches,
		908	# so quickly rule out all others first.
		909	next unless $first_char = substr $_, 0, 1;
		910
		911	my @scores;
		912
		913	# 1. Complete command [with args]
		914	# command is a prefix of the text
		915	# score is length of complete command matched
		916	# e.g. "invoke summon pet monster bat"
		917	# "invoke" "summon pet monster bat" = 6
		918	# "invoke summon pet monster" "bat" = 25
		919	if ((substr $text, 0, length $_) eq $_) {
		920	push @scores, [$_, length $_, $text];
		921	}
		922
		923	# 2. Partial command
		924	# text is a prefix of the full command
		925	# score is the length of the input text
		926	# e.g. "invoke s"
		927	# "invoke small fireball" = 8
		928	# "invoke summon pet monster" = 8
		929
		930	if ($_ =~ $regexp_partial) {
		931	push @scores, [$_, length $text, $_];
		932	}
		933
		934	# 3. Abbreviation match
		935	# attempts to use first word of text as an abbreviated command
		936	# score is length of word + 1 - 3 per non-word-initial character
		937
791	if (@penalty = $_ =~ $regexp) {	938	if (my @penalty = $_ =~ $regexp_abbrev) {
792	push @match, [$_, length join "", map "::$_", grep defined, @penalty];	939	push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
		940	}
		941
		942	# Pick the best option for this command
		943	push @match, (sort {
		944	$b->[1] <=> $a->[1]
		945	} @scores)[0];
793	}	946	}
794	}	947	}
795		948
		949	# @match is now [command object, command with arguments]
796	@match = map $self->{command}{$_->[0]},	950	@match = map [$self->{command}{$_->[0]}, $_->[2]],
797	sort {	951	sort {
798	$a->[1] <=> $b->[1]	952	$b->[1] <=> $a->[1]
799	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]	953	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
800	or (length $b->[0]) <=> (length $a->[0])	954	or (length $b->[0]) <=> (length $a->[0])
801	} @match;	955	} @match;
802	}	956	}
803		957
…		…
822	$label->{fg} = [1, 1, 1, 1];	976	$label->{fg} = [1, 1, 1, 1];
823	$label->{bg} = [0, 0, 0, 0];	977	$label->{bg} = [0, 0, 0, 0];
824	}	978	}
825		979
826	if (@matches) {	980	if (@matches) {
827	$self->{select} = "$matches[0][0]$arg";	981	$self->{select} = "$matches[0][1]";
828		982
829	$labels[0]->{fg} = [0, 0, 0, 1];	983	$labels[0]->{fg} = [0, 0, 0, 1];
830	$labels[0]->{bg} = [1, 1, 1, 0.8];	984	$labels[0]->{bg} = [1, 1, 1, 0.8];
831	} else {	985	} else {
832	$self->{select} = "$cmd$arg";	986	$self->{select} = "$text";
833	}	987	}
834		988
835	for my $match (@matches) {	989	for my $match (@matches) {
836	my $label = shift @labels;	990	my $label = shift @labels;
837		991
838	if (@labels) {	992	if (@labels) {
839	$label->set_text ("$match->[0]$arg");	993	$label->set_text ("$match->[1]");
840	$label->set_tooltip ($match->[1]);	994	$label->set_tooltip ("$match->[0][1]");
841	} else {	995	} else {
842	$label->set_text ("...");	996	$label->set_text ("...");
843	$label->set_tooltip ("Use Cursor-Down to view more matches");	997	$label->set_tooltip ("Use Cursor-Down to view more matches");
844	last;	998	last;
845	}	999	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.127 by root, Sat Dec 29 16:29:00 2007 UTC vs. Revision 1.167 by root, Tue Nov 20 14:32:12 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.127 by root, Sat Dec 29 16:29:00 2007 UTC vs.
Revision 1.167 by root, Tue Nov 20 14:32:12 2012 UTC