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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs. Revision 1.168 by root, Wed Nov 21 13:23:10 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs.
Revision 1.168 by root, Wed Nov 21 13:23:10 2012 UTC