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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs.
Revision 1.158 by root, Mon Dec 21 23:52:34 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	$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	}
22		28
23	sub DESTROY {	29	$self
		30	}
		31
		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 {
24	my $self = shift;	45	my ($self) = @_;
25		46
26	glDeleteList $self->{list};	47	%{$::COMPLETER->{command}} = ();
27		48
28	$self->SUPER::DESTROY;	49	$::COMPLETER->hide
		50	if $::COMPLETER;
29	}	51	}
30		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
31	sub button_down {	163	sub invoke_button_down {
32	my ($self, $ev, $x, $y) = @_;	164	my ($self, $ev, $x, $y) = @_;
33		165
34	$self->focus_in;
35
36	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
37	my ($ox, $oy) = ($ev->{x}, $ev->{y});	184	my ($ox, $oy) = ($ev->{x}, $ev->{y});
38	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	185	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
39		186
40	$self->{motion} = sub {	187	$self->{motion} = sub {
41	my ($ev, $x, $y) = @_;	188	my ($ev, $x, $y) = @_;
45	$::CFG->{map_shift_x} = $bw + $x - $ox;	192	$::CFG->{map_shift_x} = $bw + $x - $ox;
46	$::CFG->{map_shift_y} = $bh + $y - $oy;	193	$::CFG->{map_shift_y} = $bh + $y - $oy;
47		194
48	$self->update;	195	$self->update;
49	};	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
50	}	244	1
51	}	245	}
52		246
53	sub button_up {	247	sub invoke_button_up {
54	my ($self, $ev, $x, $y) = @_;	248	my ($self, $ev, $x, $y) = @_;
55		249
56	delete $self->{motion};	250	delete $self->{motion};
57	}
58		251
		252	1
		253	}
		254
59	sub mouse_motion {	255	sub invoke_mouse_motion {
60	my ($self, $ev, $x, $y) = @_;	256	my ($self, $ev, $x, $y) = @_;
61		257
		258	if ($self->{motion}) {
62	$self->{motion}->($ev, $x, $y) if $self->{motion};	259	$self->{motion}->($ev, $x, $y);
		260	} else {
		261	return 0;
		262	}
		263
		264	1
63	}	265	}
64		266
65	sub size_request {	267	sub size_request {
		268	my ($self) = @_;
		269
66	(	270	(
67	1 + 32 * int $::WIDTH / 32,	271	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
68	1 + 32 * int $::HEIGHT / 32,	272	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
69	)	273	)
70	}	274	}
71		275
72	sub update {	276	sub update {
73	my ($self) = @_;	277	my ($self) = @_;
74		278
75	$self->{need_update} = 1;	279	$self->{need_update} = 1;
76	$self->SUPER::update;	280	$self->SUPER::update;
77	}	281	}
78		282
79	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 {
80	my ($self) = @_;	310	my ($self, $ev) = @_;
81		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
		339	return 1;
		340	}
		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) {
82	if (delete $self->{need_update}) {	471	if (delete $self->{need_update}) {
83	glNewList $self->{list};	472	$self->movement_update;
84		473
85	if ($::MAP) {	474	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
86	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
87	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
88		475
89	glPushMatrix;	476	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
90	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	477	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
91		478
92	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	479	# width/height of map, in tiles
93	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	480	my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
		481	my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
94		482
95	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;
96		486
97	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;
98		493
99	if ($::CFG->{fow_enable}) {	494	if ($::CFG->{fow_enable}) {
100	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war	495	# draw_fow_texture REQUIRES the fow texture to stay the same size.
101	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);	496	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
102	glConvolutionFilter2D (
103	GL_CONVOLUTION_2D,
104	GL_ALPHA,
105	3, 3,
106	GL_ALPHA, GL_FLOAT,
107	pack "f*",
108	0.05, 0.13, 0.05,
109	0.13, 0.30, 0.13,
110	0.05, 0.13, 0.05,
111	);
112	glEnable GL_CONVOLUTION_2D;
113	}
114		497
115	$self->{fow_texture} = new CFClient::Texture	498	$self->{fow_texture} = new DC::Texture
116	w => $w,	499	w => $w,
117	h => $h,	500	h => $h,
118	data => $data,	501	data => $data,
119	internalformat => GL_ALPHA,	502	internalformat => GL_ALPHA,
120	format => GL_ALPHA;	503	format => GL_ALPHA;
121		504	} else {
122	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	505	delete $self->{fow_texture};
123
124	glEnable GL_BLEND;
125	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
126	glEnable GL_TEXTURE_2D;
127	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
128
129	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
130	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
131
132	glDisable GL_TEXTURE_2D;
133	glDisable GL_BLEND;
134	}	506	}
135		507
136	# HACK BEGIN	508	glNewList ($self->{list} \|\|= glGenList);
137	{
138	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
139		509
		510	glPushMatrix;
140	glTranslate 0, 30;	511	glTranslate $sx0, $sy0;
141	my ($w, $h) = (250, 250);	512	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		513	glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
142		514
143	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	515	$::MAP->draw ($dx, $dy, $sw, $sh,
		516	$self->{tilesize},
		517	$::CONN->{player}{tag},
		518	-$self->{sdx}, -$self->{sdy});
144		519
145	glEnable GL_BLEND;	520	glScale $self->{tilesize}, $self->{tilesize};
146	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
147	glEnable GL_TEXTURE_2D;
148	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
149		521
150	glPopMatrix;	522	if (my $tex = $self->{fow_texture}) {
		523	if ($DC::OpenGL::GL_MULTITEX && $self->{last_fow_texture}) {#d#
		524	my $d1 = DC::distance $self->{sdx}, $self->{sdy};
		525	my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
151		526
152	$self->{mapmap_texture} =	527	if ($d1 * $d2) {
153	new CFClient::Texture	528	DC::Texture::draw_fow_texture
154	w => $w,	529	$::CFG->{fow_intensity},
155	h => $h,	530	$self->{hidden_tex}{name},
156	data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),	531	@{$self->{fow_texture}}{qw(name data s t w h)},
157	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;	532	(min 1, $d1 / $d2),
158		533	$self->{lmdx} - $dx - $self->{lfdx},
159	$self->{mapmap_texture}->draw_quad (0, 0);	534	$self->{lmdy} - $dy - $self->{lfdy},
160		535	@{$self->{last_fow_texture}}{qw(name data)};
161	glDisable GL_TEXTURE_2D;	536	} else {
162		537	delete $self->{last_fow_texture};
163	glTranslate 0.375, 0.375;	538	}
164
165	glColor 1, 1, 0, 1;
166	glBegin GL_LINE_LOOP;
167	glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
168	glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
169	glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
170	glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
171	glEnd;
172		539	}
173	glDisable GL_BLEND;	540
		541	unless ($self->{last_fow_texture}) {
		542	DC::Texture::draw_fow_texture
		543	$::CFG->{fow_intensity},
		544	$self->{hidden_tex}{name},
		545	@{$self->{fow_texture}}{qw(name data s t w h)};
		546	}
174	}	547	}
175	# HACK END	548
		549	if ($self->{magicmap}) {
		550	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		551
		552	$x += $::MAP->ox + $self->{dx};
		553	$y += $::MAP->oy + $self->{dy};
		554
		555	glTranslate - $x - 1, - $y - 1;
		556	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		557	$::MAP->draw_magicmap ($w, $h, $data);
176	}	558	}
177		559
		560	glPopMatrix;
178	glEndList;	561	glEndList;
179	}	562	}
		563	} else {
		564	delete $self->{last_fow_texture};
		565	delete $self->{fow_texture};
180		566
181	glPushMatrix;	567	glDeleteList delete $self->{list}
		568	if $self->{list};
		569	}
		570	}
		571
		572	sub draw {
		573	my ($self) = @_;
		574
		575	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		576
		577	return unless $self->{list};
		578
		579	my $focused = $DC::UI::FOCUS == $self
		580	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
		581
		582	return
		583	unless $focused \|\| !$::FAST;
		584
182	glCallList $self->{list};	585	glCallList $self->{list};
183	glPopMatrix;
184		586
185	if ($CFClient::UI::FOCUS != $self) {	587	# TNT2 emulates logops in software (or worse :)
186	glColor 64/255, 64/255, 64/255;	588	unless ($focused) {
187	glLogicOp GL_AND;	589	glColor_premultiply 0, 0, 1, 0.25;
188	glEnable GL_COLOR_LOGIC_OP;	590	glEnable GL_BLEND;
		591	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
189	glBegin GL_QUADS;	592	glBegin GL_QUADS;
190	glVertex 0, 0;	593	glVertex 0, 0;
191	glVertex 0, $::HEIGHT;	594	glVertex 0, $::HEIGHT;
192	glVertex $::WIDTH, $::HEIGHT;	595	glVertex $::WIDTH, $::HEIGHT;
193	glVertex $::WIDTH, 0;	596	glVertex $::WIDTH, 0;
194	glEnd;	597	glEnd;
195	glDisable GL_COLOR_LOGIC_OP;	598	glDisable GL_BLEND;
196	}	599	}
197	}	600	}
198		601
199	my %DIR = (	602	sub DESTROY {
200	CFClient::SDLK_KP8, [1, "north"],	603	my $self = shift;
201	CFClient::SDLK_KP9, [2, "northeast"],
202	CFClient::SDLK_KP6, [3, "east"],
203	CFClient::SDLK_KP3, [4, "southeast"],
204	CFClient::SDLK_KP2, [5, "south"],
205	CFClient::SDLK_KP1, [6, "southwest"],
206	CFClient::SDLK_KP4, [7, "west"],
207	CFClient::SDLK_KP7, [8, "northwest"],
208		604
209	CFClient::SDLK_UP, [1, "north"],	605	glDeleteList $self->{list};
210	CFClient::SDLK_RIGHT, [3, "east"],
211	CFClient::SDLK_DOWN, [5, "south"],
212	CFClient::SDLK_LEFT, [7, "west"],
213	);
214		606
215	sub key_down {	607	$self->SUPER::DESTROY;
216	my ($self, $ev) = @_;
217
218	my $mod = $ev->{mod};
219	my $sym = $ev->{sym};
220
221	if ($sym == CFClient::SDLK_KP5) {
222	$::CONN->user_send ("stay fire");
223	} elsif ($sym == ord ",") {
224	$::CONN->user_send ("take");
225	} elsif ($sym == ord "a") {
226	$::CONN->user_send ("apply");
227	} elsif ($sym == ord "'") {
228	$self->emit ('activate_console');
229	} elsif ($sym == ord "/") {
230	$self->emit (activate_console => '/');
231	} elsif (exists $DIR{$sym}) {
232	if ($mod & CFClient::KMOD_SHIFT) {
233	$self->{shft}++;
234	$::CONN->user_send ("fire $DIR{$sym}[0]");
235	} elsif ($mod & CFClient::KMOD_CTRL) {
236	$self->{ctrl}++;
237	$::CONN->user_send ("run $DIR{$sym}[0]");
238	} else {
239	$::CONN->user_send ("$DIR{$sym}[1]");
240	}
241	} elsif ($ev->{unicode}) {
242	$self->{command_widget} \|\|=
243	new CFClient::MapWidget::Command::
244	command => $self->{command},
245	can_focus => 1,
246	connect_execute => sub {
247	# todo: support callback instead of user_send
248	$::CONN->user_send ($_[1][1]);
249	},
250	connect_close => sub {
251	(delete $self->{command_widget})->hide;
252	$self->focus_in;
253	},
254	;
255	$self->{command_widget}->key_down ($ev);
256	return unless $self->{command_widget};
257	$self->{command_widget}->show;
258	$self->{command_widget}->focus_in;
259	}
260	}	608	}
261		609
262	sub key_up {	610	package DC::MapWidget::MapMap;
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 $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
280
281	push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
282	}
283
284	package CFClient::MapWidget::Command;
285		611
286	use strict;	612	use strict;
		613	use utf8;
287		614
		615	our @ISA = DC::UI::Base::;
		616
		617	use Time::HiRes qw(time);
288	use CFClient::OpenGL;	618	use DC::OpenGL;
289		619
290	our @ISA = CFClient::UI::VBox::;	620	sub size_request {
		621	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
		622	}
		623
		624	sub refresh_hook {
		625	my ($self) = @_;
		626
		627	if ($::MAP && $self->{texture_atime} < time) {
		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} = time + 1/3;
		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
		671	sub invoke_size_allocate {
		672	my ($self, $w, $h) = @_;
		673
		674	$self->update;
		675
		676	1
		677	}
		678
		679	sub update {
		680	my ($self) = @_;
		681
		682	delete $self->{texture_atime};
		683	$self->SUPER::update;
		684	}
		685
		686	sub _draw {
		687	my ($self) = @_;
		688
		689	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
		690
		691	$self->{texture} or return;
		692
		693	glEnable GL_BLEND;
		694	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		695	glEnable GL_TEXTURE_2D;
		696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		697
		698	$self->{texture}->draw_quad (0, 0);
		699
		700	glDisable GL_TEXTURE_2D;
		701
		702	glTranslate 0.375, 0.375;
		703
		704	glColor 1, 1, 0, 1;
		705	glBegin GL_LINE_LOOP;
		706	glVertex $self->{x0} , $self->{y0} ;
		707	glVertex $self->{x0} , $self->{y0} + $self->{sh};
		708	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
		709	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
		710	glEnd;
		711
		712	glDisable GL_BLEND;
		713	}
		714
		715	package DC::MapWidget::Command;
		716
		717	use strict;
		718
		719	use DC::OpenGL;
		720
		721	our @ISA = DC::UI::Frame::;
291		722
292	sub new {	723	sub new {
293	my $class = shift;	724	my $class = shift;
294		725
295	my $self = $class->SUPER::new (	726	my $self = $class->SUPER::new (
		727	bg => [0, 0, 0, 0.8],
296	@_,	728	@_,
297	children => [map
298	CFClient::UI::Label->new (
299	can_hover => 1,
300	can_events => 1,
301	fontsize => $_,
302	), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
303	],
304	);	729	);
305		730
		731	$self->add ($self->{vbox} = new DC::UI::VBox);
		732
		733	$self->{label} = [
		734	map
		735	DC::UI::Label->new (
		736	align => 0,
		737	can_hover => 1,
		738	can_events => 1,
		739	tooltip_width => 0.33,
		740	fontsize => $_,
		741	), (0.8) x 16
		742	];
		743
		744	$self->{entry} = new DC::UI::Entry
		745	on_changed => sub {
		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
		812	}
		813	;
		814
		815	$self->{vbox}->add (
		816	$self->{entry},
		817	@{$self->{label}},
		818	);
		819
306	$self	820	$self
307	}	821	}
308		822
		823	sub set_prefix {
		824	my ($self, $prefix) = @_;
		825
		826	$self->{entry}->set_text ($prefix);
		827	$self->show;
		828	}
		829
309	sub size_allocate {	830	sub invoke_size_allocate {
310	my ($self, $w, $h) = @_;	831	my ($self, $w, $h) = @_;
311		832
312	$self->SUPER::size_allocate ($w, $h);
313	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	833	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		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
		854	sub inject_key_down {
		855	my ($self, $ev) = @_;
		856
		857	$self->{entry}->grab_focus;
		858	$self->{entry}->emit (key_down => $ev);
314	}	859	}
315		860
316	sub update_labels {	861	sub update_labels {
317	my ($self) = @_;	862	my ($self) = @_;
318		863
319	my $command = $self->{command};	864	my $text = $self->{entry}->get_text;
320	my $search_abbrev = qr/^\Q$self->{search}/;
321	my $search_full = qr/\Q$self->{search}/;
322		865
323	my @found;	866	length $text
		867	or return $self->hide;
324		868
325	for (@$command) {	869	if ($text ne $self->{last_search}) {
326	if ($_->[0] =~ $search_abbrev) {	870	my @match;
327	push @found, [$_->[0], $_];	871
328	} elsif ($_->[1] =~ $search_full) {	872	if ($text =~ /^(.*?)\s+$/) {
329	push @found, [$_->[1], $_];	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 $regexp_abbrev = do {
		881	my ($beg, @chr) = split //, lc $cmd;
		882
		883	# the following regex is used to match our "completion entry"
		884	# to an actual command - the parentheses match kind of "overhead"
		885	# - the more characters the parentheses match, the less attractive
		886	# is the match.
		887	my $regexp = "^\Q$beg\E"
		888	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		889	qr<$regexp>
		890	};
		891
		892	my $regexp_partial = do {
		893	my $regexp = "^\Q$text\E(.*)";
		894	qr<$regexp>
		895	};
		896
		897	for (keys %{$self->{command}}) {
		898	my @scores;
		899
		900	# 1. Complete command [with args]
		901	# command is a prefix of the text
		902	# score is length of complete command matched
		903	# e.g. "invoke summon pet monster bat"
		904	# "invoke" "summon pet monster bat" = 6
		905	# "invoke summon pet monster" "bat" = 25
		906	if ($text =~ /^\Q$_\E(.*)/) {
		907	push @scores, [$_, length $_, $text];
		908	}
		909
		910	# 2. Partial command
		911	# text is a prefix of the full command
		912	# score is the length of the input text
		913	# e.g. "invoke s"
		914	# "invoke small fireball" = 8
		915	# "invoke summon pet monster" = 8
		916
		917	if ($_ =~ $regexp_partial) {
		918	push @scores, [$_, length $text, $_];
		919	}
		920
		921	# 3. Abbreviation match
		922	# attempts to use first word of text as an abbreviated command
		923	# score is length of word + 1 - 3 per non-word-initial character
		924
		925	if (my @penalty = $_ =~ $regexp_abbrev) {
		926	push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
		927	}
		928
		929	# Pick the best option for this command
		930	push @match, (sort {
		931	$b->[1] <=> $a->[1]
		932	} @scores)[0];
330	}	933	}
331	}
332		934
333	@found = sort { $a->[0] cmp $b->[0] } @found;	935	# @match is now [command object, command with arguments]
		936	@match = map [$self->{command}{$_->[0]}, $_->[2]],
		937	sort {
		938	$b->[1] <=> $a->[1]
		939	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		940	or (length $b->[0]) <=> (length $a->[0])
		941	} @match;
		942	}
334		943
335	$self->{children}[0]->set_text ("$self->{search}_");	944	$self->{last_search} = $text;
		945	$self->{last_match} = \@match;
336		946
337	for (0..5) {	947	$self->{select_offset} = 0;
338	$self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
339	$self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
340	}	948	}
341		949
		950	my @labels = @{ $self->{label} };
		951	my @matches = @{ $self->{last_match} \|\| [] };
		952
		953	if ($self->{select_offset}) {
		954	splice @matches, 0, $self->{select_offset}, ();
		955
		956	my $label = shift @labels;
		957	$label->set_text ("...");
		958	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		959	}
		960
		961	for my $label (@labels) {
		962	$label->{fg} = [1, 1, 1, 1];
		963	$label->{bg} = [0, 0, 0, 0];
		964	}
		965
		966	if (@matches) {
342	$self->{select} = $found[0][1]	967	$self->{select} = "$matches[0][1]";
343	if @found;
344		968
345	if (@found > 6) {	969	$labels[0]->{fg} = [0, 0, 0, 1];
346	$self->{children}[6]->set_text ("...");	970	$labels[0]->{bg} = [1, 1, 1, 0.8];
		971	} else {
		972	$self->{select} = "$text";
347	}	973	}
348		974
349	$self->check_size;	975	for my $match (@matches) {
350	}	976	my $label = shift @labels;
351		977
352	sub key_down {	978	if (@labels) {
		979	$label->set_text ("$match->[1]");
		980	$label->set_tooltip ("$match->[0][1]");
		981	} else {
		982	$label->set_text ("...");
		983	$label->set_tooltip ("Use Cursor-Down to view more matches");
		984	last;
		985	}
		986	}
		987
		988	for my $label (@labels) {
		989	$label->set_text ("");
		990	$label->set_tooltip ("");
		991	}
		992
		993	$self->update;
		994	}
		995
		996	sub _draw {
353	my ($self, $ev) = @_;	997	my ($self) = @_;
354		998
355	if ($ev->{sym} == 8) {	999	# hack
356	substr $self->{search}, -1, 1, "";	1000	local $DC::UI::FOCUS = $self->{entry};
357	$self->update_labels;
358	} elsif ($ev->{sym} == 13) {
359	if (exists $self->{select}) {
360	$self->emit (execute => $self->{select});
361	$self->emit ("close");
362	}
363	} elsif ($ev->{sym} == 27) {
364	$self->emit ("close");
365	return;
366	} elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
367	$self->{search} .= chr $ev->{unicode};
368	$self->update_labels;
369	}
370		1001
371	length $self->{search}	1002	$self->SUPER::_draw;
372	or $self->emit ("close");
373	}	1003	}
374		1004
375	1	1005	1
		1006

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs. Revision 1.158 by root, Mon Dec 21 23:52:34 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs.
Revision 1.158 by root, Mon Dec 21 23:52:34 2009 UTC