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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.51 by root, Thu Jun 8 01:51:32 2006 UTC vs. Revision 1.108 by root, Wed Apr 25 01:12:31 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.51 by root, Thu Jun 8 01:51:32 2006 UTC vs.
Revision 1.108 by root, Wed Apr 25 01:12:31 2007 UTC