[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.121 by root, Tue Aug 28 16:26:13 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::
30	command => $self->{command},
31	can_focus => 1,
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	;
41
42	$self	29	$self
		30	}
		31
		32	sub set_tilesize {
		33	my ($self, $tilesize) = @_;
		34
		35	$self->{tilesize} = $tilesize;
43	}	36	}
44		37
45	sub add_command {	38	sub add_command {
46	my ($self, $command, $tooltip, $widget, $cb) = @_;	39	my ($self, $command, $tooltip, $widget, $cb) = @_;
47		40
49		42
50	$tooltip =~ s/^\s+//;	43	$tooltip =~ s/^\s+//;
51	$tooltip = "<big>$data</big>\n\n$tooltip";	44	$tooltip = "<big>$data</big>\n\n$tooltip";
52	$tooltip =~ s/\s+$//;	45	$tooltip =~ s/\s+$//;
53		46
54	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];	47	$::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
55	}	48	}
56		49
57	sub clr_commands {	50	sub clr_commands {
58	my ($self) = @_;	51	my ($self) = @_;
59		52
60	%{$self->{completer}{command}} = ();	53	%{$::COMPLETER->{command}} = ();
61	}
62		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	CFPlus::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 = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
		78	local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
		79
		80	print "map directory is $mapdir\n";
		81	print "lib directory is $libdir\n";
		82
		83	my $ua = CFPlus::lwp_useragent;
		84
		85	for my $file (qw(archetypes crossfire.0)) {
		86	my $url = "$editsup->{lib_root}$file";
		87	print "mirroring $url...\n";
		88	CFPlus::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 = (CFPlus::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 = (CFPlus::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 CFPlus::to_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	}
		167	}
		168
63	sub button_down {	169	sub invoke_button_down {
64	my ($self, $ev, $x, $y) = @_;	170	my ($self, $ev, $x, $y) = @_;
65		171
66	return unless $::CONN;
67
68	$self->focus_in;
69
70	if ($ev->{button} == 1) {	172	if ($ev->{button} == 1) {
		173	$self->grab_focus;
		174	return unless $::CONN;
		175
71	my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};	176	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};	177	my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
73		178
74	$x -= int 0.5 * $self->{sw};	179	$x -= CFPlus::floor $::MAP->w * 0.5;
75	$y -= int 0.5 * $self->{sh};	180	$y -= CFPlus::floor $::MAP->h * 0.5;
76		181
		182	if ($::CONN) {
77	$::CONN->lookat ($x, $y)	183	$::CONN->lookat ($x, $y)
78	if $::CONN;	184	}
79		185
80	} elsif ($ev->{button} == 2) {	186	} elsif ($ev->{button} == 2) {
		187	$self->grab_focus;
		188	return unless $::CONN;
		189
81	my ($ox, $oy) = ($ev->{x}, $ev->{y});	190	my ($ox, $oy) = ($ev->{x}, $ev->{y});
82	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	191	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
83		192
84	$self->{motion} = sub {	193	$self->{motion} = sub {
85	my ($ev, $x, $y) = @_;	194	my ($ev, $x, $y) = @_;
…		…
89	$::CFG->{map_shift_x} = $bw + $x - $ox;	198	$::CFG->{map_shift_x} = $bw + $x - $ox;
90	$::CFG->{map_shift_y} = $bh + $y - $oy;	199	$::CFG->{map_shift_y} = $bh + $y - $oy;
91		200
92	$self->update;	201	$self->update;
93	};	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'>(" . (CFPlus::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'>(" . (CFPlus::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 CFPlus::UI::Menu
		252	items => \@items,
		253	)->popup ($ev);
94	}	254	}
95		255
96	1	256	1
97	}	257	}
98		258
99	sub button_up {	259	sub invoke_button_up {
100	my ($self, $ev, $x, $y) = @_;	260	my ($self, $ev, $x, $y) = @_;
101		261
102	delete $self->{motion};	262	delete $self->{motion};
103		263
104	1	264	1
105	}	265	}
106		266
107	sub mouse_motion {	267	sub invoke_mouse_motion {
108	my ($self, $ev, $x, $y) = @_;	268	my ($self, $ev, $x, $y) = @_;
109		269
110	if ($self->{motion}) {	270	if ($self->{motion}) {
111	$self->{motion}->($ev, $x, $y);	271	$self->{motion}->($ev, $x, $y);
112	} else {	272	} else {
…		…
115		275
116	1	276	1
117	}	277	}
118		278
119	sub size_request {	279	sub size_request {
		280	my ($self) = @_;
		281
120	(	282	(
121	1 + 32 * int $::WIDTH / 32,	283	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
122	1 + 32 * int $::HEIGHT / 32,	284	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
123	)	285	)
124	}	286	}
125		287
126	sub update {	288	sub update {
127	my ($self) = @_;	289	my ($self) = @_;
…		…
129	$self->{need_update} = 1;	291	$self->{need_update} = 1;
130	$self->SUPER::update;	292	$self->SUPER::update;
131	}	293	}
132		294
133	my %DIR = (	295	my %DIR = (
		296	( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
134	CFClient::SDLK_KP8, [1, "north"],	297	( "," . CFPlus::SDLK_KP8 ), [1, "north"],
135	CFClient::SDLK_KP9, [2, "northeast"],	298	( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
136	CFClient::SDLK_KP6, [3, "east"],	299	( "," . CFPlus::SDLK_KP6 ), [3, "east"],
137	CFClient::SDLK_KP3, [4, "southeast"],	300	( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
138	CFClient::SDLK_KP2, [5, "south"],	301	( "," . CFPlus::SDLK_KP2 ), [5, "south"],
139	CFClient::SDLK_KP1, [6, "southwest"],	302	( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
140	CFClient::SDLK_KP4, [7, "west"],	303	( "," . CFPlus::SDLK_KP4 ), [7, "west"],
141	CFClient::SDLK_KP7, [8, "northwest"],	304	( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
142		305
143	CFClient::SDLK_UP, [1, "north"],	306	( "," . CFPlus::SDLK_UP ), [1, "north"],
		307	("1," . CFPlus::SDLK_UP ), [2, "northeast"],
144	CFClient::SDLK_RIGHT, [3, "east"],	308	( "," . CFPlus::SDLK_RIGHT), [3, "east"],
		309	("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
145	CFClient::SDLK_DOWN, [5, "south"],	310	( "," . CFPlus::SDLK_DOWN ), [5, "south"],
		311	("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
146	CFClient::SDLK_LEFT, [7, "west"],	312	( "," . CFPlus::SDLK_LEFT ), [7, "west"],
		313	("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
147	);	314	);
148		315
149	sub key_down {	316	sub invoke_key_down {
150	my ($self, $ev) = @_;	317	my ($self, $ev) = @_;
151
152	return 0 unless $::CONN;
153		318
154	my $mod = $ev->{mod};	319	my $mod = $ev->{mod};
155	my $sym = $ev->{sym};	320	my $sym = $ev->{sym};
156	my $uni = $ev->{unicode};	321	my $uni = $ev->{unicode};
157		322
158	if ($sym == CFClient::SDLK_KP5) {	323	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
159	$::CONN->user_send ("stay fire");	324
160	} elsif ($uni == ord ",") {	325	if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) {
161	$::CONN->user_send ("take");
162	} elsif ($uni == ord " ") {
163	$::CONN->user_send ("apply");
164	} elsif ($uni == ord ".") {
165	$::CONN->user_send ($self->{completer}{last_command})
166	if exists $self->{completer}{last_command};
167	} elsif ($uni == ord "\t") {
168	$::INV_WINDOW->toggle_visibility;
169	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
170	$::CONN->user_send ("rotateshoottype +");
171	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
172	$::CONN->user_send ("rotateshoottype -");
173	} elsif ($uni == ord '"') {
174	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
175	$self->{completer}->show;
176	} elsif ($uni == ord "'") {
177	$self->{completer}->set_prefix ("");
178	$self->{completer}->show;
179	} elsif (exists $DIR{$sym}) {
180	if ($mod & CFClient::KMOD_SHIFT) {	326	if ($mod & CFPlus::KMOD_SHIFT) {
181	$self->{shft}++;	327	$self->{shft}++;
182	if ($DIR{$sym}[0] != $self->{fire_dir}) {	328	if ($dir->[0] != $self->{fire_dir}) {
183	$::CONN->user_send ("fire $DIR{$sym}[0]");	329	$::CONN->user_send ("fire $dir->[0]");
184	}	330	}
185	$self->{fire_dir} = $DIR{$sym}[0];	331	$self->{fire_dir} = $DIR{$sym}[0];
186	} elsif ($mod & CFClient::KMOD_CTRL) {	332	} elsif ($mod & CFPlus::KMOD_CTRL) {
187	$self->{ctrl}++;	333	$self->{ctrl}++;
188	$::CONN->user_send ("run $DIR{$sym}[0]");	334	$::CONN->user_send ("run $dir->[0]");
189	} else {	335	} else {
190	$::CONN->user_send ("$DIR{$sym}[1]");	336	$::CONN->user_send ("$dir->[1]");
191	}	337	}
192	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {	338
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')) {
207	$self->{completer}->key_down ($ev);
208	$self->{completer}->show;
209	} else {
210	return 0;	339	return 1;
211	}
212
213	1	340	}
214	}
215		341
		342	0
		343	}
		344
216	sub key_up {	345	sub invoke_key_up {
217	my ($self, $ev) = @_;	346	my ($self, $ev) = @_;
218		347
219	my $res = 0;	348	my $res = 0;
220	my $mod = $ev->{mod};	349	my $mod = $ev->{mod};
221	my $sym = $ev->{sym};	350	my $sym = $ev->{sym};
222		351
223	if ($::CFG->{shift_fire_stop}) {	352	if ($::CFG->{shift_fire_stop}) {
224	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	353	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
225	$::CONN->user_send ("fire_stop");	354	$::CONN->user_send ("fire_stop");
226	delete $self->{fire_dir};	355	delete $self->{fire_dir};
227	$res = 1;	356	$res = 1;
228	}	357	}
229	} else {	358	} else {
230	if (exists $DIR{$sym} && delete $self->{shft}) {	359	if (exists $DIR{$sym} && delete $self->{shft}) {
231	$::CONN->user_send ("fire_stop");	360	$::CONN->user_send ("fire_stop");
232	delete $self->{fire_dir};	361	delete $self->{fire_dir};
233	$res = 1;	362	$res = 1;
234	} elsif (($sym == CFClient::SDLK_LSHIFT \|\| $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?	363	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
235	$::CONN->user_send ("fire_stop");	364	$::CONN->user_send ("fire_stop");
236	delete $self->{fire_dir};	365	delete $self->{fire_dir};
237	$res = 1;	366	$res = 1;
238	}	367	}
239	}	368	}
240		369
241	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	370	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
242	$::CONN->user_send ("run_stop");	371	$::CONN->user_send ("run_stop");
243	$res = 1;	372	$res = 1;
244	}	373	}
245		374
246	$res	375	$res
247	}	376	}
248		377
		378	sub invoke_visibility_change {
		379	my ($self) = @_;
		380
		381	$self->refresh_hook;
		382
		383	0
		384	}
		385
		386	sub set_magicmap {
		387	my ($self, $w, $h, $x, $y, $data) = @_;
		388
		389	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
		390	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
		391
		392	$self->{magicmap} = [$x, $y, $w, $h, $data];
		393
		394	$self->update;
		395	}
		396
		397	sub refresh_hook {
		398	my ($self) = @_;
		399
		400	if ($::MAP && $::CONN) {
		401	if (delete $self->{need_update}) {
		402	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		403
		404	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		405	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		406
		407	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
		408	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
		409
		410	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		411	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		412
		413	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		414	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
		415
		416	if ($::CFG->{fow_enable}) {
		417	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
		418
		419	$self->{fow_texture} = new CFPlus::Texture
		420	w => $w,
		421	h => $h,
		422	data => $data,
		423	internalformat => GL_ALPHA,
		424	format => GL_ALPHA;
		425	} else {
		426	delete $self->{fow_texture};
		427	}
		428
		429	glNewList ($self->{list} \|\|= glGenList);
		430
		431	glPushMatrix;
		432	glTranslate $sx0, $sy0;
		433	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		434
		435	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
		436
		437	glScale $self->{tilesize}, $self->{tilesize};
		438
		439	if (my $tex = $self->{fow_texture}) {
		440	glPushMatrix;
		441	glScale 1/3, 1/3;
		442	glEnable GL_TEXTURE_2D;
		443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		444
		445	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
		446	$self->{fow_texture}->draw_quad_alpha (0, 0);
		447
		448	glDisable GL_TEXTURE_2D;
		449	glPopMatrix;
		450	}
		451
		452	if ($self->{magicmap}) {
		453	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		454
		455	$x += $::MAP->ox + $self->{dx};
		456	$y += $::MAP->oy + $self->{dy};
		457
		458	glTranslate - $x - 1, - $y - 1;
		459	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		460	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		461	}
		462
		463	glPopMatrix;
		464	glEndList;
		465	}
		466	} else {
		467	glDeleteList delete $self->{list}
		468	if $self->{list};
		469	}
		470	}
		471
249	sub draw {	472	sub draw {
250	my ($self) = @_;	473	my ($self) = @_;
251		474
252	return unless $::MAP;	475	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
253		476
		477	return unless $self->{list};
		478
254	my $focused = $CFClient::UI::FOCUS == $self	479	my $focused = $CFPlus::UI::FOCUS == $self
255	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};	480	\|\| $CFPlus::UI::FOCUS == $::COMPLETER->{entry};
256		481
257	return	482	return
258	unless $focused \|\| !$::FAST;	483	unless $focused \|\| !$::FAST;
259		484
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};	485	glCallList $self->{list};
325	glPopMatrix;
326		486
327	# TNT2 emulates logops in software (or worse :)	487	# TNT2 emulates logops in software (or worse :)
328	unless ($focused) {	488	unless ($focused) {
329	glColor 0.4, 0.2, 0.2, 0.6;	489	glColor_premultiply 0, 0, 1, 0.25;
330	glEnable GL_BLEND;	490	glEnable GL_BLEND;
331	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	491	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
332	glBegin GL_QUADS;	492	glBegin GL_QUADS;
333	glVertex 0, 0;	493	glVertex 0, 0;
334	glVertex 0, $::HEIGHT;	494	glVertex 0, $::HEIGHT;
335	glVertex $::WIDTH, $::HEIGHT;	495	glVertex $::WIDTH, $::HEIGHT;
336	glVertex $::WIDTH, 0;	496	glVertex $::WIDTH, 0;
…		…
345	glDeleteList $self->{list};	505	glDeleteList $self->{list};
346		506
347	$self->SUPER::DESTROY;	507	$self->SUPER::DESTROY;
348	}	508	}
349		509
350	package CFClient::MapWidget::MapMap;	510	package CFPlus::MapWidget::MapMap;
351		511
		512	use strict;
		513	use utf8;
		514
352	our @ISA = CFClient::UI::Base::;	515	our @ISA = CFPlus::UI::Base::;
353		516
354	use Time::HiRes qw(time);	517	use Time::HiRes qw(time);
355	use CFClient::OpenGL;	518	use CFPlus::OpenGL;
356		519
357	sub size_request {	520	sub size_request {
358	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	521	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
359	}	522	}
360		523
		524	sub refresh_hook {
		525	my ($self) = @_;
		526
		527	if ($::MAP && $self->{texture_atime} < time) {
		528	my ($w, $h) = @$self{qw(w h)};
		529
		530	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		531	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		532
		533	my $ox = 0.5 * ($w - $sw);
		534	my $oy = 0.5 * ($h - $sh);
		535
		536	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		537	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		538
		539	#TODO: map scale is completely borked
		540
		541	my $x0 = int $ox - $sx + 0.5;
		542	my $y0 = int $oy - $sy + 0.5;
		543
		544	$self->{sw} = $sw;
		545	$self->{sh} = $sh;
		546
		547	$self->{x0} = $x0;
		548	$self->{y0} = $y0;
		549
		550	$self->{texture_atime} = time + 1/3;
		551
		552	$self->{texture} =
		553	new CFPlus::Texture
		554	w => $w,
		555	h => $h,
		556	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		557	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		558	}
		559	}
		560
		561	sub invoke_visibility_change {
		562	my ($self) = @_;
		563
		564	$self->refresh_hook;
		565
		566	0
		567	}
		568
361	sub size_allocate {	569	sub invoke_size_allocate {
362	my ($self, $w, $h) = @_;	570	my ($self, $w, $h) = @_;
363		571
364	$self->SUPER::size_allocate ($w, $h);
365	$self->update;	572	$self->update;
		573
		574	1
366	}	575	}
367		576
368	sub update {	577	sub update {
369	my ($self) = @_;	578	my ($self) = @_;
370		579
…		…
373	}	582	}
374		583
375	sub _draw {	584	sub _draw {
376	my ($self) = @_;	585	my ($self) = @_;
377		586
378	$::MAP or return;	587	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
379		588
380	my ($w, $h) = @$self{qw(w h)};	589	$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		590
391	glEnable GL_BLEND;	591	glEnable GL_BLEND;
392	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	592	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
393	glEnable GL_TEXTURE_2D;	593	glEnable GL_TEXTURE_2D;
394	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	594	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
395		595
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);	596	$self->{texture}->draw_quad (0, 0);
408		597
409	glDisable GL_TEXTURE_2D;	598	glDisable GL_TEXTURE_2D;
410		599
411	glTranslate 0.375, 0.375;	600	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		601
418	glColor 1, 1, 0, 1;	602	glColor 1, 1, 0, 1;
419	glBegin GL_LINE_LOOP;	603	glBegin GL_LINE_LOOP;
420	glVertex $x0 , $y0 ;	604	glVertex $self->{x0} , $self->{y0} ;
421	glVertex $x0 , $y0 + $sh;	605	glVertex $self->{x0} , $self->{y0} + $self->{sh};
422	glVertex $x0 + $sw, $y0 + $sh;	606	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
423	glVertex $x0 + $sw, $y0 ;	607	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
424	glEnd;	608	glEnd;
425		609
426	glDisable GL_BLEND;	610	glDisable GL_BLEND;
427	}	611	}
428		612
429	package CFClient::MapWidget::Command;	613	package CFPlus::MapWidget::Command;
430		614
431	use strict;	615	use strict;
432		616
433	use CFClient::OpenGL;	617	use CFPlus::OpenGL;
434		618
435	our @ISA = CFClient::UI::Frame::;	619	our @ISA = CFPlus::UI::Frame::;
436		620
437	sub new {	621	sub new {
438	my $class = shift;	622	my $class = shift;
439		623
440	my $self = $class->SUPER::new (	624	my $self = $class->SUPER::new (
441	bg => [0, 0, 0, 0.8],	625	bg => [0, 0, 0, 0.8],
442	@_,	626	@_,
443	);	627	);
444		628
445	$self->add ($self->{vbox} = new CFClient::UI::VBox);	629	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
446		630
447	$self->{label} = [	631	$self->{label} = [
448	map	632	map
449	CFClient::UI::Label->new (	633	CFPlus::UI::Label->new (
450	can_hover => 1,	634	can_hover => 1,
451	can_events => 1,	635	can_events => 1,
452	tooltip_width => 0.33,	636	tooltip_width => 0.33,
453	fontsize => $_,	637	fontsize => $_,
454	), (0.8) x 16	638	), (0.8) x 16
455	];	639	];
456		640
457	$self->{entry} = new CFClient::UI::Entry	641	$self->{entry} = new CFPlus::UI::Entry
458	on_changed => sub {	642	on_changed => sub {
459	$self->update_labels;	643	$self->update_labels;
		644	0
460	},	645	},
461	on_button_down => sub {	646	on_button_down => sub {
462	my ($entry, $ev, $x, $y) = @_;	647	my ($entry, $ev, $x, $y) = @_;
463		648
464	if ($ev->{button} == 3) {	649	if ($ev->{button} == 3) {
465	(new CFClient::UI::Menu	650	(new CFPlus::UI::Menu
466	items => [	651	items => [
467	["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }]	652	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
		653	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
468	],	654	],
469	)->popup ($ev);	655	)->popup ($ev);
470	return 1;	656	return 1;
471	}	657	}
472	0	658	0
…		…
479	if ($ev->{sym} == 13) {	665	if ($ev->{sym} == 13) {
480	if (exists $self->{select}) {	666	if (exists $self->{select}) {
481	$self->{last_command} = $self->{select};	667	$self->{last_command} = $self->{select};
482	$::CONN->user_send ($self->{select});	668	$::CONN->user_send ($self->{select});
483		669
484	unshift @{$self->{history}}, $self->{select};	670	unshift @{$self->{history}}, $self->{entry}->get_text;
485	$self->{hist_ptr} = 0;	671	$self->{hist_ptr} = 0;
486		672
487	$self->hide;	673	$self->hide;
488	}	674	}
489	} elsif ($ev->{sym} == 27) {	675	} elsif ($ev->{sym} == 27) {
490	$self->{hist_ptr} = 0;	676	$self->{hist_ptr} = 0;
491	$self->hide;	677	$self->hide;
492	return;
493	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {	678	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
494	if ($self->{hist_ptr} > 1) {	679	if ($self->{hist_ptr} > 1) {
495	$self->{hist_ptr}--;	680	$self->{hist_ptr}--;
496	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);	681	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
497	} elsif ($self->{hist_ptr} > 0) {	682	} elsif ($self->{hist_ptr} > 0) {
498	$self->{hist_ptr}--;	683	$self->{hist_ptr}--;
…		…
500	} else {	685	} else {
501	++$self->{select_offset}	686	++$self->{select_offset}
502	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	687	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
503	}	688	}
504	$self->update_labels;	689	$self->update_labels;
505	} elsif ($ev->{sym} == CFClient::SDLK_UP) {	690	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {
506	if ($self->{select_offset}) {	691	if ($self->{select_offset}) {
507	--$self->{select_offset}	692	--$self->{select_offset}
508	} else {	693	} else {
509	unless ($self->{hist_ptr}) {	694	unless ($self->{hist_ptr}) {
510	$self->{hist_saveback} = $self->{entry}->get_text;	695	$self->{hist_saveback} = $self->{entry}->get_text;
…		…
537		722
538	$self->{entry}->set_text ($prefix);	723	$self->{entry}->set_text ($prefix);
539	$self->show;	724	$self->show;
540	}	725	}
541		726
542	sub size_allocate {	727	sub invoke_size_allocate {
543	my ($self, $w, $h) = @_;	728	my ($self, $w, $h) = @_;
544		729
545	$self->SUPER::size_allocate ($w, $h);
546	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	730	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		731
		732	$self->SUPER::invoke_size_allocate ($w, $h)
547	}	733	}
548		734
549	sub show {	735	sub show {
550	my ($self) = @_;	736	my ($self) = @_;
551		737
552	$self->SUPER::show;	738	$self->SUPER::show;
553	$self->{entry}->focus_in;	739	$self->{entry}->grab_focus;
554	}	740	}
555		741
556	sub hide {	742	sub hide {
557	my ($self) = @_;	743	my ($self) = @_;
		744
		745	$self->{hist_ptr} = 0;
558		746
559	$self->SUPER::hide;	747	$self->SUPER::hide;
560	$self->{entry}->set_text ("");	748	$self->{entry}->set_text ("");
561	}	749	}
562		750
563	sub key_down {	751	sub inject_key_down {
564	my ($self, $ev) = @_;	752	my ($self, $ev) = @_;
565		753
		754	$self->{entry}->grab_focus;
566	$self->{entry}->key_down ($ev)	755	$self->{entry}->emit (key_down => $ev);
567	}	756	}
568		757
569	sub update_labels {	758	sub update_labels {
570	my ($self) = @_;	759	my ($self) = @_;
571		760
…		…
658	$label->set_text ("");	847	$label->set_text ("");
659	$label->set_tooltip ("");	848	$label->set_tooltip ("");
660	}	849	}
661		850
662	$self->update;	851	$self->update;
663	###
664	}	852	}
665		853
666	sub _draw {	854	sub _draw {
667	my ($self) = @_;	855	my ($self) = @_;
668		856
669	# hack	857	# hack
670	local $CFClient::UI::FOCUS = $self->{entry};	858	local $CFPlus::UI::FOCUS = $self->{entry};
671		859
672	$self->SUPER::_draw;	860	$self->SUPER::_draw;
673	}	861	}
674		862
675	1	863	1
		864

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.121 by root, Tue Aug 28 16:26:13 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.121 by root, Tue Aug 28 16:26:13 2007 UTC