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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.31 by root, Fri May 19 23:18:42 2006 UTC vs. Revision 1.163 by root, Thu Oct 14 00:02:39 2010 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.31 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.163 by root, Thu Oct 14 00:02:39 2010 UTC