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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.48 by elmex, Sat Jun 3 21:59:55 2006 UTC vs. Revision 1.144 by root, Wed Sep 3 10:08:18 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.48 by elmex, Sat Jun 3 21:59:55 2006 UTC vs.
Revision 1.144 by root, Wed Sep 3 10:08:18 2008 UTC