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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs. Revision 1.91 by root, Tue Nov 7 22:41:27 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs.
Revision 1.91 by root, Tue Nov 7 22:41:27 2006 UTC