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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.22 by root, Sat May 13 00:27:08 2006 UTC vs.
Revision 1.108 by root, Wed Apr 25 01:12:31 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.05, 0.13, 0.05,
		30	0.13, 0.30, 0.13,
		31	0.05, 0.13, 0.05,
		32	],
		33
19	@_	34	@_
20	);	35	);
21		36
22	$self->add_command ("killpets", "kills all your summoned and charmed creates");	37	$self->{completer} = new CFPlus::MapWidget::Command::
		38	command => $self->{command},
		39	tooltip => "#completer_help",
		40	;
23		41
24	$self	42	$self
25	}	43	}
26		44
27	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 {
28	my $self = shift;	64	my ($self) = @_;
29		65
30	glDeleteList $self->{list};	66	%{$self->{completer}{command}} = ();
31		67
32	$self->SUPER::DESTROY;	68	$self->{completer}->hide
		69	if $self->{completer};
33	}	70	}
34		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
35	sub button_down {	182	sub invoke_button_down {
36	my ($self, $ev, $x, $y) = @_;	183	my ($self, $ev, $x, $y) = @_;
37		184
38	$self->focus_in;
39
40	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
41	my ($ox, $oy) = ($ev->{x}, $ev->{y});	207	my ($ox, $oy) = ($ev->{x}, $ev->{y});
42	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	208	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
43		209
44	$self->{motion} = sub {	210	$self->{motion} = sub {
45	my ($ev, $x, $y) = @_;	211	my ($ev, $x, $y) = @_;
49	$::CFG->{map_shift_x} = $bw + $x - $ox;	215	$::CFG->{map_shift_x} = $bw + $x - $ox;
50	$::CFG->{map_shift_y} = $bh + $y - $oy;	216	$::CFG->{map_shift_y} = $bh + $y - $oy;
51		217
52	$self->update;	218	$self->update;
53	};	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
54	}	273	1
55	}	274	}
56		275
57	sub button_up {	276	sub invoke_button_up {
58	my ($self, $ev, $x, $y) = @_;	277	my ($self, $ev, $x, $y) = @_;
59		278
60	delete $self->{motion};	279	delete $self->{motion};
61	}
62		280
		281	1
		282	}
		283
63	sub mouse_motion {	284	sub invoke_mouse_motion {
64	my ($self, $ev, $x, $y) = @_;	285	my ($self, $ev, $x, $y) = @_;
65		286
		287	if ($self->{motion}) {
66	$self->{motion}->($ev, $x, $y) if $self->{motion};	288	$self->{motion}->($ev, $x, $y);
		289	} else {
		290	return 0;
		291	}
		292
		293	1
67	}	294	}
68		295
69	sub size_request {	296	sub size_request {
		297	my ($self) = @_;
		298
70	(	299	(
71	1 + 32 * int $::WIDTH / 32,	300	$self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
72	1 + 32 * int $::HEIGHT / 32,	301	$self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
73	)	302	)
74	}	303	}
75		304
76	sub update {	305	sub update {
77	my ($self) = @_;	306	my ($self) = @_;
78		307
79	$self->{need_update} = 1;	308	$self->{need_update} = 1;
80	$self->SUPER::update;	309	$self->SUPER::update;
81	}	310	}
82		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 set_magicmap {
		436	my ($self, $w, $h, $x, $y, $data) = @_;
		437
		438	$x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
		439	$y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
		440
		441	$self->{magicmap} = [$x, $y, $w, $h, $data];
		442
		443	$self->update;
		444	}
		445
83	sub draw {	446	sub draw {
84	my ($self) = @_;	447	my ($self) = @_;
85		448
		449	return unless $::MAP;
		450
		451	my $focused = $CFPlus::UI::FOCUS == $self
		452	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
		453
		454	return
		455	unless $focused \|\| !$::FAST;
		456
86	if (delete $self->{need_update}) {	457	if (delete $self->{need_update}) {
		458	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
		459
		460	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		461	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
		462
		463	my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
		464	my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
		465
		466	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		467	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		468
		469	my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		470	my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
		471
		472	if ($::CFG->{fow_enable}) {
		473	my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
		474
		475	if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
		476	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
		477	glConvolutionFilter2D (
		478	GL_CONVOLUTION_2D,
		479	GL_ALPHA,
		480	3, 3,
		481	GL_ALPHA, GL_FLOAT,
		482	(pack "f*", @{ $self->{smooth_matrix} }),
		483	);
		484	glEnable GL_CONVOLUTION_2D;
		485	}
		486
		487	$self->{fow_texture} = new CFPlus::Texture
		488	w => $w,
		489	h => $h,
		490	data => $data,
		491	internalformat => GL_ALPHA,
		492	format => GL_ALPHA;
		493
		494	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		495	} else {
		496	delete $self->{fow_texture};
		497	}
		498
87	glNewList $self->{list};	499	glNewList $self->{list};
88		500
89	if ($::MAP) {
90	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
91	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
92
93	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
94	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
95
96	glPushMatrix;	501	glPushMatrix;
		502	glTranslate $sx0, $sy0;
97	glScale $::CFG->{map_scale}, $::CFG->{map_scale};	503	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
98		504
99	glTranslate $sx0 - 32, $sy0 - 32, 0;	505	$::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
100		506
101	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	507	glScale $self->{tilesize}, $self->{tilesize};
102		508
103	if ($::CFG->{fow_enable}) {	509	if (my $tex = $self->{fow_texture}) {
104	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
105	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
106	glConvolutionFilter2D (
107	GL_CONVOLUTION_2D,
108	GL_ALPHA,
109	3, 3,
110	GL_ALPHA, GL_FLOAT,
111	pack "f*",
112	0.05, 0.13, 0.05,
113	0.13, 0.30, 0.13,
114	0.05, 0.13, 0.05,
115	);
116	glEnable GL_CONVOLUTION_2D;
117	}
118
119	$self->{fow_texture} = new CFClient::Texture
120	w => $w,
121	h => $h,
122	data => $data,
123	internalformat => GL_ALPHA,
124	format => GL_ALPHA;
125
126	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
127
128	glEnable GL_BLEND;
129	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
130	glEnable GL_TEXTURE_2D;	510	glEnable GL_TEXTURE_2D;
131	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
132		512
133	glColor +($::CFG->{fow_intensity}) x 3, 0.8;	513	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
134	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);	514	$self->{fow_texture}->draw_quad_alpha (0, 0);
135		515
136	glDisable GL_TEXTURE_2D;	516	glDisable GL_TEXTURE_2D;
137	glDisable GL_BLEND;
138	}	517	}
139		518
		519	if ($self->{magicmap}) {
		520	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		521
		522	$x += $::MAP->ox + $self->{dx};
		523	$y += $::MAP->oy + $self->{dy};
		524
		525	glTranslate - $x - 1, - $y - 1;
		526	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		527	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		528	}
		529
140	glPopMatrix;	530	glPopMatrix;
141	}
142
143	glEndList;	531	glEndList;
144	}	532	}
145		533
146	glPushMatrix;
147	glCallList $self->{list};	534	glCallList $self->{list};
148	glPopMatrix;
149		535
150	if ($CFClient::UI::FOCUS != $self) {	536	# TNT2 emulates logops in software (or worse :)
151	glColor 64/255, 64/255, 64/255;	537	unless ($focused) {
152	glLogicOp GL_AND;	538	glColor 0.4, 0.2, 0.2, 0.6;
153	glEnable GL_COLOR_LOGIC_OP;	539	glEnable GL_BLEND;
		540	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154	glBegin GL_QUADS;	541	glBegin GL_QUADS;
155	glVertex 0, 0;	542	glVertex 0, 0;
156	glVertex 0, $::HEIGHT;	543	glVertex 0, $::HEIGHT;
157	glVertex $::WIDTH, $::HEIGHT;	544	glVertex $::WIDTH, $::HEIGHT;
158	glVertex $::WIDTH, 0;	545	glVertex $::WIDTH, 0;
159	glEnd;	546	glEnd;
160	glDisable GL_COLOR_LOGIC_OP;	547	glDisable GL_BLEND;
161	}	548	}
162	}	549	}
163		550
164	my %DIR = (	551	sub DESTROY {
165	CFClient::SDLK_KP8, [1, "north"],	552	my $self = shift;
166	CFClient::SDLK_KP9, [2, "northeast"],
167	CFClient::SDLK_KP6, [3, "east"],
168	CFClient::SDLK_KP3, [4, "southeast"],
169	CFClient::SDLK_KP2, [5, "south"],
170	CFClient::SDLK_KP1, [6, "southwest"],
171	CFClient::SDLK_KP4, [7, "west"],
172	CFClient::SDLK_KP7, [8, "northwest"],
173		553
174	CFClient::SDLK_UP, [1, "north"],	554	glDeleteList $self->{list};
175	CFClient::SDLK_RIGHT, [3, "east"],
176	CFClient::SDLK_DOWN, [5, "south"],
177	CFClient::SDLK_LEFT, [7, "west"],
178	);
179		555
180	sub key_down {	556	$self->SUPER::DESTROY;
181	my ($self, $ev) = @_;
182
183	return unless $::CONN;
184
185	my $mod = $ev->{mod};
186	my $sym = $ev->{sym};
187	my $uni = $ev->{unicode};
188
189	if ($sym == CFClient::SDLK_KP5) {
190	$::CONN->user_send ("stay fire");
191	} elsif ($uni == ord ",") {
192	$::CONN->user_send ("take");
193	} elsif ($uni == ord "a") {
194	$::CONN->user_send ("apply");
195	} elsif ($uni == ord "'") {
196	$self->emit ('activate_console');
197	} elsif ($uni == ord "/") {
198	$self->emit (activate_console => '/');
199	} elsif (exists $DIR{$sym}) {
200	if ($mod & CFClient::KMOD_SHIFT) {
201	$self->{shft}++;
202	$::CONN->user_send ("fire $DIR{$sym}[0]");
203	} elsif ($mod & CFClient::KMOD_CTRL) {
204	$self->{ctrl}++;
205	$::CONN->user_send ("run $DIR{$sym}[0]");
206	} else {
207	$::CONN->user_send ("$DIR{$sym}[1]");
208	}
209	} elsif ($ev->{unicode}) {
210	$self->{command_widget} \|\|=
211	new CFClient::MapWidget::Command::
212	command => $self->{command},
213	can_focus => 1,
214	connect_execute => sub {
215	# todo: support callback instead of user_send
216	$::CONN->user_send ($_[1][1]);
217	},
218	connect_close => sub {
219	(delete $self->{command_widget})->hide;
220	$self->focus_in;
221	},
222	;
223	$self->{command_widget}->key_down ($ev);
224	return unless $self->{command_widget};
225	$self->{command_widget}->show;
226	$self->{command_widget}->focus_in;
227	}
228	}	557	}
229		558
230	sub key_up {
231	my ($self, $ev) = @_;
232
233	my $mod = $ev->{mod};
234	my $sym = $ev->{sym};
235
236	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
237	$::CONN->user_send ("fire_stop");
238	}
239	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
240	$::CONN->user_send ("run_stop");
241	}
242	}
243
244	sub add_command {
245	my ($self, $command, $tooltip, $widget, $cb) = @_;
246
247	(my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
248
249	$self->{command} = [
250	[$abbrev, $command, $tooltip, $widget, $cb],
251	grep $_->[1] ne $command, @{ $self->{command} },
252	];
253	}
254
255	package CFClient::MapWidget::MapMap;	559	package CFPlus::MapWidget::MapMap;
256		560
		561	use strict;
		562	use utf8;
		563
257	our @ISA = CFClient::UI::Base::;	564	our @ISA = CFPlus::UI::Base::;
258		565
259	use Time::HiRes qw(time);	566	use Time::HiRes qw(time);
260	use CFClient::OpenGL;	567	use CFPlus::OpenGL;
261		568
262	sub size_request {	569	sub size_request {
263	($::HEIGHT * 0.25, $::HEIGHT * 0.25)	570	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
264	}	571	}
265		572
266	sub size_allocate {	573	sub invoke_size_allocate {
267	my ($self, $w, $h) = @_;	574	my ($self, $w, $h) = @_;
268		575
269	$self->SUPER::size_allocate ($w, $h);
270	$self->update;	576	$self->update;
		577
		578	1
271	}	579	}
272		580
273	sub update {	581	sub update {
274	my ($self) = @_;	582	my ($self) = @_;
275		583
…		…
282		590
283	$::MAP or return;	591	$::MAP or return;
284		592
285	my ($w, $h) = @$self{qw(w h)};	593	my ($w, $h) = @$self{qw(w h)};
286		594
287	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;	595	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
288	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;	596	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
289		597
290	my $sx = int $::CFG->{map_shift_x} / 32;	598	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
291	my $sy = int $::CFG->{map_shift_y} / 32;	599	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
292		600
293	my $ox = 0.5 * ($w - $sw);	601	my $ox = 0.5 * ($w - $sw);
294	my $oy = 0.5 * ($h - $sh);	602	my $oy = 0.5 * ($h - $sh);
295		603
296	glEnable GL_BLEND;	604	glEnable GL_BLEND;
…		…
300		608
301	if ($self->{texture_atime} < time) {	609	if ($self->{texture_atime} < time) {
302	$self->{texture_atime} = time + 1/3;	610	$self->{texture_atime} = time + 1/3;
303		611
304	$self->{texture} =	612	$self->{texture} =
305	new CFClient::Texture	613	new CFPlus::Texture
306	w => $w,	614	w => $w,
307	h => $h,	615	h => $h,
308	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),	616	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
309	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;	617	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
310	}	618	}
311		619
312	$self->{texture}->draw_quad (0, 0);	620	$self->{texture}->draw_quad (0, 0);
313		621
314	glDisable GL_TEXTURE_2D;	622	glDisable GL_TEXTURE_2D;
…		…
329	glEnd;	637	glEnd;
330		638
331	glDisable GL_BLEND;	639	glDisable GL_BLEND;
332	}	640	}
333		641
334	package CFClient::MapWidget::Command;	642	package CFPlus::MapWidget::Command;
335		643
336	use strict;	644	use strict;
337		645
338	use CFClient::OpenGL;	646	use CFPlus::OpenGL;
339		647
340	our @ISA = CFClient::UI::VBox::;	648	our @ISA = CFPlus::UI::Frame::;
341		649
342	sub new {	650	sub new {
343	my $class = shift;	651	my $class = shift;
344		652
345	my $self = $class->SUPER::new (	653	my $self = $class->SUPER::new (
		654	bg => [0, 0, 0, 0.8],
346	@_,	655	@_,
347	children => [map
348	CFClient::UI::Label->new (
349	can_hover => 1,
350	can_events => 1,
351	fontsize => $_,
352	), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
353	],
354	);	656	);
355		657
		658	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
		659
		660	$self->{label} = [
		661	map
		662	CFPlus::UI::Label->new (
		663	can_hover => 1,
		664	can_events => 1,
		665	tooltip_width => 0.33,
		666	fontsize => $_,
		667	), (0.8) x 16
		668	];
		669
		670	$self->{entry} = new CFPlus::UI::Entry
		671	on_changed => sub {
		672	$self->update_labels;
		673	0
		674	},
		675	on_button_down => sub {
		676	my ($entry, $ev, $x, $y) = @_;
		677
		678	if ($ev->{button} == 3) {
		679	(new CFPlus::UI::Menu
		680	items => [
		681	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
		682	=> sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
		683	],
		684	)->popup ($ev);
		685	return 1;
		686	}
		687	0
		688	},
		689	on_key_down => sub {
		690	my ($entry, $ev) = @_;
		691
		692	my $self = $entry->{parent}{parent};
		693
		694	if ($ev->{sym} == 13) {
		695	if (exists $self->{select}) {
		696	$self->{last_command} = $self->{select};
		697	$::CONN->user_send ($self->{select});
		698
		699	unshift @{$self->{history}}, $self->{entry}->get_text;
		700	$self->{hist_ptr} = 0;
		701
		702	$self->hide;
		703	}
		704	} elsif ($ev->{sym} == 27) {
		705	$self->{hist_ptr} = 0;
		706	$self->hide;
		707	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
		708	if ($self->{hist_ptr} > 1) {
		709	$self->{hist_ptr}--;
		710	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
		711	} elsif ($self->{hist_ptr} > 0) {
		712	$self->{hist_ptr}--;
		713	$self->{entry}->set_text ($self->{hist_saveback});
		714	} else {
		715	++$self->{select_offset}
		716	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		717	}
		718	$self->update_labels;
		719	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {
		720	if ($self->{select_offset}) {
		721	--$self->{select_offset}
		722	} else {
		723	unless ($self->{hist_ptr}) {
		724	$self->{hist_saveback} = $self->{entry}->get_text;
		725	}
		726	if ($self->{hist_ptr} <= $#{$self->{history}}) {
		727	$self->{hist_ptr}++;
		728	}
		729	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
		730	if exists $self->{history}->[$self->{hist_ptr} - 1];
		731	}
		732	$self->update_labels;
		733	} else {
		734	return 0;
		735	}
		736
		737	1
		738	}
		739	;
		740
		741	$self->{vbox}->add (
		742	$self->{entry},
		743	@{$self->{label}},
		744	);
		745
356	$self	746	$self
357	}	747	}
358		748
		749	sub set_prefix {
		750	my ($self, $prefix) = @_;
		751
		752	$self->{entry}->set_text ($prefix);
		753	$self->show;
		754	}
		755
359	sub size_allocate {	756	sub invoke_size_allocate {
360	my ($self, $w, $h) = @_;	757	my ($self, $w, $h) = @_;
361		758
362	$self->SUPER::size_allocate ($w, $h);
363	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	759	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		760
		761	$self->SUPER::invoke_size_allocate ($w, $h)
		762	}
		763
		764	sub show {
		765	my ($self) = @_;
		766
		767	$self->SUPER::show;
		768	$self->{entry}->grab_focus;
		769	}
		770
		771	sub hide {
		772	my ($self) = @_;
		773
		774	$self->{hist_ptr} = 0;
		775
		776	$self->SUPER::hide;
		777	$self->{entry}->set_text ("");
		778	}
		779
		780	sub inject_key_down {
		781	my ($self, $ev) = @_;
		782
		783	$self->{entry}->grab_focus;
		784	$self->{entry}->emit (key_down => $ev);
364	}	785	}
365		786
366	sub update_labels {	787	sub update_labels {
367	my ($self) = @_;	788	my ($self) = @_;
368		789
369	my $command = $self->{command};	790	my $text = $self->{entry}->get_text;
370	my $search_abbrev = qr/^\Q$self->{search}/;
371	my $search_full = qr/\Q$self->{search}/;
372		791
373	my @found;	792	length $text
		793	or return $self->hide;
374		794
375	for (@$command) {	795	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
376	if ($_->[0] =~ $search_abbrev) {	796
377	push @found, [$_->[0], $_];	797	if ($text ne $self->{last_search}) {
378	} elsif (2 < length $self->{search} and $_->[1] =~ $search_full) {	798	my @match;
379	push @found, [$_->[1], $_];	799
		800	if ($text =~ /^(.*?)\s+$/) {
		801	@match = [$cmd, "(appended whitespace suppresses completion)"];
		802	} else {
		803	my $regexp = do {
		804	my ($beg, @chr) = split //, lc $cmd;
		805
		806	# the following regex is used to match our "completion entry"
		807	# to an actual command - the parentheses match kind of "overhead"
		808	# - the more characters the parentheses match, the less attractive
		809	# is the match.
		810	my $regexp = "^\Q$beg\E"
		811	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		812	qr<$regexp>
		813	};
		814
		815	my @penalty;
		816
		817	for (keys %{$self->{command}}) {
		818	if (@penalty = $_ =~ $regexp) {
		819	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		820	}
380	}	821	}
381	}
382		822
383	@found = sort { $a->[0] cmp $b->[0] } @found;	823	@match = map $self->{command}{$_->[0]},
		824	sort {
		825	$a->[1] <=> $b->[1]
		826	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		827	or (length $b->[0]) <=> (length $a->[0])
		828	} @match;
		829	}
384		830
385	$self->{children}[0]->set_text ("$self->{search}_");	831	$self->{last_search} = $text;
		832	$self->{last_match} = \@match;
386		833
387	for (0..5) {	834	$self->{select_offset} = 0;
388	$self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
389	$self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
390	}	835	}
391		836
392	$self->{select} = $found[0][1]	837	my @labels = @{ $self->{label} };
393	if @found;	838	my @matches = @{ $self->{last_match} \|\| [] };
394		839
395	if (@found > 6) {	840	if ($self->{select_offset}) {
396	$self->{children}[6]->set_text ("...");	841	splice @matches, 0, $self->{select_offset}, ();
397	}
398		842
399	$self->check_size;	843	my $label = shift @labels;
400	}	844	$label->set_text ("...");
		845	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		846	}
401		847
402	sub key_down {	848	for my $label (@labels) {
		849	$label->{fg} = [1, 1, 1, 1];
		850	$label->{bg} = [0, 0, 0, 0];
		851	}
		852
		853	if (@matches) {
		854	$self->{select} = "$matches[0][0]$arg";
		855
		856	$labels[0]->{fg} = [0, 0, 0, 1];
		857	$labels[0]->{bg} = [1, 1, 1, 0.8];
		858	} else {
		859	$self->{select} = "$cmd$arg";
		860	}
		861
		862	for my $match (@matches) {
		863	my $label = shift @labels;
		864
		865	if (@labels) {
		866	$label->set_text ("$match->[0]$arg");
		867	$label->set_tooltip ($match->[1]);
		868	} else {
		869	$label->set_text ("...");
		870	$label->set_tooltip ("Use Cursor-Down to view more matches");
		871	last;
		872	}
		873	}
		874
		875	for my $label (@labels) {
		876	$label->set_text ("");
		877	$label->set_tooltip ("");
		878	}
		879
		880	$self->update;
		881	}
		882
		883	sub _draw {
403	my ($self, $ev) = @_;	884	my ($self) = @_;
404		885
405	if ($ev->{sym} == 8) {	886	# hack
406	substr $self->{search}, -1, 1, "";	887	local $CFPlus::UI::FOCUS = $self->{entry};
407	$self->update_labels;
408	} elsif ($ev->{sym} == 13) {
409	if (exists $self->{select}) {
410	$self->emit (execute => $self->{select});
411	$self->emit ("close");
412	}
413	} elsif ($ev->{sym} == 27) {
414	$self->emit ("close");
415	return;
416	} elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
417	$self->{search} .= chr $ev->{unicode};
418	$self->update_labels;
419	}
420		888
421	length $self->{search}	889	$self->SUPER::_draw;
422	or $self->emit ("close");
423	}	890	}
424		891
425	1	892	1
		893

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.22 by root, Sat May 13 00:27:08 2006 UTC vs. Revision 1.108 by root, Wed Apr 25 01:12:31 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.22 by root, Sat May 13 00:27:08 2006 UTC vs.
Revision 1.108 by root, Wed Apr 25 01:12:31 2007 UTC