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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.31 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.51 by root, Thu Jun 8 01:51:32 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
		77	} elsif ($ev->{button} == 2) {
39	my ($ox, $oy) = ($ev->{x}, $ev->{y});	78	my ($ox, $oy) = ($ev->{x}, $ev->{y});
40	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	79	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
41		80
42	$self->{motion} = sub {	81	$self->{motion} = sub {
43	my ($ev, $x, $y) = @_;	82	my ($ev, $x, $y) = @_;
…		…
48	$::CFG->{map_shift_y} = $bh + $y - $oy;	87	$::CFG->{map_shift_y} = $bh + $y - $oy;
49		88
50	$self->update;	89	$self->update;
51	};	90	};
52	}	91	}
		92
		93	1
53	}	94	}
54		95
55	sub button_up {	96	sub button_up {
56	my ($self, $ev, $x, $y) = @_;	97	my ($self, $ev, $x, $y) = @_;
57		98
58	delete $self->{motion};	99	delete $self->{motion};
		100
		101	1
59	}	102	}
60		103
61	sub mouse_motion {	104	sub mouse_motion {
62	my ($self, $ev, $x, $y) = @_;	105	my ($self, $ev, $x, $y) = @_;
63		106
		107	if ($self->{motion}) {
64	$self->{motion}->($ev, $x, $y) if $self->{motion};	108	$self->{motion}->($ev, $x, $y);
		109	} else {
		110	return 0;
		111	}
		112
		113	1
65	}	114	}
66		115
67	sub size_request {	116	sub size_request {
68	(	117	(
69	1 + 32 * int $::WIDTH / 32,	118	1 + 32 * int $::WIDTH / 32,
…		…
74	sub update {	123	sub update {
75	my ($self) = @_;	124	my ($self) = @_;
76		125
77	$self->{need_update} = 1;	126	$self->{need_update} = 1;
78	$self->SUPER::update;	127	$self->SUPER::update;
79	}
80
81	sub draw {
82	my ($self) = @_;
83
84	return
85	unless $CFClient::UI::FOCUS == $self \|\| !$::FAST;
86
87	if (delete $self->{need_update}) {
88	glNewList $self->{list};
89
90	if ($::MAP) {
91	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
92	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
93
94	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
95	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
96
97	glPushMatrix;
98	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
99
100	glTranslate $sx0 - 32, $sy0 - 32, 0;
101
102	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
103
104	if ($::CFG->{fow_enable}) {
105	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
106	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
107	glConvolutionFilter2D (
108	GL_CONVOLUTION_2D,
109	GL_ALPHA,
110	3, 3,
111	GL_ALPHA, GL_FLOAT,
112	pack "f*",
113	0.05, 0.13, 0.05,
114	0.13, 0.30, 0.13,
115	0.05, 0.13, 0.05,
116	);
117	glEnable GL_CONVOLUTION_2D;
118	}
119
120	# try to re-use the texture name: TODO improve texture class instead
121	my $prev_name = ((delete $self->{fow_texture}) \|\| {})->{name};
122
123	$self->{fow_texture} = new CFClient::Texture
124	w => $w,
125	h => $h,
126	data => $data,
127	name => $prev_name, # a bit hackish
128	internalformat => GL_ALPHA,
129	format => GL_ALPHA;
130
131	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
132
133	glEnable GL_TEXTURE_2D;
134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
135
136	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
137	$self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
138
139	glDisable GL_TEXTURE_2D;
140	}
141
142	glPopMatrix;
143	}
144
145	glEndList;
146	}
147
148	glPushMatrix;
149	glCallList $self->{list};
150	glPopMatrix;
151
152	# TNT2 emulates logops in software (or worse :)
153	if ($CFClient::UI::FOCUS != $self) {
154	glColor 0.4, 0.2, 0.2, 0.9;
155	glEnable GL_BLEND;
156	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
157	glBegin GL_QUADS;
158	glVertex 0, 0;
159	glVertex 0, $::HEIGHT;
160	glVertex $::WIDTH, $::HEIGHT;
161	glVertex $::WIDTH, 0;
162	glEnd;
163	glDisable GL_BLEND;
164	}
165	}	128	}
166		129
167	my %DIR = (	130	my %DIR = (
168	CFClient::SDLK_KP8, [1, "north"],	131	CFClient::SDLK_KP8, [1, "north"],
169	CFClient::SDLK_KP9, [2, "northeast"],	132	CFClient::SDLK_KP9, [2, "northeast"],
…		…
181	);	144	);
182		145
183	sub key_down {	146	sub key_down {
184	my ($self, $ev) = @_;	147	my ($self, $ev) = @_;
185		148
186	return unless $::CONN;	149	return 0 unless $::CONN;
187		150
188	my $mod = $ev->{mod};	151	my $mod = $ev->{mod};
189	my $sym = $ev->{sym};	152	my $sym = $ev->{sym};
190	my $uni = $ev->{unicode};	153	my $uni = $ev->{unicode};
191		154
192	if ($sym == CFClient::SDLK_KP5) {	155	if ($sym == CFClient::SDLK_KP5) {
193	$::CONN->user_send ("stay fire");	156	$::CONN->user_send ("stay fire");
194	} elsif ($uni == ord ",") {	157	} elsif ($uni == ord ",") {
195	$::CONN->user_send ("take");	158	$::CONN->user_send ("take");
196	} elsif ($uni == ord "\t" or $uni == ord " ") {	159	} elsif ($uni == ord " ") {
197	$::CONN->user_send ("apply");	160	$::CONN->user_send ("apply");
		161	} elsif ($uni == ord ".") {
		162	$::CONN->user_send ($self->{completer}{last_command})
		163	if exists $self->{completer}{last_command};
		164	} elsif ($uni == ord "\t") {
		165	$::INV_WINDOW->toggle_visibility;
198	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {	166	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
199	$::CONN->user_send ("rotateshoottype +");	167	$::CONN->user_send ("rotateshoottype +");
200	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {	168	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
201	$::CONN->user_send ("rotateshoottype -");	169	$::CONN->user_send ("rotateshoottype -");
		170	} elsif ($uni == ord '"') {
		171	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
		172	$self->{completer}->show;
202	} elsif ($uni == ord "'") {	173	} elsif ($uni == ord "'") {
203	$self->emit ('activate_console');	174	$self->{completer}->set_prefix ("");
204	} elsif ($uni == ord "/") {	175	$self->{completer}->show;
205	$self->emit (activate_console => '/');
206	} elsif (exists $DIR{$sym}) {	176	} elsif (exists $DIR{$sym}) {
207	if ($mod & CFClient::KMOD_SHIFT) {	177	if ($mod & CFClient::KMOD_SHIFT) {
208	$self->{shft}++;	178	$self->{shft}++;
209	$::CONN->user_send ("fire $DIR{$sym}[0]");	179	$::CONN->user_send ("fire $DIR{$sym}[0]");
210	} elsif ($mod & CFClient::KMOD_CTRL) {	180	} elsif ($mod & CFClient::KMOD_CTRL) {
211	$self->{ctrl}++;	181	$self->{ctrl}++;
212	$::CONN->user_send ("run $DIR{$sym}[0]");	182	$::CONN->user_send ("run $DIR{$sym}[0]");
213	} else {	183	} else {
214	$::CONN->user_send ("$DIR{$sym}[1]");	184	$::CONN->user_send ("$DIR{$sym}[1]");
215	}	185	}
216	} elsif ($ev->{unicode}) {	186	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
217	$self->{command_widget} \|\|=	187	$::BIND_EDITOR->set_binding (undef, undef, [],
218	new CFClient::MapWidget::Command::	188	sub {
219	command => $self->{command},	189	my ($mod, $sym, $cmds) = @_;
220	can_focus => 1,	190	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
221	connect_execute => sub {
222	# todo: support callback instead of user_send
223	$::CONN->user_send ($_[1]);
224	},	191	});
225	connect_close => sub {	192	$::BIND_EDITOR->start;
226	(delete $self->{command_widget})->hide;	193	$::BIND_EDITOR->show;
227	$self->focus_in;	194	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
228	},	195	$::BIND_EDITOR->stop;
229	;	196	$::BIND_EDITOR->ask_for_bind_and_commit;
		197	$::BIND_EDITOR->hide;
		198	} elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
		199	$::CONN->user_send ($_) for @$bind_cmd;
		200	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
230	$self->{command_widget}->key_down ($ev)	201	$self->{completer}->key_down ($ev);
231	unless $ev->{unicode} == 20;
232	return unless $self->{command_widget};
233	$self->{command_widget}->show;	202	$self->{completer}->show;
234	$self->{command_widget}->focus_in;	203	} else {
		204	return 0;
		205	}
		206
235	}	207	1
236	}	208	}
237		209
238	sub key_up {	210	sub key_up {
239	my ($self, $ev) = @_;	211	my ($self, $ev) = @_;
240		212
		213	my $res = 0;
241	my $mod = $ev->{mod};	214	my $mod = $ev->{mod};
242	my $sym = $ev->{sym};	215	my $sym = $ev->{sym};
243		216
244	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	217	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
245	$::CONN->user_send ("fire_stop");	218	$::CONN->user_send ("fire_stop");
		219	$res = 1;
246	}	220	}
		221
247	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	222	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
248	$::CONN->user_send ("run_stop");	223	$::CONN->user_send ("run_stop");
		224	$res = 1;
249	}	225	}
250	}
251		226
252	sub add_command {	227	$res
253	my ($self, $command, $tooltip, $widget, $cb) = @_;
254
255	(my $data = $command) =~ s/\\//g;
256
257	$tooltip =~ s/^\s+//;
258
259	$tooltip = "<big>$data</big>\n\n$tooltip";
260
261	$tooltip =~ s/\s+$//;
262
263	$self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
264	}	228	}
265		229
266	sub clr_commands {	230	sub draw {
		231	my ($self) = @_;
		232
		233	my $focused = $CFClient::UI::FOCUS == $self
		234	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
		235
		236	return
		237	unless $focused \|\| !$::FAST;
		238
		239	if (delete $self->{need_update}) {
		240	glNewList $self->{list};
		241
		242	if ($::MAP) {
		243	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
		244	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		245
		246	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		247	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		248
		249	glPushMatrix;
		250	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		251
		252	glTranslate $sx0 - 32, $sy0 - 32, 0;
		253
		254	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
		255
		256	if ($::CFG->{fow_enable}) {
		257	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
		258	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
		259	glConvolutionFilter2D (
		260	GL_CONVOLUTION_2D,
		261	GL_ALPHA,
		262	3, 3,
		263	GL_ALPHA, GL_FLOAT,
		264	(pack "f*", @{ $self->{smooth_matrix} }),
		265	);
		266	glEnable GL_CONVOLUTION_2D;
		267	}
		268
		269	$self->{fow_texture_name} \|\|= glGenTexture;
		270	# try to re-use the texture name: TODO improve texture class instead
		271
		272	$self->{fow_texture} = new CFClient::Texture
		273	w => $w,
		274	h => $h,
		275	data => $data,
		276	name => $self->{fow_texture_name},
		277	internalformat => GL_ALPHA,
		278	format => GL_ALPHA;
		279
		280	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		281
		282	glEnable GL_TEXTURE_2D;
		283	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		284
		285	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
		286	$self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
		287
		288	glDisable GL_TEXTURE_2D;
		289	}
		290
		291	glPopMatrix;
		292	}
		293
		294	glEndList;
		295	}
		296
		297	glPushMatrix;
		298	glCallList $self->{list};
		299	glPopMatrix;
		300
		301	# TNT2 emulates logops in software (or worse :)
		302	if ($focused) {
		303	(delete $self->{out_of_focus})->destroy
		304	if $self->{out_of_focus};
		305	} else {
		306	glColor 0.4, 0.2, 0.2, 0.6;
		307	glEnable GL_BLEND;
		308	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		309	glBegin GL_QUADS;
		310	glVertex 0, 0;
		311	glVertex 0, $::HEIGHT;
		312	glVertex $::WIDTH, $::HEIGHT;
		313	glVertex $::WIDTH, 0;
		314	glEnd;
		315	glDisable GL_BLEND;
		316
		317	# $self->{out_of_focus} \|\|= do {
		318	# my $label = new CFClient::UI::Label
		319	# x => 0,
		320	# y => 0,
		321	# z => 1,
		322	# ellipsise => 0,
		323	# text => "map out of focus (click map to play)";
		324	#
		325	# $label->show;
		326	# $label->update;
		327	#
		328	# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
		329	# $label->move_abs (
		330	# ($::WIDTH - $label->{w}) * 0.5,
		331	# ($::HEIGHT - $label->{h}) * 0.5,
		332	# );
		333	# });
		334	#
		335	# $label
		336	# };
		337	}
		338	}
		339
		340	sub DESTROY {
267	my ($self) = @_;	341	my $self = shift;
268		342
269	%{$self->{command}} = ();	343	glDeleteList $self->{list};
		344
		345	$self->SUPER::DESTROY;
270	}	346	}
271		347
272	package CFClient::MapWidget::MapMap;	348	package CFClient::MapWidget::MapMap;
273		349
274	our @ISA = CFClient::UI::Base::;	350	our @ISA = CFClient::UI::Base::;
…		…
375	fontsize => $_,	451	fontsize => $_,
376	), (0.8) x 16	452	), (0.8) x 16
377	];	453	];
378		454
379	$self->{entry} = new CFClient::UI::Entry	455	$self->{entry} = new CFClient::UI::Entry
380	connect_changed => sub {	456	on_changed => sub {
381	$self->update_labels;	457	$self->update_labels;
		458	},
		459	on_key_down => sub {
		460	my ($entry, $ev) = @_;
		461
		462	my $self = $entry->{parent}{parent};
		463
		464	if ($ev->{sym} == 13) {
		465	if (exists $self->{select}) {
		466	$self->{last_command} = $self->{select};
		467	$::CONN->user_send ($self->{select});
		468	$self->hide;
		469	}
		470	} elsif ($ev->{sym} == 27) {
		471	$self->hide;
		472	return;
		473	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
		474	++$self->{select_offset}
		475	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		476	$self->update_labels;
		477	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
		478	--$self->{select_offset}
		479	if $self->{select_offset};
		480	$self->update_labels;
		481	} else {
		482	return 0;
		483	}
		484
		485	1
382	};	486	}
		487	;
383		488
384	$self->{vbox}->add (	489	$self->{vbox}->add (
385	$self->{entry},	490	$self->{entry},
386	@{$self->{label}},	491	@{$self->{label}},
387	);	492	);
388		493
389	$self	494	$self
390	}	495	}
391		496
		497	sub set_prefix {
		498	my ($self, $prefix) = @_;
		499
		500	$self->{entry}->set_text ($prefix);
		501	$self->show;
		502	}
		503
392	sub size_allocate {	504	sub size_allocate {
393	my ($self, $w, $h) = @_;	505	my ($self, $w, $h) = @_;
394		506
395	$self->SUPER::size_allocate ($w, $h);	507	$self->SUPER::size_allocate ($w, $h);
396	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	508	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		509	}
		510
		511	sub show {
		512	my ($self) = @_;
		513
		514	$self->SUPER::show;
		515	$self->{entry}->focus_in;
		516	}
		517
		518	sub hide {
		519	my ($self) = @_;
		520
		521	$self->SUPER::hide;
		522	$self->{entry}->set_text ("");
397	}	523	}
398		524
399	sub key_down {	525	sub key_down {
400	my ($self, $ev) = @_;	526	my ($self, $ev) = @_;
401		527
402	if ($ev->{sym} == 13) {	528	$self->{entry}->key_down ($ev)
403	if (exists $self->{select}) {	529	}
404	$self->emit (execute => $self->{select});	530
405	$self->emit ("close");	531	sub update_labels {
		532	my ($self) = @_;
		533
		534	my $text = $self->{entry}->get_text;
		535
		536	length $text
		537	or return $self->hide;
		538
		539	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		540
		541	if ($text ne $self->{last_search}) {
		542	my @match;
		543
		544	if ($text =~ /^(.*?)\s+$/) {
		545	@match = [$cmd, "(appended whitespace suppresses completion)"];
		546	} else {
		547	my $regexp = do {
		548	my ($beg, @chr) = split //, lc $cmd;
		549
		550	# the following regex is used to match our "completion entry"
		551	# to an actual command - the parentheses match kind of "overhead"
		552	# - the more characters the parentheses match, the less attractive
		553	# is the match.
		554	my $regexp = "^\Q$beg\E"
		555	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		556	qr<$regexp>
		557	};
		558
		559	my @penalty;
		560
		561	for (keys %{$self->{command}}) {
		562	if (@penalty = $_ =~ $regexp) {
		563	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		564	}
		565	}
		566
		567	@match = map $self->{command}{$_->[0]},
		568	sort {
		569	$a->[1] <=> $b->[1]
		570	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		571	or (length $b->[0]) <=> (length $a->[0])
		572	} @match;
406	}	573	}
407	} elsif ($ev->{sym} == 27) {
408	$self->{entry}->set_text ("");
409	$self->emit ("close");
410	return;
411	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
412	++$self->{select_offset}
413	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
414	$self->update_labels;
415	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
416	--$self->{select_offset}
417	if $self->{select_offset};
418	$self->update_labels;
419	} else {
420	#$self->{entry}{force_alloc} = 1;
421	$self->{entry}->key_down ($ev);
422	}
423	}
424		574
425	sub update_labels {
426	my ($self) = @_;
427
428	my $text = $self->{entry}->get_text;
429
430	length $text
431	or return $self->emit ("close");
432
433	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
434
435	if ($cmd ne $self->{last_search}) {
436	my $regexp = do {
437	my ($beg, @chr) = split //, lc $cmd;
438
439	# the following regex is used to match our "completion entry"
440	# to an actual command - the parentheses match kind of "overhead"
441	# - the more characters the parentheses match, the less attractive
442	# is the match.
443	my $regexp = "^\Q$beg\E"
444	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
445	qr<$regexp>
446	};
447
448	my @match;
449	my @penalty;
450
451	for (keys %{$self->{command}}) {
452	if (@penalty = $_ =~ $regexp) {
453	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
454	}
455	}
456
457	@match = map $self->{command}{$_->[0]},
458	sort {
459	$a->[1] <=> $b->[1]
460	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
461	} @match;
462
463	$self->{last_search} = $cmd;	575	$self->{last_search} = $text;
464	$self->{last_match} = \@match;	576	$self->{last_match} = \@match;
465		577
466	$self->{select_offset} = 0;	578	$self->{select_offset} = 0;
467	}	579	}
468		580

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.31 by root, Fri May 19 23:18:42 2006 UTC vs. Revision 1.51 by root, Thu Jun 8 01:51:32 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.31 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.51 by root, Thu Jun 8 01:51:32 2006 UTC