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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.37 by root, Thu May 25 01:26:53 2006 UTC vs.
Revision 1.162 by root, Sat Apr 3 02:58:25 2010 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.37 by root, Thu May 25 01:26:53 2006 UTC vs. Revision 1.162 by root, Sat Apr 3 02:58:25 2010 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.37 by root, Thu May 25 01:26:53 2006 UTC vs.
Revision 1.162 by root, Sat Apr 3 02:58:25 2010 UTC