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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.86 by root, Sun Oct 8 21:54:20 2006 UTC vs.
Revision 1.151 by root, Mon Nov 16 00:47:56 2009 UTC

…		…
1	package CFPlus::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 CFPlus;	8	use DC;
9	use CFPlus::OpenGL;	9	use DC::OpenGL;
10	use CFPlus::UI;	10	use DC::UI;
		11	use DC::Macro;
11		12
12	our @ISA = CFPlus::UI::Base::;	13	our @ISA = DC::UI::Base::;
13		14
14	my $magicmap_tex =	15	my $magicmap_tex =
15	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",	16	new_from_resource DC::Texture "magicmap.png",
16	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;	17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17		18
18	sub new {	19	sub new {
19	my $class = shift;	20	my $class = shift;
20		21
21	my $self = $class->SUPER::new (	22	my $self = $class->SUPER::new (
22	z => -1,	23	z => -1,
23	can_focus => 1,	24	can_focus => 1,
24	list => glGenList,	25	tilesize => 32,
25
26	smooth_matrix => [
27	0.05, 0.13, 0.05,
28	0.13, 0.30, 0.13,
29	0.05, 0.13, 0.05,
30	],
31
32	@_	26	@_
33	);	27	);
34
35	$self->{completer} = new CFPlus::MapWidget::Command::
36	command => $self->{command},
37	tooltip => "#completer_help",
38	;
39		28
40	$self	29	$self
41	}	30	}
42		31
43	sub add_command {	32	sub add_command {
47		36
48	$tooltip =~ s/^\s+//;	37	$tooltip =~ s/^\s+//;
49	$tooltip = "<big>$data</big>\n\n$tooltip";	38	$tooltip = "<big>$data</big>\n\n$tooltip";
50	$tooltip =~ s/\s+$//;	39	$tooltip =~ s/\s+$//;
51		40
52	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	41	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53	}	42	}
54		43
55	sub clr_commands {	44	sub clr_commands {
56	my ($self) = @_;	45	my ($self) = @_;
57		46
58	%{$self->{completer}{command}} = ();	47	%{$::COMPLETER->{command}} = ();
59		48
60	$self->{completer}->hide	49	$::COMPLETER->hide
61	if $self->{completer};	50	if $::COMPLETER;
62	}	51	}
63		52
64	sub server_login {	53	sub server_login {
65	my ($server) = @_;	54	my ($server) = @_;
66		55
67	::stop_game ();	56	::stop_game ();
68	local $::PROFILE->{host} = $server;	57	local $::PROFILE->{host} = $server;
69	::start_game ();	58	::start_game ();
70	}	59	}
71		60
72	sub check_lwp($) {
73	my ($res) = @_;
74
75	$res->is_error
76	and die $res->status_line;
77
78	$res
79	}
80
81	sub editor_invoke {	61	sub editor_invoke {
82	my $editsup = $::CONN && $::CONN->{editor_support}	62	my $editsup = $::CONN && $::CONN->{editor_support}
83	or return;	63	or return;
84		64
85	my ($pid, $fh);	65	DC::background {
86	unless ($pid = open $fh, "-\|:utf8", "-") {
87	$SIG{__DIE__} = sub {
88	warn "FATAL: @_\n";
89	CFPlus::_exit 99;
90	};
91
92	open STDERR, ">&STDOUT";
93	binmode STDOUT, ":utf8";
94	binmode STDERR, ":utf8";
95	close $fh;
96
97	$\| = 1;
98	print "preparing editor startup...\n";	66	print "preparing editor startup...\n";
99	CFPlus::set_proxy;
100		67
101	my $server = $editsup->{gameserver} \|\| "default";	68	my $server = $editsup->{gameserver} \|\| "default";
102	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	69	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
103		70
104	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;	71	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
105	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;	72	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
106		73
107	print "map directory is $mapdir\n";	74	print "map directory is $mapdir\n";
108	print "lib directory is $libdir\n";	75	print "lib directory is $libdir\n";
109		76
110	require LWP::UserAgent;	77	my $ua = DC::lwp_useragent;
111
112	my $ua = LWP::UserAgent->new (
113	agent => "cfplus $CFPlus::VERSION",
114	keep_alive => 1,
115	env_proxy => 1,
116	timeout => 30,
117	);
118		78
119	for my $file (qw(archetypes crossfire.0)) {	79	for my $file (qw(archetypes crossfire.0)) {
120	my $url = "$editsup->{lib_root}$file";	80	my $url = "$editsup->{lib_root}$file";
121	print "mirroring $url...\n";	81	print "mirroring $url...\n";
122	check_lwp $ua->mirror ($url, "$libdir/$file");	82	DC::lwp_check $ua->mirror ($url, "$libdir/$file");
123	printf "%s size %d octets\n", $file, -s "$libdir/$file";	83	printf "%s size %d octets\n", $file, -s "$libdir/$file";
124	}	84	}
125		85
126	if (1) { # upload a map	86	if (1) { # upload a map
127	my $mapname = $::CONN->{map_info}[0];	87	my $mapname = $::CONN->{map_info}[0];
128		88
		89	my $mappath = "$mapdir/$mapname";
		90
		91	-e $mappath and die "$mappath already exists\n";
		92
129	print "getting map revision for $mapname...\n";	93	print "getting map revision for $mapname...\n";
130		94
131	# try to get the most recent head revision, what a hack,	95	# try to get the most recent head revision, what a hack,
132	# this should have been returned while downloading sigh	96	# this should have been returned while downloading sigh
133	my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;	97	my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
134		98
135	if ($log =~ /\?rev=(\d+\.\d+)"/) {	99	if ($log =~ /\?rev=(\d+\.\d+)"/) {
136	my $rev = $1;	100	my $rev = $1;
137		101
138	print "downloading revision $rev...\n";	102	print "downloading revision $rev...\n";
139		103
140	my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;	104	my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
141		105
142	my $meta = {	106	my $meta = {
143	%$editsup,	107	%$editsup,
144	path => $mapname,	108	path => $mapname,
145	revision => $rev,	109	revision => $rev,
146	cf_login => $::PROFILE->{user},	110	cf_login => $::PROFILE->{user},
147	};	111	};
148		112
149	my $mappath = "$mapdir/$mapname";
150
151	require File::Basename;	113	require File::Basename;
152	require File::Path;	114	require File::Path;
153		115
154	File::Path::mkpath (File::Basename::dirname ($mappath));	116	File::Path::mkpath (File::Basename::dirname ($mappath));
155	open my $fh, ">:raw:perlio", "$mappath.meta"	117	open my $fh, ">:raw:perlio", "$mappath.meta"
156	or die "$mappath.meta: $!";	118	or die "$mappath.meta: $!\n";
157	print $fh CFPlus::to_json $meta;	119	print $fh DC::encode_json $meta;
158	close $fh;	120	close $fh;
159	open my $fh, ">:raw:perlio:utf8", $mappath	121	open my $fh, ">:raw:perlio:utf8", $mappath
160	or die "$mappath: $!";	122	or die "$mappath: $!\n";
161	print $fh $map;	123	print $fh $map;
162	close $fh;	124	close $fh;
163		125
164	print "saved as $mappath\n";	126	print "saved as $mappath\n";
165		127
…		…
193	# }	155	# }
194	} else {	156	} else {
195	die "viewvc parse error, unable to detect revision\n";	157	die "viewvc parse error, unable to detect revision\n";
196	}	158	}
197	}	159	}
198
199	CFPlus::_exit;
200	}
201
202	my $buffer;
203
204	Event->io (fd => $fh, poll => 'r', cb => sub {
205	unless (sysread $fh, $buffer, 4096, length $buffer) {
206	$_[0]->w->cancel;
207	$buffer .= "done\n";
208	}
209
210	while ($buffer =~ s/^(.*)\n//) {
211	::message ({
212	markup => "editor($pid): " . CFPlus::asxml $1,
213	});
214	}
215	});	160	}
216	}	161	}
217		162
218	sub invoke_button_down {	163	sub invoke_button_down {
219	my ($self, $ev, $x, $y) = @_;	164	my ($self, $ev, $x, $y) = @_;
220		165
221	if ($ev->{button} == 1) {	166	if ($ev->{button} == 1) {
222	$self->grab_focus;	167	$self->grab_focus;
223	return unless $::CONN;	168	return unless $::CONN && $self->{ctilesize};
224		169
225	my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	170	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
226	my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	171	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
227		172
228	$x -= int 0.5 * $self->{sw};	173	$x -= DC::floor $::MAP->w * 0.5;
229	$y -= int 0.5 * $self->{sh};	174	$y -= DC::floor $::MAP->h * 0.5;
230		175
		176	if ($::CONN) {
231	$::CONN->lookat ($x, $y)	177	$::CONN->lookat ($x, $y)
232	if $::CONN;	178	}
233		179
234	} elsif ($ev->{button} == 2) {	180	} elsif ($ev->{button} == 2) {
235	$self->grab_focus;	181	$self->grab_focus;
236	return unless $::CONN;	182	return unless $::CONN;
237		183
…		…
254	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	200	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
255	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	201	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
256	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	202	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
257	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	203	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
258	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],	204	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
259	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],	205	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
260	[
261	$::PICKUP_ENABLE->{state}
262	? "Disable automatic pickup"
263	: "Enable automatic pickup",
264	sub { $::PICKUP_ENABLE->toggle }
265	],
266	);	206	);
267		207
268	if ($::CONN && $::CONN->{editor_support}) {	208	if ($::CONN && $::CONN->{editor_support}) {
269	push @items, [	209	# push @items, [
270	"Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",	210	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
271	\&editor_invoke,	211	# \&editor_invoke,
272	];	212	# ];
273		213
274	for my $type (qw(test name)) {	214	for my $type (qw(test name)) {
275	$::CONN->{editor_support}{type} ne $type	215	$::CONN->{editor_support}{type} ne $type
276	or next;	216	or next;
277	my $server = $::CONN->{editor_support}{"${type}server"}	217	my $server = $::CONN->{editor_support}{"${type}server"}
278	or next;	218	or next;
279		219
280	push @items, [	220	push @items, [
281	"Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",	221	"Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
282	sub { server_login $server },	222	sub { server_login $server },
283	];	223	];
284	}	224	}
285	}	225	}
286		226
…		…
294	}	234	}
295	}	235	}
296	],	236	],
297	;	237	;
298		238
299	(new CFPlus::UI::Menu	239	(new DC::UI::Menu
300	items => \@items,	240	items => \@items,
301	)->popup ($ev);	241	)->popup ($ev);
302	}	242	}
303		243
304	1	244	1
…		…
323		263
324	1	264	1
325	}	265	}
326		266
327	sub size_request {	267	sub size_request {
		268	my ($self) = @_;
		269
328	(	270	(
329	32 * CFPlus::ceil $::WIDTH / 32,	271	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
330	32 * CFPlus::ceil $::HEIGHT / 32,	272	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
331	)	273	)
332	}	274	}
333		275
334	sub update {	276	sub update {
335	my ($self) = @_;	277	my ($self) = @_;
…		…
337	$self->{need_update} = 1;	279	$self->{need_update} = 1;
338	$self->SUPER::update;	280	$self->SUPER::update;
339	}	281	}
340		282
341	my %DIR = (	283	my %DIR = (
342	CFPlus::SDLK_KP8, [1, "north"],	284	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
		285	( "," . DC::SDLK_KP8 ), [1, "north"],
343	CFPlus::SDLK_KP9, [2, "northeast"],	286	( "," . DC::SDLK_KP9 ), [2, "northeast"],
344	CFPlus::SDLK_KP6, [3, "east"],	287	( "," . DC::SDLK_KP6 ), [3, "east"],
345	CFPlus::SDLK_KP3, [4, "southeast"],	288	( "," . DC::SDLK_KP3 ), [4, "southeast"],
346	CFPlus::SDLK_KP2, [5, "south"],	289	( "," . DC::SDLK_KP2 ), [5, "south"],
347	CFPlus::SDLK_KP1, [6, "southwest"],	290	( "," . DC::SDLK_KP1 ), [6, "southwest"],
348	CFPlus::SDLK_KP4, [7, "west"],	291	( "," . DC::SDLK_KP4 ), [7, "west"],
349	CFPlus::SDLK_KP7, [8, "northwest"],	292	( "," . DC::SDLK_KP7 ), [8, "northwest"],
350		293
351	CFPlus::SDLK_UP, [1, "north"],	294	( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
		295	( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
		296	( "," . DC::SDLK_END ), [6, "southwest"],
		297	( "," . DC::SDLK_HOME ), [8, "northwest"],
		298
		299	( "," . DC::SDLK_UP ), [1, "north"],
		300	("1," . DC::SDLK_UP ), [2, "northeast"],
352	CFPlus::SDLK_RIGHT, [3, "east"],	301	( "," . DC::SDLK_RIGHT ), [3, "east"],
353	CFPlus::SDLK_DOWN, [5, "south"],	302	("1," . DC::SDLK_RIGHT ), [4, "southeast"],
354	CFPlus::SDLK_LEFT, [7, "west"],	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"],
355	);	307	);
356		308
357	sub invoke_key_down {	309	sub invoke_key_down {
358	my ($self, $ev) = @_;	310	my ($self, $ev) = @_;
359		311
360	my $mod = $ev->{mod};	312	my $mod = $ev->{mod};
361	my $sym = $ev->{sym};	313	my $sym = $ev->{sym};
362	my $uni = $ev->{unicode};	314	my $uni = $ev->{unicode};
363		315
364	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	316	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_META \| DC::KMOD_SHIFT;
365		317
366	if ($uni == ord "\t") {	318	# ignore repeated keypresses
367	$::PL_WINDOW->toggle_visibility;	319	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
368	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {	320	$self->{last_mod} = $mod;
369	$::HELP_WINDOW->toggle_visibility;	321	$self->{last_sym} = $sym;
370	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
371	::toggle_player_page ($::STATS_PAGE);
372	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
373	::toggle_player_page ($::SKILL_PAGE);
374	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
375	::toggle_player_page ($::SPELL_PAGE);
376	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
377	::toggle_player_page ($::INVENTORY_PAGE);
378	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
379	$::SETUP_DIALOG->toggle_visibility;
380	} elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
381	$::BIND_EDITOR->set_binding (undef, undef, [],
382	sub {
383	my ($mod, $sym, $cmds) = @_;
384	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
385	});
386	$::BIND_EDITOR->start;
387	$::BIND_EDITOR->show;
388	#TODO: elmex, what was this supposed to do? it currently crashes the client.
389	# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
390	# $::BIND_EDITOR->stop;
391	# $::BIND_EDITOR->ask_for_bind_and_commit;
392	# $::BIND_EDITOR->hide;
393	} elsif (!$::CONN) {
394	return 0; # bindings further down need a valid connection
395		322
396	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {	323	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
397	$::CONN->user_send ("stay fire");	324
398	} elsif ($uni == ord ",") {	325	if ($::CONN && $dir) {
399	$::CONN->user_send ("take");
400	} elsif ($uni == ord " ") {
401	$::CONN->user_send ("apply");
402	} elsif ($uni == 13) {
403	$::CONN->user_send ("examine");
404	} elsif ($uni == ord ".") {
405	$::CONN->user_send ($self->{completer}{last_command})
406	if exists $self->{completer}{last_command};
407	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
408	$::CONN->user_send ($_) for @$bind_cmd;
409	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
410	$::CONN->user_send ("rotateshoottype +");
411	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
412	$::CONN->user_send ("rotateshoottype -");
413	} elsif ($uni == ord '"') {
414	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
415	$self->{completer}->show;
416	} elsif ($uni == ord "'") {
417	$self->{completer}->set_prefix ("");
418	$self->{completer}->show;
419	} elsif (exists $DIR{$sym}) {
420	if ($mod & CFPlus::KMOD_SHIFT) {	326	if ($mod & DC::KMOD_SHIFT) {
421	$self->{shft}++;	327	$self->{shft}++;
422	if ($DIR{$sym}[0] != $self->{fire_dir}) {	328	if ($dir->[0] != $self->{fire_dir}) {
423	$::CONN->user_send ("fire $DIR{$sym}[0]");	329	$::CONN->user_send ("fire $dir->[0]");
424	}	330	}
425	$self->{fire_dir} = $DIR{$sym}[0];	331	$self->{fire_dir} = $dir->[0];
426	} elsif ($mod & CFPlus::KMOD_CTRL) {	332	} elsif ($mod & DC::KMOD_CTRL) {
427	$self->{ctrl}++;	333	$self->{ctrl}++;
428	$::CONN->user_send ("run $DIR{$sym}[0]");	334	$::CONN->user_send ("run $dir->[0]");
429	} else {	335	} else {
430	$::CONN->user_send ("$DIR{$sym}[1]");	336	$::CONN->user_send ("$dir->[1]");
431	}	337	}
432	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	338
433	$self->{completer}->inject_key_down ($ev);
434	$self->{completer}->show;
435	} else {
436	return 0;	339	return 1;
437	}
438
439	1	340	}
		341
		342	0
440	}	343	}
441		344
442	sub invoke_key_up {	345	sub invoke_key_up {
443	my ($self, $ev) = @_;	346	my ($self, $ev) = @_;
444		347
445	my $res = 0;	348	my $res = 0;
446	my $mod = $ev->{mod};	349	my $mod = $ev->{mod};
447	my $sym = $ev->{sym};	350	my $sym = $ev->{sym};
448		351
		352	delete $self->{last_mod};
		353	delete $self->{last_sym};
		354
449	if ($::CFG->{shift_fire_stop}) {	355	if ($::CFG->{shift_fire_stop}) {
450	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {	356	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
451	$::CONN->user_send ("fire_stop");	357	$::CONN->user_send ("fire_stop");
452	delete $self->{fire_dir};	358	delete $self->{fire_dir};
453	$res = 1;	359	$res = 1;
454	}	360	}
455	} else {	361	} else {
		362	my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT \| DC::KMOD_META))) . ",$sym" };
		363
456	if (exists $DIR{$sym} && delete $self->{shft}) {	364	if ($dir && delete $self->{shft}) {
457	$::CONN->user_send ("fire_stop");	365	$::CONN->user_send ("fire_stop");
458	delete $self->{fire_dir};	366	delete $self->{fire_dir};
459	$res = 1;	367	$res = 1;
460	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?	368	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
		369	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
461	$::CONN->user_send ("fire_stop");	370	$::CONN->user_send ("fire_stop");
462	delete $self->{fire_dir};	371	delete $self->{fire_dir};
463	$res = 1;	372	$res = 1;
464	}	373	}
465	}	374	}
466		375
467	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {	376	if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
468	$::CONN->user_send ("run_stop");	377	$::CONN->user_send ("run_stop");
469	$res = 1;	378	$res = 1;
470	}	379	}
471		380
472	$res	381	$res
473	}	382	}
474		383
		384	sub invoke_visibility_change {
		385	my ($self) = @_;
		386
		387	$self->refresh_hook;
		388
		389	0
		390	}
		391
		392	sub set_tilesize {
		393	my ($self, $tilesize) = @_;
		394
		395	$self->{tilesize} = $tilesize;
		396	}
		397
		398	sub scroll {
		399	my ($self, $dx, $dy) = @_;
		400
		401	$::MAP->scroll ($dx, $dy);
		402
		403	$self->{last_fow_texture} = $self->{fow_texture};
		404	$self->{ldx} = $self->{sdx} + $dx * $self->{tilesize}; # smooth displacement
		405	$self->{ldy} = $self->{sdy} + $dy * $self->{tilesize};
		406
		407	$self->movement_update;
		408
		409	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
		410	$self->{sdy} += $dy * $self->{tilesize};
		411	}
		412
475	sub set_magicmap {	413	sub set_magicmap {
476	my ($self, $w, $h, $x, $y, $data) = @_;	414	my ($self, $w, $h, $x, $y, $data) = @_;
477		415
478	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	416	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
479	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	417	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
480		418
481	$self->{magicmap} = [$x, $y, $w, $h, $data];	419	$self->{magicmap} = [$x, $y, $w, $h, $data];
482		420
483	$self->update;	421	$self->update;
484	}	422	}
485		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) {
		467	if (delete $self->{need_update}) {
		468	$self->movement_update;
		469
		470	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		471
		472	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
		473	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
		474
		475	# width/height of map, in tiles
		476	my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
		477	my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
		478
		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;
		482
		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;
		489
		490	if ($::CFG->{fow_enable}) {
		491	my ($sdx_t, $sdy_t);#d# do not anchor at player
		492
		493	my ($w, $h, $data) = $::MAP->fow_texture (
		494	$dx + (min 0, $sdx_t),
		495	$dy + (min 0, $sdy_t),
		496	$sw + abs $sdx_t,
		497	$sh + abs $sdy_t
		498	);
		499
		500	$self->{fow_texture} = new DC::Texture
		501	w => $w,
		502	h => $h,
		503	data => $data,
		504	internalformat => GL_ALPHA,
		505	format => GL_ALPHA;
		506	} else {
		507	delete $self->{fow_texture};
		508	}
		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	glEnable GL_TEXTURE_2D;
		527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		528
		529	my $a1 = 0.9;
		530
		531	if (0 && $self->{last_fow_texture}) {
		532	my $d1 = ($self->{sdx} 2 + $self->{sdy} 2) ** 0.5;
		533	my $d2 = ($self->{ldx} 2 + $self->{ldy} 2) ** 0.5;
		534
		535	if ($d1 * $d2) {
		536	my $a2 = $d1 / $d2;
		537
		538	$a1 = 1 - $a2;
		539
		540	$a1 *= 0.9;
		541	#$a2 *= 0.9;
		542
		543	printf "%4g %4g %4g\n", $d1, $d2, $a1+$a2;#d#
		544
		545	#$a1 = 1 - (1-$a1) * 0.707;
		546	#$a2 = 1 - (1-$a2) * 0.707;
		547
		548	glColor 1,0,0,1;
		549	glBegin GL_QUADS;
		550	glVertex 10 + $sdx_t, 10;
		551	glVertex 11 + $sdx_t, 10;
		552	glVertex 11 + $sdx_t, 11;
		553	glVertex 10 + $sdx_t, 11;
		554	glEnd;
		555
		556	glColor +($::CFG->{fow_intensity}) x 3, $a2;
		557	glPushMatrix;
		558	glTranslate $sdx_t, $sdy_t; # anchor at player
		559	glTranslate $self->{ldx} / -$tilesize, $self->{ldy} / -$tilesize;
		560	glScale 1/3, 1/3;
		561	$self->{last_fow_texture}->draw_quad_alpha (0, 0);
		562	glPopMatrix;
		563	} else {
		564	delete $self->{last_fow_texture};
		565	}
		566	}
		567
		568	glColor +($::CFG->{fow_intensity}) x 3, $a1;
		569	glPushMatrix;
		570	#d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player
		571	glScale 1/3, 1/3;
		572	$self->{fow_texture}->draw_quad_alpha (0, 0);
		573	glPopMatrix;
		574
		575	glDisable GL_TEXTURE_2D;
		576	}
		577
		578	if ($self->{magicmap}) {
		579	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		580
		581	$x += $::MAP->ox + $self->{dx};
		582	$y += $::MAP->oy + $self->{dy};
		583
		584	glTranslate - $x - 1, - $y - 1;
		585	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		586	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		587	}
		588
		589	glPopMatrix;
		590	glEndList;
		591	}
		592	} else {
		593	glDeleteList delete $self->{list}
		594	if $self->{list};
		595	}
		596	}
		597
486	sub draw {	598	sub draw {
487	my ($self) = @_;	599	my ($self) = @_;
488		600
489	return unless $::MAP;	601	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
490		602
		603	return unless $self->{list};
		604
491	my $focused = $CFPlus::UI::FOCUS == $self	605	my $focused = $DC::UI::FOCUS == $self
492	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	606	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
493		607
494	return	608	return
495	unless $focused \|\| !$::FAST;	609	unless $focused \|\| !$::FAST;
496		610
497	if (delete $self->{need_update}) {
498	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
499
500	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
501	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
502
503	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
504	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
505
506	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
507	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
508
509	if ($::CFG->{fow_enable}) {
510	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
511
512	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
513	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
514	glConvolutionFilter2D (
515	GL_CONVOLUTION_2D,
516	GL_ALPHA,
517	3, 3,
518	GL_ALPHA, GL_FLOAT,
519	(pack "f*", @{ $self->{smooth_matrix} }),
520	);
521	glEnable GL_CONVOLUTION_2D;
522	}
523
524	$self->{fow_texture} = new CFPlus::Texture
525	w => $w,
526	h => $h,
527	data => $data,
528	internalformat => GL_ALPHA,
529	format => GL_ALPHA;
530
531	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
532	} else {
533	delete $self->{fow_texture};
534	}
535
536	glNewList $self->{list};
537
538	glPushMatrix;
539	glTranslate $sx0, $sy0;
540	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
541
542	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
543
544	glScale 32, 32;
545
546	if (my $tex = $self->{fow_texture}) {
547	glEnable GL_TEXTURE_2D;
548	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
549
550	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
551	$self->{fow_texture}->draw_quad_alpha (0, 0);
552
553	glDisable GL_TEXTURE_2D;
554	}
555
556	if ($self->{magicmap}) {
557	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
558
559	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
560	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
561
562	glTranslate - $x - 1, - $y - 1;
563	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
564	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
565	}
566
567	glPopMatrix;
568	glEndList;
569	}
570
571	glCallList $self->{list};	611	glCallList $self->{list};
572		612
573	# TNT2 emulates logops in software (or worse :)	613	# TNT2 emulates logops in software (or worse :)
574	unless ($focused) {	614	unless ($focused) {
575	glColor 0.4, 0.2, 0.2, 0.6;	615	glColor_premultiply 0, 0, 1, 0.25;
576	glEnable GL_BLEND;	616	glEnable GL_BLEND;
577	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	617	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
578	glBegin GL_QUADS;	618	glBegin GL_QUADS;
579	glVertex 0, 0;	619	glVertex 0, 0;
580	glVertex 0, $::HEIGHT;	620	glVertex 0, $::HEIGHT;
581	glVertex $::WIDTH, $::HEIGHT;	621	glVertex $::WIDTH, $::HEIGHT;
582	glVertex $::WIDTH, 0;	622	glVertex $::WIDTH, 0;
…		…
591	glDeleteList $self->{list};	631	glDeleteList $self->{list};
592		632
593	$self->SUPER::DESTROY;	633	$self->SUPER::DESTROY;
594	}	634	}
595		635
596	package CFPlus::MapWidget::MapMap;	636	package DC::MapWidget::MapMap;
597		637
		638	use strict;
		639	use utf8;
		640
598	our @ISA = CFPlus::UI::Base::;	641	our @ISA = DC::UI::Base::;
599		642
600	use Time::HiRes qw(time);	643	use Time::HiRes qw(time);
601	use CFPlus::OpenGL;	644	use DC::OpenGL;
602		645
603	sub size_request {	646	sub size_request {
604	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	647	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
		648	}
		649
		650	sub refresh_hook {
		651	my ($self) = @_;
		652
		653	if ($::MAP && $self->{texture_atime} < time) {
		654	my ($w, $h) = @$self{qw(w h)};
		655
		656	return unless $w && $h;
		657
		658	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		659	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		660
		661	my $ox = 0.5 * ($w - $sw);
		662	my $oy = 0.5 * ($h - $sh);
		663
		664	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		665	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		666
		667	#TODO: map scale is completely borked
		668
		669	my $x0 = int $ox - $sx + 0.5;
		670	my $y0 = int $oy - $sy + 0.5;
		671
		672	$self->{sw} = $sw;
		673	$self->{sh} = $sh;
		674
		675	$self->{x0} = $x0;
		676	$self->{y0} = $y0;
		677
		678	$self->{texture_atime} = time + 1/3;
		679
		680	$self->{texture} =
		681	new DC::Texture
		682	w => $w,
		683	h => $h,
		684	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		685	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		686	}
		687	}
		688
		689	sub invoke_visibility_change {
		690	my ($self) = @_;
		691
		692	$self->refresh_hook;
		693
		694	0
605	}	695	}
606		696
607	sub invoke_size_allocate {	697	sub invoke_size_allocate {
608	my ($self, $w, $h) = @_;	698	my ($self, $w, $h) = @_;
609		699
…		…
620	}	710	}
621		711
622	sub _draw {	712	sub _draw {
623	my ($self) = @_;	713	my ($self) = @_;
624		714
625	$::MAP or return;	715	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
626		716
627	my ($w, $h) = @$self{qw(w h)};	717	$self->{texture} or return;
628
629	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
630	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
631
632	my $sx = int $::CFG->{map_shift_x} / 32;
633	my $sy = int $::CFG->{map_shift_y} / 32;
634
635	my $ox = 0.5 * ($w - $sw);
636	my $oy = 0.5 * ($h - $sh);
637		718
638	glEnable GL_BLEND;	719	glEnable GL_BLEND;
639	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	720	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
640	glEnable GL_TEXTURE_2D;	721	glEnable GL_TEXTURE_2D;
641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	722	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642		723
643	if ($self->{texture_atime} < time) {
644	$self->{texture_atime} = time + 1/3;
645
646	$self->{texture} =
647	new CFPlus::Texture
648	w => $w,
649	h => $h,
650	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
651	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
652	}
653
654	$self->{texture}->draw_quad (0, 0);	724	$self->{texture}->draw_quad (0, 0);
655		725
656	glDisable GL_TEXTURE_2D;	726	glDisable GL_TEXTURE_2D;
657		727
658	glTranslate 0.375, 0.375;	728	glTranslate 0.375, 0.375;
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		729
665	glColor 1, 1, 0, 1;	730	glColor 1, 1, 0, 1;
666	glBegin GL_LINE_LOOP;	731	glBegin GL_LINE_LOOP;
667	glVertex $x0 , $y0 ;	732	glVertex $self->{x0} , $self->{y0} ;
668	glVertex $x0 , $y0 + $sh;	733	glVertex $self->{x0} , $self->{y0} + $self->{sh};
669	glVertex $x0 + $sw, $y0 + $sh;	734	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
670	glVertex $x0 + $sw, $y0 ;	735	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
671	glEnd;	736	glEnd;
672		737
673	glDisable GL_BLEND;	738	glDisable GL_BLEND;
674	}	739	}
675		740
676	package CFPlus::MapWidget::Command;	741	package DC::MapWidget::Command;
677		742
678	use strict;	743	use strict;
679		744
680	use CFPlus::OpenGL;	745	use DC::OpenGL;
681		746
682	our @ISA = CFPlus::UI::Frame::;	747	our @ISA = DC::UI::Frame::;
683		748
684	sub new {	749	sub new {
685	my $class = shift;	750	my $class = shift;
686		751
687	my $self = $class->SUPER::new (	752	my $self = $class->SUPER::new (
688	bg => [0, 0, 0, 0.8],	753	bg => [0, 0, 0, 0.8],
689	@_,	754	@_,
690	);	755	);
691		756
692	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	757	$self->add ($self->{vbox} = new DC::UI::VBox);
693		758
694	$self->{label} = [	759	$self->{label} = [
695	map	760	map
696	CFPlus::UI::Label->new (	761	DC::UI::Label->new (
		762	align => 0,
697	can_hover => 1,	763	can_hover => 1,
698	can_events => 1,	764	can_events => 1,
699	tooltip_width => 0.33,	765	tooltip_width => 0.33,
700	fontsize => $_,	766	fontsize => $_,
701	), (0.8) x 16	767	), (0.8) x 16
702	];	768	];
703		769
704	$self->{entry} = new CFPlus::UI::Entry	770	$self->{entry} = new DC::UI::Entry
705	on_changed => sub {	771	on_changed => sub {
706	$self->update_labels;	772	$self->update_labels;
707	0	773	0
708	},	774	},
709	on_button_down => sub {	775	on_button_down => sub {
710	my ($entry, $ev, $x, $y) = @_;	776	my ($entry, $ev, $x, $y) = @_;
711		777
712	if ($ev->{button} == 3) {	778	if ($ev->{button} == 3) {
713	(new CFPlus::UI::Menu	779	(new DC::UI::Menu
714	items => [	780	items => [
715	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	781	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
716	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	782	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
717	],	783	],
718	)->popup ($ev);	784	)->popup ($ev);
719	return 1;	785	return 1;
720	}	786	}
721	0	787	0
…		…
736	$self->hide;	802	$self->hide;
737	}	803	}
738	} elsif ($ev->{sym} == 27) {	804	} elsif ($ev->{sym} == 27) {
739	$self->{hist_ptr} = 0;	805	$self->{hist_ptr} = 0;
740	$self->hide;	806	$self->hide;
741	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {	807	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
742	if ($self->{hist_ptr} > 1) {	808	if ($self->{hist_ptr} > 1) {
743	$self->{hist_ptr}--;	809	$self->{hist_ptr}--;
744	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	810	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
745	} elsif ($self->{hist_ptr} > 0) {	811	} elsif ($self->{hist_ptr} > 0) {
746	$self->{hist_ptr}--;	812	$self->{hist_ptr}--;
…		…
748	} else {	814	} else {
749	++$self->{select_offset}	815	++$self->{select_offset}
750	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	816	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
751	}	817	}
752	$self->update_labels;	818	$self->update_labels;
753	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {	819	} elsif ($ev->{sym} == DC::SDLK_UP) {
754	if ($self->{select_offset}) {	820	if ($self->{select_offset}) {
755	--$self->{select_offset}	821	--$self->{select_offset}
756	} else {	822	} else {
757	unless ($self->{hist_ptr}) {	823	unless ($self->{hist_ptr}) {
758	$self->{hist_saveback} = $self->{entry}->get_text;	824	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
824	my $text = $self->{entry}->get_text;	890	my $text = $self->{entry}->get_text;
825		891
826	length $text	892	length $text
827	or return $self->hide;	893	or return $self->hide;
828		894
829	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
830
831	if ($text ne $self->{last_search}) {	895	if ($text ne $self->{last_search}) {
832	my @match;	896	my @match;
833		897
834	if ($text =~ /^(.*?)\s+$/) {	898	if ($text =~ /^(.*?)\s+$/) {
		899	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
835	@match = [$cmd, "(appended whitespace suppresses completion)"];	900	@match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
836	} else {	901	} else {
		902	# @match is [command, penalty, command with arguments] until sort
		903
		904	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		905
837	my $regexp = do {	906	my $regexp_abbrev = do {
838	my ($beg, @chr) = split //, lc $cmd;	907	my ($beg, @chr) = split //, lc $cmd;
839		908
840	# the following regex is used to match our "completion entry"	909	# the following regex is used to match our "completion entry"
841	# to an actual command - the parentheses match kind of "overhead"	910	# to an actual command - the parentheses match kind of "overhead"
842	# - the more characters the parentheses match, the less attractive	911	# - the more characters the parentheses match, the less attractive
…		…
844	my $regexp = "^\Q$beg\E"	913	my $regexp = "^\Q$beg\E"
845	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;	914	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
846	qr<$regexp>	915	qr<$regexp>
847	};	916	};
848		917
849	my @penalty;	918	my $regexp_partial = do {
		919	my $regexp = "^\Q$text\E(.*)";
		920	qr<$regexp>
		921	};
850		922
851	for (keys %{$self->{command}}) {	923	for (keys %{$self->{command}}) {
852	if (@penalty = $_ =~ $regexp) {	924	my @scores;
853	push @match, [$_, length join "", map "::$_", grep defined, @penalty];	925
		926	# 1. Complete command [with args]
		927	# command is a prefix of the text
		928	# score is length of complete command matched
		929	# e.g. "invoke summon pet monster bat"
		930	# "invoke" "summon pet monster bat" = 6
		931	# "invoke summon pet monster" "bat" = 25
		932	if ($text =~ /^\Q$_\E(.*)/) {
		933	push @scores, [$_, length $_, $text];
854	}	934	}
		935
		936	# 2. Partial command
		937	# text is a prefix of the full command
		938	# score is the length of the input text
		939	# e.g. "invoke s"
		940	# "invoke small fireball" = 8
		941	# "invoke summon pet monster" = 8
		942
		943	if ($_ =~ $regexp_partial) {
		944	push @scores, [$_, length $text, $_];
		945	}
		946
		947	# 3. Abbreviation match
		948	# attempts to use first word of text as an abbreviated command
		949	# score is length of word + 1 - 3 per non-word-initial character
		950
		951	if (my @penalty = $_ =~ $regexp_abbrev) {
		952	push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
		953	}
		954
		955	# Pick the best option for this command
		956	push @match, (sort {
		957	$b->[1] <=> $a->[1]
		958	} @scores)[0];
855	}	959	}
856		960
		961	# @match is now [command object, command with arguments]
857	@match = map $self->{command}{$_->[0]},	962	@match = map [$self->{command}{$_->[0]}, $_->[2]],
858	sort {	963	sort {
859	$a->[1] <=> $b->[1]	964	$b->[1] <=> $a->[1]
860	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]	965	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
861	or (length $b->[0]) <=> (length $a->[0])	966	or (length $b->[0]) <=> (length $a->[0])
862	} @match;	967	} @match;
863	}	968	}
864		969
…		…
883	$label->{fg} = [1, 1, 1, 1];	988	$label->{fg} = [1, 1, 1, 1];
884	$label->{bg} = [0, 0, 0, 0];	989	$label->{bg} = [0, 0, 0, 0];
885	}	990	}
886		991
887	if (@matches) {	992	if (@matches) {
888	$self->{select} = "$matches[0][0]$arg";	993	$self->{select} = "$matches[0][1]";
889		994
890	$labels[0]->{fg} = [0, 0, 0, 1];	995	$labels[0]->{fg} = [0, 0, 0, 1];
891	$labels[0]->{bg} = [1, 1, 1, 0.8];	996	$labels[0]->{bg} = [1, 1, 1, 0.8];
892	} else {	997	} else {
893	$self->{select} = "$cmd$arg";	998	$self->{select} = "$text";
894	}	999	}
895		1000
896	for my $match (@matches) {	1001	for my $match (@matches) {
897	my $label = shift @labels;	1002	my $label = shift @labels;
898		1003
899	if (@labels) {	1004	if (@labels) {
900	$label->set_text ("$match->[0]$arg");	1005	$label->set_text ("$match->[1]");
901	$label->set_tooltip ($match->[1]);	1006	$label->set_tooltip ("$match->[0][1]");
902	} else {	1007	} else {
903	$label->set_text ("...");	1008	$label->set_text ("...");
904	$label->set_tooltip ("Use Cursor-Down to view more matches");	1009	$label->set_tooltip ("Use Cursor-Down to view more matches");
905	last;	1010	last;
906	}	1011	}
…		…
916		1021
917	sub _draw {	1022	sub _draw {
918	my ($self) = @_;	1023	my ($self) = @_;
919		1024
920	# hack	1025	# hack
921	local $CFPlus::UI::FOCUS = $self->{entry};	1026	local $DC::UI::FOCUS = $self->{entry};
922		1027
923	$self->SUPER::_draw;	1028	$self->SUPER::_draw;
924	}	1029	}
925		1030
926	1	1031	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.86 by root, Sun Oct 8 21:54:20 2006 UTC vs. Revision 1.151 by root, Mon Nov 16 00:47:56 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.86 by root, Sun Oct 8 21:54:20 2006 UTC vs.
Revision 1.151 by root, Mon Nov 16 00:47:56 2009 UTC