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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs.
Revision 1.49 by root, Sat Jun 3 22:50:48 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs. Revision 1.49 by root, Sat Jun 3 22:50:48 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.17 by root, Mon Apr 24 13:12:32 2006 UTC vs.
Revision 1.49 by root, Sat Jun 3 22:50:48 2006 UTC