[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.145 by root, Wed Sep 24 01:03:05 2008 UTC

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

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.145 by root, Wed Sep 24 01:03:05 2008 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.145 by root, Wed Sep 24 01:03:05 2008 UTC