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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.59 by root, Wed Jun 14 16:20:22 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) {
71	my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale});	186	$self->grab_focus;
72	my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale});	187	return unless $::CONN;
		188
		189	my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
		190	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
		191
		192	$x -= CFPlus::floor $::MAP->w * 0.5;
		193	$y -= CFPlus::floor $::MAP->h * 0.5;
		194
		195	if ($::CONN) {
		196	if ($::IN_BUILD_MODE) {
		197	$::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
		198	} else {
		199	$::CONN->lookat ($x, $y)
		200	}
		201	}
		202
		203	} elsif ($ev->{button} == 2) {
		204	$self->grab_focus;
		205	return unless $::CONN;
73		206
74	$x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
75	$y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
76
77	$x -= int 0.5 * $::MAP->w;
78	$y -= int 0.5 * $::MAP->h;
79
80	$x += 1;
81	$y += 1;
82
83	$::CONN->lookat ($x, $y)
84	if $::CONN;
85
86	} elsif ($ev->{button} == 2) {
87	my ($ox, $oy) = ($ev->{x}, $ev->{y});	207	my ($ox, $oy) = ($ev->{x}, $ev->{y});
88	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	208	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
89		209
90	$self->{motion} = sub {	210	$self->{motion} = sub {
91	my ($ev, $x, $y) = @_;	211	my ($ev, $x, $y) = @_;
…		…
95	$::CFG->{map_shift_x} = $bw + $x - $ox;	215	$::CFG->{map_shift_x} = $bw + $x - $ox;
96	$::CFG->{map_shift_y} = $bh + $y - $oy;	216	$::CFG->{map_shift_y} = $bh + $y - $oy;
97		217
98	$self->update;	218	$self->update;
99	};	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);
100	}	271	}
101		272
102	1	273	1
103	}	274	}
104		275
105	sub button_up {	276	sub invoke_button_up {
106	my ($self, $ev, $x, $y) = @_;	277	my ($self, $ev, $x, $y) = @_;
107		278
108	delete $self->{motion};	279	delete $self->{motion};
109		280
110	1	281	1
111	}	282	}
112		283
113	sub mouse_motion {	284	sub invoke_mouse_motion {
114	my ($self, $ev, $x, $y) = @_;	285	my ($self, $ev, $x, $y) = @_;
115		286
116	if ($self->{motion}) {	287	if ($self->{motion}) {
117	$self->{motion}->($ev, $x, $y);	288	$self->{motion}->($ev, $x, $y);
118	} else {	289	} else {
…		…
121		292
122	1	293	1
123	}	294	}
124		295
125	sub size_request {	296	sub size_request {
		297	my ($self) = @_;
		298
126	(	299	(
127	1 + 32 * int $::WIDTH / 32,	300	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
128	1 + 32 * int $::HEIGHT / 32,	301	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
129	)	302	)
130	}	303	}
131		304
132	sub update {	305	sub update {
133	my ($self) = @_;	306	my ($self) = @_;
…		…
135	$self->{need_update} = 1;	308	$self->{need_update} = 1;
136	$self->SUPER::update;	309	$self->SUPER::update;
137	}	310	}
138		311
139	my %DIR = (	312	my %DIR = (
		313	CFPlus::SDLK_KP5, [0, "stay fire"],
140	CFClient::SDLK_KP8, [1, "north"],	314	CFPlus::SDLK_KP8, [1, "north"],
141	CFClient::SDLK_KP9, [2, "northeast"],	315	CFPlus::SDLK_KP9, [2, "northeast"],
142	CFClient::SDLK_KP6, [3, "east"],	316	CFPlus::SDLK_KP6, [3, "east"],
143	CFClient::SDLK_KP3, [4, "southeast"],	317	CFPlus::SDLK_KP3, [4, "southeast"],
144	CFClient::SDLK_KP2, [5, "south"],	318	CFPlus::SDLK_KP2, [5, "south"],
145	CFClient::SDLK_KP1, [6, "southwest"],	319	CFPlus::SDLK_KP1, [6, "southwest"],
146	CFClient::SDLK_KP4, [7, "west"],	320	CFPlus::SDLK_KP4, [7, "west"],
147	CFClient::SDLK_KP7, [8, "northwest"],	321	CFPlus::SDLK_KP7, [8, "northwest"],
148		322
149	CFClient::SDLK_UP, [1, "north"],	323	CFPlus::SDLK_UP, [1, "north"],
150	CFClient::SDLK_RIGHT, [3, "east"],	324	CFPlus::SDLK_RIGHT, [3, "east"],
151	CFClient::SDLK_DOWN, [5, "south"],	325	CFPlus::SDLK_DOWN, [5, "south"],
152	CFClient::SDLK_LEFT, [7, "west"],	326	CFPlus::SDLK_LEFT, [7, "west"],
153	);	327	);
154		328
155	sub key_down {	329	sub invoke_key_down {
156	my ($self, $ev) = @_;	330	my ($self, $ev) = @_;
157
158	return 0 unless $::CONN;
159		331
160	my $mod = $ev->{mod};	332	my $mod = $ev->{mod};
161	my $sym = $ev->{sym};	333	my $sym = $ev->{sym};
162	my $uni = $ev->{unicode};	334	my $uni = $ev->{unicode};
163		335
164	if ($sym == CFClient::SDLK_KP5) {	336	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
165	$::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
166	} elsif ($uni == ord ",") {	355	} elsif ($uni == ord ",") {
167	$::CONN->user_send ("take");	356	$::CONN->user_send ("take");
168	} elsif ($uni == ord " ") {	357	} elsif ($uni == ord " ") {
169	$::CONN->user_send ("apply");	358	$::CONN->user_send ("apply");
		359	} elsif ($uni == 13) {
		360	$::CONN->user_send ("examine");
170	} elsif ($uni == ord ".") {	361	} elsif ($uni == ord ".") {
171	$::CONN->user_send ($self->{completer}{last_command})	362	$::CONN->user_send ($self->{completer}{last_command})
172	if exists $self->{completer}{last_command};	363	if exists $self->{completer}{last_command};
173	} elsif ($uni == ord "\t") {	364	} elsif (my @macros = CFPlus::Macro::match_event $ev) {
174	$::INV_WINDOW->toggle_visibility;	365	$::CONN->macro_send ($_) for @macros;
175	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {	366	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
176	$::CONN->user_send ("rotateshoottype +");	367	$::CONN->user_send ("rotateshoottype +");
177	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {	368	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
178	$::CONN->user_send ("rotateshoottype -");	369	$::CONN->user_send ("rotateshoottype -");
		370	} elsif ($uni == ord '!') {
		371	$self->{completer}->set_prefix ("shout ");
		372	$self->{completer}->show;
179	} elsif ($uni == ord '"') {	373	} elsif ($uni == ord '"') {
180	$self->{completer}->set_prefix ("$::CFG->{say_command} ");	374	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
181	$self->{completer}->show;	375	$self->{completer}->show;
182	} elsif ($uni == ord "'") {	376	} elsif ($uni == ord "'") {
183	$self->{completer}->set_prefix ("");	377	$self->{completer}->set_prefix ("");
184	$self->{completer}->show;	378	$self->{completer}->show;
185	} elsif (exists $DIR{$sym}) {	379	} elsif (exists $DIR{$sym}) {
186	if ($mod & CFClient::KMOD_SHIFT) {	380	if ($mod & CFPlus::KMOD_SHIFT) {
187	$self->{shft}++;	381	$self->{shft}++;
188	if ($DIR{$sym}[0] != $self->{fire_dir}) {	382	if ($DIR{$sym}[0] != $self->{fire_dir}) {
189	$::CONN->user_send ("fire $DIR{$sym}[0]");	383	$::CONN->user_send ("fire $DIR{$sym}[0]");
190	}	384	}
191	$self->{fire_dir} = $DIR{$sym}[0];	385	$self->{fire_dir} = $DIR{$sym}[0];
192	} elsif ($mod & CFClient::KMOD_CTRL) {	386	} elsif ($mod & CFPlus::KMOD_CTRL) {
193	$self->{ctrl}++;	387	$self->{ctrl}++;
194	$::CONN->user_send ("run $DIR{$sym}[0]");	388	$::CONN->user_send ("run $DIR{$sym}[0]");
195	} else {	389	} else {
196	$::CONN->user_send ("$DIR{$sym}[1]");	390	$::CONN->user_send ("$DIR{$sym}[1]");
197	}	391	}
198	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
199	$::BIND_EDITOR->set_binding (undef, undef, [],
200	sub {
201	my ($mod, $sym, $cmds) = @_;
202	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
203	});
204	$::BIND_EDITOR->start;
205	$::BIND_EDITOR->show;
206	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
207	$::BIND_EDITOR->stop;
208	$::BIND_EDITOR->ask_for_bind_and_commit;
209	$::BIND_EDITOR->hide;
210	} elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
211	$::CONN->user_send ($_) for @$bind_cmd;
212	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {	392	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
213	$self->{completer}->key_down ($ev);	393	$self->{completer}->inject_key_down ($ev);
214	$self->{completer}->show;	394	$self->{completer}->show;
215	} else {	395	} else {
216	return 0;	396	return 0;
217	}	397	}
218		398
219	1	399	1
220	}	400	}
221		401
222	sub key_up {	402	sub invoke_key_up {
223	my ($self, $ev) = @_;	403	my ($self, $ev) = @_;
224		404
225	my $res = 0;	405	my $res = 0;
226	my $mod = $ev->{mod};	406	my $mod = $ev->{mod};
227	my $sym = $ev->{sym};	407	my $sym = $ev->{sym};
228		408
229	if ($::CFG->{shift_fire_stop}) {	409	if ($::CFG->{shift_fire_stop}) {
230	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	410	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
231	$::CONN->user_send ("fire_stop");	411	$::CONN->user_send ("fire_stop");
232	delete $self->{fire_dir};	412	delete $self->{fire_dir};
233	$res = 1;	413	$res = 1;
234	}	414	}
235	} else {	415	} else {
236	if (exists $DIR{$sym} && delete $self->{shft}) {	416	if (exists $DIR{$sym} && delete $self->{shft}) {
237	$::CONN->user_send ("fire_stop");	417	$::CONN->user_send ("fire_stop");
238	delete $self->{fire_dir};	418	delete $self->{fire_dir};
239	$res = 1;	419	$res = 1;
240	} 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?
241	$::CONN->user_send ("fire_stop");	421	$::CONN->user_send ("fire_stop");
242	delete $self->{fire_dir};	422	delete $self->{fire_dir};
243	$res = 1;	423	$res = 1;
244	}	424	}
245	}	425	}
246		426
247	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	427	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
248	$::CONN->user_send ("run_stop");	428	$::CONN->user_send ("run_stop");
249	$res = 1;	429	$res = 1;
250	}	430	}
251		431
252	$res	432	$res
253	}	433	}
254		434
		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 {
		455	my ($self) = @_;
		456
		457	return unless $::MAP;
		458
		459	if (delete $self->{need_update}) {
		460	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		461
		462	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		463	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		464
		465	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
		466	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
		467
		468	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		469	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		470
		471	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		472	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
		473
		474	if ($::CFG->{fow_enable}) {
		475	my ($w, $h, $data) = $::MAP->fow_texture (
		476	$dx, $dy, $sw, $sh,
		477	$::CFG->{fow_smooth},
		478	pack "f*", @{ $self->{smooth_matrix} },
		479	);
		480
		481	$self->{fow_texture} = new CFPlus::Texture
		482	w => $w,
		483	h => $h,
		484	data => $data,
		485	internalformat => GL_ALPHA,
		486	format => GL_ALPHA;
		487	} else {
		488	delete $self->{fow_texture};
		489	}
		490
		491	glNewList $self->{list};
		492
		493	glPushMatrix;
		494	glTranslate $sx0, $sy0;
		495	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		496
		497	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
		498
		499	glScale $self->{tilesize}, $self->{tilesize};
		500
		501	if (my $tex = $self->{fow_texture}) {
		502	glPushMatrix;
		503	#glScale 1/3, 1/3 if $::CFG->{fow_smooth};
		504	glEnable GL_TEXTURE_2D;
		505	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		506
		507	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
		508	$self->{fow_texture}->draw_quad_alpha (0, 0);
		509
		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);
		523	}
		524
		525	glPopMatrix;
		526	glEndList;
		527	}
		528
		529	}
		530
255	sub draw {	531	sub draw {
256	my ($self) = @_;	532	my ($self) = @_;
257		533
		534	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		535
		536	return unless $self->{list};
		537
258	my $focused = $CFClient::UI::FOCUS == $self	538	my $focused = $CFPlus::UI::FOCUS == $self
259	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};	539	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
260		540
261	return	541	return
262	unless $::CONN && ($focused \|\| !$::FAST);	542	unless $focused \|\| !$::FAST;
263		543
264	if (delete $self->{need_update}) {
265	$self->{fow_texture} \|\|= glGenTexture;
266
267	glNewList $self->{list};
268
269	if ($::MAP) {
270	my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
271	my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
272
273	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
274	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};
275	my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
276	my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
277
278	glPushMatrix;
279	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
280
281	glTranslate $sx0, $sy0;
282
283	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
284
285	if ($::CFG->{fow_enable}) {
286	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
287	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
288	glConvolutionFilter2D (
289	GL_CONVOLUTION_2D,
290	GL_ALPHA,
291	3, 3,
292	GL_ALPHA, GL_FLOAT,
293	(pack "f*", @{ $self->{smooth_matrix} }),
294	);
295	glEnable GL_CONVOLUTION_2D;
296	}
297
298	$self->{fow_texture_name} \|\|= glGenTexture;
299	# try to re-use the texture name: TODO improve texture class instead
300
301	$self->{fow_texture} = new CFClient::Texture
302	w => $w,
303	h => $h,
304	data => $data,
305	name => $self->{fow_texture_name},
306	internalformat => GL_ALPHA,
307	format => GL_ALPHA;
308
309	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
310
311	glEnable GL_TEXTURE_2D;
312	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
313
314	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
315	$self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
316
317	glDisable GL_TEXTURE_2D;
318	}
319
320	glPopMatrix;
321	}
322
323	glEndList;
324	}
325
326	glPushMatrix;
327	glCallList $self->{list};	544	glCallList $self->{list};
328	glPopMatrix;
329		545
330	# TNT2 emulates logops in software (or worse :)	546	# TNT2 emulates logops in software (or worse :)
331	if ($focused) {	547	unless ($focused) {
332	(delete $self->{out_of_focus})->destroy
333	if $self->{out_of_focus};
334	} else {
335	glColor 0.4, 0.2, 0.2, 0.6;	548	glColor 0.4, 0.2, 0.2, 0.6;
336	glEnable GL_BLEND;	549	glEnable GL_BLEND;
337	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	550	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
338	glBegin GL_QUADS;	551	glBegin GL_QUADS;
339	glVertex 0, 0;	552	glVertex 0, 0;
340	glVertex 0, $::HEIGHT;	553	glVertex 0, $::HEIGHT;
341	glVertex $::WIDTH, $::HEIGHT;	554	glVertex $::WIDTH, $::HEIGHT;
342	glVertex $::WIDTH, 0;	555	glVertex $::WIDTH, 0;
343	glEnd;	556	glEnd;
344	glDisable GL_BLEND;	557	glDisable GL_BLEND;
345
346	# $self->{out_of_focus} \|\|= do {
347	# my $label = new CFClient::UI::Label
348	# x => 0,
349	# y => 0,
350	# z => 1,
351	# ellipsise => 0,
352	# text => "map out of focus (click map to play)";
353	#
354	# $label->show;
355	# $label->update;
356	#
357	# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
358	# $label->move_abs (
359	# ($::WIDTH - $label->{w}) * 0.5,
360	# ($::HEIGHT - $label->{h}) * 0.5,
361	# );
362	# });
363	#
364	# $label
365	# };
366	}	558	}
367	}	559	}
368		560
369	sub DESTROY {	561	sub DESTROY {
370	my $self = shift;	562	my $self = shift;
…		…
372	glDeleteList $self->{list};	564	glDeleteList $self->{list};
373		565
374	$self->SUPER::DESTROY;	566	$self->SUPER::DESTROY;
375	}	567	}
376		568
377	package CFClient::MapWidget::MapMap;	569	package CFPlus::MapWidget::MapMap;
378		570
		571	use strict;
		572	use utf8;
		573
379	our @ISA = CFClient::UI::Base::;	574	our @ISA = CFPlus::UI::Base::;
380		575
381	use Time::HiRes qw(time);	576	use Time::HiRes qw(time);
382	use CFClient::OpenGL;	577	use CFPlus::OpenGL;
383		578
384	sub size_request {	579	sub size_request {
385	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	580	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
386	}	581	}
387		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
388	sub size_allocate {	628	sub invoke_size_allocate {
389	my ($self, $w, $h) = @_;	629	my ($self, $w, $h) = @_;
390		630
391	$self->SUPER::size_allocate ($w, $h);
392	$self->update;	631	$self->update;
		632
		633	1
393	}	634	}
394		635
395	sub update {	636	sub update {
396	my ($self) = @_;	637	my ($self) = @_;
397		638
…		…
400	}	641	}
401		642
402	sub _draw {	643	sub _draw {
403	my ($self) = @_;	644	my ($self) = @_;
404		645
405	$::MAP or return;	646	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
406		647
407	my ($w, $h) = @$self{qw(w h)};	648	$self->{texture} or return;
408
409	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
410	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
411
412	my $sx = int $::CFG->{map_shift_x} / 32;
413	my $sy = int $::CFG->{map_shift_y} / 32;
414
415	my $ox = 0.5 * ($w - $sw);
416	my $oy = 0.5 * ($h - $sh);
417		649
418	glEnable GL_BLEND;	650	glEnable GL_BLEND;
419	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	651	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
420	glEnable GL_TEXTURE_2D;	652	glEnable GL_TEXTURE_2D;
421	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
422		654
423	if ($self->{texture_atime} < time) {
424	$self->{texture_atime} = time + 1/3;
425
426	$self->{texture} =
427	new CFClient::Texture
428	w => $w,
429	h => $h,
430	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
431	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
432	}
433
434	$self->{texture}->draw_quad (0, 0);	655	$self->{texture}->draw_quad (0, 0);
435		656
436	glDisable GL_TEXTURE_2D;	657	glDisable GL_TEXTURE_2D;
437		658
438	glTranslate 0.375, 0.375;	659	glTranslate 0.375, 0.375;
439
440	#TODO: map scale is completely borked
441
442	my $x0 = int $ox - $sx + 0.5;
443	my $y0 = int $oy - $sy + 0.5;
444		660
445	glColor 1, 1, 0, 1;	661	glColor 1, 1, 0, 1;
446	glBegin GL_LINE_LOOP;	662	glBegin GL_LINE_LOOP;
447	glVertex $x0 , $y0 ;	663	glVertex $self->{x0} , $self->{y0} ;
448	glVertex $x0 , $y0 + $sh;	664	glVertex $self->{x0} , $self->{y0} + $self->{sh};
449	glVertex $x0 + $sw, $y0 + $sh;	665	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
450	glVertex $x0 + $sw, $y0 ;	666	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
451	glEnd;	667	glEnd;
452		668
453	glDisable GL_BLEND;	669	glDisable GL_BLEND;
454	}	670	}
455		671
456	package CFClient::MapWidget::Command;	672	package CFPlus::MapWidget::Command;
457		673
458	use strict;	674	use strict;
459		675
460	use CFClient::OpenGL;	676	use CFPlus::OpenGL;
461		677
462	our @ISA = CFClient::UI::Frame::;	678	our @ISA = CFPlus::UI::Frame::;
463		679
464	sub new {	680	sub new {
465	my $class = shift;	681	my $class = shift;
466		682
467	my $self = $class->SUPER::new (	683	my $self = $class->SUPER::new (
468	bg => [0, 0, 0, 0.8],	684	bg => [0, 0, 0, 0.8],
469	@_,	685	@_,
470	);	686	);
471		687
472	$self->add ($self->{vbox} = new CFClient::UI::VBox);	688	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
473		689
474	$self->{label} = [	690	$self->{label} = [
475	map	691	map
476	CFClient::UI::Label->new (	692	CFPlus::UI::Label->new (
477	can_hover => 1,	693	can_hover => 1,
478	can_events => 1,	694	can_events => 1,
479	tooltip_width => 0.33,	695	tooltip_width => 0.33,
480	fontsize => $_,	696	fontsize => $_,
481	), (0.8) x 16	697	), (0.8) x 16
482	];	698	];
483		699
484	$self->{entry} = new CFClient::UI::Entry	700	$self->{entry} = new CFPlus::UI::Entry
485	on_changed => sub {	701	on_changed => sub {
486	$self->update_labels;	702	$self->update_labels;
		703	0
487	},	704	},
488	on_button_down => sub {	705	on_button_down => sub {
489	my ($entry, $ev, $x, $y) = @_;	706	my ($entry, $ev, $x, $y) = @_;
490		707
491	if ($ev->{button} == 3) {	708	if ($ev->{button} == 3) {
492	(new CFClient::UI::Menu	709	(new CFPlus::UI::Menu
493	items => [	710	items => [
494	["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 } }]
495	],	713	],
496	)->popup ($ev);	714	)->popup ($ev);
497	return 1;	715	return 1;
498	}	716	}
499	0	717	0
…		…
506	if ($ev->{sym} == 13) {	724	if ($ev->{sym} == 13) {
507	if (exists $self->{select}) {	725	if (exists $self->{select}) {
508	$self->{last_command} = $self->{select};	726	$self->{last_command} = $self->{select};
509	$::CONN->user_send ($self->{select});	727	$::CONN->user_send ($self->{select});
510		728
511	unshift @{$self->{history}}, $self->{select};	729	unshift @{$self->{history}}, $self->{entry}->get_text;
512	$self->{hist_ptr} = 0;	730	$self->{hist_ptr} = 0;
513		731
514	$self->hide;	732	$self->hide;
515	}	733	}
516	} elsif ($ev->{sym} == 27) {	734	} elsif ($ev->{sym} == 27) {
517	$self->{hist_ptr} = 0;	735	$self->{hist_ptr} = 0;
518	$self->hide;	736	$self->hide;
519	return;
520	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {	737	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
521	if ($self->{hist_ptr} > 1) {	738	if ($self->{hist_ptr} > 1) {
522	$self->{hist_ptr}--;	739	$self->{hist_ptr}--;
523	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	740	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524	} elsif ($self->{hist_ptr} > 0) {	741	} elsif ($self->{hist_ptr} > 0) {
525	$self->{hist_ptr}--;	742	$self->{hist_ptr}--;
…		…
527	} else {	744	} else {
528	++$self->{select_offset}	745	++$self->{select_offset}
529	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	746	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
530	}	747	}
531	$self->update_labels;	748	$self->update_labels;
532	} elsif ($ev->{sym} == CFClient::SDLK_UP) {	749	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {
533	if ($self->{select_offset}) {	750	if ($self->{select_offset}) {
534	--$self->{select_offset}	751	--$self->{select_offset}
535	} else {	752	} else {
536	unless ($self->{hist_ptr}) {	753	unless ($self->{hist_ptr}) {
537	$self->{hist_saveback} = $self->{entry}->get_text;	754	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
564		781
565	$self->{entry}->set_text ($prefix);	782	$self->{entry}->set_text ($prefix);
566	$self->show;	783	$self->show;
567	}	784	}
568		785
569	sub size_allocate {	786	sub invoke_size_allocate {
570	my ($self, $w, $h) = @_;	787	my ($self, $w, $h) = @_;
571		788
572	$self->SUPER::size_allocate ($w, $h);
573	$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)
574	}	792	}
575		793
576	sub show {	794	sub show {
577	my ($self) = @_;	795	my ($self) = @_;
578		796
579	$self->SUPER::show;	797	$self->SUPER::show;
580	$self->{entry}->focus_in;	798	$self->{entry}->grab_focus;
581	}	799	}
582		800
583	sub hide {	801	sub hide {
584	my ($self) = @_;	802	my ($self) = @_;
		803
		804	$self->{hist_ptr} = 0;
585		805
586	$self->SUPER::hide;	806	$self->SUPER::hide;
587	$self->{entry}->set_text ("");	807	$self->{entry}->set_text ("");
588	}	808	}
589		809
590	sub key_down {	810	sub inject_key_down {
591	my ($self, $ev) = @_;	811	my ($self, $ev) = @_;
592		812
		813	$self->{entry}->grab_focus;
593	$self->{entry}->key_down ($ev)	814	$self->{entry}->emit (key_down => $ev);
594	}	815	}
595		816
596	sub update_labels {	817	sub update_labels {
597	my ($self) = @_;	818	my ($self) = @_;
598		819
…		…
685	$label->set_text ("");	906	$label->set_text ("");
686	$label->set_tooltip ("");	907	$label->set_tooltip ("");
687	}	908	}
688		909
689	$self->update;	910	$self->update;
690	###
691	}	911	}
692		912
693	sub _draw {	913	sub _draw {
694	my ($self) = @_;	914	my ($self) = @_;
695		915
696	# hack	916	# hack
697	local $CFClient::UI::FOCUS = $self->{entry};	917	local $CFPlus::UI::FOCUS = $self->{entry};
698		918
699	$self->SUPER::_draw;	919	$self->SUPER::_draw;
700	}	920	}
701		921
702	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.59 by root, Wed Jun 14 16:20:22 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.59 by root, Wed Jun 14 16:20:22 2006 UTC vs.
Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC