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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.182 by root, Sun Apr 30 11:17:08 2006 UTC vs.
Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC

…		…
1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {	36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36	}	38	}
37		39
38	$TOOLTIP->move ($x, $y);	40	$TOOLTIP->move ($x, $y);
		41	$TOOLTIP->check_size;
		42	$TOOLTIP->update;
39	}	43	}
40		44
41	return;	45	return;
42	}	46	}
43	}	47	}
…		…
130		134
131	for (@$vals) {	135	for (@$vals) {
132	my $i = int $_ + $rem;	136	my $i = int $_ + $rem;
133	$rem += $_ - $i;	137	$rem += $_ - $i;
134	$_ = $i;	138	$_ = $i;
		139	}
		140	}
		141
		142	# call when resolution changes etc.
		143	sub rescale_widgets {
		144	my ($sx, $sy) = @_;
		145
		146	for my $widget (values %WIDGET) {
		147	if ($widget->{toplevel}) {
		148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		149	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		150	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		151	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		152	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		153	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		154	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		155	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		156	}
		157
		158	$widget->reconfigure;
135	}	159	}
136	}	160	}
137		161
138	#############################################################################	162	#############################################################################
139		163
…		…
158	if (/^connect_(.*)$/) {	182	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	183	$self->connect ($1 => delete $self->{$_});
160	}	184	}
161	}	185	}
162		186
		187	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		188
163	$self	189	$self
164	}	190	}
165		191
166	sub destroy {	192	sub destroy {
167	my ($self) = @_;	193	my ($self) = @_;
…		…
173	sub show {	199	sub show {
174	my ($self) = @_;	200	my ($self) = @_;
175		201
176	return if $self->{parent};	202	return if $self->{parent};
177		203
		204	$self->{toplevel} = 1;
178	$CFClient::UI::ROOT->add ($self);	205	$CFClient::UI::ROOT->add ($self);
179	}	206	}
180		207
181	sub hide {	208	sub hide {
182	my ($self) = @_;	209	my ($self) = @_;
…		…
232	$self->{y} = $y;	259	$self->{y} = $y;
233	$self->update;	260	$self->update;
234	}	261	}
235		262
236	if ($self->{w} != $w \|\| $self->{h} != $h) {	263	if ($self->{w} != $w \|\| $self->{h} != $h) {
237	$self->{w} = $w;	264	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	$self->emit (size_allocate => $w, $h);
243	}	265	}
244	}	266	}
245		267
246	sub size_allocate {	268	sub size_allocate {
247	# nothing to be done	269	# nothing to be done
248	}	270	}
249		271
		272	sub reconfigure {
		273	my ($self) = @_;
		274
		275	$self->check_size (1);
		276	$self->update;
		277	}
		278
250	sub children {	279	sub children {
251	}
252
253	# call when resolution changes etc.
254	sub reconfigure {
255	my ($self) = @_;
256
257	$_->reconfigure
258	for $self->children;
259
260	$_->check_size;
261	}	280	}
262		281
263	sub set_max_size {	282	sub set_max_size {
264	my ($self, $w, $h) = @_;	283	my ($self, $w, $h) = @_;
265		284
266	delete $self->{max_w}; $self->{max_w} = $w if $w;	285	delete $self->{max_w}; $self->{max_w} = $w if $w;
267	delete $self->{max_h}; $self->{max_h} = $h if $h;	286	delete $self->{max_h}; $self->{max_h} = $h if $h;
268	}
269
270	# return top left coordinates
271	sub _topleft {
272	my ($self, $x, $y) = @_;
273
274	$self->{parent}
275	or Carp::confess "no parent widget in _topleft\n";#d#
276
277	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
278	}	287	}
279		288
280	# translate global coordinates to local coordinate system	289	# translate global coordinates to local coordinate system
281	sub coord2local {	290	sub coord2local {
282	my ($self, $x, $y) = @_;	291	my ($self, $x, $y) = @_;
283		292
284	my ($X, $Y) = $self->_topleft;	293	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285	($x - $X, $y - $Y)
286	}	294	}
287		295
288	# translate local coordinates to global coordinate system	296	# translate local coordinates to global coordinate system
289	sub coord2global {	297	sub coord2global {
290	my ($self, $x, $y) = @_;	298	my ($self, $x, $y) = @_;
291		299
292	my ($X, $Y) = $self->_topleft;	300	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293	($x + $X, $y + $Y)
294	}	301	}
295		302
296	sub focus_in {	303	sub focus_in {
297	my ($self) = @_;	304	my ($self) = @_;
298		305
…		…
396		403
397	sub set_parent {	404	sub set_parent {
398	my ($self, $parent) = @_;	405	my ($self, $parent) = @_;
399		406
400	Scalar::Util::weaken ($self->{parent} = $parent);	407	Scalar::Util::weaken ($self->{parent} = $parent);
		408
		409	# TODO: req_w _does_change after ->reconfigure
		410	$self->check_size
		411	unless exists $self->{req_w};
401	}	412	}
402		413
403	sub check_size {	414	sub check_size {
404	my ($self) = @_;	415	my ($self, $forced) = @_;
405		416
406	$self->{parent}	417	$self->{force_alloc} = 1 if $forced;
407	or return 1;	418	$CFClient::UI::ROOT->{check_size}{$self} = $self;
408
409	my ($w, $h) = $self->{user_w} && $self->{user_h}
410	? @$self{qw(user_w user_h)}
411	: $self->size_request;
412
413	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
414	$self->{req_w} = $w;
415	$self->{req_h} = $h;
416
417	$self->{parent}->check_size
418	or $self->size_allocate (
419	(List::Util::max $self->{w}, $w),
420	(List::Util::max $self->{h}, $h),
421	);
422
423	1
424	} else {
425	0
426	}
427	}	419	}
428		420
429	sub update {	421	sub update {
430	my ($self) = @_;	422	my ($self) = @_;
431		423
…		…
446	}	438	}
447		439
448	sub DESTROY {	440	sub DESTROY {
449	my ($self) = @_;	441	my ($self) = @_;
450		442
		443	delete $WIDGET{$self+0};
451	#$self->deactivate;	444	#$self->deactivate;
452	}	445	}
453		446
454	#############################################################################	447	#############################################################################
455		448
…		…
528		521
529	$self	522	$self
530	}	523	}
531		524
532	sub add {	525	sub add {
533	my ($self, $child) = @_;	526	my ($self, @widgets) = @_;
534		527
535	$child->set_parent ($self);	528	$_->set_parent ($self)
		529	for @widgets;
536		530
537	use sort 'stable';	531	use sort 'stable';
538		532
539	$self->{children} = [	533	$self->{children} = [
540	sort { $a->{z} <=> $b->{z} }	534	sort { $a->{z} <=> $b->{z} }
541	@{$self->{children}}, $child	535	@{$self->{children}}, @widgets
542	];	536	];
543		537
544	$child->check_size;	538	$self->check_size (1);
545	$self->update;	539	$self->update;
546	}	540	}
547		541
548	sub children {	542	sub children {
549	@{ $_[0]{children} }	543	@{ $_[0]{children} }
…		…
656	}	650	}
657		651
658	sub update {	652	sub update {
659	my ($self) = @_;	653	my ($self) = @_;
660		654
661	$ROOT->on_refresh ($self => sub { $self->render_child });	655	$ROOT->on_post_alloc ($self => sub { $self->render_child });
662	$self->SUPER::update;	656	$self->SUPER::update;
663	}	657	}
664		658
665	sub size_allocate {	659	sub size_allocate {
666	my ($self, $w, $h) = @_;	660	my ($self, $w, $h) = @_;
…		…
697	my ($w, $h) = ($self->w, $self->h);	691	my ($w, $h) = ($self->w, $self->h);
698		692
699	my $tex = $self->{texture}	693	my $tex = $self->{texture}
700	or return;	694	or return;
701		695
702	glEnable GL_BLEND;
703	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704	glEnable GL_TEXTURE_2D;	696	glEnable GL_TEXTURE_2D;
705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706	glColor 0, 0, 0, 1;	698	glColor 0, 0, 0, 1;
707		699
708	$tex->draw_quad (0, 0, $w, $h);	700	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709		701
710	glDisable GL_BLEND;
711	glDisable GL_TEXTURE_2D;	702	glDisable GL_TEXTURE_2D;
712	}	703	}
713		704
714	#############################################################################	705	#############################################################################
715		706
…		…
737		728
738	$self->{view_x} = int $x;	729	$self->{view_x} = int $x;
739	$self->{view_y} = int $y;	730	$self->{view_y} = int $y;
740		731
741	$self->update;	732	$self->update;
		733	}
		734
		735	# hmm, this does not work for topleft of $self... but we should not ask for that
		736	sub coord2local {
		737	my ($self, $x, $y) = @_;
		738
		739	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		740	}
		741
		742	sub coord2global {
		743	my ($self, $x, $y) = @_;
		744
		745	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		746	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		747
		748	$self->SUPER::coord2global ($x, $y)
		749	}
		750
		751	sub find_widget {
		752	my ($self, $x, $y) = @_;
		753
		754	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		755	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		756	) {
		757	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		758	} else {
		759	$self->CFClient::UI::Base::find_widget ($x, $y)
		760	}
742	}	761	}
743		762
744	sub _render {	763	sub _render {
745	my ($self) = @_;	764	my ($self) = @_;
746		765
…		…
779	$self->add ($self->{slider});	798	$self->add ($self->{slider});
780		799
781	$self	800	$self
782	}	801	}
783		802
784	#TODO# update range on size_allocate depeneing on child	803	#TODO# update range on size_allocate depending on child
785	# update viewport offset on scroll	804	# update viewport offset on scroll
786		805
787	#############################################################################	806	#############################################################################
788		807
789	package CFClient::UI::Frame;	808	package CFClient::UI::Frame;
…		…
793	use CFClient::OpenGL;	812	use CFClient::OpenGL;
794		813
795	sub new {	814	sub new {
796	my $class = shift;	815	my $class = shift;
797		816
798	my $self = $class->SUPER::new (	817	$class->SUPER::new (
799	bg => [1, 1, 1, 1],	818	bg => undef,
800	border_bg => [1, 1, 1, 1],
801	border => 0.8,
802	@_	819	@_,
803	);	820	)
804
805	$self
806	}	821	}
807		822
808	sub _draw {	823	sub _draw {
809	my ($self) = @_;	824	my ($self) = @_;
810		825
811	my ($w, $h) = ($self->{w}, $self->{h});	826	if ($self->{bg}) {
		827	my ($w, $h) = @$self{qw(w h)};
812		828
813	glEnable GL_BLEND;	829	glEnable GL_BLEND;
814	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	830	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815	glEnable GL_TEXTURE_2D;	831	glColor @{ $self->{bg} };
816	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817		832
818	# glBegin GL_QUADS;	833	glBegin GL_QUADS;
819	# glColor 0, 0, 0, 0;
820	# glVertex 0 , 0;	834	glVertex 0 , 0;
821	# glVertex 0 , $h;	835	glVertex 0 , $h;
822	# glVertex $w, $h;	836	glVertex $w, $h;
823	# glVertex $w, 0;	837	glVertex $w, 0;
824	# glEnd;	838	glEnd;
825		839
826
827	$self->child->draw;
828	glDisable GL_BLEND;	840	glDisable GL_BLEND;
829	glDisable GL_TEXTURE_2D;	841	}
		842
		843	$self->SUPER::_draw;
830	}	844	}
831		845
832	#############################################################################	846	#############################################################################
833		847
834	package CFClient::UI::FancyFrame;	848	package CFClient::UI::FancyFrame;
…		…
848		862
849	my $self = $class->SUPER::new (	863	my $self = $class->SUPER::new (
850	bg => [1, 1, 1, 1],	864	bg => [1, 1, 1, 1],
851	border_bg => [1, 1, 1, 1],	865	border_bg => [1, 1, 1, 1],
852	border => 0.6,	866	border => 0.6,
		867	toplevel => 1,
853	can_events => 1,	868	can_events => 1,
854	@_	869	@_
855	);	870	);
856		871
857	$self->{title} &&= new CFClient::UI::Label	872	$self->{title} &&= new CFClient::UI::Label
…		…
950	my ($self) = @_;	965	my ($self) = @_;
951		966
952	my ($w, $h ) = ($self->{w}, $self->{h});	967	my ($w, $h ) = ($self->{w}, $self->{h});
953	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	968	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
954		969
955	glEnable GL_BLEND;
956	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957	glEnable GL_TEXTURE_2D;	970	glEnable GL_TEXTURE_2D;
958	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	971	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959		972
960	my $border = $self->border;	973	my $border = $self->border;
961		974
962	glColor @{ $self->{border_bg} };	975	glColor @{ $self->{border_bg} };
963	$tex[1]->draw_quad (0, 0, $w, $border);	976	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
964	$tex[3]->draw_quad (0, $border, $border, $ch);	977	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
965	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	978	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966	$tex[4]->draw_quad (0, $h - $border, $w, $border);	979	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
967		980
968	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	981	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
969	my $bg = $tex[0];	982	my $bg = $tex[0];
970		983
971	# TODO: repeat texture not scale	984	# TODO: repeat texture not scale
…		…
975	glColor @{ $self->{bg} };	988	glColor @{ $self->{bg} };
976		989
977	$bg->{s} = $rep_x;	990	$bg->{s} = $rep_x;
978	$bg->{t} = $rep_y;	991	$bg->{t} = $rep_y;
979	$bg->{wrap_mode} = 1;	992	$bg->{wrap_mode} = 1;
980	$bg->draw_quad ($border, $border, $cw, $ch);	993	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		994	}
981		995
982	glDisable GL_TEXTURE_2D;	996	glDisable GL_TEXTURE_2D;
983	glDisable GL_BLEND;
984	}
985		997
986	$self->{title}->draw if $self->{title};	998	$self->{title}->draw if $self->{title};
987		999
988	$self->child->draw;	1000	$self->child->draw;
989	}	1001	}
…		…
1216	}	1228	}
1217		1229
1218	sub size_allocate {	1230	sub size_allocate {
1219	my ($self, $w, $h) = @_;	1231	my ($self, $w, $h) = @_;
1220		1232
		1233	Carp::confess "negative size" if $w < 0 \|\| $h < 0;#d#
		1234
1221	my $children = $self->{children};	1235	my $children = $self->{children};
1222		1236
1223	my @h = map $_->{req_h}, @$children;	1237	my @h = map $_->{req_h}, @$children;
1224		1238
1225	my $req_h = List::Util::sum @h;	1239	my $req_h = List::Util::sum @h;
…		…
1264	my ($class, %arg) = @_;	1278	my ($class, %arg) = @_;
1265		1279
1266	my $self = $class->SUPER::new (	1280	my $self = $class->SUPER::new (
1267	fg => [1, 1, 1],	1281	fg => [1, 1, 1],
1268	#font => default_font	1282	#font => default_font
		1283	#text => initial text
		1284	#markup => initial narkup
		1285	layout => (new CFClient::Layout),
1269	fontsize => 1,	1286	fontsize => 1,
1270	text => "",
1271	align => -1,	1287	align => -1,
1272	valign => -1,	1288	valign => -1,
1273	padding => 2,	1289	padding => 2,
1274	layout => new CFClient::Layout,
1275	can_events => 0,	1290	can_events => 0,
1276	%arg	1291	%arg
1277	);	1292	);
1278		1293
1279	if (exists $self->{template}) {	1294	if (exists $self->{template}) {
1280	my $layout = new CFClient::Layout;	1295	my $layout = new CFClient::Layout;
1281	$layout->set_text (delete $self->{template});	1296	$layout->set_text (delete $self->{template});
1282	$self->{template} = $layout;	1297	$self->{template} = $layout;
1283	}	1298	}
1284		1299
1285	$self->set_text (delete $self->{text}) if exists $self->{text};	1300	if (exists $self->{markup}) {
1286	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1301	$self->set_markup (delete $self->{markup});
		1302	} else {
		1303	$self->set_text (delete $self->{text});
		1304	}
1287		1305
1288	$self	1306	$self
1289	}	1307	}
1290		1308
1291	sub escape {	1309	sub escape {
…		…
1303		1321
1304	delete $self->{texture};	1322	delete $self->{texture};
1305	$self->SUPER::update;	1323	$self->SUPER::update;
1306	}	1324	}
1307		1325
1308	sub reconfigure {
1309	my ($self) = @_;
1310
1311	delete $self->{texture};
1312	}
1313
1314	sub set_text {	1326	sub set_text {
1315	my ($self, $text) = @_;	1327	my ($self, $text) = @_;
1316		1328
1317	return if $self->{text} eq "T$text";	1329	return if $self->{text} eq "T$text";
1318	$self->{text} = "T$text";	1330	$self->{text} = "T$text";
1319		1331
		1332	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320	$self->{layout}->set_text ($text);	1333	$self->{layout}->set_text ($text);
1321		1334
1322	delete $self->{texture};
1323	$self->update;	1335	$self->update;
1324	$self->check_size;	1336	$self->check_size;
1325	}	1337	}
1326		1338
1327	sub set_markup {	1339	sub set_markup {
1328	my ($self, $markup) = @_;	1340	my ($self, $markup) = @_;
1329		1341
1330	return if $self->{text} eq "M$markup";	1342	return if $self->{text} eq "M$markup";
1331	$self->{text} = "M$markup";	1343	$self->{text} = "M$markup";
1332		1344
		1345	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
		1346
		1347	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333	$self->{layout}->set_markup ($markup);	1348	$self->{layout}->set_markup ($markup);
1334		1349
1335	delete $self->{texture};
1336	$self->update;	1350	$self->update;
1337	$self->check_size;	1351	$self->check_size;
1338	}	1352	}
1339		1353
1340	sub size_request {	1354	sub size_request {
…		…
1371	sub set_fontsize {	1385	sub set_fontsize {
1372	my ($self, $fontsize) = @_;	1386	my ($self, $fontsize) = @_;
1373		1387
1374	$self->{fontsize} = $fontsize;	1388	$self->{fontsize} = $fontsize;
1375	delete $self->{texture};	1389	delete $self->{texture};
		1390
		1391	$self->update;
1376	$self->check_size;	1392	$self->check_size;
1377	$self->update;
1378	}	1393	}
1379		1394
1380	sub _draw {	1395	sub _draw {
1381	my ($self) = @_;	1396	my ($self) = @_;
1382		1397
1383	my $tex = $self->{texture} \|\|= do {	1398	my $tex = $self->{texture} \|\|= do {
		1399	$self->{layout}->set_foreground (@{$self->{fg}});
1384	$self->{layout}->set_font ($self->{font}) if $self->{font};	1400	$self->{layout}->set_font ($self->{font}) if $self->{font};
1385	$self->{layout}->set_width ($self->{w});	1401	$self->{layout}->set_width ($self->{w});
1386	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1402	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1403
1387	new_from_layout CFClient::Texture $self->{layout}	1404	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1405
		1406	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
		1407	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1408	: ($self->{w} - $tex->{w}) * 0.5;
		1409
		1410	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
		1411	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1412	: ($self->{h} - $tex->{h}) * 0.5;
		1413
		1414	$tex
1388	};	1415	};
1389		1416
1390	glEnable GL_BLEND;
1391	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392	glEnable GL_TEXTURE_2D;	1417	glEnable GL_TEXTURE_2D;
1393	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1418	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394		1419
		1420	if ($tex->{format} == GL_ALPHA) {
1395	glColor @{$self->{fg}};	1421	glColor @{$self->{fg}};
1396
1397	$self->{ox} = int (
1398	$self->{align} < 0 ? $self->{padding}
1399	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1400	: ($self->{w} - $tex->{w}) * 0.5
1401	);
1402
1403	$self->{oy} = int (
1404	$self->{valign} < 0 ? $self->{padding}
1405	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1406	: ($self->{h} - $tex->{h}) * 0.5
1407	);
1408
1409	$tex->draw_quad ($self->{ox}, $self->{oy});	1422	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1423	} else {
		1424	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1425	}
1410		1426
1411	glDisable GL_TEXTURE_2D;	1427	glDisable GL_TEXTURE_2D;
1412	glDisable GL_BLEND;
1413	}	1428	}
1414		1429
1415	#############################################################################	1430	#############################################################################
1416		1431
1417	package CFClient::UI::EntryBase;	1432	package CFClient::UI::EntryBase;
…		…
1452	$self->{layout}->set_text ("$text ");	1467	$self->{layout}->set_text ("$text ");
1453		1468
1454	$self->emit (changed => $self->{text});	1469	$self->emit (changed => $self->{text});
1455	}	1470	}
1456		1471
		1472	sub set_text {
		1473	my ($self, $text) = @_;
		1474
		1475	$self->{cursor} = length $text;
		1476	$self->_set_text ($text);
		1477	$self->check_size;
		1478	$self->update;
		1479	}
		1480
1457	sub get_text {	1481	sub get_text {
1458	$_[0]{text}	1482	$_[0]{text}
1459	}	1483	}
1460		1484
1461	sub size_request {	1485	sub size_request {
…		…
1468		1492
1469	sub size_allocate {	1493	sub size_allocate {
1470	my ($self, $w, $h) = @_;	1494	my ($self, $w, $h) = @_;
1471		1495
1472	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text	1496	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473	}
1474
1475	sub set_text {
1476	my ($self, $text) = @_;
1477
1478	$self->{cursor} = length $text;
1479	$self->_set_text ($text);
1480	$self->update;
1481	}	1497	}
1482		1498
1483	sub key_down {	1499	sub key_down {
1484	my ($self, $ev) = @_;	1500	my ($self, $ev) = @_;
1485		1501
…		…
1487	my $sym = $ev->{sym};	1503	my $sym = $ev->{sym};
1488	my $uni = $ev->{unicode};	1504	my $uni = $ev->{unicode};
1489		1505
1490	my $text = $self->get_text;	1506	my $text = $self->get_text;
1491		1507
1492	if ($sym == 8) {	1508	if ($uni == 8) {
1493	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1509	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494	} elsif ($sym == 127) {	1510	} elsif ($uni == 127) {
1495	substr $text, $self->{cursor}, 1, "";	1511	substr $text, $self->{cursor}, 1, "";
1496	} elsif ($sym == CFClient::SDLK_LEFT) {	1512	} elsif ($sym == CFClient::SDLK_LEFT) {
1497	--$self->{cursor} if $self->{cursor};	1513	--$self->{cursor} if $self->{cursor};
1498	} elsif ($sym == CFClient::SDLK_RIGHT) {	1514	} elsif ($sym == CFClient::SDLK_RIGHT) {
1499	++$self->{cursor} if $self->{cursor} < length $self->{text};	1515	++$self->{cursor} if $self->{cursor} < length $self->{text};
1500	} elsif ($sym == CFClient::SDLK_HOME) {	1516	} elsif ($sym == CFClient::SDLK_HOME) {
1501	$self->{cursor} = 0;	1517	$self->{cursor} = 0;
1502	} elsif ($sym == CFClient::SDLK_END) {	1518	} elsif ($sym == CFClient::SDLK_END) {
1503	$self->{cursor} = length $text;	1519	$self->{cursor} = length $text;
1504	} elsif ($sym == 27) {	1520	} elsif ($uni == 27) {
1505	$self->emit ('escape');	1521	$self->emit ('escape');
1506	} elsif ($uni) {	1522	} elsif ($uni) {
1507	substr $text, $self->{cursor}++, 0, chr $uni;	1523	substr $text, $self->{cursor}++, 0, chr $uni;
1508	}	1524	}
1509		1525
…		…
1673		1689
1674	if ($GRAB == $self) {	1690	if ($GRAB == $self) {
1675	$self->{fg} = $self->{active_fg};	1691	$self->{fg} = $self->{active_fg};
1676	}	1692	}
1677		1693
1678	glEnable GL_BLEND;
1679	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680	glEnable GL_TEXTURE_2D;	1694	glEnable GL_TEXTURE_2D;
1681	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682	glColor 0, 0, 0, 1;	1696	glColor 0, 0, 0, 1;
1683		1697
1684	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1698	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685		1699
1686	glDisable GL_TEXTURE_2D;	1700	glDisable GL_TEXTURE_2D;
1687	glDisable GL_BLEND;
1688		1701
1689	$self->SUPER::_draw;	1702	$self->SUPER::_draw;
1690	}	1703	}
1691		1704
1692	#############################################################################	1705	#############################################################################
…		…
1739		1752
1740	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1753	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1741		1754
1742	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1755	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743		1756
1744	glEnable GL_BLEND;	1757	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1758
1745	glEnable GL_TEXTURE_2D;	1759	glEnable GL_TEXTURE_2D;
1746	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1747
1748	my $tex = $self->{state} ? $tex[1] : $tex[0];
1749
1750	$tex->draw_quad (0, 0, $s, $s);	1760	$tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752	glDisable GL_TEXTURE_2D;	1761	glDisable GL_TEXTURE_2D;
1753	glDisable GL_BLEND;
1754	}	1762	}
1755		1763
1756	#############################################################################	1764	#############################################################################
1757		1765
1758	package CFClient::UI::Image;	1766	package CFClient::UI::Image;
…		…
1801	glTranslate 0, -$self->{w}, 0;	1809	glTranslate 0, -$self->{w}, 0;
1802		1810
1803	($w, $h) = ($h, $w);	1811	($w, $h) = ($h, $w);
1804	}	1812	}
1805		1813
1806	glEnable GL_BLEND;
1807	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808	glEnable GL_TEXTURE_2D;	1814	glEnable GL_TEXTURE_2D;
1809	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1815	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810		1816
1811	$tex->draw_quad (0, 0, $w, $h);	1817	$tex->draw_quad_alpha (0, 0, $w, $h);
1812		1818
1813	glDisable GL_BLEND;
1814	glDisable GL_TEXTURE_2D;	1819	glDisable GL_TEXTURE_2D;
1815	}	1820	}
1816		1821
1817	#############################################################################	1822	#############################################################################
1818		1823
…		…
2110	$page \|\|= 2;	2115	$page \|\|= 2;
2111		2116
2112	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2117	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2113	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2118	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2114		2119
2115	glEnable GL_BLEND;
2116	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2117	glEnable GL_TEXTURE_2D;	2120	glEnable GL_TEXTURE_2D;
2118	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2121	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119		2122
2120	# draw background	2123	# draw background
2121	$tex[1]->draw_quad (0, 0, $w, $h);	2124	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
2122		2125
2123	# draw handle	2126	# draw handle
2124	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2127	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2125		2128
2126	glDisable GL_BLEND;
2127	glDisable GL_TEXTURE_2D;	2129	glDisable GL_TEXTURE_2D;
2128	}	2130	}
2129		2131
2130	#############################################################################	2132	#############################################################################
2131		2133
…		…
2142	fontsize => 1,	2144	fontsize => 1,
2143	can_events => 0,	2145	can_events => 0,
2144	#font => default_font	2146	#font => default_font
2145	@_,	2147	@_,
2146		2148
2147	layout => (new CFClient::Layout),	2149	layout => (new CFClient::Layout 1),
2148	par => [],	2150	par => [],
2149	height => 0,	2151	height => 0,
2150	children => [	2152	children => [
2151	(new CFClient::UI::Empty expand => 1),	2153	(new CFClient::UI::Empty expand => 1),
2152	(new CFClient::UI::Slider vertical => 1),	2154	(new CFClient::UI::Slider vertical => 1),
…		…
2170		2172
2171	my $layout = $self->{layout};	2173	my $layout = $self->{layout};
2172		2174
2173	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2175	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2174	$layout->set_width ($self->{children}[0]{w});	2176	$layout->set_width ($self->{children}[0]{w});
2175	$layout->set_text ($text);	2177	$layout->set_markup ($text);
2176		2178
2177	($layout->size)[1]	2179	($layout->size)[1]
2178	}	2180	}
2179		2181
2180	sub reflow {	2182	sub reflow {
…		…
2218		2220
2219	return unless $self->{h} > 0;	2221	return unless $self->{h} > 0;
2220		2222
2221	delete $self->{texture};	2223	delete $self->{texture};
2222		2224
2223	$ROOT->on_refresh ($self, sub {	2225	$ROOT->on_post_alloc ($self, sub {
2224	if (delete $self->{need_reflow}) {	2226	if (delete $self->{need_reflow}) {
2225	my $height = 0;	2227	my $height = 0;
2226		2228
2227	$height += $_->[0] = $self->text_height ($_->[2])	2229	$height += $_->[0] = $self->text_height ($_->[2])
2228	for @{$self->{par}};	2230	for @{$self->{par}};
…		…
2236		2238
2237	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2239	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2238	glClearColor 0, 0, 0, 0;	2240	glClearColor 0, 0, 0, 0;
2239	glClear GL_COLOR_BUFFER_BIT;	2241	glClear GL_COLOR_BUFFER_BIT;
2240		2242
2241	glEnable GL_BLEND;
2242	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2243	glEnable GL_TEXTURE_2D;	2243	glEnable GL_TEXTURE_2D;
2244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245		2245
2246	my $top = int $self->{children}[1]{range}[0];	2246	my $top = int $self->{children}[1]{range}[0];
2247		2247
…		…
2256		2256
2257	for my $par (@{$self->{par}}) {	2257	for my $par (@{$self->{par}}) {
2258	my $h = $par->[0];	2258	my $h = $par->[0];
2259		2259
2260	if ($y0 < $y + $h && $y < $y1) {	2260	if ($y0 < $y + $h && $y < $y1) {
		2261	$layout->set_foreground (@{ $par->[1] });
2261	$layout->set_text ($par->[2]);	2262	$layout->set_markup ($par->[2]);
2262		2263
2263	glColor @{ $par->[1] };
2264	my ($W, $H) = $layout->size;	2264	my ($W, $H) = $layout->size;
2265	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2265	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2266	}	2266	}
2267		2267
2268	$y += $h;	2268	$y += $h;
2269	}	2269	}
2270		2270
2271	glDisable GL_TEXTURE_2D;	2271	glDisable GL_TEXTURE_2D;
2272	glDisable GL_BLEND;
2273	};	2272	};
2274	});	2273	});
2275	}	2274	}
2276		2275
2277	sub _draw {	2276	sub _draw {
2278	my ($self) = @_;	2277	my ($self) = @_;
2279		2278
2280	glEnable GL_BLEND;
2281	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282	glEnable GL_TEXTURE_2D;	2279	glEnable GL_TEXTURE_2D;
2283	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2280	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284	glColor 1, 1, 1, 1;	2281	glColor 1, 1, 1, 1;
2285	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2282	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286	glDisable GL_TEXTURE_2D;	2283	glDisable GL_TEXTURE_2D;
2287	glDisable GL_BLEND;
2288		2284
2289	$self->{children}[1]->draw;	2285	$self->{children}[1]->draw;
2290		2286
2291	}	2287	}
2292		2288
…		…
2386	@_,	2382	@_,
2387	can_events => 0,	2383	can_events => 0,
2388	)	2384	)
2389	}	2385	}
2390		2386
2391	sub set_markup {	2387	sub set_tooltip_from {
2392	my ($self, $text) = @_;	2388	my ($self, $widget) = @_;
2393		2389
2394	$self->{label} \|\|= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2390	$self->add (new CFClient::UI::Label
2395	$self->{label}->set_markup ($text);	2391	markup => $widget->{tooltip},
2396	$self->add ($self->{label});	2392	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
		2393	fontsize => 0.8,
		2394	fg => [0, 0, 0, 1],
		2395	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
		2396	);
2397	}	2397	}
2398		2398
2399	sub size_request {	2399	sub size_request {
2400	my ($self) = @_;	2400	my ($self) = @_;
2401
2402	$self->child->set_max_size ($::WIDTH * 0.3);
2403		2401
2404	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2402	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405		2403
2406	($w + 4, $h + 4)	2404	($w + 4, $h + 4)
2407	}	2405	}
…		…
2413	}	2411	}
2414		2412
2415	sub _draw {	2413	sub _draw {
2416	my ($self) = @_;	2414	my ($self) = @_;
2417		2415
2418	glPushMatrix;
2419	glTranslate 0.375, 0.375;	2416	glTranslate 0.375, 0.375;
2420		2417
2421	my ($w, $h) = @$self{qw(w h)};	2418	my ($w, $h) = @$self{qw(w h)};
2422		2419
2423	glColor 1, 0.8, 0.4;	2420	glColor 1, 0.8, 0.4;
…		…
2434	glVertex 0 , $h;	2431	glVertex 0 , $h;
2435	glVertex $w, $h;	2432	glVertex $w, $h;
2436	glVertex $w, 0;	2433	glVertex $w, 0;
2437	glEnd;	2434	glEnd;
2438		2435
2439	glPopMatrix;	2436	glTranslate 2 - 0.375, 2 - 0.375;
2440
2441	glTranslate 2, 2;
2442	$self->SUPER::_draw;	2437	$self->SUPER::_draw;
2443	}	2438	}
2444		2439
2445	#############################################################################	2440	#############################################################################
2446		2441
…		…
2464	}	2459	}
2465		2460
2466	sub _draw {	2461	sub _draw {
2467	my ($self) = @_;	2462	my ($self) = @_;
2468		2463
		2464	return unless $::CONN;#d# manage and cache textures differently
2469	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2465	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2470		2466
2471	# TODO animation	2467	# TODO animation
2472	if ($tex) {	2468	if ($tex) {
2473	glEnable GL_BLEND;
2474	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475	glEnable GL_TEXTURE_2D;	2469	glEnable GL_TEXTURE_2D;
2476	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2470	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477	glColor 1, 1, 1, 1;	2471	glColor 1, 1, 1, 1;
2478	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2472	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479	glDisable GL_TEXTURE_2D;	2473	glDisable GL_TEXTURE_2D;
2480	glDisable GL_BLEND;
2481	}	2474	}
		2475	}
		2476
		2477	#############################################################################
		2478
		2479	package CFClient::UI::InventoryItem;
		2480
		2481	our @ISA = CFClient::UI::HBox::;
		2482
		2483	sub new {
		2484	my $class = shift;
		2485
		2486	my %args = @_;
		2487
		2488	my $item = delete $args{item};
		2489
		2490	my $desc = $item->{nrof} < 2
		2491	? $item->{name}
		2492	: "$item->{nrof} $item->{name_pl}";
		2493
		2494
		2495	my $self = $class->SUPER::new (
		2496	can_hover => 1,
		2497	can_events => 1,
		2498	tooltip => (CFClient::UI::Label->escape ($desc)
		2499	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2500	connect_button_down => sub {
		2501	my ($self, $ev, $x, $y) = @_;
		2502
		2503	# todo: maybe put examine on 1? but should just be a tooltip :(
		2504	if ($ev->{button} == 1) {
		2505	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2506	} elsif ($ev->{button} == 2) {
		2507	$::CONN->send ("apply $item->{tag}");
		2508	} elsif ($ev->{button} == 3) {
		2509	CFClient::UI::Menu->new (
		2510	items => [
		2511	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2512	[
		2513	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2514	sub { $::CONN->send ("lock $item->{tag}") },
		2515	],
		2516	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2517	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2518	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2519	],
		2520	)->popup ($ev);
		2521	}
		2522
		2523	1
		2524	},
		2525	%args
		2526	);
		2527
		2528	$self->add (new CFClient::UI::Face
		2529	can_events => 0,
		2530	face => $item->{face},
		2531	anim => $item->{anim},
		2532	animspeed => $item->{animspeed},
		2533	);
		2534
		2535	$self->add (new CFClient::UI::Label
		2536	can_events => 0,
		2537	text => $desc,
		2538	);
		2539
		2540	$self
		2541	}
		2542
		2543	#############################################################################
		2544
		2545	package CFClient::UI::Inventory;
		2546
		2547	our @ISA = CFClient::UI::ScrolledWindow::;
		2548
		2549	sub new {
		2550	my $class = shift;
		2551
		2552	my $self = $class->SUPER::new (
		2553	scrolled => (new CFClient::UI::VBox),
		2554	@_,
		2555	);
		2556
		2557	$self
		2558	}
		2559
		2560	sub set_items {
		2561	my ($self, $items) = @_;
		2562
		2563	$self->{scrolled}->clear;
		2564	return unless $items;
		2565
		2566	my @items = sort {
		2567	($a->{type} <=> $b->{type})
		2568	or ($a->{name} cmp $b->{name})
		2569	} @$items;
		2570
		2571	$self->{real_items} = \@items;
		2572
		2573	for my $item (@items) {
		2574	my $desc = $item->{nrof} < 2
		2575	? $item->{name}
		2576	: "$item->{nrof} $item->{name_pl}";
		2577
		2578	$item = $item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item;
		2579	}
		2580
		2581	$self->{scrolled}->add (@items);
		2582
		2583	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2584	}
		2585
		2586	sub size_request {
		2587	my ($self) = @_;
		2588	($self->{req_w}, $self->{req_h});
2482	}	2589	}
2483		2590
2484	#############################################################################	2591	#############################################################################
2485		2592
2486	package CFClient::UI::Menu;	2593	package CFClient::UI::Menu;
…		…
2553	}	2660	}
2554	}	2661	}
2555		2662
2556	#############################################################################	2663	#############################################################################
2557		2664
		2665	package CFClient::UI::Statusbox;
		2666
		2667	our @ISA = CFClient::UI::VBox::;
		2668
		2669	sub reorder {
		2670	my ($self) = @_;
		2671	my $NOW = time;
		2672
		2673	while (my ($k, $v) = each %{ $self->{item} }) {
		2674	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2675	}
		2676
		2677	my @widgets;
		2678
		2679	my @items = sort {
		2680	$a->{pri} <=> $b->{pri}
		2681	or $b->{id} <=> $a->{id}
		2682	} values %{ $self->{item} };
		2683
		2684	my $count = 10 + 1;
		2685	for my $item (@items) {
		2686	last unless --$count;
		2687
		2688	push @widgets, $item->{label} \|\|= do {
		2689	# TODO: doesn't handle markup well (read as: at all)
		2690	my $short = $item->{count} > 1
		2691	? "<b>$item->{count} ×</b> $item->{text}"
		2692	: $item->{text};
		2693
		2694	for ($short) {
		2695	s/^\s+//;
		2696	s/\012.*/…/s;
		2697	my $len = int 40 / $item->{fontsize};
		2698	substr $_, $len, length, "…" if $len < length;
		2699	}
		2700
		2701	new CFClient::UI::Label
		2702	markup => $short,
		2703	tooltip => $item->{tooltip},
		2704	tooltip_font => $::FONT_PROP,
		2705	tooltip_width => 0.67,
		2706	fontsize => $item->{fontsize},
		2707	color => $item->{color},
		2708	can_events => 1,
		2709	can_hover => 1
		2710	};
		2711	}
		2712
		2713	$self->clear;
		2714	$self->SUPER::add (reverse @widgets);
		2715	}
		2716
		2717	sub add {
		2718	my ($self, $text, %arg) = @_;
		2719
		2720	$text =~ s/^\s+//;
		2721	$text =~ s/\s+$//;
		2722
		2723	my $timeout = time + ((delete $arg{timeout}) \|\| 60);
		2724
		2725	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2726
		2727	if (my $item = $self->{item}{$group}) {
		2728	if ($item->{text} eq $text) {
		2729	$item->{count}++;
		2730	} else {
		2731	$item->{count} = 1;
		2732	$item->{text} = $item->{tooltip} = $text;
		2733	}
		2734	$item->{id} = ++$self->{id};
		2735	$item->{timeout} = $timeout;
		2736	delete $item->{label};
		2737	} else {
		2738	$self->{item}{$group} = {
		2739	id => ++$self->{id},
		2740	text => $text,
		2741	timeout => $timeout,
		2742	tooltip => $text,
		2743	fontsize => 0.8,
		2744	color => [0.8, 0.8, 0.8, 0.8],
		2745	pri => 0,
		2746	count => 1,
		2747	%arg,
		2748	};
		2749	}
		2750
		2751	$self->reorder;
		2752	}
		2753
		2754	#############################################################################
		2755
2558	package CFClient::UI::Root;	2756	package CFClient::UI::Root;
2559		2757
2560	our @ISA = CFClient::UI::Container::;	2758	our @ISA = CFClient::UI::Container::;
2561		2759
2562	use CFClient::OpenGL;	2760	use CFClient::OpenGL;
2563		2761
2564	sub check_size {	2762	sub new {
2565	my ($self) = @_;	2763	my $class = shift;
2566		2764
2567	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2765	$class->SUPER::new (
2568	}	2766	@_,
2569		2767	)
2570	sub size_request {
2571	($::WIDTH, $::HEIGHT)
2572	}	2768	}
2573		2769
2574	sub configure {	2770	sub configure {
2575	my ($self, $x, $y, $w, $h) = @_;	2771	my ($self, $x, $y, $w, $h) = @_;
2576		2772
2577	$self->SUPER::configure ($x, $y, $w, $h);	2773	$self->{w} = $w;
		2774	$self->{h} = $h;
		2775	}
2578		2776
		2777	sub check_size {
		2778	my ($self) = @_;
		2779
		2780	$self->size_allocate ($self->{w}, $self->{h})
		2781	if $self->{w};
		2782	}
		2783
		2784	sub size_request {
		2785	my ($self) = @_;
		2786
		2787	($self->{w}, $self->{h})
		2788	}
		2789
		2790	sub size_allocate {
		2791	my ($self, $w, $h) = @_;
		2792
		2793	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2794	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2795
		2796	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2797	if $old_w && $old_h && ($old_w != $w \|\| $old_h != $h);
		2798
2579	for my $child (@{$self->{children}}) {	2799	for my $child ($self->children) {
2580	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2800	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581		2801
2582	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2802	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2583	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2803	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2584	$child->configure ($X, $Y, $W,$H);	2804	$child->configure ($X, $Y, $W, $H);
2585	}	2805	}
2586	}	2806	}
2587		2807
2588	sub _topleft {	2808	sub coord2local {
2589	my ($self, $x, $y) = @_;	2809	my ($self, $x, $y) = @_;
2590		2810
2591	($x, $y)	2811	($x, $y)
2592	}	2812	}
2593		2813
		2814	sub coord2global {
		2815	my ($self, $x, $y) = @_;
		2816
		2817	($x, $y)
		2818	}
		2819
2594	sub update {	2820	sub update {
2595	my ($self) = @_;	2821	my ($self) = @_;
2596		2822
2597	$self->check_size;	2823	$self->check_size;
2598	::refresh ();	2824	$::WANT_REFRESH++;
2599	}	2825	}
2600		2826
2601	sub add {	2827	sub add {
2602	my ($self, $child) = @_;	2828	my ($self, $child) = @_;
2603		2829
2604	# integerize window positions	2830	# integerise window positions
2605	$child->{x} = int $child->{x};	2831	$child->{x} = int $child->{x};
2606	$child->{y} = int $child->{y};	2832	$child->{y} = int $child->{y};
2607		2833
2608	$self->SUPER::add ($child);	2834	$self->SUPER::add ($child);
2609	}	2835	}
…		…
2612	my ($self, $id, $cb) = @_;	2838	my ($self, $id, $cb) = @_;
2613		2839
2614	$self->{refresh_hook}{$id} = $cb;	2840	$self->{refresh_hook}{$id} = $cb;
2615	}	2841	}
2616		2842
		2843	sub on_post_alloc {
		2844	my ($self, $id, $cb) = @_;
		2845
		2846	$self->{post_alloc_hook}{$id} = $cb;
		2847	}
		2848
2617	sub draw {	2849	sub draw {
2618	my ($self) = @_;	2850	my ($self) = @_;
2619		2851
2620	while (my $rcb = delete $self->{refresh_hook}) {	2852	while ($self->{refresh_hook}) {
2621	$_->() for values %$rcb;	2853	$_->()
		2854	for values %{delete $self->{refresh_hook}};
		2855	}
		2856
		2857	if ($self->{check_size}) {
		2858	my @queue = ([], []);
		2859
		2860	for (;;) {
		2861	if ($self->{check_size}) {
		2862	# heuristic: check containers last
		2863	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2864	for values %{delete $self->{check_size}}
		2865	}
		2866
		2867	my $widget = (pop @{ $queue[0] }) \|\| (pop @{ $queue[1] }) \|\| last;
		2868
		2869	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2870	? @$widget{qw(user_w user_h)}
		2871	: $widget->size_request;
		2872
		2873	if (delete $widget->{force_alloc}
		2874	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		2875	Carp::confess "$widget: size_request is negative" if $w < 0 \|\| $h < 0;#d#
		2876
		2877	$widget->{req_w} = $w;
		2878	$widget->{req_h} = $h;
		2879
		2880	$self->{size_alloc}{$widget} = [$widget, $widget->{w} \|\| $w, $widget->{h} \|\| $h];
		2881
		2882	$widget->{parent}->check_size
		2883	if $widget->{parent};
		2884	}
		2885	}
		2886	}
		2887
		2888	while ($self->{size_alloc}) {
		2889	for (values %{delete $self->{size_alloc}}) {
		2890	my ($widget, $w, $h) = @$_;
		2891
		2892	$w = 0 if $w < 0;
		2893	$h = 0 if $h < 0;
		2894
		2895	$widget->{w} = $w;
		2896	$widget->{h} = $h;
		2897	$widget->size_allocate ($w, $h);
		2898	$widget->emit (size_allocate => $w, $h);
		2899	}
		2900	}
		2901
		2902	while ($self->{post_alloc_hook}) {
		2903	$_->()
		2904	for values %{delete $self->{post_alloc_hook}};
2622	}	2905	}
2623		2906
2624	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2907	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2908	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626	glClear GL_COLOR_BUFFER_BIT;	2909	glClear GL_COLOR_BUFFER_BIT;
…		…
2634	$self->_draw;	2917	$self->_draw;
2635	}	2918	}
2636		2919
2637	#############################################################################	2920	#############################################################################
2638		2921
2639	package CFClient::UI::Inventory;
2640
2641	our @ISA = CFClient::UI::ScrolledWindow::;
2642
2643	sub new {
2644	my $class = shift;
2645
2646	my $self = $class->SUPER::new (
2647	scrolled => (new CFClient::UI::VBox),
2648	@_,
2649	);
2650
2651	$self
2652	}
2653
2654	sub set_items {
2655	my ($self, $items) = @_;
2656
2657	$self->{scrolled}->clear;
2658	return unless $items;
2659
2660	my @items = sort { $a->{type} <=> $b->{type} } @$items;
2661
2662	$self->{real_items} = \@items;
2663
2664	for my $item (@items) {
2665	my $desc = $item->{nrof} < 2
2666	? $item->{name}
2667	: "$item->{nrof} $item->{name_pl}";
2668
2669	my $hb = new CFClient::UI::HBox;
2670
2671	$hb->add (my $f = new CFClient::UI::Face
2672	can_events => 0,
2673	face => $item->{face},
2674	anim => $item->{anim},
2675	animspeed => $item->{animspeed},
2676	expand => 1,
2677	);
2678	$hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2679	$self->{scrolled}->add ($hb);
2680	}
2681
2682	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2683	}
2684
2685	sub size_request {
2686	my ($self) = @_;
2687	(100, 200)
2688	}
2689
2690	#############################################################################
2691
2692	package CFClient::UI;	2922	package CFClient::UI;
2693		2923
2694	$ROOT = new CFClient::UI::Root;	2924	$ROOT = new CFClient::UI::Root;
2695	$TOOLTIP = new CFClient::UI::Tooltip;	2925	$TOOLTIP = new CFClient::UI::Tooltip;
2696		2926

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.182 by root, Sun Apr 30 11:17:08 2006 UTC vs. Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.182 by root, Sun Apr 30 11:17:08 2006 UTC vs.
Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC