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

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.97 by root, Sat Dec 9 22:28:11 2006 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.97 by root, Sat Dec 9 22:28:11 2006 UTC