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.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.360 by root, Fri Dec 8 22:25:32 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) = @_;
		443
		444	Carp::confess unless $self->{parent};#d#
418		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 {
…		…
456		483
457	sub invoke_mouse_motion { 0 }	484	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 0 }	485	sub invoke_button_up { 0 }
459	sub invoke_key_down { 0 }	486	sub invoke_key_down { 0 }
460	sub invoke_key_up { 0 }	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;
…		…
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 do not like duplication
		520	# and needlessly verbose code, either.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
479	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480		527
481	#d##TODO# stop propagating at first true, do not use sum	528	#d##TODO# stop propagating at first true, do not use sum
482	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
483	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
484	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
485	}	532	}
486		533
487	sub find_widget {	534	sub find_widget {
488	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
489		536
…		…
573	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
576	glEnd;	623	glEnd;
577	glPopMatrix;	624	glPopMatrix;
578	#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;
579	}	626	}
580		627
581	$self->_draw;	628	$self->_draw;
582	glPopMatrix;	629	glPopMatrix;
583	}	630	}
…		…
589	}	636	}
590		637
591	sub DESTROY {	638	sub DESTROY {
592	my ($self) = @_;	639	my ($self) = @_;
593		640
594	return if CFClient::in_destruct;	641	return if CFPlus::in_destruct;
595		642
596	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
597		644
598	eval { $self->destroy };	645	eval { $self->destroy };
599	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
600	}	647	}
601		648
602	#############################################################################	649	#############################################################################
603		650
604	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
605		652
606	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
607		654
608	use strict;	655	use strict;
609	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
610		657
611	sub new {	658	sub new {
612	my $class = shift;	659	my $class = shift;
613		660
614	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
645	}	692	}
646	}	693	}
647		694
648	#############################################################################	695	#############################################################################
649		696
650	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
651		698
652	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
653		700
654	sub new {	701	sub new {
655	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
656	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
657	}	704	}
…		…
664		711
665	sub draw { }	712	sub draw { }
666		713
667	#############################################################################	714	#############################################################################
668		715
669	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
670		717
671	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
672		719
673	sub new {	720	sub new {
674	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
675		722
676	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
685	if $children;	732	if $children;
686		733
687	$self	734	$self
688	}	735	}
689		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
690	sub add {	745	sub add {
691	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
692		747
693	$_->set_parent ($self)	748	$_->set_parent ($self)
694	for @widgets;	749	for @widgets;
…		…
754	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
755	}	810	}
756		811
757	#############################################################################	812	#############################################################################
758		813
759	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
760		815
761	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
762		817
763	sub new {	818	sub new {
764	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
765		820
766	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
767		822
768	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
769	}	824	}
770		825
771	sub add {	826	sub add {
…		…
778	sub remove {	833	sub remove {
779	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
780		835
781	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
782		837
783	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	839	unless @{$self->{children}};
785	}	840	}
786		841
787	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
788		843
…		…
800		855
801	#############################################################################	856	#############################################################################
802		857
803	# back-buffered drawing area	858	# back-buffered drawing area
804		859
805	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
806		861
807	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
808		863
809	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
810		865
811	sub new {	866	sub new {
812	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
813		868
814	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
836	}	891	}
837		892
838	sub render_child {	893	sub render_child {
839	my ($self) = @_;	894	my ($self) = @_;
840		895
841	$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 {
842	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
843	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
844		899
845	{	900	{
846	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
847		902
848	($draw_x, $draw_y, $draw_w, $draw_h) =	903	local ($draw_x, $draw_y, $draw_w, $draw_h) =
849	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
		905
		906	$self->_render;
850	}	907	}
851
852	$self->_render;
853	};	908	};
854	}	909	}
855		910
856	sub _draw {	911	sub _draw {
857	my ($self) = @_;	912	my ($self) = @_;
858
859	my ($w, $h) = @$self{qw(w h)};
860		913
861	my $tex = $self->{texture}	914	my $tex = $self->{texture}
862	or return;	915	or return;
863		916
864	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
865	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
866	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
867		920
868	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
869		922
870	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
871	}	924	}
872		925
873	#############################################################################	926	#############################################################################
874		927
875	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
876		929
877	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
878		931
879	sub new {	932	sub new {
880	my $class = shift;	933	my $class = shift;
881		934
882	$class->SUPER::new (	935	$class->SUPER::new (
…		…
942	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
943	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
944	) {	997	) {
945	$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})
946	} else {	999	} else {
947	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
948	}	1001	}
949	}	1002	}
950		1003
951	sub _render {	1004	sub _render {
952	my ($self) = @_;	1005	my ($self) = @_;
953		1006
954	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};
955	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};
956		1009
957	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
958		1011
959	$self->SUPER::_render;	1012	$self->SUPER::_render;
960	}	1013	}
961		1014
962	#############################################################################	1015	#############################################################################
963		1016
964	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
965		1018
966	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
967		1020
968	sub new {	1021	sub new {
969	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
970		1023
971	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
972		1025
973	my $self;	1026	my $self;
974		1027
975	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
976	vertical => 1,	1029	vertical => 1,
977	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
978	on_changed => sub {	1031	on_changed => sub {
979	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
980	},	1033	},
981	;	1034	;
982		1035
983	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
984	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
		1038	can_events => 1,
985	slider => $slider,	1039	slider => $slider,
986	%arg,	1040	%arg,
987	);	1041	);
988		1042
989	$self->SUPER::add ($self->{vp}, $self->{slider});	1043	$self->SUPER::add ($self->{vp}, $self->{slider});
990	$self->add ($child) if $child;	1044	$self->add ($child) if $child;
…		…
998	my ($self, $widget) = @_;	1052	my ($self, $widget) = @_;
999		1053
1000	$self->{vp}->add ($self->{child} = $widget);	1054	$self->{vp}->add ($self->{child} = $widget);
1001	}	1055	}
1002		1056
1003	sub invoke_button_up {	1057	sub invoke_mouse_wheel {
1004	my ($self, $ev) = @_;	1058	my ($self, $ev) = @_;
1005		1059
1006	warn "button up $ev->{button}\n";#d#	1060	return 0 unless $ev->{dy}; # only vertical movements
		1061
		1062	$self->{slider}->emit (mouse_wheel => $ev);
		1063
1007		1064	1
1008	0
1009	}	1065	}
1010		1066
1011	sub update_slider {	1067	sub update_slider {
1012	my ($self) = @_;	1068	my ($self) = @_;
1013		1069
…		…
1030	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1031	}	1087	}
1032		1088
1033	#############################################################################	1089	#############################################################################
1034		1090
1035	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1036		1092
1037	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1038		1094
1039	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1040		1096
1041	sub new {	1097	sub new {
1042	my $class = shift;	1098	my $class = shift;
1043		1099
1044	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1070	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1071	}	1127	}
1072		1128
1073	#############################################################################	1129	#############################################################################
1074		1130
1075	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1076		1132
1077	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1078		1134
1079	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;
1080		1236
1081	my $bg =	1237	my $bg =
1082	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1238	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1083	mipmap => 1, wrap => 1;	1239	mipmap => 1, wrap => 1;
1084		1240
1085	my @border =	1241	my @border =
1086	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1242	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1087	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);
1088		1244
1089	sub new {	1245	sub new {
1090	my ($class, %arg) = @_;	1246	my ($class, %arg) = @_;
1091		1247
…		…
1097	min_w => 64,	1253	min_w => 64,
1098	min_h => 32,	1254	min_h => 32,
1099	%arg,	1255	%arg,
1100	);	1256	);
1101		1257
1102	$self->{title_widget} = new CFClient::UI::Label	1258	$self->{title_widget} = new CFPlus::UI::Label
1103	align => 0,	1259	align => 0,
1104	valign => 1,	1260	valign => 1,
1105	text => $self->{title},	1261	text => $self->{title},
1106	fontsize => $self->{border},	1262	fontsize => $self->{border},
1107	if exists $self->{title};	1263	if exists $self->{title};
1108		1264
1109	if ($self->{has_close_button}) {	1265	if ($self->{has_close_button}) {
1110	$self->{close_button} =	1266	$self->{close_button} =
1111	new CFClient::UI::ImageButton	1267	new CFPlus::UI::ImageButton
1112	path => 'x1_close.png',	1268	path => 'x1_close.png',
1113	on_activate => sub { $self->emit ("delete") };	1269	on_activate => sub { $self->emit ("delete") };
1114		1270
1115	$self->CFClient::UI::Container::add ($self->{close_button});	1271	$self->CFPlus::UI::Container::add ($self->{close_button});
1116	}	1272	}
1117		1273
1118	$self	1274	$self
1119	}	1275	}
1120		1276
1121	sub add {	1277	sub add {
1122	my ($self, @widgets) = @_;	1278	my ($self, @widgets) = @_;
1123		1279
1124	$self->SUPER::add (@widgets);	1280	$self->SUPER::add (@widgets);
1125	$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};
1126	$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};
1127	}	1283	}
1128		1284
1129	sub border {	1285	sub border {
1130	int $_[0]{border} * $::FONTSIZE	1286	int $_[0]{border} * $::FONTSIZE
1131	}	1287	}
…		…
1239	$self->{motion}->($ev, $x, $y) if $self->{motion};	1395	$self->{motion}->($ev, $x, $y) if $self->{motion};
1240		1396
1241	! ! $self->{motion}	1397	! ! $self->{motion}
1242	}	1398	}
1243		1399
		1400	sub invoke_visibility_change {
		1401	my ($self, $visible) = @_;
		1402
		1403	delete $self->{motion} unless $visible;
		1404
		1405	0
		1406	}
		1407
1244	sub _draw {	1408	sub _draw {
1245	my ($self) = @_;	1409	my ($self) = @_;
1246		1410
1247	my $child = $self->{children}[0];	1411	my $child = $self->{children}[0];
1248		1412
…		…
1285	if $self->{close_button};	1449	if $self->{close_button};
1286	}	1450	}
1287		1451
1288	#############################################################################	1452	#############################################################################
1289		1453
1290	package CFClient::UI::Table;	1454	package CFPlus::UI::Table;
1291		1455
1292	our @ISA = CFClient::UI::Base::;	1456	our @ISA = CFPlus::UI::Base::;
1293		1457
1294	use List::Util qw(max sum);	1458	use List::Util qw(max sum);
1295		1459
1296	use CFClient::OpenGL;	1460	use CFPlus::OpenGL;
1297		1461
1298	sub new {	1462	sub new {
1299	my $class = shift;	1463	my $class = shift;
1300		1464
1301	$class->SUPER::new (	1465	$class->SUPER::new (
…		…
1307	sub children {	1471	sub children {
1308	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309	}	1473	}
1310		1474
1311	sub add {	1475	sub add {
1312	my ($self, $x, $y, $child) = @_;	1476	my ($self) = shift;
1313		1477
		1478	while (@_) {
		1479	my ($x, $y, $child) = splice @_, 0, 3, ();
1314	$child->set_parent ($self);	1480	$child->set_parent ($self);
1315	$self->{children}[$y][$x] = $child;	1481	$self->{children}[$y][$x] = $child;
		1482	}
1316		1483
		1484	$self->{force_realloc} = 1;
		1485	$self->{force_size_alloc} = 1;
1317	$self->realloc;	1486	$self->realloc;
1318	}	1487	}
1319		1488
1320	sub remove {	1489	sub remove {
1321	my ($self, $child) = @_;	1490	my ($self, $child) = @_;
…		…
1386		1555
1387	# linearly scale sizes	1556	# linearly scale sizes
1388	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1389	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1390		1559
1391	CFClient::UI::harmonize $ws;	1560	CFPlus::UI::harmonize $ws;
1392	CFClient::UI::harmonize $hs;	1561	CFPlus::UI::harmonize $hs;
1393		1562
1394	my $y;	1563	my $y;
1395		1564
1396	for my $r (0 .. $#{$self->{children}}) {	1565	for my $r (0 .. $#{$self->{children}}) {
1397	my $row = $self->{children}[$r]	1566	my $row = $self->{children}[$r]
…		…
1440	}	1609	}
1441	}	1610	}
1442		1611
1443	#############################################################################	1612	#############################################################################
1444		1613
1445	package CFClient::UI::Box;	1614	package CFPlus::UI::Box;
1446		1615
1447	our @ISA = CFClient::UI::Container::;	1616	our @ISA = CFPlus::UI::Container::;
1448		1617
1449	sub size_request {	1618	sub size_request {
1450	my ($self) = @_;	1619	my ($self) = @_;
1451		1620
1452	$self->{vertical}	1621	$self->{vertical}
…		…
1485	$req[$_] += $space * $children[$_]{expand}	1654	$req[$_] += $space * $children[$_]{expand}
1486	for 0 .. $#children;	1655	for 0 .. $#children;
1487	}	1656	}
1488	}	1657	}
1489		1658
1490	CFClient::UI::harmonize \@req;	1659	CFPlus::UI::harmonize \@req;
1491		1660
1492	my $pos = 0;	1661	my $pos = 0;
1493	for (0 .. $#children) {	1662	for (0 .. $#children) {
1494	my $alloc = $req[$_];	1663	my $alloc = $req[$_];
1495	$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));
…		…
1500	1	1669	1
1501	}	1670	}
1502		1671
1503	#############################################################################	1672	#############################################################################
1504		1673
1505	package CFClient::UI::HBox;	1674	package CFPlus::UI::HBox;
1506		1675
1507	our @ISA = CFClient::UI::Box::;	1676	our @ISA = CFPlus::UI::Box::;
1508		1677
1509	sub new {	1678	sub new {
1510	my $class = shift;	1679	my $class = shift;
1511		1680
1512	$class->SUPER::new (	1681	$class->SUPER::new (
…		…
1515	)	1684	)
1516	}	1685	}
1517		1686
1518	#############################################################################	1687	#############################################################################
1519		1688
1520	package CFClient::UI::VBox;	1689	package CFPlus::UI::VBox;
1521		1690
1522	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1523		1692
1524	sub new {	1693	sub new {
1525	my $class = shift;	1694	my $class = shift;
1526		1695
1527	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1530	)	1699	)
1531	}	1700	}
1532		1701
1533	#############################################################################	1702	#############################################################################
1534		1703
1535	package CFClient::UI::Label;	1704	package CFPlus::UI::Label;
1536		1705
1537	our @ISA = CFClient::UI::DrawBG::;	1706	our @ISA = CFPlus::UI::DrawBG::;
1538		1707
1539	use CFClient::OpenGL;	1708	use CFPlus::OpenGL;
1540		1709
1541	sub new {	1710	sub new {
1542	my ($class, %arg) = @_;	1711	my ($class, %arg) = @_;
1543		1712
1544	my $self = $class->SUPER::new (	1713	my $self = $class->SUPER::new (
…		…
1547	#active_bg => none	1716	#active_bg => none
1548	#font => default_font	1717	#font => default_font
1549	#text => initial text	1718	#text => initial text
1550	#markup => initial narkup	1719	#markup => initial narkup
1551	#max_w => maximum pixel width	1720	#max_w => maximum pixel width
		1721	#style => 0, # render flags
1552	ellipsise => 3, # end	1722	ellipsise => 3, # end
1553	layout => (new CFClient::Layout),	1723	layout => (new CFPlus::Layout),
1554	fontsize => 1,	1724	fontsize => 1,
1555	align => -1,	1725	align => -1,
1556	valign => -1,	1726	valign => -1,
1557	padding_x => 2,	1727	padding_x => 2,
1558	padding_y => 2,	1728	padding_y => 2,
1559	can_events => 0,	1729	can_events => 0,
1560	%arg	1730	%arg
1561	);	1731	);
1562		1732
1563	if (exists $self->{template}) {	1733	if (exists $self->{template}) {
1564	my $layout = new CFClient::Layout;	1734	my $layout = new CFPlus::Layout;
1565	$layout->set_text (delete $self->{template});	1735	$layout->set_text (delete $self->{template});
1566	$self->{template} = $layout;	1736	$self->{template} = $layout;
1567	}	1737	}
1568		1738
1569	if (exists $self->{markup}) {	1739	if (exists $self->{markup}) {
…		…
1571	} else {	1741	} else {
1572	$self->set_text (delete $self->{text});	1742	$self->set_text (delete $self->{text});
1573	}	1743	}
1574		1744
1575	$self	1745	$self
1576	}
1577
1578	sub escape($) {
1579	local $_ = $_[0];
1580
1581	s/&/&amp;/g;
1582	s/>/&gt;/g;
1583	s/</&lt;/g;
1584
1585	$_
1586	}	1746	}
1587		1747
1588	sub update {	1748	sub update {
1589	my ($self) = @_;	1749	my ($self) = @_;
1590		1750
…		…
1717	};	1877	};
1718		1878
1719	my $w = List::Util::min $self->{w} + 4, $size->[0];	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
1720	my $h = List::Util::min $self->{h} + 2, $size->[1];	1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1721		1881
1722	$self->{layout}->render ($self->{ox}, $self->{oy});	1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1723	}	1883	}
1724		1884
1725	#############################################################################	1885	#############################################################################
1726		1886
1727	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1728		1888
1729	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1730		1890
1731	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1732		1892
1733	sub new {	1893	sub new {
1734	my $class = shift;	1894	my $class = shift;
1735		1895
1736	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1740	active_fg => [0, 0, 0],	1900	active_fg => [0, 0, 0],
1741	can_hover => 1,	1901	can_hover => 1,
1742	can_focus => 1,	1902	can_focus => 1,
1743	valign => 0,	1903	valign => 0,
1744	can_events => 1,	1904	can_events => 1,
		1905	ellipsise => 0,
1745	#text => ...	1906	#text => ...
1746	#hidden => "*",	1907	#hidden => "*",
1747	@_	1908	@_
1748	)	1909	)
1749	}	1910	}
…		…
1798		1959
1799	if ($uni == 8) {	1960	if ($uni == 8) {
1800	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1961	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1801	} elsif ($uni == 127) {	1962	} elsif ($uni == 127) {
1802	substr $text, $self->{cursor}, 1, "";	1963	substr $text, $self->{cursor}, 1, "";
1803	} elsif ($sym == CFClient::SDLK_LEFT) {	1964	} elsif ($sym == CFPlus::SDLK_LEFT) {
1804	--$self->{cursor} if $self->{cursor};	1965	--$self->{cursor} if $self->{cursor};
1805	} elsif ($sym == CFClient::SDLK_RIGHT) {	1966	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1806	++$self->{cursor} if $self->{cursor} < length $self->{text};	1967	++$self->{cursor} if $self->{cursor} < length $self->{text};
1807	} elsif ($sym == CFClient::SDLK_HOME) {	1968	} elsif ($sym == CFPlus::SDLK_HOME) {
1808	$self->{cursor} = 0;	1969	$self->{cursor} = 0;
1809	} elsif ($sym == CFClient::SDLK_END) {	1970	} elsif ($sym == CFPlus::SDLK_END) {
1810	$self->{cursor} = length $text;	1971	$self->{cursor} = length $text;
		1972	} elsif ($uni == 21) { # ctrl-u
		1973	$text = "";
		1974	$self->{cursor} = 0;
1811	} elsif ($uni == 27) {	1975	} elsif ($uni == 27) {
1812	$self->emit ('escape');	1976	$self->emit ('escape');
1813	} elsif ($uni) {	1977	} elsif ($uni >= 0x20 || $uni == 0x0d) {
1814	substr $text, $self->{cursor}++, 0, chr $uni;	1978	substr $text, $self->{cursor}++, 0, chr $uni;
1815	} else {	1979	} else {
1816	return 0;	1980	return 0;
1817	}	1981	}
1818		1982
1819	$self->_set_text ($text);	1983	$self->_set_text ($text);
1820		1984
1821	$self->realloc;	1985	$self->realloc;
		1986	$self->update;
1822		1987
1823	1	1988	1
1824	}	1989	}
1825		1990
1826	sub invoke_focus_in {	1991	sub invoke_focus_in {
…		…
1888	utf8::encode $text;	2053	utf8::encode $text;
1889		2054
1890	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2055	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1891	}	2056	}
1892		2057
1893	glColor @{$self->{fg}};
1894	glBegin GL_LINES;	2058	glBegin GL_LINES;
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2059	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1896	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2060	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1897	glEnd;	2061	glEnd;
1898	}	2062	}
1899	}	2063	}
1900		2064
		2065	#############################################################################
		2066
1901	package CFClient::UI::Entry;	2067	package CFPlus::UI::Entry;
1902		2068
1903	our @ISA = CFClient::UI::EntryBase::;	2069	our @ISA = CFPlus::UI::EntryBase::;
1904		2070
1905	use CFClient::OpenGL;	2071	use CFPlus::OpenGL;
1906		2072
1907	sub invoke_key_down {	2073	sub invoke_key_down {
1908	my ($self, $ev) = @_;	2074	my ($self, $ev) = @_;
1909		2075
1910	my $sym = $ev->{sym};	2076	my $sym = $ev->{sym};
1911		2077
1912	if ($sym == 13) {	2078	if ($ev->{uni} == 0x0d || $sym == 13) {
1913	unshift @{$self->{history}},	2079	unshift @{$self->{history}},
1914	my $txt = $self->get_text;	2080	my $txt = $self->get_text;
1915		2081
1916	$self->{history_pointer} = -1;	2082	$self->{history_pointer} = -1;
1917	$self->{history_saveback} = '';	2083	$self->{history_saveback} = '';
1918	$self->emit (activate => $txt);	2084	$self->emit (activate => $txt);
1919	$self->update;	2085	$self->update;
1920		2086
1921	} elsif ($sym == CFClient::SDLK_UP) {	2087	} elsif ($sym == CFPlus::SDLK_UP) {
1922	if ($self->{history_pointer} < 0) {	2088	if ($self->{history_pointer} < 0) {
1923	$self->{history_saveback} = $self->get_text;	2089	$self->{history_saveback} = $self->get_text;
1924	}	2090	}
1925	if (@{$self->{history} || []} > 0) {	2091	if (@{$self->{history} || []} > 0) {
1926	$self->{history_pointer}++;	2092	$self->{history_pointer}++;
…		…
1928	$self->{history_pointer} = @{$self->{history} || []} - 1;	2094	$self->{history_pointer} = @{$self->{history} || []} - 1;
1929	}	2095	}
1930	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2096	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1931	}	2097	}
1932		2098
1933	} elsif ($sym == CFClient::SDLK_DOWN) {	2099	} elsif ($sym == CFPlus::SDLK_DOWN) {
1934	$self->{history_pointer}--;	2100	$self->{history_pointer}--;
1935	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2101	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1936		2102
1937	if ($self->{history_pointer} >= 0) {	2103	if ($self->{history_pointer} >= 0) {
1938	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2104	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1947	1	2113	1
1948	}	2114	}
1949		2115
1950	#############################################################################	2116	#############################################################################
1951		2117
		2118	package CFPlus::UI::TextEdit;
		2119
		2120	our @ISA = CFPlus::UI::EntryBase::;
		2121
		2122	use CFPlus::OpenGL;
		2123
		2124	sub move_cursor_ver {
		2125	my ($self, $dy) = @_;
		2126
		2127	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2128
		2129	$y += $dy;
		2130
		2131	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2132	$self->{cursor} = $index;
		2133	delete $self->{cur_h};
		2134	$self->update;
		2135	return;
		2136	}
		2137	}
		2138
		2139	sub invoke_key_down {
		2140	my ($self, $ev) = @_;
		2141
		2142	my $sym = $ev->{sym};
		2143
		2144	if ($sym == CFPlus::SDLK_UP) {
		2145	$self->move_cursor_ver (-1);
		2146	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2147	$self->move_cursor_ver (+1);
		2148	} else {
		2149	return $self->SUPER::invoke_key_down ($ev)
		2150	}
		2151
		2152	1
		2153	}
		2154
		2155	#############################################################################
		2156
1952	package CFClient::UI::Button;	2157	package CFPlus::UI::Button;
1953		2158
1954	our @ISA = CFClient::UI::Label::;	2159	our @ISA = CFPlus::UI::Label::;
1955		2160
1956	use CFClient::OpenGL;	2161	use CFPlus::OpenGL;
1957		2162
1958	my @tex =	2163	my @tex =
1959	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2164	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1960	qw(b1_button_active.png);	2165	qw(b1_button_active.png);
1961		2166
1962	sub new {	2167	sub new {
1963	my $class = shift;	2168	my $class = shift;
1964		2169
…		…
2001	$self->SUPER::_draw;	2206	$self->SUPER::_draw;
2002	}	2207	}
2003		2208
2004	#############################################################################	2209	#############################################################################
2005		2210
		2211	package CFPlus::UI::CheckBox;
		2212
		2213	our @ISA = CFPlus::UI::DrawBG::;
		2214
		2215	my @tex =
		2216	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2217	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2218
		2219	use CFPlus::OpenGL;
		2220
		2221	sub new {
		2222	my $class = shift;
		2223
		2224	$class->SUPER::new (
		2225	padding_x => 2,
		2226	padding_y => 2,
		2227	fg => [1, 1, 1],
		2228	active_fg => [1, 1, 0],
		2229	bg => [0, 0, 0, 0.2],
		2230	active_bg => [1, 1, 1, 0.5],
		2231	state => 0,
		2232	can_hover => 1,
		2233	@_
		2234	)
		2235	}
		2236
		2237	sub size_request {
		2238	my ($self) = @_;
		2239
		2240	(6) x 2
		2241	}
		2242
		2243	sub toggle {
		2244	my ($self) = @_;
		2245
		2246	$self->{state} = !$self->{state};
		2247	$self->emit (changed => $self->{state});
		2248	$self->update;
		2249	}
		2250
		2251	sub invoke_button_down {
		2252	my ($self, $ev, $x, $y) = @_;
		2253
		2254	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2255	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2256	$self->toggle;
		2257	} else {
		2258	return 0
		2259	}
		2260
		2261	1
		2262	}
		2263
		2264	sub _draw {
		2265	my ($self) = @_;
		2266
		2267	$self->SUPER::_draw;
		2268
		2269	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2270
		2271	my ($w, $h) = @$self{qw(w h)};
		2272
		2273	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2274
		2275	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2276
		2277	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2278
		2279	glEnable GL_TEXTURE_2D;
		2280	$tex->draw_quad_alpha (0, 0, $s, $s);
		2281	glDisable GL_TEXTURE_2D;
		2282	}
		2283
		2284	#############################################################################
		2285
		2286	package CFPlus::UI::Image;
		2287
		2288	our @ISA = CFPlus::UI::Base::;
		2289
		2290	use CFPlus::OpenGL;
		2291
		2292	our %texture_cache;
		2293
		2294	sub new {
		2295	my $class = shift;
		2296
		2297	my $self = $class->SUPER::new (
		2298	can_events => 0,
		2299	@_,
		2300	);
		2301
		2302	$self->{path} || $self->{tex}
		2303	or Carp::croak "'path' or 'tex' attributes required";
		2304
		2305	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2306	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2307
		2308	Scalar::Util::weaken $texture_cache{$self->{path}};
		2309
		2310	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2311
		2312	$self
		2313	}
		2314
		2315	sub STORABLE_freeze {
		2316	my ($self, $cloning) = @_;
		2317
		2318	$self->{path}
		2319	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2320
		2321	$self->{path}
		2322	}
		2323
		2324	sub STORABLE_attach {
		2325	my ($self, $cloning, $path) = @_;
		2326
		2327	$self->new (path => $path)
		2328	}
		2329
		2330	sub size_request {
		2331	my ($self) = @_;
		2332
		2333	($self->{tex}{w}, $self->{tex}{h})
		2334	}
		2335
		2336	sub _draw {
		2337	my ($self) = @_;
		2338
		2339	my $tex = $self->{tex};
		2340
		2341	my ($w, $h) = ($self->{w}, $self->{h});
		2342
		2343	if ($self->{rot90}) {
		2344	glRotate 90, 0, 0, 1;
		2345	glTranslate 0, -$self->{w}, 0;
		2346
		2347	($w, $h) = ($h, $w);
		2348	}
		2349
		2350	glEnable GL_TEXTURE_2D;
		2351	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2352
		2353	$tex->draw_quad (0, 0, $w, $h);
		2354
		2355	glDisable GL_TEXTURE_2D;
		2356	}
		2357
		2358	#############################################################################
		2359
2006	package CFClient::UI::ImageButton;	2360	package CFPlus::UI::ImageButton;
2007		2361
2008	our @ISA = CFClient::UI::Image::;	2362	our @ISA = CFPlus::UI::Image::;
2009		2363
2010	use CFClient::OpenGL;	2364	use CFPlus::OpenGL;
2011		2365
2012	my %textures;	2366	my %textures;
2013		2367
2014	sub new {	2368	sub new {
2015	my $class = shift;	2369	my $class = shift;
…		…
2037	1	2391	1
2038	}	2392	}
2039		2393
2040	#############################################################################	2394	#############################################################################
2041		2395
2042	package CFClient::UI::CheckBox;
2043
2044	our @ISA = CFClient::UI::DrawBG::;
2045
2046	my @tex =
2047	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2048	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2049
2050	use CFClient::OpenGL;
2051
2052	sub new {
2053	my $class = shift;
2054
2055	$class->SUPER::new (
2056	padding_x => 2,
2057	padding_y => 2,
2058	fg => [1, 1, 1],
2059	active_fg => [1, 1, 0],
2060	bg => [0, 0, 0, 0.2],
2061	active_bg => [1, 1, 1, 0.5],
2062	state => 0,
2063	can_hover => 1,
2064	@_
2065	)
2066	}
2067
2068	sub size_request {
2069	my ($self) = @_;
2070
2071	(6) x 2
2072	}
2073
2074	sub toggle {
2075	my ($self) = @_;
2076
2077	$self->{state} = !$self->{state};
2078	$self->emit (changed => $self->{state});
2079	$self->update;
2080	}
2081
2082	sub invoke_button_down {
2083	my ($self, $ev, $x, $y) = @_;
2084
2085	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2086	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2087	$self->toggle;
2088	} else {
2089	return 0
2090	}
2091
2092	1
2093	}
2094
2095	sub _draw {
2096	my ($self) = @_;
2097
2098	$self->SUPER::_draw;
2099
2100	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2101
2102	my ($w, $h) = @$self{qw(w h)};
2103
2104	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2105
2106	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2107
2108	my $tex = $self->{state} ? $tex[1] : $tex[0];
2109
2110	glEnable GL_TEXTURE_2D;
2111	$tex->draw_quad_alpha (0, 0, $s, $s);
2112	glDisable GL_TEXTURE_2D;
2113	}
2114
2115	#############################################################################
2116
2117	package CFClient::UI::Image;	2396	package CFPlus::UI::VGauge;
2118		2397
2119	our @ISA = CFClient::UI::Base::;	2398	our @ISA = CFPlus::UI::Base::;
2120
2121	use CFClient::OpenGL;
2122
2123	our %texture_cache;
2124
2125	sub new {
2126	my $class = shift;
2127
2128	my $self = $class->SUPER::new (
2129	can_events => 0,
2130	@_,
2131	);
2132
2133	$self->{path} || $self->{tex}
2134	or Carp::croak "'path' or 'tex' attributes required";
2135
2136	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2137	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2138
2139	Scalar::Util::weaken $texture_cache{$self->{path}};
2140
2141	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2142
2143	$self
2144	}
2145
2146	sub size_request {
2147	my ($self) = @_;
2148
2149	($self->{tex}{w}, $self->{tex}{h})
2150	}
2151
2152	sub _draw {
2153	my ($self) = @_;
2154
2155	my $tex = $self->{tex};
2156
2157	my ($w, $h) = ($self->{w}, $self->{h});
2158
2159	if ($self->{rot90}) {
2160	glRotate 90, 0, 0, 1;
2161	glTranslate 0, -$self->{w}, 0;
2162
2163	($w, $h) = ($h, $w);
2164	}
2165
2166	glEnable GL_TEXTURE_2D;
2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2168
2169	$tex->draw_quad_alpha (0, 0, $w, $h);
2170
2171	glDisable GL_TEXTURE_2D;
2172	}
2173
2174	#############################################################################
2175
2176	package CFClient::UI::VGauge;
2177
2178	our @ISA = CFClient::UI::Base::;
2179		2399
2180	use List::Util qw(min max);	2400	use List::Util qw(min max);
2181		2401
2182	use CFClient::OpenGL;	2402	use CFPlus::OpenGL;
2183		2403
2184	my %tex = (	2404	my %tex = (
2185	food => [	2405	food => [
2186	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2406	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2407	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2188	],	2408	],
2189	grace => [	2409	grace => [
2190	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2410	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2411	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2192	],	2412	],
2193	hp => [	2413	hp => [
2194	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2414	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2195	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2415	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2196	],	2416	],
2197	mana => [	2417	mana => [
2198	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2418	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2199	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2419	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2200	],	2420	],
2201	);	2421	);
2202		2422
2203	# eg. VGauge->new (gauge => 'food'), default gauge: food	2423	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2306	glDisable GL_TEXTURE_2D;	2526	glDisable GL_TEXTURE_2D;
2307	}	2527	}
2308		2528
2309	#############################################################################	2529	#############################################################################
2310		2530
2311	package CFClient::UI::Gauge;	2531	package CFPlus::UI::Gauge;
2312		2532
2313	our @ISA = CFClient::UI::VBox::;	2533	our @ISA = CFPlus::UI::VBox::;
2314		2534
2315	sub new {	2535	sub new {
2316	my ($class, %arg) = @_;	2536	my ($class, %arg) = @_;
2317		2537
2318	my $self = $class->SUPER::new (	2538	my $self = $class->SUPER::new (
…		…
2320	can_hover => 1,	2540	can_hover => 1,
2321	can_events => 1,	2541	can_events => 1,
2322	%arg,	2542	%arg,
2323	);	2543	);
2324		2544
2325	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2545	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2326	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2546	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2327	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2547	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2328		2548
2329	$self	2549	$self
2330	}	2550	}
2331		2551
2332	sub set_fontsize {	2552	sub set_fontsize {
…		…
2353	$self->{value}->set_text ($val);	2573	$self->{value}->set_text ($val);
2354	}	2574	}
2355		2575
2356	#############################################################################	2576	#############################################################################
2357		2577
2358	package CFClient::UI::Slider;	2578	package CFPlus::UI::Slider;
2359		2579
2360	use strict;	2580	use strict;
2361		2581
2362	use CFClient::OpenGL;	2582	use CFPlus::OpenGL;
2363		2583
2364	our @ISA = CFClient::UI::DrawBG::;	2584	our @ISA = CFPlus::UI::DrawBG::;
2365		2585
2366	my @tex =	2586	my @tex =
2367	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2587	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2368	qw(s1_slider.png s1_slider_bg.png);	2588	qw(s1_slider.png s1_slider_bg.png);
2369		2589
2370	sub new {	2590	sub new {
2371	my $class = shift;	2591	my $class = shift;
2372		2592
…		…
2461	}	2681	}
2462		2682
2463	1	2683	1
2464	}	2684	}
2465		2685
		2686	sub invoke_mouse_wheel {
		2687	my ($self, $ev) = @_;
		2688
		2689	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2690
		2691	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2692
		2693	! ! $delta
		2694	}
		2695
2466	sub update {	2696	sub update {
2467	my ($self) = @_;	2697	my ($self) = @_;
2468		2698
2469	delete $self->{knob_w};	2699	delete $self->{knob_w};
2470	$self->SUPER::update;	2700	$self->SUPER::update;
…		…
2517	glDisable GL_TEXTURE_2D;	2747	glDisable GL_TEXTURE_2D;
2518	}	2748	}
2519		2749
2520	#############################################################################	2750	#############################################################################
2521		2751
2522	package CFClient::UI::ValSlider;	2752	package CFPlus::UI::ValSlider;
2523		2753
2524	our @ISA = CFClient::UI::HBox::;	2754	our @ISA = CFPlus::UI::HBox::;
2525		2755
2526	sub new {	2756	sub new {
2527	my ($class, %arg) = @_;	2757	my ($class, %arg) = @_;
2528		2758
2529	my $range = delete $arg{range};	2759	my $range = delete $arg{range};
2530		2760
2531	my $self = $class->SUPER::new (	2761	my $self = $class->SUPER::new (
2532	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2762	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2533	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2763	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2534	to_value => sub { shift },	2764	to_value => sub { shift },
2535	from_value => sub { shift },	2765	from_value => sub { shift },
2536	%arg,	2766	%arg,
2537	);	2767	);
2538		2768
…		…
2558	sub set_range { shift->{slider}->set_range (@_) }	2788	sub set_range { shift->{slider}->set_range (@_) }
2559	sub set_value { shift->{slider}->set_value (@_) }	2789	sub set_value { shift->{slider}->set_value (@_) }
2560		2790
2561	#############################################################################	2791	#############################################################################
2562		2792
2563	package CFClient::UI::TextScroller;	2793	package CFPlus::UI::TextScroller;
2564		2794
2565	our @ISA = CFClient::UI::HBox::;	2795	our @ISA = CFPlus::UI::HBox::;
2566		2796
2567	use CFClient::OpenGL;	2797	use CFPlus::OpenGL;
2568		2798
2569	sub new {	2799	sub new {
2570	my $class = shift;	2800	my $class = shift;
2571		2801
2572	my $self = $class->SUPER::new (	2802	my $self = $class->SUPER::new (
2573	fontsize => 1,	2803	fontsize => 1,
2574	can_events => 0,	2804	can_events => 1,
2575	indent => 0,	2805	indent => 0,
2576	#font => default_font	2806	#font => default_font
2577	@_,	2807	@_,
2578		2808
2579	layout => (new CFClient::Layout),	2809	layout => (new CFPlus::Layout),
2580	par => [],	2810	par => [],
2581	height => 0,	2811	height => 0,
2582	children => [	2812	children => [
2583	(new CFClient::UI::Empty expand => 1),	2813	(new CFPlus::UI::Empty expand => 1),
2584	(new CFClient::UI::Slider vertical => 1),	2814	(new CFPlus::UI::Slider vertical => 1),
2585	],	2815	],
2586	);	2816	);
2587		2817
2588	$self->{children}[1]->connect (changed => sub { $self->update });	2818	$self->{children}[1]->connect (changed => sub { $self->update });
2589		2819
…		…
2619		2849
2620	$self->reflow;	2850	$self->reflow;
2621		2851
2622	local $self->{children} = [$empty, $slider];	2852	local $self->{children} = [$empty, $slider];
2623	$self->SUPER::invoke_size_allocate ($w, $h)	2853	$self->SUPER::invoke_size_allocate ($w, $h)
		2854	}
		2855
		2856	sub invoke_mouse_wheel {
		2857	my ($self, $ev) = @_;
		2858
		2859	return 0 unless $ev->{dy}; # only vertical movements
		2860
		2861	$self->{children}[1]->emit (mouse_wheel => $ev);
		2862
		2863	1
2624	}	2864	}
2625		2865
2626	sub get_layout {	2866	sub get_layout {
2627	my ($self, $para) = @_;	2867	my ($self, $para) = @_;
2628		2868
…		…
2656		2896
2657	# todo: base offset on lines or so, not on pixels	2897	# todo: base offset on lines or so, not on pixels
2658	$self->{children}[1]->set_value ($offset);	2898	$self->{children}[1]->set_value ($offset);
2659	}	2899	}
2660		2900
		2901	sub current_paragraph {
		2902	my ($self) = @_;
		2903
		2904	$self->{top_paragraph} - 1
		2905	}
		2906
		2907	sub scroll_to {
		2908	my ($self, $para) = @_;
		2909
		2910	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2911
		2912	$self->{scroll_to} = $para;
		2913	$self->update;
		2914	}
		2915
2661	sub clear {	2916	sub clear {
2662	my ($self) = @_;	2917	my ($self) = @_;
2663		2918
2664	my (undef, undef, @other) = @{ $self->{children} };	2919	my (undef, undef, @other) = @{ $self->{children} };
2665	$self->remove ($_) for @other;	2920	$self->remove ($_) for @other;
…		…
2668	$self->{height} = 0;	2923	$self->{height} = 0;
2669	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2924	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2670	}	2925	}
2671		2926
2672	sub add_paragraph {	2927	sub add_paragraph {
2673	my ($self, $color, $para, $indent) = @_;	2928	my $self = shift;
2674		2929
2675	my ($text, @w) = ref $para ? @$para : $para;	2930	for my $para (@_) {
2676
2677	$para = {	2931	$para = {
		2932	fg => [1, 1, 1, 1],
		2933	indent => 0,
		2934	markup => "",
		2935	widget => [],
		2936	ref $para ? %$para : (markup => $para),
2678	w => 1e10,	2937	w => 1e10,
2679	wrapped => 1,	2938	wrapped => 1,
2680	fg => $color,
2681	indent => $indent,
2682	markup => $text,
2683	widget => \@w,
2684	};	2939	};
2685		2940
2686	$self->add (@w) if @w;	2941	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2687	push @{$self->{par}}, $para;	2942	push @{$self->{par}}, $para;
		2943	}
2688		2944
2689	$self->{need_reflow}++;	2945	$self->{need_reflow}++;
2690	$self->update;	2946	$self->update;
2691	}	2947	}
2692		2948
2693	sub scroll_to_bottom {	2949	sub scroll_to_bottom {
2694	my ($self) = @_;	2950	my ($self) = @_;
2695		2951
2696	$self->{scroll_to_bottom} = 1;	2952	$self->{scroll_to} = $#{$self->{par}};
2697	$self->update;	2953	$self->update;
2698	}	2954	}
2699		2955
		2956	sub force_uptodate {
		2957	my ($self) = @_;
		2958
		2959	if (delete $self->{need_reflow}) {
		2960	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2961
		2962	my $height = 0;
		2963
		2964	for my $para (@{$self->{par}}) {
		2965	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2966	my $layout = $self->get_layout ($para);
		2967	my ($w, $h) = $layout->size;
		2968
		2969	$para->{w} = $w + $para->{indent};
		2970	$para->{h} = $h;
		2971	$para->{wrapped} = $layout->has_wrapped;
		2972	}
		2973
		2974	$para->{y} = $height;
		2975	$height += $para->{h};
		2976	}
		2977
		2978	$self->{height} = $height;
		2979	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2980
		2981	delete $self->{texture};
		2982	}
		2983
		2984	if (my $paridx = delete $self->{scroll_to}) {
		2985	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2986	}
		2987	}
		2988
2700	sub update {	2989	sub update {
2701	my ($self) = @_;	2990	my ($self) = @_;
2702		2991
2703	$self->SUPER::update;	2992	$self->SUPER::update;
2704		2993
2705	return unless $self->{h} > 0;	2994	return unless $self->{h} > 0;
2706		2995
2707	delete $self->{texture};	2996	delete $self->{texture};
2708		2997
2709	$ROOT->on_post_alloc ($self => sub {	2998	$ROOT->on_post_alloc ($self => sub {
		2999	$self->force_uptodate;
		3000
2710	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3001	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711		3002
2712	if (delete $self->{need_reflow}) {
2713	my $height = 0;
2714
2715	for my $para (@{$self->{par}}) {
2716	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2717	my $layout = $self->get_layout ($para);
2718	my ($w, $h) = $layout->size;
2719
2720	$para->{w} = $w + $para->{indent};
2721	$para->{h} = $h;
2722	$para->{wrapped} = $layout->has_wrapped;
2723	}
2724
2725	$height += $para->{h};
2726	}
2727
2728	$self->{height} = $height;
2729
2730	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2731
2732	delete $self->{texture};
2733	}
2734
2735	if (delete $self->{scroll_to_bottom}) {
2736	$self->{children}[1]->set_value (1e10);
2737	}
2738
2739	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3003	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2740	glClearColor 0, 0, 0, 0;	3004	glClearColor 0, 0, 0, 0;
2741	glClear GL_COLOR_BUFFER_BIT;	3005	glClear GL_COLOR_BUFFER_BIT;
2742		3006
		3007	package CFPlus::UI::Base;
		3008	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3009	(0, 0, $self->{w}, $self->{h});
		3010
		3011	my $top = int $self->{children}[1]{range}[0];
		3012
		3013	my $paridx = 0;
		3014	my $top_paragraph;
2743	my $top = int $self->{children}[1]{range}[0];	3015	my $top = int $self->{children}[1]{range}[0];
2744		3016
2745	my $y0 = $top;	3017	my $y0 = $top;
2746	my $y1 = $top + $H;	3018	my $y1 = $top + $H;
2747		3019
2748	my $y = 0;
2749
2750	for my $para (@{$self->{par}}) {	3020	for my $para (@{$self->{par}}) {
2751	my $h = $para->{h};	3021	my $h = $para->{h};
		3022	my $y = $para->{y};
2752		3023
2753	if ($y0 < $y + $h && $y < $y1) {	3024	if ($y0 < $y + $h && $y < $y1) {
2754
2755	my $layout = $self->get_layout ($para);	3025	my $layout = $self->get_layout ($para);
2756		3026
2757	$layout->render ($para->{indent}, $y - $y0);	3027	$layout->render ($para->{indent}, $y - $y0);
2758		3028
2759	if (my @w = @{ $para->{widget} }) {	3029	if (my @w = @{ $para->{widget} }) {
…		…
2768	$_->draw;	3038	$_->draw;
2769	}	3039	}
2770	}	3040	}
2771	}	3041	}
2772		3042
2773	$y += $h;	3043	$paridx++;
		3044	$top_paragraph ||= $paridx if $y >= $top;
2774	}	3045	}
		3046
		3047	$self->{top_paragraph} = $top_paragraph;
2775	};	3048	};
2776	});	3049	});
2777	}	3050	}
2778		3051
2779	sub reconfigure {	3052	sub reconfigure {
…		…
2797	$self->{children}[1]->draw;	3070	$self->{children}[1]->draw;
2798	}	3071	}
2799		3072
2800	#############################################################################	3073	#############################################################################
2801		3074
2802	package CFClient::UI::Animator;	3075	package CFPlus::UI::Animator;
2803		3076
2804	use CFClient::OpenGL;	3077	use CFPlus::OpenGL;
2805		3078
2806	our @ISA = CFClient::UI::Bin::;	3079	our @ISA = CFPlus::UI::Bin::;
2807		3080
2808	sub moveto {	3081	sub moveto {
2809	my ($self, $x, $y) = @_;	3082	my ($self, $x, $y) = @_;
2810		3083
2811	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3084	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2839	glPopMatrix;	3112	glPopMatrix;
2840	}	3113	}
2841		3114
2842	#############################################################################	3115	#############################################################################
2843		3116
2844	package CFClient::UI::Flopper;	3117	package CFPlus::UI::Flopper;
2845		3118
2846	our @ISA = CFClient::UI::Button::;	3119	our @ISA = CFPlus::UI::Button::;
2847		3120
2848	sub new {	3121	sub new {
2849	my $class = shift;	3122	my $class = shift;
2850		3123
2851	my $self = $class->SUPER::new (	3124	my $self = $class->SUPER::new (
…		…
2863	$self->{other}->toggle_visibility;	3136	$self->{other}->toggle_visibility;
2864	}	3137	}
2865		3138
2866	#############################################################################	3139	#############################################################################
2867		3140
2868	package CFClient::UI::Tooltip;	3141	package CFPlus::UI::Tooltip;
2869		3142
2870	our @ISA = CFClient::UI::Bin::;	3143	our @ISA = CFPlus::UI::Bin::;
2871		3144
2872	use CFClient::OpenGL;	3145	use CFPlus::OpenGL;
2873		3146
2874	sub new {	3147	sub new {
2875	my $class = shift;	3148	my $class = shift;
2876		3149
2877	$class->SUPER::new (	3150	$class->SUPER::new (
…		…
2880	)	3153	)
2881	}	3154	}
2882		3155
2883	sub set_tooltip_from {	3156	sub set_tooltip_from {
2884	my ($self, $widget) = @_;	3157	my ($self, $widget) = @_;
		3158
		3159	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3160	if $widget->{tooltip} =~ /^#(.*)$/;
2885		3161
2886	my $tooltip = $widget->{tooltip};	3162	my $tooltip = $widget->{tooltip};
2887		3163
2888	if ($ENV{CFPLUS_DEBUG} & 2) {	3164	if ($ENV{CFPLUS_DEBUG} & 2) {
2889	$tooltip .= "\n\n" . (ref $widget) . "\n"	3165	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2893	}	3169	}
2894		3170
2895	$tooltip =~ s/^\n+//;	3171	$tooltip =~ s/^\n+//;
2896	$tooltip =~ s/\n+$//;	3172	$tooltip =~ s/\n+$//;
2897		3173
2898	$self->add (new CFClient::UI::Label	3174	$self->add (new CFPlus::UI::Label
2899	markup => $tooltip,	3175	markup => $tooltip,
2900	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3176	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2901	fontsize => 0.8,	3177	fontsize => 0.8,
2902	fg => [0, 0, 0, 1],	3178	style => 1, # FLAG_INVERSE
2903	ellipsise => 0,	3179	ellipsise => 0,
2904	font => ($widget->{tooltip_font} || $::FONT_PROP),	3180	font => ($widget->{tooltip_font} || $::FONT_PROP),
2905	);	3181	);
2906	}	3182	}
2907		3183
…		…
2926		3202
2927	$self->{root}->on_post_alloc ("move_$self" => sub {	3203	$self->{root}->on_post_alloc ("move_$self" => sub {
2928	my $widget = $self->{owner}	3204	my $widget = $self->{owner}
2929	or return;	3205	or return;
2930		3206
		3207	if ($widget->{visible}) {
2931	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3208	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932		3209
2933	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3210	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934	if $x + $self->{w} > $self->{root}{w};	3211	if $x + $self->{w} > $self->{root}{w};
2935		3212
2936	$self->move_abs ($x, $y);	3213	$self->move_abs ($x, $y);
		3214	} else {
		3215	$self->hide;
		3216	}
2937	});	3217	});
2938	}	3218	}
2939		3219
2940	sub _draw {	3220	sub _draw {
2941	my ($self) = @_;	3221	my ($self) = @_;
…		…
2965	$self->SUPER::_draw;	3245	$self->SUPER::_draw;
2966	}	3246	}
2967		3247
2968	#############################################################################	3248	#############################################################################
2969		3249
2970	package CFClient::UI::Face;	3250	package CFPlus::UI::Face;
2971		3251
2972	our @ISA = CFClient::UI::Base::;	3252	our @ISA = CFPlus::UI::DrawBG::;
2973		3253
2974	use CFClient::OpenGL;	3254	use CFPlus::OpenGL;
2975		3255
2976	sub new {	3256	sub new {
2977	my $class = shift;	3257	my $class = shift;
2978		3258
2979	my $self = $class->SUPER::new (	3259	my $self = $class->SUPER::new (
…		…
3014	sub _draw {	3294	sub _draw {
3015	my ($self) = @_;	3295	my ($self) = @_;
3016		3296
3017	return unless $::CONN;	3297	return unless $::CONN;
3018		3298
		3299	$self->SUPER::_draw;
		3300
3019	my $face;	3301	my $face;
3020		3302
3021	if ($self->{frame}) {	3303	if ($self->{frame}) {
3022	my $anim = $::CONN->{anim}[$self->{anim}];	3304	my $anim = $::CONN->{anim}[$self->{anim}];
3023		3305
…		…
3045	$self->SUPER::destroy;	3327	$self->SUPER::destroy;
3046	}	3328	}
3047		3329
3048	#############################################################################	3330	#############################################################################
3049		3331
3050	package CFClient::UI::Buttonbar;	3332	package CFPlus::UI::Buttonbar;
3051		3333
3052	our @ISA = CFClient::UI::HBox::;	3334	our @ISA = CFPlus::UI::HBox::;
3053		3335
3054	# TODO: should actualyl wrap buttons and other goodies.	3336	# TODO: should actually wrap buttons and other goodies.
3055		3337
3056	#############################################################################	3338	#############################################################################
3057		3339
3058	package CFClient::UI::Menu;	3340	package CFPlus::UI::Menu;
3059		3341
3060	our @ISA = CFClient::UI::FancyFrame::;	3342	our @ISA = CFPlus::UI::Toplevel::;
3061		3343
3062	use CFClient::OpenGL;	3344	use CFPlus::OpenGL;
3063		3345
3064	sub new {	3346	sub new {
3065	my $class = shift;	3347	my $class = shift;
3066		3348
3067	my $self = $class->SUPER::new (	3349	my $self = $class->SUPER::new (
3068	items => [],	3350	items => [],
3069	z => 100,	3351	z => 100,
3070	@_,	3352	@_,
3071	);	3353	);
3072		3354
3073	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3355	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3074		3356
3075	for my $item (@{ $self->{items} }) {	3357	for my $item (@{ $self->{items} }) {
3076	my ($widget, $cb, $tooltip) = @$item;	3358	my ($widget, $cb, $tooltip) = @$item;
3077		3359
3078	# handle various types of items, only text for now	3360	# handle various types of items, only text for now
3079	if (!ref $widget) {	3361	if (!ref $widget) {
3080	if ($widget =~ /\t/) {	3362	if ($widget =~ /\t/) {
3081	my ($left, $right) = split /\t/, $widget, 2;	3363	my ($left, $right) = split /\t/, $widget, 2;
3082		3364
3083	$widget = new CFClient::UI::HBox	3365	$widget = new CFPlus::UI::HBox
3084	can_hover => 1,	3366	can_hover => 1,
3085	can_events => 1,	3367	can_events => 1,
3086	tooltip => $tooltip,	3368	tooltip => $tooltip,
3087	children => [	3369	children => [
3088	(new CFClient::UI::Label markup => $left, expand => 1),	3370	(new CFPlus::UI::Label markup => $left, expand => 1),
3089	(new CFClient::UI::Label markup => $right, align => +1),	3371	(new CFPlus::UI::Label markup => $right, align => +1),
3090	],	3372	],
3091	;	3373	;
3092		3374
3093	} else {	3375	} else {
3094	$widget = new CFClient::UI::Label	3376	$widget = new CFPlus::UI::Label
3095	can_hover => 1,	3377	can_hover => 1,
3096	can_events => 1,	3378	can_events => 1,
3097	markup => $widget,	3379	markup => $widget,
3098	tooltip => $tooltip;	3380	tooltip => $tooltip;
3099	}	3381	}
…		…
3147	1	3429	1
3148	}	3430	}
3149		3431
3150	#############################################################################	3432	#############################################################################
3151		3433
3152	package CFClient::UI::Multiplexer;	3434	package CFPlus::UI::Multiplexer;
3153		3435
3154	our @ISA = CFClient::UI::Container::;	3436	our @ISA = CFPlus::UI::Container::;
3155		3437
3156	sub new {	3438	sub new {
3157	my $class = shift;	3439	my $class = shift;
3158		3440
3159	my $self = $class->SUPER::new (	3441	my $self = $class->SUPER::new (
…		…
3220	$self->{current}->draw;	3502	$self->{current}->draw;
3221	}	3503	}
3222		3504
3223	#############################################################################	3505	#############################################################################
3224		3506
3225	package CFClient::UI::Notebook;	3507	package CFPlus::UI::Notebook;
3226		3508
3227	our @ISA = CFClient::UI::VBox::;	3509	our @ISA = CFPlus::UI::VBox::;
3228		3510
3229	sub new {	3511	sub new {
3230	my $class = shift;	3512	my $class = shift;
3231		3513
3232	my $self = $class->SUPER::new (	3514	my $self = $class->SUPER::new (
3233	buttonbar => (new CFClient::UI::Buttonbar),	3515	buttonbar => (new CFPlus::UI::Buttonbar),
3234	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3516	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3235	# filter => # will be put between multiplexer and $self	3517	# filter => # will be put between multiplexer and $self
3236	@_,	3518	@_,
3237	);	3519	);
3238		3520
3239	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3521	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3245	sub add {	3527	sub add {
3246	my ($self, $title, $widget, $tooltip) = @_;	3528	my ($self, $title, $widget, $tooltip) = @_;
3247		3529
3248	Scalar::Util::weaken $self;	3530	Scalar::Util::weaken $self;
3249		3531
3250	$self->{buttonbar}->add (new CFClient::UI::Button	3532	$self->{buttonbar}->add (new CFPlus::UI::Button
3251	markup => $title,	3533	markup => $title,
3252	tooltip => $tooltip,	3534	tooltip => $tooltip,
3253	on_activate => sub { $self->set_current_page ($widget) },	3535	on_activate => sub { $self->set_current_page ($widget) },
3254	);	3536	);
3255		3537
…		…
3269	$self->emit (page_changed => $self->{multiplexer}{current});	3551	$self->emit (page_changed => $self->{multiplexer}{current});
3270	}	3552	}
3271		3553
3272	#############################################################################	3554	#############################################################################
3273		3555
3274	package CFClient::UI::Combobox;	3556	package CFPlus::UI::Selector;
3275		3557
3276	use utf8;	3558	use utf8;
3277		3559
3278	our @ISA = CFClient::UI::Button::;	3560	our @ISA = CFPlus::UI::Button::;
3279		3561
3280	sub new {	3562	sub new {
3281	my $class = shift;	3563	my $class = shift;
3282		3564
3283	my $self = $class->SUPER::new (	3565	my $self = $class->SUPER::new (
…		…
3300	my ($value, $title, $tooltip) = @$_;	3582	my ($value, $title, $tooltip) = @$_;
3301		3583
3302	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3584	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303	}	3585	}
3304		3586
3305	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3587	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306	}	3588	}
3307		3589
3308	sub _set_value {	3590	sub _set_value {
3309	my ($self, $value) = @_;	3591	my ($self, $value) = @_;
3310		3592
…		…
3325	$self->emit (changed => $value);	3607	$self->emit (changed => $value);
3326	}	3608	}
3327		3609
3328	#############################################################################	3610	#############################################################################
3329		3611
3330	package CFClient::UI::Statusbox;	3612	package CFPlus::UI::Statusbox;
3331		3613
3332	our @ISA = CFClient::UI::VBox::;	3614	our @ISA = CFPlus::UI::VBox::;
3333		3615
3334	sub new {	3616	sub new {
3335	my $class = shift;	3617	my $class = shift;
3336		3618
3337	my $self = $class->SUPER::new (	3619	my $self = $class->SUPER::new (
…		…
3349	sub reorder {	3631	sub reorder {
3350	my ($self) = @_;	3632	my ($self) = @_;
3351	my $NOW = Time::HiRes::time;	3633	my $NOW = Time::HiRes::time;
3352		3634
3353	# freeze display when hovering over any label	3635	# freeze display when hovering over any label
3354	return if $CFClient::UI::TOOLTIP->{owner}	3636	return if $CFPlus::UI::TOOLTIP->{owner}
3355	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3637	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3356	values %{ $self->{item} };	3638	values %{ $self->{item} };
3357		3639
3358	while (my ($k, $v) = each %{ $self->{item} }) {	3640	while (my ($k, $v) = each %{ $self->{item} }) {
3359	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3641	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3360	}	3642	}
…		…
3381	for ($short) {	3663	for ($short) {
3382	s/^\s+//;	3664	s/^\s+//;
3383	s/\s+/ /g;	3665	s/\s+/ /g;
3384	}	3666	}
3385		3667
3386	new CFClient::UI::Label	3668	new CFPlus::UI::Label
3387	markup => $short,	3669	markup => $short,
3388	tooltip => $item->{tooltip},	3670	tooltip => $item->{tooltip},
3389	tooltip_font => $::FONT_PROP,	3671	tooltip_font => $::FONT_PROP,
3390	tooltip_width => 0.67,	3672	tooltip_width => 0.67,
3391	fontsize => $item->{fontsize} || $self->{fontsize},	3673	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3470	$self->SUPER::destroy;	3752	$self->SUPER::destroy;
3471	}	3753	}
3472		3754
3473	#############################################################################	3755	#############################################################################
3474		3756
3475	package CFClient::UI::Inventory;	3757	package CFPlus::UI::Inventory;
3476		3758
3477	our @ISA = CFClient::UI::Table::;	3759	our @ISA = CFPlus::UI::Table::;
3478		3760
3479	sub new {	3761	sub new {
3480	my $class = shift;	3762	my $class = shift;
3481		3763
3482	my $self = $class->SUPER::new (	3764	my $self = $class->SUPER::new (
3483	col_expand => [0, 1, 0],	3765	col_expand => [0, 1, 0],
		3766	items => [],
3484	@_,	3767	@_,
3485	);	3768	);
3486		3769
		3770	$self->set_sort_order (undef);
		3771
3487	$self	3772	$self
		3773	}
		3774
		3775	sub update_items {
		3776	my ($self) = @_;
		3777
		3778	$self->clear;
		3779
		3780	my @item = $self->{sort}->(@{ $self->{items} });
		3781
		3782	my @adds;
		3783	my $row = 0;
		3784	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3785	CFPlus::Item::update_widgets $item;
		3786
		3787	push @adds, 0, $row, $item->{face_widget};
		3788	push @adds, 1, $row, $item->{desc_widget};
		3789	push @adds, 2, $row, $item->{weight_widget};
		3790
		3791	$row++;
		3792	}
		3793
		3794	$self->add (@adds);
		3795	}
		3796
		3797	sub set_sort_order {
		3798	my ($self, $order) = @_;
		3799
		3800	$self->{sort} = $order ||= sub {
		3801	sort {
		3802	$a->{type} <=> $b->{type}
		3803	or $a->{name} cmp $b->{name}
		3804	} @_
		3805	};
		3806
		3807	$self->update_items;
3488	}	3808	}
3489		3809
3490	sub set_items {	3810	sub set_items {
3491	my ($self, $items) = @_;	3811	my ($self, $items) = @_;
3492		3812
3493	$self->clear;	3813	$self->{items} = [$items ? values %$items : ()];
3494	return unless $items;	3814	$self->update_items;
3495
3496	my @items = sort {
3497	($a->{type} <=> $b->{type})
3498	or ($a->{name} cmp $b->{name})
3499	} values %$items;
3500
3501	$self->{real_items} = \@items;
3502
3503	my $row = 0;
3504	for my $item (@items) {
3505	CFClient::Item::update_widgets $item;
3506
3507	$self->add (0, $row, $item->{face_widget});
3508	$self->add (1, $row, $item->{desc_widget});
3509	$self->add (2, $row, $item->{weight_widget});
3510
3511	$row++;
3512	}
3513	}	3815	}
3514		3816
3515	#############################################################################	3817	#############################################################################
3516		3818
3517	package CFClient::UI::SpellList;	3819	package CFPlus::UI::SpellList;
3518		3820
3519	our @ISA = CFClient::UI::Table::;	3821	our @ISA = CFPlus::UI::Table::;
3520		3822
3521	sub new {	3823	sub new {
3522	my $class = shift;	3824	my $class = shift;
3523		3825
3524	my $self = $class->SUPER::new (	3826	my $self = $class->SUPER::new (
…		…
3542	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3844	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543		3845
3544	sub rebuild_spell_list {	3846	sub rebuild_spell_list {
3545	my ($self) = @_;	3847	my ($self) = @_;
3546		3848
3547	$CFClient::UI::ROOT->on_refresh ($self => sub {	3849	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3548	$self->clear;	3850	$self->clear;
3549		3851
3550	return unless $::CONN;	3852	return unless $::CONN;
3551		3853
3552	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3854	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3855	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3856	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3857	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3858	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557		3859
3558	my $row = 0;	3860	my $row = 0;
3559		3861
3560	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3862	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561	my $spell = $self->{spell}{$_};	3863	my $spell = $self->{spell}{$_};
…		…
3568	if ($ev->{button} == 1) {	3870	if ($ev->{button} == 1) {
3569	$::CONN->user_send ("cast $spell->{name}");	3871	$::CONN->user_send ("cast $spell->{name}");
3570	} elsif ($ev->{button} == 2) {	3872	} elsif ($ev->{button} == 2) {
3571	$::CONN->user_send ("invoke $spell->{name}");	3873	$::CONN->user_send ("invoke $spell->{name}");
3572	} elsif ($ev->{button} == 3) {	3874	} elsif ($ev->{button} == 3) {
		3875	my $shortname = CFPlus::shorten $spell->{name}, 14;
3573	(new CFClient::UI::Menu	3876	(new CFPlus::UI::Menu
3574	items => [	3877	items => [
3575	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3878	["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3879	["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577	],	3880	],
3578	)->popup ($ev);	3881	)->popup ($ev);
3579	} else {	3882	} else {
3580	return 0;	3883	return 0;
3581	}	3884	}
3582		3885
3583	1	3886	1
3584	};	3887	};
3585		3888
3586	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3889	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3587		3890
3588	#TODO: add path info to tooltip	3891	#TODO: add path info to tooltip
3589	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3892	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3590		3893
3591	$self->add (0, $row, new CFClient::UI::Face	3894	$self->add (0, $row, new CFPlus::UI::Face
3592	face => $spell->{face},	3895	face => $spell->{face},
3593	can_hover => 1,	3896	can_hover => 1,
3594	can_events => 1,	3897	can_events => 1,
3595	tooltip => $tooltip,	3898	tooltip => $tooltip,
3596	on_button_down => $spell_cb,	3899	on_button_down => $spell_cb,
3597	);	3900	);
3598		3901
3599	$self->add (1, $row, new CFClient::UI::Label	3902	$self->add (1, $row, new CFPlus::UI::Label
3600	expand => 1,	3903	expand => 1,
3601	text => $spell->{name},	3904	text => $spell->{name},
3602	can_hover => 1,	3905	can_hover => 1,
3603	can_events => 1,	3906	can_events => 1,
3604	tooltip => $tooltip,	3907	tooltip => $tooltip,
3605	on_button_down => $spell_cb,	3908	on_button_down => $spell_cb,
3606	);	3909	);
3607		3910
3608	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3911	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3912	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3913	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3914	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612	}	3915	}
3613	});	3916	});
3614	}	3917	}
3615		3918
3616	sub add_spell {	3919	sub add_spell {
…		…
3634	$self->rebuild_spell_list;	3937	$self->rebuild_spell_list;
3635	}	3938	}
3636		3939
3637	#############################################################################	3940	#############################################################################
3638		3941
3639	package CFClient::UI::Root;	3942	package CFPlus::UI::Root;
3640		3943
3641	our @ISA = CFClient::UI::Container::;	3944	our @ISA = CFPlus::UI::Container::;
3642		3945
3643	use List::Util qw(min max);	3946	use List::Util qw(min max);
3644		3947
3645	use CFClient::OpenGL;	3948	use CFPlus::OpenGL;
3646		3949
3647	sub new {	3950	sub new {
3648	my $class = shift;	3951	my $class = shift;
3649		3952
3650	my $self = $class->SUPER::new (	3953	my $self = $class->SUPER::new (
…		…
3829	$h = 0 if $h < 0;	4132	$h = 0 if $h < 0;
3830		4133
3831	$w = max $widget->{min_w}, $w;	4134	$w = max $widget->{min_w}, $w;
3832	$h = max $widget->{min_h}, $h;	4135	$h = max $widget->{min_h}, $h;
3833		4136
		4137	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4138	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4139
3834	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4140	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4141	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836		4142
3837	$w = int $w + 0.5;	4143	$w = int $w + 0.5;
3838	$h = int $h + 0.5;	4144	$h = int $h + 0.5;
…		…
3864	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4170	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3865	glMatrixMode GL_MODELVIEW;	4171	glMatrixMode GL_MODELVIEW;
3866	glLoadIdentity;	4172	glLoadIdentity;
3867		4173
3868	{	4174	{
3869	package CFClient::UI::Base;	4175	package CFPlus::UI::Base;
3870		4176
3871	($draw_x, $draw_y, $draw_w, $draw_h) =	4177	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3872	(0, 0, $self->{w}, $self->{h});	4178	(0, 0, $self->{w}, $self->{h});
3873	}
3874		4179
3875	$self->_draw;	4180	$self->_draw;
		4181	}
3876	}	4182	}
3877		4183
3878	#############################################################################	4184	#############################################################################
3879		4185
3880	package CFClient::UI;	4186	package CFPlus::UI;
3881		4187
3882	$ROOT = new CFClient::UI::Root;	4188	$ROOT = new CFPlus::UI::Root;
3883	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4189	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3884		4190
3885	1	4191	1
3886		4192

Diff Legend

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