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

Diff Legend

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