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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.12 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.131 by root, Thu May 8 19:00:37 2008 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.12 by root, Mon Apr 24 06:05:35 2006 UTC vs. Revision 1.131 by root, Thu May 8 19:00:37 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.12 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.131 by root, Thu May 8 19:00:37 2008 UTC