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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.74 by root, Sun Jul 16 23:30:08 2006 UTC vs.
Revision 1.169 by root, Sun Nov 25 14:37:18 2012 UTC

…		…
1	package CFClient::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
		7	use AnyEvent ();
		8
		9	use DC;
8	use CFClient::OpenGL;	10	use DC::OpenGL;
		11	use DC::UI;
		12	use DC::Macro;
9		13
10	our @ISA = CFClient::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;
11		20
12	my $magicmap_tex =	21	my $magicmap_tex =
13	new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",	22	new_from_resource DC::Texture "magicmap.png",
14	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;	23	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
15		24
16	sub new {	25	sub new {
17	my $class = shift;	26	my $class = shift;
18		27
19	my $self = $class->SUPER::new (	28	my $self = $class->SUPER::new (
20	z => -1,	29	z => -1,
21	can_focus => 1,	30	can_focus => 1,
22	list => glGenList,	31	tilesize => 32,
23
24	smooth_matrix => [
25	0.05, 0.13, 0.05,
26	0.13, 0.30, 0.13,
27	0.05, 0.13, 0.05,
28	],
29
30	@_	32	@_
31	);	33	);
32		34
33	$self->{completer} = new CFClient::MapWidget::Command::
34	command => $self->{command},
35	can_focus => 1,
36	tooltip => "<b>The Command Completer</b>\n\n"
37	. "This is your central interface to send text commands to the server. "
38	. "To enter a verbatim command to send to the server, just type the command, "
39	. "followed by a space, and press return. "
40	. "Typing the initial letters of words (or just any letters) displays guesses "
41	. "for commands you might want to use.\n"
42	. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
43	. "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
44	;
45
46	$self	35	$self
47	}	36	}
48		37
49	sub add_command {	38	sub server_login {
50	my ($self, $command, $tooltip, $widget, $cb) = @_;
51
52	(my $data = $command) =~ s/\\//g;
53
54	$tooltip =~ s/^\s+//;
55	$tooltip = "<big>$data</big>\n\n$tooltip";
56	$tooltip =~ s/\s+$//;
57
58	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
59	}
60
61	sub clr_commands {
62	my ($self) = @_;	39	my ($server) = @_;
63		40
64	%{$self->{completer}{command}} = ();	41	::stop_game ();
		42	local $::PROFILE->{host} = $server;
		43	::start_game ();
		44	}
		45
		46	sub editor_invoke {
		47	my $editsup = $::CONN && $::CONN->{editor_support}
		48	or return;
		49
		50	DC::background {
		51	print "preparing editor startup...\n";
		52
		53	my $server = $editsup->{gameserver} \|\| "default";
		54	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		55
		56	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
		57	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
		58
		59	print "map directory is $mapdir\n";
		60	print "lib directory is $libdir\n";
		61
		62	my $ua = DC::lwp_useragent;
		63
		64	for my $file (qw(archetypes crossfire.0)) {
		65	my $url = "$editsup->{lib_root}$file";
		66	print "mirroring $url...\n";
		67	DC::lwp_check $ua->mirror ($url, "$libdir/$file");
		68	printf "%s size %d octets\n", $file, -s "$libdir/$file";
		69	}
		70
		71	if (1) { # upload a map
		72	my $mapname = $::CONN->{map_info}[0];
		73
		74	my $mappath = "$mapdir/$mapname";
		75
		76	-e $mappath and die "$mappath already exists\n";
		77
		78	print "getting map revision for $mapname...\n";
		79
		80	# try to get the most recent head revision, what a hack,
		81	# this should have been returned while downloading sigh
		82	my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
		83
		84	if ($log =~ /\?rev=(\d+\.\d+)"/) {
		85	my $rev = $1;
		86
		87	print "downloading revision $rev...\n";
		88
		89	my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
		90
		91	my $meta = {
		92	%$editsup,
		93	path => $mapname,
		94	revision => $rev,
		95	cf_login => $::PROFILE->{user},
		96	};
		97
		98	require File::Basename;
		99	require File::Path;
		100
		101	File::Path::mkpath (File::Basename::dirname ($mappath));
		102	open my $fh, ">:raw:perlio", "$mappath.meta"
		103	or die "$mappath.meta: $!\n";
		104	print $fh DC::encode_json $meta;
		105	close $fh;
		106	open my $fh, ">:raw:perlio:utf8", $mappath
		107	or die "$mappath: $!\n";
		108	print $fh $map;
		109	close $fh;
		110
		111	print "saved as $mappath\n";
		112
		113	print "invoking editor...\n";
		114	exec "/root/s2/gce $mappath";#d#
		115
		116	# now upload it
		117	# require HTTP::Request::Common;
		118	#
		119	# my $res = $ua->post (
		120	# $ENV{CFPLUS_UPLOAD},
		121	# Content_Type => 'multipart/form-data',
		122	# Content => [
		123	# path => $mapname,
		124	# mapdir => $ENV{CROSSFIRE_MAPDIR},
		125	# map => $map,
		126	# revision => $rev,
		127	# cf_login => $ENV{CFPLUS_LOGIN},
		128	# cf_password => $ENV{CFPLUS_PASSWORD},
		129	# comment => "",
		130	# ]
		131	# );
		132	#
		133	# if ($res->is_error) {
		134	# # fatal condition
		135	# warn $res->status_line;
		136	# } else {
		137	# # script replies are marked as {{..}}
		138	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
		139	# warn map "$_\n", @msgs;
		140	# }
		141	} else {
		142	die "viewvc parse error, unable to detect revision\n";
		143	}
		144	}
		145	}
65	}	146	}
66		147
67	sub invoke_button_down {	148	sub invoke_button_down {
68	my ($self, $ev, $x, $y) = @_;	149	my ($self, $ev, $x, $y) = @_;
69		150
70	if ($ev->{button} == 1) {	151	if ($ev->{button} == 1) {
71	$self->grab_focus;	152	$self->grab_focus;
72	return unless $::CONN;	153	return unless $::CONN && $self->{ctilesize};
73		154
74	my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	155	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
75	my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	156	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
76		157
77	$x -= int 0.5 * $self->{sw};	158	$x -= DC::floor $::MAP->w * 0.5;
78	$y -= int 0.5 * $self->{sh};	159	$y -= DC::floor $::MAP->h * 0.5;
79		160
		161	if ($::CONN) {
80	$::CONN->lookat ($x, $y)	162	$::CONN->lookat ($x, $y)
81	if $::CONN;	163	}
82		164
83	} elsif ($ev->{button} == 2) {	165	} elsif ($ev->{button} == 2) {
84	$self->grab_focus;	166	$self->grab_focus;
85	return unless $::CONN;	167	return unless $::CONN;
86		168
96	$::CFG->{map_shift_y} = $bh + $y - $oy;	178	$::CFG->{map_shift_y} = $bh + $y - $oy;
97		179
98	$self->update;	180	$self->update;
99	};	181	};
100	} elsif ($ev->{button} == 3) {	182	} elsif ($ev->{button} == 3) {
101	(new CFClient::UI::Menu	183	my @items = (
102	items => [
103	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],	184	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
104	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	185	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
105	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	186	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
		187	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
106	["Inventory…\tF4", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	188	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
107	["Spells…\tF5", sub { ::toggle_player_page ($::SPELL_PAGE) }],
108	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],	189	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
109	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],	190	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
110	[	191	);
111	$::PICKUP_ENABLE->{state}	192
112	? "Disable automatic pickup"	193	if ($::CONN && $::CONN->{editor_support}) {
113	: "Enable automatic pickup",	194	# push @items, [
114	sub { $::PICKUP_ENABLE->toggle }	195	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
		196	# \&editor_invoke,
		197	# ];
		198
		199	for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
		200	$::CONN->{editor_support}{servertype} ne $type
		201	or next;
		202	my $server = $::CONN->{editor_support}{"${type}server"}
		203	or next;
		204
		205	push @items, [
		206	"Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
		207	sub { server_login $server },
115	],	208	];
		209	}
		210	}
		211
		212	push @items,
		213	["Quit",
		214	sub {
		215	if ($::CONN) {
		216	&::open_quit_dialog;
		217	} else {
		218	exit;
		219	}
		220	}
116	],	221	],
		222	;
		223
		224	(new DC::UI::Menu
		225	items => \@items,
117	)->popup ($ev);	226	)->popup ($ev);
118	}	227	}
119		228
120	1	229	1
121	}	230	}
…		…
139		248
140	1	249	1
141	}	250	}
142		251
143	sub size_request {	252	sub size_request {
		253	my ($self) = @_;
		254
144	(	255	(
145	32 * CFClient::ceil $::WIDTH / 32,	256	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
146	32 * CFClient::ceil $::HEIGHT / 32,	257	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
147	)	258	)
148	}	259	}
149		260
150	sub update {	261	sub update {
151	my ($self) = @_;	262	my ($self) = @_;
…		…
153	$self->{need_update} = 1;	264	$self->{need_update} = 1;
154	$self->SUPER::update;	265	$self->SUPER::update;
155	}	266	}
156		267
157	my %DIR = (	268	my %DIR = (
158	CFClient::SDLK_KP8, [1, "north"],	269	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
159	CFClient::SDLK_KP9, [2, "northeast"],	270	( "," . DC::SDLK_KP8 ), [1, "north"],
160	CFClient::SDLK_KP6, [3, "east"],	271	( "," . DC::SDLK_KP9 ), [2, "northeast"],
161	CFClient::SDLK_KP3, [4, "southeast"],	272	( "," . DC::SDLK_KP6 ), [3, "east"],
162	CFClient::SDLK_KP2, [5, "south"],	273	( "," . DC::SDLK_KP3 ), [4, "southeast"],
163	CFClient::SDLK_KP1, [6, "southwest"],	274	( "," . DC::SDLK_KP2 ), [5, "south"],
164	CFClient::SDLK_KP4, [7, "west"],	275	( "," . DC::SDLK_KP1 ), [6, "southwest"],
165	CFClient::SDLK_KP7, [8, "northwest"],	276	( "," . DC::SDLK_KP4 ), [7, "west"],
		277	( "," . DC::SDLK_KP7 ), [8, "northwest"],
166		278
167	CFClient::SDLK_UP, [1, "north"],	279	( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
168	CFClient::SDLK_RIGHT, [3, "east"],	280	( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
169	CFClient::SDLK_DOWN, [5, "south"],	281	( "," . DC::SDLK_END ), [6, "southwest"],
170	CFClient::SDLK_LEFT, [7, "west"],	282	( "," . DC::SDLK_HOME ), [8, "northwest"],
		283
		284	( "," . DC::SDLK_UP ), [1, "north"],
		285	("1," . DC::SDLK_UP ), [2, "northeast"],
		286	( "," . DC::SDLK_RIGHT ), [3, "east"],
		287	("1," . DC::SDLK_RIGHT ), [4, "southeast"],
		288	( "," . DC::SDLK_DOWN ), [5, "south"],
		289	("1," . DC::SDLK_DOWN ), [6, "southwest"],
		290	( "," . DC::SDLK_LEFT ), [7, "west"],
		291	("1," . DC::SDLK_LEFT ), [8, "northwest"],
171	);	292	);
172		293
173	sub invoke_key_down {	294	sub invoke_key_down {
174	my ($self, $ev) = @_;	295	my ($self, $ev) = @_;
175		296
176	my $mod = $ev->{mod};	297	my $mod = $ev->{mod};
177	my $sym = $ev->{sym};	298	my $sym = $ev->{sym};
178	my $uni = $ev->{unicode};	299	my $uni = $ev->{unicode};
179		300
180	$mod &= CFClient::KMOD_CTRL \| CFClient::KMOD_ALT \| CFClient::KMOD_SHIFT;	301	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_META \| DC::KMOD_SHIFT;
181		302
182	if ($uni == ord "\t") {	303	# ignore repeated keypresses
183	$::PL_WINDOW->toggle_visibility;	304	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
184	} elsif ($sym == CFClient::SDLK_F1 && !$mod) {	305	$self->{last_mod} = $mod;
185	$::HELP_WINDOW->toggle_visibility;	306	$self->{last_sym} = $sym;
186	} elsif ($sym == CFClient::SDLK_F2 && !$mod) {
187	::toggle_player_page ($::STATS_PAGE);
188	} elsif ($sym == CFClient::SDLK_F3 && !$mod) {
189	::toggle_player_page ($::SKILL_PAGE);
190	} elsif ($sym == CFClient::SDLK_F4 && !$mod) {
191	::toggle_player_page ($::INVENTORY_PAGE);
192	} elsif ($sym == CFClient::SDLK_F5 && !$mod) {
193	::toggle_player_page ($::SPELL_PAGE);
194	} elsif ($sym == CFClient::SDLK_F9 && !$mod) {
195	$::SETUP_DIALOG->toggle_visibility;
196	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
197	$::BIND_EDITOR->set_binding (undef, undef, [],
198	sub {
199	my ($mod, $sym, $cmds) = @_;
200	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
201	});
202	$::BIND_EDITOR->start;
203	$::BIND_EDITOR->show;
204	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
205	$::BIND_EDITOR->stop;
206	$::BIND_EDITOR->ask_for_bind_and_commit;
207	$::BIND_EDITOR->hide;
208	} elsif (!$::CONN) {
209	return 0; # bindings further down need a valid connection
210		307
211	} elsif ($sym == CFClient::SDLK_KP5 && !$mod) {	308	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
212	$::CONN->user_send ("stay fire");	309
213	} elsif ($uni == ord ",") {	310	if ($::CONN && $dir) {
214	$::CONN->user_send ("take");
215	} elsif ($uni == ord " ") {
216	$::CONN->user_send ("apply");
217	} elsif ($uni == ord ".") {
218	$::CONN->user_send ($self->{completer}{last_command})
219	if exists $self->{completer}{last_command};
220	} elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
221	$::CONN->user_send ($_) for @$bind_cmd;
222	} elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
223	$::CONN->user_send ("rotateshoottype +");
224	} elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
225	$::CONN->user_send ("rotateshoottype -");
226	} elsif ($uni == ord '"') {
227	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
228	$self->{completer}->show;
229	} elsif ($uni == ord "'") {
230	$self->{completer}->set_prefix ("");
231	$self->{completer}->show;
232	} elsif (exists $DIR{$sym}) {
233	if ($mod & CFClient::KMOD_SHIFT) {	311	if ($mod & DC::KMOD_SHIFT) {
234	$self->{shft}++;	312	$self->{shft}++;
235	if ($DIR{$sym}[0] != $self->{fire_dir}) {	313	if ($dir->[0] != $self->{fire_dir}) {
236	$::CONN->user_send ("fire $DIR{$sym}[0]");	314	$::CONN->user_send ("fire $dir->[0]");
237	}	315	}
238	$self->{fire_dir} = $DIR{$sym}[0];	316	$self->{fire_dir} = $dir->[0];
239	} elsif ($mod & CFClient::KMOD_CTRL) {	317	} elsif ($mod & DC::KMOD_CTRL) {
240	$self->{ctrl}++;	318	$self->{ctrl}++;
241	$::CONN->user_send ("run $DIR{$sym}[0]");	319	$::CONN->user_send ("run $dir->[0]");
242	} else {	320	} else {
243	$::CONN->user_send ("$DIR{$sym}[1]");	321	$::CONN->user_send ("$dir->[1]");
244	}	322	}
245	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	323
246	$self->{completer}->invoke_key_down ($ev);
247	$self->{completer}->show;
248	} else {
249	return 0;	324	return 1;
250	}
251
252	1	325	}
		326
		327	0
253	}	328	}
254		329
255	sub invoke_key_up {	330	sub invoke_key_up {
256	my ($self, $ev) = @_;	331	my ($self, $ev) = @_;
257		332
258	my $res = 0;	333	my $res = 0;
259	my $mod = $ev->{mod};	334	my $mod = $ev->{mod};
260	my $sym = $ev->{sym};	335	my $sym = $ev->{sym};
261		336
		337	delete $self->{last_mod};
		338	delete $self->{last_sym};
		339
262	if ($::CFG->{shift_fire_stop}) {	340	if ($::CFG->{shift_fire_stop}) {
263	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	341	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
264	$::CONN->user_send ("fire_stop");	342	$::CONN->user_send ("fire_stop");
265	delete $self->{fire_dir};	343	delete $self->{fire_dir};
266	$res = 1;	344	$res = 1;
267	}	345	}
268	} else {	346	} else {
		347	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		348
269	if (exists $DIR{$sym} && delete $self->{shft}) {	349	if ($dir && delete $self->{shft}) {
270	$::CONN->user_send ("fire_stop");	350	$::CONN->user_send ("fire_stop");
271	delete $self->{fire_dir};	351	delete $self->{fire_dir};
272	$res = 1;	352	$res = 1;
273	} elsif (($sym == CFClient::SDLK_LSHIFT \|\| $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?	353	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
		354	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
274	$::CONN->user_send ("fire_stop");	355	$::CONN->user_send ("fire_stop");
275	delete $self->{fire_dir};	356	delete $self->{fire_dir};
276	$res = 1;	357	$res = 1;
277	}	358	}
278	}	359	}
279		360
280	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	361	if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
281	$::CONN->user_send ("run_stop");	362	$::CONN->user_send ("run_stop");
282	$res = 1;	363	$res = 1;
283	}	364	}
284		365
285	$res	366	$res
286	}	367	}
287		368
		369	sub invoke_visibility_change {
		370	my ($self) = @_;
		371
		372	$self->refresh_hook;
		373
		374	0
		375	}
		376
		377	sub set_tilesize {
		378	my ($self, $tilesize) = @_;
		379
		380	$self->{tilesize} = $tilesize;
		381	}
		382
		383	sub scroll {
		384	my ($self, $dx, $dy) = @_;
		385
		386	$self->movement_update;
		387
		388	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
		389	$self->{sdy} += $dy * $self->{tilesize};
		390
		391	# save old fow texture, if applicable
		392	$self->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture};
		393	$self->{lfdx} = $dx;
		394	$self->{lfdy} = $dy;
		395	$self->{lmdx} = $self->{dx};
		396	$self->{lmdy} = $self->{dy};
		397
		398	$::MAP->scroll ($dx, $dy);
		399	}
		400
288	sub set_magicmap {	401	sub set_magicmap {
289	my ($self, $w, $h, $x, $y, $data) = @_;	402	my ($self, $w, $h, $x, $y, $data) = @_;
290		403
291	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	404	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
292	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	405	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
293		406
294	$self->{magicmap} = [$x, $y, $w, $h, $data];	407	$self->{magicmap} = [$x, $y, $w, $h, $data];
295		408
296	$self->update;	409	$self->update;
297	}	410	}
298		411
		412	sub movement_update {
		413	my ($self) = @_;
		414
		415	if ($::CFG->{smooth_movement}) {
		416	if ($self->{sdx} \|\| $self->{sdy}) {
		417	my $diff = AE::time - ($self->{last_update} \|\| $::LAST_REFRESH);
		418	my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
		419
		420	# the minimum time for a single tile movement
		421	my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK \|\| 1);
		422
		423	$spd *= $self->{tilesize};
		424
		425	# jump if "impossibly high" speed
		426	if (
		427	(max abs $self->{sdx}, abs $self->{sdy})
		428	> $spd * $mintime * 2.1
		429	) {
		430	#warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
		431	$self->{sdx} = $self->{sdy} = 0;
		432	} else {
		433	$spd = $diff 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
		434
		435	my $dx = $self->{sdx} < 0 ? -$spd : $spd;
		436	my $dy = $self->{sdy} < 0 ? -$spd : $spd;
		437
		438	if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
		439	if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
		440	}
		441
		442	$self->update;
		443	}
		444	} else {
		445	$self->{sdx} = $self->{sdy} = 0;
		446	}
		447
		448	$self->{last_update} = AE::time;
		449	}
		450
		451	sub refresh_hook {
		452	my ($self) = @_;
		453
		454	if ($::MAP && $::CONN) {
		455	if (delete $self->{need_update}) {
		456	$self->movement_update;
		457
		458	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		459
		460	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
		461	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
		462
		463	# width/height of map, in tiles
		464	my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
		465	my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
		466
		467	# the map displacement, in tiles
		468	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
		469	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
		470
		471	# the upper left "visible" corner, in pixels
		472	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		473	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		474
		475	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		476	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
		477
		478	if ($::CFG->{fow_enable}) {
		479	# draw_fow_texture REQUIRES the fow texture to stay the same size.
		480	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
		481
		482	$self->{fow_texture} = new DC::Texture
		483	w => $w,
		484	h => $h,
		485	data => $data,
		486	internalformat => GL_ALPHA,
		487	format => GL_ALPHA;
		488	} else {
		489	delete $self->{fow_texture};
		490	}
		491
		492	glNewList ($self->{list} \|\|= glGenList);
		493
		494	glPushMatrix;
		495	glTranslate $sx0, $sy0;
		496	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		497	glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
		498
		499	$::MAP->draw ($dx, $dy, $sw, $sh,
		500	($self->{tilesize}) x 2,
		501	$::CONN->{player}{tag},
		502	-$self->{sdx}, -$self->{sdy});
		503
		504	glScale $self->{tilesize}, $self->{tilesize};
		505
		506	if (my $tex = $self->{fow_texture}) {
		507	my @prev_fow_params;
		508
		509	if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) {
		510	my $d1 = DC::distance $self->{sdx}, $self->{sdy};
		511	my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
		512
		513	if ($d1 * $d2) {
		514	@prev_fow_params = (
		515	(min 1, $d1 / $d2),
		516	$self->{lmdx} - $dx - $self->{lfdx},
		517	$self->{lmdy} - $dy - $self->{lfdy},
		518	@{$self->{prev_fow_texture}}{qw(name data)}
		519	);
		520	}
		521	}
		522
		523	DC::Texture::draw_fow_texture
		524	$::CFG->{fow_intensity},
		525	$TEX_HIDDEN[$::CFG->{fow_texture}]{name},
		526	@{$self->{fow_texture}}{qw(name data s t w h)},
		527	@prev_fow_params;
		528	}
		529
		530	if ($self->{magicmap}) {
		531	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		532
		533	$x += $::MAP->ox + $self->{dx};
		534	$y += $::MAP->oy + $self->{dy};
		535
		536	glTranslate - $x - 1, - $y - 1;
		537	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		538	$::MAP->draw_magicmap ($w, $h, $data);
		539	}
		540
		541	glPopMatrix;
		542	glEndList;
		543	}
		544	} else {
		545	delete $self->{last_fow_texture};
		546	delete $self->{fow_texture};
		547
		548	glDeleteList delete $self->{list}
		549	if $self->{list};
		550	}
		551	}
		552
299	sub draw {	553	sub draw {
300	my ($self) = @_;	554	my ($self) = @_;
301		555
302	return unless $::MAP;	556	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
303		557
		558	return unless $self->{list};
		559
304	my $focused = $CFClient::UI::FOCUS == $self	560	my $focused = $DC::UI::FOCUS == $self
305	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};	561	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
306		562
307	return	563	return
308	unless $focused \|\| !$::FAST;	564	unless $focused \|\| !$::FAST;
309		565
310	if (delete $self->{need_update}) {
311	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
312
313	my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
314	my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
315
316	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
317	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
318
319	my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
320	my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
321
322	if ($::CFG->{fow_enable}) {
323	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
324
325	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
326	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
327	glConvolutionFilter2D (
328	GL_CONVOLUTION_2D,
329	GL_ALPHA,
330	3, 3,
331	GL_ALPHA, GL_FLOAT,
332	(pack "f*", @{ $self->{smooth_matrix} }),
333	);
334	glEnable GL_CONVOLUTION_2D;
335	}
336
337	$self->{fow_texture} = new CFClient::Texture
338	w => $w,
339	h => $h,
340	data => $data,
341	internalformat => GL_ALPHA,
342	format => GL_ALPHA;
343
344	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
345	} else {
346	delete $self->{fow_texture};
347	}
348
349	glNewList $self->{list};
350
351	glPushMatrix;
352	glTranslate $sx0, $sy0;
353	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
354
355	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
356
357	glScale 32, 32;
358
359	if (my $tex = $self->{fow_texture}) {
360	glEnable GL_TEXTURE_2D;
361	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
362
363	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
364	$self->{fow_texture}->draw_quad_alpha (0, 0);
365
366	glDisable GL_TEXTURE_2D;
367	}
368
369	if ($self->{magicmap}) {
370	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
371
372	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
373	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
374
375	glTranslate - $x - 1, - $y - 1;
376	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
377	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
378	}
379
380	glPopMatrix;
381	glEndList;
382	}
383
384	glCallList $self->{list};	566	glCallList $self->{list};
385		567
386	# TNT2 emulates logops in software (or worse :)	568	# TNT2 emulates logops in software (or worse :)
387	unless ($focused) {	569	unless ($focused) {
388	glColor 0.4, 0.2, 0.2, 0.6;	570	glColor_premultiply 0, 0, 1, 0.25;
389	glEnable GL_BLEND;	571	glEnable GL_BLEND;
390	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	572	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
391	glBegin GL_QUADS;	573	glBegin GL_QUADS;
392	glVertex 0, 0;	574	glVertex 0, 0;
393	glVertex 0, $::HEIGHT;	575	glVertex 0, $::HEIGHT;
394	glVertex $::WIDTH, $::HEIGHT;	576	glVertex $::WIDTH, $::HEIGHT;
395	glVertex $::WIDTH, 0;	577	glVertex $::WIDTH, 0;
…		…
404	glDeleteList $self->{list};	586	glDeleteList $self->{list};
405		587
406	$self->SUPER::DESTROY;	588	$self->SUPER::DESTROY;
407	}	589	}
408		590
409	package CFClient::MapWidget::MapMap;	591	package DC::MapWidget::MapMap;
410		592
		593	use common::sense;
		594
411	our @ISA = CFClient::UI::Base::;	595	our @ISA = DC::UI::Base::;
412		596
413	use Time::HiRes qw(time);
414	use CFClient::OpenGL;	597	use DC::OpenGL;
415		598
416	sub size_request {	599	sub size_request {
417	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	600	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
		601	}
		602
		603	sub refresh_hook {
		604	my ($self) = @_;
		605
		606	if ($::MAP && $self->{texture_atime} < AE::now) {
		607	my ($w, $h) = @$self{qw(w h)};
		608
		609	return unless $w && $h;
		610
		611	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		612	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		613
		614	my $ox = 0.5 * ($w - $sw);
		615	my $oy = 0.5 * ($h - $sh);
		616
		617	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		618	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		619
		620	#TODO: map scale is completely borked
		621
		622	my $x0 = int $ox - $sx + 0.5;
		623	my $y0 = int $oy - $sy + 0.5;
		624
		625	$self->{sw} = $sw;
		626	$self->{sh} = $sh;
		627
		628	$self->{x0} = $x0;
		629	$self->{y0} = $y0;
		630
		631	$self->{texture_atime} = AE::now + 1/2;
		632
		633	$self->{texture} =
		634	new DC::Texture
		635	w => $w,
		636	h => $h,
		637	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		638	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		639	}
		640	}
		641
		642	sub invoke_visibility_change {
		643	my ($self) = @_;
		644
		645	$self->refresh_hook;
		646
		647	0
418	}	648	}
419		649
420	sub invoke_size_allocate {	650	sub invoke_size_allocate {
421	my ($self, $w, $h) = @_;	651	my ($self, $w, $h) = @_;
422		652
…		…
433	}	663	}
434		664
435	sub _draw {	665	sub _draw {
436	my ($self) = @_;	666	my ($self) = @_;
437		667
438	$::MAP or return;	668	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
439		669
440	my ($w, $h) = @$self{qw(w h)};	670	$self->{texture} or return;
441
442	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
443	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
444
445	my $sx = int $::CFG->{map_shift_x} / 32;
446	my $sy = int $::CFG->{map_shift_y} / 32;
447
448	my $ox = 0.5 * ($w - $sw);
449	my $oy = 0.5 * ($h - $sh);
450		671
451	glEnable GL_BLEND;	672	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	673	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glEnable GL_TEXTURE_2D;	674	glEnable GL_TEXTURE_2D;
454	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
455		676
456	if ($self->{texture_atime} < time) {
457	$self->{texture_atime} = time + 1/3;
458
459	$self->{texture} =
460	new CFClient::Texture
461	w => $w,
462	h => $h,
463	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
464	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
465	}
466
467	$self->{texture}->draw_quad (0, 0);	677	$self->{texture}->draw_quad (0, 0);
468		678
469	glDisable GL_TEXTURE_2D;	679	glDisable GL_TEXTURE_2D;
470		680
471	glTranslate 0.375, 0.375;	681	glTranslate 0.375, 0.375;
472
473	#TODO: map scale is completely borked
474
475	my $x0 = int $ox - $sx + 0.5;
476	my $y0 = int $oy - $sy + 0.5;
477		682
478	glColor 1, 1, 0, 1;	683	glColor 1, 1, 0, 1;
479	glBegin GL_LINE_LOOP;	684	glBegin GL_LINE_LOOP;
480	glVertex $x0 , $y0 ;	685	glVertex $self->{x0} , $self->{y0} ;
481	glVertex $x0 , $y0 + $sh;	686	glVertex $self->{x0} , $self->{y0} + $self->{sh};
482	glVertex $x0 + $sw, $y0 + $sh;	687	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
483	glVertex $x0 + $sw, $y0 ;	688	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
484	glEnd;	689	glEnd;
485		690
486	glDisable GL_BLEND;	691	glDisable GL_BLEND;
487	}	692	}
488		693
489	package CFClient::MapWidget::Command;	694	package DC::MapWidget::Command;
490		695
491	use strict;	696	use common::sense;
492		697
493	use CFClient::OpenGL;	698	use DC::OpenGL;
494		699
495	our @ISA = CFClient::UI::Frame::;	700	our @ISA = DC::UI::Frame::;
496		701
497	sub new {	702	sub new {
498	my $class = shift;	703	my $class = shift;
499		704
500	my $self = $class->SUPER::new (	705	my $self = $class->SUPER::new (
		706	min_w => $::WIDTH * 0.25, # workaround for layout problems #d#
501	bg => [0, 0, 0, 0.8],	707	bg => [0, 0, 0, 0.8],
502	@_,	708	@_,
503	);	709	);
504		710
505	$self->add ($self->{vbox} = new CFClient::UI::VBox);	711	$self->add ($self->{vbox} = new DC::UI::VBox);
506		712
507	$self->{label} = [	713	$self->{label} = [
508	map	714	map
509	CFClient::UI::Label->new (	715	DC::UI::Label->new (
		716	align => 0,
510	can_hover => 1,	717	can_hover => 1,
511	can_events => 1,	718	can_events => 1,
512	tooltip_width => 0.33,	719	tooltip_width => 0.33,
513	fontsize => $_,	720	fontsize => $_,
514	), (0.8) x 16	721	), (0.8) x 16
515	];	722	];
516		723
517	$self->{entry} = new CFClient::UI::Entry	724	$self->{entry} = new DC::UI::Entry
518	on_changed => sub {	725	on_changed => sub {
519	$self->update_labels;	726	$self->update_labels;
520	0	727	0
521	},	728	},
522	on_button_down => sub {	729	on_button_down => sub {
523	my ($entry, $ev, $x, $y) = @_;	730	my ($entry, $ev, $x, $y) = @_;
524		731
525	if ($ev->{button} == 3) {	732	if ($ev->{button} == 3) {
526	(new CFClient::UI::Menu	733	(new DC::UI::Menu
527	items => [	734	items => [
528	["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key"	735	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
529	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	736	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
530	],	737	],
531	)->popup ($ev);	738	)->popup ($ev);
532	return 1;	739	return 1;
533	}	740	}
534	0	741	0
…		…
549	$self->hide;	756	$self->hide;
550	}	757	}
551	} elsif ($ev->{sym} == 27) {	758	} elsif ($ev->{sym} == 27) {
552	$self->{hist_ptr} = 0;	759	$self->{hist_ptr} = 0;
553	$self->hide;	760	$self->hide;
554	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {	761	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
555	if ($self->{hist_ptr} > 1) {	762	if ($self->{hist_ptr} > 1) {
556	$self->{hist_ptr}--;	763	$self->{hist_ptr}--;
557	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	764	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
558	} elsif ($self->{hist_ptr} > 0) {	765	} elsif ($self->{hist_ptr} > 0) {
559	$self->{hist_ptr}--;	766	$self->{hist_ptr}--;
…		…
561	} else {	768	} else {
562	++$self->{select_offset}	769	++$self->{select_offset}
563	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	770	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
564	}	771	}
565	$self->update_labels;	772	$self->update_labels;
566	} elsif ($ev->{sym} == CFClient::SDLK_UP) {	773	} elsif ($ev->{sym} == DC::SDLK_UP) {
567	if ($self->{select_offset}) {	774	if ($self->{select_offset}) {
568	--$self->{select_offset}	775	--$self->{select_offset}
569	} else {	776	} else {
570	unless ($self->{hist_ptr}) {	777	unless ($self->{hist_ptr}) {
571	$self->{hist_saveback} = $self->{entry}->get_text;	778	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
591	);	798	);
592		799
593	$self	800	$self
594	}	801	}
595		802
		803	sub reset {
		804	my ($self) = @_;
		805
		806	$self->hide;
		807	delete $self->{command_list};
		808	}
		809
596	sub set_prefix {	810	sub set_prefix {
597	my ($self, $prefix) = @_;	811	my ($self, $prefix) = @_;
598		812
599	$self->{entry}->set_text ($prefix);	813	$self->{entry}->set_text ($prefix);
600	$self->show;	814	$self->show;
…		…
616	}	830	}
617		831
618	sub hide {	832	sub hide {
619	my ($self) = @_;	833	my ($self) = @_;
620		834
		835	$self->{hist_ptr} = 0;
		836
621	$self->SUPER::hide;	837	$self->SUPER::hide;
622	$self->{entry}->set_text ("");	838	$self->{entry}->set_text ("");
623	}	839	}
624		840
625	sub invoke_key_down {	841	sub inject_key_down {
626	my ($self, $ev) = @_;	842	my ($self, $ev) = @_;
627		843
		844	$self->{entry}->grab_focus;
628	$self->{entry}->emit (key_down => $ev)	845	$self->{entry}->emit (key_down => $ev);
629	}	846	}
630		847
631	sub update_labels {	848	sub update_labels {
632	my ($self) = @_;	849	my ($self) = @_;
633		850
634	my $text = $self->{entry}->get_text;	851	my $text = $self->{entry}->get_text;
635		852
636	length $text	853	length $text
637	or return $self->hide;	854	or return $self->hide;
638		855
639	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;	856	return unless $::CONN;
		857
		858	# regenerate spell list if necessary
		859	$self->{command_list}{spells} \|\|= [
		860	map { ("cast $_->{name}", "invoke $_->{name}") }
		861	values %{ $::CONN->{spell} }
		862	];
640		863
641	if ($text ne $self->{last_search}) {	864	if ($text ne $self->{last_search}) {
642	my @match;	865	my @match;
643		866
644	if ($text =~ /^(.*?)\s+$/) {	867	if ($text =~ /^(.*?)\s+$/) {
		868	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
645	@match = [$cmd, "(appended whitespace suppresses completion)"];	869	@match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
646	} else {	870	} else {
		871	# @match is [command, penalty, command with arguments] until sort
		872
		873	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		874
		875	my $first_char = substr $cmd, 0, 1;
		876
647	my $regexp = do {	877	my $regexp_abbrev = do {
648	my ($beg, @chr) = split //, lc $cmd;	878	my ($beg, @chr) = split //, lc $cmd;
649		879
650	# the following regex is used to match our "completion entry"	880	# the following regex is used to match our "completion entry"
651	# to an actual command - the parentheses match kind of "overhead"	881	# to an actual command - the parentheses match kind of "overhead"
652	# - the more characters the parentheses match, the less attractive	882	# - the more characters the parentheses match, the less attractive
653	# is the match.	883	# is the match.
654	my $regexp = "^\Q$beg\E"	884	my $regexp = "^\Q$beg\E"
655	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;	885	. join "", map "(?:.?[ _\-]\|(.?))\Q$_\E", @chr;
656	qr<$regexp>	886	qr<$regexp>
657	};	887	};
658		888
659	my @penalty;	889	my $regexp_partial = do {
		890	my $regexp = "^\Q$text\E(.*)";
		891	qr<$regexp>
		892	};
660		893
661	for (keys %{$self->{command}}) {	894	for my $list (values %{ $self->{command_list} }) {
		895	for (@$list) {
		896	# we only match and score if the first character matches,
		897	# so quickly rule out all others first.
		898	next unless $first_char = substr $_, 0, 1;
		899
		900	my @scores;
		901
		902	# 1. Complete command [with args]
		903	# command is a prefix of the text
		904	# score is length of complete command matched
		905	# e.g. "invoke summon pet monster bat"
		906	# "invoke" "summon pet monster bat" = 6
		907	# "invoke summon pet monster" "bat" = 25
		908	if ((substr $text, 0, length $_) eq $_) {
		909	push @scores, [$_, length $_, $text];
		910	}
		911
		912	# 2. Partial command
		913	# text is a prefix of the full command
		914	# score is the length of the input text
		915	# e.g. "invoke s"
		916	# "invoke small fireball" = 8
		917	# "invoke summon pet monster" = 8
		918
		919	if ($_ =~ $regexp_partial) {
		920	push @scores, [$_, length $text, $_];
		921	}
		922
		923	# 3. Abbreviation match
		924	# attempts to use first word of text as an abbreviated command
		925	# score is length of word + 1 - 3 per non-word-initial character
		926
662	if (@penalty = $_ =~ $regexp) {	927	if (my @penalty = $_ =~ $regexp_abbrev) {
663	push @match, [$_, length join "", map "::$_", grep defined, @penalty];	928	push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
		929	}
		930
		931	# Pick the best option for this command
		932	push @match, (sort {
		933	$b->[1] <=> $a->[1]
		934	} @scores)[0];
664	}	935	}
665	}	936	}
666		937
		938	# @match is now [command object, command with arguments]
667	@match = map $self->{command}{$_->[0]},	939	@match = map [$self->{command}{$_->[0]}, $_->[2]],
668	sort {	940	sort {
669	$a->[1] <=> $b->[1]	941	$b->[1] <=> $a->[1]
670	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]	942	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
671	or (length $b->[0]) <=> (length $a->[0])	943	or (length $b->[0]) <=> (length $a->[0])
672	} @match;	944	} @match;
673	}	945	}
674		946
…		…
693	$label->{fg} = [1, 1, 1, 1];	965	$label->{fg} = [1, 1, 1, 1];
694	$label->{bg} = [0, 0, 0, 0];	966	$label->{bg} = [0, 0, 0, 0];
695	}	967	}
696		968
697	if (@matches) {	969	if (@matches) {
698	$self->{select} = "$matches[0][0]$arg";	970	$self->{select} = "$matches[0][1]";
699		971
700	$labels[0]->{fg} = [0, 0, 0, 1];	972	$labels[0]->{fg} = [0, 0, 0, 1];
701	$labels[0]->{bg} = [1, 1, 1, 0.8];	973	$labels[0]->{bg} = [1, 1, 1, 0.8];
702	} else {	974	} else {
703	$self->{select} = "$cmd$arg";	975	$self->{select} = "$text";
704	}	976	}
705		977
706	for my $match (@matches) {	978	for my $match (@matches) {
707	my $label = shift @labels;	979	my $label = shift @labels;
708		980
709	if (@labels) {	981	if (@labels) {
710	$label->set_text ("$match->[0]$arg");	982	$label->set_text ("$match->[1]");
711	$label->set_tooltip ($match->[1]);	983	$label->set_tooltip ("$match->[0][1]");
712	} else {	984	} else {
713	$label->set_text ("...");	985	$label->set_text ("...");
714	$label->set_tooltip ("Use Cursor-Down to view more matches");	986	$label->set_tooltip ("Use Cursor-Down to view more matches");
715	last;	987	last;
716	}	988	}
…		…
726		998
727	sub _draw {	999	sub _draw {
728	my ($self) = @_;	1000	my ($self) = @_;
729		1001
730	# hack	1002	# hack
731	local $CFClient::UI::FOCUS = $self->{entry};	1003	local $DC::UI::FOCUS = $self->{entry};
732		1004
733	$self->SUPER::_draw;	1005	$self->SUPER::_draw;
734	}	1006	}
735		1007
736	1	1008	1
		1009

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.74 by root, Sun Jul 16 23:30:08 2006 UTC vs. Revision 1.169 by root, Sun Nov 25 14:37:18 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.74 by root, Sun Jul 16 23:30:08 2006 UTC vs.
Revision 1.169 by root, Sun Nov 25 14:37:18 2012 UTC