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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.85 by root, Sun Oct 8 21:22:30 2006 UTC vs.
Revision 1.126 by root, Wed Dec 26 21:03:21 2007 UTC

…		…
1	package CFPlus::MapWidget;	1	package DC::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 DC;
9	use CFPlus::OpenGL;	9	use DC::OpenGL;
10	use CFPlus::UI;	10	use DC::UI;
		11	use DC::Macro;
11		12
12	our @ISA = CFPlus::UI::Base::;	13	our @ISA = DC::UI::Base::;
13		14
14	my $magicmap_tex =	15	my $magicmap_tex =
15	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",	16	new_from_file DC::Texture DC::find_rcfile "magicmap.png",
16	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;	17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17		18
18	sub new {	19	sub new {
19	my $class = shift;	20	my $class = shift;
20		21
21	my $self = $class->SUPER::new (	22	my $self = $class->SUPER::new (
22	z => -1,	23	z => -1,
23	can_focus => 1,	24	can_focus => 1,
24	list => glGenList,	25	tilesize => 32,
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
32	@_	26	@_
33	);	27	);
34		28
35	$self->{completer} = new CFPlus::MapWidget::Command::
36	command => $self->{command},
37	tooltip => "#completer_help",
38	;
39
40	$self	29	$self
		30	}
		31
		32	sub set_tilesize {
		33	my ($self, $tilesize) = @_;
		34
		35	$self->{tilesize} = $tilesize;
41	}	36	}
42		37
43	sub add_command {	38	sub add_command {
44	my ($self, $command, $tooltip, $widget, $cb) = @_;	39	my ($self, $command, $tooltip, $widget, $cb) = @_;
45		40
47		42
48	$tooltip =~ s/^\s+//;	43	$tooltip =~ s/^\s+//;
49	$tooltip = "<big>$data</big>\n\n$tooltip";	44	$tooltip = "<big>$data</big>\n\n$tooltip";
50	$tooltip =~ s/\s+$//;	45	$tooltip =~ s/\s+$//;
51		46
52	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	47	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53	}	48	}
54		49
55	sub clr_commands {	50	sub clr_commands {
56	my ($self) = @_;	51	my ($self) = @_;
57		52
58	%{$self->{completer}{command}} = ();	53	%{$::COMPLETER->{command}} = ();
59		54
60	$self->{completer}->hide	55	$::COMPLETER->hide
61	if $self->{completer};	56	if $::COMPLETER;
62	}	57	}
63		58
64	sub server_login {	59	sub server_login {
65	my ($server) = @_;	60	my ($server) = @_;
66		61
67	::stop_game ();	62	::stop_game ();
68	local $::PROFILE->{host} = $server;	63	local $::PROFILE->{host} = $server;
69	::start_game ();	64	::start_game ();
70	}	65	}
71		66
72	sub check_lwp($) {
73	my ($res) = @_;
74
75	$res->is_error
76	and die $res->status_line;
77
78	$res
79	}
80
81	sub editor_invoke {	67	sub editor_invoke {
82	my $editsup = $::CONN && $::CONN->{editor_support}	68	my $editsup = $::CONN && $::CONN->{editor_support}
83	or return;	69	or return;
84		70
85	# putting the password into the env is somewhat tasteless	71	DC::background {
86	# local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};
87	# local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password};
88	# local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload};
89
90	my ($pid, $fh);
91	unless ($pid = open $fh, "-\|:utf8", "-") {
92	$SIG{__DIE__} = sub {
93	warn "@_\n";
94	CFPlus::_exit 99;
95	};
96
97	open STDERR, ">&STDOUT";
98	binmode STDOUT, ":utf8";
99	binmode STDERR, ":utf8";
100	close $fh;
101
102	$\| = 1;
103	print "preparing editor startup...\n";	72	print "preparing editor startup...\n";
104	CFPlus::set_proxy;
105		73
106	my $server = $editsup->{gameserver} \|\| "default";	74	my $server = $editsup->{gameserver} \|\| "default";
107	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	75	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
108		76
109	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;	77	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
110	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;	78	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
111		79
112	print "map directory is $mapdir\n";	80	print "map directory is $mapdir\n";
113	print "lib directory is $libdir\n";	81	print "lib directory is $libdir\n";
114		82
115	require LWP::UserAgent;	83	my $ua = DC::lwp_useragent;
116
117	my $ua = LWP::UserAgent->new (
118	agent => "cfplus $CFPlus::VERSION",
119	keep_alive => 1,
120	env_proxy => 1,
121	timeout => 30,
122	);
123		84
124	for my $file (qw(archetypes crossfire.0)) {	85	for my $file (qw(archetypes crossfire.0)) {
125	my $url = "$editsup->{lib_root}$file";	86	my $url = "$editsup->{lib_root}$file";
126	print "mirroring $url...\n";	87	print "mirroring $url...\n";
127	check_lwp $ua->mirror ($url, "$libdir/$file");	88	DC::lwp_check $ua->mirror ($url, "$libdir/$file");
128	printf "%s size %d octets\n", $file, -s "$libdir/$file";	89	printf "%s size %d octets\n", $file, -s "$libdir/$file";
129	}	90	}
130		91
131	if (1) { # upload a map	92	if (1) { # upload a map
132	my $mapname = $::CONN->{map_info}[0];	93	my $mapname = $::CONN->{map_info}[0];
133		94
		95	my $mappath = "$mapdir/$mapname";
		96
		97	-e $mappath and die "$mappath already exists\n";
		98
134	print "getting map revision for $mapname...\n";	99	print "getting map revision for $mapname...\n";
135		100
136	# try to get the most recent head revision, what a hack,	101	# try to get the most recent head revision, what a hack,
137	# this should have been returned while downloading sigh	102	# this should have been returned while downloading sigh
138	my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;	103	my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
139		104
140	if ($log =~ /\?rev=(\d+\.\d+)"/) {	105	if ($log =~ /\?rev=(\d+\.\d+)"/) {
141	my $rev = $1;	106	my $rev = $1;
142		107
143	print "downloading revision $rev...\n";	108	print "downloading revision $rev...\n";
144		109
145	my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;	110	my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
		111
		112	my $meta = {
		113	%$editsup,
		114	path => $mapname,
		115	revision => $rev,
		116	cf_login => $::PROFILE->{user},
		117	};
		118
		119	require File::Basename;
		120	require File::Path;
		121
		122	File::Path::mkpath (File::Basename::dirname ($mappath));
		123	open my $fh, ">:raw:perlio", "$mappath.meta"
		124	or die "$mappath.meta: $!\n";
		125	print $fh DC::encode_json $meta;
		126	close $fh;
		127	open my $fh, ">:raw:perlio:utf8", $mappath
		128	or die "$mappath: $!\n";
		129	print $fh $map;
		130	close $fh;
		131
		132	print "saved as $mappath\n";
		133
		134	print "invoking editor...\n";
		135	exec "/root/s2/gce $mappath";#d#
146		136
147	# now upload it	137	# now upload it
148	# require HTTP::Request::Common;	138	# require HTTP::Request::Common;
149	#	139	#
150	# my $res = $ua->post (	140	# my $res = $ua->post (
…		…
171	# }	161	# }
172	} else {	162	} else {
173	die "viewvc parse error, unable to detect revision\n";	163	die "viewvc parse error, unable to detect revision\n";
174	}	164	}
175	}	165	}
176
177	print "invoking editor...\n";
178	exec "/root/s2/gce";#d#
179
180	CFPlus::_exit;
181	}
182
183	my $buffer;
184
185	Event->io (fd => $fh, poll => 'r', cb => sub {
186	unless (sysread $fh, $buffer, 4096, length $buffer) {
187	$_[0]->w->cancel;
188	$buffer .= "done\n";
189	}
190
191	while ($buffer =~ s/^(.*)\n//) {
192	::message ({
193	markup => "editor($pid): " . CFPlus::asxml $1,
194	});
195	}
196	});	166	}
197	}	167	}
198		168
199	sub invoke_button_down {	169	sub invoke_button_down {
200	my ($self, $ev, $x, $y) = @_;	170	my ($self, $ev, $x, $y) = @_;
201		171
202	if ($ev->{button} == 1) {	172	if ($ev->{button} == 1) {
203	$self->grab_focus;	173	$self->grab_focus;
204	return unless $::CONN;	174	return unless $::CONN;
205		175
206	my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	176	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
207	my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	177	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
208		178
209	$x -= int 0.5 * $self->{sw};	179	$x -= DC::floor $::MAP->w * 0.5;
210	$y -= int 0.5 * $self->{sh};	180	$y -= DC::floor $::MAP->h * 0.5;
211		181
		182	if ($::CONN) {
212	$::CONN->lookat ($x, $y)	183	$::CONN->lookat ($x, $y)
213	if $::CONN;	184	}
214		185
215	} elsif ($ev->{button} == 2) {	186	} elsif ($ev->{button} == 2) {
216	$self->grab_focus;	187	$self->grab_focus;
217	return unless $::CONN;	188	return unless $::CONN;
218		189
…		…
246	],	217	],
247	);	218	);
248		219
249	if ($::CONN && $::CONN->{editor_support}) {	220	if ($::CONN && $::CONN->{editor_support}) {
250	push @items, [	221	push @items, [
251	"Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",	222	"Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
252	\&editor_invoke,	223	\&editor_invoke,
253	];	224	];
254		225
255	for my $type (qw(test name)) {	226	for my $type (qw(test name)) {
256	$::CONN->{editor_support}{type} ne $type	227	$::CONN->{editor_support}{type} ne $type
257	or next;	228	or next;
258	my $server = $::CONN->{editor_support}{"${type}server"}	229	my $server = $::CONN->{editor_support}{"${type}server"}
259	or next;	230	or next;
260		231
261	push @items, [	232	push @items, [
262	"Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",	233	"Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
263	sub { server_login $server },	234	sub { server_login $server },
264	];	235	];
265	}	236	}
266	}	237	}
267		238
…		…
275	}	246	}
276	}	247	}
277	],	248	],
278	;	249	;
279		250
280	(new CFPlus::UI::Menu	251	(new DC::UI::Menu
281	items => \@items,	252	items => \@items,
282	)->popup ($ev);	253	)->popup ($ev);
283	}	254	}
284		255
285	1	256	1
…		…
304		275
305	1	276	1
306	}	277	}
307		278
308	sub size_request {	279	sub size_request {
		280	my ($self) = @_;
		281
309	(	282	(
310	32 * CFPlus::ceil $::WIDTH / 32,	283	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
311	32 * CFPlus::ceil $::HEIGHT / 32,	284	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
312	)	285	)
313	}	286	}
314		287
315	sub update {	288	sub update {
316	my ($self) = @_;	289	my ($self) = @_;
…		…
318	$self->{need_update} = 1;	291	$self->{need_update} = 1;
319	$self->SUPER::update;	292	$self->SUPER::update;
320	}	293	}
321		294
322	my %DIR = (	295	my %DIR = (
		296	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
323	CFPlus::SDLK_KP8, [1, "north"],	297	( "," . DC::SDLK_KP8 ), [1, "north"],
324	CFPlus::SDLK_KP9, [2, "northeast"],	298	( "," . DC::SDLK_KP9 ), [2, "northeast"],
325	CFPlus::SDLK_KP6, [3, "east"],	299	( "," . DC::SDLK_KP6 ), [3, "east"],
326	CFPlus::SDLK_KP3, [4, "southeast"],	300	( "," . DC::SDLK_KP3 ), [4, "southeast"],
327	CFPlus::SDLK_KP2, [5, "south"],	301	( "," . DC::SDLK_KP2 ), [5, "south"],
328	CFPlus::SDLK_KP1, [6, "southwest"],	302	( "," . DC::SDLK_KP1 ), [6, "southwest"],
329	CFPlus::SDLK_KP4, [7, "west"],	303	( "," . DC::SDLK_KP4 ), [7, "west"],
330	CFPlus::SDLK_KP7, [8, "northwest"],	304	( "," . DC::SDLK_KP7 ), [8, "northwest"],
331		305
332	CFPlus::SDLK_UP, [1, "north"],	306	( "," . DC::SDLK_UP ), [1, "north"],
		307	("1," . DC::SDLK_UP ), [2, "northeast"],
333	CFPlus::SDLK_RIGHT, [3, "east"],	308	( "," . DC::SDLK_RIGHT), [3, "east"],
		309	("1," . DC::SDLK_RIGHT), [4, "southeast"],
334	CFPlus::SDLK_DOWN, [5, "south"],	310	( "," . DC::SDLK_DOWN ), [5, "south"],
		311	("1," . DC::SDLK_DOWN ), [6, "southwest"],
335	CFPlus::SDLK_LEFT, [7, "west"],	312	( "," . DC::SDLK_LEFT ), [7, "west"],
		313	("1," . DC::SDLK_LEFT ), [8, "northwest"],
336	);	314	);
337		315
338	sub invoke_key_down {	316	sub invoke_key_down {
339	my ($self, $ev) = @_;	317	my ($self, $ev) = @_;
340		318
341	my $mod = $ev->{mod};	319	my $mod = $ev->{mod};
342	my $sym = $ev->{sym};	320	my $sym = $ev->{sym};
343	my $uni = $ev->{unicode};	321	my $uni = $ev->{unicode};
344		322
345	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	323	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_SHIFT;
346		324
347	if ($uni == ord "\t") {	325	if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
348	$::PL_WINDOW->toggle_visibility;
349	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
350	$::HELP_WINDOW->toggle_visibility;
351	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
352	::toggle_player_page ($::STATS_PAGE);
353	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
354	::toggle_player_page ($::SKILL_PAGE);
355	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
356	::toggle_player_page ($::SPELL_PAGE);
357	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
358	::toggle_player_page ($::INVENTORY_PAGE);
359	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
360	$::SETUP_DIALOG->toggle_visibility;
361	} elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
362	$::BIND_EDITOR->set_binding (undef, undef, [],
363	sub {
364	my ($mod, $sym, $cmds) = @_;
365	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
366	});
367	$::BIND_EDITOR->start;
368	$::BIND_EDITOR->show;
369	#TODO: elmex, what was this supposed to do? it currently crashes the client.
370	# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
371	# $::BIND_EDITOR->stop;
372	# $::BIND_EDITOR->ask_for_bind_and_commit;
373	# $::BIND_EDITOR->hide;
374	} elsif (!$::CONN) {
375	return 0; # bindings further down need a valid connection
376
377	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
378	$::CONN->user_send ("stay fire");
379	} elsif ($uni == ord ",") {
380	$::CONN->user_send ("take");
381	} elsif ($uni == ord " ") {
382	$::CONN->user_send ("apply");
383	} elsif ($uni == 13) {
384	$::CONN->user_send ("examine");
385	} elsif ($uni == ord ".") {
386	$::CONN->user_send ($self->{completer}{last_command})
387	if exists $self->{completer}{last_command};
388	} elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
389	$::CONN->user_send ($_) for @$bind_cmd;
390	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
391	$::CONN->user_send ("rotateshoottype +");
392	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
393	$::CONN->user_send ("rotateshoottype -");
394	} elsif ($uni == ord '"') {
395	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
396	$self->{completer}->show;
397	} elsif ($uni == ord "'") {
398	$self->{completer}->set_prefix ("");
399	$self->{completer}->show;
400	} elsif (exists $DIR{$sym}) {
401	if ($mod & CFPlus::KMOD_SHIFT) {	326	if ($mod & DC::KMOD_SHIFT) {
402	$self->{shft}++;	327	$self->{shft}++;
403	if ($DIR{$sym}[0] != $self->{fire_dir}) {	328	if ($dir->[0] != $self->{fire_dir}) {
404	$::CONN->user_send ("fire $DIR{$sym}[0]");	329	$::CONN->user_send ("fire $dir->[0]");
405	}	330	}
406	$self->{fire_dir} = $DIR{$sym}[0];	331	$self->{fire_dir} = $dir->[0];
407	} elsif ($mod & CFPlus::KMOD_CTRL) {	332	} elsif ($mod & DC::KMOD_CTRL) {
408	$self->{ctrl}++;	333	$self->{ctrl}++;
409	$::CONN->user_send ("run $DIR{$sym}[0]");	334	$::CONN->user_send ("run $dir->[0]");
410	} else {	335	} else {
411	$::CONN->user_send ("$DIR{$sym}[1]");	336	$::CONN->user_send ("$dir->[1]");
412	}	337	}
413	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	338
414	$self->{completer}->inject_key_down ($ev);
415	$self->{completer}->show;
416	} else {
417	return 0;	339	return 1;
418	}
419
420	1	340	}
		341
		342	0
421	}	343	}
422		344
423	sub invoke_key_up {	345	sub invoke_key_up {
424	my ($self, $ev) = @_;	346	my ($self, $ev) = @_;
425		347
426	my $res = 0;	348	my $res = 0;
427	my $mod = $ev->{mod};	349	my $mod = $ev->{mod};
428	my $sym = $ev->{sym};	350	my $sym = $ev->{sym};
429		351
430	if ($::CFG->{shift_fire_stop}) {	352	if ($::CFG->{shift_fire_stop}) {
431	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {	353	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
432	$::CONN->user_send ("fire_stop");	354	$::CONN->user_send ("fire_stop");
433	delete $self->{fire_dir};	355	delete $self->{fire_dir};
434	$res = 1;	356	$res = 1;
435	}	357	}
436	} else {	358	} else {
437	if (exists $DIR{$sym} && delete $self->{shft}) {	359	if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
438	$::CONN->user_send ("fire_stop");	360	$::CONN->user_send ("fire_stop");
439	delete $self->{fire_dir};	361	delete $self->{fire_dir};
440	$res = 1;	362	$res = 1;
441	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?	363	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
		364	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
442	$::CONN->user_send ("fire_stop");	365	$::CONN->user_send ("fire_stop");
443	delete $self->{fire_dir};	366	delete $self->{fire_dir};
444	$res = 1;	367	$res = 1;
445	}	368	}
446	}	369	}
447		370
448	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {	371	if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
449	$::CONN->user_send ("run_stop");	372	$::CONN->user_send ("run_stop");
450	$res = 1;	373	$res = 1;
451	}	374	}
452		375
453	$res	376	$res
454	}	377	}
455		378
		379	sub invoke_visibility_change {
		380	my ($self) = @_;
		381
		382	$self->refresh_hook;
		383
		384	0
		385	}
		386
456	sub set_magicmap {	387	sub set_magicmap {
457	my ($self, $w, $h, $x, $y, $data) = @_;	388	my ($self, $w, $h, $x, $y, $data) = @_;
458		389
459	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	390	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
460	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	391	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
461		392
462	$self->{magicmap} = [$x, $y, $w, $h, $data];	393	$self->{magicmap} = [$x, $y, $w, $h, $data];
463		394
464	$self->update;	395	$self->update;
465	}	396	}
466		397
		398	sub refresh_hook {
		399	my ($self) = @_;
		400
		401	if ($::MAP && $::CONN) {
		402	if (delete $self->{need_update}) {
		403	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		404
		405	my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
		406	my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
		407
		408	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize;
		409	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize;
		410
		411	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		412	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		413
		414	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		415	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
		416
		417	if ($::CFG->{fow_enable}) {
		418	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
		419
		420	$self->{fow_texture} = new DC::Texture
		421	w => $w,
		422	h => $h,
		423	data => $data,
		424	internalformat => GL_ALPHA,
		425	format => GL_ALPHA;
		426	} else {
		427	delete $self->{fow_texture};
		428	}
		429
		430	glNewList ($self->{list} \|\|= glGenList);
		431
		432	glPushMatrix;
		433	glTranslate $sx0, $sy0;
		434	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		435
		436	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
		437
		438	glScale $self->{tilesize}, $self->{tilesize};
		439
		440	if (my $tex = $self->{fow_texture}) {
		441	glPushMatrix;
		442	glScale 1/3, 1/3;
		443	glEnable GL_TEXTURE_2D;
		444	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		445
		446	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
		447	$self->{fow_texture}->draw_quad_alpha (0, 0);
		448
		449	glDisable GL_TEXTURE_2D;
		450	glPopMatrix;
		451	}
		452
		453	if ($self->{magicmap}) {
		454	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		455
		456	$x += $::MAP->ox + $self->{dx};
		457	$y += $::MAP->oy + $self->{dy};
		458
		459	glTranslate - $x - 1, - $y - 1;
		460	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		461	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		462	}
		463
		464	glPopMatrix;
		465	glEndList;
		466	}
		467	} else {
		468	glDeleteList delete $self->{list}
		469	if $self->{list};
		470	}
		471	}
		472
467	sub draw {	473	sub draw {
468	my ($self) = @_;	474	my ($self) = @_;
469		475
470	return unless $::MAP;	476	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
471		477
		478	return unless $self->{list};
		479
472	my $focused = $CFPlus::UI::FOCUS == $self	480	my $focused = $DC::UI::FOCUS == $self
473	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	481	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
474		482
475	return	483	return
476	unless $focused \|\| !$::FAST;	484	unless $focused \|\| !$::FAST;
477		485
478	if (delete $self->{need_update}) {
479	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
480
481	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
482	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
483
484	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
485	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
486
487	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
488	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
489
490	if ($::CFG->{fow_enable}) {
491	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
492
493	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
494	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
495	glConvolutionFilter2D (
496	GL_CONVOLUTION_2D,
497	GL_ALPHA,
498	3, 3,
499	GL_ALPHA, GL_FLOAT,
500	(pack "f*", @{ $self->{smooth_matrix} }),
501	);
502	glEnable GL_CONVOLUTION_2D;
503	}
504
505	$self->{fow_texture} = new CFPlus::Texture
506	w => $w,
507	h => $h,
508	data => $data,
509	internalformat => GL_ALPHA,
510	format => GL_ALPHA;
511
512	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
513	} else {
514	delete $self->{fow_texture};
515	}
516
517	glNewList $self->{list};
518
519	glPushMatrix;
520	glTranslate $sx0, $sy0;
521	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
522
523	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
524
525	glScale 32, 32;
526
527	if (my $tex = $self->{fow_texture}) {
528	glEnable GL_TEXTURE_2D;
529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
530
531	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
532	$self->{fow_texture}->draw_quad_alpha (0, 0);
533
534	glDisable GL_TEXTURE_2D;
535	}
536
537	if ($self->{magicmap}) {
538	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
539
540	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
541	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
542
543	glTranslate - $x - 1, - $y - 1;
544	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
545	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
546	}
547
548	glPopMatrix;
549	glEndList;
550	}
551
552	glCallList $self->{list};	486	glCallList $self->{list};
553		487
554	# TNT2 emulates logops in software (or worse :)	488	# TNT2 emulates logops in software (or worse :)
555	unless ($focused) {	489	unless ($focused) {
556	glColor 0.4, 0.2, 0.2, 0.6;	490	glColor_premultiply 0, 0, 1, 0.25;
557	glEnable GL_BLEND;	491	glEnable GL_BLEND;
558	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	492	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
559	glBegin GL_QUADS;	493	glBegin GL_QUADS;
560	glVertex 0, 0;	494	glVertex 0, 0;
561	glVertex 0, $::HEIGHT;	495	glVertex 0, $::HEIGHT;
562	glVertex $::WIDTH, $::HEIGHT;	496	glVertex $::WIDTH, $::HEIGHT;
563	glVertex $::WIDTH, 0;	497	glVertex $::WIDTH, 0;
…		…
572	glDeleteList $self->{list};	506	glDeleteList $self->{list};
573		507
574	$self->SUPER::DESTROY;	508	$self->SUPER::DESTROY;
575	}	509	}
576		510
577	package CFPlus::MapWidget::MapMap;	511	package DC::MapWidget::MapMap;
578		512
		513	use strict;
		514	use utf8;
		515
579	our @ISA = CFPlus::UI::Base::;	516	our @ISA = DC::UI::Base::;
580		517
581	use Time::HiRes qw(time);	518	use Time::HiRes qw(time);
582	use CFPlus::OpenGL;	519	use DC::OpenGL;
583		520
584	sub size_request {	521	sub size_request {
585	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	522	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
		523	}
		524
		525	sub refresh_hook {
		526	my ($self) = @_;
		527
		528	if ($::MAP && $self->{texture_atime} < time) {
		529	my ($w, $h) = @$self{qw(w h)};
		530
		531	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		532	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		533
		534	my $ox = 0.5 * ($w - $sw);
		535	my $oy = 0.5 * ($h - $sh);
		536
		537	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		538	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		539
		540	#TODO: map scale is completely borked
		541
		542	my $x0 = int $ox - $sx + 0.5;
		543	my $y0 = int $oy - $sy + 0.5;
		544
		545	$self->{sw} = $sw;
		546	$self->{sh} = $sh;
		547
		548	$self->{x0} = $x0;
		549	$self->{y0} = $y0;
		550
		551	$self->{texture_atime} = time + 1/3;
		552
		553	$self->{texture} =
		554	new DC::Texture
		555	w => $w,
		556	h => $h,
		557	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		558	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		559	}
		560	}
		561
		562	sub invoke_visibility_change {
		563	my ($self) = @_;
		564
		565	$self->refresh_hook;
		566
		567	0
586	}	568	}
587		569
588	sub invoke_size_allocate {	570	sub invoke_size_allocate {
589	my ($self, $w, $h) = @_;	571	my ($self, $w, $h) = @_;
590		572
…		…
601	}	583	}
602		584
603	sub _draw {	585	sub _draw {
604	my ($self) = @_;	586	my ($self) = @_;
605		587
606	$::MAP or return;	588	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
607		589
608	my ($w, $h) = @$self{qw(w h)};	590	$self->{texture} or return;
609
610	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
611	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
612
613	my $sx = int $::CFG->{map_shift_x} / 32;
614	my $sy = int $::CFG->{map_shift_y} / 32;
615
616	my $ox = 0.5 * ($w - $sw);
617	my $oy = 0.5 * ($h - $sh);
618		591
619	glEnable GL_BLEND;	592	glEnable GL_BLEND;
620	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	593	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
621	glEnable GL_TEXTURE_2D;	594	glEnable GL_TEXTURE_2D;
622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	595	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
623		596
624	if ($self->{texture_atime} < time) {
625	$self->{texture_atime} = time + 1/3;
626
627	$self->{texture} =
628	new CFPlus::Texture
629	w => $w,
630	h => $h,
631	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
632	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
633	}
634
635	$self->{texture}->draw_quad (0, 0);	597	$self->{texture}->draw_quad (0, 0);
636		598
637	glDisable GL_TEXTURE_2D;	599	glDisable GL_TEXTURE_2D;
638		600
639	glTranslate 0.375, 0.375;	601	glTranslate 0.375, 0.375;
640
641	#TODO: map scale is completely borked
642
643	my $x0 = int $ox - $sx + 0.5;
644	my $y0 = int $oy - $sy + 0.5;
645		602
646	glColor 1, 1, 0, 1;	603	glColor 1, 1, 0, 1;
647	glBegin GL_LINE_LOOP;	604	glBegin GL_LINE_LOOP;
648	glVertex $x0 , $y0 ;	605	glVertex $self->{x0} , $self->{y0} ;
649	glVertex $x0 , $y0 + $sh;	606	glVertex $self->{x0} , $self->{y0} + $self->{sh};
650	glVertex $x0 + $sw, $y0 + $sh;	607	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
651	glVertex $x0 + $sw, $y0 ;	608	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
652	glEnd;	609	glEnd;
653		610
654	glDisable GL_BLEND;	611	glDisable GL_BLEND;
655	}	612	}
656		613
657	package CFPlus::MapWidget::Command;	614	package DC::MapWidget::Command;
658		615
659	use strict;	616	use strict;
660		617
661	use CFPlus::OpenGL;	618	use DC::OpenGL;
662		619
663	our @ISA = CFPlus::UI::Frame::;	620	our @ISA = DC::UI::Frame::;
664		621
665	sub new {	622	sub new {
666	my $class = shift;	623	my $class = shift;
667		624
668	my $self = $class->SUPER::new (	625	my $self = $class->SUPER::new (
669	bg => [0, 0, 0, 0.8],	626	bg => [0, 0, 0, 0.8],
670	@_,	627	@_,
671	);	628	);
672		629
673	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	630	$self->add ($self->{vbox} = new DC::UI::VBox);
674		631
675	$self->{label} = [	632	$self->{label} = [
676	map	633	map
677	CFPlus::UI::Label->new (	634	DC::UI::Label->new (
678	can_hover => 1,	635	can_hover => 1,
679	can_events => 1,	636	can_events => 1,
680	tooltip_width => 0.33,	637	tooltip_width => 0.33,
681	fontsize => $_,	638	fontsize => $_,
682	), (0.8) x 16	639	), (0.8) x 16
683	];	640	];
684		641
685	$self->{entry} = new CFPlus::UI::Entry	642	$self->{entry} = new DC::UI::Entry
686	on_changed => sub {	643	on_changed => sub {
687	$self->update_labels;	644	$self->update_labels;
688	0	645	0
689	},	646	},
690	on_button_down => sub {	647	on_button_down => sub {
691	my ($entry, $ev, $x, $y) = @_;	648	my ($entry, $ev, $x, $y) = @_;
692		649
693	if ($ev->{button} == 3) {	650	if ($ev->{button} == 3) {
694	(new CFPlus::UI::Menu	651	(new DC::UI::Menu
695	items => [	652	items => [
696	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	653	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
697	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	654	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
698	],	655	],
699	)->popup ($ev);	656	)->popup ($ev);
700	return 1;	657	return 1;
701	}	658	}
702	0	659	0
…		…
717	$self->hide;	674	$self->hide;
718	}	675	}
719	} elsif ($ev->{sym} == 27) {	676	} elsif ($ev->{sym} == 27) {
720	$self->{hist_ptr} = 0;	677	$self->{hist_ptr} = 0;
721	$self->hide;	678	$self->hide;
722	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {	679	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
723	if ($self->{hist_ptr} > 1) {	680	if ($self->{hist_ptr} > 1) {
724	$self->{hist_ptr}--;	681	$self->{hist_ptr}--;
725	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	682	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
726	} elsif ($self->{hist_ptr} > 0) {	683	} elsif ($self->{hist_ptr} > 0) {
727	$self->{hist_ptr}--;	684	$self->{hist_ptr}--;
…		…
729	} else {	686	} else {
730	++$self->{select_offset}	687	++$self->{select_offset}
731	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	688	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
732	}	689	}
733	$self->update_labels;	690	$self->update_labels;
734	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {	691	} elsif ($ev->{sym} == DC::SDLK_UP) {
735	if ($self->{select_offset}) {	692	if ($self->{select_offset}) {
736	--$self->{select_offset}	693	--$self->{select_offset}
737	} else {	694	} else {
738	unless ($self->{hist_ptr}) {	695	unless ($self->{hist_ptr}) {
739	$self->{hist_saveback} = $self->{entry}->get_text;	696	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
897		854
898	sub _draw {	855	sub _draw {
899	my ($self) = @_;	856	my ($self) = @_;
900		857
901	# hack	858	# hack
902	local $CFPlus::UI::FOCUS = $self->{entry};	859	local $DC::UI::FOCUS = $self->{entry};
903		860
904	$self->SUPER::_draw;	861	$self->SUPER::_draw;
905	}	862	}
906		863
907	1	864	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.85 by root, Sun Oct 8 21:22:30 2006 UTC vs. Revision 1.126 by root, Wed Dec 26 21:03:21 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.85 by root, Sun Oct 8 21:22:30 2006 UTC vs.
Revision 1.126 by root, Wed Dec 26 21:03:21 2007 UTC