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

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.118 by elmex, Tue Aug 14 13:25:25 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.118 by elmex, Tue Aug 14 13:25:25 2007 UTC