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.331 by root, Sun Jul 23 04:46:02 2006 UTC vs.
Revision 1.408 by root, Sun Jul 22 15:26:01 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
96		99
97	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	101	my ($ev) = @_;
99	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
100		103
101	unless ($BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
102	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
103		108
104	$GRAB = $widget;	109	$GRAB = $widget;
105	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
106		111
107	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
108	}	113	}
109
110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;
116	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
117	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
118	} else {	125	} else {
119	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
120	}	127	}
121	}	128	}
…		…
207	reconfigure_widgets;	214	reconfigure_widgets;
208	}	215	}
209		216
210	#############################################################################	217	#############################################################################
211		218
212	package CFClient::UI::Event;	219	package CFPlus::UI::Event;
213		220
214	sub xy {	221	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	223	}
217		224
218	#############################################################################	225	#############################################################################
219		226
220	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
221		228
222	use strict;	229	use strict;
223		230
224	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
225		232
226	sub new {	233	sub new {
227	my $class = shift;	234	my $class = shift;
228		235
229	my $self = bless {	236	my $self = bless {
…		…
234	h => undef,	241	h => undef,
235	can_events => 1,	242	can_events => 1,
236	@_	243	@_
237	}, $class;	244	}, $class;
238		245
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		247
241	for (keys %$self) {	248	for (keys %$self) {
242	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
244	}	251	}
245	}	252	}
246		253
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		259
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		262
256	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
261		268
262	sub destroy {	269	sub destroy {
263	my ($self) = @_;	270	my ($self) = @_;
264		271
265	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
266	%$self = ();	274	%$self = ();
267	}	275	}
268		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
269	sub show {	281	sub show {
270	my ($self) = @_;	282	my ($self) = @_;
271		283
272	return if $self->{parent};	284	return if $self->{parent};
273		285
274	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
275	}	287	}
276		288
277	sub set_visible {	289	sub set_visible {
278	my ($self) = @_;	290	my ($self) = @_;
279		291
…		…
300	delete $self->{root};	312	delete $self->{root};
301		313
302	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
304		316
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
307		319
308	$self->emit ("focus_out");	320	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
310	}	322	}
…		…
312	sub set_visibility {	324	sub set_visibility {
313	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
314		326
315	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
316		328
317	$visible ? $self->hide	329	$visible ? $self->show
318	: $self->show;	330	: $self->hide;
319	}	331	}
320		332
321	sub toggle_visibility {	333	sub toggle_visibility {
322	my ($self) = @_;	334	my ($self) = @_;
323		335
…		…
367	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
368		380
369	if ($self->{aspect}) {	381	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
371		383
372	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		386
375	# use alignment to adjust x, y	387	# use alignment to adjust x, y
376		388
377	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
419		431
420	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
421		433
422	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
423		435
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	439	}
428	}	440	}
429		441
430	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
431	sub coord2local {	443	sub coord2local {
…		…
437	}	449	}
438		450
439	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
440	sub coord2global {	452	sub coord2global {
441	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
		454
		455	Carp::confess unless $self->{parent};#d#
442		456
443	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
444	}	458	}
445		459
446	sub invoke_focus_in {	460	sub invoke_focus_in {
…		…
494		508
495	sub connect {	509	sub connect {
496	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
497		511
498	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
499	}	524	}
500		525
501	my %has_coords = (	526	my %has_coords = (
502	button_down => 1,	527	button_down => 1,
503	button_up => 1,	528	button_up => 1,
…		…
506	);	531	);
507		532
508	sub emit {	533	sub emit {
509	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
510		535
		536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
511	my @append	538	my @append
512	= $has_coords{$signal}	539	= $has_coords{$signal}
513	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
514	: ();	541	: ();
515		542
516	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517		544
518	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
519	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
520	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
521	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
522	}	554	}
523		555
524	sub find_widget {	556	#sub find_widget {
525	my ($self, $x, $y) = @_;	557	# in .xs
526
527	return () unless $self->{can_events};
528
529	return $self
530	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
531	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
532
533	()
534	}
535		558
536	sub set_parent {	559	sub set_parent {
537	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
538		561
539	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
540	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
541	}	564	}
542		565
543	sub realloc {	566	sub realloc {
544	my ($self) = @_;	567	my ($self) = @_;
…		…
570		593
571	# using global variables seems a bit hacky, but passing through all drawing	594	# using global variables seems a bit hacky, but passing through all drawing
572	# functions seems pointless.	595	# functions seems pointless.
573	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
574		597
575	sub draw {	598	#sub draw {
576	my ($self) = @_;	599	#CFPlus.xs
577
578	return unless $self->{h} && $self->{w};
579
580	# update screen rectangle
581	local $draw_x = $draw_x + $self->{x};
582	local $draw_y = $draw_y + $self->{y};
583
584	# skip widgets that are entirely outside the drawing area
585	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
586	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
587
588	glPushMatrix;
589	glTranslate $self->{x}, $self->{y}, 0;
590
591	if ($self == $HOVER && $self->{can_hover}) {
592	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
593	glEnable GL_BLEND;
594	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
595	glBegin GL_QUADS;
596	glVertex 0 , 0;
597	glVertex $self->{w}, 0;
598	glVertex $self->{w}, $self->{h};
599	glVertex 0 , $self->{h};
600	glEnd;
601	glDisable GL_BLEND;
602	}
603
604	if ($ENV{CFPLUS_DEBUG} & 1) {
605	glPushMatrix;
606	glColor 1, 1, 0, 1;
607	glTranslate 0.375, 0.375;
608	glBegin GL_LINE_LOOP;
609	glVertex 0 , 0;
610	glVertex $self->{w} - 1, 0;
611	glVertex $self->{w} - 1, $self->{h} - 1;
612	glVertex 0 , $self->{h} - 1;
613	glEnd;
614	glPopMatrix;
615	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
616	}
617
618	$self->_draw;
619	glPopMatrix;
620	}
621		600
622	sub _draw {	601	sub _draw {
623	my ($self) = @_;	602	my ($self) = @_;
624		603
625	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
626	}	605	}
627		606
628	sub DESTROY {	607	sub DESTROY {
629	my ($self) = @_;	608	my ($self) = @_;
630		609
631	return if CFClient::in_destruct;	610	return if CFPlus::in_destruct;
632
633	delete $WIDGET{$self+0};
634		611
635	eval { $self->destroy };	612	eval { $self->destroy };
636	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		614
		615	delete $WIDGET{$self+0};
637	}	616	}
638		617
639	#############################################################################	618	#############################################################################
640		619
641	package CFClient::UI::DrawBG;	620	package CFPlus::UI::DrawBG;
642		621
643	our @ISA = CFClient::UI::Base::;	622	our @ISA = CFPlus::UI::Base::;
644		623
645	use strict;	624	use strict;
646	use CFClient::OpenGL;	625	use CFPlus::OpenGL;
647		626
648	sub new {	627	sub new {
649	my $class = shift;	628	my $class = shift;
650		629
651	# range [value, low, high, page]	630	# range [value, low, high, page]
…		…
682	}	661	}
683	}	662	}
684		663
685	#############################################################################	664	#############################################################################
686		665
687	package CFClient::UI::Empty;	666	package CFPlus::UI::Empty;
688		667
689	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
690		669
691	sub new {	670	sub new {
692	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
693	$class->SUPER::new (can_events => 0, %arg);	672	$class->SUPER::new (can_events => 0, %arg);
694	}	673	}
…		…
701		680
702	sub draw { }	681	sub draw { }
703		682
704	#############################################################################	683	#############################################################################
705		684
706	package CFClient::UI::Container;	685	package CFPlus::UI::Container;
707		686
708	our @ISA = CFClient::UI::Base::;	687	our @ISA = CFPlus::UI::Base::;
709		688
710	sub new {	689	sub new {
711	my ($class, %arg) = @_;	690	my ($class, %arg) = @_;
712		691
713	my $children = delete $arg{children};	692	my $children = delete $arg{children};
…		…
717	can_events => 0,	696	can_events => 0,
718	%arg,	697	%arg,
719	);	698	);
720		699
721	$self->add (@$children)	700	$self->add (@$children)
722	if $children;	701	if $children && @$children;
723		702
724	$self	703	$self
		704	}
		705
		706	sub realloc {
		707	my ($self) = @_;
		708
		709	$self->{force_realloc} = 1;
		710	$self->{force_size_alloc} = 1;
		711	$self->SUPER::realloc;
725	}	712	}
726		713
727	sub add {	714	sub add {
728	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
729		716
730	$_->set_parent ($self)	717	$_->set_parent ($self)
731	for @widgets;	718	for @widgets;
732		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
733	use sort 'stable';	721	use sort 'stable';
734		722
735	$self->{children} = [	723	$self->{children} = [
736	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
737	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
738	];	726	];
739		727
740	$self->realloc;	728	$self->realloc;
		729
		730	map $_+0, @widgets
741	}	731	}
742		732
743	sub children {	733	sub children {
744	@{ $_[0]{children} }	734	@{ $_[0]{children} }
745	}	735	}
…		…
756	}	746	}
757		747
758	sub clear {	748	sub clear {
759	my ($self) = @_;	749	my ($self) = @_;
760		750
761	my $children = delete $self->{children};	751	my $children = $self->{children};
762	$self->{children} = [];	752	$self->{children} = [];
763		753
764	for (@$children) {	754	for (@$children) {
765	delete $_->{parent};	755	delete $_->{parent};
766	$_->hide;	756	$_->hide;
…		…
791	$_->draw for @{$self->{children}};	781	$_->draw for @{$self->{children}};
792	}	782	}
793		783
794	#############################################################################	784	#############################################################################
795		785
796	package CFClient::UI::Bin;	786	package CFPlus::UI::Bin;
797		787
798	our @ISA = CFClient::UI::Container::;	788	our @ISA = CFPlus::UI::Container::;
799		789
800	sub new {	790	sub new {
801	my ($class, %arg) = @_;	791	my ($class, %arg) = @_;
802		792
803	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	793	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
804		794
805	$class->SUPER::new (children => [$child], %arg)	795	$class->SUPER::new (children => [$child], %arg)
806	}	796	}
807		797
808	sub add {	798	sub add {
…		…
815	sub remove {	805	sub remove {
816	my ($self, $widget) = @_;	806	my ($self, $widget) = @_;
817		807
818	$self->SUPER::remove ($widget);	808	$self->SUPER::remove ($widget);
819		809
820	$self->{children} = [new CFClient::UI::Empty]	810	$self->{children} = [new CFPlus::UI::Empty]
821	unless @{$self->{children}};	811	unless @{$self->{children}};
822	}	812	}
823		813
824	sub child { $_[0]->{children}[0] }	814	sub child { $_[0]->{children}[0] }
825		815
…		…
837		827
838	#############################################################################	828	#############################################################################
839		829
840	# back-buffered drawing area	830	# back-buffered drawing area
841		831
842	package CFClient::UI::Window;	832	package CFPlus::UI::Window;
843		833
844	our @ISA = CFClient::UI::Bin::;	834	our @ISA = CFPlus::UI::Bin::;
845		835
846	use CFClient::OpenGL;	836	use CFPlus::OpenGL;
847		837
848	sub new {	838	sub new {
849	my ($class, %arg) = @_;	839	my ($class, %arg) = @_;
850		840
851	my $self = $class->SUPER::new (%arg);	841	my $self = $class->SUPER::new (%arg);
…		…
873	}	863	}
874		864
875	sub render_child {	865	sub render_child {
876	my ($self) = @_;	866	my ($self) = @_;
877		867
878	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	868	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
879	glClearColor 0, 0, 0, 0;	869	glClearColor 0, 0, 0, 0;
880	glClear GL_COLOR_BUFFER_BIT;	870	glClear GL_COLOR_BUFFER_BIT;
881		871
882	{	872	{
883	package CFClient::UI::Base;	873	package CFPlus::UI::Base;
884		874
885	($draw_x, $draw_y, $draw_w, $draw_h) =	875	local ($draw_x, $draw_y, $draw_w, $draw_h) =
886	(0, 0, $self->{w}, $self->{h});	876	(0, 0, $self->{w}, $self->{h});
		877
		878	$self->_render;
887	}	879	}
888
889	$self->_render;
890	};	880	};
891	}	881	}
892		882
893	sub _draw {	883	sub _draw {
894	my ($self) = @_;	884	my ($self) = @_;
895
896	my ($w, $h) = @$self{qw(w h)};
897		885
898	my $tex = $self->{texture}	886	my $tex = $self->{texture}
899	or return;	887	or return;
900		888
901	glEnable GL_TEXTURE_2D;	889	glEnable GL_TEXTURE_2D;
902	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	890	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
903	glColor 0, 0, 0, 1;	891	glColor 0, 0, 0, 1;
904		892
905	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	893	$tex->draw_quad_alpha_premultiplied (0, 0);
906		894
907	glDisable GL_TEXTURE_2D;	895	glDisable GL_TEXTURE_2D;
908	}	896	}
909		897
910	#############################################################################	898	#############################################################################
911		899
912	package CFClient::UI::ViewPort;	900	package CFPlus::UI::ViewPort;
913		901
		902	use List::Util qw(min max);
		903
914	our @ISA = CFClient::UI::Window::;	904	our @ISA = CFPlus::UI::Window::;
915		905
916	sub new {	906	sub new {
917	my $class = shift;	907	my $class = shift;
918		908
919	$class->SUPER::new (	909	$class->SUPER::new (
…		…
926	sub size_request {	916	sub size_request {
927	my ($self) = @_;	917	my ($self) = @_;
928		918
929	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	919	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
930		920
931	$w = 10 if $self->{scroll_x};	921	$w = 1 if $self->{scroll_x};
932	$h = 10 if $self->{scroll_y};	922	$h = 1 if $self->{scroll_y};
933		923
934	($w, $h)	924	($w, $h)
935	}	925	}
936		926
937	sub invoke_size_allocate {	927	sub invoke_size_allocate {
…		…
949	}	939	}
950		940
951	sub set_offset {	941	sub set_offset {
952	my ($self, $x, $y) = @_;	942	my ($self, $x, $y) = @_;
953		943
		944	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		945	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		946
		947	if ($x != $self->{view_x} or $y != $self->{view_y}) {
954	$self->{view_x} = int $x;	948	$self->{view_x} = $x;
955	$self->{view_y} = int $y;	949	$self->{view_y} = $y;
956		950
		951	$self->emit (changed => $x, $y);
957	$self->update;	952	$self->update;
		953	}
958	}	954	}
959		955
960	# hmm, this does not work for topleft of $self... but we should not ask for that	956	# hmm, this does not work for topleft of $self... but we should not ask for that
961	sub coord2local {	957	sub coord2local {
962	my ($self, $x, $y) = @_;	958	my ($self, $x, $y) = @_;
…		…
977	my ($self, $x, $y) = @_;	973	my ($self, $x, $y) = @_;
978		974
979	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	975	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
980	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	976	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
981	) {	977	) {
982	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	978	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
983	} else {	979	} else {
984	$self->CFClient::UI::Base::find_widget ($x, $y)	980	$self->CFPlus::UI::Base::find_widget ($x, $y)
985	}	981	}
986	}	982	}
987		983
988	sub _render {	984	sub _render {
989	my ($self) = @_;	985	my ($self) = @_;
990		986
991	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	987	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
992	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	988	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
993		989
994	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	990	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
995		991
996	$self->SUPER::_render;	992	$self->SUPER::_render;
997	}	993	}
998		994
999	#############################################################################	995	#############################################################################
1000		996
1001	package CFClient::UI::ScrolledWindow;	997	package CFPlus::UI::ScrolledWindow;
1002		998
1003	our @ISA = CFClient::UI::HBox::;	999	our @ISA = CFPlus::UI::Table::;
1004		1000
1005	sub new {	1001	sub new {
1006	my ($class, %arg) = @_;	1002	my ($class, %arg) = @_;
1007		1003
1008	my $child = delete $arg{child};	1004	my $child = delete $arg{child};
1009		1005
1010	my $self;	1006	my $self;
1011		1007
1012	my $slider = new CFClient::UI::Slider	1008	my $hslider = new CFPlus::UI::Slider
		1009	col => 0,
		1010	row => 1,
		1011	vertical => 0,
		1012	range => [0, 0, 1, 0.01], # HACK fix
		1013	on_changed => sub {
		1014	$self->{hpos} = $_[1];
		1015	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1016	},
		1017	;
		1018
		1019	my $vslider = new CFPlus::UI::Slider
		1020	col => 1,
		1021	row => 0,
1013	vertical => 1,	1022	vertical => 1,
1014	range => [0, 0, 1, 0.01], # HACK fix	1023	range => [0, 0, 1, 0.01], # HACK fix
1015	on_changed => sub {	1024	on_changed => sub {
1016	$self->{vp}->set_offset (0, $_[1]);	1025	$self->{vpos} = $_[1];
		1026	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1017	},	1027	},
1018	;	1028	;
1019		1029
1020	$self = $class->SUPER::new (	1030	$self = $class->SUPER::new (
1021	vp => (new CFClient::UI::ViewPort expand => 1),	1031	scroll_x => 0,
		1032	scroll_y => 1,
1022	can_events => 1,	1033	can_events => 1,
1023	slider => $slider,	1034	hslider => $hslider,
		1035	vslider => $vslider,
		1036	col_expand => [1, 0],
		1037	row_expand => [1, 0],
1024	%arg,	1038	%arg,
1025	);	1039	);
1026		1040
		1041	$self->{vp} = new CFPlus::UI::ViewPort
		1042	col => 0,
		1043	row => 0,
		1044	expand => 1,
		1045	scroll_x => $self->{scroll_x},
		1046	scroll_y => $self->{scroll_y},
		1047	on_changed => sub {
		1048	my ($vp, $x, $y) = @_;
		1049
		1050	$vp->{parent}{hslider}->set_value ($x);
		1051	$vp->{parent}{vslider}->set_value ($y);
		1052
		1053	0
		1054	},
		1055	on_size_allocate => sub {
		1056	my ($vp, $w, $h) = @_;
		1057	$vp->{parent}->update_slider;
		1058	0
		1059	},
		1060	;
		1061
1027	$self->SUPER::add ($self->{vp}, $self->{slider});	1062	$self->SUPER::add ($self->{vp});
		1063
1028	$self->add ($child) if $child;	1064	$self->add ($child) if $child;
1029		1065
1030	$self	1066	$self
1031	}	1067	}
1032
1033	#TODO# update range on size_allocate depending on child
1034		1068
1035	sub add {	1069	sub add {
1036	my ($self, $widget) = @_;	1070	my ($self, $widget) = @_;
1037		1071
1038	$self->{vp}->add ($self->{child} = $widget);	1072	$self->{vp}->add ($self->{child} = $widget);
1039	}	1073	}
1040		1074
		1075	sub update_slider {
		1076	my ($self) = @_;
		1077
		1078	my $child = ($self->{vp} or return)->child;
		1079
		1080	if ($self->{scroll_x}) {
		1081	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1082	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1083
		1084	my $visible = $w1 > $w2;
		1085	if ($visible != $self->{hslider_visible}) {
		1086	$self->{hslider_visible} = $visible;
		1087	$visible ? $self->SUPER::add ($self->{hslider})
		1088	: $self->SUPER::remove ($self->{hslider});
		1089	}
		1090	}
		1091
		1092	if ($self->{scroll_y}) {
		1093	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1094	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1095
		1096	my $visible = $h1 > $h2;
		1097	if ($visible != $self->{vslider_visible}) {
		1098	$self->{vslider_visible} = $visible;
		1099	$visible ? $self->SUPER::add ($self->{vslider})
		1100	: $self->SUPER::remove ($self->{vslider});
		1101	}
		1102	}
		1103	}
		1104
		1105	sub start_dragging {
		1106	my ($self, $ev) = @_;
		1107
		1108	$self->grab_focus;
		1109
		1110	my $ox = $self->{vp}{view_x};
		1111	my $oy = $self->{vp}{view_y};
		1112
		1113	$self->{motion} = sub {
		1114	my ($ev, $x, $y) = @_;
		1115
		1116	$ox -= $ev->{xrel};
		1117	$oy -= $ev->{yrel};
		1118
		1119	$self->{vp}->set_offset ($ox, $oy);
		1120	};
		1121	}
		1122
1041	sub invoke_mouse_wheel {	1123	sub invoke_mouse_wheel {
1042	my ($self, $ev) = @_;	1124	my ($self, $ev) = @_;
1043		1125
1044	return 0 unless $ev->{dy}; # only vertical movements
1045
1046	$self->{slider}->emit (mouse_wheel => $ev);	1126	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1127	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1047		1128
1048	1	1129	1
1049	}	1130	}
1050		1131
1051	sub update_slider {	1132	sub invoke_button_down {
1052	my ($self) = @_;	1133	my ($self, $ev, $x, $y) = @_;
1053		1134
1054	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1135	if ($ev->{button} == 2) {
1055	}	1136	$self->start_dragging ($ev);
		1137	return 1;
		1138	}
1056		1139
1057	sub update {	1140	0
1058	my ($self) = @_;	1141	}
1059		1142
1060	$self->SUPER::update;	1143	sub invoke_button_up {
		1144	my ($self, $ev, $x, $y) = @_;
1061		1145
1062	$self->update_slider;	1146	if (delete $self->{motion}) {
		1147	return 1;
		1148	}
		1149
		1150	0
		1151	}
		1152
		1153	sub invoke_mouse_motion {
		1154	my ($self, $ev, $x, $y) = @_;
		1155
		1156	if ($self->{motion}) {
		1157	$self->{motion}->($ev, $x, $y);
		1158	return 1;
		1159	}
		1160
		1161	0
1063	}	1162	}
1064		1163
1065	sub invoke_size_allocate {	1164	sub invoke_size_allocate {
1066	my ($self, $w, $h) = @_;	1165	my ($self, $w, $h) = @_;
1067		1166
1068	$self->update_slider;	1167	$self->update_slider;
1069
1070	$self->SUPER::invoke_size_allocate ($w, $h)	1168	$self->SUPER::invoke_size_allocate ($w, $h)
1071	}	1169	}
1072		1170
1073	#############################################################################	1171	#############################################################################
1074		1172
1075	package CFClient::UI::Frame;	1173	package CFPlus::UI::Frame;
1076		1174
1077	our @ISA = CFClient::UI::Bin::;	1175	our @ISA = CFPlus::UI::Bin::;
1078		1176
1079	use CFClient::OpenGL;	1177	use CFPlus::OpenGL;
1080		1178
1081	sub new {	1179	sub new {
1082	my $class = shift;	1180	my $class = shift;
1083		1181
1084	$class->SUPER::new (	1182	$class->SUPER::new (
…		…
1110	$self->SUPER::_draw;	1208	$self->SUPER::_draw;
1111	}	1209	}
1112		1210
1113	#############################################################################	1211	#############################################################################
1114		1212
1115	package CFClient::UI::FancyFrame;	1213	package CFPlus::UI::FancyFrame;
1116		1214
1117	our @ISA = CFClient::UI::Bin::;	1215	our @ISA = CFPlus::UI::Bin::;
1118		1216
1119	use CFClient::OpenGL;	1217	use CFPlus::OpenGL;
		1218
		1219	sub new {
		1220	my ($class, %arg) = @_;
		1221
		1222	if ((exists $arg{label}) && !ref $arg{label}) {
		1223	$arg{label} = new CFPlus::UI::Label
		1224	align => 1,
		1225	valign => 0,
		1226	text => $arg{label},
		1227	fontsize => ($arg{border} || 0.8) * 0.75;
		1228	}
		1229
		1230	my $self = $class->SUPER::new (
		1231	# label => "",
		1232	fg => [0.6, 0.3, 0.1],
		1233	border => 0.8,
		1234	style => 'single',
		1235	%arg,
		1236	);
		1237
		1238	$self
		1239	}
		1240
		1241	sub add {
		1242	my ($self, @widgets) = @_;
		1243
		1244	$self->SUPER::add (@widgets);
		1245	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1246	}
		1247
		1248	sub border {
		1249	int $_[0]{border} * $::FONTSIZE
		1250	}
		1251
		1252	sub size_request {
		1253	my ($self) = @_;
		1254
		1255	($self->{label_w}, undef) = $self->{label}->size_request
		1256	if $self->{label};
		1257
		1258	my ($w, $h) = $self->SUPER::size_request;
		1259
		1260	(
		1261	$w + $self->border * 2,
		1262	$h + $self->border * 2,
		1263	)
		1264	}
		1265
		1266	sub invoke_size_allocate {
		1267	my ($self, $w, $h) = @_;
		1268
		1269	my $border = $self->border;
		1270
		1271	$w -= List::Util::max 0, $border * 2;
		1272	$h -= List::Util::max 0, $border * 2;
		1273
		1274	if (my $label = $self->{label}) {
		1275	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1276	$label->{h} = List::Util::min $h, $border;
		1277	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1278	}
		1279
		1280	$self->child->configure ($border, $border, $w, $h);
		1281
		1282	1
		1283	}
		1284
		1285	sub _draw {
		1286	my ($self) = @_;
		1287
		1288	my $child = $self->{children}[0];
		1289
		1290	my $border = $self->border;
		1291	my ($w, $h) = ($self->{w}, $self->{h});
		1292
		1293	$child->draw;
		1294
		1295	glColor @{$self->{fg}};
		1296	glBegin GL_LINE_STRIP;
		1297	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1298	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1299	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1300	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1301	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1302	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1303	glEnd;
		1304
		1305	if ($self->{label}) {
		1306	glTranslate $border * 2, 0;
		1307	$self->{label}->_draw;
		1308	}
		1309	}
		1310
		1311	#############################################################################
		1312
		1313	package CFPlus::UI::Toplevel;
		1314
		1315	our @ISA = CFPlus::UI::Bin::;
		1316
		1317	use CFPlus::OpenGL;
1120		1318
1121	my $bg =	1319	my $bg =
1122	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1320	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1123	mipmap => 1, wrap => 1;	1321	mipmap => 1, wrap => 1;
1124		1322
1125	my @border =	1323	my @border =
1126	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1324	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1127	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1325	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1326
		1327	my @icon =
		1328	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1329	qw(x1_move.png x1_resize.png);
1128		1330
1129	sub new {	1331	sub new {
1130	my ($class, %arg) = @_;	1332	my ($class, %arg) = @_;
1131		1333
1132	my $self = $class->SUPER::new (	1334	my $self = $class->SUPER::new (
…		…
1137	min_w => 64,	1339	min_w => 64,
1138	min_h => 32,	1340	min_h => 32,
1139	%arg,	1341	%arg,
1140	);	1342	);
1141		1343
1142	$self->{title_widget} = new CFClient::UI::Label	1344	$self->{title_widget} = new CFPlus::UI::Label
1143	align => 0,	1345	align => 0,
1144	valign => 1,	1346	valign => 1,
1145	text => $self->{title},	1347	text => $self->{title},
1146	fontsize => $self->{border},	1348	fontsize => $self->{border},
1147	if exists $self->{title};	1349	if exists $self->{title};
1148		1350
1149	if ($self->{has_close_button}) {	1351	if ($self->{has_close_button}) {
1150	$self->{close_button} =	1352	$self->{close_button} =
1151	new CFClient::UI::ImageButton	1353	new CFPlus::UI::ImageButton
1152	path => 'x1_close.png',	1354	path => 'x1_close.png',
1153	on_activate => sub { $self->emit ("delete") };	1355	on_activate => sub { $self->emit ("delete") };
1154		1356
1155	$self->CFClient::UI::Container::add ($self->{close_button});	1357	$self->CFPlus::UI::Container::add ($self->{close_button});
1156	}	1358	}
1157		1359
1158	$self	1360	$self
1159	}	1361	}
1160		1362
1161	sub add {	1363	sub add {
1162	my ($self, @widgets) = @_;	1364	my ($self, @widgets) = @_;
1163		1365
1164	$self->SUPER::add (@widgets);	1366	$self->SUPER::add (@widgets);
1165	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1367	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1166	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1368	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1167	}	1369	}
1168		1370
1169	sub border {	1371	sub border {
1170	int $_[0]{border} * $::FONTSIZE	1372	int $_[0]{border} * $::FONTSIZE
1171	}	1373	}
…		…
1279	$self->{motion}->($ev, $x, $y) if $self->{motion};	1481	$self->{motion}->($ev, $x, $y) if $self->{motion};
1280		1482
1281	! ! $self->{motion}	1483	! ! $self->{motion}
1282	}	1484	}
1283		1485
		1486	sub invoke_visibility_change {
		1487	my ($self, $visible) = @_;
		1488
		1489	delete $self->{motion} unless $visible;
		1490
		1491	0
		1492	}
		1493
1284	sub _draw {	1494	sub _draw {
1285	my ($self) = @_;	1495	my ($self) = @_;
1286		1496
1287	my $child = $self->{children}[0];	1497	my $child = $self->{children}[0];
1288		1498
…		…
1293	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1503	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1294		1504
1295	my $border = $self->border;	1505	my $border = $self->border;
1296		1506
1297	glColor @{ $self->{border_bg} };	1507	glColor @{ $self->{border_bg} };
1298	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1508	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1299	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1509	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1300	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1510	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1301	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1511	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1512
		1513	# move
		1514	my $w2 = ($w - $border) * .5;
		1515	my $h2 = ($h - $border) * .5;
		1516	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1517	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1518	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1519
		1520	# resize
		1521	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1522	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1523	unless $self->{has_close_button};
		1524	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1525	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1302		1526
1303	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1527	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1304	glColor @{ $self->{bg} };	1528	glColor @{ $self->{bg} };
1305		1529
1306	# TODO: repeat texture not scale	1530	# TODO: repeat texture not scale
…		…
1325	if $self->{close_button};	1549	if $self->{close_button};
1326	}	1550	}
1327		1551
1328	#############################################################################	1552	#############################################################################
1329		1553
1330	package CFClient::UI::Table;	1554	package CFPlus::UI::Table;
1331		1555
1332	our @ISA = CFClient::UI::Base::;	1556	our @ISA = CFPlus::UI::Container::;
1333		1557
1334	use List::Util qw(max sum);	1558	use List::Util qw(max sum);
1335		1559
1336	use CFClient::OpenGL;	1560	use CFPlus::OpenGL;
1337		1561
1338	sub new {	1562	sub new {
1339	my $class = shift;	1563	my $class = shift;
1340		1564
1341	$class->SUPER::new (	1565	$class->SUPER::new (
1342	col_expand => [],	1566	col_expand => [],
		1567	row_expand => [],
1343	@_,	1568	@_,
1344	)	1569	)
1345	}	1570	}
1346		1571
1347	sub children {
1348	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1349	}
1350
1351	sub add {	1572	sub add {
1352	my ($self, $x, $y, $child) = @_;	1573	my ($self, @widgets) = @_;
1353		1574
1354	$child->set_parent ($self);	1575	for my $child (@widgets) {
1355	$self->{children}[$y][$x] = $child;	1576	$child->{rowspan} ||= 1;
		1577	$child->{colspan} ||= 1;
		1578	}
1356		1579
1357	$self->realloc;	1580	$self->SUPER::add (@widgets);
1358	}	1581	}
1359		1582
1360	sub remove {	1583	sub add_at {
		1584	my $self = shift;
		1585
		1586	my @widgets;
		1587
		1588	while (@_) {
		1589	my ($col, $row, $child) = splice @_, 0, 3, ();
		1590
		1591	$child->{row} = $row;
		1592	$child->{col} = $col;
		1593
		1594	push @widgets, $child;
		1595	}
		1596
		1597	$self->add (@widgets);
		1598	}
		1599
		1600	sub get_wh {
1361	my ($self, $child) = @_;	1601	my ($self) = @_;
1362		1602
1363	# TODO: not yet implemented	1603	my (@w, @h);
1364	}
1365
1366	# TODO: move to container class maybe? send children a signal on removal?
1367	sub clear {
1368	my ($self) = @_;
1369		1604
1370	my @children = $self->children;	1605	my @children = $self->children;
1371	delete $self->{children};	1606
		1607	# first pass, columns
		1608	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1609	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1610
		1611	my $sw = sum @w[$c .. $c + $cs - 1];
		1612
		1613	if ($w > $sw) {
		1614	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1615	}
1372		1616	}
1373	for (@children) {
1374	delete $_->{parent};
1375	$_->hide;
1376	}
1377		1617
1378	$self->realloc;	1618	# second pass, rows
1379	}	1619	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1380
1381	sub get_wh {
1382	my ($self) = @_;
1383
1384	my (@w, @h);
1385
1386	for my $y (0 .. $#{$self->{children}}) {
1387	my $row = $self->{children}[$y]
1388	or next;
1389
1390	for my $x (0 .. $#$row) {
1391	my $widget = $row->[$x]
1392	or next;
1393	my ($w, $h) = @$widget{qw(req_w req_h)};	1620	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1394		1621
1395	$w[$x] = max $w[$x], $w;	1622	my $sh = sum @h[$r .. $r + $rs - 1];
1396	$h[$y] = max $h[$y], $h;	1623
		1624	if ($h > $sh) {
		1625	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1397	}	1626	}
1398	}	1627	}
1399		1628
1400	(\@w, \@h)	1629	(\@w, \@h)
1401	}	1630	}
…		…
1417	my ($ws, $hs) = $self->get_wh;	1646	my ($ws, $hs) = $self->get_wh;
1418		1647
1419	my $req_w = (sum @$ws) || 1;	1648	my $req_w = (sum @$ws) || 1;
1420	my $req_h = (sum @$hs) || 1;	1649	my $req_h = (sum @$hs) || 1;
1421		1650
1422	# TODO: nicer code && do row_expand	1651	# now linearly scale the rows/columns to the allocated size
1423	my @col_expand = @{$self->{col_expand}};	1652	my @col_expand = @{$self->{col_expand}};
1424	@col_expand = (1) x @$ws unless @col_expand;	1653	@col_expand = (1) x @$ws unless @col_expand;
1425	my $col_expand = (sum @col_expand) || 1;	1654	my $col_expand = (sum @col_expand) || 1;
1426		1655
1427	# linearly scale sizes
1428	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1656	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1429	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1430		1657
1431	CFClient::UI::harmonize $ws;	1658	CFPlus::UI::harmonize $ws;
		1659
		1660	my @row_expand = @{$self->{row_expand}};
		1661	@row_expand = (1) x @$ws unless @row_expand;
		1662	my $row_expand = (sum @row_expand) || 1;
		1663
		1664	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1665
1432	CFClient::UI::harmonize $hs;	1666	CFPlus::UI::harmonize $hs;
1433		1667
1434	my $y;	1668	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1669	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1435		1670
1436	for my $r (0 .. $#{$self->{children}}) {	1671	for my $widget ($self->children) {
1437	my $row = $self->{children}[$r]	1672	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1438	or next;
1439		1673
1440	my $x = 0;	1674	$widget->configure (
1441	my $row_h = $hs->[$r];	1675	$x[$c], $y[$r],
		1676	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1442		1677	);
1443	for my $c (0 .. $#$row) {	1678	}
1444	my $col_w = $ws->[$c];
1445		1679
1446	if (my $widget = $row->[$c]) {	1680	1
1447	$widget->configure ($x, $y, $col_w, $row_h);	1681	}
1448	}
1449		1682
1450	$x += $col_w;	1683	#############################################################################
		1684
		1685	package CFPlus::UI::Fixed;
		1686
		1687	use List::Util qw(min max);
		1688
		1689	our @ISA = CFPlus::UI::Container::;
		1690
		1691	sub add_fixed {
		1692	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1693
		1694	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1695	$self->SUPER::add ($child);
		1696	}
		1697
		1698	sub _scale($$$) {
		1699	my ($mode, $val, $max) = @_;
		1700
		1701	$mode eq "abs" ? $val
		1702	: $mode eq "rel" ? $val * $max
		1703	: 0
		1704	}
		1705
		1706	sub size_request {
		1707	my ($self) = @_;
		1708
		1709	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1710
		1711	# determine overall size by querying abs widgets
		1712	for my $child ($self->visible_children) {
		1713	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1714
		1715	if ($pos eq "abs") {
		1716	$w = _scale $size, $w, $child->{req_w};
		1717	$h = _scale $size, $h, $child->{req_h};
		1718
		1719	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1720	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1451	}	1721	}
		1722	}
1452		1723
1453	$y += $row_h;	1724	my $W = $x2 - $x1;
		1725	my $H = $y2 - $y1;
		1726
		1727	# now layout remaining widgets
		1728	for my $child ($self->visible_children) {
		1729	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1730
		1731	if ($pos ne "abs") {
		1732	$x = _scale $pos, $x, $W;
		1733	$y = _scale $pos, $x, $H;
		1734	$w = _scale $size, $w, $child->{req_w};
		1735	$h = _scale $size, $h, $child->{req_h};
		1736
		1737	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1738	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1739	}
		1740	}
		1741
		1742	my $W = $x2 - $x1;
		1743	my $H = $y2 - $y1;
		1744
		1745	($W, $H)
		1746	}
		1747
		1748	sub invoke_size_allocate {
		1749	my ($self, $W, $H) = @_;
		1750
		1751	for my $child ($self->visible_children) {
		1752	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1753
		1754	$x = _scale $pos, $x, $W;
		1755	$y = _scale $pos, $x, $H;
		1756	$w = _scale $size, $w, $W;
		1757	$h = _scale $size, $h, $H;
		1758
		1759	$child->configure ($x, $y, $w, $h);
1454	}	1760	}
1455		1761
1456	1	1762	1
1457	}	1763	}
1458		1764
1459	sub find_widget {
1460	my ($self, $x, $y) = @_;
1461
1462	$x -= $self->{x};
1463	$y -= $self->{y};
1464
1465	my $res;
1466
1467	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1468	$res = $_->find_widget ($x, $y)
1469	and return $res;
1470	}
1471
1472	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1473	}
1474
1475	sub _draw {
1476	my ($self) = @_;
1477
1478	for (grep $_, @{$self->{children}}) {
1479	$_->draw for grep $_, @$_;
1480	}
1481	}
1482
1483	#############################################################################	1765	#############################################################################
1484		1766
1485	package CFClient::UI::Box;	1767	package CFPlus::UI::Box;
1486		1768
1487	our @ISA = CFClient::UI::Container::;	1769	our @ISA = CFPlus::UI::Container::;
1488		1770
1489	sub size_request {	1771	sub size_request {
1490	my ($self) = @_;	1772	my ($self) = @_;
1491		1773
1492	$self->{vertical}	1774	$self->{vertical}
…		…
1525	$req[$_] += $space * $children[$_]{expand}	1807	$req[$_] += $space * $children[$_]{expand}
1526	for 0 .. $#children;	1808	for 0 .. $#children;
1527	}	1809	}
1528	}	1810	}
1529		1811
1530	CFClient::UI::harmonize \@req;	1812	CFPlus::UI::harmonize \@req;
1531		1813
1532	my $pos = 0;	1814	my $pos = 0;
1533	for (0 .. $#children) {	1815	for (0 .. $#children) {
1534	my $alloc = $req[$_];	1816	my $alloc = $req[$_];
1535	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1817	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1540	1	1822	1
1541	}	1823	}
1542		1824
1543	#############################################################################	1825	#############################################################################
1544		1826
1545	package CFClient::UI::HBox;	1827	package CFPlus::UI::HBox;
1546		1828
1547	our @ISA = CFClient::UI::Box::;	1829	our @ISA = CFPlus::UI::Box::;
1548		1830
1549	sub new {	1831	sub new {
1550	my $class = shift;	1832	my $class = shift;
1551		1833
1552	$class->SUPER::new (	1834	$class->SUPER::new (
…		…
1555	)	1837	)
1556	}	1838	}
1557		1839
1558	#############################################################################	1840	#############################################################################
1559		1841
1560	package CFClient::UI::VBox;	1842	package CFPlus::UI::VBox;
1561		1843
1562	our @ISA = CFClient::UI::Box::;	1844	our @ISA = CFPlus::UI::Box::;
1563		1845
1564	sub new {	1846	sub new {
1565	my $class = shift;	1847	my $class = shift;
1566		1848
1567	$class->SUPER::new (	1849	$class->SUPER::new (
…		…
1570	)	1852	)
1571	}	1853	}
1572		1854
1573	#############################################################################	1855	#############################################################################
1574		1856
1575	package CFClient::UI::Label;	1857	package CFPlus::UI::Label;
1576		1858
1577	our @ISA = CFClient::UI::DrawBG::;	1859	our @ISA = CFPlus::UI::DrawBG::;
1578		1860
1579	use CFClient::OpenGL;	1861	use CFPlus::OpenGL;
1580		1862
1581	sub new {	1863	sub new {
1582	my ($class, %arg) = @_;	1864	my ($class, %arg) = @_;
1583		1865
1584	my $self = $class->SUPER::new (	1866	my $self = $class->SUPER::new (
…		…
1587	#active_bg => none	1869	#active_bg => none
1588	#font => default_font	1870	#font => default_font
1589	#text => initial text	1871	#text => initial text
1590	#markup => initial narkup	1872	#markup => initial narkup
1591	#max_w => maximum pixel width	1873	#max_w => maximum pixel width
		1874	#style => 0, # render flags
1592	ellipsise => 3, # end	1875	ellipsise => 3, # end
1593	layout => (new CFClient::Layout),	1876	layout => (new CFPlus::Layout),
1594	fontsize => 1,	1877	fontsize => 1,
1595	align => -1,	1878	align => -1,
1596	valign => -1,	1879	valign => -1,
1597	padding_x => 2,	1880	padding_x => 2,
1598	padding_y => 2,	1881	padding_y => 2,
1599	can_events => 0,	1882	can_events => 0,
1600	%arg	1883	%arg
1601	);	1884	);
1602		1885
1603	if (exists $self->{template}) {	1886	if (exists $self->{template}) {
1604	my $layout = new CFClient::Layout;	1887	my $layout = new CFPlus::Layout;
1605	$layout->set_text (delete $self->{template});	1888	$layout->set_text (delete $self->{template});
1606	$self->{template} = $layout;	1889	$self->{template} = $layout;
1607	}	1890	}
1608		1891
1609	if (exists $self->{markup}) {	1892	if (exists $self->{markup}) {
…		…
1611	} else {	1894	} else {
1612	$self->set_text (delete $self->{text});	1895	$self->set_text (delete $self->{text});
1613	}	1896	}
1614		1897
1615	$self	1898	$self
1616	}
1617
1618	sub escape($) {
1619	local $_ = $_[0];
1620
1621	s/&/&amp;/g;
1622	s/>/&gt;/g;
1623	s/</&lt;/g;
1624
1625	$_
1626	}	1899	}
1627		1900
1628	sub update {	1901	sub update {
1629	my ($self) = @_;	1902	my ($self) = @_;
1630		1903
…		…
1754	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2027	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1755	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2028	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1756	: ($self->{h} - $size->[1]) * 0.5);	2029	: ($self->{h} - $size->[1]) * 0.5);
1757	};	2030	};
1758		2031
1759	my $w = List::Util::min $self->{w} + 4, $size->[0];	2032	# unless ($self->{list}) {
1760	my $h = List::Util::min $self->{h} + 2, $size->[1];	2033	# $self->{list} = CFPlus::OpenGL::glGenList;
		2034	# CFPlus::OpenGL::glNewList $self->{list};
		2035	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2036	# CFPlus::OpenGL::glEndList;
		2037	# }
		2038	#
		2039	# CFPlus::OpenGL::glCallList $self->{list};
1761		2040
1762	$self->{layout}->render ($self->{ox}, $self->{oy});	2041	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1763	}	2042	}
		2043
		2044	#sub destroy {
		2045	# my ($self) = @_;
		2046	#
		2047	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2048	#
		2049	# $self->SUPER::destroy;
		2050	#}
1764		2051
1765	#############################################################################	2052	#############################################################################
1766		2053
1767	package CFClient::UI::EntryBase;	2054	package CFPlus::UI::EntryBase;
1768		2055
1769	our @ISA = CFClient::UI::Label::;	2056	our @ISA = CFPlus::UI::Label::;
1770		2057
1771	use CFClient::OpenGL;	2058	use CFPlus::OpenGL;
1772		2059
1773	sub new {	2060	sub new {
1774	my $class = shift;	2061	my $class = shift;
1775		2062
1776	$class->SUPER::new (	2063	$class->SUPER::new (
…		…
1780	active_fg => [0, 0, 0],	2067	active_fg => [0, 0, 0],
1781	can_hover => 1,	2068	can_hover => 1,
1782	can_focus => 1,	2069	can_focus => 1,
1783	valign => 0,	2070	valign => 0,
1784	can_events => 1,	2071	can_events => 1,
		2072	ellipsise => 0,
1785	#text => ...	2073	#text => ...
1786	#hidden => "*",	2074	#hidden => "*",
1787	@_	2075	@_
1788	)	2076	)
1789	}	2077	}
…		…
1834	my $sym = $ev->{sym};	2122	my $sym = $ev->{sym};
1835	my $uni = $ev->{unicode};	2123	my $uni = $ev->{unicode};
1836		2124
1837	my $text = $self->get_text;	2125	my $text = $self->get_text;
1838		2126
		2127	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2128
1839	if ($uni == 8) {	2129	if ($uni == 8) {
1840	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2130	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1841	} elsif ($uni == 127) {	2131	} elsif ($uni == 127) {
1842	substr $text, $self->{cursor}, 1, "";	2132	substr $text, $self->{cursor}, 1, "";
1843	} elsif ($sym == CFClient::SDLK_LEFT) {	2133	} elsif ($sym == CFPlus::SDLK_LEFT) {
1844	--$self->{cursor} if $self->{cursor};	2134	--$self->{cursor} if $self->{cursor};
1845	} elsif ($sym == CFClient::SDLK_RIGHT) {	2135	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1846	++$self->{cursor} if $self->{cursor} < length $self->{text};	2136	++$self->{cursor} if $self->{cursor} < length $self->{text};
1847	} elsif ($sym == CFClient::SDLK_HOME) {	2137	} elsif ($sym == CFPlus::SDLK_HOME) {
		2138	# what a hack
		2139	$self->{cursor} =
		2140	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2141	? length $1
		2142	: 0;
		2143	} elsif ($sym == CFPlus::SDLK_END) {
		2144	# uh, again
		2145	$self->{cursor} =
		2146	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2147	? $self->{cursor} + length $1
		2148	: length $self->{text};
		2149	} elsif ($uni == 21) { # ctrl-u
		2150	$text = "";
1848	$self->{cursor} = 0;	2151	$self->{cursor} = 0;
1849	} elsif ($sym == CFClient::SDLK_END) {
1850	$self->{cursor} = length $text;
1851	} elsif ($uni == 27) {	2152	} elsif ($uni == 27) {
1852	$self->emit ('escape');	2153	$self->emit ('escape');
1853	} elsif ($uni) {	2154	} elsif ($uni == 0x0d) {
		2155	substr $text, $self->{cursor}++, 0, "\012";
		2156	} elsif ($uni >= 0x20) {
1854	substr $text, $self->{cursor}++, 0, chr $uni;	2157	substr $text, $self->{cursor}++, 0, chr $uni;
1855	} else {	2158	} else {
1856	return 0;	2159	return 0;
1857	}	2160	}
1858		2161
1859	$self->_set_text ($text);	2162	$self->_set_text ($text);
1860		2163
1861	$self->realloc;	2164	$self->realloc;
		2165	$self->update;
1862		2166
1863	1	2167	1
1864	}	2168	}
1865		2169
1866	sub invoke_focus_in {	2170	sub invoke_focus_in {
…		…
1928	utf8::encode $text;	2232	utf8::encode $text;
1929		2233
1930	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2234	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1931	}	2235	}
1932		2236
1933	glColor @{$self->{fg}};
1934	glBegin GL_LINES;	2237	glBegin GL_LINES;
1935	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2238	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1936	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2239	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1937	glEnd;	2240	glEnd;
1938	}	2241	}
1939	}	2242	}
1940		2243
		2244	#############################################################################
		2245
1941	package CFClient::UI::Entry;	2246	package CFPlus::UI::Entry;
1942		2247
1943	our @ISA = CFClient::UI::EntryBase::;	2248	our @ISA = CFPlus::UI::EntryBase::;
1944		2249
1945	use CFClient::OpenGL;	2250	use CFPlus::OpenGL;
1946		2251
1947	sub invoke_key_down {	2252	sub invoke_key_down {
1948	my ($self, $ev) = @_;	2253	my ($self, $ev) = @_;
1949		2254
1950	my $sym = $ev->{sym};	2255	my $sym = $ev->{sym};
1951		2256
1952	if ($sym == 13) {	2257	if ($ev->{uni} == 0x0d || $sym == 13) {
1953	unshift @{$self->{history}},	2258	unshift @{$self->{history}},
1954	my $txt = $self->get_text;	2259	my $txt = $self->get_text;
1955		2260
1956	$self->{history_pointer} = -1;	2261	$self->{history_pointer} = -1;
1957	$self->{history_saveback} = '';	2262	$self->{history_saveback} = '';
1958	$self->emit (activate => $txt);	2263	$self->emit (activate => $txt);
1959	$self->update;	2264	$self->update;
1960		2265
1961	} elsif ($sym == CFClient::SDLK_UP) {	2266	} elsif ($sym == CFPlus::SDLK_UP) {
1962	if ($self->{history_pointer} < 0) {	2267	if ($self->{history_pointer} < 0) {
1963	$self->{history_saveback} = $self->get_text;	2268	$self->{history_saveback} = $self->get_text;
1964	}	2269	}
1965	if (@{$self->{history} || []} > 0) {	2270	if (@{$self->{history} || []} > 0) {
1966	$self->{history_pointer}++;	2271	$self->{history_pointer}++;
…		…
1968	$self->{history_pointer} = @{$self->{history} || []} - 1;	2273	$self->{history_pointer} = @{$self->{history} || []} - 1;
1969	}	2274	}
1970	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2275	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1971	}	2276	}
1972		2277
1973	} elsif ($sym == CFClient::SDLK_DOWN) {	2278	} elsif ($sym == CFPlus::SDLK_DOWN) {
1974	$self->{history_pointer}--;	2279	$self->{history_pointer}--;
1975	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2280	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1976		2281
1977	if ($self->{history_pointer} >= 0) {	2282	if ($self->{history_pointer} >= 0) {
1978	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2283	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1987	1	2292	1
1988	}	2293	}
1989		2294
1990	#############################################################################	2295	#############################################################################
1991		2296
		2297	package CFPlus::UI::TextEdit;
		2298
		2299	our @ISA = CFPlus::UI::EntryBase::;
		2300
		2301	use CFPlus::OpenGL;
		2302
		2303	sub move_cursor_ver {
		2304	my ($self, $dy) = @_;
		2305
		2306	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2307
		2308	$y += $dy;
		2309
		2310	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2311	$self->{cursor} = $index;
		2312	delete $self->{cur_h};
		2313	$self->update;
		2314	return;
		2315	}
		2316	}
		2317
		2318	sub invoke_key_down {
		2319	my ($self, $ev) = @_;
		2320
		2321	my $sym = $ev->{sym};
		2322
		2323	if ($sym == CFPlus::SDLK_UP) {
		2324	$self->move_cursor_ver (-1);
		2325	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2326	$self->move_cursor_ver (+1);
		2327	} else {
		2328	return $self->SUPER::invoke_key_down ($ev)
		2329	}
		2330
		2331	1
		2332	}
		2333
		2334	#############################################################################
		2335
1992	package CFClient::UI::Button;	2336	package CFPlus::UI::Button;
1993		2337
1994	our @ISA = CFClient::UI::Label::;	2338	our @ISA = CFPlus::UI::Label::;
1995		2339
1996	use CFClient::OpenGL;	2340	use CFPlus::OpenGL;
1997		2341
1998	my @tex =	2342	my @tex =
1999	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2343	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2000	qw(b1_button_active.png);	2344	qw(b1_button_inactive.png b1_button_active.png);
2001		2345
2002	sub new {	2346	sub new {
2003	my $class = shift;	2347	my $class = shift;
2004		2348
2005	$class->SUPER::new (	2349	$class->SUPER::new (
2006	padding_x => 4,	2350	padding_x => 4,
2007	padding_y => 4,	2351	padding_y => 4,
2008	fg => [1, 1, 1],	2352	fg => [1.0, 1.0, 1.0],
2009	active_fg => [0, 0, 1],	2353	active_fg => [0.8, 0.8, 0.8],
2010	can_hover => 1,	2354	can_hover => 1,
2011	align => 0,	2355	align => 0,
2012	valign => 0,	2356	valign => 0,
2013	can_events => 1,	2357	can_events => 1,
2014	@_	2358	@_
…		…
2032		2376
2033	glEnable GL_TEXTURE_2D;	2377	glEnable GL_TEXTURE_2D;
2034	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2378	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2035	glColor 0, 0, 0, 1;	2379	glColor 0, 0, 0, 1;
2036		2380
		2381	my $tex = $tex[$GRAB == $self];
2037	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2382	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2038		2383
2039	glDisable GL_TEXTURE_2D;	2384	glDisable GL_TEXTURE_2D;
2040		2385
2041	$self->SUPER::_draw;	2386	$self->SUPER::_draw;
2042	}	2387	}
2043		2388
2044	#############################################################################	2389	#############################################################################
2045		2390
		2391	package CFPlus::UI::CheckBox;
		2392
		2393	our @ISA = CFPlus::UI::DrawBG::;
		2394
		2395	my @tex =
		2396	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2397	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2398
		2399	use CFPlus::OpenGL;
		2400
		2401	sub new {
		2402	my $class = shift;
		2403
		2404	$class->SUPER::new (
		2405	padding_x => 2,
		2406	padding_y => 2,
		2407	fg => [1, 1, 1],
		2408	active_fg => [1, 1, 0],
		2409	bg => [0, 0, 0, 0.2],
		2410	active_bg => [1, 1, 1, 0.5],
		2411	state => 0,
		2412	can_hover => 1,
		2413	@_
		2414	)
		2415	}
		2416
		2417	sub size_request {
		2418	my ($self) = @_;
		2419
		2420	(6) x 2
		2421	}
		2422
		2423	sub toggle {
		2424	my ($self) = @_;
		2425
		2426	$self->{state} = !$self->{state};
		2427	$self->emit (changed => $self->{state});
		2428	$self->update;
		2429	}
		2430
		2431	sub invoke_button_down {
		2432	my ($self, $ev, $x, $y) = @_;
		2433
		2434	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2435	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2436	$self->toggle;
		2437	} else {
		2438	return 0
		2439	}
		2440
		2441	1
		2442	}
		2443
		2444	sub _draw {
		2445	my ($self) = @_;
		2446
		2447	$self->SUPER::_draw;
		2448
		2449	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2450
		2451	my ($w, $h) = @$self{qw(w h)};
		2452
		2453	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2454
		2455	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2456
		2457	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2458
		2459	glEnable GL_TEXTURE_2D;
		2460	$tex->draw_quad_alpha (0, 0, $s, $s);
		2461	glDisable GL_TEXTURE_2D;
		2462	}
		2463
		2464	#############################################################################
		2465
		2466	package CFPlus::UI::Image;
		2467
		2468	our @ISA = CFPlus::UI::Base::;
		2469
		2470	use CFPlus::OpenGL;
		2471
		2472	our %texture_cache;
		2473
		2474	sub new {
		2475	my $class = shift;
		2476
		2477	my $self = $class->SUPER::new (
		2478	can_events => 0,
		2479	@_,
		2480	);
		2481
		2482	$self->{path} || $self->{tex}
		2483	or Carp::croak "'path' or 'tex' attributes required";
		2484
		2485	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2486	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2487
		2488	CFPlus::weaken $texture_cache{$self->{path}};
		2489
		2490	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2491
		2492	$self
		2493	}
		2494
		2495	sub STORABLE_freeze {
		2496	my ($self, $cloning) = @_;
		2497
		2498	$self->{path}
		2499	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2500
		2501	$self->{path}
		2502	}
		2503
		2504	sub STORABLE_attach {
		2505	my ($self, $cloning, $path) = @_;
		2506
		2507	$self->new (path => $path)
		2508	}
		2509
		2510	sub size_request {
		2511	my ($self) = @_;
		2512
		2513	($self->{tex}{w}, $self->{tex}{h})
		2514	}
		2515
		2516	sub _draw {
		2517	my ($self) = @_;
		2518
		2519	my $tex = $self->{tex};
		2520
		2521	my ($w, $h) = ($self->{w}, $self->{h});
		2522
		2523	if ($self->{rot90}) {
		2524	glRotate 90, 0, 0, 1;
		2525	glTranslate 0, -$self->{w}, 0;
		2526
		2527	($w, $h) = ($h, $w);
		2528	}
		2529
		2530	glEnable GL_TEXTURE_2D;
		2531	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2532
		2533	$tex->draw_quad (0, 0, $w, $h);
		2534
		2535	glDisable GL_TEXTURE_2D;
		2536	}
		2537
		2538	#############################################################################
		2539
2046	package CFClient::UI::ImageButton;	2540	package CFPlus::UI::ImageButton;
2047		2541
2048	our @ISA = CFClient::UI::Image::;	2542	our @ISA = CFPlus::UI::Image::;
2049		2543
2050	use CFClient::OpenGL;	2544	use CFPlus::OpenGL;
2051		2545
2052	my %textures;	2546	my %textures;
2053		2547
2054	sub new {	2548	sub new {
2055	my $class = shift;	2549	my $class = shift;
…		…
2077	1	2571	1
2078	}	2572	}
2079		2573
2080	#############################################################################	2574	#############################################################################
2081		2575
2082	package CFClient::UI::CheckBox;
2083
2084	our @ISA = CFClient::UI::DrawBG::;
2085
2086	my @tex =
2087	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2088	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2089
2090	use CFClient::OpenGL;
2091
2092	sub new {
2093	my $class = shift;
2094
2095	$class->SUPER::new (
2096	padding_x => 2,
2097	padding_y => 2,
2098	fg => [1, 1, 1],
2099	active_fg => [1, 1, 0],
2100	bg => [0, 0, 0, 0.2],
2101	active_bg => [1, 1, 1, 0.5],
2102	state => 0,
2103	can_hover => 1,
2104	@_
2105	)
2106	}
2107
2108	sub size_request {
2109	my ($self) = @_;
2110
2111	(6) x 2
2112	}
2113
2114	sub toggle {
2115	my ($self) = @_;
2116
2117	$self->{state} = !$self->{state};
2118	$self->emit (changed => $self->{state});
2119	$self->update;
2120	}
2121
2122	sub invoke_button_down {
2123	my ($self, $ev, $x, $y) = @_;
2124
2125	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2126	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2127	$self->toggle;
2128	} else {
2129	return 0
2130	}
2131
2132	1
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	$self->SUPER::_draw;
2139
2140	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2141
2142	my ($w, $h) = @$self{qw(w h)};
2143
2144	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2145
2146	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2147
2148	my $tex = $self->{state} ? $tex[1] : $tex[0];
2149
2150	glEnable GL_TEXTURE_2D;
2151	$tex->draw_quad_alpha (0, 0, $s, $s);
2152	glDisable GL_TEXTURE_2D;
2153	}
2154
2155	#############################################################################
2156
2157	package CFClient::UI::Image;	2576	package CFPlus::UI::VGauge;
2158		2577
2159	our @ISA = CFClient::UI::Base::;	2578	our @ISA = CFPlus::UI::Base::;
2160
2161	use CFClient::OpenGL;
2162
2163	our %texture_cache;
2164
2165	sub new {
2166	my $class = shift;
2167
2168	my $self = $class->SUPER::new (
2169	can_events => 0,
2170	@_,
2171	);
2172
2173	$self->{path} || $self->{tex}
2174	or Carp::croak "'path' or 'tex' attributes required";
2175
2176	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2177	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2178
2179	Scalar::Util::weaken $texture_cache{$self->{path}};
2180
2181	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2182
2183	$self
2184	}
2185
2186	sub size_request {
2187	my ($self) = @_;
2188
2189	($self->{tex}{w}, $self->{tex}{h})
2190	}
2191
2192	sub _draw {
2193	my ($self) = @_;
2194
2195	my $tex = $self->{tex};
2196
2197	my ($w, $h) = ($self->{w}, $self->{h});
2198
2199	if ($self->{rot90}) {
2200	glRotate 90, 0, 0, 1;
2201	glTranslate 0, -$self->{w}, 0;
2202
2203	($w, $h) = ($h, $w);
2204	}
2205
2206	glEnable GL_TEXTURE_2D;
2207	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2208
2209	$tex->draw_quad_alpha (0, 0, $w, $h);
2210
2211	glDisable GL_TEXTURE_2D;
2212	}
2213
2214	#############################################################################
2215
2216	package CFClient::UI::VGauge;
2217
2218	our @ISA = CFClient::UI::Base::;
2219		2579
2220	use List::Util qw(min max);	2580	use List::Util qw(min max);
2221		2581
2222	use CFClient::OpenGL;	2582	use CFPlus::OpenGL;
2223		2583
2224	my %tex = (	2584	my %tex = (
2225	food => [	2585	food => [
2226	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2586	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2227	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2587	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2228	],	2588	],
2229	grace => [	2589	grace => [
2230	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2590	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2591	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2232	],	2592	],
2233	hp => [	2593	hp => [
2234	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2594	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2235	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2595	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2236	],	2596	],
2237	mana => [	2597	mana => [
2238	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2598	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2239	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2599	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2240	],	2600	],
2241	);	2601	);
2242		2602
2243	# eg. VGauge->new (gauge => 'food'), default gauge: food	2603	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2346	glDisable GL_TEXTURE_2D;	2706	glDisable GL_TEXTURE_2D;
2347	}	2707	}
2348		2708
2349	#############################################################################	2709	#############################################################################
2350		2710
2351	package CFClient::UI::Gauge;	2711	package CFPlus::UI::Gauge;
2352		2712
2353	our @ISA = CFClient::UI::VBox::;	2713	our @ISA = CFPlus::UI::VBox::;
2354		2714
2355	sub new {	2715	sub new {
2356	my ($class, %arg) = @_;	2716	my ($class, %arg) = @_;
2357		2717
2358	my $self = $class->SUPER::new (	2718	my $self = $class->SUPER::new (
…		…
2360	can_hover => 1,	2720	can_hover => 1,
2361	can_events => 1,	2721	can_events => 1,
2362	%arg,	2722	%arg,
2363	);	2723	);
2364		2724
2365	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2725	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2366	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2726	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2367	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2727	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2368		2728
2369	$self	2729	$self
2370	}	2730	}
2371		2731
2372	sub set_fontsize {	2732	sub set_fontsize {
…		…
2393	$self->{value}->set_text ($val);	2753	$self->{value}->set_text ($val);
2394	}	2754	}
2395		2755
2396	#############################################################################	2756	#############################################################################
2397		2757
2398	package CFClient::UI::Slider;	2758	package CFPlus::UI::Slider;
2399		2759
2400	use strict;	2760	use strict;
2401		2761
2402	use CFClient::OpenGL;	2762	use CFPlus::OpenGL;
2403		2763
2404	our @ISA = CFClient::UI::DrawBG::;	2764	our @ISA = CFPlus::UI::DrawBG::;
2405		2765
2406	my @tex =	2766	my @tex =
2407	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2767	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2408	qw(s1_slider.png s1_slider_bg.png);	2768	qw(s1_slider.png s1_slider_bg.png);
2409		2769
2410	sub new {	2770	sub new {
2411	my $class = shift;	2771	my $class = shift;
2412		2772
…		…
2506	sub invoke_mouse_wheel {	2866	sub invoke_mouse_wheel {
2507	my ($self, $ev) = @_;	2867	my ($self, $ev) = @_;
2508		2868
2509	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2869	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510		2870
		2871	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2872
2511	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2873	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2512		2874
2513	! ! $delta	2875	! ! $delta
2514	}	2876	}
2515		2877
2516	sub update {	2878	sub update {
…		…
2567	glDisable GL_TEXTURE_2D;	2929	glDisable GL_TEXTURE_2D;
2568	}	2930	}
2569		2931
2570	#############################################################################	2932	#############################################################################
2571		2933
2572	package CFClient::UI::ValSlider;	2934	package CFPlus::UI::ValSlider;
2573		2935
2574	our @ISA = CFClient::UI::HBox::;	2936	our @ISA = CFPlus::UI::HBox::;
2575		2937
2576	sub new {	2938	sub new {
2577	my ($class, %arg) = @_;	2939	my ($class, %arg) = @_;
2578		2940
2579	my $range = delete $arg{range};	2941	my $range = delete $arg{range};
2580		2942
2581	my $self = $class->SUPER::new (	2943	my $self = $class->SUPER::new (
2582	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2944	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2583	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2945	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2584	to_value => sub { shift },	2946	to_value => sub { shift },
2585	from_value => sub { shift },	2947	from_value => sub { shift },
2586	%arg,	2948	%arg,
2587	);	2949	);
2588		2950
…		…
2608	sub set_range { shift->{slider}->set_range (@_) }	2970	sub set_range { shift->{slider}->set_range (@_) }
2609	sub set_value { shift->{slider}->set_value (@_) }	2971	sub set_value { shift->{slider}->set_value (@_) }
2610		2972
2611	#############################################################################	2973	#############################################################################
2612		2974
2613	package CFClient::UI::TextScroller;	2975	package CFPlus::UI::TextScroller;
2614		2976
2615	our @ISA = CFClient::UI::HBox::;	2977	our @ISA = CFPlus::UI::HBox::;
2616		2978
2617	use CFClient::OpenGL;	2979	use CFPlus::OpenGL;
2618		2980
2619	sub new {	2981	sub new {
2620	my $class = shift;	2982	my $class = shift;
2621		2983
2622	my $self = $class->SUPER::new (	2984	my $self = $class->SUPER::new (
…		…
2624	can_events => 1,	2986	can_events => 1,
2625	indent => 0,	2987	indent => 0,
2626	#font => default_font	2988	#font => default_font
2627	@_,	2989	@_,
2628		2990
2629	layout => (new CFClient::Layout),	2991	layout => (new CFPlus::Layout),
2630	par => [],	2992	par => [],
		2993	max_par => 0,
2631	height => 0,	2994	height => 0,
2632	children => [	2995	children => [
2633	(new CFClient::UI::Empty expand => 1),	2996	(new CFPlus::UI::Empty expand => 1),
2634	(new CFClient::UI::Slider vertical => 1),	2997	(new CFPlus::UI::Slider vertical => 1),
2635	],	2998	],
2636	);	2999	);
2637		3000
2638	$self->{children}[1]->connect (changed => sub { $self->update });	3001	$self->{children}[1]->connect (changed => sub { $self->update });
2639		3002
…		…
2716		3079
2717	# todo: base offset on lines or so, not on pixels	3080	# todo: base offset on lines or so, not on pixels
2718	$self->{children}[1]->set_value ($offset);	3081	$self->{children}[1]->set_value ($offset);
2719	}	3082	}
2720		3083
		3084	sub current_paragraph {
		3085	my ($self) = @_;
		3086
		3087	$self->{top_paragraph} - 1
		3088	}
		3089
		3090	sub scroll_to {
		3091	my ($self, $para) = @_;
		3092
		3093	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3094
		3095	$self->{scroll_to} = $para;
		3096	$self->update;
		3097	}
		3098
2721	sub clear {	3099	sub clear {
2722	my ($self) = @_;	3100	my ($self) = @_;
2723		3101
2724	my (undef, undef, @other) = @{ $self->{children} };	3102	my (undef, undef, @other) = @{ $self->{children} };
2725	$self->remove ($_) for @other;	3103	$self->remove ($_) for @other;
…		…
2728	$self->{height} = 0;	3106	$self->{height} = 0;
2729	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3107	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2730	}	3108	}
2731		3109
2732	sub add_paragraph {	3110	sub add_paragraph {
2733	my ($self, $color, $para, $indent) = @_;	3111	my $self = shift;
2734		3112
2735	my ($text, @w) = ref $para ? @$para : $para;	3113	for my $para (@_) {
2736
2737	$para = {	3114	$para = {
		3115	fg => [1, 1, 1, 1],
		3116	indent => 0,
		3117	markup => "",
		3118	widget => [],
		3119	ref $para ? %$para : (markup => $para),
2738	w => 1e10,	3120	w => 1e10,
2739	wrapped => 1,	3121	wrapped => 1,
2740	fg => $color,
2741	indent => $indent,
2742	markup => $text,
2743	widget => \@w,
2744	};	3122	};
2745		3123
2746	$self->add (@w) if @w;	3124	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2747	push @{$self->{par}}, $para;	3125	push @{$self->{par}}, $para;
		3126	}
		3127
		3128	if (my $max = $self->{max_par}) {
		3129	shift @{$self->{par}} while @{$self->{par}} > $max;
		3130	}
2748		3131
2749	$self->{need_reflow}++;	3132	$self->{need_reflow}++;
2750	$self->update;	3133	$self->update;
2751	}	3134	}
2752		3135
2753	sub scroll_to_bottom {	3136	sub scroll_to_bottom {
2754	my ($self) = @_;	3137	my ($self) = @_;
2755		3138
2756	$self->{scroll_to_bottom} = 1;	3139	$self->{scroll_to} = $#{$self->{par}};
2757	$self->update;	3140	$self->update;
2758	}	3141	}
2759		3142
		3143	sub force_uptodate {
		3144	my ($self) = @_;
		3145
		3146	if (delete $self->{need_reflow}) {
		3147	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3148
		3149	my $height = 0;
		3150
		3151	for my $para (@{$self->{par}}) {
		3152	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3153	my $layout = $self->get_layout ($para);
		3154	my ($w, $h) = $layout->size;
		3155
		3156	$para->{w} = $w + $para->{indent};
		3157	$para->{h} = $h;
		3158	$para->{wrapped} = $layout->has_wrapped;
		3159	}
		3160
		3161	$para->{y} = $height;
		3162	$height += $para->{h};
		3163	}
		3164
		3165	$self->{height} = $height;
		3166	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3167
		3168	delete $self->{texture};
		3169	}
		3170
		3171	if (my $paridx = delete $self->{scroll_to}) {
		3172	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3173	}
		3174	}
		3175
2760	sub update {	3176	sub update {
2761	my ($self) = @_;	3177	my ($self) = @_;
2762		3178
2763	$self->SUPER::update;	3179	$self->SUPER::update;
2764		3180
2765	return unless $self->{h} > 0;	3181	return unless $self->{h} > 0;
2766		3182
2767	delete $self->{texture};	3183	delete $self->{texture};
2768		3184
2769	$ROOT->on_post_alloc ($self => sub {	3185	$ROOT->on_post_alloc ($self => sub {
		3186	$self->force_uptodate;
		3187
2770	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3188	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2771		3189
2772	if (delete $self->{need_reflow}) {
2773	my $height = 0;
2774
2775	for my $para (@{$self->{par}}) {
2776	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2777	my $layout = $self->get_layout ($para);
2778	my ($w, $h) = $layout->size;
2779
2780	$para->{w} = $w + $para->{indent};
2781	$para->{h} = $h;
2782	$para->{wrapped} = $layout->has_wrapped;
2783	}
2784
2785	$height += $para->{h};
2786	}
2787
2788	$self->{height} = $height;
2789
2790	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2791
2792	delete $self->{texture};
2793	}
2794
2795	if (delete $self->{scroll_to_bottom}) {
2796	$self->{children}[1]->set_value (1e10);
2797	}
2798
2799	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3190	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2800	glClearColor 0, 0, 0, 0;	3191	glClearColor 0, 0, 0, 0;
2801	glClear GL_COLOR_BUFFER_BIT;	3192	glClear GL_COLOR_BUFFER_BIT;
2802		3193
		3194	package CFPlus::UI::Base;
		3195	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3196	(0, 0, $self->{w}, $self->{h});
		3197
		3198	my $top = int $self->{children}[1]{range}[0];
		3199
		3200	my $paridx = 0;
		3201	my $top_paragraph;
2803	my $top = int $self->{children}[1]{range}[0];	3202	my $top = int $self->{children}[1]{range}[0];
2804		3203
2805	my $y0 = $top;	3204	my $y0 = $top;
2806	my $y1 = $top + $H;	3205	my $y1 = $top + $H;
2807		3206
2808	my $y = 0;
2809
2810	for my $para (@{$self->{par}}) {	3207	for my $para (@{$self->{par}}) {
2811	my $h = $para->{h};	3208	my $h = $para->{h};
		3209	my $y = $para->{y};
2812		3210
2813	if ($y0 < $y + $h && $y < $y1) {	3211	if ($y0 < $y + $h && $y < $y1) {
2814
2815	my $layout = $self->get_layout ($para);	3212	my $layout = $self->get_layout ($para);
2816		3213
2817	$layout->render ($para->{indent}, $y - $y0);	3214	$layout->render ($para->{indent}, $y - $y0);
2818		3215
2819	if (my @w = @{ $para->{widget} }) {	3216	if (my @w = @{ $para->{widget} }) {
…		…
2828	$_->draw;	3225	$_->draw;
2829	}	3226	}
2830	}	3227	}
2831	}	3228	}
2832		3229
2833	$y += $h;	3230	$paridx++;
		3231	$top_paragraph ||= $paridx if $y >= $top;
2834	}	3232	}
		3233
		3234	$self->{top_paragraph} = $top_paragraph;
2835	};	3235	};
2836	});	3236	});
2837	}	3237	}
2838		3238
2839	sub reconfigure {	3239	sub reconfigure {
…		…
2857	$self->{children}[1]->draw;	3257	$self->{children}[1]->draw;
2858	}	3258	}
2859		3259
2860	#############################################################################	3260	#############################################################################
2861		3261
2862	package CFClient::UI::Animator;	3262	package CFPlus::UI::Animator;
2863		3263
2864	use CFClient::OpenGL;	3264	use CFPlus::OpenGL;
2865		3265
2866	our @ISA = CFClient::UI::Bin::;	3266	our @ISA = CFPlus::UI::Bin::;
2867		3267
2868	sub moveto {	3268	sub moveto {
2869	my ($self, $x, $y) = @_;	3269	my ($self, $x, $y) = @_;
2870		3270
2871	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3271	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2899	glPopMatrix;	3299	glPopMatrix;
2900	}	3300	}
2901		3301
2902	#############################################################################	3302	#############################################################################
2903		3303
2904	package CFClient::UI::Flopper;	3304	package CFPlus::UI::Flopper;
2905		3305
2906	our @ISA = CFClient::UI::Button::;	3306	our @ISA = CFPlus::UI::Button::;
2907		3307
2908	sub new {	3308	sub new {
2909	my $class = shift;	3309	my $class = shift;
2910		3310
2911	my $self = $class->SUPER::new (	3311	my $self = $class->SUPER::new (
…		…
2923	$self->{other}->toggle_visibility;	3323	$self->{other}->toggle_visibility;
2924	}	3324	}
2925		3325
2926	#############################################################################	3326	#############################################################################
2927		3327
2928	package CFClient::UI::Tooltip;	3328	package CFPlus::UI::Tooltip;
2929		3329
2930	our @ISA = CFClient::UI::Bin::;	3330	our @ISA = CFPlus::UI::Bin::;
2931		3331
2932	use CFClient::OpenGL;	3332	use CFPlus::OpenGL;
2933		3333
2934	sub new {	3334	sub new {
2935	my $class = shift;	3335	my $class = shift;
2936		3336
2937	$class->SUPER::new (	3337	$class->SUPER::new (
…		…
2940	)	3340	)
2941	}	3341	}
2942		3342
2943	sub set_tooltip_from {	3343	sub set_tooltip_from {
2944	my ($self, $widget) = @_;	3344	my ($self, $widget) = @_;
		3345
		3346	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3347	if $widget->{tooltip} =~ /^#(.*)$/;
2945		3348
2946	my $tooltip = $widget->{tooltip};	3349	my $tooltip = $widget->{tooltip};
2947		3350
2948	if ($ENV{CFPLUS_DEBUG} & 2) {	3351	if ($ENV{CFPLUS_DEBUG} & 2) {
2949	$tooltip .= "\n\n" . (ref $widget) . "\n"	3352	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2953	}	3356	}
2954		3357
2955	$tooltip =~ s/^\n+//;	3358	$tooltip =~ s/^\n+//;
2956	$tooltip =~ s/\n+$//;	3359	$tooltip =~ s/\n+$//;
2957		3360
2958	$self->add (new CFClient::UI::Label	3361	$self->add (new CFPlus::UI::Label
2959	markup => $tooltip,	3362	markup => $tooltip,
2960	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3363	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2961	fontsize => 0.8,	3364	fontsize => 0.8,
2962	fg => [0, 0, 0, 1],	3365	style => 1, # FLAG_INVERSE
2963	ellipsise => 0,	3366	ellipsise => 0,
2964	font => ($widget->{tooltip_font} || $::FONT_PROP),	3367	font => ($widget->{tooltip_font} || $::FONT_PROP),
2965	);	3368	);
2966	}	3369	}
2967		3370
…		…
2986		3389
2987	$self->{root}->on_post_alloc ("move_$self" => sub {	3390	$self->{root}->on_post_alloc ("move_$self" => sub {
2988	my $widget = $self->{owner}	3391	my $widget = $self->{owner}
2989	or return;	3392	or return;
2990		3393
		3394	if ($widget->{visible}) {
2991	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3395	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2992		3396
2993	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3397	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2994	if $x + $self->{w} > $self->{root}{w};	3398	if $x + $self->{w} > $self->{root}{w};
2995		3399
2996	$self->move_abs ($x, $y);	3400	$self->move_abs ($x, $y);
		3401	} else {
		3402	$self->hide;
		3403	}
2997	});	3404	});
2998	}	3405	}
2999		3406
3000	sub _draw {	3407	sub _draw {
3001	my ($self) = @_;	3408	my ($self) = @_;
…		…
3025	$self->SUPER::_draw;	3432	$self->SUPER::_draw;
3026	}	3433	}
3027		3434
3028	#############################################################################	3435	#############################################################################
3029		3436
3030	package CFClient::UI::Face;	3437	package CFPlus::UI::Face;
3031		3438
3032	our @ISA = CFClient::UI::Base::;	3439	our @ISA = CFPlus::UI::DrawBG::;
3033		3440
3034	use CFClient::OpenGL;	3441	use CFPlus::OpenGL;
3035		3442
3036	sub new {	3443	sub new {
3037	my $class = shift;	3444	my $class = shift;
3038		3445
3039	my $self = $class->SUPER::new (	3446	my $self = $class->SUPER::new (
		3447	size_w => 32,
		3448	size_h => 8,
3040	aspect => 1,	3449	aspect => 1,
3041	can_events => 0,	3450	can_events => 0,
3042	@_,	3451	@_,
3043	);	3452	);
3044		3453
3045	if ($self->{anim} && $self->{animspeed}) {	3454	if ($self->{anim} && $self->{animspeed}) {
3046	Scalar::Util::weaken (my $widget = $self);	3455	CFPlus::weaken (my $widget = $self);
3047		3456
		3457	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3458	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3048	$self->{timer} = Event->timer (	3459	$self->{timer} = Event->timer (
3049	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3050	hard => 1,	3460	parked => 1,
3051	interval => $self->{animspeed},
3052	cb => sub {	3461	cb => sub {
		3462	return unless $::CONN && $widget;
		3463
3053	++$widget->{frame};	3464	++$widget->{frame};
		3465	$widget->update_face;
3054	$widget->update;	3466	$widget->update;
		3467
		3468	$widget->update_timer;
3055	},	3469	},
3056	);	3470	);
		3471
		3472	$self->update_face;
		3473	$self->update_timer;
3057	}	3474	}
3058		3475
3059	$self	3476	$self
3060	}	3477	}
3061		3478
		3479	sub update_timer {
		3480	my ($self) = @_;
		3481
		3482	return unless $self->{timer};
		3483
		3484	if ($self->{visible}) {
		3485	$self->{timer}->at (
		3486	$self->{anim_start}
		3487	+ $self->{animspeed}
		3488	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3489	);
		3490	$self->{timer}->start;
		3491	} else {
		3492	$self->{timer}->stop;
		3493	}
		3494	}
		3495
		3496	sub update_face {
		3497	my ($self) = @_;
		3498
		3499	return unless $::CONN;
		3500
		3501	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3502	if ($anim && @$anim) {
		3503	delete $self->{wait_face};
		3504	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3505	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3506	}
		3507	}
		3508	}
		3509
3062	sub size_request {	3510	sub size_request {
3063	(32, 8)	3511	my ($self) = @_;
		3512
		3513	if ($::CONN) {
		3514	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3515	if (my $tex = $::CONN->{texture}[$faceid]) {
		3516	$self->{tex} = $tex;
		3517	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3518	} else {
		3519	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3520	$self->realloc;
		3521	});
		3522	}
		3523	}
		3524	}
		3525
		3526	($self->{size_w} || 8, $self->{size_h} || 8)
3064	}	3527	}
3065		3528
3066	sub update {	3529	sub update {
3067	my ($self) = @_;	3530	my ($self) = @_;
3068		3531
3069	return unless $self->{visible};	3532	return unless $self->{visible};
3070		3533
3071	$self->SUPER::update;	3534	$self->SUPER::update;
3072	}	3535	}
3073		3536
		3537	sub invoke_visibility_change {
		3538	my ($self) = @_;
		3539
		3540	$self->update_timer;
		3541
		3542	0
		3543	}
		3544
3074	sub _draw {	3545	sub _draw {
3075	my ($self) = @_;	3546	my ($self) = @_;
3076		3547
3077	return unless $::CONN;	3548	$self->SUPER::_draw;
3078		3549
3079	my $face;	3550	if (my $tex = $self->{tex}) {
3080
3081	if ($self->{frame}) {
3082	my $anim = $::CONN->{anim}[$self->{anim}];
3083
3084	$face = $anim->[ $self->{frame} % @$anim ]
3085	if $anim && @$anim;
3086	}
3087
3088	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3089
3090	if ($tex) {
3091	glEnable GL_TEXTURE_2D;	3551	glEnable GL_TEXTURE_2D;
3092	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3552	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3093	glColor 0, 0, 0, 1;	3553	glColor 0, 0, 0, 1;
3094	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3554	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3095	glDisable GL_TEXTURE_2D;	3555	glDisable GL_TEXTURE_2D;
…		…
3097	}	3557	}
3098		3558
3099	sub destroy {	3559	sub destroy {
3100	my ($self) = @_;	3560	my ($self) = @_;
3101		3561
3102	$self->{timer}->cancel	3562	(delete $self->{timer})->cancel
3103	if $self->{timer};	3563	if $self->{timer};
3104		3564
3105	$self->SUPER::destroy;	3565	$self->SUPER::destroy;
3106	}	3566	}
3107		3567
3108	#############################################################################	3568	#############################################################################
3109		3569
3110	package CFClient::UI::Buttonbar;	3570	package CFPlus::UI::Buttonbar;
3111		3571
3112	our @ISA = CFClient::UI::HBox::;	3572	our @ISA = CFPlus::UI::HBox::;
3113		3573
3114	# TODO: should actualyl wrap buttons and other goodies.	3574	# TODO: should actually wrap buttons and other goodies.
3115		3575
3116	#############################################################################	3576	#############################################################################
3117		3577
3118	package CFClient::UI::Menu;	3578	package CFPlus::UI::Menu;
3119		3579
3120	our @ISA = CFClient::UI::FancyFrame::;	3580	our @ISA = CFPlus::UI::Toplevel::;
3121		3581
3122	use CFClient::OpenGL;	3582	use CFPlus::OpenGL;
3123		3583
3124	sub new {	3584	sub new {
3125	my $class = shift;	3585	my $class = shift;
3126		3586
3127	my $self = $class->SUPER::new (	3587	my $self = $class->SUPER::new (
3128	items => [],	3588	items => [],
3129	z => 100,	3589	z => 100,
3130	@_,	3590	@_,
3131	);	3591	);
3132		3592
3133	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3593	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3134		3594
3135	for my $item (@{ $self->{items} }) {	3595	for my $item (@{ $self->{items} }) {
3136	my ($widget, $cb, $tooltip) = @$item;	3596	my ($widget, $cb, $tooltip) = @$item;
3137		3597
3138	# handle various types of items, only text for now	3598	# handle various types of items, only text for now
3139	if (!ref $widget) {	3599	if (!ref $widget) {
3140	if ($widget =~ /\t/) {	3600	if ($widget =~ /\t/) {
3141	my ($left, $right) = split /\t/, $widget, 2;	3601	my ($left, $right) = split /\t/, $widget, 2;
3142		3602
3143	$widget = new CFClient::UI::HBox	3603	$widget = new CFPlus::UI::HBox
3144	can_hover => 1,	3604	can_hover => 1,
3145	can_events => 1,	3605	can_events => 1,
3146	tooltip => $tooltip,	3606	tooltip => $tooltip,
3147	children => [	3607	children => [
3148	(new CFClient::UI::Label markup => $left, expand => 1),	3608	(new CFPlus::UI::Label markup => $left, expand => 1),
3149	(new CFClient::UI::Label markup => $right, align => +1),	3609	(new CFPlus::UI::Label markup => $right, align => +1),
3150	],	3610	],
3151	;	3611	;
3152		3612
3153	} else {	3613	} else {
3154	$widget = new CFClient::UI::Label	3614	$widget = new CFPlus::UI::Label
3155	can_hover => 1,	3615	can_hover => 1,
3156	can_events => 1,	3616	can_events => 1,
3157	markup => $widget,	3617	markup => $widget,
3158	tooltip => $tooltip;	3618	tooltip => $tooltip;
3159	}	3619	}
…		…
3207	1	3667	1
3208	}	3668	}
3209		3669
3210	#############################################################################	3670	#############################################################################
3211		3671
3212	package CFClient::UI::Multiplexer;	3672	package CFPlus::UI::Multiplexer;
3213		3673
3214	our @ISA = CFClient::UI::Container::;	3674	our @ISA = CFPlus::UI::Container::;
3215		3675
3216	sub new {	3676	sub new {
3217	my $class = shift;	3677	my $class = shift;
3218		3678
3219	my $self = $class->SUPER::new (	3679	my $self = $class->SUPER::new (
…		…
3280	$self->{current}->draw;	3740	$self->{current}->draw;
3281	}	3741	}
3282		3742
3283	#############################################################################	3743	#############################################################################
3284		3744
3285	package CFClient::UI::Notebook;	3745	package CFPlus::UI::Notebook;
3286		3746
3287	our @ISA = CFClient::UI::VBox::;	3747	our @ISA = CFPlus::UI::VBox::;
3288		3748
3289	sub new {	3749	sub new {
3290	my $class = shift;	3750	my $class = shift;
3291		3751
3292	my $self = $class->SUPER::new (	3752	my $self = $class->SUPER::new (
3293	buttonbar => (new CFClient::UI::Buttonbar),	3753	buttonbar => (new CFPlus::UI::Buttonbar),
3294	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3754	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3295	# filter => # will be put between multiplexer and $self	3755	# filter => # will be put between multiplexer and $self
3296	@_,	3756	@_,
3297	);	3757	);
3298		3758
3299	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3759	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3303	}	3763	}
3304		3764
3305	sub add {	3765	sub add {
3306	my ($self, $title, $widget, $tooltip) = @_;	3766	my ($self, $title, $widget, $tooltip) = @_;
3307		3767
3308	Scalar::Util::weaken $self;	3768	CFPlus::weaken $self;
3309		3769
3310	$self->{buttonbar}->add (new CFClient::UI::Button	3770	unless (ref $title) {
		3771	$title = new CFPlus::UI::Button
3311	markup => $title,	3772	markup => $title,
3312	tooltip => $tooltip,	3773	tooltip => $tooltip,
		3774	);
		3775	}
		3776
3313	on_activate => sub { $self->set_current_page ($widget) },	3777	$title->connect (activate => sub { $self->set_current_page ($widget) });
3314	);	3778	$self->{buttonbar}->add ($title);
3315		3779
3316	$self->{multiplexer}->add ($widget);	3780	$self->{multiplexer}->add ($widget);
3317	}	3781	}
3318		3782
3319	sub get_current_page {	3783	sub get_current_page {
…		…
3329	$self->emit (page_changed => $self->{multiplexer}{current});	3793	$self->emit (page_changed => $self->{multiplexer}{current});
3330	}	3794	}
3331		3795
3332	#############################################################################	3796	#############################################################################
3333		3797
3334	package CFClient::UI::Combobox;	3798	package CFPlus::UI::Selector;
3335		3799
3336	use utf8;	3800	use utf8;
3337		3801
3338	our @ISA = CFClient::UI::Button::;	3802	our @ISA = CFPlus::UI::Button::;
3339		3803
3340	sub new {	3804	sub new {
3341	my $class = shift;	3805	my $class = shift;
3342		3806
3343	my $self = $class->SUPER::new (	3807	my $self = $class->SUPER::new (
…		…
3360	my ($value, $title, $tooltip) = @$_;	3824	my ($value, $title, $tooltip) = @$_;
3361		3825
3362	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3826	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363	}	3827	}
3364		3828
3365	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3829	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366	}	3830	}
3367		3831
3368	sub _set_value {	3832	sub _set_value {
3369	my ($self, $value) = @_;	3833	my ($self, $value) = @_;
3370		3834
…		…
3385	$self->emit (changed => $value);	3849	$self->emit (changed => $value);
3386	}	3850	}
3387		3851
3388	#############################################################################	3852	#############################################################################
3389		3853
3390	package CFClient::UI::Statusbox;	3854	package CFPlus::UI::Statusbox;
3391		3855
3392	our @ISA = CFClient::UI::VBox::;	3856	our @ISA = CFPlus::UI::VBox::;
3393		3857
3394	sub new {	3858	sub new {
3395	my $class = shift;	3859	my $class = shift;
3396		3860
3397	my $self = $class->SUPER::new (	3861	my $self = $class->SUPER::new (
3398	fontsize => 0.8,	3862	fontsize => 0.8,
3399	@_,	3863	@_,
3400	);	3864	);
3401		3865
3402	Scalar::Util::weaken (my $this = $self);	3866	CFPlus::weaken (my $this = $self);
3403		3867
3404	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3868	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3405		3869
3406	$self	3870	$self
3407	}	3871	}
…		…
3409	sub reorder {	3873	sub reorder {
3410	my ($self) = @_;	3874	my ($self) = @_;
3411	my $NOW = Time::HiRes::time;	3875	my $NOW = Time::HiRes::time;
3412		3876
3413	# freeze display when hovering over any label	3877	# freeze display when hovering over any label
3414	return if $CFClient::UI::TOOLTIP->{owner}	3878	return if $CFPlus::UI::TOOLTIP->{owner}
3415	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3879	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3416	values %{ $self->{item} };	3880	values %{ $self->{item} };
3417		3881
3418	while (my ($k, $v) = each %{ $self->{item} }) {	3882	while (my ($k, $v) = each %{ $self->{item} }) {
3419	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3883	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3420	}	3884	}
…		…
3441	for ($short) {	3905	for ($short) {
3442	s/^\s+//;	3906	s/^\s+//;
3443	s/\s+/ /g;	3907	s/\s+/ /g;
3444	}	3908	}
3445		3909
3446	new CFClient::UI::Label	3910	new CFPlus::UI::Label
3447	markup => $short,	3911	markup => $short,
3448	tooltip => $item->{tooltip},	3912	tooltip => $item->{tooltip},
3449	tooltip_font => $::FONT_PROP,	3913	tooltip_font => $::FONT_PROP,
3450	tooltip_width => 0.67,	3914	tooltip_width => 0.67,
3451	fontsize => $item->{fontsize} || $self->{fontsize},	3915	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3530	$self->SUPER::destroy;	3994	$self->SUPER::destroy;
3531	}	3995	}
3532		3996
3533	#############################################################################	3997	#############################################################################
3534		3998
3535	package CFClient::UI::Inventory;
3536
3537	our @ISA = CFClient::UI::Table::;
3538
3539	sub new {
3540	my $class = shift;
3541
3542	my $self = $class->SUPER::new (
3543	col_expand => [0, 1, 0],
3544	@_,
3545	);
3546
3547	$self
3548	}
3549
3550	sub set_items {
3551	my ($self, $items) = @_;
3552
3553	$self->clear;
3554	return unless $items;
3555
3556	my @items = sort {
3557	($a->{type} <=> $b->{type})
3558	or ($a->{name} cmp $b->{name})
3559	} values %$items;
3560
3561	$self->{real_items} = \@items;
3562
3563	my $row = 0;
3564	for my $item (@items) {
3565	CFClient::Item::update_widgets $item;
3566
3567	$self->add (0, $row, $item->{face_widget});
3568	$self->add (1, $row, $item->{desc_widget});
3569	$self->add (2, $row, $item->{weight_widget});
3570
3571	$row++;
3572	}
3573	}
3574
3575	#############################################################################
3576
3577	package CFClient::UI::SpellList;
3578
3579	our @ISA = CFClient::UI::Table::;
3580
3581	sub new {
3582	my $class = shift;
3583
3584	my $self = $class->SUPER::new (
3585	binding => [],
3586	commands => [],
3587	@_,
3588	)
3589	}
3590
3591	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3592
3593	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3594	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3595	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3596	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3597	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3598	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3599	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3600	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3601	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3602	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603
3604	sub rebuild_spell_list {
3605	my ($self) = @_;
3606
3607	$CFClient::UI::ROOT->on_refresh ($self => sub {
3608	$self->clear;
3609
3610	return unless $::CONN;
3611
3612	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3614	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617
3618	my $row = 0;
3619
3620	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621	my $spell = $self->{spell}{$_};
3622
3623	$row++;
3624
3625	my $spell_cb = sub {
3626	my ($widget, $ev) = @_;
3627
3628	if ($ev->{button} == 1) {
3629	$::CONN->user_send ("cast $spell->{name}");
3630	} elsif ($ev->{button} == 2) {
3631	$::CONN->user_send ("invoke $spell->{name}");
3632	} elsif ($ev->{button} == 3) {
3633	(new CFClient::UI::Menu
3634	items => [
3635	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637	],
3638	)->popup ($ev);
3639	} else {
3640	return 0;
3641	}
3642
3643	1
3644	};
3645
3646	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647
3648	#TODO: add path info to tooltip
3649	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3650
3651	$self->add (0, $row, new CFClient::UI::Face
3652	face => $spell->{face},
3653	can_hover => 1,
3654	can_events => 1,
3655	tooltip => $tooltip,
3656	on_button_down => $spell_cb,
3657	);
3658
3659	$self->add (1, $row, new CFClient::UI::Label
3660	expand => 1,
3661	text => $spell->{name},
3662	can_hover => 1,
3663	can_events => 1,
3664	tooltip => $tooltip,
3665	on_button_down => $spell_cb,
3666	);
3667
3668	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672	}
3673	});
3674	}
3675
3676	sub add_spell {
3677	my ($self, $spell) = @_;
3678
3679	$self->{spell}->{$spell->{name}} = $spell;
3680	$self->rebuild_spell_list;
3681	}
3682
3683	sub remove_spell {
3684	my ($self, $spell) = @_;
3685
3686	delete $self->{spell}->{$spell->{name}};
3687	$self->rebuild_spell_list;
3688	}
3689
3690	sub clear_spells {
3691	my ($self) = @_;
3692
3693	$self->{spell} = {};
3694	$self->rebuild_spell_list;
3695	}
3696
3697	#############################################################################
3698
3699	package CFClient::UI::Root;	3999	package CFPlus::UI::Root;
3700		4000
3701	our @ISA = CFClient::UI::Container::;	4001	our @ISA = CFPlus::UI::Container::;
3702		4002
3703	use List::Util qw(min max);	4003	use List::Util qw(min max);
3704		4004
3705	use CFClient::OpenGL;	4005	use CFPlus::OpenGL;
3706		4006
3707	sub new {	4007	sub new {
3708	my $class = shift;	4008	my $class = shift;
3709		4009
3710	my $self = $class->SUPER::new (	4010	my $self = $class->SUPER::new (
3711	visible => 1,	4011	visible => 1,
3712	@_,	4012	@_,
3713	);	4013	);
3714		4014
3715	Scalar::Util::weaken ($self->{root} = $self);	4015	CFPlus::weaken ($self->{root} = $self);
3716		4016
3717	$self	4017	$self
3718	}	4018	}
3719		4019
3720	sub size_request {	4020	sub size_request {
…		…
3815	while ($self->{refresh_hook}) {	4115	while ($self->{refresh_hook}) {
3816	$_->()	4116	$_->()
3817	for values %{delete $self->{refresh_hook}};	4117	for values %{delete $self->{refresh_hook}};
3818	}	4118	}
3819		4119
3820	if ($self->{realloc}) {	4120	while ($self->{realloc}) {
3821	my %queue;	4121	my %queue;
3822	my @queue;	4122	my @queue;
3823	my $widget;	4123	my $widget;
3824		4124
3825	outer:	4125	outer:
…		…
3872	}	4172	}
3873	}	4173	}
3874		4174
3875	delete $self->{realloc}{$widget+0};	4175	delete $self->{realloc}{$widget+0};
3876	}	4176	}
3877	}
3878		4177
3879	while (my $size_alloc = delete $self->{size_alloc}) {	4178	while (my $size_alloc = delete $self->{size_alloc}) {
3880	my @queue = sort { $b->{visible} <=> $a->{visible} }	4179	my @queue = sort { $a->{visible} <=> $b->{visible} }
3881	values %$size_alloc;	4180	values %$size_alloc;
3882		4181
3883	while () {	4182	while () {
3884	my $widget = pop @queue || last;	4183	my $widget = pop @queue || last;
3885		4184
3886	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4185	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3887		4186
3888	$w = 0 if $w < 0;
3889	$h = 0 if $h < 0;
3890
3891	$w = max $widget->{min_w}, $w;	4187	$w = max $widget->{min_w}, $w;
3892	$h = max $widget->{min_h}, $h;	4188	$h = max $widget->{min_h}, $h;
3893		4189
		4190	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4191	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4192
3894	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4193	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4194	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896		4195
3897	$w = int $w + 0.5;	4196	$w = int $w + 0.5;
3898	$h = int $h + 0.5;	4197	$h = int $h + 0.5;
3899		4198
3900	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4199	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3901	$widget->{old_w} = $widget->{w};	4200	$widget->{old_w} = $widget->{w};
3902	$widget->{old_h} = $widget->{h};	4201	$widget->{old_h} = $widget->{h};
3903		4202
3904	$widget->{w} = $w;	4203	$widget->{w} = $w;
3905	$widget->{h} = $h;	4204	$widget->{h} = $h;
3906		4205
3907	$widget->emit (size_allocate => $w, $h);	4206	$widget->emit (size_allocate => $w, $h);
		4207	}
3908	}	4208	}
3909	}	4209	}
3910	}	4210	}
3911		4211
3912	while ($self->{post_alloc_hook}) {	4212	while ($self->{post_alloc_hook}) {
3913	$_->()	4213	$_->()
3914	for values %{delete $self->{post_alloc_hook}};	4214	for values %{delete $self->{post_alloc_hook}};
3915	}	4215	}
3916
3917		4216
3918	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4217	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3919	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4218	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3920	glClear GL_COLOR_BUFFER_BIT;	4219	glClear GL_COLOR_BUFFER_BIT;
3921		4220
…		…
3924	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4223	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3925	glMatrixMode GL_MODELVIEW;	4224	glMatrixMode GL_MODELVIEW;
3926	glLoadIdentity;	4225	glLoadIdentity;
3927		4226
3928	{	4227	{
3929	package CFClient::UI::Base;	4228	package CFPlus::UI::Base;
3930		4229
3931	($draw_x, $draw_y, $draw_w, $draw_h) =	4230	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3932	(0, 0, $self->{w}, $self->{h});	4231	(0, 0, $self->{w}, $self->{h});
3933	}
3934		4232
3935	$self->_draw;	4233	$self->_draw;
		4234	}
3936	}	4235	}
3937		4236
3938	#############################################################################	4237	#############################################################################
3939		4238
3940	package CFClient::UI;	4239	package CFPlus::UI;
3941		4240
3942	$ROOT = new CFClient::UI::Root;	4241	$ROOT = new CFPlus::UI::Root;
3943	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4242	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3944		4243
3945	1	4244	1
3946		4245

Diff Legend

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