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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.34 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.157 by root, Mon Dec 21 03:30:23 2009 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.34 by root, Tue May 23 21:14:41 2006 UTC vs. Revision 1.157 by root, Mon Dec 21 03:30:23 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.34 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.157 by root, Mon Dec 21 03:30:23 2009 UTC