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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.31 by root, Fri May 19 23:18:42 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
		37	$self->{completer} = new CFPlus::MapWidget::Command::
		38	command => $self->{command},
		39	tooltip => "#completer_help",
		40	;
		41
22	$self	42	$self
23	}	43	}
24		44
25	sub DESTROY {	45	sub set_tilesize {
		46	my ($self, $tilesize) = @_;
		47
		48	$self->{tilesize} = $tilesize;
		49	}
		50
		51	sub add_command {
		52	my ($self, $command, $tooltip, $widget, $cb) = @_;
		53
		54	(my $data = $command) =~ s/\\//g;
		55
		56	$tooltip =~ s/^\s+//;
		57	$tooltip = "<big>$data</big>\n\n$tooltip";
		58	$tooltip =~ s/\s+$//;
		59
		60	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
		61	}
		62
		63	sub clr_commands {
26	my $self = shift;	64	my ($self) = @_;
27		65
28	glDeleteList $self->{list};	66	%{$self->{completer}{command}} = ();
29		67
30	$self->SUPER::DESTROY;	68	$self->{completer}->hide
		69	if $self->{completer};
31	}	70	}
32		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
33	sub button_down {	182	sub invoke_button_down {
34	my ($self, $ev, $x, $y) = @_;	183	my ($self, $ev, $x, $y) = @_;
35		184
36	$self->focus_in;
37
38	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
39	my ($ox, $oy) = ($ev->{x}, $ev->{y});	207	my ($ox, $oy) = ($ev->{x}, $ev->{y});
40	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	208	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
41		209
42	$self->{motion} = sub {	210	$self->{motion} = sub {
43	my ($ev, $x, $y) = @_;	211	my ($ev, $x, $y) = @_;
47	$::CFG->{map_shift_x} = $bw + $x - $ox;	215	$::CFG->{map_shift_x} = $bw + $x - $ox;
48	$::CFG->{map_shift_y} = $bh + $y - $oy;	216	$::CFG->{map_shift_y} = $bh + $y - $oy;
49		217
50	$self->update;	218	$self->update;
51	};	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
52	}	273	1
53	}	274	}
54		275
55	sub button_up {	276	sub invoke_button_up {
56	my ($self, $ev, $x, $y) = @_;	277	my ($self, $ev, $x, $y) = @_;
57		278
58	delete $self->{motion};	279	delete $self->{motion};
59	}
60		280
		281	1
		282	}
		283
61	sub mouse_motion {	284	sub invoke_mouse_motion {
62	my ($self, $ev, $x, $y) = @_;	285	my ($self, $ev, $x, $y) = @_;
63		286
		287	if ($self->{motion}) {
64	$self->{motion}->($ev, $x, $y) if $self->{motion};	288	$self->{motion}->($ev, $x, $y);
		289	} else {
		290	return 0;
		291	}
		292
		293	1
65	}	294	}
66		295
67	sub size_request {	296	sub size_request {
		297	my ($self) = @_;
		298
68	(	299	(
69	1 + 32 * int $::WIDTH / 32,	300	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
70	1 + 32 * int $::HEIGHT / 32,	301	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
71	)	302	)
72	}	303	}
73		304
74	sub update {	305	sub update {
75	my ($self) = @_;	306	my ($self) = @_;
76		307
77	$self->{need_update} = 1;	308	$self->{need_update} = 1;
78	$self->SUPER::update;	309	$self->SUPER::update;
79	}	310	}
80		311
		312	my %DIR = (
		313	CFPlus::SDLK_KP5, [0, "stay fire"],
		314	CFPlus::SDLK_KP8, [1, "north"],
		315	CFPlus::SDLK_KP9, [2, "northeast"],
		316	CFPlus::SDLK_KP6, [3, "east"],
		317	CFPlus::SDLK_KP3, [4, "southeast"],
		318	CFPlus::SDLK_KP2, [5, "south"],
		319	CFPlus::SDLK_KP1, [6, "southwest"],
		320	CFPlus::SDLK_KP4, [7, "west"],
		321	CFPlus::SDLK_KP7, [8, "northwest"],
		322
		323	CFPlus::SDLK_UP, [1, "north"],
		324	CFPlus::SDLK_RIGHT, [3, "east"],
		325	CFPlus::SDLK_DOWN, [5, "south"],
		326	CFPlus::SDLK_LEFT, [7, "west"],
		327	);
		328
		329	sub invoke_key_down {
		330	my ($self, $ev) = @_;
		331
		332	my $mod = $ev->{mod};
		333	my $sym = $ev->{sym};
		334	my $uni = $ev->{unicode};
		335
		336	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
		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
		355	} elsif ($uni == ord ",") {
		356	$::CONN->user_send ("take");
		357	} elsif ($uni == ord " ") {
		358	$::CONN->user_send ("apply");
		359	} elsif ($uni == 13) {
		360	$::CONN->user_send ("examine");
		361	} elsif ($uni == ord ".") {
		362	$::CONN->user_send ($self->{completer}{last_command})
		363	if exists $self->{completer}{last_command};
		364	} elsif (my @macros = CFPlus::Macro::match_event $ev) {
		365	$::CONN->macro_send ($_) for @macros;
		366	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
		367	$::CONN->user_send ("rotateshoottype +");
		368	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
		369	$::CONN->user_send ("rotateshoottype -");
		370	} elsif ($uni == ord '!') {
		371	$self->{completer}->set_prefix ("shout ");
		372	$self->{completer}->show;
		373	} elsif ($uni == ord '"') {
		374	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
		375	$self->{completer}->show;
		376	} elsif ($uni == ord "'") {
		377	$self->{completer}->set_prefix ("");
		378	$self->{completer}->show;
		379	} elsif (exists $DIR{$sym}) {
		380	if ($mod & CFPlus::KMOD_SHIFT) {
		381	$self->{shft}++;
		382	if ($DIR{$sym}[0] != $self->{fire_dir}) {
		383	$::CONN->user_send ("fire $DIR{$sym}[0]");
		384	}
		385	$self->{fire_dir} = $DIR{$sym}[0];
		386	} elsif ($mod & CFPlus::KMOD_CTRL) {
		387	$self->{ctrl}++;
		388	$::CONN->user_send ("run $DIR{$sym}[0]");
		389	} else {
		390	$::CONN->user_send ("$DIR{$sym}[1]");
		391	}
		392	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
		393	$self->{completer}->inject_key_down ($ev);
		394	$self->{completer}->show;
		395	} else {
		396	return 0;
		397	}
		398
		399	1
		400	}
		401
		402	sub invoke_key_up {
		403	my ($self, $ev) = @_;
		404
		405	my $res = 0;
		406	my $mod = $ev->{mod};
		407	my $sym = $ev->{sym};
		408
		409	if ($::CFG->{shift_fire_stop}) {
		410	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
		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	}
		425	}
		426
		427	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
		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
		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
		529	}
		530
81	sub draw {	531	sub draw {
82	my ($self) = @_;	532	my ($self) = @_;
83		533
		534	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		535
		536	return unless $self->{list};
		537
		538	my $focused = $CFPlus::UI::FOCUS == $self
		539	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
		540
84	return	541	return
85	unless $CFClient::UI::FOCUS == $self \|\| !$::FAST;	542	unless $focused \|\| !$::FAST;
86		543
87	if (delete $self->{need_update}) {
88	glNewList $self->{list};
89
90	if ($::MAP) {
91	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
92	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
93
94	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
95	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
96
97	glPushMatrix;
98	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
99
100	glTranslate $sx0 - 32, $sy0 - 32, 0;
101
102	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
103
104	if ($::CFG->{fow_enable}) {
105	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
106	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
107	glConvolutionFilter2D (
108	GL_CONVOLUTION_2D,
109	GL_ALPHA,
110	3, 3,
111	GL_ALPHA, GL_FLOAT,
112	pack "f*",
113	0.05, 0.13, 0.05,
114	0.13, 0.30, 0.13,
115	0.05, 0.13, 0.05,
116	);
117	glEnable GL_CONVOLUTION_2D;
118	}
119
120	# try to re-use the texture name: TODO improve texture class instead
121	my $prev_name = ((delete $self->{fow_texture}) \|\| {})->{name};
122
123	$self->{fow_texture} = new CFClient::Texture
124	w => $w,
125	h => $h,
126	data => $data,
127	name => $prev_name, # a bit hackish
128	internalformat => GL_ALPHA,
129	format => GL_ALPHA;
130
131	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
132
133	glEnable GL_TEXTURE_2D;
134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
135
136	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
137	$self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
138
139	glDisable GL_TEXTURE_2D;
140	}
141
142	glPopMatrix;
143	}
144
145	glEndList;
146	}
147
148	glPushMatrix;
149	glCallList $self->{list};	544	glCallList $self->{list};
150	glPopMatrix;
151		545
152	# TNT2 emulates logops in software (or worse :)	546	# TNT2 emulates logops in software (or worse :)
153	if ($CFClient::UI::FOCUS != $self) {	547	unless ($focused) {
154	glColor 0.4, 0.2, 0.2, 0.9;	548	glColor 0.4, 0.2, 0.2, 0.6;
155	glEnable GL_BLEND;	549	glEnable GL_BLEND;
156	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	550	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
157	glBegin GL_QUADS;	551	glBegin GL_QUADS;
158	glVertex 0, 0;	552	glVertex 0, 0;
159	glVertex 0, $::HEIGHT;	553	glVertex 0, $::HEIGHT;
…		…
162	glEnd;	556	glEnd;
163	glDisable GL_BLEND;	557	glDisable GL_BLEND;
164	}	558	}
165	}	559	}
166		560
167	my %DIR = (	561	sub DESTROY {
168	CFClient::SDLK_KP8, [1, "north"],
169	CFClient::SDLK_KP9, [2, "northeast"],
170	CFClient::SDLK_KP6, [3, "east"],
171	CFClient::SDLK_KP3, [4, "southeast"],
172	CFClient::SDLK_KP2, [5, "south"],
173	CFClient::SDLK_KP1, [6, "southwest"],
174	CFClient::SDLK_KP4, [7, "west"],
175	CFClient::SDLK_KP7, [8, "northwest"],
176
177	CFClient::SDLK_UP, [1, "north"],
178	CFClient::SDLK_RIGHT, [3, "east"],
179	CFClient::SDLK_DOWN, [5, "south"],
180	CFClient::SDLK_LEFT, [7, "west"],
181	);
182
183	sub key_down {
184	my ($self, $ev) = @_;
185
186	return unless $::CONN;
187
188	my $mod = $ev->{mod};
189	my $sym = $ev->{sym};
190	my $uni = $ev->{unicode};
191
192	if ($sym == CFClient::SDLK_KP5) {
193	$::CONN->user_send ("stay fire");
194	} elsif ($uni == ord ",") {
195	$::CONN->user_send ("take");
196	} elsif ($uni == ord "\t" or $uni == ord " ") {
197	$::CONN->user_send ("apply");
198	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
199	$::CONN->user_send ("rotateshoottype +");
200	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
201	$::CONN->user_send ("rotateshoottype -");
202	} elsif ($uni == ord "'") {
203	$self->emit ('activate_console');
204	} elsif ($uni == ord "/") {
205	$self->emit (activate_console => '/');
206	} elsif (exists $DIR{$sym}) {
207	if ($mod & CFClient::KMOD_SHIFT) {
208	$self->{shft}++;
209	$::CONN->user_send ("fire $DIR{$sym}[0]");
210	} elsif ($mod & CFClient::KMOD_CTRL) {
211	$self->{ctrl}++;
212	$::CONN->user_send ("run $DIR{$sym}[0]");
213	} else {
214	$::CONN->user_send ("$DIR{$sym}[1]");
215	}
216	} elsif ($ev->{unicode}) {
217	$self->{command_widget} \|\|=
218	new CFClient::MapWidget::Command::
219	command => $self->{command},
220	can_focus => 1,
221	connect_execute => sub {
222	# todo: support callback instead of user_send
223	$::CONN->user_send ($_[1]);
224	},
225	connect_close => sub {
226	(delete $self->{command_widget})->hide;
227	$self->focus_in;
228	},
229	;
230	$self->{command_widget}->key_down ($ev)
231	unless $ev->{unicode} == 20;
232	return unless $self->{command_widget};
233	$self->{command_widget}->show;
234	$self->{command_widget}->focus_in;
235	}
236	}
237
238	sub key_up {
239	my ($self, $ev) = @_;
240
241	my $mod = $ev->{mod};
242	my $sym = $ev->{sym};
243
244	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
245	$::CONN->user_send ("fire_stop");
246	}
247	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
248	$::CONN->user_send ("run_stop");
249	}
250	}
251
252	sub add_command {
253	my ($self, $command, $tooltip, $widget, $cb) = @_;
254
255	(my $data = $command) =~ s/\\//g;
256
257	$tooltip =~ s/^\s+//;
258
259	$tooltip = "<big>$data</big>\n\n$tooltip";
260
261	$tooltip =~ s/\s+$//;
262
263	$self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
264	}
265
266	sub clr_commands {
267	my ($self) = @_;	562	my $self = shift;
268		563
269	%{$self->{command}} = ();	564	glDeleteList $self->{list};
270	}
271		565
		566	$self->SUPER::DESTROY;
		567	}
		568
272	package CFClient::MapWidget::MapMap;	569	package CFPlus::MapWidget::MapMap;
273		570
		571	use strict;
		572	use utf8;
		573
274	our @ISA = CFClient::UI::Base::;	574	our @ISA = CFPlus::UI::Base::;
275		575
276	use Time::HiRes qw(time);	576	use Time::HiRes qw(time);
277	use CFClient::OpenGL;	577	use CFPlus::OpenGL;
278		578
279	sub size_request {	579	sub size_request {
280	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	580	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
281	}	581	}
282		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
283	sub size_allocate {	628	sub invoke_size_allocate {
284	my ($self, $w, $h) = @_;	629	my ($self, $w, $h) = @_;
285		630
286	$self->SUPER::size_allocate ($w, $h);
287	$self->update;	631	$self->update;
		632
		633	1
288	}	634	}
289		635
290	sub update {	636	sub update {
291	my ($self) = @_;	637	my ($self) = @_;
292		638
…		…
295	}	641	}
296		642
297	sub _draw {	643	sub _draw {
298	my ($self) = @_;	644	my ($self) = @_;
299		645
300	$::MAP or return;	646	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
301		647
302	my ($w, $h) = @$self{qw(w h)};	648	$self->{texture} or return;
303
304	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
305	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
306
307	my $sx = int $::CFG->{map_shift_x} / 32;
308	my $sy = int $::CFG->{map_shift_y} / 32;
309
310	my $ox = 0.5 * ($w - $sw);
311	my $oy = 0.5 * ($h - $sh);
312		649
313	glEnable GL_BLEND;	650	glEnable GL_BLEND;
314	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	651	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
315	glEnable GL_TEXTURE_2D;	652	glEnable GL_TEXTURE_2D;
316	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
317		654
318	if ($self->{texture_atime} < time) {
319	$self->{texture_atime} = time + 1/3;
320
321	$self->{texture} =
322	new CFClient::Texture
323	w => $w,
324	h => $h,
325	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
326	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
327	}
328
329	$self->{texture}->draw_quad (0, 0);	655	$self->{texture}->draw_quad (0, 0);
330		656
331	glDisable GL_TEXTURE_2D;	657	glDisable GL_TEXTURE_2D;
332		658
333	glTranslate 0.375, 0.375;	659	glTranslate 0.375, 0.375;
334
335	#TODO: map scale is completely borked
336
337	my $x0 = int $ox - $sx + 0.5;
338	my $y0 = int $oy - $sy + 0.5;
339		660
340	glColor 1, 1, 0, 1;	661	glColor 1, 1, 0, 1;
341	glBegin GL_LINE_LOOP;	662	glBegin GL_LINE_LOOP;
342	glVertex $x0 , $y0 ;	663	glVertex $self->{x0} , $self->{y0} ;
343	glVertex $x0 , $y0 + $sh;	664	glVertex $self->{x0} , $self->{y0} + $self->{sh};
344	glVertex $x0 + $sw, $y0 + $sh;	665	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
345	glVertex $x0 + $sw, $y0 ;	666	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
346	glEnd;	667	glEnd;
347		668
348	glDisable GL_BLEND;	669	glDisable GL_BLEND;
349	}	670	}
350		671
351	package CFClient::MapWidget::Command;	672	package CFPlus::MapWidget::Command;
352		673
353	use strict;	674	use strict;
354		675
355	use CFClient::OpenGL;	676	use CFPlus::OpenGL;
356		677
357	our @ISA = CFClient::UI::Frame::;	678	our @ISA = CFPlus::UI::Frame::;
358		679
359	sub new {	680	sub new {
360	my $class = shift;	681	my $class = shift;
361		682
362	my $self = $class->SUPER::new (	683	my $self = $class->SUPER::new (
363	bg => [0, 0, 0, 0.8],	684	bg => [0, 0, 0, 0.8],
364	@_,	685	@_,
365	);	686	);
366		687
367	$self->add ($self->{vbox} = new CFClient::UI::VBox);	688	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
368		689
369	$self->{label} = [	690	$self->{label} = [
370	map	691	map
371	CFClient::UI::Label->new (	692	CFPlus::UI::Label->new (
372	can_hover => 1,	693	can_hover => 1,
373	can_events => 1,	694	can_events => 1,
374	tooltip_width => 0.33,	695	tooltip_width => 0.33,
375	fontsize => $_,	696	fontsize => $_,
376	), (0.8) x 16	697	), (0.8) x 16
377	];	698	];
378		699
379	$self->{entry} = new CFClient::UI::Entry	700	$self->{entry} = new CFPlus::UI::Entry
380	connect_changed => sub {	701	on_changed => sub {
381	$self->update_labels;	702	$self->update_labels;
		703	0
		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	},
		719	on_key_down => sub {
		720	my ($entry, $ev) = @_;
		721
		722	my $self = $entry->{parent}{parent};
		723
		724	if ($ev->{sym} == 13) {
		725	if (exists $self->{select}) {
		726	$self->{last_command} = $self->{select};
		727	$::CONN->user_send ($self->{select});
		728
		729	unshift @{$self->{history}}, $self->{entry}->get_text;
		730	$self->{hist_ptr} = 0;
		731
		732	$self->hide;
		733	}
		734	} elsif ($ev->{sym} == 27) {
		735	$self->{hist_ptr} = 0;
		736	$self->hide;
		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 {
		745	++$self->{select_offset}
		746	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		747	}
		748	$self->update_labels;
		749	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {
		750	if ($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}}) {
		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	}
		762	$self->update_labels;
		763	} else {
		764	return 0;
		765	}
		766
		767	1
382	};	768	}
		769	;
383		770
384	$self->{vbox}->add (	771	$self->{vbox}->add (
385	$self->{entry},	772	$self->{entry},
386	@{$self->{label}},	773	@{$self->{label}},
387	);	774	);
388		775
389	$self	776	$self
390	}	777	}
391		778
		779	sub set_prefix {
		780	my ($self, $prefix) = @_;
		781
		782	$self->{entry}->set_text ($prefix);
		783	$self->show;
		784	}
		785
392	sub size_allocate {	786	sub invoke_size_allocate {
393	my ($self, $w, $h) = @_;	787	my ($self, $w, $h) = @_;
394		788
395	$self->SUPER::size_allocate ($w, $h);
396	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	789	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
397	}
398		790
		791	$self->SUPER::invoke_size_allocate ($w, $h)
		792	}
		793
		794	sub show {
		795	my ($self) = @_;
		796
		797	$self->SUPER::show;
		798	$self->{entry}->grab_focus;
		799	}
		800
		801	sub hide {
		802	my ($self) = @_;
		803
		804	$self->{hist_ptr} = 0;
		805
		806	$self->SUPER::hide;
		807	$self->{entry}->set_text ("");
		808	}
		809
399	sub key_down {	810	sub inject_key_down {
400	my ($self, $ev) = @_;	811	my ($self, $ev) = @_;
401		812
402	if ($ev->{sym} == 13) {	813	$self->{entry}->grab_focus;
403	if (exists $self->{select}) {
404	$self->emit (execute => $self->{select});
405	$self->emit ("close");
406	}
407	} elsif ($ev->{sym} == 27) {
408	$self->{entry}->set_text ("");
409	$self->emit ("close");
410	return;
411	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
412	++$self->{select_offset}
413	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
414	$self->update_labels;
415	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
416	--$self->{select_offset}
417	if $self->{select_offset};
418	$self->update_labels;
419	} else {
420	#$self->{entry}{force_alloc} = 1;
421	$self->{entry}->key_down ($ev);	814	$self->{entry}->emit (key_down => $ev);
422	}
423	}	815	}
424		816
425	sub update_labels {	817	sub update_labels {
426	my ($self) = @_;	818	my ($self) = @_;
427		819
428	my $text = $self->{entry}->get_text;	820	my $text = $self->{entry}->get_text;
429		821
430	length $text	822	length $text
431	or return $self->emit ("close");	823	or return $self->hide;
432		824
433	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;	825	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
434		826
435	if ($cmd ne $self->{last_search}) {	827	if ($text ne $self->{last_search}) {
436	my $regexp = do {
437	my ($beg, @chr) = split //, lc $cmd;
438
439	# the following regex is used to match our "completion entry"
440	# to an actual command - the parentheses match kind of "overhead"
441	# - the more characters the parentheses match, the less attractive
442	# is the match.
443	my $regexp = "^\Q$beg\E"
444	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
445	qr<$regexp>
446	};
447
448	my @match;	828	my @match;
		829
		830	if ($text =~ /^(.*?)\s+$/) {
		831	@match = [$cmd, "(appended whitespace suppresses completion)"];
		832	} else {
		833	my $regexp = do {
		834	my ($beg, @chr) = split //, lc $cmd;
		835
		836	# the following regex is used to match our "completion entry"
		837	# to an actual command - the parentheses match kind of "overhead"
		838	# - the more characters the parentheses match, the less attractive
		839	# is the match.
		840	my $regexp = "^\Q$beg\E"
		841	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		842	qr<$regexp>
		843	};
		844
449	my @penalty;	845	my @penalty;
450		846
451	for (keys %{$self->{command}}) {	847	for (keys %{$self->{command}}) {
452	if (@penalty = $_ =~ $regexp) {	848	if (@penalty = $_ =~ $regexp) {
453	push @match, [$_, length join "", map "::$_", grep defined, @penalty];	849	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		850	}
454	}	851	}
455	}
456		852
457	@match = map $self->{command}{$_->[0]},	853	@match = map $self->{command}{$_->[0]},
458	sort {	854	sort {
459	$a->[1] <=> $b->[1]	855	$a->[1] <=> $b->[1]
460	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]	856	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		857	or (length $b->[0]) <=> (length $a->[0])
461	} @match;	858	} @match;
		859	}
462		860
463	$self->{last_search} = $cmd;	861	$self->{last_search} = $text;
464	$self->{last_match} = \@match;	862	$self->{last_match} = \@match;
465		863
466	$self->{select_offset} = 0;	864	$self->{select_offset} = 0;
467	}	865	}
468		866
…		…
508	$label->set_text ("");	906	$label->set_text ("");
509	$label->set_tooltip ("");	907	$label->set_tooltip ("");
510	}	908	}
511		909
512	$self->update;	910	$self->update;
513	###
514	}	911	}
515		912
516	sub _draw {	913	sub _draw {
517	my ($self) = @_;	914	my ($self) = @_;
518		915
519	# hack	916	# hack
520	local $CFClient::UI::FOCUS = $self->{entry};	917	local $CFPlus::UI::FOCUS = $self->{entry};
521		918
522	$self->SUPER::_draw;	919	$self->SUPER::_draw;
523	}	920	}
524		921
525	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.31 by root, Fri May 19 23:18:42 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.31 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC