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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs.
Revision 1.116 by root, Mon Aug 6 05:06:33 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::;
11		14
12	my $magicmap_tex =	15	my $magicmap_tex =
13	new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",	16	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
14	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;	17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
15		18
16	sub new {	19	sub new {
17	my $class = shift;	20	my $class = shift;
18		21
19	my $self = $class->SUPER::new (	22	my $self = $class->SUPER::new (
20	z => -1,	23	z => -1,
21	can_focus => 1,	24	can_focus => 1,
22	list => glGenList,	25	tilesize => 32,
23
24	smooth_matrix => [
25	0.05, 0.13, 0.05,
26	0.13, 0.30, 0.13,
27	0.05, 0.13, 0.05,
28	],
29
30	@_	26	@_
31	);	27	);
32		28
33	$self->{completer} = new CFClient::MapWidget::Command::	29	$self->{completer} = new CFPlus::MapWidget::Command::
34	command => $self->{command},	30	command => $self->{command},
35	can_focus => 1,	31	tooltip => "#completer_help",
36	tooltip => "<b>The Command Completer</b>\n\n"
37	. "This is your central interface to send text commands to the server. "
38	. "To enter a verbatim command to send to the server, just type the command, "
39	. "followed by a space, and press return. "
40	. "Typing the initial letters of words (or just any letters) displays guesses "
41	. "for commands you might want to use.\n"
42	. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
43	. "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
44	;	32	;
45		33
46	$self	34	$self
		35	}
		36
		37	sub set_tilesize {
		38	my ($self, $tilesize) = @_;
		39
		40	$self->{tilesize} = $tilesize;
47	}	41	}
48		42
49	sub add_command {	43	sub add_command {
50	my ($self, $command, $tooltip, $widget, $cb) = @_;	44	my ($self, $command, $tooltip, $widget, $cb) = @_;
51		45
60		54
61	sub clr_commands {	55	sub clr_commands {
62	my ($self) = @_;	56	my ($self) = @_;
63		57
64	%{$self->{completer}{command}} = ();	58	%{$self->{completer}{command}} = ();
		59
		60	$self->{completer}->hide
		61	if $self->{completer};
		62	}
		63
		64	sub server_login {
		65	my ($server) = @_;
		66
		67	::stop_game ();
		68	local $::PROFILE->{host} = $server;
		69	::start_game ();
		70	}
		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	}
65	}	172	}
66		173
67	sub invoke_button_down {	174	sub invoke_button_down {
68	my ($self, $ev, $x, $y) = @_;	175	my ($self, $ev, $x, $y) = @_;
69		176
70	return unless $::CONN;
71
72	$self->grab_focus;
73
74	if ($ev->{button} == 1) {	177	if ($ev->{button} == 1) {
		178	$self->grab_focus;
		179	return unless $::CONN;
		180
75	my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	181	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
76	my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	182	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
77		183
78	$x -= int 0.5 * $self->{sw};	184	$x -= CFPlus::floor $::MAP->w * 0.5;
79	$y -= int 0.5 * $self->{sh};	185	$y -= CFPlus::floor $::MAP->h * 0.5;
80		186
		187	if ($::CONN) {
81	$::CONN->lookat ($x, $y)	188	$::CONN->lookat ($x, $y)
82	if $::CONN;	189	}
83		190
84	} elsif ($ev->{button} == 2) {	191	} elsif ($ev->{button} == 2) {
		192	$self->grab_focus;
		193	return unless $::CONN;
		194
85	my ($ox, $oy) = ($ev->{x}, $ev->{y});	195	my ($ox, $oy) = ($ev->{x}, $ev->{y});
86	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	196	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87		197
88	$self->{motion} = sub {	198	$self->{motion} = sub {
89	my ($ev, $x, $y) = @_;	199	my ($ev, $x, $y) = @_;
…		…
93	$::CFG->{map_shift_x} = $bw + $x - $ox;	203	$::CFG->{map_shift_x} = $bw + $x - $ox;
94	$::CFG->{map_shift_y} = $bh + $y - $oy;	204	$::CFG->{map_shift_y} = $bh + $y - $oy;
95		205
96	$self->update;	206	$self->update;
97	};	207	};
		208	} elsif ($ev->{button} == 3) {
		209	my @items = (
		210	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
		211	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
		212	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
		213	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
		214	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
		215	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
		216	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
		217	[
		218	$::PICKUP_ENABLE->{state}
		219	? "Disable automatic pickup"
		220	: "Enable automatic pickup",
		221	sub { $::PICKUP_ENABLE->toggle }
		222	],
		223	);
		224
		225	if ($::CONN && $::CONN->{editor_support}) {
		226	push @items, [
		227	"Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
		228	\&editor_invoke,
		229	];
		230
		231	for my $type (qw(test name)) {
		232	$::CONN->{editor_support}{type} ne $type
		233	or next;
		234	my $server = $::CONN->{editor_support}{"${type}server"}
		235	or next;
		236
		237	push @items, [
		238	"Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
		239	sub { server_login $server },
		240	];
		241	}
		242	}
		243
		244	push @items,
		245	["Quit",
		246	sub {
		247	if ($::CONN) {
		248	&::open_quit_dialog;
		249	} else {
		250	exit;
		251	}
		252	}
		253	],
		254	;
		255
		256	(new CFPlus::UI::Menu
		257	items => \@items,
		258	)->popup ($ev);
98	}	259	}
99		260
100	1	261	1
101	}	262	}
102		263
…		…
119		280
120	1	281	1
121	}	282	}
122		283
123	sub size_request {	284	sub size_request {
		285	my ($self) = @_;
		286
124	(	287	(
125	32 * CFClient::ceil $::WIDTH / 32,	288	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
126	32 * CFClient::ceil $::HEIGHT / 32,	289	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
127	)	290	)
128	}	291	}
129		292
130	sub update {	293	sub update {
131	my ($self) = @_;	294	my ($self) = @_;
…		…
133	$self->{need_update} = 1;	296	$self->{need_update} = 1;
134	$self->SUPER::update;	297	$self->SUPER::update;
135	}	298	}
136		299
137	my %DIR = (	300	my %DIR = (
		301	( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
138	CFClient::SDLK_KP8, [1, "north"],	302	( "," . CFPlus::SDLK_KP8 ), [1, "north"],
139	CFClient::SDLK_KP9, [2, "northeast"],	303	( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
140	CFClient::SDLK_KP6, [3, "east"],	304	( "," . CFPlus::SDLK_KP6 ), [3, "east"],
141	CFClient::SDLK_KP3, [4, "southeast"],	305	( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
142	CFClient::SDLK_KP2, [5, "south"],	306	( "," . CFPlus::SDLK_KP2 ), [5, "south"],
143	CFClient::SDLK_KP1, [6, "southwest"],	307	( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
144	CFClient::SDLK_KP4, [7, "west"],	308	( "," . CFPlus::SDLK_KP4 ), [7, "west"],
145	CFClient::SDLK_KP7, [8, "northwest"],	309	( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
146		310
147	CFClient::SDLK_UP, [1, "north"],	311	( "," . CFPlus::SDLK_UP ), [1, "north"],
		312	("1," . CFPlus::SDLK_UP ), [2, "northeast"],
148	CFClient::SDLK_RIGHT, [3, "east"],	313	( "," . CFPlus::SDLK_RIGHT), [3, "east"],
		314	("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
149	CFClient::SDLK_DOWN, [5, "south"],	315	( "," . CFPlus::SDLK_DOWN ), [5, "south"],
		316	("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
150	CFClient::SDLK_LEFT, [7, "west"],	317	( "," . CFPlus::SDLK_LEFT ), [7, "west"],
		318	("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
151	);	319	);
152		320
153	sub invoke_key_down {	321	sub invoke_key_down {
154	my ($self, $ev) = @_;	322	my ($self, $ev) = @_;
155
156	return 0 unless $::CONN;
157		323
158	my $mod = $ev->{mod};	324	my $mod = $ev->{mod};
159	my $sym = $ev->{sym};	325	my $sym = $ev->{sym};
160	my $uni = $ev->{unicode};	326	my $uni = $ev->{unicode};
161		327
162	if ($sym == CFClient::SDLK_KP5) {	328	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
163	$::CONN->user_send ("stay fire");	329
		330	if ($sym == 9) {
		331	($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
		332	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
		333	$::HELP_WINDOW->toggle_visibility;
		334	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
		335	::toggle_player_page ($::STATS_PAGE);
		336	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
		337	::toggle_player_page ($::SKILL_PAGE);
		338	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
		339	::toggle_player_page ($::SPELL_PAGE);
		340	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
		341	::toggle_player_page ($::INVENTORY_PAGE);
		342	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
		343	$::SETUP_DIALOG->toggle_visibility;
		344	} elsif (!$::CONN) {
		345	return 0; # bindings further down need a valid connection
		346
164	} elsif ($uni == ord ",") {	347	} elsif ($uni == ord ",") {
165	$::CONN->user_send ("take");	348	$::CONN->user_send ("take");
166	} elsif ($uni == ord " ") {	349	} elsif ($uni == ord " ") {
167	$::CONN->user_send ("apply");	350	$::CONN->user_send ("apply");
		351	} elsif ($uni == 13) {
		352	$::CONN->user_send ("examine");
168	} elsif ($uni == ord ".") {	353	} elsif ($uni == ord ".") {
169	$::CONN->user_send ($self->{completer}{last_command})	354	$::CONN->user_send ($self->{completer}{last_command})
170	if exists $self->{completer}{last_command};	355	if exists $self->{completer}{last_command};
171	} elsif ($uni == ord "\t") {	356	} elsif (my @macros = CFPlus::Macro::match_event $ev) {
172	$::PL_WINDOW->toggle_visibility;	357	$::CONN->macro_send ($_) for @macros;
173	$::PL_NOTEBOOK->set_current_page ("Inventory");
174	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {	358	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
175	$::CONN->user_send ("rotateshoottype +");	359	$::CONN->user_send ("rotateshoottype +");
176	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {	360	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
177	$::CONN->user_send ("rotateshoottype -");	361	$::CONN->user_send ("rotateshoottype -");
		362	} elsif ($uni == ord '!') {
		363	$self->{completer}->set_prefix ("shout ");
		364	$self->{completer}->show;
178	} elsif ($uni == ord '"') {	365	} elsif ($uni == ord '"') {
179	$self->{completer}->set_prefix ("$::CFG->{say_command} ");	366	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
180	$self->{completer}->show;	367	$self->{completer}->show;
181	} elsif ($uni == ord "'") {	368	} elsif ($uni == ord "'") {
182	$self->{completer}->set_prefix ("");	369	$self->{completer}->set_prefix ("");
183	$self->{completer}->show;	370	$self->{completer}->show;
184	} elsif (exists $DIR{$sym}) {	371	} elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
185	if ($mod & CFClient::KMOD_SHIFT) {	372	if ($mod & CFPlus::KMOD_SHIFT) {
186	$self->{shft}++;	373	$self->{shft}++;
187	if ($DIR{$sym}[0] != $self->{fire_dir}) {	374	if ($dir->[0] != $self->{fire_dir}) {
188	$::CONN->user_send ("fire $DIR{$sym}[0]");	375	$::CONN->user_send ("fire $dir->[0]");
189	}	376	}
190	$self->{fire_dir} = $DIR{$sym}[0];	377	$self->{fire_dir} = $DIR{$sym}[0];
191	} elsif ($mod & CFClient::KMOD_CTRL) {	378	} elsif ($mod & CFPlus::KMOD_CTRL) {
192	$self->{ctrl}++;	379	$self->{ctrl}++;
193	$::CONN->user_send ("run $DIR{$sym}[0]");	380	$::CONN->user_send ("run $dir->[0]");
194	} else {	381	} else {
195	$::CONN->user_send ("$DIR{$sym}[1]");	382	$::CONN->user_send ("$dir->[1]");
196	}	383	}
197	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
198	$::BIND_EDITOR->set_binding (undef, undef, [],
199	sub {
200	my ($mod, $sym, $cmds) = @_;
201	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
202	});
203	$::BIND_EDITOR->start;
204	$::BIND_EDITOR->show;
205	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
206	$::BIND_EDITOR->stop;
207	$::BIND_EDITOR->ask_for_bind_and_commit;
208	$::BIND_EDITOR->hide;
209	} elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
210	$::CONN->user_send ($_) for @$bind_cmd;
211	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	384	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
212	$self->{completer}->invoke_key_down ($ev);	385	$self->{completer}->inject_key_down ($ev);
213	$self->{completer}->show;	386	$self->{completer}->show;
214	} else {	387	} else {
215	return 0;	388	return 0;
216	}	389	}
217		390
…		…
224	my $res = 0;	397	my $res = 0;
225	my $mod = $ev->{mod};	398	my $mod = $ev->{mod};
226	my $sym = $ev->{sym};	399	my $sym = $ev->{sym};
227		400
228	if ($::CFG->{shift_fire_stop}) {	401	if ($::CFG->{shift_fire_stop}) {
229	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	402	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
230	$::CONN->user_send ("fire_stop");	403	$::CONN->user_send ("fire_stop");
231	delete $self->{fire_dir};	404	delete $self->{fire_dir};
232	$res = 1;	405	$res = 1;
233	}	406	}
234	} else {	407	} else {
235	if (exists $DIR{$sym} && delete $self->{shft}) {	408	if (exists $DIR{$sym} && delete $self->{shft}) {
236	$::CONN->user_send ("fire_stop");	409	$::CONN->user_send ("fire_stop");
237	delete $self->{fire_dir};	410	delete $self->{fire_dir};
238	$res = 1;	411	$res = 1;
239	} elsif (($sym == CFClient::SDLK_LSHIFT \|\| $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?	412	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
240	$::CONN->user_send ("fire_stop");	413	$::CONN->user_send ("fire_stop");
241	delete $self->{fire_dir};	414	delete $self->{fire_dir};
242	$res = 1;	415	$res = 1;
243	}	416	}
244	}	417	}
245		418
246	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	419	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
247	$::CONN->user_send ("run_stop");	420	$::CONN->user_send ("run_stop");
248	$res = 1;	421	$res = 1;
249	}	422	}
250		423
251	$res	424	$res
252	}	425	}
253		426
		427	sub invoke_visibility_change {
		428	my ($self) = @_;
		429
		430	$self->refresh_hook;
		431
		432	0
		433	}
		434
254	sub set_magicmap {	435	sub set_magicmap {
255	my ($self, $w, $h, $x, $y, $data) = @_;	436	my ($self, $w, $h, $x, $y, $data) = @_;
256		437
257	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	438	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
258	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	439	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
259		440
260	$self->{magicmap} = [$x, $y, $w, $h, $data];	441	$self->{magicmap} = [$x, $y, $w, $h, $data];
261		442
262	$self->update;	443	$self->update;
263	}	444	}
264		445
		446	sub refresh_hook {
		447	my ($self) = @_;
		448
		449	if ($::MAP && $::CONN) {
		450	if (delete $self->{need_update}) {
		451	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		452
		453	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		454	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		455
		456	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
		457	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
		458
		459	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		460	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		461
		462	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		463	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
		464
		465	if ($::CFG->{fow_enable}) {
		466	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
		467
		468	$self->{fow_texture} = new CFPlus::Texture
		469	w => $w,
		470	h => $h,
		471	data => $data,
		472	internalformat => GL_ALPHA,
		473	format => GL_ALPHA;
		474	} else {
		475	delete $self->{fow_texture};
		476	}
		477
		478	glNewList ($self->{list} \|\|= glGenList);
		479
		480	glPushMatrix;
		481	glTranslate $sx0, $sy0;
		482	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		483
		484	my $missing = $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
		485
		486	glScale $self->{tilesize}, $self->{tilesize};
		487
		488	if (my $tex = $self->{fow_texture}) {
		489	glPushMatrix;
		490	glScale 1/3, 1/3;
		491	glEnable GL_TEXTURE_2D;
		492	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		493
		494	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
		495	$self->{fow_texture}->draw_quad_alpha (0, 0);
		496
		497	glDisable GL_TEXTURE_2D;
		498	glPopMatrix;
		499	}
		500
		501	if ($self->{magicmap}) {
		502	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		503
		504	$x += $::MAP->ox + $self->{dx};
		505	$y += $::MAP->oy + $self->{dy};
		506
		507	glTranslate - $x - 1, - $y - 1;
		508	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		509	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		510	}
		511
		512	glPopMatrix;
		513	glEndList;
		514
		515	for my $tile (@$missing) {
		516	$tile = $::CONN->{texture}[$tile]
		517	or next;
		518	next if $tile->{loading};
		519	$tile->upload;
		520	}
		521	}
		522	} else {
		523	glDeleteList delete $self->{list}
		524	if $self->{list};
		525	}
		526	}
		527
265	sub draw {	528	sub draw {
266	my ($self) = @_;	529	my ($self) = @_;
267		530
268	return unless $::MAP;	531	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
269		532
		533	return unless $self->{list};
		534
270	my $focused = $CFClient::UI::FOCUS == $self	535	my $focused = $CFPlus::UI::FOCUS == $self
271	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};	536	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
272		537
273	return	538	return
274	unless $focused \|\| !$::FAST;	539	unless $focused \|\| !$::FAST;
275
276	if (delete $self->{need_update}) {
277	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
278
279	my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
280	my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
281
282	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
283	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
284
285	my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
286	my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
287
288	if ($::CFG->{fow_enable}) {
289	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
290
291	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
292	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
293	glConvolutionFilter2D (
294	GL_CONVOLUTION_2D,
295	GL_ALPHA,
296	3, 3,
297	GL_ALPHA, GL_FLOAT,
298	(pack "f*", @{ $self->{smooth_matrix} }),
299	);
300	glEnable GL_CONVOLUTION_2D;
301	}
302
303	$self->{fow_texture} = new CFClient::Texture
304	w => $w,
305	h => $h,
306	data => $data,
307	internalformat => GL_ALPHA,
308	format => GL_ALPHA;
309
310	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
311	} else {
312	delete $self->{fow_texture};
313	}
314
315	glNewList $self->{list};
316
317	glPushMatrix;
318	glTranslate $sx0, $sy0;
319	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
320
321	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
322
323	glScale 32, 32;
324
325	if (my $tex = $self->{fow_texture}) {
326	glEnable GL_TEXTURE_2D;
327	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
328
329	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
330	$self->{fow_texture}->draw_quad_alpha (0, 0);
331
332	glDisable GL_TEXTURE_2D;
333	}
334
335	if ($self->{magicmap}) {
336	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
337
338	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
339	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
340
341	glTranslate - $x - 1, - $y - 1;
342	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
343	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
344	}
345
346	glPopMatrix;
347	glEndList;
348	}
349		540
350	glCallList $self->{list};	541	glCallList $self->{list};
351		542
352	# TNT2 emulates logops in software (or worse :)	543	# TNT2 emulates logops in software (or worse :)
353	unless ($focused) {	544	unless ($focused) {
…		…
370	glDeleteList $self->{list};	561	glDeleteList $self->{list};
371		562
372	$self->SUPER::DESTROY;	563	$self->SUPER::DESTROY;
373	}	564	}
374		565
375	package CFClient::MapWidget::MapMap;	566	package CFPlus::MapWidget::MapMap;
376		567
		568	use strict;
		569	use utf8;
		570
377	our @ISA = CFClient::UI::Base::;	571	our @ISA = CFPlus::UI::Base::;
378		572
379	use Time::HiRes qw(time);	573	use Time::HiRes qw(time);
380	use CFClient::OpenGL;	574	use CFPlus::OpenGL;
381		575
382	sub size_request {	576	sub size_request {
383	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	577	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
		578	}
		579
		580	sub refresh_hook {
		581	my ($self) = @_;
		582
		583	if ($::MAP && $self->{texture_atime} < time) {
		584	my ($w, $h) = @$self{qw(w h)};
		585
		586	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		587	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		588
		589	my $ox = 0.5 * ($w - $sw);
		590	my $oy = 0.5 * ($h - $sh);
		591
		592	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		593	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		594
		595	#TODO: map scale is completely borked
		596
		597	my $x0 = int $ox - $sx + 0.5;
		598	my $y0 = int $oy - $sy + 0.5;
		599
		600	$self->{sw} = $sw;
		601	$self->{sh} = $sh;
		602
		603	$self->{x0} = $x0;
		604	$self->{y0} = $y0;
		605
		606	$self->{texture_atime} = time + 1/3;
		607
		608	$self->{texture} =
		609	new CFPlus::Texture
		610	w => $w,
		611	h => $h,
		612	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		613	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		614	}
		615	}
		616
		617	sub invoke_visibility_change {
		618	my ($self) = @_;
		619
		620	$self->refresh_hook;
		621
		622	0
384	}	623	}
385		624
386	sub invoke_size_allocate {	625	sub invoke_size_allocate {
387	my ($self, $w, $h) = @_;	626	my ($self, $w, $h) = @_;
388		627
…		…
399	}	638	}
400		639
401	sub _draw {	640	sub _draw {
402	my ($self) = @_;	641	my ($self) = @_;
403		642
404	$::MAP or return;	643	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
405		644
406	my ($w, $h) = @$self{qw(w h)};	645	$self->{texture} or return;
407
408	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
409	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
410
411	my $sx = int $::CFG->{map_shift_x} / 32;
412	my $sy = int $::CFG->{map_shift_y} / 32;
413
414	my $ox = 0.5 * ($w - $sw);
415	my $oy = 0.5 * ($h - $sh);
416		646
417	glEnable GL_BLEND;	647	glEnable GL_BLEND;
418	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	648	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
419	glEnable GL_TEXTURE_2D;	649	glEnable GL_TEXTURE_2D;
420	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	650	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
421		651
422	if ($self->{texture_atime} < time) {
423	$self->{texture_atime} = time + 1/3;
424
425	$self->{texture} =
426	new CFClient::Texture
427	w => $w,
428	h => $h,
429	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
430	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
431	}
432
433	$self->{texture}->draw_quad (0, 0);	652	$self->{texture}->draw_quad (0, 0);
434		653
435	glDisable GL_TEXTURE_2D;	654	glDisable GL_TEXTURE_2D;
436		655
437	glTranslate 0.375, 0.375;	656	glTranslate 0.375, 0.375;
438
439	#TODO: map scale is completely borked
440
441	my $x0 = int $ox - $sx + 0.5;
442	my $y0 = int $oy - $sy + 0.5;
443		657
444	glColor 1, 1, 0, 1;	658	glColor 1, 1, 0, 1;
445	glBegin GL_LINE_LOOP;	659	glBegin GL_LINE_LOOP;
446	glVertex $x0 , $y0 ;	660	glVertex $self->{x0} , $self->{y0} ;
447	glVertex $x0 , $y0 + $sh;	661	glVertex $self->{x0} , $self->{y0} + $self->{sh};
448	glVertex $x0 + $sw, $y0 + $sh;	662	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
449	glVertex $x0 + $sw, $y0 ;	663	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
450	glEnd;	664	glEnd;
451		665
452	glDisable GL_BLEND;	666	glDisable GL_BLEND;
453	}	667	}
454		668
455	package CFClient::MapWidget::Command;	669	package CFPlus::MapWidget::Command;
456		670
457	use strict;	671	use strict;
458		672
459	use CFClient::OpenGL;	673	use CFPlus::OpenGL;
460		674
461	our @ISA = CFClient::UI::Frame::;	675	our @ISA = CFPlus::UI::Frame::;
462		676
463	sub new {	677	sub new {
464	my $class = shift;	678	my $class = shift;
465		679
466	my $self = $class->SUPER::new (	680	my $self = $class->SUPER::new (
467	bg => [0, 0, 0, 0.8],	681	bg => [0, 0, 0, 0.8],
468	@_,	682	@_,
469	);	683	);
470		684
471	$self->add ($self->{vbox} = new CFClient::UI::VBox);	685	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
472		686
473	$self->{label} = [	687	$self->{label} = [
474	map	688	map
475	CFClient::UI::Label->new (	689	CFPlus::UI::Label->new (
476	can_hover => 1,	690	can_hover => 1,
477	can_events => 1,	691	can_events => 1,
478	tooltip_width => 0.33,	692	tooltip_width => 0.33,
479	fontsize => $_,	693	fontsize => $_,
480	), (0.8) x 16	694	), (0.8) x 16
481	];	695	];
482		696
483	$self->{entry} = new CFClient::UI::Entry	697	$self->{entry} = new CFPlus::UI::Entry
484	on_changed => sub {	698	on_changed => sub {
485	$self->update_labels;	699	$self->update_labels;
486	0	700	0
487	},	701	},
488	on_button_down => sub {	702	on_button_down => sub {
489	my ($entry, $ev, $x, $y) = @_;	703	my ($entry, $ev, $x, $y) = @_;
490		704
491	if ($ev->{button} == 3) {	705	if ($ev->{button} == 3) {
492	(new CFClient::UI::Menu	706	(new CFPlus::UI::Menu
493	items => [	707	items => [
494	["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key"	708	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
495	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	709	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
496	],	710	],
497	)->popup ($ev);	711	)->popup ($ev);
498	return 1;	712	return 1;
499	}	713	}
500	0	714	0
…		…
515	$self->hide;	729	$self->hide;
516	}	730	}
517	} elsif ($ev->{sym} == 27) {	731	} elsif ($ev->{sym} == 27) {
518	$self->{hist_ptr} = 0;	732	$self->{hist_ptr} = 0;
519	$self->hide;	733	$self->hide;
520	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {	734	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
521	if ($self->{hist_ptr} > 1) {	735	if ($self->{hist_ptr} > 1) {
522	$self->{hist_ptr}--;	736	$self->{hist_ptr}--;
523	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	737	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524	} elsif ($self->{hist_ptr} > 0) {	738	} elsif ($self->{hist_ptr} > 0) {
525	$self->{hist_ptr}--;	739	$self->{hist_ptr}--;
…		…
527	} else {	741	} else {
528	++$self->{select_offset}	742	++$self->{select_offset}
529	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	743	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
530	}	744	}
531	$self->update_labels;	745	$self->update_labels;
532	} elsif ($ev->{sym} == CFClient::SDLK_UP) {	746	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {
533	if ($self->{select_offset}) {	747	if ($self->{select_offset}) {
534	--$self->{select_offset}	748	--$self->{select_offset}
535	} else {	749	} else {
536	unless ($self->{hist_ptr}) {	750	unless ($self->{hist_ptr}) {
537	$self->{hist_saveback} = $self->{entry}->get_text;	751	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
582	}	796	}
583		797
584	sub hide {	798	sub hide {
585	my ($self) = @_;	799	my ($self) = @_;
586		800
		801	$self->{hist_ptr} = 0;
		802
587	$self->SUPER::hide;	803	$self->SUPER::hide;
588	$self->{entry}->set_text ("");	804	$self->{entry}->set_text ("");
589	}	805	}
590		806
591	sub invoke_key_down {	807	sub inject_key_down {
592	my ($self, $ev) = @_;	808	my ($self, $ev) = @_;
593		809
		810	$self->{entry}->grab_focus;
594	$self->{entry}->emit (key_down => $ev)	811	$self->{entry}->emit (key_down => $ev);
595	}	812	}
596		813
597	sub update_labels {	814	sub update_labels {
598	my ($self) = @_;	815	my ($self) = @_;
599		816
…		…
692		909
693	sub _draw {	910	sub _draw {
694	my ($self) = @_;	911	my ($self) = @_;
695		912
696	# hack	913	# hack
697	local $CFClient::UI::FOCUS = $self->{entry};	914	local $CFPlus::UI::FOCUS = $self->{entry};
698		915
699	$self->SUPER::_draw;	916	$self->SUPER::_draw;
700	}	917	}
701		918
702	1	919	1
		920

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs. Revision 1.116 by root, Mon Aug 6 05:06:33 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs.
Revision 1.116 by root, Mon Aug 6 05:06:33 2007 UTC