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

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

Diff Legend

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

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

Diff Legend

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