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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.83 by root, Sun Oct 1 14:48:51 2006 UTC vs.
Revision 1.166 by root, Sat Nov 10 18:29:32 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;
		12	use DC::Macro;
11		13
12	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;
13		20
14	my $magicmap_tex =	21	my $magicmap_tex =
15	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",	22	new_from_resource DC::Texture "magicmap.png",
16	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;	23	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17		24
18	sub new {	25	sub new {
19	my $class = shift;	26	my $class = shift;
20		27
21	my $self = $class->SUPER::new (	28	my $self = $class->SUPER::new (
22	z => -1,	29	z => -1,
23	can_focus => 1,	30	can_focus => 1,
24	list => glGenList,	31	tilesize => 32,
25
26	smooth_matrix => [
27	0.05, 0.13, 0.05,
28	0.13, 0.30, 0.13,
29	0.05, 0.13, 0.05,
30	],
31
32	@_	32	@_
33	);	33	);
34
35	$self->{completer} = new CFPlus::MapWidget::Command::
36	command => $self->{command},
37	tooltip => "#completer_help",
38	;
39		34
40	$self	35	$self
41	}	36	}
42		37
43	sub add_command {	38	sub add_command {
47		42
48	$tooltip =~ s/^\s+//;	43	$tooltip =~ s/^\s+//;
49	$tooltip = "<big>$data</big>\n\n$tooltip";	44	$tooltip = "<big>$data</big>\n\n$tooltip";
50	$tooltip =~ s/\s+$//;	45	$tooltip =~ s/\s+$//;
51		46
52	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	47	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53	}	48	}
54		49
55	sub clr_commands {	50	sub clr_commands {
56	my ($self) = @_;	51	my ($self) = @_;
57		52
58	%{$self->{completer}{command}} = ();	53	%{$::COMPLETER->{command}} = ();
59		54
60	$self->{completer}->hide	55	$::COMPLETER->hide
61	if $self->{completer};	56	if $::COMPLETER;
62	}	57	}
63		58
64	sub test_server_login {	59	sub server_login {
65	return unless	60	my ($server) = @_;
66	$::CONN && length $::CONN->{test_server};
67		61
68	my $server = $::CONN->{test_server};
69	::stop_game ();	62	::stop_game ();
70	local $::PROFILE->{host} = $server;	63	local $::PROFILE->{host} = $server;
71	::start_game ();	64	::start_game ();
72	}	65	}
73		66
74	sub editor_invoke {	67	sub editor_invoke {
75	return unless $::CONN;	68	my $editsup = $::CONN && $::CONN->{editor_support}
		69	or return;
76		70
77	# putting the password into the env is somewhat tasteless	71	DC::background {
78	local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};	72	print "preparing editor startup...\n";
79	local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password};
80	local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload};
81	local $ENV{CROSSFIRE_MAPDIR} = $::CONN->{cvs_root};
82		73
83	# CFPlus::set_proxy;	74	my $server = $editsup->{gameserver} \|\| "default";
		75	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
84		76
85	# TODO: move into editor	77	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
86	require LWP::Simple;	78	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
		79
		80	print "map directory is $mapdir\n";
		81	print "lib directory is $libdir\n";
		82
		83	my $ua = DC::lwp_useragent;
		84
		85	for my $file (qw(archetypes crossfire.0)) {
		86	my $url = "$editsup->{lib_root}$file";
		87	print "mirroring $url...\n";
		88	DC::lwp_check $ua->mirror ($url, "$libdir/$file");
		89	printf "%s size %d octets\n", $file, -s "$libdir/$file";
		90	}
		91
		92	if (1) { # upload a map
		93	my $mapname = $::CONN->{map_info}[0];
		94
		95	my $mappath = "$mapdir/$mapname";
		96
		97	-e $mappath and die "$mappath already exists\n";
		98
		99	print "getting map revision for $mapname...\n";
		100
		101	# try to get the most recent head revision, what a hack,
		102	# this should have been returned while downloading sigh
		103	my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
		104
		105	if ($log =~ /\?rev=(\d+\.\d+)"/) {
		106	my $rev = $1;
		107
		108	print "downloading revision $rev...\n";
		109
		110	my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
		111
		112	my $meta = {
		113	%$editsup,
		114	path => $mapname,
		115	revision => $rev,
		116	cf_login => $::PROFILE->{user},
		117	};
		118
		119	require File::Basename;
		120	require File::Path;
		121
		122	File::Path::mkpath (File::Basename::dirname ($mappath));
		123	open my $fh, ">:raw:perlio", "$mappath.meta"
		124	or die "$mappath.meta: $!\n";
		125	print $fh DC::encode_json $meta;
		126	close $fh;
		127	open my $fh, ">:raw:perlio:utf8", $mappath
		128	or die "$mappath: $!\n";
		129	print $fh $map;
		130	close $fh;
		131
		132	print "saved as $mappath\n";
		133
		134	print "invoking editor...\n";
		135	exec "/root/s2/gce $mappath";#d#
		136
		137	# now upload it
		138	# require HTTP::Request::Common;
		139	#
		140	# my $res = $ua->post (
		141	# $ENV{CFPLUS_UPLOAD},
		142	# Content_Type => 'multipart/form-data',
		143	# Content => [
		144	# path => $mapname,
		145	# mapdir => $ENV{CROSSFIRE_MAPDIR},
		146	# map => $map,
		147	# revision => $rev,
		148	# cf_login => $ENV{CFPLUS_LOGIN},
		149	# cf_password => $ENV{CFPLUS_PASSWORD},
		150	# comment => "",
		151	# ]
		152	# );
		153	#
		154	# if ($res->is_error) {
		155	# # fatal condition
		156	# warn $res->status_line;
		157	# } else {
		158	# # script replies are marked as {{..}}
		159	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
		160	# warn map "$_\n", @msgs;
		161	# }
		162	} else {
		163	die "viewvc parse error, unable to detect revision\n";
		164	}
		165	}
		166	}
87	}	167	}
88		168
89	sub invoke_button_down {	169	sub invoke_button_down {
90	my ($self, $ev, $x, $y) = @_;	170	my ($self, $ev, $x, $y) = @_;
91		171
92	if ($ev->{button} == 1) {	172	if ($ev->{button} == 1) {
93	$self->grab_focus;	173	$self->grab_focus;
94	return unless $::CONN;	174	return unless $::CONN && $self->{ctilesize};
95		175
96	my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	176	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
97	my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	177	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
98		178
99	$x -= int 0.5 * $self->{sw};	179	$x -= DC::floor $::MAP->w * 0.5;
100	$y -= int 0.5 * $self->{sh};	180	$y -= DC::floor $::MAP->h * 0.5;
101		181
		182	if ($::CONN) {
102	$::CONN->lookat ($x, $y)	183	$::CONN->lookat ($x, $y)
103	if $::CONN;	184	}
104		185
105	} elsif ($ev->{button} == 2) {	186	} elsif ($ev->{button} == 2) {
106	$self->grab_focus;	187	$self->grab_focus;
107	return unless $::CONN;	188	return unless $::CONN;
108		189
…		…
118	$::CFG->{map_shift_y} = $bh + $y - $oy;	199	$::CFG->{map_shift_y} = $bh + $y - $oy;
119		200
120	$self->update;	201	$self->update;
121	};	202	};
122	} elsif ($ev->{button} == 3) {	203	} elsif ($ev->{button} == 3) {
123	(new CFPlus::UI::Menu	204	my @items = (
124	items => [
125	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],	205	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
126	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	206	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
127	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	207	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
128	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	208	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
129	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	209	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
130	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],	210	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
131	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],	211	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
132	[	212	);
133	$::PICKUP_ENABLE->{state}	213
134	? "Disable automatic pickup"	214	if ($::CONN && $::CONN->{editor_support}) {
135	: "Enable automatic pickup",	215	# push @items, [
136	sub { $::PICKUP_ENABLE->toggle }	216	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
		217	# \&editor_invoke,
		218	# ];
		219
		220	for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
		221	$::CONN->{editor_support}{servertype} ne $type
		222	or next;
		223	my $server = $::CONN->{editor_support}{"${type}server"}
		224	or next;
		225
		226	push @items, [
		227	"Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
		228	sub { server_login $server },
137	],	229	];
138	$::CONN && length $::CONN->{cvs_root}	230	}
139	? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", \&editor_invoke]	231	}
140	: (),	232
141	$::CONN && length $::CONN->{test_server}	233	push @items,
142	? ["Login on Test Server", \&test_server_login]
143	: (),
144	["Quit",	234	["Quit",
145	sub {	235	sub {
146	if ($::CONN) {	236	if ($::CONN) {
147	&::open_quit_dialog;	237	&::open_quit_dialog;
148	} else {	238	} else {
149	exit;	239	exit;
150	}
151	}	240	}
152	],	241	}
153	],	242	],
		243	;
		244
		245	(new DC::UI::Menu
		246	items => \@items,
154	)->popup ($ev);	247	)->popup ($ev);
155	}	248	}
156		249
157	1	250	1
158	}	251	}
…		…
176		269
177	1	270	1
178	}	271	}
179		272
180	sub size_request {	273	sub size_request {
		274	my ($self) = @_;
		275
181	(	276	(
182	32 * CFPlus::ceil $::WIDTH / 32,	277	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
183	32 * CFPlus::ceil $::HEIGHT / 32,	278	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
184	)	279	)
185	}	280	}
186		281
187	sub update {	282	sub update {
188	my ($self) = @_;	283	my ($self) = @_;
…		…
190	$self->{need_update} = 1;	285	$self->{need_update} = 1;
191	$self->SUPER::update;	286	$self->SUPER::update;
192	}	287	}
193		288
194	my %DIR = (	289	my %DIR = (
195	CFPlus::SDLK_KP8, [1, "north"],	290	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
		291	( "," . DC::SDLK_KP8 ), [1, "north"],
196	CFPlus::SDLK_KP9, [2, "northeast"],	292	( "," . DC::SDLK_KP9 ), [2, "northeast"],
197	CFPlus::SDLK_KP6, [3, "east"],	293	( "," . DC::SDLK_KP6 ), [3, "east"],
198	CFPlus::SDLK_KP3, [4, "southeast"],	294	( "," . DC::SDLK_KP3 ), [4, "southeast"],
199	CFPlus::SDLK_KP2, [5, "south"],	295	( "," . DC::SDLK_KP2 ), [5, "south"],
200	CFPlus::SDLK_KP1, [6, "southwest"],	296	( "," . DC::SDLK_KP1 ), [6, "southwest"],
201	CFPlus::SDLK_KP4, [7, "west"],	297	( "," . DC::SDLK_KP4 ), [7, "west"],
202	CFPlus::SDLK_KP7, [8, "northwest"],	298	( "," . DC::SDLK_KP7 ), [8, "northwest"],
203		299
204	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"],
205	CFPlus::SDLK_RIGHT, [3, "east"],	307	( "," . DC::SDLK_RIGHT ), [3, "east"],
206	CFPlus::SDLK_DOWN, [5, "south"],	308	("1," . DC::SDLK_RIGHT ), [4, "southeast"],
207	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"],
208	);	313	);
209		314
210	sub invoke_key_down {	315	sub invoke_key_down {
211	my ($self, $ev) = @_;	316	my ($self, $ev) = @_;
212		317
213	my $mod = $ev->{mod};	318	my $mod = $ev->{mod};
214	my $sym = $ev->{sym};	319	my $sym = $ev->{sym};
215	my $uni = $ev->{unicode};	320	my $uni = $ev->{unicode};
216		321
217	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	322	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_META \| DC::KMOD_SHIFT;
218		323
219	if ($uni == ord "\t") {	324	# ignore repeated keypresses
220	$::PL_WINDOW->toggle_visibility;	325	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
221	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {	326	$self->{last_mod} = $mod;
222	$::HELP_WINDOW->toggle_visibility;	327	$self->{last_sym} = $sym;
223	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
224	::toggle_player_page ($::STATS_PAGE);
225	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
226	::toggle_player_page ($::SKILL_PAGE);
227	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
228	::toggle_player_page ($::SPELL_PAGE);
229	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
230	::toggle_player_page ($::INVENTORY_PAGE);
231	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
232	$::SETUP_DIALOG->toggle_visibility;
233	} elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
234	$::BIND_EDITOR->set_binding (undef, undef, [],
235	sub {
236	my ($mod, $sym, $cmds) = @_;
237	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
238	});
239	$::BIND_EDITOR->start;
240	$::BIND_EDITOR->show;
241	#TODO: elmex, what was this supposed to do? it currently crashes the client.
242	# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
243	# $::BIND_EDITOR->stop;
244	# $::BIND_EDITOR->ask_for_bind_and_commit;
245	# $::BIND_EDITOR->hide;
246	} elsif (!$::CONN) {
247	return 0; # bindings further down need a valid connection
248		328
249	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {	329	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
250	$::CONN->user_send ("stay fire");	330
251	} elsif ($uni == ord ",") {	331	if ($::CONN && $dir) {
252	$::CONN->user_send ("take");
253	} elsif ($uni == ord " ") {
254	$::CONN->user_send ("apply");
255	} elsif ($uni == 13) {
256	$::CONN->user_send ("examine");
257	} elsif ($uni == ord ".") {
258	$::CONN->user_send ($self->{completer}{last_command})
259	if exists $self->{completer}{last_command};
260	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
261	$::CONN->user_send ($_) for @$bind_cmd;
262	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
263	$::CONN->user_send ("rotateshoottype +");
264	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
265	$::CONN->user_send ("rotateshoottype -");
266	} elsif ($uni == ord '"') {
267	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
268	$self->{completer}->show;
269	} elsif ($uni == ord "'") {
270	$self->{completer}->set_prefix ("");
271	$self->{completer}->show;
272	} elsif (exists $DIR{$sym}) {
273	if ($mod & CFPlus::KMOD_SHIFT) {	332	if ($mod & DC::KMOD_SHIFT) {
274	$self->{shft}++;	333	$self->{shft}++;
275	if ($DIR{$sym}[0] != $self->{fire_dir}) {	334	if ($dir->[0] != $self->{fire_dir}) {
276	$::CONN->user_send ("fire $DIR{$sym}[0]");	335	$::CONN->user_send ("fire $dir->[0]");
277	}	336	}
278	$self->{fire_dir} = $DIR{$sym}[0];	337	$self->{fire_dir} = $dir->[0];
279	} elsif ($mod & CFPlus::KMOD_CTRL) {	338	} elsif ($mod & DC::KMOD_CTRL) {
280	$self->{ctrl}++;	339	$self->{ctrl}++;
281	$::CONN->user_send ("run $DIR{$sym}[0]");	340	$::CONN->user_send ("run $dir->[0]");
282	} else {	341	} else {
283	$::CONN->user_send ("$DIR{$sym}[1]");	342	$::CONN->user_send ("$dir->[1]");
284	}	343	}
285	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	344
286	$self->{completer}->inject_key_down ($ev);
287	$self->{completer}->show;
288	} else {
289	return 0;	345	return 1;
290	}
291
292	1	346	}
		347
		348	0
293	}	349	}
294		350
295	sub invoke_key_up {	351	sub invoke_key_up {
296	my ($self, $ev) = @_;	352	my ($self, $ev) = @_;
297		353
298	my $res = 0;	354	my $res = 0;
299	my $mod = $ev->{mod};	355	my $mod = $ev->{mod};
300	my $sym = $ev->{sym};	356	my $sym = $ev->{sym};
301		357
		358	delete $self->{last_mod};
		359	delete $self->{last_sym};
		360
302	if ($::CFG->{shift_fire_stop}) {	361	if ($::CFG->{shift_fire_stop}) {
303	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {	362	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
304	$::CONN->user_send ("fire_stop");	363	$::CONN->user_send ("fire_stop");
305	delete $self->{fire_dir};	364	delete $self->{fire_dir};
306	$res = 1;	365	$res = 1;
307	}	366	}
308	} else {	367	} else {
		368	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		369
309	if (exists $DIR{$sym} && delete $self->{shft}) {	370	if ($dir && delete $self->{shft}) {
310	$::CONN->user_send ("fire_stop");	371	$::CONN->user_send ("fire_stop");
311	delete $self->{fire_dir};	372	delete $self->{fire_dir};
312	$res = 1;	373	$res = 1;
313	} 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?
314	$::CONN->user_send ("fire_stop");	376	$::CONN->user_send ("fire_stop");
315	delete $self->{fire_dir};	377	delete $self->{fire_dir};
316	$res = 1;	378	$res = 1;
317	}	379	}
318	}	380	}
319		381
320	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {	382	if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
321	$::CONN->user_send ("run_stop");	383	$::CONN->user_send ("run_stop");
322	$res = 1;	384	$res = 1;
323	}	385	}
324		386
325	$res	387	$res
326	}	388	}
327		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
328	sub set_magicmap {	422	sub set_magicmap {
329	my ($self, $w, $h, $x, $y, $data) = @_;	423	my ($self, $w, $h, $x, $y, $data) = @_;
330		424
331	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	425	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
332	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	426	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
333		427
334	$self->{magicmap} = [$x, $y, $w, $h, $data];	428	$self->{magicmap} = [$x, $y, $w, $h, $data];
335		429
336	$self->update;	430	$self->update;
337	}	431	}
338		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
339	sub draw {	574	sub draw {
340	my ($self) = @_;	575	my ($self) = @_;
341		576
342	return unless $::MAP;	577	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
343		578
		579	return unless $self->{list};
		580
344	my $focused = $CFPlus::UI::FOCUS == $self	581	my $focused = $DC::UI::FOCUS == $self
345	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	582	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
346		583
347	return	584	return
348	unless $focused \|\| !$::FAST;	585	unless $focused \|\| !$::FAST;
349		586
350	if (delete $self->{need_update}) {
351	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
352
353	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
354	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
355
356	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
357	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
358
359	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
360	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
361
362	if ($::CFG->{fow_enable}) {
363	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
364
365	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
366	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
367	glConvolutionFilter2D (
368	GL_CONVOLUTION_2D,
369	GL_ALPHA,
370	3, 3,
371	GL_ALPHA, GL_FLOAT,
372	(pack "f*", @{ $self->{smooth_matrix} }),
373	);
374	glEnable GL_CONVOLUTION_2D;
375	}
376
377	$self->{fow_texture} = new CFPlus::Texture
378	w => $w,
379	h => $h,
380	data => $data,
381	internalformat => GL_ALPHA,
382	format => GL_ALPHA;
383
384	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
385	} else {
386	delete $self->{fow_texture};
387	}
388
389	glNewList $self->{list};
390
391	glPushMatrix;
392	glTranslate $sx0, $sy0;
393	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
394
395	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
396
397	glScale 32, 32;
398
399	if (my $tex = $self->{fow_texture}) {
400	glEnable GL_TEXTURE_2D;
401	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
402
403	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
404	$self->{fow_texture}->draw_quad_alpha (0, 0);
405
406	glDisable GL_TEXTURE_2D;
407	}
408
409	if ($self->{magicmap}) {
410	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
411
412	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
413	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
414
415	glTranslate - $x - 1, - $y - 1;
416	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
417	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
418	}
419
420	glPopMatrix;
421	glEndList;
422	}
423
424	glCallList $self->{list};	587	glCallList $self->{list};
425		588
426	# TNT2 emulates logops in software (or worse :)	589	# TNT2 emulates logops in software (or worse :)
427	unless ($focused) {	590	unless ($focused) {
428	glColor 0.4, 0.2, 0.2, 0.6;	591	glColor_premultiply 0, 0, 1, 0.25;
429	glEnable GL_BLEND;	592	glEnable GL_BLEND;
430	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	593	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
431	glBegin GL_QUADS;	594	glBegin GL_QUADS;
432	glVertex 0, 0;	595	glVertex 0, 0;
433	glVertex 0, $::HEIGHT;	596	glVertex 0, $::HEIGHT;
434	glVertex $::WIDTH, $::HEIGHT;	597	glVertex $::WIDTH, $::HEIGHT;
435	glVertex $::WIDTH, 0;	598	glVertex $::WIDTH, 0;
…		…
444	glDeleteList $self->{list};	607	glDeleteList $self->{list};
445		608
446	$self->SUPER::DESTROY;	609	$self->SUPER::DESTROY;
447	}	610	}
448		611
449	package CFPlus::MapWidget::MapMap;	612	package DC::MapWidget::MapMap;
450		613
		614	use common::sense;
		615
451	our @ISA = CFPlus::UI::Base::;	616	our @ISA = DC::UI::Base::;
452		617
453	use Time::HiRes qw(time);
454	use CFPlus::OpenGL;	618	use DC::OpenGL;
455		619
456	sub size_request {	620	sub size_request {
457	($::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
458	}	669	}
459		670
460	sub invoke_size_allocate {	671	sub invoke_size_allocate {
461	my ($self, $w, $h) = @_;	672	my ($self, $w, $h) = @_;
462		673
…		…
473	}	684	}
474		685
475	sub _draw {	686	sub _draw {
476	my ($self) = @_;	687	my ($self) = @_;
477		688
478	$::MAP or return;	689	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
479		690
480	my ($w, $h) = @$self{qw(w h)};	691	$self->{texture} or return;
481
482	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
483	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
484
485	my $sx = int $::CFG->{map_shift_x} / 32;
486	my $sy = int $::CFG->{map_shift_y} / 32;
487
488	my $ox = 0.5 * ($w - $sw);
489	my $oy = 0.5 * ($h - $sh);
490		692
491	glEnable GL_BLEND;	693	glEnable GL_BLEND;
492	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	694	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
493	glEnable GL_TEXTURE_2D;	695	glEnable GL_TEXTURE_2D;
494	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
495		697
496	if ($self->{texture_atime} < time) {
497	$self->{texture_atime} = time + 1/3;
498
499	$self->{texture} =
500	new CFPlus::Texture
501	w => $w,
502	h => $h,
503	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
504	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
505	}
506
507	$self->{texture}->draw_quad (0, 0);	698	$self->{texture}->draw_quad (0, 0);
508		699
509	glDisable GL_TEXTURE_2D;	700	glDisable GL_TEXTURE_2D;
510		701
511	glTranslate 0.375, 0.375;	702	glTranslate 0.375, 0.375;
512
513	#TODO: map scale is completely borked
514
515	my $x0 = int $ox - $sx + 0.5;
516	my $y0 = int $oy - $sy + 0.5;
517		703
518	glColor 1, 1, 0, 1;	704	glColor 1, 1, 0, 1;
519	glBegin GL_LINE_LOOP;	705	glBegin GL_LINE_LOOP;
520	glVertex $x0 , $y0 ;	706	glVertex $self->{x0} , $self->{y0} ;
521	glVertex $x0 , $y0 + $sh;	707	glVertex $self->{x0} , $self->{y0} + $self->{sh};
522	glVertex $x0 + $sw, $y0 + $sh;	708	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
523	glVertex $x0 + $sw, $y0 ;	709	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
524	glEnd;	710	glEnd;
525		711
526	glDisable GL_BLEND;	712	glDisable GL_BLEND;
527	}	713	}
528		714
529	package CFPlus::MapWidget::Command;	715	package DC::MapWidget::Command;
530		716
531	use strict;	717	use common::sense;
532		718
533	use CFPlus::OpenGL;	719	use DC::OpenGL;
534		720
535	our @ISA = CFPlus::UI::Frame::;	721	our @ISA = DC::UI::Frame::;
536		722
537	sub new {	723	sub new {
538	my $class = shift;	724	my $class = shift;
539		725
540	my $self = $class->SUPER::new (	726	my $self = $class->SUPER::new (
541	bg => [0, 0, 0, 0.8],	727	bg => [0, 0, 0, 0.8],
542	@_,	728	@_,
543	);	729	);
544		730
545	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	731	$self->add ($self->{vbox} = new DC::UI::VBox);
546		732
547	$self->{label} = [	733	$self->{label} = [
548	map	734	map
549	CFPlus::UI::Label->new (	735	DC::UI::Label->new (
		736	align => 0,
550	can_hover => 1,	737	can_hover => 1,
551	can_events => 1,	738	can_events => 1,
552	tooltip_width => 0.33,	739	tooltip_width => 0.33,
553	fontsize => $_,	740	fontsize => $_,
554	), (0.8) x 16	741	), (0.8) x 16
555	];	742	];
556		743
557	$self->{entry} = new CFPlus::UI::Entry	744	$self->{entry} = new DC::UI::Entry
558	on_changed => sub {	745	on_changed => sub {
559	$self->update_labels;	746	$self->update_labels;
560	0	747	0
561	},	748	},
562	on_button_down => sub {	749	on_button_down => sub {
563	my ($entry, $ev, $x, $y) = @_;	750	my ($entry, $ev, $x, $y) = @_;
564		751
565	if ($ev->{button} == 3) {	752	if ($ev->{button} == 3) {
566	(new CFPlus::UI::Menu	753	(new DC::UI::Menu
567	items => [	754	items => [
568	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	755	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
569	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	756	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
570	],	757	],
571	)->popup ($ev);	758	)->popup ($ev);
572	return 1;	759	return 1;
573	}	760	}
574	0	761	0
…		…
589	$self->hide;	776	$self->hide;
590	}	777	}
591	} elsif ($ev->{sym} == 27) {	778	} elsif ($ev->{sym} == 27) {
592	$self->{hist_ptr} = 0;	779	$self->{hist_ptr} = 0;
593	$self->hide;	780	$self->hide;
594	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {	781	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
595	if ($self->{hist_ptr} > 1) {	782	if ($self->{hist_ptr} > 1) {
596	$self->{hist_ptr}--;	783	$self->{hist_ptr}--;
597	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	784	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
598	} elsif ($self->{hist_ptr} > 0) {	785	} elsif ($self->{hist_ptr} > 0) {
599	$self->{hist_ptr}--;	786	$self->{hist_ptr}--;
…		…
601	} else {	788	} else {
602	++$self->{select_offset}	789	++$self->{select_offset}
603	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	790	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
604	}	791	}
605	$self->update_labels;	792	$self->update_labels;
606	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {	793	} elsif ($ev->{sym} == DC::SDLK_UP) {
607	if ($self->{select_offset}) {	794	if ($self->{select_offset}) {
608	--$self->{select_offset}	795	--$self->{select_offset}
609	} else {	796	} else {
610	unless ($self->{hist_ptr}) {	797	unless ($self->{hist_ptr}) {
611	$self->{hist_saveback} = $self->{entry}->get_text;	798	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
677	my $text = $self->{entry}->get_text;	864	my $text = $self->{entry}->get_text;
678		865
679	length $text	866	length $text
680	or return $self->hide;	867	or return $self->hide;
681		868
682	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
683
684	if ($text ne $self->{last_search}) {	869	if ($text ne $self->{last_search}) {
685	my @match;	870	my @match;
686		871
687	if ($text =~ /^(.*?)\s+$/) {	872	if ($text =~ /^(.*?)\s+$/) {
		873	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
688	@match = [$cmd, "(appended whitespace suppresses completion)"];	874	@match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
689	} 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
690	my $regexp = do {	882	my $regexp_abbrev = do {
691	my ($beg, @chr) = split //, lc $cmd;	883	my ($beg, @chr) = split //, lc $cmd;
692		884
693	# the following regex is used to match our "completion entry"	885	# the following regex is used to match our "completion entry"
694	# to an actual command - the parentheses match kind of "overhead"	886	# to an actual command - the parentheses match kind of "overhead"
695	# - the more characters the parentheses match, the less attractive	887	# - the more characters the parentheses match, the less attractive
696	# is the match.	888	# is the match.
697	my $regexp = "^\Q$beg\E"	889	my $regexp = "^\Q$beg\E"
698	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;	890	. join "", map "(?:.?[ _\-]\|(.?))\Q$_\E", @chr;
699	qr<$regexp>	891	qr<$regexp>
700	};	892	};
701		893
702	my @penalty;	894	my $regexp_partial = do {
		895	my $regexp = "^\Q$text\E(.*)";
		896	qr<$regexp>
		897	};
703		898
704	for (keys %{$self->{command}}) {	899	for (keys %{$self->{command}}) {
705	if (@penalty = $_ =~ $regexp) {	900	# we only match and score if the first character matches,
706	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];
707	}	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];
708	}	939	}
709		940
		941	# @match is now [command object, command with arguments]
710	@match = map $self->{command}{$_->[0]},	942	@match = map [$self->{command}{$_->[0]}, $_->[2]],
711	sort {	943	sort {
712	$a->[1] <=> $b->[1]	944	$b->[1] <=> $a->[1]
713	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]	945	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
714	or (length $b->[0]) <=> (length $a->[0])	946	or (length $b->[0]) <=> (length $a->[0])
715	} @match;	947	} @match;
716	}	948	}
717		949
…		…
736	$label->{fg} = [1, 1, 1, 1];	968	$label->{fg} = [1, 1, 1, 1];
737	$label->{bg} = [0, 0, 0, 0];	969	$label->{bg} = [0, 0, 0, 0];
738	}	970	}
739		971
740	if (@matches) {	972	if (@matches) {
741	$self->{select} = "$matches[0][0]$arg";	973	$self->{select} = "$matches[0][1]";
742		974
743	$labels[0]->{fg} = [0, 0, 0, 1];	975	$labels[0]->{fg} = [0, 0, 0, 1];
744	$labels[0]->{bg} = [1, 1, 1, 0.8];	976	$labels[0]->{bg} = [1, 1, 1, 0.8];
745	} else {	977	} else {
746	$self->{select} = "$cmd$arg";	978	$self->{select} = "$text";
747	}	979	}
748		980
749	for my $match (@matches) {	981	for my $match (@matches) {
750	my $label = shift @labels;	982	my $label = shift @labels;
751		983
752	if (@labels) {	984	if (@labels) {
753	$label->set_text ("$match->[0]$arg");	985	$label->set_text ("$match->[1]");
754	$label->set_tooltip ($match->[1]);	986	$label->set_tooltip ("$match->[0][1]");
755	} else {	987	} else {
756	$label->set_text ("...");	988	$label->set_text ("...");
757	$label->set_tooltip ("Use Cursor-Down to view more matches");	989	$label->set_tooltip ("Use Cursor-Down to view more matches");
758	last;	990	last;
759	}	991	}
…		…
769		1001
770	sub _draw {	1002	sub _draw {
771	my ($self) = @_;	1003	my ($self) = @_;
772		1004
773	# hack	1005	# hack
774	local $CFPlus::UI::FOCUS = $self->{entry};	1006	local $DC::UI::FOCUS = $self->{entry};
775		1007
776	$self->SUPER::_draw;	1008	$self->SUPER::_draw;
777	}	1009	}
778		1010
779	1	1011	1
		1012

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.83 by root, Sun Oct 1 14:48:51 2006 UTC vs. Revision 1.166 by root, Sat Nov 10 18:29:32 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.83 by root, Sun Oct 1 14:48:51 2006 UTC vs.
Revision 1.166 by root, Sat Nov 10 18:29:32 2012 UTC