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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs.
Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs. Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs.
Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC