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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.97 by root, Sat Dec 9 22:28:11 2006 UTC vs.
Revision 1.167 by root, Tue Nov 20 14:32:12 2012 UTC

…		…
1	package CFPlus::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);
7		6
8	use CFPlus;	7	use AnyEvent ();
		8
		9	use DC;
9	use CFPlus::OpenGL;	10	use DC::OpenGL;
10	use CFPlus::UI;	11	use DC::UI;
11	use CFPlus::Macro;	12	use DC::Macro;
12		13
13	our @ISA = CFPlus::UI::Base::;	14	our @ISA = DC::UI::Base::;
		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;
14		20
15	my $magicmap_tex =	21	my $magicmap_tex =
16	new_from_file CFPlus::Texture CFPlus::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
22	my $self = $class->SUPER::new (	28	my $self = $class->SUPER::new (
23	z => -1,	29	z => -1,
24	can_focus => 1,	30	can_focus => 1,
25	list => glGenList,	31	tilesize => 32,
26
27	smooth_matrix => [
28	0.05, 0.13, 0.05,
29	0.13, 0.30, 0.13,
30	0.05, 0.13, 0.05,
31	],
32
33	@_	32	@_
34	);	33	);
35		34
36	$self->{completer} = new CFPlus::MapWidget::Command::
37	command => $self->{command},
38	tooltip => "#completer_help",
39	;
40
41	$self	35	$self
42	}	36	}
43		37
44	sub add_command {	38	sub add_command {#d# remove
45	my ($self, $command, $tooltip, $widget, $cb) = @_;	39	my ($self, $command, $tooltip, $widget, $cb) = @_;
46		40
47	(my $data = $command) =~ s/\\//g;	41	(my $data = $command) =~ s/\\//g;
48		42
49	$tooltip =~ s/^\s+//;	43	$tooltip =~ s/^\s+//;
50	$tooltip = "<big>$data</big>\n\n$tooltip";	44	$tooltip = "<big>$data</big>\n\n$tooltip";
51	$tooltip =~ s/\s+$//;	45	$tooltip =~ s/\s+$//;
52		46
53	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	47	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
54	}
55
56	sub clr_commands {
57	my ($self) = @_;
58
59	%{$self->{completer}{command}} = ();
60
61	$self->{completer}->hide
62	if $self->{completer};
63	}	48	}
64		49
65	sub server_login {	50	sub server_login {
66	my ($server) = @_;	51	my ($server) = @_;
67		52
72		57
73	sub editor_invoke {	58	sub editor_invoke {
74	my $editsup = $::CONN && $::CONN->{editor_support}	59	my $editsup = $::CONN && $::CONN->{editor_support}
75	or return;	60	or return;
76		61
77	CFPlus::background {	62	DC::background {
78	print "preparing editor startup...\n";	63	print "preparing editor startup...\n";
79		64
80	my $server = $editsup->{gameserver} \|\| "default";	65	my $server = $editsup->{gameserver} \|\| "default";
81	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	66	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
82		67
83	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;	68	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
84	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;	69	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
85		70
86	print "map directory is $mapdir\n";	71	print "map directory is $mapdir\n";
87	print "lib directory is $libdir\n";	72	print "lib directory is $libdir\n";
88		73
89	my $ua = CFPlus::lwp_useragent;	74	my $ua = DC::lwp_useragent;
90		75
91	for my $file (qw(archetypes crossfire.0)) {	76	for my $file (qw(archetypes crossfire.0)) {
92	my $url = "$editsup->{lib_root}$file";	77	my $url = "$editsup->{lib_root}$file";
93	print "mirroring $url...\n";	78	print "mirroring $url...\n";
94	CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");	79	DC::lwp_check $ua->mirror ($url, "$libdir/$file");
95	printf "%s size %d octets\n", $file, -s "$libdir/$file";	80	printf "%s size %d octets\n", $file, -s "$libdir/$file";
96	}	81	}
97		82
98	if (1) { # upload a map	83	if (1) { # upload a map
99	my $mapname = $::CONN->{map_info}[0];	84	my $mapname = $::CONN->{map_info}[0];
…		…
104		89
105	print "getting map revision for $mapname...\n";	90	print "getting map revision for $mapname...\n";
106		91
107	# try to get the most recent head revision, what a hack,	92	# try to get the most recent head revision, what a hack,
108	# this should have been returned while downloading sigh	93	# this should have been returned while downloading sigh
109	my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;	94	my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
110		95
111	if ($log =~ /\?rev=(\d+\.\d+)"/) {	96	if ($log =~ /\?rev=(\d+\.\d+)"/) {
112	my $rev = $1;	97	my $rev = $1;
113		98
114	print "downloading revision $rev...\n";	99	print "downloading revision $rev...\n";
115		100
116	my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;	101	my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
117		102
118	my $meta = {	103	my $meta = {
119	%$editsup,	104	%$editsup,
120	path => $mapname,	105	path => $mapname,
121	revision => $rev,	106	revision => $rev,
…		…
126	require File::Path;	111	require File::Path;
127		112
128	File::Path::mkpath (File::Basename::dirname ($mappath));	113	File::Path::mkpath (File::Basename::dirname ($mappath));
129	open my $fh, ">:raw:perlio", "$mappath.meta"	114	open my $fh, ">:raw:perlio", "$mappath.meta"
130	or die "$mappath.meta: $!\n";	115	or die "$mappath.meta: $!\n";
131	print $fh CFPlus::to_json $meta;	116	print $fh DC::encode_json $meta;
132	close $fh;	117	close $fh;
133	open my $fh, ">:raw:perlio:utf8", $mappath	118	open my $fh, ">:raw:perlio:utf8", $mappath
134	or die "$mappath: $!\n";	119	or die "$mappath: $!\n";
135	print $fh $map;	120	print $fh $map;
136	close $fh;	121	close $fh;
…		…
175	sub invoke_button_down {	160	sub invoke_button_down {
176	my ($self, $ev, $x, $y) = @_;	161	my ($self, $ev, $x, $y) = @_;
177		162
178	if ($ev->{button} == 1) {	163	if ($ev->{button} == 1) {
179	$self->grab_focus;	164	$self->grab_focus;
180	return unless $::CONN;	165	return unless $::CONN && $self->{ctilesize};
181		166
182	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};	167	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
183	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};	168	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
184		169
185	$x -= CFPlus::floor $::MAP->w * 0.5;	170	$x -= DC::floor $::MAP->w * 0.5;
186	$y -= CFPlus::floor $::MAP->h * 0.5;	171	$y -= DC::floor $::MAP->h * 0.5;
187		172
188	if ($::CONN) {	173	if ($::CONN) {
189	if ($::IN_BUILD_MODE) {
190	$::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191	} else {
192	$::CONN->lookat ($x, $y)	174	$::CONN->lookat ($x, $y)
193	}
194	}	175	}
195		176
196	} elsif ($ev->{button} == 2) {	177	} elsif ($ev->{button} == 2) {
197	$self->grab_focus;	178	$self->grab_focus;
198	return unless $::CONN;	179	return unless $::CONN;
…		…
216	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	197	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
217	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	198	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
218	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	199	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
219	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	200	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
220	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],	201	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
221	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],	202	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
222	[
223	$::PICKUP_ENABLE->{state}
224	? "Disable automatic pickup"
225	: "Enable automatic pickup",
226	sub { $::PICKUP_ENABLE->toggle }
227	],
228	);	203	);
229		204
230	if ($::CONN && $::CONN->{editor_support}) {	205	if ($::CONN && $::CONN->{editor_support}) {
231	push @items, [	206	# push @items, [
232	"Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",	207	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
233	\&editor_invoke,	208	# \&editor_invoke,
234	];	209	# ];
235		210
236	for my $type (qw(test name)) {	211	for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
237	$::CONN->{editor_support}{type} ne $type	212	$::CONN->{editor_support}{servertype} ne $type
238	or next;	213	or next;
239	my $server = $::CONN->{editor_support}{"${type}server"}	214	my $server = $::CONN->{editor_support}{"${type}server"}
240	or next;	215	or next;
241		216
242	push @items, [	217	push @items, [
243	"Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",	218	"Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
244	sub { server_login $server },	219	sub { server_login $server },
245	];	220	];
246	}	221	}
247	}	222	}
248		223
…		…
256	}	231	}
257	}	232	}
258	],	233	],
259	;	234	;
260		235
261	(new CFPlus::UI::Menu	236	(new DC::UI::Menu
262	items => \@items,	237	items => \@items,
263	)->popup ($ev);	238	)->popup ($ev);
264	}	239	}
265		240
266	1	241	1
…		…
285		260
286	1	261	1
287	}	262	}
288		263
289	sub size_request {	264	sub size_request {
		265	my ($self) = @_;
		266
290	(	267	(
291	32 * CFPlus::ceil $::WIDTH / 32,	268	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
292	32 * CFPlus::ceil $::HEIGHT / 32,	269	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
293	)	270	)
294	}	271	}
295		272
296	sub update {	273	sub update {
297	my ($self) = @_;	274	my ($self) = @_;
…		…
299	$self->{need_update} = 1;	276	$self->{need_update} = 1;
300	$self->SUPER::update;	277	$self->SUPER::update;
301	}	278	}
302		279
303	my %DIR = (	280	my %DIR = (
304	CFPlus::SDLK_KP8, [1, "north"],	281	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
		282	( "," . DC::SDLK_KP8 ), [1, "north"],
305	CFPlus::SDLK_KP9, [2, "northeast"],	283	( "," . DC::SDLK_KP9 ), [2, "northeast"],
306	CFPlus::SDLK_KP6, [3, "east"],	284	( "," . DC::SDLK_KP6 ), [3, "east"],
307	CFPlus::SDLK_KP3, [4, "southeast"],	285	( "," . DC::SDLK_KP3 ), [4, "southeast"],
308	CFPlus::SDLK_KP2, [5, "south"],	286	( "," . DC::SDLK_KP2 ), [5, "south"],
309	CFPlus::SDLK_KP1, [6, "southwest"],	287	( "," . DC::SDLK_KP1 ), [6, "southwest"],
310	CFPlus::SDLK_KP4, [7, "west"],	288	( "," . DC::SDLK_KP4 ), [7, "west"],
311	CFPlus::SDLK_KP7, [8, "northwest"],	289	( "," . DC::SDLK_KP7 ), [8, "northwest"],
312		290
313	CFPlus::SDLK_UP, [1, "north"],	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
		296	( "," . DC::SDLK_UP ), [1, "north"],
		297	("1," . DC::SDLK_UP ), [2, "northeast"],
314	CFPlus::SDLK_RIGHT, [3, "east"],	298	( "," . DC::SDLK_RIGHT ), [3, "east"],
315	CFPlus::SDLK_DOWN, [5, "south"],	299	("1," . DC::SDLK_RIGHT ), [4, "southeast"],
316	CFPlus::SDLK_LEFT, [7, "west"],	300	( "," . DC::SDLK_DOWN ), [5, "south"],
		301	("1," . DC::SDLK_DOWN ), [6, "southwest"],
		302	( "," . DC::SDLK_LEFT ), [7, "west"],
		303	("1," . DC::SDLK_LEFT ), [8, "northwest"],
317	);	304	);
318		305
319	sub invoke_key_down {	306	sub invoke_key_down {
320	my ($self, $ev) = @_;	307	my ($self, $ev) = @_;
321		308
322	my $mod = $ev->{mod};	309	my $mod = $ev->{mod};
323	my $sym = $ev->{sym};	310	my $sym = $ev->{sym};
324	my $uni = $ev->{unicode};	311	my $uni = $ev->{unicode};
325		312
326	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	313	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_META \| DC::KMOD_SHIFT;
327		314
328	if ($uni == ord "\t") {	315	# ignore repeated keypresses
329	$::PL_WINDOW->toggle_visibility;	316	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
330	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {	317	$self->{last_mod} = $mod;
331	$::HELP_WINDOW->toggle_visibility;	318	$self->{last_sym} = $sym;
332	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
333	::toggle_player_page ($::STATS_PAGE);
334	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
335	::toggle_player_page ($::SKILL_PAGE);
336	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
337	::toggle_player_page ($::SPELL_PAGE);
338	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
339	::toggle_player_page ($::INVENTORY_PAGE);
340	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
341	$::SETUP_DIALOG->toggle_visibility;
342	} elsif (!$::CONN) {
343	return 0; # bindings further down need a valid connection
344		319
345	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {	320	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
346	$::CONN->user_send ("stay fire");	321
347	} elsif ($uni == ord ",") {	322	if ($::CONN && $dir) {
348	$::CONN->user_send ("take");
349	} elsif ($uni == ord " ") {
350	$::CONN->user_send ("apply");
351	} elsif ($uni == 13) {
352	$::CONN->user_send ("examine");
353	} elsif ($uni == ord ".") {
354	$::CONN->user_send ($self->{completer}{last_command})
355	if exists $self->{completer}{last_command};
356	} elsif (my @macros = CFPlus::Macro::match_event $ev) {
357	warn "<@macros>\n";#d#
358	$::CONN->macro_send ($_) for @macros;
359	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
360	$::CONN->user_send ("rotateshoottype +");
361	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
362	$::CONN->user_send ("rotateshoottype -");
363	} elsif ($uni == ord '"') {
364	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
365	$self->{completer}->show;
366	} elsif ($uni == ord "'") {
367	$self->{completer}->set_prefix ("");
368	$self->{completer}->show;
369	} elsif (exists $DIR{$sym}) {
370	if ($mod & CFPlus::KMOD_SHIFT) {	323	if ($mod & DC::KMOD_SHIFT) {
371	$self->{shft}++;	324	$self->{shft}++;
372	if ($DIR{$sym}[0] != $self->{fire_dir}) {	325	if ($dir->[0] != $self->{fire_dir}) {
373	$::CONN->user_send ("fire $DIR{$sym}[0]");	326	$::CONN->user_send ("fire $dir->[0]");
374	}	327	}
375	$self->{fire_dir} = $DIR{$sym}[0];	328	$self->{fire_dir} = $dir->[0];
376	} elsif ($mod & CFPlus::KMOD_CTRL) {	329	} elsif ($mod & DC::KMOD_CTRL) {
377	$self->{ctrl}++;	330	$self->{ctrl}++;
378	$::CONN->user_send ("run $DIR{$sym}[0]");	331	$::CONN->user_send ("run $dir->[0]");
379	} else {	332	} else {
380	$::CONN->user_send ("$DIR{$sym}[1]");	333	$::CONN->user_send ("$dir->[1]");
381	}	334	}
382	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	335
383	$self->{completer}->inject_key_down ($ev);
384	$self->{completer}->show;
385	} else {
386	return 0;	336	return 1;
387	}
388
389	1	337	}
		338
		339	0
390	}	340	}
391		341
392	sub invoke_key_up {	342	sub invoke_key_up {
393	my ($self, $ev) = @_;	343	my ($self, $ev) = @_;
394		344
395	my $res = 0;	345	my $res = 0;
396	my $mod = $ev->{mod};	346	my $mod = $ev->{mod};
397	my $sym = $ev->{sym};	347	my $sym = $ev->{sym};
398		348
		349	delete $self->{last_mod};
		350	delete $self->{last_sym};
		351
399	if ($::CFG->{shift_fire_stop}) {	352	if ($::CFG->{shift_fire_stop}) {
400	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {	353	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
401	$::CONN->user_send ("fire_stop");	354	$::CONN->user_send ("fire_stop");
402	delete $self->{fire_dir};	355	delete $self->{fire_dir};
403	$res = 1;	356	$res = 1;
404	}	357	}
405	} else {	358	} else {
		359	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		360
406	if (exists $DIR{$sym} && delete $self->{shft}) {	361	if ($dir && delete $self->{shft}) {
407	$::CONN->user_send ("fire_stop");	362	$::CONN->user_send ("fire_stop");
408	delete $self->{fire_dir};	363	delete $self->{fire_dir};
409	$res = 1;	364	$res = 1;
410	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?	365	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
		366	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
411	$::CONN->user_send ("fire_stop");	367	$::CONN->user_send ("fire_stop");
412	delete $self->{fire_dir};	368	delete $self->{fire_dir};
413	$res = 1;	369	$res = 1;
414	}	370	}
415	}	371	}
416		372
417	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {	373	if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
418	$::CONN->user_send ("run_stop");	374	$::CONN->user_send ("run_stop");
419	$res = 1;	375	$res = 1;
420	}	376	}
421		377
422	$res	378	$res
423	}	379	}
424		380
		381	sub invoke_visibility_change {
		382	my ($self) = @_;
		383
		384	$self->refresh_hook;
		385
		386	0
		387	}
		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
425	sub set_magicmap {	413	sub set_magicmap {
426	my ($self, $w, $h, $x, $y, $data) = @_;	414	my ($self, $w, $h, $x, $y, $data) = @_;
427		415
428	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;	416	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
429	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;	417	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
…		…
431	$self->{magicmap} = [$x, $y, $w, $h, $data];	419	$self->{magicmap} = [$x, $y, $w, $h, $data];
432		420
433	$self->update;	421	$self->update;
434	}	422	}
435		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
		463	sub refresh_hook {
		464	my ($self) = @_;
		465
		466	if ($::MAP && $::CONN) {
		467	if (delete $self->{need_update}) {
		468	$self->movement_update;
		469
		470	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		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
		476	my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
		477	my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
		478
		479	# the map displacement, in tiles
		480	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
		481	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
		482
		483	# the upper left "visible" corner, in pixels
		484	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		485	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		486
		487	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		488	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
		489
		490	if ($::CFG->{fow_enable}) {
		491	# draw_fow_texture REQUIRES the fow texture to stay the same size.
		492	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
		493
		494	$self->{fow_texture} = new DC::Texture
		495	w => $w,
		496	h => $h,
		497	data => $data,
		498	internalformat => GL_ALPHA,
		499	format => GL_ALPHA;
		500	} else {
		501	delete $self->{fow_texture};
		502	}
		503
		504	glNewList ($self->{list} \|\|= glGenList);
		505
		506	glPushMatrix;
		507	glTranslate $sx0, $sy0;
		508	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		509	glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
		510
		511	$::MAP->draw ($dx, $dy, $sw, $sh,
		512	($self->{tilesize}) x 2,
		513	$::CONN->{player}{tag},
		514	-$self->{sdx}, -$self->{sdy});
		515
		516	glScale $self->{tilesize}, $self->{tilesize};
		517
		518	if (my $tex = $self->{fow_texture}) {
		519	my @prev_fow_params;
		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
		536	$::CFG->{fow_intensity},
		537	$TEX_HIDDEN[$::CFG->{fow_texture}]{name},
		538	@{$self->{fow_texture}}{qw(name data s t w h)},
		539	@prev_fow_params;
		540	}
		541
		542	if ($self->{magicmap}) {
		543	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		544
		545	$x += $::MAP->ox + $self->{dx};
		546	$y += $::MAP->oy + $self->{dy};
		547
		548	glTranslate - $x - 1, - $y - 1;
		549	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		550	$::MAP->draw_magicmap ($w, $h, $data);
		551	}
		552
		553	glPopMatrix;
		554	glEndList;
		555	}
		556	} else {
		557	delete $self->{last_fow_texture};
		558	delete $self->{fow_texture};
		559
		560	glDeleteList delete $self->{list}
		561	if $self->{list};
		562	}
		563	}
		564
436	sub draw {	565	sub draw {
437	my ($self) = @_;	566	my ($self) = @_;
438		567
439	return unless $::MAP;	568	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
440		569
		570	return unless $self->{list};
		571
441	my $focused = $CFPlus::UI::FOCUS == $self	572	my $focused = $DC::UI::FOCUS == $self
442	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	573	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
443		574
444	return	575	return
445	unless $focused \|\| !$::FAST;	576	unless $focused \|\| !$::FAST;
446		577
447	if (delete $self->{need_update}) {
448	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
449
450	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
451	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
452
453	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
454	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
455
456	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
457	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
458
459	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
460	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
461
462	if ($::CFG->{fow_enable}) {
463	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
464
465	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
466	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
467	glConvolutionFilter2D (
468	GL_CONVOLUTION_2D,
469	GL_ALPHA,
470	3, 3,
471	GL_ALPHA, GL_FLOAT,
472	(pack "f*", @{ $self->{smooth_matrix} }),
473	);
474	glEnable GL_CONVOLUTION_2D;
475	}
476
477	$self->{fow_texture} = new CFPlus::Texture
478	w => $w,
479	h => $h,
480	data => $data,
481	internalformat => GL_ALPHA,
482	format => GL_ALPHA;
483
484	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
485	} else {
486	delete $self->{fow_texture};
487	}
488
489	glNewList $self->{list};
490
491	glPushMatrix;
492	glTranslate $sx0, $sy0;
493	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
494
495	$::MAP->draw ($dx, $dy, $sw, $sh);
496
497	glScale 32, 32;
498
499	if (my $tex = $self->{fow_texture}) {
500	glEnable GL_TEXTURE_2D;
501	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
502
503	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
504	$self->{fow_texture}->draw_quad_alpha (0, 0);
505
506	glDisable GL_TEXTURE_2D;
507	}
508
509	if ($self->{magicmap}) {
510	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
511
512	$x += $::MAP->ox + $self->{dx};
513	$y += $::MAP->oy + $self->{dy};
514
515	glTranslate - $x - 1, - $y - 1;
516	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
517	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
518	}
519
520	glPopMatrix;
521	glEndList;
522	}
523
524	glCallList $self->{list};	578	glCallList $self->{list};
525		579
526	# TNT2 emulates logops in software (or worse :)	580	# TNT2 emulates logops in software (or worse :)
527	unless ($focused) {	581	unless ($focused) {
528	glColor 0.4, 0.2, 0.2, 0.6;	582	glColor_premultiply 0, 0, 1, 0.25;
529	glEnable GL_BLEND;	583	glEnable GL_BLEND;
530	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	584	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
531	glBegin GL_QUADS;	585	glBegin GL_QUADS;
532	glVertex 0, 0;	586	glVertex 0, 0;
533	glVertex 0, $::HEIGHT;	587	glVertex 0, $::HEIGHT;
534	glVertex $::WIDTH, $::HEIGHT;	588	glVertex $::WIDTH, $::HEIGHT;
535	glVertex $::WIDTH, 0;	589	glVertex $::WIDTH, 0;
…		…
544	glDeleteList $self->{list};	598	glDeleteList $self->{list};
545		599
546	$self->SUPER::DESTROY;	600	$self->SUPER::DESTROY;
547	}	601	}
548		602
549	package CFPlus::MapWidget::MapMap;	603	package DC::MapWidget::MapMap;
550		604
		605	use common::sense;
		606
551	our @ISA = CFPlus::UI::Base::;	607	our @ISA = DC::UI::Base::;
552		608
553	use Time::HiRes qw(time);
554	use CFPlus::OpenGL;	609	use DC::OpenGL;
555		610
556	sub size_request {	611	sub size_request {
557	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	612	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
		613	}
		614
		615	sub refresh_hook {
		616	my ($self) = @_;
		617
		618	if ($::MAP && $self->{texture_atime} < AE::now) {
		619	my ($w, $h) = @$self{qw(w h)};
		620
		621	return unless $w && $h;
		622
		623	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		624	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		625
		626	my $ox = 0.5 * ($w - $sw);
		627	my $oy = 0.5 * ($h - $sh);
		628
		629	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		630	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		631
		632	#TODO: map scale is completely borked
		633
		634	my $x0 = int $ox - $sx + 0.5;
		635	my $y0 = int $oy - $sy + 0.5;
		636
		637	$self->{sw} = $sw;
		638	$self->{sh} = $sh;
		639
		640	$self->{x0} = $x0;
		641	$self->{y0} = $y0;
		642
		643	$self->{texture_atime} = AE::now + 1/2;
		644
		645	$self->{texture} =
		646	new DC::Texture
		647	w => $w,
		648	h => $h,
		649	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		650	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		651	}
		652	}
		653
		654	sub invoke_visibility_change {
		655	my ($self) = @_;
		656
		657	$self->refresh_hook;
		658
		659	0
558	}	660	}
559		661
560	sub invoke_size_allocate {	662	sub invoke_size_allocate {
561	my ($self, $w, $h) = @_;	663	my ($self, $w, $h) = @_;
562		664
…		…
573	}	675	}
574		676
575	sub _draw {	677	sub _draw {
576	my ($self) = @_;	678	my ($self) = @_;
577		679
578	$::MAP or return;	680	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
579		681
580	my ($w, $h) = @$self{qw(w h)};	682	$self->{texture} or return;
581
582	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
583	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
584
585	my $sx = int $::CFG->{map_shift_x} / 32;
586	my $sy = int $::CFG->{map_shift_y} / 32;
587
588	my $ox = 0.5 * ($w - $sw);
589	my $oy = 0.5 * ($h - $sh);
590		683
591	glEnable GL_BLEND;	684	glEnable GL_BLEND;
592	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	685	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
593	glEnable GL_TEXTURE_2D;	686	glEnable GL_TEXTURE_2D;
594	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	687	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
595		688
596	if ($self->{texture_atime} < time) {
597	$self->{texture_atime} = time + 1/3;
598
599	$self->{texture} =
600	new CFPlus::Texture
601	w => $w,
602	h => $h,
603	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
604	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
605	}
606
607	$self->{texture}->draw_quad (0, 0);	689	$self->{texture}->draw_quad (0, 0);
608		690
609	glDisable GL_TEXTURE_2D;	691	glDisable GL_TEXTURE_2D;
610		692
611	glTranslate 0.375, 0.375;	693	glTranslate 0.375, 0.375;
612
613	#TODO: map scale is completely borked
614
615	my $x0 = int $ox - $sx + 0.5;
616	my $y0 = int $oy - $sy + 0.5;
617		694
618	glColor 1, 1, 0, 1;	695	glColor 1, 1, 0, 1;
619	glBegin GL_LINE_LOOP;	696	glBegin GL_LINE_LOOP;
620	glVertex $x0 , $y0 ;	697	glVertex $self->{x0} , $self->{y0} ;
621	glVertex $x0 , $y0 + $sh;	698	glVertex $self->{x0} , $self->{y0} + $self->{sh};
622	glVertex $x0 + $sw, $y0 + $sh;	699	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
623	glVertex $x0 + $sw, $y0 ;	700	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
624	glEnd;	701	glEnd;
625		702
626	glDisable GL_BLEND;	703	glDisable GL_BLEND;
627	}	704	}
628		705
629	package CFPlus::MapWidget::Command;	706	package DC::MapWidget::Command;
630		707
631	use strict;	708	use common::sense;
632		709
633	use CFPlus::OpenGL;	710	use DC::OpenGL;
634		711
635	our @ISA = CFPlus::UI::Frame::;	712	our @ISA = DC::UI::Frame::;
636		713
637	sub new {	714	sub new {
638	my $class = shift;	715	my $class = shift;
639		716
640	my $self = $class->SUPER::new (	717	my $self = $class->SUPER::new (
641	bg => [0, 0, 0, 0.8],	718	bg => [0, 0, 0, 0.8],
642	@_,	719	@_,
643	);	720	);
644		721
645	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	722	$self->add ($self->{vbox} = new DC::UI::VBox);
646		723
647	$self->{label} = [	724	$self->{label} = [
648	map	725	map
649	CFPlus::UI::Label->new (	726	DC::UI::Label->new (
		727	align => 0,
650	can_hover => 1,	728	can_hover => 1,
651	can_events => 1,	729	can_events => 1,
652	tooltip_width => 0.33,	730	tooltip_width => 0.33,
653	fontsize => $_,	731	fontsize => $_,
654	), (0.8) x 16	732	), (0.8) x 16
655	];	733	];
656		734
657	$self->{entry} = new CFPlus::UI::Entry	735	$self->{entry} = new DC::UI::Entry
658	on_changed => sub {	736	on_changed => sub {
659	$self->update_labels;	737	$self->update_labels;
660	0	738	0
661	},	739	},
662	on_button_down => sub {	740	on_button_down => sub {
663	my ($entry, $ev, $x, $y) = @_;	741	my ($entry, $ev, $x, $y) = @_;
664		742
665	if ($ev->{button} == 3) {	743	if ($ev->{button} == 3) {
666	(new CFPlus::UI::Menu	744	(new DC::UI::Menu
667	items => [	745	items => [
668	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	746	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
669	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]	747	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
670	],	748	],
671	)->popup ($ev);	749	)->popup ($ev);
672	return 1;	750	return 1;
673	}	751	}
674	0	752	0
…		…
689	$self->hide;	767	$self->hide;
690	}	768	}
691	} elsif ($ev->{sym} == 27) {	769	} elsif ($ev->{sym} == 27) {
692	$self->{hist_ptr} = 0;	770	$self->{hist_ptr} = 0;
693	$self->hide;	771	$self->hide;
694	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {	772	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
695	if ($self->{hist_ptr} > 1) {	773	if ($self->{hist_ptr} > 1) {
696	$self->{hist_ptr}--;	774	$self->{hist_ptr}--;
697	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	775	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
698	} elsif ($self->{hist_ptr} > 0) {	776	} elsif ($self->{hist_ptr} > 0) {
699	$self->{hist_ptr}--;	777	$self->{hist_ptr}--;
…		…
701	} else {	779	} else {
702	++$self->{select_offset}	780	++$self->{select_offset}
703	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	781	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
704	}	782	}
705	$self->update_labels;	783	$self->update_labels;
706	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {	784	} elsif ($ev->{sym} == DC::SDLK_UP) {
707	if ($self->{select_offset}) {	785	if ($self->{select_offset}) {
708	--$self->{select_offset}	786	--$self->{select_offset}
709	} else {	787	} else {
710	unless ($self->{hist_ptr}) {	788	unless ($self->{hist_ptr}) {
711	$self->{hist_saveback} = $self->{entry}->get_text;	789	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
731	);	809	);
732		810
733	$self	811	$self
734	}	812	}
735		813
		814	sub reset {
		815	my ($self) = @_;
		816
		817	$self->hide;
		818	delete $self->{command_list};
		819	}
		820
736	sub set_prefix {	821	sub set_prefix {
737	my ($self, $prefix) = @_;	822	my ($self, $prefix) = @_;
738		823
739	$self->{entry}->set_text ($prefix);	824	$self->{entry}->set_text ($prefix);
740	$self->show;	825	$self->show;
…		…
777	my $text = $self->{entry}->get_text;	862	my $text = $self->{entry}->get_text;
778		863
779	length $text	864	length $text
780	or return $self->hide;	865	or return $self->hide;
781		866
782	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	];
783		874
784	if ($text ne $self->{last_search}) {	875	if ($text ne $self->{last_search}) {
785	my @match;	876	my @match;
786		877
787	if ($text =~ /^(.*?)\s+$/) {	878	if ($text =~ /^(.*?)\s+$/) {
		879	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
788	@match = [$cmd, "(appended whitespace suppresses completion)"];	880	@match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
789	} 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
790	my $regexp = do {	888	my $regexp_abbrev = do {
791	my ($beg, @chr) = split //, lc $cmd;	889	my ($beg, @chr) = split //, lc $cmd;
792		890
793	# the following regex is used to match our "completion entry"	891	# the following regex is used to match our "completion entry"
794	# to an actual command - the parentheses match kind of "overhead"	892	# to an actual command - the parentheses match kind of "overhead"
795	# - the more characters the parentheses match, the less attractive	893	# - the more characters the parentheses match, the less attractive
796	# is the match.	894	# is the match.
797	my $regexp = "^\Q$beg\E"	895	my $regexp = "^\Q$beg\E"
798	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;	896	. join "", map "(?:.?[ _\-]\|(.?))\Q$_\E", @chr;
799	qr<$regexp>	897	qr<$regexp>
800	};	898	};
801		899
802	my @penalty;	900	my $regexp_partial = do {
		901	my $regexp = "^\Q$text\E(.*)";
		902	qr<$regexp>
		903	};
803		904
804	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
805	if (@penalty = $_ =~ $regexp) {	938	if (my @penalty = $_ =~ $regexp_abbrev) {
806	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];
807	}	946	}
808	}	947	}
809		948
		949	# @match is now [command object, command with arguments]
810	@match = map $self->{command}{$_->[0]},	950	@match = map [$self->{command}{$_->[0]}, $_->[2]],
811	sort {	951	sort {
812	$a->[1] <=> $b->[1]	952	$b->[1] <=> $a->[1]
813	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]	953	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
814	or (length $b->[0]) <=> (length $a->[0])	954	or (length $b->[0]) <=> (length $a->[0])
815	} @match;	955	} @match;
816	}	956	}
817		957
…		…
836	$label->{fg} = [1, 1, 1, 1];	976	$label->{fg} = [1, 1, 1, 1];
837	$label->{bg} = [0, 0, 0, 0];	977	$label->{bg} = [0, 0, 0, 0];
838	}	978	}
839		979
840	if (@matches) {	980	if (@matches) {
841	$self->{select} = "$matches[0][0]$arg";	981	$self->{select} = "$matches[0][1]";
842		982
843	$labels[0]->{fg} = [0, 0, 0, 1];	983	$labels[0]->{fg} = [0, 0, 0, 1];
844	$labels[0]->{bg} = [1, 1, 1, 0.8];	984	$labels[0]->{bg} = [1, 1, 1, 0.8];
845	} else {	985	} else {
846	$self->{select} = "$cmd$arg";	986	$self->{select} = "$text";
847	}	987	}
848		988
849	for my $match (@matches) {	989	for my $match (@matches) {
850	my $label = shift @labels;	990	my $label = shift @labels;
851		991
852	if (@labels) {	992	if (@labels) {
853	$label->set_text ("$match->[0]$arg");	993	$label->set_text ("$match->[1]");
854	$label->set_tooltip ($match->[1]);	994	$label->set_tooltip ("$match->[0][1]");
855	} else {	995	} else {
856	$label->set_text ("...");	996	$label->set_text ("...");
857	$label->set_tooltip ("Use Cursor-Down to view more matches");	997	$label->set_tooltip ("Use Cursor-Down to view more matches");
858	last;	998	last;
859	}	999	}
…		…
869		1009
870	sub _draw {	1010	sub _draw {
871	my ($self) = @_;	1011	my ($self) = @_;
872		1012
873	# hack	1013	# hack
874	local $CFPlus::UI::FOCUS = $self->{entry};	1014	local $DC::UI::FOCUS = $self->{entry};
875		1015
876	$self->SUPER::_draw;	1016	$self->SUPER::_draw;
877	}	1017	}
878		1018
879	1	1019	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.97 by root, Sat Dec 9 22:28:11 2006 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.97 by root, Sat Dec 9 22:28:11 2006 UTC vs.
Revision 1.167 by root, Tue Nov 20 14:32:12 2012 UTC