[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.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	my $self = $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		34
		35	$self->{completer} = new CFPlus::MapWidget::Command::
		36	command => $self->{command},
		37	tooltip => "#completer_help",
		38	;
		39
22	$self	40	$self
23	}	41	}
24		42
25	sub DESTROY {	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 {
26	my $self = shift;	56	my ($self) = @_;
27		57
28	glDeleteList $self->{list};	58	%{$self->{completer}{command}} = ();
29		59
30	$self->SUPER::DESTROY;	60	$self->{completer}->hide
		61	if $self->{completer};
31	}	62	}
32		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
33	sub button_down {	218	sub invoke_button_down {
34	my ($self, $ev, $x, $y) = @_;	219	my ($self, $ev, $x, $y) = @_;
35		220
36	$self->focus_in;
37
38	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
39	my ($ox, $oy) = ($ev->{x}, $ev->{y});	238	my ($ox, $oy) = ($ev->{x}, $ev->{y});
40	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	239	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
41		240
42	$self->{motion} = sub {	241	$self->{motion} = sub {
43	my ($ev, $x, $y) = @_;	242	my ($ev, $x, $y) = @_;
47	$::CFG->{map_shift_x} = $bw + $x - $ox;	246	$::CFG->{map_shift_x} = $bw + $x - $ox;
48	$::CFG->{map_shift_y} = $bh + $y - $oy;	247	$::CFG->{map_shift_y} = $bh + $y - $oy;
49		248
50	$self->update;	249	$self->update;
51	};	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
52	}	304	1
53	}	305	}
54		306
55	sub button_up {	307	sub invoke_button_up {
56	my ($self, $ev, $x, $y) = @_;	308	my ($self, $ev, $x, $y) = @_;
57		309
58	delete $self->{motion};	310	delete $self->{motion};
59	}
60		311
		312	1
		313	}
		314
61	sub mouse_motion {	315	sub invoke_mouse_motion {
62	my ($self, $ev, $x, $y) = @_;	316	my ($self, $ev, $x, $y) = @_;
63		317
		318	if ($self->{motion}) {
64	$self->{motion}->($ev, $x, $y) if $self->{motion};	319	$self->{motion}->($ev, $x, $y);
		320	} else {
		321	return 0;
		322	}
		323
		324	1
65	}	325	}
66		326
67	sub size_request {	327	sub size_request {
68	(	328	(
69	1 + 32 * int $::WIDTH / 32,	329	32 * CFPlus::ceil $::WIDTH / 32,
70	1 + 32 * int $::HEIGHT / 32,	330	32 * CFPlus::ceil $::HEIGHT / 32,
71	)	331	)
72	}	332	}
73		333
74	sub update {	334	sub update {
75	my ($self) = @_;	335	my ($self) = @_;
76		336
77	$self->{need_update} = 1;	337	$self->{need_update} = 1;
78	$self->SUPER::update;	338	$self->SUPER::update;
79	}	339	}
80		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
81	sub draw {	486	sub draw {
82	my ($self) = @_;	487	my ($self) = @_;
83		488
		489	return unless $::MAP;
		490
		491	my $focused = $CFPlus::UI::FOCUS == $self
		492	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
		493
84	return	494	return
85	unless $CFClient::UI::FOCUS == $self \|\| !$::FAST;	495	unless $focused \|\| !$::FAST;
86		496
87	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
88	glNewList $self->{list};	536	glNewList $self->{list};
89		537
90	if ($::MAP) {
91	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
92	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
93
94	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
95	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
96
97	glPushMatrix;	538	glPushMatrix;
		539	glTranslate $sx0, $sy0;
98	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	540	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
99		541
100	glTranslate $sx0 - 32, $sy0 - 32, 0;	542	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
101		543
102	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	544	glScale 32, 32;
103		545
104	if ($::CFG->{fow_enable}) {	546	if (my $tex = $self->{fow_texture}) {
105	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
106	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
107	glConvolutionFilter2D (
108	GL_CONVOLUTION_2D,
109	GL_ALPHA,
110	3, 3,
111	GL_ALPHA, GL_FLOAT,
112	pack "f*",
113	0.05, 0.13, 0.05,
114	0.13, 0.30, 0.13,
115	0.05, 0.13, 0.05,
116	);
117	glEnable GL_CONVOLUTION_2D;
118	}
119
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
124	w => $w,
125	h => $h,
126	data => $data,
127	name => $prev_name, # a bit hackish
128	internalformat => GL_ALPHA,
129	format => GL_ALPHA;
130
131	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
132
133	glEnable GL_TEXTURE_2D;	547	glEnable GL_TEXTURE_2D;
134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	548	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
135		549
136	glColor +($::CFG->{fow_intensity}) x 3, 0.8;	550	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
137	$self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);	551	$self->{fow_texture}->draw_quad_alpha (0, 0);
138		552
139	glDisable GL_TEXTURE_2D;	553	glDisable GL_TEXTURE_2D;
140	}	554	}
141		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
142	glPopMatrix;	567	glPopMatrix;
143	}
144
145	glEndList;	568	glEndList;
146	}	569	}
147		570
148	glPushMatrix;
149	glCallList $self->{list};	571	glCallList $self->{list};
150	glPopMatrix;
151		572
152	# TNT2 emulates logops in software (or worse :)	573	# TNT2 emulates logops in software (or worse :)
153	if ($CFClient::UI::FOCUS != $self) {	574	unless ($focused) {
154	glColor 0.4, 0.2, 0.2, 0.9;	575	glColor 0.4, 0.2, 0.2, 0.6;
155	glEnable GL_BLEND;	576	glEnable GL_BLEND;
156	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	577	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
157	glBegin GL_QUADS;	578	glBegin GL_QUADS;
158	glVertex 0, 0;	579	glVertex 0, 0;
159	glVertex 0, $::HEIGHT;	580	glVertex 0, $::HEIGHT;
…		…
162	glEnd;	583	glEnd;
163	glDisable GL_BLEND;	584	glDisable GL_BLEND;
164	}	585	}
165	}	586	}
166		587
167	my %DIR = (	588	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) = @_;	589	my $self = shift;
268		590
269	%{$self->{command}} = ();	591	glDeleteList $self->{list};
270	}
271		592
		593	$self->SUPER::DESTROY;
		594	}
		595
272	package CFClient::MapWidget::MapMap;	596	package CFPlus::MapWidget::MapMap;
273		597
274	our @ISA = CFClient::UI::Base::;	598	our @ISA = CFPlus::UI::Base::;
275		599
276	use Time::HiRes qw(time);	600	use Time::HiRes qw(time);
277	use CFClient::OpenGL;	601	use CFPlus::OpenGL;
278		602
279	sub size_request {	603	sub size_request {
280	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	604	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
281	}	605	}
282		606
283	sub size_allocate {	607	sub invoke_size_allocate {
284	my ($self, $w, $h) = @_;	608	my ($self, $w, $h) = @_;
285		609
286	$self->SUPER::size_allocate ($w, $h);
287	$self->update;	610	$self->update;
		611
		612	1
288	}	613	}
289		614
290	sub update {	615	sub update {
291	my ($self) = @_;	616	my ($self) = @_;
292		617
…		…
317		642
318	if ($self->{texture_atime} < time) {	643	if ($self->{texture_atime} < time) {
319	$self->{texture_atime} = time + 1/3;	644	$self->{texture_atime} = time + 1/3;
320		645
321	$self->{texture} =	646	$self->{texture} =
322	new CFClient::Texture	647	new CFPlus::Texture
323	w => $w,	648	w => $w,
324	h => $h,	649	h => $h,
325	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),	650	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;	651	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
327	}	652	}
328		653
329	$self->{texture}->draw_quad (0, 0);	654	$self->{texture}->draw_quad (0, 0);
330		655
331	glDisable GL_TEXTURE_2D;	656	glDisable GL_TEXTURE_2D;
…		…
346	glEnd;	671	glEnd;
347		672
348	glDisable GL_BLEND;	673	glDisable GL_BLEND;
349	}	674	}
350		675
351	package CFClient::MapWidget::Command;	676	package CFPlus::MapWidget::Command;
352		677
353	use strict;	678	use strict;
354		679
355	use CFClient::OpenGL;	680	use CFPlus::OpenGL;
356		681
357	our @ISA = CFClient::UI::Frame::;	682	our @ISA = CFPlus::UI::Frame::;
358		683
359	sub new {	684	sub new {
360	my $class = shift;	685	my $class = shift;
361		686
362	my $self = $class->SUPER::new (	687	my $self = $class->SUPER::new (
363	bg => [0, 0, 0, 0.8],	688	bg => [0, 0, 0, 0.8],
364	@_,	689	@_,
365	);	690	);
366		691
367	$self->add ($self->{vbox} = new CFClient::UI::VBox);	692	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
368		693
369	$self->{label} = [	694	$self->{label} = [
370	map	695	map
371	CFClient::UI::Label->new (	696	CFPlus::UI::Label->new (
372	can_hover => 1,	697	can_hover => 1,
373	can_events => 1,	698	can_events => 1,
374	tooltip_width => 0.33,	699	tooltip_width => 0.33,
375	fontsize => $_,	700	fontsize => $_,
376	), (0.8) x 16	701	), (0.8) x 16
377	];	702	];
378		703
379	$self->{entry} = new CFClient::UI::Entry	704	$self->{entry} = new CFPlus::UI::Entry
380	connect_changed => sub {	705	on_changed => sub {
381	$self->update_labels;	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
382	};	772	}
		773	;
383		774
384	$self->{vbox}->add (	775	$self->{vbox}->add (
385	$self->{entry},	776	$self->{entry},
386	@{$self->{label}},	777	@{$self->{label}},
387	);	778	);
388		779
389	$self	780	$self
390	}	781	}
391		782
		783	sub set_prefix {
		784	my ($self, $prefix) = @_;
		785
		786	$self->{entry}->set_text ($prefix);
		787	$self->show;
		788	}
		789
392	sub size_allocate {	790	sub invoke_size_allocate {
393	my ($self, $w, $h) = @_;	791	my ($self, $w, $h) = @_;
394		792
395	$self->SUPER::size_allocate ($w, $h);
396	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	793	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
397	}
398		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
399	sub key_down {	814	sub inject_key_down {
400	my ($self, $ev) = @_;	815	my ($self, $ev) = @_;
401		816
402	if ($ev->{sym} == 13) {	817	$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);	818	$self->{entry}->emit (key_down => $ev);
422	}
423	}	819	}
424		820
425	sub update_labels {	821	sub update_labels {
426	my ($self) = @_;	822	my ($self) = @_;
427		823
428	my $text = $self->{entry}->get_text;	824	my $text = $self->{entry}->get_text;
429		825
430	length $text	826	length $text
431	or return $self->emit ("close");	827	or return $self->hide;
432		828
433	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;	829	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
434		830
435	if ($cmd ne $self->{last_search}) {	831	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;	832	my @match;
		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
449	my @penalty;	849	my @penalty;
450		850
451	for (keys %{$self->{command}}) {	851	for (keys %{$self->{command}}) {
452	if (@penalty = $_ =~ $regexp) {	852	if (@penalty = $_ =~ $regexp) {
453	push @match, [$_, length join "", map "::$_", grep defined, @penalty];	853	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		854	}
454	}	855	}
455	}
456		856
457	@match = map $self->{command}{$_->[0]},	857	@match = map $self->{command}{$_->[0]},
458	sort {	858	sort {
459	$a->[1] <=> $b->[1]	859	$a->[1] <=> $b->[1]
460	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]	860	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		861	or (length $b->[0]) <=> (length $a->[0])
461	} @match;	862	} @match;
		863	}
462		864
463	$self->{last_search} = $cmd;	865	$self->{last_search} = $text;
464	$self->{last_match} = \@match;	866	$self->{last_match} = \@match;
465		867
466	$self->{select_offset} = 0;	868	$self->{select_offset} = 0;
467	}	869	}
468		870
…		…
508	$label->set_text ("");	910	$label->set_text ("");
509	$label->set_tooltip ("");	911	$label->set_tooltip ("");
510	}	912	}
511		913
512	$self->update;	914	$self->update;
513	###
514	}	915	}
515		916
516	sub _draw {	917	sub _draw {
517	my ($self) = @_;	918	my ($self) = @_;
518		919
519	# hack	920	# hack
520	local $CFClient::UI::FOCUS = $self->{entry};	921	local $CFPlus::UI::FOCUS = $self->{entry};
521		922
522	$self->SUPER::_draw;	923	$self->SUPER::_draw;
523	}	924	}
524		925
525	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.31 by root, Fri May 19 23:18:42 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.31 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.86 by root, Sun Oct 8 21:54:20 2006 UTC