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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.38 by root, Thu May 25 02:23:14 2006 UTC vs. Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.38 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC