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

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.149 by root, Tue Jan 13 00:01:48 2009 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.149 by root, Tue Jan 13 00:01:48 2009 UTC