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.331 by root, Sun Jul 23 04:46:02 2006 UTC vs.
Revision 1.383 by root, Fri Jul 20 16:32:04 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
96		99
97	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	101	my ($ev) = @_;
99	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
100		103
101	unless ($BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
102	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
103		108
104	$GRAB = $widget;	109	$GRAB = $widget;
105	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
106		111
107	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
108	}	113	}
109
110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;	118	$ev->{dx} = 0;
…		…
207	reconfigure_widgets;	210	reconfigure_widgets;
208	}	211	}
209		212
210	#############################################################################	213	#############################################################################
211		214
212	package CFClient::UI::Event;	215	package CFPlus::UI::Event;
213		216
214	sub xy {	217	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	219	}
217		220
218	#############################################################################	221	#############################################################################
219		222
220	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
221		224
222	use strict;	225	use strict;
223		226
224	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
225		228
226	sub new {	229	sub new {
227	my $class = shift;	230	my $class = shift;
228		231
229	my $self = bless {	232	my $self = bless {
…		…
234	h => undef,	237	h => undef,
235	can_events => 1,	238	can_events => 1,
236	@_	239	@_
237	}, $class;	240	}, $class;
238		241
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		243
241	for (keys %$self) {	244	for (keys %$self) {
242	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
244	}	247	}
245	}	248	}
246		249
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		255
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		258
256	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
261		264
262	sub destroy {	265	sub destroy {
263	my ($self) = @_;	266	my ($self) = @_;
264		267
265	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
266	%$self = ();	270	%$self = ();
267	}	271	}
268		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
269	sub show {	277	sub show {
270	my ($self) = @_;	278	my ($self) = @_;
271		279
272	return if $self->{parent};	280	return if $self->{parent};
273		281
274	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
275	}	283	}
276		284
277	sub set_visible {	285	sub set_visible {
278	my ($self) = @_;	286	my ($self) = @_;
279		287
…		…
300	delete $self->{root};	308	delete $self->{root};
301		309
302	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
304		312
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
307		315
308	$self->emit ("focus_out");	316	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
310	}	318	}
…		…
312	sub set_visibility {	320	sub set_visibility {
313	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
314		322
315	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
316		324
317	$visible ? $self->hide	325	$visible ? $self->show
318	: $self->show;	326	: $self->hide;
319	}	327	}
320		328
321	sub toggle_visibility {	329	sub toggle_visibility {
322	my ($self) = @_;	330	my ($self) = @_;
323		331
…		…
367	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
368		376
369	if ($self->{aspect}) {	377	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
371		379
372	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		382
375	# use alignment to adjust x, y	383	# use alignment to adjust x, y
376		384
377	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
419		427
420	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
421		429
422	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
423		431
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	435	}
428	}	436	}
429		437
430	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
431	sub coord2local {	439	sub coord2local {
…		…
437	}	445	}
438		446
439	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
440	sub coord2global {	448	sub coord2global {
441	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
		450
		451	Carp::confess unless $self->{parent};#d#
442		452
443	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
444	}	454	}
445		455
446	sub invoke_focus_in {	456	sub invoke_focus_in {
…		…
494		504
495	sub connect {	505	sub connect {
496	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
497		507
498	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
		509
		510	defined wantarray and CFPlus::guard {
		511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		512	@{ $self->{signal_cb}{$signal} };
		513	}
		514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
499	}	520	}
500		521
501	my %has_coords = (	522	my %has_coords = (
502	button_down => 1,	523	button_down => 1,
503	button_up => 1,	524	button_up => 1,
…		…
506	);	527	);
507		528
508	sub emit {	529	sub emit {
509	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
510		531
		532	# I do not really like this solution, but I do not like duplication
		533	# and needlessly verbose code, either.
511	my @append	534	my @append
512	= $has_coords{$signal}	535	= $has_coords{$signal}
513	? $args[0]->xy ($self)	536	? $args[0]->xy ($self)
514	: ();	537	: ();
515		538
516	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517		540
518	#d##TODO# stop propagating at first true, do not use sum	541	for my $cb (
519	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	542	@{$self->{signal_cb}{$signal} || []}, # before
520	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
521	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
522	}	550	}
523		551
524	sub find_widget {	552	sub find_widget {
525	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
526		554
…		…
534	}	562	}
535		563
536	sub set_parent {	564	sub set_parent {
537	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
538		566
539	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
540	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
541	}	569	}
542		570
543	sub realloc {	571	sub realloc {
544	my ($self) = @_;	572	my ($self) = @_;
…		…
610	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
611	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
612	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
613	glEnd;	641	glEnd;
614	glPopMatrix;	642	glPopMatrix;
615	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
616	}	644	}
617		645
618	$self->_draw;	646	$self->_draw;
619	glPopMatrix;	647	glPopMatrix;
620	}	648	}
…		…
623	my ($self) = @_;	651	my ($self) = @_;
624		652
625	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
626	}	654	}
627		655
		656	my $cntx;#d#
628	sub DESTROY {	657	sub DESTROY {
629	my ($self) = @_;	658	my ($self) = @_;
630		659
631	return if CFClient::in_destruct;	660	return if CFPlus::in_destruct;
632
633	delete $WIDGET{$self+0};
634		661
635	eval { $self->destroy };	662	eval { $self->destroy };
636	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
		665	delete $WIDGET{$self+0};
637	}	666	}
638		667
639	#############################################################################	668	#############################################################################
640		669
641	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
642		671
643	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
644		673
645	use strict;	674	use strict;
646	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
647		676
648	sub new {	677	sub new {
649	my $class = shift;	678	my $class = shift;
650		679
651	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
682	}	711	}
683	}	712	}
684		713
685	#############################################################################	714	#############################################################################
686		715
687	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
688		717
689	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
690		719
691	sub new {	720	sub new {
692	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
693	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
694	}	723	}
…		…
701		730
702	sub draw { }	731	sub draw { }
703		732
704	#############################################################################	733	#############################################################################
705		734
706	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
707		736
708	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
709		738
710	sub new {	739	sub new {
711	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
712		741
713	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
722	if $children;	751	if $children;
723		752
724	$self	753	$self
725	}	754	}
726		755
		756	sub realloc {
		757	my ($self) = @_;
		758
		759	$self->{force_realloc} = 1;
		760	$self->{force_size_alloc} = 1;
		761	$self->SUPER::realloc;
		762	}
		763
727	sub add {	764	sub add {
728	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
729		766
730	$_->set_parent ($self)	767	$_->set_parent ($self)
731	for @widgets;	768	for @widgets;
…		…
791	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
792	}	829	}
793		830
794	#############################################################################	831	#############################################################################
795		832
796	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
797		834
798	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
799		836
800	sub new {	837	sub new {
801	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
802		839
803	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
804		841
805	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
806	}	843	}
807		844
808	sub add {	845	sub add {
…		…
815	sub remove {	852	sub remove {
816	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
817		854
818	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
819		856
820	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
821	unless @{$self->{children}};	858	unless @{$self->{children}};
822	}	859	}
823		860
824	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
825		862
…		…
837		874
838	#############################################################################	875	#############################################################################
839		876
840	# back-buffered drawing area	877	# back-buffered drawing area
841		878
842	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
843		880
844	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
845		882
846	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
847		884
848	sub new {	885	sub new {
849	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
850		887
851	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
873	}	910	}
874		911
875	sub render_child {	912	sub render_child {
876	my ($self) = @_;	913	my ($self) = @_;
877		914
878	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	915	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
879	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
880	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
881		918
882	{	919	{
883	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
884		921
885	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
886	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
887	}	926	}
888
889	$self->_render;
890	};	927	};
891	}	928	}
892		929
893	sub _draw {	930	sub _draw {
894	my ($self) = @_;	931	my ($self) = @_;
895
896	my ($w, $h) = @$self{qw(w h)};
897		932
898	my $tex = $self->{texture}	933	my $tex = $self->{texture}
899	or return;	934	or return;
900		935
901	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
902	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
903	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
904		939
905	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
906		941
907	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
908	}	943	}
909		944
910	#############################################################################	945	#############################################################################
911		946
912	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
913		948
		949	use List::Util qw(min max);
		950
914	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
915		952
916	sub new {	953	sub new {
917	my $class = shift;	954	my $class = shift;
918		955
919	$class->SUPER::new (	956	$class->SUPER::new (
…		…
949	}	986	}
950		987
951	sub set_offset {	988	sub set_offset {
952	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
953		990
		991	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		992	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		993
		994	if ($x != $self->{view_x} or $y != $self->{view_y}) {
954	$self->{view_x} = int $x;	995	$self->{view_x} = $x;
955	$self->{view_y} = int $y;	996	$self->{view_y} = $y;
956		997
		998	$self->emit (changed => $x, $y);
957	$self->update;	999	$self->update;
		1000	}
958	}	1001	}
959		1002
960	# hmm, this does not work for topleft of $self... but we should not ask for that	1003	# hmm, this does not work for topleft of $self... but we should not ask for that
961	sub coord2local {	1004	sub coord2local {
962	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
…		…
979	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1022	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
980	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1023	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
981	) {	1024	) {
982	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1025	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
983	} else {	1026	} else {
984	$self->CFClient::UI::Base::find_widget ($x, $y)	1027	$self->CFPlus::UI::Base::find_widget ($x, $y)
985	}	1028	}
986	}	1029	}
987		1030
988	sub _render {	1031	sub _render {
989	my ($self) = @_;	1032	my ($self) = @_;
990		1033
991	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1034	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
992	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1035	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
993		1036
994	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1037	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
995		1038
996	$self->SUPER::_render;	1039	$self->SUPER::_render;
997	}	1040	}
998		1041
999	#############################################################################	1042	#############################################################################
1000		1043
1001	package CFClient::UI::ScrolledWindow;	1044	package CFPlus::UI::ScrolledWindow;
1002		1045
1003	our @ISA = CFClient::UI::HBox::;	1046	our @ISA = CFPlus::UI::Table::;
1004		1047
1005	sub new {	1048	sub new {
1006	my ($class, %arg) = @_;	1049	my ($class, %arg) = @_;
1007		1050
1008	my $child = delete $arg{child};	1051	my $child = delete $arg{child};
1009		1052
1010	my $self;	1053	my $self;
1011		1054
1012	my $slider = new CFClient::UI::Slider	1055	my $hslider = new CFPlus::UI::Slider
		1056	vertical => 0,
		1057	range => [0, 0, 1, 0.01], # HACK fix
		1058	on_changed => sub {
		1059	$self->{hpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1061	},
		1062	;
		1063
		1064	my $vslider = new CFPlus::UI::Slider
1013	vertical => 1,	1065	vertical => 1,
1014	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
1015	on_changed => sub {	1067	on_changed => sub {
1016	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1017	},	1070	},
1018	;	1071	;
1019		1072
1020	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
1021	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
1022	can_events => 1,	1076	can_events => 1,
1023	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
1024	%arg,	1081	%arg,
1025	);	1082	);
1026		1083
1027	$self->SUPER::add ($self->{vp}, $self->{slider});	1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	expand => 1,
		1086	scroll_x => $self->{scroll_x},
		1087	scroll_y => $self->{scroll_y},
		1088	on_changed => sub {
		1089	my ($vp, $x, $y) = @_;
		1090
		1091	$vp->{parent}{hslider}->set_value ($x);
		1092	$vp->{parent}{vslider}->set_value ($y);
		1093
		1094	0
		1095	},
		1096	;
		1097
		1098	$self->SUPER::add_at (0, 0, $self->{vp});
		1099
1028	$self->add ($child) if $child;	1100	$self->add ($child) if $child;
1029		1101
1030	$self	1102	$self
1031	}	1103	}
1032		1104
…		…
1036	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
1037		1109
1038	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
1039	}	1111	}
1040		1112
		1113	sub update_slider {
		1114	my ($self) = @_;
		1115
		1116	my $child = ($self->{vp} or return)->child;
		1117
		1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1120
		1121	my $visible = $w1 > $w2;
		1122	if ($visible != $self->{hslider}{visible}) {
		1123	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1124	: $self->{hslider}->hide;
		1125	}
		1126
		1127	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1128	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1129
		1130	my $visible = $h1 > $h2;
		1131	if ($visible != $self->{vslider}{visible}) {
		1132	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1133	: $self->{vslider}->hide;
		1134	}
		1135	}
		1136
		1137	sub update {
		1138	my ($self) = @_;
		1139
		1140	$self->SUPER::update;
		1141	$self->update_slider;
		1142	}
		1143
1041	sub invoke_mouse_wheel {	1144	sub invoke_mouse_wheel {
1042	my ($self, $ev) = @_;	1145	my ($self, $ev) = @_;
1043		1146
1044	return 0 unless $ev->{dy}; # only vertical movements	1147	return 0 unless $ev->{dy}; # only vertical movements for now
1045		1148
1046	$self->{slider}->emit (mouse_wheel => $ev);	1149	$self->{vslider}->emit (mouse_wheel => $ev);
1047		1150
1048	1	1151	1
1049	}	1152	}
1050		1153
1051	sub update_slider {	1154	sub invoke_button_down {
1052	my ($self) = @_;	1155	my ($self, $ev, $x, $y) = @_;
1053		1156
1054	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1157	if ($ev->{button} == 2) {
1055	}	1158	$self->grab_focus;
1056		1159
1057	sub update {	1160	my $ox = $self->{vp}{view_x} + $ev->{x};
1058	my ($self) = @_;	1161	my $oy = $self->{vp}{view_y} + $ev->{y};
		1162
		1163	$self->{motion} = sub {
		1164	my ($ev, $x, $y) = @_;
1059		1165
1060	$self->SUPER::update;	1166	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1167	$self->update;
		1168	};
1061		1169
1062	$self->update_slider;	1170	return 1;
		1171	}
		1172
		1173	0
		1174	}
		1175
		1176	sub invoke_button_up {
		1177	my ($self, $ev, $x, $y) = @_;
		1178
		1179	if (delete $self->{motion}) {
		1180	return 1;
		1181	}
		1182
		1183	0
		1184	}
		1185
		1186	sub invoke_mouse_motion {
		1187	my ($self, $ev, $x, $y) = @_;
		1188
		1189	if ($self->{motion}) {
		1190	$self->{motion}->($ev, $x, $y);
		1191	return 1;
		1192	}
		1193
		1194	0
1063	}	1195	}
1064		1196
1065	sub invoke_size_allocate {	1197	sub invoke_size_allocate {
1066	my ($self, $w, $h) = @_;	1198	my ($self, $w, $h) = @_;
1067		1199
1068	$self->update_slider;	1200	$self->update_slider;
1069
1070	$self->SUPER::invoke_size_allocate ($w, $h)	1201	$self->SUPER::invoke_size_allocate ($w, $h)
1071	}	1202	}
1072		1203
1073	#############################################################################	1204	#############################################################################
1074		1205
1075	package CFClient::UI::Frame;	1206	package CFPlus::UI::Frame;
1076		1207
1077	our @ISA = CFClient::UI::Bin::;	1208	our @ISA = CFPlus::UI::Bin::;
1078		1209
1079	use CFClient::OpenGL;	1210	use CFPlus::OpenGL;
1080		1211
1081	sub new {	1212	sub new {
1082	my $class = shift;	1213	my $class = shift;
1083		1214
1084	$class->SUPER::new (	1215	$class->SUPER::new (
…		…
1110	$self->SUPER::_draw;	1241	$self->SUPER::_draw;
1111	}	1242	}
1112		1243
1113	#############################################################################	1244	#############################################################################
1114		1245
1115	package CFClient::UI::FancyFrame;	1246	package CFPlus::UI::FancyFrame;
1116		1247
1117	our @ISA = CFClient::UI::Bin::;	1248	our @ISA = CFPlus::UI::Bin::;
1118		1249
1119	use CFClient::OpenGL;	1250	use CFPlus::OpenGL;
		1251
		1252	sub new {
		1253	my ($class, %arg) = @_;
		1254
		1255	if ((exists $arg{label}) && !ref $arg{label}) {
		1256	$arg{label} = new CFPlus::UI::Label
		1257	align => 1,
		1258	valign => 0,
		1259	text => $arg{label},
		1260	fontsize => ($arg{border} || 0.8) * 0.75;
		1261	}
		1262
		1263	my $self = $class->SUPER::new (
		1264	# label => "",
		1265	fg => [0.6, 0.3, 0.1],
		1266	border => 0.8,
		1267	style => 'single',
		1268	%arg,
		1269	);
		1270
		1271	$self
		1272	}
		1273
		1274	sub add {
		1275	my ($self, @widgets) = @_;
		1276
		1277	$self->SUPER::add (@widgets);
		1278	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1279	}
		1280
		1281	sub border {
		1282	int $_[0]{border} * $::FONTSIZE
		1283	}
		1284
		1285	sub size_request {
		1286	my ($self) = @_;
		1287
		1288	($self->{label_w}, undef) = $self->{label}->size_request
		1289	if $self->{label};
		1290
		1291	my ($w, $h) = $self->SUPER::size_request;
		1292
		1293	(
		1294	$w + $self->border * 2,
		1295	$h + $self->border * 2,
		1296	)
		1297	}
		1298
		1299	sub invoke_size_allocate {
		1300	my ($self, $w, $h) = @_;
		1301
		1302	my $border = $self->border;
		1303
		1304	$w -= List::Util::max 0, $border * 2;
		1305	$h -= List::Util::max 0, $border * 2;
		1306
		1307	if (my $label = $self->{label}) {
		1308	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1309	$label->{h} = List::Util::min $h, $border;
		1310	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1311	}
		1312
		1313	$self->child->configure ($border, $border, $w, $h);
		1314
		1315	1
		1316	}
		1317
		1318	sub _draw {
		1319	my ($self) = @_;
		1320
		1321	my $child = $self->{children}[0];
		1322
		1323	my $border = $self->border;
		1324	my ($w, $h) = ($self->{w}, $self->{h});
		1325
		1326	$child->draw;
		1327
		1328	glColor @{$self->{fg}};
		1329	glBegin GL_LINE_STRIP;
		1330	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1331	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1333	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1334	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1335	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1336	glEnd;
		1337
		1338	if ($self->{label}) {
		1339	glTranslate $border * 2, 0;
		1340	$self->{label}->_draw;
		1341	}
		1342	}
		1343
		1344	#############################################################################
		1345
		1346	package CFPlus::UI::Toplevel;
		1347
		1348	our @ISA = CFPlus::UI::Bin::;
		1349
		1350	use CFPlus::OpenGL;
1120		1351
1121	my $bg =	1352	my $bg =
1122	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1353	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1123	mipmap => 1, wrap => 1;	1354	mipmap => 1, wrap => 1;
1124		1355
1125	my @border =	1356	my @border =
1126	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1127	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1358	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1359
		1360	my @icon =
		1361	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1362	qw(x1_move.png x1_resize.png);
1128		1363
1129	sub new {	1364	sub new {
1130	my ($class, %arg) = @_;	1365	my ($class, %arg) = @_;
1131		1366
1132	my $self = $class->SUPER::new (	1367	my $self = $class->SUPER::new (
…		…
1137	min_w => 64,	1372	min_w => 64,
1138	min_h => 32,	1373	min_h => 32,
1139	%arg,	1374	%arg,
1140	);	1375	);
1141		1376
1142	$self->{title_widget} = new CFClient::UI::Label	1377	$self->{title_widget} = new CFPlus::UI::Label
1143	align => 0,	1378	align => 0,
1144	valign => 1,	1379	valign => 1,
1145	text => $self->{title},	1380	text => $self->{title},
1146	fontsize => $self->{border},	1381	fontsize => $self->{border},
1147	if exists $self->{title};	1382	if exists $self->{title};
1148		1383
1149	if ($self->{has_close_button}) {	1384	if ($self->{has_close_button}) {
1150	$self->{close_button} =	1385	$self->{close_button} =
1151	new CFClient::UI::ImageButton	1386	new CFPlus::UI::ImageButton
1152	path => 'x1_close.png',	1387	path => 'x1_close.png',
1153	on_activate => sub { $self->emit ("delete") };	1388	on_activate => sub { $self->emit ("delete") };
1154		1389
1155	$self->CFClient::UI::Container::add ($self->{close_button});	1390	$self->CFPlus::UI::Container::add ($self->{close_button});
1156	}	1391	}
1157		1392
1158	$self	1393	$self
1159	}	1394	}
1160		1395
1161	sub add {	1396	sub add {
1162	my ($self, @widgets) = @_;	1397	my ($self, @widgets) = @_;
1163		1398
1164	$self->SUPER::add (@widgets);	1399	$self->SUPER::add (@widgets);
1165	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1400	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1166	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1401	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1167	}	1402	}
1168		1403
1169	sub border {	1404	sub border {
1170	int $_[0]{border} * $::FONTSIZE	1405	int $_[0]{border} * $::FONTSIZE
1171	}	1406	}
…		…
1279	$self->{motion}->($ev, $x, $y) if $self->{motion};	1514	$self->{motion}->($ev, $x, $y) if $self->{motion};
1280		1515
1281	! ! $self->{motion}	1516	! ! $self->{motion}
1282	}	1517	}
1283		1518
		1519	sub invoke_visibility_change {
		1520	my ($self, $visible) = @_;
		1521
		1522	delete $self->{motion} unless $visible;
		1523
		1524	0
		1525	}
		1526
1284	sub _draw {	1527	sub _draw {
1285	my ($self) = @_;	1528	my ($self) = @_;
1286		1529
1287	my $child = $self->{children}[0];	1530	my $child = $self->{children}[0];
1288		1531
…		…
1293	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1536	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1294		1537
1295	my $border = $self->border;	1538	my $border = $self->border;
1296		1539
1297	glColor @{ $self->{border_bg} };	1540	glColor @{ $self->{border_bg} };
1298	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1541	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1299	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1542	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1300	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1543	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1301	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1544	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1545
		1546	# move
		1547	my $w2 = ($w - $border) * .5;
		1548	my $h2 = ($h - $border) * .5;
		1549	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1550	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1551	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1552
		1553	# resize
		1554	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1556	unless $self->{has_close_button};
		1557	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1558	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1302		1559
1303	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1560	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1304	glColor @{ $self->{bg} };	1561	glColor @{ $self->{bg} };
1305		1562
1306	# TODO: repeat texture not scale	1563	# TODO: repeat texture not scale
…		…
1325	if $self->{close_button};	1582	if $self->{close_button};
1326	}	1583	}
1327		1584
1328	#############################################################################	1585	#############################################################################
1329		1586
1330	package CFClient::UI::Table;	1587	package CFPlus::UI::Table;
1331		1588
1332	our @ISA = CFClient::UI::Base::;	1589	our @ISA = CFPlus::UI::Base::;
1333		1590
1334	use List::Util qw(max sum);	1591	use List::Util qw(max sum);
1335		1592
1336	use CFClient::OpenGL;	1593	use CFPlus::OpenGL;
1337		1594
1338	sub new {	1595	sub new {
1339	my $class = shift;	1596	my $class = shift;
1340		1597
1341	$class->SUPER::new (	1598	$class->SUPER::new (
		1599	children => [],
1342	col_expand => [],	1600	col_expand => [],
		1601	row_expand => [],
1343	@_,	1602	@_,
1344	)	1603	)
1345	}	1604	}
1346		1605
1347	sub children {	1606	sub children {
1348	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1607	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1349	}	1608	}
1350		1609
		1610	# TODO: store row/col info in child widget and use standard add/del
1351	sub add {	1611	sub add {
1352	my ($self, $x, $y, $child) = @_;	1612	my $self = shift;
1353		1613
		1614	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1615	$self->add_at (@_);
		1616	}
		1617
		1618	sub add_at {
		1619	my $self = shift;
		1620
		1621	while (@_) {
		1622	my ($col, $row, $child) = splice @_, 0, 3, ();
		1623
1354	$child->set_parent ($self);	1624	$child->set_parent ($self);
1355	$self->{children}[$y][$x] = $child;	1625	$self->{children}[$row][$col] = $child;
		1626	}
1356		1627
		1628	$self->{force_realloc} = 1;
		1629	$self->{force_size_alloc} = 1;
1357	$self->realloc;	1630	$self->realloc;
1358	}	1631	}
1359		1632
1360	sub remove {	1633	sub remove {
1361	my ($self, $child) = @_;	1634	my ($self, $child) = @_;
1362		1635
1363	# TODO: not yet implemented	1636	for (@{ $self->{children} }) {
		1637	for (@{ $_ || [] }) {
		1638	$_ = undef if $_ == $child;
		1639	}
		1640	}
1364	}	1641	}
1365		1642
1366	# TODO: move to container class maybe? send children a signal on removal?	1643	# TODO: move to container class maybe? send children a signal on removal?
1367	sub clear {	1644	sub clear {
1368	my ($self) = @_;	1645	my ($self) = @_;
…		…
1417	my ($ws, $hs) = $self->get_wh;	1694	my ($ws, $hs) = $self->get_wh;
1418		1695
1419	my $req_w = (sum @$ws) || 1;	1696	my $req_w = (sum @$ws) || 1;
1420	my $req_h = (sum @$hs) || 1;	1697	my $req_h = (sum @$hs) || 1;
1421		1698
1422	# TODO: nicer code && do row_expand	1699	# TODO: nicer code
1423	my @col_expand = @{$self->{col_expand}};	1700	my @col_expand = @{$self->{col_expand}};
1424	@col_expand = (1) x @$ws unless @col_expand;	1701	@col_expand = (1) x @$ws unless @col_expand;
1425	my $col_expand = (sum @col_expand) || 1;	1702	my $col_expand = (sum @col_expand) || 1;
1426		1703
1427	# linearly scale sizes
1428	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1704	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1429	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1430		1705
1431	CFClient::UI::harmonize $ws;	1706	CFPlus::UI::harmonize $ws;
		1707
		1708	my @row_expand = @{$self->{row_expand}};
		1709	@row_expand = (1) x @$ws unless @row_expand;
		1710	my $row_expand = (sum @row_expand) || 1;
		1711
		1712	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1713
1432	CFClient::UI::harmonize $hs;	1714	CFPlus::UI::harmonize $hs;
1433		1715
1434	my $y;	1716	my $y;
1435		1717
1436	for my $r (0 .. $#{$self->{children}}) {	1718	for my $r (0 .. $#{$self->{children}}) {
1437	my $row = $self->{children}[$r]	1719	my $row = $self->{children}[$r]
…		…
1480	}	1762	}
1481	}	1763	}
1482		1764
1483	#############################################################################	1765	#############################################################################
1484		1766
1485	package CFClient::UI::Box;	1767	package CFPlus::UI::Fixed;
1486		1768
		1769	use List::Util qw(min max);
		1770
1487	our @ISA = CFClient::UI::Container::;	1771	our @ISA = CFPlus::UI::Container::;
		1772
		1773	sub add {
		1774	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1775
		1776	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1777	$self->SUPER::add ($child);
		1778	}
		1779
		1780	sub _scale($$$) {
		1781	my ($mode, $val, $max) = @_;
		1782
		1783	$mode eq "abs" ? $val
		1784	: $mode eq "rel" ? $val * $max
		1785	: 0
		1786	}
		1787
		1788	sub size_request {
		1789	my ($self) = @_;
		1790
		1791	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1792
		1793	# determine overall size by querying abs widgets
		1794	for my $child ($self->visible_children) {
		1795	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1796
		1797	if ($pos eq "abs") {
		1798	$w = _scale $size, $w, $child->{req_w};
		1799	$h = _scale $size, $h, $child->{req_h};
		1800
		1801	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1802	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1803	}
		1804	}
		1805
		1806	my $W = $x2 - $x1;
		1807	my $H = $y2 - $y1;
		1808
		1809	# now layout remaining widgets
		1810	for my $child ($self->visible_children) {
		1811	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1812
		1813	if ($pos ne "abs") {
		1814	$x = _scale $pos, $x, $W;
		1815	$y = _scale $pos, $x, $H;
		1816	$w = _scale $size, $w, $child->{req_w};
		1817	$h = _scale $size, $h, $child->{req_h};
		1818
		1819	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1820	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1821	}
		1822	}
		1823
		1824	my $W = $x2 - $x1;
		1825	my $H = $y2 - $y1;
		1826
		1827	($W, $H)
		1828	}
		1829
		1830	sub invoke_size_allocate {
		1831	my ($self, $W, $H) = @_;
		1832
		1833	for my $child ($self->visible_children) {
		1834	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1835
		1836	$x = _scale $pos, $x, $W;
		1837	$y = _scale $pos, $x, $H;
		1838	$w = _scale $size, $w, $child->{req_w};
		1839	$h = _scale $size, $h, $child->{req_h};
		1840
		1841	$child->configure ($x, $y, $w, $h);
		1842	}
		1843
		1844	1
		1845	}
		1846
		1847	#############################################################################
		1848
		1849	package CFPlus::UI::Box;
		1850
		1851	our @ISA = CFPlus::UI::Container::;
1488		1852
1489	sub size_request {	1853	sub size_request {
1490	my ($self) = @_;	1854	my ($self) = @_;
1491		1855
1492	$self->{vertical}	1856	$self->{vertical}
…		…
1525	$req[$_] += $space * $children[$_]{expand}	1889	$req[$_] += $space * $children[$_]{expand}
1526	for 0 .. $#children;	1890	for 0 .. $#children;
1527	}	1891	}
1528	}	1892	}
1529		1893
1530	CFClient::UI::harmonize \@req;	1894	CFPlus::UI::harmonize \@req;
1531		1895
1532	my $pos = 0;	1896	my $pos = 0;
1533	for (0 .. $#children) {	1897	for (0 .. $#children) {
1534	my $alloc = $req[$_];	1898	my $alloc = $req[$_];
1535	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1899	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1540	1	1904	1
1541	}	1905	}
1542		1906
1543	#############################################################################	1907	#############################################################################
1544		1908
1545	package CFClient::UI::HBox;	1909	package CFPlus::UI::HBox;
1546		1910
1547	our @ISA = CFClient::UI::Box::;	1911	our @ISA = CFPlus::UI::Box::;
1548		1912
1549	sub new {	1913	sub new {
1550	my $class = shift;	1914	my $class = shift;
1551		1915
1552	$class->SUPER::new (	1916	$class->SUPER::new (
…		…
1555	)	1919	)
1556	}	1920	}
1557		1921
1558	#############################################################################	1922	#############################################################################
1559		1923
1560	package CFClient::UI::VBox;	1924	package CFPlus::UI::VBox;
1561		1925
1562	our @ISA = CFClient::UI::Box::;	1926	our @ISA = CFPlus::UI::Box::;
1563		1927
1564	sub new {	1928	sub new {
1565	my $class = shift;	1929	my $class = shift;
1566		1930
1567	$class->SUPER::new (	1931	$class->SUPER::new (
…		…
1570	)	1934	)
1571	}	1935	}
1572		1936
1573	#############################################################################	1937	#############################################################################
1574		1938
1575	package CFClient::UI::Label;	1939	package CFPlus::UI::Label;
1576		1940
1577	our @ISA = CFClient::UI::DrawBG::;	1941	our @ISA = CFPlus::UI::DrawBG::;
1578		1942
1579	use CFClient::OpenGL;	1943	use CFPlus::OpenGL;
1580		1944
1581	sub new {	1945	sub new {
1582	my ($class, %arg) = @_;	1946	my ($class, %arg) = @_;
1583		1947
1584	my $self = $class->SUPER::new (	1948	my $self = $class->SUPER::new (
…		…
1587	#active_bg => none	1951	#active_bg => none
1588	#font => default_font	1952	#font => default_font
1589	#text => initial text	1953	#text => initial text
1590	#markup => initial narkup	1954	#markup => initial narkup
1591	#max_w => maximum pixel width	1955	#max_w => maximum pixel width
		1956	#style => 0, # render flags
1592	ellipsise => 3, # end	1957	ellipsise => 3, # end
1593	layout => (new CFClient::Layout),	1958	layout => (new CFPlus::Layout),
1594	fontsize => 1,	1959	fontsize => 1,
1595	align => -1,	1960	align => -1,
1596	valign => -1,	1961	valign => -1,
1597	padding_x => 2,	1962	padding_x => 2,
1598	padding_y => 2,	1963	padding_y => 2,
1599	can_events => 0,	1964	can_events => 0,
1600	%arg	1965	%arg
1601	);	1966	);
1602		1967
1603	if (exists $self->{template}) {	1968	if (exists $self->{template}) {
1604	my $layout = new CFClient::Layout;	1969	my $layout = new CFPlus::Layout;
1605	$layout->set_text (delete $self->{template});	1970	$layout->set_text (delete $self->{template});
1606	$self->{template} = $layout;	1971	$self->{template} = $layout;
1607	}	1972	}
1608		1973
1609	if (exists $self->{markup}) {	1974	if (exists $self->{markup}) {
…		…
1611	} else {	1976	} else {
1612	$self->set_text (delete $self->{text});	1977	$self->set_text (delete $self->{text});
1613	}	1978	}
1614		1979
1615	$self	1980	$self
1616	}
1617
1618	sub escape($) {
1619	local $_ = $_[0];
1620
1621	s/&/&amp;/g;
1622	s/>/&gt;/g;
1623	s/</&lt;/g;
1624
1625	$_
1626	}	1981	}
1627		1982
1628	sub update {	1983	sub update {
1629	my ($self) = @_;	1984	my ($self) = @_;
1630		1985
…		…
1757	};	2112	};
1758		2113
1759	my $w = List::Util::min $self->{w} + 4, $size->[0];	2114	my $w = List::Util::min $self->{w} + 4, $size->[0];
1760	my $h = List::Util::min $self->{h} + 2, $size->[1];	2115	my $h = List::Util::min $self->{h} + 2, $size->[1];
1761		2116
1762	$self->{layout}->render ($self->{ox}, $self->{oy});	2117	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1763	}	2118	}
1764		2119
1765	#############################################################################	2120	#############################################################################
1766		2121
1767	package CFClient::UI::EntryBase;	2122	package CFPlus::UI::EntryBase;
1768		2123
1769	our @ISA = CFClient::UI::Label::;	2124	our @ISA = CFPlus::UI::Label::;
1770		2125
1771	use CFClient::OpenGL;	2126	use CFPlus::OpenGL;
1772		2127
1773	sub new {	2128	sub new {
1774	my $class = shift;	2129	my $class = shift;
1775		2130
1776	$class->SUPER::new (	2131	$class->SUPER::new (
…		…
1780	active_fg => [0, 0, 0],	2135	active_fg => [0, 0, 0],
1781	can_hover => 1,	2136	can_hover => 1,
1782	can_focus => 1,	2137	can_focus => 1,
1783	valign => 0,	2138	valign => 0,
1784	can_events => 1,	2139	can_events => 1,
		2140	ellipsise => 0,
1785	#text => ...	2141	#text => ...
1786	#hidden => "*",	2142	#hidden => "*",
1787	@_	2143	@_
1788	)	2144	)
1789	}	2145	}
…		…
1834	my $sym = $ev->{sym};	2190	my $sym = $ev->{sym};
1835	my $uni = $ev->{unicode};	2191	my $uni = $ev->{unicode};
1836		2192
1837	my $text = $self->get_text;	2193	my $text = $self->get_text;
1838		2194
		2195	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2196
1839	if ($uni == 8) {	2197	if ($uni == 8) {
1840	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2198	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1841	} elsif ($uni == 127) {	2199	} elsif ($uni == 127) {
1842	substr $text, $self->{cursor}, 1, "";	2200	substr $text, $self->{cursor}, 1, "";
1843	} elsif ($sym == CFClient::SDLK_LEFT) {	2201	} elsif ($sym == CFPlus::SDLK_LEFT) {
1844	--$self->{cursor} if $self->{cursor};	2202	--$self->{cursor} if $self->{cursor};
1845	} elsif ($sym == CFClient::SDLK_RIGHT) {	2203	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1846	++$self->{cursor} if $self->{cursor} < length $self->{text};	2204	++$self->{cursor} if $self->{cursor} < length $self->{text};
1847	} elsif ($sym == CFClient::SDLK_HOME) {	2205	} elsif ($sym == CFPlus::SDLK_HOME) {
		2206	# what a hack
		2207	$self->{cursor} =
		2208	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2209	? length $1
		2210	: 0;
		2211	} elsif ($sym == CFPlus::SDLK_END) {
		2212	# uh, again
		2213	$self->{cursor} =
		2214	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2215	? $self->{cursor} + length $1
		2216	: length $self->{text};
		2217	} elsif ($uni == 21) { # ctrl-u
		2218	$text = "";
1848	$self->{cursor} = 0;	2219	$self->{cursor} = 0;
1849	} elsif ($sym == CFClient::SDLK_END) {
1850	$self->{cursor} = length $text;
1851	} elsif ($uni == 27) {	2220	} elsif ($uni == 27) {
1852	$self->emit ('escape');	2221	$self->emit ('escape');
1853	} elsif ($uni) {	2222	} elsif ($uni == 0x0d) {
		2223	substr $text, $self->{cursor}++, 0, "\012";
		2224	} elsif ($uni >= 0x20) {
1854	substr $text, $self->{cursor}++, 0, chr $uni;	2225	substr $text, $self->{cursor}++, 0, chr $uni;
1855	} else {	2226	} else {
1856	return 0;	2227	return 0;
1857	}	2228	}
1858		2229
1859	$self->_set_text ($text);	2230	$self->_set_text ($text);
1860		2231
1861	$self->realloc;	2232	$self->realloc;
		2233	$self->update;
1862		2234
1863	1	2235	1
1864	}	2236	}
1865		2237
1866	sub invoke_focus_in {	2238	sub invoke_focus_in {
…		…
1928	utf8::encode $text;	2300	utf8::encode $text;
1929		2301
1930	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2302	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1931	}	2303	}
1932		2304
1933	glColor @{$self->{fg}};
1934	glBegin GL_LINES;	2305	glBegin GL_LINES;
1935	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2306	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1936	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2307	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1937	glEnd;	2308	glEnd;
1938	}	2309	}
1939	}	2310	}
1940		2311
		2312	#############################################################################
		2313
1941	package CFClient::UI::Entry;	2314	package CFPlus::UI::Entry;
1942		2315
1943	our @ISA = CFClient::UI::EntryBase::;	2316	our @ISA = CFPlus::UI::EntryBase::;
1944		2317
1945	use CFClient::OpenGL;	2318	use CFPlus::OpenGL;
1946		2319
1947	sub invoke_key_down {	2320	sub invoke_key_down {
1948	my ($self, $ev) = @_;	2321	my ($self, $ev) = @_;
1949		2322
1950	my $sym = $ev->{sym};	2323	my $sym = $ev->{sym};
1951		2324
1952	if ($sym == 13) {	2325	if ($ev->{uni} == 0x0d || $sym == 13) {
1953	unshift @{$self->{history}},	2326	unshift @{$self->{history}},
1954	my $txt = $self->get_text;	2327	my $txt = $self->get_text;
1955		2328
1956	$self->{history_pointer} = -1;	2329	$self->{history_pointer} = -1;
1957	$self->{history_saveback} = '';	2330	$self->{history_saveback} = '';
1958	$self->emit (activate => $txt);	2331	$self->emit (activate => $txt);
1959	$self->update;	2332	$self->update;
1960		2333
1961	} elsif ($sym == CFClient::SDLK_UP) {	2334	} elsif ($sym == CFPlus::SDLK_UP) {
1962	if ($self->{history_pointer} < 0) {	2335	if ($self->{history_pointer} < 0) {
1963	$self->{history_saveback} = $self->get_text;	2336	$self->{history_saveback} = $self->get_text;
1964	}	2337	}
1965	if (@{$self->{history} || []} > 0) {	2338	if (@{$self->{history} || []} > 0) {
1966	$self->{history_pointer}++;	2339	$self->{history_pointer}++;
…		…
1968	$self->{history_pointer} = @{$self->{history} || []} - 1;	2341	$self->{history_pointer} = @{$self->{history} || []} - 1;
1969	}	2342	}
1970	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2343	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1971	}	2344	}
1972		2345
1973	} elsif ($sym == CFClient::SDLK_DOWN) {	2346	} elsif ($sym == CFPlus::SDLK_DOWN) {
1974	$self->{history_pointer}--;	2347	$self->{history_pointer}--;
1975	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2348	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1976		2349
1977	if ($self->{history_pointer} >= 0) {	2350	if ($self->{history_pointer} >= 0) {
1978	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2351	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1987	1	2360	1
1988	}	2361	}
1989		2362
1990	#############################################################################	2363	#############################################################################
1991		2364
		2365	package CFPlus::UI::TextEdit;
		2366
		2367	our @ISA = CFPlus::UI::EntryBase::;
		2368
		2369	use CFPlus::OpenGL;
		2370
		2371	sub move_cursor_ver {
		2372	my ($self, $dy) = @_;
		2373
		2374	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2375
		2376	$y += $dy;
		2377
		2378	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2379	$self->{cursor} = $index;
		2380	delete $self->{cur_h};
		2381	$self->update;
		2382	return;
		2383	}
		2384	}
		2385
		2386	sub invoke_key_down {
		2387	my ($self, $ev) = @_;
		2388
		2389	my $sym = $ev->{sym};
		2390
		2391	if ($sym == CFPlus::SDLK_UP) {
		2392	$self->move_cursor_ver (-1);
		2393	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2394	$self->move_cursor_ver (+1);
		2395	} else {
		2396	return $self->SUPER::invoke_key_down ($ev)
		2397	}
		2398
		2399	1
		2400	}
		2401
		2402	#############################################################################
		2403
1992	package CFClient::UI::Button;	2404	package CFPlus::UI::Button;
1993		2405
1994	our @ISA = CFClient::UI::Label::;	2406	our @ISA = CFPlus::UI::Label::;
1995		2407
1996	use CFClient::OpenGL;	2408	use CFPlus::OpenGL;
1997		2409
1998	my @tex =	2410	my @tex =
1999	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2411	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2000	qw(b1_button_active.png);	2412	qw(b1_button_inactive.png b1_button_active.png);
2001		2413
2002	sub new {	2414	sub new {
2003	my $class = shift;	2415	my $class = shift;
2004		2416
2005	$class->SUPER::new (	2417	$class->SUPER::new (
2006	padding_x => 4,	2418	padding_x => 4,
2007	padding_y => 4,	2419	padding_y => 4,
2008	fg => [1, 1, 1],	2420	fg => [1.0, 1.0, 1.0],
2009	active_fg => [0, 0, 1],	2421	active_fg => [0.8, 0.8, 0.8],
2010	can_hover => 1,	2422	can_hover => 1,
2011	align => 0,	2423	align => 0,
2012	valign => 0,	2424	valign => 0,
2013	can_events => 1,	2425	can_events => 1,
2014	@_	2426	@_
…		…
2032		2444
2033	glEnable GL_TEXTURE_2D;	2445	glEnable GL_TEXTURE_2D;
2034	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2035	glColor 0, 0, 0, 1;	2447	glColor 0, 0, 0, 1;
2036		2448
		2449	my $tex = $tex[$GRAB == $self];
2037	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2450	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2038		2451
2039	glDisable GL_TEXTURE_2D;	2452	glDisable GL_TEXTURE_2D;
2040		2453
2041	$self->SUPER::_draw;	2454	$self->SUPER::_draw;
2042	}	2455	}
2043		2456
2044	#############################################################################	2457	#############################################################################
2045		2458
		2459	package CFPlus::UI::CheckBox;
		2460
		2461	our @ISA = CFPlus::UI::DrawBG::;
		2462
		2463	my @tex =
		2464	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2465	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2466
		2467	use CFPlus::OpenGL;
		2468
		2469	sub new {
		2470	my $class = shift;
		2471
		2472	$class->SUPER::new (
		2473	padding_x => 2,
		2474	padding_y => 2,
		2475	fg => [1, 1, 1],
		2476	active_fg => [1, 1, 0],
		2477	bg => [0, 0, 0, 0.2],
		2478	active_bg => [1, 1, 1, 0.5],
		2479	state => 0,
		2480	can_hover => 1,
		2481	@_
		2482	)
		2483	}
		2484
		2485	sub size_request {
		2486	my ($self) = @_;
		2487
		2488	(6) x 2
		2489	}
		2490
		2491	sub toggle {
		2492	my ($self) = @_;
		2493
		2494	$self->{state} = !$self->{state};
		2495	$self->emit (changed => $self->{state});
		2496	$self->update;
		2497	}
		2498
		2499	sub invoke_button_down {
		2500	my ($self, $ev, $x, $y) = @_;
		2501
		2502	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2503	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2504	$self->toggle;
		2505	} else {
		2506	return 0
		2507	}
		2508
		2509	1
		2510	}
		2511
		2512	sub _draw {
		2513	my ($self) = @_;
		2514
		2515	$self->SUPER::_draw;
		2516
		2517	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2518
		2519	my ($w, $h) = @$self{qw(w h)};
		2520
		2521	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2522
		2523	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2524
		2525	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2526
		2527	glEnable GL_TEXTURE_2D;
		2528	$tex->draw_quad_alpha (0, 0, $s, $s);
		2529	glDisable GL_TEXTURE_2D;
		2530	}
		2531
		2532	#############################################################################
		2533
		2534	package CFPlus::UI::Image;
		2535
		2536	our @ISA = CFPlus::UI::Base::;
		2537
		2538	use CFPlus::OpenGL;
		2539
		2540	our %texture_cache;
		2541
		2542	sub new {
		2543	my $class = shift;
		2544
		2545	my $self = $class->SUPER::new (
		2546	can_events => 0,
		2547	@_,
		2548	);
		2549
		2550	$self->{path} || $self->{tex}
		2551	or Carp::croak "'path' or 'tex' attributes required";
		2552
		2553	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2554	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2555
		2556	CFPlus::weaken $texture_cache{$self->{path}};
		2557
		2558	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2559
		2560	$self
		2561	}
		2562
		2563	sub STORABLE_freeze {
		2564	my ($self, $cloning) = @_;
		2565
		2566	$self->{path}
		2567	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2568
		2569	$self->{path}
		2570	}
		2571
		2572	sub STORABLE_attach {
		2573	my ($self, $cloning, $path) = @_;
		2574
		2575	$self->new (path => $path)
		2576	}
		2577
		2578	sub size_request {
		2579	my ($self) = @_;
		2580
		2581	($self->{tex}{w}, $self->{tex}{h})
		2582	}
		2583
		2584	sub _draw {
		2585	my ($self) = @_;
		2586
		2587	my $tex = $self->{tex};
		2588
		2589	my ($w, $h) = ($self->{w}, $self->{h});
		2590
		2591	if ($self->{rot90}) {
		2592	glRotate 90, 0, 0, 1;
		2593	glTranslate 0, -$self->{w}, 0;
		2594
		2595	($w, $h) = ($h, $w);
		2596	}
		2597
		2598	glEnable GL_TEXTURE_2D;
		2599	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2600
		2601	$tex->draw_quad (0, 0, $w, $h);
		2602
		2603	glDisable GL_TEXTURE_2D;
		2604	}
		2605
		2606	#############################################################################
		2607
2046	package CFClient::UI::ImageButton;	2608	package CFPlus::UI::ImageButton;
2047		2609
2048	our @ISA = CFClient::UI::Image::;	2610	our @ISA = CFPlus::UI::Image::;
2049		2611
2050	use CFClient::OpenGL;	2612	use CFPlus::OpenGL;
2051		2613
2052	my %textures;	2614	my %textures;
2053		2615
2054	sub new {	2616	sub new {
2055	my $class = shift;	2617	my $class = shift;
…		…
2077	1	2639	1
2078	}	2640	}
2079		2641
2080	#############################################################################	2642	#############################################################################
2081		2643
2082	package CFClient::UI::CheckBox;
2083
2084	our @ISA = CFClient::UI::DrawBG::;
2085
2086	my @tex =
2087	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2088	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2089
2090	use CFClient::OpenGL;
2091
2092	sub new {
2093	my $class = shift;
2094
2095	$class->SUPER::new (
2096	padding_x => 2,
2097	padding_y => 2,
2098	fg => [1, 1, 1],
2099	active_fg => [1, 1, 0],
2100	bg => [0, 0, 0, 0.2],
2101	active_bg => [1, 1, 1, 0.5],
2102	state => 0,
2103	can_hover => 1,
2104	@_
2105	)
2106	}
2107
2108	sub size_request {
2109	my ($self) = @_;
2110
2111	(6) x 2
2112	}
2113
2114	sub toggle {
2115	my ($self) = @_;
2116
2117	$self->{state} = !$self->{state};
2118	$self->emit (changed => $self->{state});
2119	$self->update;
2120	}
2121
2122	sub invoke_button_down {
2123	my ($self, $ev, $x, $y) = @_;
2124
2125	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2126	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2127	$self->toggle;
2128	} else {
2129	return 0
2130	}
2131
2132	1
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	$self->SUPER::_draw;
2139
2140	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2141
2142	my ($w, $h) = @$self{qw(w h)};
2143
2144	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2145
2146	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2147
2148	my $tex = $self->{state} ? $tex[1] : $tex[0];
2149
2150	glEnable GL_TEXTURE_2D;
2151	$tex->draw_quad_alpha (0, 0, $s, $s);
2152	glDisable GL_TEXTURE_2D;
2153	}
2154
2155	#############################################################################
2156
2157	package CFClient::UI::Image;	2644	package CFPlus::UI::VGauge;
2158		2645
2159	our @ISA = CFClient::UI::Base::;	2646	our @ISA = CFPlus::UI::Base::;
2160
2161	use CFClient::OpenGL;
2162
2163	our %texture_cache;
2164
2165	sub new {
2166	my $class = shift;
2167
2168	my $self = $class->SUPER::new (
2169	can_events => 0,
2170	@_,
2171	);
2172
2173	$self->{path} || $self->{tex}
2174	or Carp::croak "'path' or 'tex' attributes required";
2175
2176	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2177	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2178
2179	Scalar::Util::weaken $texture_cache{$self->{path}};
2180
2181	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2182
2183	$self
2184	}
2185
2186	sub size_request {
2187	my ($self) = @_;
2188
2189	($self->{tex}{w}, $self->{tex}{h})
2190	}
2191
2192	sub _draw {
2193	my ($self) = @_;
2194
2195	my $tex = $self->{tex};
2196
2197	my ($w, $h) = ($self->{w}, $self->{h});
2198
2199	if ($self->{rot90}) {
2200	glRotate 90, 0, 0, 1;
2201	glTranslate 0, -$self->{w}, 0;
2202
2203	($w, $h) = ($h, $w);
2204	}
2205
2206	glEnable GL_TEXTURE_2D;
2207	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2208
2209	$tex->draw_quad_alpha (0, 0, $w, $h);
2210
2211	glDisable GL_TEXTURE_2D;
2212	}
2213
2214	#############################################################################
2215
2216	package CFClient::UI::VGauge;
2217
2218	our @ISA = CFClient::UI::Base::;
2219		2647
2220	use List::Util qw(min max);	2648	use List::Util qw(min max);
2221		2649
2222	use CFClient::OpenGL;	2650	use CFPlus::OpenGL;
2223		2651
2224	my %tex = (	2652	my %tex = (
2225	food => [	2653	food => [
2226	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2654	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2227	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2655	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2228	],	2656	],
2229	grace => [	2657	grace => [
2230	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2658	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2659	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2232	],	2660	],
2233	hp => [	2661	hp => [
2234	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2662	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2235	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2663	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2236	],	2664	],
2237	mana => [	2665	mana => [
2238	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2666	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2239	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2667	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2240	],	2668	],
2241	);	2669	);
2242		2670
2243	# eg. VGauge->new (gauge => 'food'), default gauge: food	2671	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2346	glDisable GL_TEXTURE_2D;	2774	glDisable GL_TEXTURE_2D;
2347	}	2775	}
2348		2776
2349	#############################################################################	2777	#############################################################################
2350		2778
2351	package CFClient::UI::Gauge;	2779	package CFPlus::UI::Gauge;
2352		2780
2353	our @ISA = CFClient::UI::VBox::;	2781	our @ISA = CFPlus::UI::VBox::;
2354		2782
2355	sub new {	2783	sub new {
2356	my ($class, %arg) = @_;	2784	my ($class, %arg) = @_;
2357		2785
2358	my $self = $class->SUPER::new (	2786	my $self = $class->SUPER::new (
…		…
2360	can_hover => 1,	2788	can_hover => 1,
2361	can_events => 1,	2789	can_events => 1,
2362	%arg,	2790	%arg,
2363	);	2791	);
2364		2792
2365	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2793	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2366	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2794	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2367	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2795	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2368		2796
2369	$self	2797	$self
2370	}	2798	}
2371		2799
2372	sub set_fontsize {	2800	sub set_fontsize {
…		…
2393	$self->{value}->set_text ($val);	2821	$self->{value}->set_text ($val);
2394	}	2822	}
2395		2823
2396	#############################################################################	2824	#############################################################################
2397		2825
2398	package CFClient::UI::Slider;	2826	package CFPlus::UI::Slider;
2399		2827
2400	use strict;	2828	use strict;
2401		2829
2402	use CFClient::OpenGL;	2830	use CFPlus::OpenGL;
2403		2831
2404	our @ISA = CFClient::UI::DrawBG::;	2832	our @ISA = CFPlus::UI::DrawBG::;
2405		2833
2406	my @tex =	2834	my @tex =
2407	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2835	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2408	qw(s1_slider.png s1_slider_bg.png);	2836	qw(s1_slider.png s1_slider_bg.png);
2409		2837
2410	sub new {	2838	sub new {
2411	my $class = shift;	2839	my $class = shift;
2412		2840
…		…
2506	sub invoke_mouse_wheel {	2934	sub invoke_mouse_wheel {
2507	my ($self, $ev) = @_;	2935	my ($self, $ev) = @_;
2508		2936
2509	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2937	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510		2938
		2939	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2940
2511	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2941	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2512		2942
2513	! ! $delta	2943	! ! $delta
2514	}	2944	}
2515		2945
2516	sub update {	2946	sub update {
…		…
2567	glDisable GL_TEXTURE_2D;	2997	glDisable GL_TEXTURE_2D;
2568	}	2998	}
2569		2999
2570	#############################################################################	3000	#############################################################################
2571		3001
2572	package CFClient::UI::ValSlider;	3002	package CFPlus::UI::ValSlider;
2573		3003
2574	our @ISA = CFClient::UI::HBox::;	3004	our @ISA = CFPlus::UI::HBox::;
2575		3005
2576	sub new {	3006	sub new {
2577	my ($class, %arg) = @_;	3007	my ($class, %arg) = @_;
2578		3008
2579	my $range = delete $arg{range};	3009	my $range = delete $arg{range};
2580		3010
2581	my $self = $class->SUPER::new (	3011	my $self = $class->SUPER::new (
2582	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3012	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2583	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3013	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2584	to_value => sub { shift },	3014	to_value => sub { shift },
2585	from_value => sub { shift },	3015	from_value => sub { shift },
2586	%arg,	3016	%arg,
2587	);	3017	);
2588		3018
…		…
2608	sub set_range { shift->{slider}->set_range (@_) }	3038	sub set_range { shift->{slider}->set_range (@_) }
2609	sub set_value { shift->{slider}->set_value (@_) }	3039	sub set_value { shift->{slider}->set_value (@_) }
2610		3040
2611	#############################################################################	3041	#############################################################################
2612		3042
2613	package CFClient::UI::TextScroller;	3043	package CFPlus::UI::TextScroller;
2614		3044
2615	our @ISA = CFClient::UI::HBox::;	3045	our @ISA = CFPlus::UI::HBox::;
2616		3046
2617	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2618		3048
2619	sub new {	3049	sub new {
2620	my $class = shift;	3050	my $class = shift;
2621		3051
2622	my $self = $class->SUPER::new (	3052	my $self = $class->SUPER::new (
…		…
2624	can_events => 1,	3054	can_events => 1,
2625	indent => 0,	3055	indent => 0,
2626	#font => default_font	3056	#font => default_font
2627	@_,	3057	@_,
2628		3058
2629	layout => (new CFClient::Layout),	3059	layout => (new CFPlus::Layout),
2630	par => [],	3060	par => [],
		3061	max_par => 0,
2631	height => 0,	3062	height => 0,
2632	children => [	3063	children => [
2633	(new CFClient::UI::Empty expand => 1),	3064	(new CFPlus::UI::Empty expand => 1),
2634	(new CFClient::UI::Slider vertical => 1),	3065	(new CFPlus::UI::Slider vertical => 1),
2635	],	3066	],
2636	);	3067	);
2637		3068
2638	$self->{children}[1]->connect (changed => sub { $self->update });	3069	$self->{children}[1]->connect (changed => sub { $self->update });
2639		3070
…		…
2716		3147
2717	# todo: base offset on lines or so, not on pixels	3148	# todo: base offset on lines or so, not on pixels
2718	$self->{children}[1]->set_value ($offset);	3149	$self->{children}[1]->set_value ($offset);
2719	}	3150	}
2720		3151
		3152	sub current_paragraph {
		3153	my ($self) = @_;
		3154
		3155	$self->{top_paragraph} - 1
		3156	}
		3157
		3158	sub scroll_to {
		3159	my ($self, $para) = @_;
		3160
		3161	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3162
		3163	$self->{scroll_to} = $para;
		3164	$self->update;
		3165	}
		3166
2721	sub clear {	3167	sub clear {
2722	my ($self) = @_;	3168	my ($self) = @_;
2723		3169
2724	my (undef, undef, @other) = @{ $self->{children} };	3170	my (undef, undef, @other) = @{ $self->{children} };
2725	$self->remove ($_) for @other;	3171	$self->remove ($_) for @other;
…		…
2728	$self->{height} = 0;	3174	$self->{height} = 0;
2729	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3175	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2730	}	3176	}
2731		3177
2732	sub add_paragraph {	3178	sub add_paragraph {
2733	my ($self, $color, $para, $indent) = @_;	3179	my $self = shift;
2734		3180
2735	my ($text, @w) = ref $para ? @$para : $para;	3181	for my $para (@_) {
2736
2737	$para = {	3182	$para = {
		3183	fg => [1, 1, 1, 1],
		3184	indent => 0,
		3185	markup => "",
		3186	widget => [],
		3187	ref $para ? %$para : (markup => $para),
2738	w => 1e10,	3188	w => 1e10,
2739	wrapped => 1,	3189	wrapped => 1,
2740	fg => $color,
2741	indent => $indent,
2742	markup => $text,
2743	widget => \@w,
2744	};	3190	};
2745		3191
2746	$self->add (@w) if @w;	3192	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2747	push @{$self->{par}}, $para;	3193	push @{$self->{par}}, $para;
		3194	}
		3195
		3196	if (my $max = $self->{max_par}) {
		3197	shift @{$self->{par}} while @{$self->{par}} > $max;
		3198	}
2748		3199
2749	$self->{need_reflow}++;	3200	$self->{need_reflow}++;
2750	$self->update;	3201	$self->update;
2751	}	3202	}
2752		3203
2753	sub scroll_to_bottom {	3204	sub scroll_to_bottom {
2754	my ($self) = @_;	3205	my ($self) = @_;
2755		3206
2756	$self->{scroll_to_bottom} = 1;	3207	$self->{scroll_to} = $#{$self->{par}};
2757	$self->update;	3208	$self->update;
2758	}	3209	}
2759		3210
		3211	sub force_uptodate {
		3212	my ($self) = @_;
		3213
		3214	if (delete $self->{need_reflow}) {
		3215	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3216
		3217	my $height = 0;
		3218
		3219	for my $para (@{$self->{par}}) {
		3220	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3221	my $layout = $self->get_layout ($para);
		3222	my ($w, $h) = $layout->size;
		3223
		3224	$para->{w} = $w + $para->{indent};
		3225	$para->{h} = $h;
		3226	$para->{wrapped} = $layout->has_wrapped;
		3227	}
		3228
		3229	$para->{y} = $height;
		3230	$height += $para->{h};
		3231	}
		3232
		3233	$self->{height} = $height;
		3234	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3235
		3236	delete $self->{texture};
		3237	}
		3238
		3239	if (my $paridx = delete $self->{scroll_to}) {
		3240	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3241	}
		3242	}
		3243
2760	sub update {	3244	sub update {
2761	my ($self) = @_;	3245	my ($self) = @_;
2762		3246
2763	$self->SUPER::update;	3247	$self->SUPER::update;
2764		3248
2765	return unless $self->{h} > 0;	3249	return unless $self->{h} > 0;
2766		3250
2767	delete $self->{texture};	3251	delete $self->{texture};
2768		3252
2769	$ROOT->on_post_alloc ($self => sub {	3253	$ROOT->on_post_alloc ($self => sub {
		3254	$self->force_uptodate;
		3255
2770	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3256	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2771		3257
2772	if (delete $self->{need_reflow}) {
2773	my $height = 0;
2774
2775	for my $para (@{$self->{par}}) {
2776	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2777	my $layout = $self->get_layout ($para);
2778	my ($w, $h) = $layout->size;
2779
2780	$para->{w} = $w + $para->{indent};
2781	$para->{h} = $h;
2782	$para->{wrapped} = $layout->has_wrapped;
2783	}
2784
2785	$height += $para->{h};
2786	}
2787
2788	$self->{height} = $height;
2789
2790	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2791
2792	delete $self->{texture};
2793	}
2794
2795	if (delete $self->{scroll_to_bottom}) {
2796	$self->{children}[1]->set_value (1e10);
2797	}
2798
2799	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3258	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2800	glClearColor 0, 0, 0, 0;	3259	glClearColor 0, 0, 0, 0;
2801	glClear GL_COLOR_BUFFER_BIT;	3260	glClear GL_COLOR_BUFFER_BIT;
2802		3261
		3262	package CFPlus::UI::Base;
		3263	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3264	(0, 0, $self->{w}, $self->{h});
		3265
		3266	my $top = int $self->{children}[1]{range}[0];
		3267
		3268	my $paridx = 0;
		3269	my $top_paragraph;
2803	my $top = int $self->{children}[1]{range}[0];	3270	my $top = int $self->{children}[1]{range}[0];
2804		3271
2805	my $y0 = $top;	3272	my $y0 = $top;
2806	my $y1 = $top + $H;	3273	my $y1 = $top + $H;
2807		3274
2808	my $y = 0;
2809
2810	for my $para (@{$self->{par}}) {	3275	for my $para (@{$self->{par}}) {
2811	my $h = $para->{h};	3276	my $h = $para->{h};
		3277	my $y = $para->{y};
2812		3278
2813	if ($y0 < $y + $h && $y < $y1) {	3279	if ($y0 < $y + $h && $y < $y1) {
2814
2815	my $layout = $self->get_layout ($para);	3280	my $layout = $self->get_layout ($para);
2816		3281
2817	$layout->render ($para->{indent}, $y - $y0);	3282	$layout->render ($para->{indent}, $y - $y0);
2818		3283
2819	if (my @w = @{ $para->{widget} }) {	3284	if (my @w = @{ $para->{widget} }) {
…		…
2828	$_->draw;	3293	$_->draw;
2829	}	3294	}
2830	}	3295	}
2831	}	3296	}
2832		3297
2833	$y += $h;	3298	$paridx++;
		3299	$top_paragraph ||= $paridx if $y >= $top;
2834	}	3300	}
		3301
		3302	$self->{top_paragraph} = $top_paragraph;
2835	};	3303	};
2836	});	3304	});
2837	}	3305	}
2838		3306
2839	sub reconfigure {	3307	sub reconfigure {
…		…
2857	$self->{children}[1]->draw;	3325	$self->{children}[1]->draw;
2858	}	3326	}
2859		3327
2860	#############################################################################	3328	#############################################################################
2861		3329
2862	package CFClient::UI::Animator;	3330	package CFPlus::UI::Animator;
2863		3331
2864	use CFClient::OpenGL;	3332	use CFPlus::OpenGL;
2865		3333
2866	our @ISA = CFClient::UI::Bin::;	3334	our @ISA = CFPlus::UI::Bin::;
2867		3335
2868	sub moveto {	3336	sub moveto {
2869	my ($self, $x, $y) = @_;	3337	my ($self, $x, $y) = @_;
2870		3338
2871	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3339	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2899	glPopMatrix;	3367	glPopMatrix;
2900	}	3368	}
2901		3369
2902	#############################################################################	3370	#############################################################################
2903		3371
2904	package CFClient::UI::Flopper;	3372	package CFPlus::UI::Flopper;
2905		3373
2906	our @ISA = CFClient::UI::Button::;	3374	our @ISA = CFPlus::UI::Button::;
2907		3375
2908	sub new {	3376	sub new {
2909	my $class = shift;	3377	my $class = shift;
2910		3378
2911	my $self = $class->SUPER::new (	3379	my $self = $class->SUPER::new (
…		…
2923	$self->{other}->toggle_visibility;	3391	$self->{other}->toggle_visibility;
2924	}	3392	}
2925		3393
2926	#############################################################################	3394	#############################################################################
2927		3395
2928	package CFClient::UI::Tooltip;	3396	package CFPlus::UI::Tooltip;
2929		3397
2930	our @ISA = CFClient::UI::Bin::;	3398	our @ISA = CFPlus::UI::Bin::;
2931		3399
2932	use CFClient::OpenGL;	3400	use CFPlus::OpenGL;
2933		3401
2934	sub new {	3402	sub new {
2935	my $class = shift;	3403	my $class = shift;
2936		3404
2937	$class->SUPER::new (	3405	$class->SUPER::new (
…		…
2940	)	3408	)
2941	}	3409	}
2942		3410
2943	sub set_tooltip_from {	3411	sub set_tooltip_from {
2944	my ($self, $widget) = @_;	3412	my ($self, $widget) = @_;
		3413
		3414	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3415	if $widget->{tooltip} =~ /^#(.*)$/;
2945		3416
2946	my $tooltip = $widget->{tooltip};	3417	my $tooltip = $widget->{tooltip};
2947		3418
2948	if ($ENV{CFPLUS_DEBUG} & 2) {	3419	if ($ENV{CFPLUS_DEBUG} & 2) {
2949	$tooltip .= "\n\n" . (ref $widget) . "\n"	3420	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2953	}	3424	}
2954		3425
2955	$tooltip =~ s/^\n+//;	3426	$tooltip =~ s/^\n+//;
2956	$tooltip =~ s/\n+$//;	3427	$tooltip =~ s/\n+$//;
2957		3428
2958	$self->add (new CFClient::UI::Label	3429	$self->add (new CFPlus::UI::Label
2959	markup => $tooltip,	3430	markup => $tooltip,
2960	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3431	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2961	fontsize => 0.8,	3432	fontsize => 0.8,
2962	fg => [0, 0, 0, 1],	3433	style => 1, # FLAG_INVERSE
2963	ellipsise => 0,	3434	ellipsise => 0,
2964	font => ($widget->{tooltip_font} || $::FONT_PROP),	3435	font => ($widget->{tooltip_font} || $::FONT_PROP),
2965	);	3436	);
2966	}	3437	}
2967		3438
…		…
2986		3457
2987	$self->{root}->on_post_alloc ("move_$self" => sub {	3458	$self->{root}->on_post_alloc ("move_$self" => sub {
2988	my $widget = $self->{owner}	3459	my $widget = $self->{owner}
2989	or return;	3460	or return;
2990		3461
		3462	if ($widget->{visible}) {
2991	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3463	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2992		3464
2993	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3465	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2994	if $x + $self->{w} > $self->{root}{w};	3466	if $x + $self->{w} > $self->{root}{w};
2995		3467
2996	$self->move_abs ($x, $y);	3468	$self->move_abs ($x, $y);
		3469	} else {
		3470	$self->hide;
		3471	}
2997	});	3472	});
2998	}	3473	}
2999		3474
3000	sub _draw {	3475	sub _draw {
3001	my ($self) = @_;	3476	my ($self) = @_;
…		…
3025	$self->SUPER::_draw;	3500	$self->SUPER::_draw;
3026	}	3501	}
3027		3502
3028	#############################################################################	3503	#############################################################################
3029		3504
3030	package CFClient::UI::Face;	3505	package CFPlus::UI::Face;
3031		3506
3032	our @ISA = CFClient::UI::Base::;	3507	our @ISA = CFPlus::UI::DrawBG::;
3033		3508
3034	use CFClient::OpenGL;	3509	use CFPlus::OpenGL;
3035		3510
3036	sub new {	3511	sub new {
3037	my $class = shift;	3512	my $class = shift;
3038		3513
3039	my $self = $class->SUPER::new (	3514	my $self = $class->SUPER::new (
		3515	size_w => 32,
		3516	size_h => 8,
3040	aspect => 1,	3517	aspect => 1,
3041	can_events => 0,	3518	can_events => 0,
3042	@_,	3519	@_,
3043	);	3520	);
3044		3521
3045	if ($self->{anim} && $self->{animspeed}) {	3522	if ($self->{anim} && $self->{animspeed}) {
3046	Scalar::Util::weaken (my $widget = $self);	3523	CFPlus::weaken (my $widget = $self);
3047		3524
		3525	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3526	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3048	$self->{timer} = Event->timer (	3527	$self->{timer} = Event->timer (
3049	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3050	hard => 1,	3528	parked => 1,
3051	interval => $self->{animspeed},
3052	cb => sub {	3529	cb => sub {
		3530	return unless $::CONN && $widget;
		3531
3053	++$widget->{frame};	3532	++$widget->{frame};
		3533	$widget->update_face;
3054	$widget->update;	3534	$widget->update;
		3535
		3536	$widget->update_timer;
3055	},	3537	},
3056	);	3538	);
		3539
		3540	$self->update_face;
		3541	$self->update_timer;
3057	}	3542	}
3058		3543
3059	$self	3544	$self
3060	}	3545	}
3061		3546
		3547	sub update_timer {
		3548	my ($self) = @_;
		3549
		3550	return unless $self->{timer};
		3551
		3552	if ($self->{visible}) {
		3553	$self->{timer}->at (
		3554	$self->{anim_start}
		3555	+ $self->{animspeed}
		3556	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3557	);
		3558	$self->{timer}->start;
		3559	} else {
		3560	$self->{timer}->stop;
		3561	}
		3562	}
		3563
		3564	sub update_face {
		3565	my ($self) = @_;
		3566
		3567	return unless $::CONN;
		3568
		3569	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3570	if ($anim && @$anim) {
		3571	delete $self->{wait_face};
		3572	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3573	}
		3574	}
		3575	}
		3576
3062	sub size_request {	3577	sub size_request {
3063	(32, 8)	3578	my ($self) = @_;
		3579
		3580	if ($::CONN) {
		3581	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3582	if (my $tex = $::CONN->{texture}[$faceid]) {
		3583	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3584	} else {
		3585	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3586	$self->realloc;
		3587	});
		3588	}
		3589	}
		3590	}
		3591
		3592	($self->{size_w} || 8, $self->{size_h} || 8)
3064	}	3593	}
3065		3594
3066	sub update {	3595	sub update {
3067	my ($self) = @_;	3596	my ($self) = @_;
3068		3597
3069	return unless $self->{visible};	3598	return unless $self->{visible};
3070		3599
3071	$self->SUPER::update;	3600	$self->SUPER::update;
3072	}	3601	}
3073		3602
		3603	sub invoke_visibility_change {
		3604	my ($self) = @_;
		3605
		3606	$self->update_timer;
		3607
		3608	0
		3609	}
		3610
3074	sub _draw {	3611	sub _draw {
3075	my ($self) = @_;	3612	my ($self) = @_;
3076		3613
3077	return unless $::CONN;	3614	return unless $::CONN;
3078		3615
3079	my $face;	3616	$self->SUPER::_draw;
3080		3617
3081	if ($self->{frame}) {
3082	my $anim = $::CONN->{anim}[$self->{anim}];	3618	my $faceid = $::CONN->{faceid}[$self->{face}]
3083		3619	or return;
3084	$face = $anim->[ $self->{frame} % @$anim ]
3085	if $anim && @$anim;
3086	}
3087		3620
3088	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3621	my $tex = $::CONN->{texture}[$faceid];
3089		3622
3090	if ($tex) {	3623	if ($tex) {
3091	glEnable GL_TEXTURE_2D;	3624	glEnable GL_TEXTURE_2D;
3092	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3625	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3093	glColor 0, 0, 0, 1;	3626	glColor 0, 0, 0, 1;
…		…
3097	}	3630	}
3098		3631
3099	sub destroy {	3632	sub destroy {
3100	my ($self) = @_;	3633	my ($self) = @_;
3101		3634
3102	$self->{timer}->cancel	3635	(delete $self->{timer})->cancel
3103	if $self->{timer};	3636	if $self->{timer};
3104		3637
3105	$self->SUPER::destroy;	3638	$self->SUPER::destroy;
3106	}	3639	}
3107		3640
3108	#############################################################################	3641	#############################################################################
3109		3642
3110	package CFClient::UI::Buttonbar;	3643	package CFPlus::UI::Buttonbar;
3111		3644
3112	our @ISA = CFClient::UI::HBox::;	3645	our @ISA = CFPlus::UI::HBox::;
3113		3646
3114	# TODO: should actualyl wrap buttons and other goodies.	3647	# TODO: should actually wrap buttons and other goodies.
3115		3648
3116	#############################################################################	3649	#############################################################################
3117		3650
3118	package CFClient::UI::Menu;	3651	package CFPlus::UI::Menu;
3119		3652
3120	our @ISA = CFClient::UI::FancyFrame::;	3653	our @ISA = CFPlus::UI::Toplevel::;
3121		3654
3122	use CFClient::OpenGL;	3655	use CFPlus::OpenGL;
3123		3656
3124	sub new {	3657	sub new {
3125	my $class = shift;	3658	my $class = shift;
3126		3659
3127	my $self = $class->SUPER::new (	3660	my $self = $class->SUPER::new (
3128	items => [],	3661	items => [],
3129	z => 100,	3662	z => 100,
3130	@_,	3663	@_,
3131	);	3664	);
3132		3665
3133	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3666	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3134		3667
3135	for my $item (@{ $self->{items} }) {	3668	for my $item (@{ $self->{items} }) {
3136	my ($widget, $cb, $tooltip) = @$item;	3669	my ($widget, $cb, $tooltip) = @$item;
3137		3670
3138	# handle various types of items, only text for now	3671	# handle various types of items, only text for now
3139	if (!ref $widget) {	3672	if (!ref $widget) {
3140	if ($widget =~ /\t/) {	3673	if ($widget =~ /\t/) {
3141	my ($left, $right) = split /\t/, $widget, 2;	3674	my ($left, $right) = split /\t/, $widget, 2;
3142		3675
3143	$widget = new CFClient::UI::HBox	3676	$widget = new CFPlus::UI::HBox
3144	can_hover => 1,	3677	can_hover => 1,
3145	can_events => 1,	3678	can_events => 1,
3146	tooltip => $tooltip,	3679	tooltip => $tooltip,
3147	children => [	3680	children => [
3148	(new CFClient::UI::Label markup => $left, expand => 1),	3681	(new CFPlus::UI::Label markup => $left, expand => 1),
3149	(new CFClient::UI::Label markup => $right, align => +1),	3682	(new CFPlus::UI::Label markup => $right, align => +1),
3150	],	3683	],
3151	;	3684	;
3152		3685
3153	} else {	3686	} else {
3154	$widget = new CFClient::UI::Label	3687	$widget = new CFPlus::UI::Label
3155	can_hover => 1,	3688	can_hover => 1,
3156	can_events => 1,	3689	can_events => 1,
3157	markup => $widget,	3690	markup => $widget,
3158	tooltip => $tooltip;	3691	tooltip => $tooltip;
3159	}	3692	}
…		…
3207	1	3740	1
3208	}	3741	}
3209		3742
3210	#############################################################################	3743	#############################################################################
3211		3744
3212	package CFClient::UI::Multiplexer;	3745	package CFPlus::UI::Multiplexer;
3213		3746
3214	our @ISA = CFClient::UI::Container::;	3747	our @ISA = CFPlus::UI::Container::;
3215		3748
3216	sub new {	3749	sub new {
3217	my $class = shift;	3750	my $class = shift;
3218		3751
3219	my $self = $class->SUPER::new (	3752	my $self = $class->SUPER::new (
…		…
3280	$self->{current}->draw;	3813	$self->{current}->draw;
3281	}	3814	}
3282		3815
3283	#############################################################################	3816	#############################################################################
3284		3817
3285	package CFClient::UI::Notebook;	3818	package CFPlus::UI::Notebook;
3286		3819
3287	our @ISA = CFClient::UI::VBox::;	3820	our @ISA = CFPlus::UI::VBox::;
3288		3821
3289	sub new {	3822	sub new {
3290	my $class = shift;	3823	my $class = shift;
3291		3824
3292	my $self = $class->SUPER::new (	3825	my $self = $class->SUPER::new (
3293	buttonbar => (new CFClient::UI::Buttonbar),	3826	buttonbar => (new CFPlus::UI::Buttonbar),
3294	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3827	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3295	# filter => # will be put between multiplexer and $self	3828	# filter => # will be put between multiplexer and $self
3296	@_,	3829	@_,
3297	);	3830	);
3298		3831
3299	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3832	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3303	}	3836	}
3304		3837
3305	sub add {	3838	sub add {
3306	my ($self, $title, $widget, $tooltip) = @_;	3839	my ($self, $title, $widget, $tooltip) = @_;
3307		3840
3308	Scalar::Util::weaken $self;	3841	CFPlus::weaken $self;
3309		3842
3310	$self->{buttonbar}->add (new CFClient::UI::Button	3843	$self->{buttonbar}->add (new CFPlus::UI::Button
3311	markup => $title,	3844	markup => $title,
3312	tooltip => $tooltip,	3845	tooltip => $tooltip,
3313	on_activate => sub { $self->set_current_page ($widget) },	3846	on_activate => sub { $self->set_current_page ($widget) },
3314	);	3847	);
3315		3848
…		…
3329	$self->emit (page_changed => $self->{multiplexer}{current});	3862	$self->emit (page_changed => $self->{multiplexer}{current});
3330	}	3863	}
3331		3864
3332	#############################################################################	3865	#############################################################################
3333		3866
3334	package CFClient::UI::Combobox;	3867	package CFPlus::UI::Selector;
3335		3868
3336	use utf8;	3869	use utf8;
3337		3870
3338	our @ISA = CFClient::UI::Button::;	3871	our @ISA = CFPlus::UI::Button::;
3339		3872
3340	sub new {	3873	sub new {
3341	my $class = shift;	3874	my $class = shift;
3342		3875
3343	my $self = $class->SUPER::new (	3876	my $self = $class->SUPER::new (
…		…
3360	my ($value, $title, $tooltip) = @$_;	3893	my ($value, $title, $tooltip) = @$_;
3361		3894
3362	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3895	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363	}	3896	}
3364		3897
3365	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3898	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366	}	3899	}
3367		3900
3368	sub _set_value {	3901	sub _set_value {
3369	my ($self, $value) = @_;	3902	my ($self, $value) = @_;
3370		3903
…		…
3385	$self->emit (changed => $value);	3918	$self->emit (changed => $value);
3386	}	3919	}
3387		3920
3388	#############################################################################	3921	#############################################################################
3389		3922
3390	package CFClient::UI::Statusbox;	3923	package CFPlus::UI::Statusbox;
3391		3924
3392	our @ISA = CFClient::UI::VBox::;	3925	our @ISA = CFPlus::UI::VBox::;
3393		3926
3394	sub new {	3927	sub new {
3395	my $class = shift;	3928	my $class = shift;
3396		3929
3397	my $self = $class->SUPER::new (	3930	my $self = $class->SUPER::new (
3398	fontsize => 0.8,	3931	fontsize => 0.8,
3399	@_,	3932	@_,
3400	);	3933	);
3401		3934
3402	Scalar::Util::weaken (my $this = $self);	3935	CFPlus::weaken (my $this = $self);
3403		3936
3404	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3937	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3405		3938
3406	$self	3939	$self
3407	}	3940	}
…		…
3409	sub reorder {	3942	sub reorder {
3410	my ($self) = @_;	3943	my ($self) = @_;
3411	my $NOW = Time::HiRes::time;	3944	my $NOW = Time::HiRes::time;
3412		3945
3413	# freeze display when hovering over any label	3946	# freeze display when hovering over any label
3414	return if $CFClient::UI::TOOLTIP->{owner}	3947	return if $CFPlus::UI::TOOLTIP->{owner}
3415	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3948	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3416	values %{ $self->{item} };	3949	values %{ $self->{item} };
3417		3950
3418	while (my ($k, $v) = each %{ $self->{item} }) {	3951	while (my ($k, $v) = each %{ $self->{item} }) {
3419	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3952	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3420	}	3953	}
…		…
3441	for ($short) {	3974	for ($short) {
3442	s/^\s+//;	3975	s/^\s+//;
3443	s/\s+/ /g;	3976	s/\s+/ /g;
3444	}	3977	}
3445		3978
3446	new CFClient::UI::Label	3979	new CFPlus::UI::Label
3447	markup => $short,	3980	markup => $short,
3448	tooltip => $item->{tooltip},	3981	tooltip => $item->{tooltip},
3449	tooltip_font => $::FONT_PROP,	3982	tooltip_font => $::FONT_PROP,
3450	tooltip_width => 0.67,	3983	tooltip_width => 0.67,
3451	fontsize => $item->{fontsize} || $self->{fontsize},	3984	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3530	$self->SUPER::destroy;	4063	$self->SUPER::destroy;
3531	}	4064	}
3532		4065
3533	#############################################################################	4066	#############################################################################
3534		4067
3535	package CFClient::UI::Inventory;
3536
3537	our @ISA = CFClient::UI::Table::;
3538
3539	sub new {
3540	my $class = shift;
3541
3542	my $self = $class->SUPER::new (
3543	col_expand => [0, 1, 0],
3544	@_,
3545	);
3546
3547	$self
3548	}
3549
3550	sub set_items {
3551	my ($self, $items) = @_;
3552
3553	$self->clear;
3554	return unless $items;
3555
3556	my @items = sort {
3557	($a->{type} <=> $b->{type})
3558	or ($a->{name} cmp $b->{name})
3559	} values %$items;
3560
3561	$self->{real_items} = \@items;
3562
3563	my $row = 0;
3564	for my $item (@items) {
3565	CFClient::Item::update_widgets $item;
3566
3567	$self->add (0, $row, $item->{face_widget});
3568	$self->add (1, $row, $item->{desc_widget});
3569	$self->add (2, $row, $item->{weight_widget});
3570
3571	$row++;
3572	}
3573	}
3574
3575	#############################################################################
3576
3577	package CFClient::UI::SpellList;
3578
3579	our @ISA = CFClient::UI::Table::;
3580
3581	sub new {
3582	my $class = shift;
3583
3584	my $self = $class->SUPER::new (
3585	binding => [],
3586	commands => [],
3587	@_,
3588	)
3589	}
3590
3591	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3592
3593	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3594	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3595	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3596	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3597	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3598	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3599	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3600	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3601	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3602	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603
3604	sub rebuild_spell_list {
3605	my ($self) = @_;
3606
3607	$CFClient::UI::ROOT->on_refresh ($self => sub {
3608	$self->clear;
3609
3610	return unless $::CONN;
3611
3612	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3614	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617
3618	my $row = 0;
3619
3620	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621	my $spell = $self->{spell}{$_};
3622
3623	$row++;
3624
3625	my $spell_cb = sub {
3626	my ($widget, $ev) = @_;
3627
3628	if ($ev->{button} == 1) {
3629	$::CONN->user_send ("cast $spell->{name}");
3630	} elsif ($ev->{button} == 2) {
3631	$::CONN->user_send ("invoke $spell->{name}");
3632	} elsif ($ev->{button} == 3) {
3633	(new CFClient::UI::Menu
3634	items => [
3635	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637	],
3638	)->popup ($ev);
3639	} else {
3640	return 0;
3641	}
3642
3643	1
3644	};
3645
3646	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647
3648	#TODO: add path info to tooltip
3649	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3650
3651	$self->add (0, $row, new CFClient::UI::Face
3652	face => $spell->{face},
3653	can_hover => 1,
3654	can_events => 1,
3655	tooltip => $tooltip,
3656	on_button_down => $spell_cb,
3657	);
3658
3659	$self->add (1, $row, new CFClient::UI::Label
3660	expand => 1,
3661	text => $spell->{name},
3662	can_hover => 1,
3663	can_events => 1,
3664	tooltip => $tooltip,
3665	on_button_down => $spell_cb,
3666	);
3667
3668	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672	}
3673	});
3674	}
3675
3676	sub add_spell {
3677	my ($self, $spell) = @_;
3678
3679	$self->{spell}->{$spell->{name}} = $spell;
3680	$self->rebuild_spell_list;
3681	}
3682
3683	sub remove_spell {
3684	my ($self, $spell) = @_;
3685
3686	delete $self->{spell}->{$spell->{name}};
3687	$self->rebuild_spell_list;
3688	}
3689
3690	sub clear_spells {
3691	my ($self) = @_;
3692
3693	$self->{spell} = {};
3694	$self->rebuild_spell_list;
3695	}
3696
3697	#############################################################################
3698
3699	package CFClient::UI::Root;	4068	package CFPlus::UI::Root;
3700		4069
3701	our @ISA = CFClient::UI::Container::;	4070	our @ISA = CFPlus::UI::Container::;
3702		4071
3703	use List::Util qw(min max);	4072	use List::Util qw(min max);
3704		4073
3705	use CFClient::OpenGL;	4074	use CFPlus::OpenGL;
3706		4075
3707	sub new {	4076	sub new {
3708	my $class = shift;	4077	my $class = shift;
3709		4078
3710	my $self = $class->SUPER::new (	4079	my $self = $class->SUPER::new (
3711	visible => 1,	4080	visible => 1,
3712	@_,	4081	@_,
3713	);	4082	);
3714		4083
3715	Scalar::Util::weaken ($self->{root} = $self);	4084	CFPlus::weaken ($self->{root} = $self);
3716		4085
3717	$self	4086	$self
3718	}	4087	}
3719		4088
3720	sub size_request {	4089	sub size_request {
…		…
3889	$h = 0 if $h < 0;	4258	$h = 0 if $h < 0;
3890		4259
3891	$w = max $widget->{min_w}, $w;	4260	$w = max $widget->{min_w}, $w;
3892	$h = max $widget->{min_h}, $h;	4261	$h = max $widget->{min_h}, $h;
3893		4262
		4263	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4264	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4265
3894	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4266	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4267	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896		4268
3897	$w = int $w + 0.5;	4269	$w = int $w + 0.5;
3898	$h = int $h + 0.5;	4270	$h = int $h + 0.5;
…		…
3911		4283
3912	while ($self->{post_alloc_hook}) {	4284	while ($self->{post_alloc_hook}) {
3913	$_->()	4285	$_->()
3914	for values %{delete $self->{post_alloc_hook}};	4286	for values %{delete $self->{post_alloc_hook}};
3915	}	4287	}
3916
3917		4288
3918	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4289	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3919	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4290	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3920	glClear GL_COLOR_BUFFER_BIT;	4291	glClear GL_COLOR_BUFFER_BIT;
3921		4292
…		…
3924	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4295	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3925	glMatrixMode GL_MODELVIEW;	4296	glMatrixMode GL_MODELVIEW;
3926	glLoadIdentity;	4297	glLoadIdentity;
3927		4298
3928	{	4299	{
3929	package CFClient::UI::Base;	4300	package CFPlus::UI::Base;
3930		4301
3931	($draw_x, $draw_y, $draw_w, $draw_h) =	4302	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3932	(0, 0, $self->{w}, $self->{h});	4303	(0, 0, $self->{w}, $self->{h});
3933	}
3934		4304
3935	$self->_draw;	4305	$self->_draw;
		4306	}
3936	}	4307	}
3937		4308
3938	#############################################################################	4309	#############################################################################
3939		4310
3940	package CFClient::UI;	4311	package CFPlus::UI;
3941		4312
3942	$ROOT = new CFClient::UI::Root;	4313	$ROOT = new CFPlus::UI::Root;
3943	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4314	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3944		4315
3945	1	4316	1
3946		4317

Diff Legend

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