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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.25 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.52 by elmex, Thu Jun 8 18:18:16 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	if (delete $self->{need_update}) {
85	glNewList $self->{list};
86
87	if ($::MAP) {
88	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
89	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
90
91	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
92	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
93
94	glPushMatrix;
95	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
96
97	glTranslate $sx0 - 32, $sy0 - 32, 0;
98
99	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
100
101	if ($::CFG->{fow_enable}) {
102	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
103	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
104	glConvolutionFilter2D (
105	GL_CONVOLUTION_2D,
106	GL_ALPHA,
107	3, 3,
108	GL_ALPHA, GL_FLOAT,
109	pack "f*",
110	0.05, 0.13, 0.05,
111	0.13, 0.30, 0.13,
112	0.05, 0.13, 0.05,
113	);
114	glEnable GL_CONVOLUTION_2D;
115	}
116
117	$self->{fow_texture} = new CFClient::Texture
118	w => $w,
119	h => $h,
120	data => $data,
121	internalformat => GL_ALPHA,
122	format => GL_ALPHA;
123
124	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
125
126	glEnable GL_BLEND;
127	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
128	glEnable GL_TEXTURE_2D;
129	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
130
131	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
132	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
133
134	glDisable GL_TEXTURE_2D;
135	glDisable GL_BLEND;
136	}
137
138	glPopMatrix;
139	}
140
141	glEndList;
142	}
143
144	glPushMatrix;
145	glCallList $self->{list};
146	glPopMatrix;
147
148	if ($CFClient::UI::FOCUS != $self) {
149	glColor 64/255, 64/255, 64/255;
150	glLogicOp GL_AND;
151	glEnable GL_COLOR_LOGIC_OP;
152	glBegin GL_QUADS;
153	glVertex 0, 0;
154	glVertex 0, $::HEIGHT;
155	glVertex $::WIDTH, $::HEIGHT;
156	glVertex $::WIDTH, 0;
157	glEnd;
158	glDisable GL_COLOR_LOGIC_OP;
159	}
160	}	128	}
161		129
162	my %DIR = (	130	my %DIR = (
163	CFClient::SDLK_KP8, [1, "north"],	131	CFClient::SDLK_KP8, [1, "north"],
164	CFClient::SDLK_KP9, [2, "northeast"],	132	CFClient::SDLK_KP9, [2, "northeast"],
…		…
176	);	144	);
177		145
178	sub key_down {	146	sub key_down {
179	my ($self, $ev) = @_;	147	my ($self, $ev) = @_;
180		148
181	return unless $::CONN;	149	return 0 unless $::CONN;
182		150
183	my $mod = $ev->{mod};	151	my $mod = $ev->{mod};
184	my $sym = $ev->{sym};	152	my $sym = $ev->{sym};
185	my $uni = $ev->{unicode};	153	my $uni = $ev->{unicode};
186		154
187	if ($sym == CFClient::SDLK_KP5) {	155	if ($sym == CFClient::SDLK_KP5) {
188	$::CONN->user_send ("stay fire");	156	$::CONN->user_send ("stay fire");
189	} elsif ($uni == ord ",") {	157	} elsif ($uni == ord ",") {
190	$::CONN->user_send ("take");	158	$::CONN->user_send ("take");
		159	} elsif ($uni == ord " ") {
		160	$::CONN->user_send ("apply");
		161	} elsif ($uni == ord ".") {
		162	$::CONN->user_send ($self->{completer}{last_command})
		163	if exists $self->{completer}{last_command};
191	} elsif ($uni == ord "\t") {	164	} elsif ($uni == ord "\t") {
		165	$::INV_WINDOW->toggle_visibility;
		166	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
192	$::CONN->user_send ("apply");	167	$::CONN->user_send ("rotateshoottype +");
		168	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
		169	$::CONN->user_send ("rotateshoottype -");
		170	} elsif ($uni == ord '"') {
		171	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
		172	$self->{completer}->show;
193	} elsif ($uni == ord "'") {	173	} elsif ($uni == ord "'") {
194	$self->emit ('activate_console');	174	$self->{completer}->set_prefix ("");
195	} elsif ($uni == ord "/") {	175	$self->{completer}->show;
196	$self->emit (activate_console => '/');
197	} elsif (exists $DIR{$sym}) {	176	} elsif (exists $DIR{$sym}) {
198	if ($mod & CFClient::KMOD_SHIFT) {	177	if ($mod & CFClient::KMOD_SHIFT) {
199	$self->{shft}++;	178	$self->{shft}++;
200	$::CONN->user_send ("fire $DIR{$sym}[0]");	179	$::CONN->user_send ("fire $DIR{$sym}[0]");
201	} elsif ($mod & CFClient::KMOD_CTRL) {	180	} elsif ($mod & CFClient::KMOD_CTRL) {
202	$self->{ctrl}++;	181	$self->{ctrl}++;
203	$::CONN->user_send ("run $DIR{$sym}[0]");	182	$::CONN->user_send ("run $DIR{$sym}[0]");
204	} else {	183	} else {
205	$::CONN->user_send ("$DIR{$sym}[1]");	184	$::CONN->user_send ("$DIR{$sym}[1]");
206	}	185	}
207	} elsif ($ev->{unicode}) {	186	} elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
208	$self->{command_widget} \|\|=	187	$::BIND_EDITOR->set_binding (undef, undef, [],
209	new CFClient::MapWidget::Command::	188	sub {
210	command => $self->{command},	189	my ($mod, $sym, $cmds) = @_;
211	can_focus => 1,	190	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
212	connect_execute => sub {
213	# todo: support callback instead of user_send
214	$::CONN->user_send ($_[1]);
215	},	191	});
216	connect_close => sub {	192	$::BIND_EDITOR->start;
217	(delete $self->{command_widget})->hide;	193	$::BIND_EDITOR->show;
218	$self->focus_in;	194	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
219	},	195	$::BIND_EDITOR->stop;
220	;	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')) {
221	$self->{command_widget}->key_down ($ev)	201	$self->{completer}->key_down ($ev);
222	unless $ev->{unicode} == 20;
223	return unless $self->{command_widget};
224	$self->{command_widget}->show;	202	$self->{completer}->show;
225	$self->{command_widget}->focus_in;	203	} else {
		204	return 0;
		205	}
		206
226	}	207	1
227	}	208	}
228		209
229	sub key_up {	210	sub key_up {
230	my ($self, $ev) = @_;	211	my ($self, $ev) = @_;
231		212
		213	my $res = 0;
232	my $mod = $ev->{mod};	214	my $mod = $ev->{mod};
233	my $sym = $ev->{sym};	215	my $sym = $ev->{sym};
234		216
235	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	217	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
236	$::CONN->user_send ("fire_stop");	218	$::CONN->user_send ("fire_stop");
		219	$res = 1;
237	}	220	}
		221
238	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	222	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
239	$::CONN->user_send ("run_stop");	223	$::CONN->user_send ("run_stop");
		224	$res = 1;
240	}	225	}
241	}
242		226
243	sub add_command {	227	$res
244	my ($self, $command, $tooltip, $widget, $cb) = @_;
245
246	(my $data = $command) =~ s/\\//g;
247
248	$tooltip =~ s/^\s+//;
249
250	$tooltip = "<big>$data</big>\n\n$tooltip";
251
252	$tooltip =~ s/\s+$//;
253
254	$self->{command}{$command} = [$data, $tooltip, $widget, $cb];
255	}	228	}
256		229
257	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 {
258	my ($self) = @_;	341	my $self = shift;
259		342
260	%{$self->{command}} = ();	343	glDeleteList $self->{list};
		344
		345	$self->SUPER::DESTROY;
261	}	346	}
262		347
263	package CFClient::MapWidget::MapMap;	348	package CFClient::MapWidget::MapMap;
264		349
265	our @ISA = CFClient::UI::Base::;	350	our @ISA = CFClient::UI::Base::;
…		…
362	CFClient::UI::Label->new (	447	CFClient::UI::Label->new (
363	can_hover => 1,	448	can_hover => 1,
364	can_events => 1,	449	can_events => 1,
365	tooltip_width => 0.33,	450	tooltip_width => 0.33,
366	fontsize => $_,	451	fontsize => $_,
367	), (0.8) x 6	452	), (0.8) x 16
368	];	453	];
369		454
370	$self->{entry} = new CFClient::UI::Entry	455	$self->{entry} = new CFClient::UI::Entry
371	connect_changed => sub {	456	on_changed => sub {
372	$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
		469	unshift @{$self->{history}}, $self->{select};
		470	$self->{hist_ptr} = 0;
		471
		472	$self->hide;
		473	}
		474	} elsif ($ev->{sym} == 27) {
		475	$self->{hist_ptr} = 0;
		476	$self->hide;
		477	return;
		478	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
		479	if ($self->{hist_ptr} > 1) {
		480	$self->{hist_ptr}--;
		481	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
		482	} elsif ($self->{hist_ptr} > 0) {
		483	$self->{hist_ptr}--;
		484	$self->{entry}->set_text ($self->{hist_saveback});
		485	} else {
		486	++$self->{select_offset}
		487	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		488	}
		489	$self->update_labels;
		490	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
		491	if ($self->{select_offset}) {
		492	--$self->{select_offset}
		493	} else {
		494	unless ($self->{hist_ptr}) {
		495	$self->{hist_saveback} = $self->{entry}->get_text;
		496	}
		497	if ($self->{hist_ptr} <= $#{$self->{history}}) {
		498	$self->{hist_ptr}++;
		499	}
		500	$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
		501	if exists $self->{history}->[$self->{hist_ptr} - 1];
		502	}
		503	$self->update_labels;
		504	} else {
		505	return 0;
		506	}
		507
		508	1
373	};	509	}
		510	;
374		511
375	$self->{vbox}->add (	512	$self->{vbox}->add (
376	$self->{entry},	513	$self->{entry},
377	@{$self->{label}},	514	@{$self->{label}},
378	);	515	);
379		516
380	$self	517	$self
381	}	518	}
382		519
		520	sub set_prefix {
		521	my ($self, $prefix) = @_;
		522
		523	$self->{entry}->set_text ($prefix);
		524	$self->show;
		525	}
		526
383	sub size_allocate {	527	sub size_allocate {
384	my ($self, $w, $h) = @_;	528	my ($self, $w, $h) = @_;
385		529
386	$self->SUPER::size_allocate ($w, $h);	530	$self->SUPER::size_allocate ($w, $h);
387	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	531	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		532	}
		533
		534	sub show {
		535	my ($self) = @_;
		536
		537	$self->SUPER::show;
		538	$self->{entry}->focus_in;
		539	}
		540
		541	sub hide {
		542	my ($self) = @_;
		543
		544	$self->SUPER::hide;
		545	$self->{entry}->set_text ("");
388	}	546	}
389		547
390	sub key_down {	548	sub key_down {
391	my ($self, $ev) = @_;	549	my ($self, $ev) = @_;
392		550
393	if ($ev->{sym} == 13) {	551	$self->{entry}->key_down ($ev)
394	if (exists $self->{select}) {	552	}
395	$self->emit (execute => $self->{select});	553
396	$self->emit ("close");	554	sub update_labels {
		555	my ($self) = @_;
		556
		557	my $text = $self->{entry}->get_text;
		558
		559	length $text
		560	or return $self->hide;
		561
		562	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		563
		564	if ($text ne $self->{last_search}) {
		565	my @match;
		566
		567	if ($text =~ /^(.*?)\s+$/) {
		568	@match = [$cmd, "(appended whitespace suppresses completion)"];
		569	} else {
		570	my $regexp = do {
		571	my ($beg, @chr) = split //, lc $cmd;
		572
		573	# the following regex is used to match our "completion entry"
		574	# to an actual command - the parentheses match kind of "overhead"
		575	# - the more characters the parentheses match, the less attractive
		576	# is the match.
		577	my $regexp = "^\Q$beg\E"
		578	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		579	qr<$regexp>
		580	};
		581
		582	my @penalty;
		583
		584	for (keys %{$self->{command}}) {
		585	if (@penalty = $_ =~ $regexp) {
		586	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		587	}
		588	}
		589
		590	@match = map $self->{command}{$_->[0]},
		591	sort {
		592	$a->[1] <=> $b->[1]
		593	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		594	or (length $b->[0]) <=> (length $a->[0])
		595	} @match;
397	}	596	}
398	} elsif ($ev->{sym} == 27) {
399	$self->{entry}->set_text ("");
400	$self->emit ("close");
401	return;
402	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
403	++$self->{select_offset}
404	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
405	$self->update_labels;
406	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
407	--$self->{select_offset}
408	if $self->{select_offset};
409	$self->update_labels;
410	} else {
411	#$self->{entry}{force_alloc} = 1;
412	$self->{entry}->key_down ($ev);
413	}
414	}
415		597
416	sub update_labels {
417	my ($self) = @_;
418
419	my $text = $self->{entry}->get_text;
420
421	length $text
422	or return $self->emit ("close");
423
424	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
425
426	if ($cmd ne $self->{last_search}) {
427	my $regexp = do {
428	my ($beg, @chr) = split //, lc $cmd;
429
430	# the following regex is used to match our "completion entry"
431	# to an actual command - the parentheses match kind of "overhead"
432	# - the more characters the parentheses match, the less attractive
433	# is the match.
434	my $regexp = "^\Q$beg\E"
435	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
436	qr<$regexp>
437	};
438
439	my @match;
440	my @penalty;
441
442	for (keys %{$self->{command}}) {
443	if (@penalty = $_ =~ $regexp) {
444	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
445	}
446	}
447
448	@match = map $self->{command}{$_->[0]},
449	sort {
450	$a->[1] <=> $b->[1]
451	or (length $a->[0]) <=> (length $b->[0])
452	} @match;
453
454	$self->{last_search} = $cmd;	598	$self->{last_search} = $text;
455	$self->{last_match} = \@match;	599	$self->{last_match} = \@match;
456		600
457	$self->{select_offset} = 0;	601	$self->{select_offset} = 0;
458	}	602	}
459		603

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.25 by root, Wed May 17 15:18:57 2006 UTC vs. Revision 1.52 by elmex, Thu Jun 8 18:18:16 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.25 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.52 by elmex, Thu Jun 8 18:18:16 2006 UTC