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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.59 by root, Wed Jun 14 16:20:22 2006 UTC vs.
Revision 1.171 by root, Mon Nov 26 13:14:43 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;
		20
		21	my $magicmap_tex =
		22	new_from_resource DC::Texture "magicmap.png",
		23	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11		24
12	sub new {	25	sub new {
13	my $class = shift;	26	my $class = shift;
14		27
15	my $self = $class->SUPER::new (	28	my $self = $class->SUPER::new (
16	z => -1,	29	z => -1,
17	can_focus => 1,	30	can_focus => 1,
18	list => glGenList,	31	tilesize => 32,
19
20	smooth_matrix => [
21	0.05, 0.13, 0.05,
22	0.13, 0.30, 0.13,
23	0.05, 0.13, 0.05,
24	],
25
26	@_	32	@_
27	);	33	);
28		34
29	$self->{completer} = new CFClient::MapWidget::Command::
30	command => $self->{command},
31	can_focus => 1,
32	tooltip => "<b>The Command Completer</b>\n\n"
33	. "This is your central interface to send text commands to the server. "
34	. "To enter a verbatim command to send to the server, just type the command, "
35	. "followed by a space, and press return. "
36	. "Typing the initial letters of words (or just any letters) displays guesses "
37	. "for commands you might want to use.\n"
38	. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
39	. "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
40	;
41
42	$self	35	$self
43	}	36	}
44		37
45	sub add_command {	38	sub server_login {
46	my ($self, $command, $tooltip, $widget, $cb) = @_;
47
48	(my $data = $command) =~ s/\\//g;
49
50	$tooltip =~ s/^\s+//;
51	$tooltip = "<big>$data</big>\n\n$tooltip";
52	$tooltip =~ s/\s+$//;
53
54	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
55	}
56
57	sub clr_commands {
58	my ($self) = @_;	39	my ($server) = @_;
59		40
60	%{$self->{completer}{command}} = ();	41	::stop_game ();
		42	local $::PROFILE->{host} = $server;
		43	::start_game ();
61	}	44	}
62		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	}
		146	}
		147
63	sub button_down {	148	sub invoke_button_down {
64	my ($self, $ev, $x, $y) = @_;	149	my ($self, $ev, $x, $y) = @_;
65		150
66	return unless $::CONN;
67
68	$self->focus_in;
69
70	if ($ev->{button} == 1) {	151	if ($ev->{button} == 1) {
71	my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale});	152	$self->grab_focus;
72	my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale});	153	return unless $::CONN && $self->{ctilesize};
		154
		155	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
		156	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
		157
		158	$x -= DC::floor $::MAP->w * 0.5;
		159	$y -= DC::floor $::MAP->h * 0.5;
		160
		161	if ($::CONN) {
		162	$::CONN->lookat ($x, $y)
		163	}
		164
		165	} elsif ($ev->{button} == 2) {
		166	$self->grab_focus;
		167	return unless $::CONN;
73		168
74	$x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
75	$y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
76
77	$x -= int 0.5 * $::MAP->w;
78	$y -= int 0.5 * $::MAP->h;
79
80	$x += 1;
81	$y += 1;
82
83	$::CONN->lookat ($x, $y)
84	if $::CONN;
85
86	} elsif ($ev->{button} == 2) {
87	my ($ox, $oy) = ($ev->{x}, $ev->{y});	169	my ($ox, $oy) = ($ev->{x}, $ev->{y});
88	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	170	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
89		171
90	$self->{motion} = sub {	172	$self->{motion} = sub {
91	my ($ev, $x, $y) = @_;	173	my ($ev, $x, $y) = @_;
95	$::CFG->{map_shift_x} = $bw + $x - $ox;	177	$::CFG->{map_shift_x} = $bw + $x - $ox;
96	$::CFG->{map_shift_y} = $bh + $y - $oy;	178	$::CFG->{map_shift_y} = $bh + $y - $oy;
97		179
98	$self->update;	180	$self->update;
99	};	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);
100	}	227	}
101		228
102	1	229	1
103	}	230	}
104		231
105	sub button_up {	232	sub invoke_button_up {
106	my ($self, $ev, $x, $y) = @_;	233	my ($self, $ev, $x, $y) = @_;
107		234
108	delete $self->{motion};	235	delete $self->{motion};
109		236
110	1	237	1
111	}	238	}
112		239
113	sub mouse_motion {	240	sub invoke_mouse_motion {
114	my ($self, $ev, $x, $y) = @_;	241	my ($self, $ev, $x, $y) = @_;
115		242
116	if ($self->{motion}) {	243	if ($self->{motion}) {
117	$self->{motion}->($ev, $x, $y);	244	$self->{motion}->($ev, $x, $y);
118	} else {	245	} else {
…		…
121		248
122	1	249	1
123	}	250	}
124		251
125	sub size_request {	252	sub size_request {
		253	my ($self) = @_;
		254
126	(	255	(
127	1 + 32 * int $::WIDTH / 32,	256	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
128	1 + 32 * int $::HEIGHT / 32,	257	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
129	)	258	)
130	}	259	}
131		260
132	sub update {	261	sub update {
133	my ($self) = @_;	262	my ($self) = @_;
…		…
135	$self->{need_update} = 1;	264	$self->{need_update} = 1;
136	$self->SUPER::update;	265	$self->SUPER::update;
137	}	266	}
138		267
139	my %DIR = (	268	my %DIR = (
140	CFClient::SDLK_KP8, [1, "north"],	269	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
141	CFClient::SDLK_KP9, [2, "northeast"],	270	( "," . DC::SDLK_KP8 ), [1, "north"],
142	CFClient::SDLK_KP6, [3, "east"],	271	( "," . DC::SDLK_KP9 ), [2, "northeast"],
143	CFClient::SDLK_KP3, [4, "southeast"],	272	( "," . DC::SDLK_KP6 ), [3, "east"],
144	CFClient::SDLK_KP2, [5, "south"],	273	( "," . DC::SDLK_KP3 ), [4, "southeast"],
145	CFClient::SDLK_KP1, [6, "southwest"],	274	( "," . DC::SDLK_KP2 ), [5, "south"],
146	CFClient::SDLK_KP4, [7, "west"],	275	( "," . DC::SDLK_KP1 ), [6, "southwest"],
147	CFClient::SDLK_KP7, [8, "northwest"],	276	( "," . DC::SDLK_KP4 ), [7, "west"],
		277	( "," . DC::SDLK_KP7 ), [8, "northwest"],
148		278
149	CFClient::SDLK_UP, [1, "north"],	279	( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
150	CFClient::SDLK_RIGHT, [3, "east"],	280	( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
151	CFClient::SDLK_DOWN, [5, "south"],	281	( "," . DC::SDLK_END ), [6, "southwest"],
152	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"],
153	);	292	);
154		293
155	sub key_down {	294	sub invoke_key_down {
156	my ($self, $ev) = @_;	295	my ($self, $ev) = @_;
157
158	return 0 unless $::CONN;
159		296
160	my $mod = $ev->{mod};	297	my $mod = $ev->{mod};
161	my $sym = $ev->{sym};	298	my $sym = $ev->{sym};
162	my $uni = $ev->{unicode};	299	my $uni = $ev->{unicode};
163		300
164	if ($sym == CFClient::SDLK_KP5) {	301	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_META \| DC::KMOD_SHIFT;
165	$::CONN->user_send ("stay fire");	302
166	} elsif ($uni == ord ",") {	303	# ignore repeated keypresses
167	$::CONN->user_send ("take");	304	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
168	} elsif ($uni == ord " ") {	305	$self->{last_mod} = $mod;
169	$::CONN->user_send ("apply");	306	$self->{last_sym} = $sym;
170	} elsif ($uni == ord ".") {	307
171	$::CONN->user_send ($self->{completer}{last_command})	308	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
172	if exists $self->{completer}{last_command};	309
173	} elsif ($uni == ord "\t") {	310	if ($::CONN && $dir) {
174	$::INV_WINDOW->toggle_visibility;
175	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
176	$::CONN->user_send ("rotateshoottype +");
177	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
178	$::CONN->user_send ("rotateshoottype -");
179	} elsif ($uni == ord '"') {
180	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
181	$self->{completer}->show;
182	} elsif ($uni == ord "'") {
183	$self->{completer}->set_prefix ("");
184	$self->{completer}->show;
185	} elsif (exists $DIR{$sym}) {
186	if ($mod & CFClient::KMOD_SHIFT) {	311	if ($mod & DC::KMOD_SHIFT) {
187	$self->{shft}++;	312	$self->{shft}++;
188	if ($DIR{$sym}[0] != $self->{fire_dir}) {	313	if ($dir->[0] != $self->{fire_dir}) {
189	$::CONN->user_send ("fire $DIR{$sym}[0]");	314	$::CONN->user_send ("fire $dir->[0]");
190	}	315	}
191	$self->{fire_dir} = $DIR{$sym}[0];	316	$self->{fire_dir} = $dir->[0];
192	} elsif ($mod & CFClient::KMOD_CTRL) {	317	} elsif ($mod & DC::KMOD_CTRL) {
193	$self->{ctrl}++;	318	$self->{ctrl}++;
194	$::CONN->user_send ("run $DIR{$sym}[0]");	319	$::CONN->user_send ("run $dir->[0]");
195	} else {	320	} else {
196	$::CONN->user_send ("$DIR{$sym}[1]");	321	$::CONN->user_send ("$dir->[1]");
197	}	322	}
198	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {	323
199	$::BIND_EDITOR->set_binding (undef, undef, [],
200	sub {
201	my ($mod, $sym, $cmds) = @_;
202	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
203	});
204	$::BIND_EDITOR->start;
205	$::BIND_EDITOR->show;
206	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
207	$::BIND_EDITOR->stop;
208	$::BIND_EDITOR->ask_for_bind_and_commit;
209	$::BIND_EDITOR->hide;
210	} elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
211	$::CONN->user_send ($_) for @$bind_cmd;
212	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
213	$self->{completer}->key_down ($ev);
214	$self->{completer}->show;
215	} else {
216	return 0;	324	return 1;
217	}
218
219	1	325	}
220	}
221		326
		327	0
		328	}
		329
222	sub key_up {	330	sub invoke_key_up {
223	my ($self, $ev) = @_;	331	my ($self, $ev) = @_;
224		332
225	my $res = 0;	333	my $res = 0;
226	my $mod = $ev->{mod};	334	my $mod = $ev->{mod};
227	my $sym = $ev->{sym};	335	my $sym = $ev->{sym};
228		336
		337	delete $self->{last_mod};
		338	delete $self->{last_sym};
		339
229	if ($::CFG->{shift_fire_stop}) {	340	if ($::CFG->{shift_fire_stop}) {
230	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	341	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
231	$::CONN->user_send ("fire_stop");	342	$::CONN->user_send ("fire_stop");
232	delete $self->{fire_dir};	343	delete $self->{fire_dir};
233	$res = 1;	344	$res = 1;
234	}	345	}
235	} else {	346	} else {
		347	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		348
236	if (exists $DIR{$sym} && delete $self->{shft}) {	349	if ($dir && delete $self->{shft}) {
237	$::CONN->user_send ("fire_stop");	350	$::CONN->user_send ("fire_stop");
238	delete $self->{fire_dir};	351	delete $self->{fire_dir};
239	$res = 1;	352	$res = 1;
240	} 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?
241	$::CONN->user_send ("fire_stop");	355	$::CONN->user_send ("fire_stop");
242	delete $self->{fire_dir};	356	delete $self->{fire_dir};
243	$res = 1;	357	$res = 1;
244	}	358	}
245	}	359	}
246		360
247	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	361	if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
248	$::CONN->user_send ("run_stop");	362	$::CONN->user_send ("run_stop");
249	$res = 1;	363	$res = 1;
250	}	364	}
251		365
252	$res	366	$res
253	}	367	}
254		368
255	sub draw {	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 {
256	my ($self) = @_;	384	my ($self, $dx, $dy) = @_;
257		385
258	my $focused = $CFClient::UI::FOCUS == $self	386	$self->movement_update;
259	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
260		387
261	return	388	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
262	unless $::CONN && ($focused \|\| !$::FAST);	389	$self->{sdy} += $dy * $self->{tilesize};
263		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
		401	sub set_magicmap {
		402	my ($self, $w, $h, $x, $y, $data) = @_;
		403
		404	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
		405	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
		406
		407	$self->{magicmap} = [$x, $y, $w, $h, $data];
		408
		409	$self->update;
		410	}
		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) {
264	if (delete $self->{need_update}) {	455	if (delete $self->{need_update}) {
265	$self->{fow_texture} \|\|= glGenTexture;	456	$self->movement_update;
266		457
267	glNewList $self->{list};	458	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
268		459
269	if ($::MAP) {	460	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
270	my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	461	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
271	my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
272		462
273	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};	463	# width/height of map, in tiles
274	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};	464	my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
275	my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;	465	my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
276	my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
277		466
278	glPushMatrix;	467	# the map displacement, in tiles
279	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	468	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
		469	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
280		470
281	glTranslate $sx0, $sy0;	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;
282		474
283	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	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;
284		477
285	if ($::CFG->{fow_enable}) {	478	if ($::CFG->{fow_enable}) {
286	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	479	# draw_fow_texture REQUIRES the fow texture to stay the same size.
287	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);	480	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
288	glConvolutionFilter2D (
289	GL_CONVOLUTION_2D,
290	GL_ALPHA,
291	3, 3,
292	GL_ALPHA, GL_FLOAT,
293	(pack "f*", @{ $self->{smooth_matrix} }),
294	);
295	glEnable GL_CONVOLUTION_2D;
296	}
297		481
298	$self->{fow_texture_name} \|\|= glGenTexture;
299	# try to re-use the texture name: TODO improve texture class instead
300
301	$self->{fow_texture} = new CFClient::Texture	482	$self->{fow_texture} = new DC::Texture
302	w => $w,	483	w => $w,
303	h => $h,	484	h => $h,
304	data => $data,	485	data => $data,
305	name => $self->{fow_texture_name},
306	internalformat => GL_ALPHA,	486	internalformat => GL_ALPHA,
307	format => GL_ALPHA;	487	format => GL_ALPHA;
308		488	} else {
309	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	489	delete $self->{fow_texture};
310
311	glEnable GL_TEXTURE_2D;
312	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
313
314	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
315	$self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
316
317	glDisable GL_TEXTURE_2D;
318	}	490	}
319		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
320	glPopMatrix;	541	glPopMatrix;
321	}
322
323	glEndList;	542	glEndList;
324	}	543	}
		544	} else {
		545	delete $self->{last_fow_texture};
		546	delete $self->{fow_texture};
325		547
326	glPushMatrix;	548	glDeleteList delete $self->{list}
		549	if $self->{list};
		550	}
		551	}
		552
		553	sub draw {
		554	my ($self) = @_;
		555
		556	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		557
		558	return unless $self->{list};
		559
		560	my $focused = $DC::UI::FOCUS == $self
		561	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
		562
		563	return
		564	unless $focused \|\| !$::FAST;
		565
327	glCallList $self->{list};	566	glCallList $self->{list};
328	glPopMatrix;
329		567
330	# TNT2 emulates logops in software (or worse :)	568	# TNT2 emulates logops in software (or worse :)
331	if ($focused) {	569	unless ($focused) {
332	(delete $self->{out_of_focus})->destroy	570	glColor_premultiply 0, 0, 1, 0.25;
333	if $self->{out_of_focus};
334	} else {
335	glColor 0.4, 0.2, 0.2, 0.6;
336	glEnable GL_BLEND;	571	glEnable GL_BLEND;
337	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	572	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
338	glBegin GL_QUADS;	573	glBegin GL_QUADS;
339	glVertex 0, 0;	574	glVertex 0, 0;
340	glVertex 0, $::HEIGHT;	575	glVertex 0, $::HEIGHT;
341	glVertex $::WIDTH, $::HEIGHT;	576	glVertex $::WIDTH, $::HEIGHT;
342	glVertex $::WIDTH, 0;	577	glVertex $::WIDTH, 0;
343	glEnd;	578	glEnd;
344	glDisable GL_BLEND;	579	glDisable GL_BLEND;
345
346	# $self->{out_of_focus} \|\|= do {
347	# my $label = new CFClient::UI::Label
348	# x => 0,
349	# y => 0,
350	# z => 1,
351	# ellipsise => 0,
352	# text => "map out of focus (click map to play)";
353	#
354	# $label->show;
355	# $label->update;
356	#
357	# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
358	# $label->move_abs (
359	# ($::WIDTH - $label->{w}) * 0.5,
360	# ($::HEIGHT - $label->{h}) * 0.5,
361	# );
362	# });
363	#
364	# $label
365	# };
366	}	580	}
367	}	581	}
368		582
369	sub DESTROY {	583	sub DESTROY {
370	my $self = shift;	584	my $self = shift;
…		…
372	glDeleteList $self->{list};	586	glDeleteList $self->{list};
373		587
374	$self->SUPER::DESTROY;	588	$self->SUPER::DESTROY;
375	}	589	}
376		590
377	package CFClient::MapWidget::MapMap;	591	package DC::MapWidget::MapMap;
378		592
		593	use common::sense;
		594
379	our @ISA = CFClient::UI::Base::;	595	our @ISA = DC::UI::Base::;
380		596
381	use Time::HiRes qw(time);
382	use CFClient::OpenGL;	597	use DC::OpenGL;
383		598
384	sub size_request {	599	sub size_request {
385	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	600	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
386	}	601	}
387		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
		648	}
		649
388	sub size_allocate {	650	sub invoke_size_allocate {
389	my ($self, $w, $h) = @_;	651	my ($self, $w, $h) = @_;
390		652
391	$self->SUPER::size_allocate ($w, $h);
392	$self->update;	653	$self->update;
		654
		655	1
393	}	656	}
394		657
395	sub update {	658	sub update {
396	my ($self) = @_;	659	my ($self) = @_;
397		660
…		…
400	}	663	}
401		664
402	sub _draw {	665	sub _draw {
403	my ($self) = @_;	666	my ($self) = @_;
404		667
405	$::MAP or return;	668	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
406		669
407	my ($w, $h) = @$self{qw(w h)};	670	$self->{texture} or return;
408
409	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
410	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
411
412	my $sx = int $::CFG->{map_shift_x} / 32;
413	my $sy = int $::CFG->{map_shift_y} / 32;
414
415	my $ox = 0.5 * ($w - $sw);
416	my $oy = 0.5 * ($h - $sh);
417		671
418	glEnable GL_BLEND;	672	glEnable GL_BLEND;
419	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	673	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
420	glEnable GL_TEXTURE_2D;	674	glEnable GL_TEXTURE_2D;
421	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
422		676
423	if ($self->{texture_atime} < time) {
424	$self->{texture_atime} = time + 1/3;
425
426	$self->{texture} =
427	new CFClient::Texture
428	w => $w,
429	h => $h,
430	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
431	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
432	}
433
434	$self->{texture}->draw_quad (0, 0);	677	$self->{texture}->draw_quad (0, 0);
435		678
436	glDisable GL_TEXTURE_2D;	679	glDisable GL_TEXTURE_2D;
437		680
438	glTranslate 0.375, 0.375;	681	glTranslate 0.375, 0.375;
439
440	#TODO: map scale is completely borked
441
442	my $x0 = int $ox - $sx + 0.5;
443	my $y0 = int $oy - $sy + 0.5;
444		682
445	glColor 1, 1, 0, 1;	683	glColor 1, 1, 0, 1;
446	glBegin GL_LINE_LOOP;	684	glBegin GL_LINE_LOOP;
447	glVertex $x0 , $y0 ;	685	glVertex $self->{x0} , $self->{y0} ;
448	glVertex $x0 , $y0 + $sh;	686	glVertex $self->{x0} , $self->{y0} + $self->{sh};
449	glVertex $x0 + $sw, $y0 + $sh;	687	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
450	glVertex $x0 + $sw, $y0 ;	688	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
451	glEnd;	689	glEnd;
452		690
453	glDisable GL_BLEND;	691	glDisable GL_BLEND;
454	}	692	}
455		693
456	package CFClient::MapWidget::Command;	694	package DC::MapWidget::Command;
457		695
458	use strict;	696	use common::sense;
459		697
460	use CFClient::OpenGL;	698	use DC::OpenGL;
461		699
462	our @ISA = CFClient::UI::Frame::;	700	our @ISA = DC::UI::Frame::;
463		701
464	sub new {	702	sub new {
465	my $class = shift;	703	my $class = shift;
466		704
467	my $self = $class->SUPER::new (	705	my $self = $class->SUPER::new (
		706	min_w => $::WIDTH * 0.25, # workaround for layout problems #d#
468	bg => [0, 0, 0, 0.8],	707	bg => [0, 0, 0, 0.8],
469	@_,	708	@_,
470	);	709	);
471		710
472	$self->add ($self->{vbox} = new CFClient::UI::VBox);	711	$self->add ($self->{vbox} = new DC::UI::VBox);
473		712
474	$self->{label} = [	713	$self->{label} = [
475	map	714	map
476	CFClient::UI::Label->new (	715	DC::UI::Label->new (
		716	align => 0,
477	can_hover => 1,	717	can_hover => 1,
478	can_events => 1,	718	can_events => 1,
479	tooltip_width => 0.33,	719	tooltip_width => 0.33,
480	fontsize => $_,	720	fontsize => $_,
481	), (0.8) x 16	721	), (0.8) x 16
482	];	722	];
483		723
484	$self->{entry} = new CFClient::UI::Entry	724	$self->{entry} = new DC::UI::Entry
485	on_changed => sub {	725	on_changed => sub {
486	$self->update_labels;	726	$self->update_labels;
		727	0
487	},	728	},
488	on_button_down => sub {	729	on_button_down => sub {
489	my ($entry, $ev, $x, $y) = @_;	730	my ($entry, $ev, $x, $y) = @_;
490		731
491	if ($ev->{button} == 3) {	732	if ($ev->{button} == 3) {
492	(new CFClient::UI::Menu	733	(new DC::UI::Menu
493	items => [	734	items => [
494	["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }]	735	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
		736	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
495	],	737	],
496	)->popup ($ev);	738	)->popup ($ev);
497	return 1;	739	return 1;
498	}	740	}
499	0	741	0
…		…
506	if ($ev->{sym} == 13) {	748	if ($ev->{sym} == 13) {
507	if (exists $self->{select}) {	749	if (exists $self->{select}) {
508	$self->{last_command} = $self->{select};	750	$self->{last_command} = $self->{select};
509	$::CONN->user_send ($self->{select});	751	$::CONN->user_send ($self->{select});
510		752
511	unshift @{$self->{history}}, $self->{select};	753	unshift @{$self->{history}}, $self->{entry}->get_text;
512	$self->{hist_ptr} = 0;	754	$self->{hist_ptr} = 0;
513		755
514	$self->hide;	756	$self->hide;
515	}	757	}
516	} elsif ($ev->{sym} == 27) {	758	} elsif ($ev->{sym} == 27) {
517	$self->{hist_ptr} = 0;	759	$self->{hist_ptr} = 0;
518	$self->hide;	760	$self->hide;
519	return;
520	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {	761	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
521	if ($self->{hist_ptr} > 1) {	762	if ($self->{hist_ptr} > 1) {
522	$self->{hist_ptr}--;	763	$self->{hist_ptr}--;
523	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	764	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524	} elsif ($self->{hist_ptr} > 0) {	765	} elsif ($self->{hist_ptr} > 0) {
525	$self->{hist_ptr}--;	766	$self->{hist_ptr}--;
…		…
527	} else {	768	} else {
528	++$self->{select_offset}	769	++$self->{select_offset}
529	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	770	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
530	}	771	}
531	$self->update_labels;	772	$self->update_labels;
532	} elsif ($ev->{sym} == CFClient::SDLK_UP) {	773	} elsif ($ev->{sym} == DC::SDLK_UP) {
533	if ($self->{select_offset}) {	774	if ($self->{select_offset}) {
534	--$self->{select_offset}	775	--$self->{select_offset}
535	} else {	776	} else {
536	unless ($self->{hist_ptr}) {	777	unless ($self->{hist_ptr}) {
537	$self->{hist_saveback} = $self->{entry}->get_text;	778	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
557	);	798	);
558		799
559	$self	800	$self
560	}	801	}
561		802
		803	sub reset {
		804	my ($self) = @_;
		805
		806	$self->hide;
		807	delete $self->{command_lists};
		808	delete $self->{command_list};
		809	}
		810
562	sub set_prefix {	811	sub set_prefix {
563	my ($self, $prefix) = @_;	812	my ($self, $prefix) = @_;
564		813
565	$self->{entry}->set_text ($prefix);	814	$self->{entry}->set_text ($prefix);
566	$self->show;	815	$self->show;
567	}	816	}
568		817
569	sub size_allocate {	818	sub invoke_size_allocate {
570	my ($self, $w, $h) = @_;	819	my ($self, $w, $h) = @_;
571		820
572	$self->SUPER::size_allocate ($w, $h);
573	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	821	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		822
		823	$self->SUPER::invoke_size_allocate ($w, $h)
574	}	824	}
575		825
576	sub show {	826	sub show {
577	my ($self) = @_;	827	my ($self) = @_;
578		828
579	$self->SUPER::show;	829	$self->SUPER::show;
580	$self->{entry}->focus_in;	830	$self->{entry}->grab_focus;
581	}	831	}
582		832
583	sub hide {	833	sub hide {
584	my ($self) = @_;	834	my ($self) = @_;
		835
		836	$self->{hist_ptr} = 0;
585		837
586	$self->SUPER::hide;	838	$self->SUPER::hide;
587	$self->{entry}->set_text ("");	839	$self->{entry}->set_text ("");
588	}	840	}
589		841
590	sub key_down {	842	sub inject_key_down {
591	my ($self, $ev) = @_;	843	my ($self, $ev) = @_;
592		844
		845	$self->{entry}->grab_focus;
593	$self->{entry}->key_down ($ev)	846	$self->{entry}->emit (key_down => $ev);
594	}	847	}
595		848
596	sub update_labels {	849	sub update_labels {
597	my ($self) = @_;	850	my ($self) = @_;
		851
		852	use sort qw(stable);
598		853
599	my $text = $self->{entry}->get_text;	854	my $text = $self->{entry}->get_text;
600		855
601	length $text	856	length $text
602	or return $self->hide;	857	or return $self->hide;
603		858
604	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;	859	return unless $::CONN;
		860
		861	# regenerate spell list if necessary
		862	$self->{command_list}{spells} \|\|= [
		863	map { ("cast $_->{name}", "invoke $_->{name}") }
		864	values %{ $::CONN->{spell} }
		865	];
605		866
606	if ($text ne $self->{last_search}) {	867	if ($text ne $self->{last_search}) {
607	my @match;	868	my @match;
608		869
609	if ($text =~ /^(.*?)\s+$/) {	870	if ($text =~ /^(.*?)\s+$/) {
		871	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
610	@match = [$cmd, "(appended whitespace suppresses completion)"];	872	@match = ([[$cmd,' (appended whitespace suppresses completion)'], $text]);
611	} else {	873	} else {
		874	# @match is [command, penalty, command with arguments] until sort
		875
		876	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		877
		878	my $first_char = substr $cmd, 0, 1;
		879
612	my $regexp = do {	880	my $regexp_abbrev = do {
613	my ($beg, @chr) = split //, lc $cmd;	881	my ($beg, @chr) = split //, lc $cmd;
614		882
615	# the following regex is used to match our "completion entry"	883	# the following regex is used to match our "completion entry"
616	# to an actual command - the parentheses match kind of "overhead"	884	# to an actual command - the parentheses match kind of "overhead"
617	# - the more characters the parentheses match, the less attractive	885	# - the more characters the parentheses match, the less attractive
618	# is the match.	886	# is the match.
619	my $regexp = "^\Q$beg\E"	887	my $regexp = "^\Q$beg\E"
620	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;	888	. join "", map "(?:.?[ _\-]\|(.?))\Q$_\E", @chr;
621	qr<$regexp>	889	qr<$regexp>
622	};	890	};
623		891
624	my @penalty;	892	my $regexp_partial = do {
		893	my $regexp = "^\Q$text\E(.*)";
		894	qr<$regexp>
		895	};
625		896
626	for (keys %{$self->{command}}) {	897	for my $list (@{ $self->{command_lists} }, "spells") {
		898	for (@{ $self->{command_list}{$list} }) {
		899	# we only match and score if the first character matches,
		900	# so quickly rule out all others first.
		901	next unless $first_char = substr $_, 0, 1;
		902
		903	my @scores;
		904
		905	# 1. Complete command [with args]
		906	# command is a prefix of the text
		907	# score is length of complete command matched
		908	# e.g. "invoke summon pet monster bat"
		909	# "invoke" "summon pet monster bat" = 6
		910	# "invoke summon pet monster" "bat" = 25
		911	if ((substr $text, 0, length $_) eq $_) {
		912	push @scores, [$_, length $_, $text];
		913	}
		914
		915	# 2. Partial command
		916	# text is a prefix of the full command
		917	# score is the length of the input text
		918	# e.g. "invoke s"
		919	# "invoke small fireball" = 8
		920	# "invoke summon pet monster" = 8
		921
		922	if ($_ =~ $regexp_partial) {
		923	push @scores, [$_, length $text, $_];
		924	}
		925
		926	# 3. Abbreviation match
		927	# attempts to use first word of text as an abbreviated command
		928	# score is length of word + 1 - 3 per non-word-initial character
		929
627	if (@penalty = $_ =~ $regexp) {	930	if (my @penalty = $_ =~ $regexp_abbrev) {
628	push @match, [$_, length join "", map "::$_", grep defined, @penalty];	931	push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
		932	}
		933
		934	# Pick the best option for this command
		935	push @match, (sort { $b->[1] <=> $a->[1] } @scores)[0];
629	}	936	}
630	}	937	}
631		938
632	@match = map $self->{command}{$_->[0]},	939	# @match is now [command object, command with arguments]
633	sort {	940	@match = map [$_->[0], $_->[2]],
634	$a->[1] <=> $b->[1]	941	sort { $b->[1] <=> $a->[1] }
635	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
636	or (length $b->[0]) <=> (length $a->[0])
637	} @match;	942	@match;
638	}	943	}
639		944
640	$self->{last_search} = $text;	945	$self->{last_search} = $text;
641	$self->{last_match} = \@match;	946	$self->{last_match} = \@match;
642		947
…		…
658	$label->{fg} = [1, 1, 1, 1];	963	$label->{fg} = [1, 1, 1, 1];
659	$label->{bg} = [0, 0, 0, 0];	964	$label->{bg} = [0, 0, 0, 0];
660	}	965	}
661		966
662	if (@matches) {	967	if (@matches) {
663	$self->{select} = "$matches[0][0]$arg";	968	$self->{select} = "$matches[0][1]";
664		969
665	$labels[0]->{fg} = [0, 0, 0, 1];	970	$labels[0]->{fg} = [0, 0, 0, 1];
666	$labels[0]->{bg} = [1, 1, 1, 0.8];	971	$labels[0]->{bg} = [1, 1, 1, 0.8];
667	} else {	972	} else {
668	$self->{select} = "$cmd$arg";	973	$self->{select} = "$text";
669	}	974	}
670		975
671	for my $match (@matches) {	976	for my $match (@matches) {
672	my $label = shift @labels;	977	my $label = shift @labels;
673		978
674	if (@labels) {	979	if (@labels) {
675	$label->set_text ("$match->[0]$arg");	980	$label->set_text ("$match->[1]");
676	$label->set_tooltip ($match->[1]);	981	$label->set_tooltip ("#(command/$match->[1])");
677	} else {	982	} else {
678	$label->set_text ("...");	983	$label->set_text ("...");
679	$label->set_tooltip ("Use Cursor-Down to view more matches");	984	$label->set_tooltip ("Use Cursor-Down to view more matches");
680	last;	985	last;
681	}	986	}
…		…
685	$label->set_text ("");	990	$label->set_text ("");
686	$label->set_tooltip ("");	991	$label->set_tooltip ("");
687	}	992	}
688		993
689	$self->update;	994	$self->update;
690	###
691	}	995	}
692		996
693	sub _draw {	997	sub _draw {
694	my ($self) = @_;	998	my ($self) = @_;
695		999
696	# hack	1000	# hack
697	local $CFClient::UI::FOCUS = $self->{entry};	1001	local $DC::UI::FOCUS = $self->{entry};
698		1002
699	$self->SUPER::_draw;	1003	$self->SUPER::_draw;
700	}	1004	}
701		1005
702	1	1006	1
		1007

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.59 by root, Wed Jun 14 16:20:22 2006 UTC vs. Revision 1.171 by root, Mon Nov 26 13:14:43 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.59 by root, Wed Jun 14 16:20:22 2006 UTC vs.
Revision 1.171 by root, Mon Nov 26 13:14:43 2012 UTC