[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.129 by root, Mon May 5 20:22:03 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		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 test_server_login {	59	sub server_login {
65	return unless	60	my ($server) = @_;
66	$::CONN && length $::CONN->{test_server};
67		61
68	my $server = $::CONN->{test_server};
69	::stop_game ();	62	::stop_game ();
70	local $::PROFILE->{host} = $server;	63	local $::PROFILE->{host} = $server;
71	::start_game ();	64	::start_game ();
72	}	65	}
73		66
74	sub editor_invoke {	67	sub editor_invoke {
75	return unless $::CONN;	68	my $editsup = $::CONN && $::CONN->{editor_support}
		69	or return;
76		70
77	# putting the password into the env is somewhat tasteless	71	DC::background {
78	local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};	72	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		73
83	CFPlus::set_proxy;	74	my $server = $editsup->{gameserver} \|\| "default";
		75	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
84		76
85	my $map = "map:$::CONN->{map_info}[0]";	77	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
		78	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
86		79
87	if (fork == 0) {	80	print "map directory is $mapdir\n";
88	$SIG{__DIE__} = sub {	81	print "lib directory is $libdir\n";
89	warn "@_";	82
90	CFPlus::_exit 99;	83	my $ua = DC::lwp_useragent;
		84
		85	for my $file (qw(archetypes crossfire.0)) {
		86	my $url = "$editsup->{lib_root}$file";
		87	print "mirroring $url...\n";
		88	DC::lwp_check $ua->mirror ($url, "$libdir/$file");
		89	printf "%s size %d octets\n", $file, -s "$libdir/$file";
91	};	90	}
92		91
93	# TODO: move into editor	92	if (1) { # upload a map
94	require LWP::UserAgent;	93	my $mapname = $::CONN->{map_info}[0];
95		94
96	my $ua = LWP::UserAgent->new (	95	my $mappath = "$mapdir/$mapname";
97	agent => "cfplus $CFPlus::VERSION",
98	keep_alive => 1,
99	env_proxy => 1,
100	);
101		96
102	if ($map =~ /^map:(.*)/) {	97	-e $mappath and die "$mappath already exists\n";
103	my $mapname = $1;	98
		99	print "getting map revision for $mapname...\n";
		100
104	# try to get the most recent head revision, what a hack	101	# try to get the most recent head revision, what a hack,
		102	# this should have been returned while downloading sigh
105	my $log = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$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;
106		104
107	if ($log =~ /\?rev=(\d+\.\d+)"/) {	105	if ($log =~ /\?rev=(\d+\.\d+)"/) {
108	my $rev = $1;	106	my $rev = $1;
		107
		108	print "downloading revision $rev...\n";
		109
109	my $map = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?rev=$rev")->decoded_content;	110	my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
110	warn "revision is $rev " .(length $map)."\n";#d#	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#
111		136
112	# now upload it	137	# now upload it
113	my $comment = "some comment";
114
115	require HTTP::Request::Common;	138	# require HTTP::Request::Common;
116		139	#
117	my $res = $ua->post (	140	# my $res = $ua->post (
118	$ENV{CFPLUS_UPLOAD},	141	# $ENV{CFPLUS_UPLOAD},
119	Content_Type => 'multipart/form-data',	142	# Content_Type => 'multipart/form-data',
120	Content => [	143	# Content => [
121	path => $mapname,	144	# path => $mapname,
122	mapdir => $ENV{CROSSFIRE_MAPDIR},	145	# mapdir => $ENV{CROSSFIRE_MAPDIR},
123	map => $map,	146	# map => $map,
124	revision => $rev,	147	# revision => $rev,
125	cf_login => $ENV{CFPLUS_LOGIN},	148	# cf_login => $ENV{CFPLUS_LOGIN},
126	cf_password => $ENV{CFPLUS_PASSWORD},	149	# cf_password => $ENV{CFPLUS_PASSWORD},
127	comment => "",	150	# comment => "",
128	]	151	# ]
129	);	152	# );
130		153	#
131	if ($res->is_error) {	154	# if ($res->is_error) {
132	# fatal condition	155	# # fatal condition
133	warn $res->status_line;	156	# warn $res->status_line;
134	} else {	157	# } else {
135	# script replies are marked as {{..}}	158	# # script replies are marked as {{..}}
136	my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;	159	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
137	warn map "$_\n", @msgs;	160	# warn map "$_\n", @msgs;
138	}	161	# }
139	} else {	162	} else {
140	# error, could not detect revision	163	die "viewvc parse error, unable to detect revision\n";
141	}	164	}
142	}	165	}
143
144	CFPlus::_exit;
145	}	166	}
146	}	167	}
147		168
148	sub invoke_button_down {	169	sub invoke_button_down {
149	my ($self, $ev, $x, $y) = @_;	170	my ($self, $ev, $x, $y) = @_;
150		171
151	if ($ev->{button} == 1) {	172	if ($ev->{button} == 1) {
152	$self->grab_focus;	173	$self->grab_focus;
153	return unless $::CONN;	174	return unless $::CONN;
154		175
155	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};
156	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};
157		178
158	$x -= int 0.5 * $self->{sw};	179	$x -= DC::floor $::MAP->w * 0.5;
159	$y -= int 0.5 * $self->{sh};	180	$y -= DC::floor $::MAP->h * 0.5;
160		181
		182	if ($::CONN) {
161	$::CONN->lookat ($x, $y)	183	$::CONN->lookat ($x, $y)
162	if $::CONN;	184	}
163		185
164	} elsif ($ev->{button} == 2) {	186	} elsif ($ev->{button} == 2) {
165	$self->grab_focus;	187	$self->grab_focus;
166	return unless $::CONN;	188	return unless $::CONN;
167		189
…		…
177	$::CFG->{map_shift_y} = $bh + $y - $oy;	199	$::CFG->{map_shift_y} = $bh + $y - $oy;
178		200
179	$self->update;	201	$self->update;
180	};	202	};
181	} elsif ($ev->{button} == 3) {	203	} elsif ($ev->{button} == 3) {
182	(new CFPlus::UI::Menu	204	my @items = (
183	items => [
184	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],	205	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
185	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	206	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
186	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	207	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
187	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	208	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
188	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	209	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
189	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],	210	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
190	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],	211	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
191	[	212	[
192	$::PICKUP_ENABLE->{state}	213	$::PICKUP_ENABLE->{state}
193	? "Disable automatic pickup"	214	? "Disable automatic pickup"
194	: "Enable automatic pickup",	215	: "Enable automatic pickup",
195	sub { $::PICKUP_ENABLE->toggle }	216	sub { $::PICKUP_ENABLE->toggle }
196	],	217	],
197	$::CONN && length $::CONN->{cvs_root}	218	);
		219
		220	if ($::CONN && $::CONN->{editor_support}) {
		221	# push @items, [
198	? ["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>",
199	\&editor_invoke]	223	# \&editor_invoke,
200	: (),	224	# ];
201	$::CONN && length $::CONN->{test_server}	225
		226	for my $type (qw(test name)) {
		227	$::CONN->{editor_support}{type} ne $type
		228	or next;
		229	my $server = $::CONN->{editor_support}{"${type}server"}
		230	or next;
		231
		232	push @items, [
202	? ["Login on Test Server <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{test_server}) . ")</span>",	233	"Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
203	\&test_server_login]	234	sub { server_login $server },
204	: (),	235	];
		236	}
		237	}
		238
		239	push @items,
205	["Quit",	240	["Quit",
206	sub {	241	sub {
207	if ($::CONN) {	242	if ($::CONN) {
208	&::open_quit_dialog;	243	&::open_quit_dialog;
209	} else {	244	} else {
210	exit;	245	exit;
211	}
212	}	246	}
213	],	247	}
214	],	248	],
		249	;
		250
		251	(new DC::UI::Menu
		252	items => \@items,
215	)->popup ($ev);	253	)->popup ($ev);
216	}	254	}
217		255
218	1	256	1
219	}	257	}
…		…
237		275
238	1	276	1
239	}	277	}
240		278
241	sub size_request {	279	sub size_request {
		280	my ($self) = @_;
		281
242	(	282	(
243	32 * CFPlus::ceil $::WIDTH / 32,	283	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
244	32 * CFPlus::ceil $::HEIGHT / 32,	284	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
245	)	285	)
246	}	286	}
247		287
248	sub update {	288	sub update {
249	my ($self) = @_;	289	my ($self) = @_;
…		…
251	$self->{need_update} = 1;	291	$self->{need_update} = 1;
252	$self->SUPER::update;	292	$self->SUPER::update;
253	}	293	}
254		294
255	my %DIR = (	295	my %DIR = (
		296	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
256	CFPlus::SDLK_KP8, [1, "north"],	297	( "," . DC::SDLK_KP8 ), [1, "north"],
257	CFPlus::SDLK_KP9, [2, "northeast"],	298	( "," . DC::SDLK_KP9 ), [2, "northeast"],
258	CFPlus::SDLK_KP6, [3, "east"],	299	( "," . DC::SDLK_KP6 ), [3, "east"],
259	CFPlus::SDLK_KP3, [4, "southeast"],	300	( "," . DC::SDLK_KP3 ), [4, "southeast"],
260	CFPlus::SDLK_KP2, [5, "south"],	301	( "," . DC::SDLK_KP2 ), [5, "south"],
261	CFPlus::SDLK_KP1, [6, "southwest"],	302	( "," . DC::SDLK_KP1 ), [6, "southwest"],
262	CFPlus::SDLK_KP4, [7, "west"],	303	( "," . DC::SDLK_KP4 ), [7, "west"],
263	CFPlus::SDLK_KP7, [8, "northwest"],	304	( "," . DC::SDLK_KP7 ), [8, "northwest"],
264		305
265	CFPlus::SDLK_UP, [1, "north"],	306	( "," . DC::SDLK_UP ), [1, "north"],
		307	("1," . DC::SDLK_UP ), [2, "northeast"],
266	CFPlus::SDLK_RIGHT, [3, "east"],	308	( "," . DC::SDLK_RIGHT), [3, "east"],
		309	("1," . DC::SDLK_RIGHT), [4, "southeast"],
267	CFPlus::SDLK_DOWN, [5, "south"],	310	( "," . DC::SDLK_DOWN ), [5, "south"],
		311	("1," . DC::SDLK_DOWN ), [6, "southwest"],
268	CFPlus::SDLK_LEFT, [7, "west"],	312	( "," . DC::SDLK_LEFT ), [7, "west"],
		313	("1," . DC::SDLK_LEFT ), [8, "northwest"],
269	);	314	);
270		315
271	sub invoke_key_down {	316	sub invoke_key_down {
272	my ($self, $ev) = @_;	317	my ($self, $ev) = @_;
273		318
274	my $mod = $ev->{mod};	319	my $mod = $ev->{mod};
275	my $sym = $ev->{sym};	320	my $sym = $ev->{sym};
276	my $uni = $ev->{unicode};	321	my $uni = $ev->{unicode};
277		322
278	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	323	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_SHIFT;
279		324
280	if ($uni == ord "\t") {	325	if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
281	$::PL_WINDOW->toggle_visibility;
282	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
283	$::HELP_WINDOW->toggle_visibility;
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
310	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
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) {	326	if ($mod & DC::KMOD_SHIFT) {
335	$self->{shft}++;	327	$self->{shft}++;
336	if ($DIR{$sym}[0] != $self->{fire_dir}) {	328	if ($dir->[0] != $self->{fire_dir}) {
337	$::CONN->user_send ("fire $DIR{$sym}[0]");	329	$::CONN->user_send ("fire $dir->[0]");
338	}	330	}
339	$self->{fire_dir} = $DIR{$sym}[0];	331	$self->{fire_dir} = $dir->[0];
340	} elsif ($mod & CFPlus::KMOD_CTRL) {	332	} elsif ($mod & DC::KMOD_CTRL) {
341	$self->{ctrl}++;	333	$self->{ctrl}++;
342	$::CONN->user_send ("run $DIR{$sym}[0]");	334	$::CONN->user_send ("run $dir->[0]");
343	} else {	335	} else {
344	$::CONN->user_send ("$DIR{$sym}[1]");	336	$::CONN->user_send ("$dir->[1]");
345	}	337	}
346	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	338
347	$self->{completer}->inject_key_down ($ev);
348	$self->{completer}->show;
349	} else {
350	return 0;	339	return 1;
351	}
352
353	1	340	}
		341
		342	0
354	}	343	}
355		344
356	sub invoke_key_up {	345	sub invoke_key_up {
357	my ($self, $ev) = @_;	346	my ($self, $ev) = @_;
358		347
359	my $res = 0;	348	my $res = 0;
360	my $mod = $ev->{mod};	349	my $mod = $ev->{mod};
361	my $sym = $ev->{sym};	350	my $sym = $ev->{sym};
362		351
363	if ($::CFG->{shift_fire_stop}) {	352	if ($::CFG->{shift_fire_stop}) {
364	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {	353	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
365	$::CONN->user_send ("fire_stop");	354	$::CONN->user_send ("fire_stop");
366	delete $self->{fire_dir};	355	delete $self->{fire_dir};
367	$res = 1;	356	$res = 1;
368	}	357	}
369	} else {	358	} else {
370	if (exists $DIR{$sym} && delete $self->{shft}) {	359	if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
371	$::CONN->user_send ("fire_stop");	360	$::CONN->user_send ("fire_stop");
372	delete $self->{fire_dir};	361	delete $self->{fire_dir};
373	$res = 1;	362	$res = 1;
374	} 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?
375	$::CONN->user_send ("fire_stop");	365	$::CONN->user_send ("fire_stop");
376	delete $self->{fire_dir};	366	delete $self->{fire_dir};
377	$res = 1;	367	$res = 1;
378	}	368	}
379	}	369	}
380		370
381	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {	371	if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
382	$::CONN->user_send ("run_stop");	372	$::CONN->user_send ("run_stop");
383	$res = 1;	373	$res = 1;
384	}	374	}
385		375
386	$res	376	$res
387	}	377	}
388		378
		379	sub invoke_visibility_change {
		380	my ($self) = @_;
		381
		382	$self->refresh_hook;
		383
		384	0
		385	}
		386
389	sub set_magicmap {	387	sub set_magicmap {
390	my ($self, $w, $h, $x, $y, $data) = @_;	388	my ($self, $w, $h, $x, $y, $data) = @_;
391		389
392	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	390	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
393	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	391	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
394		392
395	$self->{magicmap} = [$x, $y, $w, $h, $data];	393	$self->{magicmap} = [$x, $y, $w, $h, $data];
396		394
397	$self->update;	395	$self->update;
398	}	396	}
399		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
400	sub draw {	473	sub draw {
401	my ($self) = @_;	474	my ($self) = @_;
402		475
403	return unless $::MAP;	476	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
404		477
		478	return unless $self->{list};
		479
405	my $focused = $CFPlus::UI::FOCUS == $self	480	my $focused = $DC::UI::FOCUS == $self
406	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	481	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
407		482
408	return	483	return
409	unless $focused \|\| !$::FAST;	484	unless $focused \|\| !$::FAST;
410		485
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};	486	glCallList $self->{list};
486		487
487	# TNT2 emulates logops in software (or worse :)	488	# TNT2 emulates logops in software (or worse :)
488	unless ($focused) {	489	unless ($focused) {
489	glColor 0.4, 0.2, 0.2, 0.6;	490	glColor_premultiply 0, 0, 1, 0.25;
490	glEnable GL_BLEND;	491	glEnable GL_BLEND;
491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	492	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
492	glBegin GL_QUADS;	493	glBegin GL_QUADS;
493	glVertex 0, 0;	494	glVertex 0, 0;
494	glVertex 0, $::HEIGHT;	495	glVertex 0, $::HEIGHT;
495	glVertex $::WIDTH, $::HEIGHT;	496	glVertex $::WIDTH, $::HEIGHT;
496	glVertex $::WIDTH, 0;	497	glVertex $::WIDTH, 0;
…		…
505	glDeleteList $self->{list};	506	glDeleteList $self->{list};
506		507
507	$self->SUPER::DESTROY;	508	$self->SUPER::DESTROY;
508	}	509	}
509		510
510	package CFPlus::MapWidget::MapMap;	511	package DC::MapWidget::MapMap;
511		512
		513	use strict;
		514	use utf8;
		515
512	our @ISA = CFPlus::UI::Base::;	516	our @ISA = DC::UI::Base::;
513		517
514	use Time::HiRes qw(time);	518	use Time::HiRes qw(time);
515	use CFPlus::OpenGL;	519	use DC::OpenGL;
516		520
517	sub size_request {	521	sub size_request {
518	($::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
519	}	568	}
520		569
521	sub invoke_size_allocate {	570	sub invoke_size_allocate {
522	my ($self, $w, $h) = @_;	571	my ($self, $w, $h) = @_;
523		572
…		…
534	}	583	}
535		584
536	sub _draw {	585	sub _draw {
537	my ($self) = @_;	586	my ($self) = @_;
538		587
539	$::MAP or return;	588	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
540		589
541	my ($w, $h) = @$self{qw(w h)};	590	$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		591
552	glEnable GL_BLEND;	592	glEnable GL_BLEND;
553	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	593	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
554	glEnable GL_TEXTURE_2D;	594	glEnable GL_TEXTURE_2D;
555	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	595	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
556		596
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);	597	$self->{texture}->draw_quad (0, 0);
569		598
570	glDisable GL_TEXTURE_2D;	599	glDisable GL_TEXTURE_2D;
571		600
572	glTranslate 0.375, 0.375;	601	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		602
579	glColor 1, 1, 0, 1;	603	glColor 1, 1, 0, 1;
580	glBegin GL_LINE_LOOP;	604	glBegin GL_LINE_LOOP;
581	glVertex $x0 , $y0 ;	605	glVertex $self->{x0} , $self->{y0} ;
582	glVertex $x0 , $y0 + $sh;	606	glVertex $self->{x0} , $self->{y0} + $self->{sh};
583	glVertex $x0 + $sw, $y0 + $sh;	607	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
584	glVertex $x0 + $sw, $y0 ;	608	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
585	glEnd;	609	glEnd;
586		610
587	glDisable GL_BLEND;	611	glDisable GL_BLEND;
588	}	612	}
589		613
590	package CFPlus::MapWidget::Command;	614	package DC::MapWidget::Command;
591		615
592	use strict;	616	use strict;
593		617
594	use CFPlus::OpenGL;	618	use DC::OpenGL;
595		619
596	our @ISA = CFPlus::UI::Frame::;	620	our @ISA = DC::UI::Frame::;
597		621
598	sub new {	622	sub new {
599	my $class = shift;	623	my $class = shift;
600		624
601	my $self = $class->SUPER::new (	625	my $self = $class->SUPER::new (
602	bg => [0, 0, 0, 0.8],	626	bg => [0, 0, 0, 0.8],
603	@_,	627	@_,
604	);	628	);
605		629
606	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	630	$self->add ($self->{vbox} = new DC::UI::VBox);
607		631
608	$self->{label} = [	632	$self->{label} = [
609	map	633	map
610	CFPlus::UI::Label->new (	634	DC::UI::Label->new (
		635	align => 0,
611	can_hover => 1,	636	can_hover => 1,
612	can_events => 1,	637	can_events => 1,
613	tooltip_width => 0.33,	638	tooltip_width => 0.33,
614	fontsize => $_,	639	fontsize => $_,
615	), (0.8) x 16	640	), (0.8) x 16
616	];	641	];
617		642
618	$self->{entry} = new CFPlus::UI::Entry	643	$self->{entry} = new DC::UI::Entry
619	on_changed => sub {	644	on_changed => sub {
620	$self->update_labels;	645	$self->update_labels;
621	0	646	0
622	},	647	},
623	on_button_down => sub {	648	on_button_down => sub {
624	my ($entry, $ev, $x, $y) = @_;	649	my ($entry, $ev, $x, $y) = @_;
625		650
626	if ($ev->{button} == 3) {	651	if ($ev->{button} == 3) {
627	(new CFPlus::UI::Menu	652	(new DC::UI::Menu
628	items => [	653	items => [
629	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	654	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
630	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	655	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
631	],	656	],
632	)->popup ($ev);	657	)->popup ($ev);
633	return 1;	658	return 1;
634	}	659	}
635	0	660	0
…		…
650	$self->hide;	675	$self->hide;
651	}	676	}
652	} elsif ($ev->{sym} == 27) {	677	} elsif ($ev->{sym} == 27) {
653	$self->{hist_ptr} = 0;	678	$self->{hist_ptr} = 0;
654	$self->hide;	679	$self->hide;
655	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {	680	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
656	if ($self->{hist_ptr} > 1) {	681	if ($self->{hist_ptr} > 1) {
657	$self->{hist_ptr}--;	682	$self->{hist_ptr}--;
658	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	683	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
659	} elsif ($self->{hist_ptr} > 0) {	684	} elsif ($self->{hist_ptr} > 0) {
660	$self->{hist_ptr}--;	685	$self->{hist_ptr}--;
…		…
662	} else {	687	} else {
663	++$self->{select_offset}	688	++$self->{select_offset}
664	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	689	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
665	}	690	}
666	$self->update_labels;	691	$self->update_labels;
667	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {	692	} elsif ($ev->{sym} == DC::SDLK_UP) {
668	if ($self->{select_offset}) {	693	if ($self->{select_offset}) {
669	--$self->{select_offset}	694	--$self->{select_offset}
670	} else {	695	} else {
671	unless ($self->{hist_ptr}) {	696	unless ($self->{hist_ptr}) {
672	$self->{hist_saveback} = $self->{entry}->get_text;	697	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
830		855
831	sub _draw {	856	sub _draw {
832	my ($self) = @_;	857	my ($self) = @_;
833		858
834	# hack	859	# hack
835	local $CFPlus::UI::FOCUS = $self->{entry};	860	local $DC::UI::FOCUS = $self->{entry};
836		861
837	$self->SUPER::_draw;	862	$self->SUPER::_draw;
838	}	863	}
839		864
840	1	865	1
		866

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.129 by root, Mon May 5 20:22:03 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.129 by root, Mon May 5 20:22:03 2008 UTC