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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs.
Revision 1.132 by root, Sun Jul 13 12:17:00 2008 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs. Revision 1.132 by root, Sun Jul 13 12:17:00 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs.
Revision 1.132 by root, Sun Jul 13 12:17:00 2008 UTC