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

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.162 by root, Sat Apr 3 02:58:25 2010 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.162 by root, Sat Apr 3 02:58:25 2010 UTC