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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.58 by elmex, Tue Jun 13 14:35:17 2006 UTC vs.
Revision 1.114 by root, Mon Jul 23 23:52:41 2007 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.58 by elmex, Tue Jun 13 14:35:17 2006 UTC vs. Revision 1.114 by root, Mon Jul 23 23:52:41 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.58 by elmex, Tue Jun 13 14:35:17 2006 UTC vs.
Revision 1.114 by root, Mon Jul 23 23:52:41 2007 UTC