ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.193 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.224 by elmex, Tue May 23 20:00:55 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) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
130		133
131	for (@$vals) {	134	for (@$vals) {
132	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
133	$rem += $_ - $i;	136	$rem += $_ - $i;
134	$_ = $i;	137	$_ = $i;
		138	}
		139	}
		140
		141	sub full_refresh {
		142	# make a copy, otherwise for complains about freed values.
		143	my @widgets = values %WIDGET;
		144
		145	$_->update
		146	for @widgets;
		147	}
		148
		149	# call when resolution changes etc.
		150	sub rescale_widgets {
		151	my ($sx, $sy) = @_;
		152
		153	# make a copy, otherwise for complains about freed values.
		154	my @widgets = values %WIDGET;
		155
		156	for my $widget (@widgets) {
		157	if ($widget->{toplevel}) {
		158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		166	}
		167
		168	$widget->reconfigure;
135	}	169	}
136	}	170	}
137		171
138	#############################################################################	172	#############################################################################
139		173
…		…
158	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
160	}	194	}
161	}	195	}
162		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
163	$self	199	$self
164	}	200	}
165		201
166	sub destroy {	202	sub destroy {
167	my ($self) = @_;	203	my ($self) = @_;
…		…
170	%$self = ();	206	%$self = ();
171	}	207	}
172		208
173	sub show {	209	sub show {
174	my ($self) = @_;	210	my ($self) = @_;
175
176	return if $self->{parent};	211	return if $self->{parent};
177		212
178	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
		214	}
		215
		216	sub show_centered {
		217	my ($self) = @_;
		218	return if $self->{parent};
		219
		220	$self->show;
		221
		222	$CFClient::UI::ROOT->on_post_alloc (
		223	"centered $self" => sub {
		224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		225	},
		226	);
179	}	227	}
180		228
181	sub hide {	229	sub hide {
182	my ($self) = @_;	230	my ($self) = @_;
183		231
…		…
240		288
241	sub size_allocate {	289	sub size_allocate {
242	# nothing to be done	290	# nothing to be done
243	}	291	}
244		292
		293	sub reconfigure {
		294	my ($self) = @_;
		295
		296	$self->check_size (1);
		297	$self->update;
		298	}
		299
245	sub children {	300	sub children {
246	}
247
248	# call when resolution changes etc.
249	sub reconfigure {
250	my ($self) = @_;
251
252	$_->reconfigure
253	for $self->children;
254
255	$self->check_size;
256	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257	$self->update;
258	}	301	}
259		302
260	sub set_max_size {	303	sub set_max_size {
261	my ($self, $w, $h) = @_;	304	my ($self, $w, $h) = @_;
262		305
263	delete $self->{max_w}; $self->{max_w} = $w if $w;	306	delete $self->{max_w}; $self->{max_w} = $w if $w;
264	delete $self->{max_h}; $self->{max_h} = $h if $h;	307	delete $self->{max_h}; $self->{max_h} = $h if $h;
		308	}
		309
		310	sub set_tooltip {
		311	my ($self, $tooltip) = @_;
		312
		313	$self->{tooltip} = $tooltip;
		314
		315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		316	delete $CFClient::UI::TOOLTIP->{owner};
		317	CFClient::UI::check_tooltip;
		318	}
265	}	319	}
266		320
267	# translate global coordinates to local coordinate system	321	# translate global coordinates to local coordinate system
268	sub coord2local {	322	sub coord2local {
269	my ($self, $x, $y) = @_;	323	my ($self, $x, $y) = @_;
…		…
355	glVertex $self->{w}, 0;	409	glVertex $self->{w}, 0;
356	glVertex $self->{w}, $self->{h};	410	glVertex $self->{w}, $self->{h};
357	glVertex 0 , $self->{h};	411	glVertex 0 , $self->{h};
358	glEnd;	412	glEnd;
359	glPopMatrix;	413	glPopMatrix;
360	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361	}	415	}
362	}	416	}
363		417
364	sub _draw {	418	sub _draw {
365	my ($self) = @_;	419	my ($self) = @_;
…		…
382	sub set_parent {	436	sub set_parent {
383	my ($self, $parent) = @_;	437	my ($self, $parent) = @_;
384		438
385	Scalar::Util::weaken ($self->{parent} = $parent);	439	Scalar::Util::weaken ($self->{parent} = $parent);
386		440
		441	# TODO: req_w _does_change after ->reconfigure
387	$self->check_size	442	$self->check_size
388	unless exists $self->{req_w};	443	unless exists $self->{req_w};
		444
		445	$self->show;
389	}	446	}
390		447
391	sub check_size {	448	sub check_size {
392	my ($self) = @_;	449	my ($self, $forced) = @_;
393		450
		451	$self->{force_alloc} = 1 if $forced;
394	$CFClient::UI::ROOT->{check_size}{$self} = $self;	452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
395	}	453	}
396		454
397	sub update {	455	sub update {
398	my ($self) = @_;	456	my ($self) = @_;
…		…
414	}	472	}
415		473
416	sub DESTROY {	474	sub DESTROY {
417	my ($self) = @_;	475	my ($self) = @_;
418		476
		477	delete $WIDGET{$self+0};
419	#$self->deactivate;	478	#$self->deactivate;
420	}	479	}
421		480
422	#############################################################################	481	#############################################################################
423		482
…		…
432	my $class = shift;	491	my $class = shift;
433		492
434	# range [value, low, high, page]	493	# range [value, low, high, page]
435		494
436	$class->SUPER::new (	495	$class->SUPER::new (
437	bg => [0, 0, 0, 0.2],	496	#bg => [0, 0, 0, 0.2],
438	active_bg => [1, 1, 1, 0.5],	497	#active_bg => [1, 1, 1, 0.5],
439	@_	498	@_
440	)	499	)
441	}	500	}
442		501
443	sub _draw {	502	sub _draw {
444	my ($self) = @_;	503	my ($self) = @_;
445		504
		505	my $color = $FOCUS == $self && $self->{active_bg}
		506	? $self->{active_bg}
		507	: $self->{bg};
		508
		509	if ($color && (@$color < 4 || $color->[3])) {
446	my ($w, $h) = @$self{qw(w h)};	510	my ($w, $h) = @$self{qw(w h)};
447		511
448	glEnable GL_BLEND;	512	glEnable GL_BLEND;
449	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	514	glColor @$color;
451		515
452	glBegin GL_QUADS;	516	glBegin GL_QUADS;
453	glVertex 0 , 0;	517	glVertex 0 , 0;
454	glVertex 0 , $h;	518	glVertex 0 , $h;
455	glVertex $w, $h;	519	glVertex $w, $h;
456	glVertex $w, 0;	520	glVertex $w, 0;
457	glEnd;	521	glEnd;
458		522
459	glDisable GL_BLEND;	523	glDisable GL_BLEND;
		524	}
460	}	525	}
461		526
462	#############################################################################	527	#############################################################################
463		528
464	package CFClient::UI::Empty;	529	package CFClient::UI::Empty;
…		…
508	$self->{children} = [	573	$self->{children} = [
509	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
510	@{$self->{children}}, @widgets	575	@{$self->{children}}, @widgets
511	];	576	];
512		577
513	$self->check_size;	578	$self->check_size (1);
514	$self->update;	579	$self->update;
515	}	580	}
516		581
517	sub children {	582	sub children {
518	@{ $_[0]{children} }	583	@{ $_[0]{children} }
…		…
625	}	690	}
626		691
627	sub update {	692	sub update {
628	my ($self) = @_;	693	my ($self) = @_;
629		694
630	$ROOT->on_refresh ($self => sub { $self->render_child });	695	$ROOT->on_post_alloc ($self => sub { $self->render_child });
631	$self->SUPER::update;	696	$self->SUPER::update;
632	}	697	}
633		698
634	sub size_allocate {	699	sub size_allocate {
635	my ($self, $w, $h) = @_;	700	my ($self, $w, $h) = @_;
…		…
648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	713	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649	glClearColor 0, 0, 0, 0;	714	glClearColor 0, 0, 0, 0;
650	glClear GL_COLOR_BUFFER_BIT;	715	glClear GL_COLOR_BUFFER_BIT;
651		716
652	$self->_render;	717	$self->_render;
653	# glColorMask 1, 1, 1, 0;
654	# glEnable GL_BLEND;
655	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656	# glRasterPos 0, 0;
657	# glCopyPixels 0, 0, $self->{w}, $self->{h};
658	# glDisable GL_BLEND;
659	# glColorMask 1, 1, 1, 1;
660	};	718	};
661	}	719	}
662		720
663	sub _draw {	721	sub _draw {
664	my ($self) = @_;	722	my ($self) = @_;
…		…
666	my ($w, $h) = ($self->w, $self->h);	724	my ($w, $h) = ($self->w, $self->h);
667		725
668	my $tex = $self->{texture}	726	my $tex = $self->{texture}
669	or return;	727	or return;
670		728
671	glEnable GL_BLEND;
672	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673	glEnable GL_TEXTURE_2D;	729	glEnable GL_TEXTURE_2D;
674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	730	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675	glColor 0, 0, 0, 1;	731	glColor 1, 1, 1, 1;
676		732
677	$tex->draw_quad (0, 0, $w, $h);	733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678		734
679	glDisable GL_BLEND;
680	glDisable GL_TEXTURE_2D;	735	glDisable GL_TEXTURE_2D;
681	}	736	}
682		737
683	#############################################################################	738	#############################################################################
684		739
…		…
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	819	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765	},	820	},
766	;	821	;
767		822
768	$self = $class->SUPER::new (	823	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	824	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	825	slider => $slider,
771	@_,	826	@_,
772	);	827	);
773		828
774	$self->{vp}->add ($self->{scrolled});	829	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	831	$self->add ($self->{slider});
777		832
778	$self	833	$self
779	}	834	}
780		835
781	#TODO# update range on size_allocate depeneing on child	836	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	837	# update viewport offset on scroll
783		838
784	#############################################################################	839	#############################################################################
785		840
786	package CFClient::UI::Frame;	841	package CFClient::UI::Frame;
…		…
790	use CFClient::OpenGL;	845	use CFClient::OpenGL;
791		846
792	sub new {	847	sub new {
793	my $class = shift;	848	my $class = shift;
794		849
795	my $self = $class->SUPER::new (	850	$class->SUPER::new (
796	bg => [1, 1, 1, 1],	851	bg => undef,
797	border_bg => [1, 1, 1, 1],
798	border => 0.8,
799	@_	852	@_,
800	);	853	)
801
802	$self
803	}	854	}
804		855
805	sub _draw {	856	sub _draw {
806	my ($self) = @_;	857	my ($self) = @_;
807		858
808	my ($w, $h) = ($self->{w}, $self->{h});	859	if ($self->{bg}) {
		860	my ($w, $h) = @$self{qw(w h)};
809		861
810	glEnable GL_BLEND;	862	glEnable GL_BLEND;
811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	863	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812	glEnable GL_TEXTURE_2D;	864	glColor @{ $self->{bg} };
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814		865
815	# glBegin GL_QUADS;	866	glBegin GL_QUADS;
816	# glColor 0, 0, 0, 0;
817	# glVertex 0 , 0;	867	glVertex 0 , 0;
818	# glVertex 0 , $h;	868	glVertex 0 , $h;
819	# glVertex $w, $h;	869	glVertex $w, $h;
820	# glVertex $w, 0;	870	glVertex $w, 0;
821	# glEnd;	871	glEnd;
822		872
823
824	$self->child->draw;
825	glDisable GL_BLEND;	873	glDisable GL_BLEND;
826	glDisable GL_TEXTURE_2D;	874	}
		875
		876	$self->SUPER::_draw;
827	}	877	}
828		878
829	#############################################################################	879	#############################################################################
830		880
831	package CFClient::UI::FancyFrame;	881	package CFClient::UI::FancyFrame;
…		…
845		895
846	my $self = $class->SUPER::new (	896	my $self = $class->SUPER::new (
847	bg => [1, 1, 1, 1],	897	bg => [1, 1, 1, 1],
848	border_bg => [1, 1, 1, 1],	898	border_bg => [1, 1, 1, 1],
849	border => 0.6,	899	border => 0.6,
		900	toplevel => 1,
850	can_events => 1,	901	can_events => 1,
851	@_	902	@_
852	);	903	);
853		904
854	$self->{title} &&= new CFClient::UI::Label	905	$self->{title} &&= new CFClient::UI::Label
…		…
879	my ($self, $w, $h) = @_;	930	my ($self, $w, $h) = @_;
880		931
881	$h -= List::Util::max 0, $self->border * 2;	932	$h -= List::Util::max 0, $self->border * 2;
882	$w -= List::Util::max 0, $self->border * 2;	933	$w -= List::Util::max 0, $self->border * 2;
883		934
884	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	935	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885	if $self->{title};	936	if $self->{title};
886		937
887	$self->child->configure ($self->border, $self->border, $w, $h);	938	$self->child->configure ($self->border, $self->border, $w, $h);
888	}	939	}
889		940
…		…
947	my ($self) = @_;	998	my ($self) = @_;
948		999
949	my ($w, $h ) = ($self->{w}, $self->{h});	1000	my ($w, $h ) = ($self->{w}, $self->{h});
950	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1001	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951		1002
952	glEnable GL_BLEND;
953	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954	glEnable GL_TEXTURE_2D;	1003	glEnable GL_TEXTURE_2D;
955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1004	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956		1005
957	my $border = $self->border;	1006	my $border = $self->border;
958		1007
959	glColor @{ $self->{border_bg} };	1008	glColor @{ $self->{border_bg} };
960	$tex[1]->draw_quad (0, 0, $w, $border);	1009	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
961	$tex[3]->draw_quad (0, $border, $border, $ch);	1010	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1011	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1012	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964		1013
965	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1014	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966	my $bg = $tex[0];	1015	my $bg = $tex[0];
967		1016
968	# TODO: repeat texture not scale	1017	# TODO: repeat texture not scale
…		…
972	glColor @{ $self->{bg} };	1021	glColor @{ $self->{bg} };
973		1022
974	$bg->{s} = $rep_x;	1023	$bg->{s} = $rep_x;
975	$bg->{t} = $rep_y;	1024	$bg->{t} = $rep_y;
976	$bg->{wrap_mode} = 1;	1025	$bg->{wrap_mode} = 1;
977	$bg->draw_quad ($border, $border, $cw, $ch);	1026	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1027	}
978		1028
979	glDisable GL_TEXTURE_2D;	1029	glDisable GL_TEXTURE_2D;
980	glDisable GL_BLEND;
981	}
982		1030
983	$self->{title}->draw if $self->{title};	1031	$self->{title}->draw if $self->{title};
984		1032
985	$self->child->draw;	1033	$self->child->draw;
986	}	1034	}
…		…
1253		1301
1254	#############################################################################	1302	#############################################################################
1255		1303
1256	package CFClient::UI::Label;	1304	package CFClient::UI::Label;
1257		1305
1258	our @ISA = CFClient::UI::Base::;	1306	our @ISA = CFClient::UI::DrawBG::;
1259		1307
1260	use CFClient::OpenGL;	1308	use CFClient::OpenGL;
1261		1309
1262	sub new {	1310	sub new {
1263	my ($class, %arg) = @_;	1311	my ($class, %arg) = @_;
1264		1312
1265	my $self = $class->SUPER::new (	1313	my $self = $class->SUPER::new (
1266	fg => [1, 1, 1],	1314	fg => [1, 1, 1],
		1315	#bg => none
		1316	#active_bg => none
1267	#font => default_font	1317	#font => default_font
		1318	#text => initial text
		1319	#markup => initial narkup
		1320	#max_w => maximum pixel width
		1321	ellipsise => 3, # end
		1322	layout => (new CFClient::Layout),
1268	fontsize => 1,	1323	fontsize => 1,
1269	text => "",
1270	align => -1,	1324	align => -1,
1271	valign => -1,	1325	valign => -1,
1272	padding => 2,	1326	padding => 2,
1273	layout => new CFClient::Layout,
1274	can_events => 0,	1327	can_events => 0,
1275	%arg	1328	%arg
1276	);	1329	);
1277		1330
1278	if (exists $self->{template}) {	1331	if (exists $self->{template}) {
1279	my $layout = new CFClient::Layout;	1332	my $layout = new CFClient::Layout;
1280	$layout->set_text (delete $self->{template});	1333	$layout->set_text (delete $self->{template});
1281	$self->{template} = $layout;	1334	$self->{template} = $layout;
1282	}	1335	}
1283		1336
1284	$self->set_text (delete $self->{text}) if exists $self->{text};	1337	if (exists $self->{markup}) {
1285	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1338	$self->set_markup (delete $self->{markup});
		1339	} else {
		1340	$self->set_text (delete $self->{text});
		1341	}
1286		1342
1287	$self	1343	$self
1288	}	1344	}
1289		1345
1290	sub escape {	1346	sub escape($) {
1291	local $_ = $_[1];	1347	local $_ = $_[0];
1292		1348
1293	s/&/&amp;/g;	1349	s/&/&amp;/g;
1294	s/>/&gt;/g;	1350	s/>/&gt;/g;
1295	s/</&lt;/g;	1351	s/</&lt;/g;
1296		1352
1297	$_[1]	1353	$_
1298	}	1354	}
1299		1355
1300	sub update {	1356	sub update {
1301	my ($self) = @_;	1357	my ($self) = @_;
1302		1358
…		…
1308	my ($self, $text) = @_;	1364	my ($self, $text) = @_;
1309		1365
1310	return if $self->{text} eq "T$text";	1366	return if $self->{text} eq "T$text";
1311	$self->{text} = "T$text";	1367	$self->{text} = "T$text";
1312		1368
		1369	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1313	$self->{layout}->set_text ($text);	1370	$self->{layout}->set_text ($text);
1314		1371
1315	$self->update;	1372	$self->update;
1316	$self->check_size;	1373	$self->check_size;
1317	}	1374	}
…		…
1320	my ($self, $markup) = @_;	1377	my ($self, $markup) = @_;
1321		1378
1322	return if $self->{text} eq "M$markup";	1379	return if $self->{text} eq "M$markup";
1323	$self->{text} = "M$markup";	1380	$self->{text} = "M$markup";
1324		1381
		1382	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1383
		1384	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325	$self->{layout}->set_markup ($markup);	1385	$self->{layout}->set_markup ($markup);
1326		1386
1327	$self->update;	1387	$self->update;
1328	$self->check_size;	1388	$self->check_size;
1329	}	1389	}
…		…
1331	sub size_request {	1391	sub size_request {
1332	my ($self) = @_;	1392	my ($self) = @_;
1333		1393
1334	$self->{layout}->set_font ($self->{font}) if $self->{font};	1394	$self->{layout}->set_font ($self->{font}) if $self->{font};
1335	$self->{layout}->set_width ($self->{max_w} || -1);	1395	$self->{layout}->set_width ($self->{max_w} || -1);
		1396	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1397	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1398	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337		1399
1338	my ($w, $h) = $self->{layout}->size;	1400	my ($w, $h) = $self->{layout}->size;
1339		1401
1340	if (exists $self->{template}) {	1402	if (exists $self->{template}) {
…		…
1370	}	1432	}
1371		1433
1372	sub _draw {	1434	sub _draw {
1373	my ($self) = @_;	1435	my ($self) = @_;
1374		1436
		1437	$self->SUPER::_draw; # draw background, if applicable
		1438
1375	my $tex = $self->{texture} ||= do {	1439	my $tex = $self->{texture} ||= do {
		1440	$self->{layout}->set_foreground (@{$self->{fg}});
1376	$self->{layout}->set_font ($self->{font}) if $self->{font};	1441	$self->{layout}->set_font ($self->{font}) if $self->{font};
1377	$self->{layout}->set_width ($self->{w});	1442	$self->{layout}->set_width ($self->{w});
		1443	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1444	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1378	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1445	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1446
1379	new_from_layout CFClient::Texture $self->{layout}	1447	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1448
		1449	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1450	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1451	: ($self->{w} - $tex->{w}) * 0.5);
		1452
		1453	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1454	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1455	: ($self->{h} - $tex->{h}) * 0.5);
		1456
		1457	$tex
1380	};	1458	};
1381		1459
1382	glEnable GL_BLEND;
1383	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1384	glEnable GL_TEXTURE_2D;	1460	glEnable GL_TEXTURE_2D;
1385	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1461	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1386		1462
		1463	if ($tex->{format} == GL_ALPHA) {
1387	glColor @{$self->{fg}};	1464	glColor @{$self->{fg}};
1388
1389	$self->{ox} = int (
1390	$self->{align} < 0 ? $self->{padding}
1391	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1392	: ($self->{w} - $tex->{w}) * 0.5
1393	);
1394
1395	$self->{oy} = int (
1396	$self->{valign} < 0 ? $self->{padding}
1397	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1398	: ($self->{h} - $tex->{h}) * 0.5
1399	);
1400
1401	$tex->draw_quad ($self->{ox}, $self->{oy});	1465	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1466	} else {
		1467	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1468	}
1402		1469
1403	glDisable GL_TEXTURE_2D;	1470	glDisable GL_TEXTURE_2D;
1404	glDisable GL_BLEND;
1405	}	1471	}
1406		1472
1407	#############################################################################	1473	#############################################################################
1408		1474
1409	package CFClient::UI::EntryBase;	1475	package CFClient::UI::EntryBase;
…		…
1444	$self->{layout}->set_text ("$text ");	1510	$self->{layout}->set_text ("$text ");
1445		1511
1446	$self->emit (changed => $self->{text});	1512	$self->emit (changed => $self->{text});
1447	}	1513	}
1448		1514
1449	sub get_text {
1450	$_[0]{text}
1451	}
1452
1453	sub size_request {
1454	my ($self) = @_;
1455
1456	my ($w, $h) = $self->SUPER::size_request;
1457
1458	($w + 1, $h) # add 1 for cursor
1459	}
1460
1461	sub size_allocate {
1462	my ($self, $w, $h) = @_;
1463
1464	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1465	}
1466
1467	sub set_text {	1515	sub set_text {
1468	my ($self, $text) = @_;	1516	my ($self, $text) = @_;
1469		1517
1470	$self->{cursor} = length $text;	1518	$self->{cursor} = length $text;
1471	$self->_set_text ($text);	1519	$self->_set_text ($text);
1472	$self->update;	1520	$self->update;
		1521	$self->check_size;
		1522	}
		1523
		1524	sub get_text {
		1525	$_[0]{text}
		1526	}
		1527
		1528	sub size_request {
		1529	my ($self) = @_;
		1530
		1531	my ($w, $h) = $self->SUPER::size_request;
		1532
		1533	($w + 1, $h) # add 1 for cursor
		1534	}
		1535
		1536	sub size_allocate {
		1537	my ($self, $w, $h) = @_;
		1538
		1539	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473	}	1540	}
1474		1541
1475	sub key_down {	1542	sub key_down {
1476	my ($self, $ev) = @_;	1543	my ($self, $ev) = @_;
1477		1544
…		…
1479	my $sym = $ev->{sym};	1546	my $sym = $ev->{sym};
1480	my $uni = $ev->{unicode};	1547	my $uni = $ev->{unicode};
1481		1548
1482	my $text = $self->get_text;	1549	my $text = $self->get_text;
1483		1550
1484	if ($sym == 8) {	1551	if ($uni == 8) {
1485	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1552	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1486	} elsif ($sym == 127) {	1553	} elsif ($uni == 127) {
1487	substr $text, $self->{cursor}, 1, "";	1554	substr $text, $self->{cursor}, 1, "";
1488	} elsif ($sym == CFClient::SDLK_LEFT) {	1555	} elsif ($sym == CFClient::SDLK_LEFT) {
1489	--$self->{cursor} if $self->{cursor};	1556	--$self->{cursor} if $self->{cursor};
1490	} elsif ($sym == CFClient::SDLK_RIGHT) {	1557	} elsif ($sym == CFClient::SDLK_RIGHT) {
1491	++$self->{cursor} if $self->{cursor} < length $self->{text};	1558	++$self->{cursor} if $self->{cursor} < length $self->{text};
1492	} elsif ($sym == CFClient::SDLK_HOME) {	1559	} elsif ($sym == CFClient::SDLK_HOME) {
1493	$self->{cursor} = 0;	1560	$self->{cursor} = 0;
1494	} elsif ($sym == CFClient::SDLK_END) {	1561	} elsif ($sym == CFClient::SDLK_END) {
1495	$self->{cursor} = length $text;	1562	$self->{cursor} = length $text;
1496	} elsif ($sym == 27) {	1563	} elsif ($uni == 27) {
1497	$self->emit ('escape');	1564	$self->emit ('escape');
1498	} elsif ($uni) {	1565	} elsif ($uni) {
1499	substr $text, $self->{cursor}++, 0, chr $uni;	1566	substr $text, $self->{cursor}++, 0, chr $uni;
1500	}	1567	}
1501		1568
1502	$self->_set_text ($text);	1569	$self->_set_text ($text);
1503	$self->update;	1570	$self->update;
		1571	$self->check_size;
1504	}	1572	}
1505		1573
1506	sub focus_in {	1574	sub focus_in {
1507	my ($self) = @_;	1575	my ($self) = @_;
1508		1576
…		…
1637	my $class = shift;	1705	my $class = shift;
1638		1706
1639	$class->SUPER::new (	1707	$class->SUPER::new (
1640	padding => 4,	1708	padding => 4,
1641	fg => [1, 1, 1],	1709	fg => [1, 1, 1],
1642	bg => [1, 1, 1, 0.2],
1643	active_fg => [0, 0, 1],	1710	active_fg => [0, 0, 1],
1644	can_hover => 1,	1711	can_hover => 1,
1645	align => 0,	1712	align => 0,
1646	valign => 0,	1713	valign => 0,
1647	can_events => 1,	1714	can_events => 1,
…		…
1665		1732
1666	if ($GRAB == $self) {	1733	if ($GRAB == $self) {
1667	$self->{fg} = $self->{active_fg};	1734	$self->{fg} = $self->{active_fg};
1668	}	1735	}
1669		1736
1670	glEnable GL_BLEND;
1671	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672	glEnable GL_TEXTURE_2D;	1737	glEnable GL_TEXTURE_2D;
1673	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1738	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674	glColor 0, 0, 0, 1;	1739	glColor 0, 0, 0, 1;
1675		1740
1676	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1741	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677		1742
1678	glDisable GL_TEXTURE_2D;	1743	glDisable GL_TEXTURE_2D;
1679	glDisable GL_BLEND;
1680		1744
1681	$self->SUPER::_draw;	1745	$self->SUPER::_draw;
1682	}	1746	}
1683		1747
1684	#############################################################################	1748	#############################################################################
…		…
1698		1762
1699	$class->SUPER::new (	1763	$class->SUPER::new (
1700	padding => 2,	1764	padding => 2,
1701	fg => [1, 1, 1],	1765	fg => [1, 1, 1],
1702	active_fg => [1, 1, 0],	1766	active_fg => [1, 1, 0],
		1767	bg => [0, 0, 0, 0.2],
		1768	active_bg => [1, 1, 1, 0.5],
1703	state => 0,	1769	state => 0,
1704	can_hover => 1,	1770	can_hover => 1,
1705	@_	1771	@_
1706	)	1772	)
1707	}	1773	}
…		…
1731		1797
1732	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1798	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1733		1799
1734	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1800	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735		1801
1736	glEnable GL_BLEND;	1802	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1803
1737	glEnable GL_TEXTURE_2D;	1804	glEnable GL_TEXTURE_2D;
1738	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1739
1740	my $tex = $self->{state} ? $tex[1] : $tex[0];
1741
1742	$tex->draw_quad (0, 0, $s, $s);	1805	$tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744	glDisable GL_TEXTURE_2D;	1806	glDisable GL_TEXTURE_2D;
1745	glDisable GL_BLEND;
1746	}	1807	}
1747		1808
1748	#############################################################################	1809	#############################################################################
1749		1810
1750	package CFClient::UI::Image;	1811	package CFClient::UI::Image;
…		…
1793	glTranslate 0, -$self->{w}, 0;	1854	glTranslate 0, -$self->{w}, 0;
1794		1855
1795	($w, $h) = ($h, $w);	1856	($w, $h) = ($h, $w);
1796	}	1857	}
1797		1858
1798	glEnable GL_BLEND;
1799	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800	glEnable GL_TEXTURE_2D;	1859	glEnable GL_TEXTURE_2D;
1801	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802		1861
1803	$tex->draw_quad (0, 0, $w, $h);	1862	$tex->draw_quad_alpha (0, 0, $w, $h);
1804		1863
1805	glDisable GL_BLEND;
1806	glDisable GL_TEXTURE_2D;	1864	glDisable GL_TEXTURE_2D;
1807	}	1865	}
1808		1866
1809	#############################################################################	1867	#############################################################################
1810		1868
…		…
1999	qw(s1_slider.png s1_slider_bg.png);	2057	qw(s1_slider.png s1_slider_bg.png);
2000		2058
2001	sub new {	2059	sub new {
2002	my $class = shift;	2060	my $class = shift;
2003		2061
2004	# range [value, low, high, page]	2062	# range [value, low, high, page, unit]
2005		2063
2006	# TODO: 0-width page	2064	# TODO: 0-width page
2007	# TODO: req_w/h are wrong with vertical	2065	# TODO: req_w/h are wrong with vertical
2008	# TODO: calculations are off	2066	# TODO: calculations are off
2009	my $self = $class->SUPER::new (	2067	my $self = $class->SUPER::new (
2010	fg => [1, 1, 1],	2068	fg => [1, 1, 1],
2011	active_fg => [0, 0, 0],	2069	active_fg => [0, 0, 0],
		2070	bg => [0, 0, 0, 0.2],
		2071	active_bg => [1, 1, 1, 0.5],
2012	range => [0, 0, 100, 10],	2072	range => [0, 0, 100, 10],
2013	req_w => $::WIDTH / 80,	2073	req_w => $::WIDTH / 80,
2014	req_h => $::WIDTH / 80,	2074	req_h => $::WIDTH / 80,
2015	vertical => 0,	2075	vertical => 0,
2016	can_hover => 1,	2076	can_hover => 1,
2017	inner_pad => 5,	2077	inner_pad => 0.02,
2018	@_	2078	@_
2019	);	2079	);
2020		2080
		2081	$self->set_value ($self->{range}[0]);
		2082	$self->update;
		2083
2021	$self	2084	$self
		2085	}
		2086
		2087	sub set_value {
		2088	my ($self, $value) = @_;
		2089
		2090	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2091
		2092	$hi = $lo + 1 if $hi <= $lo;
		2093
		2094	$value = $lo if $value < $lo;
		2095	$value = $hi if $value > $hi;
		2096
		2097	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2098	if $unit;
		2099
		2100	$page = $hi - $lo if $page > $hi - $lo;
		2101
		2102	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2103
		2104	if ($value != $old_value) {
		2105	$self->emit (changed => $value);
		2106	$self->update;
		2107	}
2022	}	2108	}
2023		2109
2024	sub size_request {	2110	sub size_request {
2025	my ($self) = @_;	2111	my ($self) = @_;
2026		2112
…		…
2039		2125
2040	sub mouse_motion {	2126	sub mouse_motion {
2041	my ($self, $ev, $x, $y) = @_;	2127	my ($self, $ev, $x, $y) = @_;
2042		2128
2043	if ($GRAB == $self) {	2129	if ($GRAB == $self) {
		2130	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2131
		2132	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2133
		2134	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2135
		2136	$self->set_value ($x * ($hi - $lo) + $lo);
		2137	}
		2138	}
		2139
		2140	sub update {
		2141	my ($self) = @_;
		2142
		2143	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2144	$self->set_value ($self->{range}[0]);
		2145
2044	my ($value, $lo, $hi, $page) = @{$self->{range}};	2146	my ($value, $lo, $hi, $page) = @{$self->{range}};
2045		2147
2046	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2148	my $inner_w = 1 - 2 * $self->{inner_pad};
2047		2149
2048	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2150	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2049	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2050		2151
2051	$x -= $inner_pad_px; # substract the padding	2152	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2052	$x = $x * ($hi - $lo) / $inner_w + $lo;	2153	$value = $self->{scale} * ($value - $lo);
2053	$x = $lo if $x < $lo;
2054	$x = $hi - $page if $x > $hi - $page;
2055	$self->{range}[0] = $x;
2056		2154
2057	$self->emit (changed => $x);	2155	$value = $self->{inner_pad} + ($value - $page * 0.5);
2058	$self->update;	2156
		2157	$value = 0 if $value < 0;
		2158	$page = 1 - $value if $value + $page > 1;
		2159
		2160	$self->{knob_x} = $value;
		2161	$self->{knob_w} = $page;
2059	}	2162	});
2060	}
2061		2163
2062	# the inner_* stuff is for generating a padding for the slider handle,	2164	$self->SUPER::update;
2063	# so that the handle doesn't leave the texture. This calculation isn't 100%
2064	# correct propably, but it does the job for now
2065	sub _calc_inner_pad_px {
2066	my ($self, $w) = @_;
2067	($w / 100) * $self->{inner_pad} # % to pixels
2068	}	2165	}
2069		2166
2070	sub _draw {	2167	sub _draw {
2071	my ($self) = @_;	2168	my ($self) = @_;
2072		2169
2073	$self->SUPER::_draw ();	2170	$self->SUPER::_draw ();
2074		2171
2075	my ($w, $h) = @$self{qw(w h)};	2172	glScale $self->{w}, $self->{h};
2076		2173
2077	if ($self->{vertical}) {	2174	if ($self->{vertical}) {
2078	# draw a vertical slider like a rotated horizontal slider	2175	# draw a vertical slider like a rotated horizontal slider
2079		2176
		2177	glTranslate 1, 0, 0;
2080	glRotate 90, 0, 0, 1;	2178	glRotate 90, 0, 0, 1;
2081	glTranslate 0, -$self->{w}, 0;
2082
2083	($w, $h) = ($h, $w);
2084	}	2179	}
2085		2180
2086	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2181	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2087	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2182	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2088		2183
2089	my ($value, $lo, $hi, $page) = @{$self->{range}};
2090
2091	$hi = $value + 1 if $lo == $hi;
2092
2093	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2094	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2095
2096	$page = int $page * $inner_w / ($hi - $lo);
2097	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2098
2099	$w -= $page;
2100	$page &= ~1;
2101	glTranslate $page * 0.5, 0, 0;
2102	$page ||= 2;
2103
2104	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2105	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2106
2107	glEnable GL_BLEND;
2108	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2109	glEnable GL_TEXTURE_2D;	2184	glEnable GL_TEXTURE_2D;
2110	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2185	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111		2186
2112	# draw background	2187	# draw background
2113	$tex[1]->draw_quad (0, 0, $w, $h);	2188	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2114		2189
2115	# draw handle	2190	# draw handle
2116	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2191	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2117		2192
2118	glDisable GL_BLEND;
2119	glDisable GL_TEXTURE_2D;	2193	glDisable GL_TEXTURE_2D;
2120	}	2194	}
2121		2195
2122	#############################################################################	2196	#############################################################################
2123		2197
…		…
2134	fontsize => 1,	2208	fontsize => 1,
2135	can_events => 0,	2209	can_events => 0,
2136	#font => default_font	2210	#font => default_font
2137	@_,	2211	@_,
2138		2212
2139	layout => (new CFClient::Layout),	2213	layout => (new CFClient::Layout 1),
2140	par => [],	2214	par => [],
2141	height => 0,	2215	height => 0,
2142	children => [	2216	children => [
2143	(new CFClient::UI::Empty expand => 1),	2217	(new CFClient::UI::Empty expand => 1),
2144	(new CFClient::UI::Slider vertical => 1),	2218	(new CFClient::UI::Slider vertical => 1),
…		…
2155		2229
2156	$self->{fontsize} = $fontsize;	2230	$self->{fontsize} = $fontsize;
2157	$self->reflow;	2231	$self->reflow;
2158	}	2232	}
2159		2233
2160	sub text_height {
2161	my ($self, $text) = @_;
2162
2163	my $layout = $self->{layout};
2164
2165	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2166	$layout->set_width ($self->{children}[0]{w});
2167	$layout->set_text ($text);
2168
2169	($layout->size)[1]
2170	}
2171
2172	sub reflow {
2173	my ($self) = @_;
2174
2175	$self->{need_reflow}++;
2176	$self->update;
2177	}
2178
2179	sub size_allocate {	2234	sub size_allocate {
2180	my ($self, $w, $h) = @_;	2235	my ($self, $w, $h) = @_;
2181		2236
2182	$self->SUPER::size_allocate ($w, $h);	2237	$self->SUPER::size_allocate ($w, $h);
2183		2238
…		…
2186	$self->{layout}->set_width ($self->{children}[0]{w});	2241	$self->{layout}->set_width ($self->{children}[0]{w});
2187		2242
2188	$self->reflow;	2243	$self->reflow;
2189	}	2244	}
2190		2245
		2246	sub text_height {
		2247	my ($self, $text, $indent) = @_;
		2248
		2249	my $layout = $self->{layout};
		2250
		2251	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2252	$layout->set_width ($self->{children}[0]{w} - $indent);
		2253	$layout->set_markup ($text);
		2254
		2255	($layout->size)[1]
		2256	}
		2257
		2258	sub reflow {
		2259	my ($self) = @_;
		2260
		2261	$self->{need_reflow}++;
		2262	$self->update;
		2263	}
		2264
2191	sub add_paragraph {	2265	sub add_paragraph {
2192	my ($self, $color, $text) = @_;	2266	my ($self, $color, $text, $indent) = @_;
2193		2267
2194	#TODO: intelligently "reformat" paragraph	2268	#TODO: intelligently "reformat" paragraph
2195		2269
		2270	for my $line (split /\n/, $text) {
2196	my $height = $self->text_height ($text);	2271	my $height = $self->text_height ($line);
2197
2198	$self->{height} += $height;	2272	$self->{height} += $height;
2199
2200	push @{$self->{par}}, [$height, $color, $text];	2273	push @{$self->{par}}, [$height, $color, $indent, $line];
		2274	}
2201		2275
2202	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2276	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2203	$self->{children}[1]->update;	2277	$self->{children}[1]->update;
2204	}	2278	}
2205		2279
…		…
2210		2284
2211	return unless $self->{h} > 0;	2285	return unless $self->{h} > 0;
2212		2286
2213	delete $self->{texture};	2287	delete $self->{texture};
2214		2288
2215	$ROOT->on_refresh ($self, sub {	2289	$ROOT->on_post_alloc ($self, sub {
2216	if (delete $self->{need_reflow}) {	2290	if (delete $self->{need_reflow}) {
2217	my $height = 0;	2291	my $height = 0;
2218		2292
2219	$height += $_->[0] = $self->text_height ($_->[2])	2293	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2220	for @{$self->{par}};	2294	for @{$self->{par}};
2221		2295
2222	$self->{height} = $height;	2296	$self->{height} = $height;
2223		2297
2224	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2298	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2299	$self->{children}[1]->update;
2225		2300
2226	delete $self->{texture};	2301	delete $self->{texture};
2227	}	2302	}
2228		2303
2229	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2304	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2230	glClearColor 0, 0, 0, 0;	2305	glClearColor 0.5, 0.5, 0.5, 0;
2231	glClear GL_COLOR_BUFFER_BIT;	2306	glClear GL_COLOR_BUFFER_BIT;
2232
2233	glEnable GL_BLEND;
2234	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2235	glEnable GL_TEXTURE_2D;
2236	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2237		2307
2238	my $top = int $self->{children}[1]{range}[0];	2308	my $top = int $self->{children}[1]{range}[0];
2239		2309
2240	my $y0 = $top;	2310	my $y0 = $top;
2241	my $y1 = $top + $self->{h};	2311	my $y1 = $top + $self->{h};
…		…
2244		2314
2245	my $layout = $self->{layout};	2315	my $layout = $self->{layout};
2246		2316
2247	$layout->set_font ($self->{font}) if $self->{font};	2317	$layout->set_font ($self->{font}) if $self->{font};
2248		2318
		2319	glEnable GL_BLEND;
		2320	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2321
2249	for my $par (@{$self->{par}}) {	2322	for my $par (@{$self->{par}}) {
2250	my $h = $par->[0];	2323	my $h = $par->[0];
2251		2324
2252	if ($y0 < $y + $h && $y < $y1) {	2325	if ($y0 < $y + $h && $y < $y1) {
		2326	$layout->set_foreground (@{ $par->[1] });
		2327	$layout->set_width ($self->{w} - $par->[2]);
2253	$layout->set_text ($par->[2]);	2328	$layout->set_markup ($par->[3]);
2254		2329
2255	glColor @{ $par->[1] };	2330	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2256	my ($W, $H) = $layout->size;	2331
2257	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2332	glRasterPos $par->[2], $y - $y0;
		2333	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2258	}	2334	}
2259		2335
2260	$y += $h;	2336	$y += $h;
2261	}	2337	}
2262		2338
2263	glDisable GL_TEXTURE_2D;
2264	glDisable GL_BLEND;	2339	glDisable GL_BLEND;
2265	};	2340	};
2266	});	2341	});
2267	}	2342	}
2268		2343
2269	sub _draw {	2344	sub _draw {
2270	my ($self) = @_;	2345	my ($self) = @_;
2271		2346
2272	glEnable GL_BLEND;
2273	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274	glEnable GL_TEXTURE_2D;	2347	glEnable GL_TEXTURE_2D;
2275	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2348	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276	glColor 1, 1, 1, 1;	2349	glColor 1, 1, 1, 1;
2277	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2350	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2278	glDisable GL_TEXTURE_2D;	2351	glDisable GL_TEXTURE_2D;
2279	glDisable GL_BLEND;
2280		2352
2281	$self->{children}[1]->draw;	2353	$self->{children}[1]->draw;
2282		2354
2283	}	2355	}
2284		2356
…		…
2378	@_,	2450	@_,
2379	can_events => 0,	2451	can_events => 0,
2380	)	2452	)
2381	}	2453	}
2382		2454
2383	sub set_markup {	2455	sub set_tooltip_from {
2384	my ($self, $text) = @_;	2456	my ($self, $widget) = @_;
2385		2457
2386	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2458	$self->add (new CFClient::UI::Label
2387	$self->{label}->set_markup ($text);	2459	markup => $widget->{tooltip},
2388	$self->add ($self->{label});	2460	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2461	fontsize => 0.8,
		2462	fg => [0, 0, 0, 1],
		2463	ellipsise => 0,
		2464	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2465	);
2389	}	2466	}
2390		2467
2391	sub size_request {	2468	sub size_request {
2392	my ($self) = @_;	2469	my ($self) = @_;
2393
2394	$self->child->set_max_size ($::WIDTH * 0.3);
2395		2470
2396	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2471	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397		2472
2398	($w + 4, $h + 4)	2473	($w + 4, $h + 4)
2399	}	2474	}
…		…
2405	}	2480	}
2406		2481
2407	sub _draw {	2482	sub _draw {
2408	my ($self) = @_;	2483	my ($self) = @_;
2409		2484
2410	glPushMatrix;
2411	glTranslate 0.375, 0.375;	2485	glTranslate 0.375, 0.375;
2412		2486
2413	my ($w, $h) = @$self{qw(w h)};	2487	my ($w, $h) = @$self{qw(w h)};
2414		2488
2415	glColor 1, 0.8, 0.4;	2489	glColor 1, 0.8, 0.4;
…		…
2426	glVertex 0 , $h;	2500	glVertex 0 , $h;
2427	glVertex $w, $h;	2501	glVertex $w, $h;
2428	glVertex $w, 0;	2502	glVertex $w, 0;
2429	glEnd;	2503	glEnd;
2430		2504
2431	glPopMatrix;	2505	glTranslate 2 - 0.375, 2 - 0.375;
2432
2433	glTranslate 2, 2;
2434	$self->SUPER::_draw;	2506	$self->SUPER::_draw;
2435	}	2507	}
2436		2508
2437	#############################################################################	2509	#############################################################################
2438		2510
…		…
2443	use CFClient::OpenGL;	2515	use CFClient::OpenGL;
2444		2516
2445	sub new {	2517	sub new {
2446	my $class = shift;	2518	my $class = shift;
2447		2519
2448	$class->SUPER::new (	2520	my $self = $class->SUPER::new (
2449	aspect => 1,	2521	aspect => 1,
2450	@_,	2522	@_,
2451	)	2523	);
		2524
		2525	if ($self->{anim} && $self->{animspeed}) {
		2526	Scalar::Util::weaken (my $widget = $self);
		2527
		2528	$self->{timer} = Event->timer (
		2529	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2530	hard => 1,
		2531	interval => $self->{animspeed},
		2532	cb => sub {
		2533	++$widget->{frame};
		2534	$widget->update;
		2535	},
		2536	);
		2537	}
		2538
		2539	$self
2452	}	2540	}
2453		2541
2454	sub size_request {	2542	sub size_request {
2455	(32, 8)	2543	(32, 8)
2456	}	2544	}
2457		2545
		2546	sub update {
		2547	my ($self) = @_;
		2548
		2549	return unless $self->{visible};
		2550
		2551	$self->SUPER::update;
		2552	}
		2553
2458	sub _draw {	2554	sub _draw {
2459	my ($self) = @_;	2555	my ($self) = @_;
2460		2556
2461	return unless $::CONN;#d# manage and cache textures differently	2557	return unless $::CONN;#d# manage and cache textures differently
		2558
		2559	my $face;
		2560
		2561	if ($self->{frame}) {
		2562	my $anim = $::CONN->{anim}[$self->{anim}];
		2563
		2564	$face = $anim->[ $self->{frame} % @$anim ]
		2565	if $anim && @$anim;
		2566	}
		2567
2462	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2568	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2463		2569
2464	# TODO animation
2465	if ($tex) {	2570	if ($tex) {
2466	glEnable GL_BLEND;
2467	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468	glEnable GL_TEXTURE_2D;	2571	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2572	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2573	glColor 1, 1, 1, 1;
2471	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2574	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2575	glDisable GL_TEXTURE_2D;
2473	glDisable GL_BLEND;
2474	}	2576	}
		2577	}
		2578
		2579	sub DESTROY {
		2580	my ($self) = @_;
		2581
		2582	$self->{timer}->cancel
		2583	if $self->{timer};
		2584
		2585	$self->SUPER::DESTROY;
2475	}	2586	}
2476		2587
2477	#############################################################################	2588	#############################################################################
2478		2589
2479	package CFClient::UI::InventoryItem;	2590	package CFClient::UI::InventoryItem;
2480		2591
2481	our @ISA = CFClient::UI::HBox::;	2592	our @ISA = CFClient::UI::HBox::;
		2593
		2594	sub _item_to_desc {
		2595	my ($item) = @_;
		2596
		2597	my $desc =
		2598	$item->{nrof} < 2
		2599	? $item->{name}
		2600	: "$item->{nrof} × $item->{name_pl}";
		2601
		2602	$item->{flags} & Crossfire::Protocol::F_OPEN
		2603	and $desc .= " (open)";
		2604	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2605	and $desc .= " (applied)";
		2606	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2607	and $desc .= " (unpaid)";
		2608	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2609	and $desc .= " (magic)";
		2610	$item->{flags} & Crossfire::Protocol::F_CURSED
		2611	and $desc .= " (cursed)";
		2612	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2613	and $desc .= " (damned)";
		2614	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2615	and $desc .= " *";
		2616
		2617	$desc
		2618	}
2482		2619
2483	sub new {	2620	sub new {
2484	my $class = shift;	2621	my $class = shift;
2485		2622
2486	my %args = @_;	2623	my %args = @_;
2487		2624
2488	my $item = delete $args{item};	2625	my $item = delete $args{item};
2489		2626
2490	my $desc = $item->{nrof} < 2	2627	my $desc = _item_to_desc ($item);
2491	? $item->{name}
2492	: "$item->{nrof} $item->{name_pl}";
2493
2494		2628
2495	my $self = $class->SUPER::new (	2629	my $self = $class->SUPER::new (
2496	can_hover => 1,	2630	can_hover => 1,
2497	can_events => 1,	2631	can_events => 1,
2498	tooltip => (CFClient::UI::Label->escape ($desc)	2632	tooltip => ((CFClient::UI::Label::escape $desc)
2499	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2633	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2500	connect_button_down => sub {	2634	connect_button_down => sub {
2501	my ($self, $ev, $x, $y) = @_;	2635	my ($self, $ev, $x, $y) = @_;
2502		2636
2503	# todo: maybe put examine on 1? but should just be a tooltip :(	2637	# todo: maybe put examine on 1? but should just be a tooltip :(
		2638	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2639	my $targ = $::CONN->{player}{tag};
		2640
		2641	if ($item->{container} == $::CONN->{player}{tag}) {
		2642	$targ = $main::OPENCONT;
		2643	}
		2644
		2645	$::CONN->send ("move $targ $item->{tag} 0");
2504	if ($ev->{button} == 1) {	2646	} elsif ($ev->{button} == 1) {
2505	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2647	$::CONN->send ("examine $item->{tag}");
2506	} elsif ($ev->{button} == 2) {	2648	} elsif ($ev->{button} == 2) {
2507	$::CONN->send ("apply $item->{tag}");	2649	$::CONN->send ("apply $item->{tag}");
2508	} elsif ($ev->{button} == 3) {	2650	} elsif ($ev->{button} == 3) {
2509	CFClient::UI::Menu->new (	2651	my @menu_items = (
2510	items => [
2511	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2652	["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}") }],	2653	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2517	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2654	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2655	(
		2656	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2657	? (
		2658	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2659	)
		2660	: (
		2661	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2518	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2662	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2663	)
2519	],	2664	),
2520	)->popup ($ev);	2665	);
		2666
		2667	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2521	}	2668	}
2522		2669
2523	1	2670	1
2524	},	2671	},
2525	%args	2672	%args
2526	);	2673	);
		2674
2527		2675
2528	$self->add (new CFClient::UI::Face	2676	$self->add (new CFClient::UI::Face
2529	can_events => 0,	2677	can_events => 0,
2530	face => $item->{face},	2678	face => $item->{face},
2531	anim => $item->{anim},	2679	anim => $item->{anim},
2532	animspeed => $item->{animspeed},	2680	animspeed => $item->{animspeed},
2533	);	2681	);
2534		2682
2535	$self->add (new CFClient::UI::Label	2683	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2536	can_events => 0,	2684
2537	text => $desc,	2685	$self->{item} = $item;
2538	);	2686
		2687	$self->update_item;
2539		2688
2540	$self	2689	$self
		2690	}
		2691
		2692	sub update_item {
		2693	my ($self) = @_;
		2694
		2695	my $desc = _item_to_desc ($self->{item});
		2696
		2697	$self->{name_lbl}->set_text ($desc);
2541	}	2698	}
2542		2699
2543	#############################################################################	2700	#############################################################################
2544		2701
2545	package CFClient::UI::Inventory;	2702	package CFClient::UI::Inventory;
…		…
2548		2705
2549	sub new {	2706	sub new {
2550	my $class = shift;	2707	my $class = shift;
2551		2708
2552	my $self = $class->SUPER::new (	2709	my $self = $class->SUPER::new (
2553	scrolled => (new CFClient::UI::VBox),	2710	scrolled => (new CFClient::UI::Table),
2554	@_,	2711	@_,
2555	);	2712	);
2556		2713
2557	$self	2714	$self
2558	}	2715	}
…		…
2561	my ($self, $items) = @_;	2718	my ($self, $items) = @_;
2562		2719
2563	$self->{scrolled}->clear;	2720	$self->{scrolled}->clear;
2564	return unless $items;	2721	return unless $items;
2565		2722
2566	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2723	my @items = sort {
		2724	($a->{type} <=> $b->{type})
		2725	or ($a->{name} cmp $b->{name})
		2726	} @$items;
2567		2727
2568	$self->{real_items} = \@items;	2728	$self->{real_items} = \@items;
2569		2729
2570	for my $item (@items) {	2730	for my $item (@items) {
2571	my $desc = $item->{nrof} < 2	2731	$item->{item} = $item;
2572	? $item->{name}
2573	: "$item->{nrof} $item->{name_pl}";
2574
2575	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2732	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2733	$item->update_item ();
		2734	}
		2735
		2736	my $i = 0;
		2737	for (@items) {
		2738	$self->{scrolled}->add (0, $i, $_);
		2739	my $nrof = $_->{item}->{nrof} || 1;
		2740	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2576	}	2741	}
2577		2742
2578	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2743	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2579	}	2744	}
2580		2745
…		…
2655	}	2820	}
2656	}	2821	}
2657		2822
2658	#############################################################################	2823	#############################################################################
2659		2824
		2825	package CFClient::UI::Statusbox;
		2826
		2827	our @ISA = CFClient::UI::VBox::;
		2828
		2829	sub new {
		2830	my $class = shift;
		2831
		2832	$class->SUPER::new (
		2833	fontsize => 0.8,
		2834	@_,
		2835	)
		2836	}
		2837
		2838	sub reorder {
		2839	my ($self) = @_;
		2840	my $NOW = time;
		2841
		2842	while (my ($k, $v) = each %{ $self->{item} }) {
		2843	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2844	}
		2845
		2846	my @widgets;
		2847
		2848	my @items = sort {
		2849	$a->{pri} <=> $b->{pri}
		2850	or $b->{id} <=> $a->{id}
		2851	} values %{ $self->{item} };
		2852
		2853	my $count = 10 + 1;
		2854	for my $item (@items) {
		2855	last unless --$count;
		2856
		2857	push @widgets, $item->{label} ||= do {
		2858	# TODO: doesn't handle markup well (read as: at all)
		2859	my $short = $item->{count} > 1
		2860	? "<b>$item->{count} ×</b> $item->{text}"
		2861	: $item->{text};
		2862
		2863	for ($short) {
		2864	s/^\s+//;
		2865	s/\s+/ /g;
		2866	}
		2867
		2868	new CFClient::UI::Label
		2869	markup => $short,
		2870	tooltip => $item->{tooltip},
		2871	tooltip_font => $::FONT_PROP,
		2872	tooltip_width => 0.67,
		2873	fontsize => $item->{fontsize} || $self->{fontsize},
		2874	max_w => $::WIDTH * 0.44,
		2875	fg => $item->{fg},
		2876	can_events => 1,
		2877	can_hover => 1
		2878	};
		2879	}
		2880
		2881	$self->clear;
		2882	$self->SUPER::add (reverse @widgets);
		2883	}
		2884
		2885	sub add {
		2886	my ($self, $text, %arg) = @_;
		2887
		2888	$text =~ s/^\s+//;
		2889	$text =~ s/\s+$//;
		2890
		2891	my $timeout = time + ((delete $arg{timeout}) || 60);
		2892
		2893	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2894
		2895	if (my $item = $self->{item}{$group}) {
		2896	if ($item->{text} eq $text) {
		2897	$item->{count}++;
		2898	} else {
		2899	$item->{count} = 1;
		2900	$item->{text} = $item->{tooltip} = $text;
		2901	}
		2902	$item->{id} = ++$self->{id};
		2903	$item->{timeout} = $timeout;
		2904	delete $item->{label};
		2905	} else {
		2906	$self->{item}{$group} = {
		2907	id => ++$self->{id},
		2908	text => $text,
		2909	timeout => $timeout,
		2910	tooltip => $text,
		2911	fg => [0.8, 0.8, 0.8, 0.8],
		2912	pri => 0,
		2913	count => 1,
		2914	%arg,
		2915	};
		2916	}
		2917
		2918	$self->reorder;
		2919	}
		2920
		2921	sub reconfigure {
		2922	my ($self) = @_;
		2923
		2924	delete $_->{label}
		2925	for values %{ $self->{item} || {} };
		2926
		2927	$self->reorder;
		2928	$self->SUPER::reconfigure;
		2929	}
		2930
		2931	#############################################################################
		2932
2660	package CFClient::UI::Root;	2933	package CFClient::UI::Root;
2661		2934
2662	our @ISA = CFClient::UI::Container::;	2935	our @ISA = CFClient::UI::Container::;
2663		2936
2664	use CFClient::OpenGL;	2937	use CFClient::OpenGL;
…		…
2692	}	2965	}
2693		2966
2694	sub size_allocate {	2967	sub size_allocate {
2695	my ($self, $w, $h) = @_;	2968	my ($self, $w, $h) = @_;
2696		2969
2697	my $old_w = $self->{old_w};	2970	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2698	my $old_h = $self->{old_h};	2971	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2699		2972
2700	if ($old_w && $old_h) {	2973	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2701	for my $child ($self->children) {	2974	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2702	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710	}
2711	}
2712		2975
2713	for my $child ($self->children) {	2976	for my $child ($self->children) {
2714	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2977	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2715		2978
		2979	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2980	if exists $child->{req_x};
		2981
		2982	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2983	if exists $child->{req_y};
		2984
2716	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2985	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2717	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2986	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2987
2718	$child->configure ($X, $Y, $W, $H);	2988	$child->configure ($X, $Y, $W, $H);
2719	}	2989	}
2720
2721	$self->{old_w} = $w;
2722	$self->{old_h} = $h;
2723	}	2990	}
2724		2991
2725	sub coord2local {	2992	sub coord2local {
2726	my ($self, $x, $y) = @_;	2993	my ($self, $x, $y) = @_;
2727		2994
…		…
2740	$self->check_size;	3007	$self->check_size;
2741	$::WANT_REFRESH++;	3008	$::WANT_REFRESH++;
2742	}	3009	}
2743		3010
2744	sub add {	3011	sub add {
2745	my ($self, $child) = @_;	3012	my ($self, @children) = @_;
2746		3013
		3014	for my $child (@children) {
		3015	$child->{toplevel} = 1;
		3016
2747	# integerise window positions	3017	# integerise window positions
2748	$child->{x} = int $child->{x};	3018	$child->{x} = int $child->{x};
2749	$child->{y} = int $child->{y};	3019	$child->{y} = int $child->{y};
		3020	}
2750		3021
2751	$self->SUPER::add ($child);	3022	$self->SUPER::add (@children);
		3023
		3024	while (@children) {
		3025	my $w = pop @children;
		3026	push @children, $w->children;
		3027	$w->{visible} = 1;
		3028	}
		3029	}
		3030
		3031	sub remove {
		3032	my ($self, @children) = @_;
		3033
		3034	$self->SUPER::remove (@children);
		3035
		3036	while (@children) {
		3037	my $w = pop @children;
		3038	push @children, $w->children;
		3039	delete $w->{visible};
		3040	}
2752	}	3041	}
2753		3042
2754	sub on_refresh {	3043	sub on_refresh {
2755	my ($self, $id, $cb) = @_;	3044	my ($self, $id, $cb) = @_;
2756		3045
2757	$self->{refresh_hook}{$id} = $cb;	3046	$self->{refresh_hook}{$id} = $cb;
2758	}	3047	}
2759		3048
		3049	sub on_post_alloc {
		3050	my ($self, $id, $cb) = @_;
		3051
		3052	$self->{post_alloc_hook}{$id} = $cb;
		3053	}
		3054
2760	sub draw {	3055	sub draw {
2761	my ($self) = @_;	3056	my ($self) = @_;
		3057
		3058	while ($self->{refresh_hook}) {
		3059	$_->()
		3060	for values %{delete $self->{refresh_hook}};
		3061	}
2762		3062
2763	if ($self->{check_size}) {	3063	if ($self->{check_size}) {
2764	my @queue = ([], []);	3064	my @queue = ([], []);
2765		3065
2766	for (;;) {	3066	for (;;) {
…		…
2774		3074
2775	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3075	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776	? @$widget{qw(user_w user_h)}	3076	? @$widget{qw(user_w user_h)}
2777	: $widget->size_request;	3077	: $widget->size_request;
2778		3078
		3079	if (delete $widget->{force_alloc}
2779	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3080	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2780	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3081	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781		3082
2782	$widget->{req_w} = $w;	3083	$widget->{req_w} = $w;
2783	$widget->{req_h} = $h;	3084	$widget->{req_h} = $h;
2784		3085
2785	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3086	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2786		3087
2787	$widget->{parent}->check_size	3088	$widget->{parent}->check_size
2788	if $widget->{parent};	3089	if $widget->{parent};
2789	}	3090	}
2790	}	3091	}
…		…
2802	$widget->size_allocate ($w, $h);	3103	$widget->size_allocate ($w, $h);
2803	$widget->emit (size_allocate => $w, $h);	3104	$widget->emit (size_allocate => $w, $h);
2804	}	3105	}
2805	}	3106	}
2806		3107
2807	while ($self->{refresh_hook}) {	3108	while ($self->{post_alloc_hook}) {
2808	$_->()	3109	$_->()
2809	for values %{delete $self->{refresh_hook}};	3110	for values %{delete $self->{post_alloc_hook}};
2810	}	3111	}
2811		3112
2812	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3113	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3114	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814	glClear GL_COLOR_BUFFER_BIT;	3115	glClear GL_COLOR_BUFFER_BIT;
2815		3116
2816	glMatrixMode GL_PROJECTION;	3117	glMatrixMode GL_PROJECTION;
2817	glLoadIdentity;	3118	glLoadIdentity;
2818	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3119	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2819	glMatrixMode GL_MODELVIEW;	3120	glMatrixMode GL_MODELVIEW;
2820	glLoadIdentity;	3121	glLoadIdentity;
2821		3122
2822	$self->_draw;	3123	$self->_draw;
2823	}	3124	}
…		…
2825	#############################################################################	3126	#############################################################################
2826		3127
2827	package CFClient::UI;	3128	package CFClient::UI;
2828		3129
2829	$ROOT = new CFClient::UI::Root;	3130	$ROOT = new CFClient::UI::Root;
2830	$TOOLTIP = new CFClient::UI::Tooltip;	3131	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2831		3132
2832	1	3133	1
2833		3134

Diff Legend

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