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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.84 by root, Sun Oct 1 18:17:38 2006 UTC vs. Revision 1.140 by root, Sun Jul 20 15:09:29 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.84 by root, Sun Oct 1 18:17:38 2006 UTC vs.
Revision 1.140 by root, Sun Jul 20 15:09:29 2008 UTC