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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.50 by root, Sat Jun 3 23:47:47 2006 UTC vs. Revision 1.150 by elmex, Wed Aug 12 18:41:39 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.50 by root, Sat Jun 3 23:47:47 2006 UTC vs.
Revision 1.150 by elmex, Wed Aug 12 18:41:39 2009 UTC