[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.37 by root, Thu May 25 01:26:53 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
		45	$tooltip = "<big>$data</big>\n\n$tooltip";
		46
		47	$tooltip =~ s/\s+$//;
		48
		49	$self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
		50	}
		51
		52	sub clr_commands {
26	my $self = shift;	53	my ($self) = @_;
27		54
28	glDeleteList $self->{list};	55	%{$self->{completer}{command}} = ();
29
30	$self->SUPER::DESTROY;
31	}	56	}
32		57
33	sub button_down {	58	sub button_down {
34	my ($self, $ev, $x, $y) = @_;	59	my ($self, $ev, $x, $y) = @_;
35		60
…		…
76		101
77	$self->{need_update} = 1;	102	$self->{need_update} = 1;
78	$self->SUPER::update;	103	$self->SUPER::update;
79	}	104	}
80		105
		106	my %DIR = (
		107	CFClient::SDLK_KP8, [1, "north"],
		108	CFClient::SDLK_KP9, [2, "northeast"],
		109	CFClient::SDLK_KP6, [3, "east"],
		110	CFClient::SDLK_KP3, [4, "southeast"],
		111	CFClient::SDLK_KP2, [5, "south"],
		112	CFClient::SDLK_KP1, [6, "southwest"],
		113	CFClient::SDLK_KP4, [7, "west"],
		114	CFClient::SDLK_KP7, [8, "northwest"],
		115
		116	CFClient::SDLK_UP, [1, "north"],
		117	CFClient::SDLK_RIGHT, [3, "east"],
		118	CFClient::SDLK_DOWN, [5, "south"],
		119	CFClient::SDLK_LEFT, [7, "west"],
		120	);
		121
		122	sub key_down {
		123	my ($self, $ev) = @_;
		124
		125	return unless $::CONN;
		126
		127	my $mod = $ev->{mod};
		128	my $sym = $ev->{sym};
		129	my $uni = $ev->{unicode};
		130
		131	if ($sym == CFClient::SDLK_KP5) {
		132	$::CONN->user_send ("stay fire");
		133	} elsif ($uni == ord ",") {
		134	$::CONN->user_send ("take");
		135	} elsif ($uni == ord " ") {
		136	$::CONN->user_send ("apply");
		137	} elsif ($uni == ord ".") {
		138	$::CONN->user_send ($self->{completer}{last_command})
		139	if exists $self->{completer}{last_command};
		140	} elsif ($uni == ord "\t") {
		141	# TODO: toggle inventory
		142	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
		143	$::CONN->user_send ("rotateshoottype +");
		144	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
		145	$::CONN->user_send ("rotateshoottype -");
		146	} elsif ($uni == ord '"') {
		147	$self->{completer}->set_prefix ("$::CFG->{say_command} ");
		148	$self->{completer}->show;
		149	} elsif ($uni == ord "'") {
		150	$self->{completer}->set_prefix ("");
		151	$self->{completer}->show;
		152	} elsif (exists $DIR{$sym}) {
		153	if ($mod & CFClient::KMOD_SHIFT) {
		154	$self->{shft}++;
		155	$::CONN->user_send ("fire $DIR{$sym}[0]");
		156	} elsif ($mod & CFClient::KMOD_CTRL) {
		157	$self->{ctrl}++;
		158	$::CONN->user_send ("run $DIR{$sym}[0]");
		159	} else {
		160	$::CONN->user_send ("$DIR{$sym}[1]");
		161	}
		162	} elsif ($ev->{unicode}) {
		163	$self->{completer}->key_down ($ev);
		164	$self->{completer}->show;
		165	}
		166	}
		167
		168	sub key_up {
		169	my ($self, $ev) = @_;
		170
		171	my $mod = $ev->{mod};
		172	my $sym = $ev->{sym};
		173
		174	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
		175	$::CONN->user_send ("fire_stop");
		176	}
		177	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
		178	$::CONN->user_send ("run_stop");
		179	}
		180	}
		181
81	sub draw {	182	sub draw {
82	my ($self) = @_;	183	my ($self) = @_;
83		184
		185	my $focused = $CFClient::UI::FOCUS == $self
		186	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
		187
84	return	188	return
85	unless $CFClient::UI::FOCUS == $self \|\| !$::FAST;	189	unless $focused \|\| !$::FAST;
86		190
87	if (delete $self->{need_update}) {	191	if (delete $self->{need_update}) {
88	glNewList $self->{list};	192	glNewList $self->{list};
89		193
90	if ($::MAP) {	194	if ($::MAP) {
…		…
115	0.05, 0.13, 0.05,	219	0.05, 0.13, 0.05,
116	);	220	);
117	glEnable GL_CONVOLUTION_2D;	221	glEnable GL_CONVOLUTION_2D;
118	}	222	}
119		223
		224	$self->{fow_texture_name} \|\|= glGenTexture;
120	# try to re-use the texture name: TODO improve texture class instead	225	# try to re-use the texture name: TODO improve texture class instead
121	my $prev_name = ((delete $self->{fow_texture}) \|\| {})->{name};
122		226
123	$self->{fow_texture} = new CFClient::Texture	227	$self->{fow_texture} = new CFClient::Texture
124	w => $w,	228	w => $w,
125	h => $h,	229	h => $h,
126	data => $data,	230	data => $data,
127	name => $prev_name, # a bit hackish	231	name => $self->{fow_texture_name},
128	internalformat => GL_ALPHA,	232	internalformat => GL_ALPHA,
129	format => GL_ALPHA;	233	format => GL_ALPHA;
130		234
131	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	235	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
132		236
…		…
148	glPushMatrix;	252	glPushMatrix;
149	glCallList $self->{list};	253	glCallList $self->{list};
150	glPopMatrix;	254	glPopMatrix;
151		255
152	# TNT2 emulates logops in software (or worse :)	256	# TNT2 emulates logops in software (or worse :)
153	if ($CFClient::UI::FOCUS != $self) {	257	if ($focused) {
		258	(delete $self->{out_of_focus})->destroy
		259	if $self->{out_of_focus};
		260	} else {
154	glColor 0.4, 0.2, 0.2, 0.9;	261	glColor 0.4, 0.2, 0.2, 0.6;
155	glEnable GL_BLEND;	262	glEnable GL_BLEND;
156	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	263	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
157	glBegin GL_QUADS;	264	glBegin GL_QUADS;
158	glVertex 0, 0;	265	glVertex 0, 0;
159	glVertex 0, $::HEIGHT;	266	glVertex 0, $::HEIGHT;
160	glVertex $::WIDTH, $::HEIGHT;	267	glVertex $::WIDTH, $::HEIGHT;
161	glVertex $::WIDTH, 0;	268	glVertex $::WIDTH, 0;
162	glEnd;	269	glEnd;
163	glDisable GL_BLEND;	270	glDisable GL_BLEND;
164	}
165	}
166		271
167	my %DIR = (	272	$self->{out_of_focus} \|\|= do {
168	CFClient::SDLK_KP8, [1, "north"],	273	my $label = new CFClient::UI::Label
169	CFClient::SDLK_KP9, [2, "northeast"],	274	x => 0,
170	CFClient::SDLK_KP6, [3, "east"],	275	y => 0,
171	CFClient::SDLK_KP3, [4, "southeast"],	276	z => 1,
172	CFClient::SDLK_KP2, [5, "south"],	277	ellipsise => 0,
173	CFClient::SDLK_KP1, [6, "southwest"],	278	text => "map out of focus (click map to play)";
174	CFClient::SDLK_KP4, [7, "west"],
175	CFClient::SDLK_KP7, [8, "northwest"],
176		279
177	CFClient::SDLK_UP, [1, "north"],	280	$label->show;
178	CFClient::SDLK_RIGHT, [3, "east"],	281	$label->update;
179	CFClient::SDLK_DOWN, [5, "south"],
180	CFClient::SDLK_LEFT, [7, "west"],
181	);
182		282
183	sub key_down {	283	$CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
184	my ($self, $ev) = @_;	284	$label->move (
		285	($::WIDTH - $label->{w}) * 0.5,
		286	($::HEIGHT - $label->{h}) * 0.5,
		287	);
		288	});
185		289
186	return unless $::CONN;	290	$label
187
188	my $mod = $ev->{mod};
189	my $sym = $ev->{sym};
190	my $uni = $ev->{unicode};
191
192	if ($sym == CFClient::SDLK_KP5) {
193	$::CONN->user_send ("stay fire");
194	} elsif ($uni == ord ",") {
195	$::CONN->user_send ("take");
196	} elsif ($uni == ord "\t" or $uni == ord " ") {
197	$::CONN->user_send ("apply");
198	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
199	$::CONN->user_send ("rotateshoottype +");
200	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
201	$::CONN->user_send ("rotateshoottype -");
202	} elsif ($uni == ord "'") {
203	$self->emit ('activate_console');
204	} elsif ($uni == ord "/") {
205	$self->emit (activate_console => '/');
206	} elsif (exists $DIR{$sym}) {
207	if ($mod & CFClient::KMOD_SHIFT) {
208	$self->{shft}++;
209	$::CONN->user_send ("fire $DIR{$sym}[0]");
210	} elsif ($mod & CFClient::KMOD_CTRL) {
211	$self->{ctrl}++;
212	$::CONN->user_send ("run $DIR{$sym}[0]");
213	} else {
214	$::CONN->user_send ("$DIR{$sym}[1]");
215	}	291	};
216	} elsif ($ev->{unicode}) {
217	$self->{command_widget} \|\|=
218	new CFClient::MapWidget::Command::
219	command => $self->{command},
220	can_focus => 1,
221	connect_execute => sub {
222	# todo: support callback instead of user_send
223	$::CONN->user_send ($_[1]);
224	},
225	connect_close => sub {
226	(delete $self->{command_widget})->hide;
227	$self->focus_in;
228	},
229	;
230	$self->{command_widget}->key_down ($ev)
231	unless $ev->{unicode} == 20;
232	return unless $self->{command_widget};
233	$self->{command_widget}->show;
234	$self->{command_widget}->focus_in;
235	}	292	}
236	}	293	}
237		294
238	sub key_up {	295	sub DESTROY {
239	my ($self, $ev) = @_;
240
241	my $mod = $ev->{mod};
242	my $sym = $ev->{sym};
243
244	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
245	$::CONN->user_send ("fire_stop");
246	}
247	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
248	$::CONN->user_send ("run_stop");
249	}
250	}
251
252	sub add_command {
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	}
265
266	sub clr_commands {
267	my ($self) = @_;	296	my $self = shift;
268		297
269	%{$self->{command}} = ();	298	glDeleteList $self->{list};
		299
		300	$self->SUPER::DESTROY;
270	}	301	}
271		302
272	package CFClient::MapWidget::MapMap;	303	package CFClient::MapWidget::MapMap;
273		304
274	our @ISA = CFClient::UI::Base::;	305	our @ISA = CFClient::UI::Base::;
…		…
377	];	408	];
378		409
379	$self->{entry} = new CFClient::UI::Entry	410	$self->{entry} = new CFClient::UI::Entry
380	connect_changed => sub {	411	connect_changed => sub {
381	$self->update_labels;	412	$self->update_labels;
		413	},
		414	connect_key_down => sub {
		415	my ($entry, $ev) = @_;
		416
		417	my $self = $entry->{parent}{parent};
		418
		419	if ($ev->{sym} == 13) {
		420	if (exists $self->{select}) {
		421	$self->{last_command} = $self->{select};
		422	$::CONN->user_send ($self->{select});
		423	$self->hide;
		424	}
		425	} elsif ($ev->{sym} == 27) {
		426	$self->hide;
		427	return;
		428	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
		429	++$self->{select_offset}
		430	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		431	$self->update_labels;
		432	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
		433	--$self->{select_offset}
		434	if $self->{select_offset};
		435	$self->update_labels;
		436	} else {
		437	return 0;
		438	}
		439
		440	1
382	};	441	}
		442	;
383		443
384	$self->{vbox}->add (	444	$self->{vbox}->add (
385	$self->{entry},	445	$self->{entry},
386	@{$self->{label}},	446	@{$self->{label}},
387	);	447	);
388		448
389	$self	449	$self
390	}	450	}
391		451
		452	sub set_prefix {
		453	my ($self, $prefix) = @_;
		454
		455	$self->{entry}->set_text ($prefix);
		456	$self->show;
		457	}
		458
392	sub size_allocate {	459	sub size_allocate {
393	my ($self, $w, $h) = @_;	460	my ($self, $w, $h) = @_;
394		461
395	$self->SUPER::size_allocate ($w, $h);	462	$self->SUPER::size_allocate ($w, $h);
396	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	463	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
397	}	464	}
398		465
		466	sub show {
		467	my ($self) = @_;
		468
		469	$self->SUPER::show;
		470	$self->{entry}->focus_in;
		471	}
		472
		473	sub hide {
		474	my ($self) = @_;
		475
		476	$self->SUPER::hide;
		477	$self->{entry}->set_text ("");
		478	}
		479
399	sub key_down {	480	sub key_down {
400	my ($self, $ev) = @_;	481	my ($self, $ev) = @_;
401		482
402	if ($ev->{sym} == 13) {	483	$self->{entry}->key_down ($ev);
403	if (exists $self->{select}) {	484	}
404	$self->emit (execute => $self->{select});	485
405	$self->emit ("close");	486	sub update_labels {
		487	my ($self) = @_;
		488
		489	my $text = $self->{entry}->get_text;
		490
		491	length $text
		492	or return $self->hide;
		493
		494	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		495
		496	if ($text ne $self->{last_search}) {
		497	my @match;
		498
		499	if ($text =~ /^(.*?)\s+$/) {
		500	@match = [$cmd, "(appended whitespace suppresses completion)"];
		501	} else {
		502	my $regexp = do {
		503	my ($beg, @chr) = split //, lc $cmd;
		504
		505	# the following regex is used to match our "completion entry"
		506	# to an actual command - the parentheses match kind of "overhead"
		507	# - the more characters the parentheses match, the less attractive
		508	# is the match.
		509	my $regexp = "^\Q$beg\E"
		510	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		511	qr<$regexp>
		512	};
		513
		514	my @penalty;
		515
		516	for (keys %{$self->{command}}) {
		517	if (@penalty = $_ =~ $regexp) {
		518	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		519	}
		520	}
		521
		522	@match = map $self->{command}{$_->[0]},
		523	sort {
		524	$a->[1] <=> $b->[1]
		525	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		526	or (length $a->[0]) <=> (length $b->[0])
		527	} @match;
406	}	528	}
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
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		529
463	$self->{last_search} = $cmd;	530	$self->{last_search} = $cmd;
464	$self->{last_match} = \@match;	531	$self->{last_match} = \@match;
465		532
466	$self->{select_offset} = 0;	533	$self->{select_offset} = 0;

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.37 by root, Thu May 25 01:26:53 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.37 by root, Thu May 25 01:26:53 2006 UTC