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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs.
Revision 1.138 by root, Sun Jul 20 04:17:02 2008 UTC

…		…
1	package CFClient::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 DC;
8	use CFClient::OpenGL;	9	use DC::OpenGL;
		10	use DC::UI;
		11	use DC::Macro;
9		12
10	our @ISA = CFClient::UI::Base::;	13	our @ISA = DC::UI::Base::;
11		14
12	my $magicmap_tex =	15	my $magicmap_tex =
13	new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",	16	new_from_file DC::Texture DC::find_rcfile "magicmap.png",
14	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;	17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
15		18
16	sub new {	19	sub new {
17	my $class = shift;	20	my $class = shift;
18		21
19	my $self = $class->SUPER::new (	22	my $self = $class->SUPER::new (
20	z => -1,	23	z => -1,
21	can_focus => 1,	24	can_focus => 1,
22	list => glGenList,	25	tilesize => 32,
23
24	smooth_matrix => [
25	0.05, 0.13, 0.05,
26	0.13, 0.30, 0.13,
27	0.05, 0.13, 0.05,
28	],
29
30	@_	26	@_
31	);	27	);
32
33	$self->{completer} = new CFClient::MapWidget::Command::
34	command => $self->{command},
35	can_focus => 1,
36	tooltip => "<b>The Command Completer</b>\n\n"
37	. "This is your central interface to send text commands to the server. "
38	. "To enter a verbatim command to send to the server, just type the command, "
39	. "followed by a space, and press return. "
40	. "Typing the initial letters of words (or just any letters) displays guesses "
41	. "for commands you might want to use.\n"
42	. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
43	. "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
44	;
45		28
46	$self	29	$self
47	}	30	}
48		31
49	sub add_command {	32	sub add_command {
53		36
54	$tooltip =~ s/^\s+//;	37	$tooltip =~ s/^\s+//;
55	$tooltip = "<big>$data</big>\n\n$tooltip";	38	$tooltip = "<big>$data</big>\n\n$tooltip";
56	$tooltip =~ s/\s+$//;	39	$tooltip =~ s/\s+$//;
57		40
58	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	41	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
59	}	42	}
60		43
61	sub clr_commands {	44	sub clr_commands {
62	my ($self) = @_;	45	my ($self) = @_;
63		46
64	%{$self->{completer}{command}} = ();	47	%{$::COMPLETER->{command}} = ();
		48
		49	$::COMPLETER->hide
		50	if $::COMPLETER;
		51	}
		52
		53	sub server_login {
		54	my ($server) = @_;
		55
		56	::stop_game ();
		57	local $::PROFILE->{host} = $server;
		58	::start_game ();
		59	}
		60
		61	sub editor_invoke {
		62	my $editsup = $::CONN && $::CONN->{editor_support}
		63	or return;
		64
		65	DC::background {
		66	print "preparing editor startup...\n";
		67
		68	my $server = $editsup->{gameserver} \|\| "default";
		69	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		70
		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;
		73
		74	print "map directory is $mapdir\n";
		75	print "lib directory is $libdir\n";
		76
		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";
		84	}
		85
		86	if (1) { # upload a map
		87	my $mapname = $::CONN->{map_info}[0];
		88
		89	my $mappath = "$mapdir/$mapname";
		90
		91	-e $mappath and die "$mappath already exists\n";
		92
		93	print "getting map revision for $mapname...\n";
		94
		95	# try to get the most recent head revision, what a hack,
		96	# this should have been returned while downloading sigh
		97	my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
		98
		99	if ($log =~ /\?rev=(\d+\.\d+)"/) {
		100	my $rev = $1;
		101
		102	print "downloading revision $rev...\n";
		103
		104	my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
		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#
		130
		131	# now upload it
		132	# require HTTP::Request::Common;
		133	#
		134	# my $res = $ua->post (
		135	# $ENV{CFPLUS_UPLOAD},
		136	# Content_Type => 'multipart/form-data',
		137	# Content => [
		138	# path => $mapname,
		139	# mapdir => $ENV{CROSSFIRE_MAPDIR},
		140	# map => $map,
		141	# revision => $rev,
		142	# cf_login => $ENV{CFPLUS_LOGIN},
		143	# cf_password => $ENV{CFPLUS_PASSWORD},
		144	# comment => "",
		145	# ]
		146	# );
		147	#
		148	# if ($res->is_error) {
		149	# # fatal condition
		150	# warn $res->status_line;
		151	# } else {
		152	# # script replies are marked as {{..}}
		153	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
		154	# warn map "$_\n", @msgs;
		155	# }
		156	} else {
		157	die "viewvc parse error, unable to detect revision\n";
		158	}
		159	}
		160	}
65	}	161	}
66		162
67	sub invoke_button_down {	163	sub invoke_button_down {
68	my ($self, $ev, $x, $y) = @_;	164	my ($self, $ev, $x, $y) = @_;
69		165
70	return unless $::CONN;
71
72	$self->grab_focus;
73
74	if ($ev->{button} == 1) {	166	if ($ev->{button} == 1) {
		167	$self->grab_focus;
		168	return unless $::CONN;
		169
75	my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	170	my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
76	my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	171	my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
77		172
78	$x -= int 0.5 * $self->{sw};	173	$x -= DC::floor $::MAP->w * 0.5;
79	$y -= int 0.5 * $self->{sh};	174	$y -= DC::floor $::MAP->h * 0.5;
80		175
		176	if ($::CONN) {
81	$::CONN->lookat ($x, $y)	177	$::CONN->lookat ($x, $y)
82	if $::CONN;	178	}
83		179
84	} elsif ($ev->{button} == 2) {	180	} elsif ($ev->{button} == 2) {
		181	$self->grab_focus;
		182	return unless $::CONN;
		183
85	my ($ox, $oy) = ($ev->{x}, $ev->{y});	184	my ($ox, $oy) = ($ev->{x}, $ev->{y});
86	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	185	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87		186
88	$self->{motion} = sub {	187	$self->{motion} = sub {
89	my ($ev, $x, $y) = @_;	188	my ($ev, $x, $y) = @_;
…		…
93	$::CFG->{map_shift_x} = $bw + $x - $ox;	192	$::CFG->{map_shift_x} = $bw + $x - $ox;
94	$::CFG->{map_shift_y} = $bh + $y - $oy;	193	$::CFG->{map_shift_y} = $bh + $y - $oy;
95		194
96	$self->update;	195	$self->update;
97	};	196	};
		197	} elsif ($ev->{button} == 3) {
		198	my @items = (
		199	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
		200	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
		201	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
		202	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
		203	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
		204	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
		205	# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
		206	[
		207	$::PICKUP_ENABLE->{state}
		208	? "Disable automatic pickup"
		209	: "Enable automatic pickup",
		210	sub { $::PICKUP_ENABLE->toggle }
		211	],
		212	);
		213
		214	if ($::CONN && $::CONN->{editor_support}) {
		215	# push @items, [
		216	# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
		217	# \&editor_invoke,
		218	# ];
		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, [
		227	"Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
		228	sub { server_login $server },
		229	];
		230	}
		231	}
		232
		233	push @items,
		234	["Quit",
		235	sub {
		236	if ($::CONN) {
		237	&::open_quit_dialog;
		238	} else {
		239	exit;
		240	}
		241	}
		242	],
		243	;
		244
		245	(new DC::UI::Menu
		246	items => \@items,
		247	)->popup ($ev);
98	}	248	}
99		249
100	1	250	1
101	}	251	}
102		252
…		…
119		269
120	1	270	1
121	}	271	}
122		272
123	sub size_request {	273	sub size_request {
		274	my ($self) = @_;
		275
124	(	276	(
125	32 * CFClient::ceil $::WIDTH / 32,	277	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
126	32 * CFClient::ceil $::HEIGHT / 32,	278	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
127	)	279	)
128	}	280	}
129		281
130	sub update {	282	sub update {
131	my ($self) = @_;	283	my ($self) = @_;
…		…
133	$self->{need_update} = 1;	285	$self->{need_update} = 1;
134	$self->SUPER::update;	286	$self->SUPER::update;
135	}	287	}
136		288
137	my %DIR = (	289	my %DIR = (
		290	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
138	CFClient::SDLK_KP8, [1, "north"],	291	( "," . DC::SDLK_KP8 ), [1, "north"],
139	CFClient::SDLK_KP9, [2, "northeast"],	292	( "," . DC::SDLK_KP9 ), [2, "northeast"],
140	CFClient::SDLK_KP6, [3, "east"],	293	( "," . DC::SDLK_KP6 ), [3, "east"],
141	CFClient::SDLK_KP3, [4, "southeast"],	294	( "," . DC::SDLK_KP3 ), [4, "southeast"],
142	CFClient::SDLK_KP2, [5, "south"],	295	( "," . DC::SDLK_KP2 ), [5, "south"],
143	CFClient::SDLK_KP1, [6, "southwest"],	296	( "," . DC::SDLK_KP1 ), [6, "southwest"],
144	CFClient::SDLK_KP4, [7, "west"],	297	( "," . DC::SDLK_KP4 ), [7, "west"],
145	CFClient::SDLK_KP7, [8, "northwest"],	298	( "," . DC::SDLK_KP7 ), [8, "northwest"],
146		299
147	CFClient::SDLK_UP, [1, "north"],	300	( "," . DC::SDLK_UP ), [1, "north"],
		301	("1," . DC::SDLK_UP ), [2, "northeast"],
148	CFClient::SDLK_RIGHT, [3, "east"],	302	( "," . DC::SDLK_RIGHT), [3, "east"],
		303	("1," . DC::SDLK_RIGHT), [4, "southeast"],
149	CFClient::SDLK_DOWN, [5, "south"],	304	( "," . DC::SDLK_DOWN ), [5, "south"],
		305	("1," . DC::SDLK_DOWN ), [6, "southwest"],
150	CFClient::SDLK_LEFT, [7, "west"],	306	( "," . DC::SDLK_LEFT ), [7, "west"],
		307	("1," . DC::SDLK_LEFT ), [8, "northwest"],
151	);	308	);
152		309
153	sub invoke_key_down {	310	sub invoke_key_down {
154	my ($self, $ev) = @_;	311	my ($self, $ev) = @_;
155
156	return 0 unless $::CONN;
157		312
158	my $mod = $ev->{mod};	313	my $mod = $ev->{mod};
159	my $sym = $ev->{sym};	314	my $sym = $ev->{sym};
160	my $uni = $ev->{unicode};	315	my $uni = $ev->{unicode};
161		316
162	if ($sym == CFClient::SDLK_KP5) {	317	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_SHIFT;
163	$::CONN->user_send ("stay fire");	318
164	} elsif ($uni == ord ",") {	319	# ignore repeated keypresses
165	$::CONN->user_send ("take");	320	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
166	} elsif ($uni == ord " ") {	321	$self->{last_mod} = $mod;
167	$::CONN->user_send ("apply");	322	$self->{last_sym} = $sym;
168	} elsif ($uni == ord ".") {	323
169	$::CONN->user_send ($self->{completer}{last_command})	324	if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
170	if exists $self->{completer}{last_command};
171	} elsif ($uni == ord "\t") {
172	$::PL_WINDOW->toggle_visibility;
173	$::PL_NOTEBOOK->set_current_page ("Inventory");
174	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
175	$::CONN->user_send ("rotateshoottype +");
176	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
177	$::CONN->user_send ("rotateshoottype -");
178	} elsif ($uni == ord '"') {
179	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
180	$self->{completer}->show;
181	} elsif ($uni == ord "'") {
182	$self->{completer}->set_prefix ("");
183	$self->{completer}->show;
184	} elsif (exists $DIR{$sym}) {
185	if ($mod & CFClient::KMOD_SHIFT) {	325	if ($mod & DC::KMOD_SHIFT) {
186	$self->{shft}++;	326	$self->{shft}++;
187	if ($DIR{$sym}[0] != $self->{fire_dir}) {	327	if ($dir->[0] != $self->{fire_dir}) {
188	$::CONN->user_send ("fire $DIR{$sym}[0]");	328	$::CONN->user_send ("fire $dir->[0]");
189	}	329	}
190	$self->{fire_dir} = $DIR{$sym}[0];	330	$self->{fire_dir} = $dir->[0];
191	} elsif ($mod & CFClient::KMOD_CTRL) {	331	} elsif ($mod & DC::KMOD_CTRL) {
192	$self->{ctrl}++;	332	$self->{ctrl}++;
193	$::CONN->user_send ("run $DIR{$sym}[0]");	333	$::CONN->user_send ("run $dir->[0]");
194	} else {	334	} else {
195	$::CONN->user_send ("$DIR{$sym}[1]");	335	$::CONN->user_send ("$dir->[1]");
196	}	336	}
197	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {	337
198	$::BIND_EDITOR->set_binding (undef, undef, [],
199	sub {
200	my ($mod, $sym, $cmds) = @_;
201	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
202	});
203	$::BIND_EDITOR->start;
204	$::BIND_EDITOR->show;
205	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
206	$::BIND_EDITOR->stop;
207	$::BIND_EDITOR->ask_for_bind_and_commit;
208	$::BIND_EDITOR->hide;
209	} elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
210	$::CONN->user_send ($_) for @$bind_cmd;
211	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
212	$self->{completer}->invoke_key_down ($ev);
213	$self->{completer}->show;
214	} else {
215	return 0;	338	return 1;
216	}
217
218	1	339	}
		340
		341	0
219	}	342	}
220		343
221	sub invoke_key_up {	344	sub invoke_key_up {
222	my ($self, $ev) = @_;	345	my ($self, $ev) = @_;
223		346
224	my $res = 0;	347	my $res = 0;
225	my $mod = $ev->{mod};	348	my $mod = $ev->{mod};
226	my $sym = $ev->{sym};	349	my $sym = $ev->{sym};
227		350
		351	delete $self->{last_mod};
		352	delete $self->{last_sym};
		353
228	if ($::CFG->{shift_fire_stop}) {	354	if ($::CFG->{shift_fire_stop}) {
229	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	355	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
230	$::CONN->user_send ("fire_stop");	356	$::CONN->user_send ("fire_stop");
231	delete $self->{fire_dir};	357	delete $self->{fire_dir};
232	$res = 1;	358	$res = 1;
233	}	359	}
234	} else {	360	} else {
235	if (exists $DIR{$sym} && delete $self->{shft}) {	361	if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
236	$::CONN->user_send ("fire_stop");	362	$::CONN->user_send ("fire_stop");
237	delete $self->{fire_dir};	363	delete $self->{fire_dir};
238	$res = 1;	364	$res = 1;
239	} elsif (($sym == CFClient::SDLK_LSHIFT \|\| $sym == CFClient::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?
240	$::CONN->user_send ("fire_stop");	367	$::CONN->user_send ("fire_stop");
241	delete $self->{fire_dir};	368	delete $self->{fire_dir};
242	$res = 1;	369	$res = 1;
243	}	370	}
244	}	371	}
245		372
246	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	373	if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
247	$::CONN->user_send ("run_stop");	374	$::CONN->user_send ("run_stop");
248	$res = 1;	375	$res = 1;
249	}	376	}
250		377
251	$res	378	$res
252	}	379	}
253		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
254	sub set_magicmap {	406	sub set_magicmap {
255	my ($self, $w, $h, $x, $y, $data) = @_;	407	my ($self, $w, $h, $x, $y, $data) = @_;
256		408
257	$x -= $::MAP->ox + int 0.5 * $::MAP->w;	409	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
258	$y -= $::MAP->oy + int 0.5 * $::MAP->h;	410	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
259		411
260	$self->{magicmap} = [$x, $y, $w, $h, $data];	412	$self->{magicmap} = [$x, $y, $w, $h, $data];
261		413
262	$self->update;	414	$self->update;
263	}	415	}
264		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} = 1 + DC::ceil $self->{w} / $tilesize;
		468	my $sh = $self->{sh} = 1 + 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
265	sub draw {	549	sub draw {
266	my ($self) = @_;	550	my ($self) = @_;
267		551
268	return unless $::MAP;	552	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
269		553
		554	return unless $self->{list};
		555
270	my $focused = $CFClient::UI::FOCUS == $self	556	my $focused = $DC::UI::FOCUS == $self
271	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};	557	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
272		558
273	return	559	return
274	unless $focused \|\| !$::FAST;	560	unless $focused \|\| !$::FAST;
275		561
276	if (delete $self->{need_update}) {
277	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
278
279	my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
280	my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
281
282	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
283	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
284
285	my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
286	my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
287
288	if ($::CFG->{fow_enable}) {
289	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
290
291	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
292	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
293	glConvolutionFilter2D (
294	GL_CONVOLUTION_2D,
295	GL_ALPHA,
296	3, 3,
297	GL_ALPHA, GL_FLOAT,
298	(pack "f*", @{ $self->{smooth_matrix} }),
299	);
300	glEnable GL_CONVOLUTION_2D;
301	}
302
303	$self->{fow_texture} = new CFClient::Texture
304	w => $w,
305	h => $h,
306	data => $data,
307	internalformat => GL_ALPHA,
308	format => GL_ALPHA;
309
310	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
311	} else {
312	delete $self->{fow_texture};
313	}
314
315	glNewList $self->{list};
316
317	glPushMatrix;
318	glTranslate $sx0, $sy0;
319	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
320
321	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
322
323	glScale 32, 32;
324
325	if (my $tex = $self->{fow_texture}) {
326	glEnable GL_TEXTURE_2D;
327	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
328
329	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
330	$self->{fow_texture}->draw_quad_alpha (0, 0);
331
332	glDisable GL_TEXTURE_2D;
333	}
334
335	if ($self->{magicmap}) {
336	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
337
338	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
339	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
340
341	glTranslate - $x - 1, - $y - 1;
342	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
343	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
344	}
345
346	glPopMatrix;
347	glEndList;
348	}
349
350	glCallList $self->{list};	562	glCallList $self->{list};
351		563
352	# TNT2 emulates logops in software (or worse :)	564	# TNT2 emulates logops in software (or worse :)
353	unless ($focused) {	565	unless ($focused) {
354	glColor 0.4, 0.2, 0.2, 0.6;	566	glColor_premultiply 0, 0, 1, 0.25;
355	glEnable GL_BLEND;	567	glEnable GL_BLEND;
356	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	568	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
357	glBegin GL_QUADS;	569	glBegin GL_QUADS;
358	glVertex 0, 0;	570	glVertex 0, 0;
359	glVertex 0, $::HEIGHT;	571	glVertex 0, $::HEIGHT;
360	glVertex $::WIDTH, $::HEIGHT;	572	glVertex $::WIDTH, $::HEIGHT;
361	glVertex $::WIDTH, 0;	573	glVertex $::WIDTH, 0;
…		…
370	glDeleteList $self->{list};	582	glDeleteList $self->{list};
371		583
372	$self->SUPER::DESTROY;	584	$self->SUPER::DESTROY;
373	}	585	}
374		586
375	package CFClient::MapWidget::MapMap;	587	package DC::MapWidget::MapMap;
376		588
		589	use strict;
		590	use utf8;
		591
377	our @ISA = CFClient::UI::Base::;	592	our @ISA = DC::UI::Base::;
378		593
379	use Time::HiRes qw(time);	594	use Time::HiRes qw(time);
380	use CFClient::OpenGL;	595	use DC::OpenGL;
381		596
382	sub size_request {	597	sub size_request {
383	($::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
384	}	644	}
385		645
386	sub invoke_size_allocate {	646	sub invoke_size_allocate {
387	my ($self, $w, $h) = @_;	647	my ($self, $w, $h) = @_;
388		648
…		…
399	}	659	}
400		660
401	sub _draw {	661	sub _draw {
402	my ($self) = @_;	662	my ($self) = @_;
403		663
404	$::MAP or return;	664	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
405		665
406	my ($w, $h) = @$self{qw(w h)};	666	$self->{texture} or return;
407
408	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
409	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
410
411	my $sx = int $::CFG->{map_shift_x} / 32;
412	my $sy = int $::CFG->{map_shift_y} / 32;
413
414	my $ox = 0.5 * ($w - $sw);
415	my $oy = 0.5 * ($h - $sh);
416		667
417	glEnable GL_BLEND;	668	glEnable GL_BLEND;
418	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	669	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
419	glEnable GL_TEXTURE_2D;	670	glEnable GL_TEXTURE_2D;
420	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
421		672
422	if ($self->{texture_atime} < time) {
423	$self->{texture_atime} = time + 1/3;
424
425	$self->{texture} =
426	new CFClient::Texture
427	w => $w,
428	h => $h,
429	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
430	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
431	}
432
433	$self->{texture}->draw_quad (0, 0);	673	$self->{texture}->draw_quad (0, 0);
434		674
435	glDisable GL_TEXTURE_2D;	675	glDisable GL_TEXTURE_2D;
436		676
437	glTranslate 0.375, 0.375;	677	glTranslate 0.375, 0.375;
438
439	#TODO: map scale is completely borked
440
441	my $x0 = int $ox - $sx + 0.5;
442	my $y0 = int $oy - $sy + 0.5;
443		678
444	glColor 1, 1, 0, 1;	679	glColor 1, 1, 0, 1;
445	glBegin GL_LINE_LOOP;	680	glBegin GL_LINE_LOOP;
446	glVertex $x0 , $y0 ;	681	glVertex $self->{x0} , $self->{y0} ;
447	glVertex $x0 , $y0 + $sh;	682	glVertex $self->{x0} , $self->{y0} + $self->{sh};
448	glVertex $x0 + $sw, $y0 + $sh;	683	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
449	glVertex $x0 + $sw, $y0 ;	684	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
450	glEnd;	685	glEnd;
451		686
452	glDisable GL_BLEND;	687	glDisable GL_BLEND;
453	}	688	}
454		689
455	package CFClient::MapWidget::Command;	690	package DC::MapWidget::Command;
456		691
457	use strict;	692	use strict;
458		693
459	use CFClient::OpenGL;	694	use DC::OpenGL;
460		695
461	our @ISA = CFClient::UI::Frame::;	696	our @ISA = DC::UI::Frame::;
462		697
463	sub new {	698	sub new {
464	my $class = shift;	699	my $class = shift;
465		700
466	my $self = $class->SUPER::new (	701	my $self = $class->SUPER::new (
467	bg => [0, 0, 0, 0.8],	702	bg => [0, 0, 0, 0.8],
468	@_,	703	@_,
469	);	704	);
470		705
471	$self->add ($self->{vbox} = new CFClient::UI::VBox);	706	$self->add ($self->{vbox} = new DC::UI::VBox);
472		707
473	$self->{label} = [	708	$self->{label} = [
474	map	709	map
475	CFClient::UI::Label->new (	710	DC::UI::Label->new (
		711	align => 0,
476	can_hover => 1,	712	can_hover => 1,
477	can_events => 1,	713	can_events => 1,
478	tooltip_width => 0.33,	714	tooltip_width => 0.33,
479	fontsize => $_,	715	fontsize => $_,
480	), (0.8) x 16	716	), (0.8) x 16
481	];	717	];
482		718
483	$self->{entry} = new CFClient::UI::Entry	719	$self->{entry} = new DC::UI::Entry
484	on_changed => sub {	720	on_changed => sub {
485	$self->update_labels;	721	$self->update_labels;
486	0	722	0
487	},	723	},
488	on_button_down => sub {	724	on_button_down => sub {
489	my ($entry, $ev, $x, $y) = @_;	725	my ($entry, $ev, $x, $y) = @_;
490		726
491	if ($ev->{button} == 3) {	727	if ($ev->{button} == 3) {
492	(new CFClient::UI::Menu	728	(new DC::UI::Menu
493	items => [	729	items => [
494	["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key"	730	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
495	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]	731	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
496	],	732	],
497	)->popup ($ev);	733	)->popup ($ev);
498	return 1;	734	return 1;
499	}	735	}
500	0	736	0
…		…
515	$self->hide;	751	$self->hide;
516	}	752	}
517	} elsif ($ev->{sym} == 27) {	753	} elsif ($ev->{sym} == 27) {
518	$self->{hist_ptr} = 0;	754	$self->{hist_ptr} = 0;
519	$self->hide;	755	$self->hide;
520	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {	756	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
521	if ($self->{hist_ptr} > 1) {	757	if ($self->{hist_ptr} > 1) {
522	$self->{hist_ptr}--;	758	$self->{hist_ptr}--;
523	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	759	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524	} elsif ($self->{hist_ptr} > 0) {	760	} elsif ($self->{hist_ptr} > 0) {
525	$self->{hist_ptr}--;	761	$self->{hist_ptr}--;
…		…
527	} else {	763	} else {
528	++$self->{select_offset}	764	++$self->{select_offset}
529	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	765	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
530	}	766	}
531	$self->update_labels;	767	$self->update_labels;
532	} elsif ($ev->{sym} == CFClient::SDLK_UP) {	768	} elsif ($ev->{sym} == DC::SDLK_UP) {
533	if ($self->{select_offset}) {	769	if ($self->{select_offset}) {
534	--$self->{select_offset}	770	--$self->{select_offset}
535	} else {	771	} else {
536	unless ($self->{hist_ptr}) {	772	unless ($self->{hist_ptr}) {
537	$self->{hist_saveback} = $self->{entry}->get_text;	773	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
582	}	818	}
583		819
584	sub hide {	820	sub hide {
585	my ($self) = @_;	821	my ($self) = @_;
586		822
		823	$self->{hist_ptr} = 0;
		824
587	$self->SUPER::hide;	825	$self->SUPER::hide;
588	$self->{entry}->set_text ("");	826	$self->{entry}->set_text ("");
589	}	827	}
590		828
591	sub invoke_key_down {	829	sub inject_key_down {
592	my ($self, $ev) = @_;	830	my ($self, $ev) = @_;
593		831
		832	$self->{entry}->grab_focus;
594	$self->{entry}->emit (key_down => $ev)	833	$self->{entry}->emit (key_down => $ev);
595	}	834	}
596		835
597	sub update_labels {	836	sub update_labels {
598	my ($self) = @_;	837	my ($self) = @_;
599		838
…		…
692		931
693	sub _draw {	932	sub _draw {
694	my ($self) = @_;	933	my ($self) = @_;
695		934
696	# hack	935	# hack
697	local $CFClient::UI::FOCUS = $self->{entry};	936	local $DC::UI::FOCUS = $self->{entry};
698		937
699	$self->SUPER::_draw;	938	$self->SUPER::_draw;
700	}	939	}
701		940
702	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.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs. Revision 1.138 by root, Sun Jul 20 04:17:02 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs.
Revision 1.138 by root, Sun Jul 20 04:17:02 2008 UTC