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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.34 by root, Tue May 23 21:14:41 2006 UTC vs. Revision 1.99 by root, Sat Dec 23 08:07:56 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.34 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.99 by root, Sat Dec 23 08:07:56 2006 UTC