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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.2 by root, Wed Apr 19 09:40:00 2006 UTC vs. Revision 1.70 by elmex, Sun Jul 2 19:32:55 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.2 by root, Wed Apr 19 09:40:00 2006 UTC vs.
Revision 1.70 by elmex, Sun Jul 2 19:32:55 2006 UTC