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

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.166 by root, Sat Nov 10 18:29:32 2012 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.166 by root, Sat Nov 10 18:29:32 2012 UTC