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.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.345 by root, Sun Aug 13 21:46:10 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	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;
1068		1136
1069	my $bg =	1137	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1138	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1139	mipmap => 1, wrap => 1;
1072		1140
1073	my @border =	1141	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1142	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);	1143	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1144
1077	sub new {	1145	sub new {
1078	my ($class, %arg) = @_;	1146	my ($class, %arg) = @_;
1079		1147
1080	my $self = $class->SUPER::new (	1148	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1149	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1150	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1151	border => 0.6,
1084	can_events => 1,	1152	can_events => 1,
1085	min_w => 16,	1153	min_w => 64,
1086	min_h => 16,	1154	min_h => 32,
1087	%arg,	1155	%arg,
1088	);	1156	);
1089		1157
1090	$self->{title_widget} = new CFClient::UI::Label	1158	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1159	align => 0,
1092	valign => 1,	1160	valign => 1,
1093	text => $self->{title},	1161	text => $self->{title},
1094	fontsize => $self->{border},	1162	fontsize => $self->{border},
1095	if exists $self->{title};	1163	if exists $self->{title};
1096		1164
1097	if ($self->{has_close_button}) {	1165	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1166	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1167	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1168	path => 'x1_close.png',
1101	on_activate => sub { $self->emit ("delete") };	1169	on_activate => sub { $self->emit ("delete") };
1102		1170
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1171	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1172	}
1105		1173
1106	$self	1174	$self
1107	}	1175	}
1108		1176
1109	sub add {	1177	sub add {
1110	my ($self, @widgets) = @_;	1178	my ($self, @widgets) = @_;
1111		1179
1112	$self->SUPER::add (@widgets);	1180	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1181	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1182	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1183	}
1116		1184
1117	sub border {	1185	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1186	int $_[0]{border} * $::FONTSIZE
1119	}	1187	}
…		…
1227	$self->{motion}->($ev, $x, $y) if $self->{motion};	1295	$self->{motion}->($ev, $x, $y) if $self->{motion};
1228		1296
1229	! ! $self->{motion}	1297	! ! $self->{motion}
1230	}	1298	}
1231		1299
		1300	sub invoke_visibility_change {
		1301	my ($self, $visible) = @_;
		1302
		1303	delete $self->{motion} unless $visible;
		1304
		1305	0
		1306	}
		1307
1232	sub _draw {	1308	sub _draw {
1233	my ($self) = @_;	1309	my ($self) = @_;
1234		1310
1235	my $child = $self->{children}[0];	1311	my $child = $self->{children}[0];
1236		1312
…		…
1273	if $self->{close_button};	1349	if $self->{close_button};
1274	}	1350	}
1275		1351
1276	#############################################################################	1352	#############################################################################
1277		1353
1278	package CFClient::UI::Table;	1354	package CFPlus::UI::Table;
1279		1355
1280	our @ISA = CFClient::UI::Base::;	1356	our @ISA = CFPlus::UI::Base::;
1281		1357
1282	use List::Util qw(max sum);	1358	use List::Util qw(max sum);
1283		1359
1284	use CFClient::OpenGL;	1360	use CFPlus::OpenGL;
1285		1361
1286	sub new {	1362	sub new {
1287	my $class = shift;	1363	my $class = shift;
1288		1364
1289	$class->SUPER::new (	1365	$class->SUPER::new (
…		…
1295	sub children {	1371	sub children {
1296	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1372	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297	}	1373	}
1298		1374
1299	sub add {	1375	sub add {
1300	my ($self, $x, $y, $child) = @_;	1376	my ($self) = shift;
1301		1377
		1378	while (@_) {
		1379	my ($x, $y, $child) = splice @_, 0, 3, ();
1302	$child->set_parent ($self);	1380	$child->set_parent ($self);
1303	$self->{children}[$y][$x] = $child;	1381	$self->{children}[$y][$x] = $child;
		1382	}
1304		1383
		1384	$self->{force_realloc} = 1;
		1385	$self->{force_size_alloc} = 1;
1305	$self->realloc;	1386	$self->realloc;
1306	}	1387	}
1307		1388
1308	sub remove {	1389	sub remove {
1309	my ($self, $child) = @_;	1390	my ($self, $child) = @_;
…		…
1374		1455
1375	# linearly scale sizes	1456	# linearly scale sizes
1376	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1457	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1458	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378		1459
1379	CFClient::UI::harmonize $ws;	1460	CFPlus::UI::harmonize $ws;
1380	CFClient::UI::harmonize $hs;	1461	CFPlus::UI::harmonize $hs;
1381		1462
1382	my $y;	1463	my $y;
1383		1464
1384	for my $r (0 .. $#{$self->{children}}) {	1465	for my $r (0 .. $#{$self->{children}}) {
1385	my $row = $self->{children}[$r]	1466	my $row = $self->{children}[$r]
…		…
1428	}	1509	}
1429	}	1510	}
1430		1511
1431	#############################################################################	1512	#############################################################################
1432		1513
1433	package CFClient::UI::Box;	1514	package CFPlus::UI::Box;
1434		1515
1435	our @ISA = CFClient::UI::Container::;	1516	our @ISA = CFPlus::UI::Container::;
1436		1517
1437	sub size_request {	1518	sub size_request {
1438	my ($self) = @_;	1519	my ($self) = @_;
1439		1520
1440	$self->{vertical}	1521	$self->{vertical}
…		…
1473	$req[$_] += $space * $children[$_]{expand}	1554	$req[$_] += $space * $children[$_]{expand}
1474	for 0 .. $#children;	1555	for 0 .. $#children;
1475	}	1556	}
1476	}	1557	}
1477		1558
1478	CFClient::UI::harmonize \@req;	1559	CFPlus::UI::harmonize \@req;
1479		1560
1480	my $pos = 0;	1561	my $pos = 0;
1481	for (0 .. $#children) {	1562	for (0 .. $#children) {
1482	my $alloc = $req[$_];	1563	my $alloc = $req[$_];
1483	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1564	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1488	1	1569	1
1489	}	1570	}
1490		1571
1491	#############################################################################	1572	#############################################################################
1492		1573
1493	package CFClient::UI::HBox;	1574	package CFPlus::UI::HBox;
1494		1575
1495	our @ISA = CFClient::UI::Box::;	1576	our @ISA = CFPlus::UI::Box::;
1496		1577
1497	sub new {	1578	sub new {
1498	my $class = shift;	1579	my $class = shift;
1499		1580
1500	$class->SUPER::new (	1581	$class->SUPER::new (
…		…
1503	)	1584	)
1504	}	1585	}
1505		1586
1506	#############################################################################	1587	#############################################################################
1507		1588
1508	package CFClient::UI::VBox;	1589	package CFPlus::UI::VBox;
1509		1590
1510	our @ISA = CFClient::UI::Box::;	1591	our @ISA = CFPlus::UI::Box::;
1511		1592
1512	sub new {	1593	sub new {
1513	my $class = shift;	1594	my $class = shift;
1514		1595
1515	$class->SUPER::new (	1596	$class->SUPER::new (
…		…
1518	)	1599	)
1519	}	1600	}
1520		1601
1521	#############################################################################	1602	#############################################################################
1522		1603
1523	package CFClient::UI::Label;	1604	package CFPlus::UI::Label;
1524		1605
1525	our @ISA = CFClient::UI::DrawBG::;	1606	our @ISA = CFPlus::UI::DrawBG::;
1526		1607
1527	use CFClient::OpenGL;	1608	use CFPlus::OpenGL;
1528		1609
1529	sub new {	1610	sub new {
1530	my ($class, %arg) = @_;	1611	my ($class, %arg) = @_;
1531		1612
1532	my $self = $class->SUPER::new (	1613	my $self = $class->SUPER::new (
…		…
1535	#active_bg => none	1616	#active_bg => none
1536	#font => default_font	1617	#font => default_font
1537	#text => initial text	1618	#text => initial text
1538	#markup => initial narkup	1619	#markup => initial narkup
1539	#max_w => maximum pixel width	1620	#max_w => maximum pixel width
		1621	#style => 0, # render flags
1540	ellipsise => 3, # end	1622	ellipsise => 3, # end
1541	layout => (new CFClient::Layout),	1623	layout => (new CFPlus::Layout),
1542	fontsize => 1,	1624	fontsize => 1,
1543	align => -1,	1625	align => -1,
1544	valign => -1,	1626	valign => -1,
1545	padding_x => 2,	1627	padding_x => 2,
1546	padding_y => 2,	1628	padding_y => 2,
1547	can_events => 0,	1629	can_events => 0,
1548	%arg	1630	%arg
1549	);	1631	);
1550		1632
1551	if (exists $self->{template}) {	1633	if (exists $self->{template}) {
1552	my $layout = new CFClient::Layout;	1634	my $layout = new CFPlus::Layout;
1553	$layout->set_text (delete $self->{template});	1635	$layout->set_text (delete $self->{template});
1554	$self->{template} = $layout;	1636	$self->{template} = $layout;
1555	}	1637	}
1556		1638
1557	if (exists $self->{markup}) {	1639	if (exists $self->{markup}) {
…		…
1561	}	1643	}
1562		1644
1563	$self	1645	$self
1564	}	1646	}
1565		1647
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 {	1648	sub update {
1577	my ($self) = @_;	1649	my ($self) = @_;
1578		1650
1579	delete $self->{texture};	1651	delete $self->{texture};
1580	$self->SUPER::update;	1652	$self->SUPER::update;
…		…
1591	my ($self, $text) = @_;	1663	my ($self, $text) = @_;
1592		1664
1593	return if $self->{text} eq "T$text";	1665	return if $self->{text} eq "T$text";
1594	$self->{text} = "T$text";	1666	$self->{text} = "T$text";
1595		1667
1596	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597	$self->{layout}->set_text ($text);	1668	$self->{layout}->set_text ($text);
1598		1669
1599	delete $self->{size_req};	1670	delete $self->{size_req};
1600	$self->realloc;	1671	$self->realloc;
1601	$self->update;	1672	$self->update;
…		…
1607	return if $self->{text} eq "M$markup";	1678	return if $self->{text} eq "M$markup";
1608	$self->{text} = "M$markup";	1679	$self->{text} = "M$markup";
1609		1680
1610	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1681	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611		1682
1612	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613	$self->{layout}->set_markup ($markup);	1683	$self->{layout}->set_markup ($markup);
1614		1684
1615	delete $self->{size_req};	1685	delete $self->{size_req};
1616	$self->realloc;	1686	$self->realloc;
1617	$self->update;	1687	$self->update;
…		…
1629		1699
1630	my ($w, $h) = $self->{layout}->size;	1700	my ($w, $h) = $self->{layout}->size;
1631		1701
1632	if (exists $self->{template}) {	1702	if (exists $self->{template}) {
1633	$self->{template}->set_font ($self->{font}) if $self->{font};	1703	$self->{template}->set_font ($self->{font}) if $self->{font};
		1704	$self->{template}->set_width ($self->{max_w} || -1);
1634	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1705	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635		1706
1636	my ($w2, $h2) = $self->{template}->size;	1707	my ($w2, $h2) = $self->{template}->size;
1637		1708
1638	$w = List::Util::max $w, $w2;	1709	$w = List::Util::max $w, $w2;
…		…
1672		1743
1673	sub reconfigure {	1744	sub reconfigure {
1674	my ($self) = @_;	1745	my ($self) = @_;
1675		1746
1676	delete $self->{size_req};	1747	delete $self->{size_req};
		1748	delete $self->{texture};
1677		1749
1678	$self->SUPER::reconfigure;	1750	$self->SUPER::reconfigure;
1679	}	1751	}
1680		1752
1681	sub _draw {	1753	sub _draw {
1682	my ($self) = @_;	1754	my ($self) = @_;
1683		1755
1684	$self->SUPER::_draw; # draw background, if applicable	1756	$self->SUPER::_draw; # draw background, if applicable
1685		1757
1686	my $tex = $self->{texture} ||= do {	1758	my $size = $self->{texture} ||= do {
1687	$self->{layout}->set_foreground (@{$self->{fg}});	1759	$self->{layout}->set_foreground (@{$self->{fg}});
1688	$self->{layout}->set_font ($self->{font}) if $self->{font};	1760	$self->{layout}->set_font ($self->{font}) if $self->{font};
1689	$self->{layout}->set_width ($self->{w});	1761	$self->{layout}->set_width ($self->{w});
1690	$self->{layout}->set_ellipsise ($self->{ellipsise});	1762	$self->{layout}->set_ellipsise ($self->{ellipsise});
1691	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1763	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1764	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693		1765
1694	new_from_layout CFClient::Texture $self->{layout}	1766	[$self->{layout}->size]
1695	};	1767	};
1696		1768
1697	unless (exists $self->{ox}) {	1769	unless (exists $self->{ox}) {
1698	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1770	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1771	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700	: ($self->{w} - $tex->{w}) * 0.5);	1772	: ($self->{w} - $size->[0]) * 0.5);
1701		1773
1702	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1774	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1775	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704	: ($self->{h} - $tex->{h}) * 0.5);	1776	: ($self->{h} - $size->[1]) * 0.5);
1705	};	1777	};
1706		1778
1707	glEnable GL_TEXTURE_2D;
1708
1709	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1779	my $w = List::Util::min $self->{w} + 4, $size->[0];
1710	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1780	my $h = List::Util::min $self->{h} + 2, $size->[1];
1711		1781
1712	if ($tex->{format} == GL_ALPHA) {	1782	$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	}	1783	}
1723		1784
1724	#############################################################################	1785	#############################################################################
1725		1786
1726	package CFClient::UI::EntryBase;	1787	package CFPlus::UI::EntryBase;
1727		1788
1728	our @ISA = CFClient::UI::Label::;	1789	our @ISA = CFPlus::UI::Label::;
1729		1790
1730	use CFClient::OpenGL;	1791	use CFPlus::OpenGL;
1731		1792
1732	sub new {	1793	sub new {
1733	my $class = shift;	1794	my $class = shift;
1734		1795
1735	$class->SUPER::new (	1796	$class->SUPER::new (
…		…
1797		1858
1798	if ($uni == 8) {	1859	if ($uni == 8) {
1799	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1800	} elsif ($uni == 127) {	1861	} elsif ($uni == 127) {
1801	substr $text, $self->{cursor}, 1, "";	1862	substr $text, $self->{cursor}, 1, "";
1802	} elsif ($sym == CFClient::SDLK_LEFT) {	1863	} elsif ($sym == CFPlus::SDLK_LEFT) {
1803	--$self->{cursor} if $self->{cursor};	1864	--$self->{cursor} if $self->{cursor};
1804	} elsif ($sym == CFClient::SDLK_RIGHT) {	1865	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1805	++$self->{cursor} if $self->{cursor} < length $self->{text};	1866	++$self->{cursor} if $self->{cursor} < length $self->{text};
1806	} elsif ($sym == CFClient::SDLK_HOME) {	1867	} elsif ($sym == CFPlus::SDLK_HOME) {
1807	$self->{cursor} = 0;	1868	$self->{cursor} = 0;
1808	} elsif ($sym == CFClient::SDLK_END) {	1869	} elsif ($sym == CFPlus::SDLK_END) {
1809	$self->{cursor} = length $text;	1870	$self->{cursor} = length $text;
1810	} elsif ($uni == 27) {	1871	} elsif ($uni == 27) {
1811	$self->emit ('escape');	1872	$self->emit ('escape');
1812	} elsif ($uni) {	1873	} elsif ($uni) {
1813	substr $text, $self->{cursor}++, 0, chr $uni;	1874	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1837		1898
1838	my $idx = $self->{layout}->xy_to_index ($x, $y);	1899	my $idx = $self->{layout}->xy_to_index ($x, $y);
1839		1900
1840	# byte-index to char-index	1901	# byte-index to char-index
1841	my $text = $self->{text};	1902	my $text = $self->{text};
1842	utf8::encode $text;	1903	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843	$self->{cursor} = length substr $text, 0, $idx;	1904	$self->{cursor} = length $text;
1844		1905
1845	$self->_set_text ($self->{text});	1906	$self->_set_text ($self->{text});
1846	$self->update;	1907	$self->update;
1847		1908
1848	1	1909	1
…		…
1887	utf8::encode $text;	1948	utf8::encode $text;
1888		1949
1889	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1890	}	1951	}
1891		1952
1892	glColor @{$self->{fg}};
1893	glBegin GL_LINES;	1953	glBegin GL_LINES;
1894	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	1954	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	1955	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1896	glEnd;	1956	glEnd;
1897	}	1957	}
1898	}	1958	}
1899		1959
1900	package CFClient::UI::Entry;	1960	package CFPlus::UI::Entry;
1901		1961
1902	our @ISA = CFClient::UI::EntryBase::;	1962	our @ISA = CFPlus::UI::EntryBase::;
1903		1963
1904	use CFClient::OpenGL;	1964	use CFPlus::OpenGL;
1905		1965
1906	sub invoke_key_down {	1966	sub invoke_key_down {
1907	my ($self, $ev) = @_;	1967	my ($self, $ev) = @_;
1908		1968
1909	my $sym = $ev->{sym};	1969	my $sym = $ev->{sym};
…		…
1915	$self->{history_pointer} = -1;	1975	$self->{history_pointer} = -1;
1916	$self->{history_saveback} = '';	1976	$self->{history_saveback} = '';
1917	$self->emit (activate => $txt);	1977	$self->emit (activate => $txt);
1918	$self->update;	1978	$self->update;
1919		1979
1920	} elsif ($sym == CFClient::SDLK_UP) {	1980	} elsif ($sym == CFPlus::SDLK_UP) {
1921	if ($self->{history_pointer} < 0) {	1981	if ($self->{history_pointer} < 0) {
1922	$self->{history_saveback} = $self->get_text;	1982	$self->{history_saveback} = $self->get_text;
1923	}	1983	}
1924	if (@{$self->{history} || []} > 0) {	1984	if (@{$self->{history} || []} > 0) {
1925	$self->{history_pointer}++;	1985	$self->{history_pointer}++;
…		…
1927	$self->{history_pointer} = @{$self->{history} || []} - 1;	1987	$self->{history_pointer} = @{$self->{history} || []} - 1;
1928	}	1988	}
1929	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1989	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1930	}	1990	}
1931		1991
1932	} elsif ($sym == CFClient::SDLK_DOWN) {	1992	} elsif ($sym == CFPlus::SDLK_DOWN) {
1933	$self->{history_pointer}--;	1993	$self->{history_pointer}--;
1934	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1994	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1935		1995
1936	if ($self->{history_pointer} >= 0) {	1996	if ($self->{history_pointer} >= 0) {
1937	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1997	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1946	1	2006	1
1947	}	2007	}
1948		2008
1949	#############################################################################	2009	#############################################################################
1950		2010
1951	package CFClient::UI::Button;	2011	package CFPlus::UI::Button;
1952		2012
1953	our @ISA = CFClient::UI::Label::;	2013	our @ISA = CFPlus::UI::Label::;
1954		2014
1955	use CFClient::OpenGL;	2015	use CFPlus::OpenGL;
1956		2016
1957	my @tex =	2017	my @tex =
1958	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2018	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1959	qw(b1_button_active.png);	2019	qw(b1_button_active.png);
1960		2020
1961	sub new {	2021	sub new {
1962	my $class = shift;	2022	my $class = shift;
1963		2023
…		…
2000	$self->SUPER::_draw;	2060	$self->SUPER::_draw;
2001	}	2061	}
2002		2062
2003	#############################################################################	2063	#############################################################################
2004		2064
		2065	package CFPlus::UI::CheckBox;
		2066
		2067	our @ISA = CFPlus::UI::DrawBG::;
		2068
		2069	my @tex =
		2070	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2071	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2072
		2073	use CFPlus::OpenGL;
		2074
		2075	sub new {
		2076	my $class = shift;
		2077
		2078	$class->SUPER::new (
		2079	padding_x => 2,
		2080	padding_y => 2,
		2081	fg => [1, 1, 1],
		2082	active_fg => [1, 1, 0],
		2083	bg => [0, 0, 0, 0.2],
		2084	active_bg => [1, 1, 1, 0.5],
		2085	state => 0,
		2086	can_hover => 1,
		2087	@_
		2088	)
		2089	}
		2090
		2091	sub size_request {
		2092	my ($self) = @_;
		2093
		2094	(6) x 2
		2095	}
		2096
		2097	sub toggle {
		2098	my ($self) = @_;
		2099
		2100	$self->{state} = !$self->{state};
		2101	$self->emit (changed => $self->{state});
		2102	$self->update;
		2103	}
		2104
		2105	sub invoke_button_down {
		2106	my ($self, $ev, $x, $y) = @_;
		2107
		2108	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2109	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2110	$self->toggle;
		2111	} else {
		2112	return 0
		2113	}
		2114
		2115	1
		2116	}
		2117
		2118	sub _draw {
		2119	my ($self) = @_;
		2120
		2121	$self->SUPER::_draw;
		2122
		2123	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2124
		2125	my ($w, $h) = @$self{qw(w h)};
		2126
		2127	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2128
		2129	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2130
		2131	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2132
		2133	glEnable GL_TEXTURE_2D;
		2134	$tex->draw_quad_alpha (0, 0, $s, $s);
		2135	glDisable GL_TEXTURE_2D;
		2136	}
		2137
		2138	#############################################################################
		2139
		2140	package CFPlus::UI::Image;
		2141
		2142	our @ISA = CFPlus::UI::Base::;
		2143
		2144	use CFPlus::OpenGL;
		2145
		2146	our %texture_cache;
		2147
		2148	sub new {
		2149	my $class = shift;
		2150
		2151	my $self = $class->SUPER::new (
		2152	can_events => 0,
		2153	@_,
		2154	);
		2155
		2156	$self->{path} || $self->{tex}
		2157	or Carp::croak "'path' or 'tex' attributes required";
		2158
		2159	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2160	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2161
		2162	Scalar::Util::weaken $texture_cache{$self->{path}};
		2163
		2164	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2165
		2166	$self
		2167	}
		2168
		2169	sub STORABLE_freeze {
		2170	my ($self, $cloning) = @_;
		2171
		2172	$self->{path}
		2173	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2174
		2175	$self->{path}
		2176	}
		2177
		2178	sub STORABLE_attach {
		2179	my ($self, $cloning, $path) = @_;
		2180
		2181	$self->new (path => $path)
		2182	}
		2183
		2184	sub size_request {
		2185	my ($self) = @_;
		2186
		2187	($self->{tex}{w}, $self->{tex}{h})
		2188	}
		2189
		2190	sub _draw {
		2191	my ($self) = @_;
		2192
		2193	my $tex = $self->{tex};
		2194
		2195	my ($w, $h) = ($self->{w}, $self->{h});
		2196
		2197	if ($self->{rot90}) {
		2198	glRotate 90, 0, 0, 1;
		2199	glTranslate 0, -$self->{w}, 0;
		2200
		2201	($w, $h) = ($h, $w);
		2202	}
		2203
		2204	glEnable GL_TEXTURE_2D;
		2205	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2206
		2207	$tex->draw_quad (0, 0, $w, $h);
		2208
		2209	glDisable GL_TEXTURE_2D;
		2210	}
		2211
		2212	#############################################################################
		2213
2005	package CFClient::UI::ImageButton;	2214	package CFPlus::UI::ImageButton;
2006		2215
2007	our @ISA = CFClient::UI::Image::;	2216	our @ISA = CFPlus::UI::Image::;
2008		2217
2009	use CFClient::OpenGL;	2218	use CFPlus::OpenGL;
2010		2219
2011	my %textures;	2220	my %textures;
2012		2221
2013	sub new {	2222	sub new {
2014	my $class = shift;	2223	my $class = shift;
…		…
2036	1	2245	1
2037	}	2246	}
2038		2247
2039	#############################################################################	2248	#############################################################################
2040		2249
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 toggle {
2074	my ($self) = @_;
2075
2076	$self->{state} = !$self->{state};
2077	$self->emit (changed => $self->{state});
2078	$self->update;
2079	}
2080
2081	sub invoke_button_down {
2082	my ($self, $ev, $x, $y) = @_;
2083
2084	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2085	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2086	$self->toggle;
2087	} else {
2088	return 0
2089	}
2090
2091	1
2092	}
2093
2094	sub _draw {
2095	my ($self) = @_;
2096
2097	$self->SUPER::_draw;
2098
2099	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2100
2101	my ($w, $h) = @$self{qw(w h)};
2102
2103	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2104
2105	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2106
2107	my $tex = $self->{state} ? $tex[1] : $tex[0];
2108
2109	glEnable GL_TEXTURE_2D;
2110	$tex->draw_quad_alpha (0, 0, $s, $s);
2111	glDisable GL_TEXTURE_2D;
2112	}
2113
2114	#############################################################################
2115
2116	package CFClient::UI::Image;	2250	package CFPlus::UI::VGauge;
2117		2251
2118	our @ISA = CFClient::UI::Base::;	2252	our @ISA = CFPlus::UI::Base::;
2119
2120	use CFClient::OpenGL;
2121
2122	our %texture_cache;
2123
2124	sub new {
2125	my $class = shift;
2126
2127	my $self = $class->SUPER::new (
2128	can_events => 0,
2129	@_,
2130	);
2131
2132	$self->{path}
2133	or Carp::croak "required attribute 'path' not set";
2134
2135	$self->{tex} = $texture_cache{$self->{path}} ||=
2136	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2137
2138	Scalar::Util::weaken $texture_cache{$self->{path}};
2139
2140	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2141
2142	$self
2143	}
2144
2145	sub size_request {
2146	my ($self) = @_;
2147
2148	($self->{tex}{w}, $self->{tex}{h})
2149	}
2150
2151	sub _draw {
2152	my ($self) = @_;
2153
2154	my $tex = $self->{tex};
2155
2156	my ($w, $h) = ($self->{w}, $self->{h});
2157
2158	if ($self->{rot90}) {
2159	glRotate 90, 0, 0, 1;
2160	glTranslate 0, -$self->{w}, 0;
2161
2162	($w, $h) = ($h, $w);
2163	}
2164
2165	glEnable GL_TEXTURE_2D;
2166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2167
2168	$tex->draw_quad_alpha (0, 0, $w, $h);
2169
2170	glDisable GL_TEXTURE_2D;
2171	}
2172
2173	#############################################################################
2174
2175	package CFClient::UI::VGauge;
2176
2177	our @ISA = CFClient::UI::Base::;
2178		2253
2179	use List::Util qw(min max);	2254	use List::Util qw(min max);
2180		2255
2181	use CFClient::OpenGL;	2256	use CFPlus::OpenGL;
2182		2257
2183	my %tex = (	2258	my %tex = (
2184	food => [	2259	food => [
2185	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2260	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2186	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2261	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2187	],	2262	],
2188	grace => [	2263	grace => [
2189	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2264	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2265	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2191	],	2266	],
2192	hp => [	2267	hp => [
2193	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2268	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2194	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2269	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2195	],	2270	],
2196	mana => [	2271	mana => [
2197	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2272	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2198	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2273	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2199	],	2274	],
2200	);	2275	);
2201		2276
2202	# eg. VGauge->new (gauge => 'food'), default gauge: food	2277	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2305	glDisable GL_TEXTURE_2D;	2380	glDisable GL_TEXTURE_2D;
2306	}	2381	}
2307		2382
2308	#############################################################################	2383	#############################################################################
2309		2384
2310	package CFClient::UI::Gauge;	2385	package CFPlus::UI::Gauge;
2311		2386
2312	our @ISA = CFClient::UI::VBox::;	2387	our @ISA = CFPlus::UI::VBox::;
2313		2388
2314	sub new {	2389	sub new {
2315	my ($class, %arg) = @_;	2390	my ($class, %arg) = @_;
2316		2391
2317	my $self = $class->SUPER::new (	2392	my $self = $class->SUPER::new (
…		…
2319	can_hover => 1,	2394	can_hover => 1,
2320	can_events => 1,	2395	can_events => 1,
2321	%arg,	2396	%arg,
2322	);	2397	);
2323		2398
2324	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2399	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2325	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2400	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2326	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2401	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2327		2402
2328	$self	2403	$self
2329	}	2404	}
2330		2405
2331	sub set_fontsize {	2406	sub set_fontsize {
…		…
2352	$self->{value}->set_text ($val);	2427	$self->{value}->set_text ($val);
2353	}	2428	}
2354		2429
2355	#############################################################################	2430	#############################################################################
2356		2431
2357	package CFClient::UI::Slider;	2432	package CFPlus::UI::Slider;
2358		2433
2359	use strict;	2434	use strict;
2360		2435
2361	use CFClient::OpenGL;	2436	use CFPlus::OpenGL;
2362		2437
2363	our @ISA = CFClient::UI::DrawBG::;	2438	our @ISA = CFPlus::UI::DrawBG::;
2364		2439
2365	my @tex =	2440	my @tex =
2366	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2367	qw(s1_slider.png s1_slider_bg.png);	2442	qw(s1_slider.png s1_slider_bg.png);
2368		2443
2369	sub new {	2444	sub new {
2370	my $class = shift;	2445	my $class = shift;
2371		2446
…		…
2460	}	2535	}
2461		2536
2462	1	2537	1
2463	}	2538	}
2464		2539
		2540	sub invoke_mouse_wheel {
		2541	my ($self, $ev) = @_;
		2542
		2543	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2544
		2545	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2546
		2547	! ! $delta
		2548	}
		2549
2465	sub update {	2550	sub update {
2466	my ($self) = @_;	2551	my ($self) = @_;
2467		2552
2468	delete $self->{knob_w};	2553	delete $self->{knob_w};
2469	$self->SUPER::update;	2554	$self->SUPER::update;
…		…
2516	glDisable GL_TEXTURE_2D;	2601	glDisable GL_TEXTURE_2D;
2517	}	2602	}
2518		2603
2519	#############################################################################	2604	#############################################################################
2520		2605
2521	package CFClient::UI::ValSlider;	2606	package CFPlus::UI::ValSlider;
2522		2607
2523	our @ISA = CFClient::UI::HBox::;	2608	our @ISA = CFPlus::UI::HBox::;
2524		2609
2525	sub new {	2610	sub new {
2526	my ($class, %arg) = @_;	2611	my ($class, %arg) = @_;
2527		2612
2528	my $range = delete $arg{range};	2613	my $range = delete $arg{range};
2529		2614
2530	my $self = $class->SUPER::new (	2615	my $self = $class->SUPER::new (
2531	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2616	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2532	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2617	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2533	to_value => sub { shift },	2618	to_value => sub { shift },
2534	from_value => sub { shift },	2619	from_value => sub { shift },
2535	%arg,	2620	%arg,
2536	);	2621	);
2537		2622
…		…
2557	sub set_range { shift->{slider}->set_range (@_) }	2642	sub set_range { shift->{slider}->set_range (@_) }
2558	sub set_value { shift->{slider}->set_value (@_) }	2643	sub set_value { shift->{slider}->set_value (@_) }
2559		2644
2560	#############################################################################	2645	#############################################################################
2561		2646
2562	package CFClient::UI::TextScroller;	2647	package CFPlus::UI::TextScroller;
2563		2648
2564	our @ISA = CFClient::UI::HBox::;	2649	our @ISA = CFPlus::UI::HBox::;
2565		2650
2566	use CFClient::OpenGL;	2651	use CFPlus::OpenGL;
2567		2652
2568	sub new {	2653	sub new {
2569	my $class = shift;	2654	my $class = shift;
2570		2655
2571	my $self = $class->SUPER::new (	2656	my $self = $class->SUPER::new (
2572	fontsize => 1,	2657	fontsize => 1,
2573	can_events => 0,	2658	can_events => 1,
2574	indent => 0,	2659	indent => 0,
2575	#font => default_font	2660	#font => default_font
2576	@_,	2661	@_,
2577		2662
2578	layout => (new CFClient::Layout 1),	2663	layout => (new CFPlus::Layout),
2579	par => [],	2664	par => [],
2580	height => 0,	2665	height => 0,
2581	children => [	2666	children => [
2582	(new CFClient::UI::Empty expand => 1),	2667	(new CFPlus::UI::Empty expand => 1),
2583	(new CFClient::UI::Slider vertical => 1),	2668	(new CFPlus::UI::Slider vertical => 1),
2584	],	2669	],
2585	);	2670	);
2586		2671
2587	$self->{children}[1]->connect (changed => sub { $self->update });	2672	$self->{children}[1]->connect (changed => sub { $self->update });
2588		2673
…		…
2618		2703
2619	$self->reflow;	2704	$self->reflow;
2620		2705
2621	local $self->{children} = [$empty, $slider];	2706	local $self->{children} = [$empty, $slider];
2622	$self->SUPER::invoke_size_allocate ($w, $h)	2707	$self->SUPER::invoke_size_allocate ($w, $h)
		2708	}
		2709
		2710	sub invoke_mouse_wheel {
		2711	my ($self, $ev) = @_;
		2712
		2713	return 0 unless $ev->{dy}; # only vertical movements
		2714
		2715	$self->{children}[1]->emit (mouse_wheel => $ev);
		2716
		2717	1
2623	}	2718	}
2624		2719
2625	sub get_layout {	2720	sub get_layout {
2626	my ($self, $para) = @_;	2721	my ($self, $para) = @_;
2627		2722
…		…
2655		2750
2656	# todo: base offset on lines or so, not on pixels	2751	# todo: base offset on lines or so, not on pixels
2657	$self->{children}[1]->set_value ($offset);	2752	$self->{children}[1]->set_value ($offset);
2658	}	2753	}
2659		2754
		2755	sub current_paragraph {
		2756	my ($self) = @_;
		2757
		2758	$self->force_uptodate;
		2759	$self->{top_paragraph} - 1
		2760	}
		2761
		2762	sub scroll_to {
		2763	my ($self, $para) = @_;
		2764
		2765	$self->force_uptodate;
		2766
		2767	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2768
		2769	$self->{children}[1]->set_value ($self->{par}[$para]{y});
		2770	}
		2771
2660	sub clear {	2772	sub clear {
2661	my ($self) = @_;	2773	my ($self) = @_;
2662		2774
2663	my (undef, undef, @other) = @{ $self->{children} };	2775	my (undef, undef, @other) = @{ $self->{children} };
2664	$self->remove ($_) for @other;	2776	$self->remove ($_) for @other;
…		…
2667	$self->{height} = 0;	2779	$self->{height} = 0;
2668	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2780	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2669	}	2781	}
2670		2782
2671	sub add_paragraph {	2783	sub add_paragraph {
2672	my ($self, $color, $para, $indent) = @_;	2784	my $self = shift;
2673		2785
2674	my ($text, @w) = ref $para ? @$para : $para;	2786	for my $para (@_) {
2675
2676	$para = {	2787	$para = {
		2788	fg => [1, 1, 1, 1],
		2789	indent => 0,
		2790	markup => "",
		2791	widget => [],
		2792	ref $para ? %$para : (markup => $para),
2677	w => 1e10,	2793	w => 1e10,
2678	wrapped => 1,	2794	wrapped => 1,
2679	fg => $color,
2680	indent => $indent,
2681	markup => $text,
2682	widget => \@w,
2683	};	2795	};
2684		2796
2685	$self->add (@w) if @w;	2797	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2686	push @{$self->{par}}, $para;	2798	push @{$self->{par}}, $para;
		2799	}
2687		2800
2688	$self->{need_reflow}++;	2801	$self->{need_reflow}++;
2689	$self->update;	2802	$self->update;
2690	}	2803	}
2691		2804
…		…
2694		2807
2695	$self->{scroll_to_bottom} = 1;	2808	$self->{scroll_to_bottom} = 1;
2696	$self->update;	2809	$self->update;
2697	}	2810	}
2698		2811
		2812	sub force_uptodate {
		2813	my ($self) = @_;
		2814
		2815	if (delete $self->{need_reflow}) {
		2816	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2817
		2818	my $height = 0;
		2819	my $paridx;
		2820	my $top_paragraph;
		2821	my $top = int $self->{children}[1]{range}[0];
		2822
		2823	for my $para (@{$self->{par}}) {
		2824	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2825	my $layout = $self->get_layout ($para);
		2826	my ($w, $h) = $layout->size;
		2827
		2828	$para->{w} = $w + $para->{indent};
		2829	$para->{h} = $h;
		2830	$para->{wrapped} = $layout->has_wrapped;
		2831	}
		2832
		2833	$para->{y} = $height;
		2834
		2835	$paridx++;
		2836	$top_paragraph ||= $paridx if $height >= $top;
		2837
		2838	$height += $para->{h};
		2839	}
		2840
		2841	$self->{top_paragraph} = $top_paragraph;
		2842	$self->{height} = $height;
		2843
		2844	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2845
		2846	delete $self->{texture};
		2847	}
		2848
		2849	if (delete $self->{scroll_to_bottom}) {
		2850	$self->{children}[1]->set_value (1e10);
		2851	}
		2852	}
		2853
2699	sub update {	2854	sub update {
2700	my ($self) = @_;	2855	my ($self) = @_;
2701		2856
2702	$self->SUPER::update;	2857	$self->SUPER::update;
2703		2858
2704	return unless $self->{h} > 0;	2859	return unless $self->{h} > 0;
2705		2860
2706	delete $self->{texture};	2861	delete $self->{texture};
2707		2862
2708	$ROOT->on_post_alloc ($self => sub {	2863	$ROOT->on_post_alloc ($self => sub {
		2864	$self->force_uptodate;
		2865
2709	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2866	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2710		2867
2711	if (delete $self->{need_reflow}) {
2712	my $height = 0;
2713
2714	for my $para (@{$self->{par}}) {
2715	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2716	my $layout = $self->get_layout ($para);
2717	my ($w, $h) = $layout->size;
2718
2719	$para->{w} = $w + $para->{indent};
2720	$para->{h} = $h;
2721	$para->{wrapped} = $layout->has_wrapped;
2722	}
2723
2724	$height += $para->{h};
2725	}
2726
2727	$self->{height} = $height;
2728
2729	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2730
2731	delete $self->{texture};
2732	}
2733
2734	if (delete $self->{scroll_to_bottom}) {
2735	$self->{children}[1]->set_value (1e10);
2736	}
2737
2738	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2868	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2739	glClearColor 0, 0, 0, 0;	2869	glClearColor 0, 0, 0, 0;
2740	glClear GL_COLOR_BUFFER_BIT;	2870	glClear GL_COLOR_BUFFER_BIT;
2741		2871
2742	my $top = int $self->{children}[1]{range}[0];	2872	my $top = int $self->{children}[1]{range}[0];
2743		2873
2744	my $y0 = $top;	2874	my $y0 = $top;
2745	my $y1 = $top + $H;	2875	my $y1 = $top + $H;
2746		2876
2747	my $y = 0;
2748
2749	glEnable GL_BLEND;
2750	#TODO# not correct in windows where rgba is forced off
2751	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2752
2753	for my $para (@{$self->{par}}) {	2877	for my $para (@{$self->{par}}) {
2754	my $h = $para->{h};	2878	my $h = $para->{h};
		2879	my $y = $para->{y};
2755		2880
2756	if ($y0 < $y + $h && $y < $y1) {	2881	if ($y0 < $y + $h && $y < $y1) {
2757
2758	my $layout = $self->get_layout ($para);	2882	my $layout = $self->get_layout ($para);
2759		2883
2760	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762	glRasterPos $para->{indent}, $y - $y0;	2884	$layout->render ($para->{indent}, $y - $y0);
2763	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764		2885
2765	if (my @w = @{ $para->{widget} }) {	2886	if (my @w = @{ $para->{widget} }) {
2766	my @s = $layout->get_shapes;	2887	my @s = $layout->get_shapes;
2767		2888
2768	glDisable GL_BLEND;
2769	for (@w) {	2889	for (@w) {
2770	my ($dx, $dy) = splice @s, 0, 2, ();	2890	my ($dx, $dy) = splice @s, 0, 2, ();
2771		2891
2772	$_->{x} = $dx + $para->{indent};	2892	$_->{x} = $dx + $para->{indent};
2773	$_->{y} = $dy + $y - $y0;	2893	$_->{y} = $dy + $y - $y0;
2774		2894
2775	$_->draw;	2895	$_->draw;
2776	}	2896	}
2777	glEnable GL_BLEND;
2778	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779	}	2897	}
2780	}	2898	}
2781
2782	$y += $h;
2783	}	2899	}
2784
2785	glDisable GL_BLEND;
2786	};	2900	};
2787	});	2901	});
2788	}	2902	}
2789		2903
2790	sub reconfigure {	2904	sub reconfigure {
…		…
2808	$self->{children}[1]->draw;	2922	$self->{children}[1]->draw;
2809	}	2923	}
2810		2924
2811	#############################################################################	2925	#############################################################################
2812		2926
2813	package CFClient::UI::Animator;	2927	package CFPlus::UI::Animator;
2814		2928
2815	use CFClient::OpenGL;	2929	use CFPlus::OpenGL;
2816		2930
2817	our @ISA = CFClient::UI::Bin::;	2931	our @ISA = CFPlus::UI::Bin::;
2818		2932
2819	sub moveto {	2933	sub moveto {
2820	my ($self, $x, $y) = @_;	2934	my ($self, $x, $y) = @_;
2821		2935
2822	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2936	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2850	glPopMatrix;	2964	glPopMatrix;
2851	}	2965	}
2852		2966
2853	#############################################################################	2967	#############################################################################
2854		2968
2855	package CFClient::UI::Flopper;	2969	package CFPlus::UI::Flopper;
2856		2970
2857	our @ISA = CFClient::UI::Button::;	2971	our @ISA = CFPlus::UI::Button::;
2858		2972
2859	sub new {	2973	sub new {
2860	my $class = shift;	2974	my $class = shift;
2861		2975
2862	my $self = $class->SUPER::new (	2976	my $self = $class->SUPER::new (
…		…
2874	$self->{other}->toggle_visibility;	2988	$self->{other}->toggle_visibility;
2875	}	2989	}
2876		2990
2877	#############################################################################	2991	#############################################################################
2878		2992
2879	package CFClient::UI::Tooltip;	2993	package CFPlus::UI::Tooltip;
2880		2994
2881	our @ISA = CFClient::UI::Bin::;	2995	our @ISA = CFPlus::UI::Bin::;
2882		2996
2883	use CFClient::OpenGL;	2997	use CFPlus::OpenGL;
2884		2998
2885	sub new {	2999	sub new {
2886	my $class = shift;	3000	my $class = shift;
2887		3001
2888	$class->SUPER::new (	3002	$class->SUPER::new (
…		…
2891	)	3005	)
2892	}	3006	}
2893		3007
2894	sub set_tooltip_from {	3008	sub set_tooltip_from {
2895	my ($self, $widget) = @_;	3009	my ($self, $widget) = @_;
		3010
		3011	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3012	if $widget->{tooltip} =~ /^#(.*)$/;
2896		3013
2897	my $tooltip = $widget->{tooltip};	3014	my $tooltip = $widget->{tooltip};
2898		3015
2899	if ($ENV{CFPLUS_DEBUG} & 2) {	3016	if ($ENV{CFPLUS_DEBUG} & 2) {
2900	$tooltip .= "\n\n" . (ref $widget) . "\n"	3017	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2904	}	3021	}
2905		3022
2906	$tooltip =~ s/^\n+//;	3023	$tooltip =~ s/^\n+//;
2907	$tooltip =~ s/\n+$//;	3024	$tooltip =~ s/\n+$//;
2908		3025
2909	$self->add (new CFClient::UI::Label	3026	$self->add (new CFPlus::UI::Label
2910	markup => $tooltip,	3027	markup => $tooltip,
2911	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3028	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2912	fontsize => 0.8,	3029	fontsize => 0.8,
2913	fg => [0, 0, 0, 1],	3030	style => 1, # FLAG_INVERSE
2914	ellipsise => 0,	3031	ellipsise => 0,
2915	font => ($widget->{tooltip_font} || $::FONT_PROP),	3032	font => ($widget->{tooltip_font} || $::FONT_PROP),
2916	);	3033	);
2917	}	3034	}
2918		3035
…		…
2937		3054
2938	$self->{root}->on_post_alloc ("move_$self" => sub {	3055	$self->{root}->on_post_alloc ("move_$self" => sub {
2939	my $widget = $self->{owner}	3056	my $widget = $self->{owner}
2940	or return;	3057	or return;
2941		3058
		3059	if ($widget->{visible}) {
2942	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3060	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943		3061
2944	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3062	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945	if $x + $self->{w} > $self->{root}{w};	3063	if $x + $self->{w} > $self->{root}{w};
2946		3064
2947	$self->move_abs ($x, $y);	3065	$self->move_abs ($x, $y);
		3066	} else {
		3067	$self->hide;
		3068	}
2948	});	3069	});
2949	}	3070	}
2950		3071
2951	sub _draw {	3072	sub _draw {
2952	my ($self) = @_;	3073	my ($self) = @_;
…		…
2976	$self->SUPER::_draw;	3097	$self->SUPER::_draw;
2977	}	3098	}
2978		3099
2979	#############################################################################	3100	#############################################################################
2980		3101
2981	package CFClient::UI::Face;	3102	package CFPlus::UI::Face;
2982		3103
2983	our @ISA = CFClient::UI::Base::;	3104	our @ISA = CFPlus::UI::DrawBG::;
2984		3105
2985	use CFClient::OpenGL;	3106	use CFPlus::OpenGL;
2986		3107
2987	sub new {	3108	sub new {
2988	my $class = shift;	3109	my $class = shift;
2989		3110
2990	my $self = $class->SUPER::new (	3111	my $self = $class->SUPER::new (
…		…
3025	sub _draw {	3146	sub _draw {
3026	my ($self) = @_;	3147	my ($self) = @_;
3027		3148
3028	return unless $::CONN;	3149	return unless $::CONN;
3029		3150
		3151	$self->SUPER::_draw;
		3152
3030	my $face;	3153	my $face;
3031		3154
3032	if ($self->{frame}) {	3155	if ($self->{frame}) {
3033	my $anim = $::CONN->{anim}[$self->{anim}];	3156	my $anim = $::CONN->{anim}[$self->{anim}];
3034		3157
…		…
3056	$self->SUPER::destroy;	3179	$self->SUPER::destroy;
3057	}	3180	}
3058		3181
3059	#############################################################################	3182	#############################################################################
3060		3183
3061	package CFClient::UI::Buttonbar;	3184	package CFPlus::UI::Buttonbar;
3062		3185
3063	our @ISA = CFClient::UI::HBox::;	3186	our @ISA = CFPlus::UI::HBox::;
3064		3187
3065	# TODO: should actualyl wrap buttons and other goodies.	3188	# TODO: should actualyl wrap buttons and other goodies.
3066		3189
3067	#############################################################################	3190	#############################################################################
3068		3191
3069	package CFClient::UI::Menu;	3192	package CFPlus::UI::Menu;
3070		3193
3071	our @ISA = CFClient::UI::FancyFrame::;	3194	our @ISA = CFPlus::UI::FancyFrame::;
3072		3195
3073	use CFClient::OpenGL;	3196	use CFPlus::OpenGL;
3074		3197
3075	sub new {	3198	sub new {
3076	my $class = shift;	3199	my $class = shift;
3077		3200
3078	my $self = $class->SUPER::new (	3201	my $self = $class->SUPER::new (
3079	items => [],	3202	items => [],
3080	z => 100,	3203	z => 100,
3081	@_,	3204	@_,
3082	);	3205	);
3083		3206
3084	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3207	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3085		3208
3086	for my $item (@{ $self->{items} }) {	3209	for my $item (@{ $self->{items} }) {
3087	my ($widget, $cb, $tooltip) = @$item;	3210	my ($widget, $cb, $tooltip) = @$item;
3088		3211
3089	# handle various types of items, only text for now	3212	# handle various types of items, only text for now
3090	if (!ref $widget) {	3213	if (!ref $widget) {
		3214	if ($widget =~ /\t/) {
		3215	my ($left, $right) = split /\t/, $widget, 2;
		3216
3091	$widget = new CFClient::UI::Label	3217	$widget = new CFPlus::UI::HBox
3092	can_hover => 1,	3218	can_hover => 1,
3093	can_events => 1,	3219	can_events => 1,
		3220	tooltip => $tooltip,
		3221	children => [
		3222	(new CFPlus::UI::Label markup => $left, expand => 1),
		3223	(new CFPlus::UI::Label markup => $right, align => +1),
		3224	],
		3225	;
		3226
		3227	} else {
		3228	$widget = new CFPlus::UI::Label
		3229	can_hover => 1,
		3230	can_events => 1,
3094	markup => $widget,	3231	markup => $widget,
3095	tooltip => $tooltip	3232	tooltip => $tooltip;
		3233	}
3096	}	3234	}
3097		3235
3098	$self->{item}{$widget} = $item;	3236	$self->{item}{$widget} = $item;
3099		3237
3100	$self->{vbox}->add ($widget);	3238	$self->{vbox}->add ($widget);
…		…
3143	1	3281	1
3144	}	3282	}
3145		3283
3146	#############################################################################	3284	#############################################################################
3147		3285
3148	package CFClient::UI::Multiplexer;	3286	package CFPlus::UI::Multiplexer;
3149		3287
3150	our @ISA = CFClient::UI::Container::;	3288	our @ISA = CFPlus::UI::Container::;
3151		3289
3152	sub new {	3290	sub new {
3153	my $class = shift;	3291	my $class = shift;
3154		3292
3155	my $self = $class->SUPER::new (	3293	my $self = $class->SUPER::new (
…		…
3216	$self->{current}->draw;	3354	$self->{current}->draw;
3217	}	3355	}
3218		3356
3219	#############################################################################	3357	#############################################################################
3220		3358
3221	package CFClient::UI::Notebook;	3359	package CFPlus::UI::Notebook;
3222		3360
3223	our @ISA = CFClient::UI::VBox::;	3361	our @ISA = CFPlus::UI::VBox::;
3224		3362
3225	sub new {	3363	sub new {
3226	my $class = shift;	3364	my $class = shift;
3227		3365
3228	my $self = $class->SUPER::new (	3366	my $self = $class->SUPER::new (
3229	buttonbar => (new CFClient::UI::Buttonbar),	3367	buttonbar => (new CFPlus::UI::Buttonbar),
3230	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3368	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3231	# filter => # will be put between multiplexer and $self	3369	# filter => # will be put between multiplexer and $self
3232	@_,	3370	@_,
3233	);	3371	);
3234		3372
3235	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3373	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3241	sub add {	3379	sub add {
3242	my ($self, $title, $widget, $tooltip) = @_;	3380	my ($self, $title, $widget, $tooltip) = @_;
3243		3381
3244	Scalar::Util::weaken $self;	3382	Scalar::Util::weaken $self;
3245		3383
3246	$self->{buttonbar}->add (new CFClient::UI::Button	3384	$self->{buttonbar}->add (new CFPlus::UI::Button
3247	markup => $title,	3385	markup => $title,
3248	tooltip => $tooltip,	3386	tooltip => $tooltip,
3249	on_activate => sub { $self->set_current_page ($widget) },	3387	on_activate => sub { $self->set_current_page ($widget) },
3250	);	3388	);
3251		3389
…		…
3265	$self->emit (page_changed => $self->{multiplexer}{current});	3403	$self->emit (page_changed => $self->{multiplexer}{current});
3266	}	3404	}
3267		3405
3268	#############################################################################	3406	#############################################################################
3269		3407
3270	package CFClient::UI::Combobox;	3408	package CFPlus::UI::Selector;
3271		3409
3272	use utf8;	3410	use utf8;
3273		3411
3274	our @ISA = CFClient::UI::Button::;	3412	our @ISA = CFPlus::UI::Button::;
3275		3413
3276	sub new {	3414	sub new {
3277	my $class = shift;	3415	my $class = shift;
3278		3416
3279	my $self = $class->SUPER::new (	3417	my $self = $class->SUPER::new (
…		…
3296	my ($value, $title, $tooltip) = @$_;	3434	my ($value, $title, $tooltip) = @$_;
3297		3435
3298	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3436	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299	}	3437	}
3300		3438
3301	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3439	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302	}	3440	}
3303		3441
3304	sub _set_value {	3442	sub _set_value {
3305	my ($self, $value) = @_;	3443	my ($self, $value) = @_;
3306		3444
…		…
3321	$self->emit (changed => $value);	3459	$self->emit (changed => $value);
3322	}	3460	}
3323		3461
3324	#############################################################################	3462	#############################################################################
3325		3463
3326	package CFClient::UI::Statusbox;	3464	package CFPlus::UI::Statusbox;
3327		3465
3328	our @ISA = CFClient::UI::VBox::;	3466	our @ISA = CFPlus::UI::VBox::;
3329		3467
3330	sub new {	3468	sub new {
3331	my $class = shift;	3469	my $class = shift;
3332		3470
3333	my $self = $class->SUPER::new (	3471	my $self = $class->SUPER::new (
…		…
3345	sub reorder {	3483	sub reorder {
3346	my ($self) = @_;	3484	my ($self) = @_;
3347	my $NOW = Time::HiRes::time;	3485	my $NOW = Time::HiRes::time;
3348		3486
3349	# freeze display when hovering over any label	3487	# freeze display when hovering over any label
3350	return if $CFClient::UI::TOOLTIP->{owner}	3488	return if $CFPlus::UI::TOOLTIP->{owner}
3351	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3489	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3352	values %{ $self->{item} };	3490	values %{ $self->{item} };
3353		3491
3354	while (my ($k, $v) = each %{ $self->{item} }) {	3492	while (my ($k, $v) = each %{ $self->{item} }) {
3355	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3493	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3356	}	3494	}
…		…
3377	for ($short) {	3515	for ($short) {
3378	s/^\s+//;	3516	s/^\s+//;
3379	s/\s+/ /g;	3517	s/\s+/ /g;
3380	}	3518	}
3381		3519
3382	new CFClient::UI::Label	3520	new CFPlus::UI::Label
3383	markup => $short,	3521	markup => $short,
3384	tooltip => $item->{tooltip},	3522	tooltip => $item->{tooltip},
3385	tooltip_font => $::FONT_PROP,	3523	tooltip_font => $::FONT_PROP,
3386	tooltip_width => 0.67,	3524	tooltip_width => 0.67,
3387	fontsize => $item->{fontsize} || $self->{fontsize},	3525	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3466	$self->SUPER::destroy;	3604	$self->SUPER::destroy;
3467	}	3605	}
3468		3606
3469	#############################################################################	3607	#############################################################################
3470		3608
3471	package CFClient::UI::Inventory;	3609	package CFPlus::UI::Inventory;
3472		3610
3473	our @ISA = CFClient::UI::Table::;	3611	our @ISA = CFPlus::UI::Table::;
3474		3612
3475	sub new {	3613	sub new {
3476	my $class = shift;	3614	my $class = shift;
3477		3615
3478	my $self = $class->SUPER::new (	3616	my $self = $class->SUPER::new (
3479	col_expand => [0, 1, 0],	3617	col_expand => [0, 1, 0],
		3618	items => [],
3480	@_,	3619	@_,
3481	);	3620	);
3482		3621
		3622	$self->set_sort_order (undef);
		3623
3483	$self	3624	$self
		3625	}
		3626
		3627	sub update_items {
		3628	my ($self) = @_;
		3629
		3630	$self->clear;
		3631
		3632	my @item = $self->{sort}->(@{ $self->{items} });
		3633
		3634	my @adds;
		3635	my $row = 0;
		3636	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3637	CFPlus::Item::update_widgets $item;
		3638
		3639	push @adds, 0, $row, $item->{face_widget};
		3640	push @adds, 1, $row, $item->{desc_widget};
		3641	push @adds, 2, $row, $item->{weight_widget};
		3642
		3643	$row++;
		3644	}
		3645
		3646	$self->add (@adds);
		3647	}
		3648
		3649	sub set_sort_order {
		3650	my ($self, $order) = @_;
		3651
		3652	$self->{sort} = $order ||= sub {
		3653	sort {
		3654	$a->{type} <=> $b->{type}
		3655	or $a->{name} cmp $b->{name}
		3656	} @_
		3657	};
		3658
		3659	$self->update_items;
3484	}	3660	}
3485		3661
3486	sub set_items {	3662	sub set_items {
3487	my ($self, $items) = @_;	3663	my ($self, $items) = @_;
3488		3664
3489	$self->clear;	3665	$self->{items} = [$items ? values %$items : ()];
3490	return unless $items;	3666	$self->update_items;
3491
3492	my @items = sort {
3493	($a->{type} <=> $b->{type})
3494	or ($a->{name} cmp $b->{name})
3495	} values %$items;
3496
3497	$self->{real_items} = \@items;
3498
3499	my $row = 0;
3500	for my $item (@items) {
3501	CFClient::Item::update_widgets $item;
3502
3503	$self->add (0, $row, $item->{face_widget});
3504	$self->add (1, $row, $item->{desc_widget});
3505	$self->add (2, $row, $item->{weight_widget});
3506
3507	$row++;
3508	}
3509	}	3667	}
3510		3668
3511	#############################################################################	3669	#############################################################################
3512		3670
3513	package CFClient::UI::SpellList;	3671	package CFPlus::UI::SpellList;
3514		3672
3515	our @ISA = CFClient::UI::Table::;	3673	our @ISA = CFPlus::UI::Table::;
3516		3674
3517	sub new {	3675	sub new {
3518	my $class = shift;	3676	my $class = shift;
3519		3677
3520	my $self = $class->SUPER::new (	3678	my $self = $class->SUPER::new (
…		…
3538	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3696	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539		3697
3540	sub rebuild_spell_list {	3698	sub rebuild_spell_list {
3541	my ($self) = @_;	3699	my ($self) = @_;
3542		3700
3543	$CFClient::UI::ROOT->on_refresh ($self => sub {	3701	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3544	$self->clear;	3702	$self->clear;
3545		3703
3546	return unless $::CONN;	3704	return unless $::CONN;
3547		3705
3548	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3706	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3707	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3708	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3709	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3710	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553		3711
3554	my $row = 0;	3712	my $row = 0;
3555		3713
3556	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3714	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557	my $spell = $self->{spell}{$_};	3715	my $spell = $self->{spell}{$_};
…		…
3564	if ($ev->{button} == 1) {	3722	if ($ev->{button} == 1) {
3565	$::CONN->user_send ("cast $spell->{name}");	3723	$::CONN->user_send ("cast $spell->{name}");
3566	} elsif ($ev->{button} == 2) {	3724	} elsif ($ev->{button} == 2) {
3567	$::CONN->user_send ("invoke $spell->{name}");	3725	$::CONN->user_send ("invoke $spell->{name}");
3568	} elsif ($ev->{button} == 3) {	3726	} elsif ($ev->{button} == 3) {
3569	(new CFClient::UI::Menu	3727	(new CFPlus::UI::Menu
3570	items => [	3728	items => [
3571	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3729	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3730	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573	],	3731	],
3574	)->popup ($ev);	3732	)->popup ($ev);
…		…
3580	};	3738	};
3581		3739
3582	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3740	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583		3741
3584	#TODO: add path info to tooltip	3742	#TODO: add path info to tooltip
3585	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3743	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3586		3744
3587	$self->add (0, $row, new CFClient::UI::Face	3745	$self->add (0, $row, new CFPlus::UI::Face
3588	face => $spell->{face},	3746	face => $spell->{face},
3589	can_hover => 1,	3747	can_hover => 1,
3590	can_events => 1,	3748	can_events => 1,
3591	tooltip => $tooltip,	3749	tooltip => $tooltip,
3592	on_button_down => $spell_cb,	3750	on_button_down => $spell_cb,
3593	);	3751	);
3594		3752
3595	$self->add (1, $row, new CFClient::UI::Label	3753	$self->add (1, $row, new CFPlus::UI::Label
3596	expand => 1,	3754	expand => 1,
3597	text => $spell->{name},	3755	text => $spell->{name},
3598	can_hover => 1,	3756	can_hover => 1,
3599	can_events => 1,	3757	can_events => 1,
3600	tooltip => $tooltip,	3758	tooltip => $tooltip,
3601	on_button_down => $spell_cb,	3759	on_button_down => $spell_cb,
3602	);	3760	);
3603		3761
3604	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3762	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3763	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3764	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3765	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608	}	3766	}
3609	});	3767	});
3610	}	3768	}
3611		3769
3612	sub add_spell {	3770	sub add_spell {
…		…
3630	$self->rebuild_spell_list;	3788	$self->rebuild_spell_list;
3631	}	3789	}
3632		3790
3633	#############################################################################	3791	#############################################################################
3634		3792
3635	package CFClient::UI::Root;	3793	package CFPlus::UI::Root;
3636		3794
3637	our @ISA = CFClient::UI::Container::;	3795	our @ISA = CFPlus::UI::Container::;
3638		3796
3639	use List::Util qw(min max);	3797	use List::Util qw(min max);
3640		3798
3641	use CFClient::OpenGL;	3799	use CFPlus::OpenGL;
3642		3800
3643	sub new {	3801	sub new {
3644	my $class = shift;	3802	my $class = shift;
3645		3803
3646	my $self = $class->SUPER::new (	3804	my $self = $class->SUPER::new (
…		…
3822	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3980	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3823		3981
3824	$w = 0 if $w < 0;	3982	$w = 0 if $w < 0;
3825	$h = 0 if $h < 0;	3983	$h = 0 if $h < 0;
3826		3984
		3985	$w = max $widget->{min_w}, $w;
		3986	$h = max $widget->{min_h}, $h;
		3987
		3988	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3989	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3990
		3991	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3992	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3993
3827	$w = int $w + 0.5;	3994	$w = int $w + 0.5;
3828	$h = int $h + 0.5;	3995	$h = int $h + 0.5;
3829		3996
3830	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3997	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831	$widget->{old_w} = $widget->{w};	3998	$widget->{old_w} = $widget->{w};
…		…
3854	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4021	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855	glMatrixMode GL_MODELVIEW;	4022	glMatrixMode GL_MODELVIEW;
3856	glLoadIdentity;	4023	glLoadIdentity;
3857		4024
3858	{	4025	{
3859	package CFClient::UI::Base;	4026	package CFPlus::UI::Base;
3860		4027
3861	($draw_x, $draw_y, $draw_w, $draw_h) =	4028	($draw_x, $draw_y, $draw_w, $draw_h) =
3862	(0, 0, $self->{w}, $self->{h});	4029	(0, 0, $self->{w}, $self->{h});
3863	}	4030	}
3864		4031
3865	$self->_draw;	4032	$self->_draw;
3866	}	4033	}
3867		4034
3868	#############################################################################	4035	#############################################################################
3869		4036
3870	package CFClient::UI;	4037	package CFPlus::UI;
3871		4038
3872	$ROOT = new CFClient::UI::Root;	4039	$ROOT = new CFPlus::UI::Root;
3873	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4040	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874		4041
3875	1	4042	1
3876		4043

Diff Legend

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