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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.25 by root, Wed May 17 15:18:57 2006 UTC vs. Revision 1.141 by root, Wed Aug 27 20:19:52 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.25 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.141 by root, Wed Aug 27 20:19:52 2008 UTC