[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.155 by root, Thu Dec 17 02:49:38 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	$::MAP->scroll ($dx, $dy);
234	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
235		402
236	return	403	$self->{last_fow_texture} = $self->{fow_texture};
237	unless $focused \|\| !$::FAST;	404	$self->{ldx} = $self->{sdx} + $dx * $self->{tilesize}; # smooth displacement
		405	$self->{ldy} = $self->{sdy} + $dy * $self->{tilesize};
238		406
		407	$self->movement_update;
		408
		409	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
		410	$self->{sdy} += $dy * $self->{tilesize};
		411	}
		412
		413	sub set_magicmap {
		414	my ($self, $w, $h, $x, $y, $data) = @_;
		415
		416	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
		417	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
		418
		419	$self->{magicmap} = [$x, $y, $w, $h, $data];
		420
		421	$self->update;
		422	}
		423
		424	sub movement_update {
		425	my ($self) = @_;
		426
		427	if ($::CFG->{smooth_movement}) {
		428	if ($self->{sdx} \|\| $self->{sdy}) {
		429	my $diff = EV::time - ($self->{last_update} \|\| $::LAST_REFRESH);
		430	my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
		431
		432	# the minimum time for a single tile movement
		433	my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK \|\| 1);
		434
		435	$spd *= $self->{tilesize};
		436
		437	# jump if "impossibly high" speed
		438	if (
		439	(max abs $self->{sdx}, abs $self->{sdy})
		440	> $spd * $mintime * 2.1
		441	) {
		442	#warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
		443	$self->{sdx} = $self->{sdy} = 0;
		444	} else {
		445	$spd = $diff 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
		446
		447	my $dx = $self->{sdx} < 0 ? -$spd : $spd;
		448	my $dy = $self->{sdy} < 0 ? -$spd : $spd;
		449
		450	if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
		451	if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
		452	}
		453
		454	$self->update;
		455	}
		456	} else {
		457	$self->{sdx} = $self->{sdy} = 0;
		458	}
		459
		460	$self->{last_update} = EV::time;
		461	}
		462
		463	sub refresh_hook {
		464	my ($self) = @_;
		465
		466	if ($::MAP && $::CONN) {
239	if (delete $self->{need_update}) {	467	if (delete $self->{need_update}) {
240	glNewList $self->{list};	468	$self->movement_update;
241		469
242	if ($::MAP) {	470	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		471
246	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	472	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;	473	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
248		474
249	glPushMatrix;	475	# width/height of map, in tiles
250	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	476	my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
		477	my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
251		478
252	glTranslate $sx0 - 32, $sy0 - 32, 0;	479	# the map displacement, in tiles
		480	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
		481	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
253		482
254	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	483	# the upper left "visible" corner, in pixels
		484	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		485	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		486
		487	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		488	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
255		489
256	if ($::CFG->{fow_enable}) {	490	if ($::CFG->{fow_enable}) {
257	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	491	my ($sdx_t, $sdy_t);#d# do not anchor at player
258	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);	492
259	glConvolutionFilter2D (	493	my ($w, $h, $data) = $::MAP->fow_texture (
260	GL_CONVOLUTION_2D,	494	$dx + (min 0, $sdx_t),
261	GL_ALPHA,	495	$dy + (min 0, $sdy_t),
262	3, 3,	496	$sw + abs $sdx_t,
263	GL_ALPHA, GL_FLOAT,	497	$sh + abs $sdy_t
264	(pack "f*", @{ $self->{smooth_matrix} }),
265	);	498	);
266	glEnable GL_CONVOLUTION_2D;
267	}
268		499
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	500	$self->{fow_texture} = new DC::Texture
273	w => $w,	501	w => $w,
274	h => $h,	502	h => $h,
275	data => $data,	503	data => $data,
276	name => $self->{fow_texture_name},
277	internalformat => GL_ALPHA,	504	internalformat => GL_INTENSITY,
278	format => GL_ALPHA;	505	format => GL_LUMINANCE;
279		506	} else {
280	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	507	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	}	508	}
290		509
		510	glNewList ($self->{list} \|\|= glGenList);
		511
		512	glPushMatrix;
		513	glTranslate $sx0, $sy0;
		514	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		515	glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
		516
		517	$::MAP->draw ($dx, $dy, $sw, $sh,
		518	$self->{tilesize},
		519	$::CONN->{player}{tag},
		520	-$self->{sdx}, -$self->{sdy});
		521
		522	#d#glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
		523	glScale $self->{tilesize}, $self->{tilesize};
		524
		525	if (my $tex = $self->{fow_texture}) {
		526	if (0 && $self->{last_fow_texture}) {
		527	my $d1 = ($self->{sdx} 2 + $self->{sdy} 2) ** 0.5;
		528	my $d2 = ($self->{ldx} 2 + $self->{ldy} 2) ** 0.5;
		529
		530	if ($d1 * $d2) {
		531	my $a2 = $d1 / $d2;
		532	my $a1 = 1 - $a2;
		533
		534	#$a1 *= 0.9;
		535	#$a2 *= 0.9;
		536
		537	printf "%8g %8g %8g %8g\n", $d1, $d2, $a1, $a2;#d#
		538
		539	#$a1 = 1 - (1-$a1) * 0.707;
		540	#$a2 = 1 - (1-$a2) * 0.707;
		541
		542	glColor 1,0,0,1;
		543	glBegin GL_QUADS;
		544	glVertex 10 + $sdx_t, 10;
		545	glVertex 11 + $sdx_t, 10;
		546	glVertex 11 + $sdx_t, 11;
		547	glVertex 10 + $sdx_t, 11;
		548	glEnd;
		549
		550	if(0){
		551	glBlendFunc GL_ZERO, GL_DST_COLOR;
		552	glColor +($::CFG->{fow_intensity}) x 3, $a2;
		553	glPushMatrix;
		554	glTranslate $sdx_t, $sdy_t; # anchor at player
		555	glTranslate $self->{ldx} / -$tilesize, $self->{ldy} / -$tilesize;
		556	glScale 1/3, 1/3;
		557	$self->{last_fow_texture}->draw_quad_alpha (0, 0);
		558	glPopMatrix;
		559	}
		560	} else {
		561	delete $self->{last_fow_texture};
		562	}
		563	} else {
		564	DC::Texture::draw_fow_texture
		565	$::CFG->{fow_intensity},
		566	@{$self->{fow_texture}}{qw(name s t w h)};
		567	#d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player
		568	}
		569	}
		570
		571	if ($self->{magicmap}) {
		572	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		573
		574	$x += $::MAP->ox + $self->{dx};
		575	$y += $::MAP->oy + $self->{dy};
		576
		577	glTranslate - $x - 1, - $y - 1;
		578	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		579	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		580	}
		581
291	glPopMatrix;	582	glPopMatrix;
292	}
293
294	glEndList;	583	glEndList;
		584	}
		585	} else {
		586	glDeleteList delete $self->{list}
		587	if $self->{list};
295	}	588	}
		589	}
296		590
297	glPushMatrix;	591	sub draw {
		592	my ($self) = @_;
		593
		594	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		595
		596	return unless $self->{list};
		597
		598	my $focused = $DC::UI::FOCUS == $self
		599	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
		600
		601	return
		602	unless $focused \|\| !$::FAST;
		603
298	glCallList $self->{list};	604	glCallList $self->{list};
299	glPopMatrix;
300		605
301	# TNT2 emulates logops in software (or worse :)	606	# TNT2 emulates logops in software (or worse :)
302	if ($focused) {	607	unless ($focused) {
303	(delete $self->{out_of_focus})->destroy	608	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;	609	glEnable GL_BLEND;
308	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	610	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
309	glBegin GL_QUADS;	611	glBegin GL_QUADS;
310	glVertex 0, 0;	612	glVertex 0, 0;
311	glVertex 0, $::HEIGHT;	613	glVertex 0, $::HEIGHT;
312	glVertex $::WIDTH, $::HEIGHT;	614	glVertex $::WIDTH, $::HEIGHT;
313	glVertex $::WIDTH, 0;	615	glVertex $::WIDTH, 0;
314	glEnd;	616	glEnd;
315	glDisable GL_BLEND;	617	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	}	618	}
338	}	619	}
339		620
340	sub DESTROY {	621	sub DESTROY {
341	my $self = shift;	622	my $self = shift;
…		…
343	glDeleteList $self->{list};	624	glDeleteList $self->{list};
344		625
345	$self->SUPER::DESTROY;	626	$self->SUPER::DESTROY;
346	}	627	}
347		628
348	package CFClient::MapWidget::MapMap;	629	package DC::MapWidget::MapMap;
349		630
		631	use strict;
		632	use utf8;
		633
350	our @ISA = CFClient::UI::Base::;	634	our @ISA = DC::UI::Base::;
351		635
352	use Time::HiRes qw(time);	636	use Time::HiRes qw(time);
353	use CFClient::OpenGL;	637	use DC::OpenGL;
354		638
355	sub size_request {	639	sub size_request {
356	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	640	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
357	}	641	}
358		642
		643	sub refresh_hook {
		644	my ($self) = @_;
		645
		646	if ($::MAP && $self->{texture_atime} < time) {
		647	my ($w, $h) = @$self{qw(w h)};
		648
		649	return unless $w && $h;
		650
		651	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		652	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		653
		654	my $ox = 0.5 * ($w - $sw);
		655	my $oy = 0.5 * ($h - $sh);
		656
		657	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		658	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		659
		660	#TODO: map scale is completely borked
		661
		662	my $x0 = int $ox - $sx + 0.5;
		663	my $y0 = int $oy - $sy + 0.5;
		664
		665	$self->{sw} = $sw;
		666	$self->{sh} = $sh;
		667
		668	$self->{x0} = $x0;
		669	$self->{y0} = $y0;
		670
		671	$self->{texture_atime} = time + 1/3;
		672
		673	$self->{texture} =
		674	new DC::Texture
		675	w => $w,
		676	h => $h,
		677	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		678	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		679	}
		680	}
		681
		682	sub invoke_visibility_change {
		683	my ($self) = @_;
		684
		685	$self->refresh_hook;
		686
		687	0
		688	}
		689
359	sub size_allocate {	690	sub invoke_size_allocate {
360	my ($self, $w, $h) = @_;	691	my ($self, $w, $h) = @_;
361		692
362	$self->SUPER::size_allocate ($w, $h);
363	$self->update;	693	$self->update;
		694
		695	1
364	}	696	}
365		697
366	sub update {	698	sub update {
367	my ($self) = @_;	699	my ($self) = @_;
368		700
…		…
371	}	703	}
372		704
373	sub _draw {	705	sub _draw {
374	my ($self) = @_;	706	my ($self) = @_;
375		707
376	$::MAP or return;	708	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
377		709
378	my ($w, $h) = @$self{qw(w h)};	710	$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		711
389	glEnable GL_BLEND;	712	glEnable GL_BLEND;
390	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	713	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
391	glEnable GL_TEXTURE_2D;	714	glEnable GL_TEXTURE_2D;
392	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	715	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
393		716
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);	717	$self->{texture}->draw_quad (0, 0);
406		718
407	glDisable GL_TEXTURE_2D;	719	glDisable GL_TEXTURE_2D;
408		720
409	glTranslate 0.375, 0.375;	721	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		722
416	glColor 1, 1, 0, 1;	723	glColor 1, 1, 0, 1;
417	glBegin GL_LINE_LOOP;	724	glBegin GL_LINE_LOOP;
418	glVertex $x0 , $y0 ;	725	glVertex $self->{x0} , $self->{y0} ;
419	glVertex $x0 , $y0 + $sh;	726	glVertex $self->{x0} , $self->{y0} + $self->{sh};
420	glVertex $x0 + $sw, $y0 + $sh;	727	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
421	glVertex $x0 + $sw, $y0 ;	728	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
422	glEnd;	729	glEnd;
423		730
424	glDisable GL_BLEND;	731	glDisable GL_BLEND;
425	}	732	}
426		733
427	package CFClient::MapWidget::Command;	734	package DC::MapWidget::Command;
428		735
429	use strict;	736	use strict;
430		737
431	use CFClient::OpenGL;	738	use DC::OpenGL;
432		739
433	our @ISA = CFClient::UI::Frame::;	740	our @ISA = DC::UI::Frame::;
434		741
435	sub new {	742	sub new {
436	my $class = shift;	743	my $class = shift;
437		744
438	my $self = $class->SUPER::new (	745	my $self = $class->SUPER::new (
439	bg => [0, 0, 0, 0.8],	746	bg => [0, 0, 0, 0.8],
440	@_,	747	@_,
441	);	748	);
442		749
443	$self->add ($self->{vbox} = new CFClient::UI::VBox);	750	$self->add ($self->{vbox} = new DC::UI::VBox);
444		751
445	$self->{label} = [	752	$self->{label} = [
446	map	753	map
447	CFClient::UI::Label->new (	754	DC::UI::Label->new (
		755	align => 0,
448	can_hover => 1,	756	can_hover => 1,
449	can_events => 1,	757	can_events => 1,
450	tooltip_width => 0.33,	758	tooltip_width => 0.33,
451	fontsize => $_,	759	fontsize => $_,
452	), (0.8) x 16	760	), (0.8) x 16
453	];	761	];
454		762
455	$self->{entry} = new CFClient::UI::Entry	763	$self->{entry} = new DC::UI::Entry
456	on_changed => sub {	764	on_changed => sub {
457	$self->update_labels;	765	$self->update_labels;
		766	0
		767	},
		768	on_button_down => sub {
		769	my ($entry, $ev, $x, $y) = @_;
		770
		771	if ($ev->{button} == 3) {
		772	(new DC::UI::Menu
		773	items => [
		774	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
		775	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
		776	],
		777	)->popup ($ev);
		778	return 1;
		779	}
		780	0
458	},	781	},
459	on_key_down => sub {	782	on_key_down => sub {
460	my ($entry, $ev) = @_;	783	my ($entry, $ev) = @_;
461		784
462	my $self = $entry->{parent}{parent};	785	my $self = $entry->{parent}{parent};
463		786
464	if ($ev->{sym} == 13) {	787	if ($ev->{sym} == 13) {
465	if (exists $self->{select}) {	788	if (exists $self->{select}) {
466	$self->{last_command} = $self->{select};	789	$self->{last_command} = $self->{select};
467	$::CONN->user_send ($self->{select});	790	$::CONN->user_send ($self->{select});
		791
		792	unshift @{$self->{history}}, $self->{entry}->get_text;
		793	$self->{hist_ptr} = 0;
		794
468	$self->hide;	795	$self->hide;
469	}	796	}
470	} elsif ($ev->{sym} == 27) {	797	} elsif ($ev->{sym} == 27) {
		798	$self->{hist_ptr} = 0;
471	$self->hide;	799	$self->hide;
472	return;
473	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {	800	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
		801	if ($self->{hist_ptr} > 1) {
		802	$self->{hist_ptr}--;
		803	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
		804	} elsif ($self->{hist_ptr} > 0) {
		805	$self->{hist_ptr}--;
		806	$self->{entry}->set_text ($self->{hist_saveback});
		807	} else {
474	++$self->{select_offset}	808	++$self->{select_offset}
475	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	809	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		810	}
476	$self->update_labels;	811	$self->update_labels;
477	} elsif ($ev->{sym} == CFClient::SDLK_UP) {	812	} elsif ($ev->{sym} == DC::SDLK_UP) {
		813	if ($self->{select_offset}) {
478	--$self->{select_offset}	814	--$self->{select_offset}
		815	} else {
		816	unless ($self->{hist_ptr}) {
		817	$self->{hist_saveback} = $self->{entry}->get_text;
		818	}
		819	if ($self->{hist_ptr} <= $#{$self->{history}}) {
479	if $self->{select_offset};	820	$self->{hist_ptr}++;
		821	}
		822	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
		823	if exists $self->{history}->[$self->{hist_ptr} - 1];
		824	}
480	$self->update_labels;	825	$self->update_labels;
481	} else {	826	} else {
482	return 0;	827	return 0;
483	}	828	}
484		829
…		…
499		844
500	$self->{entry}->set_text ($prefix);	845	$self->{entry}->set_text ($prefix);
501	$self->show;	846	$self->show;
502	}	847	}
503		848
504	sub size_allocate {	849	sub invoke_size_allocate {
505	my ($self, $w, $h) = @_;	850	my ($self, $w, $h) = @_;
506		851
507	$self->SUPER::size_allocate ($w, $h);
508	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	852	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		853
		854	$self->SUPER::invoke_size_allocate ($w, $h)
509	}	855	}
510		856
511	sub show {	857	sub show {
512	my ($self) = @_;	858	my ($self) = @_;
513		859
514	$self->SUPER::show;	860	$self->SUPER::show;
515	$self->{entry}->focus_in;	861	$self->{entry}->grab_focus;
516	}	862	}
517		863
518	sub hide {	864	sub hide {
519	my ($self) = @_;	865	my ($self) = @_;
		866
		867	$self->{hist_ptr} = 0;
520		868
521	$self->SUPER::hide;	869	$self->SUPER::hide;
522	$self->{entry}->set_text ("");	870	$self->{entry}->set_text ("");
523	}	871	}
524		872
525	sub key_down {	873	sub inject_key_down {
526	my ($self, $ev) = @_;	874	my ($self, $ev) = @_;
527		875
		876	$self->{entry}->grab_focus;
528	$self->{entry}->key_down ($ev)	877	$self->{entry}->emit (key_down => $ev);
529	}	878	}
530		879
531	sub update_labels {	880	sub update_labels {
532	my ($self) = @_;	881	my ($self) = @_;
533		882
534	my $text = $self->{entry}->get_text;	883	my $text = $self->{entry}->get_text;
535		884
536	length $text	885	length $text
537	or return $self->hide;	886	or return $self->hide;
538		887
539	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
540
541	if ($text ne $self->{last_search}) {	888	if ($text ne $self->{last_search}) {
542	my @match;	889	my @match;
543		890
544	if ($text =~ /^(.*?)\s+$/) {	891	if ($text =~ /^(.*?)\s+$/) {
		892	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
545	@match = [$cmd, "(appended whitespace suppresses completion)"];	893	@match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
546	} else {	894	} else {
		895	# @match is [command, penalty, command with arguments] until sort
		896
		897	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		898
547	my $regexp = do {	899	my $regexp_abbrev = do {
548	my ($beg, @chr) = split //, lc $cmd;	900	my ($beg, @chr) = split //, lc $cmd;
549		901
550	# the following regex is used to match our "completion entry"	902	# the following regex is used to match our "completion entry"
551	# to an actual command - the parentheses match kind of "overhead"	903	# to an actual command - the parentheses match kind of "overhead"
552	# - the more characters the parentheses match, the less attractive	904	# - the more characters the parentheses match, the less attractive
…		…
554	my $regexp = "^\Q$beg\E"	906	my $regexp = "^\Q$beg\E"
555	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;	907	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
556	qr<$regexp>	908	qr<$regexp>
557	};	909	};
558		910
559	my @penalty;	911	my $regexp_partial = do {
		912	my $regexp = "^\Q$text\E(.*)";
		913	qr<$regexp>
		914	};
560		915
561	for (keys %{$self->{command}}) {	916	for (keys %{$self->{command}}) {
562	if (@penalty = $_ =~ $regexp) {	917	my @scores;
563	push @match, [$_, length join "", map "::$_", grep defined, @penalty];	918
		919	# 1. Complete command [with args]
		920	# command is a prefix of the text
		921	# score is length of complete command matched
		922	# e.g. "invoke summon pet monster bat"
		923	# "invoke" "summon pet monster bat" = 6
		924	# "invoke summon pet monster" "bat" = 25
		925	if ($text =~ /^\Q$_\E(.*)/) {
		926	push @scores, [$_, length $_, $text];
564	}	927	}
		928
		929	# 2. Partial command
		930	# text is a prefix of the full command
		931	# score is the length of the input text
		932	# e.g. "invoke s"
		933	# "invoke small fireball" = 8
		934	# "invoke summon pet monster" = 8
		935
		936	if ($_ =~ $regexp_partial) {
		937	push @scores, [$_, length $text, $_];
		938	}
		939
		940	# 3. Abbreviation match
		941	# attempts to use first word of text as an abbreviated command
		942	# score is length of word + 1 - 3 per non-word-initial character
		943
		944	if (my @penalty = $_ =~ $regexp_abbrev) {
		945	push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
		946	}
		947
		948	# Pick the best option for this command
		949	push @match, (sort {
		950	$b->[1] <=> $a->[1]
		951	} @scores)[0];
565	}	952	}
566		953
		954	# @match is now [command object, command with arguments]
567	@match = map $self->{command}{$_->[0]},	955	@match = map [$self->{command}{$_->[0]}, $_->[2]],
568	sort {	956	sort {
569	$a->[1] <=> $b->[1]	957	$b->[1] <=> $a->[1]
570	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]	958	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
571	or (length $b->[0]) <=> (length $a->[0])	959	or (length $b->[0]) <=> (length $a->[0])
572	} @match;	960	} @match;
573	}	961	}
574		962
…		…
593	$label->{fg} = [1, 1, 1, 1];	981	$label->{fg} = [1, 1, 1, 1];
594	$label->{bg} = [0, 0, 0, 0];	982	$label->{bg} = [0, 0, 0, 0];
595	}	983	}
596		984
597	if (@matches) {	985	if (@matches) {
598	$self->{select} = "$matches[0][0]$arg";	986	$self->{select} = "$matches[0][1]";
599		987
600	$labels[0]->{fg} = [0, 0, 0, 1];	988	$labels[0]->{fg} = [0, 0, 0, 1];
601	$labels[0]->{bg} = [1, 1, 1, 0.8];	989	$labels[0]->{bg} = [1, 1, 1, 0.8];
602	} else {	990	} else {
603	$self->{select} = "$cmd$arg";	991	$self->{select} = "$text";
604	}	992	}
605		993
606	for my $match (@matches) {	994	for my $match (@matches) {
607	my $label = shift @labels;	995	my $label = shift @labels;
608		996
609	if (@labels) {	997	if (@labels) {
610	$label->set_text ("$match->[0]$arg");	998	$label->set_text ("$match->[1]");
611	$label->set_tooltip ($match->[1]);	999	$label->set_tooltip ("$match->[0][1]");
612	} else {	1000	} else {
613	$label->set_text ("...");	1001	$label->set_text ("...");
614	$label->set_tooltip ("Use Cursor-Down to view more matches");	1002	$label->set_tooltip ("Use Cursor-Down to view more matches");
615	last;	1003	last;
616	}	1004	}
…		…
620	$label->set_text ("");	1008	$label->set_text ("");
621	$label->set_tooltip ("");	1009	$label->set_tooltip ("");
622	}	1010	}
623		1011
624	$self->update;	1012	$self->update;
625	###
626	}	1013	}
627		1014
628	sub _draw {	1015	sub _draw {
629	my ($self) = @_;	1016	my ($self) = @_;
630		1017
631	# hack	1018	# hack
632	local $CFClient::UI::FOCUS = $self->{entry};	1019	local $DC::UI::FOCUS = $self->{entry};
633		1020
634	$self->SUPER::_draw;	1021	$self->SUPER::_draw;
635	}	1022	}
636		1023
637	1	1024	1
		1025

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.155 by root, Thu Dec 17 02:49:38 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.155 by root, Thu Dec 17 02:49:38 2009 UTC