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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.18 by root, Tue Apr 25 12:56:34 2006 UTC vs. Revision 1.85 by root, Sun Oct 8 21:22:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.18 by root, Tue Apr 25 12:56:34 2006 UTC vs.
Revision 1.85 by root, Sun Oct 8 21:22:30 2006 UTC