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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.9 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.50 by root, Sat Jun 3 23:47:47 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.9 by root, Mon Apr 24 02:41:48 2006 UTC vs. Revision 1.50 by root, Sat Jun 3 23:47:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.9 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.50 by root, Sat Jun 3 23:47:47 2006 UTC