[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.76 by elmex, Sat Jul 22 12:36:17 2006 UTC

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