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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.50 by root, Sat Jun 3 23:47:47 2006 UTC vs. Revision 1.109 by root, Tue Jul 17 17:39:07 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.50 by root, Sat Jun 3 23:47:47 2006 UTC vs.
Revision 1.109 by root, Tue Jul 17 17:39:07 2007 UTC