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.328 by root, Sat Jul 22 13:43:05 2006 UTC vs.
Revision 1.345 by root, Sun Aug 13 21:46:10 2006 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 ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	warn "button down $ev->{button}\n";#d#	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
89		103
90	if (!$BUTTON_STATE) {	104	unless ($GRAB) {
91	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
92		106
93	$GRAB = $widget;	107	$GRAB = $widget;
94	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
95		109
96	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
97	}	111	}
98		112
99	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
100		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
101	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
102	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
103	}	123	}
104		124
105	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
106	my ($ev) = @_;	126	my ($ev) = @_;
107	my ($x, $y) = ($ev->{x}, $ev->{y});
108		127
109	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
110		129
111	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
112		131
113	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
114	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
115		134
116	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
117	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
118	$grab->update if $grab;	137	$grab->update if $grab;
119	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
120		139
		140	check_hover $widget;
121	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
122	}	142	}
123	}	143	}
124		144
125	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
126	my ($ev) = @_;	146	my ($ev) = @_;
127	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
128		148
129	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
130		150
131	if ($widget != $HOVER) {	151	check_hover $widget;
132	my $hover = $HOVER; $HOVER = $widget;
133		152
134	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
135	$HOVER->update if $HOVER && $HOVER->{can_hover};
136
137	$TOOLTIP_WATCHER->start;
138	}
139
140	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
141	if $HOVER;	154	if $HOVER;
142	}	155	}
143		156
144	# convert position array to integers	157	# convert position array to integers
145	sub harmonize {	158	sub harmonize {
…		…
195	reconfigure_widgets;	208	reconfigure_widgets;
196	}	209	}
197		210
198	#############################################################################	211	#############################################################################
199		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
200	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
201		222
202	use strict;	223	use strict;
203		224
204	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
205		226
206	sub new {	227	sub new {
207	my $class = shift;	228	my $class = shift;
208		229
209	my $self = bless {	230	my $self = bless {
…		…
214	h => undef,	235	h => undef,
215	can_events => 1,	236	can_events => 1,
216	@_	237	@_
217	}, $class;	238	}, $class;
218		239
219	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
220		241
221	for (keys %$self) {	242	for (keys %$self) {
222	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
223	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
224	}	245	}
225	}	246	}
226		247
227	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
228	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
229	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
230	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
231	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
232		253
233	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
234	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
235		256
236	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
249	sub show {	270	sub show {
250	my ($self) = @_;	271	my ($self) = @_;
251		272
252	return if $self->{parent};	273	return if $self->{parent};
253		274
254	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
255	}	276	}
256		277
257	sub set_visible {	278	sub set_visible {
258	my ($self) = @_;	279	my ($self) = @_;
259		280
…		…
280	delete $self->{root};	301	delete $self->{root};
281		302
282	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
283	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
284		305
285	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
286	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
287		308
288	$self->emit ("focus_out");	309	$self->emit ("focus_out");
289	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
290	}	311	}
…		…
347	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
348		369
349	if ($self->{aspect}) {	370	if ($self->{aspect}) {
350	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
351		372
352	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
353	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
354		375
355	# use alignment to adjust x, y	376	# use alignment to adjust x, y
356		377
357	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
358	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
399		420
400	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
401		422
402	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
403		424
404	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
405	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
406	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
407	}	428	}
408	}	429	}
409		430
410	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
411	sub coord2local {	432	sub coord2local {
412	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
413		434
		435	Carp::confess unless $self->{parent};#d#
		436
414	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
415	}	438	}
416		439
417	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
418	sub coord2global {	441	sub coord2global {
419	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
		443
		444	Carp::confess unless $self->{parent};#d#
420		445
421	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
422	}	447	}
423		448
424	sub invoke_focus_in {	449	sub invoke_focus_in {
…		…
458		483
459	sub invoke_mouse_motion { 0 }	484	sub invoke_mouse_motion { 0 }
460	sub invoke_button_up { 0 }	485	sub invoke_button_up { 0 }
461	sub invoke_key_down { 0 }	486	sub invoke_key_down { 0 }
462	sub invoke_key_up { 0 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
463		489
464	sub invoke_button_down {	490	sub invoke_button_down {
465	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
466		492
467	$self->grab_focus;	493	$self->grab_focus;
468		494
469	warn "button down $ev->{button} $x $y\n";#d#
470
471	0	495	0
472	}	496	}
473		497
474	sub connect {	498	sub connect {
475	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
476		500
477	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
478	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
479		515
480	sub emit {	516	sub emit {
481	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
482		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
483	#d##TODO# stop propagating at first true, do not use sum	528	#d##TODO# stop propagating at first true, do not use sum
484	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
485	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
486	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
487	}	532	}
488		533
489	sub find_widget {	534	sub find_widget {
490	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
491		536
…		…
575	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
576	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
577	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
578	glEnd;	623	glEnd;
579	glPopMatrix;	624	glPopMatrix;
580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581	}	626	}
582		627
583	$self->_draw;	628	$self->_draw;
584	glPopMatrix;	629	glPopMatrix;
585	}	630	}
…		…
591	}	636	}
592		637
593	sub DESTROY {	638	sub DESTROY {
594	my ($self) = @_;	639	my ($self) = @_;
595		640
596	return if CFClient::in_destruct;	641	return if CFPlus::in_destruct;
597		642
598	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
599		644
600	eval { $self->destroy };	645	eval { $self->destroy };
601	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
602	}	647	}
603		648
604	#############################################################################	649	#############################################################################
605		650
606	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
607		652
608	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
609		654
610	use strict;	655	use strict;
611	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
612		657
613	sub new {	658	sub new {
614	my $class = shift;	659	my $class = shift;
615		660
616	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
647	}	692	}
648	}	693	}
649		694
650	#############################################################################	695	#############################################################################
651		696
652	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
653		698
654	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
655		700
656	sub new {	701	sub new {
657	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
658	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
659	}	704	}
…		…
666		711
667	sub draw { }	712	sub draw { }
668		713
669	#############################################################################	714	#############################################################################
670		715
671	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
672		717
673	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
674		719
675	sub new {	720	sub new {
676	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
677		722
678	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
687	if $children;	732	if $children;
688		733
689	$self	734	$self
690	}	735	}
691		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
		743	}
		744
692	sub add {	745	sub add {
693	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
694		747
695	$_->set_parent ($self)	748	$_->set_parent ($self)
696	for @widgets;	749	for @widgets;
…		…
756	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
757	}	810	}
758		811
759	#############################################################################	812	#############################################################################
760		813
761	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
762		815
763	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
764		817
765	sub new {	818	sub new {
766	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
767		820
768	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
769		822
770	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
771	}	824	}
772		825
773	sub add {	826	sub add {
…		…
780	sub remove {	833	sub remove {
781	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
782		835
783	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
784		837
785	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
786	unless @{$self->{children}};	839	unless @{$self->{children}};
787	}	840	}
788		841
789	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
790		843
…		…
802		855
803	#############################################################################	856	#############################################################################
804		857
805	# back-buffered drawing area	858	# back-buffered drawing area
806		859
807	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
808		861
809	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
810		863
811	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
812		865
813	sub new {	866	sub new {
814	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
815		868
816	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
838	}	891	}
839		892
840	sub render_child {	893	sub render_child {
841	my ($self) = @_;	894	my ($self) = @_;
842		895
843	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
844	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
845	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
846		899
847	{	900	{
848	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
849		902
850	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
851	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
852	}	905	}
853		906
…		…
856	}	909	}
857		910
858	sub _draw {	911	sub _draw {
859	my ($self) = @_;	912	my ($self) = @_;
860		913
861	my ($w, $h) = @$self{qw(w h)};
862
863	my $tex = $self->{texture}	914	my $tex = $self->{texture}
864	or return;	915	or return;
865		916
866	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
867	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
868	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
869		920
870	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
871		922
872	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
873	}	924	}
874		925
875	#############################################################################	926	#############################################################################
876		927
877	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
878		929
879	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
880		931
881	sub new {	932	sub new {
882	my $class = shift;	933	my $class = shift;
883		934
884	$class->SUPER::new (	935	$class->SUPER::new (
…		…
944	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
945	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
946	) {	997	) {
947	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
948	} else {	999	} else {
949	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
950	}	1001	}
951	}	1002	}
952		1003
953	sub _render {	1004	sub _render {
954	my ($self) = @_;	1005	my ($self) = @_;
955		1006
956	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
957	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
958		1009
959	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
960		1011
961	$self->SUPER::_render;	1012	$self->SUPER::_render;
962	}	1013	}
963		1014
964	#############################################################################	1015	#############################################################################
965		1016
966	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
967		1018
968	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
969		1020
970	sub new {	1021	sub new {
971	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
972		1023
973	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
974		1025
975	my $self;	1026	my $self;
976		1027
977	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
978	vertical => 1,	1029	vertical => 1,
979	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
980	on_changed => sub {	1031	on_changed => sub {
981	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
982	},	1033	},
983	;	1034	;
984		1035
985	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
986	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
		1038	can_events => 1,
987	slider => $slider,	1039	slider => $slider,
988	%arg,	1040	%arg,
989	);	1041	);
990		1042
991	$self->SUPER::add ($self->{vp}, $self->{slider});	1043	$self->SUPER::add ($self->{vp}, $self->{slider});
992	$self->add ($child) if $child;	1044	$self->add ($child) if $child;
…		…
1000	my ($self, $widget) = @_;	1052	my ($self, $widget) = @_;
1001		1053
1002	$self->{vp}->add ($self->{child} = $widget);	1054	$self->{vp}->add ($self->{child} = $widget);
1003	}	1055	}
1004		1056
1005	sub invoke_button_down {	1057	sub invoke_mouse_wheel {
1006	my ($self, $ev) = @_;	1058	my ($self, $ev) = @_;
1007		1059
1008	warn "button down $ev->{button}\n";#d#	1060	return 0 unless $ev->{dy}; # only vertical movements
		1061
		1062	$self->{slider}->emit (mouse_wheel => $ev);
		1063
1009		1064	1
1010	0
1011	}	1065	}
1012		1066
1013	sub update_slider {	1067	sub update_slider {
1014	my ($self) = @_;	1068	my ($self) = @_;
1015		1069
…		…
1032	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1033	}	1087	}
1034		1088
1035	#############################################################################	1089	#############################################################################
1036		1090
1037	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1038		1092
1039	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1040		1094
1041	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1042		1096
1043	sub new {	1097	sub new {
1044	my $class = shift;	1098	my $class = shift;
1045		1099
1046	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1072	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1073	}	1127	}
1074		1128
1075	#############################################################################	1129	#############################################################################
1076		1130
1077	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1078		1132
1079	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1080		1134
1081	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
1082		1136
1083	my $bg =	1137	my $bg =
1084	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1138	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1085	mipmap => 1, wrap => 1;	1139	mipmap => 1, wrap => 1;
1086		1140
1087	my @border =	1141	my @border =
1088	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1142	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1089	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1143	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1090		1144
1091	sub new {	1145	sub new {
1092	my ($class, %arg) = @_;	1146	my ($class, %arg) = @_;
1093		1147
…		…
1099	min_w => 64,	1153	min_w => 64,
1100	min_h => 32,	1154	min_h => 32,
1101	%arg,	1155	%arg,
1102	);	1156	);
1103		1157
1104	$self->{title_widget} = new CFClient::UI::Label	1158	$self->{title_widget} = new CFPlus::UI::Label
1105	align => 0,	1159	align => 0,
1106	valign => 1,	1160	valign => 1,
1107	text => $self->{title},	1161	text => $self->{title},
1108	fontsize => $self->{border},	1162	fontsize => $self->{border},
1109	if exists $self->{title};	1163	if exists $self->{title};
1110		1164
1111	if ($self->{has_close_button}) {	1165	if ($self->{has_close_button}) {
1112	$self->{close_button} =	1166	$self->{close_button} =
1113	new CFClient::UI::ImageButton	1167	new CFPlus::UI::ImageButton
1114	path => 'x1_close.png',	1168	path => 'x1_close.png',
1115	on_activate => sub { $self->emit ("delete") };	1169	on_activate => sub { $self->emit ("delete") };
1116		1170
1117	$self->CFClient::UI::Container::add ($self->{close_button});	1171	$self->CFPlus::UI::Container::add ($self->{close_button});
1118	}	1172	}
1119		1173
1120	$self	1174	$self
1121	}	1175	}
1122		1176
1123	sub add {	1177	sub add {
1124	my ($self, @widgets) = @_;	1178	my ($self, @widgets) = @_;
1125		1179
1126	$self->SUPER::add (@widgets);	1180	$self->SUPER::add (@widgets);
1127	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1181	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1128	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1182	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1129	}	1183	}
1130		1184
1131	sub border {	1185	sub border {
1132	int $_[0]{border} * $::FONTSIZE	1186	int $_[0]{border} * $::FONTSIZE
1133	}	1187	}
…		…
1241	$self->{motion}->($ev, $x, $y) if $self->{motion};	1295	$self->{motion}->($ev, $x, $y) if $self->{motion};
1242		1296
1243	! ! $self->{motion}	1297	! ! $self->{motion}
1244	}	1298	}
1245		1299
		1300	sub invoke_visibility_change {
		1301	my ($self, $visible) = @_;
		1302
		1303	delete $self->{motion} unless $visible;
		1304
		1305	0
		1306	}
		1307
1246	sub _draw {	1308	sub _draw {
1247	my ($self) = @_;	1309	my ($self) = @_;
1248		1310
1249	my $child = $self->{children}[0];	1311	my $child = $self->{children}[0];
1250		1312
…		…
1287	if $self->{close_button};	1349	if $self->{close_button};
1288	}	1350	}
1289		1351
1290	#############################################################################	1352	#############################################################################
1291		1353
1292	package CFClient::UI::Table;	1354	package CFPlus::UI::Table;
1293		1355
1294	our @ISA = CFClient::UI::Base::;	1356	our @ISA = CFPlus::UI::Base::;
1295		1357
1296	use List::Util qw(max sum);	1358	use List::Util qw(max sum);
1297		1359
1298	use CFClient::OpenGL;	1360	use CFPlus::OpenGL;
1299		1361
1300	sub new {	1362	sub new {
1301	my $class = shift;	1363	my $class = shift;
1302		1364
1303	$class->SUPER::new (	1365	$class->SUPER::new (
…		…
1309	sub children {	1371	sub children {
1310	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1372	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311	}	1373	}
1312		1374
1313	sub add {	1375	sub add {
1314	my ($self, $x, $y, $child) = @_;	1376	my ($self) = shift;
1315		1377
		1378	while (@_) {
		1379	my ($x, $y, $child) = splice @_, 0, 3, ();
1316	$child->set_parent ($self);	1380	$child->set_parent ($self);
1317	$self->{children}[$y][$x] = $child;	1381	$self->{children}[$y][$x] = $child;
		1382	}
1318		1383
		1384	$self->{force_realloc} = 1;
		1385	$self->{force_size_alloc} = 1;
1319	$self->realloc;	1386	$self->realloc;
1320	}	1387	}
1321		1388
1322	sub remove {	1389	sub remove {
1323	my ($self, $child) = @_;	1390	my ($self, $child) = @_;
…		…
1388		1455
1389	# linearly scale sizes	1456	# linearly scale sizes
1390	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1457	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1391	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1458	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1392		1459
1393	CFClient::UI::harmonize $ws;	1460	CFPlus::UI::harmonize $ws;
1394	CFClient::UI::harmonize $hs;	1461	CFPlus::UI::harmonize $hs;
1395		1462
1396	my $y;	1463	my $y;
1397		1464
1398	for my $r (0 .. $#{$self->{children}}) {	1465	for my $r (0 .. $#{$self->{children}}) {
1399	my $row = $self->{children}[$r]	1466	my $row = $self->{children}[$r]
…		…
1442	}	1509	}
1443	}	1510	}
1444		1511
1445	#############################################################################	1512	#############################################################################
1446		1513
1447	package CFClient::UI::Box;	1514	package CFPlus::UI::Box;
1448		1515
1449	our @ISA = CFClient::UI::Container::;	1516	our @ISA = CFPlus::UI::Container::;
1450		1517
1451	sub size_request {	1518	sub size_request {
1452	my ($self) = @_;	1519	my ($self) = @_;
1453		1520
1454	$self->{vertical}	1521	$self->{vertical}
…		…
1487	$req[$_] += $space * $children[$_]{expand}	1554	$req[$_] += $space * $children[$_]{expand}
1488	for 0 .. $#children;	1555	for 0 .. $#children;
1489	}	1556	}
1490	}	1557	}
1491		1558
1492	CFClient::UI::harmonize \@req;	1559	CFPlus::UI::harmonize \@req;
1493		1560
1494	my $pos = 0;	1561	my $pos = 0;
1495	for (0 .. $#children) {	1562	for (0 .. $#children) {
1496	my $alloc = $req[$_];	1563	my $alloc = $req[$_];
1497	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1564	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1502	1	1569	1
1503	}	1570	}
1504		1571
1505	#############################################################################	1572	#############################################################################
1506		1573
1507	package CFClient::UI::HBox;	1574	package CFPlus::UI::HBox;
1508		1575
1509	our @ISA = CFClient::UI::Box::;	1576	our @ISA = CFPlus::UI::Box::;
1510		1577
1511	sub new {	1578	sub new {
1512	my $class = shift;	1579	my $class = shift;
1513		1580
1514	$class->SUPER::new (	1581	$class->SUPER::new (
…		…
1517	)	1584	)
1518	}	1585	}
1519		1586
1520	#############################################################################	1587	#############################################################################
1521		1588
1522	package CFClient::UI::VBox;	1589	package CFPlus::UI::VBox;
1523		1590
1524	our @ISA = CFClient::UI::Box::;	1591	our @ISA = CFPlus::UI::Box::;
1525		1592
1526	sub new {	1593	sub new {
1527	my $class = shift;	1594	my $class = shift;
1528		1595
1529	$class->SUPER::new (	1596	$class->SUPER::new (
…		…
1532	)	1599	)
1533	}	1600	}
1534		1601
1535	#############################################################################	1602	#############################################################################
1536		1603
1537	package CFClient::UI::Label;	1604	package CFPlus::UI::Label;
1538		1605
1539	our @ISA = CFClient::UI::DrawBG::;	1606	our @ISA = CFPlus::UI::DrawBG::;
1540		1607
1541	use CFClient::OpenGL;	1608	use CFPlus::OpenGL;
1542		1609
1543	sub new {	1610	sub new {
1544	my ($class, %arg) = @_;	1611	my ($class, %arg) = @_;
1545		1612
1546	my $self = $class->SUPER::new (	1613	my $self = $class->SUPER::new (
…		…
1549	#active_bg => none	1616	#active_bg => none
1550	#font => default_font	1617	#font => default_font
1551	#text => initial text	1618	#text => initial text
1552	#markup => initial narkup	1619	#markup => initial narkup
1553	#max_w => maximum pixel width	1620	#max_w => maximum pixel width
		1621	#style => 0, # render flags
1554	ellipsise => 3, # end	1622	ellipsise => 3, # end
1555	layout => (new CFClient::Layout),	1623	layout => (new CFPlus::Layout),
1556	fontsize => 1,	1624	fontsize => 1,
1557	align => -1,	1625	align => -1,
1558	valign => -1,	1626	valign => -1,
1559	padding_x => 2,	1627	padding_x => 2,
1560	padding_y => 2,	1628	padding_y => 2,
1561	can_events => 0,	1629	can_events => 0,
1562	%arg	1630	%arg
1563	);	1631	);
1564		1632
1565	if (exists $self->{template}) {	1633	if (exists $self->{template}) {
1566	my $layout = new CFClient::Layout;	1634	my $layout = new CFPlus::Layout;
1567	$layout->set_text (delete $self->{template});	1635	$layout->set_text (delete $self->{template});
1568	$self->{template} = $layout;	1636	$self->{template} = $layout;
1569	}	1637	}
1570		1638
1571	if (exists $self->{markup}) {	1639	if (exists $self->{markup}) {
…		…
1573	} else {	1641	} else {
1574	$self->set_text (delete $self->{text});	1642	$self->set_text (delete $self->{text});
1575	}	1643	}
1576		1644
1577	$self	1645	$self
1578	}
1579
1580	sub escape($) {
1581	local $_ = $_[0];
1582
1583	s/&/&amp;/g;
1584	s/>/&gt;/g;
1585	s/</&lt;/g;
1586
1587	$_
1588	}	1646	}
1589		1647
1590	sub update {	1648	sub update {
1591	my ($self) = @_;	1649	my ($self) = @_;
1592		1650
…		…
1719	};	1777	};
1720		1778
1721	my $w = List::Util::min $self->{w} + 4, $size->[0];	1779	my $w = List::Util::min $self->{w} + 4, $size->[0];
1722	my $h = List::Util::min $self->{h} + 2, $size->[1];	1780	my $h = List::Util::min $self->{h} + 2, $size->[1];
1723		1781
1724	$self->{layout}->render ($self->{ox}, $self->{oy});	1782	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1725	}	1783	}
1726		1784
1727	#############################################################################	1785	#############################################################################
1728		1786
1729	package CFClient::UI::EntryBase;	1787	package CFPlus::UI::EntryBase;
1730		1788
1731	our @ISA = CFClient::UI::Label::;	1789	our @ISA = CFPlus::UI::Label::;
1732		1790
1733	use CFClient::OpenGL;	1791	use CFPlus::OpenGL;
1734		1792
1735	sub new {	1793	sub new {
1736	my $class = shift;	1794	my $class = shift;
1737		1795
1738	$class->SUPER::new (	1796	$class->SUPER::new (
…		…
1800		1858
1801	if ($uni == 8) {	1859	if ($uni == 8) {
1802	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1803	} elsif ($uni == 127) {	1861	} elsif ($uni == 127) {
1804	substr $text, $self->{cursor}, 1, "";	1862	substr $text, $self->{cursor}, 1, "";
1805	} elsif ($sym == CFClient::SDLK_LEFT) {	1863	} elsif ($sym == CFPlus::SDLK_LEFT) {
1806	--$self->{cursor} if $self->{cursor};	1864	--$self->{cursor} if $self->{cursor};
1807	} elsif ($sym == CFClient::SDLK_RIGHT) {	1865	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1808	++$self->{cursor} if $self->{cursor} < length $self->{text};	1866	++$self->{cursor} if $self->{cursor} < length $self->{text};
1809	} elsif ($sym == CFClient::SDLK_HOME) {	1867	} elsif ($sym == CFPlus::SDLK_HOME) {
1810	$self->{cursor} = 0;	1868	$self->{cursor} = 0;
1811	} elsif ($sym == CFClient::SDLK_END) {	1869	} elsif ($sym == CFPlus::SDLK_END) {
1812	$self->{cursor} = length $text;	1870	$self->{cursor} = length $text;
1813	} elsif ($uni == 27) {	1871	} elsif ($uni == 27) {
1814	$self->emit ('escape');	1872	$self->emit ('escape');
1815	} elsif ($uni) {	1873	} elsif ($uni) {
1816	substr $text, $self->{cursor}++, 0, chr $uni;	1874	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1890	utf8::encode $text;	1948	utf8::encode $text;
1891		1949
1892	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1893	}	1951	}
1894		1952
1895	glColor @{$self->{fg}};
1896	glBegin GL_LINES;	1953	glBegin GL_LINES;
1897	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	1954	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1898	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	1955	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1899	glEnd;	1956	glEnd;
1900	}	1957	}
1901	}	1958	}
1902		1959
1903	package CFClient::UI::Entry;	1960	package CFPlus::UI::Entry;
1904		1961
1905	our @ISA = CFClient::UI::EntryBase::;	1962	our @ISA = CFPlus::UI::EntryBase::;
1906		1963
1907	use CFClient::OpenGL;	1964	use CFPlus::OpenGL;
1908		1965
1909	sub invoke_key_down {	1966	sub invoke_key_down {
1910	my ($self, $ev) = @_;	1967	my ($self, $ev) = @_;
1911		1968
1912	my $sym = $ev->{sym};	1969	my $sym = $ev->{sym};
…		…
1918	$self->{history_pointer} = -1;	1975	$self->{history_pointer} = -1;
1919	$self->{history_saveback} = '';	1976	$self->{history_saveback} = '';
1920	$self->emit (activate => $txt);	1977	$self->emit (activate => $txt);
1921	$self->update;	1978	$self->update;
1922		1979
1923	} elsif ($sym == CFClient::SDLK_UP) {	1980	} elsif ($sym == CFPlus::SDLK_UP) {
1924	if ($self->{history_pointer} < 0) {	1981	if ($self->{history_pointer} < 0) {
1925	$self->{history_saveback} = $self->get_text;	1982	$self->{history_saveback} = $self->get_text;
1926	}	1983	}
1927	if (@{$self->{history} || []} > 0) {	1984	if (@{$self->{history} || []} > 0) {
1928	$self->{history_pointer}++;	1985	$self->{history_pointer}++;
…		…
1930	$self->{history_pointer} = @{$self->{history} || []} - 1;	1987	$self->{history_pointer} = @{$self->{history} || []} - 1;
1931	}	1988	}
1932	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1989	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1933	}	1990	}
1934		1991
1935	} elsif ($sym == CFClient::SDLK_DOWN) {	1992	} elsif ($sym == CFPlus::SDLK_DOWN) {
1936	$self->{history_pointer}--;	1993	$self->{history_pointer}--;
1937	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1994	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1938		1995
1939	if ($self->{history_pointer} >= 0) {	1996	if ($self->{history_pointer} >= 0) {
1940	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1997	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1949	1	2006	1
1950	}	2007	}
1951		2008
1952	#############################################################################	2009	#############################################################################
1953		2010
1954	package CFClient::UI::Button;	2011	package CFPlus::UI::Button;
1955		2012
1956	our @ISA = CFClient::UI::Label::;	2013	our @ISA = CFPlus::UI::Label::;
1957		2014
1958	use CFClient::OpenGL;	2015	use CFPlus::OpenGL;
1959		2016
1960	my @tex =	2017	my @tex =
1961	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2018	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1962	qw(b1_button_active.png);	2019	qw(b1_button_active.png);
1963		2020
1964	sub new {	2021	sub new {
1965	my $class = shift;	2022	my $class = shift;
1966		2023
…		…
2003	$self->SUPER::_draw;	2060	$self->SUPER::_draw;
2004	}	2061	}
2005		2062
2006	#############################################################################	2063	#############################################################################
2007		2064
		2065	package CFPlus::UI::CheckBox;
		2066
		2067	our @ISA = CFPlus::UI::DrawBG::;
		2068
		2069	my @tex =
		2070	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2071	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2072
		2073	use CFPlus::OpenGL;
		2074
		2075	sub new {
		2076	my $class = shift;
		2077
		2078	$class->SUPER::new (
		2079	padding_x => 2,
		2080	padding_y => 2,
		2081	fg => [1, 1, 1],
		2082	active_fg => [1, 1, 0],
		2083	bg => [0, 0, 0, 0.2],
		2084	active_bg => [1, 1, 1, 0.5],
		2085	state => 0,
		2086	can_hover => 1,
		2087	@_
		2088	)
		2089	}
		2090
		2091	sub size_request {
		2092	my ($self) = @_;
		2093
		2094	(6) x 2
		2095	}
		2096
		2097	sub toggle {
		2098	my ($self) = @_;
		2099
		2100	$self->{state} = !$self->{state};
		2101	$self->emit (changed => $self->{state});
		2102	$self->update;
		2103	}
		2104
		2105	sub invoke_button_down {
		2106	my ($self, $ev, $x, $y) = @_;
		2107
		2108	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2109	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2110	$self->toggle;
		2111	} else {
		2112	return 0
		2113	}
		2114
		2115	1
		2116	}
		2117
		2118	sub _draw {
		2119	my ($self) = @_;
		2120
		2121	$self->SUPER::_draw;
		2122
		2123	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2124
		2125	my ($w, $h) = @$self{qw(w h)};
		2126
		2127	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2128
		2129	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2130
		2131	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2132
		2133	glEnable GL_TEXTURE_2D;
		2134	$tex->draw_quad_alpha (0, 0, $s, $s);
		2135	glDisable GL_TEXTURE_2D;
		2136	}
		2137
		2138	#############################################################################
		2139
		2140	package CFPlus::UI::Image;
		2141
		2142	our @ISA = CFPlus::UI::Base::;
		2143
		2144	use CFPlus::OpenGL;
		2145
		2146	our %texture_cache;
		2147
		2148	sub new {
		2149	my $class = shift;
		2150
		2151	my $self = $class->SUPER::new (
		2152	can_events => 0,
		2153	@_,
		2154	);
		2155
		2156	$self->{path} || $self->{tex}
		2157	or Carp::croak "'path' or 'tex' attributes required";
		2158
		2159	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2160	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2161
		2162	Scalar::Util::weaken $texture_cache{$self->{path}};
		2163
		2164	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2165
		2166	$self
		2167	}
		2168
		2169	sub STORABLE_freeze {
		2170	my ($self, $cloning) = @_;
		2171
		2172	$self->{path}
		2173	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2174
		2175	$self->{path}
		2176	}
		2177
		2178	sub STORABLE_attach {
		2179	my ($self, $cloning, $path) = @_;
		2180
		2181	$self->new (path => $path)
		2182	}
		2183
		2184	sub size_request {
		2185	my ($self) = @_;
		2186
		2187	($self->{tex}{w}, $self->{tex}{h})
		2188	}
		2189
		2190	sub _draw {
		2191	my ($self) = @_;
		2192
		2193	my $tex = $self->{tex};
		2194
		2195	my ($w, $h) = ($self->{w}, $self->{h});
		2196
		2197	if ($self->{rot90}) {
		2198	glRotate 90, 0, 0, 1;
		2199	glTranslate 0, -$self->{w}, 0;
		2200
		2201	($w, $h) = ($h, $w);
		2202	}
		2203
		2204	glEnable GL_TEXTURE_2D;
		2205	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2206
		2207	$tex->draw_quad (0, 0, $w, $h);
		2208
		2209	glDisable GL_TEXTURE_2D;
		2210	}
		2211
		2212	#############################################################################
		2213
2008	package CFClient::UI::ImageButton;	2214	package CFPlus::UI::ImageButton;
2009		2215
2010	our @ISA = CFClient::UI::Image::;	2216	our @ISA = CFPlus::UI::Image::;
2011		2217
2012	use CFClient::OpenGL;	2218	use CFPlus::OpenGL;
2013		2219
2014	my %textures;	2220	my %textures;
2015		2221
2016	sub new {	2222	sub new {
2017	my $class = shift;	2223	my $class = shift;
…		…
2039	1	2245	1
2040	}	2246	}
2041		2247
2042	#############################################################################	2248	#############################################################################
2043		2249
2044	package CFClient::UI::CheckBox;
2045
2046	our @ISA = CFClient::UI::DrawBG::;
2047
2048	my @tex =
2049	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2050	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2051
2052	use CFClient::OpenGL;
2053
2054	sub new {
2055	my $class = shift;
2056
2057	$class->SUPER::new (
2058	padding_x => 2,
2059	padding_y => 2,
2060	fg => [1, 1, 1],
2061	active_fg => [1, 1, 0],
2062	bg => [0, 0, 0, 0.2],
2063	active_bg => [1, 1, 1, 0.5],
2064	state => 0,
2065	can_hover => 1,
2066	@_
2067	)
2068	}
2069
2070	sub size_request {
2071	my ($self) = @_;
2072
2073	(6) x 2
2074	}
2075
2076	sub toggle {
2077	my ($self) = @_;
2078
2079	$self->{state} = !$self->{state};
2080	$self->emit (changed => $self->{state});
2081	$self->update;
2082	}
2083
2084	sub invoke_button_down {
2085	my ($self, $ev, $x, $y) = @_;
2086
2087	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2088	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2089	$self->toggle;
2090	} else {
2091	return 0
2092	}
2093
2094	1
2095	}
2096
2097	sub _draw {
2098	my ($self) = @_;
2099
2100	$self->SUPER::_draw;
2101
2102	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2103
2104	my ($w, $h) = @$self{qw(w h)};
2105
2106	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2107
2108	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2109
2110	my $tex = $self->{state} ? $tex[1] : $tex[0];
2111
2112	glEnable GL_TEXTURE_2D;
2113	$tex->draw_quad_alpha (0, 0, $s, $s);
2114	glDisable GL_TEXTURE_2D;
2115	}
2116
2117	#############################################################################
2118
2119	package CFClient::UI::Image;	2250	package CFPlus::UI::VGauge;
2120		2251
2121	our @ISA = CFClient::UI::Base::;	2252	our @ISA = CFPlus::UI::Base::;
2122
2123	use CFClient::OpenGL;
2124
2125	our %texture_cache;
2126
2127	sub new {
2128	my $class = shift;
2129
2130	my $self = $class->SUPER::new (
2131	can_events => 0,
2132	@_,
2133	);
2134
2135	$self->{path} || $self->{tex}
2136	or Carp::croak "'path' or 'tex' attributes required";
2137
2138	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2139	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2140
2141	Scalar::Util::weaken $texture_cache{$self->{path}};
2142
2143	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2144
2145	$self
2146	}
2147
2148	sub size_request {
2149	my ($self) = @_;
2150
2151	($self->{tex}{w}, $self->{tex}{h})
2152	}
2153
2154	sub _draw {
2155	my ($self) = @_;
2156
2157	my $tex = $self->{tex};
2158
2159	my ($w, $h) = ($self->{w}, $self->{h});
2160
2161	if ($self->{rot90}) {
2162	glRotate 90, 0, 0, 1;
2163	glTranslate 0, -$self->{w}, 0;
2164
2165	($w, $h) = ($h, $w);
2166	}
2167
2168	glEnable GL_TEXTURE_2D;
2169	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170
2171	$tex->draw_quad_alpha (0, 0, $w, $h);
2172
2173	glDisable GL_TEXTURE_2D;
2174	}
2175
2176	#############################################################################
2177
2178	package CFClient::UI::VGauge;
2179
2180	our @ISA = CFClient::UI::Base::;
2181		2253
2182	use List::Util qw(min max);	2254	use List::Util qw(min max);
2183		2255
2184	use CFClient::OpenGL;	2256	use CFPlus::OpenGL;
2185		2257
2186	my %tex = (	2258	my %tex = (
2187	food => [	2259	food => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2260	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2261	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2190	],	2262	],
2191	grace => [	2263	grace => [
2192	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2264	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2193	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2265	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2194	],	2266	],
2195	hp => [	2267	hp => [
2196	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2268	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2197	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2269	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2198	],	2270	],
2199	mana => [	2271	mana => [
2200	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2272	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2201	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2273	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2202	],	2274	],
2203	);	2275	);
2204		2276
2205	# eg. VGauge->new (gauge => 'food'), default gauge: food	2277	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2308	glDisable GL_TEXTURE_2D;	2380	glDisable GL_TEXTURE_2D;
2309	}	2381	}
2310		2382
2311	#############################################################################	2383	#############################################################################
2312		2384
2313	package CFClient::UI::Gauge;	2385	package CFPlus::UI::Gauge;
2314		2386
2315	our @ISA = CFClient::UI::VBox::;	2387	our @ISA = CFPlus::UI::VBox::;
2316		2388
2317	sub new {	2389	sub new {
2318	my ($class, %arg) = @_;	2390	my ($class, %arg) = @_;
2319		2391
2320	my $self = $class->SUPER::new (	2392	my $self = $class->SUPER::new (
…		…
2322	can_hover => 1,	2394	can_hover => 1,
2323	can_events => 1,	2395	can_events => 1,
2324	%arg,	2396	%arg,
2325	);	2397	);
2326		2398
2327	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2399	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2328	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2400	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2329	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2401	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2330		2402
2331	$self	2403	$self
2332	}	2404	}
2333		2405
2334	sub set_fontsize {	2406	sub set_fontsize {
…		…
2355	$self->{value}->set_text ($val);	2427	$self->{value}->set_text ($val);
2356	}	2428	}
2357		2429
2358	#############################################################################	2430	#############################################################################
2359		2431
2360	package CFClient::UI::Slider;	2432	package CFPlus::UI::Slider;
2361		2433
2362	use strict;	2434	use strict;
2363		2435
2364	use CFClient::OpenGL;	2436	use CFPlus::OpenGL;
2365		2437
2366	our @ISA = CFClient::UI::DrawBG::;	2438	our @ISA = CFPlus::UI::DrawBG::;
2367		2439
2368	my @tex =	2440	my @tex =
2369	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2370	qw(s1_slider.png s1_slider_bg.png);	2442	qw(s1_slider.png s1_slider_bg.png);
2371		2443
2372	sub new {	2444	sub new {
2373	my $class = shift;	2445	my $class = shift;
2374		2446
…		…
2463	}	2535	}
2464		2536
2465	1	2537	1
2466	}	2538	}
2467		2539
		2540	sub invoke_mouse_wheel {
		2541	my ($self, $ev) = @_;
		2542
		2543	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2544
		2545	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2546
		2547	! ! $delta
		2548	}
		2549
2468	sub update {	2550	sub update {
2469	my ($self) = @_;	2551	my ($self) = @_;
2470		2552
2471	delete $self->{knob_w};	2553	delete $self->{knob_w};
2472	$self->SUPER::update;	2554	$self->SUPER::update;
…		…
2519	glDisable GL_TEXTURE_2D;	2601	glDisable GL_TEXTURE_2D;
2520	}	2602	}
2521		2603
2522	#############################################################################	2604	#############################################################################
2523		2605
2524	package CFClient::UI::ValSlider;	2606	package CFPlus::UI::ValSlider;
2525		2607
2526	our @ISA = CFClient::UI::HBox::;	2608	our @ISA = CFPlus::UI::HBox::;
2527		2609
2528	sub new {	2610	sub new {
2529	my ($class, %arg) = @_;	2611	my ($class, %arg) = @_;
2530		2612
2531	my $range = delete $arg{range};	2613	my $range = delete $arg{range};
2532		2614
2533	my $self = $class->SUPER::new (	2615	my $self = $class->SUPER::new (
2534	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2616	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2535	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2617	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2536	to_value => sub { shift },	2618	to_value => sub { shift },
2537	from_value => sub { shift },	2619	from_value => sub { shift },
2538	%arg,	2620	%arg,
2539	);	2621	);
2540		2622
…		…
2560	sub set_range { shift->{slider}->set_range (@_) }	2642	sub set_range { shift->{slider}->set_range (@_) }
2561	sub set_value { shift->{slider}->set_value (@_) }	2643	sub set_value { shift->{slider}->set_value (@_) }
2562		2644
2563	#############################################################################	2645	#############################################################################
2564		2646
2565	package CFClient::UI::TextScroller;	2647	package CFPlus::UI::TextScroller;
2566		2648
2567	our @ISA = CFClient::UI::HBox::;	2649	our @ISA = CFPlus::UI::HBox::;
2568		2650
2569	use CFClient::OpenGL;	2651	use CFPlus::OpenGL;
2570		2652
2571	sub new {	2653	sub new {
2572	my $class = shift;	2654	my $class = shift;
2573		2655
2574	my $self = $class->SUPER::new (	2656	my $self = $class->SUPER::new (
2575	fontsize => 1,	2657	fontsize => 1,
2576	can_events => 0,	2658	can_events => 1,
2577	indent => 0,	2659	indent => 0,
2578	#font => default_font	2660	#font => default_font
2579	@_,	2661	@_,
2580		2662
2581	layout => (new CFClient::Layout),	2663	layout => (new CFPlus::Layout),
2582	par => [],	2664	par => [],
2583	height => 0,	2665	height => 0,
2584	children => [	2666	children => [
2585	(new CFClient::UI::Empty expand => 1),	2667	(new CFPlus::UI::Empty expand => 1),
2586	(new CFClient::UI::Slider vertical => 1),	2668	(new CFPlus::UI::Slider vertical => 1),
2587	],	2669	],
2588	);	2670	);
2589		2671
2590	$self->{children}[1]->connect (changed => sub { $self->update });	2672	$self->{children}[1]->connect (changed => sub { $self->update });
2591		2673
…		…
2621		2703
2622	$self->reflow;	2704	$self->reflow;
2623		2705
2624	local $self->{children} = [$empty, $slider];	2706	local $self->{children} = [$empty, $slider];
2625	$self->SUPER::invoke_size_allocate ($w, $h)	2707	$self->SUPER::invoke_size_allocate ($w, $h)
		2708	}
		2709
		2710	sub invoke_mouse_wheel {
		2711	my ($self, $ev) = @_;
		2712
		2713	return 0 unless $ev->{dy}; # only vertical movements
		2714
		2715	$self->{children}[1]->emit (mouse_wheel => $ev);
		2716
		2717	1
2626	}	2718	}
2627		2719
2628	sub get_layout {	2720	sub get_layout {
2629	my ($self, $para) = @_;	2721	my ($self, $para) = @_;
2630		2722
…		…
2658		2750
2659	# todo: base offset on lines or so, not on pixels	2751	# todo: base offset on lines or so, not on pixels
2660	$self->{children}[1]->set_value ($offset);	2752	$self->{children}[1]->set_value ($offset);
2661	}	2753	}
2662		2754
		2755	sub current_paragraph {
		2756	my ($self) = @_;
		2757
		2758	$self->force_uptodate;
		2759	$self->{top_paragraph} - 1
		2760	}
		2761
		2762	sub scroll_to {
		2763	my ($self, $para) = @_;
		2764
		2765	$self->force_uptodate;
		2766
		2767	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2768
		2769	$self->{children}[1]->set_value ($self->{par}[$para]{y});
		2770	}
		2771
2663	sub clear {	2772	sub clear {
2664	my ($self) = @_;	2773	my ($self) = @_;
2665		2774
2666	my (undef, undef, @other) = @{ $self->{children} };	2775	my (undef, undef, @other) = @{ $self->{children} };
2667	$self->remove ($_) for @other;	2776	$self->remove ($_) for @other;
…		…
2670	$self->{height} = 0;	2779	$self->{height} = 0;
2671	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2780	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672	}	2781	}
2673		2782
2674	sub add_paragraph {	2783	sub add_paragraph {
2675	my ($self, $color, $para, $indent) = @_;	2784	my $self = shift;
2676		2785
2677	my ($text, @w) = ref $para ? @$para : $para;	2786	for my $para (@_) {
2678
2679	$para = {	2787	$para = {
		2788	fg => [1, 1, 1, 1],
		2789	indent => 0,
		2790	markup => "",
		2791	widget => [],
		2792	ref $para ? %$para : (markup => $para),
2680	w => 1e10,	2793	w => 1e10,
2681	wrapped => 1,	2794	wrapped => 1,
2682	fg => $color,
2683	indent => $indent,
2684	markup => $text,
2685	widget => \@w,
2686	};	2795	};
2687		2796
2688	$self->add (@w) if @w;	2797	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2689	push @{$self->{par}}, $para;	2798	push @{$self->{par}}, $para;
		2799	}
2690		2800
2691	$self->{need_reflow}++;	2801	$self->{need_reflow}++;
2692	$self->update;	2802	$self->update;
2693	}	2803	}
2694		2804
…		…
2697		2807
2698	$self->{scroll_to_bottom} = 1;	2808	$self->{scroll_to_bottom} = 1;
2699	$self->update;	2809	$self->update;
2700	}	2810	}
2701		2811
		2812	sub force_uptodate {
		2813	my ($self) = @_;
		2814
		2815	if (delete $self->{need_reflow}) {
		2816	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2817
		2818	my $height = 0;
		2819	my $paridx;
		2820	my $top_paragraph;
		2821	my $top = int $self->{children}[1]{range}[0];
		2822
		2823	for my $para (@{$self->{par}}) {
		2824	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2825	my $layout = $self->get_layout ($para);
		2826	my ($w, $h) = $layout->size;
		2827
		2828	$para->{w} = $w + $para->{indent};
		2829	$para->{h} = $h;
		2830	$para->{wrapped} = $layout->has_wrapped;
		2831	}
		2832
		2833	$para->{y} = $height;
		2834
		2835	$paridx++;
		2836	$top_paragraph ||= $paridx if $height >= $top;
		2837
		2838	$height += $para->{h};
		2839	}
		2840
		2841	$self->{top_paragraph} = $top_paragraph;
		2842	$self->{height} = $height;
		2843
		2844	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2845
		2846	delete $self->{texture};
		2847	}
		2848
		2849	if (delete $self->{scroll_to_bottom}) {
		2850	$self->{children}[1]->set_value (1e10);
		2851	}
		2852	}
		2853
2702	sub update {	2854	sub update {
2703	my ($self) = @_;	2855	my ($self) = @_;
2704		2856
2705	$self->SUPER::update;	2857	$self->SUPER::update;
2706		2858
2707	return unless $self->{h} > 0;	2859	return unless $self->{h} > 0;
2708		2860
2709	delete $self->{texture};	2861	delete $self->{texture};
2710		2862
2711	$ROOT->on_post_alloc ($self => sub {	2863	$ROOT->on_post_alloc ($self => sub {
		2864	$self->force_uptodate;
		2865
2712	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2866	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713		2867
2714	if (delete $self->{need_reflow}) {
2715	my $height = 0;
2716
2717	for my $para (@{$self->{par}}) {
2718	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2719	my $layout = $self->get_layout ($para);
2720	my ($w, $h) = $layout->size;
2721
2722	$para->{w} = $w + $para->{indent};
2723	$para->{h} = $h;
2724	$para->{wrapped} = $layout->has_wrapped;
2725	}
2726
2727	$height += $para->{h};
2728	}
2729
2730	$self->{height} = $height;
2731
2732	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2733
2734	delete $self->{texture};
2735	}
2736
2737	if (delete $self->{scroll_to_bottom}) {
2738	$self->{children}[1]->set_value (1e10);
2739	}
2740
2741	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2868	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2742	glClearColor 0, 0, 0, 0;	2869	glClearColor 0, 0, 0, 0;
2743	glClear GL_COLOR_BUFFER_BIT;	2870	glClear GL_COLOR_BUFFER_BIT;
2744		2871
2745	my $top = int $self->{children}[1]{range}[0];	2872	my $top = int $self->{children}[1]{range}[0];
2746		2873
2747	my $y0 = $top;	2874	my $y0 = $top;
2748	my $y1 = $top + $H;	2875	my $y1 = $top + $H;
2749		2876
2750	my $y = 0;
2751
2752	for my $para (@{$self->{par}}) {	2877	for my $para (@{$self->{par}}) {
2753	my $h = $para->{h};	2878	my $h = $para->{h};
		2879	my $y = $para->{y};
2754		2880
2755	if ($y0 < $y + $h && $y < $y1) {	2881	if ($y0 < $y + $h && $y < $y1) {
2756
2757	my $layout = $self->get_layout ($para);	2882	my $layout = $self->get_layout ($para);
2758		2883
2759	$layout->render ($para->{indent}, $y - $y0);	2884	$layout->render ($para->{indent}, $y - $y0);
2760		2885
2761	if (my @w = @{ $para->{widget} }) {	2886	if (my @w = @{ $para->{widget} }) {
…		…
2769		2894
2770	$_->draw;	2895	$_->draw;
2771	}	2896	}
2772	}	2897	}
2773	}	2898	}
2774
2775	$y += $h;
2776	}	2899	}
2777	};	2900	};
2778	});	2901	});
2779	}	2902	}
2780		2903
…		…
2799	$self->{children}[1]->draw;	2922	$self->{children}[1]->draw;
2800	}	2923	}
2801		2924
2802	#############################################################################	2925	#############################################################################
2803		2926
2804	package CFClient::UI::Animator;	2927	package CFPlus::UI::Animator;
2805		2928
2806	use CFClient::OpenGL;	2929	use CFPlus::OpenGL;
2807		2930
2808	our @ISA = CFClient::UI::Bin::;	2931	our @ISA = CFPlus::UI::Bin::;
2809		2932
2810	sub moveto {	2933	sub moveto {
2811	my ($self, $x, $y) = @_;	2934	my ($self, $x, $y) = @_;
2812		2935
2813	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2936	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2841	glPopMatrix;	2964	glPopMatrix;
2842	}	2965	}
2843		2966
2844	#############################################################################	2967	#############################################################################
2845		2968
2846	package CFClient::UI::Flopper;	2969	package CFPlus::UI::Flopper;
2847		2970
2848	our @ISA = CFClient::UI::Button::;	2971	our @ISA = CFPlus::UI::Button::;
2849		2972
2850	sub new {	2973	sub new {
2851	my $class = shift;	2974	my $class = shift;
2852		2975
2853	my $self = $class->SUPER::new (	2976	my $self = $class->SUPER::new (
…		…
2865	$self->{other}->toggle_visibility;	2988	$self->{other}->toggle_visibility;
2866	}	2989	}
2867		2990
2868	#############################################################################	2991	#############################################################################
2869		2992
2870	package CFClient::UI::Tooltip;	2993	package CFPlus::UI::Tooltip;
2871		2994
2872	our @ISA = CFClient::UI::Bin::;	2995	our @ISA = CFPlus::UI::Bin::;
2873		2996
2874	use CFClient::OpenGL;	2997	use CFPlus::OpenGL;
2875		2998
2876	sub new {	2999	sub new {
2877	my $class = shift;	3000	my $class = shift;
2878		3001
2879	$class->SUPER::new (	3002	$class->SUPER::new (
…		…
2882	)	3005	)
2883	}	3006	}
2884		3007
2885	sub set_tooltip_from {	3008	sub set_tooltip_from {
2886	my ($self, $widget) = @_;	3009	my ($self, $widget) = @_;
		3010
		3011	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3012	if $widget->{tooltip} =~ /^#(.*)$/;
2887		3013
2888	my $tooltip = $widget->{tooltip};	3014	my $tooltip = $widget->{tooltip};
2889		3015
2890	if ($ENV{CFPLUS_DEBUG} & 2) {	3016	if ($ENV{CFPLUS_DEBUG} & 2) {
2891	$tooltip .= "\n\n" . (ref $widget) . "\n"	3017	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2895	}	3021	}
2896		3022
2897	$tooltip =~ s/^\n+//;	3023	$tooltip =~ s/^\n+//;
2898	$tooltip =~ s/\n+$//;	3024	$tooltip =~ s/\n+$//;
2899		3025
2900	$self->add (new CFClient::UI::Label	3026	$self->add (new CFPlus::UI::Label
2901	markup => $tooltip,	3027	markup => $tooltip,
2902	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3028	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2903	fontsize => 0.8,	3029	fontsize => 0.8,
2904	fg => [0, 0, 0, 1],	3030	style => 1, # FLAG_INVERSE
2905	ellipsise => 0,	3031	ellipsise => 0,
2906	font => ($widget->{tooltip_font} || $::FONT_PROP),	3032	font => ($widget->{tooltip_font} || $::FONT_PROP),
2907	);	3033	);
2908	}	3034	}
2909		3035
…		…
2928		3054
2929	$self->{root}->on_post_alloc ("move_$self" => sub {	3055	$self->{root}->on_post_alloc ("move_$self" => sub {
2930	my $widget = $self->{owner}	3056	my $widget = $self->{owner}
2931	or return;	3057	or return;
2932		3058
		3059	if ($widget->{visible}) {
2933	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3060	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934		3061
2935	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3062	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936	if $x + $self->{w} > $self->{root}{w};	3063	if $x + $self->{w} > $self->{root}{w};
2937		3064
2938	$self->move_abs ($x, $y);	3065	$self->move_abs ($x, $y);
		3066	} else {
		3067	$self->hide;
		3068	}
2939	});	3069	});
2940	}	3070	}
2941		3071
2942	sub _draw {	3072	sub _draw {
2943	my ($self) = @_;	3073	my ($self) = @_;
…		…
2967	$self->SUPER::_draw;	3097	$self->SUPER::_draw;
2968	}	3098	}
2969		3099
2970	#############################################################################	3100	#############################################################################
2971		3101
2972	package CFClient::UI::Face;	3102	package CFPlus::UI::Face;
2973		3103
2974	our @ISA = CFClient::UI::Base::;	3104	our @ISA = CFPlus::UI::DrawBG::;
2975		3105
2976	use CFClient::OpenGL;	3106	use CFPlus::OpenGL;
2977		3107
2978	sub new {	3108	sub new {
2979	my $class = shift;	3109	my $class = shift;
2980		3110
2981	my $self = $class->SUPER::new (	3111	my $self = $class->SUPER::new (
…		…
3016	sub _draw {	3146	sub _draw {
3017	my ($self) = @_;	3147	my ($self) = @_;
3018		3148
3019	return unless $::CONN;	3149	return unless $::CONN;
3020		3150
		3151	$self->SUPER::_draw;
		3152
3021	my $face;	3153	my $face;
3022		3154
3023	if ($self->{frame}) {	3155	if ($self->{frame}) {
3024	my $anim = $::CONN->{anim}[$self->{anim}];	3156	my $anim = $::CONN->{anim}[$self->{anim}];
3025		3157
…		…
3047	$self->SUPER::destroy;	3179	$self->SUPER::destroy;
3048	}	3180	}
3049		3181
3050	#############################################################################	3182	#############################################################################
3051		3183
3052	package CFClient::UI::Buttonbar;	3184	package CFPlus::UI::Buttonbar;
3053		3185
3054	our @ISA = CFClient::UI::HBox::;	3186	our @ISA = CFPlus::UI::HBox::;
3055		3187
3056	# TODO: should actualyl wrap buttons and other goodies.	3188	# TODO: should actualyl wrap buttons and other goodies.
3057		3189
3058	#############################################################################	3190	#############################################################################
3059		3191
3060	package CFClient::UI::Menu;	3192	package CFPlus::UI::Menu;
3061		3193
3062	our @ISA = CFClient::UI::FancyFrame::;	3194	our @ISA = CFPlus::UI::FancyFrame::;
3063		3195
3064	use CFClient::OpenGL;	3196	use CFPlus::OpenGL;
3065		3197
3066	sub new {	3198	sub new {
3067	my $class = shift;	3199	my $class = shift;
3068		3200
3069	my $self = $class->SUPER::new (	3201	my $self = $class->SUPER::new (
3070	items => [],	3202	items => [],
3071	z => 100,	3203	z => 100,
3072	@_,	3204	@_,
3073	);	3205	);
3074		3206
3075	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3207	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3076		3208
3077	for my $item (@{ $self->{items} }) {	3209	for my $item (@{ $self->{items} }) {
3078	my ($widget, $cb, $tooltip) = @$item;	3210	my ($widget, $cb, $tooltip) = @$item;
3079		3211
3080	# handle various types of items, only text for now	3212	# handle various types of items, only text for now
3081	if (!ref $widget) {	3213	if (!ref $widget) {
3082	if ($widget =~ /\t/) {	3214	if ($widget =~ /\t/) {
3083	my ($left, $right) = split /\t/, $widget, 2;	3215	my ($left, $right) = split /\t/, $widget, 2;
3084		3216
3085	$widget = new CFClient::UI::HBox	3217	$widget = new CFPlus::UI::HBox
3086	can_hover => 1,	3218	can_hover => 1,
3087	can_events => 1,	3219	can_events => 1,
3088	tooltip => $tooltip,	3220	tooltip => $tooltip,
3089	children => [	3221	children => [
3090	(new CFClient::UI::Label markup => $left, expand => 1),	3222	(new CFPlus::UI::Label markup => $left, expand => 1),
3091	(new CFClient::UI::Label markup => $right, align => +1),	3223	(new CFPlus::UI::Label markup => $right, align => +1),
3092	],	3224	],
3093	;	3225	;
3094		3226
3095	} else {	3227	} else {
3096	$widget = new CFClient::UI::Label	3228	$widget = new CFPlus::UI::Label
3097	can_hover => 1,	3229	can_hover => 1,
3098	can_events => 1,	3230	can_events => 1,
3099	markup => $widget,	3231	markup => $widget,
3100	tooltip => $tooltip;	3232	tooltip => $tooltip;
3101	}	3233	}
…		…
3149	1	3281	1
3150	}	3282	}
3151		3283
3152	#############################################################################	3284	#############################################################################
3153		3285
3154	package CFClient::UI::Multiplexer;	3286	package CFPlus::UI::Multiplexer;
3155		3287
3156	our @ISA = CFClient::UI::Container::;	3288	our @ISA = CFPlus::UI::Container::;
3157		3289
3158	sub new {	3290	sub new {
3159	my $class = shift;	3291	my $class = shift;
3160		3292
3161	my $self = $class->SUPER::new (	3293	my $self = $class->SUPER::new (
…		…
3222	$self->{current}->draw;	3354	$self->{current}->draw;
3223	}	3355	}
3224		3356
3225	#############################################################################	3357	#############################################################################
3226		3358
3227	package CFClient::UI::Notebook;	3359	package CFPlus::UI::Notebook;
3228		3360
3229	our @ISA = CFClient::UI::VBox::;	3361	our @ISA = CFPlus::UI::VBox::;
3230		3362
3231	sub new {	3363	sub new {
3232	my $class = shift;	3364	my $class = shift;
3233		3365
3234	my $self = $class->SUPER::new (	3366	my $self = $class->SUPER::new (
3235	buttonbar => (new CFClient::UI::Buttonbar),	3367	buttonbar => (new CFPlus::UI::Buttonbar),
3236	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3368	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3237	# filter => # will be put between multiplexer and $self	3369	# filter => # will be put between multiplexer and $self
3238	@_,	3370	@_,
3239	);	3371	);
3240		3372
3241	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3373	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3247	sub add {	3379	sub add {
3248	my ($self, $title, $widget, $tooltip) = @_;	3380	my ($self, $title, $widget, $tooltip) = @_;
3249		3381
3250	Scalar::Util::weaken $self;	3382	Scalar::Util::weaken $self;
3251		3383
3252	$self->{buttonbar}->add (new CFClient::UI::Button	3384	$self->{buttonbar}->add (new CFPlus::UI::Button
3253	markup => $title,	3385	markup => $title,
3254	tooltip => $tooltip,	3386	tooltip => $tooltip,
3255	on_activate => sub { $self->set_current_page ($widget) },	3387	on_activate => sub { $self->set_current_page ($widget) },
3256	);	3388	);
3257		3389
…		…
3271	$self->emit (page_changed => $self->{multiplexer}{current});	3403	$self->emit (page_changed => $self->{multiplexer}{current});
3272	}	3404	}
3273		3405
3274	#############################################################################	3406	#############################################################################
3275		3407
3276	package CFClient::UI::Combobox;	3408	package CFPlus::UI::Selector;
3277		3409
3278	use utf8;	3410	use utf8;
3279		3411
3280	our @ISA = CFClient::UI::Button::;	3412	our @ISA = CFPlus::UI::Button::;
3281		3413
3282	sub new {	3414	sub new {
3283	my $class = shift;	3415	my $class = shift;
3284		3416
3285	my $self = $class->SUPER::new (	3417	my $self = $class->SUPER::new (
…		…
3302	my ($value, $title, $tooltip) = @$_;	3434	my ($value, $title, $tooltip) = @$_;
3303		3435
3304	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3436	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305	}	3437	}
3306		3438
3307	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3439	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308	}	3440	}
3309		3441
3310	sub _set_value {	3442	sub _set_value {
3311	my ($self, $value) = @_;	3443	my ($self, $value) = @_;
3312		3444
…		…
3327	$self->emit (changed => $value);	3459	$self->emit (changed => $value);
3328	}	3460	}
3329		3461
3330	#############################################################################	3462	#############################################################################
3331		3463
3332	package CFClient::UI::Statusbox;	3464	package CFPlus::UI::Statusbox;
3333		3465
3334	our @ISA = CFClient::UI::VBox::;	3466	our @ISA = CFPlus::UI::VBox::;
3335		3467
3336	sub new {	3468	sub new {
3337	my $class = shift;	3469	my $class = shift;
3338		3470
3339	my $self = $class->SUPER::new (	3471	my $self = $class->SUPER::new (
…		…
3351	sub reorder {	3483	sub reorder {
3352	my ($self) = @_;	3484	my ($self) = @_;
3353	my $NOW = Time::HiRes::time;	3485	my $NOW = Time::HiRes::time;
3354		3486
3355	# freeze display when hovering over any label	3487	# freeze display when hovering over any label
3356	return if $CFClient::UI::TOOLTIP->{owner}	3488	return if $CFPlus::UI::TOOLTIP->{owner}
3357	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3489	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3358	values %{ $self->{item} };	3490	values %{ $self->{item} };
3359		3491
3360	while (my ($k, $v) = each %{ $self->{item} }) {	3492	while (my ($k, $v) = each %{ $self->{item} }) {
3361	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3493	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3362	}	3494	}
…		…
3383	for ($short) {	3515	for ($short) {
3384	s/^\s+//;	3516	s/^\s+//;
3385	s/\s+/ /g;	3517	s/\s+/ /g;
3386	}	3518	}
3387		3519
3388	new CFClient::UI::Label	3520	new CFPlus::UI::Label
3389	markup => $short,	3521	markup => $short,
3390	tooltip => $item->{tooltip},	3522	tooltip => $item->{tooltip},
3391	tooltip_font => $::FONT_PROP,	3523	tooltip_font => $::FONT_PROP,
3392	tooltip_width => 0.67,	3524	tooltip_width => 0.67,
3393	fontsize => $item->{fontsize} || $self->{fontsize},	3525	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3472	$self->SUPER::destroy;	3604	$self->SUPER::destroy;
3473	}	3605	}
3474		3606
3475	#############################################################################	3607	#############################################################################
3476		3608
3477	package CFClient::UI::Inventory;	3609	package CFPlus::UI::Inventory;
3478		3610
3479	our @ISA = CFClient::UI::Table::;	3611	our @ISA = CFPlus::UI::Table::;
3480		3612
3481	sub new {	3613	sub new {
3482	my $class = shift;	3614	my $class = shift;
3483		3615
3484	my $self = $class->SUPER::new (	3616	my $self = $class->SUPER::new (
3485	col_expand => [0, 1, 0],	3617	col_expand => [0, 1, 0],
		3618	items => [],
3486	@_,	3619	@_,
3487	);	3620	);
3488		3621
		3622	$self->set_sort_order (undef);
		3623
3489	$self	3624	$self
		3625	}
		3626
		3627	sub update_items {
		3628	my ($self) = @_;
		3629
		3630	$self->clear;
		3631
		3632	my @item = $self->{sort}->(@{ $self->{items} });
		3633
		3634	my @adds;
		3635	my $row = 0;
		3636	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3637	CFPlus::Item::update_widgets $item;
		3638
		3639	push @adds, 0, $row, $item->{face_widget};
		3640	push @adds, 1, $row, $item->{desc_widget};
		3641	push @adds, 2, $row, $item->{weight_widget};
		3642
		3643	$row++;
		3644	}
		3645
		3646	$self->add (@adds);
		3647	}
		3648
		3649	sub set_sort_order {
		3650	my ($self, $order) = @_;
		3651
		3652	$self->{sort} = $order ||= sub {
		3653	sort {
		3654	$a->{type} <=> $b->{type}
		3655	or $a->{name} cmp $b->{name}
		3656	} @_
		3657	};
		3658
		3659	$self->update_items;
3490	}	3660	}
3491		3661
3492	sub set_items {	3662	sub set_items {
3493	my ($self, $items) = @_;	3663	my ($self, $items) = @_;
3494		3664
3495	$self->clear;	3665	$self->{items} = [$items ? values %$items : ()];
3496	return unless $items;	3666	$self->update_items;
3497
3498	my @items = sort {
3499	($a->{type} <=> $b->{type})
3500	or ($a->{name} cmp $b->{name})
3501	} values %$items;
3502
3503	$self->{real_items} = \@items;
3504
3505	my $row = 0;
3506	for my $item (@items) {
3507	CFClient::Item::update_widgets $item;
3508
3509	$self->add (0, $row, $item->{face_widget});
3510	$self->add (1, $row, $item->{desc_widget});
3511	$self->add (2, $row, $item->{weight_widget});
3512
3513	$row++;
3514	}
3515	}	3667	}
3516		3668
3517	#############################################################################	3669	#############################################################################
3518		3670
3519	package CFClient::UI::SpellList;	3671	package CFPlus::UI::SpellList;
3520		3672
3521	our @ISA = CFClient::UI::Table::;	3673	our @ISA = CFPlus::UI::Table::;
3522		3674
3523	sub new {	3675	sub new {
3524	my $class = shift;	3676	my $class = shift;
3525		3677
3526	my $self = $class->SUPER::new (	3678	my $self = $class->SUPER::new (
…		…
3544	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3696	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3545		3697
3546	sub rebuild_spell_list {	3698	sub rebuild_spell_list {
3547	my ($self) = @_;	3699	my ($self) = @_;
3548		3700
3549	$CFClient::UI::ROOT->on_refresh ($self => sub {	3701	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3550	$self->clear;	3702	$self->clear;
3551		3703
3552	return unless $::CONN;	3704	return unless $::CONN;
3553		3705
3554	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3706	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3555	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3707	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3556	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3708	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3557	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3709	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3558	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3710	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3559		3711
3560	my $row = 0;	3712	my $row = 0;
3561		3713
3562	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3714	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3563	my $spell = $self->{spell}{$_};	3715	my $spell = $self->{spell}{$_};
…		…
3570	if ($ev->{button} == 1) {	3722	if ($ev->{button} == 1) {
3571	$::CONN->user_send ("cast $spell->{name}");	3723	$::CONN->user_send ("cast $spell->{name}");
3572	} elsif ($ev->{button} == 2) {	3724	} elsif ($ev->{button} == 2) {
3573	$::CONN->user_send ("invoke $spell->{name}");	3725	$::CONN->user_send ("invoke $spell->{name}");
3574	} elsif ($ev->{button} == 3) {	3726	} elsif ($ev->{button} == 3) {
3575	(new CFClient::UI::Menu	3727	(new CFPlus::UI::Menu
3576	items => [	3728	items => [
3577	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3729	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3578	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3730	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3579	],	3731	],
3580	)->popup ($ev);	3732	)->popup ($ev);
…		…
3586	};	3738	};
3587		3739
3588	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3740	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3589		3741
3590	#TODO: add path info to tooltip	3742	#TODO: add path info to tooltip
3591	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3743	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3592		3744
3593	$self->add (0, $row, new CFClient::UI::Face	3745	$self->add (0, $row, new CFPlus::UI::Face
3594	face => $spell->{face},	3746	face => $spell->{face},
3595	can_hover => 1,	3747	can_hover => 1,
3596	can_events => 1,	3748	can_events => 1,
3597	tooltip => $tooltip,	3749	tooltip => $tooltip,
3598	on_button_down => $spell_cb,	3750	on_button_down => $spell_cb,
3599	);	3751	);
3600		3752
3601	$self->add (1, $row, new CFClient::UI::Label	3753	$self->add (1, $row, new CFPlus::UI::Label
3602	expand => 1,	3754	expand => 1,
3603	text => $spell->{name},	3755	text => $spell->{name},
3604	can_hover => 1,	3756	can_hover => 1,
3605	can_events => 1,	3757	can_events => 1,
3606	tooltip => $tooltip,	3758	tooltip => $tooltip,
3607	on_button_down => $spell_cb,	3759	on_button_down => $spell_cb,
3608	);	3760	);
3609		3761
3610	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3762	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3611	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3763	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3612	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3764	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3613	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3765	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3614	}	3766	}
3615	});	3767	});
3616	}	3768	}
3617		3769
3618	sub add_spell {	3770	sub add_spell {
…		…
3636	$self->rebuild_spell_list;	3788	$self->rebuild_spell_list;
3637	}	3789	}
3638		3790
3639	#############################################################################	3791	#############################################################################
3640		3792
3641	package CFClient::UI::Root;	3793	package CFPlus::UI::Root;
3642		3794
3643	our @ISA = CFClient::UI::Container::;	3795	our @ISA = CFPlus::UI::Container::;
3644		3796
3645	use List::Util qw(min max);	3797	use List::Util qw(min max);
3646		3798
3647	use CFClient::OpenGL;	3799	use CFPlus::OpenGL;
3648		3800
3649	sub new {	3801	sub new {
3650	my $class = shift;	3802	my $class = shift;
3651		3803
3652	my $self = $class->SUPER::new (	3804	my $self = $class->SUPER::new (
…		…
3831	$h = 0 if $h < 0;	3983	$h = 0 if $h < 0;
3832		3984
3833	$w = max $widget->{min_w}, $w;	3985	$w = max $widget->{min_w}, $w;
3834	$h = max $widget->{min_h}, $h;	3986	$h = max $widget->{min_h}, $h;
3835		3987
		3988	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3989	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3990
3836	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3991	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3992	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838		3993
3839	$w = int $w + 0.5;	3994	$w = int $w + 0.5;
3840	$h = int $h + 0.5;	3995	$h = int $h + 0.5;
…		…
3866	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4021	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3867	glMatrixMode GL_MODELVIEW;	4022	glMatrixMode GL_MODELVIEW;
3868	glLoadIdentity;	4023	glLoadIdentity;
3869		4024
3870	{	4025	{
3871	package CFClient::UI::Base;	4026	package CFPlus::UI::Base;
3872		4027
3873	($draw_x, $draw_y, $draw_w, $draw_h) =	4028	($draw_x, $draw_y, $draw_w, $draw_h) =
3874	(0, 0, $self->{w}, $self->{h});	4029	(0, 0, $self->{w}, $self->{h});
3875	}	4030	}
3876		4031
3877	$self->_draw;	4032	$self->_draw;
3878	}	4033	}
3879		4034
3880	#############################################################################	4035	#############################################################################
3881		4036
3882	package CFClient::UI;	4037	package CFPlus::UI;
3883		4038
3884	$ROOT = new CFClient::UI::Root;	4039	$ROOT = new CFPlus::UI::Root;
3885	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4040	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3886		4041
3887	1	4042	1
3888		4043

Diff Legend

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