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.330 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.442 by root, Mon Oct 8 17:01:03 2007 UTC

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

Diff Legend

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