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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.64 by root, Sun Jun 18 17:23:35 2006 UTC vs.
Revision 1.167 by root, Tue Nov 20 14:32:12 2012 UTC

…		…
1	package CFClient::MapWidget;	1	package DC::MapWidget;
2		2
3	use strict;	3	use common::sense;
4	use utf8;
5		4
6	use List::Util qw(min max);	5	use List::Util qw(min max);
7		6
		7	use AnyEvent ();
		8
		9	use DC;
8	use CFClient::OpenGL;	10	use DC::OpenGL;
		11	use DC::UI;
		12	use DC::Macro;
9		13
10	our @ISA = CFClient::UI::Base::;	14	our @ISA = DC::UI::Base::;
		15
		16	our @TEX_HIDDEN = map {
		17	new_from_resource DC::Texture # MUST be POT
		18	"hidden-$_.png", mipmap => 1, wrap => 1
		19	} 0, 1, 2;
11		20
12	my $magicmap_tex =	21	my $magicmap_tex =
13	new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",	22	new_from_resource DC::Texture "magicmap.png",
14	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;	23	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
15		24
16	sub new {	25	sub new {
17	my $class = shift;	26	my $class = shift;
18		27
19	my $self = $class->SUPER::new (	28	my $self = $class->SUPER::new (
20	z => -1,	29	z => -1,
21	can_focus => 1,	30	can_focus => 1,
22	list => glGenList,	31	tilesize => 32,
23
24	smooth_matrix => [
25	0.05, 0.13, 0.05,
26	0.13, 0.30, 0.13,
27	0.05, 0.13, 0.05,
28	],
29
30	@_	32	@_
31	);	33	);
32		34
33	$self->{completer} = new CFClient::MapWidget::Command::
34	command => $self->{command},
35	can_focus => 1,
36	tooltip => "<b>The Command Completer</b>\n\n"
37	. "This is your central interface to send text commands to the server. "
38	. "To enter a verbatim command to send to the server, just type the command, "
39	. "followed by a space, and press return. "
40	. "Typing the initial letters of words (or just any letters) displays guesses "
41	. "for commands you might want to use.\n"
42	. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
43	. "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
44	;
45
46	$self	35	$self
47	}	36	}
48		37
49	sub add_command {	38	sub add_command {#d# remove
50	my ($self, $command, $tooltip, $widget, $cb) = @_;	39	my ($self, $command, $tooltip, $widget, $cb) = @_;
51		40
52	(my $data = $command) =~ s/\\//g;	41	(my $data = $command) =~ s/\\//g;
53		42
54	$tooltip =~ s/^\s+//;	43	$tooltip =~ s/^\s+//;
55	$tooltip = "<big>$data</big>\n\n$tooltip";	44	$tooltip = "<big>$data</big>\n\n$tooltip";
56	$tooltip =~ s/\s+$//;	45	$tooltip =~ s/\s+$//;
57		46
58	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	47	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
59	}	48	}
60		49
61	sub clr_commands {	50	sub server_login {
62	my ($self) = @_;	51	my ($server) = @_;
63		52
64	%{$self->{completer}{command}} = ();	53	::stop_game ();
		54	local $::PROFILE->{host} = $server;
		55	::start_game ();
		56	}
		57
		58	sub editor_invoke {
		59	my $editsup = $::CONN && $::CONN->{editor_support}
		60	or return;
		61
		62	DC::background {
		63	print "preparing editor startup...\n";
		64
		65	my $server = $editsup->{gameserver} \|\| "default";
		66	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		67
		68	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
		69	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
		70
		71	print "map directory is $mapdir\n";
		72	print "lib directory is $libdir\n";
		73
		74	my $ua = DC::lwp_useragent;
		75
		76	for my $file (qw(archetypes crossfire.0)) {
		77	my $url = "$editsup->{lib_root}$file";
		78	print "mirroring $url...\n";
		79	DC::lwp_check $ua->mirror ($url, "$libdir/$file");
		80	printf "%s size %d octets\n", $file, -s "$libdir/$file";
		81	}
		82
		83	if (1) { # upload a map
		84	my $mapname = $::CONN->{map_info}[0];
		85
		86	my $mappath = "$mapdir/$mapname";
		87
		88	-e $mappath and die "$mappath already exists\n";
		89
		90	print "getting map revision for $mapname...\n";
		91
		92	# try to get the most recent head revision, what a hack,
		93	# this should have been returned while downloading sigh
		94	my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
		95
		96	if ($log =~ /\?rev=(\d+\.\d+)"/) {
		97	my $rev = $1;
		98
		99	print "downloading revision $rev...\n";
		100
		101	my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
		102
		103	my $meta = {
		104	%$editsup,
		105	path => $mapname,
		106	revision => $rev,
		107	cf_login => $::PROFILE->{user},
		108	};
		109
		110	require File::Basename;
		111	require File::Path;
		112
		113	File::Path::mkpath (File::Basename::dirname ($mappath));
		114	open my $fh, ">:raw:perlio", "$mappath.meta"
		115	or die "$mappath.meta: $!\n";
		116	print $fh DC::encode_json $meta;
		117	close $fh;
		118	open my $fh, ">:raw:perlio:utf8", $mappath
		119	or die "$mappath: $!\n";
		120	print $fh $map;
		121	close $fh;
		122
		123	print "saved as $mappath\n";
		124
		125	print "invoking editor...\n";
		126	exec "/root/s2/gce $mappath";#d#
		127
		128	# now upload it
		129	# require HTTP::Request::Common;
		130	#
		131	# my $res = $ua->post (
		132	# $ENV{CFPLUS_UPLOAD},
		133	# Content_Type => 'multipart/form-data',
		134	# Content => [
		135	# path => $mapname,
		136	# mapdir => $ENV{CROSSFIRE_MAPDIR},
		137	# map => $map,
		138	# revision => $rev,
		139	# cf_login => $ENV{CFPLUS_LOGIN},
		140	# cf_password => $ENV{CFPLUS_PASSWORD},
		141	# comment => "",
		142	# ]
		143	# );
		144	#
		145	# if ($res->is_error) {
		146	# # fatal condition
		147	# warn $res->status_line;
		148	# } else {
		149	# # script replies are marked as {{..}}
		150	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
		151	# warn map "$_\n", @msgs;
		152	# }
		153	} else {
		154	die "viewvc parse error, unable to detect revision\n";
		155	}
		156	}
		157	}
65	}	158	}
66		159
67	sub invoke_button_down {	160	sub invoke_button_down {
68	my ($self, $ev, $x, $y) = @_;	161	my ($self, $ev, $x, $y) = @_;
69		162
70	return unless $::CONN;
71
72	$self->grab_focus;
73
74	if ($ev->{button} == 1) {	163	if ($ev->{button} == 1) {
		164	$self->grab_focus;
		165	return unless $::CONN && $self->{ctilesize};
		166
75	my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	167	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
76	my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	168	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
77		169
78	$x -= int 0.5 * $self->{sw};	170	$x -= DC::floor $::MAP->w * 0.5;
79	$y -= int 0.5 * $self->{sh};	171	$y -= DC::floor $::MAP->h * 0.5;
80		172
		173	if ($::CONN) {
81	$::CONN->lookat ($x, $y)	174	$::CONN->lookat ($x, $y)
82	if $::CONN;	175	}
83		176
84	} elsif ($ev->{button} == 2) {	177	} elsif ($ev->{button} == 2) {
		178	$self->grab_focus;
		179	return unless $::CONN;
		180
85	my ($ox, $oy) = ($ev->{x}, $ev->{y});	181	my ($ox, $oy) = ($ev->{x}, $ev->{y});
86	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	182	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87		183
88	$self->{motion} = sub {	184	$self->{motion} = sub {
89	my ($ev, $x, $y) = @_;	185	my ($ev, $x, $y) = @_;
93	$::CFG->{map_shift_x} = $bw + $x - $ox;	189	$::CFG->{map_shift_x} = $bw + $x - $ox;
94	$::CFG->{map_shift_y} = $bh + $y - $oy;	190	$::CFG->{map_shift_y} = $bh + $y - $oy;
95		191
96	$self->update;	192	$self->update;
97	};	193	};
		194	} elsif ($ev->{button} == 3) {
		195	my @items = (
		196	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
		197	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
		198	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
		199	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
		200	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
		201	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
		202	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
		203	);
		204
		205	if ($::CONN && $::CONN->{editor_support}) {
		206	# push @items, [
		207	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
		208	# \&editor_invoke,
		209	# ];
		210
		211	for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
		212	$::CONN->{editor_support}{servertype} ne $type
		213	or next;
		214	my $server = $::CONN->{editor_support}{"${type}server"}
		215	or next;
		216
		217	push @items, [
		218	"Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
		219	sub { server_login $server },
		220	];
		221	}
		222	}
		223
		224	push @items,
		225	["Quit",
		226	sub {
		227	if ($::CONN) {
		228	&::open_quit_dialog;
		229	} else {
		230	exit;
		231	}
		232	}
		233	],
		234	;
		235
		236	(new DC::UI::Menu
		237	items => \@items,
		238	)->popup ($ev);
98	}	239	}
99		240
100	1	241	1
101	}	242	}
102		243
…		…
119		260
120	1	261	1
121	}	262	}
122		263
123	sub size_request {	264	sub size_request {
		265	my ($self) = @_;
		266
124	(	267	(
125	1 + 32 * int $::WIDTH / 32,	268	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
126	1 + 32 * int $::HEIGHT / 32,	269	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
127	)	270	)
128	}	271	}
129		272
130	sub update {	273	sub update {
131	my ($self) = @_;	274	my ($self) = @_;
…		…
133	$self->{need_update} = 1;	276	$self->{need_update} = 1;
134	$self->SUPER::update;	277	$self->SUPER::update;
135	}	278	}
136		279
137	my %DIR = (	280	my %DIR = (
138	CFClient::SDLK_KP8, [1, "north"],	281	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
139	CFClient::SDLK_KP9, [2, "northeast"],	282	( "," . DC::SDLK_KP8 ), [1, "north"],
140	CFClient::SDLK_KP6, [3, "east"],	283	( "," . DC::SDLK_KP9 ), [2, "northeast"],
141	CFClient::SDLK_KP3, [4, "southeast"],	284	( "," . DC::SDLK_KP6 ), [3, "east"],
142	CFClient::SDLK_KP2, [5, "south"],	285	( "," . DC::SDLK_KP3 ), [4, "southeast"],
143	CFClient::SDLK_KP1, [6, "southwest"],	286	( "," . DC::SDLK_KP2 ), [5, "south"],
144	CFClient::SDLK_KP4, [7, "west"],	287	( "," . DC::SDLK_KP1 ), [6, "southwest"],
145	CFClient::SDLK_KP7, [8, "northwest"],	288	( "," . DC::SDLK_KP4 ), [7, "west"],
		289	( "," . DC::SDLK_KP7 ), [8, "northwest"],
146		290
147	CFClient::SDLK_UP, [1, "north"],	291	( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
148	CFClient::SDLK_RIGHT, [3, "east"],	292	( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
149	CFClient::SDLK_DOWN, [5, "south"],	293	( "," . DC::SDLK_END ), [6, "southwest"],
150	CFClient::SDLK_LEFT, [7, "west"],	294	( "," . DC::SDLK_HOME ), [8, "northwest"],
		295
		296	( "," . DC::SDLK_UP ), [1, "north"],
		297	("1," . DC::SDLK_UP ), [2, "northeast"],
		298	( "," . DC::SDLK_RIGHT ), [3, "east"],
		299	("1," . DC::SDLK_RIGHT ), [4, "southeast"],
		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"],
151	);	304	);
152		305
153	sub invoke_key_down {	306	sub invoke_key_down {
154	my ($self, $ev) = @_;	307	my ($self, $ev) = @_;
155
156	return 0 unless $::CONN;
157		308
158	my $mod = $ev->{mod};	309	my $mod = $ev->{mod};
159	my $sym = $ev->{sym};	310	my $sym = $ev->{sym};
160	my $uni = $ev->{unicode};	311	my $uni = $ev->{unicode};
161		312
162	if ($sym == CFClient::SDLK_KP5) {	313	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_META \| DC::KMOD_SHIFT;
163	$::CONN->user_send ("stay fire");	314
164	} elsif ($uni == ord ",") {	315	# ignore repeated keypresses
165	$::CONN->user_send ("take");	316	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
166	} elsif ($uni == ord " ") {	317	$self->{last_mod} = $mod;
167	$::CONN->user_send ("apply");	318	$self->{last_sym} = $sym;
168	} elsif ($uni == ord ".") {	319
169	$::CONN->user_send ($self->{completer}{last_command})	320	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
170	if exists $self->{completer}{last_command};	321
171	} elsif ($uni == ord "\t") {	322	if ($::CONN && $dir) {
172	$::INV_WINDOW->toggle_visibility;
173	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
174	$::CONN->user_send ("rotateshoottype +");
175	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
176	$::CONN->user_send ("rotateshoottype -");
177	} elsif ($uni == ord '"') {
178	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
179	$self->{completer}->show;
180	} elsif ($uni == ord "'") {
181	$self->{completer}->set_prefix ("");
182	$self->{completer}->show;
183	} elsif (exists $DIR{$sym}) {
184	if ($mod & CFClient::KMOD_SHIFT) {	323	if ($mod & DC::KMOD_SHIFT) {
185	$self->{shft}++;	324	$self->{shft}++;
186	if ($DIR{$sym}[0] != $self->{fire_dir}) {	325	if ($dir->[0] != $self->{fire_dir}) {
187	$::CONN->user_send ("fire $DIR{$sym}[0]");	326	$::CONN->user_send ("fire $dir->[0]");
188	}	327	}
189	$self->{fire_dir} = $DIR{$sym}[0];	328	$self->{fire_dir} = $dir->[0];
190	} elsif ($mod & CFClient::KMOD_CTRL) {	329	} elsif ($mod & DC::KMOD_CTRL) {
191	$self->{ctrl}++;	330	$self->{ctrl}++;
192	$::CONN->user_send ("run $DIR{$sym}[0]");	331	$::CONN->user_send ("run $dir->[0]");
193	} else {	332	} else {
194	$::CONN->user_send ("$DIR{$sym}[1]");	333	$::CONN->user_send ("$dir->[1]");
195	}	334	}
196	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {	335
197	$::BIND_EDITOR->set_binding (undef, undef, [],
198	sub {
199	my ($mod, $sym, $cmds) = @_;
200	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
201	});
202	$::BIND_EDITOR->start;
203	$::BIND_EDITOR->show;
204	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
205	$::BIND_EDITOR->stop;
206	$::BIND_EDITOR->ask_for_bind_and_commit;
207	$::BIND_EDITOR->hide;
208	} elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
209	$::CONN->user_send ($_) for @$bind_cmd;
210	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
211	$self->{completer}->key_down ($ev);
212	$self->{completer}->show;
213	} else {
214	return 0;	336	return 1;
215	}
216
217	1	337	}
		338
		339	0
218	}	340	}
219		341
220	sub invoke_key_up {	342	sub invoke_key_up {
221	my ($self, $ev) = @_;	343	my ($self, $ev) = @_;
222		344
223	my $res = 0;	345	my $res = 0;
224	my $mod = $ev->{mod};	346	my $mod = $ev->{mod};
225	my $sym = $ev->{sym};	347	my $sym = $ev->{sym};
226		348
		349	delete $self->{last_mod};
		350	delete $self->{last_sym};
		351
227	if ($::CFG->{shift_fire_stop}) {	352	if ($::CFG->{shift_fire_stop}) {
228	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	353	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
229	$::CONN->user_send ("fire_stop");	354	$::CONN->user_send ("fire_stop");
230	delete $self->{fire_dir};	355	delete $self->{fire_dir};
231	$res = 1;	356	$res = 1;
232	}	357	}
233	} else {	358	} else {
		359	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		360
234	if (exists $DIR{$sym} && delete $self->{shft}) {	361	if ($dir && delete $self->{shft}) {
235	$::CONN->user_send ("fire_stop");	362	$::CONN->user_send ("fire_stop");
236	delete $self->{fire_dir};	363	delete $self->{fire_dir};
237	$res = 1;	364	$res = 1;
238	} elsif (($sym == CFClient::SDLK_LSHIFT \|\| $sym == CFClient::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?
239	$::CONN->user_send ("fire_stop");	367	$::CONN->user_send ("fire_stop");
240	delete $self->{fire_dir};	368	delete $self->{fire_dir};
241	$res = 1;	369	$res = 1;
242	}	370	}
243	}	371	}
244		372
245	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	373	if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
246	$::CONN->user_send ("run_stop");	374	$::CONN->user_send ("run_stop");
247	$res = 1;	375	$res = 1;
248	}	376	}
249		377
250	$res	378	$res
251	}	379	}
252		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
253	sub set_magicmap {	413	sub set_magicmap {
254	my ($self, $w, $h, $x, $y, $data) = @_;	414	my ($self, $w, $h, $x, $y, $data) = @_;
255		415
256	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	416	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
257	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	417	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
258		418
259	$self->{magicmap} = [$x, $y, $w, $h, $data];	419	$self->{magicmap} = [$x, $y, $w, $h, $data];
260		420
261	$self->update;	421	$self->update;
262	}	422	}
263		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
264	sub draw {	565	sub draw {
265	my ($self) = @_;	566	my ($self) = @_;
266		567
267	return unless $::MAP;	568	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
268		569
		570	return unless $self->{list};
		571
269	my $focused = $CFClient::UI::FOCUS == $self	572	my $focused = $DC::UI::FOCUS == $self
270	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};	573	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
271		574
272	return	575	return
273	unless $focused \|\| !$::FAST;	576	unless $focused \|\| !$::FAST;
274		577
275	if (delete $self->{need_update}) {
276	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
277
278	my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
279	my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
280
281	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
282	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
283
284	my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
285	my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
286
287	if ($::CFG->{fow_enable}) {
288	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
289
290	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
291	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
292	glConvolutionFilter2D (
293	GL_CONVOLUTION_2D,
294	GL_ALPHA,
295	3, 3,
296	GL_ALPHA, GL_FLOAT,
297	(pack "f*", @{ $self->{smooth_matrix} }),
298	);
299	glEnable GL_CONVOLUTION_2D;
300	}
301
302	$self->{fow_texture} = new CFClient::Texture
303	w => $w,
304	h => $h,
305	data => $data,
306	internalformat => GL_ALPHA,
307	format => GL_ALPHA;
308
309	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
310	} else {
311	delete $self->{fow_texture};
312	}
313
314	glNewList $self->{list};
315
316	glPushMatrix;
317	glTranslate $sx0, $sy0;
318	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
319
320	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
321
322	glScale 32, 32;
323
324	if (my $tex = $self->{fow_texture}) {
325	glEnable GL_TEXTURE_2D;
326	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
327
328	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
329	$self->{fow_texture}->draw_quad_alpha (0, 0);
330
331	glDisable GL_TEXTURE_2D;
332	}
333
334	if ($self->{magicmap}) {
335	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
336
337	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
338	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
339
340	glTranslate - $x - 1, - $y - 1;
341	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
342	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
343	}
344
345	glPopMatrix;
346	glEndList;
347	}
348
349	glCallList $self->{list};	578	glCallList $self->{list};
350		579
351	# TNT2 emulates logops in software (or worse :)	580	# TNT2 emulates logops in software (or worse :)
352	unless ($focused) {	581	unless ($focused) {
353	glColor 0.4, 0.2, 0.2, 0.6;	582	glColor_premultiply 0, 0, 1, 0.25;
354	glEnable GL_BLEND;	583	glEnable GL_BLEND;
355	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	584	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
356	glBegin GL_QUADS;	585	glBegin GL_QUADS;
357	glVertex 0, 0;	586	glVertex 0, 0;
358	glVertex 0, $::HEIGHT;	587	glVertex 0, $::HEIGHT;
359	glVertex $::WIDTH, $::HEIGHT;	588	glVertex $::WIDTH, $::HEIGHT;
360	glVertex $::WIDTH, 0;	589	glVertex $::WIDTH, 0;
…		…
369	glDeleteList $self->{list};	598	glDeleteList $self->{list};
370		599
371	$self->SUPER::DESTROY;	600	$self->SUPER::DESTROY;
372	}	601	}
373		602
374	package CFClient::MapWidget::MapMap;	603	package DC::MapWidget::MapMap;
375		604
		605	use common::sense;
		606
376	our @ISA = CFClient::UI::Base::;	607	our @ISA = DC::UI::Base::;
377		608
378	use Time::HiRes qw(time);
379	use CFClient::OpenGL;	609	use DC::OpenGL;
380		610
381	sub size_request {	611	sub size_request {
382	($::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
383	}	660	}
384		661
385	sub invoke_size_allocate {	662	sub invoke_size_allocate {
386	my ($self, $w, $h) = @_;	663	my ($self, $w, $h) = @_;
387		664
…		…
398	}	675	}
399		676
400	sub _draw {	677	sub _draw {
401	my ($self) = @_;	678	my ($self) = @_;
402		679
403	$::MAP or return;	680	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
404		681
405	my ($w, $h) = @$self{qw(w h)};	682	$self->{texture} or return;
406
407	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
408	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
409
410	my $sx = int $::CFG->{map_shift_x} / 32;
411	my $sy = int $::CFG->{map_shift_y} / 32;
412
413	my $ox = 0.5 * ($w - $sw);
414	my $oy = 0.5 * ($h - $sh);
415		683
416	glEnable GL_BLEND;	684	glEnable GL_BLEND;
417	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	685	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
418	glEnable GL_TEXTURE_2D;	686	glEnable GL_TEXTURE_2D;
419	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	687	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
420		688
421	if ($self->{texture_atime} < time) {
422	$self->{texture_atime} = time + 1/3;
423
424	$self->{texture} =
425	new CFClient::Texture
426	w => $w,
427	h => $h,
428	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
429	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
430	}
431
432	$self->{texture}->draw_quad (0, 0);	689	$self->{texture}->draw_quad (0, 0);
433		690
434	glDisable GL_TEXTURE_2D;	691	glDisable GL_TEXTURE_2D;
435		692
436	glTranslate 0.375, 0.375;	693	glTranslate 0.375, 0.375;
437
438	#TODO: map scale is completely borked
439
440	my $x0 = int $ox - $sx + 0.5;
441	my $y0 = int $oy - $sy + 0.5;
442		694
443	glColor 1, 1, 0, 1;	695	glColor 1, 1, 0, 1;
444	glBegin GL_LINE_LOOP;	696	glBegin GL_LINE_LOOP;
445	glVertex $x0 , $y0 ;	697	glVertex $self->{x0} , $self->{y0} ;
446	glVertex $x0 , $y0 + $sh;	698	glVertex $self->{x0} , $self->{y0} + $self->{sh};
447	glVertex $x0 + $sw, $y0 + $sh;	699	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
448	glVertex $x0 + $sw, $y0 ;	700	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
449	glEnd;	701	glEnd;
450		702
451	glDisable GL_BLEND;	703	glDisable GL_BLEND;
452	}	704	}
453		705
454	package CFClient::MapWidget::Command;	706	package DC::MapWidget::Command;
455		707
456	use strict;	708	use common::sense;
457		709
458	use CFClient::OpenGL;	710	use DC::OpenGL;
459		711
460	our @ISA = CFClient::UI::Frame::;	712	our @ISA = DC::UI::Frame::;
461		713
462	sub new {	714	sub new {
463	my $class = shift;	715	my $class = shift;
464		716
465	my $self = $class->SUPER::new (	717	my $self = $class->SUPER::new (
466	bg => [0, 0, 0, 0.8],	718	bg => [0, 0, 0, 0.8],
467	@_,	719	@_,
468	);	720	);
469		721
470	$self->add ($self->{vbox} = new CFClient::UI::VBox);	722	$self->add ($self->{vbox} = new DC::UI::VBox);
471		723
472	$self->{label} = [	724	$self->{label} = [
473	map	725	map
474	CFClient::UI::Label->new (	726	DC::UI::Label->new (
		727	align => 0,
475	can_hover => 1,	728	can_hover => 1,
476	can_events => 1,	729	can_events => 1,
477	tooltip_width => 0.33,	730	tooltip_width => 0.33,
478	fontsize => $_,	731	fontsize => $_,
479	), (0.8) x 16	732	), (0.8) x 16
480	];	733	];
481		734
482	$self->{entry} = new CFClient::UI::Entry	735	$self->{entry} = new DC::UI::Entry
483	on_changed => sub {	736	on_changed => sub {
484	$self->update_labels;	737	$self->update_labels;
485	0	738	0
486	},	739	},
487	on_button_down => sub {	740	on_button_down => sub {
488	my ($entry, $ev, $x, $y) = @_;	741	my ($entry, $ev, $x, $y) = @_;
489		742
490	if ($ev->{button} == 3) {	743	if ($ev->{button} == 3) {
491	(new CFClient::UI::Menu	744	(new DC::UI::Menu
492	items => [	745	items => [
		746	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
493	["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	747	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
494	],	748	],
495	)->popup ($ev);	749	)->popup ($ev);
496	return 1;	750	return 1;
497	}	751	}
498	0	752	0
…		…
505	if ($ev->{sym} == 13) {	759	if ($ev->{sym} == 13) {
506	if (exists $self->{select}) {	760	if (exists $self->{select}) {
507	$self->{last_command} = $self->{select};	761	$self->{last_command} = $self->{select};
508	$::CONN->user_send ($self->{select});	762	$::CONN->user_send ($self->{select});
509		763
510	unshift @{$self->{history}}, $self->{select};	764	unshift @{$self->{history}}, $self->{entry}->get_text;
511	$self->{hist_ptr} = 0;	765	$self->{hist_ptr} = 0;
512		766
513	$self->hide;	767	$self->hide;
514	}	768	}
515	} elsif ($ev->{sym} == 27) {	769	} elsif ($ev->{sym} == 27) {
516	$self->{hist_ptr} = 0;	770	$self->{hist_ptr} = 0;
517	$self->hide;	771	$self->hide;
518	return;
519	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {	772	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
520	if ($self->{hist_ptr} > 1) {	773	if ($self->{hist_ptr} > 1) {
521	$self->{hist_ptr}--;	774	$self->{hist_ptr}--;
522	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	775	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
523	} elsif ($self->{hist_ptr} > 0) {	776	} elsif ($self->{hist_ptr} > 0) {
524	$self->{hist_ptr}--;	777	$self->{hist_ptr}--;
…		…
526	} else {	779	} else {
527	++$self->{select_offset}	780	++$self->{select_offset}
528	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	781	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
529	}	782	}
530	$self->update_labels;	783	$self->update_labels;
531	} elsif ($ev->{sym} == CFClient::SDLK_UP) {	784	} elsif ($ev->{sym} == DC::SDLK_UP) {
532	if ($self->{select_offset}) {	785	if ($self->{select_offset}) {
533	--$self->{select_offset}	786	--$self->{select_offset}
534	} else {	787	} else {
535	unless ($self->{hist_ptr}) {	788	unless ($self->{hist_ptr}) {
536	$self->{hist_saveback} = $self->{entry}->get_text;	789	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
556	);	809	);
557		810
558	$self	811	$self
559	}	812	}
560		813
		814	sub reset {
		815	my ($self) = @_;
		816
		817	$self->hide;
		818	delete $self->{command_list};
		819	}
		820
561	sub set_prefix {	821	sub set_prefix {
562	my ($self, $prefix) = @_;	822	my ($self, $prefix) = @_;
563		823
564	$self->{entry}->set_text ($prefix);	824	$self->{entry}->set_text ($prefix);
565	$self->show;	825	$self->show;
…		…
581	}	841	}
582		842
583	sub hide {	843	sub hide {
584	my ($self) = @_;	844	my ($self) = @_;
585		845
		846	$self->{hist_ptr} = 0;
		847
586	$self->SUPER::hide;	848	$self->SUPER::hide;
587	$self->{entry}->set_text ("");	849	$self->{entry}->set_text ("");
588	}	850	}
589		851
590	sub invoke_key_down {	852	sub inject_key_down {
591	my ($self, $ev) = @_;	853	my ($self, $ev) = @_;
592		854
		855	$self->{entry}->grab_focus;
593	$self->{entry}->key_down ($ev)	856	$self->{entry}->emit (key_down => $ev);
594	}	857	}
595		858
596	sub update_labels {	859	sub update_labels {
597	my ($self) = @_;	860	my ($self) = @_;
598		861
599	my $text = $self->{entry}->get_text;	862	my $text = $self->{entry}->get_text;
600		863
601	length $text	864	length $text
602	or return $self->hide;	865	or return $self->hide;
603		866
604	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	];
605		874
606	if ($text ne $self->{last_search}) {	875	if ($text ne $self->{last_search}) {
607	my @match;	876	my @match;
608		877
609	if ($text =~ /^(.*?)\s+$/) {	878	if ($text =~ /^(.*?)\s+$/) {
		879	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
610	@match = [$cmd, "(appended whitespace suppresses completion)"];	880	@match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
611	} 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
612	my $regexp = do {	888	my $regexp_abbrev = do {
613	my ($beg, @chr) = split //, lc $cmd;	889	my ($beg, @chr) = split //, lc $cmd;
614		890
615	# the following regex is used to match our "completion entry"	891	# the following regex is used to match our "completion entry"
616	# to an actual command - the parentheses match kind of "overhead"	892	# to an actual command - the parentheses match kind of "overhead"
617	# - the more characters the parentheses match, the less attractive	893	# - the more characters the parentheses match, the less attractive
618	# is the match.	894	# is the match.
619	my $regexp = "^\Q$beg\E"	895	my $regexp = "^\Q$beg\E"
620	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;	896	. join "", map "(?:.?[ _\-]\|(.?))\Q$_\E", @chr;
621	qr<$regexp>	897	qr<$regexp>
622	};	898	};
623		899
624	my @penalty;	900	my $regexp_partial = do {
		901	my $regexp = "^\Q$text\E(.*)";
		902	qr<$regexp>
		903	};
625		904
626	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
627	if (@penalty = $_ =~ $regexp) {	938	if (my @penalty = $_ =~ $regexp_abbrev) {
628	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];
629	}	946	}
630	}	947	}
631		948
		949	# @match is now [command object, command with arguments]
632	@match = map $self->{command}{$_->[0]},	950	@match = map [$self->{command}{$_->[0]}, $_->[2]],
633	sort {	951	sort {
634	$a->[1] <=> $b->[1]	952	$b->[1] <=> $a->[1]
635	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]	953	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
636	or (length $b->[0]) <=> (length $a->[0])	954	or (length $b->[0]) <=> (length $a->[0])
637	} @match;	955	} @match;
638	}	956	}
639		957
…		…
658	$label->{fg} = [1, 1, 1, 1];	976	$label->{fg} = [1, 1, 1, 1];
659	$label->{bg} = [0, 0, 0, 0];	977	$label->{bg} = [0, 0, 0, 0];
660	}	978	}
661		979
662	if (@matches) {	980	if (@matches) {
663	$self->{select} = "$matches[0][0]$arg";	981	$self->{select} = "$matches[0][1]";
664		982
665	$labels[0]->{fg} = [0, 0, 0, 1];	983	$labels[0]->{fg} = [0, 0, 0, 1];
666	$labels[0]->{bg} = [1, 1, 1, 0.8];	984	$labels[0]->{bg} = [1, 1, 1, 0.8];
667	} else {	985	} else {
668	$self->{select} = "$cmd$arg";	986	$self->{select} = "$text";
669	}	987	}
670		988
671	for my $match (@matches) {	989	for my $match (@matches) {
672	my $label = shift @labels;	990	my $label = shift @labels;
673		991
674	if (@labels) {	992	if (@labels) {
675	$label->set_text ("$match->[0]$arg");	993	$label->set_text ("$match->[1]");
676	$label->set_tooltip ($match->[1]);	994	$label->set_tooltip ("$match->[0][1]");
677	} else {	995	} else {
678	$label->set_text ("...");	996	$label->set_text ("...");
679	$label->set_tooltip ("Use Cursor-Down to view more matches");	997	$label->set_tooltip ("Use Cursor-Down to view more matches");
680	last;	998	last;
681	}	999	}
…		…
685	$label->set_text ("");	1003	$label->set_text ("");
686	$label->set_tooltip ("");	1004	$label->set_tooltip ("");
687	}	1005	}
688		1006
689	$self->update;	1007	$self->update;
690	###
691	}	1008	}
692		1009
693	sub _draw {	1010	sub _draw {
694	my ($self) = @_;	1011	my ($self) = @_;
695		1012
696	# hack	1013	# hack
697	local $CFClient::UI::FOCUS = $self->{entry};	1014	local $DC::UI::FOCUS = $self->{entry};
698		1015
699	$self->SUPER::_draw;	1016	$self->SUPER::_draw;
700	}	1017	}
701		1018
702	1	1019	1
		1020

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.64 by root, Sun Jun 18 17:23:35 2006 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.64 by root, Sun Jun 18 17:23:35 2006 UTC vs.
Revision 1.167 by root, Tue Nov 20 14:32:12 2012 UTC