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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.50 by root, Sat Jun 3 23:47:47 2006 UTC vs. Revision 1.115 by elmex, Fri Jul 27 18:04:42 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.50 by root, Sat Jun 3 23:47:47 2006 UTC vs.
Revision 1.115 by elmex, Fri Jul 27 18:04:42 2007 UTC