[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.45 by elmex, Tue May 30 14:35:09 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 ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
		161	$::BIND_EDITOR->set_binding (undef, undef, [],
		162	sub {
		163	my ($mod, $sym, $cmds) = @_;
		164	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		165	});
		166	$::BIND_EDITOR->start;
		167	$::BIND_EDITOR->show;
		168	} elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
		169	$::BIND_EDITOR->stop;
		170	$::BIND_EDITOR->ask_for_bind (1);
		171	$::BIND_EDITOR->hide;
		172	} elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
		173	$::CONN->user_send ($_) for @$bind_cmd;
		174	} elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
		175	$self->{completer}->key_down ($ev);
		176	$self->{completer}->show;
		177	}
		178	}
		179
		180	sub key_up {
		181	my ($self, $ev) = @_;
		182
		183	my $mod = $ev->{mod};
		184	my $sym = $ev->{sym};
		185
		186	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
		187	$::CONN->user_send ("fire_stop");
		188	}
		189	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
		190	$::CONN->user_send ("run_stop");
		191	}
		192	}
		193
81	sub draw {	194	sub draw {
82	my ($self) = @_;	195	my ($self) = @_;
83		196
		197	my $focused = $CFClient::UI::FOCUS == $self
		198	\|\| $CFClient::UI::FOCUS == $self->{completer}{entry};
		199
84	return	200	return
85	unless $CFClient::UI::FOCUS == $self \|\| !$::FAST;	201	unless $focused \|\| !$::FAST;
86		202
87	if (delete $self->{need_update}) {	203	if (delete $self->{need_update}) {
88	glNewList $self->{list};	204	glNewList $self->{list};
89		205
90	if ($::MAP) {	206	if ($::MAP) {
…		…
100	glTranslate $sx0 - 32, $sy0 - 32, 0;	216	glTranslate $sx0 - 32, $sy0 - 32, 0;
101		217
102	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	218	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
103		219
104	if ($::CFG->{fow_enable}) {	220	if ($::CFG->{fow_enable}) {
105	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war	221	if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
106	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);	222	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
107	glConvolutionFilter2D (	223	glConvolutionFilter2D (
108	GL_CONVOLUTION_2D,	224	GL_CONVOLUTION_2D,
109	GL_ALPHA,	225	GL_ALPHA,
110	3, 3,	226	3, 3,
…		…
115	0.05, 0.13, 0.05,	231	0.05, 0.13, 0.05,
116	);	232	);
117	glEnable GL_CONVOLUTION_2D;	233	glEnable GL_CONVOLUTION_2D;
118	}	234	}
119		235
		236	$self->{fow_texture_name} \|\|= glGenTexture;
120	# try to re-use the texture name: TODO improve texture class instead	237	# try to re-use the texture name: TODO improve texture class instead
121	my $prev_name = ((delete $self->{fow_texture}) \|\| {})->{name};
122		238
123	$self->{fow_texture} = new CFClient::Texture	239	$self->{fow_texture} = new CFClient::Texture
124	w => $w,	240	w => $w,
125	h => $h,	241	h => $h,
126	data => $data,	242	data => $data,
127	name => $prev_name, # a bit hackish	243	name => $self->{fow_texture_name},
128	internalformat => GL_ALPHA,	244	internalformat => GL_ALPHA,
129	format => GL_ALPHA;	245	format => GL_ALPHA;
130		246
131	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	247	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
132		248
…		…
148	glPushMatrix;	264	glPushMatrix;
149	glCallList $self->{list};	265	glCallList $self->{list};
150	glPopMatrix;	266	glPopMatrix;
151		267
152	# TNT2 emulates logops in software (or worse :)	268	# TNT2 emulates logops in software (or worse :)
153	if ($CFClient::UI::FOCUS != $self) {	269	if ($focused) {
		270	(delete $self->{out_of_focus})->destroy
		271	if $self->{out_of_focus};
		272	} else {
154	glColor 0.4, 0.2, 0.2, 0.9;	273	glColor 0.4, 0.2, 0.2, 0.6;
155	glEnable GL_BLEND;	274	glEnable GL_BLEND;
156	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	275	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
157	glBegin GL_QUADS;	276	glBegin GL_QUADS;
158	glVertex 0, 0;	277	glVertex 0, 0;
159	glVertex 0, $::HEIGHT;	278	glVertex 0, $::HEIGHT;
160	glVertex $::WIDTH, $::HEIGHT;	279	glVertex $::WIDTH, $::HEIGHT;
161	glVertex $::WIDTH, 0;	280	glVertex $::WIDTH, 0;
162	glEnd;	281	glEnd;
163	glDisable GL_BLEND;	282	glDisable GL_BLEND;
164	}
165	}
166		283
167	my %DIR = (	284	# $self->{out_of_focus} \|\|= do {
168	CFClient::SDLK_KP8, [1, "north"],	285	# my $label = new CFClient::UI::Label
169	CFClient::SDLK_KP9, [2, "northeast"],	286	# x => 0,
170	CFClient::SDLK_KP6, [3, "east"],	287	# y => 0,
171	CFClient::SDLK_KP3, [4, "southeast"],	288	# z => 1,
172	CFClient::SDLK_KP2, [5, "south"],	289	# ellipsise => 0,
173	CFClient::SDLK_KP1, [6, "southwest"],	290	# text => "map out of focus (click map to play)";
174	CFClient::SDLK_KP4, [7, "west"],	291	#
175	CFClient::SDLK_KP7, [8, "northwest"],	292	# $label->show;
176		293	# $label->update;
177	CFClient::SDLK_UP, [1, "north"],	294	#
178	CFClient::SDLK_RIGHT, [3, "east"],	295	# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
179	CFClient::SDLK_DOWN, [5, "south"],	296	# $label->move_abs (
180	CFClient::SDLK_LEFT, [7, "west"],	297	# ($::WIDTH - $label->{w}) * 0.5,
181	);	298	# ($::HEIGHT - $label->{h}) * 0.5,
182		299	# );
183	sub key_down {	300	# });
184	my ($self, $ev) = @_;	301	#
185		302	# $label
186	return unless $::CONN;
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	}	303	# };
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	}	304	}
236	}	305	}
237		306
238	sub key_up {	307	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) = @_;	308	my $self = shift;
268		309
269	%{$self->{command}} = ();	310	glDeleteList $self->{list};
		311
		312	$self->SUPER::DESTROY;
270	}	313	}
271		314
272	package CFClient::MapWidget::MapMap;	315	package CFClient::MapWidget::MapMap;
273		316
274	our @ISA = CFClient::UI::Base::;	317	our @ISA = CFClient::UI::Base::;
…		…
375	fontsize => $_,	418	fontsize => $_,
376	), (0.8) x 16	419	), (0.8) x 16
377	];	420	];
378		421
379	$self->{entry} = new CFClient::UI::Entry	422	$self->{entry} = new CFClient::UI::Entry
380	connect_changed => sub {	423	on_changed => sub {
381	$self->update_labels;	424	$self->update_labels;
		425	},
		426	on_key_down => sub {
		427	my ($entry, $ev) = @_;
		428
		429	my $self = $entry->{parent}{parent};
		430
		431	if ($ev->{sym} == 13) {
		432	if (exists $self->{select}) {
		433	$self->{last_command} = $self->{select};
		434	$::CONN->user_send ($self->{select});
		435	$self->hide;
		436	}
		437	} elsif ($ev->{sym} == 27) {
		438	$self->hide;
		439	return;
		440	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
		441	++$self->{select_offset}
		442	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
		443	$self->update_labels;
		444	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
		445	--$self->{select_offset}
		446	if $self->{select_offset};
		447	$self->update_labels;
		448	} else {
		449	return 0;
		450	}
		451
		452	1
382	};	453	}
		454	;
383		455
384	$self->{vbox}->add (	456	$self->{vbox}->add (
385	$self->{entry},	457	$self->{entry},
386	@{$self->{label}},	458	@{$self->{label}},
387	);	459	);
388		460
389	$self	461	$self
390	}	462	}
391		463
		464	sub set_prefix {
		465	my ($self, $prefix) = @_;
		466
		467	$self->{entry}->set_text ($prefix);
		468	$self->show;
		469	}
		470
392	sub size_allocate {	471	sub size_allocate {
393	my ($self, $w, $h) = @_;	472	my ($self, $w, $h) = @_;
394		473
395	$self->SUPER::size_allocate ($w, $h);	474	$self->SUPER::size_allocate ($w, $h);
396	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	475	$self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		476	}
		477
		478	sub show {
		479	my ($self) = @_;
		480
		481	$self->SUPER::show;
		482	$self->{entry}->focus_in;
		483	}
		484
		485	sub hide {
		486	my ($self) = @_;
		487
		488	$self->SUPER::hide;
		489	$self->{entry}->set_text ("");
397	}	490	}
398		491
399	sub key_down {	492	sub key_down {
400	my ($self, $ev) = @_;	493	my ($self, $ev) = @_;
401		494
402	if ($ev->{sym} == 13) {	495	$self->{entry}->key_down ($ev);
403	if (exists $self->{select}) {	496	}
404	$self->emit (execute => $self->{select});	497
405	$self->emit ("close");	498	sub update_labels {
		499	my ($self) = @_;
		500
		501	my $text = $self->{entry}->get_text;
		502
		503	length $text
		504	or return $self->hide;
		505
		506	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		507
		508	if ($text ne $self->{last_search}) {
		509	my @match;
		510
		511	if ($text =~ /^(.*?)\s+$/) {
		512	@match = [$cmd, "(appended whitespace suppresses completion)"];
		513	} else {
		514	my $regexp = do {
		515	my ($beg, @chr) = split //, lc $cmd;
		516
		517	# the following regex is used to match our "completion entry"
		518	# to an actual command - the parentheses match kind of "overhead"
		519	# - the more characters the parentheses match, the less attractive
		520	# is the match.
		521	my $regexp = "^\Q$beg\E"
		522	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		523	qr<$regexp>
		524	};
		525
		526	my @penalty;
		527
		528	for (keys %{$self->{command}}) {
		529	if (@penalty = $_ =~ $regexp) {
		530	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		531	}
		532	}
		533
		534	@match = map $self->{command}{$_->[0]},
		535	sort {
		536	$a->[1] <=> $b->[1]
		537	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		538	or (length $b->[0]) <=> (length $a->[0])
		539	} @match;
406	}	540	}
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		541
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
463	$self->{last_search} = $cmd;	542	$self->{last_search} = $text;
464	$self->{last_match} = \@match;	543	$self->{last_match} = \@match;
465		544
466	$self->{select_offset} = 0;	545	$self->{select_offset} = 0;
467	}	546	}
468		547

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.45 by elmex, Tue May 30 14:35:09 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.45 by elmex, Tue May 30 14:35:09 2006 UTC