[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.62 by root, Thu Jun 15 16:44:20 2006 UTC

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