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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.14 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.86 by root, Sun Oct 8 21:54:20 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.14 by root, Mon Apr 24 11:54:26 2006 UTC vs. Revision 1.86 by root, Sun Oct 8 21:54:20 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.14 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.86 by root, Sun Oct 8 21:54:20 2006 UTC