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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs.
Revision 1.144 by root, Wed Sep 3 10:08:18 2008 UTC

…		…
1	package CFClient::MapWidget;	1	package DC::MapWidget;
2		2
3	use strict;	3	use strict;
		4	use utf8;
4		5
5	use List::Util qw(min max);	6	use List::Util qw(min max);
6		7
		8	use DC;
7	use CFClient::OpenGL;	9	use DC::OpenGL;
		10	use DC::UI;
		11	use DC::Macro;
8		12
9	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;
10		18
11	sub new {	19	sub new {
12	my $class = shift;	20	my $class = shift;
13		21
14	$class->SUPER::new (	22	my $self = $class->SUPER::new (
15	z => -1,	23	z => -1,
16	can_focus => 1,	24	can_focus => 1,
17	list => glGenList,	25	tilesize => 32,
18	@_	26	@_
19	)	27	);
20	}
21		28
22	sub DESTROY {	29	$self
		30	}
		31
		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 {
23	my $self = shift;	45	my ($self) = @_;
24		46
25	glDeleteList $self->{list};	47	%{$::COMPLETER->{command}} = ();
26		48
27	$self->SUPER::DESTROY;	49	$::COMPLETER->hide
		50	if $::COMPLETER;
28	}	51	}
29		52
30	sub key_down {	53	sub server_login {
31	print "MAPKEYDOWN\n";	54	my ($server) = @_;
32	}
33		55
34	sub key_up {	56	::stop_game ();
		57	local $::PROFILE->{host} = $server;
		58	::start_game ();
35	}	59	}
36		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
37	sub button_down {	163	sub invoke_button_down {
38	my ($self, $ev, $x, $y) = @_;	164	my ($self, $ev, $x, $y) = @_;
39		165
40	$self->focus_in;
41
42	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
43	my ($ox, $oy) = ($ev->{x}, $ev->{y});	184	my ($ox, $oy) = ($ev->{x}, $ev->{y});
44	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	185	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
45		186
46	$self->{motion} = sub {	187	$self->{motion} = sub {
47	my ($ev, $x, $y) = @_;	188	my ($ev, $x, $y) = @_;
51	$::CFG->{map_shift_x} = $bw + $x - $ox;	192	$::CFG->{map_shift_x} = $bw + $x - $ox;
52	$::CFG->{map_shift_y} = $bh + $y - $oy;	193	$::CFG->{map_shift_y} = $bh + $y - $oy;
53		194
54	$self->update;	195	$self->update;
55	};	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
56	}	250	1
57	}	251	}
58		252
59	sub button_up {	253	sub invoke_button_up {
60	my ($self, $ev, $x, $y) = @_;	254	my ($self, $ev, $x, $y) = @_;
61		255
62	delete $self->{motion};	256	delete $self->{motion};
63	}
64		257
		258	1
		259	}
		260
65	sub mouse_motion {	261	sub invoke_mouse_motion {
66	my ($self, $ev, $x, $y) = @_;	262	my ($self, $ev, $x, $y) = @_;
67		263
		264	if ($self->{motion}) {
68	$self->{motion}->($ev, $x, $y) if $self->{motion};	265	$self->{motion}->($ev, $x, $y);
		266	} else {
		267	return 0;
		268	}
		269
		270	1
69	}	271	}
70		272
71	sub size_request {	273	sub size_request {
		274	my ($self) = @_;
		275
72	(	276	(
73	1 + 32 * int $::WIDTH / 32,	277	$self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
74	1 + 32 * int $::HEIGHT / 32,	278	$self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
75	)	279	)
76	}	280	}
77		281
78	sub update {	282	sub update {
79	my ($self) = @_;	283	my ($self) = @_;
80		284
81	$self->{need_update} = 1;	285	$self->{need_update} = 1;
82	$self->SUPER::update;	286	$self->SUPER::update;
83	}	287	}
84		288
85	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 {
86	my ($self) = @_;	316	my ($self, $ev) = @_;
87		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	# jump if "impossibly high" speed
		438	if (
		439	(max abs $self->{sdx}, abs $self->{sdy})
		440	> $spd * $self->{tilesize} * $mintime * 1.1
		441	) {
		442	#warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d#
		443	$self->{sdx} = $self->{sdy} = 0;
		444	} else {
		445	$spd = $self->{tilesize} $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
		446
		447	my $dx = $self->{sdx} < 0 ? -$spd : $spd;
		448	my $dy = $self->{sdy} < 0 ? -$spd : $spd;
		449
		450	if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
		451	if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
		452
		453	$self->update;
		454	}
		455	}
		456	} else {
		457	$self->{sdx} = $self->{sdy} = 0;
		458	}
		459
		460	$self->{last_update} = EV::time;
		461	}
		462
		463	sub refresh_hook {
		464	my ($self) = @_;
		465
		466	if ($::MAP && $::CONN) {
88	if (delete $self->{need_update}) {	467	if (delete $self->{need_update}) {
89	glNewList $self->{list};	468	$self->movement_update;
90		469
91	if ($::MAP) {	470	my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) \|\| 1;
92	my $sw = int $::WIDTH / 32;
93	my $sh = int $::HEIGHT / 32;
94		471
95	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	472	my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
96	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	473	my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
97		474
98	glTranslate $sx0 - 32, $sy0 - 32, 0;	475	# width/height of map, in tiles
		476	my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
		477	my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
99		478
100	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	479	# the map displacement, in tiles
		480	my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
		481	my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
		482
		483	# the upper left "visible" corner, in pixels
		484	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
		485	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
		486
		487	my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
		488	my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
101		489
102	if ($::CFG->{fow_enable}) {	490	if ($::CFG->{fow_enable}) {
103	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war	491	$sdx_t = $sdy_t = 0;#d#
104	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);	492	my ($w, $h, $data) = $::MAP->fow_texture (
105	glConvolutionFilter2D (	493	$dx + (min 0, $sdx_t),
106	GL_CONVOLUTION_2D,	494	$dy + (min 0, $sdy_t),
107	GL_ALPHA,	495	$sw + abs $sdx_t,
108	3, 3,	496	$sh + abs $sdy_t
109	GL_ALPHA, GL_FLOAT,
110	pack "f*",
111	0.1, 0.1, 0.1,
112	0.1, 0.2, 0.1,
113	0.1, 0.1, 0.1,
114	);	497	);
115	glEnable GL_CONVOLUTION_2D;
116	}
117		498
118	$self->{fow_texture} = new CFClient::Texture	499	$self->{fow_texture} = new DC::Texture
119	w => $w,	500	w => $w,
120	h => $h,	501	h => $h,
121	data => $data,	502	data => $data,
122	internalformat => GL_ALPHA,	503	internalformat => GL_ALPHA,
123	format => GL_ALPHA;	504	format => GL_ALPHA;
		505	} else {
		506	delete $self->{fow_texture};
		507	}
124		508
125	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	509	glNewList ($self->{list} \|\|= glGenList);
126		510
127	glEnable GL_BLEND;	511	glPushMatrix;
128	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	512	glTranslate $sx0, $sy0;
		513	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		514	glTranslate $self->{sdx}, $self->{sdy};
		515
		516	$::MAP->draw ($dx, $dy, $sw, $sh,
		517	$self->{tilesize},
		518	$::CONN->{player}{tag},
		519	-$self->{sdx}, -$self->{sdy});
		520
		521	#glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
		522	glScale $self->{tilesize}, $self->{tilesize};
		523
		524	if (my $tex = $self->{fow_texture}) {
		525	glPushMatrix;
		526	glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
		527	glScale 1/3, 1/3;
129	glEnable GL_TEXTURE_2D;	528	glEnable GL_TEXTURE_2D;
130	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
131		530
132	glColor +($::CFG->{fow_intensity}) x 3, 1;	531	glColor +($::CFG->{fow_intensity}) x 3, 0.9;
133	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);	532	$self->{fow_texture}->draw_quad_alpha (0, 0);
134		533
135	glDisable GL_TEXTURE_2D;	534	glDisable GL_TEXTURE_2D;
136	glDisable GL_BLEND;	535	glPopMatrix;
137	}	536	}
138		537
139	# HACK BEGIN	538	if ($self->{magicmap}) {
140	{	539	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
141	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
142		540
143	glTranslate 0, 30;	541	$x += $::MAP->ox + $self->{dx};
144	my ($w, $h) = (250, 250);	542	$y += $::MAP->oy + $self->{dy};
145		543
146	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	544	glTranslate - $x - 1, - $y - 1;
147		545	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
148	glEnable GL_BLEND;	546	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
149	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
150	glEnable GL_TEXTURE_2D;
151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
152
153	$self->{mapmap_texture} =
154	new CFClient::Texture
155	w => $w,
156	h => $h,
157	data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
158	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
159
160	$self->{mapmap_texture}->draw_quad (0, 0);
161
162	glDisable GL_TEXTURE_2D;
163
164	glTranslate 0.375, 0.375;
165
166	glColor 1, 1, 0, 1;
167	glBegin GL_LINE_LOOP;
168	glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
169	glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
170	glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
171	glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
172	glEnd;
173
174	glDisable GL_BLEND;
175	}	547	}
176	# HACK END
177	}
178		548
		549	glPopMatrix;
179	glEndList;	550	glEndList;
		551	}
		552	} else {
		553	glDeleteList delete $self->{list}
		554	if $self->{list};
180	}	555	}
		556	}
181		557
182	glPushMatrix;	558	sub draw {
		559	my ($self) = @_;
		560
		561	$self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
		562
		563	return unless $self->{list};
		564
		565	my $focused = $DC::UI::FOCUS == $self
		566	\|\| $DC::UI::FOCUS == $::COMPLETER->{entry};
		567
		568	return
		569	unless $focused \|\| !$::FAST;
		570
183	glCallList $self->{list};	571	glCallList $self->{list};
184	glPopMatrix;
185		572
186	if ($CFClient::UI::FOCUS != $self) {	573	# TNT2 emulates logops in software (or worse :)
187	glColor 64/255, 64/255, 64/255;	574	unless ($focused) {
188	glLogicOp GL_AND;	575	glColor_premultiply 0, 0, 1, 0.25;
189	glEnable GL_COLOR_LOGIC_OP;	576	glEnable GL_BLEND;
		577	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
190	glBegin GL_QUADS;	578	glBegin GL_QUADS;
191	glVertex 0, 0;	579	glVertex 0, 0;
192	glVertex 0, $::HEIGHT;	580	glVertex 0, $::HEIGHT;
193	glVertex $::WIDTH, $::HEIGHT;	581	glVertex $::WIDTH, $::HEIGHT;
194	glVertex $::WIDTH, 0;	582	glVertex $::WIDTH, 0;
195	glEnd;	583	glEnd;
196	glDisable GL_COLOR_LOGIC_OP;	584	glDisable GL_BLEND;
		585	}
		586	}
		587
		588	sub DESTROY {
		589	my $self = shift;
		590
		591	glDeleteList $self->{list};
		592
		593	$self->SUPER::DESTROY;
		594	}
		595
		596	package DC::MapWidget::MapMap;
		597
		598	use strict;
		599	use utf8;
		600
		601	our @ISA = DC::UI::Base::;
		602
		603	use Time::HiRes qw(time);
		604	use DC::OpenGL;
		605
		606	sub size_request {
		607	($::HEIGHT * 0.2, $::HEIGHT * 0.2)
		608	}
		609
		610	sub refresh_hook {
		611	my ($self) = @_;
		612
		613	if ($::MAP && $self->{texture_atime} < time) {
		614	my ($w, $h) = @$self{qw(w h)};
		615
		616	return unless $w && $h;
		617
		618	my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		619	my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
		620
		621	my $ox = 0.5 * ($w - $sw);
		622	my $oy = 0.5 * ($h - $sh);
		623
		624	my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
		625	my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
		626
		627	#TODO: map scale is completely borked
		628
		629	my $x0 = int $ox - $sx + 0.5;
		630	my $y0 = int $oy - $sy + 0.5;
		631
		632	$self->{sw} = $sw;
		633	$self->{sh} = $sh;
		634
		635	$self->{x0} = $x0;
		636	$self->{y0} = $y0;
		637
		638	$self->{texture_atime} = time + 1/3;
		639
		640	$self->{texture} =
		641	new DC::Texture
		642	w => $w,
		643	h => $h,
		644	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		645	type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		646	}
		647	}
		648
		649	sub invoke_visibility_change {
		650	my ($self) = @_;
		651
		652	$self->refresh_hook;
		653
		654	0
		655	}
		656
		657	sub invoke_size_allocate {
		658	my ($self, $w, $h) = @_;
		659
		660	$self->update;
		661
		662	1
		663	}
		664
		665	sub update {
		666	my ($self) = @_;
		667
		668	delete $self->{texture_atime};
		669	$self->SUPER::update;
		670	}
		671
		672	sub _draw {
		673	my ($self) = @_;
		674
		675	$self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
		676
		677	$self->{texture} or return;
		678
		679	glEnable GL_BLEND;
		680	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		681	glEnable GL_TEXTURE_2D;
		682	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		683
		684	$self->{texture}->draw_quad (0, 0);
		685
		686	glDisable GL_TEXTURE_2D;
		687
		688	glTranslate 0.375, 0.375;
		689
		690	glColor 1, 1, 0, 1;
		691	glBegin GL_LINE_LOOP;
		692	glVertex $self->{x0} , $self->{y0} ;
		693	glVertex $self->{x0} , $self->{y0} + $self->{sh};
		694	glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
		695	glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
		696	glEnd;
197	}	697
		698	glDisable GL_BLEND;
198	}	699	}
199		700
200	my %DIR = (	701	package DC::MapWidget::Command;
201	CFClient::SDLK_KP8, [1, "north"],
202	CFClient::SDLK_KP9, [2, "northeast"],
203	CFClient::SDLK_KP6, [3, "east"],
204	CFClient::SDLK_KP3, [4, "southeast"],
205	CFClient::SDLK_KP2, [5, "south"],
206	CFClient::SDLK_KP1, [6, "southwest"],
207	CFClient::SDLK_KP4, [7, "west"],
208	CFClient::SDLK_KP7, [8, "northwest"],
209		702
210	CFClient::SDLK_UP, [1, "north"],	703	use strict;
211	CFClient::SDLK_RIGHT, [3, "east"],
212	CFClient::SDLK_DOWN, [5, "south"],
213	CFClient::SDLK_LEFT, [7, "west"],
214	);
215		704
		705	use DC::OpenGL;
		706
		707	our @ISA = DC::UI::Frame::;
		708
		709	sub new {
		710	my $class = shift;
		711
		712	my $self = $class->SUPER::new (
		713	bg => [0, 0, 0, 0.8],
		714	@_,
		715	);
		716
		717	$self->add ($self->{vbox} = new DC::UI::VBox);
		718
		719	$self->{label} = [
		720	map
		721	DC::UI::Label->new (
		722	align => 0,
		723	can_hover => 1,
		724	can_events => 1,
		725	tooltip_width => 0.33,
		726	fontsize => $_,
		727	), (0.8) x 16
		728	];
		729
		730	$self->{entry} = new DC::UI::Entry
		731	on_changed => sub {
		732	$self->update_labels;
		733	0
		734	},
		735	on_button_down => sub {
		736	my ($entry, $ev, $x, $y) = @_;
		737
		738	if ($ev->{button} == 3) {
		739	(new DC::UI::Menu
		740	items => [
		741	["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
		742	=> sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
		743	],
		744	)->popup ($ev);
		745	return 1;
		746	}
		747	0
		748	},
		749	on_key_down => sub {
		750	my ($entry, $ev) = @_;
		751
		752	my $self = $entry->{parent}{parent};
		753
		754	if ($ev->{sym} == 13) {
		755	if (exists $self->{select}) {
		756	$self->{last_command} = $self->{select};
		757	$::CONN->user_send ($self->{select});
		758
		759	unshift @{$self->{history}}, $self->{entry}->get_text;
		760	$self->{hist_ptr} = 0;
		761
		762	$self->hide;
		763	}
		764	} elsif ($ev->{sym} == 27) {
		765	$self->{hist_ptr} = 0;
		766	$self->hide;
		767	} elsif ($ev->{sym} == DC::SDLK_DOWN) {
		768	if ($self->{hist_ptr} > 1) {
		769	$self->{hist_ptr}--;
		770	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
		771	} elsif ($self->{hist_ptr} > 0) {
		772	$self->{hist_ptr}--;
		773	$self->{entry}->set_text ($self->{hist_saveback});
		774	} else {
		775	++$self->{select_offset}
		776	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		777	}
		778	$self->update_labels;
		779	} elsif ($ev->{sym} == DC::SDLK_UP) {
		780	if ($self->{select_offset}) {
		781	--$self->{select_offset}
		782	} else {
		783	unless ($self->{hist_ptr}) {
		784	$self->{hist_saveback} = $self->{entry}->get_text;
		785	}
		786	if ($self->{hist_ptr} <= $#{$self->{history}}) {
		787	$self->{hist_ptr}++;
		788	}
		789	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
		790	if exists $self->{history}->[$self->{hist_ptr} - 1];
		791	}
		792	$self->update_labels;
		793	} else {
		794	return 0;
		795	}
		796
		797	1
		798	}
		799	;
		800
		801	$self->{vbox}->add (
		802	$self->{entry},
		803	@{$self->{label}},
		804	);
		805
		806	$self
		807	}
		808
		809	sub set_prefix {
		810	my ($self, $prefix) = @_;
		811
		812	$self->{entry}->set_text ($prefix);
		813	$self->show;
		814	}
		815
		816	sub invoke_size_allocate {
		817	my ($self, $w, $h) = @_;
		818
		819	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		820
		821	$self->SUPER::invoke_size_allocate ($w, $h)
		822	}
		823
		824	sub show {
		825	my ($self) = @_;
		826
		827	$self->SUPER::show;
		828	$self->{entry}->grab_focus;
		829	}
		830
		831	sub hide {
		832	my ($self) = @_;
		833
		834	$self->{hist_ptr} = 0;
		835
		836	$self->SUPER::hide;
		837	$self->{entry}->set_text ("");
		838	}
		839
216	sub key_down {	840	sub inject_key_down {
217	my ($self, $ev) = @_;	841	my ($self, $ev) = @_;
218		842
219	my $mod = $ev->{mod};	843	$self->{entry}->grab_focus;
220	my $sym = $ev->{sym};	844	$self->{entry}->emit (key_down => $ev);
		845	}
221		846
222	if ($sym == CFClient::SDLK_KP5) {	847	sub update_labels {
223	$::CONN->user_send ("stay fire");	848	my ($self) = @_;
224	} elsif ($sym == ord "a") {	849
225	$::CONN->user_send ("apply");	850	my $text = $self->{entry}->get_text;
226	} elsif ($sym == ord "'") {	851
227	$self->emit ('activate_console');	852	length $text
228	} elsif ($sym == ord "/") {	853	or return $self->hide;
229	$self->emit ('activate_console' => '/');	854
230	} elsif (exists $DIR{$sym}) {	855	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
231	if ($mod & CFClient::KMOD_SHIFT) {	856
232	$self->{shft}++;	857	if ($text ne $self->{last_search}) {
233	$::CONN->user_send ("fire $DIR{$sym}[0]");	858	my @match;
234	} elsif ($mod & CFClient::KMOD_CTRL) {	859
235	$self->{ctrl}++;	860	if ($text =~ /^(.*?)\s+$/) {
236	$::CONN->user_send ("run $DIR{$sym}[0]");	861	@match = [$cmd, "(appended whitespace suppresses completion)"];
237	} else {	862	} else {
238	$::CONN->user_send ("$DIR{$sym}[1]");	863	my $regexp = do {
		864	my ($beg, @chr) = split //, lc $cmd;
		865
		866	# the following regex is used to match our "completion entry"
		867	# to an actual command - the parentheses match kind of "overhead"
		868	# - the more characters the parentheses match, the less attractive
		869	# is the match.
		870	my $regexp = "^\Q$beg\E"
		871	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		872	qr<$regexp>
		873	};
		874
		875	my @penalty;
		876
		877	for (keys %{$self->{command}}) {
		878	if (@penalty = $_ =~ $regexp) {
		879	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		880	}
239	}	881	}
240	}
241	}
242		882
243	sub key_up {	883	@match = map $self->{command}{$_->[0]},
		884	sort {
		885	$a->[1] <=> $b->[1]
		886	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		887	or (length $b->[0]) <=> (length $a->[0])
		888	} @match;
		889	}
		890
		891	$self->{last_search} = $text;
		892	$self->{last_match} = \@match;
		893
		894	$self->{select_offset} = 0;
		895	}
		896
		897	my @labels = @{ $self->{label} };
		898	my @matches = @{ $self->{last_match} \|\| [] };
		899
		900	if ($self->{select_offset}) {
		901	splice @matches, 0, $self->{select_offset}, ();
		902
		903	my $label = shift @labels;
		904	$label->set_text ("...");
		905	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		906	}
		907
		908	for my $label (@labels) {
		909	$label->{fg} = [1, 1, 1, 1];
		910	$label->{bg} = [0, 0, 0, 0];
		911	}
		912
		913	if (@matches) {
		914	$self->{select} = "$matches[0][0]$arg";
		915
		916	$labels[0]->{fg} = [0, 0, 0, 1];
		917	$labels[0]->{bg} = [1, 1, 1, 0.8];
		918	} else {
		919	$self->{select} = "$cmd$arg";
		920	}
		921
		922	for my $match (@matches) {
		923	my $label = shift @labels;
		924
		925	if (@labels) {
		926	$label->set_text ("$match->[0]$arg");
		927	$label->set_tooltip ($match->[1]);
		928	} else {
		929	$label->set_text ("...");
		930	$label->set_tooltip ("Use Cursor-Down to view more matches");
		931	last;
		932	}
		933	}
		934
		935	for my $label (@labels) {
		936	$label->set_text ("");
		937	$label->set_tooltip ("");
		938	}
		939
		940	$self->update;
		941	}
		942
		943	sub _draw {
244	my ($self, $ev) = @_;	944	my ($self) = @_;
245		945
246	my $mod = $ev->{mod};	946	# hack
247	my $sym = $ev->{sym};	947	local $DC::UI::FOCUS = $self->{entry};
248		948
249	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	949	$self->SUPER::_draw;
250	$::CONN->user_send ("fire_stop");
251	}
252	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
253	$::CONN->user_send ("run_stop");
254	}
255	}
256
257	sub add_command {
258	my ($self, $command, $widget, $cb) = @_;
259
260	(my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
261	warn "$command\|$abbrev\|$widget\n";#d#
262	}	950	}
263		951
264	1	952	1
		953

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs. Revision 1.144 by root, Wed Sep 3 10:08:18 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs.
Revision 1.144 by root, Wed Sep 3 10:08:18 2008 UTC