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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs. Revision 1.53 by root, Sun Jun 11 17:30:53 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs.
Revision 1.53 by root, Sun Jun 11 17:30:53 2006 UTC