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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.36 by root, Thu May 25 00:26:19 2006 UTC vs. Revision 1.126 by root, Wed Dec 26 21:03:21 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.36 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.126 by root, Wed Dec 26 21:03:21 2007 UTC