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.368 by root, Mon Jun 25 05:43:37 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
96		99
97	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	101	my ($ev) = @_;
99	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
100		103
101	unless ($BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
102	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
103		108
104	$GRAB = $widget;	109	$GRAB = $widget;
105	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
106		111
107	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
108	}	113	}
109
110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;	118	$ev->{dx} = 0;
…		…
207	reconfigure_widgets;	210	reconfigure_widgets;
208	}	211	}
209		212
210	#############################################################################	213	#############################################################################
211		214
212	package CFClient::UI::Event;	215	package CFPlus::UI::Event;
213		216
214	sub xy {	217	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	219	}
217		220
218	#############################################################################	221	#############################################################################
219		222
220	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
221		224
222	use strict;	225	use strict;
223		226
224	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
225		228
226	sub new {	229	sub new {
227	my $class = shift;	230	my $class = shift;
228		231
229	my $self = bless {	232	my $self = bless {
…		…
234	h => undef,	237	h => undef,
235	can_events => 1,	238	can_events => 1,
236	@_	239	@_
237	}, $class;	240	}, $class;
238		241
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		243
241	for (keys %$self) {	244	for (keys %$self) {
242	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
244	}	247	}
245	}	248	}
246		249
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		255
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		258
256	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
261		264
262	sub destroy {	265	sub destroy {
263	my ($self) = @_;	266	my ($self) = @_;
264		267
265	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
266	%$self = ();	270	%$self = ();
267	}	271	}
268		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
269	sub show {	277	sub show {
270	my ($self) = @_;	278	my ($self) = @_;
271		279
272	return if $self->{parent};	280	return if $self->{parent};
273		281
274	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
275	}	283	}
276		284
277	sub set_visible {	285	sub set_visible {
278	my ($self) = @_;	286	my ($self) = @_;
279		287
…		…
300	delete $self->{root};	308	delete $self->{root};
301		309
302	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
304		312
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
307		315
308	$self->emit ("focus_out");	316	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
310	}	318	}
…		…
367	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
368		376
369	if ($self->{aspect}) {	377	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
371		379
372	$w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		382
375	# use alignment to adjust x, y	383	# use alignment to adjust x, y
376		384
377	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
419		427
420	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
421		429
422	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
423		431
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	435	}
428	}	436	}
429		437
430	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
431	sub coord2local {	439	sub coord2local {
…		…
497	sub connect {	505	sub connect {
498	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
499		507
500	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
501		509
502	defined wantarray and CFClient::guard {	510	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	512	@{ $self->{signal_cb}{$signal} };
505	}	513	}
		514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
506	}	520	}
507		521
508	my %has_coords = (	522	my %has_coords = (
509	button_down => 1,	523	button_down => 1,
510	button_up => 1,	524	button_up => 1,
…		…
513	);	527	);
514		528
515	sub emit {	529	sub emit {
516	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
517		531
518	# I do not really like this solution, but I dislike duplication	532	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	533	# and needlessly verbose code, either.
520	my @append	534	my @append
521	= $has_coords{$signal}	535	= $has_coords{$signal}
522	? $args[0]->xy ($self)	536	? $args[0]->xy ($self)
523	: ();	537	: ();
524		538
525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526		540
527	#d##TODO# stop propagating at first true, do not use sum	541	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	542	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	550	}
532		551
533	sub find_widget {	552	sub find_widget {
534	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
535		554
…		…
543	}	562	}
544		563
545	sub set_parent {	564	sub set_parent {
546	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
547		566
548	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
550	}	569	}
551		570
552	sub realloc {	571	sub realloc {
553	my ($self) = @_;	572	my ($self) = @_;
…		…
619	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
622	glEnd;	641	glEnd;
623	glPopMatrix;	642	glPopMatrix;
624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}	644	}
626		645
627	$self->_draw;	646	$self->_draw;
628	glPopMatrix;	647	glPopMatrix;
629	}	648	}
…		…
632	my ($self) = @_;	651	my ($self) = @_;
633		652
634	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
635	}	654	}
636		655
		656	my $cntx;#d#
637	sub DESTROY {	657	sub DESTROY {
638	my ($self) = @_;	658	my ($self) = @_;
639		659
640	return if CFClient::in_destruct;	660	return if CFPlus::in_destruct;
641
642	delete $WIDGET{$self+0};
643		661
644	eval { $self->destroy };	662	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
		665	delete $WIDGET{$self+0};
646	}	666	}
647		667
648	#############################################################################	668	#############################################################################
649		669
650	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
651		671
652	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
653		673
654	use strict;	674	use strict;
655	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
656		676
657	sub new {	677	sub new {
658	my $class = shift;	678	my $class = shift;
659		679
660	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
691	}	711	}
692	}	712	}
693		713
694	#############################################################################	714	#############################################################################
695		715
696	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
697		717
698	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
699		719
700	sub new {	720	sub new {
701	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
703	}	723	}
…		…
710		730
711	sub draw { }	731	sub draw { }
712		732
713	#############################################################################	733	#############################################################################
714		734
715	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
716		736
717	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
718		738
719	sub new {	739	sub new {
720	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
721		741
722	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
808	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
809	}	829	}
810		830
811	#############################################################################	831	#############################################################################
812		832
813	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
814		834
815	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
816		836
817	sub new {	837	sub new {
818	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
819		839
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		841
822	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
823	}	843	}
824		844
825	sub add {	845	sub add {
…		…
832	sub remove {	852	sub remove {
833	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
834		854
835	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
836		856
837	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	858	unless @{$self->{children}};
839	}	859	}
840		860
841	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
842		862
…		…
854		874
855	#############################################################################	875	#############################################################################
856		876
857	# back-buffered drawing area	877	# back-buffered drawing area
858		878
859	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
860		880
861	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
862		882
863	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
864		884
865	sub new {	885	sub new {
866	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
867		887
868	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
890	}	910	}
891		911
892	sub render_child {	912	sub render_child {
893	my ($self) = @_;	913	my ($self) = @_;
894		914
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	915	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
898		918
899	{	919	{
900	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
901		921
902	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
904	}	926	}
905
906	$self->_render;
907	};	927	};
908	}	928	}
909		929
910	sub _draw {	930	sub _draw {
911	my ($self) = @_;	931	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		932
915	my $tex = $self->{texture}	933	my $tex = $self->{texture}
916	or return;	934	or return;
917		935
918	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
921		939
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
923		941
924	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
925	}	943	}
926		944
927	#############################################################################	945	#############################################################################
928		946
929	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
930		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 (
…		…
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1016	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1018	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1020	}
1003	}	1021	}
1004		1022
1005	sub _render {	1023	sub _render {
1006	my ($self) = @_;	1024	my ($self) = @_;
1007		1025
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1026	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};	1027	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1028
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1030
1013	$self->SUPER::_render;	1031	$self->SUPER::_render;
1014	}	1032	}
1015		1033
1016	#############################################################################	1034	#############################################################################
1017		1035
1018	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
1019		1037
1020	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::HBox::;
1021		1039
1022	sub new {	1040	sub new {
1023	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
1024		1042
1025	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
1026		1044
1027	my $self;	1045	my $self;
1028		1046
1029	my $slider = new CFClient::UI::Slider	1047	my $slider = new CFPlus::UI::Slider
1030	vertical => 1,	1048	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1049	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1050	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1051	$self->{vp}->set_offset (0, $_[1]);
1034	},	1052	},
1035	;	1053	;
1036		1054
1037	$self = $class->SUPER::new (	1055	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1056	vp => (new CFPlus::UI::ViewPort expand => 1),
1039	can_events => 1,	1057	can_events => 1,
1040	slider => $slider,	1058	slider => $slider,
1041	%arg,	1059	%arg,
1042	);	1060	);
1043		1061
…		…
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1105	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1106	}
1089		1107
1090	#############################################################################	1108	#############################################################################
1091		1109
1092	package CFClient::UI::Frame;	1110	package CFPlus::UI::Frame;
1093		1111
1094	our @ISA = CFClient::UI::Bin::;	1112	our @ISA = CFPlus::UI::Bin::;
1095		1113
1096	use CFClient::OpenGL;	1114	use CFPlus::OpenGL;
1097		1115
1098	sub new {	1116	sub new {
1099	my $class = shift;	1117	my $class = shift;
1100		1118
1101	$class->SUPER::new (	1119	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1145	$self->SUPER::_draw;
1128	}	1146	}
1129		1147
1130	#############################################################################	1148	#############################################################################
1131		1149
1132	package CFClient::UI::FancyFrame;	1150	package CFPlus::UI::FancyFrame;
1133		1151
1134	our @ISA = CFClient::UI::Bin::;	1152	our @ISA = CFPlus::UI::Bin::;
1135		1153
1136	use CFClient::OpenGL;	1154	use CFPlus::OpenGL;
		1155
		1156	sub new {
		1157	my ($class, %arg) = @_;
		1158
		1159	if ((exists $arg{label}) && !ref $arg{label}) {
		1160	$arg{label} = new CFPlus::UI::Label
		1161	align => 1,
		1162	valign => 0,
		1163	text => $arg{label},
		1164	fontsize => ($arg{border} || 0.8) * 0.75;
		1165	}
		1166
		1167	my $self = $class->SUPER::new (
		1168	# label => "",
		1169	fg => [0.6, 0.3, 0.1],
		1170	border => 0.8,
		1171	style => 'single',
		1172	%arg,
		1173	);
		1174
		1175	$self
		1176	}
		1177
		1178	sub add {
		1179	my ($self, @widgets) = @_;
		1180
		1181	$self->SUPER::add (@widgets);
		1182	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1183	}
		1184
		1185	sub border {
		1186	int $_[0]{border} * $::FONTSIZE
		1187	}
		1188
		1189	sub size_request {
		1190	my ($self) = @_;
		1191
		1192	($self->{label_w}, undef) = $self->{label}->size_request
		1193	if $self->{label};
		1194
		1195	my ($w, $h) = $self->SUPER::size_request;
		1196
		1197	(
		1198	$w + $self->border * 2,
		1199	$h + $self->border * 2,
		1200	)
		1201	}
		1202
		1203	sub invoke_size_allocate {
		1204	my ($self, $w, $h) = @_;
		1205
		1206	my $border = $self->border;
		1207
		1208	$w -= List::Util::max 0, $border * 2;
		1209	$h -= List::Util::max 0, $border * 2;
		1210
		1211	if (my $label = $self->{label}) {
		1212	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1213	$label->{h} = List::Util::min $h, $border;
		1214	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1215	}
		1216
		1217	$self->child->configure ($border, $border, $w, $h);
		1218
		1219	1
		1220	}
		1221
		1222	sub _draw {
		1223	my ($self) = @_;
		1224
		1225	my $child = $self->{children}[0];
		1226
		1227	my $border = $self->border;
		1228	my ($w, $h) = ($self->{w}, $self->{h});
		1229
		1230	$child->draw;
		1231
		1232	glColor @{$self->{fg}};
		1233	glBegin GL_LINE_STRIP;
		1234	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1235	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1236	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1237	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1238	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1239	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1240	glEnd;
		1241
		1242	if ($self->{label}) {
		1243	glTranslate $border * 2, 0;
		1244	$self->{label}->_draw;
		1245	}
		1246	}
		1247
		1248	#############################################################################
		1249
		1250	package CFPlus::UI::Toplevel;
		1251
		1252	our @ISA = CFPlus::UI::Bin::;
		1253
		1254	use CFPlus::OpenGL;
1137		1255
1138	my $bg =	1256	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1257	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1258	mipmap => 1, wrap => 1;
1141		1259
1142	my @border =	1260	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1261	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);	1262	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145		1263
1146	sub new {	1264	sub new {
1147	my ($class, %arg) = @_;	1265	my ($class, %arg) = @_;
1148		1266
…		…
1154	min_w => 64,	1272	min_w => 64,
1155	min_h => 32,	1273	min_h => 32,
1156	%arg,	1274	%arg,
1157	);	1275	);
1158		1276
1159	$self->{title_widget} = new CFClient::UI::Label	1277	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1278	align => 0,
1161	valign => 1,	1279	valign => 1,
1162	text => $self->{title},	1280	text => $self->{title},
1163	fontsize => $self->{border},	1281	fontsize => $self->{border},
1164	if exists $self->{title};	1282	if exists $self->{title};
1165		1283
1166	if ($self->{has_close_button}) {	1284	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1285	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1286	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1287	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1288	on_activate => sub { $self->emit ("delete") };
1171		1289
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1290	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1291	}
1174		1292
1175	$self	1293	$self
1176	}	1294	}
1177		1295
1178	sub add {	1296	sub add {
1179	my ($self, @widgets) = @_;	1297	my ($self, @widgets) = @_;
1180		1298
1181	$self->SUPER::add (@widgets);	1299	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1300	$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};	1301	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1302	}
1185		1303
1186	sub border {	1304	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1305	int $_[0]{border} * $::FONTSIZE
1188	}	1306	}
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1414	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1415
1298	! ! $self->{motion}	1416	! ! $self->{motion}
1299	}	1417	}
1300		1418
		1419	sub invoke_visibility_change {
		1420	my ($self, $visible) = @_;
		1421
		1422	delete $self->{motion} unless $visible;
		1423
		1424	0
		1425	}
		1426
1301	sub _draw {	1427	sub _draw {
1302	my ($self) = @_;	1428	my ($self) = @_;
1303		1429
1304	my $child = $self->{children}[0];	1430	my $child = $self->{children}[0];
1305		1431
…		…
1342	if $self->{close_button};	1468	if $self->{close_button};
1343	}	1469	}
1344		1470
1345	#############################################################################	1471	#############################################################################
1346		1472
1347	package CFClient::UI::Table;	1473	package CFPlus::UI::Table;
1348		1474
1349	our @ISA = CFClient::UI::Base::;	1475	our @ISA = CFPlus::UI::Base::;
1350		1476
1351	use List::Util qw(max sum);	1477	use List::Util qw(max sum);
1352		1478
1353	use CFClient::OpenGL;	1479	use CFPlus::OpenGL;
1354		1480
1355	sub new {	1481	sub new {
1356	my $class = shift;	1482	my $class = shift;
1357		1483
1358	$class->SUPER::new (	1484	$class->SUPER::new (
…		…
1448		1574
1449	# linearly scale sizes	1575	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1576	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1577	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1578
1453	CFClient::UI::harmonize $ws;	1579	CFPlus::UI::harmonize $ws;
1454	CFClient::UI::harmonize $hs;	1580	CFPlus::UI::harmonize $hs;
1455		1581
1456	my $y;	1582	my $y;
1457		1583
1458	for my $r (0 .. $#{$self->{children}}) {	1584	for my $r (0 .. $#{$self->{children}}) {
1459	my $row = $self->{children}[$r]	1585	my $row = $self->{children}[$r]
…		…
1502	}	1628	}
1503	}	1629	}
1504		1630
1505	#############################################################################	1631	#############################################################################
1506		1632
1507	package CFClient::UI::Box;	1633	package CFPlus::UI::Box;
1508		1634
1509	our @ISA = CFClient::UI::Container::;	1635	our @ISA = CFPlus::UI::Container::;
1510		1636
1511	sub size_request {	1637	sub size_request {
1512	my ($self) = @_;	1638	my ($self) = @_;
1513		1639
1514	$self->{vertical}	1640	$self->{vertical}
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1673	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1674	for 0 .. $#children;
1549	}	1675	}
1550	}	1676	}
1551		1677
1552	CFClient::UI::harmonize \@req;	1678	CFPlus::UI::harmonize \@req;
1553		1679
1554	my $pos = 0;	1680	my $pos = 0;
1555	for (0 .. $#children) {	1681	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1682	my $alloc = $req[$_];
1557	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1683	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1562	1	1688	1
1563	}	1689	}
1564		1690
1565	#############################################################################	1691	#############################################################################
1566		1692
1567	package CFClient::UI::HBox;	1693	package CFPlus::UI::HBox;
1568		1694
1569	our @ISA = CFClient::UI::Box::;	1695	our @ISA = CFPlus::UI::Box::;
1570		1696
1571	sub new {	1697	sub new {
1572	my $class = shift;	1698	my $class = shift;
1573		1699
1574	$class->SUPER::new (	1700	$class->SUPER::new (
…		…
1577	)	1703	)
1578	}	1704	}
1579		1705
1580	#############################################################################	1706	#############################################################################
1581		1707
1582	package CFClient::UI::VBox;	1708	package CFPlus::UI::VBox;
1583		1709
1584	our @ISA = CFClient::UI::Box::;	1710	our @ISA = CFPlus::UI::Box::;
1585		1711
1586	sub new {	1712	sub new {
1587	my $class = shift;	1713	my $class = shift;
1588		1714
1589	$class->SUPER::new (	1715	$class->SUPER::new (
…		…
1592	)	1718	)
1593	}	1719	}
1594		1720
1595	#############################################################################	1721	#############################################################################
1596		1722
1597	package CFClient::UI::Label;	1723	package CFPlus::UI::Label;
1598		1724
1599	our @ISA = CFClient::UI::DrawBG::;	1725	our @ISA = CFPlus::UI::DrawBG::;
1600		1726
1601	use CFClient::OpenGL;	1727	use CFPlus::OpenGL;
1602		1728
1603	sub new {	1729	sub new {
1604	my ($class, %arg) = @_;	1730	my ($class, %arg) = @_;
1605		1731
1606	my $self = $class->SUPER::new (	1732	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1735	#active_bg => none
1610	#font => default_font	1736	#font => default_font
1611	#text => initial text	1737	#text => initial text
1612	#markup => initial narkup	1738	#markup => initial narkup
1613	#max_w => maximum pixel width	1739	#max_w => maximum pixel width
		1740	#style => 0, # render flags
1614	ellipsise => 3, # end	1741	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1742	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1743	fontsize => 1,
1617	align => -1,	1744	align => -1,
1618	valign => -1,	1745	valign => -1,
1619	padding_x => 2,	1746	padding_x => 2,
1620	padding_y => 2,	1747	padding_y => 2,
1621	can_events => 0,	1748	can_events => 0,
1622	%arg	1749	%arg
1623	);	1750	);
1624		1751
1625	if (exists $self->{template}) {	1752	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1753	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1754	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1755	$self->{template} = $layout;
1629	}	1756	}
1630		1757
1631	if (exists $self->{markup}) {	1758	if (exists $self->{markup}) {
…		…
1769	};	1896	};
1770		1897
1771	my $w = List::Util::min $self->{w} + 4, $size->[0];	1898	my $w = List::Util::min $self->{w} + 4, $size->[0];
1772	my $h = List::Util::min $self->{h} + 2, $size->[1];	1899	my $h = List::Util::min $self->{h} + 2, $size->[1];
1773		1900
1774	$self->{layout}->render ($self->{ox}, $self->{oy});	1901	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775	}	1902	}
1776		1903
1777	#############################################################################	1904	#############################################################################
1778		1905
1779	package CFClient::UI::EntryBase;	1906	package CFPlus::UI::EntryBase;
1780		1907
1781	our @ISA = CFClient::UI::Label::;	1908	our @ISA = CFPlus::UI::Label::;
1782		1909
1783	use CFClient::OpenGL;	1910	use CFPlus::OpenGL;
1784		1911
1785	sub new {	1912	sub new {
1786	my $class = shift;	1913	my $class = shift;
1787		1914
1788	$class->SUPER::new (	1915	$class->SUPER::new (
…		…
1792	active_fg => [0, 0, 0],	1919	active_fg => [0, 0, 0],
1793	can_hover => 1,	1920	can_hover => 1,
1794	can_focus => 1,	1921	can_focus => 1,
1795	valign => 0,	1922	valign => 0,
1796	can_events => 1,	1923	can_events => 1,
		1924	ellipsise => 0,
1797	#text => ...	1925	#text => ...
1798	#hidden => "*",	1926	#hidden => "*",
1799	@_	1927	@_
1800	)	1928	)
1801	}	1929	}
…		…
1846	my $sym = $ev->{sym};	1974	my $sym = $ev->{sym};
1847	my $uni = $ev->{unicode};	1975	my $uni = $ev->{unicode};
1848		1976
1849	my $text = $self->get_text;	1977	my $text = $self->get_text;
1850		1978
		1979	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		1980
1851	if ($uni == 8) {	1981	if ($uni == 8) {
1852	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1982	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853	} elsif ($uni == 127) {	1983	} elsif ($uni == 127) {
1854	substr $text, $self->{cursor}, 1, "";	1984	substr $text, $self->{cursor}, 1, "";
1855	} elsif ($sym == CFClient::SDLK_LEFT) {	1985	} elsif ($sym == CFPlus::SDLK_LEFT) {
1856	--$self->{cursor} if $self->{cursor};	1986	--$self->{cursor} if $self->{cursor};
1857	} elsif ($sym == CFClient::SDLK_RIGHT) {	1987	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1858	++$self->{cursor} if $self->{cursor} < length $self->{text};	1988	++$self->{cursor} if $self->{cursor} < length $self->{text};
1859	} elsif ($sym == CFClient::SDLK_HOME) {	1989	} elsif ($sym == CFPlus::SDLK_HOME) {
		1990	# what a hack
		1991	$self->{cursor} =
		1992	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1993	? length $1
		1994	: 0;
		1995	} elsif ($sym == CFPlus::SDLK_END) {
		1996	# uh, again
		1997	$self->{cursor} =
		1998	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1999	? $self->{cursor} + length $1
		2000	: length $self->{text};
		2001	} elsif ($uni == 21) { # ctrl-u
		2002	$text = "";
1860	$self->{cursor} = 0;	2003	$self->{cursor} = 0;
1861	} elsif ($sym == CFClient::SDLK_END) {
1862	$self->{cursor} = length $text;
1863	} elsif ($uni == 27) {	2004	} elsif ($uni == 27) {
1864	$self->emit ('escape');	2005	$self->emit ('escape');
1865	} elsif ($uni) {	2006	} elsif ($uni == 0x0d) {
		2007	substr $text, $self->{cursor}++, 0, "\012";
		2008	} elsif ($uni >= 0x20) {
1866	substr $text, $self->{cursor}++, 0, chr $uni;	2009	substr $text, $self->{cursor}++, 0, chr $uni;
1867	} else {	2010	} else {
1868	return 0;	2011	return 0;
1869	}	2012	}
1870		2013
1871	$self->_set_text ($text);	2014	$self->_set_text ($text);
1872		2015
1873	$self->realloc;	2016	$self->realloc;
		2017	$self->update;
1874		2018
1875	1	2019	1
1876	}	2020	}
1877		2021
1878	sub invoke_focus_in {	2022	sub invoke_focus_in {
…		…
1940	utf8::encode $text;	2084	utf8::encode $text;
1941		2085
1942	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2086	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943	}	2087	}
1944		2088
1945	glColor @{$self->{fg}};
1946	glBegin GL_LINES;	2089	glBegin GL_LINES;
1947	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2090	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};	2091	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949	glEnd;	2092	glEnd;
1950	}	2093	}
1951	}	2094	}
1952		2095
		2096	#############################################################################
		2097
1953	package CFClient::UI::Entry;	2098	package CFPlus::UI::Entry;
1954		2099
1955	our @ISA = CFClient::UI::EntryBase::;	2100	our @ISA = CFPlus::UI::EntryBase::;
1956		2101
1957	use CFClient::OpenGL;	2102	use CFPlus::OpenGL;
1958		2103
1959	sub invoke_key_down {	2104	sub invoke_key_down {
1960	my ($self, $ev) = @_;	2105	my ($self, $ev) = @_;
1961		2106
1962	my $sym = $ev->{sym};	2107	my $sym = $ev->{sym};
1963		2108
1964	if ($sym == 13) {	2109	if ($ev->{uni} == 0x0d || $sym == 13) {
1965	unshift @{$self->{history}},	2110	unshift @{$self->{history}},
1966	my $txt = $self->get_text;	2111	my $txt = $self->get_text;
1967		2112
1968	$self->{history_pointer} = -1;	2113	$self->{history_pointer} = -1;
1969	$self->{history_saveback} = '';	2114	$self->{history_saveback} = '';
1970	$self->emit (activate => $txt);	2115	$self->emit (activate => $txt);
1971	$self->update;	2116	$self->update;
1972		2117
1973	} elsif ($sym == CFClient::SDLK_UP) {	2118	} elsif ($sym == CFPlus::SDLK_UP) {
1974	if ($self->{history_pointer} < 0) {	2119	if ($self->{history_pointer} < 0) {
1975	$self->{history_saveback} = $self->get_text;	2120	$self->{history_saveback} = $self->get_text;
1976	}	2121	}
1977	if (@{$self->{history} || []} > 0) {	2122	if (@{$self->{history} || []} > 0) {
1978	$self->{history_pointer}++;	2123	$self->{history_pointer}++;
…		…
1980	$self->{history_pointer} = @{$self->{history} || []} - 1;	2125	$self->{history_pointer} = @{$self->{history} || []} - 1;
1981	}	2126	}
1982	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2127	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1983	}	2128	}
1984		2129
1985	} elsif ($sym == CFClient::SDLK_DOWN) {	2130	} elsif ($sym == CFPlus::SDLK_DOWN) {
1986	$self->{history_pointer}--;	2131	$self->{history_pointer}--;
1987	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2132	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988		2133
1989	if ($self->{history_pointer} >= 0) {	2134	if ($self->{history_pointer} >= 0) {
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2135	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1999	1	2144	1
2000	}	2145	}
2001		2146
2002	#############################################################################	2147	#############################################################################
2003		2148
		2149	package CFPlus::UI::TextEdit;
		2150
		2151	our @ISA = CFPlus::UI::EntryBase::;
		2152
		2153	use CFPlus::OpenGL;
		2154
		2155	sub move_cursor_ver {
		2156	my ($self, $dy) = @_;
		2157
		2158	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2159
		2160	$y += $dy;
		2161
		2162	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2163	$self->{cursor} = $index;
		2164	delete $self->{cur_h};
		2165	$self->update;
		2166	return;
		2167	}
		2168	}
		2169
		2170	sub invoke_key_down {
		2171	my ($self, $ev) = @_;
		2172
		2173	my $sym = $ev->{sym};
		2174
		2175	if ($sym == CFPlus::SDLK_UP) {
		2176	$self->move_cursor_ver (-1);
		2177	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2178	$self->move_cursor_ver (+1);
		2179	} else {
		2180	return $self->SUPER::invoke_key_down ($ev)
		2181	}
		2182
		2183	1
		2184	}
		2185
		2186	#############################################################################
		2187
2004	package CFClient::UI::Button;	2188	package CFPlus::UI::Button;
2005		2189
2006	our @ISA = CFClient::UI::Label::;	2190	our @ISA = CFPlus::UI::Label::;
2007		2191
2008	use CFClient::OpenGL;	2192	use CFPlus::OpenGL;
2009		2193
2010	my @tex =	2194	my @tex =
2011	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2195	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012	qw(b1_button_active.png);	2196	qw(b1_button_active.png);
2013		2197
2014	sub new {	2198	sub new {
2015	my $class = shift;	2199	my $class = shift;
2016		2200
…		…
2053	$self->SUPER::_draw;	2237	$self->SUPER::_draw;
2054	}	2238	}
2055		2239
2056	#############################################################################	2240	#############################################################################
2057		2241
2058	package CFClient::UI::CheckBox;	2242	package CFPlus::UI::CheckBox;
2059		2243
2060	our @ISA = CFClient::UI::DrawBG::;	2244	our @ISA = CFPlus::UI::DrawBG::;
2061		2245
2062	my @tex =	2246	my @tex =
2063	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2247	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2064	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2248	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065		2249
2066	use CFClient::OpenGL;	2250	use CFPlus::OpenGL;
2067		2251
2068	sub new {	2252	sub new {
2069	my $class = shift;	2253	my $class = shift;
2070		2254
2071	$class->SUPER::new (	2255	$class->SUPER::new (
…		…
2128	glDisable GL_TEXTURE_2D;	2312	glDisable GL_TEXTURE_2D;
2129	}	2313	}
2130		2314
2131	#############################################################################	2315	#############################################################################
2132		2316
2133	package CFClient::UI::Image;	2317	package CFPlus::UI::Image;
2134		2318
2135	our @ISA = CFClient::UI::Base::;	2319	our @ISA = CFPlus::UI::Base::;
2136		2320
2137	use CFClient::OpenGL;	2321	use CFPlus::OpenGL;
2138		2322
2139	our %texture_cache;	2323	our %texture_cache;
2140		2324
2141	sub new {	2325	sub new {
2142	my $class = shift;	2326	my $class = shift;
…		…
2148		2332
2149	$self->{path} || $self->{tex}	2333	$self->{path} || $self->{tex}
2150	or Carp::croak "'path' or 'tex' attributes required";	2334	or Carp::croak "'path' or 'tex' attributes required";
2151		2335
2152	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2336	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2153	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;	2337	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2154		2338
2155	Scalar::Util::weaken $texture_cache{$self->{path}};	2339	CFPlus::weaken $texture_cache{$self->{path}};
2156		2340
2157	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2341	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158		2342
2159	$self	2343	$self
2160	}	2344	}
2161		2345
2162	sub STORABLE_freeze {	2346	sub STORABLE_freeze {
2163	my ($self, $cloning) = @_;	2347	my ($self, $cloning) = @_;
2164		2348
2165	$self->{path}	2349	$self->{path}
2166	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";	2350	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2167		2351
2168	$self->{path}	2352	$self->{path}
2169	}	2353	}
2170		2354
2171	sub STORABLE_attach {	2355	sub STORABLE_attach {
…		…
2202	glDisable GL_TEXTURE_2D;	2386	glDisable GL_TEXTURE_2D;
2203	}	2387	}
2204		2388
2205	#############################################################################	2389	#############################################################################
2206		2390
2207	package CFClient::UI::ImageButton;	2391	package CFPlus::UI::ImageButton;
2208		2392
2209	our @ISA = CFClient::UI::Image::;	2393	our @ISA = CFPlus::UI::Image::;
2210		2394
2211	use CFClient::OpenGL;	2395	use CFPlus::OpenGL;
2212		2396
2213	my %textures;	2397	my %textures;
2214		2398
2215	sub new {	2399	sub new {
2216	my $class = shift;	2400	my $class = shift;
…		…
2238	1	2422	1
2239	}	2423	}
2240		2424
2241	#############################################################################	2425	#############################################################################
2242		2426
2243	package CFClient::UI::VGauge;	2427	package CFPlus::UI::VGauge;
2244		2428
2245	our @ISA = CFClient::UI::Base::;	2429	our @ISA = CFPlus::UI::Base::;
2246		2430
2247	use List::Util qw(min max);	2431	use List::Util qw(min max);
2248		2432
2249	use CFClient::OpenGL;	2433	use CFPlus::OpenGL;
2250		2434
2251	my %tex = (	2435	my %tex = (
2252	food => [	2436	food => [
2253	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2437	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2438	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255	],	2439	],
2256	grace => [	2440	grace => [
2257	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2441	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/	2442	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259	],	2443	],
2260	hp => [	2444	hp => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2445	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2446	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263	],	2447	],
2264	mana => [	2448	mana => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2449	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/	2450	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267	],	2451	],
2268	);	2452	);
2269		2453
2270	# eg. VGauge->new (gauge => 'food'), default gauge: food	2454	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2373	glDisable GL_TEXTURE_2D;	2557	glDisable GL_TEXTURE_2D;
2374	}	2558	}
2375		2559
2376	#############################################################################	2560	#############################################################################
2377		2561
2378	package CFClient::UI::Gauge;	2562	package CFPlus::UI::Gauge;
2379		2563
2380	our @ISA = CFClient::UI::VBox::;	2564	our @ISA = CFPlus::UI::VBox::;
2381		2565
2382	sub new {	2566	sub new {
2383	my ($class, %arg) = @_;	2567	my ($class, %arg) = @_;
2384		2568
2385	my $self = $class->SUPER::new (	2569	my $self = $class->SUPER::new (
…		…
2387	can_hover => 1,	2571	can_hover => 1,
2388	can_events => 1,	2572	can_events => 1,
2389	%arg,	2573	%arg,
2390	);	2574	);
2391		2575
2392	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2576	$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);	2577	$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");	2578	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395		2579
2396	$self	2580	$self
2397	}	2581	}
2398		2582
2399	sub set_fontsize {	2583	sub set_fontsize {
…		…
2420	$self->{value}->set_text ($val);	2604	$self->{value}->set_text ($val);
2421	}	2605	}
2422		2606
2423	#############################################################################	2607	#############################################################################
2424		2608
2425	package CFClient::UI::Slider;	2609	package CFPlus::UI::Slider;
2426		2610
2427	use strict;	2611	use strict;
2428		2612
2429	use CFClient::OpenGL;	2613	use CFPlus::OpenGL;
2430		2614
2431	our @ISA = CFClient::UI::DrawBG::;	2615	our @ISA = CFPlus::UI::DrawBG::;
2432		2616
2433	my @tex =	2617	my @tex =
2434	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2618	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435	qw(s1_slider.png s1_slider_bg.png);	2619	qw(s1_slider.png s1_slider_bg.png);
2436		2620
2437	sub new {	2621	sub new {
2438	my $class = shift;	2622	my $class = shift;
2439		2623
…		…
2533	sub invoke_mouse_wheel {	2717	sub invoke_mouse_wheel {
2534	my ($self, $ev) = @_;	2718	my ($self, $ev) = @_;
2535		2719
2536	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2720	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537		2721
		2722	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2723
2538	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2724	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539		2725
2540	! ! $delta	2726	! ! $delta
2541	}	2727	}
2542		2728
2543	sub update {	2729	sub update {
…		…
2594	glDisable GL_TEXTURE_2D;	2780	glDisable GL_TEXTURE_2D;
2595	}	2781	}
2596		2782
2597	#############################################################################	2783	#############################################################################
2598		2784
2599	package CFClient::UI::ValSlider;	2785	package CFPlus::UI::ValSlider;
2600		2786
2601	our @ISA = CFClient::UI::HBox::;	2787	our @ISA = CFPlus::UI::HBox::;
2602		2788
2603	sub new {	2789	sub new {
2604	my ($class, %arg) = @_;	2790	my ($class, %arg) = @_;
2605		2791
2606	my $range = delete $arg{range};	2792	my $range = delete $arg{range};
2607		2793
2608	my $self = $class->SUPER::new (	2794	my $self = $class->SUPER::new (
2609	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2795	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2796	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611	to_value => sub { shift },	2797	to_value => sub { shift },
2612	from_value => sub { shift },	2798	from_value => sub { shift },
2613	%arg,	2799	%arg,
2614	);	2800	);
2615		2801
…		…
2635	sub set_range { shift->{slider}->set_range (@_) }	2821	sub set_range { shift->{slider}->set_range (@_) }
2636	sub set_value { shift->{slider}->set_value (@_) }	2822	sub set_value { shift->{slider}->set_value (@_) }
2637		2823
2638	#############################################################################	2824	#############################################################################
2639		2825
2640	package CFClient::UI::TextScroller;	2826	package CFPlus::UI::TextScroller;
2641		2827
2642	our @ISA = CFClient::UI::HBox::;	2828	our @ISA = CFPlus::UI::HBox::;
2643		2829
2644	use CFClient::OpenGL;	2830	use CFPlus::OpenGL;
2645		2831
2646	sub new {	2832	sub new {
2647	my $class = shift;	2833	my $class = shift;
2648		2834
2649	my $self = $class->SUPER::new (	2835	my $self = $class->SUPER::new (
…		…
2651	can_events => 1,	2837	can_events => 1,
2652	indent => 0,	2838	indent => 0,
2653	#font => default_font	2839	#font => default_font
2654	@_,	2840	@_,
2655		2841
2656	layout => (new CFClient::Layout),	2842	layout => (new CFPlus::Layout),
2657	par => [],	2843	par => [],
		2844	max_par => 0,
2658	height => 0,	2845	height => 0,
2659	children => [	2846	children => [
2660	(new CFClient::UI::Empty expand => 1),	2847	(new CFPlus::UI::Empty expand => 1),
2661	(new CFClient::UI::Slider vertical => 1),	2848	(new CFPlus::UI::Slider vertical => 1),
2662	],	2849	],
2663	);	2850	);
2664		2851
2665	$self->{children}[1]->connect (changed => sub { $self->update });	2852	$self->{children}[1]->connect (changed => sub { $self->update });
2666		2853
…		…
2743		2930
2744	# todo: base offset on lines or so, not on pixels	2931	# todo: base offset on lines or so, not on pixels
2745	$self->{children}[1]->set_value ($offset);	2932	$self->{children}[1]->set_value ($offset);
2746	}	2933	}
2747		2934
		2935	sub current_paragraph {
		2936	my ($self) = @_;
		2937
		2938	$self->{top_paragraph} - 1
		2939	}
		2940
		2941	sub scroll_to {
		2942	my ($self, $para) = @_;
		2943
		2944	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2945
		2946	$self->{scroll_to} = $para;
		2947	$self->update;
		2948	}
		2949
2748	sub clear {	2950	sub clear {
2749	my ($self) = @_;	2951	my ($self) = @_;
2750		2952
2751	my (undef, undef, @other) = @{ $self->{children} };	2953	my (undef, undef, @other) = @{ $self->{children} };
2752	$self->remove ($_) for @other;	2954	$self->remove ($_) for @other;
…		…
2755	$self->{height} = 0;	2957	$self->{height} = 0;
2756	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2958	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757	}	2959	}
2758		2960
2759	sub add_paragraph {	2961	sub add_paragraph {
2760	my ($self, $color, $para, $indent) = @_;	2962	my $self = shift;
2761		2963
2762	my ($text, @w) = ref $para ? @$para : $para;	2964	for my $para (@_) {
2763
2764	$para = {	2965	$para = {
		2966	fg => [1, 1, 1, 1],
		2967	indent => 0,
		2968	markup => "",
		2969	widget => [],
		2970	ref $para ? %$para : (markup => $para),
2765	w => 1e10,	2971	w => 1e10,
2766	wrapped => 1,	2972	wrapped => 1,
2767	fg => $color,
2768	indent => $indent,
2769	markup => $text,
2770	widget => \@w,
2771	};	2973	};
2772		2974
2773	$self->add (@w) if @w;	2975	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774	push @{$self->{par}}, $para;	2976	push @{$self->{par}}, $para;
		2977	}
		2978
		2979	if (my $max = $self->{max_par}) {
		2980	shift @{$self->{par}} while @{$self->{par}} > $max;
		2981	}
2775		2982
2776	$self->{need_reflow}++;	2983	$self->{need_reflow}++;
2777	$self->update;	2984	$self->update;
2778	}	2985	}
2779		2986
2780	sub scroll_to_bottom {	2987	sub scroll_to_bottom {
2781	my ($self) = @_;	2988	my ($self) = @_;
2782		2989
2783	$self->{scroll_to_bottom} = 1;	2990	$self->{scroll_to} = $#{$self->{par}};
2784	$self->update;	2991	$self->update;
2785	}	2992	}
2786		2993
		2994	sub force_uptodate {
		2995	my ($self) = @_;
		2996
		2997	if (delete $self->{need_reflow}) {
		2998	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2999
		3000	my $height = 0;
		3001
		3002	for my $para (@{$self->{par}}) {
		3003	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3004	my $layout = $self->get_layout ($para);
		3005	my ($w, $h) = $layout->size;
		3006
		3007	$para->{w} = $w + $para->{indent};
		3008	$para->{h} = $h;
		3009	$para->{wrapped} = $layout->has_wrapped;
		3010	}
		3011
		3012	$para->{y} = $height;
		3013	$height += $para->{h};
		3014	}
		3015
		3016	$self->{height} = $height;
		3017	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3018
		3019	delete $self->{texture};
		3020	}
		3021
		3022	if (my $paridx = delete $self->{scroll_to}) {
		3023	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3024	}
		3025	}
		3026
2787	sub update {	3027	sub update {
2788	my ($self) = @_;	3028	my ($self) = @_;
2789		3029
2790	$self->SUPER::update;	3030	$self->SUPER::update;
2791		3031
2792	return unless $self->{h} > 0;	3032	return unless $self->{h} > 0;
2793		3033
2794	delete $self->{texture};	3034	delete $self->{texture};
2795		3035
2796	$ROOT->on_post_alloc ($self => sub {	3036	$ROOT->on_post_alloc ($self => sub {
		3037	$self->force_uptodate;
		3038
2797	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3039	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798		3040
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 {	3041	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2827	glClearColor 0, 0, 0, 0;	3042	glClearColor 0, 0, 0, 0;
2828	glClear GL_COLOR_BUFFER_BIT;	3043	glClear GL_COLOR_BUFFER_BIT;
2829		3044
		3045	package CFPlus::UI::Base;
		3046	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3047	(0, 0, $self->{w}, $self->{h});
		3048
		3049	my $top = int $self->{children}[1]{range}[0];
		3050
		3051	my $paridx = 0;
		3052	my $top_paragraph;
2830	my $top = int $self->{children}[1]{range}[0];	3053	my $top = int $self->{children}[1]{range}[0];
2831		3054
2832	my $y0 = $top;	3055	my $y0 = $top;
2833	my $y1 = $top + $H;	3056	my $y1 = $top + $H;
2834		3057
2835	my $y = 0;
2836
2837	for my $para (@{$self->{par}}) {	3058	for my $para (@{$self->{par}}) {
2838	my $h = $para->{h};	3059	my $h = $para->{h};
		3060	my $y = $para->{y};
2839		3061
2840	if ($y0 < $y + $h && $y < $y1) {	3062	if ($y0 < $y + $h && $y < $y1) {
2841
2842	my $layout = $self->get_layout ($para);	3063	my $layout = $self->get_layout ($para);
2843		3064
2844	$layout->render ($para->{indent}, $y - $y0);	3065	$layout->render ($para->{indent}, $y - $y0);
2845		3066
2846	if (my @w = @{ $para->{widget} }) {	3067	if (my @w = @{ $para->{widget} }) {
…		…
2855	$_->draw;	3076	$_->draw;
2856	}	3077	}
2857	}	3078	}
2858	}	3079	}
2859		3080
2860	$y += $h;	3081	$paridx++;
		3082	$top_paragraph ||= $paridx if $y >= $top;
2861	}	3083	}
		3084
		3085	$self->{top_paragraph} = $top_paragraph;
2862	};	3086	};
2863	});	3087	});
2864	}	3088	}
2865		3089
2866	sub reconfigure {	3090	sub reconfigure {
…		…
2884	$self->{children}[1]->draw;	3108	$self->{children}[1]->draw;
2885	}	3109	}
2886		3110
2887	#############################################################################	3111	#############################################################################
2888		3112
2889	package CFClient::UI::Animator;	3113	package CFPlus::UI::Animator;
2890		3114
2891	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2892		3116
2893	our @ISA = CFClient::UI::Bin::;	3117	our @ISA = CFPlus::UI::Bin::;
2894		3118
2895	sub moveto {	3119	sub moveto {
2896	my ($self, $x, $y) = @_;	3120	my ($self, $x, $y) = @_;
2897		3121
2898	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3122	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2926	glPopMatrix;	3150	glPopMatrix;
2927	}	3151	}
2928		3152
2929	#############################################################################	3153	#############################################################################
2930		3154
2931	package CFClient::UI::Flopper;	3155	package CFPlus::UI::Flopper;
2932		3156
2933	our @ISA = CFClient::UI::Button::;	3157	our @ISA = CFPlus::UI::Button::;
2934		3158
2935	sub new {	3159	sub new {
2936	my $class = shift;	3160	my $class = shift;
2937		3161
2938	my $self = $class->SUPER::new (	3162	my $self = $class->SUPER::new (
…		…
2950	$self->{other}->toggle_visibility;	3174	$self->{other}->toggle_visibility;
2951	}	3175	}
2952		3176
2953	#############################################################################	3177	#############################################################################
2954		3178
2955	package CFClient::UI::Tooltip;	3179	package CFPlus::UI::Tooltip;
2956		3180
2957	our @ISA = CFClient::UI::Bin::;	3181	our @ISA = CFPlus::UI::Bin::;
2958		3182
2959	use CFClient::OpenGL;	3183	use CFPlus::OpenGL;
2960		3184
2961	sub new {	3185	sub new {
2962	my $class = shift;	3186	my $class = shift;
2963		3187
2964	$class->SUPER::new (	3188	$class->SUPER::new (
…		…
2967	)	3191	)
2968	}	3192	}
2969		3193
2970	sub set_tooltip_from {	3194	sub set_tooltip_from {
2971	my ($self, $widget) = @_;	3195	my ($self, $widget) = @_;
		3196
		3197	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3198	if $widget->{tooltip} =~ /^#(.*)$/;
2972		3199
2973	my $tooltip = $widget->{tooltip};	3200	my $tooltip = $widget->{tooltip};
2974		3201
2975	if ($ENV{CFPLUS_DEBUG} & 2) {	3202	if ($ENV{CFPLUS_DEBUG} & 2) {
2976	$tooltip .= "\n\n" . (ref $widget) . "\n"	3203	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2980	}	3207	}
2981		3208
2982	$tooltip =~ s/^\n+//;	3209	$tooltip =~ s/^\n+//;
2983	$tooltip =~ s/\n+$//;	3210	$tooltip =~ s/\n+$//;
2984		3211
2985	$self->add (new CFClient::UI::Label	3212	$self->add (new CFPlus::UI::Label
2986	markup => $tooltip,	3213	markup => $tooltip,
2987	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3214	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2988	fontsize => 0.8,	3215	fontsize => 0.8,
2989	fg => [0, 0, 0, 1],	3216	style => 1, # FLAG_INVERSE
2990	ellipsise => 0,	3217	ellipsise => 0,
2991	font => ($widget->{tooltip_font} || $::FONT_PROP),	3218	font => ($widget->{tooltip_font} || $::FONT_PROP),
2992	);	3219	);
2993	}	3220	}
2994		3221
…		…
3056	$self->SUPER::_draw;	3283	$self->SUPER::_draw;
3057	}	3284	}
3058		3285
3059	#############################################################################	3286	#############################################################################
3060		3287
3061	package CFClient::UI::Face;	3288	package CFPlus::UI::Face;
3062		3289
3063	our @ISA = CFClient::UI::DrawBG::;	3290	our @ISA = CFPlus::UI::DrawBG::;
3064		3291
3065	use CFClient::OpenGL;	3292	use CFPlus::OpenGL;
3066		3293
3067	sub new {	3294	sub new {
3068	my $class = shift;	3295	my $class = shift;
3069		3296
3070	my $self = $class->SUPER::new (	3297	my $self = $class->SUPER::new (
…		…
3072	can_events => 0,	3299	can_events => 0,
3073	@_,	3300	@_,
3074	);	3301	);
3075		3302
3076	if ($self->{anim} && $self->{animspeed}) {	3303	if ($self->{anim} && $self->{animspeed}) {
3077	Scalar::Util::weaken (my $widget = $self);	3304	CFPlus::weaken (my $widget = $self);
3078		3305
3079	$self->{timer} = Event->timer (	3306	$self->{timer} = Event->timer (
3080	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3307	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3081	hard => 1,	3308	hard => 1,
3082	interval => $self->{animspeed},	3309	interval => $self->{animspeed},
…		…
3138	$self->SUPER::destroy;	3365	$self->SUPER::destroy;
3139	}	3366	}
3140		3367
3141	#############################################################################	3368	#############################################################################
3142		3369
3143	package CFClient::UI::Buttonbar;	3370	package CFPlus::UI::Buttonbar;
3144		3371
3145	our @ISA = CFClient::UI::HBox::;	3372	our @ISA = CFPlus::UI::HBox::;
3146		3373
3147	# TODO: should actualyl wrap buttons and other goodies.	3374	# TODO: should actually wrap buttons and other goodies.
3148		3375
3149	#############################################################################	3376	#############################################################################
3150		3377
3151	package CFClient::UI::Menu;	3378	package CFPlus::UI::Menu;
3152		3379
3153	our @ISA = CFClient::UI::FancyFrame::;	3380	our @ISA = CFPlus::UI::Toplevel::;
3154		3381
3155	use CFClient::OpenGL;	3382	use CFPlus::OpenGL;
3156		3383
3157	sub new {	3384	sub new {
3158	my $class = shift;	3385	my $class = shift;
3159		3386
3160	my $self = $class->SUPER::new (	3387	my $self = $class->SUPER::new (
3161	items => [],	3388	items => [],
3162	z => 100,	3389	z => 100,
3163	@_,	3390	@_,
3164	);	3391	);
3165		3392
3166	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3393	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3167		3394
3168	for my $item (@{ $self->{items} }) {	3395	for my $item (@{ $self->{items} }) {
3169	my ($widget, $cb, $tooltip) = @$item;	3396	my ($widget, $cb, $tooltip) = @$item;
3170		3397
3171	# handle various types of items, only text for now	3398	# handle various types of items, only text for now
3172	if (!ref $widget) {	3399	if (!ref $widget) {
3173	if ($widget =~ /\t/) {	3400	if ($widget =~ /\t/) {
3174	my ($left, $right) = split /\t/, $widget, 2;	3401	my ($left, $right) = split /\t/, $widget, 2;
3175		3402
3176	$widget = new CFClient::UI::HBox	3403	$widget = new CFPlus::UI::HBox
3177	can_hover => 1,	3404	can_hover => 1,
3178	can_events => 1,	3405	can_events => 1,
3179	tooltip => $tooltip,	3406	tooltip => $tooltip,
3180	children => [	3407	children => [
3181	(new CFClient::UI::Label markup => $left, expand => 1),	3408	(new CFPlus::UI::Label markup => $left, expand => 1),
3182	(new CFClient::UI::Label markup => $right, align => +1),	3409	(new CFPlus::UI::Label markup => $right, align => +1),
3183	],	3410	],
3184	;	3411	;
3185		3412
3186	} else {	3413	} else {
3187	$widget = new CFClient::UI::Label	3414	$widget = new CFPlus::UI::Label
3188	can_hover => 1,	3415	can_hover => 1,
3189	can_events => 1,	3416	can_events => 1,
3190	markup => $widget,	3417	markup => $widget,
3191	tooltip => $tooltip;	3418	tooltip => $tooltip;
3192	}	3419	}
…		…
3240	1	3467	1
3241	}	3468	}
3242		3469
3243	#############################################################################	3470	#############################################################################
3244		3471
3245	package CFClient::UI::Multiplexer;	3472	package CFPlus::UI::Multiplexer;
3246		3473
3247	our @ISA = CFClient::UI::Container::;	3474	our @ISA = CFPlus::UI::Container::;
3248		3475
3249	sub new {	3476	sub new {
3250	my $class = shift;	3477	my $class = shift;
3251		3478
3252	my $self = $class->SUPER::new (	3479	my $self = $class->SUPER::new (
…		…
3313	$self->{current}->draw;	3540	$self->{current}->draw;
3314	}	3541	}
3315		3542
3316	#############################################################################	3543	#############################################################################
3317		3544
3318	package CFClient::UI::Notebook;	3545	package CFPlus::UI::Notebook;
3319		3546
3320	our @ISA = CFClient::UI::VBox::;	3547	our @ISA = CFPlus::UI::VBox::;
3321		3548
3322	sub new {	3549	sub new {
3323	my $class = shift;	3550	my $class = shift;
3324		3551
3325	my $self = $class->SUPER::new (	3552	my $self = $class->SUPER::new (
3326	buttonbar => (new CFClient::UI::Buttonbar),	3553	buttonbar => (new CFPlus::UI::Buttonbar),
3327	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3554	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3328	# filter => # will be put between multiplexer and $self	3555	# filter => # will be put between multiplexer and $self
3329	@_,	3556	@_,
3330	);	3557	);
3331		3558
3332	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3559	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3336	}	3563	}
3337		3564
3338	sub add {	3565	sub add {
3339	my ($self, $title, $widget, $tooltip) = @_;	3566	my ($self, $title, $widget, $tooltip) = @_;
3340		3567
3341	Scalar::Util::weaken $self;	3568	CFPlus::weaken $self;
3342		3569
3343	$self->{buttonbar}->add (new CFClient::UI::Button	3570	$self->{buttonbar}->add (new CFPlus::UI::Button
3344	markup => $title,	3571	markup => $title,
3345	tooltip => $tooltip,	3572	tooltip => $tooltip,
3346	on_activate => sub { $self->set_current_page ($widget) },	3573	on_activate => sub { $self->set_current_page ($widget) },
3347	);	3574	);
3348		3575
…		…
3362	$self->emit (page_changed => $self->{multiplexer}{current});	3589	$self->emit (page_changed => $self->{multiplexer}{current});
3363	}	3590	}
3364		3591
3365	#############################################################################	3592	#############################################################################
3366		3593
3367	package CFClient::UI::Selector;	3594	package CFPlus::UI::Selector;
3368		3595
3369	use utf8;	3596	use utf8;
3370		3597
3371	our @ISA = CFClient::UI::Button::;	3598	our @ISA = CFPlus::UI::Button::;
3372		3599
3373	sub new {	3600	sub new {
3374	my $class = shift;	3601	my $class = shift;
3375		3602
3376	my $self = $class->SUPER::new (	3603	my $self = $class->SUPER::new (
…		…
3393	my ($value, $title, $tooltip) = @$_;	3620	my ($value, $title, $tooltip) = @$_;
3394		3621
3395	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3622	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396	}	3623	}
3397		3624
3398	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3625	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399	}	3626	}
3400		3627
3401	sub _set_value {	3628	sub _set_value {
3402	my ($self, $value) = @_;	3629	my ($self, $value) = @_;
3403		3630
…		…
3418	$self->emit (changed => $value);	3645	$self->emit (changed => $value);
3419	}	3646	}
3420		3647
3421	#############################################################################	3648	#############################################################################
3422		3649
3423	package CFClient::UI::Statusbox;	3650	package CFPlus::UI::Statusbox;
3424		3651
3425	our @ISA = CFClient::UI::VBox::;	3652	our @ISA = CFPlus::UI::VBox::;
3426		3653
3427	sub new {	3654	sub new {
3428	my $class = shift;	3655	my $class = shift;
3429		3656
3430	my $self = $class->SUPER::new (	3657	my $self = $class->SUPER::new (
3431	fontsize => 0.8,	3658	fontsize => 0.8,
3432	@_,	3659	@_,
3433	);	3660	);
3434		3661
3435	Scalar::Util::weaken (my $this = $self);	3662	CFPlus::weaken (my $this = $self);
3436		3663
3437	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3664	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3438		3665
3439	$self	3666	$self
3440	}	3667	}
…		…
3442	sub reorder {	3669	sub reorder {
3443	my ($self) = @_;	3670	my ($self) = @_;
3444	my $NOW = Time::HiRes::time;	3671	my $NOW = Time::HiRes::time;
3445		3672
3446	# freeze display when hovering over any label	3673	# freeze display when hovering over any label
3447	return if $CFClient::UI::TOOLTIP->{owner}	3674	return if $CFPlus::UI::TOOLTIP->{owner}
3448	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3675	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3449	values %{ $self->{item} };	3676	values %{ $self->{item} };
3450		3677
3451	while (my ($k, $v) = each %{ $self->{item} }) {	3678	while (my ($k, $v) = each %{ $self->{item} }) {
3452	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3679	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3453	}	3680	}
…		…
3474	for ($short) {	3701	for ($short) {
3475	s/^\s+//;	3702	s/^\s+//;
3476	s/\s+/ /g;	3703	s/\s+/ /g;
3477	}	3704	}
3478		3705
3479	new CFClient::UI::Label	3706	new CFPlus::UI::Label
3480	markup => $short,	3707	markup => $short,
3481	tooltip => $item->{tooltip},	3708	tooltip => $item->{tooltip},
3482	tooltip_font => $::FONT_PROP,	3709	tooltip_font => $::FONT_PROP,
3483	tooltip_width => 0.67,	3710	tooltip_width => 0.67,
3484	fontsize => $item->{fontsize} || $self->{fontsize},	3711	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3563	$self->SUPER::destroy;	3790	$self->SUPER::destroy;
3564	}	3791	}
3565		3792
3566	#############################################################################	3793	#############################################################################
3567		3794
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;	3795	package CFPlus::UI::Root;
3753		3796
3754	our @ISA = CFClient::UI::Container::;	3797	our @ISA = CFPlus::UI::Container::;
3755		3798
3756	use List::Util qw(min max);	3799	use List::Util qw(min max);
3757		3800
3758	use CFClient::OpenGL;	3801	use CFPlus::OpenGL;
3759		3802
3760	sub new {	3803	sub new {
3761	my $class = shift;	3804	my $class = shift;
3762		3805
3763	my $self = $class->SUPER::new (	3806	my $self = $class->SUPER::new (
3764	visible => 1,	3807	visible => 1,
3765	@_,	3808	@_,
3766	);	3809	);
3767		3810
3768	Scalar::Util::weaken ($self->{root} = $self);	3811	CFPlus::weaken ($self->{root} = $self);
3769		3812
3770	$self	3813	$self
3771	}	3814	}
3772		3815
3773	sub size_request {	3816	sub size_request {
…		…
3980	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4023	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3981	glMatrixMode GL_MODELVIEW;	4024	glMatrixMode GL_MODELVIEW;
3982	glLoadIdentity;	4025	glLoadIdentity;
3983		4026
3984	{	4027	{
3985	package CFClient::UI::Base;	4028	package CFPlus::UI::Base;
3986		4029
3987	($draw_x, $draw_y, $draw_w, $draw_h) =	4030	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3988	(0, 0, $self->{w}, $self->{h});	4031	(0, 0, $self->{w}, $self->{h});
3989	}
3990		4032
3991	$self->_draw;	4033	$self->_draw;
		4034	}
3992	}	4035	}
3993		4036
3994	#############################################################################	4037	#############################################################################
3995		4038
3996	package CFClient::UI;	4039	package CFPlus::UI;
3997		4040
3998	$ROOT = new CFClient::UI::Root;	4041	$ROOT = new CFPlus::UI::Root;
3999	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4042	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4000		4043
4001	1	4044	1
4002		4045

Diff Legend

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