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

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.100 by pippijn, Tue Jan 2 14:45:22 2007 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.100 by pippijn, Tue Jan 2 14:45:22 2007 UTC