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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.43 by elmex, Mon May 29 19:30:28 2006 UTC vs. Revision 1.153 by root, Thu Nov 26 07:19:12 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.43 by elmex, Mon May 29 19:30:28 2006 UTC vs.
Revision 1.153 by root, Thu Nov 26 07:19:12 2009 UTC