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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.21 by root, Mon May 8 17:23:08 2006 UTC vs. Revision 1.111 by root, Thu Jul 19 14:54:50 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.21 by root, Mon May 8 17:23:08 2006 UTC vs.
Revision 1.111 by root, Thu Jul 19 14:54:50 2007 UTC