[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.50 by root, Sat Jun 3 23:47:47 2006 UTC

…		…
17	can_focus => 1,	17	can_focus => 1,
18	list => glGenList,	18	list => glGenList,
19	@_	19	@_
20	);	20	);
21		21
		22	$self->{completer} = new CFClient::MapWidget::Command::
		23	command => $self->{command},
		24	can_focus => 1,
		25	tooltip => "<b>The Command Completer</b>\n\n"
		26	. "This is your central interface to send text commands to the server. "
		27	. "To enter a verbatim command to send to the server, just type the command, "
		28	. "followed by a space, and press return. "
		29	. "Typing the initial letters of words (or just any letters) displays guesses "
		30	. "for commands you might want to use.\n"
		31	. "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
		32	. "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
		33	;
		34
22	$self	35	$self
23	}	36	}
24		37
25	sub DESTROY {	38	sub add_command {
		39	my ($self, $command, $tooltip, $widget, $cb) = @_;
		40
		41	(my $data = $command) =~ s/\\//g;
		42
		43	$tooltip =~ s/^\s+//;
		44	$tooltip = "<big>$data</big>\n\n$tooltip";
		45	$tooltip =~ s/\s+$//;
		46
		47	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
		48	}
		49
		50	sub clr_commands {
26	my $self = shift;	51	my ($self) = @_;
27		52
28	glDeleteList $self->{list};	53	%{$self->{completer}{command}} = ();
29
30	$self->SUPER::DESTROY;
31	}	54	}
32		55
33	sub button_down {	56	sub button_down {
34	my ($self, $ev, $x, $y) = @_;	57	my ($self, $ev, $x, $y) = @_;
35		58
36	$self->focus_in;	59	$self->focus_in;
37		60
38	if ($ev->{button} == 2) {	61	if ($ev->{button} == 1) {
		62	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
		63	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		64
		65	my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99;
		66	my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99;
		67
		68	$::CONN->send (sprintf "lookat %d %d", $fx, $fy);
		69
		70	} elsif ($ev->{button} == 2) {
39	my ($ox, $oy) = ($ev->{x}, $ev->{y});	71	my ($ox, $oy) = ($ev->{x}, $ev->{y});
40	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	72	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
41		73
42	$self->{motion} = sub {	74	$self->{motion} = sub {
43	my ($ev, $x, $y) = @_;	75	my ($ev, $x, $y) = @_;
…		…
48	$::CFG->{map_shift_y} = $bh + $y - $oy;	80	$::CFG->{map_shift_y} = $bh + $y - $oy;
49		81
50	$self->update;	82	$self->update;
51	};	83	};
52	}	84	}
		85
		86	1
53	}	87	}
54		88
55	sub button_up {	89	sub button_up {
56	my ($self, $ev, $x, $y) = @_;	90	my ($self, $ev, $x, $y) = @_;
57		91
58	delete $self->{motion};	92	delete $self->{motion};
		93
		94	1
59	}	95	}
60		96
61	sub mouse_motion {	97	sub mouse_motion {
62	my ($self, $ev, $x, $y) = @_;	98	my ($self, $ev, $x, $y) = @_;
63		99
		100	if ($self->{motion}) {
64	$self->{motion}->($ev, $x, $y) if $self->{motion};	101	$self->{motion}->($ev, $x, $y);
		102	} else {
		103	return 0;
		104	}
		105
		106	1
65	}	107	}
66		108
67	sub size_request {	109	sub size_request {
68	(	110	(
69	1 + 32 * int $::WIDTH / 32,	111	1 + 32 * int $::WIDTH / 32,
…		…
76		118
77	$self->{need_update} = 1;	119	$self->{need_update} = 1;
78	$self->SUPER::update;	120	$self->SUPER::update;
79	}	121	}
80		122
		123	my %DIR = (
		124	CFClient::SDLK_KP8, [1, "north"],
		125	CFClient::SDLK_KP9, [2, "northeast"],
		126	CFClient::SDLK_KP6, [3, "east"],
		127	CFClient::SDLK_KP3, [4, "southeast"],
		128	CFClient::SDLK_KP2, [5, "south"],
		129	CFClient::SDLK_KP1, [6, "southwest"],
		130	CFClient::SDLK_KP4, [7, "west"],
		131	CFClient::SDLK_KP7, [8, "northwest"],
		132
		133	CFClient::SDLK_UP, [1, "north"],
		134	CFClient::SDLK_RIGHT, [3, "east"],
		135	CFClient::SDLK_DOWN, [5, "south"],
		136	CFClient::SDLK_LEFT, [7, "west"],
		137	);
		138
		139	sub key_down {
		140	my ($self, $ev) = @_;
		141
		142	return 0 unless $::CONN;
		143
		144	my $mod = $ev->{mod};
		145	my $sym = $ev->{sym};
		146	my $uni = $ev->{unicode};
		147
		148	if ($sym == CFClient::SDLK_KP5) {
		149	$::CONN->user_send ("stay fire");
		150	} elsif ($uni == ord ",") {
		151	$::CONN->user_send ("take");
		152	} elsif ($uni == ord " ") {
		153	$::CONN->user_send ("apply");
		154	} elsif ($uni == ord ".") {
		155	$::CONN->user_send ($self->{completer}{last_command})
		156	if exists $self->{completer}{last_command};
		157	} elsif ($uni == ord "\t") {
		158	$::INV_WINDOW->toggle_visibility;
		159	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
		160	$::CONN->user_send ("rotateshoottype +");
		161	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
		162	$::CONN->user_send ("rotateshoottype -");
		163	} elsif ($uni == ord '"') {
		164	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
		165	$self->{completer}->show;
		166	} elsif ($uni == ord "'") {
		167	$self->{completer}->set_prefix ("");
		168	$self->{completer}->show;
		169	} elsif (exists $DIR{$sym}) {
		170	if ($mod & CFClient::KMOD_SHIFT) {
		171	$self->{shft}++;
		172	$::CONN->user_send ("fire $DIR{$sym}[0]");
		173	} elsif ($mod & CFClient::KMOD_CTRL) {
		174	$self->{ctrl}++;
		175	$::CONN->user_send ("run $DIR{$sym}[0]");
		176	} else {
		177	$::CONN->user_send ("$DIR{$sym}[1]");
		178	}
		179	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
		180	$::BIND_EDITOR->set_binding (undef, undef, [],
		181	sub {
		182	my ($mod, $sym, $cmds) = @_;
		183	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		184	});
		185	$::BIND_EDITOR->start;
		186	$::BIND_EDITOR->show;
		187	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
		188	$::BIND_EDITOR->stop;
		189	$::BIND_EDITOR->ask_for_bind_and_commit;
		190	$::BIND_EDITOR->hide;
		191	} elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
		192	$::CONN->user_send ($_) for @$bind_cmd;
		193	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
		194	$self->{completer}->key_down ($ev);
		195	$self->{completer}->show;
		196	} else {
		197	return 0;
		198	}
		199
		200	1
		201	}
		202
		203	sub key_up {
		204	my ($self, $ev) = @_;
		205
		206	my $res = 0;
		207	my $mod = $ev->{mod};
		208	my $sym = $ev->{sym};
		209
		210	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
		211	$::CONN->user_send ("fire_stop");
		212	$res = 1;
		213	}
		214
		215	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
		216	$::CONN->user_send ("run_stop");
		217	$res = 1;
		218	}
		219
		220	$res
		221	}
		222
81	sub draw {	223	sub draw {
82	my ($self) = @_;	224	my ($self) = @_;
83		225
		226	my $focused = $CFClient::UI::FOCUS == $self
		227	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
		228
84	return	229	return
85	unless $CFClient::UI::FOCUS == $self \|\| !$::FAST;	230	unless $focused \|\| !$::FAST;
86		231
87	if (delete $self->{need_update}) {	232	if (delete $self->{need_update}) {
88	glNewList $self->{list};	233	glNewList $self->{list};
89		234
90	if ($::MAP) {	235	if ($::MAP) {
…		…
100	glTranslate $sx0 - 32, $sy0 - 32, 0;	245	glTranslate $sx0 - 32, $sy0 - 32, 0;
101		246
102	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	247	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
103		248
104	if ($::CFG->{fow_enable}) {	249	if ($::CFG->{fow_enable}) {
105	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war	250	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);	251	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
107	glConvolutionFilter2D (	252	glConvolutionFilter2D (
108	GL_CONVOLUTION_2D,	253	GL_CONVOLUTION_2D,
109	GL_ALPHA,	254	GL_ALPHA,
110	3, 3,	255	3, 3,
…		…
115	0.05, 0.13, 0.05,	260	0.05, 0.13, 0.05,
116	);	261	);
117	glEnable GL_CONVOLUTION_2D;	262	glEnable GL_CONVOLUTION_2D;
118	}	263	}
119		264
		265	$self->{fow_texture_name} \|\|= glGenTexture;
120	# try to re-use the texture name: TODO improve texture class instead	266	# try to re-use the texture name: TODO improve texture class instead
121	my $prev_name = ((delete $self->{fow_texture}) \|\| {})->{name};
122		267
123	$self->{fow_texture} = new CFClient::Texture	268	$self->{fow_texture} = new CFClient::Texture
124	w => $w,	269	w => $w,
125	h => $h,	270	h => $h,
126	data => $data,	271	data => $data,
127	name => $prev_name, # a bit hackish	272	name => $self->{fow_texture_name},
128	internalformat => GL_ALPHA,	273	internalformat => GL_ALPHA,
129	format => GL_ALPHA;	274	format => GL_ALPHA;
130		275
131	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	276	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
132		277
…		…
148	glPushMatrix;	293	glPushMatrix;
149	glCallList $self->{list};	294	glCallList $self->{list};
150	glPopMatrix;	295	glPopMatrix;
151		296
152	# TNT2 emulates logops in software (or worse :)	297	# TNT2 emulates logops in software (or worse :)
153	if ($CFClient::UI::FOCUS == $self) {	298	if ($focused) {
154	(delete $self->{out_of_focus})->destroy	299	(delete $self->{out_of_focus})->destroy
155	if $self->{out_of_focus};	300	if $self->{out_of_focus};
156	} else {	301	} else {
157	glColor 0.4, 0.2, 0.2, 0.6;	302	glColor 0.4, 0.2, 0.2, 0.6;
158	glEnable GL_BLEND;	303	glEnable GL_BLEND;
…		…
163	glVertex $::WIDTH, $::HEIGHT;	308	glVertex $::WIDTH, $::HEIGHT;
164	glVertex $::WIDTH, 0;	309	glVertex $::WIDTH, 0;
165	glEnd;	310	glEnd;
166	glDisable GL_BLEND;	311	glDisable GL_BLEND;
167		312
168	$self->{out_of_focus} \|\|= do {	313	# $self->{out_of_focus} \|\|= do {
169	my $label = new CFClient::UI::Label	314	# my $label = new CFClient::UI::Label
170	x => 0,	315	# x => 0,
171	y => 0,	316	# y => 0,
172	z => 1,	317	# z => 1,
173	ellipsise => 0,	318	# ellipsise => 0,
174	text => "map out of focus (click map to play)";	319	# text => "map out of focus (click map to play)";
175		320	#
176	$label->show;	321	# $label->show;
177	$label->update;	322	# $label->update;
178		323	#
179	$CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {	324	# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
180	$label->move (	325	# $label->move_abs (
181	($::WIDTH - $label->{w}) * 0.5,	326	# ($::WIDTH - $label->{w}) * 0.5,
182	($::HEIGHT - $label->{h}) * 0.5,	327	# ($::HEIGHT - $label->{h}) * 0.5,
183	);	328	# );
184	});	329	# });
185		330	#
186	$label	331	# $label
187	};	332	# };
188	}	333	}
189	}	334	}
190		335
191	my %DIR = (	336	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) = @_;	337	my $self = shift;
292		338
293	%{$self->{command}} = ();	339	glDeleteList $self->{list};
		340
		341	$self->SUPER::DESTROY;
294	}	342	}
295		343
296	package CFClient::MapWidget::MapMap;	344	package CFClient::MapWidget::MapMap;
297		345
298	our @ISA = CFClient::UI::Base::;	346	our @ISA = CFClient::UI::Base::;
…		…
399	fontsize => $_,	447	fontsize => $_,
400	), (0.8) x 16	448	), (0.8) x 16
401	];	449	];
402		450
403	$self->{entry} = new CFClient::UI::Entry	451	$self->{entry} = new CFClient::UI::Entry
404	connect_changed => sub {	452	on_changed => sub {
405	$self->update_labels;	453	$self->update_labels;
		454	},
		455	on_key_down => sub {
		456	my ($entry, $ev) = @_;
		457
		458	my $self = $entry->{parent}{parent};
		459
		460	if ($ev->{sym} == 13) {
		461	if (exists $self->{select}) {
		462	$self->{last_command} = $self->{select};
		463	$::CONN->user_send ($self->{select});
		464	$self->hide;
		465	}
		466	} elsif ($ev->{sym} == 27) {
		467	$self->hide;
		468	return;
		469	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
		470	++$self->{select_offset}
		471	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		472	$self->update_labels;
		473	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
		474	--$self->{select_offset}
		475	if $self->{select_offset};
		476	$self->update_labels;
		477	} else {
		478	return 0;
		479	}
		480
		481	1
406	};	482	}
		483	;
407		484
408	$self->{vbox}->add (	485	$self->{vbox}->add (
409	$self->{entry},	486	$self->{entry},
410	@{$self->{label}},	487	@{$self->{label}},
411	);	488	);
412		489
413	$self	490	$self
414	}	491	}
415		492
		493	sub set_prefix {
		494	my ($self, $prefix) = @_;
		495
		496	$self->{entry}->set_text ($prefix);
		497	$self->show;
		498	}
		499
416	sub size_allocate {	500	sub size_allocate {
417	my ($self, $w, $h) = @_;	501	my ($self, $w, $h) = @_;
418		502
419	$self->SUPER::size_allocate ($w, $h);	503	$self->SUPER::size_allocate ($w, $h);
420	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	504	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		505	}
		506
		507	sub show {
		508	my ($self) = @_;
		509
		510	$self->SUPER::show;
		511	$self->{entry}->focus_in;
		512	}
		513
		514	sub hide {
		515	my ($self) = @_;
		516
		517	$self->SUPER::hide;
		518	$self->{entry}->set_text ("");
421	}	519	}
422		520
423	sub key_down {	521	sub key_down {
424	my ($self, $ev) = @_;	522	my ($self, $ev) = @_;
425		523
426	if ($ev->{sym} == 13) {	524	$self->{entry}->key_down ($ev)
427	if (exists $self->{select}) {	525	}
428	$self->emit (execute => $self->{select});	526
429	$self->emit ("close");	527	sub update_labels {
		528	my ($self) = @_;
		529
		530	my $text = $self->{entry}->get_text;
		531
		532	length $text
		533	or return $self->hide;
		534
		535	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		536
		537	if ($text ne $self->{last_search}) {
		538	my @match;
		539
		540	if ($text =~ /^(.*?)\s+$/) {
		541	@match = [$cmd, "(appended whitespace suppresses completion)"];
		542	} else {
		543	my $regexp = do {
		544	my ($beg, @chr) = split //, lc $cmd;
		545
		546	# the following regex is used to match our "completion entry"
		547	# to an actual command - the parentheses match kind of "overhead"
		548	# - the more characters the parentheses match, the less attractive
		549	# is the match.
		550	my $regexp = "^\Q$beg\E"
		551	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		552	qr<$regexp>
		553	};
		554
		555	my @penalty;
		556
		557	for (keys %{$self->{command}}) {
		558	if (@penalty = $_ =~ $regexp) {
		559	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		560	}
		561	}
		562
		563	@match = map $self->{command}{$_->[0]},
		564	sort {
		565	$a->[1] <=> $b->[1]
		566	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		567	or (length $b->[0]) <=> (length $a->[0])
		568	} @match;
430	}	569	}
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		570
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;	571	$self->{last_search} = $text;
489	$self->{last_match} = \@match;	572	$self->{last_match} = \@match;
490		573
491	$self->{select_offset} = 0;	574	$self->{select_offset} = 0;
492	}	575	}
493		576

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.50 by root, Sat Jun 3 23:47:47 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.50 by root, Sat Jun 3 23:47:47 2006 UTC