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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.28 by root, Wed May 17 20:50:19 2006 UTC vs. Revision 1.58 by elmex, Tue Jun 13 14:35:17 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.28 by root, Wed May 17 20:50:19 2006 UTC vs.
Revision 1.58 by elmex, Tue Jun 13 14:35:17 2006 UTC