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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.56 by root, Mon Jun 12 13:26:14 2006 UTC vs. Revision 1.111 by root, Thu Jul 19 14:54:50 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.56 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.111 by root, Thu Jul 19 14:54:50 2007 UTC