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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.34 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.53 by root, Sun Jun 11 17:30:53 2006 UTC

…		…
14		14
15	my $self = $class->SUPER::new (	15	my $self = $class->SUPER::new (
16	z => -1,	16	z => -1,
17	can_focus => 1,	17	can_focus => 1,
18	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
19	@_	26	@_
20	);	27	);
21		28
		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
22	$self	42	$self
23	}	43	}
24		44
25	sub DESTROY {	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 {
26	my $self = shift;	58	my ($self) = @_;
27		59
28	glDeleteList $self->{list};	60	%{$self->{completer}{command}} = ();
29
30	$self->SUPER::DESTROY;
31	}	61	}
32		62
33	sub button_down {	63	sub button_down {
34	my ($self, $ev, $x, $y) = @_;	64	my ($self, $ev, $x, $y) = @_;
35		65
36	$self->focus_in;	66	$self->focus_in;
37		67
38	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) {
39	my ($ox, $oy) = ($ev->{x}, $ev->{y});	79	my ($ox, $oy) = ($ev->{x}, $ev->{y});
40	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	80	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
41		81
42	$self->{motion} = sub {	82	$self->{motion} = sub {
43	my ($ev, $x, $y) = @_;	83	my ($ev, $x, $y) = @_;
…		…
48	$::CFG->{map_shift_y} = $bh + $y - $oy;	88	$::CFG->{map_shift_y} = $bh + $y - $oy;
49		89
50	$self->update;	90	$self->update;
51	};	91	};
52	}	92	}
		93
		94	1
53	}	95	}
54		96
55	sub button_up {	97	sub button_up {
56	my ($self, $ev, $x, $y) = @_;	98	my ($self, $ev, $x, $y) = @_;
57		99
58	delete $self->{motion};	100	delete $self->{motion};
		101
		102	1
59	}	103	}
60		104
61	sub mouse_motion {	105	sub mouse_motion {
62	my ($self, $ev, $x, $y) = @_;	106	my ($self, $ev, $x, $y) = @_;
63		107
		108	if ($self->{motion}) {
64	$self->{motion}->($ev, $x, $y) if $self->{motion};	109	$self->{motion}->($ev, $x, $y);
		110	} else {
		111	return 0;
		112	}
		113
		114	1
65	}	115	}
66		116
67	sub size_request {	117	sub size_request {
68	(	118	(
69	1 + 32 * int $::WIDTH / 32,	119	1 + 32 * int $::WIDTH / 32,
…		…
76		126
77	$self->{need_update} = 1;	127	$self->{need_update} = 1;
78	$self->SUPER::update;	128	$self->SUPER::update;
79	}	129	}
80		130
		131	my %DIR = (
		132	CFClient::SDLK_KP8, [1, "north"],
		133	CFClient::SDLK_KP9, [2, "northeast"],
		134	CFClient::SDLK_KP6, [3, "east"],
		135	CFClient::SDLK_KP3, [4, "southeast"],
		136	CFClient::SDLK_KP2, [5, "south"],
		137	CFClient::SDLK_KP1, [6, "southwest"],
		138	CFClient::SDLK_KP4, [7, "west"],
		139	CFClient::SDLK_KP7, [8, "northwest"],
		140
		141	CFClient::SDLK_UP, [1, "north"],
		142	CFClient::SDLK_RIGHT, [3, "east"],
		143	CFClient::SDLK_DOWN, [5, "south"],
		144	CFClient::SDLK_LEFT, [7, "west"],
		145	);
		146
		147	sub key_down {
		148	my ($self, $ev) = @_;
		149
		150	return 0 unless $::CONN;
		151
		152	my $mod = $ev->{mod};
		153	my $sym = $ev->{sym};
		154	my $uni = $ev->{unicode};
		155
		156	if ($sym == CFClient::SDLK_KP5) {
		157	$::CONN->user_send ("stay fire");
		158	} elsif ($uni == ord ",") {
		159	$::CONN->user_send ("take");
		160	} elsif ($uni == ord " ") {
		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;
		174	} elsif ($uni == ord "'") {
		175	$self->{completer}->set_prefix ("");
		176	$self->{completer}->show;
		177	} elsif (exists $DIR{$sym}) {
		178	if ($mod & CFClient::KMOD_SHIFT) {
		179	$self->{shft}++;
		180	$::CONN->user_send ("fire $DIR{$sym}[0]");
		181	} elsif ($mod & CFClient::KMOD_CTRL) {
		182	$self->{ctrl}++;
		183	$::CONN->user_send ("run $DIR{$sym}[0]");
		184	} else {
		185	$::CONN->user_send ("$DIR{$sym}[1]");
		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
		208	1
		209	}
		210
		211	sub key_up {
		212	my ($self, $ev) = @_;
		213
		214	my $res = 0;
		215	my $mod = $ev->{mod};
		216	my $sym = $ev->{sym};
		217
		218	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
		219	$::CONN->user_send ("fire_stop");
		220	$res = 1;
		221	}
		222
		223	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
		224	$::CONN->user_send ("run_stop");
		225	$res = 1;
		226	}
		227
		228	$res
		229	}
		230
81	sub draw {	231	sub draw {
82	my ($self) = @_;	232	my ($self) = @_;
83		233
		234	my $focused = $CFClient::UI::FOCUS == $self
		235	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
		236
84	return	237	return
85	unless $CFClient::UI::FOCUS == $self \|\| !$::FAST;	238	unless $focused \|\| !$::FAST;
86		239
87	if (delete $self->{need_update}) {	240	if (delete $self->{need_update}) {
88	glNewList $self->{list};	241	glNewList $self->{list};
89		242
90	if ($::MAP) {	243	if ($::MAP) {
…		…
100	glTranslate $sx0 - 32, $sy0 - 32, 0;	253	glTranslate $sx0 - 32, $sy0 - 32, 0;
101		254
102	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	255	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
103		256
104	if ($::CFG->{fow_enable}) {	257	if ($::CFG->{fow_enable}) {
105	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war	258	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
106	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);	259	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
107	glConvolutionFilter2D (	260	glConvolutionFilter2D (
108	GL_CONVOLUTION_2D,	261	GL_CONVOLUTION_2D,
109	GL_ALPHA,	262	GL_ALPHA,
110	3, 3,	263	3, 3,
111	GL_ALPHA, GL_FLOAT,	264	GL_ALPHA, GL_FLOAT,
112	pack "f*",	265	(pack "f*", @{ $self->{smooth_matrix} }),
113	0.05, 0.13, 0.05,
114	0.13, 0.30, 0.13,
115	0.05, 0.13, 0.05,
116	);	266	);
117	glEnable GL_CONVOLUTION_2D;	267	glEnable GL_CONVOLUTION_2D;
118	}	268	}
119		269
		270	$self->{fow_texture_name} \|\|= glGenTexture;
120	# try to re-use the texture name: TODO improve texture class instead	271	# try to re-use the texture name: TODO improve texture class instead
121	my $prev_name = ((delete $self->{fow_texture}) \|\| {})->{name};
122		272
123	$self->{fow_texture} = new CFClient::Texture	273	$self->{fow_texture} = new CFClient::Texture
124	w => $w,	274	w => $w,
125	h => $h,	275	h => $h,
126	data => $data,	276	data => $data,
127	name => $prev_name, # a bit hackish	277	name => $self->{fow_texture_name},
128	internalformat => GL_ALPHA,	278	internalformat => GL_ALPHA,
129	format => GL_ALPHA;	279	format => GL_ALPHA;
130		280
131	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	281	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
132		282
…		…
148	glPushMatrix;	298	glPushMatrix;
149	glCallList $self->{list};	299	glCallList $self->{list};
150	glPopMatrix;	300	glPopMatrix;
151		301
152	# TNT2 emulates logops in software (or worse :)	302	# TNT2 emulates logops in software (or worse :)
153	if ($CFClient::UI::FOCUS == $self) {	303	if ($focused) {
154	(delete $self->{out_of_focus})->destroy	304	(delete $self->{out_of_focus})->destroy
155	if $self->{out_of_focus};	305	if $self->{out_of_focus};
156	} else {	306	} else {
157	glColor 0.4, 0.2, 0.2, 0.6;	307	glColor 0.4, 0.2, 0.2, 0.6;
158	glEnable GL_BLEND;	308	glEnable GL_BLEND;
…		…
163	glVertex $::WIDTH, $::HEIGHT;	313	glVertex $::WIDTH, $::HEIGHT;
164	glVertex $::WIDTH, 0;	314	glVertex $::WIDTH, 0;
165	glEnd;	315	glEnd;
166	glDisable GL_BLEND;	316	glDisable GL_BLEND;
167		317
168	$self->{out_of_focus} \|\|= do {	318	# $self->{out_of_focus} \|\|= do {
169	my $label = new CFClient::UI::Label	319	# my $label = new CFClient::UI::Label
170	x => 0,	320	# x => 0,
171	y => 0,	321	# y => 0,
172	z => 1,	322	# z => 1,
173	ellipsise => 0,	323	# ellipsise => 0,
174	text => "map out of focus (click map to play)";	324	# text => "map out of focus (click map to play)";
175		325	#
176	$label->show;	326	# $label->show;
177	$label->update;	327	# $label->update;
178		328	#
179	$CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {	329	# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
180	$label->move (	330	# $label->move_abs (
181	($::WIDTH - $label->{w}) * 0.5,	331	# ($::WIDTH - $label->{w}) * 0.5,
182	($::HEIGHT - $label->{h}) * 0.5,	332	# ($::HEIGHT - $label->{h}) * 0.5,
183	);	333	# );
184	});	334	# });
185		335	#
186	$label	336	# $label
187	};	337	# };
188	}	338	}
189	}	339	}
190		340
191	my %DIR = (	341	sub DESTROY {
192	CFClient::SDLK_KP8, [1, "north"],
193	CFClient::SDLK_KP9, [2, "northeast"],
194	CFClient::SDLK_KP6, [3, "east"],
195	CFClient::SDLK_KP3, [4, "southeast"],
196	CFClient::SDLK_KP2, [5, "south"],
197	CFClient::SDLK_KP1, [6, "southwest"],
198	CFClient::SDLK_KP4, [7, "west"],
199	CFClient::SDLK_KP7, [8, "northwest"],
200
201	CFClient::SDLK_UP, [1, "north"],
202	CFClient::SDLK_RIGHT, [3, "east"],
203	CFClient::SDLK_DOWN, [5, "south"],
204	CFClient::SDLK_LEFT, [7, "west"],
205	);
206
207	sub key_down {
208	my ($self, $ev) = @_;
209
210	return unless $::CONN;
211
212	my $mod = $ev->{mod};
213	my $sym = $ev->{sym};
214	my $uni = $ev->{unicode};
215
216	if ($sym == CFClient::SDLK_KP5) {
217	$::CONN->user_send ("stay fire");
218	} elsif ($uni == ord ",") {
219	$::CONN->user_send ("take");
220	} elsif ($uni == ord "\t" or $uni == ord " ") {
221	$::CONN->user_send ("apply");
222	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
223	$::CONN->user_send ("rotateshoottype +");
224	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
225	$::CONN->user_send ("rotateshoottype -");
226	} elsif ($uni == ord "'") {
227	$self->emit ('activate_console');
228	} elsif ($uni == ord "/") {
229	$self->emit (activate_console => '/');
230	} elsif (exists $DIR{$sym}) {
231	if ($mod & CFClient::KMOD_SHIFT) {
232	$self->{shft}++;
233	$::CONN->user_send ("fire $DIR{$sym}[0]");
234	} elsif ($mod & CFClient::KMOD_CTRL) {
235	$self->{ctrl}++;
236	$::CONN->user_send ("run $DIR{$sym}[0]");
237	} else {
238	$::CONN->user_send ("$DIR{$sym}[1]");
239	}
240	} elsif ($ev->{unicode}) {
241	$self->{command_widget} \|\|=
242	new CFClient::MapWidget::Command::
243	command => $self->{command},
244	can_focus => 1,
245	connect_execute => sub {
246	# todo: support callback instead of user_send
247	$::CONN->user_send ($_[1]);
248	},
249	connect_close => sub {
250	(delete $self->{command_widget})->hide;
251	$self->focus_in;
252	},
253	;
254	$self->{command_widget}->key_down ($ev)
255	unless $ev->{unicode} == 20;
256	return unless $self->{command_widget};
257	$self->{command_widget}->show;
258	$self->{command_widget}->focus_in;
259	}
260	}
261
262	sub key_up {
263	my ($self, $ev) = @_;
264
265	my $mod = $ev->{mod};
266	my $sym = $ev->{sym};
267
268	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
269	$::CONN->user_send ("fire_stop");
270	}
271	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
272	$::CONN->user_send ("run_stop");
273	}
274	}
275
276	sub add_command {
277	my ($self, $command, $tooltip, $widget, $cb) = @_;
278
279	(my $data = $command) =~ s/\\//g;
280
281	$tooltip =~ s/^\s+//;
282
283	$tooltip = "<big>$data</big>\n\n$tooltip";
284
285	$tooltip =~ s/\s+$//;
286
287	$self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
288	}
289
290	sub clr_commands {
291	my ($self) = @_;	342	my $self = shift;
292		343
293	%{$self->{command}} = ();	344	glDeleteList $self->{list};
		345
		346	$self->SUPER::DESTROY;
294	}	347	}
295		348
296	package CFClient::MapWidget::MapMap;	349	package CFClient::MapWidget::MapMap;
297		350
298	our @ISA = CFClient::UI::Base::;	351	our @ISA = CFClient::UI::Base::;
…		…
399	fontsize => $_,	452	fontsize => $_,
400	), (0.8) x 16	453	), (0.8) x 16
401	];	454	];
402		455
403	$self->{entry} = new CFClient::UI::Entry	456	$self->{entry} = new CFClient::UI::Entry
404	connect_changed => sub {	457	on_changed => sub {
405	$self->update_labels;	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
406	};	510	}
		511	;
407		512
408	$self->{vbox}->add (	513	$self->{vbox}->add (
409	$self->{entry},	514	$self->{entry},
410	@{$self->{label}},	515	@{$self->{label}},
411	);	516	);
412		517
413	$self	518	$self
414	}	519	}
415		520
		521	sub set_prefix {
		522	my ($self, $prefix) = @_;
		523
		524	$self->{entry}->set_text ($prefix);
		525	$self->show;
		526	}
		527
416	sub size_allocate {	528	sub size_allocate {
417	my ($self, $w, $h) = @_;	529	my ($self, $w, $h) = @_;
418		530
419	$self->SUPER::size_allocate ($w, $h);	531	$self->SUPER::size_allocate ($w, $h);
420	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	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 ("");
421	}	547	}
422		548
423	sub key_down {	549	sub key_down {
424	my ($self, $ev) = @_;	550	my ($self, $ev) = @_;
425		551
426	if ($ev->{sym} == 13) {	552	$self->{entry}->key_down ($ev)
427	if (exists $self->{select}) {	553	}
428	$self->emit (execute => $self->{select});	554
429	$self->emit ("close");	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;
430	}	597	}
431	} elsif ($ev->{sym} == 27) {
432	$self->{entry}->set_text ("");
433	$self->emit ("close");
434	return;
435	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
436	++$self->{select_offset}
437	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
438	$self->update_labels;
439	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
440	--$self->{select_offset}
441	if $self->{select_offset};
442	$self->update_labels;
443	} else {
444	#$self->{entry}{force_alloc} = 1;
445	$self->{entry}->key_down ($ev);
446	}
447	}
448		598
449	sub update_labels {
450	my ($self) = @_;
451
452	my $text = $self->{entry}->get_text;
453
454	length $text
455	or return $self->emit ("close");
456
457	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
458
459	if ($cmd ne $self->{last_search}) {
460	my $regexp = do {
461	my ($beg, @chr) = split //, lc $cmd;
462
463	# the following regex is used to match our "completion entry"
464	# to an actual command - the parentheses match kind of "overhead"
465	# - the more characters the parentheses match, the less attractive
466	# is the match.
467	my $regexp = "^\Q$beg\E"
468	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
469	qr<$regexp>
470	};
471
472	my @match;
473	my @penalty;
474
475	for (keys %{$self->{command}}) {
476	if (@penalty = $_ =~ $regexp) {
477	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
478	}
479	}
480
481	@match = map $self->{command}{$_->[0]},
482	sort {
483	$a->[1] <=> $b->[1]
484	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
485	or (length $a->[0]) <=> (length $b->[0])
486	} @match;
487
488	$self->{last_search} = $cmd;	599	$self->{last_search} = $text;
489	$self->{last_match} = \@match;	600	$self->{last_match} = \@match;
490		601
491	$self->{select_offset} = 0;	602	$self->{select_offset} = 0;
492	}	603	}
493		604

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.34 by root, Tue May 23 21:14:41 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.34 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.53 by root, Sun Jun 11 17:30:53 2006 UTC