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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.25 by root, Wed May 17 15:18:57 2006 UTC vs. Revision 1.167 by root, Tue Nov 20 14:32:12 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.25 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.167 by root, Tue Nov 20 14:32:12 2012 UTC