[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.153 by root, Thu Nov 26 07:19:12 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	$::MAP->scroll ($dx, $dy);
		402
		403	$self->{last_fow_texture} = $self->{fow_texture};
		404	$self->{ldx} = $self->{sdx} + $dx * $self->{tilesize}; # smooth displacement
		405	$self->{ldy} = $self->{sdy} + $dy * $self->{tilesize};
		406
		407	$self->movement_update;
		408
		409	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
		410	$self->{sdy} += $dy * $self->{tilesize};
		411	}
		412
		413	sub set_magicmap {
		414	my ($self, $w, $h, $x, $y, $data) = @_;
		415
		416	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
		417	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
		418
		419	$self->{magicmap} = [$x, $y, $w, $h, $data];
		420
		421	$self->update;
		422	}
		423
		424	sub movement_update {
		425	my ($self) = @_;
		426
		427	if ($::CFG->{smooth_movement}) {
		428	if ($self->{sdx} \|\| $self->{sdy}) {
		429	my $diff = EV::time - ($self->{last_update} \|\| $::LAST_REFRESH);
		430	my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
		431
		432	# the minimum time for a single tile movement
		433	my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK \|\| 1);
		434
		435	$spd *= $self->{tilesize};
		436
		437	# jump if "impossibly high" speed
		438	if (
		439	(max abs $self->{sdx}, abs $self->{sdy})
		440	> $spd * $mintime * 2.1
		441	) {
		442	#warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
		443	$self->{sdx} = $self->{sdy} = 0;
		444	} else {
		445	$spd = $diff 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
		446
		447	my $dx = $self->{sdx} < 0 ? -$spd : $spd;
		448	my $dy = $self->{sdy} < 0 ? -$spd : $spd;
		449
		450	if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
		451	if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
		452	}
		453
		454	$self->update;
		455	}
		456	} else {
		457	$self->{sdx} = $self->{sdy} = 0;
		458	}
		459
		460	$self->{last_update} = EV::time;
		461	}
		462
		463	sub refresh_hook {
		464	my ($self) = @_;
		465
		466	if ($::MAP && $::CONN) {
87	if (delete $self->{need_update}) {	467	if (delete $self->{need_update}) {
88	glNewList $self->{list};	468	$self->movement_update;
89		469
90	if ($::MAP) {	470	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		471
94	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	472	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
95	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	473	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
96		474
97	glPushMatrix;	475	# width/height of map, in tiles
98	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	476	my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
		477	my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
99		478
100	glTranslate $sx0 - 32, $sy0 - 32, 0;	479	# the map displacement, in tiles
		480	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
		481	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
101		482
102	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	483	# the upper left "visible" corner, in pixels
		484	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		485	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		486
		487	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		488	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
103		489
104	if ($::CFG->{fow_enable}) {	490	if ($::CFG->{fow_enable}) {
105	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war	491	my ($sdx_t, $sdy_t);#d# do not anchor at player
106	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);	492
107	glConvolutionFilter2D (	493	my ($w, $h, $data) = $::MAP->fow_texture (
108	GL_CONVOLUTION_2D,	494	$dx + (min 0, $sdx_t),
109	GL_ALPHA,	495	$dy + (min 0, $sdy_t),
110	3, 3,	496	$sw + abs $sdx_t,
111	GL_ALPHA, GL_FLOAT,	497	$sh + abs $sdy_t
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	);	498	);
117	glEnable GL_CONVOLUTION_2D;
118	}
119		499
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	500	$self->{fow_texture} = new DC::Texture
124	w => $w,	501	w => $w,
125	h => $h,	502	h => $h,
126	data => $data,	503	data => $data,
127	name => $prev_name, # a bit hackish
128	internalformat => GL_ALPHA,	504	internalformat => GL_ALPHA,
129	format => GL_ALPHA;	505	format => GL_ALPHA;
		506	} else {
		507	delete $self->{fow_texture};
		508	}
130		509
131	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	510	glNewList ($self->{list} \|\|= glGenList);
132		511
		512	glPushMatrix;
		513	glTranslate $sx0, $sy0;
		514	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		515	glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
		516
		517	$::MAP->draw ($dx, $dy, $sw, $sh,
		518	$self->{tilesize},
		519	$::CONN->{player}{tag},
		520	-$self->{sdx}, -$self->{sdy});
		521
		522	#d#glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
		523	glScale $self->{tilesize}, $self->{tilesize};
		524
		525	if (my $tex = $self->{fow_texture}) {
133	glEnable GL_TEXTURE_2D;	526	glEnable GL_TEXTURE_2D;
		527	glEnable GL_BLEND;
134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	528	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		529	glBlendEquation GL_FUNC_REVERSE_SUBTRACT;
		530	glBlendFunc GL_ONE, GL_ZERO;
135		531
		532	my $a1 = 0.9;
		533
		534	if (0 && $self->{last_fow_texture}) {
		535	my $d1 = ($self->{sdx} 2 + $self->{sdy} 2) ** 0.5;
		536	my $d2 = ($self->{ldx} 2 + $self->{ldy} 2) ** 0.5;
		537
		538	if ($d1 * $d2) {
		539	my $a2 = $d1 / $d2;
		540
		541	$a1 = 1 - $a2;
		542
		543	#$a1 *= 0.9;
		544	#$a2 *= 0.9;
		545
		546	printf "%4g %4g %4g %4g\n", $d1, $d2, $a1, $a2;#d#
		547
		548	#$a1 = 1 - (1-$a1) * 0.707;
		549	#$a2 = 1 - (1-$a2) * 0.707;
		550
		551	glColor 1,0,0,1;
		552	glBegin GL_QUADS;
		553	glVertex 10 + $sdx_t, 10;
		554	glVertex 11 + $sdx_t, 10;
		555	glVertex 11 + $sdx_t, 11;
		556	glVertex 10 + $sdx_t, 11;
		557	glEnd;
		558
		559	glColor +($::CFG->{fow_intensity}) x 3, $a2;
		560	glPushMatrix;
		561	glTranslate $sdx_t, $sdy_t; # anchor at player
		562	glTranslate $self->{ldx} / -$tilesize, $self->{ldy} / -$tilesize;
		563	glScale 1/3, 1/3;
		564	$self->{last_fow_texture}->draw_quad_alpha (0, 0);
		565	glPopMatrix;
		566	} else {
		567	delete $self->{last_fow_texture};
		568	}
		569	}
		570
136	glColor +($::CFG->{fow_intensity}) x 3, 0.8;	571	glColor +($::CFG->{fow_intensity}) x 3, $a1;
		572	glPushMatrix;
		573	#d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player
		574	glScale 1/3, 1/3;
137	$self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);	575	$self->{fow_texture}->draw_quad_alpha (0, 0);
		576	glPopMatrix;
138		577
		578	glBlendEquation GL_FUNC_ADD;
139	glDisable GL_TEXTURE_2D;	579	glDisable GL_TEXTURE_2D;
		580	glDisable GL_BLEND;
140	}	581	}
141		582
		583	if ($self->{magicmap}) {
		584	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		585
		586	$x += $::MAP->ox + $self->{dx};
		587	$y += $::MAP->oy + $self->{dy};
		588
		589	glTranslate - $x - 1, - $y - 1;
		590	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		591	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		592	}
		593
142	glPopMatrix;	594	glPopMatrix;
143	}
144
145	glEndList;	595	glEndList;
		596	}
		597	} else {
		598	glDeleteList delete $self->{list}
		599	if $self->{list};
146	}	600	}
		601	}
147		602
148	glPushMatrix;	603	sub draw {
		604	my ($self) = @_;
		605
		606	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		607
		608	return unless $self->{list};
		609
		610	my $focused = $DC::UI::FOCUS == $self
		611	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
		612
		613	return
		614	unless $focused \|\| !$::FAST;
		615
149	glCallList $self->{list};	616	glCallList $self->{list};
150	glPopMatrix;
151		617
152	# TNT2 emulates logops in software (or worse :)	618	# TNT2 emulates logops in software (or worse :)
153	if ($CFClient::UI::FOCUS != $self) {	619	unless ($focused) {
154	glColor 0.4, 0.2, 0.2, 0.9;	620	glColor_premultiply 0, 0, 1, 0.25;
155	glEnable GL_BLEND;	621	glEnable GL_BLEND;
156	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	622	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
157	glBegin GL_QUADS;	623	glBegin GL_QUADS;
158	glVertex 0, 0;	624	glVertex 0, 0;
159	glVertex 0, $::HEIGHT;	625	glVertex 0, $::HEIGHT;
160	glVertex $::WIDTH, $::HEIGHT;	626	glVertex $::WIDTH, $::HEIGHT;
161	glVertex $::WIDTH, 0;	627	glVertex $::WIDTH, 0;
162	glEnd;	628	glEnd;
163	glDisable GL_BLEND;	629	glDisable GL_BLEND;
164	}	630	}
165	}	631	}
166		632
167	my %DIR = (	633	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) = @_;	634	my $self = shift;
268		635
269	%{$self->{command}} = ();	636	glDeleteList $self->{list};
270	}
271		637
		638	$self->SUPER::DESTROY;
		639	}
		640
272	package CFClient::MapWidget::MapMap;	641	package DC::MapWidget::MapMap;
273		642
		643	use strict;
		644	use utf8;
		645
274	our @ISA = CFClient::UI::Base::;	646	our @ISA = DC::UI::Base::;
275		647
276	use Time::HiRes qw(time);	648	use Time::HiRes qw(time);
277	use CFClient::OpenGL;	649	use DC::OpenGL;
278		650
279	sub size_request {	651	sub size_request {
280	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	652	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
281	}	653	}
282		654
		655	sub refresh_hook {
		656	my ($self) = @_;
		657
		658	if ($::MAP && $self->{texture_atime} < time) {
		659	my ($w, $h) = @$self{qw(w h)};
		660
		661	return unless $w && $h;
		662
		663	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		664	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		665
		666	my $ox = 0.5 * ($w - $sw);
		667	my $oy = 0.5 * ($h - $sh);
		668
		669	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		670	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		671
		672	#TODO: map scale is completely borked
		673
		674	my $x0 = int $ox - $sx + 0.5;
		675	my $y0 = int $oy - $sy + 0.5;
		676
		677	$self->{sw} = $sw;
		678	$self->{sh} = $sh;
		679
		680	$self->{x0} = $x0;
		681	$self->{y0} = $y0;
		682
		683	$self->{texture_atime} = time + 1/3;
		684
		685	$self->{texture} =
		686	new DC::Texture
		687	w => $w,
		688	h => $h,
		689	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		690	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		691	}
		692	}
		693
		694	sub invoke_visibility_change {
		695	my ($self) = @_;
		696
		697	$self->refresh_hook;
		698
		699	0
		700	}
		701
283	sub size_allocate {	702	sub invoke_size_allocate {
284	my ($self, $w, $h) = @_;	703	my ($self, $w, $h) = @_;
285		704
286	$self->SUPER::size_allocate ($w, $h);
287	$self->update;	705	$self->update;
		706
		707	1
288	}	708	}
289		709
290	sub update {	710	sub update {
291	my ($self) = @_;	711	my ($self) = @_;
292		712
…		…
295	}	715	}
296		716
297	sub _draw {	717	sub _draw {
298	my ($self) = @_;	718	my ($self) = @_;
299		719
300	$::MAP or return;	720	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
301		721
302	my ($w, $h) = @$self{qw(w h)};	722	$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		723
313	glEnable GL_BLEND;	724	glEnable GL_BLEND;
314	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	725	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
315	glEnable GL_TEXTURE_2D;	726	glEnable GL_TEXTURE_2D;
316	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	727	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
317		728
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);	729	$self->{texture}->draw_quad (0, 0);
330		730
331	glDisable GL_TEXTURE_2D;	731	glDisable GL_TEXTURE_2D;
332		732
333	glTranslate 0.375, 0.375;	733	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		734
340	glColor 1, 1, 0, 1;	735	glColor 1, 1, 0, 1;
341	glBegin GL_LINE_LOOP;	736	glBegin GL_LINE_LOOP;
342	glVertex $x0 , $y0 ;	737	glVertex $self->{x0} , $self->{y0} ;
343	glVertex $x0 , $y0 + $sh;	738	glVertex $self->{x0} , $self->{y0} + $self->{sh};
344	glVertex $x0 + $sw, $y0 + $sh;	739	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
345	glVertex $x0 + $sw, $y0 ;	740	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
346	glEnd;	741	glEnd;
347		742
348	glDisable GL_BLEND;	743	glDisable GL_BLEND;
349	}	744	}
350		745
351	package CFClient::MapWidget::Command;	746	package DC::MapWidget::Command;
352		747
353	use strict;	748	use strict;
354		749
355	use CFClient::OpenGL;	750	use DC::OpenGL;
356		751
357	our @ISA = CFClient::UI::Frame::;	752	our @ISA = DC::UI::Frame::;
358		753
359	sub new {	754	sub new {
360	my $class = shift;	755	my $class = shift;
361		756
362	my $self = $class->SUPER::new (	757	my $self = $class->SUPER::new (
363	bg => [0, 0, 0, 0.8],	758	bg => [0, 0, 0, 0.8],
364	@_,	759	@_,
365	);	760	);
366		761
367	$self->add ($self->{vbox} = new CFClient::UI::VBox);	762	$self->add ($self->{vbox} = new DC::UI::VBox);
368		763
369	$self->{label} = [	764	$self->{label} = [
370	map	765	map
371	CFClient::UI::Label->new (	766	DC::UI::Label->new (
		767	align => 0,
372	can_hover => 1,	768	can_hover => 1,
373	can_events => 1,	769	can_events => 1,
374	tooltip_width => 0.33,	770	tooltip_width => 0.33,
375	fontsize => $_,	771	fontsize => $_,
376	), (0.8) x 16	772	), (0.8) x 16
377	];	773	];
378		774
379	$self->{entry} = new CFClient::UI::Entry	775	$self->{entry} = new DC::UI::Entry
380	connect_changed => sub {	776	on_changed => sub {
381	$self->update_labels;	777	$self->update_labels;
		778	0
		779	},
		780	on_button_down => sub {
		781	my ($entry, $ev, $x, $y) = @_;
		782
		783	if ($ev->{button} == 3) {
		784	(new DC::UI::Menu
		785	items => [
		786	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
		787	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
		788	],
		789	)->popup ($ev);
		790	return 1;
		791	}
		792	0
		793	},
		794	on_key_down => sub {
		795	my ($entry, $ev) = @_;
		796
		797	my $self = $entry->{parent}{parent};
		798
		799	if ($ev->{sym} == 13) {
		800	if (exists $self->{select}) {
		801	$self->{last_command} = $self->{select};
		802	$::CONN->user_send ($self->{select});
		803
		804	unshift @{$self->{history}}, $self->{entry}->get_text;
		805	$self->{hist_ptr} = 0;
		806
		807	$self->hide;
		808	}
		809	} elsif ($ev->{sym} == 27) {
		810	$self->{hist_ptr} = 0;
		811	$self->hide;
		812	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
		813	if ($self->{hist_ptr} > 1) {
		814	$self->{hist_ptr}--;
		815	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
		816	} elsif ($self->{hist_ptr} > 0) {
		817	$self->{hist_ptr}--;
		818	$self->{entry}->set_text ($self->{hist_saveback});
		819	} else {
		820	++$self->{select_offset}
		821	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		822	}
		823	$self->update_labels;
		824	} elsif ($ev->{sym} == DC::SDLK_UP) {
		825	if ($self->{select_offset}) {
		826	--$self->{select_offset}
		827	} else {
		828	unless ($self->{hist_ptr}) {
		829	$self->{hist_saveback} = $self->{entry}->get_text;
		830	}
		831	if ($self->{hist_ptr} <= $#{$self->{history}}) {
		832	$self->{hist_ptr}++;
		833	}
		834	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
		835	if exists $self->{history}->[$self->{hist_ptr} - 1];
		836	}
		837	$self->update_labels;
		838	} else {
		839	return 0;
		840	}
		841
		842	1
382	};	843	}
		844	;
383		845
384	$self->{vbox}->add (	846	$self->{vbox}->add (
385	$self->{entry},	847	$self->{entry},
386	@{$self->{label}},	848	@{$self->{label}},
387	);	849	);
388		850
389	$self	851	$self
390	}	852	}
391		853
		854	sub set_prefix {
		855	my ($self, $prefix) = @_;
		856
		857	$self->{entry}->set_text ($prefix);
		858	$self->show;
		859	}
		860
392	sub size_allocate {	861	sub invoke_size_allocate {
393	my ($self, $w, $h) = @_;	862	my ($self, $w, $h) = @_;
394		863
395	$self->SUPER::size_allocate ($w, $h);
396	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	864	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
397	}
398		865
		866	$self->SUPER::invoke_size_allocate ($w, $h)
		867	}
		868
		869	sub show {
		870	my ($self) = @_;
		871
		872	$self->SUPER::show;
		873	$self->{entry}->grab_focus;
		874	}
		875
		876	sub hide {
		877	my ($self) = @_;
		878
		879	$self->{hist_ptr} = 0;
		880
		881	$self->SUPER::hide;
		882	$self->{entry}->set_text ("");
		883	}
		884
399	sub key_down {	885	sub inject_key_down {
400	my ($self, $ev) = @_;	886	my ($self, $ev) = @_;
401		887
402	if ($ev->{sym} == 13) {	888	$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);	889	$self->{entry}->emit (key_down => $ev);
422	}
423	}	890	}
424		891
425	sub update_labels {	892	sub update_labels {
426	my ($self) = @_;	893	my ($self) = @_;
427		894
428	my $text = $self->{entry}->get_text;	895	my $text = $self->{entry}->get_text;
429		896
430	length $text	897	length $text
431	or return $self->emit ("close");	898	or return $self->hide;
432		899
433	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
434
435	if ($cmd ne $self->{last_search}) {	900	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;	901	my @match;
449	my @penalty;
450		902
		903	if ($text =~ /^(.*?)\s+$/) {
		904	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		905	@match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
		906	} else {
		907	# @match is [command, penalty, command with arguments] until sort
		908
		909	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		910
		911	my $regexp_abbrev = do {
		912	my ($beg, @chr) = split //, lc $cmd;
		913
		914	# the following regex is used to match our "completion entry"
		915	# to an actual command - the parentheses match kind of "overhead"
		916	# - the more characters the parentheses match, the less attractive
		917	# is the match.
		918	my $regexp = "^\Q$beg\E"
		919	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		920	qr<$regexp>
		921	};
		922
		923	my $regexp_partial = do {
		924	my $regexp = "^\Q$text\E(.*)";
		925	qr<$regexp>
		926	};
		927
451	for (keys %{$self->{command}}) {	928	for (keys %{$self->{command}}) {
		929	my @scores;
		930
		931	# 1. Complete command [with args]
		932	# command is a prefix of the text
		933	# score is length of complete command matched
		934	# e.g. "invoke summon pet monster bat"
		935	# "invoke" "summon pet monster bat" = 6
		936	# "invoke summon pet monster" "bat" = 25
		937	if ($text =~ /^\Q$_\E(.*)/) {
		938	push @scores, [$_, length $_, $text];
		939	}
		940
		941	# 2. Partial command
		942	# text is a prefix of the full command
		943	# score is the length of the input text
		944	# e.g. "invoke s"
		945	# "invoke small fireball" = 8
		946	# "invoke summon pet monster" = 8
		947
		948	if ($_ =~ $regexp_partial) {
		949	push @scores, [$_, length $text, $_];
		950	}
		951
		952	# 3. Abbreviation match
		953	# attempts to use first word of text as an abbreviated command
		954	# score is length of word + 1 - 3 per non-word-initial character
		955
452	if (@penalty = $_ =~ $regexp) {	956	if (my @penalty = $_ =~ $regexp_abbrev) {
453	push @match, [$_, length join "", map "::$_", grep defined, @penalty];	957	push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
		958	}
		959
		960	# Pick the best option for this command
		961	push @match, (sort {
		962	$b->[1] <=> $a->[1]
		963	} @scores)[0];
454	}	964	}
455	}
456		965
		966	# @match is now [command object, command with arguments]
457	@match = map $self->{command}{$_->[0]},	967	@match = map [$self->{command}{$_->[0]}, $_->[2]],
458	sort {	968	sort {
459	$a->[1] <=> $b->[1]	969	$b->[1] <=> $a->[1]
460	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]	970	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		971	or (length $b->[0]) <=> (length $a->[0])
461	} @match;	972	} @match;
		973	}
462		974
463	$self->{last_search} = $cmd;	975	$self->{last_search} = $text;
464	$self->{last_match} = \@match;	976	$self->{last_match} = \@match;
465		977
466	$self->{select_offset} = 0;	978	$self->{select_offset} = 0;
467	}	979	}
468		980
…		…
481	$label->{fg} = [1, 1, 1, 1];	993	$label->{fg} = [1, 1, 1, 1];
482	$label->{bg} = [0, 0, 0, 0];	994	$label->{bg} = [0, 0, 0, 0];
483	}	995	}
484		996
485	if (@matches) {	997	if (@matches) {
486	$self->{select} = "$matches[0][0]$arg";	998	$self->{select} = "$matches[0][1]";
487		999
488	$labels[0]->{fg} = [0, 0, 0, 1];	1000	$labels[0]->{fg} = [0, 0, 0, 1];
489	$labels[0]->{bg} = [1, 1, 1, 0.8];	1001	$labels[0]->{bg} = [1, 1, 1, 0.8];
490	} else {	1002	} else {
491	$self->{select} = "$cmd$arg";	1003	$self->{select} = "$text";
492	}	1004	}
493		1005
494	for my $match (@matches) {	1006	for my $match (@matches) {
495	my $label = shift @labels;	1007	my $label = shift @labels;
496		1008
497	if (@labels) {	1009	if (@labels) {
498	$label->set_text ("$match->[0]$arg");	1010	$label->set_text ("$match->[1]");
499	$label->set_tooltip ($match->[1]);	1011	$label->set_tooltip ("$match->[0][1]");
500	} else {	1012	} else {
501	$label->set_text ("...");	1013	$label->set_text ("...");
502	$label->set_tooltip ("Use Cursor-Down to view more matches");	1014	$label->set_tooltip ("Use Cursor-Down to view more matches");
503	last;	1015	last;
504	}	1016	}
…		…
508	$label->set_text ("");	1020	$label->set_text ("");
509	$label->set_tooltip ("");	1021	$label->set_tooltip ("");
510	}	1022	}
511		1023
512	$self->update;	1024	$self->update;
513	###
514	}	1025	}
515		1026
516	sub _draw {	1027	sub _draw {
517	my ($self) = @_;	1028	my ($self) = @_;
518		1029
519	# hack	1030	# hack
520	local $CFClient::UI::FOCUS = $self->{entry};	1031	local $DC::UI::FOCUS = $self->{entry};
521		1032
522	$self->SUPER::_draw;	1033	$self->SUPER::_draw;
523	}	1034	}
524		1035
525	1	1036	1
		1037

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.153 by root, Thu Nov 26 07:19:12 2009 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.153 by root, Thu Nov 26 07:19:12 2009 UTC