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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.51 by root, Thu Jun 8 01:51:32 2006 UTC vs. Revision 1.157 by root, Mon Dec 21 03:30:23 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.51 by root, Thu Jun 8 01:51:32 2006 UTC vs.
Revision 1.157 by root, Mon Dec 21 03:30:23 2009 UTC