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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.38 by root, Thu May 25 02:23:14 2006 UTC vs. Revision 1.160 by root, Tue Dec 22 01:37:41 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.38 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.160 by root, Tue Dec 22 01:37:41 2009 UTC