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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.22 by root, Sat May 13 00:27:08 2006 UTC vs. Revision 1.135 by root, Sun Jul 20 02:51:40 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.22 by root, Sat May 13 00:27:08 2006 UTC vs.
Revision 1.135 by root, Sun Jul 20 02:51:40 2008 UTC