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.337 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.399 by root, Sat Jul 21 16:07:53 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;
116	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
117	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
118	} else {	125	} else {
119	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
120	}	127	}
121	}	128	}
…		…
207	reconfigure_widgets;	214	reconfigure_widgets;
208	}	215	}
209		216
210	#############################################################################	217	#############################################################################
211		218
212	package CFClient::UI::Event;	219	package CFPlus::UI::Event;
213		220
214	sub xy {	221	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	223	}
217		224
218	#############################################################################	225	#############################################################################
219		226
220	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
221		228
222	use strict;	229	use strict;
223		230
224	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
225		232
226	sub new {	233	sub new {
227	my $class = shift;	234	my $class = shift;
228		235
229	my $self = bless {	236	my $self = bless {
…		…
234	h => undef,	241	h => undef,
235	can_events => 1,	242	can_events => 1,
236	@_	243	@_
237	}, $class;	244	}, $class;
238		245
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		247
241	for (keys %$self) {	248	for (keys %$self) {
242	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
244	}	251	}
245	}	252	}
246		253
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$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};	256	$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};	257	$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};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		259
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		262
256	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
261		268
262	sub destroy {	269	sub destroy {
263	my ($self) = @_;	270	my ($self) = @_;
264		271
265	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
266	%$self = ();	274	%$self = ();
267	}	275	}
268		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
269	sub show {	281	sub show {
270	my ($self) = @_;	282	my ($self) = @_;
271		283
272	return if $self->{parent};	284	return if $self->{parent};
273		285
274	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
275	}	287	}
276		288
277	sub set_visible {	289	sub set_visible {
278	my ($self) = @_;	290	my ($self) = @_;
279		291
…		…
300	delete $self->{root};	312	delete $self->{root};
301		313
302	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
304		316
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
307		319
308	$self->emit ("focus_out");	320	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
310	}	322	}
…		…
312	sub set_visibility {	324	sub set_visibility {
313	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
314		326
315	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
316		328
317	$visible ? $self->hide	329	$visible ? $self->show
318	: $self->show;	330	: $self->hide;
319	}	331	}
320		332
321	sub toggle_visibility {	333	sub toggle_visibility {
322	my ($self) = @_;	334	my ($self) = @_;
323		335
…		…
367	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
368		380
369	if ($self->{aspect}) {	381	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
371		383
372	$w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		386
375	# use alignment to adjust x, y	387	# use alignment to adjust x, y
376		388
377	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
419		431
420	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
421		433
422	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
423		435
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	439	}
428	}	440	}
429		441
430	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
431	sub coord2local {	443	sub coord2local {
…		…
497	sub connect {	509	sub connect {
498	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
499		511
500	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
501		513
502	defined wantarray and CFClient::guard {	514	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	516	@{ $self->{signal_cb}{$signal} };
505	}	517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
506	}	524	}
507		525
508	my %has_coords = (	526	my %has_coords = (
509	button_down => 1,	527	button_down => 1,
510	button_up => 1,	528	button_up => 1,
…		…
513	);	531	);
514		532
515	sub emit {	533	sub emit {
516	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
517		535
518	# I do not really like this solution, but I dislike duplication	536	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	537	# and needlessly verbose code, either.
520	my @append	538	my @append
521	= $has_coords{$signal}	539	= $has_coords{$signal}
522	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
523	: ();	541	: ();
524		542
525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526		544
527	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	554	}
532		555
533	sub find_widget {	556	#sub find_widget {
534	my ($self, $x, $y) = @_;	557	# in .xs
535
536	return () unless $self->{can_events};
537
538	return $self
539	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542	()
543	}
544		558
545	sub set_parent {	559	sub set_parent {
546	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
547		561
548	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
550	}	564	}
551		565
552	sub realloc {	566	sub realloc {
553	my ($self) = @_;	567	my ($self) = @_;
…		…
619	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
622	glEnd;	636	glEnd;
623	glPopMatrix;	637	glPopMatrix;
624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}	639	}
626		640
627	$self->_draw;	641	$self->_draw;
628	glPopMatrix;	642	glPopMatrix;
629	}	643	}
…		…
632	my ($self) = @_;	646	my ($self) = @_;
633		647
634	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
635	}	649	}
636		650
		651	my $cntx;#d#
637	sub DESTROY {	652	sub DESTROY {
638	my ($self) = @_;	653	my ($self) = @_;
639		654
640	return if CFClient::in_destruct;	655	return if CFPlus::in_destruct;
641
642	delete $WIDGET{$self+0};
643		656
644	eval { $self->destroy };	657	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
646	}	661	}
647		662
648	#############################################################################	663	#############################################################################
649		664
650	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
651		666
652	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
653		668
654	use strict;	669	use strict;
655	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
656		671
657	sub new {	672	sub new {
658	my $class = shift;	673	my $class = shift;
659		674
660	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
691	}	706	}
692	}	707	}
693		708
694	#############################################################################	709	#############################################################################
695		710
696	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
697		712
698	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
699		714
700	sub new {	715	sub new {
701	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
703	}	718	}
…		…
710		725
711	sub draw { }	726	sub draw { }
712		727
713	#############################################################################	728	#############################################################################
714		729
715	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
716		731
717	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
718		733
719	sub new {	734	sub new {
720	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
721		736
722	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
726	can_events => 0,	741	can_events => 0,
727	%arg,	742	%arg,
728	);	743	);
729		744
730	$self->add (@$children)	745	$self->add (@$children)
731	if $children;	746	if $children && @$children;
732		747
733	$self	748	$self
734	}	749	}
735		750
736	sub realloc {	751	sub realloc {
…		…
745	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
746		761
747	$_->set_parent ($self)	762	$_->set_parent ($self)
748	for @widgets;	763	for @widgets;
749		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
750	use sort 'stable';	766	use sort 'stable';
751		767
752	$self->{children} = [	768	$self->{children} = [
753	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
754	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
755	];	771	];
756		772
757	$self->realloc;	773	$self->realloc;
		774
		775	map $_+0, @widgets
758	}	776	}
759		777
760	sub children {	778	sub children {
761	@{ $_[0]{children} }	779	@{ $_[0]{children} }
762	}	780	}
…		…
773	}	791	}
774		792
775	sub clear {	793	sub clear {
776	my ($self) = @_;	794	my ($self) = @_;
777		795
778	my $children = delete $self->{children};	796	my $children = $self->{children};
779	$self->{children} = [];	797	$self->{children} = [];
780		798
781	for (@$children) {	799	for (@$children) {
782	delete $_->{parent};	800	delete $_->{parent};
783	$_->hide;	801	$_->hide;
…		…
808	$_->draw for @{$self->{children}};	826	$_->draw for @{$self->{children}};
809	}	827	}
810		828
811	#############################################################################	829	#############################################################################
812		830
813	package CFClient::UI::Bin;	831	package CFPlus::UI::Bin;
814		832
815	our @ISA = CFClient::UI::Container::;	833	our @ISA = CFPlus::UI::Container::;
816		834
817	sub new {	835	sub new {
818	my ($class, %arg) = @_;	836	my ($class, %arg) = @_;
819		837
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	838	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		839
822	$class->SUPER::new (children => [$child], %arg)	840	$class->SUPER::new (children => [$child], %arg)
823	}	841	}
824		842
825	sub add {	843	sub add {
…		…
832	sub remove {	850	sub remove {
833	my ($self, $widget) = @_;	851	my ($self, $widget) = @_;
834		852
835	$self->SUPER::remove ($widget);	853	$self->SUPER::remove ($widget);
836		854
837	$self->{children} = [new CFClient::UI::Empty]	855	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	856	unless @{$self->{children}};
839	}	857	}
840		858
841	sub child { $_[0]->{children}[0] }	859	sub child { $_[0]->{children}[0] }
842		860
…		…
854		872
855	#############################################################################	873	#############################################################################
856		874
857	# back-buffered drawing area	875	# back-buffered drawing area
858		876
859	package CFClient::UI::Window;	877	package CFPlus::UI::Window;
860		878
861	our @ISA = CFClient::UI::Bin::;	879	our @ISA = CFPlus::UI::Bin::;
862		880
863	use CFClient::OpenGL;	881	use CFPlus::OpenGL;
864		882
865	sub new {	883	sub new {
866	my ($class, %arg) = @_;	884	my ($class, %arg) = @_;
867		885
868	my $self = $class->SUPER::new (%arg);	886	my $self = $class->SUPER::new (%arg);
…		…
890	}	908	}
891		909
892	sub render_child {	910	sub render_child {
893	my ($self) = @_;	911	my ($self) = @_;
894		912
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	913	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	914	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	915	glClear GL_COLOR_BUFFER_BIT;
898		916
899	{	917	{
900	package CFClient::UI::Base;	918	package CFPlus::UI::Base;
901		919
902	($draw_x, $draw_y, $draw_w, $draw_h) =	920	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	921	(0, 0, $self->{w}, $self->{h});
		922
		923	$self->_render;
904	}	924	}
905
906	$self->_render;
907	};	925	};
908	}	926	}
909		927
910	sub _draw {	928	sub _draw {
911	my ($self) = @_;	929	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		930
915	my $tex = $self->{texture}	931	my $tex = $self->{texture}
916	or return;	932	or return;
917		933
918	glEnable GL_TEXTURE_2D;	934	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	935	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	936	glColor 0, 0, 0, 1;
921		937
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	938	$tex->draw_quad_alpha_premultiplied (0, 0);
923		939
924	glDisable GL_TEXTURE_2D;	940	glDisable GL_TEXTURE_2D;
925	}	941	}
926		942
927	#############################################################################	943	#############################################################################
928		944
929	package CFClient::UI::ViewPort;	945	package CFPlus::UI::ViewPort;
930		946
		947	use List::Util qw(min max);
		948
931	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
932		950
933	sub new {	951	sub new {
934	my $class = shift;	952	my $class = shift;
935		953
936	$class->SUPER::new (	954	$class->SUPER::new (
…		…
943	sub size_request {	961	sub size_request {
944	my ($self) = @_;	962	my ($self) = @_;
945		963
946	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	964	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947		965
948	$w = 10 if $self->{scroll_x};	966	$w = 1 if $self->{scroll_x};
949	$h = 10 if $self->{scroll_y};	967	$h = 1 if $self->{scroll_y};
950		968
951	($w, $h)	969	($w, $h)
952	}	970	}
953		971
954	sub invoke_size_allocate {	972	sub invoke_size_allocate {
…		…
966	}	984	}
967		985
968	sub set_offset {	986	sub set_offset {
969	my ($self, $x, $y) = @_;	987	my ($self, $x, $y) = @_;
970		988
		989	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		990	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		991
		992	if ($x != $self->{view_x} or $y != $self->{view_y}) {
971	$self->{view_x} = int $x;	993	$self->{view_x} = $x;
972	$self->{view_y} = int $y;	994	$self->{view_y} = $y;
973		995
		996	$self->emit (changed => $x, $y);
974	$self->update;	997	$self->update;
		998	}
975	}	999	}
976		1000
977	# hmm, this does not work for topleft of $self... but we should not ask for that	1001	# hmm, this does not work for topleft of $self... but we should not ask for that
978	sub coord2local {	1002	sub coord2local {
979	my ($self, $x, $y) = @_;	1003	my ($self, $x, $y) = @_;
…		…
994	my ($self, $x, $y) = @_;	1018	my ($self, $x, $y) = @_;
995		1019
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1020	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1021	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1022	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1023	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1024	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1025	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1026	}
1003	}	1027	}
1004		1028
1005	sub _render {	1029	sub _render {
1006	my ($self) = @_;	1030	my ($self) = @_;
1007		1031
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1032	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1033	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1034
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1035	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1036
1013	$self->SUPER::_render;	1037	$self->SUPER::_render;
1014	}	1038	}
1015		1039
1016	#############################################################################	1040	#############################################################################
1017		1041
1018	package CFClient::UI::ScrolledWindow;	1042	package CFPlus::UI::ScrolledWindow;
1019		1043
1020	our @ISA = CFClient::UI::HBox::;	1044	our @ISA = CFPlus::UI::Table::;
1021		1045
1022	sub new {	1046	sub new {
1023	my ($class, %arg) = @_;	1047	my ($class, %arg) = @_;
1024		1048
1025	my $child = delete $arg{child};	1049	my $child = delete $arg{child};
1026		1050
1027	my $self;	1051	my $self;
1028		1052
1029	my $slider = new CFClient::UI::Slider	1053	my $hslider = new CFPlus::UI::Slider
		1054	col => 0,
		1055	row => 1,
		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
		1065	col => 1,
		1066	row => 0,
1030	vertical => 1,	1067	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1068	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1069	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1070	$self->{vpos} = $_[1];
		1071	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034	},	1072	},
1035	;	1073	;
1036		1074
1037	$self = $class->SUPER::new (	1075	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1076	scroll_x => 0,
		1077	scroll_y => 1,
1039	can_events => 1,	1078	can_events => 1,
1040	slider => $slider,	1079	hslider => $hslider,
		1080	vslider => $vslider,
		1081	col_expand => [1, 0],
		1082	row_expand => [1, 0],
1041	%arg,	1083	%arg,
1042	);	1084	);
1043		1085
		1086	$self->{vp} = new CFPlus::UI::ViewPort
		1087	col => 0,
		1088	row => 0,
		1089	expand => 1,
		1090	scroll_x => $self->{scroll_x},
		1091	scroll_y => $self->{scroll_y},
		1092	on_changed => sub {
		1093	my ($vp, $x, $y) = @_;
		1094
		1095	$vp->{parent}{hslider}->set_value ($x);
		1096	$vp->{parent}{vslider}->set_value ($y);
		1097
		1098	0
		1099	},
		1100	;
		1101
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1102	$self->SUPER::add ($self->{vp});
		1103
1045	$self->add ($child) if $child;	1104	$self->add ($child) if $child;
1046		1105
1047	$self	1106	$self
1048	}	1107	}
1049
1050	#TODO# update range on size_allocate depending on child
1051		1108
1052	sub add {	1109	sub add {
1053	my ($self, $widget) = @_;	1110	my ($self, $widget) = @_;
1054		1111
1055	$self->{vp}->add ($self->{child} = $widget);	1112	$self->{vp}->add ($self->{child} = $widget);
1056	}	1113	}
1057		1114
		1115	sub update_slider {
		1116	my ($self) = @_;
		1117
		1118	my $child = ($self->{vp} or return)->child;
		1119
		1120	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1121	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1122
		1123	my $visible = $w1 > $w2;
		1124	if ($visible != $self->{hslider_visible}) {
		1125	$self->{hslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{hslider})
		1127	: $self->SUPER::remove ($self->{hslider});
		1128	}
		1129
		1130	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1131	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1132
		1133	my $visible = $h1 > $h2;
		1134	if ($visible != $self->{vslider_visible}) {
		1135	$self->{vslider_visible} = $visible;
		1136	$visible ? $self->SUPER::add ($self->{vslider})
		1137	: $self->SUPER::remove ($self->{vslider});
		1138	}
		1139	}
		1140
		1141	sub start_dragging {
		1142	my ($self, $ev) = @_;
		1143
		1144	$self->grab_focus;
		1145
		1146	my $ox = $self->{vp}{view_x};
		1147	my $oy = $self->{vp}{view_y};
		1148
		1149	$self->{motion} = sub {
		1150	my ($ev, $x, $y) = @_;
		1151
		1152	$ox -= $ev->{xrel};
		1153	$oy -= $ev->{yrel};
		1154
		1155	$self->{vp}->set_offset ($ox, $oy);
		1156	};
		1157	}
		1158
1058	sub invoke_mouse_wheel {	1159	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1160	my ($self, $ev) = @_;
1060		1161
1061	return 0 unless $ev->{dy}; # only vertical movements
1062
1063	$self->{slider}->emit (mouse_wheel => $ev);	1162	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1163	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064		1164
1065	1	1165	1
1066	}	1166	}
1067		1167
1068	sub update_slider {	1168	sub invoke_button_down {
1069	my ($self) = @_;	1169	my ($self, $ev, $x, $y) = @_;
1070		1170
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1171	if ($ev->{button} == 2) {
1072	}	1172	$self->start_dragging ($ev);
		1173	return 1;
		1174	}
1073		1175
1074	sub update {	1176	0
1075	my ($self) = @_;	1177	}
1076		1178
1077	$self->SUPER::update;	1179	sub invoke_button_up {
		1180	my ($self, $ev, $x, $y) = @_;
1078		1181
1079	$self->update_slider;	1182	if (delete $self->{motion}) {
		1183	return 1;
		1184	}
		1185
		1186	0
		1187	}
		1188
		1189	sub invoke_mouse_motion {
		1190	my ($self, $ev, $x, $y) = @_;
		1191
		1192	if ($self->{motion}) {
		1193	$self->{motion}->($ev, $x, $y);
		1194	return 1;
		1195	}
		1196
		1197	0
1080	}	1198	}
1081		1199
1082	sub invoke_size_allocate {	1200	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1201	my ($self, $w, $h) = @_;
1084		1202
1085	$self->update_slider;	1203	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1204	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1205	}
1089		1206
1090	#############################################################################	1207	#############################################################################
1091		1208
1092	package CFClient::UI::Frame;	1209	package CFPlus::UI::Frame;
1093		1210
1094	our @ISA = CFClient::UI::Bin::;	1211	our @ISA = CFPlus::UI::Bin::;
1095		1212
1096	use CFClient::OpenGL;	1213	use CFPlus::OpenGL;
1097		1214
1098	sub new {	1215	sub new {
1099	my $class = shift;	1216	my $class = shift;
1100		1217
1101	$class->SUPER::new (	1218	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1244	$self->SUPER::_draw;
1128	}	1245	}
1129		1246
1130	#############################################################################	1247	#############################################################################
1131		1248
1132	package CFClient::UI::FancyFrame;	1249	package CFPlus::UI::FancyFrame;
1133		1250
1134	our @ISA = CFClient::UI::Bin::;	1251	our @ISA = CFPlus::UI::Bin::;
1135		1252
1136	use CFClient::OpenGL;	1253	use CFPlus::OpenGL;
		1254
		1255	sub new {
		1256	my ($class, %arg) = @_;
		1257
		1258	if ((exists $arg{label}) && !ref $arg{label}) {
		1259	$arg{label} = new CFPlus::UI::Label
		1260	align => 1,
		1261	valign => 0,
		1262	text => $arg{label},
		1263	fontsize => ($arg{border} || 0.8) * 0.75;
		1264	}
		1265
		1266	my $self = $class->SUPER::new (
		1267	# label => "",
		1268	fg => [0.6, 0.3, 0.1],
		1269	border => 0.8,
		1270	style => 'single',
		1271	%arg,
		1272	);
		1273
		1274	$self
		1275	}
		1276
		1277	sub add {
		1278	my ($self, @widgets) = @_;
		1279
		1280	$self->SUPER::add (@widgets);
		1281	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1282	}
		1283
		1284	sub border {
		1285	int $_[0]{border} * $::FONTSIZE
		1286	}
		1287
		1288	sub size_request {
		1289	my ($self) = @_;
		1290
		1291	($self->{label_w}, undef) = $self->{label}->size_request
		1292	if $self->{label};
		1293
		1294	my ($w, $h) = $self->SUPER::size_request;
		1295
		1296	(
		1297	$w + $self->border * 2,
		1298	$h + $self->border * 2,
		1299	)
		1300	}
		1301
		1302	sub invoke_size_allocate {
		1303	my ($self, $w, $h) = @_;
		1304
		1305	my $border = $self->border;
		1306
		1307	$w -= List::Util::max 0, $border * 2;
		1308	$h -= List::Util::max 0, $border * 2;
		1309
		1310	if (my $label = $self->{label}) {
		1311	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1312	$label->{h} = List::Util::min $h, $border;
		1313	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1314	}
		1315
		1316	$self->child->configure ($border, $border, $w, $h);
		1317
		1318	1
		1319	}
		1320
		1321	sub _draw {
		1322	my ($self) = @_;
		1323
		1324	my $child = $self->{children}[0];
		1325
		1326	my $border = $self->border;
		1327	my ($w, $h) = ($self->{w}, $self->{h});
		1328
		1329	$child->draw;
		1330
		1331	glColor @{$self->{fg}};
		1332	glBegin GL_LINE_STRIP;
		1333	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1334	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1335	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1336	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1337	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1338	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1339	glEnd;
		1340
		1341	if ($self->{label}) {
		1342	glTranslate $border * 2, 0;
		1343	$self->{label}->_draw;
		1344	}
		1345	}
		1346
		1347	#############################################################################
		1348
		1349	package CFPlus::UI::Toplevel;
		1350
		1351	our @ISA = CFPlus::UI::Bin::;
		1352
		1353	use CFPlus::OpenGL;
1137		1354
1138	my $bg =	1355	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1356	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1357	mipmap => 1, wrap => 1;
1141		1358
1142	my @border =	1359	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1360	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1361	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1362
		1363	my @icon =
		1364	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1365	qw(x1_move.png x1_resize.png);
1145		1366
1146	sub new {	1367	sub new {
1147	my ($class, %arg) = @_;	1368	my ($class, %arg) = @_;
1148		1369
1149	my $self = $class->SUPER::new (	1370	my $self = $class->SUPER::new (
…		…
1154	min_w => 64,	1375	min_w => 64,
1155	min_h => 32,	1376	min_h => 32,
1156	%arg,	1377	%arg,
1157	);	1378	);
1158		1379
1159	$self->{title_widget} = new CFClient::UI::Label	1380	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1381	align => 0,
1161	valign => 1,	1382	valign => 1,
1162	text => $self->{title},	1383	text => $self->{title},
1163	fontsize => $self->{border},	1384	fontsize => $self->{border},
1164	if exists $self->{title};	1385	if exists $self->{title};
1165		1386
1166	if ($self->{has_close_button}) {	1387	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1388	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1389	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1390	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1391	on_activate => sub { $self->emit ("delete") };
1171		1392
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1393	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1394	}
1174		1395
1175	$self	1396	$self
1176	}	1397	}
1177		1398
1178	sub add {	1399	sub add {
1179	my ($self, @widgets) = @_;	1400	my ($self, @widgets) = @_;
1180		1401
1181	$self->SUPER::add (@widgets);	1402	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1403	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1404	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1405	}
1185		1406
1186	sub border {	1407	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1408	int $_[0]{border} * $::FONTSIZE
1188	}	1409	}
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1517	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1518
1298	! ! $self->{motion}	1519	! ! $self->{motion}
1299	}	1520	}
1300		1521
		1522	sub invoke_visibility_change {
		1523	my ($self, $visible) = @_;
		1524
		1525	delete $self->{motion} unless $visible;
		1526
		1527	0
		1528	}
		1529
1301	sub _draw {	1530	sub _draw {
1302	my ($self) = @_;	1531	my ($self) = @_;
1303		1532
1304	my $child = $self->{children}[0];	1533	my $child = $self->{children}[0];
1305		1534
…		…
1310	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1539	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311		1540
1312	my $border = $self->border;	1541	my $border = $self->border;
1313		1542
1314	glColor @{ $self->{border_bg} };	1543	glColor @{ $self->{border_bg} };
1315	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1544	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1545	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1546	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1547	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1548
		1549	# move
		1550	my $w2 = ($w - $border) * .5;
		1551	my $h2 = ($h - $border) * .5;
		1552	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1553	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1554	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1555
		1556	# resize
		1557	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1558	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1559	unless $self->{has_close_button};
		1560	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1561	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1319		1562
1320	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1563	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321	glColor @{ $self->{bg} };	1564	glColor @{ $self->{bg} };
1322		1565
1323	# TODO: repeat texture not scale	1566	# TODO: repeat texture not scale
…		…
1342	if $self->{close_button};	1585	if $self->{close_button};
1343	}	1586	}
1344		1587
1345	#############################################################################	1588	#############################################################################
1346		1589
1347	package CFClient::UI::Table;	1590	package CFPlus::UI::Table;
1348		1591
1349	our @ISA = CFClient::UI::Base::;	1592	our @ISA = CFPlus::UI::Container::;
1350		1593
1351	use List::Util qw(max sum);	1594	use List::Util qw(max sum);
1352		1595
1353	use CFClient::OpenGL;	1596	use CFPlus::OpenGL;
1354		1597
1355	sub new {	1598	sub new {
1356	my $class = shift;	1599	my $class = shift;
1357		1600
1358	$class->SUPER::new (	1601	$class->SUPER::new (
1359	col_expand => [],	1602	col_expand => [],
		1603	row_expand => [],
1360	@_,	1604	@_,
1361	)	1605	)
1362	}	1606	}
1363		1607
1364	sub children {
1365	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366	}
1367
1368	sub add {	1608	sub add {
		1609	my ($self, @widgets) = @_;
		1610
		1611	for my $child (@widgets) {
		1612	$child->{rowspan} ||= 1;
		1613	$child->{colspan} ||= 1;
		1614	}
		1615
		1616	$self->SUPER::add (@widgets);
		1617	}
		1618
		1619	sub add_at {
1369	my ($self) = shift;	1620	my $self = shift;
		1621
		1622	my @widgets;
1370		1623
1371	while (@_) {	1624	while (@_) {
1372	my ($x, $y, $child) = splice @_, 0, 3, ();	1625	my ($col, $row, $child) = splice @_, 0, 3, ();
1373	$child->set_parent ($self);
1374	$self->{children}[$y][$x] = $child;
1375	}
1376		1626
1377	$self->{force_realloc} = 1;	1627	$child->{row} = $row;
1378	$self->{force_size_alloc} = 1;	1628	$child->{col} = $col;
1379	$self->realloc;
1380	}
1381		1629
1382	sub remove {	1630	push @widgets, $child;
		1631	}
		1632
		1633	$self->add (@widgets);
		1634	}
		1635
		1636	sub get_wh {
1383	my ($self, $child) = @_;	1637	my ($self) = @_;
1384		1638
1385	# TODO: not yet implemented	1639	my (@w, @h);
1386	}
1387
1388	# TODO: move to container class maybe? send children a signal on removal?
1389	sub clear {
1390	my ($self) = @_;
1391		1640
1392	my @children = $self->children;	1641	my @children = $self->children;
1393	delete $self->{children};	1642
		1643	# first pass, columns
		1644	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1645	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1646
		1647	my $sw = sum @w[$c .. $c + $cs - 1];
		1648
		1649	if ($w > $sw) {
		1650	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1651	}
1394		1652	}
1395	for (@children) {
1396	delete $_->{parent};
1397	$_->hide;
1398	}
1399		1653
1400	$self->realloc;	1654	# second pass, rows
1401	}	1655	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1402
1403	sub get_wh {
1404	my ($self) = @_;
1405
1406	my (@w, @h);
1407
1408	for my $y (0 .. $#{$self->{children}}) {
1409	my $row = $self->{children}[$y]
1410	or next;
1411
1412	for my $x (0 .. $#$row) {
1413	my $widget = $row->[$x]
1414	or next;
1415	my ($w, $h) = @$widget{qw(req_w req_h)};	1656	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1416		1657
1417	$w[$x] = max $w[$x], $w;	1658	my $sh = sum @h[$r .. $r + $rs - 1];
1418	$h[$y] = max $h[$y], $h;	1659
		1660	if ($h > $sh) {
		1661	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1419	}	1662	}
1420	}	1663	}
1421		1664
1422	(\@w, \@h)	1665	(\@w, \@h)
1423	}	1666	}
…		…
1439	my ($ws, $hs) = $self->get_wh;	1682	my ($ws, $hs) = $self->get_wh;
1440		1683
1441	my $req_w = (sum @$ws) || 1;	1684	my $req_w = (sum @$ws) || 1;
1442	my $req_h = (sum @$hs) || 1;	1685	my $req_h = (sum @$hs) || 1;
1443		1686
1444	# TODO: nicer code && do row_expand	1687	# now linearly scale the rows/columns to the allocated size
1445	my @col_expand = @{$self->{col_expand}};	1688	my @col_expand = @{$self->{col_expand}};
1446	@col_expand = (1) x @$ws unless @col_expand;	1689	@col_expand = (1) x @$ws unless @col_expand;
1447	my $col_expand = (sum @col_expand) || 1;	1690	my $col_expand = (sum @col_expand) || 1;
1448		1691
1449	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1692	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1693
1453	CFClient::UI::harmonize $ws;	1694	CFPlus::UI::harmonize $ws;
		1695
		1696	my @row_expand = @{$self->{row_expand}};
		1697	@row_expand = (1) x @$ws unless @row_expand;
		1698	my $row_expand = (sum @row_expand) || 1;
		1699
		1700	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1701
1454	CFClient::UI::harmonize $hs;	1702	CFPlus::UI::harmonize $hs;
1455		1703
1456	my $y;	1704	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1705	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1457		1706
1458	for my $r (0 .. $#{$self->{children}}) {	1707	for my $widget ($self->children) {
1459	my $row = $self->{children}[$r]	1708	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1460	or next;
1461		1709
1462	my $x = 0;	1710	$widget->configure (
1463	my $row_h = $hs->[$r];	1711	$x[$c], $y[$r],
		1712	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1464		1713	);
1465	for my $c (0 .. $#$row) {	1714	}
1466	my $col_w = $ws->[$c];
1467		1715
1468	if (my $widget = $row->[$c]) {	1716	1
1469	$widget->configure ($x, $y, $col_w, $row_h);	1717	}
1470	}
1471		1718
1472	$x += $col_w;	1719	#############################################################################
		1720
		1721	package CFPlus::UI::Fixed;
		1722
		1723	use List::Util qw(min max);
		1724
		1725	our @ISA = CFPlus::UI::Container::;
		1726
		1727	sub add {
		1728	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1729
		1730	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1731	$self->SUPER::add ($child);
		1732	}
		1733
		1734	sub _scale($$$) {
		1735	my ($mode, $val, $max) = @_;
		1736
		1737	$mode eq "abs" ? $val
		1738	: $mode eq "rel" ? $val * $max
		1739	: 0
		1740	}
		1741
		1742	sub size_request {
		1743	my ($self) = @_;
		1744
		1745	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1746
		1747	# determine overall size by querying abs widgets
		1748	for my $child ($self->visible_children) {
		1749	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1750
		1751	if ($pos eq "abs") {
		1752	$w = _scale $size, $w, $child->{req_w};
		1753	$h = _scale $size, $h, $child->{req_h};
		1754
		1755	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1756	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1473	}	1757	}
		1758	}
1474		1759
1475	$y += $row_h;	1760	my $W = $x2 - $x1;
		1761	my $H = $y2 - $y1;
		1762
		1763	# now layout remaining widgets
		1764	for my $child ($self->visible_children) {
		1765	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1766
		1767	if ($pos ne "abs") {
		1768	$x = _scale $pos, $x, $W;
		1769	$y = _scale $pos, $x, $H;
		1770	$w = _scale $size, $w, $child->{req_w};
		1771	$h = _scale $size, $h, $child->{req_h};
		1772
		1773	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1774	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1775	}
		1776	}
		1777
		1778	my $W = $x2 - $x1;
		1779	my $H = $y2 - $y1;
		1780
		1781	($W, $H)
		1782	}
		1783
		1784	sub invoke_size_allocate {
		1785	my ($self, $W, $H) = @_;
		1786
		1787	for my $child ($self->visible_children) {
		1788	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1789
		1790	$x = _scale $pos, $x, $W;
		1791	$y = _scale $pos, $x, $H;
		1792	$w = _scale $size, $w, $child->{req_w};
		1793	$h = _scale $size, $h, $child->{req_h};
		1794
		1795	$child->configure ($x, $y, $w, $h);
1476	}	1796	}
1477		1797
1478	1	1798	1
1479	}	1799	}
1480		1800
1481	sub find_widget {
1482	my ($self, $x, $y) = @_;
1483
1484	$x -= $self->{x};
1485	$y -= $self->{y};
1486
1487	my $res;
1488
1489	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1490	$res = $_->find_widget ($x, $y)
1491	and return $res;
1492	}
1493
1494	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1495	}
1496
1497	sub _draw {
1498	my ($self) = @_;
1499
1500	for (grep $_, @{$self->{children}}) {
1501	$_->draw for grep $_, @$_;
1502	}
1503	}
1504
1505	#############################################################################	1801	#############################################################################
1506		1802
1507	package CFClient::UI::Box;	1803	package CFPlus::UI::Box;
1508		1804
1509	our @ISA = CFClient::UI::Container::;	1805	our @ISA = CFPlus::UI::Container::;
1510		1806
1511	sub size_request {	1807	sub size_request {
1512	my ($self) = @_;	1808	my ($self) = @_;
1513		1809
1514	$self->{vertical}	1810	$self->{vertical}
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1843	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1844	for 0 .. $#children;
1549	}	1845	}
1550	}	1846	}
1551		1847
1552	CFClient::UI::harmonize \@req;	1848	CFPlus::UI::harmonize \@req;
1553		1849
1554	my $pos = 0;	1850	my $pos = 0;
1555	for (0 .. $#children) {	1851	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1852	my $alloc = $req[$_];
1557	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1853	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1562	1	1858	1
1563	}	1859	}
1564		1860
1565	#############################################################################	1861	#############################################################################
1566		1862
1567	package CFClient::UI::HBox;	1863	package CFPlus::UI::HBox;
1568		1864
1569	our @ISA = CFClient::UI::Box::;	1865	our @ISA = CFPlus::UI::Box::;
1570		1866
1571	sub new {	1867	sub new {
1572	my $class = shift;	1868	my $class = shift;
1573		1869
1574	$class->SUPER::new (	1870	$class->SUPER::new (
…		…
1577	)	1873	)
1578	}	1874	}
1579		1875
1580	#############################################################################	1876	#############################################################################
1581		1877
1582	package CFClient::UI::VBox;	1878	package CFPlus::UI::VBox;
1583		1879
1584	our @ISA = CFClient::UI::Box::;	1880	our @ISA = CFPlus::UI::Box::;
1585		1881
1586	sub new {	1882	sub new {
1587	my $class = shift;	1883	my $class = shift;
1588		1884
1589	$class->SUPER::new (	1885	$class->SUPER::new (
…		…
1592	)	1888	)
1593	}	1889	}
1594		1890
1595	#############################################################################	1891	#############################################################################
1596		1892
1597	package CFClient::UI::Label;	1893	package CFPlus::UI::Label;
1598		1894
1599	our @ISA = CFClient::UI::DrawBG::;	1895	our @ISA = CFPlus::UI::DrawBG::;
1600		1896
1601	use CFClient::OpenGL;	1897	use CFPlus::OpenGL;
1602		1898
1603	sub new {	1899	sub new {
1604	my ($class, %arg) = @_;	1900	my ($class, %arg) = @_;
1605		1901
1606	my $self = $class->SUPER::new (	1902	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1905	#active_bg => none
1610	#font => default_font	1906	#font => default_font
1611	#text => initial text	1907	#text => initial text
1612	#markup => initial narkup	1908	#markup => initial narkup
1613	#max_w => maximum pixel width	1909	#max_w => maximum pixel width
		1910	#style => 0, # render flags
1614	ellipsise => 3, # end	1911	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1912	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1913	fontsize => 1,
1617	align => -1,	1914	align => -1,
1618	valign => -1,	1915	valign => -1,
1619	padding_x => 2,	1916	padding_x => 2,
1620	padding_y => 2,	1917	padding_y => 2,
1621	can_events => 0,	1918	can_events => 0,
1622	%arg	1919	%arg
1623	);	1920	);
1624		1921
1625	if (exists $self->{template}) {	1922	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1923	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1924	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1925	$self->{template} = $layout;
1629	}	1926	}
1630		1927
1631	if (exists $self->{markup}) {	1928	if (exists $self->{markup}) {
…		…
1769	};	2066	};
1770		2067
1771	my $w = List::Util::min $self->{w} + 4, $size->[0];	2068	my $w = List::Util::min $self->{w} + 4, $size->[0];
1772	my $h = List::Util::min $self->{h} + 2, $size->[1];	2069	my $h = List::Util::min $self->{h} + 2, $size->[1];
1773		2070
1774	$self->{layout}->render ($self->{ox}, $self->{oy});	2071	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775	}	2072	}
1776		2073
1777	#############################################################################	2074	#############################################################################
1778		2075
1779	package CFClient::UI::EntryBase;	2076	package CFPlus::UI::EntryBase;
1780		2077
1781	our @ISA = CFClient::UI::Label::;	2078	our @ISA = CFPlus::UI::Label::;
1782		2079
1783	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1784		2081
1785	sub new {	2082	sub new {
1786	my $class = shift;	2083	my $class = shift;
1787		2084
1788	$class->SUPER::new (	2085	$class->SUPER::new (
…		…
1792	active_fg => [0, 0, 0],	2089	active_fg => [0, 0, 0],
1793	can_hover => 1,	2090	can_hover => 1,
1794	can_focus => 1,	2091	can_focus => 1,
1795	valign => 0,	2092	valign => 0,
1796	can_events => 1,	2093	can_events => 1,
		2094	ellipsise => 0,
1797	#text => ...	2095	#text => ...
1798	#hidden => "*",	2096	#hidden => "*",
1799	@_	2097	@_
1800	)	2098	)
1801	}	2099	}
…		…
1846	my $sym = $ev->{sym};	2144	my $sym = $ev->{sym};
1847	my $uni = $ev->{unicode};	2145	my $uni = $ev->{unicode};
1848		2146
1849	my $text = $self->get_text;	2147	my $text = $self->get_text;
1850		2148
		2149	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2150
1851	if ($uni == 8) {	2151	if ($uni == 8) {
1852	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2152	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853	} elsif ($uni == 127) {	2153	} elsif ($uni == 127) {
1854	substr $text, $self->{cursor}, 1, "";	2154	substr $text, $self->{cursor}, 1, "";
1855	} elsif ($sym == CFClient::SDLK_LEFT) {	2155	} elsif ($sym == CFPlus::SDLK_LEFT) {
1856	--$self->{cursor} if $self->{cursor};	2156	--$self->{cursor} if $self->{cursor};
1857	} elsif ($sym == CFClient::SDLK_RIGHT) {	2157	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1858	++$self->{cursor} if $self->{cursor} < length $self->{text};	2158	++$self->{cursor} if $self->{cursor} < length $self->{text};
1859	} elsif ($sym == CFClient::SDLK_HOME) {	2159	} elsif ($sym == CFPlus::SDLK_HOME) {
		2160	# what a hack
		2161	$self->{cursor} =
		2162	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2163	? length $1
		2164	: 0;
		2165	} elsif ($sym == CFPlus::SDLK_END) {
		2166	# uh, again
		2167	$self->{cursor} =
		2168	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2169	? $self->{cursor} + length $1
		2170	: length $self->{text};
		2171	} elsif ($uni == 21) { # ctrl-u
		2172	$text = "";
1860	$self->{cursor} = 0;	2173	$self->{cursor} = 0;
1861	} elsif ($sym == CFClient::SDLK_END) {
1862	$self->{cursor} = length $text;
1863	} elsif ($uni == 27) {	2174	} elsif ($uni == 27) {
1864	$self->emit ('escape');	2175	$self->emit ('escape');
1865	} elsif ($uni) {	2176	} elsif ($uni == 0x0d) {
		2177	substr $text, $self->{cursor}++, 0, "\012";
		2178	} elsif ($uni >= 0x20) {
1866	substr $text, $self->{cursor}++, 0, chr $uni;	2179	substr $text, $self->{cursor}++, 0, chr $uni;
1867	} else {	2180	} else {
1868	return 0;	2181	return 0;
1869	}	2182	}
1870		2183
1871	$self->_set_text ($text);	2184	$self->_set_text ($text);
1872		2185
1873	$self->realloc;	2186	$self->realloc;
		2187	$self->update;
1874		2188
1875	1	2189	1
1876	}	2190	}
1877		2191
1878	sub invoke_focus_in {	2192	sub invoke_focus_in {
…		…
1940	utf8::encode $text;	2254	utf8::encode $text;
1941		2255
1942	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2256	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943	}	2257	}
1944		2258
1945	glColor @{$self->{fg}};
1946	glBegin GL_LINES;	2259	glBegin GL_LINES;
1947	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2260	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1948	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2261	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949	glEnd;	2262	glEnd;
1950	}	2263	}
1951	}	2264	}
1952		2265
		2266	#############################################################################
		2267
1953	package CFClient::UI::Entry;	2268	package CFPlus::UI::Entry;
1954		2269
1955	our @ISA = CFClient::UI::EntryBase::;	2270	our @ISA = CFPlus::UI::EntryBase::;
1956		2271
1957	use CFClient::OpenGL;	2272	use CFPlus::OpenGL;
1958		2273
1959	sub invoke_key_down {	2274	sub invoke_key_down {
1960	my ($self, $ev) = @_;	2275	my ($self, $ev) = @_;
1961		2276
1962	my $sym = $ev->{sym};	2277	my $sym = $ev->{sym};
1963		2278
1964	if ($sym == 13) {	2279	if ($ev->{uni} == 0x0d || $sym == 13) {
1965	unshift @{$self->{history}},	2280	unshift @{$self->{history}},
1966	my $txt = $self->get_text;	2281	my $txt = $self->get_text;
1967		2282
1968	$self->{history_pointer} = -1;	2283	$self->{history_pointer} = -1;
1969	$self->{history_saveback} = '';	2284	$self->{history_saveback} = '';
1970	$self->emit (activate => $txt);	2285	$self->emit (activate => $txt);
1971	$self->update;	2286	$self->update;
1972		2287
1973	} elsif ($sym == CFClient::SDLK_UP) {	2288	} elsif ($sym == CFPlus::SDLK_UP) {
1974	if ($self->{history_pointer} < 0) {	2289	if ($self->{history_pointer} < 0) {
1975	$self->{history_saveback} = $self->get_text;	2290	$self->{history_saveback} = $self->get_text;
1976	}	2291	}
1977	if (@{$self->{history} || []} > 0) {	2292	if (@{$self->{history} || []} > 0) {
1978	$self->{history_pointer}++;	2293	$self->{history_pointer}++;
…		…
1980	$self->{history_pointer} = @{$self->{history} || []} - 1;	2295	$self->{history_pointer} = @{$self->{history} || []} - 1;
1981	}	2296	}
1982	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2297	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1983	}	2298	}
1984		2299
1985	} elsif ($sym == CFClient::SDLK_DOWN) {	2300	} elsif ($sym == CFPlus::SDLK_DOWN) {
1986	$self->{history_pointer}--;	2301	$self->{history_pointer}--;
1987	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2302	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988		2303
1989	if ($self->{history_pointer} >= 0) {	2304	if ($self->{history_pointer} >= 0) {
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2305	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1999	1	2314	1
2000	}	2315	}
2001		2316
2002	#############################################################################	2317	#############################################################################
2003		2318
		2319	package CFPlus::UI::TextEdit;
		2320
		2321	our @ISA = CFPlus::UI::EntryBase::;
		2322
		2323	use CFPlus::OpenGL;
		2324
		2325	sub move_cursor_ver {
		2326	my ($self, $dy) = @_;
		2327
		2328	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2329
		2330	$y += $dy;
		2331
		2332	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2333	$self->{cursor} = $index;
		2334	delete $self->{cur_h};
		2335	$self->update;
		2336	return;
		2337	}
		2338	}
		2339
		2340	sub invoke_key_down {
		2341	my ($self, $ev) = @_;
		2342
		2343	my $sym = $ev->{sym};
		2344
		2345	if ($sym == CFPlus::SDLK_UP) {
		2346	$self->move_cursor_ver (-1);
		2347	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2348	$self->move_cursor_ver (+1);
		2349	} else {
		2350	return $self->SUPER::invoke_key_down ($ev)
		2351	}
		2352
		2353	1
		2354	}
		2355
		2356	#############################################################################
		2357
2004	package CFClient::UI::Button;	2358	package CFPlus::UI::Button;
2005		2359
2006	our @ISA = CFClient::UI::Label::;	2360	our @ISA = CFPlus::UI::Label::;
2007		2361
2008	use CFClient::OpenGL;	2362	use CFPlus::OpenGL;
2009		2363
2010	my @tex =	2364	my @tex =
2011	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2365	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012	qw(b1_button_active.png);	2366	qw(b1_button_inactive.png b1_button_active.png);
2013		2367
2014	sub new {	2368	sub new {
2015	my $class = shift;	2369	my $class = shift;
2016		2370
2017	$class->SUPER::new (	2371	$class->SUPER::new (
2018	padding_x => 4,	2372	padding_x => 4,
2019	padding_y => 4,	2373	padding_y => 4,
2020	fg => [1, 1, 1],	2374	fg => [1.0, 1.0, 1.0],
2021	active_fg => [0, 0, 1],	2375	active_fg => [0.8, 0.8, 0.8],
2022	can_hover => 1,	2376	can_hover => 1,
2023	align => 0,	2377	align => 0,
2024	valign => 0,	2378	valign => 0,
2025	can_events => 1,	2379	can_events => 1,
2026	@_	2380	@_
…		…
2044		2398
2045	glEnable GL_TEXTURE_2D;	2399	glEnable GL_TEXTURE_2D;
2046	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2047	glColor 0, 0, 0, 1;	2401	glColor 0, 0, 0, 1;
2048		2402
		2403	my $tex = $tex[$GRAB == $self];
2049	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2404	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2050		2405
2051	glDisable GL_TEXTURE_2D;	2406	glDisable GL_TEXTURE_2D;
2052		2407
2053	$self->SUPER::_draw;	2408	$self->SUPER::_draw;
2054	}	2409	}
2055		2410
2056	#############################################################################	2411	#############################################################################
2057		2412
2058	package CFClient::UI::CheckBox;	2413	package CFPlus::UI::CheckBox;
2059		2414
2060	our @ISA = CFClient::UI::DrawBG::;	2415	our @ISA = CFPlus::UI::DrawBG::;
2061		2416
2062	my @tex =	2417	my @tex =
2063	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2418	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2064	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2419	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065		2420
2066	use CFClient::OpenGL;	2421	use CFPlus::OpenGL;
2067		2422
2068	sub new {	2423	sub new {
2069	my $class = shift;	2424	my $class = shift;
2070		2425
2071	$class->SUPER::new (	2426	$class->SUPER::new (
…		…
2128	glDisable GL_TEXTURE_2D;	2483	glDisable GL_TEXTURE_2D;
2129	}	2484	}
2130		2485
2131	#############################################################################	2486	#############################################################################
2132		2487
2133	package CFClient::UI::Image;	2488	package CFPlus::UI::Image;
2134		2489
2135	our @ISA = CFClient::UI::Base::;	2490	our @ISA = CFPlus::UI::Base::;
2136		2491
2137	use CFClient::OpenGL;	2492	use CFPlus::OpenGL;
2138		2493
2139	our %texture_cache;	2494	our %texture_cache;
2140		2495
2141	sub new {	2496	sub new {
2142	my $class = shift;	2497	my $class = shift;
…		…
2148		2503
2149	$self->{path} || $self->{tex}	2504	$self->{path} || $self->{tex}
2150	or Carp::croak "'path' or 'tex' attributes required";	2505	or Carp::croak "'path' or 'tex' attributes required";
2151		2506
2152	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2507	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2153	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;	2508	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2154		2509
2155	Scalar::Util::weaken $texture_cache{$self->{path}};	2510	CFPlus::weaken $texture_cache{$self->{path}};
2156		2511
2157	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2512	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158		2513
2159	$self	2514	$self
2160	}	2515	}
2161		2516
2162	sub STORABLE_freeze {	2517	sub STORABLE_freeze {
2163	my ($self, $cloning) = @_;	2518	my ($self, $cloning) = @_;
2164		2519
2165	$self->{path}	2520	$self->{path}
2166	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";	2521	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2167		2522
2168	$self->{path}	2523	$self->{path}
2169	}	2524	}
2170		2525
2171	sub STORABLE_attach {	2526	sub STORABLE_attach {
…		…
2202	glDisable GL_TEXTURE_2D;	2557	glDisable GL_TEXTURE_2D;
2203	}	2558	}
2204		2559
2205	#############################################################################	2560	#############################################################################
2206		2561
2207	package CFClient::UI::ImageButton;	2562	package CFPlus::UI::ImageButton;
2208		2563
2209	our @ISA = CFClient::UI::Image::;	2564	our @ISA = CFPlus::UI::Image::;
2210		2565
2211	use CFClient::OpenGL;	2566	use CFPlus::OpenGL;
2212		2567
2213	my %textures;	2568	my %textures;
2214		2569
2215	sub new {	2570	sub new {
2216	my $class = shift;	2571	my $class = shift;
…		…
2238	1	2593	1
2239	}	2594	}
2240		2595
2241	#############################################################################	2596	#############################################################################
2242		2597
2243	package CFClient::UI::VGauge;	2598	package CFPlus::UI::VGauge;
2244		2599
2245	our @ISA = CFClient::UI::Base::;	2600	our @ISA = CFPlus::UI::Base::;
2246		2601
2247	use List::Util qw(min max);	2602	use List::Util qw(min max);
2248		2603
2249	use CFClient::OpenGL;	2604	use CFPlus::OpenGL;
2250		2605
2251	my %tex = (	2606	my %tex = (
2252	food => [	2607	food => [
2253	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2608	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2609	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255	],	2610	],
2256	grace => [	2611	grace => [
2257	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2258	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2613	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259	],	2614	],
2260	hp => [	2615	hp => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2617	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263	],	2618	],
2264	mana => [	2619	mana => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2621	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267	],	2622	],
2268	);	2623	);
2269		2624
2270	# eg. VGauge->new (gauge => 'food'), default gauge: food	2625	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2373	glDisable GL_TEXTURE_2D;	2728	glDisable GL_TEXTURE_2D;
2374	}	2729	}
2375		2730
2376	#############################################################################	2731	#############################################################################
2377		2732
2378	package CFClient::UI::Gauge;	2733	package CFPlus::UI::Gauge;
2379		2734
2380	our @ISA = CFClient::UI::VBox::;	2735	our @ISA = CFPlus::UI::VBox::;
2381		2736
2382	sub new {	2737	sub new {
2383	my ($class, %arg) = @_;	2738	my ($class, %arg) = @_;
2384		2739
2385	my $self = $class->SUPER::new (	2740	my $self = $class->SUPER::new (
…		…
2387	can_hover => 1,	2742	can_hover => 1,
2388	can_events => 1,	2743	can_events => 1,
2389	%arg,	2744	%arg,
2390	);	2745	);
2391		2746
2392	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2747	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2393	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2748	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2394	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2749	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395		2750
2396	$self	2751	$self
2397	}	2752	}
2398		2753
2399	sub set_fontsize {	2754	sub set_fontsize {
…		…
2420	$self->{value}->set_text ($val);	2775	$self->{value}->set_text ($val);
2421	}	2776	}
2422		2777
2423	#############################################################################	2778	#############################################################################
2424		2779
2425	package CFClient::UI::Slider;	2780	package CFPlus::UI::Slider;
2426		2781
2427	use strict;	2782	use strict;
2428		2783
2429	use CFClient::OpenGL;	2784	use CFPlus::OpenGL;
2430		2785
2431	our @ISA = CFClient::UI::DrawBG::;	2786	our @ISA = CFPlus::UI::DrawBG::;
2432		2787
2433	my @tex =	2788	my @tex =
2434	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2789	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435	qw(s1_slider.png s1_slider_bg.png);	2790	qw(s1_slider.png s1_slider_bg.png);
2436		2791
2437	sub new {	2792	sub new {
2438	my $class = shift;	2793	my $class = shift;
2439		2794
…		…
2533	sub invoke_mouse_wheel {	2888	sub invoke_mouse_wheel {
2534	my ($self, $ev) = @_;	2889	my ($self, $ev) = @_;
2535		2890
2536	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2891	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537		2892
		2893	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2894
2538	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2895	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539		2896
2540	! ! $delta	2897	! ! $delta
2541	}	2898	}
2542		2899
2543	sub update {	2900	sub update {
…		…
2594	glDisable GL_TEXTURE_2D;	2951	glDisable GL_TEXTURE_2D;
2595	}	2952	}
2596		2953
2597	#############################################################################	2954	#############################################################################
2598		2955
2599	package CFClient::UI::ValSlider;	2956	package CFPlus::UI::ValSlider;
2600		2957
2601	our @ISA = CFClient::UI::HBox::;	2958	our @ISA = CFPlus::UI::HBox::;
2602		2959
2603	sub new {	2960	sub new {
2604	my ($class, %arg) = @_;	2961	my ($class, %arg) = @_;
2605		2962
2606	my $range = delete $arg{range};	2963	my $range = delete $arg{range};
2607		2964
2608	my $self = $class->SUPER::new (	2965	my $self = $class->SUPER::new (
2609	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2966	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2967	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611	to_value => sub { shift },	2968	to_value => sub { shift },
2612	from_value => sub { shift },	2969	from_value => sub { shift },
2613	%arg,	2970	%arg,
2614	);	2971	);
2615		2972
…		…
2635	sub set_range { shift->{slider}->set_range (@_) }	2992	sub set_range { shift->{slider}->set_range (@_) }
2636	sub set_value { shift->{slider}->set_value (@_) }	2993	sub set_value { shift->{slider}->set_value (@_) }
2637		2994
2638	#############################################################################	2995	#############################################################################
2639		2996
2640	package CFClient::UI::TextScroller;	2997	package CFPlus::UI::TextScroller;
2641		2998
2642	our @ISA = CFClient::UI::HBox::;	2999	our @ISA = CFPlus::UI::HBox::;
2643		3000
2644	use CFClient::OpenGL;	3001	use CFPlus::OpenGL;
2645		3002
2646	sub new {	3003	sub new {
2647	my $class = shift;	3004	my $class = shift;
2648		3005
2649	my $self = $class->SUPER::new (	3006	my $self = $class->SUPER::new (
…		…
2651	can_events => 1,	3008	can_events => 1,
2652	indent => 0,	3009	indent => 0,
2653	#font => default_font	3010	#font => default_font
2654	@_,	3011	@_,
2655		3012
2656	layout => (new CFClient::Layout),	3013	layout => (new CFPlus::Layout),
2657	par => [],	3014	par => [],
		3015	max_par => 0,
2658	height => 0,	3016	height => 0,
2659	children => [	3017	children => [
2660	(new CFClient::UI::Empty expand => 1),	3018	(new CFPlus::UI::Empty expand => 1),
2661	(new CFClient::UI::Slider vertical => 1),	3019	(new CFPlus::UI::Slider vertical => 1),
2662	],	3020	],
2663	);	3021	);
2664		3022
2665	$self->{children}[1]->connect (changed => sub { $self->update });	3023	$self->{children}[1]->connect (changed => sub { $self->update });
2666		3024
…		…
2743		3101
2744	# todo: base offset on lines or so, not on pixels	3102	# todo: base offset on lines or so, not on pixels
2745	$self->{children}[1]->set_value ($offset);	3103	$self->{children}[1]->set_value ($offset);
2746	}	3104	}
2747		3105
		3106	sub current_paragraph {
		3107	my ($self) = @_;
		3108
		3109	$self->{top_paragraph} - 1
		3110	}
		3111
		3112	sub scroll_to {
		3113	my ($self, $para) = @_;
		3114
		3115	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3116
		3117	$self->{scroll_to} = $para;
		3118	$self->update;
		3119	}
		3120
2748	sub clear {	3121	sub clear {
2749	my ($self) = @_;	3122	my ($self) = @_;
2750		3123
2751	my (undef, undef, @other) = @{ $self->{children} };	3124	my (undef, undef, @other) = @{ $self->{children} };
2752	$self->remove ($_) for @other;	3125	$self->remove ($_) for @other;
…		…
2755	$self->{height} = 0;	3128	$self->{height} = 0;
2756	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3129	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757	}	3130	}
2758		3131
2759	sub add_paragraph {	3132	sub add_paragraph {
2760	my ($self, $color, $para, $indent) = @_;	3133	my $self = shift;
2761		3134
2762	my ($text, @w) = ref $para ? @$para : $para;	3135	for my $para (@_) {
2763
2764	$para = {	3136	$para = {
		3137	fg => [1, 1, 1, 1],
		3138	indent => 0,
		3139	markup => "",
		3140	widget => [],
		3141	ref $para ? %$para : (markup => $para),
2765	w => 1e10,	3142	w => 1e10,
2766	wrapped => 1,	3143	wrapped => 1,
2767	fg => $color,
2768	indent => $indent,
2769	markup => $text,
2770	widget => \@w,
2771	};	3144	};
2772		3145
2773	$self->add (@w) if @w;	3146	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774	push @{$self->{par}}, $para;	3147	push @{$self->{par}}, $para;
		3148	}
		3149
		3150	if (my $max = $self->{max_par}) {
		3151	shift @{$self->{par}} while @{$self->{par}} > $max;
		3152	}
2775		3153
2776	$self->{need_reflow}++;	3154	$self->{need_reflow}++;
2777	$self->update;	3155	$self->update;
2778	}	3156	}
2779		3157
2780	sub scroll_to_bottom {	3158	sub scroll_to_bottom {
2781	my ($self) = @_;	3159	my ($self) = @_;
2782		3160
2783	$self->{scroll_to_bottom} = 1;	3161	$self->{scroll_to} = $#{$self->{par}};
2784	$self->update;	3162	$self->update;
2785	}	3163	}
2786		3164
		3165	sub force_uptodate {
		3166	my ($self) = @_;
		3167
		3168	if (delete $self->{need_reflow}) {
		3169	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3170
		3171	my $height = 0;
		3172
		3173	for my $para (@{$self->{par}}) {
		3174	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3175	my $layout = $self->get_layout ($para);
		3176	my ($w, $h) = $layout->size;
		3177
		3178	$para->{w} = $w + $para->{indent};
		3179	$para->{h} = $h;
		3180	$para->{wrapped} = $layout->has_wrapped;
		3181	}
		3182
		3183	$para->{y} = $height;
		3184	$height += $para->{h};
		3185	}
		3186
		3187	$self->{height} = $height;
		3188	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3189
		3190	delete $self->{texture};
		3191	}
		3192
		3193	if (my $paridx = delete $self->{scroll_to}) {
		3194	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3195	}
		3196	}
		3197
2787	sub update {	3198	sub update {
2788	my ($self) = @_;	3199	my ($self) = @_;
2789		3200
2790	$self->SUPER::update;	3201	$self->SUPER::update;
2791		3202
2792	return unless $self->{h} > 0;	3203	return unless $self->{h} > 0;
2793		3204
2794	delete $self->{texture};	3205	delete $self->{texture};
2795		3206
2796	$ROOT->on_post_alloc ($self => sub {	3207	$ROOT->on_post_alloc ($self => sub {
		3208	$self->force_uptodate;
		3209
2797	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3210	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798		3211
2799	if (delete $self->{need_reflow}) {
2800	my $height = 0;
2801
2802	for my $para (@{$self->{par}}) {
2803	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2804	my $layout = $self->get_layout ($para);
2805	my ($w, $h) = $layout->size;
2806
2807	$para->{w} = $w + $para->{indent};
2808	$para->{h} = $h;
2809	$para->{wrapped} = $layout->has_wrapped;
2810	}
2811
2812	$height += $para->{h};
2813	}
2814
2815	$self->{height} = $height;
2816
2817	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2818
2819	delete $self->{texture};
2820	}
2821
2822	if (delete $self->{scroll_to_bottom}) {
2823	$self->{children}[1]->set_value (1e10);
2824	}
2825
2826	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3212	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2827	glClearColor 0, 0, 0, 0;	3213	glClearColor 0, 0, 0, 0;
2828	glClear GL_COLOR_BUFFER_BIT;	3214	glClear GL_COLOR_BUFFER_BIT;
2829		3215
		3216	package CFPlus::UI::Base;
		3217	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3218	(0, 0, $self->{w}, $self->{h});
		3219
		3220	my $top = int $self->{children}[1]{range}[0];
		3221
		3222	my $paridx = 0;
		3223	my $top_paragraph;
2830	my $top = int $self->{children}[1]{range}[0];	3224	my $top = int $self->{children}[1]{range}[0];
2831		3225
2832	my $y0 = $top;	3226	my $y0 = $top;
2833	my $y1 = $top + $H;	3227	my $y1 = $top + $H;
2834		3228
2835	my $y = 0;
2836
2837	for my $para (@{$self->{par}}) {	3229	for my $para (@{$self->{par}}) {
2838	my $h = $para->{h};	3230	my $h = $para->{h};
		3231	my $y = $para->{y};
2839		3232
2840	if ($y0 < $y + $h && $y < $y1) {	3233	if ($y0 < $y + $h && $y < $y1) {
2841
2842	my $layout = $self->get_layout ($para);	3234	my $layout = $self->get_layout ($para);
2843		3235
2844	$layout->render ($para->{indent}, $y - $y0);	3236	$layout->render ($para->{indent}, $y - $y0);
2845		3237
2846	if (my @w = @{ $para->{widget} }) {	3238	if (my @w = @{ $para->{widget} }) {
…		…
2855	$_->draw;	3247	$_->draw;
2856	}	3248	}
2857	}	3249	}
2858	}	3250	}
2859		3251
2860	$y += $h;	3252	$paridx++;
		3253	$top_paragraph ||= $paridx if $y >= $top;
2861	}	3254	}
		3255
		3256	$self->{top_paragraph} = $top_paragraph;
2862	};	3257	};
2863	});	3258	});
2864	}	3259	}
2865		3260
2866	sub reconfigure {	3261	sub reconfigure {
…		…
2884	$self->{children}[1]->draw;	3279	$self->{children}[1]->draw;
2885	}	3280	}
2886		3281
2887	#############################################################################	3282	#############################################################################
2888		3283
2889	package CFClient::UI::Animator;	3284	package CFPlus::UI::Animator;
2890		3285
2891	use CFClient::OpenGL;	3286	use CFPlus::OpenGL;
2892		3287
2893	our @ISA = CFClient::UI::Bin::;	3288	our @ISA = CFPlus::UI::Bin::;
2894		3289
2895	sub moveto {	3290	sub moveto {
2896	my ($self, $x, $y) = @_;	3291	my ($self, $x, $y) = @_;
2897		3292
2898	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3293	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2926	glPopMatrix;	3321	glPopMatrix;
2927	}	3322	}
2928		3323
2929	#############################################################################	3324	#############################################################################
2930		3325
2931	package CFClient::UI::Flopper;	3326	package CFPlus::UI::Flopper;
2932		3327
2933	our @ISA = CFClient::UI::Button::;	3328	our @ISA = CFPlus::UI::Button::;
2934		3329
2935	sub new {	3330	sub new {
2936	my $class = shift;	3331	my $class = shift;
2937		3332
2938	my $self = $class->SUPER::new (	3333	my $self = $class->SUPER::new (
…		…
2950	$self->{other}->toggle_visibility;	3345	$self->{other}->toggle_visibility;
2951	}	3346	}
2952		3347
2953	#############################################################################	3348	#############################################################################
2954		3349
2955	package CFClient::UI::Tooltip;	3350	package CFPlus::UI::Tooltip;
2956		3351
2957	our @ISA = CFClient::UI::Bin::;	3352	our @ISA = CFPlus::UI::Bin::;
2958		3353
2959	use CFClient::OpenGL;	3354	use CFPlus::OpenGL;
2960		3355
2961	sub new {	3356	sub new {
2962	my $class = shift;	3357	my $class = shift;
2963		3358
2964	$class->SUPER::new (	3359	$class->SUPER::new (
…		…
2967	)	3362	)
2968	}	3363	}
2969		3364
2970	sub set_tooltip_from {	3365	sub set_tooltip_from {
2971	my ($self, $widget) = @_;	3366	my ($self, $widget) = @_;
		3367
		3368	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3369	if $widget->{tooltip} =~ /^#(.*)$/;
2972		3370
2973	my $tooltip = $widget->{tooltip};	3371	my $tooltip = $widget->{tooltip};
2974		3372
2975	if ($ENV{CFPLUS_DEBUG} & 2) {	3373	if ($ENV{CFPLUS_DEBUG} & 2) {
2976	$tooltip .= "\n\n" . (ref $widget) . "\n"	3374	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2980	}	3378	}
2981		3379
2982	$tooltip =~ s/^\n+//;	3380	$tooltip =~ s/^\n+//;
2983	$tooltip =~ s/\n+$//;	3381	$tooltip =~ s/\n+$//;
2984		3382
2985	$self->add (new CFClient::UI::Label	3383	$self->add (new CFPlus::UI::Label
2986	markup => $tooltip,	3384	markup => $tooltip,
2987	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3385	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2988	fontsize => 0.8,	3386	fontsize => 0.8,
2989	fg => [0, 0, 0, 1],	3387	style => 1, # FLAG_INVERSE
2990	ellipsise => 0,	3388	ellipsise => 0,
2991	font => ($widget->{tooltip_font} || $::FONT_PROP),	3389	font => ($widget->{tooltip_font} || $::FONT_PROP),
2992	);	3390	);
2993	}	3391	}
2994		3392
…		…
3056	$self->SUPER::_draw;	3454	$self->SUPER::_draw;
3057	}	3455	}
3058		3456
3059	#############################################################################	3457	#############################################################################
3060		3458
3061	package CFClient::UI::Face;	3459	package CFPlus::UI::Face;
3062		3460
3063	our @ISA = CFClient::UI::DrawBG::;	3461	our @ISA = CFPlus::UI::DrawBG::;
3064		3462
3065	use CFClient::OpenGL;	3463	use CFPlus::OpenGL;
3066		3464
3067	sub new {	3465	sub new {
3068	my $class = shift;	3466	my $class = shift;
3069		3467
3070	my $self = $class->SUPER::new (	3468	my $self = $class->SUPER::new (
		3469	size_w => 32,
		3470	size_h => 8,
3071	aspect => 1,	3471	aspect => 1,
3072	can_events => 0,	3472	can_events => 0,
3073	@_,	3473	@_,
3074	);	3474	);
3075		3475
3076	if ($self->{anim} && $self->{animspeed}) {	3476	if ($self->{anim} && $self->{animspeed}) {
3077	Scalar::Util::weaken (my $widget = $self);	3477	CFPlus::weaken (my $widget = $self);
3078		3478
		3479	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3480	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3079	$self->{timer} = Event->timer (	3481	$self->{timer} = Event->timer (
3080	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3081	hard => 1,	3482	parked => 1,
3082	interval => $self->{animspeed},
3083	cb => sub {	3483	cb => sub {
		3484	return unless $::CONN && $widget;
		3485
3084	++$widget->{frame};	3486	++$widget->{frame};
		3487	$widget->update_face;
3085	$widget->update;	3488	$widget->update;
		3489
		3490	$widget->update_timer;
3086	},	3491	},
3087	);	3492	);
		3493
		3494	$self->update_face;
		3495	$self->update_timer;
3088	}	3496	}
3089		3497
3090	$self	3498	$self
3091	}	3499	}
3092		3500
		3501	sub update_timer {
		3502	my ($self) = @_;
		3503
		3504	return unless $self->{timer};
		3505
		3506	if ($self->{visible}) {
		3507	$self->{timer}->at (
		3508	$self->{anim_start}
		3509	+ $self->{animspeed}
		3510	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3511	);
		3512	$self->{timer}->start;
		3513	} else {
		3514	$self->{timer}->stop;
		3515	}
		3516	}
		3517
		3518	sub update_face {
		3519	my ($self) = @_;
		3520
		3521	return unless $::CONN;
		3522
		3523	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3524	if ($anim && @$anim) {
		3525	delete $self->{wait_face};
		3526	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3527	}
		3528	}
		3529	}
		3530
3093	sub size_request {	3531	sub size_request {
3094	(32, 8)	3532	my ($self) = @_;
		3533
		3534	if ($::CONN) {
		3535	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3536	if (my $tex = $::CONN->{texture}[$faceid]) {
		3537	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3538	} else {
		3539	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3540	$self->realloc;
		3541	});
		3542	}
		3543	}
		3544	}
		3545
		3546	($self->{size_w} || 8, $self->{size_h} || 8)
3095	}	3547	}
3096		3548
3097	sub update {	3549	sub update {
3098	my ($self) = @_;	3550	my ($self) = @_;
3099		3551
3100	return unless $self->{visible};	3552	return unless $self->{visible};
3101		3553
3102	$self->SUPER::update;	3554	$self->SUPER::update;
3103	}	3555	}
3104		3556
		3557	sub invoke_visibility_change {
		3558	my ($self) = @_;
		3559
		3560	$self->update_timer;
		3561
		3562	0
		3563	}
		3564
3105	sub _draw {	3565	sub _draw {
3106	my ($self) = @_;	3566	my ($self) = @_;
3107		3567
3108	return unless $::CONN;	3568	return unless $::CONN;
3109		3569
3110	$self->SUPER::_draw;	3570	$self->SUPER::_draw;
3111		3571
3112	my $face;
3113
3114	if ($self->{frame}) {
3115	my $anim = $::CONN->{anim}[$self->{anim}];	3572	my $faceid = $::CONN->{faceid}[$self->{face}]
3116		3573	or return;
3117	$face = $anim->[ $self->{frame} % @$anim ]
3118	if $anim && @$anim;
3119	}
3120		3574
3121	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3575	my $tex = $::CONN->{texture}[$faceid];
3122		3576
3123	if ($tex) {	3577	if ($tex) {
3124	glEnable GL_TEXTURE_2D;	3578	glEnable GL_TEXTURE_2D;
3125	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3579	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3126	glColor 0, 0, 0, 1;	3580	glColor 0, 0, 0, 1;
…		…
3130	}	3584	}
3131		3585
3132	sub destroy {	3586	sub destroy {
3133	my ($self) = @_;	3587	my ($self) = @_;
3134		3588
3135	$self->{timer}->cancel	3589	(delete $self->{timer})->cancel
3136	if $self->{timer};	3590	if $self->{timer};
3137		3591
3138	$self->SUPER::destroy;	3592	$self->SUPER::destroy;
3139	}	3593	}
3140		3594
3141	#############################################################################	3595	#############################################################################
3142		3596
3143	package CFClient::UI::Buttonbar;	3597	package CFPlus::UI::Buttonbar;
3144		3598
3145	our @ISA = CFClient::UI::HBox::;	3599	our @ISA = CFPlus::UI::HBox::;
3146		3600
3147	# TODO: should actualyl wrap buttons and other goodies.	3601	# TODO: should actually wrap buttons and other goodies.
3148		3602
3149	#############################################################################	3603	#############################################################################
3150		3604
3151	package CFClient::UI::Menu;	3605	package CFPlus::UI::Menu;
3152		3606
3153	our @ISA = CFClient::UI::FancyFrame::;	3607	our @ISA = CFPlus::UI::Toplevel::;
3154		3608
3155	use CFClient::OpenGL;	3609	use CFPlus::OpenGL;
3156		3610
3157	sub new {	3611	sub new {
3158	my $class = shift;	3612	my $class = shift;
3159		3613
3160	my $self = $class->SUPER::new (	3614	my $self = $class->SUPER::new (
3161	items => [],	3615	items => [],
3162	z => 100,	3616	z => 100,
3163	@_,	3617	@_,
3164	);	3618	);
3165		3619
3166	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3620	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3167		3621
3168	for my $item (@{ $self->{items} }) {	3622	for my $item (@{ $self->{items} }) {
3169	my ($widget, $cb, $tooltip) = @$item;	3623	my ($widget, $cb, $tooltip) = @$item;
3170		3624
3171	# handle various types of items, only text for now	3625	# handle various types of items, only text for now
3172	if (!ref $widget) {	3626	if (!ref $widget) {
3173	if ($widget =~ /\t/) {	3627	if ($widget =~ /\t/) {
3174	my ($left, $right) = split /\t/, $widget, 2;	3628	my ($left, $right) = split /\t/, $widget, 2;
3175		3629
3176	$widget = new CFClient::UI::HBox	3630	$widget = new CFPlus::UI::HBox
3177	can_hover => 1,	3631	can_hover => 1,
3178	can_events => 1,	3632	can_events => 1,
3179	tooltip => $tooltip,	3633	tooltip => $tooltip,
3180	children => [	3634	children => [
3181	(new CFClient::UI::Label markup => $left, expand => 1),	3635	(new CFPlus::UI::Label markup => $left, expand => 1),
3182	(new CFClient::UI::Label markup => $right, align => +1),	3636	(new CFPlus::UI::Label markup => $right, align => +1),
3183	],	3637	],
3184	;	3638	;
3185		3639
3186	} else {	3640	} else {
3187	$widget = new CFClient::UI::Label	3641	$widget = new CFPlus::UI::Label
3188	can_hover => 1,	3642	can_hover => 1,
3189	can_events => 1,	3643	can_events => 1,
3190	markup => $widget,	3644	markup => $widget,
3191	tooltip => $tooltip;	3645	tooltip => $tooltip;
3192	}	3646	}
…		…
3240	1	3694	1
3241	}	3695	}
3242		3696
3243	#############################################################################	3697	#############################################################################
3244		3698
3245	package CFClient::UI::Multiplexer;	3699	package CFPlus::UI::Multiplexer;
3246		3700
3247	our @ISA = CFClient::UI::Container::;	3701	our @ISA = CFPlus::UI::Container::;
3248		3702
3249	sub new {	3703	sub new {
3250	my $class = shift;	3704	my $class = shift;
3251		3705
3252	my $self = $class->SUPER::new (	3706	my $self = $class->SUPER::new (
…		…
3313	$self->{current}->draw;	3767	$self->{current}->draw;
3314	}	3768	}
3315		3769
3316	#############################################################################	3770	#############################################################################
3317		3771
3318	package CFClient::UI::Notebook;	3772	package CFPlus::UI::Notebook;
3319		3773
3320	our @ISA = CFClient::UI::VBox::;	3774	our @ISA = CFPlus::UI::VBox::;
3321		3775
3322	sub new {	3776	sub new {
3323	my $class = shift;	3777	my $class = shift;
3324		3778
3325	my $self = $class->SUPER::new (	3779	my $self = $class->SUPER::new (
3326	buttonbar => (new CFClient::UI::Buttonbar),	3780	buttonbar => (new CFPlus::UI::Buttonbar),
3327	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3781	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3328	# filter => # will be put between multiplexer and $self	3782	# filter => # will be put between multiplexer and $self
3329	@_,	3783	@_,
3330	);	3784	);
3331		3785
3332	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3786	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3336	}	3790	}
3337		3791
3338	sub add {	3792	sub add {
3339	my ($self, $title, $widget, $tooltip) = @_;	3793	my ($self, $title, $widget, $tooltip) = @_;
3340		3794
3341	Scalar::Util::weaken $self;	3795	CFPlus::weaken $self;
3342		3796
3343	$self->{buttonbar}->add (new CFClient::UI::Button	3797	$self->{buttonbar}->add (new CFPlus::UI::Button
3344	markup => $title,	3798	markup => $title,
3345	tooltip => $tooltip,	3799	tooltip => $tooltip,
3346	on_activate => sub { $self->set_current_page ($widget) },	3800	on_activate => sub { $self->set_current_page ($widget) },
3347	);	3801	);
3348		3802
…		…
3362	$self->emit (page_changed => $self->{multiplexer}{current});	3816	$self->emit (page_changed => $self->{multiplexer}{current});
3363	}	3817	}
3364		3818
3365	#############################################################################	3819	#############################################################################
3366		3820
3367	package CFClient::UI::Selector;	3821	package CFPlus::UI::Selector;
3368		3822
3369	use utf8;	3823	use utf8;
3370		3824
3371	our @ISA = CFClient::UI::Button::;	3825	our @ISA = CFPlus::UI::Button::;
3372		3826
3373	sub new {	3827	sub new {
3374	my $class = shift;	3828	my $class = shift;
3375		3829
3376	my $self = $class->SUPER::new (	3830	my $self = $class->SUPER::new (
…		…
3393	my ($value, $title, $tooltip) = @$_;	3847	my ($value, $title, $tooltip) = @$_;
3394		3848
3395	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3849	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396	}	3850	}
3397		3851
3398	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3852	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399	}	3853	}
3400		3854
3401	sub _set_value {	3855	sub _set_value {
3402	my ($self, $value) = @_;	3856	my ($self, $value) = @_;
3403		3857
…		…
3418	$self->emit (changed => $value);	3872	$self->emit (changed => $value);
3419	}	3873	}
3420		3874
3421	#############################################################################	3875	#############################################################################
3422		3876
3423	package CFClient::UI::Statusbox;	3877	package CFPlus::UI::Statusbox;
3424		3878
3425	our @ISA = CFClient::UI::VBox::;	3879	our @ISA = CFPlus::UI::VBox::;
3426		3880
3427	sub new {	3881	sub new {
3428	my $class = shift;	3882	my $class = shift;
3429		3883
3430	my $self = $class->SUPER::new (	3884	my $self = $class->SUPER::new (
3431	fontsize => 0.8,	3885	fontsize => 0.8,
3432	@_,	3886	@_,
3433	);	3887	);
3434		3888
3435	Scalar::Util::weaken (my $this = $self);	3889	CFPlus::weaken (my $this = $self);
3436		3890
3437	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3891	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3438		3892
3439	$self	3893	$self
3440	}	3894	}
…		…
3442	sub reorder {	3896	sub reorder {
3443	my ($self) = @_;	3897	my ($self) = @_;
3444	my $NOW = Time::HiRes::time;	3898	my $NOW = Time::HiRes::time;
3445		3899
3446	# freeze display when hovering over any label	3900	# freeze display when hovering over any label
3447	return if $CFClient::UI::TOOLTIP->{owner}	3901	return if $CFPlus::UI::TOOLTIP->{owner}
3448	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3902	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3449	values %{ $self->{item} };	3903	values %{ $self->{item} };
3450		3904
3451	while (my ($k, $v) = each %{ $self->{item} }) {	3905	while (my ($k, $v) = each %{ $self->{item} }) {
3452	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3906	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3453	}	3907	}
…		…
3474	for ($short) {	3928	for ($short) {
3475	s/^\s+//;	3929	s/^\s+//;
3476	s/\s+/ /g;	3930	s/\s+/ /g;
3477	}	3931	}
3478		3932
3479	new CFClient::UI::Label	3933	new CFPlus::UI::Label
3480	markup => $short,	3934	markup => $short,
3481	tooltip => $item->{tooltip},	3935	tooltip => $item->{tooltip},
3482	tooltip_font => $::FONT_PROP,	3936	tooltip_font => $::FONT_PROP,
3483	tooltip_width => 0.67,	3937	tooltip_width => 0.67,
3484	fontsize => $item->{fontsize} || $self->{fontsize},	3938	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3563	$self->SUPER::destroy;	4017	$self->SUPER::destroy;
3564	}	4018	}
3565		4019
3566	#############################################################################	4020	#############################################################################
3567		4021
3568	package CFClient::UI::Inventory;
3569
3570	our @ISA = CFClient::UI::Table::;
3571
3572	sub new {
3573	my $class = shift;
3574
3575	my $self = $class->SUPER::new (
3576	col_expand => [0, 1, 0],
3577	items => [],
3578	@_,
3579	);
3580
3581	$self->set_sort_order (undef);
3582
3583	$self
3584	}
3585
3586	sub update_items {
3587	my ($self) = @_;
3588
3589	$self->clear;
3590
3591	my @item = $self->{sort}->(@{ $self->{items} });
3592
3593	my @adds;
3594	my $row = 0;
3595	for my $item ($self->{sort}->(@{ $self->{items} })) {
3596	CFClient::Item::update_widgets $item;
3597
3598	push @adds, 0, $row, $item->{face_widget};
3599	push @adds, 1, $row, $item->{desc_widget};
3600	push @adds, 2, $row, $item->{weight_widget};
3601
3602	$row++;
3603	}
3604
3605	$self->add (@adds);
3606	}
3607
3608	sub set_sort_order {
3609	my ($self, $order) = @_;
3610
3611	$self->{sort} = $order ||= sub {
3612	sort {
3613	$a->{type} <=> $b->{type}
3614	or $a->{name} cmp $b->{name}
3615	} @_
3616	};
3617
3618	$self->update_items;
3619	}
3620
3621	sub set_items {
3622	my ($self, $items) = @_;
3623
3624	$self->{items} = [$items ? values %$items : ()];
3625	$self->update_items;
3626	}
3627
3628	#############################################################################
3629
3630	package CFClient::UI::SpellList;
3631
3632	our @ISA = CFClient::UI::Table::;
3633
3634	sub new {
3635	my $class = shift;
3636
3637	my $self = $class->SUPER::new (
3638	binding => [],
3639	commands => [],
3640	@_,
3641	)
3642	}
3643
3644	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3645
3646	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3648	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3649	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3650	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3652	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3654	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3655	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3656
3657	sub rebuild_spell_list {
3658	my ($self) = @_;
3659
3660	$CFClient::UI::ROOT->on_refresh ($self => sub {
3661	$self->clear;
3662
3663	return unless $::CONN;
3664
3665	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3666	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3667	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3668	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3669	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3670
3671	my $row = 0;
3672
3673	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3674	my $spell = $self->{spell}{$_};
3675
3676	$row++;
3677
3678	my $spell_cb = sub {
3679	my ($widget, $ev) = @_;
3680
3681	if ($ev->{button} == 1) {
3682	$::CONN->user_send ("cast $spell->{name}");
3683	} elsif ($ev->{button} == 2) {
3684	$::CONN->user_send ("invoke $spell->{name}");
3685	} elsif ($ev->{button} == 3) {
3686	(new CFClient::UI::Menu
3687	items => [
3688	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3689	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3690	],
3691	)->popup ($ev);
3692	} else {
3693	return 0;
3694	}
3695
3696	1
3697	};
3698
3699	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3700
3701	#TODO: add path info to tooltip
3702	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3703
3704	$self->add (0, $row, new CFClient::UI::Face
3705	face => $spell->{face},
3706	can_hover => 1,
3707	can_events => 1,
3708	tooltip => $tooltip,
3709	on_button_down => $spell_cb,
3710	);
3711
3712	$self->add (1, $row, new CFClient::UI::Label
3713	expand => 1,
3714	text => $spell->{name},
3715	can_hover => 1,
3716	can_events => 1,
3717	tooltip => $tooltip,
3718	on_button_down => $spell_cb,
3719	);
3720
3721	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3722	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3723	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3724	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3725	}
3726	});
3727	}
3728
3729	sub add_spell {
3730	my ($self, $spell) = @_;
3731
3732	$self->{spell}->{$spell->{name}} = $spell;
3733	$self->rebuild_spell_list;
3734	}
3735
3736	sub remove_spell {
3737	my ($self, $spell) = @_;
3738
3739	delete $self->{spell}->{$spell->{name}};
3740	$self->rebuild_spell_list;
3741	}
3742
3743	sub clear_spells {
3744	my ($self) = @_;
3745
3746	$self->{spell} = {};
3747	$self->rebuild_spell_list;
3748	}
3749
3750	#############################################################################
3751
3752	package CFClient::UI::Root;	4022	package CFPlus::UI::Root;
3753		4023
3754	our @ISA = CFClient::UI::Container::;	4024	our @ISA = CFPlus::UI::Container::;
3755		4025
3756	use List::Util qw(min max);	4026	use List::Util qw(min max);
3757		4027
3758	use CFClient::OpenGL;	4028	use CFPlus::OpenGL;
3759		4029
3760	sub new {	4030	sub new {
3761	my $class = shift;	4031	my $class = shift;
3762		4032
3763	my $self = $class->SUPER::new (	4033	my $self = $class->SUPER::new (
3764	visible => 1,	4034	visible => 1,
3765	@_,	4035	@_,
3766	);	4036	);
3767		4037
3768	Scalar::Util::weaken ($self->{root} = $self);	4038	CFPlus::weaken ($self->{root} = $self);
3769		4039
3770	$self	4040	$self
3771	}	4041	}
3772		4042
3773	sub size_request {	4043	sub size_request {
…		…
3968	while ($self->{post_alloc_hook}) {	4238	while ($self->{post_alloc_hook}) {
3969	$_->()	4239	$_->()
3970	for values %{delete $self->{post_alloc_hook}};	4240	for values %{delete $self->{post_alloc_hook}};
3971	}	4241	}
3972		4242
3973
3974	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4243	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3975	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4244	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3976	glClear GL_COLOR_BUFFER_BIT;	4245	glClear GL_COLOR_BUFFER_BIT;
3977		4246
3978	glMatrixMode GL_PROJECTION;	4247	glMatrixMode GL_PROJECTION;
…		…
3980	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4249	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3981	glMatrixMode GL_MODELVIEW;	4250	glMatrixMode GL_MODELVIEW;
3982	glLoadIdentity;	4251	glLoadIdentity;
3983		4252
3984	{	4253	{
3985	package CFClient::UI::Base;	4254	package CFPlus::UI::Base;
3986		4255
3987	($draw_x, $draw_y, $draw_w, $draw_h) =	4256	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3988	(0, 0, $self->{w}, $self->{h});	4257	(0, 0, $self->{w}, $self->{h});
3989	}
3990		4258
3991	$self->_draw;	4259	$self->_draw;
		4260	}
3992	}	4261	}
3993		4262
3994	#############################################################################	4263	#############################################################################
3995		4264
3996	package CFClient::UI;	4265	package CFPlus::UI;
3997		4266
3998	$ROOT = new CFClient::UI::Root;	4267	$ROOT = new CFPlus::UI::Root;
3999	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4268	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4000		4269
4001	1	4270	1
4002		4271

Diff Legend

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