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

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.42 by root, Mon May 29 18:33:23 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.42 by root, Mon May 29 18:33:23 2006 UTC