[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.81 by root, Sun Aug 13 15:14:17 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
30	sub button_down {	64	sub invoke_button_down {
31	my ($self, $ev, $x, $y) = @_;	65	my ($self, $ev, $x, $y) = @_;
32		66
33	$self->focus_in;
34
35	if ($ev->button == 2) {	67	if ($ev->{button} == 1) {
		68	$self->grab_focus;
		69	return unless $::CONN;
		70
		71	my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
		72	my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
		73
		74	$x -= int 0.5 * $self->{sw};
		75	$y -= int 0.5 * $self->{sh};
		76
		77	$::CONN->lookat ($x, $y)
		78	if $::CONN;
		79
		80	} elsif ($ev->{button} == 2) {
		81	$self->grab_focus;
		82	return unless $::CONN;
		83
36	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	84	my ($ox, $oy) = ($ev->{x}, $ev->{y});
37	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	85	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
38		86
39	$self->{motion} = sub {	87	$self->{motion} = sub {
40	my ($ev, $x, $y) = @_;	88	my ($ev, $x, $y) = @_;
41		89
42	($x, $y) = ($ev->motion_x, $ev->motion_y);	90	($x, $y) = ($ev->{x}, $ev->{y});
43		91
44	$::CFG->{map_shift_x} = $bw + $x - $ox;	92	$::CFG->{map_shift_x} = $bw + $x - $ox;
45	$::CFG->{map_shift_y} = $bh + $y - $oy;	93	$::CFG->{map_shift_y} = $bh + $y - $oy;
46		94
47	$self->update;	95	$self->update;
48	};	96	};
		97	} elsif ($ev->{button} == 3) {
		98	(new CFPlus::UI::Menu
		99	items => [
		100	["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
		101	["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
		102	["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
		103	["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
		104	["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
		105	["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
		106	["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
		107	[
		108	$::PICKUP_ENABLE->{state}
		109	? "Disable automatic pickup"
		110	: "Enable automatic pickup",
		111	sub { $::PICKUP_ENABLE->toggle }
		112	],
		113	["Quit",
		114	sub {
		115	if ($::CONN) {
		116	&::open_quit_dialog;
		117	} else {
		118	exit;
		119	}
		120	}
		121	],
		122	],
		123	)->popup ($ev);
		124	}
		125
49	}	126	1
50	}	127	}
51		128
52	sub button_up {	129	sub invoke_button_up {
53	my ($self, $ev, $x, $y) = @_;	130	my ($self, $ev, $x, $y) = @_;
54		131
55	delete $self->{motion};	132	delete $self->{motion};
56	}
57		133
		134	1
		135	}
		136
58	sub mouse_motion {	137	sub invoke_mouse_motion {
59	my ($self, $ev, $x, $y) = @_;	138	my ($self, $ev, $x, $y) = @_;
60		139
		140	if ($self->{motion}) {
61	$self->{motion}->($ev, $x, $y) if $self->{motion};	141	$self->{motion}->($ev, $x, $y);
		142	} else {
		143	return 0;
		144	}
		145
		146	1
62	}	147	}
63		148
64	sub size_request {	149	sub size_request {
65	(	150	(
66	1 + 32 * int $::WIDTH / 32,	151	32 * CFPlus::ceil $::WIDTH / 32,
67	1 + 32 * int $::HEIGHT / 32,	152	32 * CFPlus::ceil $::HEIGHT / 32,
68	)	153	)
69	}	154	}
70		155
71	sub update {	156	sub update {
72	my ($self) = @_;	157	my ($self) = @_;
73		158
74	$self->{need_update} = 1;	159	$self->{need_update} = 1;
75	$self->SUPER::update;	160	$self->SUPER::update;
76	}	161	}
77		162
		163	my %DIR = (
		164	CFPlus::SDLK_KP8, [1, "north"],
		165	CFPlus::SDLK_KP9, [2, "northeast"],
		166	CFPlus::SDLK_KP6, [3, "east"],
		167	CFPlus::SDLK_KP3, [4, "southeast"],
		168	CFPlus::SDLK_KP2, [5, "south"],
		169	CFPlus::SDLK_KP1, [6, "southwest"],
		170	CFPlus::SDLK_KP4, [7, "west"],
		171	CFPlus::SDLK_KP7, [8, "northwest"],
		172
		173	CFPlus::SDLK_UP, [1, "north"],
		174	CFPlus::SDLK_RIGHT, [3, "east"],
		175	CFPlus::SDLK_DOWN, [5, "south"],
		176	CFPlus::SDLK_LEFT, [7, "west"],
		177	);
		178
		179	sub invoke_key_down {
		180	my ($self, $ev) = @_;
		181
		182	my $mod = $ev->{mod};
		183	my $sym = $ev->{sym};
		184	my $uni = $ev->{unicode};
		185
		186	$mod &= CFPlus::KMOD_CTRL \| CFPlus::KMOD_ALT \| CFPlus::KMOD_SHIFT;
		187
		188	if ($uni == ord "\t") {
		189	$::PL_WINDOW->toggle_visibility;
		190	} elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
		191	$::HELP_WINDOW->toggle_visibility;
		192	} elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
		193	::toggle_player_page ($::STATS_PAGE);
		194	} elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
		195	::toggle_player_page ($::SKILL_PAGE);
		196	} elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
		197	::toggle_player_page ($::SPELL_PAGE);
		198	} elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
		199	::toggle_player_page ($::INVENTORY_PAGE);
		200	} elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
		201	$::SETUP_DIALOG->toggle_visibility;
		202	} elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
		203	$::BIND_EDITOR->set_binding (undef, undef, [],
		204	sub {
		205	my ($mod, $sym, $cmds) = @_;
		206	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
		207	});
		208	$::BIND_EDITOR->start;
		209	$::BIND_EDITOR->show;
		210	} elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
		211	$::BIND_EDITOR->stop;
		212	$::BIND_EDITOR->ask_for_bind_and_commit;
		213	$::BIND_EDITOR->hide;
		214	} elsif (!$::CONN) {
		215	return 0; # bindings further down need a valid connection
		216
		217	} elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
		218	$::CONN->user_send ("stay fire");
		219	} elsif ($uni == ord ",") {
		220	$::CONN->user_send ("take");
		221	} elsif ($uni == ord " ") {
		222	$::CONN->user_send ("apply");
		223	} elsif ($uni == ord ".") {
		224	$::CONN->user_send ($self->{completer}{last_command})
		225	if exists $self->{completer}{last_command};
		226	} elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
		227	$::CONN->user_send ($_) for @$bind_cmd;
		228	} elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) \|\| $uni == ord "+") {
		229	$::CONN->user_send ("rotateshoottype +");
		230	} elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) \|\| $uni == ord "-") {
		231	$::CONN->user_send ("rotateshoottype -");
		232	} elsif ($uni == ord '"') {
		233	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
		234	$self->{completer}->show;
		235	} elsif ($uni == ord "'") {
		236	$self->{completer}->set_prefix ("");
		237	$self->{completer}->show;
		238	} elsif (exists $DIR{$sym}) {
		239	if ($mod & CFPlus::KMOD_SHIFT) {
		240	$self->{shft}++;
		241	if ($DIR{$sym}[0] != $self->{fire_dir}) {
		242	$::CONN->user_send ("fire $DIR{$sym}[0]");
		243	}
		244	$self->{fire_dir} = $DIR{$sym}[0];
		245	} elsif ($mod & CFPlus::KMOD_CTRL) {
		246	$self->{ctrl}++;
		247	$::CONN->user_send ("run $DIR{$sym}[0]");
		248	} else {
		249	$::CONN->user_send ("$DIR{$sym}[1]");
		250	}
		251	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
		252	$self->{completer}->inject_key_down ($ev);
		253	$self->{completer}->show;
		254	} else {
		255	return 0;
		256	}
		257
		258	1
		259	}
		260
		261	sub invoke_key_up {
		262	my ($self, $ev) = @_;
		263
		264	my $res = 0;
		265	my $mod = $ev->{mod};
		266	my $sym = $ev->{sym};
		267
		268	if ($::CFG->{shift_fire_stop}) {
		269	if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
		270	$::CONN->user_send ("fire_stop");
		271	delete $self->{fire_dir};
		272	$res = 1;
		273	}
		274	} else {
		275	if (exists $DIR{$sym} && delete $self->{shft}) {
		276	$::CONN->user_send ("fire_stop");
		277	delete $self->{fire_dir};
		278	$res = 1;
		279	} elsif (($sym == CFPlus::SDLK_LSHIFT \|\| $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
		280	$::CONN->user_send ("fire_stop");
		281	delete $self->{fire_dir};
		282	$res = 1;
		283	}
		284	}
		285
		286	if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
		287	$::CONN->user_send ("run_stop");
		288	$res = 1;
		289	}
		290
		291	$res
		292	}
		293
		294	sub set_magicmap {
		295	my ($self, $w, $h, $x, $y, $data) = @_;
		296
		297	$x -= $::MAP->ox + int 0.5 * $::MAP->w;
		298	$y -= $::MAP->oy + int 0.5 * $::MAP->h;
		299
		300	$self->{magicmap} = [$x, $y, $w, $h, $data];
		301
		302	$self->update;
		303	}
		304
78	sub draw {	305	sub draw {
79	my ($self) = @_;	306	my ($self) = @_;
80		307
		308	return unless $::MAP;
		309
		310	my $focused = $CFPlus::UI::FOCUS == $self
		311	\|\| $CFPlus::UI::FOCUS == $self->{completer}{entry};
		312
		313	return
		314	unless $focused \|\| !$::FAST;
		315
81	if (delete $self->{need_update}) {	316	if (delete $self->{need_update}) {
82	glNewList $self->{list}, GL_COMPILE;	317	my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
83		318
84	if ($::MAP) {	319	my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
85	my $sw = int $::WIDTH / 32;	320	my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
86	my $sh = int $::HEIGHT / 32;
87		321
88	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	322	my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
89	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	323	my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
90		324
91	glTranslate $sx0 - 32, $sy0 - 32, 0;	325	my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
		326	my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
92		327
93	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
94
95	if ($::CFG->{fow_enable}) {	328	if ($::CFG->{fow_enable}) {
		329	my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
		330
96	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war	331	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);	332	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
98	glConvolutionFilter2D (	333	glConvolutionFilter2D (
99	GL_CONVOLUTION_2D,	334	GL_CONVOLUTION_2D,
100	GL_ALPHA,	335	GL_ALPHA,
101	3, 3,	336	3, 3,
102	GL_ALPHA, GL_FLOAT,	337	GL_ALPHA, GL_FLOAT,
103	pack "f*",	338	(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	);	339	);
108	glEnable GL_CONVOLUTION_2D;	340	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	}	341	}
131		342
132	# HACK BEGIN	343	$self->{fow_texture} = new CFPlus::Texture
133	{	344	w => $w,
134	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove	345	h => $h,
135	my ($w, $h) = (250, 250);	346	data => $data,
		347	internalformat => GL_ALPHA,
		348	format => GL_ALPHA;
136		349
137	glEnable GL_BLEND;	350	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
138	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	351	} else {
		352	delete $self->{fow_texture};
		353	}
		354
		355	glNewList $self->{list};
		356
		357	glPushMatrix;
		358	glTranslate $sx0, $sy0;
		359	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		360
		361	$::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
		362
		363	glScale 32, 32;
		364
		365	if (my $tex = $self->{fow_texture}) {
139	glEnable GL_TEXTURE_2D;	366	glEnable GL_TEXTURE_2D;
140	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	367	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
141		368
142	$self->{mapmap_texture} =	369	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);	370	$self->{fow_texture}->draw_quad_alpha (0, 0);
150		371
151	glDisable GL_TEXTURE_2D;	372	glDisable GL_TEXTURE_2D;
152	glDisable GL_BLEND;
153	}	373	}
154	# HACK END
155	}
156		374
		375	if ($self->{magicmap}) {
		376	my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
		377
		378	$x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
		379	$y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
		380
		381	glTranslate - $x - 1, - $y - 1;
		382	glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
		383	$::MAP->draw_magicmap ($x, $y, $w, $h, $data);
		384	}
		385
		386	glPopMatrix;
157	glEndList;	387	glEndList;
158	}	388	}
159		389
160	glPushMatrix;
161	glCallList $self->{list};	390	glCallList $self->{list};
162	glPopMatrix;
163		391
164	if ($CFClient::UI::FOCUS != $self) {	392	# TNT2 emulates logops in software (or worse :)
165	glColor 64/255, 64/255, 64/255;	393	unless ($focused) {
166	glLogicOp GL_AND;	394	glColor 0.4, 0.2, 0.2, 0.6;
167	glEnable GL_COLOR_LOGIC_OP;	395	glEnable GL_BLEND;
		396	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
168	glBegin GL_QUADS;	397	glBegin GL_QUADS;
169	glVertex 0, 0;	398	glVertex 0, 0;
170	glVertex 0, $::HEIGHT;	399	glVertex 0, $::HEIGHT;
171	glVertex $::WIDTH, $::HEIGHT;	400	glVertex $::WIDTH, $::HEIGHT;
172	glVertex $::WIDTH, 0;	401	glVertex $::WIDTH, 0;
173	glEnd;	402	glEnd;
174	glDisable GL_COLOR_LOGIC_OP;	403	glDisable GL_BLEND;
		404	}
		405	}
		406
		407	sub DESTROY {
		408	my $self = shift;
		409
		410	glDeleteList $self->{list};
		411
		412	$self->SUPER::DESTROY;
		413	}
		414
		415	package CFPlus::MapWidget::MapMap;
		416
		417	our @ISA = CFPlus::UI::Base::;
		418
		419	use Time::HiRes qw(time);
		420	use CFPlus::OpenGL;
		421
		422	sub size_request {
		423	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
		424	}
		425
		426	sub invoke_size_allocate {
		427	my ($self, $w, $h) = @_;
		428
		429	$self->update;
		430
		431	1
		432	}
		433
		434	sub update {
		435	my ($self) = @_;
		436
		437	delete $self->{texture_atime};
		438	$self->SUPER::update;
		439	}
		440
		441	sub _draw {
		442	my ($self) = @_;
		443
		444	$::MAP or return;
		445
		446	my ($w, $h) = @$self{qw(w h)};
		447
		448	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
		449	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		450
		451	my $sx = int $::CFG->{map_shift_x} / 32;
		452	my $sy = int $::CFG->{map_shift_y} / 32;
		453
		454	my $ox = 0.5 * ($w - $sw);
		455	my $oy = 0.5 * ($h - $sh);
		456
		457	glEnable GL_BLEND;
		458	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		459	glEnable GL_TEXTURE_2D;
		460	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		461
		462	if ($self->{texture_atime} < time) {
		463	$self->{texture_atime} = time + 1/3;
		464
		465	$self->{texture} =
		466	new CFPlus::Texture
		467	w => $w,
		468	h => $h,
		469	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		470	type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		471	}
		472
		473	$self->{texture}->draw_quad (0, 0);
		474
		475	glDisable GL_TEXTURE_2D;
		476
		477	glTranslate 0.375, 0.375;
		478
		479	#TODO: map scale is completely borked
		480
		481	my $x0 = int $ox - $sx + 0.5;
		482	my $y0 = int $oy - $sy + 0.5;
		483
		484	glColor 1, 1, 0, 1;
		485	glBegin GL_LINE_LOOP;
		486	glVertex $x0 , $y0 ;
		487	glVertex $x0 , $y0 + $sh;
		488	glVertex $x0 + $sw, $y0 + $sh;
		489	glVertex $x0 + $sw, $y0 ;
		490	glEnd;
175	}	491
		492	glDisable GL_BLEND;
176	}	493	}
177		494
178	my %DIR = (	495	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		496
188	SDLK_UP, [1, "north"],	497	use strict;
189	SDLK_RIGHT, [3, "east"],
190	SDLK_DOWN, [5, "south"],
191	SDLK_LEFT, [7, "west"],
192	);
193		498
		499	use CFPlus::OpenGL;
		500
		501	our @ISA = CFPlus::UI::Frame::;
		502
		503	sub new {
		504	my $class = shift;
		505
		506	my $self = $class->SUPER::new (
		507	bg => [0, 0, 0, 0.8],
		508	@_,
		509	);
		510
		511	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
		512
		513	$self->{label} = [
		514	map
		515	CFPlus::UI::Label->new (
		516	can_hover => 1,
		517	can_events => 1,
		518	tooltip_width => 0.33,
		519	fontsize => $_,
		520	), (0.8) x 16
		521	];
		522
		523	$self->{entry} = new CFPlus::UI::Entry
		524	on_changed => sub {
		525	$self->update_labels;
		526	0
		527	},
		528	on_button_down => sub {
		529	my ($entry, $ev, $x, $y) = @_;
		530
		531	if ($ev->{button} == 3) {
		532	(new CFPlus::UI::Menu
		533	items => [
		534	["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
		535	=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
		536	],
		537	)->popup ($ev);
		538	return 1;
		539	}
		540	0
		541	},
		542	on_key_down => sub {
		543	my ($entry, $ev) = @_;
		544
		545	my $self = $entry->{parent}{parent};
		546
		547	if ($ev->{sym} == 13) {
		548	if (exists $self->{select}) {
		549	$self->{last_command} = $self->{select};
		550	$::CONN->user_send ($self->{select});
		551
		552	unshift @{$self->{history}}, $self->{entry}->get_text;
		553	$self->{hist_ptr} = 0;
		554
		555	$self->hide;
		556	}
		557	} elsif ($ev->{sym} == 27) {
		558	$self->{hist_ptr} = 0;
		559	$self->hide;
		560	} elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
		561	if ($self->{hist_ptr} > 1) {
		562	$self->{hist_ptr}--;
		563	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
		564	} elsif ($self->{hist_ptr} > 0) {
		565	$self->{hist_ptr}--;
		566	$self->{entry}->set_text ($self->{hist_saveback});
		567	} else {
		568	++$self->{select_offset}
		569	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		570	}
		571	$self->update_labels;
		572	} elsif ($ev->{sym} == CFPlus::SDLK_UP) {
		573	if ($self->{select_offset}) {
		574	--$self->{select_offset}
		575	} else {
		576	unless ($self->{hist_ptr}) {
		577	$self->{hist_saveback} = $self->{entry}->get_text;
		578	}
		579	if ($self->{hist_ptr} <= $#{$self->{history}}) {
		580	$self->{hist_ptr}++;
		581	}
		582	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
		583	if exists $self->{history}->[$self->{hist_ptr} - 1];
		584	}
		585	$self->update_labels;
		586	} else {
		587	return 0;
		588	}
		589
		590	1
		591	}
		592	;
		593
		594	$self->{vbox}->add (
		595	$self->{entry},
		596	@{$self->{label}},
		597	);
		598
		599	$self
		600	}
		601
		602	sub set_prefix {
		603	my ($self, $prefix) = @_;
		604
		605	$self->{entry}->set_text ($prefix);
		606	$self->show;
		607	}
		608
		609	sub invoke_size_allocate {
		610	my ($self, $w, $h) = @_;
		611
		612	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		613
		614	$self->SUPER::invoke_size_allocate ($w, $h)
		615	}
		616
		617	sub show {
		618	my ($self) = @_;
		619
		620	$self->SUPER::show;
		621	$self->{entry}->grab_focus;
		622	}
		623
		624	sub hide {
		625	my ($self) = @_;
		626
		627	$self->{hist_ptr} = 0;
		628
		629	$self->SUPER::hide;
		630	$self->{entry}->set_text ("");
		631	}
		632
194	sub key_down {	633	sub inject_key_down {
195	my ($self, $ev) = @_;	634	my ($self, $ev) = @_;
196		635
197	my $mod = $ev->key_mod;	636	$self->{entry}->grab_focus;
198	my $sym = $ev->key_sym;	637	$self->{entry}->emit (key_down => $ev);
		638	}
199		639
200	if ($sym == SDLK_KP5) {	640	sub update_labels {
201	$::CONN->user_send ("stay fire");	641	my ($self) = @_;
202	} elsif ($sym == SDLK_a) {	642
203	$::CONN->user_send ("apply");	643	my $text = $self->{entry}->get_text;
204	} elsif ($sym == SDLK_QUOTE) {	644
205	$self->emit ('activate_console');	645	length $text
206	} elsif ($sym == SDLK_SLASH) {	646	or return $self->hide;
207	$self->emit ('activate_console' => '/');	647
208	} elsif (exists $DIR{$sym}) {	648	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
209	if ($mod & KMOD_SHIFT) {	649
210	$self->{shft}++;	650	if ($text ne $self->{last_search}) {
211	$::CONN->user_send ("fire $DIR{$sym}[0]");	651	my @match;
212	} elsif ($mod & KMOD_CTRL) {	652
213	$self->{ctrl}++;	653	if ($text =~ /^(.*?)\s+$/) {
214	$::CONN->user_send ("run $DIR{$sym}[0]");	654	@match = [$cmd, "(appended whitespace suppresses completion)"];
215	} else {	655	} else {
216	$::CONN->user_send ("$DIR{$sym}[1]");	656	my $regexp = do {
		657	my ($beg, @chr) = split //, lc $cmd;
		658
		659	# the following regex is used to match our "completion entry"
		660	# to an actual command - the parentheses match kind of "overhead"
		661	# - the more characters the parentheses match, the less attractive
		662	# is the match.
		663	my $regexp = "^\Q$beg\E"
		664	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		665	qr<$regexp>
		666	};
		667
		668	my @penalty;
		669
		670	for (keys %{$self->{command}}) {
		671	if (@penalty = $_ =~ $regexp) {
		672	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		673	}
217	}	674	}
218	}
219	}
220		675
221	sub key_up {	676	@match = map $self->{command}{$_->[0]},
		677	sort {
		678	$a->[1] <=> $b->[1]
		679	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		680	or (length $b->[0]) <=> (length $a->[0])
		681	} @match;
		682	}
		683
		684	$self->{last_search} = $text;
		685	$self->{last_match} = \@match;
		686
		687	$self->{select_offset} = 0;
		688	}
		689
		690	my @labels = @{ $self->{label} };
		691	my @matches = @{ $self->{last_match} \|\| [] };
		692
		693	if ($self->{select_offset}) {
		694	splice @matches, 0, $self->{select_offset}, ();
		695
		696	my $label = shift @labels;
		697	$label->set_text ("...");
		698	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		699	}
		700
		701	for my $label (@labels) {
		702	$label->{fg} = [1, 1, 1, 1];
		703	$label->{bg} = [0, 0, 0, 0];
		704	}
		705
		706	if (@matches) {
		707	$self->{select} = "$matches[0][0]$arg";
		708
		709	$labels[0]->{fg} = [0, 0, 0, 1];
		710	$labels[0]->{bg} = [1, 1, 1, 0.8];
		711	} else {
		712	$self->{select} = "$cmd$arg";
		713	}
		714
		715	for my $match (@matches) {
		716	my $label = shift @labels;
		717
		718	if (@labels) {
		719	$label->set_text ("$match->[0]$arg");
		720	$label->set_tooltip ($match->[1]);
		721	} else {
		722	$label->set_text ("...");
		723	$label->set_tooltip ("Use Cursor-Down to view more matches");
		724	last;
		725	}
		726	}
		727
		728	for my $label (@labels) {
		729	$label->set_text ("");
		730	$label->set_tooltip ("");
		731	}
		732
		733	$self->update;
		734	}
		735
		736	sub _draw {
222	my ($self, $ev) = @_;	737	my ($self) = @_;
223		738
224	my $mod = $ev->key_mod;	739	# hack
225	my $sym = $ev->key_sym;	740	local $CFPlus::UI::FOCUS = $self->{entry};
226		741
227	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	742	$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	}	743	}
241		744
242	1	745	1

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.81 by root, Sun Aug 13 15:14:17 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.81 by root, Sun Aug 13 15:14:17 2006 UTC