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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.80 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.128 by root, Thu Apr 17 20:13:17 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 => "<b>The Command Completer</b>\n\n"
38	. "This is your central interface to send text commands to the server. "
39	. "To enter a verbatim command to send to the server, just type the command, "
40	. "followed by a space, and press return. "
41	. "Typing the initial letters of words (or just any letters) displays guesses "
42	. "for commands you might want to use.\n"
43	. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
44	. "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
45	;
46
47	$self	29	$self
		30	}
		31
		32	sub set_tilesize {
		33	my ($self, $tilesize) = @_;
		34
		35	$self->{tilesize} = $tilesize;
48	}	36	}
49		37
50	sub add_command {	38	sub add_command {
51	my ($self, $command, $tooltip, $widget, $cb) = @_;	39	my ($self, $command, $tooltip, $widget, $cb) = @_;
52		40
54		42
55	$tooltip =~ s/^\s+//;	43	$tooltip =~ s/^\s+//;
56	$tooltip = "<big>$data</big>\n\n$tooltip";	44	$tooltip = "<big>$data</big>\n\n$tooltip";
57	$tooltip =~ s/\s+$//;	45	$tooltip =~ s/\s+$//;
58		46
59	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	47	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
60	}	48	}
61		49
62	sub clr_commands {	50	sub clr_commands {
63	my ($self) = @_;	51	my ($self) = @_;
64		52
65	%{$self->{completer}{command}} = ();	53	%{$::COMPLETER->{command}} = ();
66		54
67	$self->{completer}->hide	55	$::COMPLETER->hide
68	if $self->{completer};	56	if $::COMPLETER;
		57	}
		58
		59	sub server_login {
		60	my ($server) = @_;
		61
		62	::stop_game ();
		63	local $::PROFILE->{host} = $server;
		64	::start_game ();
		65	}
		66
		67	sub editor_invoke {
		68	my $editsup = $::CONN && $::CONN->{editor_support}
		69	or return;
		70
		71	DC::background {
		72	print "preparing editor startup...\n";
		73
		74	my $server = $editsup->{gameserver} \|\| "default";
		75	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		76
		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;
		79
		80	print "map directory is $mapdir\n";
		81	print "lib directory is $libdir\n";
		82
		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";
		90	}
		91
		92	if (1) { # upload a map
		93	my $mapname = $::CONN->{map_info}[0];
		94
		95	my $mappath = "$mapdir/$mapname";
		96
		97	-e $mappath and die "$mappath already exists\n";
		98
		99	print "getting map revision for $mapname...\n";
		100
		101	# try to get the most recent head revision, what a hack,
		102	# this should have been returned while downloading sigh
		103	my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
		104
		105	if ($log =~ /\?rev=(\d+\.\d+)"/) {
		106	my $rev = $1;
		107
		108	print "downloading revision $rev...\n";
		109
		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#
		136
		137	# now upload it
		138	# require HTTP::Request::Common;
		139	#
		140	# my $res = $ua->post (
		141	# $ENV{CFPLUS_UPLOAD},
		142	# Content_Type => 'multipart/form-data',
		143	# Content => [
		144	# path => $mapname,
		145	# mapdir => $ENV{CROSSFIRE_MAPDIR},
		146	# map => $map,
		147	# revision => $rev,
		148	# cf_login => $ENV{CFPLUS_LOGIN},
		149	# cf_password => $ENV{CFPLUS_PASSWORD},
		150	# comment => "",
		151	# ]
		152	# );
		153	#
		154	# if ($res->is_error) {
		155	# # fatal condition
		156	# warn $res->status_line;
		157	# } else {
		158	# # script replies are marked as {{..}}
		159	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
		160	# warn map "$_\n", @msgs;
		161	# }
		162	} else {
		163	die "viewvc parse error, unable to detect revision\n";
		164	}
		165	}
		166	}
69	}	167	}
70		168
71	sub invoke_button_down {	169	sub invoke_button_down {
72	my ($self, $ev, $x, $y) = @_;	170	my ($self, $ev, $x, $y) = @_;
73		171
74	if ($ev->{button} == 1) {	172	if ($ev->{button} == 1) {
75	$self->grab_focus;	173	$self->grab_focus;
76	return unless $::CONN;	174	return unless $::CONN;
77		175
78	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};
79	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};
80		178
81	$x -= int 0.5 * $self->{sw};	179	$x -= DC::floor $::MAP->w * 0.5;
82	$y -= int 0.5 * $self->{sh};	180	$y -= DC::floor $::MAP->h * 0.5;
83		181
		182	if ($::CONN) {
84	$::CONN->lookat ($x, $y)	183	$::CONN->lookat ($x, $y)
85	if $::CONN;	184	}
86		185
87	} elsif ($ev->{button} == 2) {	186	} elsif ($ev->{button} == 2) {
88	$self->grab_focus;	187	$self->grab_focus;
89	return unless $::CONN;	188	return unless $::CONN;
90		189
…		…
100	$::CFG->{map_shift_y} = $bh + $y - $oy;	199	$::CFG->{map_shift_y} = $bh + $y - $oy;
101		200
102	$self->update;	201	$self->update;
103	};	202	};
104	} elsif ($ev->{button} == 3) {	203	} elsif ($ev->{button} == 3) {
105	(new CFPlus::UI::Menu	204	my @items = (
106	items => [
107	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],	205	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
108	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],	206	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
109	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],	207	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
110	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],	208	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
111	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],	209	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
…		…
115	$::PICKUP_ENABLE->{state}	213	$::PICKUP_ENABLE->{state}
116	? "Disable automatic pickup"	214	? "Disable automatic pickup"
117	: "Enable automatic pickup",	215	: "Enable automatic pickup",
118	sub { $::PICKUP_ENABLE->toggle }	216	sub { $::PICKUP_ENABLE->toggle }
119	],	217	],
		218	);
		219
		220	if ($::CONN && $::CONN->{editor_support}) {
		221	# push @items, [
		222	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
		223	# \&editor_invoke,
		224	# ];
		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, [
		233	"Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
		234	sub { server_login $server },
		235	];
		236	}
		237	}
		238
		239	push @items,
120	["Quit",	240	["Quit",
121	sub {	241	sub {
122	if ($::CONN) {	242	if ($::CONN) {
123	&::open_quit_dialog;	243	&::open_quit_dialog;
124	} else {	244	} else {
125	exit;	245	exit;
126	}
127	}	246	}
128	],	247	}
129	],	248	],
		249	;
		250
		251	(new DC::UI::Menu
		252	items => \@items,
130	)->popup ($ev);	253	)->popup ($ev);
131	}	254	}
132		255
133	1	256	1
134	}	257	}
…		…
152		275
153	1	276	1
154	}	277	}
155		278
156	sub size_request {	279	sub size_request {
		280	my ($self) = @_;
		281
157	(	282	(
158	32 * CFPlus::ceil $::WIDTH / 32,	283	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
159	32 * CFPlus::ceil $::HEIGHT / 32,	284	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
160	)	285	)
161	}	286	}
162		287
163	sub update {	288	sub update {
164	my ($self) = @_;	289	my ($self) = @_;
…		…
166	$self->{need_update} = 1;	291	$self->{need_update} = 1;
167	$self->SUPER::update;	292	$self->SUPER::update;
168	}	293	}
169		294
170	my %DIR = (	295	my %DIR = (
		296	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
171	CFPlus::SDLK_KP8, [1, "north"],	297	( "," . DC::SDLK_KP8 ), [1, "north"],
172	CFPlus::SDLK_KP9, [2, "northeast"],	298	( "," . DC::SDLK_KP9 ), [2, "northeast"],
173	CFPlus::SDLK_KP6, [3, "east"],	299	( "," . DC::SDLK_KP6 ), [3, "east"],
174	CFPlus::SDLK_KP3, [4, "southeast"],	300	( "," . DC::SDLK_KP3 ), [4, "southeast"],
175	CFPlus::SDLK_KP2, [5, "south"],	301	( "," . DC::SDLK_KP2 ), [5, "south"],
176	CFPlus::SDLK_KP1, [6, "southwest"],	302	( "," . DC::SDLK_KP1 ), [6, "southwest"],
177	CFPlus::SDLK_KP4, [7, "west"],	303	( "," . DC::SDLK_KP4 ), [7, "west"],
178	CFPlus::SDLK_KP7, [8, "northwest"],	304	( "," . DC::SDLK_KP7 ), [8, "northwest"],
179		305
180	CFPlus::SDLK_UP, [1, "north"],	306	( "," . DC::SDLK_UP ), [1, "north"],
		307	("1," . DC::SDLK_UP ), [2, "northeast"],
181	CFPlus::SDLK_RIGHT, [3, "east"],	308	( "," . DC::SDLK_RIGHT), [3, "east"],
		309	("1," . DC::SDLK_RIGHT), [4, "southeast"],
182	CFPlus::SDLK_DOWN, [5, "south"],	310	( "," . DC::SDLK_DOWN ), [5, "south"],
		311	("1," . DC::SDLK_DOWN ), [6, "southwest"],
183	CFPlus::SDLK_LEFT, [7, "west"],	312	( "," . DC::SDLK_LEFT ), [7, "west"],
		313	("1," . DC::SDLK_LEFT ), [8, "northwest"],
184	);	314	);
185		315
186	sub invoke_key_down {	316	sub invoke_key_down {
187	my ($self, $ev) = @_;	317	my ($self, $ev) = @_;
188		318
189	my $mod = $ev->{mod};	319	my $mod = $ev->{mod};
190	my $sym = $ev->{sym};	320	my $sym = $ev->{sym};
191	my $uni = $ev->{unicode};	321	my $uni = $ev->{unicode};
192		322
193	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;	323	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_SHIFT;
194		324
195	if ($uni == ord "\t") {	325	if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
196	$::PL_WINDOW->toggle_visibility;
197	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
198	$::HELP_WINDOW->toggle_visibility;
199	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
200	::toggle_player_page ($::STATS_PAGE);
201	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
202	::toggle_player_page ($::SKILL_PAGE);
203	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
204	::toggle_player_page ($::SPELL_PAGE);
205	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
206	::toggle_player_page ($::INVENTORY_PAGE);
207	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
208	$::SETUP_DIALOG->toggle_visibility;
209	} elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
210	$::BIND_EDITOR->set_binding (undef, undef, [],
211	sub {
212	my ($mod, $sym, $cmds) = @_;
213	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
214	});
215	$::BIND_EDITOR->start;
216	$::BIND_EDITOR->show;
217	} elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
218	$::BIND_EDITOR->stop;
219	$::BIND_EDITOR->ask_for_bind_and_commit;
220	$::BIND_EDITOR->hide;
221	} elsif (!$::CONN) {
222	return 0; # bindings further down need a valid connection
223
224	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
225	$::CONN->user_send ("stay fire");
226	} elsif ($uni == ord ",") {
227	$::CONN->user_send ("take");
228	} elsif ($uni == ord " ") {
229	$::CONN->user_send ("apply");
230	} elsif ($uni == ord ".") {
231	$::CONN->user_send ($self->{completer}{last_command})
232	if exists $self->{completer}{last_command};
233	} elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
234	$::CONN->user_send ($_) for @$bind_cmd;
235	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
236	$::CONN->user_send ("rotateshoottype +");
237	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
238	$::CONN->user_send ("rotateshoottype -");
239	} elsif ($uni == ord '"') {
240	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
241	$self->{completer}->show;
242	} elsif ($uni == ord "'") {
243	$self->{completer}->set_prefix ("");
244	$self->{completer}->show;
245	} elsif (exists $DIR{$sym}) {
246	if ($mod & CFPlus::KMOD_SHIFT) {	326	if ($mod & DC::KMOD_SHIFT) {
247	$self->{shft}++;	327	$self->{shft}++;
248	if ($DIR{$sym}[0] != $self->{fire_dir}) {	328	if ($dir->[0] != $self->{fire_dir}) {
249	$::CONN->user_send ("fire $DIR{$sym}[0]");	329	$::CONN->user_send ("fire $dir->[0]");
250	}	330	}
251	$self->{fire_dir} = $DIR{$sym}[0];	331	$self->{fire_dir} = $dir->[0];
252	} elsif ($mod & CFPlus::KMOD_CTRL) {	332	} elsif ($mod & DC::KMOD_CTRL) {
253	$self->{ctrl}++;	333	$self->{ctrl}++;
254	$::CONN->user_send ("run $DIR{$sym}[0]");	334	$::CONN->user_send ("run $dir->[0]");
255	} else {	335	} else {
256	$::CONN->user_send ("$DIR{$sym}[1]");	336	$::CONN->user_send ("$dir->[1]");
257	}	337	}
258	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	338
259	$self->{completer}->inject_key_down ($ev);
260	$self->{completer}->show;
261	} else {
262	return 0;	339	return 1;
263	}
264
265	1	340	}
		341
		342	0
266	}	343	}
267		344
268	sub invoke_key_up {	345	sub invoke_key_up {
269	my ($self, $ev) = @_;	346	my ($self, $ev) = @_;
270		347
271	my $res = 0;	348	my $res = 0;
272	my $mod = $ev->{mod};	349	my $mod = $ev->{mod};
273	my $sym = $ev->{sym};	350	my $sym = $ev->{sym};
274		351
275	if ($::CFG->{shift_fire_stop}) {	352	if ($::CFG->{shift_fire_stop}) {
276	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {	353	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
277	$::CONN->user_send ("fire_stop");	354	$::CONN->user_send ("fire_stop");
278	delete $self->{fire_dir};	355	delete $self->{fire_dir};
279	$res = 1;	356	$res = 1;
280	}	357	}
281	} else {	358	} else {
282	if (exists $DIR{$sym} && delete $self->{shft}) {	359	if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
283	$::CONN->user_send ("fire_stop");	360	$::CONN->user_send ("fire_stop");
284	delete $self->{fire_dir};	361	delete $self->{fire_dir};
285	$res = 1;	362	$res = 1;
286	} 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?
287	$::CONN->user_send ("fire_stop");	365	$::CONN->user_send ("fire_stop");
288	delete $self->{fire_dir};	366	delete $self->{fire_dir};
289	$res = 1;	367	$res = 1;
290	}	368	}
291	}	369	}
292		370
293	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {	371	if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
294	$::CONN->user_send ("run_stop");	372	$::CONN->user_send ("run_stop");
295	$res = 1;	373	$res = 1;
296	}	374	}
297		375
298	$res	376	$res
299	}	377	}
300		378
		379	sub invoke_visibility_change {
		380	my ($self) = @_;
		381
		382	$self->refresh_hook;
		383
		384	0
		385	}
		386
301	sub set_magicmap {	387	sub set_magicmap {
302	my ($self, $w, $h, $x, $y, $data) = @_;	388	my ($self, $w, $h, $x, $y, $data) = @_;
303		389
304	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	390	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
305	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	391	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
306		392
307	$self->{magicmap} = [$x, $y, $w, $h, $data];	393	$self->{magicmap} = [$x, $y, $w, $h, $data];
308		394
309	$self->update;	395	$self->update;
310	}	396	}
311		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
312	sub draw {	473	sub draw {
313	my ($self) = @_;	474	my ($self) = @_;
314		475
315	return unless $::MAP;	476	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
316		477
		478	return unless $self->{list};
		479
317	my $focused = $CFPlus::UI::FOCUS == $self	480	my $focused = $DC::UI::FOCUS == $self
318	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};	481	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
319		482
320	return	483	return
321	unless $focused \|\| !$::FAST;	484	unless $focused \|\| !$::FAST;
322		485
323	if (delete $self->{need_update}) {
324	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
325
326	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
327	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
328
329	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
330	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
331
332	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
333	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
334
335	if ($::CFG->{fow_enable}) {
336	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
337
338	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
339	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
340	glConvolutionFilter2D (
341	GL_CONVOLUTION_2D,
342	GL_ALPHA,
343	3, 3,
344	GL_ALPHA, GL_FLOAT,
345	(pack "f*", @{ $self->{smooth_matrix} }),
346	);
347	glEnable GL_CONVOLUTION_2D;
348	}
349
350	$self->{fow_texture} = new CFPlus::Texture
351	w => $w,
352	h => $h,
353	data => $data,
354	internalformat => GL_ALPHA,
355	format => GL_ALPHA;
356
357	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
358	} else {
359	delete $self->{fow_texture};
360	}
361
362	glNewList $self->{list};
363
364	glPushMatrix;
365	glTranslate $sx0, $sy0;
366	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
367
368	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
369
370	glScale 32, 32;
371
372	if (my $tex = $self->{fow_texture}) {
373	glEnable GL_TEXTURE_2D;
374	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
375
376	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
377	$self->{fow_texture}->draw_quad_alpha (0, 0);
378
379	glDisable GL_TEXTURE_2D;
380	}
381
382	if ($self->{magicmap}) {
383	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
384
385	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
386	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
387
388	glTranslate - $x - 1, - $y - 1;
389	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
390	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
391	}
392
393	glPopMatrix;
394	glEndList;
395	}
396
397	glCallList $self->{list};	486	glCallList $self->{list};
398		487
399	# TNT2 emulates logops in software (or worse :)	488	# TNT2 emulates logops in software (or worse :)
400	unless ($focused) {	489	unless ($focused) {
401	glColor 0.4, 0.2, 0.2, 0.6;	490	glColor_premultiply 0, 0, 1, 0.25;
402	glEnable GL_BLEND;	491	glEnable GL_BLEND;
403	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	492	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
404	glBegin GL_QUADS;	493	glBegin GL_QUADS;
405	glVertex 0, 0;	494	glVertex 0, 0;
406	glVertex 0, $::HEIGHT;	495	glVertex 0, $::HEIGHT;
407	glVertex $::WIDTH, $::HEIGHT;	496	glVertex $::WIDTH, $::HEIGHT;
408	glVertex $::WIDTH, 0;	497	glVertex $::WIDTH, 0;
…		…
417	glDeleteList $self->{list};	506	glDeleteList $self->{list};
418		507
419	$self->SUPER::DESTROY;	508	$self->SUPER::DESTROY;
420	}	509	}
421		510
422	package CFPlus::MapWidget::MapMap;	511	package DC::MapWidget::MapMap;
423		512
		513	use strict;
		514	use utf8;
		515
424	our @ISA = CFPlus::UI::Base::;	516	our @ISA = DC::UI::Base::;
425		517
426	use Time::HiRes qw(time);	518	use Time::HiRes qw(time);
427	use CFPlus::OpenGL;	519	use DC::OpenGL;
428		520
429	sub size_request {	521	sub size_request {
430	($::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
431	}	568	}
432		569
433	sub invoke_size_allocate {	570	sub invoke_size_allocate {
434	my ($self, $w, $h) = @_;	571	my ($self, $w, $h) = @_;
435		572
…		…
446	}	583	}
447		584
448	sub _draw {	585	sub _draw {
449	my ($self) = @_;	586	my ($self) = @_;
450		587
451	$::MAP or return;	588	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
452		589
453	my ($w, $h) = @$self{qw(w h)};	590	$self->{texture} or return;
454
455	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
456	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
457
458	my $sx = int $::CFG->{map_shift_x} / 32;
459	my $sy = int $::CFG->{map_shift_y} / 32;
460
461	my $ox = 0.5 * ($w - $sw);
462	my $oy = 0.5 * ($h - $sh);
463		591
464	glEnable GL_BLEND;	592	glEnable GL_BLEND;
465	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	593	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
466	glEnable GL_TEXTURE_2D;	594	glEnable GL_TEXTURE_2D;
467	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	595	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
468		596
469	if ($self->{texture_atime} < time) {
470	$self->{texture_atime} = time + 1/3;
471
472	$self->{texture} =
473	new CFPlus::Texture
474	w => $w,
475	h => $h,
476	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
477	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
478	}
479
480	$self->{texture}->draw_quad (0, 0);	597	$self->{texture}->draw_quad (0, 0);
481		598
482	glDisable GL_TEXTURE_2D;	599	glDisable GL_TEXTURE_2D;
483		600
484	glTranslate 0.375, 0.375;	601	glTranslate 0.375, 0.375;
485
486	#TODO: map scale is completely borked
487
488	my $x0 = int $ox - $sx + 0.5;
489	my $y0 = int $oy - $sy + 0.5;
490		602
491	glColor 1, 1, 0, 1;	603	glColor 1, 1, 0, 1;
492	glBegin GL_LINE_LOOP;	604	glBegin GL_LINE_LOOP;
493	glVertex $x0 , $y0 ;	605	glVertex $self->{x0} , $self->{y0} ;
494	glVertex $x0 , $y0 + $sh;	606	glVertex $self->{x0} , $self->{y0} + $self->{sh};
495	glVertex $x0 + $sw, $y0 + $sh;	607	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
496	glVertex $x0 + $sw, $y0 ;	608	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
497	glEnd;	609	glEnd;
498		610
499	glDisable GL_BLEND;	611	glDisable GL_BLEND;
500	}	612	}
501		613
502	package CFPlus::MapWidget::Command;	614	package DC::MapWidget::Command;
503		615
504	use strict;	616	use strict;
505		617
506	use CFPlus::OpenGL;	618	use DC::OpenGL;
507		619
508	our @ISA = CFPlus::UI::Frame::;	620	our @ISA = DC::UI::Frame::;
509		621
510	sub new {	622	sub new {
511	my $class = shift;	623	my $class = shift;
512		624
513	my $self = $class->SUPER::new (	625	my $self = $class->SUPER::new (
514	bg => [0, 0, 0, 0.8],	626	bg => [0, 0, 0, 0.8],
515	@_,	627	@_,
516	);	628	);
517		629
518	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	630	$self->add ($self->{vbox} = new DC::UI::VBox);
519		631
520	$self->{label} = [	632	$self->{label} = [
521	map	633	map
522	CFPlus::UI::Label->new (	634	DC::UI::Label->new (
		635	align => 0,
523	can_hover => 1,	636	can_hover => 1,
524	can_events => 1,	637	can_events => 1,
525	tooltip_width => 0.33,	638	tooltip_width => 0.33,
526	fontsize => $_,	639	fontsize => $_,
527	), (0.8) x 16	640	), (0.8) x 16
528	];	641	];
529		642
530	$self->{entry} = new CFPlus::UI::Entry	643	$self->{entry} = new DC::UI::Entry
531	on_changed => sub {	644	on_changed => sub {
532	$self->update_labels;	645	$self->update_labels;
533	0	646	0
534	},	647	},
535	on_button_down => sub {	648	on_button_down => sub {
536	my ($entry, $ev, $x, $y) = @_;	649	my ($entry, $ev, $x, $y) = @_;
537		650
538	if ($ev->{button} == 3) {	651	if ($ev->{button} == 3) {
539	(new CFPlus::UI::Menu	652	(new DC::UI::Menu
540	items => [	653	items => [
541	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"	654	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
542	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	655	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
543	],	656	],
544	)->popup ($ev);	657	)->popup ($ev);
545	return 1;	658	return 1;
546	}	659	}
547	0	660	0
…		…
562	$self->hide;	675	$self->hide;
563	}	676	}
564	} elsif ($ev->{sym} == 27) {	677	} elsif ($ev->{sym} == 27) {
565	$self->{hist_ptr} = 0;	678	$self->{hist_ptr} = 0;
566	$self->hide;	679	$self->hide;
567	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {	680	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
568	if ($self->{hist_ptr} > 1) {	681	if ($self->{hist_ptr} > 1) {
569	$self->{hist_ptr}--;	682	$self->{hist_ptr}--;
570	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	683	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
571	} elsif ($self->{hist_ptr} > 0) {	684	} elsif ($self->{hist_ptr} > 0) {
572	$self->{hist_ptr}--;	685	$self->{hist_ptr}--;
…		…
574	} else {	687	} else {
575	++$self->{select_offset}	688	++$self->{select_offset}
576	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	689	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
577	}	690	}
578	$self->update_labels;	691	$self->update_labels;
579	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {	692	} elsif ($ev->{sym} == DC::SDLK_UP) {
580	if ($self->{select_offset}) {	693	if ($self->{select_offset}) {
581	--$self->{select_offset}	694	--$self->{select_offset}
582	} else {	695	} else {
583	unless ($self->{hist_ptr}) {	696	unless ($self->{hist_ptr}) {
584	$self->{hist_saveback} = $self->{entry}->get_text;	697	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
742		855
743	sub _draw {	856	sub _draw {
744	my ($self) = @_;	857	my ($self) = @_;
745		858
746	# hack	859	# hack
747	local $CFPlus::UI::FOCUS = $self->{entry};	860	local $DC::UI::FOCUS = $self->{entry};
748		861
749	$self->SUPER::_draw;	862	$self->SUPER::_draw;
750	}	863	}
751		864
752	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.80 by root, Sun Jul 30 13:16:44 2006 UTC vs. Revision 1.128 by root, Thu Apr 17 20:13:17 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.80 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.128 by root, Thu Apr 17 20:13:17 2008 UTC