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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.108 by root, Wed Apr 25 01:12:31 2007 UTC vs.
Revision 1.165 by root, Fri Nov 9 22:53:57 2012 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.108 by root, Wed Apr 25 01:12:31 2007 UTC vs. Revision 1.165 by root, Fri Nov 9 22:53:57 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.108 by root, Wed Apr 25 01:12:31 2007 UTC vs.
Revision 1.165 by root, Fri Nov 9 22:53:57 2012 UTC