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.317 by root, Sun Jul 2 18:52:05 2006 UTC vs.
Revision 1.348 by root, Thu Aug 17 01:27:28 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	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
90		106
91	$GRAB = $widget;	107	$GRAB = $widget;
92	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
93		109
94	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
95	}	111	}
96		112
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
98		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
100	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	}
101	}	123	}
102		124
103	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	126	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		127
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		129
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		131
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
112	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		134
114	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	137	$grab->update if $grab;
117	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
118		139
		140	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
120	}	142	}
121	}	143	}
122		144
123	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
124	my ($ev) = @_;	146	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
126		148
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		150
129	if ($widget != $HOVER) {	151	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		152
132	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	154	if $HOVER;
140	}	155	}
141		156
142	# convert position array to integers	157	# convert position array to integers
143	sub harmonize {	158	sub harmonize {
…		…
193	reconfigure_widgets;	208	reconfigure_widgets;
194	}	209	}
195		210
196	#############################################################################	211	#############################################################################
197		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
198	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
199		222
200	use strict;	223	use strict;
201		224
202	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
203		226
204	sub new {	227	sub new {
205	my $class = shift;	228	my $class = shift;
206		229
207	my $self = bless {	230	my $self = bless {
…		…
212	h => undef,	235	h => undef,
213	can_events => 1,	236	can_events => 1,
214	@_	237	@_
215	}, $class;	238	}, $class;
216		239
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		241
219	for (keys %$self) {	242	for (keys %$self) {
220	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
222	}	245	}
223	}	246	}
224		247
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$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};
227	$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};
228	$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};
229	$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};
230		253
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		256
234	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
247	sub show {	270	sub show {
248	my ($self) = @_;	271	my ($self) = @_;
249		272
250	return if $self->{parent};	273	return if $self->{parent};
251		274
252	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
253	}	276	}
254		277
255	sub set_visible {	278	sub set_visible {
256	my ($self) = @_;	279	my ($self) = @_;
257		280
…		…
278	delete $self->{root};	301	delete $self->{root};
279		302
280	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
282		305
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
285		308
286	$self->emit ("focus_out");	309	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
288	}	311	}
…		…
345	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
346		369
347	if ($self->{aspect}) {	370	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
349		372
350	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		375
353	# use alignment to adjust x, y	376	# use alignment to adjust x, y
354		377
355	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
397		420
398	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
399		422
400	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
401		424
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	428	}
406	}	429	}
407		430
408	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
409	sub coord2local {	432	sub coord2local {
410	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
411		434
		435	Carp::confess unless $self->{parent};#d#
		436
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	438	}
414		439
415	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
416	sub coord2global {	441	sub coord2global {
417	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
418		443
		444	Carp::confess unless $self->{parent};#d#
		445
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	447	}
421		448
422	sub invoke_focus_in {	449	sub invoke_focus_in {
423	my ($self) = @_;	450	my ($self) = @_;
…		…
452		479
453	$FOCUS->emit ("focus_out") if $FOCUS;	480	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	481	$self->emit ("focus_in");
455	}	482	}
456		483
457	sub invoke_mouse_motion { 1 }	484	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	485	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	486	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
461		489
462	sub invoke_button_down {	490	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
464		492
465	$self->grab_focus;	493	$self->grab_focus;
466		494
467	1	495	0
468	}	496	}
469		497
470	sub connect {	498	sub connect {
471	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
472		500
473	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	}
474	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
475		515
476	sub emit {	516	sub emit {
477	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
478		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
479	#d##TODO# stop propagating at first true, do not use sum	528	#d##TODO# stop propagating at first true, do not use sum
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483	}	532	}
484		533
485	sub find_widget {	534	sub find_widget {
486	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
487		536
…		…
571	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
574	glEnd;	623	glEnd;
575	glPopMatrix;	624	glPopMatrix;
576	#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;
577	}	626	}
578		627
579	$self->_draw;	628	$self->_draw;
580	glPopMatrix;	629	glPopMatrix;
581	}	630	}
…		…
587	}	636	}
588		637
589	sub DESTROY {	638	sub DESTROY {
590	my ($self) = @_;	639	my ($self) = @_;
591		640
		641	return if CFPlus::in_destruct;
		642
592	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
593		644
594	eval { $self->destroy };	645	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596	}	647	}
597		648
598	#############################################################################	649	#############################################################################
599		650
600	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
601		652
602	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
603		654
604	use strict;	655	use strict;
605	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
606		657
607	sub new {	658	sub new {
608	my $class = shift;	659	my $class = shift;
609		660
610	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
641	}	692	}
642	}	693	}
643		694
644	#############################################################################	695	#############################################################################
645		696
646	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
647		698
648	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
649		700
650	sub new {	701	sub new {
651	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
653	}	704	}
…		…
660		711
661	sub draw { }	712	sub draw { }
662		713
663	#############################################################################	714	#############################################################################
664		715
665	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
666		717
667	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
668		719
669	sub new {	720	sub new {
670	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
671		722
672	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
681	if $children;	732	if $children;
682		733
683	$self	734	$self
684	}	735	}
685		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
686	sub add {	745	sub add {
687	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
688		747
689	$_->set_parent ($self)	748	$_->set_parent ($self)
690	for @widgets;	749	for @widgets;
…		…
750	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
751	}	810	}
752		811
753	#############################################################################	812	#############################################################################
754		813
755	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
756		815
757	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
758		817
759	sub new {	818	sub new {
760	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
761		820
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		822
764	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
765	}	824	}
766		825
767	sub add {	826	sub add {
…		…
774	sub remove {	833	sub remove {
775	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
776		835
777	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
778		837
779	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	839	unless @{$self->{children}};
781	}	840	}
782		841
783	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
784		843
…		…
796		855
797	#############################################################################	856	#############################################################################
798		857
799	# back-buffered drawing area	858	# back-buffered drawing area
800		859
801	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
802		861
803	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
804		863
805	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
806		865
807	sub new {	866	sub new {
808	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
809		868
810	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
832	}	891	}
833		892
834	sub render_child {	893	sub render_child {
835	my ($self) = @_;	894	my ($self) = @_;
836		895
837	$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 {
838	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
840		899
841	{	900	{
842	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
843		902
844	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
846	}	905	}
847		906
…		…
850	}	909	}
851		910
852	sub _draw {	911	sub _draw {
853	my ($self) = @_;	912	my ($self) = @_;
854		913
855	my ($w, $h) = @$self{qw(w h)};
856
857	my $tex = $self->{texture}	914	my $tex = $self->{texture}
858	or return;	915	or return;
859		916
860	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
863		920
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
865		922
866	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
867	}	924	}
868		925
869	#############################################################################	926	#############################################################################
870		927
871	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
872		929
873	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
874		931
875	sub new {	932	sub new {
876	my $class = shift;	933	my $class = shift;
877		934
878	$class->SUPER::new (	935	$class->SUPER::new (
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	997	) {
941	$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})
942	} else {	999	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1001	}
945	}	1002	}
946		1003
947	sub _render {	1004	sub _render {
948	my ($self) = @_;	1005	my ($self) = @_;
949		1006
950	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};
951	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};
952		1009
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1011
955	$self->SUPER::_render;	1012	$self->SUPER::_render;
956	}	1013	}
957		1014
958	#############################################################################	1015	#############################################################################
959		1016
960	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
961		1018
962	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
963		1020
964	sub new {	1021	sub new {
965	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
966		1023
967	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
968		1025
969	my $self;	1026	my $self;
970		1027
971	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
972	vertical => 1,	1029	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1031	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
976	},	1033	},
977	;	1034	;
978		1035
979	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
		1038	can_events => 1,
981	slider => $slider,	1039	slider => $slider,
982	%arg,	1040	%arg,
983	);	1041	);
984		1042
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1043	$self->SUPER::add ($self->{vp}, $self->{slider});
986	$self->add ($child) if $child;	1044	$self->add ($child) if $child;
…		…
994	my ($self, $widget) = @_;	1052	my ($self, $widget) = @_;
995		1053
996	$self->{vp}->add ($self->{child} = $widget);	1054	$self->{vp}->add ($self->{child} = $widget);
997	}	1055	}
998		1056
		1057	sub invoke_mouse_wheel {
		1058	my ($self, $ev) = @_;
		1059
		1060	return 0 unless $ev->{dy}; # only vertical movements
		1061
		1062	$self->{slider}->emit (mouse_wheel => $ev);
		1063
		1064	1
		1065	}
		1066
999	sub update_slider {	1067	sub update_slider {
1000	my ($self) = @_;	1068	my ($self) = @_;
1001		1069
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003	}	1071	}
…		…
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1087	}
1020		1088
1021	#############################################################################	1089	#############################################################################
1022		1090
1023	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1024		1092
1025	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1026		1094
1027	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1028		1096
1029	sub new {	1097	sub new {
1030	my $class = shift;	1098	my $class = shift;
1031		1099
1032	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1059	}	1127	}
1060		1128
1061	#############################################################################	1129	#############################################################################
1062		1130
1063	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1064		1132
1065	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1066		1134
1067	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
		1136
		1137	sub new {
		1138	my ($class, %arg) = @_;
		1139
		1140	if ((exists $arg{label}) && !ref $arg{label}) {
		1141	$arg{label} = new CFPlus::UI::Label
		1142	align => 1,
		1143	valign => 0,
		1144	text => $arg{label},
		1145	fontsize => ($arg{border} || 0.8) * 0.75;
		1146	}
		1147
		1148	my $self = $class->SUPER::new (
		1149	# label => "",
		1150	fg => [0.6, 0.3, 0.1],
		1151	border => 0.8,
		1152	style => 'single',
		1153	%arg,
		1154	);
		1155
		1156	$self
		1157	}
		1158
		1159	sub add {
		1160	my ($self, @widgets) = @_;
		1161
		1162	$self->SUPER::add (@widgets);
		1163	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1164	}
		1165
		1166	sub border {
		1167	int $_[0]{border} * $::FONTSIZE
		1168	}
		1169
		1170	sub size_request {
		1171	my ($self) = @_;
		1172
		1173	($self->{label_w}, undef) = $self->{label}->size_request
		1174	if $self->{label};
		1175
		1176	my ($w, $h) = $self->SUPER::size_request;
		1177
		1178	(
		1179	$w + $self->border * 2,
		1180	$h + $self->border * 2,
		1181	)
		1182	}
		1183
		1184	sub invoke_size_allocate {
		1185	my ($self, $w, $h) = @_;
		1186
		1187	my $border = $self->border;
		1188
		1189	$w -= List::Util::max 0, $border * 2;
		1190	$h -= List::Util::max 0, $border * 2;
		1191
		1192	if (my $label = $self->{label}) {
		1193	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1194	$label->{h} = List::Util::min $h, $border;
		1195	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1196	}
		1197
		1198	$self->child->configure ($border, $border, $w, $h);
		1199
		1200	1
		1201	}
		1202
		1203	sub _draw {
		1204	my ($self) = @_;
		1205
		1206	my $child = $self->{children}[0];
		1207
		1208	my $border = $self->border;
		1209	my ($w, $h) = ($self->{w}, $self->{h});
		1210
		1211	$child->draw;
		1212
		1213	glColor @{$self->{fg}};
		1214	glBegin GL_LINE_STRIP;
		1215	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1216	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1217	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1218	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1219	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1220	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1221	glEnd;
		1222
		1223	if ($self->{label}) {
		1224	glTranslate $border * 2, 0;
		1225	$self->{label}->_draw;
		1226	}
		1227	}
		1228
		1229	#############################################################################
		1230
		1231	package CFPlus::UI::Toplevel;
		1232
		1233	our @ISA = CFPlus::UI::Bin::;
		1234
		1235	use CFPlus::OpenGL;
1068		1236
1069	my $bg =	1237	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1238	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1239	mipmap => 1, wrap => 1;
1072		1240
1073	my @border =	1241	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1242	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1243	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1244
1077	sub new {	1245	sub new {
1078	my ($class, %arg) = @_;	1246	my ($class, %arg) = @_;
1079		1247
1080	my $self = $class->SUPER::new (	1248	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1249	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1250	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1251	border => 0.6,
1084	can_events => 1,	1252	can_events => 1,
1085	min_w => 16,	1253	min_w => 64,
1086	min_h => 16,	1254	min_h => 32,
1087	%arg,	1255	%arg,
1088	);	1256	);
1089		1257
1090	$self->{title_widget} = new CFClient::UI::Label	1258	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1259	align => 0,
1092	valign => 1,	1260	valign => 1,
1093	text => $self->{title},	1261	text => $self->{title},
1094	fontsize => $self->{border},	1262	fontsize => $self->{border},
1095	if exists $self->{title};	1263	if exists $self->{title};
1096		1264
1097	if ($self->{has_close_button}) {	1265	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1266	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1267	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1268	path => 'x1_close.png',
1101	on_activate => sub { $self->emit ("delete") };	1269	on_activate => sub { $self->emit ("delete") };
1102		1270
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1271	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1272	}
1105		1273
1106	$self	1274	$self
1107	}	1275	}
1108		1276
1109	sub add {	1277	sub add {
1110	my ($self, @widgets) = @_;	1278	my ($self, @widgets) = @_;
1111		1279
1112	$self->SUPER::add (@widgets);	1280	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1281	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1282	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1283	}
1116		1284
1117	sub border {	1285	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1286	int $_[0]{border} * $::FONTSIZE
1119	}	1287	}
…		…
1227	$self->{motion}->($ev, $x, $y) if $self->{motion};	1395	$self->{motion}->($ev, $x, $y) if $self->{motion};
1228		1396
1229	! ! $self->{motion}	1397	! ! $self->{motion}
1230	}	1398	}
1231		1399
		1400	sub invoke_visibility_change {
		1401	my ($self, $visible) = @_;
		1402
		1403	delete $self->{motion} unless $visible;
		1404
		1405	0
		1406	}
		1407
1232	sub _draw {	1408	sub _draw {
1233	my ($self) = @_;	1409	my ($self) = @_;
1234		1410
1235	my $child = $self->{children}[0];	1411	my $child = $self->{children}[0];
1236		1412
…		…
1273	if $self->{close_button};	1449	if $self->{close_button};
1274	}	1450	}
1275		1451
1276	#############################################################################	1452	#############################################################################
1277		1453
1278	package CFClient::UI::Table;	1454	package CFPlus::UI::Table;
1279		1455
1280	our @ISA = CFClient::UI::Base::;	1456	our @ISA = CFPlus::UI::Base::;
1281		1457
1282	use List::Util qw(max sum);	1458	use List::Util qw(max sum);
1283		1459
1284	use CFClient::OpenGL;	1460	use CFPlus::OpenGL;
1285		1461
1286	sub new {	1462	sub new {
1287	my $class = shift;	1463	my $class = shift;
1288		1464
1289	$class->SUPER::new (	1465	$class->SUPER::new (
…		…
1295	sub children {	1471	sub children {
1296	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297	}	1473	}
1298		1474
1299	sub add {	1475	sub add {
1300	my ($self, $x, $y, $child) = @_;	1476	my ($self) = shift;
1301		1477
		1478	while (@_) {
		1479	my ($x, $y, $child) = splice @_, 0, 3, ();
1302	$child->set_parent ($self);	1480	$child->set_parent ($self);
1303	$self->{children}[$y][$x] = $child;	1481	$self->{children}[$y][$x] = $child;
		1482	}
1304		1483
		1484	$self->{force_realloc} = 1;
		1485	$self->{force_size_alloc} = 1;
1305	$self->realloc;	1486	$self->realloc;
1306	}	1487	}
1307		1488
1308	sub remove {	1489	sub remove {
1309	my ($self, $child) = @_;	1490	my ($self, $child) = @_;
…		…
1374		1555
1375	# linearly scale sizes	1556	# linearly scale sizes
1376	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378		1559
1379	CFClient::UI::harmonize $ws;	1560	CFPlus::UI::harmonize $ws;
1380	CFClient::UI::harmonize $hs;	1561	CFPlus::UI::harmonize $hs;
1381		1562
1382	my $y;	1563	my $y;
1383		1564
1384	for my $r (0 .. $#{$self->{children}}) {	1565	for my $r (0 .. $#{$self->{children}}) {
1385	my $row = $self->{children}[$r]	1566	my $row = $self->{children}[$r]
…		…
1428	}	1609	}
1429	}	1610	}
1430		1611
1431	#############################################################################	1612	#############################################################################
1432		1613
1433	package CFClient::UI::Box;	1614	package CFPlus::UI::Box;
1434		1615
1435	our @ISA = CFClient::UI::Container::;	1616	our @ISA = CFPlus::UI::Container::;
1436		1617
1437	sub size_request {	1618	sub size_request {
1438	my ($self) = @_;	1619	my ($self) = @_;
1439		1620
1440	$self->{vertical}	1621	$self->{vertical}
…		…
1473	$req[$_] += $space * $children[$_]{expand}	1654	$req[$_] += $space * $children[$_]{expand}
1474	for 0 .. $#children;	1655	for 0 .. $#children;
1475	}	1656	}
1476	}	1657	}
1477		1658
1478	CFClient::UI::harmonize \@req;	1659	CFPlus::UI::harmonize \@req;
1479		1660
1480	my $pos = 0;	1661	my $pos = 0;
1481	for (0 .. $#children) {	1662	for (0 .. $#children) {
1482	my $alloc = $req[$_];	1663	my $alloc = $req[$_];
1483	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1664	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1488	1	1669	1
1489	}	1670	}
1490		1671
1491	#############################################################################	1672	#############################################################################
1492		1673
1493	package CFClient::UI::HBox;	1674	package CFPlus::UI::HBox;
1494		1675
1495	our @ISA = CFClient::UI::Box::;	1676	our @ISA = CFPlus::UI::Box::;
1496		1677
1497	sub new {	1678	sub new {
1498	my $class = shift;	1679	my $class = shift;
1499		1680
1500	$class->SUPER::new (	1681	$class->SUPER::new (
…		…
1503	)	1684	)
1504	}	1685	}
1505		1686
1506	#############################################################################	1687	#############################################################################
1507		1688
1508	package CFClient::UI::VBox;	1689	package CFPlus::UI::VBox;
1509		1690
1510	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1511		1692
1512	sub new {	1693	sub new {
1513	my $class = shift;	1694	my $class = shift;
1514		1695
1515	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1518	)	1699	)
1519	}	1700	}
1520		1701
1521	#############################################################################	1702	#############################################################################
1522		1703
1523	package CFClient::UI::Label;	1704	package CFPlus::UI::Label;
1524		1705
1525	our @ISA = CFClient::UI::DrawBG::;	1706	our @ISA = CFPlus::UI::DrawBG::;
1526		1707
1527	use CFClient::OpenGL;	1708	use CFPlus::OpenGL;
1528		1709
1529	sub new {	1710	sub new {
1530	my ($class, %arg) = @_;	1711	my ($class, %arg) = @_;
1531		1712
1532	my $self = $class->SUPER::new (	1713	my $self = $class->SUPER::new (
…		…
1535	#active_bg => none	1716	#active_bg => none
1536	#font => default_font	1717	#font => default_font
1537	#text => initial text	1718	#text => initial text
1538	#markup => initial narkup	1719	#markup => initial narkup
1539	#max_w => maximum pixel width	1720	#max_w => maximum pixel width
		1721	#style => 0, # render flags
1540	ellipsise => 3, # end	1722	ellipsise => 3, # end
1541	layout => (new CFClient::Layout),	1723	layout => (new CFPlus::Layout),
1542	fontsize => 1,	1724	fontsize => 1,
1543	align => -1,	1725	align => -1,
1544	valign => -1,	1726	valign => -1,
1545	padding_x => 2,	1727	padding_x => 2,
1546	padding_y => 2,	1728	padding_y => 2,
1547	can_events => 0,	1729	can_events => 0,
1548	%arg	1730	%arg
1549	);	1731	);
1550		1732
1551	if (exists $self->{template}) {	1733	if (exists $self->{template}) {
1552	my $layout = new CFClient::Layout;	1734	my $layout = new CFPlus::Layout;
1553	$layout->set_text (delete $self->{template});	1735	$layout->set_text (delete $self->{template});
1554	$self->{template} = $layout;	1736	$self->{template} = $layout;
1555	}	1737	}
1556		1738
1557	if (exists $self->{markup}) {	1739	if (exists $self->{markup}) {
…		…
1561	}	1743	}
1562		1744
1563	$self	1745	$self
1564	}	1746	}
1565		1747
1566	sub escape($) {
1567	local $_ = $_[0];
1568
1569	s/&/&amp;/g;
1570	s/>/&gt;/g;
1571	s/</&lt;/g;
1572
1573	$_
1574	}
1575
1576	sub update {	1748	sub update {
1577	my ($self) = @_;	1749	my ($self) = @_;
1578		1750
1579	delete $self->{texture};	1751	delete $self->{texture};
1580	$self->SUPER::update;	1752	$self->SUPER::update;
…		…
1591	my ($self, $text) = @_;	1763	my ($self, $text) = @_;
1592		1764
1593	return if $self->{text} eq "T$text";	1765	return if $self->{text} eq "T$text";
1594	$self->{text} = "T$text";	1766	$self->{text} = "T$text";
1595		1767
1596	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597	$self->{layout}->set_text ($text);	1768	$self->{layout}->set_text ($text);
1598		1769
1599	delete $self->{size_req};	1770	delete $self->{size_req};
1600	$self->realloc;	1771	$self->realloc;
1601	$self->update;	1772	$self->update;
…		…
1607	return if $self->{text} eq "M$markup";	1778	return if $self->{text} eq "M$markup";
1608	$self->{text} = "M$markup";	1779	$self->{text} = "M$markup";
1609		1780
1610	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1781	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611		1782
1612	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613	$self->{layout}->set_markup ($markup);	1783	$self->{layout}->set_markup ($markup);
1614		1784
1615	delete $self->{size_req};	1785	delete $self->{size_req};
1616	$self->realloc;	1786	$self->realloc;
1617	$self->update;	1787	$self->update;
…		…
1629		1799
1630	my ($w, $h) = $self->{layout}->size;	1800	my ($w, $h) = $self->{layout}->size;
1631		1801
1632	if (exists $self->{template}) {	1802	if (exists $self->{template}) {
1633	$self->{template}->set_font ($self->{font}) if $self->{font};	1803	$self->{template}->set_font ($self->{font}) if $self->{font};
		1804	$self->{template}->set_width ($self->{max_w} || -1);
1634	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1805	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635		1806
1636	my ($w2, $h2) = $self->{template}->size;	1807	my ($w2, $h2) = $self->{template}->size;
1637		1808
1638	$w = List::Util::max $w, $w2;	1809	$w = List::Util::max $w, $w2;
…		…
1672		1843
1673	sub reconfigure {	1844	sub reconfigure {
1674	my ($self) = @_;	1845	my ($self) = @_;
1675		1846
1676	delete $self->{size_req};	1847	delete $self->{size_req};
		1848	delete $self->{texture};
1677		1849
1678	$self->SUPER::reconfigure;	1850	$self->SUPER::reconfigure;
1679	}	1851	}
1680		1852
1681	sub _draw {	1853	sub _draw {
1682	my ($self) = @_;	1854	my ($self) = @_;
1683		1855
1684	$self->SUPER::_draw; # draw background, if applicable	1856	$self->SUPER::_draw; # draw background, if applicable
1685		1857
1686	my $tex = $self->{texture} ||= do {	1858	my $size = $self->{texture} ||= do {
1687	$self->{layout}->set_foreground (@{$self->{fg}});	1859	$self->{layout}->set_foreground (@{$self->{fg}});
1688	$self->{layout}->set_font ($self->{font}) if $self->{font};	1860	$self->{layout}->set_font ($self->{font}) if $self->{font};
1689	$self->{layout}->set_width ($self->{w});	1861	$self->{layout}->set_width ($self->{w});
1690	$self->{layout}->set_ellipsise ($self->{ellipsise});	1862	$self->{layout}->set_ellipsise ($self->{ellipsise});
1691	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1863	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1864	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693		1865
1694	new_from_layout CFClient::Texture $self->{layout}	1866	[$self->{layout}->size]
1695	};	1867	};
1696		1868
1697	unless (exists $self->{ox}) {	1869	unless (exists $self->{ox}) {
1698	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1870	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1871	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700	: ($self->{w} - $tex->{w}) * 0.5);	1872	: ($self->{w} - $size->[0]) * 0.5);
1701		1873
1702	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1874	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1875	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704	: ($self->{h} - $tex->{h}) * 0.5);	1876	: ($self->{h} - $size->[1]) * 0.5);
1705	};	1877	};
1706		1878
1707	glEnable GL_TEXTURE_2D;
1708
1709	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
1710	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1711		1881
1712	if ($tex->{format} == GL_ALPHA) {	1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714	glColor @{$self->{fg}};
1715	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716	} else {
1717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719	}
1720
1721	glDisable GL_TEXTURE_2D;
1722	}	1883	}
1723		1884
1724	#############################################################################	1885	#############################################################################
1725		1886
1726	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1727		1888
1728	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1729		1890
1730	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1731		1892
1732	sub new {	1893	sub new {
1733	my $class = shift;	1894	my $class = shift;
1734		1895
1735	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1797		1958
1798	if ($uni == 8) {	1959	if ($uni == 8) {
1799	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1800	} elsif ($uni == 127) {	1961	} elsif ($uni == 127) {
1801	substr $text, $self->{cursor}, 1, "";	1962	substr $text, $self->{cursor}, 1, "";
1802	} elsif ($sym == CFClient::SDLK_LEFT) {	1963	} elsif ($sym == CFPlus::SDLK_LEFT) {
1803	--$self->{cursor} if $self->{cursor};	1964	--$self->{cursor} if $self->{cursor};
1804	} elsif ($sym == CFClient::SDLK_RIGHT) {	1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1805	++$self->{cursor} if $self->{cursor} < length $self->{text};	1966	++$self->{cursor} if $self->{cursor} < length $self->{text};
1806	} elsif ($sym == CFClient::SDLK_HOME) {	1967	} elsif ($sym == CFPlus::SDLK_HOME) {
1807	$self->{cursor} = 0;	1968	$self->{cursor} = 0;
1808	} elsif ($sym == CFClient::SDLK_END) {	1969	} elsif ($sym == CFPlus::SDLK_END) {
1809	$self->{cursor} = length $text;	1970	$self->{cursor} = length $text;
		1971	} elsif ($uni == 21) { # ctrl-u
		1972	$text = "";
1810	} elsif ($uni == 27) {	1973	} elsif ($uni == 27) {
1811	$self->emit ('escape');	1974	$self->emit ('escape');
1812	} elsif ($uni) {	1975	} elsif ($uni) {
1813	substr $text, $self->{cursor}++, 0, chr $uni;	1976	substr $text, $self->{cursor}++, 0, chr $uni;
1814	} else {	1977	} else {
…		…
1837		2000
1838	my $idx = $self->{layout}->xy_to_index ($x, $y);	2001	my $idx = $self->{layout}->xy_to_index ($x, $y);
1839		2002
1840	# byte-index to char-index	2003	# byte-index to char-index
1841	my $text = $self->{text};	2004	my $text = $self->{text};
1842	utf8::encode $text;	2005	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843	$self->{cursor} = length substr $text, 0, $idx;	2006	$self->{cursor} = length $text;
1844		2007
1845	$self->_set_text ($self->{text});	2008	$self->_set_text ($self->{text});
1846	$self->update;	2009	$self->update;
1847		2010
1848	1	2011	1
…		…
1887	utf8::encode $text;	2050	utf8::encode $text;
1888		2051
1889	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2052	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1890	}	2053	}
1891		2054
1892	glColor @{$self->{fg}};
1893	glBegin GL_LINES;	2055	glBegin GL_LINES;
1894	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2056	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2057	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1896	glEnd;	2058	glEnd;
1897	}	2059	}
1898	}	2060	}
1899		2061
1900	package CFClient::UI::Entry;	2062	package CFPlus::UI::Entry;
1901		2063
1902	our @ISA = CFClient::UI::EntryBase::;	2064	our @ISA = CFPlus::UI::EntryBase::;
1903		2065
1904	use CFClient::OpenGL;	2066	use CFPlus::OpenGL;
1905		2067
1906	sub invoke_key_down {	2068	sub invoke_key_down {
1907	my ($self, $ev) = @_;	2069	my ($self, $ev) = @_;
1908		2070
1909	my $sym = $ev->{sym};	2071	my $sym = $ev->{sym};
…		…
1915	$self->{history_pointer} = -1;	2077	$self->{history_pointer} = -1;
1916	$self->{history_saveback} = '';	2078	$self->{history_saveback} = '';
1917	$self->emit (activate => $txt);	2079	$self->emit (activate => $txt);
1918	$self->update;	2080	$self->update;
1919		2081
1920	} elsif ($sym == CFClient::SDLK_UP) {	2082	} elsif ($sym == CFPlus::SDLK_UP) {
1921	if ($self->{history_pointer} < 0) {	2083	if ($self->{history_pointer} < 0) {
1922	$self->{history_saveback} = $self->get_text;	2084	$self->{history_saveback} = $self->get_text;
1923	}	2085	}
1924	if (@{$self->{history} || []} > 0) {	2086	if (@{$self->{history} || []} > 0) {
1925	$self->{history_pointer}++;	2087	$self->{history_pointer}++;
…		…
1927	$self->{history_pointer} = @{$self->{history} || []} - 1;	2089	$self->{history_pointer} = @{$self->{history} || []} - 1;
1928	}	2090	}
1929	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2091	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1930	}	2092	}
1931		2093
1932	} elsif ($sym == CFClient::SDLK_DOWN) {	2094	} elsif ($sym == CFPlus::SDLK_DOWN) {
1933	$self->{history_pointer}--;	2095	$self->{history_pointer}--;
1934	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2096	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1935		2097
1936	if ($self->{history_pointer} >= 0) {	2098	if ($self->{history_pointer} >= 0) {
1937	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2099	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1946	1	2108	1
1947	}	2109	}
1948		2110
1949	#############################################################################	2111	#############################################################################
1950		2112
1951	package CFClient::UI::Button;	2113	package CFPlus::UI::Button;
1952		2114
1953	our @ISA = CFClient::UI::Label::;	2115	our @ISA = CFPlus::UI::Label::;
1954		2116
1955	use CFClient::OpenGL;	2117	use CFPlus::OpenGL;
1956		2118
1957	my @tex =	2119	my @tex =
1958	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2120	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1959	qw(b1_button_active.png);	2121	qw(b1_button_active.png);
1960		2122
1961	sub new {	2123	sub new {
1962	my $class = shift;	2124	my $class = shift;
1963		2125
…		…
2000	$self->SUPER::_draw;	2162	$self->SUPER::_draw;
2001	}	2163	}
2002		2164
2003	#############################################################################	2165	#############################################################################
2004		2166
		2167	package CFPlus::UI::CheckBox;
		2168
		2169	our @ISA = CFPlus::UI::DrawBG::;
		2170
		2171	my @tex =
		2172	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2173	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2174
		2175	use CFPlus::OpenGL;
		2176
		2177	sub new {
		2178	my $class = shift;
		2179
		2180	$class->SUPER::new (
		2181	padding_x => 2,
		2182	padding_y => 2,
		2183	fg => [1, 1, 1],
		2184	active_fg => [1, 1, 0],
		2185	bg => [0, 0, 0, 0.2],
		2186	active_bg => [1, 1, 1, 0.5],
		2187	state => 0,
		2188	can_hover => 1,
		2189	@_
		2190	)
		2191	}
		2192
		2193	sub size_request {
		2194	my ($self) = @_;
		2195
		2196	(6) x 2
		2197	}
		2198
		2199	sub toggle {
		2200	my ($self) = @_;
		2201
		2202	$self->{state} = !$self->{state};
		2203	$self->emit (changed => $self->{state});
		2204	$self->update;
		2205	}
		2206
		2207	sub invoke_button_down {
		2208	my ($self, $ev, $x, $y) = @_;
		2209
		2210	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2211	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2212	$self->toggle;
		2213	} else {
		2214	return 0
		2215	}
		2216
		2217	1
		2218	}
		2219
		2220	sub _draw {
		2221	my ($self) = @_;
		2222
		2223	$self->SUPER::_draw;
		2224
		2225	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2226
		2227	my ($w, $h) = @$self{qw(w h)};
		2228
		2229	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2230
		2231	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2232
		2233	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2234
		2235	glEnable GL_TEXTURE_2D;
		2236	$tex->draw_quad_alpha (0, 0, $s, $s);
		2237	glDisable GL_TEXTURE_2D;
		2238	}
		2239
		2240	#############################################################################
		2241
		2242	package CFPlus::UI::Image;
		2243
		2244	our @ISA = CFPlus::UI::Base::;
		2245
		2246	use CFPlus::OpenGL;
		2247
		2248	our %texture_cache;
		2249
		2250	sub new {
		2251	my $class = shift;
		2252
		2253	my $self = $class->SUPER::new (
		2254	can_events => 0,
		2255	@_,
		2256	);
		2257
		2258	$self->{path} || $self->{tex}
		2259	or Carp::croak "'path' or 'tex' attributes required";
		2260
		2261	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2262	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2263
		2264	Scalar::Util::weaken $texture_cache{$self->{path}};
		2265
		2266	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2267
		2268	$self
		2269	}
		2270
		2271	sub STORABLE_freeze {
		2272	my ($self, $cloning) = @_;
		2273
		2274	$self->{path}
		2275	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2276
		2277	$self->{path}
		2278	}
		2279
		2280	sub STORABLE_attach {
		2281	my ($self, $cloning, $path) = @_;
		2282
		2283	$self->new (path => $path)
		2284	}
		2285
		2286	sub size_request {
		2287	my ($self) = @_;
		2288
		2289	($self->{tex}{w}, $self->{tex}{h})
		2290	}
		2291
		2292	sub _draw {
		2293	my ($self) = @_;
		2294
		2295	my $tex = $self->{tex};
		2296
		2297	my ($w, $h) = ($self->{w}, $self->{h});
		2298
		2299	if ($self->{rot90}) {
		2300	glRotate 90, 0, 0, 1;
		2301	glTranslate 0, -$self->{w}, 0;
		2302
		2303	($w, $h) = ($h, $w);
		2304	}
		2305
		2306	glEnable GL_TEXTURE_2D;
		2307	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2308
		2309	$tex->draw_quad (0, 0, $w, $h);
		2310
		2311	glDisable GL_TEXTURE_2D;
		2312	}
		2313
		2314	#############################################################################
		2315
2005	package CFClient::UI::ImageButton;	2316	package CFPlus::UI::ImageButton;
2006		2317
2007	our @ISA = CFClient::UI::Image::;	2318	our @ISA = CFPlus::UI::Image::;
2008		2319
2009	use CFClient::OpenGL;	2320	use CFPlus::OpenGL;
2010		2321
2011	my %textures;	2322	my %textures;
2012		2323
2013	sub new {	2324	sub new {
2014	my $class = shift;	2325	my $class = shift;
…		…
2036	1	2347	1
2037	}	2348	}
2038		2349
2039	#############################################################################	2350	#############################################################################
2040		2351
2041	package CFClient::UI::CheckBox;
2042
2043	our @ISA = CFClient::UI::DrawBG::;
2044
2045	my @tex =
2046	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2047	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2048
2049	use CFClient::OpenGL;
2050
2051	sub new {
2052	my $class = shift;
2053
2054	$class->SUPER::new (
2055	padding_x => 2,
2056	padding_y => 2,
2057	fg => [1, 1, 1],
2058	active_fg => [1, 1, 0],
2059	bg => [0, 0, 0, 0.2],
2060	active_bg => [1, 1, 1, 0.5],
2061	state => 0,
2062	can_hover => 1,
2063	@_
2064	)
2065	}
2066
2067	sub size_request {
2068	my ($self) = @_;
2069
2070	(6) x 2
2071	}
2072
2073	sub invoke_button_down {
2074	my ($self, $ev, $x, $y) = @_;
2075
2076	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2077	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2078	$self->{state} = !$self->{state};
2079	$self->emit (changed => $self->{state});
2080	} else {
2081	return 0
2082	}
2083
2084	1
2085	}
2086
2087	sub _draw {
2088	my ($self) = @_;
2089
2090	$self->SUPER::_draw;
2091
2092	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2093
2094	my ($w, $h) = @$self{qw(w h)};
2095
2096	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2097
2098	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2099
2100	my $tex = $self->{state} ? $tex[1] : $tex[0];
2101
2102	glEnable GL_TEXTURE_2D;
2103	$tex->draw_quad_alpha (0, 0, $s, $s);
2104	glDisable GL_TEXTURE_2D;
2105	}
2106
2107	#############################################################################
2108
2109	package CFClient::UI::Image;	2352	package CFPlus::UI::VGauge;
2110		2353
2111	our @ISA = CFClient::UI::Base::;	2354	our @ISA = CFPlus::UI::Base::;
2112
2113	use CFClient::OpenGL;
2114
2115	our %texture_cache;
2116
2117	sub new {
2118	my $class = shift;
2119
2120	my $self = $class->SUPER::new (
2121	can_events => 0,
2122	@_,
2123	);
2124
2125	$self->{path}
2126	or Carp::croak "required attribute 'path' not set";
2127
2128	$self->{tex} = $texture_cache{$self->{path}} ||=
2129	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2130
2131	Scalar::Util::weaken $texture_cache{$self->{path}};
2132
2133	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2134
2135	$self
2136	}
2137
2138	sub size_request {
2139	my ($self) = @_;
2140
2141	($self->{tex}{w}, $self->{tex}{h})
2142	}
2143
2144	sub _draw {
2145	my ($self) = @_;
2146
2147	my $tex = $self->{tex};
2148
2149	my ($w, $h) = ($self->{w}, $self->{h});
2150
2151	if ($self->{rot90}) {
2152	glRotate 90, 0, 0, 1;
2153	glTranslate 0, -$self->{w}, 0;
2154
2155	($w, $h) = ($h, $w);
2156	}
2157
2158	glEnable GL_TEXTURE_2D;
2159	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2160
2161	$tex->draw_quad_alpha (0, 0, $w, $h);
2162
2163	glDisable GL_TEXTURE_2D;
2164	}
2165
2166	#############################################################################
2167
2168	package CFClient::UI::VGauge;
2169
2170	our @ISA = CFClient::UI::Base::;
2171		2355
2172	use List::Util qw(min max);	2356	use List::Util qw(min max);
2173		2357
2174	use CFClient::OpenGL;	2358	use CFPlus::OpenGL;
2175		2359
2176	my %tex = (	2360	my %tex = (
2177	food => [	2361	food => [
2178	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2363	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2180	],	2364	],
2181	grace => [	2365	grace => [
2182	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2366	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2367	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2184	],	2368	],
2185	hp => [	2369	hp => [
2186	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2370	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2371	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2188	],	2372	],
2189	mana => [	2373	mana => [
2190	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2374	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2375	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2192	],	2376	],
2193	);	2377	);
2194		2378
2195	# eg. VGauge->new (gauge => 'food'), default gauge: food	2379	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2298	glDisable GL_TEXTURE_2D;	2482	glDisable GL_TEXTURE_2D;
2299	}	2483	}
2300		2484
2301	#############################################################################	2485	#############################################################################
2302		2486
2303	package CFClient::UI::Gauge;	2487	package CFPlus::UI::Gauge;
2304		2488
2305	our @ISA = CFClient::UI::VBox::;	2489	our @ISA = CFPlus::UI::VBox::;
2306		2490
2307	sub new {	2491	sub new {
2308	my ($class, %arg) = @_;	2492	my ($class, %arg) = @_;
2309		2493
2310	my $self = $class->SUPER::new (	2494	my $self = $class->SUPER::new (
…		…
2312	can_hover => 1,	2496	can_hover => 1,
2313	can_events => 1,	2497	can_events => 1,
2314	%arg,	2498	%arg,
2315	);	2499	);
2316		2500
2317	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2501	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2318	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2502	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2319	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2503	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2320		2504
2321	$self	2505	$self
2322	}	2506	}
2323		2507
2324	sub set_fontsize {	2508	sub set_fontsize {
…		…
2345	$self->{value}->set_text ($val);	2529	$self->{value}->set_text ($val);
2346	}	2530	}
2347		2531
2348	#############################################################################	2532	#############################################################################
2349		2533
2350	package CFClient::UI::Slider;	2534	package CFPlus::UI::Slider;
2351		2535
2352	use strict;	2536	use strict;
2353		2537
2354	use CFClient::OpenGL;	2538	use CFPlus::OpenGL;
2355		2539
2356	our @ISA = CFClient::UI::DrawBG::;	2540	our @ISA = CFPlus::UI::DrawBG::;
2357		2541
2358	my @tex =	2542	my @tex =
2359	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2543	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2360	qw(s1_slider.png s1_slider_bg.png);	2544	qw(s1_slider.png s1_slider_bg.png);
2361		2545
2362	sub new {	2546	sub new {
2363	my $class = shift;	2547	my $class = shift;
2364		2548
…		…
2453	}	2637	}
2454		2638
2455	1	2639	1
2456	}	2640	}
2457		2641
		2642	sub invoke_mouse_wheel {
		2643	my ($self, $ev) = @_;
		2644
		2645	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2646
		2647	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2648
		2649	! ! $delta
		2650	}
		2651
2458	sub update {	2652	sub update {
2459	my ($self) = @_;	2653	my ($self) = @_;
2460		2654
2461	delete $self->{knob_w};	2655	delete $self->{knob_w};
2462	$self->SUPER::update;	2656	$self->SUPER::update;
…		…
2509	glDisable GL_TEXTURE_2D;	2703	glDisable GL_TEXTURE_2D;
2510	}	2704	}
2511		2705
2512	#############################################################################	2706	#############################################################################
2513		2707
2514	package CFClient::UI::ValSlider;	2708	package CFPlus::UI::ValSlider;
2515		2709
2516	our @ISA = CFClient::UI::HBox::;	2710	our @ISA = CFPlus::UI::HBox::;
2517		2711
2518	sub new {	2712	sub new {
2519	my ($class, %arg) = @_;	2713	my ($class, %arg) = @_;
2520		2714
2521	my $range = delete $arg{range};	2715	my $range = delete $arg{range};
2522		2716
2523	my $self = $class->SUPER::new (	2717	my $self = $class->SUPER::new (
2524	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2718	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2525	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2719	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2526	to_value => sub { shift },	2720	to_value => sub { shift },
2527	from_value => sub { shift },	2721	from_value => sub { shift },
2528	%arg,	2722	%arg,
2529	);	2723	);
2530		2724
…		…
2550	sub set_range { shift->{slider}->set_range (@_) }	2744	sub set_range { shift->{slider}->set_range (@_) }
2551	sub set_value { shift->{slider}->set_value (@_) }	2745	sub set_value { shift->{slider}->set_value (@_) }
2552		2746
2553	#############################################################################	2747	#############################################################################
2554		2748
2555	package CFClient::UI::TextScroller;	2749	package CFPlus::UI::TextScroller;
2556		2750
2557	our @ISA = CFClient::UI::HBox::;	2751	our @ISA = CFPlus::UI::HBox::;
2558		2752
2559	use CFClient::OpenGL;	2753	use CFPlus::OpenGL;
2560		2754
2561	sub new {	2755	sub new {
2562	my $class = shift;	2756	my $class = shift;
2563		2757
2564	my $self = $class->SUPER::new (	2758	my $self = $class->SUPER::new (
2565	fontsize => 1,	2759	fontsize => 1,
2566	can_events => 0,	2760	can_events => 1,
2567	indent => 0,	2761	indent => 0,
2568	#font => default_font	2762	#font => default_font
2569	@_,	2763	@_,
2570		2764
2571	layout => (new CFClient::Layout 1),	2765	layout => (new CFPlus::Layout),
2572	par => [],	2766	par => [],
2573	height => 0,	2767	height => 0,
2574	children => [	2768	children => [
2575	(new CFClient::UI::Empty expand => 1),	2769	(new CFPlus::UI::Empty expand => 1),
2576	(new CFClient::UI::Slider vertical => 1),	2770	(new CFPlus::UI::Slider vertical => 1),
2577	],	2771	],
2578	);	2772	);
2579		2773
2580	$self->{children}[1]->connect (changed => sub { $self->update });	2774	$self->{children}[1]->connect (changed => sub { $self->update });
2581		2775
…		…
2611		2805
2612	$self->reflow;	2806	$self->reflow;
2613		2807
2614	local $self->{children} = [$empty, $slider];	2808	local $self->{children} = [$empty, $slider];
2615	$self->SUPER::invoke_size_allocate ($w, $h)	2809	$self->SUPER::invoke_size_allocate ($w, $h)
		2810	}
		2811
		2812	sub invoke_mouse_wheel {
		2813	my ($self, $ev) = @_;
		2814
		2815	return 0 unless $ev->{dy}; # only vertical movements
		2816
		2817	$self->{children}[1]->emit (mouse_wheel => $ev);
		2818
		2819	1
2616	}	2820	}
2617		2821
2618	sub get_layout {	2822	sub get_layout {
2619	my ($self, $para) = @_;	2823	my ($self, $para) = @_;
2620		2824
…		…
2648		2852
2649	# todo: base offset on lines or so, not on pixels	2853	# todo: base offset on lines or so, not on pixels
2650	$self->{children}[1]->set_value ($offset);	2854	$self->{children}[1]->set_value ($offset);
2651	}	2855	}
2652		2856
		2857	sub current_paragraph {
		2858	my ($self) = @_;
		2859
		2860	$self->{top_paragraph} - 1
		2861	}
		2862
		2863	sub scroll_to {
		2864	my ($self, $para) = @_;
		2865
		2866	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2867
		2868	$self->{scroll_to} = $para;
		2869	$self->update;
		2870	}
		2871
2653	sub clear {	2872	sub clear {
2654	my ($self) = @_;	2873	my ($self) = @_;
2655		2874
2656	my (undef, undef, @other) = @{ $self->{children} };	2875	my (undef, undef, @other) = @{ $self->{children} };
2657	$self->remove ($_) for @other;	2876	$self->remove ($_) for @other;
…		…
2660	$self->{height} = 0;	2879	$self->{height} = 0;
2661	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2880	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2662	}	2881	}
2663		2882
2664	sub add_paragraph {	2883	sub add_paragraph {
2665	my ($self, $color, $para, $indent) = @_;	2884	my $self = shift;
2666		2885
2667	my ($text, @w) = ref $para ? @$para : $para;	2886	for my $para (@_) {
2668
2669	$para = {	2887	$para = {
		2888	fg => [1, 1, 1, 1],
		2889	indent => 0,
		2890	markup => "",
		2891	widget => [],
		2892	ref $para ? %$para : (markup => $para),
2670	w => 1e10,	2893	w => 1e10,
2671	wrapped => 1,	2894	wrapped => 1,
2672	fg => $color,
2673	indent => $indent,
2674	markup => $text,
2675	widget => \@w,
2676	};	2895	};
2677		2896
2678	$self->add (@w) if @w;	2897	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2679	push @{$self->{par}}, $para;	2898	push @{$self->{par}}, $para;
		2899	}
2680		2900
2681	$self->{need_reflow}++;	2901	$self->{need_reflow}++;
2682	$self->update;	2902	$self->update;
2683	}	2903	}
2684		2904
2685	sub scroll_to_bottom {	2905	sub scroll_to_bottom {
2686	my ($self) = @_;	2906	my ($self) = @_;
2687		2907
2688	$self->{scroll_to_bottom} = 1;	2908	$self->{scroll_to} = $#{$self->{par}};
2689	$self->update;	2909	$self->update;
2690	}	2910	}
2691		2911
		2912	sub force_uptodate {
		2913	my ($self) = @_;
		2914
		2915	if (delete $self->{need_reflow}) {
		2916	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2917
		2918	my $height = 0;
		2919
		2920	for my $para (@{$self->{par}}) {
		2921	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2922	my $layout = $self->get_layout ($para);
		2923	my ($w, $h) = $layout->size;
		2924
		2925	$para->{w} = $w + $para->{indent};
		2926	$para->{h} = $h;
		2927	$para->{wrapped} = $layout->has_wrapped;
		2928	}
		2929
		2930	$para->{y} = $height;
		2931	$height += $para->{h};
		2932	}
		2933
		2934	$self->{height} = $height;
		2935	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2936
		2937	delete $self->{texture};
		2938	}
		2939
		2940	if (my $paridx = delete $self->{scroll_to}) {
		2941	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2942	}
		2943	}
		2944
2692	sub update {	2945	sub update {
2693	my ($self) = @_;	2946	my ($self) = @_;
2694		2947
2695	$self->SUPER::update;	2948	$self->SUPER::update;
2696		2949
2697	return unless $self->{h} > 0;	2950	return unless $self->{h} > 0;
2698		2951
2699	delete $self->{texture};	2952	delete $self->{texture};
2700		2953
2701	$ROOT->on_post_alloc ($self => sub {	2954	$ROOT->on_post_alloc ($self => sub {
		2955	$self->force_uptodate;
		2956
2702	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2957	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2703		2958
2704	if (delete $self->{need_reflow}) {
2705	my $height = 0;
2706
2707	for my $para (@{$self->{par}}) {
2708	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2709	my $layout = $self->get_layout ($para);
2710	my ($w, $h) = $layout->size;
2711
2712	$para->{w} = $w + $para->{indent};
2713	$para->{h} = $h;
2714	$para->{wrapped} = $layout->has_wrapped;
2715	}
2716
2717	$height += $para->{h};
2718	}
2719
2720	$self->{height} = $height;
2721
2722	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2723
2724	delete $self->{texture};
2725	}
2726
2727	if (delete $self->{scroll_to_bottom}) {
2728	$self->{children}[1]->set_value (1e10);
2729	}
2730
2731	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2959	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2732	glClearColor 0, 0, 0, 0;	2960	glClearColor 0, 0, 0, 0;
2733	glClear GL_COLOR_BUFFER_BIT;	2961	glClear GL_COLOR_BUFFER_BIT;
2734		2962
2735	my $top = int $self->{children}[1]{range}[0];	2963	my $top = int $self->{children}[1]{range}[0];
2736		2964
		2965	my $paridx = 0;
		2966	my $top_paragraph;
		2967	my $top = int $self->{children}[1]{range}[0];
		2968
2737	my $y0 = $top;	2969	my $y0 = $top;
2738	my $y1 = $top + $H;	2970	my $y1 = $top + $H;
2739		2971
2740	my $y = 0;
2741
2742	glEnable GL_BLEND;
2743	#TODO# not correct in windows where rgba is forced off
2744	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2745
2746	for my $para (@{$self->{par}}) {	2972	for my $para (@{$self->{par}}) {
2747	my $h = $para->{h};	2973	my $h = $para->{h};
		2974	my $y = $para->{y};
2748		2975
2749	if ($y0 < $y + $h && $y < $y1) {	2976	if ($y0 < $y + $h && $y < $y1) {
2750
2751	my $layout = $self->get_layout ($para);	2977	my $layout = $self->get_layout ($para);
2752		2978
2753	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2754
2755	glRasterPos $para->{indent}, $y - $y0;	2979	$layout->render ($para->{indent}, $y - $y0);
2756	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2757		2980
2758	if (my @w = @{ $para->{widget} }) {	2981	if (my @w = @{ $para->{widget} }) {
2759	my @s = $layout->get_shapes;	2982	my @s = $layout->get_shapes;
2760		2983
2761	glDisable GL_BLEND;
2762	for (@w) {	2984	for (@w) {
2763	my ($dx, $dy) = splice @s, 0, 2, ();	2985	my ($dx, $dy) = splice @s, 0, 2, ();
2764		2986
2765	$_->{x} = $dx + $para->{indent};	2987	$_->{x} = $dx + $para->{indent};
2766	$_->{y} = $dy + $y - $y0;	2988	$_->{y} = $dy + $y - $y0;
2767		2989
2768	$_->draw;	2990	$_->draw;
2769	}	2991	}
2770	glEnable GL_BLEND;
2771	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2772	}	2992	}
2773	}	2993	}
2774		2994
2775	$y += $h;	2995	$paridx++;
		2996	$top_paragraph ||= $paridx if $y >= $top;
2776	}	2997	}
2777		2998
2778	glDisable GL_BLEND;	2999	$self->{top_paragraph} = $top_paragraph;
2779	};	3000	};
2780	});	3001	});
2781	}	3002	}
2782		3003
2783	sub reconfigure {	3004	sub reconfigure {
…		…
2801	$self->{children}[1]->draw;	3022	$self->{children}[1]->draw;
2802	}	3023	}
2803		3024
2804	#############################################################################	3025	#############################################################################
2805		3026
2806	package CFClient::UI::Animator;	3027	package CFPlus::UI::Animator;
2807		3028
2808	use CFClient::OpenGL;	3029	use CFPlus::OpenGL;
2809		3030
2810	our @ISA = CFClient::UI::Bin::;	3031	our @ISA = CFPlus::UI::Bin::;
2811		3032
2812	sub moveto {	3033	sub moveto {
2813	my ($self, $x, $y) = @_;	3034	my ($self, $x, $y) = @_;
2814		3035
2815	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3036	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2843	glPopMatrix;	3064	glPopMatrix;
2844	}	3065	}
2845		3066
2846	#############################################################################	3067	#############################################################################
2847		3068
2848	package CFClient::UI::Flopper;	3069	package CFPlus::UI::Flopper;
2849		3070
2850	our @ISA = CFClient::UI::Button::;	3071	our @ISA = CFPlus::UI::Button::;
2851		3072
2852	sub new {	3073	sub new {
2853	my $class = shift;	3074	my $class = shift;
2854		3075
2855	my $self = $class->SUPER::new (	3076	my $self = $class->SUPER::new (
…		…
2867	$self->{other}->toggle_visibility;	3088	$self->{other}->toggle_visibility;
2868	}	3089	}
2869		3090
2870	#############################################################################	3091	#############################################################################
2871		3092
2872	package CFClient::UI::Tooltip;	3093	package CFPlus::UI::Tooltip;
2873		3094
2874	our @ISA = CFClient::UI::Bin::;	3095	our @ISA = CFPlus::UI::Bin::;
2875		3096
2876	use CFClient::OpenGL;	3097	use CFPlus::OpenGL;
2877		3098
2878	sub new {	3099	sub new {
2879	my $class = shift;	3100	my $class = shift;
2880		3101
2881	$class->SUPER::new (	3102	$class->SUPER::new (
…		…
2884	)	3105	)
2885	}	3106	}
2886		3107
2887	sub set_tooltip_from {	3108	sub set_tooltip_from {
2888	my ($self, $widget) = @_;	3109	my ($self, $widget) = @_;
		3110
		3111	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3112	if $widget->{tooltip} =~ /^#(.*)$/;
2889		3113
2890	my $tooltip = $widget->{tooltip};	3114	my $tooltip = $widget->{tooltip};
2891		3115
2892	if ($ENV{CFPLUS_DEBUG} & 2) {	3116	if ($ENV{CFPLUS_DEBUG} & 2) {
2893	$tooltip .= "\n\n" . (ref $widget) . "\n"	3117	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2897	}	3121	}
2898		3122
2899	$tooltip =~ s/^\n+//;	3123	$tooltip =~ s/^\n+//;
2900	$tooltip =~ s/\n+$//;	3124	$tooltip =~ s/\n+$//;
2901		3125
2902	$self->add (new CFClient::UI::Label	3126	$self->add (new CFPlus::UI::Label
2903	markup => $tooltip,	3127	markup => $tooltip,
2904	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3128	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2905	fontsize => 0.8,	3129	fontsize => 0.8,
2906	fg => [0, 0, 0, 1],	3130	style => 1, # FLAG_INVERSE
2907	ellipsise => 0,	3131	ellipsise => 0,
2908	font => ($widget->{tooltip_font} || $::FONT_PROP),	3132	font => ($widget->{tooltip_font} || $::FONT_PROP),
2909	);	3133	);
2910	}	3134	}
2911		3135
…		…
2930		3154
2931	$self->{root}->on_post_alloc ("move_$self" => sub {	3155	$self->{root}->on_post_alloc ("move_$self" => sub {
2932	my $widget = $self->{owner}	3156	my $widget = $self->{owner}
2933	or return;	3157	or return;
2934		3158
		3159	if ($widget->{visible}) {
2935	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3160	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2936		3161
2937	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3162	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2938	if $x + $self->{w} > $self->{root}{w};	3163	if $x + $self->{w} > $self->{root}{w};
2939		3164
2940	$self->move_abs ($x, $y);	3165	$self->move_abs ($x, $y);
		3166	} else {
		3167	$self->hide;
		3168	}
2941	});	3169	});
2942	}	3170	}
2943		3171
2944	sub _draw {	3172	sub _draw {
2945	my ($self) = @_;	3173	my ($self) = @_;
…		…
2969	$self->SUPER::_draw;	3197	$self->SUPER::_draw;
2970	}	3198	}
2971		3199
2972	#############################################################################	3200	#############################################################################
2973		3201
2974	package CFClient::UI::Face;	3202	package CFPlus::UI::Face;
2975		3203
2976	our @ISA = CFClient::UI::Base::;	3204	our @ISA = CFPlus::UI::DrawBG::;
2977		3205
2978	use CFClient::OpenGL;	3206	use CFPlus::OpenGL;
2979		3207
2980	sub new {	3208	sub new {
2981	my $class = shift;	3209	my $class = shift;
2982		3210
2983	my $self = $class->SUPER::new (	3211	my $self = $class->SUPER::new (
…		…
3018	sub _draw {	3246	sub _draw {
3019	my ($self) = @_;	3247	my ($self) = @_;
3020		3248
3021	return unless $::CONN;	3249	return unless $::CONN;
3022		3250
		3251	$self->SUPER::_draw;
		3252
3023	my $face;	3253	my $face;
3024		3254
3025	if ($self->{frame}) {	3255	if ($self->{frame}) {
3026	my $anim = $::CONN->{anim}[$self->{anim}];	3256	my $anim = $::CONN->{anim}[$self->{anim}];
3027		3257
…		…
3049	$self->SUPER::destroy;	3279	$self->SUPER::destroy;
3050	}	3280	}
3051		3281
3052	#############################################################################	3282	#############################################################################
3053		3283
3054	package CFClient::UI::Buttonbar;	3284	package CFPlus::UI::Buttonbar;
3055		3285
3056	our @ISA = CFClient::UI::HBox::;	3286	our @ISA = CFPlus::UI::HBox::;
3057		3287
3058	# TODO: should actualyl wrap buttons and other goodies.	3288	# TODO: should actualyl wrap buttons and other goodies.
3059		3289
3060	#############################################################################	3290	#############################################################################
3061		3291
3062	package CFClient::UI::Menu;	3292	package CFPlus::UI::Menu;
3063		3293
3064	our @ISA = CFClient::UI::FancyFrame::;	3294	our @ISA = CFPlus::UI::Toplevel::;
3065		3295
3066	use CFClient::OpenGL;	3296	use CFPlus::OpenGL;
3067		3297
3068	sub new {	3298	sub new {
3069	my $class = shift;	3299	my $class = shift;
3070		3300
3071	my $self = $class->SUPER::new (	3301	my $self = $class->SUPER::new (
3072	items => [],	3302	items => [],
3073	z => 100,	3303	z => 100,
3074	@_,	3304	@_,
3075	);	3305	);
3076		3306
3077	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3307	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3078		3308
3079	for my $item (@{ $self->{items} }) {	3309	for my $item (@{ $self->{items} }) {
3080	my ($widget, $cb, $tooltip) = @$item;	3310	my ($widget, $cb, $tooltip) = @$item;
3081		3311
3082	# handle various types of items, only text for now	3312	# handle various types of items, only text for now
3083	if (!ref $widget) {	3313	if (!ref $widget) {
		3314	if ($widget =~ /\t/) {
		3315	my ($left, $right) = split /\t/, $widget, 2;
		3316
3084	$widget = new CFClient::UI::Label	3317	$widget = new CFPlus::UI::HBox
3085	can_hover => 1,	3318	can_hover => 1,
3086	can_events => 1,	3319	can_events => 1,
		3320	tooltip => $tooltip,
		3321	children => [
		3322	(new CFPlus::UI::Label markup => $left, expand => 1),
		3323	(new CFPlus::UI::Label markup => $right, align => +1),
		3324	],
		3325	;
		3326
		3327	} else {
		3328	$widget = new CFPlus::UI::Label
		3329	can_hover => 1,
		3330	can_events => 1,
3087	markup => $widget,	3331	markup => $widget,
3088	tooltip => $tooltip	3332	tooltip => $tooltip;
		3333	}
3089	}	3334	}
3090		3335
3091	$self->{item}{$widget} = $item;	3336	$self->{item}{$widget} = $item;
3092		3337
3093	$self->{vbox}->add ($widget);	3338	$self->{vbox}->add ($widget);
…		…
3136	1	3381	1
3137	}	3382	}
3138		3383
3139	#############################################################################	3384	#############################################################################
3140		3385
3141	package CFClient::UI::Multiplexer;	3386	package CFPlus::UI::Multiplexer;
3142		3387
3143	our @ISA = CFClient::UI::Container::;	3388	our @ISA = CFPlus::UI::Container::;
3144		3389
3145	sub new {	3390	sub new {
3146	my $class = shift;	3391	my $class = shift;
3147		3392
3148	my $self = $class->SUPER::new (	3393	my $self = $class->SUPER::new (
…		…
3162		3407
3163	$self->{current} = $self->{children}[0]	3408	$self->{current} = $self->{children}[0]
3164	if @{ $self->{children} };	3409	if @{ $self->{children} };
3165	}	3410	}
3166		3411
		3412	sub get_current_page {
		3413	my ($self) = @_;
		3414
		3415	$self->{current}
		3416	}
		3417
3167	sub set_current_page {	3418	sub set_current_page {
3168	my ($self, $page_or_widget) = @_;	3419	my ($self, $page_or_widget) = @_;
3169		3420
3170	my $widget = ref $page_or_widget	3421	my $widget = ref $page_or_widget
3171	? $page_or_widget	3422	? $page_or_widget
…		…
3203	$self->{current}->draw;	3454	$self->{current}->draw;
3204	}	3455	}
3205		3456
3206	#############################################################################	3457	#############################################################################
3207		3458
3208	package CFClient::UI::Notebook;	3459	package CFPlus::UI::Notebook;
3209		3460
3210	our @ISA = CFClient::UI::VBox::;	3461	our @ISA = CFPlus::UI::VBox::;
3211		3462
3212	sub new {	3463	sub new {
3213	my $class = shift;	3464	my $class = shift;
3214		3465
3215	my $self = $class->SUPER::new (	3466	my $self = $class->SUPER::new (
3216	buttonbar => (new CFClient::UI::Buttonbar),	3467	buttonbar => (new CFPlus::UI::Buttonbar),
3217	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3468	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3218	# filter => # will be put between multiplexer and $self	3469	# filter => # will be put between multiplexer and $self
3219	@_,	3470	@_,
3220	);	3471	);
3221		3472
3222	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3473	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3228	sub add {	3479	sub add {
3229	my ($self, $title, $widget, $tooltip) = @_;	3480	my ($self, $title, $widget, $tooltip) = @_;
3230		3481
3231	Scalar::Util::weaken $self;	3482	Scalar::Util::weaken $self;
3232		3483
3233	$self->{buttonbar}->add (new CFClient::UI::Button	3484	$self->{buttonbar}->add (new CFPlus::UI::Button
3234	markup => $title,	3485	markup => $title,
3235	tooltip => $tooltip,	3486	tooltip => $tooltip,
3236	on_activate => sub { $self->set_current_page ($widget) },	3487	on_activate => sub { $self->set_current_page ($widget) },
3237	);	3488	);
3238		3489
3239	$self->{multiplexer}->add ($widget);	3490	$self->{multiplexer}->add ($widget);
3240	}	3491	}
3241		3492
		3493	sub get_current_page {
		3494	my ($self) = @_;
		3495
		3496	$self->{multiplexer}->get_current_page
		3497	}
		3498
3242	sub set_current_page {	3499	sub set_current_page {
3243	my ($self, $page) = @_;	3500	my ($self, $page) = @_;
3244		3501
3245	$self->{multiplexer}->set_current_page ($page);	3502	$self->{multiplexer}->set_current_page ($page);
3246	$self->emit (page_changed => $self->{multiplexer}{current});	3503	$self->emit (page_changed => $self->{multiplexer}{current});
3247	}	3504	}
3248		3505
3249	#############################################################################	3506	#############################################################################
3250		3507
3251	package CFClient::UI::Combobox;	3508	package CFPlus::UI::Selector;
3252		3509
3253	use utf8;	3510	use utf8;
3254		3511
3255	our @ISA = CFClient::UI::Button::;	3512	our @ISA = CFPlus::UI::Button::;
3256		3513
3257	sub new {	3514	sub new {
3258	my $class = shift;	3515	my $class = shift;
3259		3516
3260	my $self = $class->SUPER::new (	3517	my $self = $class->SUPER::new (
…		…
3277	my ($value, $title, $tooltip) = @$_;	3534	my ($value, $title, $tooltip) = @$_;
3278		3535
3279	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3536	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3280	}	3537	}
3281		3538
3282	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3539	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3283	}	3540	}
3284		3541
3285	sub _set_value {	3542	sub _set_value {
3286	my ($self, $value) = @_;	3543	my ($self, $value) = @_;
3287		3544
…		…
3302	$self->emit (changed => $value);	3559	$self->emit (changed => $value);
3303	}	3560	}
3304		3561
3305	#############################################################################	3562	#############################################################################
3306		3563
3307	package CFClient::UI::Statusbox;	3564	package CFPlus::UI::Statusbox;
3308		3565
3309	our @ISA = CFClient::UI::VBox::;	3566	our @ISA = CFPlus::UI::VBox::;
3310		3567
3311	sub new {	3568	sub new {
3312	my $class = shift;	3569	my $class = shift;
3313		3570
3314	my $self = $class->SUPER::new (	3571	my $self = $class->SUPER::new (
…		…
3326	sub reorder {	3583	sub reorder {
3327	my ($self) = @_;	3584	my ($self) = @_;
3328	my $NOW = Time::HiRes::time;	3585	my $NOW = Time::HiRes::time;
3329		3586
3330	# freeze display when hovering over any label	3587	# freeze display when hovering over any label
3331	return if $CFClient::UI::TOOLTIP->{owner}	3588	return if $CFPlus::UI::TOOLTIP->{owner}
3332	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3589	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3333	values %{ $self->{item} };	3590	values %{ $self->{item} };
3334		3591
3335	while (my ($k, $v) = each %{ $self->{item} }) {	3592	while (my ($k, $v) = each %{ $self->{item} }) {
3336	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3593	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3337	}	3594	}
…		…
3358	for ($short) {	3615	for ($short) {
3359	s/^\s+//;	3616	s/^\s+//;
3360	s/\s+/ /g;	3617	s/\s+/ /g;
3361	}	3618	}
3362		3619
3363	new CFClient::UI::Label	3620	new CFPlus::UI::Label
3364	markup => $short,	3621	markup => $short,
3365	tooltip => $item->{tooltip},	3622	tooltip => $item->{tooltip},
3366	tooltip_font => $::FONT_PROP,	3623	tooltip_font => $::FONT_PROP,
3367	tooltip_width => 0.67,	3624	tooltip_width => 0.67,
3368	fontsize => $item->{fontsize} || $self->{fontsize},	3625	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3447	$self->SUPER::destroy;	3704	$self->SUPER::destroy;
3448	}	3705	}
3449		3706
3450	#############################################################################	3707	#############################################################################
3451		3708
3452	package CFClient::UI::Inventory;	3709	package CFPlus::UI::Inventory;
3453		3710
3454	our @ISA = CFClient::UI::ScrolledWindow::;	3711	our @ISA = CFPlus::UI::Table::;
3455		3712
3456	sub new {	3713	sub new {
3457	my $class = shift;	3714	my $class = shift;
3458		3715
3459	my $self = $class->SUPER::new (	3716	my $self = $class->SUPER::new (
3460	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3717	col_expand => [0, 1, 0],
		3718	items => [],
3461	@_,	3719	@_,
3462	);	3720	);
3463		3721
		3722	$self->set_sort_order (undef);
		3723
3464	$self	3724	$self
		3725	}
		3726
		3727	sub update_items {
		3728	my ($self) = @_;
		3729
		3730	$self->clear;
		3731
		3732	my @item = $self->{sort}->(@{ $self->{items} });
		3733
		3734	my @adds;
		3735	my $row = 0;
		3736	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3737	CFPlus::Item::update_widgets $item;
		3738
		3739	push @adds, 0, $row, $item->{face_widget};
		3740	push @adds, 1, $row, $item->{desc_widget};
		3741	push @adds, 2, $row, $item->{weight_widget};
		3742
		3743	$row++;
		3744	}
		3745
		3746	$self->add (@adds);
		3747	}
		3748
		3749	sub set_sort_order {
		3750	my ($self, $order) = @_;
		3751
		3752	$self->{sort} = $order ||= sub {
		3753	sort {
		3754	$a->{type} <=> $b->{type}
		3755	or $a->{name} cmp $b->{name}
		3756	} @_
		3757	};
		3758
		3759	$self->update_items;
3465	}	3760	}
3466		3761
3467	sub set_items {	3762	sub set_items {
3468	my ($self, $items) = @_;	3763	my ($self, $items) = @_;
3469		3764
3470	$self->{child}->clear;	3765	$self->{items} = [$items ? values %$items : ()];
3471	return unless $items;	3766	$self->update_items;
3472
3473	my @items = sort {
3474	($a->{type} <=> $b->{type})
3475	or ($a->{name} cmp $b->{name})
3476	} values %$items;
3477
3478	$self->{real_items} = \@items;
3479
3480	my $row = 0;
3481	for my $item (@items) {
3482	CFClient::Item::update_widgets $item;
3483
3484	$self->{child}->add (0, $row, $item->{face_widget});
3485	$self->{child}->add (1, $row, $item->{desc_widget});
3486	$self->{child}->add (2, $row, $item->{weight_widget});
3487
3488	$row++;
3489	}
3490	}	3767	}
3491		3768
3492	#############################################################################	3769	#############################################################################
3493		3770
3494	package CFClient::UI::SpellList;	3771	package CFPlus::UI::SpellList;
3495		3772
3496	our @ISA = CFClient::UI::Table::;	3773	our @ISA = CFPlus::UI::Table::;
3497		3774
3498	sub new {	3775	sub new {
3499	my $class = shift;	3776	my $class = shift;
3500		3777
3501	my $self = $class->SUPER::new (	3778	my $self = $class->SUPER::new (
…		…
3519	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3796	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3520		3797
3521	sub rebuild_spell_list {	3798	sub rebuild_spell_list {
3522	my ($self) = @_;	3799	my ($self) = @_;
3523		3800
3524	$CFClient::UI::ROOT->on_refresh ($self => sub {	3801	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3525	$self->clear;	3802	$self->clear;
3526		3803
3527	return unless $::CONN;	3804	return unless $::CONN;
3528		3805
3529	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3806	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3530	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3807	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3531	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3808	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3532	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3809	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3533	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3810	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3534		3811
3535	my $row = 0;	3812	my $row = 0;
3536		3813
3537	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3814	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3538	my $spell = $self->{spell}{$_};	3815	my $spell = $self->{spell}{$_};
…		…
3545	if ($ev->{button} == 1) {	3822	if ($ev->{button} == 1) {
3546	$::CONN->user_send ("cast $spell->{name}");	3823	$::CONN->user_send ("cast $spell->{name}");
3547	} elsif ($ev->{button} == 2) {	3824	} elsif ($ev->{button} == 2) {
3548	$::CONN->user_send ("invoke $spell->{name}");	3825	$::CONN->user_send ("invoke $spell->{name}");
3549	} elsif ($ev->{button} == 3) {	3826	} elsif ($ev->{button} == 3) {
3550	(new CFClient::UI::Menu	3827	(new CFPlus::UI::Menu
3551	items => [	3828	items => [
3552	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3829	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3553	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3830	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3554	],	3831	],
3555	)->popup ($ev);	3832	)->popup ($ev);
…		…
3561	};	3838	};
3562		3839
3563	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3840	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3564		3841
3565	#TODO: add path info to tooltip	3842	#TODO: add path info to tooltip
3566	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3843	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3567		3844
3568	$self->add (0, $row, new CFClient::UI::Face	3845	$self->add (0, $row, new CFPlus::UI::Face
3569	face => $spell->{face},	3846	face => $spell->{face},
3570	can_hover => 1,	3847	can_hover => 1,
3571	can_events => 1,	3848	can_events => 1,
3572	tooltip => $tooltip,	3849	tooltip => $tooltip,
3573	on_button_down => $spell_cb,	3850	on_button_down => $spell_cb,
3574	);	3851	);
3575		3852
3576	$self->add (1, $row, new CFClient::UI::Label	3853	$self->add (1, $row, new CFPlus::UI::Label
3577	expand => 1,	3854	expand => 1,
3578	text => $spell->{name},	3855	text => $spell->{name},
3579	can_hover => 1,	3856	can_hover => 1,
3580	can_events => 1,	3857	can_events => 1,
3581	tooltip => $tooltip,	3858	tooltip => $tooltip,
3582	on_button_down => $spell_cb,	3859	on_button_down => $spell_cb,
3583	);	3860	);
3584		3861
3585	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3862	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3586	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3863	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3587	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3864	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3588	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3865	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3589	}	3866	}
3590	});	3867	});
3591	}	3868	}
3592		3869
3593	sub add_spell {	3870	sub add_spell {
…		…
3611	$self->rebuild_spell_list;	3888	$self->rebuild_spell_list;
3612	}	3889	}
3613		3890
3614	#############################################################################	3891	#############################################################################
3615		3892
3616	package CFClient::UI::Root;	3893	package CFPlus::UI::Root;
3617		3894
3618	our @ISA = CFClient::UI::Container::;	3895	our @ISA = CFPlus::UI::Container::;
3619		3896
3620	use List::Util qw(min max);	3897	use List::Util qw(min max);
3621		3898
3622	use CFClient::OpenGL;	3899	use CFPlus::OpenGL;
3623		3900
3624	sub new {	3901	sub new {
3625	my $class = shift;	3902	my $class = shift;
3626		3903
3627	my $self = $class->SUPER::new (	3904	my $self = $class->SUPER::new (
…		…
3803	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4080	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3804		4081
3805	$w = 0 if $w < 0;	4082	$w = 0 if $w < 0;
3806	$h = 0 if $h < 0;	4083	$h = 0 if $h < 0;
3807		4084
		4085	$w = max $widget->{min_w}, $w;
		4086	$h = max $widget->{min_h}, $h;
		4087
		4088	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4089	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4090
		4091	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4092	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4093
3808	$w = int $w + 0.5;	4094	$w = int $w + 0.5;
3809	$h = int $h + 0.5;	4095	$h = int $h + 0.5;
3810		4096
3811	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4097	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3812	$widget->{old_w} = $widget->{w};	4098	$widget->{old_w} = $widget->{w};
…		…
3835	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4121	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3836	glMatrixMode GL_MODELVIEW;	4122	glMatrixMode GL_MODELVIEW;
3837	glLoadIdentity;	4123	glLoadIdentity;
3838		4124
3839	{	4125	{
3840	package CFClient::UI::Base;	4126	package CFPlus::UI::Base;
3841		4127
3842	($draw_x, $draw_y, $draw_w, $draw_h) =	4128	($draw_x, $draw_y, $draw_w, $draw_h) =
3843	(0, 0, $self->{w}, $self->{h});	4129	(0, 0, $self->{w}, $self->{h});
3844	}	4130	}
3845		4131
3846	$self->_draw;	4132	$self->_draw;
3847	}	4133	}
3848		4134
3849	#############################################################################	4135	#############################################################################
3850		4136
3851	package CFClient::UI;	4137	package CFPlus::UI;
3852		4138
3853	$ROOT = new CFClient::UI::Root;	4139	$ROOT = new CFPlus::UI::Root;
3854	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4140	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3855		4141
3856	1	4142	1
3857		4143

Diff Legend

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