ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.331 by root, Sun Jul 23 04:46:02 2006 UTC vs.
Revision 1.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) = @_;
		461
		462	return (undef, undef) unless $self->{parent};
442		463
443	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	464	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
444	}	465	}
445		466
446	sub invoke_focus_in {	467	sub invoke_focus_in {
…		…
494		515
495	sub connect {	516	sub connect {
496	my ($self, $signal, $cb) = @_;	517	my ($self, $signal, $cb) = @_;
497		518
498	push @{ $self->{signal_cb}{$signal} }, $cb;	519	push @{ $self->{signal_cb}{$signal} }, $cb;
		520
		521	defined wantarray and CFPlus::guard {
		522	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		523	@{ $self->{signal_cb}{$signal} };
		524	}
		525	}
		526
		527	sub disconnect_all {
		528	my ($self, $signal) = @_;
		529
		530	delete $self->{signal_cb}{$signal};
499	}	531	}
500		532
501	my %has_coords = (	533	my %has_coords = (
502	button_down => 1,	534	button_down => 1,
503	button_up => 1,	535	button_up => 1,
…		…
506	);	538	);
507		539
508	sub emit {	540	sub emit {
509	my ($self, $signal, @args) = @_;	541	my ($self, $signal, @args) = @_;
510		542
		543	# I do not really like this solution, but I do not like duplication
		544	# and needlessly verbose code, either.
511	my @append	545	my @append
512	= $has_coords{$signal}	546	= $has_coords{$signal}
513	? $args[0]->xy ($self)	547	? $args[0]->xy ($self)
514	: ();	548	: ();
515		549
516	#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#
517		551
518	#d##TODO# stop propagating at first true, do not use sum	552	for my $cb (
519	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	553	@{$self->{signal_cb}{$signal} || []}, # before
520	|| ($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
521	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	560	$self->{parent} && $self->{parent}->emit ($signal, @args)
522	}	561	}
523		562
524	sub find_widget {	563	#sub find_widget {
525	my ($self, $x, $y) = @_;	564	# in .xs
526
527	return () unless $self->{can_events};
528
529	return $self
530	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
531	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
532
533	()
534	}
535		565
536	sub set_parent {	566	sub set_parent {
537	my ($self, $parent) = @_;	567	my ($self, $parent) = @_;
538		568
539	Scalar::Util::weaken ($self->{parent} = $parent);	569	CFPlus::weaken ($self->{parent} = $parent);
540	$self->set_visible if $parent->{visible};	570	$self->set_visible if $parent->{visible};
541	}	571	}
542		572
543	sub realloc {	573	sub realloc {
544	my ($self) = @_;	574	my ($self) = @_;
…		…
570		600
571	# 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
572	# functions seems pointless.	602	# functions seems pointless.
573	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
574		604
575	sub draw {	605	#sub draw {
576	my ($self) = @_;	606	#CFPlus.xs
577
578	return unless $self->{h} && $self->{w};
579
580	# update screen rectangle
581	local $draw_x = $draw_x + $self->{x};
582	local $draw_y = $draw_y + $self->{y};
583
584	# skip widgets that are entirely outside the drawing area
585	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
586	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
587
588	glPushMatrix;
589	glTranslate $self->{x}, $self->{y}, 0;
590
591	if ($self == $HOVER && $self->{can_hover}) {
592	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
593	glEnable GL_BLEND;
594	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
595	glBegin GL_QUADS;
596	glVertex 0 , 0;
597	glVertex $self->{w}, 0;
598	glVertex $self->{w}, $self->{h};
599	glVertex 0 , $self->{h};
600	glEnd;
601	glDisable GL_BLEND;
602	}
603
604	if ($ENV{CFPLUS_DEBUG} & 1) {
605	glPushMatrix;
606	glColor 1, 1, 0, 1;
607	glTranslate 0.375, 0.375;
608	glBegin GL_LINE_LOOP;
609	glVertex 0 , 0;
610	glVertex $self->{w} - 1, 0;
611	glVertex $self->{w} - 1, $self->{h} - 1;
612	glVertex 0 , $self->{h} - 1;
613	glEnd;
614	glPopMatrix;
615	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
616	}
617
618	$self->_draw;
619	glPopMatrix;
620	}
621		607
622	sub _draw {	608	sub _draw {
623	my ($self) = @_;	609	my ($self) = @_;
624		610
625	warn "no draw defined for $self\n";	611	warn "no draw defined for $self\n";
626	}	612	}
627		613
628	sub DESTROY {	614	sub DESTROY {
629	my ($self) = @_;	615	my ($self) = @_;
630		616
631	return if CFClient::in_destruct;	617	return if CFPlus::in_destruct;
632		618
633	delete $WIDGET{$self+0};	619	local $@;
634
635	eval { $self->destroy };	620	eval { $self->destroy };
636	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};
637	}	624	}
638		625
639	#############################################################################	626	#############################################################################
640		627
641	package CFClient::UI::DrawBG;	628	package CFPlus::UI::DrawBG;
642		629
643	our @ISA = CFClient::UI::Base::;	630	our @ISA = CFPlus::UI::Base::;
644		631
645	use strict;	632	use strict;
646	use CFClient::OpenGL;	633	use CFPlus::OpenGL;
647		634
648	sub new {	635	sub new {
649	my $class = shift;	636	my $class = shift;
650
651	# range [value, low, high, page]
652		637
653	$class->SUPER::new (	638	$class->SUPER::new (
654	#bg => [0, 0, 0, 0.2],	639	#bg => [0, 0, 0, 0.2],
655	#active_bg => [1, 1, 1, 0.5],	640	#active_bg => [1, 1, 1, 0.5],
656	@_	641	@_
…		…
668	my ($w, $h) = @$self{qw(w h)};	653	my ($w, $h) = @$self{qw(w h)};
669		654
670	glEnable GL_BLEND;	655	glEnable GL_BLEND;
671	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	656	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
672	glColor_premultiply @$color;	657	glColor_premultiply @$color;
673
674	glBegin GL_QUADS;
675	glVertex 0 , 0;
676	glVertex 0 , $h;
677	glVertex $w, $h;	658	glRect 0, 0, $w, $h;
678	glVertex $w, 0;
679	glEnd;
680
681	glDisable GL_BLEND;	659	glDisable GL_BLEND;
682	}	660	}
683	}	661	}
684		662
685	#############################################################################	663	#############################################################################
686		664
687	package CFClient::UI::Empty;	665	package CFPlus::UI::Empty;
688		666
689	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
690		668
691	sub new {	669	sub new {
692	my ($class, %arg) = @_;	670	my ($class, %arg) = @_;
693	$class->SUPER::new (can_events => 0, %arg);	671	$class->SUPER::new (can_events => 0, %arg);
694	}	672	}
…		…
701		679
702	sub draw { }	680	sub draw { }
703		681
704	#############################################################################	682	#############################################################################
705		683
706	package CFClient::UI::Container;	684	package CFPlus::UI::Container;
707		685
708	our @ISA = CFClient::UI::Base::;	686	our @ISA = CFPlus::UI::Base::;
709		687
710	sub new {	688	sub new {
711	my ($class, %arg) = @_;	689	my ($class, %arg) = @_;
712		690
713	my $children = delete $arg{children};	691	my $children = delete $arg{children};
…		…
717	can_events => 0,	695	can_events => 0,
718	%arg,	696	%arg,
719	);	697	);
720		698
721	$self->add (@$children)	699	$self->add (@$children)
722	if $children;	700	if $children && @$children;
723		701
724	$self	702	$self
		703	}
		704
		705	sub realloc {
		706	my ($self) = @_;
		707
		708	$self->{force_realloc} = 1;
		709	$self->{force_size_alloc} = 1;
		710	$self->SUPER::realloc;
725	}	711	}
726		712
727	sub add {	713	sub add {
728	my ($self, @widgets) = @_;	714	my ($self, @widgets) = @_;
729		715
730	$_->set_parent ($self)	716	$_->set_parent ($self)
731	for @widgets;	717	for @widgets;
732		718
		719	# TODO: only do this in widgets that need it, e.g. root, fixed
733	use sort 'stable';	720	use sort 'stable';
734		721
735	$self->{children} = [	722	$self->{children} = [
736	sort { $a->{z} <=> $b->{z} }	723	sort { $a->{z} <=> $b->{z} }
737	@{$self->{children}}, @widgets	724	@{$self->{children}}, @widgets
738	];	725	];
739		726
740	$self->realloc;	727	$self->realloc;
		728
		729	$self->emit (c_add => \@widgets);
		730
		731	map $_+0, @widgets
741	}	732	}
742		733
743	sub children {	734	sub children {
744	@{ $_[0]{children} }	735	@{ $_[0]{children} }
745	}	736	}
746		737
747	sub remove {	738	sub remove {
748	my ($self, $child) = @_;	739	my ($self, @widgets) = @_;
749		740
		741	$self->emit (c_remove => \@widgets);
		742
		743	for my $child (@widgets) {
750	delete $child->{parent};	744	delete $child->{parent};
751	$child->hide;	745	$child->hide;
752
753	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	746	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		747	}
754		748
755	$self->realloc;	749	$self->realloc;
756	}	750	}
757		751
758	sub clear {	752	sub clear {
759	my ($self) = @_;	753	my ($self) = @_;
760		754
761	my $children = delete $self->{children};	755	my $children = $self->{children};
762	$self->{children} = [];	756	$self->{children} = [];
763		757
764	for (@$children) {	758	for (@$children) {
765	delete $_->{parent};	759	delete $_->{parent};
766	$_->hide;	760	$_->hide;
…		…
786	}	780	}
787		781
788	sub _draw {	782	sub _draw {
789	my ($self) = @_;	783	my ($self) = @_;
790		784
791	$_->draw for @{$self->{children}};	785	$_->draw for $self->visible_children;
792	}	786	}
793		787
794	#############################################################################	788	#############################################################################
795		789
796	package CFClient::UI::Bin;	790	package CFPlus::UI::Bin;
797		791
798	our @ISA = CFClient::UI::Container::;	792	our @ISA = CFPlus::UI::Container::;
799		793
800	sub new {	794	sub new {
801	my ($class, %arg) = @_;	795	my ($class, %arg) = @_;
802		796
803	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	797	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
804		798
805	$class->SUPER::new (children => [$child], %arg)	799	$class->SUPER::new (children => [$child], %arg)
806	}	800	}
807		801
808	sub add {	802	sub add {
809	my ($self, $child) = @_;	803	my ($self, $child) = @_;
810		804
811	$self->SUPER::remove ($_) for @{ $self->{children} };	805	$self->clear;
812	$self->SUPER::add ($child);	806	$self->SUPER::add ($child);
813	}	807	}
814		808
815	sub remove {	809	sub remove {
816	my ($self, $widget) = @_;	810	my ($self, $widget) = @_;
817		811
818	$self->SUPER::remove ($widget);	812	$self->SUPER::remove ($widget);
819		813
820	$self->{children} = [new CFClient::UI::Empty]	814	$self->{children} = [new CFPlus::UI::Empty]
821	unless @{$self->{children}};	815	unless @{$self->{children}};
822	}	816	}
823		817
824	sub child { $_[0]->{children}[0] }	818	sub child { $_[0]->{children}[0] }
825		819
…		…
834		828
835	1	829	1
836	}	830	}
837		831
838	#############################################################################	832	#############################################################################
839
840	# back-buffered drawing area	833	# back-buffered drawing area
841		834
842	package CFClient::UI::Window;	835	package CFPlus::UI::Window;
843		836
844	our @ISA = CFClient::UI::Bin::;	837	our @ISA = CFPlus::UI::Bin::;
845		838
846	use CFClient::OpenGL;	839	use CFPlus::OpenGL;
847		840
848	sub new {	841	sub new {
849	my ($class, %arg) = @_;	842	my ($class, %arg) = @_;
850		843
851	my $self = $class->SUPER::new (%arg);	844	my $self = $class->SUPER::new (%arg);
…		…
873	}	866	}
874		867
875	sub render_child {	868	sub render_child {
876	my ($self) = @_;	869	my ($self) = @_;
877		870
878	$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 {
879	glClearColor 0, 0, 0, 0;	872	glClearColor 0, 0, 0, 0;
880	glClear GL_COLOR_BUFFER_BIT;	873	glClear GL_COLOR_BUFFER_BIT;
881		874
882	{	875	{
883	package CFClient::UI::Base;	876	package CFPlus::UI::Base;
884		877
885	($draw_x, $draw_y, $draw_w, $draw_h) =	878	local ($draw_x, $draw_y, $draw_w, $draw_h) =
886	(0, 0, $self->{w}, $self->{h});	879	(0, 0, $self->{w}, $self->{h});
		880
		881	$self->_render;
887	}	882	}
888
889	$self->_render;
890	};	883	};
891	}	884	}
892		885
893	sub _draw {	886	sub _draw {
894	my ($self) = @_;	887	my ($self) = @_;
895
896	my ($w, $h) = @$self{qw(w h)};
897		888
898	my $tex = $self->{texture}	889	my $tex = $self->{texture}
899	or return;	890	or return;
900		891
901	glEnable GL_TEXTURE_2D;	892	glEnable GL_TEXTURE_2D;
902	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
903	glColor 0, 0, 0, 1;	894	glColor 0, 0, 0, 1;
904		895
905	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	896	$tex->draw_quad_alpha_premultiplied (0, 0);
906		897
907	glDisable GL_TEXTURE_2D;	898	glDisable GL_TEXTURE_2D;
908	}	899	}
909		900
910	#############################################################################	901	#############################################################################
911		902
912	package CFClient::UI::ViewPort;	903	package CFPlus::UI::ViewPort;
913		904
		905	use List::Util qw(min max);
		906
914	our @ISA = CFClient::UI::Window::;	907	our @ISA = CFPlus::UI::Window::;
915		908
916	sub new {	909	sub new {
917	my $class = shift;	910	my $class = shift;
918		911
919	$class->SUPER::new (	912	$class->SUPER::new (
…		…
926	sub size_request {	919	sub size_request {
927	my ($self) = @_;	920	my ($self) = @_;
928		921
929	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	922	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
930		923
931	$w = 10 if $self->{scroll_x};	924	$w = 1 if $self->{scroll_x};
932	$h = 10 if $self->{scroll_y};	925	$h = 1 if $self->{scroll_y};
933		926
934	($w, $h)	927	($w, $h)
935	}	928	}
936		929
937	sub invoke_size_allocate {	930	sub invoke_size_allocate {
…		…
949	}	942	}
950		943
951	sub set_offset {	944	sub set_offset {
952	my ($self, $x, $y) = @_;	945	my ($self, $x, $y) = @_;
953		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}) {
954	$self->{view_x} = int $x;	951	$self->{view_x} = $x;
955	$self->{view_y} = int $y;	952	$self->{view_y} = $y;
956		953
		954	$self->emit (changed => $x, $y);
957	$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	}
958	}	975	}
959		976
960	# 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
961	sub coord2local {	978	sub coord2local {
962	my ($self, $x, $y) = @_;	979	my ($self, $x, $y) = @_;
…		…
977	my ($self, $x, $y) = @_;	994	my ($self, $x, $y) = @_;
978		995
979	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
980	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
981	) {	998	) {
982	$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})
983	} else {	1000	} else {
984	$self->CFClient::UI::Base::find_widget ($x, $y)	1001	$self->CFPlus::UI::Base::find_widget ($x, $y)
985	}	1002	}
986	}	1003	}
987		1004
988	sub _render {	1005	sub _render {
989	my ($self) = @_;	1006	my ($self) = @_;
990		1007
991	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};
992	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};
993		1010
994	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1011	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
995		1012
996	$self->SUPER::_render;	1013	$self->SUPER::_render;
997	}	1014	}
998		1015
999	#############################################################################	1016	#############################################################################
1000		1017
1001	package CFClient::UI::ScrolledWindow;	1018	package CFPlus::UI::ScrolledWindow;
1002		1019
1003	our @ISA = CFClient::UI::HBox::;	1020	our @ISA = CFPlus::UI::Table::;
1004		1021
1005	sub new {	1022	sub new {
1006	my ($class, %arg) = @_;	1023	my ($class, %arg) = @_;
1007		1024
1008	my $child = delete $arg{child};	1025	my $child = delete $arg{child};
1009		1026
1010	my $self;	1027	my $self;
1011		1028
1012	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,
1013	vertical => 1,	1043	vertical => 1,
1014	range => [0, 0, 1, 0.01], # HACK fix	1044	range => [0, 0, 1, 0.01], # HACK fix
1015	on_changed => sub {	1045	on_changed => sub {
1016	$self->{vp}->set_offset (0, $_[1]);	1046	$self->{vpos} = $_[1];
		1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1017	},	1048	},
1018	;	1049	;
1019		1050
1020	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
1021	vp => (new CFClient::UI::ViewPort expand => 1),	1052	scroll_x => 0,
		1053	scroll_y => 1,
1022	can_events => 1,	1054	can_events => 1,
1023	slider => $slider,	1055	hslider => $hslider,
		1056	vslider => $vslider,
		1057	col_expand => [1, 0],
		1058	row_expand => [1, 0],
1024	%arg,	1059	%arg,
1025	);	1060	);
1026		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
1027	$self->SUPER::add ($self->{vp}, $self->{slider});	1083	$self->SUPER::add ($self->{vp});
		1084
1028	$self->add ($child) if $child;	1085	$self->add ($child) if $child;
1029		1086
1030	$self	1087	$self
1031	}	1088	}
1032
1033	#TODO# update range on size_allocate depending on child
1034		1089
1035	sub add {	1090	sub add {
1036	my ($self, $widget) = @_;	1091	my ($self, $widget) = @_;
1037		1092
1038	$self->{vp}->add ($self->{child} = $widget);	1093	$self->{vp}->add ($self->{child} = $widget);
1039	}	1094	}
1040		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
1041	sub invoke_mouse_wheel {	1148	sub invoke_mouse_wheel {
1042	my ($self, $ev) = @_;	1149	my ($self, $ev) = @_;
1043		1150
1044	return 0 unless $ev->{dy}; # only vertical movements
1045
1046	$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};
1047		1153
1048	1	1154	1
1049	}	1155	}
1050		1156
1051	sub update_slider {	1157	sub invoke_button_down {
1052	my ($self) = @_;	1158	my ($self, $ev, $x, $y) = @_;
1053		1159
1054	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1160	if ($ev->{button} == 2) {
1055	}	1161	$self->start_dragging ($ev);
		1162	return 1;
		1163	}
1056		1164
1057	sub update {	1165	0
1058	my ($self) = @_;	1166	}
1059		1167
1060	$self->SUPER::update;	1168	sub invoke_button_up {
		1169	my ($self, $ev, $x, $y) = @_;
1061		1170
1062	$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
1063	}	1187	}
1064		1188
1065	sub invoke_size_allocate {	1189	sub invoke_size_allocate {
1066	my ($self, $w, $h) = @_;	1190	my ($self, $w, $h) = @_;
1067		1191
1068	$self->update_slider;	1192	$self->update_slider;
1069
1070	$self->SUPER::invoke_size_allocate ($w, $h)	1193	$self->SUPER::invoke_size_allocate ($w, $h)
1071	}	1194	}
1072		1195
1073	#############################################################################	1196	#############################################################################
1074		1197
1075	package CFClient::UI::Frame;	1198	package CFPlus::UI::Frame;
1076		1199
1077	our @ISA = CFClient::UI::Bin::;	1200	our @ISA = CFPlus::UI::Bin::;
1078		1201
1079	use CFClient::OpenGL;	1202	use CFPlus::OpenGL;
1080		1203
1081	sub new {	1204	sub new {
1082	my $class = shift;	1205	my $class = shift;
1083		1206
1084	$class->SUPER::new (	1207	$class->SUPER::new (
…		…
1094	my ($w, $h) = @$self{qw(w h)};	1217	my ($w, $h) = @$self{qw(w h)};
1095		1218
1096	glEnable GL_BLEND;	1219	glEnable GL_BLEND;
1097	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1220	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1098	glColor_premultiply @{ $self->{bg} };	1221	glColor_premultiply @{ $self->{bg} };
1099
1100	glBegin GL_QUADS;
1101	glVertex 0 , 0;
1102	glVertex 0 , $h;
1103	glVertex $w, $h;	1222	glRect 0, 0, $w, $h;
1104	glVertex $w, 0;
1105	glEnd;
1106
1107	glDisable GL_BLEND;	1223	glDisable GL_BLEND;
1108	}	1224	}
1109		1225
1110	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1111	}	1227	}
1112		1228
1113	#############################################################################	1229	#############################################################################
1114		1230
1115	package CFClient::UI::FancyFrame;	1231	package CFPlus::UI::FancyFrame;
1116		1232
1117	our @ISA = CFClient::UI::Bin::;	1233	our @ISA = CFPlus::UI::Bin::;
1118		1234
1119	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;
1120		1336
1121	my $bg =	1337	my $bg =
1122	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1338	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1123	mipmap => 1, wrap => 1;	1339	mipmap => 1, wrap => 1;
1124		1340
1125	my @border =	1341	my @border =
1126	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1342	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1127	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	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);
1128		1348
1129	sub new {	1349	sub new {
1130	my ($class, %arg) = @_;	1350	my ($class, %arg) = @_;
1131		1351
1132	my $self = $class->SUPER::new (	1352	my $self = $class->SUPER::new (
…		…
1137	min_w => 64,	1357	min_w => 64,
1138	min_h => 32,	1358	min_h => 32,
1139	%arg,	1359	%arg,
1140	);	1360	);
1141		1361
1142	$self->{title_widget} = new CFClient::UI::Label	1362	$self->{title_widget} = new CFPlus::UI::Label
1143	align => 0,	1363	align => 0,
1144	valign => 1,	1364	valign => 1,
1145	text => $self->{title},	1365	text => $self->{title},
1146	fontsize => $self->{border},	1366	fontsize => $self->{border},
1147	if exists $self->{title};	1367	if exists $self->{title};
1148		1368
1149	if ($self->{has_close_button}) {	1369	if ($self->{has_close_button}) {
1150	$self->{close_button} =	1370	$self->{close_button} =
1151	new CFClient::UI::ImageButton	1371	new CFPlus::UI::ImageButton
1152	path => 'x1_close.png',	1372	path => 'x1_close.png',
1153	on_activate => sub { $self->emit ("delete") };	1373	on_activate => sub { $self->emit ("delete") };
1154		1374
1155	$self->CFClient::UI::Container::add ($self->{close_button});	1375	$self->CFPlus::UI::Container::add ($self->{close_button});
1156	}	1376	}
1157		1377
1158	$self	1378	$self
1159	}	1379	}
1160		1380
1161	sub add {	1381	sub add {
1162	my ($self, @widgets) = @_;	1382	my ($self, @widgets) = @_;
1163		1383
1164	$self->SUPER::add (@widgets);	1384	$self->SUPER::add (@widgets);
1165	$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};
1166	$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};
1167	}	1387	}
1168		1388
1169	sub border {	1389	sub border {
1170	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
1171	}	1400	}
1172		1401
1173	sub size_request {	1402	sub size_request {
1174	my ($self) = @_;	1403	my ($self) = @_;
1175		1404
…		…
1279	$self->{motion}->($ev, $x, $y) if $self->{motion};	1508	$self->{motion}->($ev, $x, $y) if $self->{motion};
1280		1509
1281	! ! $self->{motion}	1510	! ! $self->{motion}
1282	}	1511	}
1283		1512
		1513	sub invoke_visibility_change {
		1514	my ($self, $visible) = @_;
		1515
		1516	delete $self->{motion} unless $visible;
		1517
		1518	0
		1519	}
		1520
1284	sub _draw {	1521	sub _draw {
1285	my ($self) = @_;	1522	my ($self) = @_;
1286		1523
1287	my $child = $self->{children}[0];	1524	my $child = $self->{children}[0];
1288		1525
…		…
1293	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1294		1531
1295	my $border = $self->border;	1532	my $border = $self->border;
1296		1533
1297	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1298	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1299	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1300	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1301	$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);
1302		1553
1303	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1304	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1305		1556
1306	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1325	if $self->{close_button};	1576	if $self->{close_button};
1326	}	1577	}
1327		1578
1328	#############################################################################	1579	#############################################################################
1329		1580
1330	package CFClient::UI::Table;	1581	package CFPlus::UI::Table;
1331		1582
1332	our @ISA = CFClient::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1333		1584
1334	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1335		1586
1336	use CFClient::OpenGL;	1587	use CFPlus::OpenGL;
1337		1588
1338	sub new {	1589	sub new {
1339	my $class = shift;	1590	my $class = shift;
1340		1591
1341	$class->SUPER::new (	1592	$class->SUPER::new (
1342	col_expand => [],	1593	col_expand => [],
		1594	row_expand => [],
1343	@_,	1595	@_,
1344	)	1596	)
1345	}	1597	}
1346		1598
1347	sub children {
1348	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1349	}
1350
1351	sub add {	1599	sub add {
1352	my ($self, $x, $y, $child) = @_;	1600	my ($self, @widgets) = @_;
1353		1601
1354	$child->set_parent ($self);	1602	for my $child (@widgets) {
1355	$self->{children}[$y][$x] = $child;	1603	$child->{c_rowspan} ||= 1;
		1604	$child->{c_colspan} ||= 1;
		1605	}
1356		1606
1357	$self->realloc;	1607	$self->SUPER::add (@widgets);
1358	}	1608	}
1359		1609
1360	sub remove {	1610	sub add_at {
		1611	my $self = shift;
		1612
		1613	my @widgets;
		1614
		1615	while (@_) {
		1616	my ($col, $row, $child) = splice @_, 0, 3, ();
		1617
		1618	$child->{c_row} = $row;
		1619	$child->{c_col} = $col;
		1620
		1621	push @widgets, $child;
		1622	}
		1623
		1624	$self->add (@widgets);
		1625	}
		1626
		1627	sub get_wh {
1361	my ($self, $child) = @_;	1628	my ($self) = @_;
1362		1629
1363	# TODO: not yet implemented	1630	my (@w, @h);
1364	}
1365
1366	# TODO: move to container class maybe? send children a signal on removal?
1367	sub clear {
1368	my ($self) = @_;
1369		1631
1370	my @children = $self->children;	1632	my @children = $self->children;
1371	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	}
1372		1643	}
1373	for (@children) {
1374	delete $_->{parent};
1375	$_->hide;
1376	}
1377		1644
1378	$self->realloc;	1645	# second pass, rows
1379	}	1646	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1380
1381	sub get_wh {
1382	my ($self) = @_;
1383
1384	my (@w, @h);
1385
1386	for my $y (0 .. $#{$self->{children}}) {
1387	my $row = $self->{children}[$y]
1388	or next;
1389
1390	for my $x (0 .. $#$row) {
1391	my $widget = $row->[$x]
1392	or next;
1393	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1394		1648
1395	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1396	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1397	}	1653	}
1398	}	1654	}
1399		1655
1400	(\@w, \@h)	1656	(\@w, \@h)
1401	}	1657	}
…		…
1417	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1418		1674
1419	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1420	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1421		1677
1422	# TODO: nicer code && do row_expand	1678	# now linearly scale the rows/columns to the allocated size
1423	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1424	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1425	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1426		1682
1427	# linearly scale sizes
1428	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1429	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1430		1684
1431	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
1432	CFClient::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1433		1694
1434	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1435		1697
1436	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1437	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)};
1438	or next;
1439		1700
1440	my $x = 0;	1701	$widget->configure (
1441	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1442		1704	);
1443	for my $c (0 .. $#$row) {	1705	}
1444	my $col_w = $ws->[$c];
1445		1706
1446	if (my $widget = $row->[$c]) {	1707	1
1447	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1448	}
1449		1709
1450	$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};
1451	}	1737	}
		1738	}
1452		1739
1453	$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});
1454	}	1771	}
1455		1772
1456	1	1773	1
1457	}	1774	}
1458		1775
1459	sub find_widget {
1460	my ($self, $x, $y) = @_;
1461
1462	$x -= $self->{x};
1463	$y -= $self->{y};
1464
1465	my $res;
1466
1467	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1468	$res = $_->find_widget ($x, $y)
1469	and return $res;
1470	}
1471
1472	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1473	}
1474
1475	sub _draw {
1476	my ($self) = @_;
1477
1478	for (grep $_, @{$self->{children}}) {
1479	$_->draw for grep $_, @$_;
1480	}
1481	}
1482
1483	#############################################################################	1776	#############################################################################
1484		1777
1485	package CFClient::UI::Box;	1778	package CFPlus::UI::Box;
1486		1779
1487	our @ISA = CFClient::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1488		1781
1489	sub size_request {	1782	sub size_request {
1490	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1491		1786
1492	$self->{vertical}	1787	$self->{vertical}
1493	? (	1788	? (
1494	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1495	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1496	)	1791	)
1497	: (	1792	: (
1498	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1499	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1500	)	1795	)
1501	}	1796	}
1502		1797
1503	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1504	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
…		…
1525	$req[$_] += $space * $children[$_]{expand}	1820	$req[$_] += $space * $children[$_]{expand}
1526	for 0 .. $#children;	1821	for 0 .. $#children;
1527	}	1822	}
1528	}	1823	}
1529		1824
1530	CFClient::UI::harmonize \@req;	1825	CFPlus::UI::harmonize \@req;
1531		1826
1532	my $pos = 0;	1827	my $pos = 0;
1533	for (0 .. $#children) {	1828	for (0 .. $#children) {
1534	my $alloc = $req[$_];	1829	my $alloc = $req[$_];
1535	$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));
…		…
1540	1	1835	1
1541	}	1836	}
1542		1837
1543	#############################################################################	1838	#############################################################################
1544		1839
1545	package CFClient::UI::HBox;	1840	package CFPlus::UI::HBox;
1546		1841
1547	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1548		1843
1549	sub new {	1844	sub new {
1550	my $class = shift;	1845	my $class = shift;
1551		1846
1552	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1555	)	1850	)
1556	}	1851	}
1557		1852
1558	#############################################################################	1853	#############################################################################
1559		1854
1560	package CFClient::UI::VBox;	1855	package CFPlus::UI::VBox;
1561		1856
1562	our @ISA = CFClient::UI::Box::;	1857	our @ISA = CFPlus::UI::Box::;
1563		1858
1564	sub new {	1859	sub new {
1565	my $class = shift;	1860	my $class = shift;
1566		1861
1567	$class->SUPER::new (	1862	$class->SUPER::new (
…		…
1570	)	1865	)
1571	}	1866	}
1572		1867
1573	#############################################################################	1868	#############################################################################
1574		1869
1575	package CFClient::UI::Label;	1870	package CFPlus::UI::Label;
1576		1871
1577	our @ISA = CFClient::UI::DrawBG::;	1872	our @ISA = CFPlus::UI::DrawBG::;
1578		1873
1579	use CFClient::OpenGL;	1874	use CFPlus::OpenGL;
1580		1875
1581	sub new {	1876	sub new {
1582	my ($class, %arg) = @_;	1877	my ($class, %arg) = @_;
1583		1878
1584	my $self = $class->SUPER::new (	1879	my $self = $class->SUPER::new (
…		…
1587	#active_bg => none	1882	#active_bg => none
1588	#font => default_font	1883	#font => default_font
1589	#text => initial text	1884	#text => initial text
1590	#markup => initial narkup	1885	#markup => initial narkup
1591	#max_w => maximum pixel width	1886	#max_w => maximum pixel width
		1887	#style => 0, # render flags
1592	ellipsise => 3, # end	1888	ellipsise => 3, # end
1593	layout => (new CFClient::Layout),	1889	layout => (new CFPlus::Layout),
1594	fontsize => 1,	1890	fontsize => 1,
1595	align => -1,	1891	align => -1,
1596	valign => -1,	1892	valign => -1,
1597	padding_x => 2,	1893	padding_x => 2,
1598	padding_y => 2,	1894	padding_y => 2,
1599	can_events => 0,	1895	can_events => 0,
1600	%arg	1896	%arg
1601	);	1897	);
1602		1898
1603	if (exists $self->{template}) {	1899	if (exists $self->{template}) {
1604	my $layout = new CFClient::Layout;	1900	my $layout = new CFPlus::Layout;
1605	$layout->set_text (delete $self->{template});	1901	$layout->set_text (delete $self->{template});
1606	$self->{template} = $layout;	1902	$self->{template} = $layout;
1607	}	1903	}
1608		1904
1609	if (exists $self->{markup}) {	1905	if (exists $self->{markup}) {
…		…
1613	}	1909	}
1614		1910
1615	$self	1911	$self
1616	}	1912	}
1617		1913
1618	sub escape($) {
1619	local $_ = $_[0];
1620
1621	s/&/&amp;/g;
1622	s/>/&gt;/g;
1623	s/</&lt;/g;
1624
1625	$_
1626	}
1627
1628	sub update {	1914	sub update {
1629	my ($self) = @_;	1915	my ($self) = @_;
1630		1916
1631	delete $self->{texture};	1917	delete $self->{texture};
1632	$self->SUPER::update;	1918	$self->SUPER::update;
…		…
1635	sub realloc {	1921	sub realloc {
1636	my ($self) = @_;	1922	my ($self) = @_;
1637		1923
1638	delete $self->{ox};	1924	delete $self->{ox};
1639	$self->SUPER::realloc;	1925	$self->SUPER::realloc;
		1926	}
		1927
		1928	sub clear {
		1929	my ($self) = @_;
		1930
		1931	$self->set_text ("");
1640	}	1932	}
1641		1933
1642	sub set_text {	1934	sub set_text {
1643	my ($self, $text) = @_;	1935	my ($self, $text) = @_;
1644		1936
…		…
1669		1961
1670	sub size_request {	1962	sub size_request {
1671	my ($self) = @_;	1963	my ($self) = @_;
1672		1964
1673	$self->{size_req} ||= do {	1965	$self->{size_req} ||= do {
		1966	my ($max_w, $max_h) = $self->get_max_wh;
		1967
1674	$self->{layout}->set_font ($self->{font}) if $self->{font};	1968	$self->{layout}->set_font ($self->{font}) if $self->{font};
1675	$self->{layout}->set_width ($self->{max_w} || -1);	1969	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1676	$self->{layout}->set_ellipsise ($self->{ellipsise});	1970	$self->{layout}->set_ellipsise ($self->{ellipsise});
1677	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1971	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1678	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1972	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1679		1973
1680	my ($w, $h) = $self->{layout}->size;	1974	my ($w, $h) = $self->{layout}->size;
…		…
1752	: ($self->{w} - $size->[0]) * 0.5);	2046	: ($self->{w} - $size->[0]) * 0.5);
1753		2047
1754	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2048	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1755	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2049	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1756	: ($self->{h} - $size->[1]) * 0.5);	2050	: ($self->{h} - $size->[1]) * 0.5);
		2051
		2052	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1757	};	2053	};
1758		2054
1759	my $w = List::Util::min $self->{w} + 4, $size->[0];	2055	# unless ($self->{list}) {
1760	my $h = List::Util::min $self->{h} + 2, $size->[1];	2056	# $self->{list} = CFPlus::OpenGL::glGenList;
1761		2057	# CFPlus::OpenGL::glNewList $self->{list};
1762	$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;
1763	}	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	#}
1764		2074
1765	#############################################################################	2075	#############################################################################
1766		2076
1767	package CFClient::UI::EntryBase;	2077	package CFPlus::UI::EntryBase;
1768		2078
1769	our @ISA = CFClient::UI::Label::;	2079	our @ISA = CFPlus::UI::Label::;
1770		2080
1771	use CFClient::OpenGL;	2081	use CFPlus::OpenGL;
1772		2082
1773	sub new {	2083	sub new {
1774	my $class = shift;	2084	my $class = shift;
1775		2085
1776	$class->SUPER::new (	2086	$class->SUPER::new (
1777	fg => [1, 1, 1],	2087	fg => [1, 1, 1],
1778	bg => [0, 0, 0, 0.2],	2088	bg => [0, 0, 0, 0.2],
		2089	outline => [0.6, 0.3, 0.1],
1779	active_bg => [1, 1, 1, 0.5],	2090	active_bg => [0, 0, 1, .2],
1780	active_fg => [0, 0, 0],	2091	active_fg => [1, 1, 1],
		2092	active_outline => [1, 1, 0],
1781	can_hover => 1,	2093	can_hover => 1,
1782	can_focus => 1,	2094	can_focus => 1,
1783	valign => 0,	2095	valign => 0,
1784	can_events => 1,	2096	can_events => 1,
		2097	ellipsise => 0,
1785	#text => ...	2098	#text => ...
1786	#hidden => "*",	2099	#hidden => "*",
1787	@_	2100	@_
1788	)	2101	)
1789	}	2102	}
…		…
1834	my $sym = $ev->{sym};	2147	my $sym = $ev->{sym};
1835	my $uni = $ev->{unicode};	2148	my $uni = $ev->{unicode};
1836		2149
1837	my $text = $self->get_text;	2150	my $text = $self->get_text;
1838		2151
		2152	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2153
1839	if ($uni == 8) {	2154	if ($uni == 8) {
1840	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2155	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1841	} elsif ($uni == 127) {	2156	} elsif ($uni == 127) {
1842	substr $text, $self->{cursor}, 1, "";	2157	substr $text, $self->{cursor}, 1, "";
1843	} elsif ($sym == CFClient::SDLK_LEFT) {	2158	} elsif ($sym == CFPlus::SDLK_LEFT) {
1844	--$self->{cursor} if $self->{cursor};	2159	--$self->{cursor} if $self->{cursor};
1845	} elsif ($sym == CFClient::SDLK_RIGHT) {	2160	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1846	++$self->{cursor} if $self->{cursor} < length $self->{text};	2161	++$self->{cursor} if $self->{cursor} < length $self->{text};
1847	} 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 = "";
1848	$self->{cursor} = 0;	2176	$self->{cursor} = 0;
1849	} elsif ($sym == CFClient::SDLK_END) {
1850	$self->{cursor} = length $text;
1851	} elsif ($uni == 27) {	2177	} elsif ($uni == 27) {
1852	$self->emit ('escape');	2178	$self->emit ('escape');
1853	} elsif ($uni) {	2179	} elsif ($uni == 0x0d) {
		2180	substr $text, $self->{cursor}++, 0, "\012";
		2181	} elsif ($uni >= 0x20) {
1854	substr $text, $self->{cursor}++, 0, chr $uni;	2182	substr $text, $self->{cursor}++, 0, chr $uni;
1855	} else {	2183	} else {
1856	return 0;	2184	return 0;
1857	}	2185	}
1858		2186
1859	$self->_set_text ($text);	2187	$self->_set_text ($text);
1860		2188
1861	$self->realloc;	2189	$self->realloc;
		2190	$self->update;
1862		2191
1863	1	2192	1
1864	}	2193	}
1865		2194
1866	sub invoke_focus_in {	2195	sub invoke_focus_in {
…		…
1908	glColor_premultiply @{$self->{bg}};	2237	glColor_premultiply @{$self->{bg}};
1909	}	2238	}
1910		2239
1911	glEnable GL_BLEND;	2240	glEnable GL_BLEND;
1912	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2241	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1913	glBegin GL_QUADS;
1914	glVertex 0 , 0;
1915	glVertex 0 , $self->{h};
1916	glVertex $self->{w}, $self->{h};	2242	glRect 0, 0, $self->{w}, $self->{h};
1917	glVertex $self->{w}, 0;
1918	glEnd;
1919	glDisable GL_BLEND;	2243	glDisable GL_BLEND;
1920		2244
1921	$self->SUPER::_draw;	2245	$self->SUPER::_draw;
1922		2246
1923	#TODO: force update every cursor change :(	2247	#TODO: force update every cursor change :(
…		…
1925		2249
1926	unless (exists $self->{cur_h}) {	2250	unless (exists $self->{cur_h}) {
1927	my $text = substr $self->{text}, 0, $self->{cursor};	2251	my $text = substr $self->{text}, 0, $self->{cursor};
1928	utf8::encode $text;	2252	utf8::encode $text;
1929		2253
1930	@$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);
1931	}	2255	}
1932		2256
1933	glColor @{$self->{fg}};	2257	glColor_premultiply @{$self->{active_fg}};
1934	glBegin GL_LINES;	2258	glBegin GL_LINES;
1935	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2259	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1936	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};
1937	glEnd;	2261	glEnd;
1938	}
1939	}
1940		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
1941	package CFClient::UI::Entry;	2281	package CFPlus::UI::Entry;
1942		2282
1943	our @ISA = CFClient::UI::EntryBase::;	2283	our @ISA = CFPlus::UI::EntryBase::;
1944		2284
1945	use CFClient::OpenGL;	2285	use CFPlus::OpenGL;
1946		2286
1947	sub invoke_key_down {	2287	sub invoke_key_down {
1948	my ($self, $ev) = @_;	2288	my ($self, $ev) = @_;
1949		2289
1950	my $sym = $ev->{sym};	2290	my $sym = $ev->{sym};
1951		2291
1952	if ($sym == 13) {	2292	if ($ev->{uni} == 0x0d || $sym == 13) {
1953	unshift @{$self->{history}},	2293	unshift @{$self->{history}},
1954	my $txt = $self->get_text;	2294	my $txt = $self->get_text;
1955		2295
1956	$self->{history_pointer} = -1;	2296	$self->{history_pointer} = -1;
1957	$self->{history_saveback} = '';	2297	$self->{history_saveback} = '';
1958	$self->emit (activate => $txt);	2298	$self->emit (activate => $txt);
1959	$self->update;	2299	$self->update;
1960		2300
1961	} elsif ($sym == CFClient::SDLK_UP) {	2301	} elsif ($sym == CFPlus::SDLK_UP) {
1962	if ($self->{history_pointer} < 0) {	2302	if ($self->{history_pointer} < 0) {
1963	$self->{history_saveback} = $self->get_text;	2303	$self->{history_saveback} = $self->get_text;
1964	}	2304	}
1965	if (@{$self->{history} || []} > 0) {	2305	if (@{$self->{history} || []} > 0) {
1966	$self->{history_pointer}++;	2306	$self->{history_pointer}++;
…		…
1968	$self->{history_pointer} = @{$self->{history} || []} - 1;	2308	$self->{history_pointer} = @{$self->{history} || []} - 1;
1969	}	2309	}
1970	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2310	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1971	}	2311	}
1972		2312
1973	} elsif ($sym == CFClient::SDLK_DOWN) {	2313	} elsif ($sym == CFPlus::SDLK_DOWN) {
1974	$self->{history_pointer}--;	2314	$self->{history_pointer}--;
1975	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2315	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1976		2316
1977	if ($self->{history_pointer} >= 0) {	2317	if ($self->{history_pointer} >= 0) {
1978	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2318	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1987	1	2327	1
1988	}	2328	}
1989		2329
1990	#############################################################################	2330	#############################################################################
1991		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
1992	package CFClient::UI::Button;	2371	package CFPlus::UI::ButtonBin;
1993		2372
1994	our @ISA = CFClient::UI::Label::;	2373	our @ISA = CFPlus::UI::Bin::;
1995		2374
1996	use CFClient::OpenGL;	2375	use CFPlus::OpenGL;
1997		2376
1998	my @tex =	2377	my @tex =
1999	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2378	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2000	qw(b1_button_active.png);	2379	qw(b1_button_inactive.png b1_button_active.png);
2001		2380
2002	sub new {	2381	sub new {
2003	my $class = shift;	2382	my $class = shift;
2004		2383
2005	$class->SUPER::new (	2384	$class->SUPER::new (
2006	padding_x => 4,
2007	padding_y => 4,
2008	fg => [1, 1, 1],
2009	active_fg => [0, 0, 1],
2010	can_hover => 1,	2385	can_hover => 1,
2011	align => 0,	2386	align => 0,
2012	valign => 0,	2387	valign => 0,
2013	can_events => 1,	2388	can_events => 1,
2014	@_	2389	@_
…		…
2026	}	2401	}
2027		2402
2028	sub _draw {	2403	sub _draw {
2029	my ($self) = @_;	2404	my ($self) = @_;
2030		2405
2031	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2032
2033	glEnable GL_TEXTURE_2D;	2406	glEnable GL_TEXTURE_2D;
2034	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2407	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2035	glColor 0, 0, 0, 1;	2408	glColor 0, 0, 0, 1;
2036		2409
		2410	my $tex = $tex[$GRAB == $self];
2037	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2411	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2038		2412
2039	glDisable GL_TEXTURE_2D;	2413	glDisable GL_TEXTURE_2D;
2040		2414
2041	$self->SUPER::_draw;	2415	$self->SUPER::_draw;
2042	}	2416	}
2043		2417
2044	#############################################################################	2418	#############################################################################
2045		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
2046	package CFClient::UI::ImageButton;	2625	package CFPlus::UI::ImageButton;
2047		2626
2048	our @ISA = CFClient::UI::Image::;	2627	our @ISA = CFPlus::UI::Image::;
2049		2628
2050	use CFClient::OpenGL;	2629	use CFPlus::OpenGL;
2051		2630
2052	my %textures;	2631	my %textures;
2053		2632
2054	sub new {	2633	sub new {
2055	my $class = shift;	2634	my $class = shift;
…		…
2065	can_events => 1,	2644	can_events => 1,
2066	@_	2645	@_
2067	);	2646	);
2068	}	2647	}
2069		2648
		2649	sub invoke_button_down {
		2650	my ($self, $ev, $x, $y) = @_;
		2651
		2652	1
		2653	}
		2654
2070	sub invoke_button_up {	2655	sub invoke_button_up {
2071	my ($self, $ev, $x, $y) = @_;	2656	my ($self, $ev, $x, $y) = @_;
2072		2657
2073	$self->emit ("activate")	2658	$self->emit ("activate")
2074	if $x >= 0 && $x < $self->{w}	2659	if $x >= 0 && $x < $self->{w}
…		…
2077	1	2662	1
2078	}	2663	}
2079		2664
2080	#############################################################################	2665	#############################################################################
2081		2666
2082	package CFClient::UI::CheckBox;
2083
2084	our @ISA = CFClient::UI::DrawBG::;
2085
2086	my @tex =
2087	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2088	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2089
2090	use CFClient::OpenGL;
2091
2092	sub new {
2093	my $class = shift;
2094
2095	$class->SUPER::new (
2096	padding_x => 2,
2097	padding_y => 2,
2098	fg => [1, 1, 1],
2099	active_fg => [1, 1, 0],
2100	bg => [0, 0, 0, 0.2],
2101	active_bg => [1, 1, 1, 0.5],
2102	state => 0,
2103	can_hover => 1,
2104	@_
2105	)
2106	}
2107
2108	sub size_request {
2109	my ($self) = @_;
2110
2111	(6) x 2
2112	}
2113
2114	sub toggle {
2115	my ($self) = @_;
2116
2117	$self->{state} = !$self->{state};
2118	$self->emit (changed => $self->{state});
2119	$self->update;
2120	}
2121
2122	sub invoke_button_down {
2123	my ($self, $ev, $x, $y) = @_;
2124
2125	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2126	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2127	$self->toggle;
2128	} else {
2129	return 0
2130	}
2131
2132	1
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	$self->SUPER::_draw;
2139
2140	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2141
2142	my ($w, $h) = @$self{qw(w h)};
2143
2144	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2145
2146	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2147
2148	my $tex = $self->{state} ? $tex[1] : $tex[0];
2149
2150	glEnable GL_TEXTURE_2D;
2151	$tex->draw_quad_alpha (0, 0, $s, $s);
2152	glDisable GL_TEXTURE_2D;
2153	}
2154
2155	#############################################################################
2156
2157	package CFClient::UI::Image;	2667	package CFPlus::UI::VGauge;
2158		2668
2159	our @ISA = CFClient::UI::Base::;	2669	our @ISA = CFPlus::UI::Base::;
2160
2161	use CFClient::OpenGL;
2162
2163	our %texture_cache;
2164
2165	sub new {
2166	my $class = shift;
2167
2168	my $self = $class->SUPER::new (
2169	can_events => 0,
2170	@_,
2171	);
2172
2173	$self->{path} || $self->{tex}
2174	or Carp::croak "'path' or 'tex' attributes required";
2175
2176	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2177	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2178
2179	Scalar::Util::weaken $texture_cache{$self->{path}};
2180
2181	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2182
2183	$self
2184	}
2185
2186	sub size_request {
2187	my ($self) = @_;
2188
2189	($self->{tex}{w}, $self->{tex}{h})
2190	}
2191
2192	sub _draw {
2193	my ($self) = @_;
2194
2195	my $tex = $self->{tex};
2196
2197	my ($w, $h) = ($self->{w}, $self->{h});
2198
2199	if ($self->{rot90}) {
2200	glRotate 90, 0, 0, 1;
2201	glTranslate 0, -$self->{w}, 0;
2202
2203	($w, $h) = ($h, $w);
2204	}
2205
2206	glEnable GL_TEXTURE_2D;
2207	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2208
2209	$tex->draw_quad_alpha (0, 0, $w, $h);
2210
2211	glDisable GL_TEXTURE_2D;
2212	}
2213
2214	#############################################################################
2215
2216	package CFClient::UI::VGauge;
2217
2218	our @ISA = CFClient::UI::Base::;
2219		2670
2220	use List::Util qw(min max);	2671	use List::Util qw(min max);
2221		2672
2222	use CFClient::OpenGL;	2673	use CFPlus::OpenGL;
2223		2674
2224	my %tex = (	2675	my %tex = (
2225	food => [	2676	food => [
2226	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2677	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2227	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2678	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2228	],	2679	],
2229	grace => [	2680	grace => [
2230	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2681	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2682	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2232	],	2683	],
2233	hp => [	2684	hp => [
2234	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2685	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2235	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2686	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2236	],	2687	],
2237	mana => [	2688	mana => [
2238	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2689	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2239	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2690	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2240	],	2691	],
2241	);	2692	);
2242		2693
2243	# eg. VGauge->new (gauge => 'food'), default gauge: food	2694	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2346	glDisable GL_TEXTURE_2D;	2797	glDisable GL_TEXTURE_2D;
2347	}	2798	}
2348		2799
2349	#############################################################################	2800	#############################################################################
2350		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
2351	package CFClient::UI::Gauge;	2940	package CFPlus::UI::Gauge;
2352		2941
2353	our @ISA = CFClient::UI::VBox::;	2942	our @ISA = CFPlus::UI::VBox::;
2354		2943
2355	sub new {	2944	sub new {
2356	my ($class, %arg) = @_;	2945	my ($class, %arg) = @_;
2357		2946
2358	my $self = $class->SUPER::new (	2947	my $self = $class->SUPER::new (
…		…
2360	can_hover => 1,	2949	can_hover => 1,
2361	can_events => 1,	2950	can_events => 1,
2362	%arg,	2951	%arg,
2363	);	2952	);
2364		2953
2365	$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");
2366	$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);
2367	$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");
2368		2957
2369	$self	2958	$self
2370	}	2959	}
2371		2960
2372	sub set_fontsize {	2961	sub set_fontsize {
…		…
2393	$self->{value}->set_text ($val);	2982	$self->{value}->set_text ($val);
2394	}	2983	}
2395		2984
2396	#############################################################################	2985	#############################################################################
2397		2986
2398	package CFClient::UI::Slider;	2987	package CFPlus::UI::Slider;
2399		2988
2400	use strict;	2989	use strict;
2401		2990
2402	use CFClient::OpenGL;	2991	use CFPlus::OpenGL;
2403		2992
2404	our @ISA = CFClient::UI::DrawBG::;	2993	our @ISA = CFPlus::UI::DrawBG::;
2405		2994
2406	my @tex =	2995	my @tex =
2407	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2996	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2408	qw(s1_slider.png s1_slider_bg.png);	2997	qw(s1_slider.png s1_slider_bg.png);
2409		2998
2410	sub new {	2999	sub new {
2411	my $class = shift;	3000	my $class = shift;
2412		3001
…		…
2480		3069
2481	$self->SUPER::invoke_button_down ($ev, $x, $y);	3070	$self->SUPER::invoke_button_down ($ev, $x, $y);
2482		3071
2483	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3072	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2484		3073
2485	$self->invoke_mouse_motion ($ev, $x, $y)	3074	$self->invoke_mouse_motion ($ev, $x, $y);
		3075
		3076	1
2486	}	3077	}
2487		3078
2488	sub invoke_mouse_motion {	3079	sub invoke_mouse_motion {
2489	my ($self, $ev, $x, $y) = @_;	3080	my ($self, $ev, $x, $y) = @_;
2490		3081
…		…
2506	sub invoke_mouse_wheel {	3097	sub invoke_mouse_wheel {
2507	my ($self, $ev) = @_;	3098	my ($self, $ev) = @_;
2508		3099
2509	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3100	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510		3101
		3102	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3103
2511	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	3104	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2512		3105
2513	! ! $delta	3106	1
2514	}	3107	}
2515		3108
2516	sub update {	3109	sub update {
2517	my ($self) = @_;	3110	my ($self) = @_;
2518		3111
…		…
2567	glDisable GL_TEXTURE_2D;	3160	glDisable GL_TEXTURE_2D;
2568	}	3161	}
2569		3162
2570	#############################################################################	3163	#############################################################################
2571		3164
2572	package CFClient::UI::ValSlider;	3165	package CFPlus::UI::ValSlider;
2573		3166
2574	our @ISA = CFClient::UI::HBox::;	3167	our @ISA = CFPlus::UI::HBox::;
2575		3168
2576	sub new {	3169	sub new {
2577	my ($class, %arg) = @_;	3170	my ($class, %arg) = @_;
2578		3171
2579	my $range = delete $arg{range};	3172	my $range = delete $arg{range};
2580		3173
2581	my $self = $class->SUPER::new (	3174	my $self = $class->SUPER::new (
2582	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3175	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2583	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3176	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2584	to_value => sub { shift },	3177	to_value => sub { shift },
2585	from_value => sub { shift },	3178	from_value => sub { shift },
2586	%arg,	3179	%arg,
2587	);	3180	);
2588		3181
…		…
2608	sub set_range { shift->{slider}->set_range (@_) }	3201	sub set_range { shift->{slider}->set_range (@_) }
2609	sub set_value { shift->{slider}->set_value (@_) }	3202	sub set_value { shift->{slider}->set_value (@_) }
2610		3203
2611	#############################################################################	3204	#############################################################################
2612		3205
2613	package CFClient::UI::TextScroller;	3206	package CFPlus::UI::TextScroller;
2614		3207
2615	our @ISA = CFClient::UI::HBox::;	3208	our @ISA = CFPlus::UI::HBox::;
2616		3209
2617	use CFClient::OpenGL;	3210	use CFPlus::OpenGL;
2618		3211
2619	sub new {	3212	sub new {
2620	my $class = shift;	3213	my $class = shift;
2621		3214
2622	my $self = $class->SUPER::new (	3215	my $self = $class->SUPER::new (
…		…
2624	can_events => 1,	3217	can_events => 1,
2625	indent => 0,	3218	indent => 0,
2626	#font => default_font	3219	#font => default_font
2627	@_,	3220	@_,
2628		3221
2629	layout => (new CFClient::Layout),	3222	layout => (new CFPlus::Layout),
2630	par => [],	3223	par => [],
		3224	max_par => 0,
2631	height => 0,	3225	height => 0,
2632	children => [	3226	children => [
2633	(new CFClient::UI::Empty expand => 1),	3227	(new CFPlus::UI::Empty expand => 1),
2634	(new CFClient::UI::Slider vertical => 1),	3228	(new CFPlus::UI::Slider vertical => 1),
2635	],	3229	],
2636	);	3230	);
2637		3231
2638	$self->{children}[1]->connect (changed => sub { $self->update });	3232	$self->{children}[1]->connect (changed => sub { $self->update });
2639		3233
…		…
2648	}	3242	}
2649		3243
2650	sub size_request {	3244	sub size_request {
2651	my ($self) = @_;	3245	my ($self) = @_;
2652		3246
2653	my ($empty, $slider) = @{ $self->{children} };	3247	my ($empty, $slider) = $self->visible_children;
2654		3248
2655	local $self->{children} = [$empty, $slider];	3249	local $self->{children} = [$empty, $slider];
2656	$self->SUPER::size_request	3250	$self->SUPER::size_request
2657	}	3251	}
2658		3252
…		…
2716		3310
2717	# todo: base offset on lines or so, not on pixels	3311	# todo: base offset on lines or so, not on pixels
2718	$self->{children}[1]->set_value ($offset);	3312	$self->{children}[1]->set_value ($offset);
2719	}	3313	}
2720		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
2721	sub clear {	3330	sub clear {
2722	my ($self) = @_;	3331	my ($self) = @_;
2723		3332
2724	my (undef, undef, @other) = @{ $self->{children} };	3333	my (undef, undef, @other) = @{ $self->{children} };
2725	$self->remove ($_) for @other;	3334	$self->remove ($_) for @other;
…		…
2728	$self->{height} = 0;	3337	$self->{height} = 0;
2729	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3338	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2730	}	3339	}
2731		3340
2732	sub add_paragraph {	3341	sub add_paragraph {
2733	my ($self, $color, $para, $indent) = @_;	3342	my $self = shift;
2734		3343
2735	my ($text, @w) = ref $para ? @$para : $para;	3344	for my $para (@_) {
2736
2737	$para = {	3345	$para = {
		3346	fg => [1, 1, 1, 1],
		3347	indent => 0,
		3348	markup => "",
		3349	widget => [],
		3350	ref $para ? %$para : (markup => $para),
2738	w => 1e10,	3351	w => 1e10,
2739	wrapped => 1,	3352	wrapped => 1,
2740	fg => $color,
2741	indent => $indent,
2742	markup => $text,
2743	widget => \@w,
2744	};	3353	};
2745		3354
2746	$self->add (@w) if @w;	3355	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2747	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	}
2748		3362
2749	$self->{need_reflow}++;	3363	$self->{need_reflow}++;
2750	$self->update;	3364	$self->update;
2751	}	3365	}
2752		3366
2753	sub scroll_to_bottom {	3367	sub scroll_to_bottom {
2754	my ($self) = @_;	3368	my ($self) = @_;
2755		3369
2756	$self->{scroll_to_bottom} = 1;	3370	$self->{scroll_to} = $#{$self->{par}};
2757	$self->update;	3371	$self->update;
2758	}	3372	}
2759		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
2760	sub update {	3407	sub update {
2761	my ($self) = @_;	3408	my ($self) = @_;
2762		3409
2763	$self->SUPER::update;	3410	$self->SUPER::update;
2764		3411
2765	return unless $self->{h} > 0;	3412	return unless $self->{h} > 0;
2766		3413
2767	delete $self->{texture};	3414	delete $self->{texture};
2768		3415
2769	$ROOT->on_post_alloc ($self => sub {	3416	$ROOT->on_post_alloc ($self => sub {
		3417	$self->force_uptodate;
		3418
2770	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3419	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2771		3420
2772	if (delete $self->{need_reflow}) {
2773	my $height = 0;
2774
2775	for my $para (@{$self->{par}}) {
2776	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2777	my $layout = $self->get_layout ($para);
2778	my ($w, $h) = $layout->size;
2779
2780	$para->{w} = $w + $para->{indent};
2781	$para->{h} = $h;
2782	$para->{wrapped} = $layout->has_wrapped;
2783	}
2784
2785	$height += $para->{h};
2786	}
2787
2788	$self->{height} = $height;
2789
2790	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2791
2792	delete $self->{texture};
2793	}
2794
2795	if (delete $self->{scroll_to_bottom}) {
2796	$self->{children}[1]->set_value (1e10);
2797	}
2798
2799	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3421	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2800	glClearColor 0, 0, 0, 0;	3422	glClearColor 0, 0, 0, 0;
2801	glClear GL_COLOR_BUFFER_BIT;	3423	glClear GL_COLOR_BUFFER_BIT;
2802		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;
2803	my $top = int $self->{children}[1]{range}[0];	3433	my $top = int $self->{children}[1]{range}[0];
2804		3434
2805	my $y0 = $top;	3435	my $y0 = $top;
2806	my $y1 = $top + $H;	3436	my $y1 = $top + $H;
2807		3437
2808	my $y = 0;
2809
2810	for my $para (@{$self->{par}}) {	3438	for my $para (@{$self->{par}}) {
2811	my $h = $para->{h};	3439	my $h = $para->{h};
		3440	my $y = $para->{y};
2812		3441
2813	if ($y0 < $y + $h && $y < $y1) {	3442	if ($y0 < $y + $h && $y < $y1) {
2814
2815	my $layout = $self->get_layout ($para);	3443	my $layout = $self->get_layout ($para);
2816		3444
2817	$layout->render ($para->{indent}, $y - $y0);	3445	$layout->render ($para->{indent}, $y - $y0);
		3446	$layout->draw;
2818		3447
2819	if (my @w = @{ $para->{widget} }) {	3448	if (my @w = @{ $para->{widget} }) {
2820	my @s = $layout->get_shapes;	3449	my @s = $layout->get_shapes;
2821		3450
2822	for (@w) {	3451	for (@w) {
…		…
2828	$_->draw;	3457	$_->draw;
2829	}	3458	}
2830	}	3459	}
2831	}	3460	}
2832		3461
2833	$y += $h;	3462	$paridx++;
		3463	$top_paragraph ||= $paridx if $y >= $top;
2834	}	3464	}
		3465
		3466	$self->{top_paragraph} = $top_paragraph;
2835	};	3467	};
2836	});	3468	});
2837	}	3469	}
2838		3470
2839	sub reconfigure {	3471	sub reconfigure {
…		…
2857	$self->{children}[1]->draw;	3489	$self->{children}[1]->draw;
2858	}	3490	}
2859		3491
2860	#############################################################################	3492	#############################################################################
2861		3493
2862	package CFClient::UI::Animator;	3494	package CFPlus::UI::Animator;
2863		3495
2864	use CFClient::OpenGL;	3496	use CFPlus::OpenGL;
2865		3497
2866	our @ISA = CFClient::UI::Bin::;	3498	our @ISA = CFPlus::UI::Bin::;
2867		3499
2868	sub moveto {	3500	sub moveto {
2869	my ($self, $x, $y) = @_;	3501	my ($self, $x, $y) = @_;
2870		3502
2871	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3503	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2899	glPopMatrix;	3531	glPopMatrix;
2900	}	3532	}
2901		3533
2902	#############################################################################	3534	#############################################################################
2903		3535
2904	package CFClient::UI::Flopper;	3536	package CFPlus::UI::Flopper;
2905		3537
2906	our @ISA = CFClient::UI::Button::;	3538	our @ISA = CFPlus::UI::Button::;
2907		3539
2908	sub new {	3540	sub new {
2909	my $class = shift;	3541	my $class = shift;
2910		3542
2911	my $self = $class->SUPER::new (	3543	my $self = $class->SUPER::new (
…		…
2923	$self->{other}->toggle_visibility;	3555	$self->{other}->toggle_visibility;
2924	}	3556	}
2925		3557
2926	#############################################################################	3558	#############################################################################
2927		3559
2928	package CFClient::UI::Tooltip;	3560	package CFPlus::UI::Tooltip;
2929		3561
2930	our @ISA = CFClient::UI::Bin::;	3562	our @ISA = CFPlus::UI::Bin::;
2931		3563
2932	use CFClient::OpenGL;	3564	use CFPlus::OpenGL;
2933		3565
2934	sub new {	3566	sub new {
2935	my $class = shift;	3567	my $class = shift;
2936		3568
2937	$class->SUPER::new (	3569	$class->SUPER::new (
…		…
2941	}	3573	}
2942		3574
2943	sub set_tooltip_from {	3575	sub set_tooltip_from {
2944	my ($self, $widget) = @_;	3576	my ($self, $widget) = @_;
2945		3577
2946	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 =~ /^#(.*)$/;
2947		3583
2948	if ($ENV{CFPLUS_DEBUG} & 2) {	3584	if ($ENV{CFPLUS_DEBUG} & 2) {
2949	$tooltip .= "\n\n" . (ref $widget) . "\n"	3585	$tip .= "\n\n" . (ref $widget) . "\n"
2950	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3586	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2951	. "req $widget->{req_w} $widget->{req_h}\n"	3587	. "req $widget->{req_w} $widget->{req_h}\n"
2952	. "visible $widget->{visible}";	3588	. "visible $widget->{visible}";
2953	}	3589	}
2954		3590
2955	$tooltip =~ s/^\n+//;	3591	$tip =~ s/^\n+//;
2956	$tooltip =~ s/\n+$//;	3592	$tip =~ s/\n+$//;
2957		3593
2958	$self->add (new CFClient::UI::Label	3594	$self->add (new CFPlus::UI::Label
2959	markup => $tooltip,	3595	markup => $tip,
2960	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3596	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2961	fontsize => 0.8,	3597	fontsize => 0.8,
2962	fg => [0, 0, 0, 1],	3598	style => 1, # FLAG_INVERSE
2963	ellipsise => 0,	3599	ellipsise => 0,
2964	font => ($widget->{tooltip_font} || $::FONT_PROP),	3600	font => ($widget->{tooltip_font} || $::FONT_PROP),
2965	);	3601	);
2966	}	3602	}
2967		3603
…		…
2986		3622
2987	$self->{root}->on_post_alloc ("move_$self" => sub {	3623	$self->{root}->on_post_alloc ("move_$self" => sub {
2988	my $widget = $self->{owner}	3624	my $widget = $self->{owner}
2989	or return;	3625	or return;
2990		3626
		3627	if ($widget->{visible}) {
2991	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3628	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2992		3629
2993	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3630	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2994	if $x + $self->{w} > $self->{root}{w};	3631	if $x + $self->{w} > $self->{root}{w};
2995		3632
2996	$self->move_abs ($x, $y);	3633	$self->move_abs ($x, $y);
		3634	} else {
		3635	$self->hide;
		3636	}
2997	});	3637	});
2998	}	3638	}
2999		3639
3000	sub _draw {	3640	sub _draw {
3001	my ($self) = @_;	3641	my ($self) = @_;
3002		3642
3003	glTranslate 0.375, 0.375;
3004
3005	my ($w, $h) = @$self{qw(w h)};	3643	my ($w, $h) = @$self{qw(w h)};
3006		3644
3007	glColor 1, 0.8, 0.4;	3645	glColor 1, 0.8, 0.4;
3008	glBegin GL_QUADS;	3646	glRect 0, 0, $w, $h;
3009	glVertex 0 , 0;
3010	glVertex 0 , $h;
3011	glVertex $w, $h;
3012	glVertex $w, 0;
3013	glEnd;
3014		3647
3015	glColor 0, 0, 0;	3648	glColor 0, 0, 0;
3016	glBegin GL_LINE_LOOP;	3649	glRect_lineloop .5, .5, $w + .5, $h + .5;
3017	glVertex 0 , 0;
3018	glVertex 0 , $h;
3019	glVertex $w, $h;
3020	glVertex $w, 0;
3021	glEnd;
3022		3650
3023	glTranslate 2 - 0.375, 2 - 0.375;	3651	glTranslate 2, 2;
3024		3652
3025	$self->SUPER::_draw;	3653	$self->SUPER::_draw;
3026	}	3654	}
3027		3655
3028	#############################################################################	3656	#############################################################################
3029		3657
3030	package CFClient::UI::Face;	3658	package CFPlus::UI::Face;
3031		3659
3032	our @ISA = CFClient::UI::Base::;	3660	our @ISA = CFPlus::UI::DrawBG::;
3033		3661
3034	use CFClient::OpenGL;	3662	use CFPlus::OpenGL;
3035		3663
3036	sub new {	3664	sub new {
3037	my $class = shift;	3665	my $class = shift;
3038		3666
3039	my $self = $class->SUPER::new (	3667	my $self = $class->SUPER::new (
		3668	size_w => 32,
		3669	size_h => 8,
3040	aspect => 1,	3670	aspect => 1,
3041	can_events => 0,	3671	can_events => 0,
3042	@_,	3672	@_,
3043	);	3673	);
3044		3674
3045	if ($self->{anim} && $self->{animspeed}) {	3675	if ($self->{anim} && $self->{animspeed}) {
3046	Scalar::Util::weaken (my $widget = $self);	3676	CFPlus::weaken (my $widget = $self);
3047		3677
3048	$self->{timer} = Event->timer (	3678	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3049	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3679	$widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
3050	hard => 1,	3680	$self->{timer} = EV::timer_ns 0, 0, sub {
3051	interval => $self->{animspeed},	3681	return unless $::CONN;
3052	cb => sub {	3682
		3683	my $w = $widget
		3684	or return;
		3685
3053	++$widget->{frame};	3686	++$w->{frame};
		3687	$w->update_face;
		3688
		3689	# somehow, $widget can go away
3054	$widget->update;	3690	$w->update;
3055	},	3691	$w->update_timer;
3056	);	3692	};
		3693
		3694	$self->update_face;
		3695	$self->update_timer;
3057	}	3696	}
3058		3697
3059	$self	3698	$self
3060	}	3699	}
3061		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
3062	sub size_request {	3736	sub size_request {
3063	(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)
3064	}	3754	}
3065		3755
3066	sub update {	3756	sub update {
3067	my ($self) = @_;	3757	my ($self) = @_;
3068		3758
3069	return unless $self->{visible};	3759	return unless $self->{visible};
3070		3760
3071	$self->SUPER::update;	3761	$self->SUPER::update;
3072	}	3762	}
3073		3763
		3764	sub invoke_visibility_change {
		3765	my ($self) = @_;
		3766
		3767	$self->update_timer;
		3768
		3769	0
		3770	}
		3771
3074	sub _draw {	3772	sub _draw {
3075	my ($self) = @_;	3773	my ($self) = @_;
3076		3774
3077	return unless $::CONN;	3775	$self->SUPER::_draw;
3078		3776
3079	my $face;	3777	if (my $tex = $self->{tex}) {
3080
3081	if ($self->{frame}) {
3082	my $anim = $::CONN->{anim}[$self->{anim}];
3083
3084	$face = $anim->[ $self->{frame} % @$anim ]
3085	if $anim && @$anim;
3086	}
3087
3088	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3089
3090	if ($tex) {
3091	glEnable GL_TEXTURE_2D;	3778	glEnable GL_TEXTURE_2D;
3092	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3779	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3093	glColor 0, 0, 0, 1;	3780	glColor 0, 0, 0, 1;
3094	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3781	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3095	glDisable GL_TEXTURE_2D;	3782	glDisable GL_TEXTURE_2D;
…		…
3097	}	3784	}
3098		3785
3099	sub destroy {	3786	sub destroy {
3100	my ($self) = @_;	3787	my ($self) = @_;
3101		3788
3102	$self->{timer}->cancel	3789	(delete $self->{timer})->cancel
3103	if $self->{timer};	3790	if $self->{timer};
3104		3791
3105	$self->SUPER::destroy;	3792	$self->SUPER::destroy;
3106	}	3793	}
3107		3794
3108	#############################################################################	3795	#############################################################################
3109		3796
3110	package CFClient::UI::Buttonbar;	3797	package CFPlus::UI::Buttonbar;
3111		3798
3112	our @ISA = CFClient::UI::HBox::;	3799	our @ISA = CFPlus::UI::HBox::;
3113		3800
3114	# TODO: should actualyl wrap buttons and other goodies.	3801	# TODO: should actually wrap buttons and other goodies.
3115		3802
3116	#############################################################################	3803	#############################################################################
3117		3804
3118	package CFClient::UI::Menu;	3805	package CFPlus::UI::Menu;
3119		3806
3120	our @ISA = CFClient::UI::FancyFrame::;	3807	our @ISA = CFPlus::UI::Toplevel::;
3121		3808
3122	use CFClient::OpenGL;	3809	use CFPlus::OpenGL;
3123		3810
3124	sub new {	3811	sub new {
3125	my $class = shift;	3812	my $class = shift;
3126		3813
3127	my $self = $class->SUPER::new (	3814	my $self = $class->SUPER::new (
3128	items => [],	3815	items => [],
3129	z => 100,	3816	z => 100,
3130	@_,	3817	@_,
3131	);	3818	);
3132		3819
3133	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3820	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3134		3821
3135	for my $item (@{ $self->{items} }) {	3822	for my $item (@{ $self->{items} }) {
3136	my ($widget, $cb, $tooltip) = @$item;	3823	my ($widget, $cb, $tooltip) = @$item;
3137		3824
3138	# handle various types of items, only text for now	3825	# handle various types of items, only text for now
3139	if (!ref $widget) {	3826	if (!ref $widget) {
3140	if ($widget =~ /\t/) {	3827	if ($widget =~ /\t/) {
3141	my ($left, $right) = split /\t/, $widget, 2;	3828	my ($left, $right) = split /\t/, $widget, 2;
3142		3829
3143	$widget = new CFClient::UI::HBox	3830	$widget = new CFPlus::UI::HBox
3144	can_hover => 1,	3831	can_hover => 1,
3145	can_events => 1,	3832	can_events => 1,
3146	tooltip => $tooltip,	3833	tooltip => $tooltip,
3147	children => [	3834	children => [
3148	(new CFClient::UI::Label markup => $left, expand => 1),	3835	(new CFPlus::UI::Label markup => $left, expand => 1),
3149	(new CFClient::UI::Label markup => $right, align => +1),	3836	(new CFPlus::UI::Label markup => $right, align => +1),
3150	],	3837	],
3151	;	3838	;
3152		3839
3153	} else {	3840	} else {
3154	$widget = new CFClient::UI::Label	3841	$widget = new CFPlus::UI::Label
3155	can_hover => 1,	3842	can_hover => 1,
3156	can_events => 1,	3843	can_events => 1,
3157	markup => $widget,	3844	markup => $widget,
3158	tooltip => $tooltip;	3845	tooltip => $tooltip;
3159	}	3846	}
…		…
3207	1	3894	1
3208	}	3895	}
3209		3896
3210	#############################################################################	3897	#############################################################################
3211		3898
3212	package CFClient::UI::Multiplexer;	3899	package CFPlus::UI::Multiplexer;
3213		3900
3214	our @ISA = CFClient::UI::Container::;	3901	our @ISA = CFPlus::UI::Container::;
3215		3902
3216	sub new {	3903	sub new {
3217	my $class = shift;	3904	my $class = shift;
3218		3905
3219	my $self = $class->SUPER::new (	3906	my $self = $class->SUPER::new (
…		…
3280	$self->{current}->draw;	3967	$self->{current}->draw;
3281	}	3968	}
3282		3969
3283	#############################################################################	3970	#############################################################################
3284		3971
3285	package CFClient::UI::Notebook;	3972	package CFPlus::UI::Notebook;
3286		3973
		3974	use CFPlus::OpenGL;
		3975
3287	our @ISA = CFClient::UI::VBox::;	3976	our @ISA = CFPlus::UI::VBox::;
3288		3977
3289	sub new {	3978	sub new {
3290	my $class = shift;	3979	my $class = shift;
3291		3980
3292	my $self = $class->SUPER::new (	3981	my $self = $class->SUPER::new (
3293	buttonbar => (new CFClient::UI::Buttonbar),	3982	buttonbar => (new CFPlus::UI::Buttonbar),
3294	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3983	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3984	active_outline => [.7, .7, 0.2],
3295	# filter => # will be put between multiplexer and $self	3985	# filter => # will be put between multiplexer and $self
3296	@_,	3986	@_,
3297	);	3987	);
3298		3988
3299	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3989	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3300	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3990	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3301		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
3302	$self	4026	$self
3303	}	4027	}
3304		4028
3305	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 {
3306	my ($self, $title, $widget, $tooltip) = @_;	4047	my ($self, $title, $widget, $tooltip) = @_;
3307		4048
3308	Scalar::Util::weaken $self;	4049	$title = [$title, $tooltip] unless ref $title;
		4050	$widget->{c_tab} = $title;
3309		4051
3310	$self->{buttonbar}->add (new CFClient::UI::Button
3311	markup => $title,
3312	tooltip => $tooltip,
3313	on_activate => sub { $self->set_current_page ($widget) },
3314	);
3315
3316	$self->{multiplexer}->add ($widget);	4052	$self->add ($widget);
3317	}	4053	}
3318		4054
3319	sub get_current_page {	4055	sub get_current_page {
3320	my ($self) = @_;	4056	my ($self) = @_;
3321		4057
…		…
3327		4063
3328	$self->{multiplexer}->set_current_page ($page);	4064	$self->{multiplexer}->set_current_page ($page);
3329	$self->emit (page_changed => $self->{multiplexer}{current});	4065	$self->emit (page_changed => $self->{multiplexer}{current});
3330	}	4066	}
3331		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
3332	#############################################################################	4088	#############################################################################
3333		4089
3334	package CFClient::UI::Combobox;	4090	package CFPlus::UI::Selector;
3335		4091
3336	use utf8;	4092	use utf8;
3337		4093
3338	our @ISA = CFClient::UI::Button::;	4094	our @ISA = CFPlus::UI::Button::;
3339		4095
3340	sub new {	4096	sub new {
3341	my $class = shift;	4097	my $class = shift;
3342		4098
3343	my $self = $class->SUPER::new (	4099	my $self = $class->SUPER::new (
…		…
3360	my ($value, $title, $tooltip) = @$_;	4116	my ($value, $title, $tooltip) = @$_;
3361		4117
3362	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4118	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363	}	4119	}
3364		4120
3365	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4121	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366	}	4122	}
3367		4123
3368	sub _set_value {	4124	sub _set_value {
3369	my ($self, $value) = @_;	4125	my ($self, $value) = @_;
3370		4126
3371	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4127	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4128	$item ||= $self->{options}[0]
3372	or return;	4129	or return;
3373		4130
3374	$self->{value} = $item->[0];	4131	$self->{value} = $item->[0];
3375	$self->set_markup ("$item->[1] ⇓");	4132	$self->set_markup ("$item->[1] ⇓");
3376	$self->set_tooltip ($item->[2]);	4133	# $self->set_tooltip ($item->[2]);
3377	}	4134	}
3378		4135
3379	sub set_value {	4136	sub set_value {
3380	my ($self, $value) = @_;	4137	my ($self, $value) = @_;
3381		4138
…		…
3383		4140
3384	$self->_set_value ($value);	4141	$self->_set_value ($value);
3385	$self->emit (changed => $value);	4142	$self->emit (changed => $value);
3386	}	4143	}
3387		4144
		4145	sub set_options {
		4146	my ($self, $options) = @_;
		4147
		4148	$self->{options} = $options;
		4149	$self->_set_value ($self->{value});
		4150	}
		4151
3388	#############################################################################	4152	#############################################################################
3389		4153
3390	package CFClient::UI::Statusbox;	4154	package CFPlus::UI::Statusbox;
3391		4155
3392	our @ISA = CFClient::UI::VBox::;	4156	our @ISA = CFPlus::UI::VBox::;
3393		4157
3394	sub new {	4158	sub new {
3395	my $class = shift;	4159	my $class = shift;
3396		4160
3397	my $self = $class->SUPER::new (	4161	my $self = $class->SUPER::new (
3398	fontsize => 0.8,	4162	fontsize => 0.8,
3399	@_,	4163	@_,
3400	);	4164	);
3401		4165
3402	Scalar::Util::weaken (my $this = $self);	4166	CFPlus::weaken (my $this = $self);
3403		4167
3404	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4168	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3405		4169
3406	$self	4170	$self
3407	}	4171	}
3408		4172
3409	sub reorder {	4173	sub reorder {
3410	my ($self) = @_;	4174	my ($self) = @_;
3411	my $NOW = Time::HiRes::time;	4175	my $NOW = Time::HiRes::time;
3412		4176
3413	# freeze display when hovering over any label	4177	# freeze display when hovering over any label
3414	return if $CFClient::UI::TOOLTIP->{owner}	4178	return if $CFPlus::UI::TOOLTIP->{owner}
3415	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4179	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3416	values %{ $self->{item} };	4180	values %{ $self->{item} };
3417		4181
3418	while (my ($k, $v) = each %{ $self->{item} }) {	4182	while (my ($k, $v) = each %{ $self->{item} }) {
3419	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4183	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3420	}	4184	}
…		…
3423		4187
3424	my @items = sort {	4188	my @items = sort {
3425	$a->{pri} <=> $b->{pri}	4189	$a->{pri} <=> $b->{pri}
3426	or $b->{id} <=> $a->{id}	4190	or $b->{id} <=> $a->{id}
3427	} values %{ $self->{item} };	4191	} values %{ $self->{item} };
3428
3429	$self->{timer}->interval (1);
3430		4192
3431	my $count = 10 + 1;	4193	my $count = 10 + 1;
3432	for my $item (@items) {	4194	for my $item (@items) {
3433	last unless --$count;	4195	last unless --$count;
3434		4196
…		…
3441	for ($short) {	4203	for ($short) {
3442	s/^\s+//;	4204	s/^\s+//;
3443	s/\s+/ /g;	4205	s/\s+/ /g;
3444	}	4206	}
3445		4207
3446	new CFClient::UI::Label	4208	new CFPlus::UI::Label
3447	markup => $short,	4209	markup => $short,
3448	tooltip => $item->{tooltip},	4210	tooltip => $item->{tooltip},
3449	tooltip_font => $::FONT_PROP,	4211	tooltip_font => $::FONT_PROP,
3450	tooltip_width => 0.67,	4212	tooltip_width => 0.67,
3451	fontsize => $item->{fontsize} || $self->{fontsize},	4213	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3458	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4220	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3459	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4221	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3460	$label->update;	4222	$label->update;
3461	$label->set_max_size (undef, $label->{req_h} * $diff)	4223	$label->set_max_size (undef, $label->{req_h} * $diff)
3462	if $diff < 1;	4224	if $diff < 1;
3463	$self->{timer}->interval (1/30);	4225	$self->{timer}->set (1/30, 1/30);
3464	} else {	4226	} else {
3465	$label->{fg}[3] = $item->{fg}[3] || 1;	4227	$label->{fg}[3] = $item->{fg}[3] || 1;
3466	}	4228	}
3467		4229
3468	push @widgets, $label;	4230	push @widgets, $label;
…		…
3530	$self->SUPER::destroy;	4292	$self->SUPER::destroy;
3531	}	4293	}
3532		4294
3533	#############################################################################	4295	#############################################################################
3534		4296
3535	package CFClient::UI::Inventory;
3536
3537	our @ISA = CFClient::UI::Table::;
3538
3539	sub new {
3540	my $class = shift;
3541
3542	my $self = $class->SUPER::new (
3543	col_expand => [0, 1, 0],
3544	@_,
3545	);
3546
3547	$self
3548	}
3549
3550	sub set_items {
3551	my ($self, $items) = @_;
3552
3553	$self->clear;
3554	return unless $items;
3555
3556	my @items = sort {
3557	($a->{type} <=> $b->{type})
3558	or ($a->{name} cmp $b->{name})
3559	} values %$items;
3560
3561	$self->{real_items} = \@items;
3562
3563	my $row = 0;
3564	for my $item (@items) {
3565	CFClient::Item::update_widgets $item;
3566
3567	$self->add (0, $row, $item->{face_widget});
3568	$self->add (1, $row, $item->{desc_widget});
3569	$self->add (2, $row, $item->{weight_widget});
3570
3571	$row++;
3572	}
3573	}
3574
3575	#############################################################################
3576
3577	package CFClient::UI::SpellList;
3578
3579	our @ISA = CFClient::UI::Table::;
3580
3581	sub new {
3582	my $class = shift;
3583
3584	my $self = $class->SUPER::new (
3585	binding => [],
3586	commands => [],
3587	@_,
3588	)
3589	}
3590
3591	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3592
3593	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3594	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3595	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3596	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3597	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3598	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3599	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3600	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3601	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3602	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603
3604	sub rebuild_spell_list {
3605	my ($self) = @_;
3606
3607	$CFClient::UI::ROOT->on_refresh ($self => sub {
3608	$self->clear;
3609
3610	return unless $::CONN;
3611
3612	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3614	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617
3618	my $row = 0;
3619
3620	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621	my $spell = $self->{spell}{$_};
3622
3623	$row++;
3624
3625	my $spell_cb = sub {
3626	my ($widget, $ev) = @_;
3627
3628	if ($ev->{button} == 1) {
3629	$::CONN->user_send ("cast $spell->{name}");
3630	} elsif ($ev->{button} == 2) {
3631	$::CONN->user_send ("invoke $spell->{name}");
3632	} elsif ($ev->{button} == 3) {
3633	(new CFClient::UI::Menu
3634	items => [
3635	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637	],
3638	)->popup ($ev);
3639	} else {
3640	return 0;
3641	}
3642
3643	1
3644	};
3645
3646	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647
3648	#TODO: add path info to tooltip
3649	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3650
3651	$self->add (0, $row, new CFClient::UI::Face
3652	face => $spell->{face},
3653	can_hover => 1,
3654	can_events => 1,
3655	tooltip => $tooltip,
3656	on_button_down => $spell_cb,
3657	);
3658
3659	$self->add (1, $row, new CFClient::UI::Label
3660	expand => 1,
3661	text => $spell->{name},
3662	can_hover => 1,
3663	can_events => 1,
3664	tooltip => $tooltip,
3665	on_button_down => $spell_cb,
3666	);
3667
3668	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672	}
3673	});
3674	}
3675
3676	sub add_spell {
3677	my ($self, $spell) = @_;
3678
3679	$self->{spell}->{$spell->{name}} = $spell;
3680	$self->rebuild_spell_list;
3681	}
3682
3683	sub remove_spell {
3684	my ($self, $spell) = @_;
3685
3686	delete $self->{spell}->{$spell->{name}};
3687	$self->rebuild_spell_list;
3688	}
3689
3690	sub clear_spells {
3691	my ($self) = @_;
3692
3693	$self->{spell} = {};
3694	$self->rebuild_spell_list;
3695	}
3696
3697	#############################################################################
3698
3699	package CFClient::UI::Root;	4297	package CFPlus::UI::Root;
3700		4298
3701	our @ISA = CFClient::UI::Container::;	4299	our @ISA = CFPlus::UI::Container::;
3702		4300
3703	use List::Util qw(min max);	4301	use List::Util qw(min max);
3704		4302
3705	use CFClient::OpenGL;	4303	use CFPlus::OpenGL;
3706		4304
3707	sub new {	4305	sub new {
3708	my $class = shift;	4306	my $class = shift;
3709		4307
3710	my $self = $class->SUPER::new (	4308	my $self = $class->SUPER::new (
3711	visible => 1,	4309	visible => 1,
3712	@_,	4310	@_,
3713	);	4311	);
3714		4312
3715	Scalar::Util::weaken ($self->{root} = $self);	4313	CFPlus::weaken ($self->{root} = $self);
3716		4314
3717	$self	4315	$self
3718	}	4316	}
3719		4317
3720	sub size_request {	4318	sub size_request {
…		…
3768	}	4366	}
3769		4367
3770	sub update {	4368	sub update {
3771	my ($self) = @_;	4369	my ($self) = @_;
3772		4370
3773	$::WANT_REFRESH++;	4371	$::WANT_REFRESH->start;
3774	}	4372	}
3775		4373
3776	sub add {	4374	sub add {
3777	my ($self, @children) = @_;	4375	my ($self, @children) = @_;
3778		4376
…		…
3815	while ($self->{refresh_hook}) {	4413	while ($self->{refresh_hook}) {
3816	$_->()	4414	$_->()
3817	for values %{delete $self->{refresh_hook}};	4415	for values %{delete $self->{refresh_hook}};
3818	}	4416	}
3819		4417
3820	if ($self->{realloc}) {	4418	while ($self->{realloc}) {
3821	my %queue;	4419	my %queue;
3822	my @queue;	4420	my @queue;
3823	my $widget;	4421	my $widget;
3824		4422
3825	outer:	4423	outer:
…		…
3872	}	4470	}
3873	}	4471	}
3874		4472
3875	delete $self->{realloc}{$widget+0};	4473	delete $self->{realloc}{$widget+0};
3876	}	4474	}
3877	}
3878		4475
3879	while (my $size_alloc = delete $self->{size_alloc}) {	4476	while (my $size_alloc = delete $self->{size_alloc}) {
3880	my @queue = sort { $b->{visible} <=> $a->{visible} }	4477	my @queue = sort { $a->{visible} <=> $b->{visible} }
3881	values %$size_alloc;	4478	values %$size_alloc;
3882		4479
3883	while () {	4480	while () {
3884	my $widget = pop @queue || last;	4481	my $widget = pop @queue || last;
3885		4482
3886	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4483	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3887		4484
3888	$w = 0 if $w < 0;
3889	$h = 0 if $h < 0;
3890
3891	$w = max $widget->{min_w}, $w;	4485	$w = max $widget->{min_w}, $w;
3892	$h = max $widget->{min_h}, $h;	4486	$h = max $widget->{min_h}, $h;
3893		4487
		4488	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4489	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4490
3894	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4491	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4492	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896		4493
3897	$w = int $w + 0.5;	4494	$w = int $w + 0.5;
3898	$h = int $h + 0.5;	4495	$h = int $h + 0.5;
3899		4496
3900	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}) {
3901	$widget->{old_w} = $widget->{w};	4498	$widget->{old_w} = $widget->{w};
3902	$widget->{old_h} = $widget->{h};	4499	$widget->{old_h} = $widget->{h};
3903		4500
3904	$widget->{w} = $w;	4501	$widget->{w} = $w;
3905	$widget->{h} = $h;	4502	$widget->{h} = $h;
3906		4503
3907	$widget->emit (size_allocate => $w, $h);	4504	$widget->emit (size_allocate => $w, $h);
		4505	}
3908	}	4506	}
3909	}	4507	}
3910	}	4508	}
3911		4509
3912	while ($self->{post_alloc_hook}) {	4510	while ($self->{post_alloc_hook}) {
3913	$_->()	4511	$_->()
3914	for values %{delete $self->{post_alloc_hook}};	4512	for values %{delete $self->{post_alloc_hook}};
3915	}	4513	}
3916
3917		4514
3918	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4515	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3919	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4516	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3920	glClear GL_COLOR_BUFFER_BIT;	4517	glClear GL_COLOR_BUFFER_BIT;
3921		4518
…		…
3924	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4521	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3925	glMatrixMode GL_MODELVIEW;	4522	glMatrixMode GL_MODELVIEW;
3926	glLoadIdentity;	4523	glLoadIdentity;
3927		4524
3928	{	4525	{
3929	package CFClient::UI::Base;	4526	package CFPlus::UI::Base;
3930		4527
3931	($draw_x, $draw_y, $draw_w, $draw_h) =	4528	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3932	(0, 0, $self->{w}, $self->{h});	4529	(0, 0, $self->{w}, $self->{h});
3933	}
3934		4530
3935	$self->_draw;	4531	$self->_draw;
		4532	}
3936	}	4533	}
3937		4534
3938	#############################################################################	4535	#############################################################################
3939		4536
3940	package CFClient::UI;	4537	package CFPlus::UI;
3941		4538
3942	$ROOT = new CFClient::UI::Root;	4539	$ROOT = new CFPlus::UI::Root;
3943	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4540	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3944		4541
3945	1	4542	1
3946		4543

Diff Legend

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