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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.102 by root, Sun Apr 1 15:08:14 2007 UTC vs.
Revision 1.167 by root, Tue Nov 20 14:32:12 2012 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.102 by root, Sun Apr 1 15:08:14 2007 UTC vs. Revision 1.167 by root, Tue Nov 20 14:32:12 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.102 by root, Sun Apr 1 15:08:14 2007 UTC vs.
Revision 1.167 by root, Tue Nov 20 14:32:12 2012 UTC