[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.158 by root, Mon Dec 21 23:52:34 2009 UTC

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

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.158 by root, Mon Dec 21 23:52:34 2009 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.158 by root, Mon Dec 21 23:52:34 2009 UTC