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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.19 by root, Tue Apr 25 13:51:48 2006 UTC vs. Revision 1.107 by root, Sat Apr 14 06:51:45 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.19 by root, Tue Apr 25 13:51:48 2006 UTC vs.
Revision 1.107 by root, Sat Apr 14 06:51:45 2007 UTC