[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.133 by root, Sat Jul 19 20:33:47 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_file DC::Texture DC::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	@_	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 = (
		290	( "," . DC::SDLK_KP5 ), [0, "stay fire"],
127	CFClient::SDLK_KP8, [1, "north"],	291	( "," . DC::SDLK_KP8 ), [1, "north"],
128	CFClient::SDLK_KP9, [2, "northeast"],	292	( "," . DC::SDLK_KP9 ), [2, "northeast"],
129	CFClient::SDLK_KP6, [3, "east"],	293	( "," . DC::SDLK_KP6 ), [3, "east"],
130	CFClient::SDLK_KP3, [4, "southeast"],	294	( "," . DC::SDLK_KP3 ), [4, "southeast"],
131	CFClient::SDLK_KP2, [5, "south"],	295	( "," . DC::SDLK_KP2 ), [5, "south"],
132	CFClient::SDLK_KP1, [6, "southwest"],	296	( "," . DC::SDLK_KP1 ), [6, "southwest"],
133	CFClient::SDLK_KP4, [7, "west"],	297	( "," . DC::SDLK_KP4 ), [7, "west"],
134	CFClient::SDLK_KP7, [8, "northwest"],	298	( "," . DC::SDLK_KP7 ), [8, "northwest"],
135		299
136	CFClient::SDLK_UP, [1, "north"],	300	( "," . DC::SDLK_UP ), [1, "north"],
		301	("1," . DC::SDLK_UP ), [2, "northeast"],
137	CFClient::SDLK_RIGHT, [3, "east"],	302	( "," . DC::SDLK_RIGHT), [3, "east"],
		303	("1," . DC::SDLK_RIGHT), [4, "southeast"],
138	CFClient::SDLK_DOWN, [5, "south"],	304	( "," . DC::SDLK_DOWN ), [5, "south"],
		305	("1," . DC::SDLK_DOWN ), [6, "southwest"],
139	CFClient::SDLK_LEFT, [7, "west"],	306	( "," . DC::SDLK_LEFT ), [7, "west"],
		307	("1," . DC::SDLK_LEFT ), [8, "northwest"],
140	);	308	);
141		309
142	sub key_down {	310	sub invoke_key_down {
143	my ($self, $ev) = @_;	311	my ($self, $ev) = @_;
144
145	return 0 unless $::CONN;
146		312
147	my $mod = $ev->{mod};	313	my $mod = $ev->{mod};
148	my $sym = $ev->{sym};	314	my $sym = $ev->{sym};
149	my $uni = $ev->{unicode};	315	my $uni = $ev->{unicode};
150		316
151	if ($sym == CFClient::SDLK_KP5) {	317	$mod &= DC::KMOD_CTRL \| DC::KMOD_ALT \| DC::KMOD_SHIFT;
152	$::CONN->user_send ("stay fire");	318
153	} elsif ($uni == ord ",") {	319	# ignore repeated keypresses
154	$::CONN->user_send ("take");	320	return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
155	} elsif ($uni == ord " ") {	321	$self->{last_mod} = $mod;
156	$::CONN->user_send ("apply");	322	$self->{last_sym} = $sym;
157	} elsif ($uni == ord ".") {	323
158	$::CONN->user_send ($self->{completer}{last_command})	324	if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
159	if exists $self->{completer}{last_command};
160	} elsif ($uni == ord "\t") {
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) {	325	if ($mod & DC::KMOD_SHIFT) {
174	$self->{shft}++;	326	$self->{shft}++;
		327	if ($dir->[0] != $self->{fire_dir}) {
175	$::CONN->user_send ("fire $DIR{$sym}[0]");	328	$::CONN->user_send ("fire $dir->[0]");
		329	}
		330	$self->{fire_dir} = $dir->[0];
176	} elsif ($mod & CFClient::KMOD_CTRL) {	331	} elsif ($mod & DC::KMOD_CTRL) {
177	$self->{ctrl}++;	332	$self->{ctrl}++;
178	$::CONN->user_send ("run $DIR{$sym}[0]");	333	$::CONN->user_send ("run $dir->[0]");
179	} else {	334	} else {
180	$::CONN->user_send ("$DIR{$sym}[1]");	335	$::CONN->user_send ("$dir->[1]");
181	}	336	}
182	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {	337
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;	338	return 1;
201	}
202
203	1	339	}
204	}
205		340
		341	0
		342	}
		343
206	sub key_up {	344	sub invoke_key_up {
207	my ($self, $ev) = @_;	345	my ($self, $ev) = @_;
208		346
209	my $res = 0;	347	my $res = 0;
210	my $mod = $ev->{mod};	348	my $mod = $ev->{mod};
211	my $sym = $ev->{sym};	349	my $sym = $ev->{sym};
212		350
		351	delete $self->{last_mod};
		352	delete $self->{last_sym};
		353
		354	if ($::CFG->{shift_fire_stop}) {
213	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	355	if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
214	$::CONN->user_send ("fire_stop");	356	$::CONN->user_send ("fire_stop");
		357	delete $self->{fire_dir};
215	$res = 1;	358	$res = 1;
		359	}
		360	} else {
		361	if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
		362	$::CONN->user_send ("fire_stop");
		363	delete $self->{fire_dir};
		364	$res = 1;
		365	} elsif (($sym == DC::SDLK_LSHIFT \|\| $sym == DC::SDLK_RSHIFT)
		366	&& delete $self->{shft}) { # XXX: is RSHIFT ok?
		367	$::CONN->user_send ("fire_stop");
		368	delete $self->{fire_dir};
		369	$res = 1;
		370	}
216	}	371	}
217		372
218	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	373	if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
219	$::CONN->user_send ("run_stop");	374	$::CONN->user_send ("run_stop");
220	$res = 1;	375	$res = 1;
221	}	376	}
222		377
223	$res	378	$res
224	}	379	}
225		380
226	sub draw {	381	sub invoke_visibility_change {
		382	my ($self) = @_;
		383
		384	$self->refresh_hook;
		385
		386	0
		387	}
		388
		389	sub set_tilesize {
		390	my ($self, $tilesize) = @_;
		391
		392	$self->{tilesize} = $tilesize;
		393	}
		394
		395	sub scroll {
227	my ($self) = @_;	396	my ($self, $dx, $dy) = @_;
228		397
229	my $focused = $CFClient::UI::FOCUS == $self	398	$::MAP->scroll ($dx, $dy);
230	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
231		399
232	return	400	$self->movement_update;
233	unless $focused \|\| !$::FAST;
234		401
		402	$self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
		403	$self->{sdy} += $dy * $self->{tilesize};
		404	}
		405
		406	sub set_magicmap {
		407	my ($self, $w, $h, $x, $y, $data) = @_;
		408
		409	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
		410	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
		411
		412	$self->{magicmap} = [$x, $y, $w, $h, $data];
		413
		414	$self->update;
		415	}
		416
		417	sub movement_update {
		418	my ($self) = @_;
		419
		420	if ($::CFG->{smooth_movement}) {
		421	if ($self->{sdx} \|\| $self->{sdy}) {
		422	my $diff = EV::time - ($self->{last_update} \|\| $::LAST_REFRESH);
		423	my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
		424
		425	# the minimum time for a single tile movement
		426	my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK);
		427
		428	# jump if "impossibly high" speed
		429	if (
		430	(max abs $self->{sdx}, abs $self->{sdy})
		431	> $spd * $self->{tilesize} * $mintime * 1.1
		432	) {
		433	#warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d#
		434	$self->{sdx} = $self->{sdy} = 0;
		435	} else {
		436	my $upd = 0;
		437
		438	$spd = $self->{tilesize} $diff * 1.0001;
		439
		440	my $dx = $self->{sdx} < 0 ? -$spd : $spd;
		441	my $dy = $self->{sdy} < 0 ? -$spd : $spd;
		442
		443	if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx; $upd = 1 }
		444	if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy; $upd = 1 }
		445
		446	$self->update if $upd;
		447	}
		448	}
		449	} else {
		450	$self->{sdx} = $self->{sdy} = 0;
		451	}
		452
		453	$self->{last_update} = EV::time;
		454	}
		455
		456	sub refresh_hook {
		457	my ($self) = @_;
		458
		459	if ($::MAP && $::CONN) {
235	if (delete $self->{need_update}) {	460	if (delete $self->{need_update}) {
236	glNewList $self->{list};	461	$self->movement_update;
237		462
238	if ($::MAP) {	463	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		464
242	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	465	# width/height of map, in tiles
243	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	466	my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
		467	my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
244		468
245	glPushMatrix;	469	# the map displacement, in tiles
246	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	470	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $self->{sdx} / $self->{tilesize};
		471	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $self->{sdy} / $self->{tilesize};
247		472
248	glTranslate $sx0 - 32, $sy0 - 32, 0;	473	# the upper left "visible" corner, in pixels
		474	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		475	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
249		476
250	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	477	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		478	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
251		479
252	if ($::CFG->{fow_enable}) {	480	if ($::CFG->{fow_enable}) {
253	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war	481	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
254	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
255	glConvolutionFilter2D (
256	GL_CONVOLUTION_2D,
257	GL_ALPHA,
258	3, 3,
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	);
265	glEnable GL_CONVOLUTION_2D;
266	}
267		482
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	483	$self->{fow_texture} = new DC::Texture
272	w => $w,	484	w => $w,
273	h => $h,	485	h => $h,
274	data => $data,	486	data => $data,
275	name => $self->{fow_texture_name},
276	internalformat => GL_ALPHA,	487	internalformat => GL_ALPHA,
277	format => GL_ALPHA;	488	format => GL_ALPHA;
		489	} else {
		490	delete $self->{fow_texture};
		491	}
278		492
279	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	493	glNewList ($self->{list} \|\|= glGenList);
280		494
		495	glPushMatrix;
		496	glTranslate $sx0 + $self->{sdx}, $sy0 + $self->{sdy};
		497	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		498
		499	$::MAP->draw ($dx, $dy, $sw, $sh,
		500	$self->{tilesize},
		501	$::CONN->{player}{tag},
		502	-$self->{sdx}, -$self->{sdy});
		503
		504	glScale $self->{tilesize}, $self->{tilesize};
		505
		506	if (my $tex = $self->{fow_texture}) {
		507	glPushMatrix;
		508	glScale 1/3, 1/3;
281	glEnable GL_TEXTURE_2D;	509	glEnable GL_TEXTURE_2D;
282	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	510	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
283		511
284	glColor +($::CFG->{fow_intensity}) x 3, 0.8;	512	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
285	$self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);	513	$self->{fow_texture}->draw_quad_alpha (0, 0);
286		514
287	glDisable GL_TEXTURE_2D;	515	glDisable GL_TEXTURE_2D;
		516	glPopMatrix;
288	}	517	}
289		518
		519	if ($self->{magicmap}) {
		520	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		521
		522	$x += $::MAP->ox + $self->{dx};
		523	$y += $::MAP->oy + $self->{dy};
		524
		525	glTranslate - $x - 1, - $y - 1;
		526	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		527	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		528	}
		529
290	glPopMatrix;	530	glPopMatrix;
291	}
292
293	glEndList;	531	glEndList;
		532	}
		533	} else {
		534	glDeleteList delete $self->{list}
		535	if $self->{list};
294	}	536	}
		537	}
295		538
296	glPushMatrix;	539	sub draw {
		540	my ($self) = @_;
		541
		542	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		543
		544	return unless $self->{list};
		545
		546	my $focused = $DC::UI::FOCUS == $self
		547	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
		548
		549	return
		550	unless $focused \|\| !$::FAST;
		551
297	glCallList $self->{list};	552	glCallList $self->{list};
298	glPopMatrix;
299		553
300	# TNT2 emulates logops in software (or worse :)	554	# TNT2 emulates logops in software (or worse :)
301	if ($focused) {	555	unless ($focused) {
302	(delete $self->{out_of_focus})->destroy	556	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;	557	glEnable GL_BLEND;
307	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	558	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
308	glBegin GL_QUADS;	559	glBegin GL_QUADS;
309	glVertex 0, 0;	560	glVertex 0, 0;
310	glVertex 0, $::HEIGHT;	561	glVertex 0, $::HEIGHT;
311	glVertex $::WIDTH, $::HEIGHT;	562	glVertex $::WIDTH, $::HEIGHT;
312	glVertex $::WIDTH, 0;	563	glVertex $::WIDTH, 0;
313	glEnd;	564	glEnd;
314	glDisable GL_BLEND;	565	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	}	566	}
337	}	567	}
338		568
339	sub DESTROY {	569	sub DESTROY {
340	my $self = shift;	570	my $self = shift;
…		…
342	glDeleteList $self->{list};	572	glDeleteList $self->{list};
343		573
344	$self->SUPER::DESTROY;	574	$self->SUPER::DESTROY;
345	}	575	}
346		576
347	package CFClient::MapWidget::MapMap;	577	package DC::MapWidget::MapMap;
348		578
		579	use strict;
		580	use utf8;
		581
349	our @ISA = CFClient::UI::Base::;	582	our @ISA = DC::UI::Base::;
350		583
351	use Time::HiRes qw(time);	584	use Time::HiRes qw(time);
352	use CFClient::OpenGL;	585	use DC::OpenGL;
353		586
354	sub size_request {	587	sub size_request {
355	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	588	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
356	}	589	}
357		590
		591	sub refresh_hook {
		592	my ($self) = @_;
		593
		594	if ($::MAP && $self->{texture_atime} < time) {
		595	my ($w, $h) = @$self{qw(w h)};
		596
		597	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		598	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		599
		600	my $ox = 0.5 * ($w - $sw);
		601	my $oy = 0.5 * ($h - $sh);
		602
		603	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		604	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		605
		606	#TODO: map scale is completely borked
		607
		608	my $x0 = int $ox - $sx + 0.5;
		609	my $y0 = int $oy - $sy + 0.5;
		610
		611	$self->{sw} = $sw;
		612	$self->{sh} = $sh;
		613
		614	$self->{x0} = $x0;
		615	$self->{y0} = $y0;
		616
		617	$self->{texture_atime} = time + 1/3;
		618
		619	$self->{texture} =
		620	new DC::Texture
		621	w => $w,
		622	h => $h,
		623	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		624	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		625	}
		626	}
		627
		628	sub invoke_visibility_change {
		629	my ($self) = @_;
		630
		631	$self->refresh_hook;
		632
		633	0
		634	}
		635
358	sub size_allocate {	636	sub invoke_size_allocate {
359	my ($self, $w, $h) = @_;	637	my ($self, $w, $h) = @_;
360		638
361	$self->SUPER::size_allocate ($w, $h);
362	$self->update;	639	$self->update;
		640
		641	1
363	}	642	}
364		643
365	sub update {	644	sub update {
366	my ($self) = @_;	645	my ($self) = @_;
367		646
…		…
370	}	649	}
371		650
372	sub _draw {	651	sub _draw {
373	my ($self) = @_;	652	my ($self) = @_;
374		653
375	$::MAP or return;	654	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
376		655
377	my ($w, $h) = @$self{qw(w h)};	656	$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		657
388	glEnable GL_BLEND;	658	glEnable GL_BLEND;
389	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	659	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
390	glEnable GL_TEXTURE_2D;	660	glEnable GL_TEXTURE_2D;
391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	661	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
392		662
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);	663	$self->{texture}->draw_quad (0, 0);
405		664
406	glDisable GL_TEXTURE_2D;	665	glDisable GL_TEXTURE_2D;
407		666
408	glTranslate 0.375, 0.375;	667	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		668
415	glColor 1, 1, 0, 1;	669	glColor 1, 1, 0, 1;
416	glBegin GL_LINE_LOOP;	670	glBegin GL_LINE_LOOP;
417	glVertex $x0 , $y0 ;	671	glVertex $self->{x0} , $self->{y0} ;
418	glVertex $x0 , $y0 + $sh;	672	glVertex $self->{x0} , $self->{y0} + $self->{sh};
419	glVertex $x0 + $sw, $y0 + $sh;	673	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
420	glVertex $x0 + $sw, $y0 ;	674	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
421	glEnd;	675	glEnd;
422		676
423	glDisable GL_BLEND;	677	glDisable GL_BLEND;
424	}	678	}
425		679
426	package CFClient::MapWidget::Command;	680	package DC::MapWidget::Command;
427		681
428	use strict;	682	use strict;
429		683
430	use CFClient::OpenGL;	684	use DC::OpenGL;
431		685
432	our @ISA = CFClient::UI::Frame::;	686	our @ISA = DC::UI::Frame::;
433		687
434	sub new {	688	sub new {
435	my $class = shift;	689	my $class = shift;
436		690
437	my $self = $class->SUPER::new (	691	my $self = $class->SUPER::new (
438	bg => [0, 0, 0, 0.8],	692	bg => [0, 0, 0, 0.8],
439	@_,	693	@_,
440	);	694	);
441		695
442	$self->add ($self->{vbox} = new CFClient::UI::VBox);	696	$self->add ($self->{vbox} = new DC::UI::VBox);
443		697
444	$self->{label} = [	698	$self->{label} = [
445	map	699	map
446	CFClient::UI::Label->new (	700	DC::UI::Label->new (
		701	align => 0,
447	can_hover => 1,	702	can_hover => 1,
448	can_events => 1,	703	can_events => 1,
449	tooltip_width => 0.33,	704	tooltip_width => 0.33,
450	fontsize => $_,	705	fontsize => $_,
451	), (0.8) x 16	706	), (0.8) x 16
452	];	707	];
453		708
454	$self->{entry} = new CFClient::UI::Entry	709	$self->{entry} = new DC::UI::Entry
455	on_changed => sub {	710	on_changed => sub {
456	$self->update_labels;	711	$self->update_labels;
		712	0
		713	},
		714	on_button_down => sub {
		715	my ($entry, $ev, $x, $y) = @_;
		716
		717	if ($ev->{button} == 3) {
		718	(new DC::UI::Menu
		719	items => [
		720	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
		721	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
		722	],
		723	)->popup ($ev);
		724	return 1;
		725	}
		726	0
457	},	727	},
458	on_key_down => sub {	728	on_key_down => sub {
459	my ($entry, $ev) = @_;	729	my ($entry, $ev) = @_;
460		730
461	my $self = $entry->{parent}{parent};	731	my $self = $entry->{parent}{parent};
462		732
463	if ($ev->{sym} == 13) {	733	if ($ev->{sym} == 13) {
464	if (exists $self->{select}) {	734	if (exists $self->{select}) {
465	$self->{last_command} = $self->{select};	735	$self->{last_command} = $self->{select};
466	$::CONN->user_send ($self->{select});	736	$::CONN->user_send ($self->{select});
		737
		738	unshift @{$self->{history}}, $self->{entry}->get_text;
		739	$self->{hist_ptr} = 0;
		740
467	$self->hide;	741	$self->hide;
468	}	742	}
469	} elsif ($ev->{sym} == 27) {	743	} elsif ($ev->{sym} == 27) {
		744	$self->{hist_ptr} = 0;
470	$self->hide;	745	$self->hide;
471	return;
472	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {	746	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
		747	if ($self->{hist_ptr} > 1) {
		748	$self->{hist_ptr}--;
		749	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
		750	} elsif ($self->{hist_ptr} > 0) {
		751	$self->{hist_ptr}--;
		752	$self->{entry}->set_text ($self->{hist_saveback});
		753	} else {
473	++$self->{select_offset}	754	++$self->{select_offset}
474	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };	755	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		756	}
475	$self->update_labels;	757	$self->update_labels;
476	} elsif ($ev->{sym} == CFClient::SDLK_UP) {	758	} elsif ($ev->{sym} == DC::SDLK_UP) {
		759	if ($self->{select_offset}) {
477	--$self->{select_offset}	760	--$self->{select_offset}
		761	} else {
		762	unless ($self->{hist_ptr}) {
		763	$self->{hist_saveback} = $self->{entry}->get_text;
		764	}
		765	if ($self->{hist_ptr} <= $#{$self->{history}}) {
478	if $self->{select_offset};	766	$self->{hist_ptr}++;
		767	}
		768	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
		769	if exists $self->{history}->[$self->{hist_ptr} - 1];
		770	}
479	$self->update_labels;	771	$self->update_labels;
480	} else {	772	} else {
481	return 0;	773	return 0;
482	}	774	}
483		775
…		…
498		790
499	$self->{entry}->set_text ($prefix);	791	$self->{entry}->set_text ($prefix);
500	$self->show;	792	$self->show;
501	}	793	}
502		794
503	sub size_allocate {	795	sub invoke_size_allocate {
504	my ($self, $w, $h) = @_;	796	my ($self, $w, $h) = @_;
505		797
506	$self->SUPER::size_allocate ($w, $h);
507	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	798	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		799
		800	$self->SUPER::invoke_size_allocate ($w, $h)
508	}	801	}
509		802
510	sub show {	803	sub show {
511	my ($self) = @_;	804	my ($self) = @_;
512		805
513	$self->SUPER::show;	806	$self->SUPER::show;
514	$self->{entry}->focus_in;	807	$self->{entry}->grab_focus;
515	}	808	}
516		809
517	sub hide {	810	sub hide {
518	my ($self) = @_;	811	my ($self) = @_;
		812
		813	$self->{hist_ptr} = 0;
519		814
520	$self->SUPER::hide;	815	$self->SUPER::hide;
521	$self->{entry}->set_text ("");	816	$self->{entry}->set_text ("");
522	}	817	}
523		818
524	sub key_down {	819	sub inject_key_down {
525	my ($self, $ev) = @_;	820	my ($self, $ev) = @_;
526		821
		822	$self->{entry}->grab_focus;
527	$self->{entry}->key_down ($ev)	823	$self->{entry}->emit (key_down => $ev);
528	}	824	}
529		825
530	sub update_labels {	826	sub update_labels {
531	my ($self) = @_;	827	my ($self) = @_;
532		828
…		…
619	$label->set_text ("");	915	$label->set_text ("");
620	$label->set_tooltip ("");	916	$label->set_tooltip ("");
621	}	917	}
622		918
623	$self->update;	919	$self->update;
624	###
625	}	920	}
626		921
627	sub _draw {	922	sub _draw {
628	my ($self) = @_;	923	my ($self) = @_;
629		924
630	# hack	925	# hack
631	local $CFClient::UI::FOCUS = $self->{entry};	926	local $DC::UI::FOCUS = $self->{entry};
632		927
633	$self->SUPER::_draw;	928	$self->SUPER::_draw;
634	}	929	}
635		930
636	1	931	1
		932

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.133 by root, Sat Jul 19 20:33:47 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.133 by root, Sat Jul 19 20:33:47 2008 UTC