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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.2 by root, Wed Apr 19 09:40:00 2006 UTC vs.
Revision 1.94 by elmex, Mon Dec 4 15:17:14 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.2 by root, Wed Apr 19 09:40:00 2006 UTC vs. Revision 1.94 by elmex, Mon Dec 4 15:17:14 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.2 by root, Wed Apr 19 09:40:00 2006 UTC vs.
Revision 1.94 by elmex, Mon Dec 4 15:17:14 2006 UTC