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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.60 by root, Thu Jun 15 08:29:18 2006 UTC vs.
Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC

…		…
1	package CFClient::MapWidget;	1	package CFPlus::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 CFClient::OpenGL;	9	use CFPlus::OpenGL;
		10	use CFPlus::UI;
		11	use CFPlus::Macro;
9		12
10	our @ISA = CFClient::UI::Base::;	13	our @ISA = CFPlus::UI::Base::;
		14
		15	my $magicmap_tex =
		16	new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
		17	mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11		18
12	sub new {	19	sub new {
13	my $class = shift;	20	my $class = shift;
14		21
15	my $self = $class->SUPER::new (	22	my $self = $class->SUPER::new (
16	z => -1,	23	z => -1,
17	can_focus => 1,	24	can_focus => 1,
18	list => glGenList,	25	list => glGenList,
		26	tilesize => 32,
19		27
20	smooth_matrix => [	28	smooth_matrix => [
21	0.05, 0.13, 0.05,	29	0.30, 0.50, 0.30,
22	0.13, 0.30, 0.13,
23	0.05, 0.13, 0.05,	30	0.50, 0.50, 0.50,
		31	0.30, 0.50, 0.30,
24	],	32	],
25		33
26	@_	34	@_
27	);	35	);
28		36
29	$self->{completer} = new CFClient::MapWidget::Command::	37	$self->{completer} = new CFPlus::MapWidget::Command::
30	command => $self->{command},	38	command => $self->{command},
31	can_focus => 1,	39	tooltip => "#completer_help",
32	tooltip => "<b>The Command Completer</b>\n\n"
33	. "This is your central interface to send text commands to the server. "
34	. "To enter a verbatim command to send to the server, just type the command, "
35	. "followed by a space, and press return. "
36	. "Typing the initial letters of words (or just any letters) displays guesses "
37	. "for commands you might want to use.\n"
38	. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
39	. "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
40	;	40	;
41		41
42	$self	42	$self
		43	}
		44
		45	sub set_tilesize {
		46	my ($self, $tilesize) = @_;
		47
		48	$self->{tilesize} = $tilesize;
43	}	49	}
44		50
45	sub add_command {	51	sub add_command {
46	my ($self, $command, $tooltip, $widget, $cb) = @_;	52	my ($self, $command, $tooltip, $widget, $cb) = @_;
47		53
56		62
57	sub clr_commands {	63	sub clr_commands {
58	my ($self) = @_;	64	my ($self) = @_;
59		65
60	%{$self->{completer}{command}} = ();	66	%{$self->{completer}{command}} = ();
61	}
62		67
		68	$self->{completer}->hide
		69	if $self->{completer};
		70	}
		71
		72	sub server_login {
		73	my ($server) = @_;
		74
		75	::stop_game ();
		76	local $::PROFILE->{host} = $server;
		77	::start_game ();
		78	}
		79
		80	sub editor_invoke {
		81	my $editsup = $::CONN && $::CONN->{editor_support}
		82	or return;
		83
		84	CFPlus::background {
		85	print "preparing editor startup...\n";
		86
		87	my $server = $editsup->{gameserver} \|\| "default";
		88	$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		89
		90	local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
		91	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
		92
		93	print "map directory is $mapdir\n";
		94	print "lib directory is $libdir\n";
		95
		96	my $ua = CFPlus::lwp_useragent;
		97
		98	for my $file (qw(archetypes crossfire.0)) {
		99	my $url = "$editsup->{lib_root}$file";
		100	print "mirroring $url...\n";
		101	CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
		102	printf "%s size %d octets\n", $file, -s "$libdir/$file";
		103	}
		104
		105	if (1) { # upload a map
		106	my $mapname = $::CONN->{map_info}[0];
		107
		108	my $mappath = "$mapdir/$mapname";
		109
		110	-e $mappath and die "$mappath already exists\n";
		111
		112	print "getting map revision for $mapname...\n";
		113
		114	# try to get the most recent head revision, what a hack,
		115	# this should have been returned while downloading sigh
		116	my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
		117
		118	if ($log =~ /\?rev=(\d+\.\d+)"/) {
		119	my $rev = $1;
		120
		121	print "downloading revision $rev...\n";
		122
		123	my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
		124
		125	my $meta = {
		126	%$editsup,
		127	path => $mapname,
		128	revision => $rev,
		129	cf_login => $::PROFILE->{user},
		130	};
		131
		132	require File::Basename;
		133	require File::Path;
		134
		135	File::Path::mkpath (File::Basename::dirname ($mappath));
		136	open my $fh, ">:raw:perlio", "$mappath.meta"
		137	or die "$mappath.meta: $!\n";
		138	print $fh CFPlus::to_json $meta;
		139	close $fh;
		140	open my $fh, ">:raw:perlio:utf8", $mappath
		141	or die "$mappath: $!\n";
		142	print $fh $map;
		143	close $fh;
		144
		145	print "saved as $mappath\n";
		146
		147	print "invoking editor...\n";
		148	exec "/root/s2/gce $mappath";#d#
		149
		150	# now upload it
		151	# require HTTP::Request::Common;
		152	#
		153	# my $res = $ua->post (
		154	# $ENV{CFPLUS_UPLOAD},
		155	# Content_Type => 'multipart/form-data',
		156	# Content => [
		157	# path => $mapname,
		158	# mapdir => $ENV{CROSSFIRE_MAPDIR},
		159	# map => $map,
		160	# revision => $rev,
		161	# cf_login => $ENV{CFPLUS_LOGIN},
		162	# cf_password => $ENV{CFPLUS_PASSWORD},
		163	# comment => "",
		164	# ]
		165	# );
		166	#
		167	# if ($res->is_error) {
		168	# # fatal condition
		169	# warn $res->status_line;
		170	# } else {
		171	# # script replies are marked as {{..}}
		172	# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
		173	# warn map "$_\n", @msgs;
		174	# }
		175	} else {
		176	die "viewvc parse error, unable to detect revision\n";
		177	}
		178	}
		179	}
		180	}
		181
63	sub button_down {	182	sub invoke_button_down {
64	my ($self, $ev, $x, $y) = @_;	183	my ($self, $ev, $x, $y) = @_;
65		184
66	return unless $::CONN;
67
68	$self->focus_in;
69
70	if ($ev->{button} == 1) {	185	if ($ev->{button} == 1) {
		186	$self->grab_focus;
		187	return unless $::CONN;
		188
71	my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	189	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
72	my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};	190	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
73		191
74	$x -= int 0.5 * $self->{sw};	192	$x -= CFPlus::floor $::MAP->w * 0.5;
75	$y -= int 0.5 * $self->{sh};	193	$y -= CFPlus::floor $::MAP->h * 0.5;
76		194
		195	if ($::CONN) {
		196	if ($::IN_BUILD_MODE) {
		197	$::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
		198	} else {
77	$::CONN->lookat ($x, $y)	199	$::CONN->lookat ($x, $y)
78	if $::CONN;	200	}
		201	}
79		202
80	} elsif ($ev->{button} == 2) {	203	} elsif ($ev->{button} == 2) {
		204	$self->grab_focus;
		205	return unless $::CONN;
		206
81	my ($ox, $oy) = ($ev->{x}, $ev->{y});	207	my ($ox, $oy) = ($ev->{x}, $ev->{y});
82	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	208	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
83		209
84	$self->{motion} = sub {	210	$self->{motion} = sub {
85	my ($ev, $x, $y) = @_;	211	my ($ev, $x, $y) = @_;
…		…
89	$::CFG->{map_shift_x} = $bw + $x - $ox;	215	$::CFG->{map_shift_x} = $bw + $x - $ox;
90	$::CFG->{map_shift_y} = $bh + $y - $oy;	216	$::CFG->{map_shift_y} = $bh + $y - $oy;
91		217
92	$self->update;	218	$self->update;
93	};	219	};
		220	} elsif ($ev->{button} == 3) {
		221	my @items = (
		222	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
		223	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
		224	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
		225	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
		226	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
		227	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
		228	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
		229	[
		230	$::PICKUP_ENABLE->{state}
		231	? "Disable automatic pickup"
		232	: "Enable automatic pickup",
		233	sub { $::PICKUP_ENABLE->toggle }
		234	],
		235	);
		236
		237	if ($::CONN && $::CONN->{editor_support}) {
		238	push @items, [
		239	"Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
		240	\&editor_invoke,
		241	];
		242
		243	for my $type (qw(test name)) {
		244	$::CONN->{editor_support}{type} ne $type
		245	or next;
		246	my $server = $::CONN->{editor_support}{"${type}server"}
		247	or next;
		248
		249	push @items, [
		250	"Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
		251	sub { server_login $server },
		252	];
		253	}
		254	}
		255
		256	push @items,
		257	["Quit",
		258	sub {
		259	if ($::CONN) {
		260	&::open_quit_dialog;
		261	} else {
		262	exit;
		263	}
		264	}
		265	],
		266	;
		267
		268	(new CFPlus::UI::Menu
		269	items => \@items,
		270	)->popup ($ev);
94	}	271	}
95		272
96	1	273	1
97	}	274	}
98		275
99	sub button_up {	276	sub invoke_button_up {
100	my ($self, $ev, $x, $y) = @_;	277	my ($self, $ev, $x, $y) = @_;
101		278
102	delete $self->{motion};	279	delete $self->{motion};
103		280
104	1	281	1
105	}	282	}
106		283
107	sub mouse_motion {	284	sub invoke_mouse_motion {
108	my ($self, $ev, $x, $y) = @_;	285	my ($self, $ev, $x, $y) = @_;
109		286
110	if ($self->{motion}) {	287	if ($self->{motion}) {
111	$self->{motion}->($ev, $x, $y);	288	$self->{motion}->($ev, $x, $y);
112	} else {	289	} else {
…		…
115		292
116	1	293	1
117	}	294	}
118		295
119	sub size_request {	296	sub size_request {
		297	my ($self) = @_;
		298
120	(	299	(
121	1 + 32 * int $::WIDTH / 32,	300	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
122	1 + 32 * int $::HEIGHT / 32,	301	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
123	)	302	)
124	}	303	}
125		304
126	sub update {	305	sub update {
127	my ($self) = @_;	306	my ($self) = @_;
…		…
129	$self->{need_update} = 1;	308	$self->{need_update} = 1;
130	$self->SUPER::update;	309	$self->SUPER::update;
131	}	310	}
132		311
133	my %DIR = (	312	my %DIR = (
		313	CFPlus::SDLK_KP5, [0, "stay fire"],
134	CFClient::SDLK_KP8, [1, "north"],	314	CFPlus::SDLK_KP8, [1, "north"],
135	CFClient::SDLK_KP9, [2, "northeast"],	315	CFPlus::SDLK_KP9, [2, "northeast"],
136	CFClient::SDLK_KP6, [3, "east"],	316	CFPlus::SDLK_KP6, [3, "east"],
137	CFClient::SDLK_KP3, [4, "southeast"],	317	CFPlus::SDLK_KP3, [4, "southeast"],
138	CFClient::SDLK_KP2, [5, "south"],	318	CFPlus::SDLK_KP2, [5, "south"],
139	CFClient::SDLK_KP1, [6, "southwest"],	319	CFPlus::SDLK_KP1, [6, "southwest"],
140	CFClient::SDLK_KP4, [7, "west"],	320	CFPlus::SDLK_KP4, [7, "west"],
141	CFClient::SDLK_KP7, [8, "northwest"],	321	CFPlus::SDLK_KP7, [8, "northwest"],
142		322
143	CFClient::SDLK_UP, [1, "north"],	323	CFPlus::SDLK_UP, [1, "north"],
144	CFClient::SDLK_RIGHT, [3, "east"],	324	CFPlus::SDLK_RIGHT, [3, "east"],
145	CFClient::SDLK_DOWN, [5, "south"],	325	CFPlus::SDLK_DOWN, [5, "south"],
146	CFClient::SDLK_LEFT, [7, "west"],	326	CFPlus::SDLK_LEFT, [7, "west"],
147	);	327	);
148		328
149	sub key_down {	329	sub invoke_key_down {
150	my ($self, $ev) = @_;	330	my ($self, $ev) = @_;
151
152	return 0 unless $::CONN;
153		331
154	my $mod = $ev->{mod};	332	my $mod = $ev->{mod};
155	my $sym = $ev->{sym};	333	my $sym = $ev->{sym};
156	my $uni = $ev->{unicode};	334	my $uni = $ev->{unicode};
157		335
158	if ($sym == CFClient::SDLK_KP5) {	336	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
159	$::CONN->user_send ("stay fire");	337
		338	if ($sym == 9) {
		339	($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
		340	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
		341	$::HELP_WINDOW->toggle_visibility;
		342	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
		343	::toggle_player_page ($::STATS_PAGE);
		344	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
		345	::toggle_player_page ($::SKILL_PAGE);
		346	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
		347	::toggle_player_page ($::SPELL_PAGE);
		348	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
		349	::toggle_player_page ($::INVENTORY_PAGE);
		350	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
		351	$::SETUP_DIALOG->toggle_visibility;
		352	} elsif (!$::CONN) {
		353	return 0; # bindings further down need a valid connection
		354
160	} elsif ($uni == ord ",") {	355	} elsif ($uni == ord ",") {
161	$::CONN->user_send ("take");	356	$::CONN->user_send ("take");
162	} elsif ($uni == ord " ") {	357	} elsif ($uni == ord " ") {
163	$::CONN->user_send ("apply");	358	$::CONN->user_send ("apply");
		359	} elsif ($uni == 13) {
		360	$::CONN->user_send ("examine");
164	} elsif ($uni == ord ".") {	361	} elsif ($uni == ord ".") {
165	$::CONN->user_send ($self->{completer}{last_command})	362	$::CONN->user_send ($self->{completer}{last_command})
166	if exists $self->{completer}{last_command};	363	if exists $self->{completer}{last_command};
167	} elsif ($uni == ord "\t") {	364	} elsif (my @macros = CFPlus::Macro::match_event $ev) {
168	$::INV_WINDOW->toggle_visibility;	365	$::CONN->macro_send ($_) for @macros;
169	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {	366	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
170	$::CONN->user_send ("rotateshoottype +");	367	$::CONN->user_send ("rotateshoottype +");
171	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {	368	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
172	$::CONN->user_send ("rotateshoottype -");	369	$::CONN->user_send ("rotateshoottype -");
		370	} elsif ($uni == ord '!') {
		371	$self->{completer}->set_prefix ("shout ");
		372	$self->{completer}->show;
173	} elsif ($uni == ord '"') {	373	} elsif ($uni == ord '"') {
174	$self->{completer}->set_prefix ("$::CFG->{say_command} ");	374	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
175	$self->{completer}->show;	375	$self->{completer}->show;
176	} elsif ($uni == ord "'") {	376	} elsif ($uni == ord "'") {
177	$self->{completer}->set_prefix ("");	377	$self->{completer}->set_prefix ("");
178	$self->{completer}->show;	378	$self->{completer}->show;
179	} elsif (exists $DIR{$sym}) {	379	} elsif (exists $DIR{$sym}) {
180	if ($mod & CFClient::KMOD_SHIFT) {	380	if ($mod & CFPlus::KMOD_SHIFT) {
181	$self->{shft}++;	381	$self->{shft}++;
182	if ($DIR{$sym}[0] != $self->{fire_dir}) {	382	if ($DIR{$sym}[0] != $self->{fire_dir}) {
183	$::CONN->user_send ("fire $DIR{$sym}[0]");	383	$::CONN->user_send ("fire $DIR{$sym}[0]");
184	}	384	}
185	$self->{fire_dir} = $DIR{$sym}[0];	385	$self->{fire_dir} = $DIR{$sym}[0];
186	} elsif ($mod & CFClient::KMOD_CTRL) {	386	} elsif ($mod & CFPlus::KMOD_CTRL) {
187	$self->{ctrl}++;	387	$self->{ctrl}++;
188	$::CONN->user_send ("run $DIR{$sym}[0]");	388	$::CONN->user_send ("run $DIR{$sym}[0]");
189	} else {	389	} else {
190	$::CONN->user_send ("$DIR{$sym}[1]");	390	$::CONN->user_send ("$DIR{$sym}[1]");
191	}	391	}
192	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
193	$::BIND_EDITOR->set_binding (undef, undef, [],
194	sub {
195	my ($mod, $sym, $cmds) = @_;
196	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
197	});
198	$::BIND_EDITOR->start;
199	$::BIND_EDITOR->show;
200	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
201	$::BIND_EDITOR->stop;
202	$::BIND_EDITOR->ask_for_bind_and_commit;
203	$::BIND_EDITOR->hide;
204	} elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
205	$::CONN->user_send ($_) for @$bind_cmd;
206	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	392	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
207	$self->{completer}->key_down ($ev);	393	$self->{completer}->inject_key_down ($ev);
208	$self->{completer}->show;	394	$self->{completer}->show;
209	} else {	395	} else {
210	return 0;	396	return 0;
211	}	397	}
212		398
213	1	399	1
214	}	400	}
215		401
216	sub key_up {	402	sub invoke_key_up {
217	my ($self, $ev) = @_;	403	my ($self, $ev) = @_;
218		404
219	my $res = 0;	405	my $res = 0;
220	my $mod = $ev->{mod};	406	my $mod = $ev->{mod};
221	my $sym = $ev->{sym};	407	my $sym = $ev->{sym};
222		408
223	if ($::CFG->{shift_fire_stop}) {	409	if ($::CFG->{shift_fire_stop}) {
224	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	410	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
225	$::CONN->user_send ("fire_stop");	411	$::CONN->user_send ("fire_stop");
226	delete $self->{fire_dir};	412	delete $self->{fire_dir};
227	$res = 1;	413	$res = 1;
228	}	414	}
229	} else {	415	} else {
230	if (exists $DIR{$sym} && delete $self->{shft}) {	416	if (exists $DIR{$sym} && delete $self->{shft}) {
231	$::CONN->user_send ("fire_stop");	417	$::CONN->user_send ("fire_stop");
232	delete $self->{fire_dir};	418	delete $self->{fire_dir};
233	$res = 1;	419	$res = 1;
234	} elsif (($sym == CFClient::SDLK_LSHIFT \|\| $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?	420	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
235	$::CONN->user_send ("fire_stop");	421	$::CONN->user_send ("fire_stop");
236	delete $self->{fire_dir};	422	delete $self->{fire_dir};
237	$res = 1;	423	$res = 1;
238	}	424	}
239	}	425	}
240		426
241	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	427	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
242	$::CONN->user_send ("run_stop");	428	$::CONN->user_send ("run_stop");
243	$res = 1;	429	$res = 1;
244	}	430	}
245		431
246	$res	432	$res
247	}	433	}
248		434
249	sub draw {	435	sub invoke_visibility_change {
		436	my ($self) = @_;
		437
		438	$self->refresh_hook;
		439
		440	0
		441	}
		442
		443	sub set_magicmap {
		444	my ($self, $w, $h, $x, $y, $data) = @_;
		445
		446	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
		447	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
		448
		449	$self->{magicmap} = [$x, $y, $w, $h, $data];
		450
		451	$self->update;
		452	}
		453
		454	sub refresh_hook {
250	my ($self) = @_;	455	my ($self) = @_;
251		456
252	return unless $::MAP;	457	return unless $::MAP;
253		458
254	my $focused = $CFClient::UI::FOCUS == $self
255	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
256
257	return
258	unless $focused \|\| !$::FAST;
259
260	if (delete $self->{need_update}) {	459	if (delete $self->{need_update}) {
261	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};	460	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
262		461
		462	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		463	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		464
263	my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;	465	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
264	my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;	466	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
265		467
266	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;	468	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
267	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;	469	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
268		470
269	my $sw = $self->{sw} = 1 + CFClient::ceil $::WIDTH / $tilesize;	471	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
270	my $sh = $self->{sh} = 1 + CFClient::ceil $::HEIGHT / $tilesize;	472	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
271		473
272	if ($::CFG->{fow_enable}) {	474	if ($::CFG->{fow_enable}) {
273	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);	475	my ($w, $h, $data) = $::MAP->fow_texture (
274		476	$dx, $dy, $sw, $sh,
275	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	477	$::CFG->{fow_smooth},
276	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
277	glConvolutionFilter2D (
278	GL_CONVOLUTION_2D,
279	GL_ALPHA,
280	3, 3,
281	GL_ALPHA, GL_FLOAT,
282	(pack "f*", @{ $self->{smooth_matrix} }),	478	pack "f*", @{ $self->{smooth_matrix} },
283	);	479	);
284	glEnable GL_CONVOLUTION_2D;
285	}
286		480
287	$self->{fow_texture} = new CFClient::Texture	481	$self->{fow_texture} = new CFPlus::Texture
288	w => $w,	482	w => $w,
289	h => $h,	483	h => $h,
290	data => $data,	484	data => $data,
291	internalformat => GL_ALPHA,	485	internalformat => GL_ALPHA,
292	format => GL_ALPHA;	486	format => GL_ALPHA;
293
294	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
295	} else {	487	} else {
296	delete $self->{fow_texture};	488	delete $self->{fow_texture};
297	}	489	}
298		490
299	glNewList $self->{list};	491	glNewList $self->{list};
300		492
301	glPushMatrix;	493	glPushMatrix;
302	glTranslate $sx0, $sy0;	494	glTranslate $sx0, $sy0;
303	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	495	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
304		496
305	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);	497	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
		498
		499	glScale $self->{tilesize}, $self->{tilesize};
306		500
307	if (my $tex = $self->{fow_texture}) {	501	if (my $tex = $self->{fow_texture}) {
		502	glPushMatrix;
		503	#glScale 1/3, 1/3 if $::CFG->{fow_smooth};
308	glEnable GL_TEXTURE_2D;	504	glEnable GL_TEXTURE_2D;
309	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	505	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
310		506
311	glScale 32, 32;
312	glColor +($::CFG->{fow_intensity}) x 3, 0.9;	507	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
313	$self->{fow_texture}->draw_quad_alpha (0, 0);	508	$self->{fow_texture}->draw_quad_alpha (0, 0);
314		509
315	glDisable GL_TEXTURE_2D;	510	glDisable GL_TEXTURE_2D;
		511	glPopMatrix;
		512	}
		513
		514	if ($self->{magicmap}) {
		515	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		516
		517	$x += $::MAP->ox + $self->{dx};
		518	$y += $::MAP->oy + $self->{dy};
		519
		520	glTranslate - $x - 1, - $y - 1;
		521	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		522	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
316	}	523	}
317		524
318	glPopMatrix;	525	glPopMatrix;
319
320	glEndList;	526	glEndList;
321	}	527	}
322		528
323	glPushMatrix;	529	}
		530
		531	sub draw {
		532	my ($self) = @_;
		533
		534	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		535
		536	return unless $self->{list};
		537
		538	my $focused = $CFPlus::UI::FOCUS == $self
		539	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
		540
		541	return
		542	unless $focused \|\| !$::FAST;
		543
324	glCallList $self->{list};	544	glCallList $self->{list};
325	glPopMatrix;
326		545
327	# TNT2 emulates logops in software (or worse :)	546	# TNT2 emulates logops in software (or worse :)
328	unless ($focused) {	547	unless ($focused) {
329	glColor 0.4, 0.2, 0.2, 0.6;	548	glColor 0.4, 0.2, 0.2, 0.6;
330	glEnable GL_BLEND;	549	glEnable GL_BLEND;
…		…
345	glDeleteList $self->{list};	564	glDeleteList $self->{list};
346		565
347	$self->SUPER::DESTROY;	566	$self->SUPER::DESTROY;
348	}	567	}
349		568
350	package CFClient::MapWidget::MapMap;	569	package CFPlus::MapWidget::MapMap;
351		570
		571	use strict;
		572	use utf8;
		573
352	our @ISA = CFClient::UI::Base::;	574	our @ISA = CFPlus::UI::Base::;
353		575
354	use Time::HiRes qw(time);	576	use Time::HiRes qw(time);
355	use CFClient::OpenGL;	577	use CFPlus::OpenGL;
356		578
357	sub size_request {	579	sub size_request {
358	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	580	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
359	}	581	}
360		582
		583	sub refresh_hook {
		584	my ($self) = @_;
		585
		586	if ($::MAP && $self->{texture_atime} < time) {
		587	my ($w, $h) = @$self{qw(w h)};
		588
		589	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		590	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		591
		592	my $ox = 0.5 * ($w - $sw);
		593	my $oy = 0.5 * ($h - $sh);
		594
		595	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		596	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		597
		598	#TODO: map scale is completely borked
		599
		600	my $x0 = int $ox - $sx + 0.5;
		601	my $y0 = int $oy - $sy + 0.5;
		602
		603	$self->{sw} = $sw;
		604	$self->{sh} = $sh;
		605
		606	$self->{x0} = $x0;
		607	$self->{y0} = $y0;
		608
		609	$self->{texture_atime} = time + 1/3;
		610
		611	$self->{texture} =
		612	new CFPlus::Texture
		613	w => $w,
		614	h => $h,
		615	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		616	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		617	}
		618	}
		619
		620	sub invoke_visibility_change {
		621	my ($self) = @_;
		622
		623	$self->refresh_hook;
		624
		625	0
		626	}
		627
361	sub size_allocate {	628	sub invoke_size_allocate {
362	my ($self, $w, $h) = @_;	629	my ($self, $w, $h) = @_;
363		630
364	$self->SUPER::size_allocate ($w, $h);
365	$self->update;	631	$self->update;
		632
		633	1
366	}	634	}
367		635
368	sub update {	636	sub update {
369	my ($self) = @_;	637	my ($self) = @_;
370		638
…		…
373	}	641	}
374		642
375	sub _draw {	643	sub _draw {
376	my ($self) = @_;	644	my ($self) = @_;
377		645
378	$::MAP or return;	646	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
379		647
380	my ($w, $h) = @$self{qw(w h)};	648	$self->{texture} or return;
381
382	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
383	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
384
385	my $sx = int $::CFG->{map_shift_x} / 32;
386	my $sy = int $::CFG->{map_shift_y} / 32;
387
388	my $ox = 0.5 * ($w - $sw);
389	my $oy = 0.5 * ($h - $sh);
390		649
391	glEnable GL_BLEND;	650	glEnable GL_BLEND;
392	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	651	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
393	glEnable GL_TEXTURE_2D;	652	glEnable GL_TEXTURE_2D;
394	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
395		654
396	if ($self->{texture_atime} < time) {
397	$self->{texture_atime} = time + 1/3;
398
399	$self->{texture} =
400	new CFClient::Texture
401	w => $w,
402	h => $h,
403	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
404	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
405	}
406
407	$self->{texture}->draw_quad (0, 0);	655	$self->{texture}->draw_quad (0, 0);
408		656
409	glDisable GL_TEXTURE_2D;	657	glDisable GL_TEXTURE_2D;
410		658
411	glTranslate 0.375, 0.375;	659	glTranslate 0.375, 0.375;
412
413	#TODO: map scale is completely borked
414
415	my $x0 = int $ox - $sx + 0.5;
416	my $y0 = int $oy - $sy + 0.5;
417		660
418	glColor 1, 1, 0, 1;	661	glColor 1, 1, 0, 1;
419	glBegin GL_LINE_LOOP;	662	glBegin GL_LINE_LOOP;
420	glVertex $x0 , $y0 ;	663	glVertex $self->{x0} , $self->{y0} ;
421	glVertex $x0 , $y0 + $sh;	664	glVertex $self->{x0} , $self->{y0} + $self->{sh};
422	glVertex $x0 + $sw, $y0 + $sh;	665	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
423	glVertex $x0 + $sw, $y0 ;	666	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
424	glEnd;	667	glEnd;
425		668
426	glDisable GL_BLEND;	669	glDisable GL_BLEND;
427	}	670	}
428		671
429	package CFClient::MapWidget::Command;	672	package CFPlus::MapWidget::Command;
430		673
431	use strict;	674	use strict;
432		675
433	use CFClient::OpenGL;	676	use CFPlus::OpenGL;
434		677
435	our @ISA = CFClient::UI::Frame::;	678	our @ISA = CFPlus::UI::Frame::;
436		679
437	sub new {	680	sub new {
438	my $class = shift;	681	my $class = shift;
439		682
440	my $self = $class->SUPER::new (	683	my $self = $class->SUPER::new (
441	bg => [0, 0, 0, 0.8],	684	bg => [0, 0, 0, 0.8],
442	@_,	685	@_,
443	);	686	);
444		687
445	$self->add ($self->{vbox} = new CFClient::UI::VBox);	688	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
446		689
447	$self->{label} = [	690	$self->{label} = [
448	map	691	map
449	CFClient::UI::Label->new (	692	CFPlus::UI::Label->new (
450	can_hover => 1,	693	can_hover => 1,
451	can_events => 1,	694	can_events => 1,
452	tooltip_width => 0.33,	695	tooltip_width => 0.33,
453	fontsize => $_,	696	fontsize => $_,
454	), (0.8) x 16	697	), (0.8) x 16
455	];	698	];
456		699
457	$self->{entry} = new CFClient::UI::Entry	700	$self->{entry} = new CFPlus::UI::Entry
458	on_changed => sub {	701	on_changed => sub {
459	$self->update_labels;	702	$self->update_labels;
		703	0
460	},	704	},
461	on_button_down => sub {	705	on_button_down => sub {
462	my ($entry, $ev, $x, $y) = @_;	706	my ($entry, $ev, $x, $y) = @_;
463		707
464	if ($ev->{button} == 3) {	708	if ($ev->{button} == 3) {
465	(new CFClient::UI::Menu	709	(new CFPlus::UI::Menu
466	items => [	710	items => [
467	["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }]	711	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
		712	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
468	],	713	],
469	)->popup ($ev);	714	)->popup ($ev);
470	return 1;	715	return 1;
471	}	716	}
472	0	717	0
…		…
479	if ($ev->{sym} == 13) {	724	if ($ev->{sym} == 13) {
480	if (exists $self->{select}) {	725	if (exists $self->{select}) {
481	$self->{last_command} = $self->{select};	726	$self->{last_command} = $self->{select};
482	$::CONN->user_send ($self->{select});	727	$::CONN->user_send ($self->{select});
483		728
484	unshift @{$self->{history}}, $self->{select};	729	unshift @{$self->{history}}, $self->{entry}->get_text;
485	$self->{hist_ptr} = 0;	730	$self->{hist_ptr} = 0;
486		731
487	$self->hide;	732	$self->hide;
488	}	733	}
489	} elsif ($ev->{sym} == 27) {	734	} elsif ($ev->{sym} == 27) {
490	$self->{hist_ptr} = 0;	735	$self->{hist_ptr} = 0;
491	$self->hide;	736	$self->hide;
492	return;
493	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {	737	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
494	if ($self->{hist_ptr} > 1) {	738	if ($self->{hist_ptr} > 1) {
495	$self->{hist_ptr}--;	739	$self->{hist_ptr}--;
496	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	740	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
497	} elsif ($self->{hist_ptr} > 0) {	741	} elsif ($self->{hist_ptr} > 0) {
498	$self->{hist_ptr}--;	742	$self->{hist_ptr}--;
…		…
500	} else {	744	} else {
501	++$self->{select_offset}	745	++$self->{select_offset}
502	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	746	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
503	}	747	}
504	$self->update_labels;	748	$self->update_labels;
505	} elsif ($ev->{sym} == CFClient::SDLK_UP) {	749	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {
506	if ($self->{select_offset}) {	750	if ($self->{select_offset}) {
507	--$self->{select_offset}	751	--$self->{select_offset}
508	} else {	752	} else {
509	unless ($self->{hist_ptr}) {	753	unless ($self->{hist_ptr}) {
510	$self->{hist_saveback} = $self->{entry}->get_text;	754	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
537		781
538	$self->{entry}->set_text ($prefix);	782	$self->{entry}->set_text ($prefix);
539	$self->show;	783	$self->show;
540	}	784	}
541		785
542	sub size_allocate {	786	sub invoke_size_allocate {
543	my ($self, $w, $h) = @_;	787	my ($self, $w, $h) = @_;
544		788
545	$self->SUPER::size_allocate ($w, $h);
546	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	789	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		790
		791	$self->SUPER::invoke_size_allocate ($w, $h)
547	}	792	}
548		793
549	sub show {	794	sub show {
550	my ($self) = @_;	795	my ($self) = @_;
551		796
552	$self->SUPER::show;	797	$self->SUPER::show;
553	$self->{entry}->focus_in;	798	$self->{entry}->grab_focus;
554	}	799	}
555		800
556	sub hide {	801	sub hide {
557	my ($self) = @_;	802	my ($self) = @_;
		803
		804	$self->{hist_ptr} = 0;
558		805
559	$self->SUPER::hide;	806	$self->SUPER::hide;
560	$self->{entry}->set_text ("");	807	$self->{entry}->set_text ("");
561	}	808	}
562		809
563	sub key_down {	810	sub inject_key_down {
564	my ($self, $ev) = @_;	811	my ($self, $ev) = @_;
565		812
		813	$self->{entry}->grab_focus;
566	$self->{entry}->key_down ($ev)	814	$self->{entry}->emit (key_down => $ev);
567	}	815	}
568		816
569	sub update_labels {	817	sub update_labels {
570	my ($self) = @_;	818	my ($self) = @_;
571		819
…		…
658	$label->set_text ("");	906	$label->set_text ("");
659	$label->set_tooltip ("");	907	$label->set_tooltip ("");
660	}	908	}
661		909
662	$self->update;	910	$self->update;
663	###
664	}	911	}
665		912
666	sub _draw {	913	sub _draw {
667	my ($self) = @_;	914	my ($self) = @_;
668		915
669	# hack	916	# hack
670	local $CFClient::UI::FOCUS = $self->{entry};	917	local $CFPlus::UI::FOCUS = $self->{entry};
671		918
672	$self->SUPER::_draw;	919	$self->SUPER::_draw;
673	}	920	}
674		921
675	1	922	1
		923

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.60 by root, Thu Jun 15 08:29:18 2006 UTC vs. Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.60 by root, Thu Jun 15 08:29:18 2006 UTC vs.
Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC