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

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.87 by root, Sun Oct 8 21:57:54 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.87 by root, Sun Oct 8 21:57:54 2006 UTC