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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs. Revision 1.102 by root, Sun Apr 1 15:08:14 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs.
Revision 1.102 by root, Sun Apr 1 15:08:14 2007 UTC