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.333 by root, Sun Jul 23 11:09:58 2006 UTC vs.
Revision 1.447 by root, Sat Dec 22 06:50:45 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;
9		7
10	use CFClient;	8	use CFPlus;
		9	use CFPlus::Pod;
11	use CFClient::Texture;	10	use CFPlus::Texture;
12		11
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		13
15	our $LAYOUT;	14	our $LAYOUT;
16	our $ROOT;	15	our $ROOT;
17	our $TOOLTIP;	16	our $TOOLTIP;
18	our $BUTTON_STATE;	17	our $BUTTON_STATE;
19		18
20	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
21		20
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	21	our $TOOLTIP_WATCHER = EV::timer_ns 0, 1/60, sub {
		22	$_[0]->stop;
		23
23	if (!$GRAB) {	24	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
		28	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	29	$TOOLTIP->hide;
28		30
29	$TOOLTIP->{owner} = $widget;	31	$TOOLTIP->{owner} = $widget;
		32	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		33
31	return if $ENV{CFPLUS_DEBUG} & 8;	34	return if $ENV{CFPLUS_DEBUG} & 8;
32		35
33	my $tip = $widget->{tooltip};
34
35	$tip = $tip->($widget) if CODE:: eq ref $tip;
36
37	$TOOLTIP->set_tooltip_from ($widget);	36	$TOOLTIP->set_tooltip_from ($widget);
38	$TOOLTIP->show;	37	$TOOLTIP->show;
39	}	38	}
40		39
41	return;	40	return;
42	}	41	}
43	}	42	}
44	}	43	}
45		44
46	$TOOLTIP->hide;	45	$TOOLTIP->hide;
		46	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
48	});	48	};
49		49
50	sub get_layout {	50	sub get_layout {
51	my $layout;	51	my $layout;
52		52
53	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
88	my $hover = $HOVER; $HOVER = $widget;	88	my $hover = $HOVER; $HOVER = $widget;
89		89
90	$hover->update if $hover && $hover->{can_hover};	90	$hover->update if $hover && $hover->{can_hover};
91	$HOVER->update if $HOVER && $HOVER->{can_hover};	91	$HOVER->update if $HOVER && $HOVER->{can_hover};
92		92
93	$TOOLTIP_WATCHER->start;	93	$TOOLTIP_WATCHER->again;
94	}	94	}
95	}	95	}
96		96
97	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	98	my ($ev) = @_;
99	my ($x, $y) = ($ev->{x}, $ev->{y});	99	my ($x, $y) = ($ev->{x}, $ev->{y});
100		100
101	unless ($BUTTON_STATE) {	101	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		102
		103	unless ($GRAB) {
102	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
103		105
104	$GRAB = $widget;	106	$GRAB = $widget;
105	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
106		108
107	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->invoke;
108	}	110	}
109
110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
111		111
112	if ($GRAB) {	112	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	113	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	114	# mousewheel
115	$ev->{dx} = 0;
116	$ev->{dy} = $ev->{button} * 2 - 9;	115	my $delta = $ev->{button} * 2 - 9;
		116	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		117
		118	$ev->{dx} = $shift ? $delta : 0;
		119	$ev->{dy} = $shift ? 0 : $delta;
		120
117	$GRAB->emit (mouse_wheel => $ev);	121	$GRAB->emit (mouse_wheel => $ev);
118	} else {	122	} else {
119	$GRAB->emit (button_down => $ev)	123	$GRAB->emit (button_down => $ev)
120	}	124	}
121	}	125	}
…		…
135	my $grab = $GRAB; undef $GRAB;	139	my $grab = $GRAB; undef $GRAB;
136	$grab->update if $grab;	140	$grab->update if $grab;
137	$GRAB->update if $GRAB;	141	$GRAB->update if $GRAB;
138		142
139	check_hover $widget;	143	check_hover $widget;
140	$TOOLTIP_WATCHER->cb->();	144	$TOOLTIP_WATCHER->invoke;
141	}	145	}
142	}	146	}
143		147
144	sub feed_sdl_motion_event {	148	sub feed_sdl_motion_event {
145	my ($ev) = @_;	149	my ($ev) = @_;
…		…
207	reconfigure_widgets;	211	reconfigure_widgets;
208	}	212	}
209		213
210	#############################################################################	214	#############################################################################
211		215
212	package CFClient::UI::Event;	216	package CFPlus::UI::Event;
213		217
214	sub xy {	218	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	219	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	220	}
217		221
218	#############################################################################	222	#############################################################################
219		223
220	package CFClient::UI::Base;	224	package CFPlus::UI::Base;
221		225
222	use strict;	226	use strict;
223		227
224	use CFClient::OpenGL;	228	use CFPlus::OpenGL;
225		229
226	sub new {	230	sub new {
227	my $class = shift;	231	my $class = shift;
228		232
229	my $self = bless {	233	my $self = bless {
…		…
234	h => undef,	238	h => undef,
235	can_events => 1,	239	can_events => 1,
236	@_	240	@_
237	}, $class;	241	}, $class;
238		242
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	243	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		244
241	for (keys %$self) {	245	for (keys %$self) {
242	if (/^on_(.*)$/) {	246	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	247	$self->connect ($1 => delete $self->{$_});
244	}	248	}
245	}	249	}
246		250
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	251	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	252	$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};	253	$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};	254	$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};	255	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		256
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	257	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	258	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		259
256	$self->show if $layout->{show};	260	$self->show if $layout->{show};
…		…
261		265
262	sub destroy {	266	sub destroy {
263	my ($self) = @_;	267	my ($self) = @_;
264		268
265	$self->hide;	269	$self->hide;
		270	$self->emit ("destroy");
266	%$self = ();	271	%$self = ();
267	}	272	}
268		273
		274	sub TO_JSON {
		275	{ "\fw" => $_[0]{s_id} }
		276	}
		277
269	sub show {	278	sub show {
270	my ($self) = @_;	279	my ($self) = @_;
271		280
272	return if $self->{parent};	281	return if $self->{parent};
273		282
274	$CFClient::UI::ROOT->add ($self);	283	$CFPlus::UI::ROOT->add ($self);
275	}	284	}
276		285
277	sub set_visible {	286	sub set_visible {
278	my ($self) = @_;	287	my ($self) = @_;
279		288
…		…
300	delete $self->{root};	309	delete $self->{root};
301		310
302	undef $GRAB if $GRAB == $self;	311	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	312	undef $HOVER if $HOVER == $self;
304		313
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	314	$CFPlus::UI::TOOLTIP_WATCHER->invoke
306	if $TOOLTIP->{owner} == $self;	315	if $TOOLTIP->{owner} == $self;
307		316
308	$self->emit ("focus_out");	317	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	318	$self->emit (visibility_change => 0);
310	}	319	}
…		…
312	sub set_visibility {	321	sub set_visibility {
313	my ($self, $visible) = @_;	322	my ($self, $visible) = @_;
314		323
315	return if $self->{visible} == $visible;	324	return if $self->{visible} == $visible;
316		325
317	$visible ? $self->hide	326	$visible ? $self->show
318	: $self->show;	327	: $self->hide;
319	}	328	}
320		329
321	sub toggle_visibility {	330	sub toggle_visibility {
322	my ($self) = @_;	331	my ($self) = @_;
323		332
…		…
352	$self->{force_h} = $h;	361	$self->{force_h} = $h;
353		362
354	$self->realloc;	363	$self->realloc;
355	}	364	}
356		365
		366	# traverse the widget chain up to find the maximum "physical" size constraints
		367	sub get_max_wh {
		368	my ($self) = @_;
		369
		370	return $self->{parent}->get_max_wh
		371	if $self->{parent};
		372
		373	($::WIDTH, $::HEIGHT)
		374	}
		375
357	sub size_request {	376	sub size_request {
358	require Carp;	377	require Carp;
359	Carp::confess "size_request is abstract";	378	Carp::confess "size_request is abstract";
360	}	379	}
361		380
…		…
367	my ($self, $x, $y, $w, $h) = @_;	386	my ($self, $x, $y, $w, $h) = @_;
368		387
369	if ($self->{aspect}) {	388	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	389	my ($ow, $oh) = ($w, $h);
371		390
372	$w = List::Util::min $w, int $h * $self->{aspect};	391	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $w / $self->{aspect};	392	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		393
375	# use alignment to adjust x, y	394	# use alignment to adjust x, y
376		395
377	$x += int 0.5 * ($ow - $w);	396	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	397	$y += int 0.5 * ($oh - $h);
…		…
419		438
420	return if $self->{tooltip} eq $tooltip;	439	return if $self->{tooltip} eq $tooltip;
421		440
422	$self->{tooltip} = $tooltip;	441	$self->{tooltip} = $tooltip;
423		442
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	443	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	444	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	445	$CFPlus::UI::TOOLTIP_WATCHER->invoke;
427	}	446	}
428	}	447	}
429		448
430	# translate global coordinates to local coordinate system	449	# translate global coordinates to local coordinate system
431	sub coord2local {	450	sub coord2local {
432	my ($self, $x, $y) = @_;	451	my ($self, $x, $y) = @_;
433		452
434	Carp::confess unless $self->{parent};#d#	453	return (undef, undef) unless $self->{parent};
435		454
436	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	455	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
437	}	456	}
438		457
439	# translate local coordinates to global coordinate system	458	# translate local coordinates to global coordinate system
440	sub coord2global {	459	sub coord2global {
441	my ($self, $x, $y) = @_;	460	my ($self, $x, $y) = @_;
442		461
443	Carp::confess unless $self->{parent};#d#	462	return (undef, undef) unless $self->{parent};
444		463
445	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	464	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
446	}	465	}
447		466
448	sub invoke_focus_in {	467	sub invoke_focus_in {
…		…
497	sub connect {	516	sub connect {
498	my ($self, $signal, $cb) = @_;	517	my ($self, $signal, $cb) = @_;
499		518
500	push @{ $self->{signal_cb}{$signal} }, $cb;	519	push @{ $self->{signal_cb}{$signal} }, $cb;
501		520
502	defined wantarray and CFClient::guard {	521	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	522	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	523	@{ $self->{signal_cb}{$signal} };
505	}	524	}
		525	}
		526
		527	sub disconnect_all {
		528	my ($self, $signal) = @_;
		529
		530	delete $self->{signal_cb}{$signal};
506	}	531	}
507		532
508	my %has_coords = (	533	my %has_coords = (
509	button_down => 1,	534	button_down => 1,
510	button_up => 1,	535	button_up => 1,
…		…
513	);	538	);
514		539
515	sub emit {	540	sub emit {
516	my ($self, $signal, @args) = @_;	541	my ($self, $signal, @args) = @_;
517		542
518	# I do not really like this solution, but I dislike duplication	543	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	544	# and needlessly verbose code, either.
520	my @append	545	my @append
521	= $has_coords{$signal}	546	= $has_coords{$signal}
522	? $args[0]->xy ($self)	547	? $args[0]->xy ($self)
523	: ();	548	: ();
524		549
525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	550	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526		551
527	#d##TODO# stop propagating at first true, do not use sum	552	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	553	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	554	($self->can ("invoke_$signal") || sub { 1 }), # closure
		555	) {
		556	return $cb->($self, @args, @append) || next;
		557	}
		558
		559	# parent
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	560	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	561	}
532		562
533	sub find_widget {	563	#sub find_widget {
534	my ($self, $x, $y) = @_;	564	# in .xs
535
536	return () unless $self->{can_events};
537
538	return $self
539	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542	()
543	}
544		565
545	sub set_parent {	566	sub set_parent {
546	my ($self, $parent) = @_;	567	my ($self, $parent) = @_;
547		568
548	Scalar::Util::weaken ($self->{parent} = $parent);	569	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	570	$self->set_visible if $parent->{visible};
550	}	571	}
551		572
552	sub realloc {	573	sub realloc {
553	my ($self) = @_;	574	my ($self) = @_;
…		…
579		600
580	# using global variables seems a bit hacky, but passing through all drawing	601	# using global variables seems a bit hacky, but passing through all drawing
581	# functions seems pointless.	602	# functions seems pointless.
582	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	603	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583		604
584	sub draw {	605	#sub draw {
585	my ($self) = @_;	606	#CFPlus.xs
586
587	return unless $self->{h} && $self->{w};
588
589	# update screen rectangle
590	local $draw_x = $draw_x + $self->{x};
591	local $draw_y = $draw_y + $self->{y};
592
593	# skip widgets that are entirely outside the drawing area
594	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
595	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
596
597	glPushMatrix;
598	glTranslate $self->{x}, $self->{y}, 0;
599
600	if ($self == $HOVER && $self->{can_hover}) {
601	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
602	glEnable GL_BLEND;
603	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
604	glBegin GL_QUADS;
605	glVertex 0 , 0;
606	glVertex $self->{w}, 0;
607	glVertex $self->{w}, $self->{h};
608	glVertex 0 , $self->{h};
609	glEnd;
610	glDisable GL_BLEND;
611	}
612
613	if ($ENV{CFPLUS_DEBUG} & 1) {
614	glPushMatrix;
615	glColor 1, 1, 0, 1;
616	glTranslate 0.375, 0.375;
617	glBegin GL_LINE_LOOP;
618	glVertex 0 , 0;
619	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;
622	glEnd;
623	glPopMatrix;
624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}
626
627	$self->_draw;
628	glPopMatrix;
629	}
630		607
631	sub _draw {	608	sub _draw {
632	my ($self) = @_;	609	my ($self) = @_;
633		610
634	warn "no draw defined for $self\n";	611	warn "no draw defined for $self\n";
635	}	612	}
636		613
637	sub DESTROY {	614	sub DESTROY {
638	my ($self) = @_;	615	my ($self) = @_;
639		616
640	return if CFClient::in_destruct;	617	return if CFPlus::in_destruct;
641		618
642	delete $WIDGET{$self+0};	619	local $@;
643
644	eval { $self->destroy };	620	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	621	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		622
		623	delete $WIDGET{$self+0};
646	}	624	}
647		625
648	#############################################################################	626	#############################################################################
649		627
650	package CFClient::UI::DrawBG;	628	package CFPlus::UI::DrawBG;
651		629
652	our @ISA = CFClient::UI::Base::;	630	our @ISA = CFPlus::UI::Base::;
653		631
654	use strict;	632	use strict;
655	use CFClient::OpenGL;	633	use CFPlus::OpenGL;
656		634
657	sub new {	635	sub new {
658	my $class = shift;	636	my $class = shift;
659
660	# range [value, low, high, page]
661		637
662	$class->SUPER::new (	638	$class->SUPER::new (
663	#bg => [0, 0, 0, 0.2],	639	#bg => [0, 0, 0, 0.2],
664	#active_bg => [1, 1, 1, 0.5],	640	#active_bg => [1, 1, 1, 0.5],
665	@_	641	@_
…		…
677	my ($w, $h) = @$self{qw(w h)};	653	my ($w, $h) = @$self{qw(w h)};
678		654
679	glEnable GL_BLEND;	655	glEnable GL_BLEND;
680	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	656	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
681	glColor_premultiply @$color;	657	glColor_premultiply @$color;
682
683	glBegin GL_QUADS;
684	glVertex 0 , 0;
685	glVertex 0 , $h;
686	glVertex $w, $h;	658	glRect 0, 0, $w, $h;
687	glVertex $w, 0;
688	glEnd;
689
690	glDisable GL_BLEND;	659	glDisable GL_BLEND;
691	}	660	}
692	}	661	}
693		662
694	#############################################################################	663	#############################################################################
695		664
696	package CFClient::UI::Empty;	665	package CFPlus::UI::Empty;
697		666
698	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
699		668
700	sub new {	669	sub new {
701	my ($class, %arg) = @_;	670	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	671	$class->SUPER::new (can_events => 0, %arg);
703	}	672	}
…		…
710		679
711	sub draw { }	680	sub draw { }
712		681
713	#############################################################################	682	#############################################################################
714		683
715	package CFClient::UI::Container;	684	package CFPlus::UI::Container;
716		685
717	our @ISA = CFClient::UI::Base::;	686	our @ISA = CFPlus::UI::Base::;
718		687
719	sub new {	688	sub new {
720	my ($class, %arg) = @_;	689	my ($class, %arg) = @_;
721		690
722	my $children = delete $arg{children};	691	my $children = delete $arg{children};
…		…
726	can_events => 0,	695	can_events => 0,
727	%arg,	696	%arg,
728	);	697	);
729		698
730	$self->add (@$children)	699	$self->add (@$children)
731	if $children;	700	if $children && @$children;
732		701
733	$self	702	$self
734	}	703	}
735		704
736	sub realloc {	705	sub realloc {
…		…
745	my ($self, @widgets) = @_;	714	my ($self, @widgets) = @_;
746		715
747	$_->set_parent ($self)	716	$_->set_parent ($self)
748	for @widgets;	717	for @widgets;
749		718
		719	# TODO: only do this in widgets that need it, e.g. root, fixed
750	use sort 'stable';	720	use sort 'stable';
751		721
752	$self->{children} = [	722	$self->{children} = [
753	sort { $a->{z} <=> $b->{z} }	723	sort { $a->{z} <=> $b->{z} }
754	@{$self->{children}}, @widgets	724	@{$self->{children}}, @widgets
755	];	725	];
756		726
757	$self->realloc;	727	$self->realloc;
		728
		729	$self->emit (c_add => \@widgets);
		730
		731	map $_+0, @widgets
758	}	732	}
759		733
760	sub children {	734	sub children {
761	@{ $_[0]{children} }	735	@{ $_[0]{children} }
762	}	736	}
763		737
764	sub remove {	738	sub remove {
765	my ($self, $child) = @_;	739	my ($self, @widgets) = @_;
766		740
		741	$self->emit (c_remove => \@widgets);
		742
		743	for my $child (@widgets) {
767	delete $child->{parent};	744	delete $child->{parent};
768	$child->hide;	745	$child->hide;
769
770	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	746	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		747	}
771		748
772	$self->realloc;	749	$self->realloc;
773	}	750	}
774		751
775	sub clear {	752	sub clear {
776	my ($self) = @_;	753	my ($self) = @_;
777		754
778	my $children = delete $self->{children};	755	my $children = $self->{children};
779	$self->{children} = [];	756	$self->{children} = [];
780		757
781	for (@$children) {	758	for (@$children) {
782	delete $_->{parent};	759	delete $_->{parent};
783	$_->hide;	760	$_->hide;
…		…
803	}	780	}
804		781
805	sub _draw {	782	sub _draw {
806	my ($self) = @_;	783	my ($self) = @_;
807		784
808	$_->draw for @{$self->{children}};	785	$_->draw for $self->visible_children;
809	}	786	}
810		787
811	#############################################################################	788	#############################################################################
812		789
813	package CFClient::UI::Bin;	790	package CFPlus::UI::Bin;
814		791
815	our @ISA = CFClient::UI::Container::;	792	our @ISA = CFPlus::UI::Container::;
816		793
817	sub new {	794	sub new {
818	my ($class, %arg) = @_;	795	my ($class, %arg) = @_;
819		796
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	797	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		798
822	$class->SUPER::new (children => [$child], %arg)	799	$class->SUPER::new (children => [$child], %arg)
823	}	800	}
824		801
825	sub add {	802	sub add {
826	my ($self, $child) = @_;	803	my ($self, $child) = @_;
827		804
828	$self->SUPER::remove ($_) for @{ $self->{children} };	805	$self->clear;
829	$self->SUPER::add ($child);	806	$self->SUPER::add ($child);
830	}	807	}
831		808
832	sub remove {	809	sub remove {
833	my ($self, $widget) = @_;	810	my ($self, $widget) = @_;
834		811
835	$self->SUPER::remove ($widget);	812	$self->SUPER::remove ($widget);
836		813
837	$self->{children} = [new CFClient::UI::Empty]	814	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	815	unless @{$self->{children}};
839	}	816	}
840		817
841	sub child { $_[0]->{children}[0] }	818	sub child { $_[0]->{children}[0] }
842		819
…		…
851		828
852	1	829	1
853	}	830	}
854		831
855	#############################################################################	832	#############################################################################
856
857	# back-buffered drawing area	833	# back-buffered drawing area
858		834
859	package CFClient::UI::Window;	835	package CFPlus::UI::Window;
860		836
861	our @ISA = CFClient::UI::Bin::;	837	our @ISA = CFPlus::UI::Bin::;
862		838
863	use CFClient::OpenGL;	839	use CFPlus::OpenGL;
864		840
865	sub new {	841	sub new {
866	my ($class, %arg) = @_;	842	my ($class, %arg) = @_;
867		843
868	my $self = $class->SUPER::new (%arg);	844	my $self = $class->SUPER::new (%arg);
…		…
890	}	866	}
891		867
892	sub render_child {	868	sub render_child {
893	my ($self) = @_;	869	my ($self) = @_;
894		870
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	871	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	872	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	873	glClear GL_COLOR_BUFFER_BIT;
898		874
899	{	875	{
900	package CFClient::UI::Base;	876	package CFPlus::UI::Base;
901		877
902	($draw_x, $draw_y, $draw_w, $draw_h) =	878	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	879	(0, 0, $self->{w}, $self->{h});
		880
		881	$self->_render;
904	}	882	}
905
906	$self->_render;
907	};	883	};
908	}	884	}
909		885
910	sub _draw {	886	sub _draw {
911	my ($self) = @_;	887	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		888
915	my $tex = $self->{texture}	889	my $tex = $self->{texture}
916	or return;	890	or return;
917		891
918	glEnable GL_TEXTURE_2D;	892	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	894	glColor 0, 0, 0, 1;
921		895
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	896	$tex->draw_quad_alpha_premultiplied (0, 0);
923		897
924	glDisable GL_TEXTURE_2D;	898	glDisable GL_TEXTURE_2D;
925	}	899	}
926		900
927	#############################################################################	901	#############################################################################
928		902
929	package CFClient::UI::ViewPort;	903	package CFPlus::UI::ViewPort;
930		904
		905	use List::Util qw(min max);
		906
931	our @ISA = CFClient::UI::Window::;	907	our @ISA = CFPlus::UI::Window::;
932		908
933	sub new {	909	sub new {
934	my $class = shift;	910	my $class = shift;
935		911
936	$class->SUPER::new (	912	$class->SUPER::new (
…		…
943	sub size_request {	919	sub size_request {
944	my ($self) = @_;	920	my ($self) = @_;
945		921
946	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	922	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947		923
948	$w = 10 if $self->{scroll_x};	924	$w = 1 if $self->{scroll_x};
949	$h = 10 if $self->{scroll_y};	925	$h = 1 if $self->{scroll_y};
950		926
951	($w, $h)	927	($w, $h)
952	}	928	}
953		929
954	sub invoke_size_allocate {	930	sub invoke_size_allocate {
…		…
966	}	942	}
967		943
968	sub set_offset {	944	sub set_offset {
969	my ($self, $x, $y) = @_;	945	my ($self, $x, $y) = @_;
970		946
		947	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		948	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		949
		950	if ($x != $self->{view_x} or $y != $self->{view_y}) {
971	$self->{view_x} = int $x;	951	$self->{view_x} = $x;
972	$self->{view_y} = int $y;	952	$self->{view_y} = $y;
973		953
		954	$self->emit (changed => $x, $y);
974	$self->update;	955	$self->update;
		956	}
		957	}
		958
		959	sub set_center {
		960	my ($self, $x, $y) = @_;
		961
		962	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		963	}
		964
		965	sub make_visible {
		966	my ($self, $x, $y, $border) = @_;
		967
		968	if ( $x < $self->{view_x} + $self->{w} * $border
		969	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		970	|| $y < $self->{view_y} + $self->{h} * $border
		971	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		972	) {
		973	$self->set_center ($x, $y);
		974	}
975	}	975	}
976		976
977	# hmm, this does not work for topleft of $self... but we should not ask for that	977	# hmm, this does not work for topleft of $self... but we should not ask for that
978	sub coord2local {	978	sub coord2local {
979	my ($self, $x, $y) = @_;	979	my ($self, $x, $y) = @_;
…		…
994	my ($self, $x, $y) = @_;	994	my ($self, $x, $y) = @_;
995		995
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	998	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1000	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1001	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1002	}
1003	}	1003	}
1004		1004
1005	sub _render {	1005	sub _render {
1006	my ($self) = @_;	1006	my ($self) = @_;
1007		1007
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1008	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1009	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1010
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1011	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1012
1013	$self->SUPER::_render;	1013	$self->SUPER::_render;
1014	}	1014	}
1015		1015
1016	#############################################################################	1016	#############################################################################
1017		1017
1018	package CFClient::UI::ScrolledWindow;	1018	package CFPlus::UI::ScrolledWindow;
1019		1019
1020	our @ISA = CFClient::UI::HBox::;	1020	our @ISA = CFPlus::UI::Table::;
1021		1021
1022	sub new {	1022	sub new {
1023	my ($class, %arg) = @_;	1023	my ($class, %arg) = @_;
1024		1024
1025	my $child = delete $arg{child};	1025	my $child = delete $arg{child};
1026		1026
1027	my $self;	1027	my $self;
1028		1028
1029	my $slider = new CFClient::UI::Slider	1029	my $hslider = new CFPlus::UI::Slider
		1030	c_col => 0,
		1031	c_row => 1,
		1032	vertical => 0,
		1033	range => [0, 0, 1, 0.01], # HACK fix
		1034	on_changed => sub {
		1035	$self->{hpos} = $_[1];
		1036	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1037	},
		1038	;
		1039
		1040	my $vslider = new CFPlus::UI::Slider
		1041	c_col => 1,
		1042	c_row => 0,
1030	vertical => 1,	1043	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1044	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1045	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1046	$self->{vpos} = $_[1];
		1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034	},	1048	},
1035	;	1049	;
1036		1050
1037	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1052	scroll_x => 0,
		1053	scroll_y => 1,
1039	can_events => 1,	1054	can_events => 1,
1040	slider => $slider,	1055	hslider => $hslider,
		1056	vslider => $vslider,
		1057	col_expand => [1, 0],
		1058	row_expand => [1, 0],
1041	%arg,	1059	%arg,
1042	);	1060	);
1043		1061
		1062	$self->{vp} = new CFPlus::UI::ViewPort
		1063	c_col => 0,
		1064	c_row => 0,
		1065	expand => 1,
		1066	scroll_x => $self->{scroll_x},
		1067	scroll_y => $self->{scroll_y},
		1068	on_changed => sub {
		1069	my ($vp, $x, $y) = @_;
		1070
		1071	$vp->{parent}{hslider}->set_value ($x);
		1072	$vp->{parent}{vslider}->set_value ($y);
		1073
		1074	0
		1075	},
		1076	on_size_allocate => sub {
		1077	my ($vp, $w, $h) = @_;
		1078	$vp->{parent}->update_slider;
		1079	0
		1080	},
		1081	;
		1082
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1083	$self->SUPER::add ($self->{vp});
		1084
1045	$self->add ($child) if $child;	1085	$self->add ($child) if $child;
1046		1086
1047	$self	1087	$self
1048	}	1088	}
1049
1050	#TODO# update range on size_allocate depending on child
1051		1089
1052	sub add {	1090	sub add {
1053	my ($self, $widget) = @_;	1091	my ($self, $widget) = @_;
1054		1092
1055	$self->{vp}->add ($self->{child} = $widget);	1093	$self->{vp}->add ($self->{child} = $widget);
1056	}	1094	}
1057		1095
		1096	sub set_offset { shift->{vp}->set_offset (@_) }
		1097	sub set_center { shift->{vp}->set_center (@_) }
		1098	sub make_visible { shift->{vp}->make_visible (@_) }
		1099
		1100	sub update_slider {
		1101	my ($self) = @_;
		1102
		1103	my $child = ($self->{vp} or return)->child;
		1104
		1105	if ($self->{scroll_x}) {
		1106	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1107	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1108
		1109	my $visible = $w1 > $w2;
		1110	if ($visible != $self->{hslider_visible}) {
		1111	$self->{hslider_visible} = $visible;
		1112	$visible ? $self->SUPER::add ($self->{hslider})
		1113	: $self->SUPER::remove ($self->{hslider});
		1114	}
		1115	}
		1116
		1117	if ($self->{scroll_y}) {
		1118	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1119	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1120
		1121	my $visible = $h1 > $h2;
		1122	if ($visible != $self->{vslider_visible}) {
		1123	$self->{vslider_visible} = $visible;
		1124	$visible ? $self->SUPER::add ($self->{vslider})
		1125	: $self->SUPER::remove ($self->{vslider});
		1126	}
		1127	}
		1128	}
		1129
		1130	sub start_dragging {
		1131	my ($self, $ev) = @_;
		1132
		1133	$self->grab_focus;
		1134
		1135	my $ox = $self->{vp}{view_x};
		1136	my $oy = $self->{vp}{view_y};
		1137
		1138	$self->{motion} = sub {
		1139	my ($ev, $x, $y) = @_;
		1140
		1141	$ox -= $ev->{xrel};
		1142	$oy -= $ev->{yrel};
		1143
		1144	$self->{vp}->set_offset ($ox, $oy);
		1145	};
		1146	}
		1147
1058	sub invoke_mouse_wheel {	1148	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1149	my ($self, $ev) = @_;
1060		1150
1061	return 0 unless $ev->{dy}; # only vertical movements
1062
1063	$self->{slider}->emit (mouse_wheel => $ev);	1151	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1152	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064		1153
1065	1	1154	1
1066	}	1155	}
1067		1156
1068	sub update_slider {	1157	sub invoke_button_down {
1069	my ($self) = @_;	1158	my ($self, $ev, $x, $y) = @_;
1070		1159
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1160	if ($ev->{button} == 2) {
1072	}	1161	$self->start_dragging ($ev);
		1162	return 1;
		1163	}
1073		1164
1074	sub update {	1165	0
1075	my ($self) = @_;	1166	}
1076		1167
1077	$self->SUPER::update;	1168	sub invoke_button_up {
		1169	my ($self, $ev, $x, $y) = @_;
1078		1170
1079	$self->update_slider;	1171	if (delete $self->{motion}) {
		1172	return 1;
		1173	}
		1174
		1175	0
		1176	}
		1177
		1178	sub invoke_mouse_motion {
		1179	my ($self, $ev, $x, $y) = @_;
		1180
		1181	if ($self->{motion}) {
		1182	$self->{motion}->($ev, $x, $y);
		1183	return 1;
		1184	}
		1185
		1186	0
1080	}	1187	}
1081		1188
1082	sub invoke_size_allocate {	1189	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1190	my ($self, $w, $h) = @_;
1084		1191
1085	$self->update_slider;	1192	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1193	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1194	}
1089		1195
1090	#############################################################################	1196	#############################################################################
1091		1197
1092	package CFClient::UI::Frame;	1198	package CFPlus::UI::Frame;
1093		1199
1094	our @ISA = CFClient::UI::Bin::;	1200	our @ISA = CFPlus::UI::Bin::;
1095		1201
1096	use CFClient::OpenGL;	1202	use CFPlus::OpenGL;
1097		1203
1098	sub new {	1204	sub new {
1099	my $class = shift;	1205	my $class = shift;
1100		1206
1101	$class->SUPER::new (	1207	$class->SUPER::new (
…		…
1111	my ($w, $h) = @$self{qw(w h)};	1217	my ($w, $h) = @$self{qw(w h)};
1112		1218
1113	glEnable GL_BLEND;	1219	glEnable GL_BLEND;
1114	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1220	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1115	glColor_premultiply @{ $self->{bg} };	1221	glColor_premultiply @{ $self->{bg} };
1116
1117	glBegin GL_QUADS;
1118	glVertex 0 , 0;
1119	glVertex 0 , $h;
1120	glVertex $w, $h;	1222	glRect 0, 0, $w, $h;
1121	glVertex $w, 0;
1122	glEnd;
1123
1124	glDisable GL_BLEND;	1223	glDisable GL_BLEND;
1125	}	1224	}
1126		1225
1127	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1128	}	1227	}
1129		1228
1130	#############################################################################	1229	#############################################################################
1131		1230
1132	package CFClient::UI::FancyFrame;	1231	package CFPlus::UI::FancyFrame;
1133		1232
1134	our @ISA = CFClient::UI::Bin::;	1233	our @ISA = CFPlus::UI::Bin::;
1135		1234
1136	use CFClient::OpenGL;	1235	use CFPlus::OpenGL;
		1236
		1237	sub new {
		1238	my ($class, %arg) = @_;
		1239
		1240	if ((exists $arg{label}) && !ref $arg{label}) {
		1241	$arg{label} = new CFPlus::UI::Label
		1242	align => 1,
		1243	valign => 0,
		1244	text => $arg{label},
		1245	fontsize => ($arg{border} || 0.8) * 0.75;
		1246	}
		1247
		1248	my $self = $class->SUPER::new (
		1249	# label => "",
		1250	fg => [0.6, 0.3, 0.1],
		1251	border => 0.8,
		1252	style => 'single',
		1253	%arg,
		1254	);
		1255
		1256	$self
		1257	}
		1258
		1259	sub add {
		1260	my ($self, @widgets) = @_;
		1261
		1262	$self->SUPER::add (@widgets);
		1263	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1264	}
		1265
		1266	sub border {
		1267	int $_[0]{border} * $::FONTSIZE
		1268	}
		1269
		1270	sub size_request {
		1271	my ($self) = @_;
		1272
		1273	($self->{label_w}, undef) = $self->{label}->size_request
		1274	if $self->{label};
		1275
		1276	my ($w, $h) = $self->SUPER::size_request;
		1277
		1278	(
		1279	$w + $self->border * 2,
		1280	$h + $self->border * 2,
		1281	)
		1282	}
		1283
		1284	sub invoke_size_allocate {
		1285	my ($self, $w, $h) = @_;
		1286
		1287	my $border = $self->border;
		1288
		1289	$w -= List::Util::max 0, $border * 2;
		1290	$h -= List::Util::max 0, $border * 2;
		1291
		1292	if (my $label = $self->{label}) {
		1293	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1294	$label->{h} = List::Util::min $h, $border;
		1295	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1296	}
		1297
		1298	$self->child->configure ($border, $border, $w, $h);
		1299
		1300	1
		1301	}
		1302
		1303	sub _draw {
		1304	my ($self) = @_;
		1305
		1306	my $child = $self->{children}[0];
		1307
		1308	my $border = $self->border;
		1309	my ($w, $h) = ($self->{w}, $self->{h});
		1310
		1311	$child->draw;
		1312
		1313	glColor @{$self->{fg}};
		1314	glBegin GL_LINE_STRIP;
		1315	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1316	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1317	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1318	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1319	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1320	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1321	glEnd;
		1322
		1323	if ($self->{label}) {
		1324	glTranslate $border * 2, 0;
		1325	$self->{label}->_draw;
		1326	}
		1327	}
		1328
		1329	#############################################################################
		1330
		1331	package CFPlus::UI::Toplevel;
		1332
		1333	our @ISA = CFPlus::UI::Bin::;
		1334
		1335	use CFPlus::OpenGL;
1137		1336
1138	my $bg =	1337	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1338	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1339	mipmap => 1, wrap => 1;
1141		1340
1142	my @border =	1341	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1342	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1343	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1344
		1345	my @icon =
		1346	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1347	qw(x1_move.png x1_resize.png);
1145		1348
1146	sub new {	1349	sub new {
1147	my ($class, %arg) = @_;	1350	my ($class, %arg) = @_;
1148		1351
1149	my $self = $class->SUPER::new (	1352	my $self = $class->SUPER::new (
…		…
1154	min_w => 64,	1357	min_w => 64,
1155	min_h => 32,	1358	min_h => 32,
1156	%arg,	1359	%arg,
1157	);	1360	);
1158		1361
1159	$self->{title_widget} = new CFClient::UI::Label	1362	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1363	align => 0,
1161	valign => 1,	1364	valign => 1,
1162	text => $self->{title},	1365	text => $self->{title},
1163	fontsize => $self->{border},	1366	fontsize => $self->{border},
1164	if exists $self->{title};	1367	if exists $self->{title};
1165		1368
1166	if ($self->{has_close_button}) {	1369	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1370	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1371	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1372	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1373	on_activate => sub { $self->emit ("delete") };
1171		1374
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1375	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1376	}
1174		1377
1175	$self	1378	$self
1176	}	1379	}
1177		1380
1178	sub add {	1381	sub add {
1179	my ($self, @widgets) = @_;	1382	my ($self, @widgets) = @_;
1180		1383
1181	$self->SUPER::add (@widgets);	1384	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1385	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1386	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1387	}
1185		1388
1186	sub border {	1389	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1390	int $_[0]{border} * $::FONTSIZE
		1391	}
		1392
		1393	sub get_max_wh {
		1394	my ($self) = @_;
		1395
		1396	return ($self->{w}, $self->{h})
		1397	if $self->{visible} && $self->{w};
		1398
		1399	$self->SUPER::get_max_wh
1188	}	1400	}
1189		1401
1190	sub size_request {	1402	sub size_request {
1191	my ($self) = @_;	1403	my ($self) = @_;
1192		1404
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1508	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1509
1298	! ! $self->{motion}	1510	! ! $self->{motion}
1299	}	1511	}
1300		1512
		1513	sub invoke_visibility_change {
		1514	my ($self, $visible) = @_;
		1515
		1516	delete $self->{motion} unless $visible;
		1517
		1518	0
		1519	}
		1520
1301	sub _draw {	1521	sub _draw {
1302	my ($self) = @_;	1522	my ($self) = @_;
1303		1523
1304	my $child = $self->{children}[0];	1524	my $child = $self->{children}[0];
1305		1525
…		…
1310	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311		1531
1312	my $border = $self->border;	1532	my $border = $self->border;
1313		1533
1314	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1315	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1538	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1539
		1540	# move
		1541	my $w2 = ($w - $border) * .5;
		1542	my $h2 = ($h - $border) * .5;
		1543	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1545	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1546
		1547	# resize
		1548	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1549	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1550	unless $self->{has_close_button};
		1551	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1319		1553
1320	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1322		1556
1323	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1342	if $self->{close_button};	1576	if $self->{close_button};
1343	}	1577	}
1344		1578
1345	#############################################################################	1579	#############################################################################
1346		1580
1347	package CFClient::UI::Table;	1581	package CFPlus::UI::Table;
1348		1582
1349	our @ISA = CFClient::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1350		1584
1351	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1352		1586
1353	use CFClient::OpenGL;	1587	use CFPlus::OpenGL;
1354		1588
1355	sub new {	1589	sub new {
1356	my $class = shift;	1590	my $class = shift;
1357		1591
1358	$class->SUPER::new (	1592	$class->SUPER::new (
1359	col_expand => [],	1593	col_expand => [],
		1594	row_expand => [],
1360	@_,	1595	@_,
1361	)	1596	)
1362	}	1597	}
1363		1598
1364	sub children {
1365	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366	}
1367
1368	sub add {	1599	sub add {
		1600	my ($self, @widgets) = @_;
		1601
		1602	for my $child (@widgets) {
		1603	$child->{c_rowspan} ||= 1;
		1604	$child->{c_colspan} ||= 1;
		1605	}
		1606
		1607	$self->SUPER::add (@widgets);
		1608	}
		1609
		1610	sub add_at {
1369	my ($self) = shift;	1611	my $self = shift;
		1612
		1613	my @widgets;
1370		1614
1371	while (@_) {	1615	while (@_) {
1372	my ($x, $y, $child) = splice @_, 0, 3, ();	1616	my ($col, $row, $child) = splice @_, 0, 3, ();
1373	$child->set_parent ($self);
1374	$self->{children}[$y][$x] = $child;
1375	}
1376		1617
1377	$self->{force_realloc} = 1;	1618	$child->{c_row} = $row;
1378	$self->{force_size_alloc} = 1;	1619	$child->{c_col} = $col;
1379	$self->realloc;
1380	}
1381		1620
1382	sub remove {	1621	push @widgets, $child;
		1622	}
		1623
		1624	$self->add (@widgets);
		1625	}
		1626
		1627	sub get_wh {
1383	my ($self, $child) = @_;	1628	my ($self) = @_;
1384		1629
1385	# TODO: not yet implemented	1630	my (@w, @h);
1386	}
1387
1388	# TODO: move to container class maybe? send children a signal on removal?
1389	sub clear {
1390	my ($self) = @_;
1391		1631
1392	my @children = $self->children;	1632	my @children = $self->children;
1393	delete $self->{children};	1633
		1634	# first pass, columns
		1635	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1636	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1637
		1638	my $sw = sum @w[$c .. $c + $cs - 1];
		1639
		1640	if ($w > $sw) {
		1641	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1642	}
1394		1643	}
1395	for (@children) {
1396	delete $_->{parent};
1397	$_->hide;
1398	}
1399		1644
1400	$self->realloc;	1645	# second pass, rows
1401	}	1646	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1402
1403	sub get_wh {
1404	my ($self) = @_;
1405
1406	my (@w, @h);
1407
1408	for my $y (0 .. $#{$self->{children}}) {
1409	my $row = $self->{children}[$y]
1410	or next;
1411
1412	for my $x (0 .. $#$row) {
1413	my $widget = $row->[$x]
1414	or next;
1415	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1416		1648
1417	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1418	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1419	}	1653	}
1420	}	1654	}
1421		1655
1422	(\@w, \@h)	1656	(\@w, \@h)
1423	}	1657	}
…		…
1439	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1440		1674
1441	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1442	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1443		1677
1444	# TODO: nicer code && do row_expand	1678	# now linearly scale the rows/columns to the allocated size
1445	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1446	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1447	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1448		1682
1449	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1684
1453	CFClient::UI::harmonize $ws;	1685	CFPlus::UI::harmonize $ws;
		1686
		1687	my @row_expand = @{$self->{row_expand}};
		1688	@row_expand = (1) x @$ws unless @row_expand;
		1689	my $row_expand = (sum @row_expand) || 1;
		1690
		1691	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1692
1454	CFClient::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1455		1694
1456	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1457		1697
1458	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1459	my $row = $self->{children}[$r]	1699	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1460	or next;
1461		1700
1462	my $x = 0;	1701	$widget->configure (
1463	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1464		1704	);
1465	for my $c (0 .. $#$row) {	1705	}
1466	my $col_w = $ws->[$c];
1467		1706
1468	if (my $widget = $row->[$c]) {	1707	1
1469	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1470	}
1471		1709
1472	$x += $col_w;	1710	#############################################################################
		1711
		1712	package CFPlus::UI::Fixed;
		1713
		1714	use List::Util qw(min max);
		1715
		1716	our @ISA = CFPlus::UI::Container::;
		1717
		1718	sub _scale($$$) {
		1719	my ($rel, $val, $max) = @_;
		1720
		1721	$rel ? $val * $max : $val
		1722	}
		1723
		1724	sub size_request {
		1725	my ($self) = @_;
		1726
		1727	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1728
		1729	# determine overall size by querying abs widgets
		1730	for my $child ($self->visible_children) {
		1731	unless ($child->{c_rel}) {
		1732	my $x = $child->{c_x};
		1733	my $y = $child->{c_y};
		1734
		1735	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1736	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1473	}	1737	}
		1738	}
1474		1739
1475	$y += $row_h;	1740	my $W = $x2 - $x1;
		1741	my $H = $y2 - $y1;
		1742
		1743	# now layout remaining widgets
		1744	for my $child ($self->visible_children) {
		1745	if ($child->{c_rel}) {
		1746	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1747	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1751	}
		1752	}
		1753
		1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
		1756
		1757	($W, $H)
		1758	}
		1759
		1760	sub invoke_size_allocate {
		1761	my ($self, $W, $H) = @_;
		1762
		1763	for my $child ($self->visible_children) {
		1764	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1765	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1766
		1767	$x += $child->{c_halign} * $child->{req_w};
		1768	$y += $child->{c_valign} * $child->{req_h};
		1769
		1770	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1476	}	1771	}
1477		1772
1478	1	1773	1
1479	}	1774	}
1480		1775
1481	sub find_widget {
1482	my ($self, $x, $y) = @_;
1483
1484	$x -= $self->{x};
1485	$y -= $self->{y};
1486
1487	my $res;
1488
1489	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1490	$res = $_->find_widget ($x, $y)
1491	and return $res;
1492	}
1493
1494	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1495	}
1496
1497	sub _draw {
1498	my ($self) = @_;
1499
1500	for (grep $_, @{$self->{children}}) {
1501	$_->draw for grep $_, @$_;
1502	}
1503	}
1504
1505	#############################################################################	1776	#############################################################################
1506		1777
1507	package CFClient::UI::Box;	1778	package CFPlus::UI::Box;
1508		1779
1509	our @ISA = CFClient::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1510		1781
1511	sub size_request {	1782	sub size_request {
1512	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1513		1786
1514	$self->{vertical}	1787	$self->{vertical}
1515	? (	1788	? (
1516	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1517	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1518	)	1791	)
1519	: (	1792	: (
1520	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1521	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1522	)	1795	)
1523	}	1796	}
1524		1797
1525	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1526	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1820	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1821	for 0 .. $#children;
1549	}	1822	}
1550	}	1823	}
1551		1824
1552	CFClient::UI::harmonize \@req;	1825	CFPlus::UI::harmonize \@req;
1553		1826
1554	my $pos = 0;	1827	my $pos = 0;
1555	for (0 .. $#children) {	1828	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1829	my $alloc = $req[$_];
1557	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1830	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1562	1	1835	1
1563	}	1836	}
1564		1837
1565	#############################################################################	1838	#############################################################################
1566		1839
1567	package CFClient::UI::HBox;	1840	package CFPlus::UI::HBox;
1568		1841
1569	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1570		1843
1571	sub new {	1844	sub new {
1572	my $class = shift;	1845	my $class = shift;
1573		1846
1574	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1577	)	1850	)
1578	}	1851	}
1579		1852
1580	#############################################################################	1853	#############################################################################
1581		1854
1582	package CFClient::UI::VBox;	1855	package CFPlus::UI::VBox;
1583		1856
1584	our @ISA = CFClient::UI::Box::;	1857	our @ISA = CFPlus::UI::Box::;
1585		1858
1586	sub new {	1859	sub new {
1587	my $class = shift;	1860	my $class = shift;
1588		1861
1589	$class->SUPER::new (	1862	$class->SUPER::new (
…		…
1592	)	1865	)
1593	}	1866	}
1594		1867
1595	#############################################################################	1868	#############################################################################
1596		1869
1597	package CFClient::UI::Label;	1870	package CFPlus::UI::Label;
1598		1871
1599	our @ISA = CFClient::UI::DrawBG::;	1872	our @ISA = CFPlus::UI::DrawBG::;
1600		1873
1601	use CFClient::OpenGL;	1874	use CFPlus::OpenGL;
1602		1875
1603	sub new {	1876	sub new {
1604	my ($class, %arg) = @_;	1877	my ($class, %arg) = @_;
1605		1878
1606	my $self = $class->SUPER::new (	1879	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1882	#active_bg => none
1610	#font => default_font	1883	#font => default_font
1611	#text => initial text	1884	#text => initial text
1612	#markup => initial narkup	1885	#markup => initial narkup
1613	#max_w => maximum pixel width	1886	#max_w => maximum pixel width
		1887	#style => 0, # render flags
1614	ellipsise => 3, # end	1888	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1889	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1890	fontsize => 1,
1617	align => -1,	1891	align => -1,
1618	valign => -1,	1892	valign => -1,
1619	padding_x => 2,	1893	padding_x => 2,
1620	padding_y => 2,	1894	padding_y => 2,
1621	can_events => 0,	1895	can_events => 0,
1622	%arg	1896	%arg
1623	);	1897	);
1624		1898
1625	if (exists $self->{template}) {	1899	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1900	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1901	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1902	$self->{template} = $layout;
1629	}	1903	}
1630		1904
1631	if (exists $self->{markup}) {	1905	if (exists $self->{markup}) {
…		…
1635	}	1909	}
1636		1910
1637	$self	1911	$self
1638	}	1912	}
1639		1913
1640	sub escape($) {
1641	local $_ = $_[0];
1642
1643	s/&/&amp;/g;
1644	s/>/&gt;/g;
1645	s/</&lt;/g;
1646
1647	$_
1648	}
1649
1650	sub update {	1914	sub update {
1651	my ($self) = @_;	1915	my ($self) = @_;
1652		1916
1653	delete $self->{texture};	1917	delete $self->{texture};
1654	$self->SUPER::update;	1918	$self->SUPER::update;
…		…
1657	sub realloc {	1921	sub realloc {
1658	my ($self) = @_;	1922	my ($self) = @_;
1659		1923
1660	delete $self->{ox};	1924	delete $self->{ox};
1661	$self->SUPER::realloc;	1925	$self->SUPER::realloc;
		1926	}
		1927
		1928	sub clear {
		1929	my ($self) = @_;
		1930
		1931	$self->set_text ("");
1662	}	1932	}
1663		1933
1664	sub set_text {	1934	sub set_text {
1665	my ($self, $text) = @_;	1935	my ($self, $text) = @_;
1666		1936
…		…
1691		1961
1692	sub size_request {	1962	sub size_request {
1693	my ($self) = @_;	1963	my ($self) = @_;
1694		1964
1695	$self->{size_req} ||= do {	1965	$self->{size_req} ||= do {
		1966	my ($max_w, $max_h) = $self->get_max_wh;
		1967
1696	$self->{layout}->set_font ($self->{font}) if $self->{font};	1968	$self->{layout}->set_font ($self->{font}) if $self->{font};
1697	$self->{layout}->set_width ($self->{max_w} || -1);	1969	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1698	$self->{layout}->set_ellipsise ($self->{ellipsise});	1970	$self->{layout}->set_ellipsise ($self->{ellipsise});
1699	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1971	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1700	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1972	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1701		1973
1702	my ($w, $h) = $self->{layout}->size;	1974	my ($w, $h) = $self->{layout}->size;
…		…
1774	: ($self->{w} - $size->[0]) * 0.5);	2046	: ($self->{w} - $size->[0]) * 0.5);
1775		2047
1776	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2048	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1777	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2049	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1778	: ($self->{h} - $size->[1]) * 0.5);	2050	: ($self->{h} - $size->[1]) * 0.5);
		2051
		2052	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1779	};	2053	};
1780		2054
1781	my $w = List::Util::min $self->{w} + 4, $size->[0];	2055	# unless ($self->{list}) {
1782	my $h = List::Util::min $self->{h} + 2, $size->[1];	2056	# $self->{list} = CFPlus::OpenGL::glGenList;
1783		2057	# CFPlus::OpenGL::glNewList $self->{list};
1784	$self->{layout}->render ($self->{ox}, $self->{oy});	2058	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2059	# CFPlus::OpenGL::glEndList;
		2060	# }
		2061	#
		2062	# CFPlus::OpenGL::glCallList $self->{list};
		2063
		2064	$self->{layout}->draw;
1785	}	2065	}
		2066
		2067	#sub destroy {
		2068	# my ($self) = @_;
		2069	#
		2070	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2071	#
		2072	# $self->SUPER::destroy;
		2073	#}
1786		2074
1787	#############################################################################	2075	#############################################################################
1788		2076
1789	package CFClient::UI::EntryBase;	2077	package CFPlus::UI::EntryBase;
1790		2078
1791	our @ISA = CFClient::UI::Label::;	2079	our @ISA = CFPlus::UI::Label::;
1792		2080
1793	use CFClient::OpenGL;	2081	use CFPlus::OpenGL;
1794		2082
1795	sub new {	2083	sub new {
1796	my $class = shift;	2084	my $class = shift;
1797		2085
1798	$class->SUPER::new (	2086	$class->SUPER::new (
1799	fg => [1, 1, 1],	2087	fg => [1, 1, 1],
1800	bg => [0, 0, 0, 0.2],	2088	bg => [0, 0, 0, 0.2],
		2089	outline => [0.6, 0.3, 0.1],
1801	active_bg => [1, 1, 1, 0.5],	2090	active_bg => [0, 0, 1, .2],
1802	active_fg => [0, 0, 0],	2091	active_fg => [1, 1, 1],
		2092	active_outline => [1, 1, 0],
1803	can_hover => 1,	2093	can_hover => 1,
1804	can_focus => 1,	2094	can_focus => 1,
1805	valign => 0,	2095	valign => 0,
1806	can_events => 1,	2096	can_events => 1,
		2097	ellipsise => 0,
1807	#text => ...	2098	#text => ...
1808	#hidden => "*",	2099	#hidden => "*",
1809	@_	2100	@_
1810	)	2101	)
1811	}	2102	}
…		…
1856	my $sym = $ev->{sym};	2147	my $sym = $ev->{sym};
1857	my $uni = $ev->{unicode};	2148	my $uni = $ev->{unicode};
1858		2149
1859	my $text = $self->get_text;	2150	my $text = $self->get_text;
1860		2151
		2152	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2153
1861	if ($uni == 8) {	2154	if ($uni == 8) {
1862	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2155	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1863	} elsif ($uni == 127) {	2156	} elsif ($uni == 127) {
1864	substr $text, $self->{cursor}, 1, "";	2157	substr $text, $self->{cursor}, 1, "";
1865	} elsif ($sym == CFClient::SDLK_LEFT) {	2158	} elsif ($sym == CFPlus::SDLK_LEFT) {
1866	--$self->{cursor} if $self->{cursor};	2159	--$self->{cursor} if $self->{cursor};
1867	} elsif ($sym == CFClient::SDLK_RIGHT) {	2160	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1868	++$self->{cursor} if $self->{cursor} < length $self->{text};	2161	++$self->{cursor} if $self->{cursor} < length $self->{text};
1869	} elsif ($sym == CFClient::SDLK_HOME) {	2162	} elsif ($sym == CFPlus::SDLK_HOME) {
		2163	# what a hack
		2164	$self->{cursor} =
		2165	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2166	? length $1
		2167	: 0;
		2168	} elsif ($sym == CFPlus::SDLK_END) {
		2169	# uh, again
		2170	$self->{cursor} =
		2171	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2172	? $self->{cursor} + length $1
		2173	: length $self->{text};
		2174	} elsif ($uni == 21) { # ctrl-u
		2175	$text = "";
1870	$self->{cursor} = 0;	2176	$self->{cursor} = 0;
1871	} elsif ($sym == CFClient::SDLK_END) {
1872	$self->{cursor} = length $text;
1873	} elsif ($uni == 27) {	2177	} elsif ($uni == 27) {
1874	$self->emit ('escape');	2178	$self->emit ('escape');
1875	} elsif ($uni) {	2179	} elsif ($uni == 0x0d) {
		2180	substr $text, $self->{cursor}++, 0, "\012";
		2181	} elsif ($uni >= 0x20) {
1876	substr $text, $self->{cursor}++, 0, chr $uni;	2182	substr $text, $self->{cursor}++, 0, chr $uni;
1877	} else {	2183	} else {
1878	return 0;	2184	return 0;
1879	}	2185	}
1880		2186
1881	$self->_set_text ($text);	2187	$self->_set_text ($text);
1882		2188
1883	$self->realloc;	2189	$self->realloc;
		2190	$self->update;
1884		2191
1885	1	2192	1
1886	}	2193	}
1887		2194
1888	sub invoke_focus_in {	2195	sub invoke_focus_in {
…		…
1930	glColor_premultiply @{$self->{bg}};	2237	glColor_premultiply @{$self->{bg}};
1931	}	2238	}
1932		2239
1933	glEnable GL_BLEND;	2240	glEnable GL_BLEND;
1934	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2241	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1935	glBegin GL_QUADS;
1936	glVertex 0 , 0;
1937	glVertex 0 , $self->{h};
1938	glVertex $self->{w}, $self->{h};	2242	glRect 0, 0, $self->{w}, $self->{h};
1939	glVertex $self->{w}, 0;
1940	glEnd;
1941	glDisable GL_BLEND;	2243	glDisable GL_BLEND;
1942		2244
1943	$self->SUPER::_draw;	2245	$self->SUPER::_draw;
1944		2246
1945	#TODO: force update every cursor change :(	2247	#TODO: force update every cursor change :(
…		…
1947		2249
1948	unless (exists $self->{cur_h}) {	2250	unless (exists $self->{cur_h}) {
1949	my $text = substr $self->{text}, 0, $self->{cursor};	2251	my $text = substr $self->{text}, 0, $self->{cursor};
1950	utf8::encode $text;	2252	utf8::encode $text;
1951		2253
1952	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2254	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1953	}	2255	}
1954		2256
1955	glColor @{$self->{fg}};	2257	glColor_premultiply @{$self->{active_fg}};
1956	glBegin GL_LINES;	2258	glBegin GL_LINES;
1957	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2259	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1958	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2260	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1959	glEnd;	2261	glEnd;
1960	}
1961	}
1962		2262
		2263	glLineWidth 3;
		2264	glColor @{$self->{active_outline}};
		2265	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2266	glLineWidth 1;
		2267
		2268	} else {
		2269	glColor @{$self->{outline}};
		2270	glBegin GL_LINE_STRIP;
		2271	glVertex .5, $self->{h} * .5;
		2272	glVertex .5, $self->{h} - 2.5;
		2273	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2274	glVertex $self->{w} - .5, $self->{h} * .5;
		2275	glEnd;
		2276	}
		2277	}
		2278
		2279	#############################################################################
		2280
1963	package CFClient::UI::Entry;	2281	package CFPlus::UI::Entry;
1964		2282
1965	our @ISA = CFClient::UI::EntryBase::;	2283	our @ISA = CFPlus::UI::EntryBase::;
1966		2284
1967	use CFClient::OpenGL;	2285	use CFPlus::OpenGL;
1968		2286
1969	sub invoke_key_down {	2287	sub invoke_key_down {
1970	my ($self, $ev) = @_;	2288	my ($self, $ev) = @_;
1971		2289
1972	my $sym = $ev->{sym};	2290	my $sym = $ev->{sym};
1973		2291
1974	if ($sym == 13) {	2292	if ($ev->{uni} == 0x0d || $sym == 13) {
1975	unshift @{$self->{history}},	2293	unshift @{$self->{history}},
1976	my $txt = $self->get_text;	2294	my $txt = $self->get_text;
1977		2295
1978	$self->{history_pointer} = -1;	2296	$self->{history_pointer} = -1;
1979	$self->{history_saveback} = '';	2297	$self->{history_saveback} = '';
1980	$self->emit (activate => $txt);	2298	$self->emit (activate => $txt);
1981	$self->update;	2299	$self->update;
1982		2300
1983	} elsif ($sym == CFClient::SDLK_UP) {	2301	} elsif ($sym == CFPlus::SDLK_UP) {
1984	if ($self->{history_pointer} < 0) {	2302	if ($self->{history_pointer} < 0) {
1985	$self->{history_saveback} = $self->get_text;	2303	$self->{history_saveback} = $self->get_text;
1986	}	2304	}
1987	if (@{$self->{history} || []} > 0) {	2305	if (@{$self->{history} || []} > 0) {
1988	$self->{history_pointer}++;	2306	$self->{history_pointer}++;
…		…
1990	$self->{history_pointer} = @{$self->{history} || []} - 1;	2308	$self->{history_pointer} = @{$self->{history} || []} - 1;
1991	}	2309	}
1992	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2310	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1993	}	2311	}
1994		2312
1995	} elsif ($sym == CFClient::SDLK_DOWN) {	2313	} elsif ($sym == CFPlus::SDLK_DOWN) {
1996	$self->{history_pointer}--;	2314	$self->{history_pointer}--;
1997	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2315	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1998		2316
1999	if ($self->{history_pointer} >= 0) {	2317	if ($self->{history_pointer} >= 0) {
2000	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2318	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2009	1	2327	1
2010	}	2328	}
2011		2329
2012	#############################################################################	2330	#############################################################################
2013		2331
		2332	package CFPlus::UI::TextEdit;
		2333
		2334	our @ISA = CFPlus::UI::EntryBase::;
		2335
		2336	use CFPlus::OpenGL;
		2337
		2338	sub move_cursor_ver {
		2339	my ($self, $dy) = @_;
		2340
		2341	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2342
		2343	$y += $dy;
		2344
		2345	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2346	$self->{cursor} = $index;
		2347	delete $self->{cur_h};
		2348	$self->update;
		2349	return;
		2350	}
		2351	}
		2352
		2353	sub invoke_key_down {
		2354	my ($self, $ev) = @_;
		2355
		2356	my $sym = $ev->{sym};
		2357
		2358	if ($sym == CFPlus::SDLK_UP) {
		2359	$self->move_cursor_ver (-1);
		2360	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2361	$self->move_cursor_ver (+1);
		2362	} else {
		2363	return $self->SUPER::invoke_key_down ($ev)
		2364	}
		2365
		2366	1
		2367	}
		2368
		2369	#############################################################################
		2370
2014	package CFClient::UI::Button;	2371	package CFPlus::UI::ButtonBin;
2015		2372
2016	our @ISA = CFClient::UI::Label::;	2373	our @ISA = CFPlus::UI::Bin::;
2017		2374
2018	use CFClient::OpenGL;	2375	use CFPlus::OpenGL;
2019		2376
2020	my @tex =	2377	my @tex =
2021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2378	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2022	qw(b1_button_active.png);	2379	qw(b1_button_inactive.png b1_button_active.png);
2023		2380
2024	sub new {	2381	sub new {
2025	my $class = shift;	2382	my $class = shift;
2026		2383
2027	$class->SUPER::new (	2384	$class->SUPER::new (
2028	padding_x => 4,
2029	padding_y => 4,
2030	fg => [1, 1, 1],
2031	active_fg => [0, 0, 1],
2032	can_hover => 1,	2385	can_hover => 1,
2033	align => 0,	2386	align => 0,
2034	valign => 0,	2387	valign => 0,
2035	can_events => 1,	2388	can_events => 1,
2036	@_	2389	@_
…		…
2048	}	2401	}
2049		2402
2050	sub _draw {	2403	sub _draw {
2051	my ($self) = @_;	2404	my ($self) = @_;
2052		2405
2053	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2054
2055	glEnable GL_TEXTURE_2D;	2406	glEnable GL_TEXTURE_2D;
2056	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2407	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057	glColor 0, 0, 0, 1;	2408	glColor 0, 0, 0, 1;
2058		2409
		2410	my $tex = $tex[$GRAB == $self];
2059	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2411	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2060		2412
2061	glDisable GL_TEXTURE_2D;	2413	glDisable GL_TEXTURE_2D;
2062		2414
2063	$self->SUPER::_draw;	2415	$self->SUPER::_draw;
2064	}	2416	}
2065		2417
2066	#############################################################################	2418	#############################################################################
2067		2419
		2420	package CFPlus::UI::Button;
		2421
		2422	our @ISA = CFPlus::UI::Label::;
		2423
		2424	use CFPlus::OpenGL;
		2425
		2426	my @tex =
		2427	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2428	qw(b1_button_inactive.png b1_button_active.png);
		2429
		2430	sub new {
		2431	my $class = shift;
		2432
		2433	$class->SUPER::new (
		2434	padding_x => 4,
		2435	padding_y => 4,
		2436	fg => [1.0, 1.0, 1.0],
		2437	active_fg => [0.8, 0.8, 0.8],
		2438	can_hover => 1,
		2439	align => 0,
		2440	valign => 0,
		2441	can_events => 1,
		2442	@_
		2443	)
		2444	}
		2445
		2446	sub invoke_button_up {
		2447	my ($self, $ev, $x, $y) = @_;
		2448
		2449	$self->emit ("activate")
		2450	if $x >= 0 && $x < $self->{w}
		2451	&& $y >= 0 && $y < $self->{h};
		2452
		2453	1
		2454	}
		2455
		2456	sub _draw {
		2457	my ($self) = @_;
		2458
		2459	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2460
		2461	glEnable GL_TEXTURE_2D;
		2462	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2463	glColor 0, 0, 0, 1;
		2464
		2465	my $tex = $tex[$GRAB == $self];
		2466	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2467
		2468	glDisable GL_TEXTURE_2D;
		2469
		2470	$self->SUPER::_draw;
		2471	}
		2472
		2473	#############################################################################
		2474
		2475	package CFPlus::UI::CheckBox;
		2476
		2477	our @ISA = CFPlus::UI::DrawBG::;
		2478
		2479	my @tex =
		2480	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2481	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2482
		2483	use CFPlus::OpenGL;
		2484
		2485	sub new {
		2486	my $class = shift;
		2487
		2488	$class->SUPER::new (
		2489	padding_x => 2,
		2490	padding_y => 2,
		2491	fg => [1, 1, 1],
		2492	active_fg => [1, 1, 0],
		2493	bg => [0, 0, 0, 0.2],
		2494	active_bg => [1, 1, 1, 0.5],
		2495	state => 0,
		2496	can_hover => 1,
		2497	@_
		2498	)
		2499	}
		2500
		2501	sub size_request {
		2502	my ($self) = @_;
		2503
		2504	(6) x 2
		2505	}
		2506
		2507	sub toggle {
		2508	my ($self) = @_;
		2509
		2510	$self->{state} = !$self->{state};
		2511	$self->emit (changed => $self->{state});
		2512	$self->update;
		2513	}
		2514
		2515	sub invoke_button_down {
		2516	my ($self, $ev, $x, $y) = @_;
		2517
		2518	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2519	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2520	$self->toggle;
		2521	} else {
		2522	return 0
		2523	}
		2524
		2525	1
		2526	}
		2527
		2528	sub _draw {
		2529	my ($self) = @_;
		2530
		2531	$self->SUPER::_draw;
		2532
		2533	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
		2534
		2535	my ($w, $h) = @$self{qw(w h)};
		2536
		2537	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2538
		2539	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2540
		2541	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2542
		2543	glEnable GL_TEXTURE_2D;
		2544	$tex->draw_quad_alpha (0, 0, $s, $s);
		2545	glDisable GL_TEXTURE_2D;
		2546	}
		2547
		2548	#############################################################################
		2549
		2550	package CFPlus::UI::Image;
		2551
		2552	our @ISA = CFPlus::UI::Base::;
		2553
		2554	use CFPlus::OpenGL;
		2555
		2556	our %texture_cache;
		2557
		2558	sub new {
		2559	my $class = shift;
		2560
		2561	my $self = $class->SUPER::new (
		2562	can_events => 0,
		2563	scale => 1,
		2564	@_,
		2565	);
		2566
		2567	$self->{path} || $self->{tex}
		2568	or Carp::croak "'path' or 'tex' attributes required";
		2569
		2570	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2571	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2572
		2573	CFPlus::weaken $texture_cache{$self->{path}};
		2574
		2575	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2576
		2577	$self
		2578	}
		2579
		2580	sub STORABLE_freeze {
		2581	my ($self, $cloning) = @_;
		2582
		2583	$self->{path}
		2584	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2585
		2586	$self->{path}
		2587	}
		2588
		2589	sub STORABLE_attach {
		2590	my ($self, $cloning, $path) = @_;
		2591
		2592	$self->new (path => $path)
		2593	}
		2594
		2595	sub size_request {
		2596	my ($self) = @_;
		2597
		2598	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
		2599	}
		2600
		2601	sub _draw {
		2602	my ($self) = @_;
		2603
		2604	my $tex = $self->{tex};
		2605
		2606	my ($w, $h) = ($self->{w}, $self->{h});
		2607
		2608	if ($self->{rot90}) {
		2609	glRotate 90, 0, 0, 1;
		2610	glTranslate 0, -$self->{w}, 0;
		2611
		2612	($w, $h) = ($h, $w);
		2613	}
		2614
		2615	glEnable GL_TEXTURE_2D;
		2616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2617
		2618	$tex->draw_quad_alpha (0, 0, $w, $h);
		2619
		2620	glDisable GL_TEXTURE_2D;
		2621	}
		2622
		2623	#############################################################################
		2624
2068	package CFClient::UI::ImageButton;	2625	package CFPlus::UI::ImageButton;
2069		2626
2070	our @ISA = CFClient::UI::Image::;	2627	our @ISA = CFPlus::UI::Image::;
2071		2628
2072	use CFClient::OpenGL;	2629	use CFPlus::OpenGL;
2073		2630
2074	my %textures;	2631	my %textures;
2075		2632
2076	sub new {	2633	sub new {
2077	my $class = shift;	2634	my $class = shift;
…		…
2087	can_events => 1,	2644	can_events => 1,
2088	@_	2645	@_
2089	);	2646	);
2090	}	2647	}
2091		2648
		2649	sub invoke_button_down {
		2650	my ($self, $ev, $x, $y) = @_;
		2651
		2652	1
		2653	}
		2654
2092	sub invoke_button_up {	2655	sub invoke_button_up {
2093	my ($self, $ev, $x, $y) = @_;	2656	my ($self, $ev, $x, $y) = @_;
2094		2657
2095	$self->emit ("activate")	2658	$self->emit ("activate")
2096	if $x >= 0 && $x < $self->{w}	2659	if $x >= 0 && $x < $self->{w}
…		…
2099	1	2662	1
2100	}	2663	}
2101		2664
2102	#############################################################################	2665	#############################################################################
2103		2666
2104	package CFClient::UI::CheckBox;
2105
2106	our @ISA = CFClient::UI::DrawBG::;
2107
2108	my @tex =
2109	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2110	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2111
2112	use CFClient::OpenGL;
2113
2114	sub new {
2115	my $class = shift;
2116
2117	$class->SUPER::new (
2118	padding_x => 2,
2119	padding_y => 2,
2120	fg => [1, 1, 1],
2121	active_fg => [1, 1, 0],
2122	bg => [0, 0, 0, 0.2],
2123	active_bg => [1, 1, 1, 0.5],
2124	state => 0,
2125	can_hover => 1,
2126	@_
2127	)
2128	}
2129
2130	sub size_request {
2131	my ($self) = @_;
2132
2133	(6) x 2
2134	}
2135
2136	sub toggle {
2137	my ($self) = @_;
2138
2139	$self->{state} = !$self->{state};
2140	$self->emit (changed => $self->{state});
2141	$self->update;
2142	}
2143
2144	sub invoke_button_down {
2145	my ($self, $ev, $x, $y) = @_;
2146
2147	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2148	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2149	$self->toggle;
2150	} else {
2151	return 0
2152	}
2153
2154	1
2155	}
2156
2157	sub _draw {
2158	my ($self) = @_;
2159
2160	$self->SUPER::_draw;
2161
2162	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2163
2164	my ($w, $h) = @$self{qw(w h)};
2165
2166	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2167
2168	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2169
2170	my $tex = $self->{state} ? $tex[1] : $tex[0];
2171
2172	glEnable GL_TEXTURE_2D;
2173	$tex->draw_quad_alpha (0, 0, $s, $s);
2174	glDisable GL_TEXTURE_2D;
2175	}
2176
2177	#############################################################################
2178
2179	package CFClient::UI::Image;	2667	package CFPlus::UI::VGauge;
2180		2668
2181	our @ISA = CFClient::UI::Base::;	2669	our @ISA = CFPlus::UI::Base::;
2182
2183	use CFClient::OpenGL;
2184
2185	our %texture_cache;
2186
2187	sub new {
2188	my $class = shift;
2189
2190	my $self = $class->SUPER::new (
2191	can_events => 0,
2192	@_,
2193	);
2194
2195	$self->{path} || $self->{tex}
2196	or Carp::croak "'path' or 'tex' attributes required";
2197
2198	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2199	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2200
2201	Scalar::Util::weaken $texture_cache{$self->{path}};
2202
2203	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2204
2205	$self
2206	}
2207
2208	sub size_request {
2209	my ($self) = @_;
2210
2211	($self->{tex}{w}, $self->{tex}{h})
2212	}
2213
2214	sub _draw {
2215	my ($self) = @_;
2216
2217	my $tex = $self->{tex};
2218
2219	my ($w, $h) = ($self->{w}, $self->{h});
2220
2221	if ($self->{rot90}) {
2222	glRotate 90, 0, 0, 1;
2223	glTranslate 0, -$self->{w}, 0;
2224
2225	($w, $h) = ($h, $w);
2226	}
2227
2228	glEnable GL_TEXTURE_2D;
2229	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230
2231	$tex->draw_quad_alpha (0, 0, $w, $h);
2232
2233	glDisable GL_TEXTURE_2D;
2234	}
2235
2236	#############################################################################
2237
2238	package CFClient::UI::VGauge;
2239
2240	our @ISA = CFClient::UI::Base::;
2241		2670
2242	use List::Util qw(min max);	2671	use List::Util qw(min max);
2243		2672
2244	use CFClient::OpenGL;	2673	use CFPlus::OpenGL;
2245		2674
2246	my %tex = (	2675	my %tex = (
2247	food => [	2676	food => [
2248	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2677	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2249	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2678	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2250	],	2679	],
2251	grace => [	2680	grace => [
2252	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2681	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2253	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2682	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2254	],	2683	],
2255	hp => [	2684	hp => [
2256	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2685	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2257	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2686	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2258	],	2687	],
2259	mana => [	2688	mana => [
2260	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2689	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2261	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2690	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2262	],	2691	],
2263	);	2692	);
2264		2693
2265	# eg. VGauge->new (gauge => 'food'), default gauge: food	2694	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2368	glDisable GL_TEXTURE_2D;	2797	glDisable GL_TEXTURE_2D;
2369	}	2798	}
2370		2799
2371	#############################################################################	2800	#############################################################################
2372		2801
		2802	package CFPlus::UI::Progress;
		2803
		2804	our @ISA = CFPlus::UI::Label::;
		2805
		2806	use CFPlus::OpenGL;
		2807
		2808	sub new {
		2809	my ($class, %arg) = @_;
		2810
		2811	my $self = $class->SUPER::new (
		2812	fg => [1, 1, 1],
		2813	bg => [0, 0, 1, 0.2],
		2814	bar => [0.7, 0.5, 0.1, 0.8],
		2815	outline => [0.4, 0.3, 0],
		2816	fontsize => 0.9,
		2817	valign => 0,
		2818	align => 0,
		2819	can_events => 1,
		2820	ellipsise => 1,
		2821	label => "%d%%",
		2822	%arg,
		2823	);
		2824
		2825	$self->set_value ($arg{value} || -1);
		2826
		2827	$self
		2828	}
		2829
		2830	sub set_label {
		2831	my ($self, $label) = @_;
		2832
		2833	return if $self->{label} eq $label;
		2834	$self->{label} = $label;
		2835
		2836	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2837	}
		2838
		2839	sub set_value {
		2840	my ($self, $value) = @_;
		2841
		2842	if ($self->{value} ne $value) {
		2843	$self->{value} = $value;
		2844
		2845	if ($value < 0) {
		2846	$self->set_text ("-");
		2847	} else {
		2848	$self->set_text (sprintf $self->{label}, $value * 100);
		2849	}
		2850
		2851	$self->update;
		2852	}
		2853	}
		2854
		2855	sub _draw {
		2856	my ($self) = @_;
		2857
		2858	glEnable GL_BLEND;
		2859	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2860
		2861	if ($self->{value} >= 0) {
		2862	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2863
		2864	glColor_premultiply @{$self->{bar}};
		2865	glRect 2, 2, $s, $self->{h} - 2;
		2866	glColor_premultiply @{$self->{bg}};
		2867	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2868	}
		2869
		2870	glColor_premultiply @{$self->{outline}};
		2871	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2872
		2873	glDisable GL_BLEND;
		2874
		2875	{
		2876	local $self->{bg}; # do not draw background
		2877	$self->SUPER::_draw;
		2878	}
		2879	}
		2880
		2881	#############################################################################
		2882
		2883	package CFPlus::UI::ExperienceProgress;
		2884
		2885	our @ISA = CFPlus::UI::Progress::;
		2886
		2887	sub new {
		2888	my ($class, %arg) = @_;
		2889
		2890	my $self = $class->SUPER::new (
		2891	tooltip => sub {
		2892	my ($self) = @_;
		2893
		2894	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2895	$self->{lvl},
		2896	::formsep ($self->{exp}),
		2897	::formsep ($self->{nxt}),
		2898	::formsep ($self->{nxt} - $self->{exp}),
		2899	},
		2900	%arg
		2901	);
		2902
		2903	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2904	if $::CONN;
		2905
		2906	$self
		2907	}
		2908
		2909	sub DESTROY {
		2910	my ($self) = @_;
		2911
		2912	delete $::CONN->{on_exp_update}{$self+0}
		2913	if $::CONN;
		2914
		2915	$self->SUPER::DESTROY;
		2916	}
		2917
		2918	sub set_value {
		2919	my ($self, $lvl, $exp) = @_;
		2920
		2921	$self->{lvl} = $lvl;
		2922	$self->{exp} = $exp;
		2923
		2924	my $v = -1;
		2925
		2926	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2927	my $l0 = $table->[$lvl - 1];
		2928	my $l1 = $table->[$lvl];
		2929
		2930	$self->{nxt} = $l1;
		2931
		2932	$v = ($exp - $l0) / ($l1 - $l0);
		2933	}
		2934
		2935	$self->SUPER::set_value ($v);
		2936	}
		2937
		2938	#############################################################################
		2939
2373	package CFClient::UI::Gauge;	2940	package CFPlus::UI::Gauge;
2374		2941
2375	our @ISA = CFClient::UI::VBox::;	2942	our @ISA = CFPlus::UI::VBox::;
2376		2943
2377	sub new {	2944	sub new {
2378	my ($class, %arg) = @_;	2945	my ($class, %arg) = @_;
2379		2946
2380	my $self = $class->SUPER::new (	2947	my $self = $class->SUPER::new (
…		…
2382	can_hover => 1,	2949	can_hover => 1,
2383	can_events => 1,	2950	can_events => 1,
2384	%arg,	2951	%arg,
2385	);	2952	);
2386		2953
2387	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2954	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2388	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2955	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2389	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2956	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2390		2957
2391	$self	2958	$self
2392	}	2959	}
2393		2960
2394	sub set_fontsize {	2961	sub set_fontsize {
…		…
2415	$self->{value}->set_text ($val);	2982	$self->{value}->set_text ($val);
2416	}	2983	}
2417		2984
2418	#############################################################################	2985	#############################################################################
2419		2986
2420	package CFClient::UI::Slider;	2987	package CFPlus::UI::Slider;
2421		2988
2422	use strict;	2989	use strict;
2423		2990
2424	use CFClient::OpenGL;	2991	use CFPlus::OpenGL;
2425		2992
2426	our @ISA = CFClient::UI::DrawBG::;	2993	our @ISA = CFPlus::UI::DrawBG::;
2427		2994
2428	my @tex =	2995	my @tex =
2429	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2996	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2430	qw(s1_slider.png s1_slider_bg.png);	2997	qw(s1_slider.png s1_slider_bg.png);
2431		2998
2432	sub new {	2999	sub new {
2433	my $class = shift;	3000	my $class = shift;
2434		3001
…		…
2502		3069
2503	$self->SUPER::invoke_button_down ($ev, $x, $y);	3070	$self->SUPER::invoke_button_down ($ev, $x, $y);
2504		3071
2505	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3072	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2506		3073
2507	$self->invoke_mouse_motion ($ev, $x, $y)	3074	$self->invoke_mouse_motion ($ev, $x, $y);
		3075
		3076	1
2508	}	3077	}
2509		3078
2510	sub invoke_mouse_motion {	3079	sub invoke_mouse_motion {
2511	my ($self, $ev, $x, $y) = @_;	3080	my ($self, $ev, $x, $y) = @_;
2512		3081
…		…
2528	sub invoke_mouse_wheel {	3097	sub invoke_mouse_wheel {
2529	my ($self, $ev) = @_;	3098	my ($self, $ev) = @_;
2530		3099
2531	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3100	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2532		3101
		3102	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3103
2533	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	3104	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2534		3105
2535	! ! $delta	3106	1
2536	}	3107	}
2537		3108
2538	sub update {	3109	sub update {
2539	my ($self) = @_;	3110	my ($self) = @_;
2540		3111
…		…
2589	glDisable GL_TEXTURE_2D;	3160	glDisable GL_TEXTURE_2D;
2590	}	3161	}
2591		3162
2592	#############################################################################	3163	#############################################################################
2593		3164
2594	package CFClient::UI::ValSlider;	3165	package CFPlus::UI::ValSlider;
2595		3166
2596	our @ISA = CFClient::UI::HBox::;	3167	our @ISA = CFPlus::UI::HBox::;
2597		3168
2598	sub new {	3169	sub new {
2599	my ($class, %arg) = @_;	3170	my ($class, %arg) = @_;
2600		3171
2601	my $range = delete $arg{range};	3172	my $range = delete $arg{range};
2602		3173
2603	my $self = $class->SUPER::new (	3174	my $self = $class->SUPER::new (
2604	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3175	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2605	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3176	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2606	to_value => sub { shift },	3177	to_value => sub { shift },
2607	from_value => sub { shift },	3178	from_value => sub { shift },
2608	%arg,	3179	%arg,
2609	);	3180	);
2610		3181
…		…
2630	sub set_range { shift->{slider}->set_range (@_) }	3201	sub set_range { shift->{slider}->set_range (@_) }
2631	sub set_value { shift->{slider}->set_value (@_) }	3202	sub set_value { shift->{slider}->set_value (@_) }
2632		3203
2633	#############################################################################	3204	#############################################################################
2634		3205
2635	package CFClient::UI::TextScroller;	3206	package CFPlus::UI::TextScroller;
2636		3207
2637	our @ISA = CFClient::UI::HBox::;	3208	our @ISA = CFPlus::UI::HBox::;
2638		3209
2639	use CFClient::OpenGL;	3210	use CFPlus::OpenGL;
2640		3211
2641	sub new {	3212	sub new {
2642	my $class = shift;	3213	my $class = shift;
2643		3214
2644	my $self = $class->SUPER::new (	3215	my $self = $class->SUPER::new (
…		…
2646	can_events => 1,	3217	can_events => 1,
2647	indent => 0,	3218	indent => 0,
2648	#font => default_font	3219	#font => default_font
2649	@_,	3220	@_,
2650		3221
2651	layout => (new CFClient::Layout),	3222	layout => (new CFPlus::Layout),
2652	par => [],	3223	par => [],
		3224	max_par => 0,
2653	height => 0,	3225	height => 0,
2654	children => [	3226	children => [
2655	(new CFClient::UI::Empty expand => 1),	3227	(new CFPlus::UI::Empty expand => 1),
2656	(new CFClient::UI::Slider vertical => 1),	3228	(new CFPlus::UI::Slider vertical => 1),
2657	],	3229	],
2658	);	3230	);
2659		3231
2660	$self->{children}[1]->connect (changed => sub { $self->update });	3232	$self->{children}[1]->connect (changed => sub { $self->update });
2661		3233
…		…
2670	}	3242	}
2671		3243
2672	sub size_request {	3244	sub size_request {
2673	my ($self) = @_;	3245	my ($self) = @_;
2674		3246
2675	my ($empty, $slider) = @{ $self->{children} };	3247	my ($empty, $slider) = $self->visible_children;
2676		3248
2677	local $self->{children} = [$empty, $slider];	3249	local $self->{children} = [$empty, $slider];
2678	$self->SUPER::size_request	3250	$self->SUPER::size_request
2679	}	3251	}
2680		3252
…		…
2738		3310
2739	# todo: base offset on lines or so, not on pixels	3311	# todo: base offset on lines or so, not on pixels
2740	$self->{children}[1]->set_value ($offset);	3312	$self->{children}[1]->set_value ($offset);
2741	}	3313	}
2742		3314
		3315	sub current_paragraph {
		3316	my ($self) = @_;
		3317
		3318	$self->{top_paragraph} - 1
		3319	}
		3320
		3321	sub scroll_to {
		3322	my ($self, $para) = @_;
		3323
		3324	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3325
		3326	$self->{scroll_to} = $para;
		3327	$self->update;
		3328	}
		3329
2743	sub clear {	3330	sub clear {
2744	my ($self) = @_;	3331	my ($self) = @_;
2745		3332
2746	my (undef, undef, @other) = @{ $self->{children} };	3333	my (undef, undef, @other) = @{ $self->{children} };
2747	$self->remove ($_) for @other;	3334	$self->remove ($_) for @other;
…		…
2750	$self->{height} = 0;	3337	$self->{height} = 0;
2751	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3338	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2752	}	3339	}
2753		3340
2754	sub add_paragraph {	3341	sub add_paragraph {
2755	my ($self, $color, $para, $indent) = @_;	3342	my $self = shift;
2756		3343
2757	my ($text, @w) = ref $para ? @$para : $para;	3344	for my $para (@_) {
2758
2759	$para = {	3345	$para = {
		3346	fg => [1, 1, 1, 1],
		3347	indent => 0,
		3348	markup => "",
		3349	widget => [],
		3350	ref $para ? %$para : (markup => $para),
2760	w => 1e10,	3351	w => 1e10,
2761	wrapped => 1,	3352	wrapped => 1,
2762	fg => $color,
2763	indent => $indent,
2764	markup => $text,
2765	widget => \@w,
2766	};	3353	};
2767		3354
2768	$self->add (@w) if @w;	3355	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2769	push @{$self->{par}}, $para;	3356	push @{$self->{par}}, $para;
		3357	}
		3358
		3359	if (my $max = $self->{max_par}) {
		3360	shift @{$self->{par}} while @{$self->{par}} > $max;
		3361	}
2770		3362
2771	$self->{need_reflow}++;	3363	$self->{need_reflow}++;
2772	$self->update;	3364	$self->update;
2773	}	3365	}
2774		3366
2775	sub scroll_to_bottom {	3367	sub scroll_to_bottom {
2776	my ($self) = @_;	3368	my ($self) = @_;
2777		3369
2778	$self->{scroll_to_bottom} = 1;	3370	$self->{scroll_to} = $#{$self->{par}};
2779	$self->update;	3371	$self->update;
2780	}	3372	}
2781		3373
		3374	sub force_uptodate {
		3375	my ($self) = @_;
		3376
		3377	if (delete $self->{need_reflow}) {
		3378	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3379
		3380	my $height = 0;
		3381
		3382	for my $para (@{$self->{par}}) {
		3383	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3384	my $layout = $self->get_layout ($para);
		3385	my ($w, $h) = $layout->size;
		3386
		3387	$para->{w} = $w + $para->{indent};
		3388	$para->{h} = $h;
		3389	$para->{wrapped} = $layout->has_wrapped;
		3390	}
		3391
		3392	$para->{y} = $height;
		3393	$height += $para->{h};
		3394	}
		3395
		3396	$self->{height} = $height;
		3397	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3398
		3399	delete $self->{texture};
		3400	}
		3401
		3402	if (my $paridx = delete $self->{scroll_to}) {
		3403	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3404	}
		3405	}
		3406
2782	sub update {	3407	sub update {
2783	my ($self) = @_;	3408	my ($self) = @_;
2784		3409
2785	$self->SUPER::update;	3410	$self->SUPER::update;
2786		3411
2787	return unless $self->{h} > 0;	3412	return unless $self->{h} > 0;
2788		3413
2789	delete $self->{texture};	3414	delete $self->{texture};
2790		3415
2791	$ROOT->on_post_alloc ($self => sub {	3416	$ROOT->on_post_alloc ($self => sub {
		3417	$self->force_uptodate;
		3418
2792	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3419	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2793		3420
2794	if (delete $self->{need_reflow}) {
2795	my $height = 0;
2796
2797	for my $para (@{$self->{par}}) {
2798	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2799	my $layout = $self->get_layout ($para);
2800	my ($w, $h) = $layout->size;
2801
2802	$para->{w} = $w + $para->{indent};
2803	$para->{h} = $h;
2804	$para->{wrapped} = $layout->has_wrapped;
2805	}
2806
2807	$height += $para->{h};
2808	}
2809
2810	$self->{height} = $height;
2811
2812	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2813
2814	delete $self->{texture};
2815	}
2816
2817	if (delete $self->{scroll_to_bottom}) {
2818	$self->{children}[1]->set_value (1e10);
2819	}
2820
2821	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3421	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2822	glClearColor 0, 0, 0, 0;	3422	glClearColor 0, 0, 0, 0;
2823	glClear GL_COLOR_BUFFER_BIT;	3423	glClear GL_COLOR_BUFFER_BIT;
2824		3424
		3425	package CFPlus::UI::Base;
		3426	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3427	(0, 0, $self->{w}, $self->{h});
		3428
		3429	my $top = int $self->{children}[1]{range}[0];
		3430
		3431	my $paridx = 0;
		3432	my $top_paragraph;
2825	my $top = int $self->{children}[1]{range}[0];	3433	my $top = int $self->{children}[1]{range}[0];
2826		3434
2827	my $y0 = $top;	3435	my $y0 = $top;
2828	my $y1 = $top + $H;	3436	my $y1 = $top + $H;
2829		3437
2830	my $y = 0;
2831
2832	for my $para (@{$self->{par}}) {	3438	for my $para (@{$self->{par}}) {
2833	my $h = $para->{h};	3439	my $h = $para->{h};
		3440	my $y = $para->{y};
2834		3441
2835	if ($y0 < $y + $h && $y < $y1) {	3442	if ($y0 < $y + $h && $y < $y1) {
2836
2837	my $layout = $self->get_layout ($para);	3443	my $layout = $self->get_layout ($para);
2838		3444
2839	$layout->render ($para->{indent}, $y - $y0);	3445	$layout->render ($para->{indent}, $y - $y0);
		3446	$layout->draw;
2840		3447
2841	if (my @w = @{ $para->{widget} }) {	3448	if (my @w = @{ $para->{widget} }) {
2842	my @s = $layout->get_shapes;	3449	my @s = $layout->get_shapes;
2843		3450
2844	for (@w) {	3451	for (@w) {
…		…
2850	$_->draw;	3457	$_->draw;
2851	}	3458	}
2852	}	3459	}
2853	}	3460	}
2854		3461
2855	$y += $h;	3462	$paridx++;
		3463	$top_paragraph ||= $paridx if $y >= $top;
2856	}	3464	}
		3465
		3466	$self->{top_paragraph} = $top_paragraph;
2857	};	3467	};
2858	});	3468	});
2859	}	3469	}
2860		3470
2861	sub reconfigure {	3471	sub reconfigure {
…		…
2879	$self->{children}[1]->draw;	3489	$self->{children}[1]->draw;
2880	}	3490	}
2881		3491
2882	#############################################################################	3492	#############################################################################
2883		3493
2884	package CFClient::UI::Animator;	3494	package CFPlus::UI::Animator;
2885		3495
2886	use CFClient::OpenGL;	3496	use CFPlus::OpenGL;
2887		3497
2888	our @ISA = CFClient::UI::Bin::;	3498	our @ISA = CFPlus::UI::Bin::;
2889		3499
2890	sub moveto {	3500	sub moveto {
2891	my ($self, $x, $y) = @_;	3501	my ($self, $x, $y) = @_;
2892		3502
2893	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3503	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2921	glPopMatrix;	3531	glPopMatrix;
2922	}	3532	}
2923		3533
2924	#############################################################################	3534	#############################################################################
2925		3535
2926	package CFClient::UI::Flopper;	3536	package CFPlus::UI::Flopper;
2927		3537
2928	our @ISA = CFClient::UI::Button::;	3538	our @ISA = CFPlus::UI::Button::;
2929		3539
2930	sub new {	3540	sub new {
2931	my $class = shift;	3541	my $class = shift;
2932		3542
2933	my $self = $class->SUPER::new (	3543	my $self = $class->SUPER::new (
…		…
2945	$self->{other}->toggle_visibility;	3555	$self->{other}->toggle_visibility;
2946	}	3556	}
2947		3557
2948	#############################################################################	3558	#############################################################################
2949		3559
2950	package CFClient::UI::Tooltip;	3560	package CFPlus::UI::Tooltip;
2951		3561
2952	our @ISA = CFClient::UI::Bin::;	3562	our @ISA = CFPlus::UI::Bin::;
2953		3563
2954	use CFClient::OpenGL;	3564	use CFPlus::OpenGL;
2955		3565
2956	sub new {	3566	sub new {
2957	my $class = shift;	3567	my $class = shift;
2958		3568
2959	$class->SUPER::new (	3569	$class->SUPER::new (
…		…
2963	}	3573	}
2964		3574
2965	sub set_tooltip_from {	3575	sub set_tooltip_from {
2966	my ($self, $widget) = @_;	3576	my ($self, $widget) = @_;
2967		3577
2968	my $tooltip = $widget->{tooltip};	3578	my $tip = $widget->{tooltip};
		3579	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3580
		3581	$tip = CFPlus::Pod::section_label tooltip => $1
		3582	if $tip =~ /^#(.*)$/;
2969		3583
2970	if ($ENV{CFPLUS_DEBUG} & 2) {	3584	if ($ENV{CFPLUS_DEBUG} & 2) {
2971	$tooltip .= "\n\n" . (ref $widget) . "\n"	3585	$tip .= "\n\n" . (ref $widget) . "\n"
2972	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3586	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2973	. "req $widget->{req_w} $widget->{req_h}\n"	3587	. "req $widget->{req_w} $widget->{req_h}\n"
2974	. "visible $widget->{visible}";	3588	. "visible $widget->{visible}";
2975	}	3589	}
2976		3590
2977	$tooltip =~ s/^\n+//;	3591	$tip =~ s/^\n+//;
2978	$tooltip =~ s/\n+$//;	3592	$tip =~ s/\n+$//;
2979		3593
2980	$self->add (new CFClient::UI::Label	3594	$self->add (new CFPlus::UI::Label
2981	markup => $tooltip,	3595	markup => $tip,
2982	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3596	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2983	fontsize => 0.8,	3597	fontsize => 0.8,
2984	fg => [0, 0, 0, 1],	3598	style => 1, # FLAG_INVERSE
2985	ellipsise => 0,	3599	ellipsise => 0,
2986	font => ($widget->{tooltip_font} || $::FONT_PROP),	3600	font => ($widget->{tooltip_font} || $::FONT_PROP),
2987	);	3601	);
2988	}	3602	}
2989		3603
…		…
3024	}	3638	}
3025		3639
3026	sub _draw {	3640	sub _draw {
3027	my ($self) = @_;	3641	my ($self) = @_;
3028		3642
3029	glTranslate 0.375, 0.375;
3030
3031	my ($w, $h) = @$self{qw(w h)};	3643	my ($w, $h) = @$self{qw(w h)};
3032		3644
3033	glColor 1, 0.8, 0.4;	3645	glColor 1, 0.8, 0.4;
3034	glBegin GL_QUADS;	3646	glRect 0, 0, $w, $h;
3035	glVertex 0 , 0;
3036	glVertex 0 , $h;
3037	glVertex $w, $h;
3038	glVertex $w, 0;
3039	glEnd;
3040		3647
3041	glColor 0, 0, 0;	3648	glColor 0, 0, 0;
3042	glBegin GL_LINE_LOOP;	3649	glRect_lineloop .5, .5, $w + .5, $h + .5;
3043	glVertex 0 , 0;
3044	glVertex 0 , $h;
3045	glVertex $w, $h;
3046	glVertex $w, 0;
3047	glEnd;
3048		3650
3049	glTranslate 2 - 0.375, 2 - 0.375;	3651	glTranslate 2, 2;
3050		3652
3051	$self->SUPER::_draw;	3653	$self->SUPER::_draw;
3052	}	3654	}
3053		3655
3054	#############################################################################	3656	#############################################################################
3055		3657
3056	package CFClient::UI::Face;	3658	package CFPlus::UI::Face;
3057		3659
3058	our @ISA = CFClient::UI::Base::;	3660	our @ISA = CFPlus::UI::DrawBG::;
3059		3661
3060	use CFClient::OpenGL;	3662	use CFPlus::OpenGL;
3061		3663
3062	sub new {	3664	sub new {
3063	my $class = shift;	3665	my $class = shift;
3064		3666
3065	my $self = $class->SUPER::new (	3667	my $self = $class->SUPER::new (
		3668	size_w => 32,
		3669	size_h => 8,
3066	aspect => 1,	3670	aspect => 1,
3067	can_events => 0,	3671	can_events => 0,
3068	@_,	3672	@_,
3069	);	3673	);
3070		3674
3071	if ($self->{anim} && $self->{animspeed}) {	3675	if ($self->{anim} && $self->{animspeed}) {
3072	Scalar::Util::weaken (my $widget = $self);	3676	CFPlus::weaken (my $widget = $self);
3073		3677
3074	$self->{timer} = Event->timer (	3678	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3075	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3679	$widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
3076	hard => 1,	3680	$self->{timer} = EV::timer_ns 0, 0, sub {
3077	interval => $self->{animspeed},	3681	return unless $::CONN;
3078	cb => sub {	3682
		3683	my $w = $widget
		3684	or return;
		3685
3079	++$widget->{frame};	3686	++$w->{frame};
		3687	$w->update_face;
		3688
		3689	# somehow, $widget can go away
3080	$widget->update;	3690	$w->update;
3081	},	3691	$w->update_timer;
3082	);	3692	};
		3693
		3694	$self->update_face;
		3695	$self->update_timer;
3083	}	3696	}
3084		3697
3085	$self	3698	$self
3086	}	3699	}
3087		3700
		3701	sub update_timer {
		3702	my ($self) = @_;
		3703
		3704	return unless $self->{timer};
		3705
		3706	$self->{timer}->stop;
		3707	if ($self->{visible}) {
		3708	$self->{timer}->set (
		3709	$self->{anim_start}
		3710	+ $self->{animspeed}
		3711	* int 1.5 + (EV::now - $self->{anim_start}) / $self->{animspeed}
		3712	);
		3713	$self->{timer}->start;
		3714	}
		3715	}
		3716
		3717	sub update_face {
		3718	my ($self) = @_;
		3719
		3720	if ($::CONN) {
		3721	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3722	if ($anim && @$anim) {
		3723	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3724	delete $self->{face_change_cb};
		3725
		3726	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3727	unless ($tex->{name} || $tex->{loading}) {
		3728	$tex->upload (sub { $self->reconfigure });
		3729	}
		3730	}
		3731	}
		3732	}
		3733	}
		3734	}
		3735
3088	sub size_request {	3736	sub size_request {
3089	(32, 8)	3737	my ($self) = @_;
		3738
		3739	if ($::CONN) {
		3740	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3741	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3742	if ($tex->{name}) {
		3743	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3744	} elsif (!$tex->{loading}) {
		3745	$tex->upload (sub { $self->reconfigure });
		3746	}
		3747	}
		3748
		3749	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3750	}
		3751	}
		3752
		3753	($self->{size_w} || 8, $self->{size_h} || 8)
3090	}	3754	}
3091		3755
3092	sub update {	3756	sub update {
3093	my ($self) = @_;	3757	my ($self) = @_;
3094		3758
3095	return unless $self->{visible};	3759	return unless $self->{visible};
3096		3760
3097	$self->SUPER::update;	3761	$self->SUPER::update;
3098	}	3762	}
3099		3763
		3764	sub invoke_visibility_change {
		3765	my ($self) = @_;
		3766
		3767	$self->update_timer;
		3768
		3769	0
		3770	}
		3771
3100	sub _draw {	3772	sub _draw {
3101	my ($self) = @_;	3773	my ($self) = @_;
3102		3774
3103	return unless $::CONN;	3775	$self->SUPER::_draw;
3104		3776
3105	my $face;	3777	if (my $tex = $self->{tex}) {
3106
3107	if ($self->{frame}) {
3108	my $anim = $::CONN->{anim}[$self->{anim}];
3109
3110	$face = $anim->[ $self->{frame} % @$anim ]
3111	if $anim && @$anim;
3112	}
3113
3114	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3115
3116	if ($tex) {
3117	glEnable GL_TEXTURE_2D;	3778	glEnable GL_TEXTURE_2D;
3118	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3779	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3119	glColor 0, 0, 0, 1;	3780	glColor 0, 0, 0, 1;
3120	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3781	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3121	glDisable GL_TEXTURE_2D;	3782	glDisable GL_TEXTURE_2D;
…		…
3123	}	3784	}
3124		3785
3125	sub destroy {	3786	sub destroy {
3126	my ($self) = @_;	3787	my ($self) = @_;
3127		3788
3128	$self->{timer}->cancel	3789	(delete $self->{timer})->cancel
3129	if $self->{timer};	3790	if $self->{timer};
3130		3791
3131	$self->SUPER::destroy;	3792	$self->SUPER::destroy;
3132	}	3793	}
3133		3794
3134	#############################################################################	3795	#############################################################################
3135		3796
3136	package CFClient::UI::Buttonbar;	3797	package CFPlus::UI::Buttonbar;
3137		3798
3138	our @ISA = CFClient::UI::HBox::;	3799	our @ISA = CFPlus::UI::HBox::;
3139		3800
3140	# TODO: should actualyl wrap buttons and other goodies.	3801	# TODO: should actually wrap buttons and other goodies.
3141		3802
3142	#############################################################################	3803	#############################################################################
3143		3804
3144	package CFClient::UI::Menu;	3805	package CFPlus::UI::Menu;
3145		3806
3146	our @ISA = CFClient::UI::FancyFrame::;	3807	our @ISA = CFPlus::UI::Toplevel::;
3147		3808
3148	use CFClient::OpenGL;	3809	use CFPlus::OpenGL;
3149		3810
3150	sub new {	3811	sub new {
3151	my $class = shift;	3812	my $class = shift;
3152		3813
3153	my $self = $class->SUPER::new (	3814	my $self = $class->SUPER::new (
3154	items => [],	3815	items => [],
3155	z => 100,	3816	z => 100,
3156	@_,	3817	@_,
3157	);	3818	);
3158		3819
3159	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3820	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3160		3821
3161	for my $item (@{ $self->{items} }) {	3822	for my $item (@{ $self->{items} }) {
3162	my ($widget, $cb, $tooltip) = @$item;	3823	my ($widget, $cb, $tooltip) = @$item;
3163		3824
3164	# handle various types of items, only text for now	3825	# handle various types of items, only text for now
3165	if (!ref $widget) {	3826	if (!ref $widget) {
3166	if ($widget =~ /\t/) {	3827	if ($widget =~ /\t/) {
3167	my ($left, $right) = split /\t/, $widget, 2;	3828	my ($left, $right) = split /\t/, $widget, 2;
3168		3829
3169	$widget = new CFClient::UI::HBox	3830	$widget = new CFPlus::UI::HBox
3170	can_hover => 1,	3831	can_hover => 1,
3171	can_events => 1,	3832	can_events => 1,
3172	tooltip => $tooltip,	3833	tooltip => $tooltip,
3173	children => [	3834	children => [
3174	(new CFClient::UI::Label markup => $left, expand => 1),	3835	(new CFPlus::UI::Label markup => $left, expand => 1),
3175	(new CFClient::UI::Label markup => $right, align => +1),	3836	(new CFPlus::UI::Label markup => $right, align => +1),
3176	],	3837	],
3177	;	3838	;
3178		3839
3179	} else {	3840	} else {
3180	$widget = new CFClient::UI::Label	3841	$widget = new CFPlus::UI::Label
3181	can_hover => 1,	3842	can_hover => 1,
3182	can_events => 1,	3843	can_events => 1,
3183	markup => $widget,	3844	markup => $widget,
3184	tooltip => $tooltip;	3845	tooltip => $tooltip;
3185	}	3846	}
…		…
3233	1	3894	1
3234	}	3895	}
3235		3896
3236	#############################################################################	3897	#############################################################################
3237		3898
3238	package CFClient::UI::Multiplexer;	3899	package CFPlus::UI::Multiplexer;
3239		3900
3240	our @ISA = CFClient::UI::Container::;	3901	our @ISA = CFPlus::UI::Container::;
3241		3902
3242	sub new {	3903	sub new {
3243	my $class = shift;	3904	my $class = shift;
3244		3905
3245	my $self = $class->SUPER::new (	3906	my $self = $class->SUPER::new (
…		…
3306	$self->{current}->draw;	3967	$self->{current}->draw;
3307	}	3968	}
3308		3969
3309	#############################################################################	3970	#############################################################################
3310		3971
3311	package CFClient::UI::Notebook;	3972	package CFPlus::UI::Notebook;
3312		3973
		3974	use CFPlus::OpenGL;
		3975
3313	our @ISA = CFClient::UI::VBox::;	3976	our @ISA = CFPlus::UI::VBox::;
3314		3977
3315	sub new {	3978	sub new {
3316	my $class = shift;	3979	my $class = shift;
3317		3980
3318	my $self = $class->SUPER::new (	3981	my $self = $class->SUPER::new (
3319	buttonbar => (new CFClient::UI::Buttonbar),	3982	buttonbar => (new CFPlus::UI::Buttonbar),
3320	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3983	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3984	active_outline => [.7, .7, 0.2],
3321	# filter => # will be put between multiplexer and $self	3985	# filter => # will be put between multiplexer and $self
3322	@_,	3986	@_,
3323	);	3987	);
3324		3988
3325	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3989	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3326	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3990	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3327		3991
		3992	{
		3993	Scalar::Util::weaken (my $wself = $self);
		3994
		3995	$self->{multiplexer}->connect (c_add => sub {
		3996	my ($mplex, $widgets) = @_;
		3997
		3998	for my $child (@$widgets) {
		3999	Scalar::Util::weaken $child;
		4000	$child->{c_tab_} ||= do {
		4001	my $tab =
		4002	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		4003	? $child->{c_tab}
		4004	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4005
		4006	$tab->connect (activate => sub {
		4007	$wself->set_current_page ($child);
		4008	});
		4009
		4010	$tab
		4011	};
		4012
		4013	$self->{buttonbar}->add ($child->{c_tab_});
		4014	}
		4015	});
		4016
		4017	$self->{multiplexer}->connect (c_remove => sub {
		4018	my ($mplex, $widgets) = @_;
		4019
		4020	for my $child (@$widgets) {
		4021	$wself->{buttonbar}->remove ($child->{c_tab_});
		4022	}
		4023	});
		4024	}
		4025
3328	$self	4026	$self
3329	}	4027	}
3330		4028
3331	sub add {	4029	sub add {
		4030	my ($self, @widgets) = @_;
		4031
		4032	$self->{multiplexer}->add (@widgets)
		4033	}
		4034
		4035	sub remove {
		4036	my ($self, @widgets) = @_;
		4037
		4038	$self->{multiplexer}->remove (@widgets)
		4039	}
		4040
		4041	sub pages {
		4042	my ($self) = @_;
		4043	$self->{multiplexer}->children
		4044	}
		4045
		4046	sub add_tab {
3332	my ($self, $title, $widget, $tooltip) = @_;	4047	my ($self, $title, $widget, $tooltip) = @_;
3333		4048
3334	Scalar::Util::weaken $self;	4049	$title = [$title, $tooltip] unless ref $title;
		4050	$widget->{c_tab} = $title;
3335		4051
3336	$self->{buttonbar}->add (new CFClient::UI::Button
3337	markup => $title,
3338	tooltip => $tooltip,
3339	on_activate => sub { $self->set_current_page ($widget) },
3340	);
3341
3342	$self->{multiplexer}->add ($widget);	4052	$self->add ($widget);
3343	}	4053	}
3344		4054
3345	sub get_current_page {	4055	sub get_current_page {
3346	my ($self) = @_;	4056	my ($self) = @_;
3347		4057
…		…
3353		4063
3354	$self->{multiplexer}->set_current_page ($page);	4064	$self->{multiplexer}->set_current_page ($page);
3355	$self->emit (page_changed => $self->{multiplexer}{current});	4065	$self->emit (page_changed => $self->{multiplexer}{current});
3356	}	4066	}
3357		4067
		4068	sub _draw {
		4069	my ($self) = @_;
		4070
		4071	$self->SUPER::_draw ();
		4072
		4073	if (my $cur = $self->{multiplexer}{current}) {
		4074	if ($cur = $cur->{c_tab_}) {
		4075	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4076	$self->{buttonbar}{y} + $cur->{y};
		4077	glLineWidth 3;
		4078	#glEnable GL_BLEND;
		4079	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4080	glColor @{$self->{active_outline}};
		4081	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4082	glLineWidth 1;
		4083	#glDisable GL_BLEND;
		4084	}
		4085	}
		4086	}
		4087
3358	#############################################################################	4088	#############################################################################
3359		4089
3360	package CFClient::UI::Combobox;	4090	package CFPlus::UI::Selector;
3361		4091
3362	use utf8;	4092	use utf8;
3363		4093
3364	our @ISA = CFClient::UI::Button::;	4094	our @ISA = CFPlus::UI::Button::;
3365		4095
3366	sub new {	4096	sub new {
3367	my $class = shift;	4097	my $class = shift;
3368		4098
3369	my $self = $class->SUPER::new (	4099	my $self = $class->SUPER::new (
…		…
3386	my ($value, $title, $tooltip) = @$_;	4116	my ($value, $title, $tooltip) = @$_;
3387		4117
3388	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4118	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3389	}	4119	}
3390		4120
3391	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4121	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3392	}	4122	}
3393		4123
3394	sub _set_value {	4124	sub _set_value {
3395	my ($self, $value) = @_;	4125	my ($self, $value) = @_;
3396		4126
3397	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4127	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4128	$item ||= $self->{options}[0]
3398	or return;	4129	or return;
3399		4130
3400	$self->{value} = $item->[0];	4131	$self->{value} = $item->[0];
3401	$self->set_markup ("$item->[1] ⇓");	4132	$self->set_markup ("$item->[1] ⇓");
3402	$self->set_tooltip ($item->[2]);	4133	# $self->set_tooltip ($item->[2]);
3403	}	4134	}
3404		4135
3405	sub set_value {	4136	sub set_value {
3406	my ($self, $value) = @_;	4137	my ($self, $value) = @_;
3407		4138
…		…
3409		4140
3410	$self->_set_value ($value);	4141	$self->_set_value ($value);
3411	$self->emit (changed => $value);	4142	$self->emit (changed => $value);
3412	}	4143	}
3413		4144
		4145	sub set_options {
		4146	my ($self, $options) = @_;
		4147
		4148	$self->{options} = $options;
		4149	$self->_set_value ($self->{value});
		4150	}
		4151
3414	#############################################################################	4152	#############################################################################
3415		4153
3416	package CFClient::UI::Statusbox;	4154	package CFPlus::UI::Statusbox;
3417		4155
3418	our @ISA = CFClient::UI::VBox::;	4156	our @ISA = CFPlus::UI::VBox::;
3419		4157
3420	sub new {	4158	sub new {
3421	my $class = shift;	4159	my $class = shift;
3422		4160
3423	my $self = $class->SUPER::new (	4161	my $self = $class->SUPER::new (
3424	fontsize => 0.8,	4162	fontsize => 0.8,
3425	@_,	4163	@_,
3426	);	4164	);
3427		4165
3428	Scalar::Util::weaken (my $this = $self);	4166	CFPlus::weaken (my $this = $self);
3429		4167
3430	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4168	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3431		4169
3432	$self	4170	$self
3433	}	4171	}
3434		4172
3435	sub reorder {	4173	sub reorder {
3436	my ($self) = @_;	4174	my ($self) = @_;
3437	my $NOW = Time::HiRes::time;	4175	my $NOW = Time::HiRes::time;
3438		4176
3439	# freeze display when hovering over any label	4177	# freeze display when hovering over any label
3440	return if $CFClient::UI::TOOLTIP->{owner}	4178	return if $CFPlus::UI::TOOLTIP->{owner}
3441	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4179	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3442	values %{ $self->{item} };	4180	values %{ $self->{item} };
3443		4181
3444	while (my ($k, $v) = each %{ $self->{item} }) {	4182	while (my ($k, $v) = each %{ $self->{item} }) {
3445	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4183	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3446	}	4184	}
…		…
3449		4187
3450	my @items = sort {	4188	my @items = sort {
3451	$a->{pri} <=> $b->{pri}	4189	$a->{pri} <=> $b->{pri}
3452	or $b->{id} <=> $a->{id}	4190	or $b->{id} <=> $a->{id}
3453	} values %{ $self->{item} };	4191	} values %{ $self->{item} };
3454
3455	$self->{timer}->interval (1);
3456		4192
3457	my $count = 10 + 1;	4193	my $count = 10 + 1;
3458	for my $item (@items) {	4194	for my $item (@items) {
3459	last unless --$count;	4195	last unless --$count;
3460		4196
…		…
3467	for ($short) {	4203	for ($short) {
3468	s/^\s+//;	4204	s/^\s+//;
3469	s/\s+/ /g;	4205	s/\s+/ /g;
3470	}	4206	}
3471		4207
3472	new CFClient::UI::Label	4208	new CFPlus::UI::Label
3473	markup => $short,	4209	markup => $short,
3474	tooltip => $item->{tooltip},	4210	tooltip => $item->{tooltip},
3475	tooltip_font => $::FONT_PROP,	4211	tooltip_font => $::FONT_PROP,
3476	tooltip_width => 0.67,	4212	tooltip_width => 0.67,
3477	fontsize => $item->{fontsize} || $self->{fontsize},	4213	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3484	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4220	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3485	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4221	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3486	$label->update;	4222	$label->update;
3487	$label->set_max_size (undef, $label->{req_h} * $diff)	4223	$label->set_max_size (undef, $label->{req_h} * $diff)
3488	if $diff < 1;	4224	if $diff < 1;
3489	$self->{timer}->interval (1/30);	4225	$self->{timer}->set (1/30, 1/30);
3490	} else {	4226	} else {
3491	$label->{fg}[3] = $item->{fg}[3] || 1;	4227	$label->{fg}[3] = $item->{fg}[3] || 1;
3492	}	4228	}
3493		4229
3494	push @widgets, $label;	4230	push @widgets, $label;
…		…
3556	$self->SUPER::destroy;	4292	$self->SUPER::destroy;
3557	}	4293	}
3558		4294
3559	#############################################################################	4295	#############################################################################
3560		4296
3561	package CFClient::UI::Inventory;
3562
3563	our @ISA = CFClient::UI::Table::;
3564
3565	sub new {
3566	my $class = shift;
3567
3568	my $self = $class->SUPER::new (
3569	col_expand => [0, 1, 0],
3570	items => [],
3571	@_,
3572	);
3573
3574	$self->set_sort_order (undef);
3575
3576	$self
3577	}
3578
3579	sub update_items {
3580	my ($self) = @_;
3581
3582	$self->clear;
3583
3584	my @item = $self->{sort}->(@{ $self->{items} });
3585
3586	my @adds;
3587	my $row = 0;
3588	for my $item ($self->{sort}->(@{ $self->{items} })) {
3589	CFClient::Item::update_widgets $item;
3590
3591	push @adds, 0, $row, $item->{face_widget};
3592	push @adds, 1, $row, $item->{desc_widget};
3593	push @adds, 2, $row, $item->{weight_widget};
3594
3595	$row++;
3596	}
3597
3598	$self->add (@adds);
3599	}
3600
3601	sub set_sort_order {
3602	my ($self, $order) = @_;
3603
3604	$self->{sort} = $order ||= sub {
3605	sort {
3606	$a->{type} <=> $b->{type}
3607	or $a->{name} cmp $b->{name}
3608	} @_
3609	};
3610
3611	$self->update_items;
3612	}
3613
3614	sub set_items {
3615	my ($self, $items) = @_;
3616
3617	$self->{items} = [$items ? values %$items : ()];
3618	$self->update_items;
3619	}
3620
3621	#############################################################################
3622
3623	package CFClient::UI::SpellList;
3624
3625	our @ISA = CFClient::UI::Table::;
3626
3627	sub new {
3628	my $class = shift;
3629
3630	my $self = $class->SUPER::new (
3631	binding => [],
3632	commands => [],
3633	@_,
3634	)
3635	}
3636
3637	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3638
3639	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3640	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3641	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3642	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3643	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3644	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3645	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3646	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3647	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3648	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3649
3650	sub rebuild_spell_list {
3651	my ($self) = @_;
3652
3653	$CFClient::UI::ROOT->on_refresh ($self => sub {
3654	$self->clear;
3655
3656	return unless $::CONN;
3657
3658	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3659	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3660	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3661	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3662	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3663
3664	my $row = 0;
3665
3666	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3667	my $spell = $self->{spell}{$_};
3668
3669	$row++;
3670
3671	my $spell_cb = sub {
3672	my ($widget, $ev) = @_;
3673
3674	if ($ev->{button} == 1) {
3675	$::CONN->user_send ("cast $spell->{name}");
3676	} elsif ($ev->{button} == 2) {
3677	$::CONN->user_send ("invoke $spell->{name}");
3678	} elsif ($ev->{button} == 3) {
3679	(new CFClient::UI::Menu
3680	items => [
3681	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3682	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3683	],
3684	)->popup ($ev);
3685	} else {
3686	return 0;
3687	}
3688
3689	1
3690	};
3691
3692	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3693
3694	#TODO: add path info to tooltip
3695	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3696
3697	$self->add (0, $row, new CFClient::UI::Face
3698	face => $spell->{face},
3699	can_hover => 1,
3700	can_events => 1,
3701	tooltip => $tooltip,
3702	on_button_down => $spell_cb,
3703	);
3704
3705	$self->add (1, $row, new CFClient::UI::Label
3706	expand => 1,
3707	text => $spell->{name},
3708	can_hover => 1,
3709	can_events => 1,
3710	tooltip => $tooltip,
3711	on_button_down => $spell_cb,
3712	);
3713
3714	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3715	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3716	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3717	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3718	}
3719	});
3720	}
3721
3722	sub add_spell {
3723	my ($self, $spell) = @_;
3724
3725	$self->{spell}->{$spell->{name}} = $spell;
3726	$self->rebuild_spell_list;
3727	}
3728
3729	sub remove_spell {
3730	my ($self, $spell) = @_;
3731
3732	delete $self->{spell}->{$spell->{name}};
3733	$self->rebuild_spell_list;
3734	}
3735
3736	sub clear_spells {
3737	my ($self) = @_;
3738
3739	$self->{spell} = {};
3740	$self->rebuild_spell_list;
3741	}
3742
3743	#############################################################################
3744
3745	package CFClient::UI::Root;	4297	package CFPlus::UI::Root;
3746		4298
3747	our @ISA = CFClient::UI::Container::;	4299	our @ISA = CFPlus::UI::Container::;
3748		4300
3749	use List::Util qw(min max);	4301	use List::Util qw(min max);
3750		4302
3751	use CFClient::OpenGL;	4303	use CFPlus::OpenGL;
3752		4304
3753	sub new {	4305	sub new {
3754	my $class = shift;	4306	my $class = shift;
3755		4307
3756	my $self = $class->SUPER::new (	4308	my $self = $class->SUPER::new (
3757	visible => 1,	4309	visible => 1,
3758	@_,	4310	@_,
3759	);	4311	);
3760		4312
3761	Scalar::Util::weaken ($self->{root} = $self);	4313	CFPlus::weaken ($self->{root} = $self);
3762		4314
3763	$self	4315	$self
3764	}	4316	}
3765		4317
3766	sub size_request {	4318	sub size_request {
…		…
3814	}	4366	}
3815		4367
3816	sub update {	4368	sub update {
3817	my ($self) = @_;	4369	my ($self) = @_;
3818		4370
3819	$::WANT_REFRESH++;	4371	$::WANT_REFRESH->start;
3820	}	4372	}
3821		4373
3822	sub add {	4374	sub add {
3823	my ($self, @children) = @_;	4375	my ($self, @children) = @_;
3824		4376
…		…
3861	while ($self->{refresh_hook}) {	4413	while ($self->{refresh_hook}) {
3862	$_->()	4414	$_->()
3863	for values %{delete $self->{refresh_hook}};	4415	for values %{delete $self->{refresh_hook}};
3864	}	4416	}
3865		4417
3866	if ($self->{realloc}) {	4418	while ($self->{realloc}) {
3867	my %queue;	4419	my %queue;
3868	my @queue;	4420	my @queue;
3869	my $widget;	4421	my $widget;
3870		4422
3871	outer:	4423	outer:
…		…
3918	}	4470	}
3919	}	4471	}
3920		4472
3921	delete $self->{realloc}{$widget+0};	4473	delete $self->{realloc}{$widget+0};
3922	}	4474	}
3923	}
3924		4475
3925	while (my $size_alloc = delete $self->{size_alloc}) {	4476	while (my $size_alloc = delete $self->{size_alloc}) {
3926	my @queue = sort { $b->{visible} <=> $a->{visible} }	4477	my @queue = sort { $a->{visible} <=> $b->{visible} }
3927	values %$size_alloc;	4478	values %$size_alloc;
3928		4479
3929	while () {	4480	while () {
3930	my $widget = pop @queue || last;	4481	my $widget = pop @queue || last;
3931		4482
3932	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4483	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3933		4484
3934	$w = 0 if $w < 0;
3935	$h = 0 if $h < 0;
3936
3937	$w = max $widget->{min_w}, $w;	4485	$w = max $widget->{min_w}, $w;
3938	$h = max $widget->{min_h}, $h;	4486	$h = max $widget->{min_h}, $h;
3939		4487
		4488	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4489	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4490
3940	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4491	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4492	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3942		4493
3943	$w = int $w + 0.5;	4494	$w = int $w + 0.5;
3944	$h = int $h + 0.5;	4495	$h = int $h + 0.5;
3945		4496
3946	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4497	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3947	$widget->{old_w} = $widget->{w};	4498	$widget->{old_w} = $widget->{w};
3948	$widget->{old_h} = $widget->{h};	4499	$widget->{old_h} = $widget->{h};
3949		4500
3950	$widget->{w} = $w;	4501	$widget->{w} = $w;
3951	$widget->{h} = $h;	4502	$widget->{h} = $h;
3952		4503
3953	$widget->emit (size_allocate => $w, $h);	4504	$widget->emit (size_allocate => $w, $h);
		4505	}
3954	}	4506	}
3955	}	4507	}
3956	}	4508	}
3957		4509
3958	while ($self->{post_alloc_hook}) {	4510	while ($self->{post_alloc_hook}) {
3959	$_->()	4511	$_->()
3960	for values %{delete $self->{post_alloc_hook}};	4512	for values %{delete $self->{post_alloc_hook}};
3961	}	4513	}
3962
3963		4514
3964	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4515	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3965	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4516	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3966	glClear GL_COLOR_BUFFER_BIT;	4517	glClear GL_COLOR_BUFFER_BIT;
3967		4518
…		…
3970	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4521	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3971	glMatrixMode GL_MODELVIEW;	4522	glMatrixMode GL_MODELVIEW;
3972	glLoadIdentity;	4523	glLoadIdentity;
3973		4524
3974	{	4525	{
3975	package CFClient::UI::Base;	4526	package CFPlus::UI::Base;
3976		4527
3977	($draw_x, $draw_y, $draw_w, $draw_h) =	4528	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3978	(0, 0, $self->{w}, $self->{h});	4529	(0, 0, $self->{w}, $self->{h});
3979	}
3980		4530
3981	$self->_draw;	4531	$self->_draw;
		4532	}
3982	}	4533	}
3983		4534
3984	#############################################################################	4535	#############################################################################
3985		4536
3986	package CFClient::UI;	4537	package CFPlus::UI;
3987		4538
3988	$ROOT = new CFClient::UI::Root;	4539	$ROOT = new CFPlus::UI::Root;
3989	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4540	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3990		4541
3991	1	4542	1
3992		4543

Diff Legend

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