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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.100 by pippijn, Tue Jan 2 14:45:22 2007 UTC vs.
Revision 1.171 by root, Mon Nov 26 13:14:43 2012 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.100 by pippijn, Tue Jan 2 14:45:22 2007 UTC vs. Revision 1.171 by root, Mon Nov 26 13:14:43 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.100 by pippijn, Tue Jan 2 14:45:22 2007 UTC vs.
Revision 1.171 by root, Mon Nov 26 13:14:43 2012 UTC