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