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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.36 by root, Thu May 25 00:26:19 2006 UTC vs. Revision 1.111 by root, Thu Jul 19 14:54:50 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.36 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.111 by root, Thu Jul 19 14:54:50 2007 UTC