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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.190 by root, Mon May 8 22:17:38 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	$self->check_size;
261	$self->size_allocate ($self->{w}, $self->{h});
262	$self->update;
263	}	280	}
264		281
265	sub set_max_size {	282	sub set_max_size {
266	my ($self, $w, $h) = @_;	283	my ($self, $w, $h) = @_;
267		284
268	delete $self->{max_w}; $self->{max_w} = $w if $w;	285	delete $self->{max_w}; $self->{max_w} = $w if $w;
269	delete $self->{max_h}; $self->{max_h} = $h if $h;	286	delete $self->{max_h}; $self->{max_h} = $h if $h;
270	}
271
272	# return top left coordinates
273	sub _topleft {
274	my ($self, $x, $y) = @_;
275
276	$self->{parent}
277	or Carp::confess "no parent widget in _topleft\n";#d#
278
279	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
280	}	287	}
281		288
282	# translate global coordinates to local coordinate system	289	# translate global coordinates to local coordinate system
283	sub coord2local {	290	sub coord2local {
284	my ($self, $x, $y) = @_;	291	my ($self, $x, $y) = @_;
285		292
286	my ($X, $Y) = $self->_topleft;	293	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287	($x - $X, $y - $Y)
288	}	294	}
289		295
290	# translate local coordinates to global coordinate system	296	# translate local coordinates to global coordinate system
291	sub coord2global {	297	sub coord2global {
292	my ($self, $x, $y) = @_;	298	my ($self, $x, $y) = @_;
293		299
294	my ($X, $Y) = $self->_topleft;	300	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295	($x + $X, $y + $Y)
296	}	301	}
297		302
298	sub focus_in {	303	sub focus_in {
299	my ($self) = @_;	304	my ($self) = @_;
300		305
…		…
398		403
399	sub set_parent {	404	sub set_parent {
400	my ($self, $parent) = @_;	405	my ($self, $parent) = @_;
401		406
402	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};
403	}	412	}
404		413
405	sub check_size {	414	sub check_size {
406	my ($self) = @_;	415	my ($self, $forced) = @_;
407		416
408	$self->_check_size;	417	$self->{force_alloc} = 1 if $forced;
409	return;
410	#TODO: but needs a vastly more difficult algorithm
411	my $check_size = $CFClient::UI::ROOT->{_check_size} \|\|= {};
412
413	$check_size->{$self} = $self;
414
415	$CFClient::UI::ROOT->on_refresh (_check_size => sub {
416	while (%$check_size) {
417	my @widgets = values %$check_size;
418	$_->_check_size
419	for @widgets;
420	}
421	});
422	}
423
424	sub _check_size {
425	my ($self) = @_;
426
427	delete $CFClient::UI::ROOT->{_check_size}{$self};	418	$CFClient::UI::ROOT->{check_size}{$self} = $self;
428
429	$self->{parent}
430	or return 1;
431
432	my ($w, $h) = $self->{user_w} && $self->{user_h}
433	? @$self{qw(user_w user_h)}
434	: $self->size_request;
435
436	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
437	$self->{req_w} = $w;
438	$self->{req_h} = $h;
439
440	$self->{parent}->_check_size
441	or $self->size_allocate (
442	(List::Util::max $self->{w}, $w),
443	(List::Util::max $self->{h}, $h),
444	);
445
446	1
447	} else {
448	0
449	}
450	}	419	}
451		420
452	sub update {	421	sub update {
453	my ($self) = @_;	422	my ($self) = @_;
454		423
455	my $update = $CFClient::UI::ROOT->{_update} \|\|= {};	424	$self->{parent}->update
456		425	if $self->{parent};
457	$update->{$self} = $self;
458
459	$CFClient::UI::ROOT->on_refresh (_update => sub {
460	while (%$update) {
461	my @widgets = values %$update;
462	%$update = ();
463
464	$_->{parent} && $_->{parent}->update
465	for @widgets;
466	}
467	});
468	}	426	}
469		427
470	sub connect {	428	sub connect {
471	my ($self, $signal, $cb) = @_;	429	my ($self, $signal, $cb) = @_;
472		430
…		…
480	}	438	}
481		439
482	sub DESTROY {	440	sub DESTROY {
483	my ($self) = @_;	441	my ($self) = @_;
484		442
		443	delete $WIDGET{$self+0};
485	#$self->deactivate;	444	#$self->deactivate;
486	}	445	}
487		446
488	#############################################################################	447	#############################################################################
489		448
…		…
574	$self->{children} = [	533	$self->{children} = [
575	sort { $a->{z} <=> $b->{z} }	534	sort { $a->{z} <=> $b->{z} }
576	@{$self->{children}}, @widgets	535	@{$self->{children}}, @widgets
577	];	536	];
578		537
579	$_->check_size	538	$self->check_size (1);
580	for @widgets;
581
582	$self->update;	539	$self->update;
583	}	540	}
584		541
585	sub children {	542	sub children {
586	@{ $_[0]{children} }	543	@{ $_[0]{children} }
…		…
693	}	650	}
694		651
695	sub update {	652	sub update {
696	my ($self) = @_;	653	my ($self) = @_;
697		654
698	$ROOT->on_refresh ($self => sub { $self->render_child });	655	$ROOT->on_post_alloc ($self => sub { $self->render_child });
699	$self->SUPER::update;	656	$self->SUPER::update;
700	}	657	}
701		658
702	sub size_allocate {	659	sub size_allocate {
703	my ($self, $w, $h) = @_;	660	my ($self, $w, $h) = @_;
…		…
734	my ($w, $h) = ($self->w, $self->h);	691	my ($w, $h) = ($self->w, $self->h);
735		692
736	my $tex = $self->{texture}	693	my $tex = $self->{texture}
737	or return;	694	or return;
738		695
739	glEnable GL_BLEND;
740	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
741	glEnable GL_TEXTURE_2D;	696	glEnable GL_TEXTURE_2D;
742	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743	glColor 0, 0, 0, 1;	698	glColor 0, 0, 0, 1;
744		699
745	$tex->draw_quad (0, 0, $w, $h);	700	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
746		701
747	glDisable GL_BLEND;
748	glDisable GL_TEXTURE_2D;	702	glDisable GL_TEXTURE_2D;
749	}	703	}
750		704
751	#############################################################################	705	#############################################################################
752		706
…		…
776	$self->{view_y} = int $y;	730	$self->{view_y} = int $y;
777		731
778	$self->update;	732	$self->update;
779	}	733	}
780		734
781	# hmm, this does not work for topleft of $self... but we should not aks for that	735	# hmm, this does not work for topleft of $self... but we should not ask for that
782	sub _topleft {	736	sub coord2local {
783	my ($self, $x, $y) = @_;	737	my ($self, $x, $y) = @_;
784		738
785	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})	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)
786	}	749	}
787		750
788	sub find_widget {	751	sub find_widget {
789	my ($self, $x, $y) = @_;	752	my ($self, $x, $y) = @_;
790		753
…		…
835	$self->add ($self->{slider});	798	$self->add ($self->{slider});
836		799
837	$self	800	$self
838	}	801	}
839		802
840	#TODO# update range on size_allocate depeneing on child	803	#TODO# update range on size_allocate depending on child
841	# update viewport offset on scroll	804	# update viewport offset on scroll
842		805
843	#############################################################################	806	#############################################################################
844		807
845	package CFClient::UI::Frame;	808	package CFClient::UI::Frame;
…		…
849	use CFClient::OpenGL;	812	use CFClient::OpenGL;
850		813
851	sub new {	814	sub new {
852	my $class = shift;	815	my $class = shift;
853		816
854	my $self = $class->SUPER::new (	817	$class->SUPER::new (
855	bg => [1, 1, 1, 1],	818	bg => undef,
856	border_bg => [1, 1, 1, 1],
857	border => 0.8,
858	@_	819	@_,
859	);	820	)
860
861	$self
862	}	821	}
863		822
864	sub _draw {	823	sub _draw {
865	my ($self) = @_;	824	my ($self) = @_;
866		825
867	my ($w, $h) = ($self->{w}, $self->{h});	826	if ($self->{bg}) {
		827	my ($w, $h) = @$self{qw(w h)};
868		828
869	glEnable GL_BLEND;	829	glEnable GL_BLEND;
870	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	830	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
871	glEnable GL_TEXTURE_2D;	831	glColor @{ $self->{bg} };
872	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
873		832
874	# glBegin GL_QUADS;	833	glBegin GL_QUADS;
875	# glColor 0, 0, 0, 0;
876	# glVertex 0 , 0;	834	glVertex 0 , 0;
877	# glVertex 0 , $h;	835	glVertex 0 , $h;
878	# glVertex $w, $h;	836	glVertex $w, $h;
879	# glVertex $w, 0;	837	glVertex $w, 0;
880	# glEnd;	838	glEnd;
881		839
882
883	$self->child->draw;
884	glDisable GL_BLEND;	840	glDisable GL_BLEND;
885	glDisable GL_TEXTURE_2D;	841	}
		842
		843	$self->SUPER::_draw;
886	}	844	}
887		845
888	#############################################################################	846	#############################################################################
889		847
890	package CFClient::UI::FancyFrame;	848	package CFClient::UI::FancyFrame;
…		…
904		862
905	my $self = $class->SUPER::new (	863	my $self = $class->SUPER::new (
906	bg => [1, 1, 1, 1],	864	bg => [1, 1, 1, 1],
907	border_bg => [1, 1, 1, 1],	865	border_bg => [1, 1, 1, 1],
908	border => 0.6,	866	border => 0.6,
		867	toplevel => 1,
909	can_events => 1,	868	can_events => 1,
910	@_	869	@_
911	);	870	);
912		871
913	$self->{title} &&= new CFClient::UI::Label	872	$self->{title} &&= new CFClient::UI::Label
…		…
1006	my ($self) = @_;	965	my ($self) = @_;
1007		966
1008	my ($w, $h ) = ($self->{w}, $self->{h});	967	my ($w, $h ) = ($self->{w}, $self->{h});
1009	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	968	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1010		969
1011	glEnable GL_BLEND;
1012	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1013	glEnable GL_TEXTURE_2D;	970	glEnable GL_TEXTURE_2D;
1014	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	971	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1015		972
1016	my $border = $self->border;	973	my $border = $self->border;
1017		974
1018	glColor @{ $self->{border_bg} };	975	glColor @{ $self->{border_bg} };
1019	$tex[1]->draw_quad (0, 0, $w, $border);	976	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
1020	$tex[3]->draw_quad (0, $border, $border, $ch);	977	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1021	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	978	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1022	$tex[4]->draw_quad (0, $h - $border, $w, $border);	979	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1023		980
1024	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	981	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1025	my $bg = $tex[0];	982	my $bg = $tex[0];
1026		983
1027	# TODO: repeat texture not scale	984	# TODO: repeat texture not scale
…		…
1031	glColor @{ $self->{bg} };	988	glColor @{ $self->{bg} };
1032		989
1033	$bg->{s} = $rep_x;	990	$bg->{s} = $rep_x;
1034	$bg->{t} = $rep_y;	991	$bg->{t} = $rep_y;
1035	$bg->{wrap_mode} = 1;	992	$bg->{wrap_mode} = 1;
1036	$bg->draw_quad ($border, $border, $cw, $ch);	993	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		994	}
1037		995
1038	glDisable GL_TEXTURE_2D;	996	glDisable GL_TEXTURE_2D;
1039	glDisable GL_BLEND;
1040	}
1041		997
1042	$self->{title}->draw if $self->{title};	998	$self->{title}->draw if $self->{title};
1043		999
1044	$self->child->draw;	1000	$self->child->draw;
1045	}	1001	}
…		…
1272	}	1228	}
1273		1229
1274	sub size_allocate {	1230	sub size_allocate {
1275	my ($self, $w, $h) = @_;	1231	my ($self, $w, $h) = @_;
1276		1232
		1233	Carp::confess "negative size" if $w < 0 \|\| $h < 0;#d#
		1234
1277	my $children = $self->{children};	1235	my $children = $self->{children};
1278		1236
1279	my @h = map $_->{req_h}, @$children;	1237	my @h = map $_->{req_h}, @$children;
1280		1238
1281	my $req_h = List::Util::sum @h;	1239	my $req_h = List::Util::sum @h;
…		…
1320	my ($class, %arg) = @_;	1278	my ($class, %arg) = @_;
1321		1279
1322	my $self = $class->SUPER::new (	1280	my $self = $class->SUPER::new (
1323	fg => [1, 1, 1],	1281	fg => [1, 1, 1],
1324	#font => default_font	1282	#font => default_font
		1283	#text => initial text
		1284	#markup => initial narkup
		1285	layout => (new CFClient::Layout),
1325	fontsize => 1,	1286	fontsize => 1,
1326	text => "",
1327	align => -1,	1287	align => -1,
1328	valign => -1,	1288	valign => -1,
1329	padding => 2,	1289	padding => 2,
1330	layout => new CFClient::Layout,
1331	can_events => 0,	1290	can_events => 0,
1332	%arg	1291	%arg
1333	);	1292	);
1334		1293
1335	if (exists $self->{template}) {	1294	if (exists $self->{template}) {
1336	my $layout = new CFClient::Layout;	1295	my $layout = new CFClient::Layout;
1337	$layout->set_text (delete $self->{template});	1296	$layout->set_text (delete $self->{template});
1338	$self->{template} = $layout;	1297	$self->{template} = $layout;
1339	}	1298	}
1340		1299
1341	$self->set_text (delete $self->{text}) if exists $self->{text};	1300	if (exists $self->{markup}) {
1342	$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	}
1343		1305
1344	$self	1306	$self
1345	}	1307	}
1346		1308
1347	sub escape {	1309	sub escape {
…		…
1365	my ($self, $text) = @_;	1327	my ($self, $text) = @_;
1366		1328
1367	return if $self->{text} eq "T$text";	1329	return if $self->{text} eq "T$text";
1368	$self->{text} = "T$text";	1330	$self->{text} = "T$text";
1369		1331
		1332	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370	$self->{layout}->set_text ($text);	1333	$self->{layout}->set_text ($text);
1371		1334
1372	delete $self->{texture};
1373	$self->update;	1335	$self->update;
1374	$self->check_size;	1336	$self->check_size;
1375	}	1337	}
1376		1338
1377	sub set_markup {	1339	sub set_markup {
1378	my ($self, $markup) = @_;	1340	my ($self, $markup) = @_;
1379		1341
1380	return if $self->{text} eq "M$markup";	1342	return if $self->{text} eq "M$markup";
1381	$self->{text} = "M$markup";	1343	$self->{text} = "M$markup";
1382		1344
		1345	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
		1346
		1347	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1383	$self->{layout}->set_markup ($markup);	1348	$self->{layout}->set_markup ($markup);
1384		1349
1385	delete $self->{texture};
1386	$self->update;	1350	$self->update;
1387	$self->check_size;	1351	$self->check_size;
1388	}	1352	}
1389		1353
1390	sub size_request {	1354	sub size_request {
…		…
1430		1394
1431	sub _draw {	1395	sub _draw {
1432	my ($self) = @_;	1396	my ($self) = @_;
1433		1397
1434	my $tex = $self->{texture} \|\|= do {	1398	my $tex = $self->{texture} \|\|= do {
		1399	$self->{layout}->set_foreground (@{$self->{fg}});
1435	$self->{layout}->set_font ($self->{font}) if $self->{font};	1400	$self->{layout}->set_font ($self->{font}) if $self->{font};
1436	$self->{layout}->set_width ($self->{w});	1401	$self->{layout}->set_width ($self->{w});
1437	$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
1438	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
1439	};	1415	};
1440		1416
1441	glEnable GL_BLEND;
1442	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1443	glEnable GL_TEXTURE_2D;	1417	glEnable GL_TEXTURE_2D;
1444	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1418	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1445		1419
		1420	if ($tex->{format} == GL_ALPHA) {
1446	glColor @{$self->{fg}};	1421	glColor @{$self->{fg}};
1447
1448	$self->{ox} = int (
1449	$self->{align} < 0 ? $self->{padding}
1450	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1451	: ($self->{w} - $tex->{w}) * 0.5
1452	);
1453
1454	$self->{oy} = int (
1455	$self->{valign} < 0 ? $self->{padding}
1456	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457	: ($self->{h} - $tex->{h}) * 0.5
1458	);
1459
1460	$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	}
1461		1426
1462	glDisable GL_TEXTURE_2D;	1427	glDisable GL_TEXTURE_2D;
1463	glDisable GL_BLEND;
1464	}	1428	}
1465		1429
1466	#############################################################################	1430	#############################################################################
1467		1431
1468	package CFClient::UI::EntryBase;	1432	package CFClient::UI::EntryBase;
…		…
1503	$self->{layout}->set_text ("$text ");	1467	$self->{layout}->set_text ("$text ");
1504		1468
1505	$self->emit (changed => $self->{text});	1469	$self->emit (changed => $self->{text});
1506	}	1470	}
1507		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
1508	sub get_text {	1481	sub get_text {
1509	$_[0]{text}	1482	$_[0]{text}
1510	}	1483	}
1511		1484
1512	sub size_request {	1485	sub size_request {
…		…
1519		1492
1520	sub size_allocate {	1493	sub size_allocate {
1521	my ($self, $w, $h) = @_;	1494	my ($self, $w, $h) = @_;
1522		1495
1523	$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
1524	}
1525
1526	sub set_text {
1527	my ($self, $text) = @_;
1528
1529	$self->{cursor} = length $text;
1530	$self->_set_text ($text);
1531	$self->update;
1532	}	1497	}
1533		1498
1534	sub key_down {	1499	sub key_down {
1535	my ($self, $ev) = @_;	1500	my ($self, $ev) = @_;
1536		1501
…		…
1538	my $sym = $ev->{sym};	1503	my $sym = $ev->{sym};
1539	my $uni = $ev->{unicode};	1504	my $uni = $ev->{unicode};
1540		1505
1541	my $text = $self->get_text;	1506	my $text = $self->get_text;
1542		1507
1543	if ($sym == 8) {	1508	if ($uni == 8) {
1544	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1509	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1545	} elsif ($sym == 127) {	1510	} elsif ($uni == 127) {
1546	substr $text, $self->{cursor}, 1, "";	1511	substr $text, $self->{cursor}, 1, "";
1547	} elsif ($sym == CFClient::SDLK_LEFT) {	1512	} elsif ($sym == CFClient::SDLK_LEFT) {
1548	--$self->{cursor} if $self->{cursor};	1513	--$self->{cursor} if $self->{cursor};
1549	} elsif ($sym == CFClient::SDLK_RIGHT) {	1514	} elsif ($sym == CFClient::SDLK_RIGHT) {
1550	++$self->{cursor} if $self->{cursor} < length $self->{text};	1515	++$self->{cursor} if $self->{cursor} < length $self->{text};
1551	} elsif ($sym == CFClient::SDLK_HOME) {	1516	} elsif ($sym == CFClient::SDLK_HOME) {
1552	$self->{cursor} = 0;	1517	$self->{cursor} = 0;
1553	} elsif ($sym == CFClient::SDLK_END) {	1518	} elsif ($sym == CFClient::SDLK_END) {
1554	$self->{cursor} = length $text;	1519	$self->{cursor} = length $text;
1555	} elsif ($sym == 27) {	1520	} elsif ($uni == 27) {
1556	$self->emit ('escape');	1521	$self->emit ('escape');
1557	} elsif ($uni) {	1522	} elsif ($uni) {
1558	substr $text, $self->{cursor}++, 0, chr $uni;	1523	substr $text, $self->{cursor}++, 0, chr $uni;
1559	}	1524	}
1560		1525
…		…
1724		1689
1725	if ($GRAB == $self) {	1690	if ($GRAB == $self) {
1726	$self->{fg} = $self->{active_fg};	1691	$self->{fg} = $self->{active_fg};
1727	}	1692	}
1728		1693
1729	glEnable GL_BLEND;
1730	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1731	glEnable GL_TEXTURE_2D;	1694	glEnable GL_TEXTURE_2D;
1732	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1733	glColor 0, 0, 0, 1;	1696	glColor 0, 0, 0, 1;
1734		1697
1735	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1698	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1736		1699
1737	glDisable GL_TEXTURE_2D;	1700	glDisable GL_TEXTURE_2D;
1738	glDisable GL_BLEND;
1739		1701
1740	$self->SUPER::_draw;	1702	$self->SUPER::_draw;
1741	}	1703	}
1742		1704
1743	#############################################################################	1705	#############################################################################
…		…
1790		1752
1791	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;
1792		1754
1793	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1755	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1794		1756
1795	glEnable GL_BLEND;	1757	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1758
1796	glEnable GL_TEXTURE_2D;	1759	glEnable GL_TEXTURE_2D;
1797	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798
1799	my $tex = $self->{state} ? $tex[1] : $tex[0];
1800
1801	$tex->draw_quad (0, 0, $s, $s);	1760	$tex->draw_quad_alpha (0, 0, $s, $s);
1802
1803	glDisable GL_TEXTURE_2D;	1761	glDisable GL_TEXTURE_2D;
1804	glDisable GL_BLEND;
1805	}	1762	}
1806		1763
1807	#############################################################################	1764	#############################################################################
1808		1765
1809	package CFClient::UI::Image;	1766	package CFClient::UI::Image;
…		…
1852	glTranslate 0, -$self->{w}, 0;	1809	glTranslate 0, -$self->{w}, 0;
1853		1810
1854	($w, $h) = ($h, $w);	1811	($w, $h) = ($h, $w);
1855	}	1812	}
1856		1813
1857	glEnable GL_BLEND;
1858	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1859	glEnable GL_TEXTURE_2D;	1814	glEnable GL_TEXTURE_2D;
1860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1815	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861		1816
1862	$tex->draw_quad (0, 0, $w, $h);	1817	$tex->draw_quad_alpha (0, 0, $w, $h);
1863		1818
1864	glDisable GL_BLEND;
1865	glDisable GL_TEXTURE_2D;	1819	glDisable GL_TEXTURE_2D;
1866	}	1820	}
1867		1821
1868	#############################################################################	1822	#############################################################################
1869		1823
…		…
2161	$page \|\|= 2;	2115	$page \|\|= 2;
2162		2116
2163	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2117	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2164	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2118	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2165		2119
2166	glEnable GL_BLEND;
2167	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2168	glEnable GL_TEXTURE_2D;	2120	glEnable GL_TEXTURE_2D;
2169	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2121	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170		2122
2171	# draw background	2123	# draw background
2172	$tex[1]->draw_quad (0, 0, $w, $h);	2124	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
2173		2125
2174	# draw handle	2126	# draw handle
2175	$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);
2176		2128
2177	glDisable GL_BLEND;
2178	glDisable GL_TEXTURE_2D;	2129	glDisable GL_TEXTURE_2D;
2179	}	2130	}
2180		2131
2181	#############################################################################	2132	#############################################################################
2182		2133
…		…
2193	fontsize => 1,	2144	fontsize => 1,
2194	can_events => 0,	2145	can_events => 0,
2195	#font => default_font	2146	#font => default_font
2196	@_,	2147	@_,
2197		2148
2198	layout => (new CFClient::Layout),	2149	layout => (new CFClient::Layout 1),
2199	par => [],	2150	par => [],
2200	height => 0,	2151	height => 0,
2201	children => [	2152	children => [
2202	(new CFClient::UI::Empty expand => 1),	2153	(new CFClient::UI::Empty expand => 1),
2203	(new CFClient::UI::Slider vertical => 1),	2154	(new CFClient::UI::Slider vertical => 1),
…		…
2221		2172
2222	my $layout = $self->{layout};	2173	my $layout = $self->{layout};
2223		2174
2224	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2175	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225	$layout->set_width ($self->{children}[0]{w});	2176	$layout->set_width ($self->{children}[0]{w});
2226	$layout->set_text ($text);	2177	$layout->set_markup ($text);
2227		2178
2228	($layout->size)[1]	2179	($layout->size)[1]
2229	}	2180	}
2230		2181
2231	sub reflow {	2182	sub reflow {
…		…
2269		2220
2270	return unless $self->{h} > 0;	2221	return unless $self->{h} > 0;
2271		2222
2272	delete $self->{texture};	2223	delete $self->{texture};
2273		2224
2274	$ROOT->on_refresh ($self, sub {	2225	$ROOT->on_post_alloc ($self, sub {
2275	if (delete $self->{need_reflow}) {	2226	if (delete $self->{need_reflow}) {
2276	my $height = 0;	2227	my $height = 0;
2277		2228
2278	$height += $_->[0] = $self->text_height ($_->[2])	2229	$height += $_->[0] = $self->text_height ($_->[2])
2279	for @{$self->{par}};	2230	for @{$self->{par}};
…		…
2287		2238
2288	$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 {
2289	glClearColor 0, 0, 0, 0;	2240	glClearColor 0, 0, 0, 0;
2290	glClear GL_COLOR_BUFFER_BIT;	2241	glClear GL_COLOR_BUFFER_BIT;
2291		2242
2292	glEnable GL_BLEND;
2293	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294	glEnable GL_TEXTURE_2D;	2243	glEnable GL_TEXTURE_2D;
2295	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296		2245
2297	my $top = int $self->{children}[1]{range}[0];	2246	my $top = int $self->{children}[1]{range}[0];
2298		2247
…		…
2307		2256
2308	for my $par (@{$self->{par}}) {	2257	for my $par (@{$self->{par}}) {
2309	my $h = $par->[0];	2258	my $h = $par->[0];
2310		2259
2311	if ($y0 < $y + $h && $y < $y1) {	2260	if ($y0 < $y + $h && $y < $y1) {
		2261	$layout->set_foreground (@{ $par->[1] });
2312	$layout->set_text ($par->[2]);	2262	$layout->set_markup ($par->[2]);
2313		2263
2314	glColor @{ $par->[1] };
2315	my ($W, $H) = $layout->size;	2264	my ($W, $H) = $layout->size;
2316	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);
2317	}	2266	}
2318		2267
2319	$y += $h;	2268	$y += $h;
2320	}	2269	}
2321		2270
2322	glDisable GL_TEXTURE_2D;	2271	glDisable GL_TEXTURE_2D;
2323	glDisable GL_BLEND;
2324	};	2272	};
2325	});	2273	});
2326	}	2274	}
2327		2275
2328	sub _draw {	2276	sub _draw {
2329	my ($self) = @_;	2277	my ($self) = @_;
2330		2278
2331	glEnable GL_BLEND;
2332	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2333	glEnable GL_TEXTURE_2D;	2279	glEnable GL_TEXTURE_2D;
2334	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2280	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335	glColor 1, 1, 1, 1;	2281	glColor 1, 1, 1, 1;
2336	$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});
2337	glDisable GL_TEXTURE_2D;	2283	glDisable GL_TEXTURE_2D;
2338	glDisable GL_BLEND;
2339		2284
2340	$self->{children}[1]->draw;	2285	$self->{children}[1]->draw;
2341		2286
2342	}	2287	}
2343		2288
…		…
2437	@_,	2382	@_,
2438	can_events => 0,	2383	can_events => 0,
2439	)	2384	)
2440	}	2385	}
2441		2386
2442	sub set_markup {	2387	sub set_tooltip_from {
2443	my ($self, $text) = @_;	2388	my ($self, $widget) = @_;
2444		2389
2445	$self->{label} \|\|= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2390	$self->add (new CFClient::UI::Label
2446	$self->{label}->set_markup ($text);	2391	markup => $widget->{tooltip},
2447	$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	);
2448	}	2397	}
2449		2398
2450	sub size_request {	2399	sub size_request {
2451	my ($self) = @_;	2400	my ($self) = @_;
2452
2453	$self->child->set_max_size ($::WIDTH * 0.3);
2454		2401
2455	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2402	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456		2403
2457	($w + 4, $h + 4)	2404	($w + 4, $h + 4)
2458	}	2405	}
…		…
2464	}	2411	}
2465		2412
2466	sub _draw {	2413	sub _draw {
2467	my ($self) = @_;	2414	my ($self) = @_;
2468		2415
2469	glPushMatrix;
2470	glTranslate 0.375, 0.375;	2416	glTranslate 0.375, 0.375;
2471		2417
2472	my ($w, $h) = @$self{qw(w h)};	2418	my ($w, $h) = @$self{qw(w h)};
2473		2419
2474	glColor 1, 0.8, 0.4;	2420	glColor 1, 0.8, 0.4;
…		…
2485	glVertex 0 , $h;	2431	glVertex 0 , $h;
2486	glVertex $w, $h;	2432	glVertex $w, $h;
2487	glVertex $w, 0;	2433	glVertex $w, 0;
2488	glEnd;	2434	glEnd;
2489		2435
2490	glPopMatrix;	2436	glTranslate 2 - 0.375, 2 - 0.375;
2491
2492	glTranslate 2, 2;
2493	$self->SUPER::_draw;	2437	$self->SUPER::_draw;
2494	}	2438	}
2495		2439
2496	#############################################################################	2440	#############################################################################
2497		2441
…		…
2520	return unless $::CONN;#d# manage and cache textures differently	2464	return unless $::CONN;#d# manage and cache textures differently
2521	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2465	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2522		2466
2523	# TODO animation	2467	# TODO animation
2524	if ($tex) {	2468	if ($tex) {
2525	glEnable GL_BLEND;
2526	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2527	glEnable GL_TEXTURE_2D;	2469	glEnable GL_TEXTURE_2D;
2528	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2470	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2529	glColor 1, 1, 1, 1;	2471	glColor 1, 1, 1, 1;
2530	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2472	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2531	glDisable GL_TEXTURE_2D;	2473	glDisable GL_TEXTURE_2D;
2532	glDisable GL_BLEND;
2533	}	2474	}
2534	}	2475	}
2535		2476
2536	#############################################################################	2477	#############################################################################
2537		2478
…		…
2542	sub new {	2483	sub new {
2543	my $class = shift;	2484	my $class = shift;
2544		2485
2545	my %args = @_;	2486	my %args = @_;
2546		2487
2547	my $item = $args{item};	2488	my $item = delete $args{item};
2548		2489
2549	my $desc = $item->{nrof} < 2	2490	my $desc = $item->{nrof} < 2
2550	? $item->{name}	2491	? $item->{name}
2551	: "$item->{nrof} $item->{name_pl}";	2492	: "$item->{nrof} $item->{name_pl}";
2552		2493
…		…
2581		2522
2582	1	2523	1
2583	},	2524	},
2584	%args	2525	%args
2585	);	2526	);
		2527
2586	$self->add(new CFClient::UI::Face	2528	$self->add (new CFClient::UI::Face
2587	can_events => 0,	2529	can_events => 0,
2588	face => $item->{face},	2530	face => $item->{face},
2589	anim => $item->{anim},	2531	anim => $item->{anim},
2590	animspeed => $item->{animspeed});	2532	animspeed => $item->{animspeed},
		2533	);
		2534
2591	$self->add(new CFClient::UI::Label	2535	$self->add (new CFClient::UI::Label
2592	can_events => 0,	2536	can_events => 0,
2593	text => $desc);	2537	text => $desc,
		2538	);
2594		2539
2595	$self	2540	$self
2596	}	2541	}
2597		2542
2598	#############################################################################	2543	#############################################################################
…		…
2616	my ($self, $items) = @_;	2561	my ($self, $items) = @_;
2617		2562
2618	$self->{scrolled}->clear;	2563	$self->{scrolled}->clear;
2619	return unless $items;	2564	return unless $items;
2620		2565
2621	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2566	my @items = sort {
		2567	($a->{type} <=> $b->{type})
		2568	or ($a->{name} cmp $b->{name})
		2569	} @$items;
2622		2570
2623	$self->{real_items} = \@items;	2571	$self->{real_items} = \@items;
2624		2572
2625	for my $item (@items) {	2573	for my $item (@items) {
2626	my $desc = $item->{nrof} < 2	2574	my $desc = $item->{nrof} < 2
2627	? $item->{name}	2575	? $item->{name}
2628	: "$item->{nrof} $item->{name_pl}";	2576	: "$item->{nrof} $item->{name_pl}";
2629		2577
2630	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);	2578	$item = $item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item;
2631	}	2579	}
		2580
		2581	$self->{scrolled}->add (@items);
2632		2582
2633	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2583	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2634	}	2584	}
2635		2585
2636	sub size_request {	2586	sub size_request {
…		…
2710	}	2660	}
2711	}	2661	}
2712		2662
2713	#############################################################################	2663	#############################################################################
2714		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
2715	package CFClient::UI::Root;	2756	package CFClient::UI::Root;
2716		2757
2717	our @ISA = CFClient::UI::Container::;	2758	our @ISA = CFClient::UI::Container::;
2718		2759
2719	use CFClient::OpenGL;	2760	use CFClient::OpenGL;
2720		2761
		2762	sub new {
		2763	my $class = shift;
		2764
		2765	$class->SUPER::new (
		2766	@_,
		2767	)
		2768	}
		2769
		2770	sub configure {
		2771	my ($self, $x, $y, $w, $h) = @_;
		2772
		2773	$self->{w} = $w;
		2774	$self->{h} = $h;
		2775	}
		2776
2721	sub check_size {	2777	sub check_size {
2722	my ($self) = @_;	2778	my ($self) = @_;
2723		2779
2724	$self->configure (0, 0, $self->{w}, $self->{h});	2780	$self->size_allocate ($self->{w}, $self->{h})
		2781	if $self->{w};
2725	}	2782	}
2726		2783
2727	sub size_request {	2784	sub size_request {
2728	my ($self) = @_;	2785	my ($self) = @_;
2729		2786
…		…
2731	}	2788	}
2732		2789
2733	sub size_allocate {	2790	sub size_allocate {
2734	my ($self, $w, $h) = @_;	2791	my ($self, $w, $h) = @_;
2735		2792
2736	my $old_w = $self->{old_w};	2793	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2737	my $old_h = $self->{old_h};	2794	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2738		2795
2739	if ($old_w && $old_h) {	2796	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2740	for my $child ($self->children) {	2797	if $old_w && $old_h && ($old_w != $w \|\| $old_h != $h);
2741	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2742	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2743	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2744	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2745	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2746	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2747	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2748	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2749	}
2750	}
2751
2752	$self->{old_w} = $w;
2753	$self->{old_h} = $h;
2754	}
2755
2756	sub configure {
2757	my ($self, $x, $y, $w, $h) = @_;
2758
2759	$self->SUPER::configure ($x, $y, $w, $h);
2760		2798
2761	for my $child ($self->children) {	2799	for my $child ($self->children) {
2762	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)};
2763		2801
2764	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2802	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2765	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2803	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2766	$child->configure ($X, $Y, $W, $H);	2804	$child->configure ($X, $Y, $W, $H);
2767	}	2805	}
2768	}	2806	}
2769		2807
2770	sub _topleft {	2808	sub coord2local {
2771	my ($self, $x, $y) = @_;	2809	my ($self, $x, $y) = @_;
2772		2810
2773	($x, $y)	2811	($x, $y)
2774	}	2812	}
2775		2813
		2814	sub coord2global {
		2815	my ($self, $x, $y) = @_;
		2816
		2817	($x, $y)
		2818	}
		2819
2776	sub update {	2820	sub update {
2777	my ($self) = @_;	2821	my ($self) = @_;
2778		2822
2779	$self->check_size;	2823	$self->check_size;
2780	::refresh ();	2824	$::WANT_REFRESH++;
2781	}	2825	}
2782		2826
2783	sub add {	2827	sub add {
2784	my ($self, $child) = @_;	2828	my ($self, $child) = @_;
2785		2829
2786	# integerize window positions	2830	# integerise window positions
2787	$child->{x} = int $child->{x};	2831	$child->{x} = int $child->{x};
2788	$child->{y} = int $child->{y};	2832	$child->{y} = int $child->{y};
2789		2833
2790	$self->SUPER::add ($child);	2834	$self->SUPER::add ($child);
2791	}	2835	}
…		…
2794	my ($self, $id, $cb) = @_;	2838	my ($self, $id, $cb) = @_;
2795		2839
2796	$self->{refresh_hook}{$id} = $cb;	2840	$self->{refresh_hook}{$id} = $cb;
2797	}	2841	}
2798		2842
		2843	sub on_post_alloc {
		2844	my ($self, $id, $cb) = @_;
		2845
		2846	$self->{post_alloc_hook}{$id} = $cb;
		2847	}
		2848
2799	sub draw {	2849	sub draw {
2800	my ($self) = @_;	2850	my ($self) = @_;
2801		2851
2802	while (my $rcb = delete $self->{refresh_hook}) {	2852	while ($self->{refresh_hook}) {
2803	$_->() 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}};
2804	}	2905	}
2805		2906
2806	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2907	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2807	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2908	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2808	glClear GL_COLOR_BUFFER_BIT;	2909	glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.190 by root, Mon May 8 22:17:38 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.190 by root, Mon May 8 22:17:38 2006 UTC vs.
Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC