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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.42 by root, Mon May 29 18:33:23 2006 UTC vs. Revision 1.132 by root, Sun Jul 13 12:17:00 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.42 by root, Mon May 29 18:33:23 2006 UTC vs.
Revision 1.132 by root, Sun Jul 13 12:17:00 2008 UTC