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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.96 by root, Sat Dec 9 21:44:43 2006 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.96 by root, Sat Dec 9 21:44:43 2006 UTC vs.
Revision 1.165 by root, Fri Nov 9 22:53:57 2012 UTC