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.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.394 by root, Sat Jul 21 13:54:03 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		120
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
101	}	129	}
102		130
103	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	132	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		133
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		135
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		137
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
112	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		140
114	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	143	$grab->update if $grab;
117	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
118		145
		146	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	147	$TOOLTIP_WATCHER->cb->();
120	}	148	}
121	}	149	}
122		150
123	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
124	my ($ev) = @_;	152	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
126		154
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		156
129	if ($widget != $HOVER) {	157	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		158
132	$hover->update if $hover && $hover->{can_hover};	159	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	160	if $HOVER;
140	}	161	}
141		162
142	# convert position array to integers	163	# convert position array to integers
143	sub harmonize {	164	sub harmonize {
…		…
193	reconfigure_widgets;	214	reconfigure_widgets;
194	}	215	}
195		216
196	#############################################################################	217	#############################################################################
197		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
198	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
199		228
200	use strict;	229	use strict;
201		230
202	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
203		232
204	sub new {	233	sub new {
205	my $class = shift;	234	my $class = shift;
206		235
207	my $self = bless {	236	my $self = bless {
…		…
212	h => undef,	241	h => undef,
213	can_events => 1,	242	can_events => 1,
214	@_	243	@_
215	}, $class;	244	}, $class;
216		245
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		247
219	for (keys %$self) {	248	for (keys %$self) {
220	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
222	}	251	}
223	}	252	}
224		253
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		259
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		262
234	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
239		268
240	sub destroy {	269	sub destroy {
241	my ($self) = @_;	270	my ($self) = @_;
242		271
243	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
244	%$self = ();	274	%$self = ();
245	}	275	}
246		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
247	sub show {	281	sub show {
248	my ($self) = @_;	282	my ($self) = @_;
249		283
250	return if $self->{parent};	284	return if $self->{parent};
251		285
252	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
253	}	287	}
254		288
255	sub set_visible {	289	sub set_visible {
256	my ($self) = @_;	290	my ($self) = @_;
257		291
…		…
278	delete $self->{root};	312	delete $self->{root};
279		313
280	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
282		316
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
285		319
286	$self->emit ("focus_out");	320	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
288	}	322	}
…		…
290	sub set_visibility {	324	sub set_visibility {
291	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
292		326
293	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
294		328
295	$visible ? $self->hide	329	$visible ? $self->show
296	: $self->show;	330	: $self->hide;
297	}	331	}
298		332
299	sub toggle_visibility {	333	sub toggle_visibility {
300	my ($self) = @_;	334	my ($self) = @_;
301		335
…		…
345	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
346		380
347	if ($self->{aspect}) {	381	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
349		383
350	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		386
353	# use alignment to adjust x, y	387	# use alignment to adjust x, y
354		388
355	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
397		431
398	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
399		433
400	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
401		435
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	439	}
406	}	440	}
407		441
408	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
409	sub coord2local {	443	sub coord2local {
410	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
411		445
		446	Carp::confess unless $self->{parent};#d#
		447
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	449	}
414		450
415	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
416	sub coord2global {	452	sub coord2global {
417	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
		454
		455	Carp::confess unless $self->{parent};#d#
418		456
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	458	}
421		459
422	sub invoke_focus_in {	460	sub invoke_focus_in {
…		…
456		494
457	sub invoke_mouse_motion { 0 }	495	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 0 }	496	sub invoke_button_up { 0 }
459	sub invoke_key_down { 0 }	497	sub invoke_key_down { 0 }
460	sub invoke_key_up { 0 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
461		500
462	sub invoke_button_down {	501	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
464		503
465	$self->grab_focus;	504	$self->grab_focus;
…		…
469		508
470	sub connect {	509	sub connect {
471	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
472		511
473	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
474	}	518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
475		532
476	sub emit {	533	sub emit {
477	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
478		535
		536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
479	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480		544
481	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
482	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
483	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
484	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
485	}	554	}
486		555
487	sub find_widget {	556	#sub find_widget {
488	my ($self, $x, $y) = @_;	557	# in .xs
489
490	return () unless $self->{can_events};
491
492	return $self
493	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
494	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
495
496	()
497	}
498		558
499	sub set_parent {	559	sub set_parent {
500	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
501		561
502	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
503	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
504	}	564	}
505		565
506	sub realloc {	566	sub realloc {
507	my ($self) = @_;	567	my ($self) = @_;
…		…
573	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
576	glEnd;	636	glEnd;
577	glPopMatrix;	637	glPopMatrix;
578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579	}	639	}
580		640
581	$self->_draw;	641	$self->_draw;
582	glPopMatrix;	642	glPopMatrix;
583	}	643	}
…		…
586	my ($self) = @_;	646	my ($self) = @_;
587		647
588	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
589	}	649	}
590		650
		651	my $cntx;#d#
591	sub DESTROY {	652	sub DESTROY {
592	my ($self) = @_;	653	my ($self) = @_;
593		654
594	return if CFClient::in_destruct;	655	return if CFPlus::in_destruct;
595
596	delete $WIDGET{$self+0};
597		656
598	eval { $self->destroy };	657	eval { $self->destroy };
599	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
600	}	661	}
601		662
602	#############################################################################	663	#############################################################################
603		664
604	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
605		666
606	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
607		668
608	use strict;	669	use strict;
609	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
610		671
611	sub new {	672	sub new {
612	my $class = shift;	673	my $class = shift;
613		674
614	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
645	}	706	}
646	}	707	}
647		708
648	#############################################################################	709	#############################################################################
649		710
650	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
651		712
652	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
653		714
654	sub new {	715	sub new {
655	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
656	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
657	}	718	}
…		…
664		725
665	sub draw { }	726	sub draw { }
666		727
667	#############################################################################	728	#############################################################################
668		729
669	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
670		731
671	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
672		733
673	sub new {	734	sub new {
674	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
675		736
676	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
680	can_events => 0,	741	can_events => 0,
681	%arg,	742	%arg,
682	);	743	);
683		744
684	$self->add (@$children)	745	$self->add (@$children)
685	if $children;	746	if $children && @$children;
686		747
687	$self	748	$self
		749	}
		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
688	}	757	}
689		758
690	sub add {	759	sub add {
691	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
692		761
693	$_->set_parent ($self)	762	$_->set_parent ($self)
694	for @widgets;	763	for @widgets;
695		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
696	use sort 'stable';	766	use sort 'stable';
697		767
698	$self->{children} = [	768	$self->{children} = [
699	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
700	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
…		…
719	}	789	}
720		790
721	sub clear {	791	sub clear {
722	my ($self) = @_;	792	my ($self) = @_;
723		793
724	my $children = delete $self->{children};	794	my $children = $self->{children};
725	$self->{children} = [];	795	$self->{children} = [];
726		796
727	for (@$children) {	797	for (@$children) {
728	delete $_->{parent};	798	delete $_->{parent};
729	$_->hide;	799	$_->hide;
…		…
754	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
755	}	825	}
756		826
757	#############################################################################	827	#############################################################################
758		828
759	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
760		830
761	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
762		832
763	sub new {	833	sub new {
764	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
765		835
766	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
767		837
768	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
769	}	839	}
770		840
771	sub add {	841	sub add {
…		…
778	sub remove {	848	sub remove {
779	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
780		850
781	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
782		852
783	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	854	unless @{$self->{children}};
785	}	855	}
786		856
787	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
788		858
…		…
800		870
801	#############################################################################	871	#############################################################################
802		872
803	# back-buffered drawing area	873	# back-buffered drawing area
804		874
805	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
806		876
807	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
808		878
809	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
810		880
811	sub new {	881	sub new {
812	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
813		883
814	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
836	}	906	}
837		907
838	sub render_child {	908	sub render_child {
839	my ($self) = @_;	909	my ($self) = @_;
840		910
841	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	911	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
842	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
843	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
844		914
845	{	915	{
846	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
847		917
848	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
849	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
850	}	922	}
851
852	$self->_render;
853	};	923	};
854	}	924	}
855		925
856	sub _draw {	926	sub _draw {
857	my ($self) = @_;	927	my ($self) = @_;
858
859	my ($w, $h) = @$self{qw(w h)};
860		928
861	my $tex = $self->{texture}	929	my $tex = $self->{texture}
862	or return;	930	or return;
863		931
864	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
865	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
866	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
867		935
868	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
869		937
870	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
871	}	939	}
872		940
873	#############################################################################	941	#############################################################################
874		942
875	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
876		944
		945	use List::Util qw(min max);
		946
877	our @ISA = CFClient::UI::Window::;	947	our @ISA = CFPlus::UI::Window::;
878		948
879	sub new {	949	sub new {
880	my $class = shift;	950	my $class = shift;
881		951
882	$class->SUPER::new (	952	$class->SUPER::new (
…		…
889	sub size_request {	959	sub size_request {
890	my ($self) = @_;	960	my ($self) = @_;
891		961
892	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	962	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
893		963
894	$w = 10 if $self->{scroll_x};	964	$w = 1 if $self->{scroll_x};
895	$h = 10 if $self->{scroll_y};	965	$h = 1 if $self->{scroll_y};
896		966
897	($w, $h)	967	($w, $h)
898	}	968	}
899		969
900	sub invoke_size_allocate {	970	sub invoke_size_allocate {
…		…
912	}	982	}
913		983
914	sub set_offset {	984	sub set_offset {
915	my ($self, $x, $y) = @_;	985	my ($self, $x, $y) = @_;
916		986
		987	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		988	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		989
		990	if ($x != $self->{view_x} or $y != $self->{view_y}) {
917	$self->{view_x} = int $x;	991	$self->{view_x} = $x;
918	$self->{view_y} = int $y;	992	$self->{view_y} = $y;
919		993
		994	$self->emit (changed => $x, $y);
920	$self->update;	995	$self->update;
		996	}
921	}	997	}
922		998
923	# hmm, this does not work for topleft of $self... but we should not ask for that	999	# hmm, this does not work for topleft of $self... but we should not ask for that
924	sub coord2local {	1000	sub coord2local {
925	my ($self, $x, $y) = @_;	1001	my ($self, $x, $y) = @_;
…		…
940	my ($self, $x, $y) = @_;	1016	my ($self, $x, $y) = @_;
941		1017
942	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1018	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
943	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1019	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
944	) {	1020	) {
945	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1021	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
946	} else {	1022	} else {
947	$self->CFClient::UI::Base::find_widget ($x, $y)	1023	$self->CFPlus::UI::Base::find_widget ($x, $y)
948	}	1024	}
949	}	1025	}
950		1026
951	sub _render {	1027	sub _render {
952	my ($self) = @_;	1028	my ($self) = @_;
953		1029
954	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1030	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
955	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1031	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
956		1032
957	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1033	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
958		1034
959	$self->SUPER::_render;	1035	$self->SUPER::_render;
960	}	1036	}
961		1037
962	#############################################################################	1038	#############################################################################
963		1039
964	package CFClient::UI::ScrolledWindow;	1040	package CFPlus::UI::ScrolledWindow;
965		1041
966	our @ISA = CFClient::UI::HBox::;	1042	our @ISA = CFPlus::UI::Table::;
967		1043
968	sub new {	1044	sub new {
969	my ($class, %arg) = @_;	1045	my ($class, %arg) = @_;
970		1046
971	my $child = delete $arg{child};	1047	my $child = delete $arg{child};
972		1048
973	my $self;	1049	my $self;
974		1050
975	my $slider = new CFClient::UI::Slider	1051	my $hslider = new CFPlus::UI::Slider
		1052	col => 0,
		1053	row => 1,
		1054	vertical => 0,
		1055	range => [0, 0, 1, 0.01], # HACK fix
		1056	on_changed => sub {
		1057	$self->{hpos} = $_[1];
		1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1059	},
		1060	;
		1061
		1062	my $vslider = new CFPlus::UI::Slider
		1063	col => 1,
		1064	row => 0,
976	vertical => 1,	1065	vertical => 1,
977	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
978	on_changed => sub {	1067	on_changed => sub {
979	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
980	},	1070	},
981	;	1071	;
982		1072
983	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
984	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
		1076	can_events => 1,
985	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
986	%arg,	1081	%arg,
987	);	1082	);
988		1083
		1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	col => 0,
		1086	row => 0,
		1087	expand => 1,
		1088	scroll_x => $self->{scroll_x},
		1089	scroll_y => $self->{scroll_y},
		1090	on_changed => sub {
		1091	my ($vp, $x, $y) = @_;
		1092
		1093	$vp->{parent}{hslider}->set_value ($x);
		1094	$vp->{parent}{vslider}->set_value ($y);
		1095
		1096	0
		1097	},
		1098	;
		1099
989	$self->SUPER::add ($self->{vp}, $self->{slider});	1100	$self->SUPER::add ($self->{vp});
		1101
990	$self->add ($child) if $child;	1102	$self->add ($child) if $child;
991		1103
992	$self	1104	$self
993	}	1105	}
994		1106
995	#TODO# update range on size_allocate depending on child	1107	#TODO# update range on size_allocate depending on child?
996		1108
997	sub add {	1109	sub add {
998	my ($self, $widget) = @_;	1110	my ($self, $widget) = @_;
999		1111
1000	$self->{vp}->add ($self->{child} = $widget);	1112	$self->{vp}->add ($self->{child} = $widget);
1001	}	1113	}
1002		1114
		1115	sub update_slider {
		1116	my ($self) = @_;
		1117
		1118	my $child = ($self->{vp} or return)->child;
		1119
		1120	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1121	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1122
		1123	my $visible = $w1 > $w2;
		1124	if ($visible != $self->{hslider_visible}) {
		1125	$self->{hslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{hslider})
		1127	: $self->SUPER::remove ($self->{hslider});
		1128	}
		1129
		1130	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1131	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1132
		1133	my $visible = $h1 > $h2;
		1134	if ($visible != $self->{vslider_visible}) {
		1135	$self->{vslider_visible} = $visible;
		1136	$visible ? $self->SUPER::add ($self->{vslider})
		1137	: $self->SUPER::remove ($self->{vslider});
		1138	}
		1139	}
		1140
		1141	sub update {
		1142	my ($self) = @_;
		1143
		1144	$self->update_slider;
		1145	$self->SUPER::update;
		1146	}
		1147
		1148	sub invoke_mouse_wheel {
		1149	my ($self, $ev) = @_;
		1150
		1151	$self->{vslider}->emit (mouse_wheel => $ev)
		1152	if $ev->{dy};
		1153
		1154	$self->{hslider}->emit (mouse_wheel => $ev)
		1155	if $ev->{dx};
		1156
		1157	1
		1158	}
		1159
		1160	sub invoke_button_down {
		1161	my ($self, $ev, $x, $y) = @_;
		1162
		1163	if ($ev->{button} == 2) {
		1164	$self->grab_focus;
		1165
		1166	my $ox = $self->{vp}{view_x} + $ev->{x};
		1167	my $oy = $self->{vp}{view_y} + $ev->{y};
		1168
		1169	$self->{motion} = sub {
		1170	my ($ev, $x, $y) = @_;
		1171
		1172	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1173	$self->update;
		1174	};
		1175
		1176	return 1;
		1177	}
		1178
		1179	0
		1180	}
		1181
1003	sub invoke_button_up {	1182	sub invoke_button_up {
1004	my ($self, $ev) = @_;	1183	my ($self, $ev, $x, $y) = @_;
1005		1184
1006	warn "button up $ev->{button}\n";#d#	1185	if (delete $self->{motion}) {
		1186	return 1;
1007		1187	}
		1188
1008	0	1189	0
1009	}	1190	}
1010		1191
1011	sub update_slider {	1192	sub invoke_mouse_motion {
1012	my ($self) = @_;	1193	my ($self, $ev, $x, $y) = @_;
1013		1194
1014	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1195	if ($self->{motion}) {
1015	}	1196	$self->{motion}->($ev, $x, $y);
		1197	return 1;
		1198	}
1016		1199
1017	sub update {	1200	0
1018	my ($self) = @_;
1019
1020	$self->SUPER::update;
1021
1022	$self->update_slider;
1023	}	1201	}
1024		1202
1025	sub invoke_size_allocate {	1203	sub invoke_size_allocate {
1026	my ($self, $w, $h) = @_;	1204	my ($self, $w, $h) = @_;
1027		1205
1028	$self->update_slider;	1206	$self->update_slider;
1029
1030	$self->SUPER::invoke_size_allocate ($w, $h)	1207	$self->SUPER::invoke_size_allocate ($w, $h)
1031	}	1208	}
1032		1209
1033	#############################################################################	1210	#############################################################################
1034		1211
1035	package CFClient::UI::Frame;	1212	package CFPlus::UI::Frame;
1036		1213
1037	our @ISA = CFClient::UI::Bin::;	1214	our @ISA = CFPlus::UI::Bin::;
1038		1215
1039	use CFClient::OpenGL;	1216	use CFPlus::OpenGL;
1040		1217
1041	sub new {	1218	sub new {
1042	my $class = shift;	1219	my $class = shift;
1043		1220
1044	$class->SUPER::new (	1221	$class->SUPER::new (
…		…
1070	$self->SUPER::_draw;	1247	$self->SUPER::_draw;
1071	}	1248	}
1072		1249
1073	#############################################################################	1250	#############################################################################
1074		1251
1075	package CFClient::UI::FancyFrame;	1252	package CFPlus::UI::FancyFrame;
1076		1253
1077	our @ISA = CFClient::UI::Bin::;	1254	our @ISA = CFPlus::UI::Bin::;
1078		1255
1079	use CFClient::OpenGL;	1256	use CFPlus::OpenGL;
		1257
		1258	sub new {
		1259	my ($class, %arg) = @_;
		1260
		1261	if ((exists $arg{label}) && !ref $arg{label}) {
		1262	$arg{label} = new CFPlus::UI::Label
		1263	align => 1,
		1264	valign => 0,
		1265	text => $arg{label},
		1266	fontsize => ($arg{border} || 0.8) * 0.75;
		1267	}
		1268
		1269	my $self = $class->SUPER::new (
		1270	# label => "",
		1271	fg => [0.6, 0.3, 0.1],
		1272	border => 0.8,
		1273	style => 'single',
		1274	%arg,
		1275	);
		1276
		1277	$self
		1278	}
		1279
		1280	sub add {
		1281	my ($self, @widgets) = @_;
		1282
		1283	$self->SUPER::add (@widgets);
		1284	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1285	}
		1286
		1287	sub border {
		1288	int $_[0]{border} * $::FONTSIZE
		1289	}
		1290
		1291	sub size_request {
		1292	my ($self) = @_;
		1293
		1294	($self->{label_w}, undef) = $self->{label}->size_request
		1295	if $self->{label};
		1296
		1297	my ($w, $h) = $self->SUPER::size_request;
		1298
		1299	(
		1300	$w + $self->border * 2,
		1301	$h + $self->border * 2,
		1302	)
		1303	}
		1304
		1305	sub invoke_size_allocate {
		1306	my ($self, $w, $h) = @_;
		1307
		1308	my $border = $self->border;
		1309
		1310	$w -= List::Util::max 0, $border * 2;
		1311	$h -= List::Util::max 0, $border * 2;
		1312
		1313	if (my $label = $self->{label}) {
		1314	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1315	$label->{h} = List::Util::min $h, $border;
		1316	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1317	}
		1318
		1319	$self->child->configure ($border, $border, $w, $h);
		1320
		1321	1
		1322	}
		1323
		1324	sub _draw {
		1325	my ($self) = @_;
		1326
		1327	my $child = $self->{children}[0];
		1328
		1329	my $border = $self->border;
		1330	my ($w, $h) = ($self->{w}, $self->{h});
		1331
		1332	$child->draw;
		1333
		1334	glColor @{$self->{fg}};
		1335	glBegin GL_LINE_STRIP;
		1336	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1337	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1338	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1339	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1340	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1341	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1342	glEnd;
		1343
		1344	if ($self->{label}) {
		1345	glTranslate $border * 2, 0;
		1346	$self->{label}->_draw;
		1347	}
		1348	}
		1349
		1350	#############################################################################
		1351
		1352	package CFPlus::UI::Toplevel;
		1353
		1354	our @ISA = CFPlus::UI::Bin::;
		1355
		1356	use CFPlus::OpenGL;
1080		1357
1081	my $bg =	1358	my $bg =
1082	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1359	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1083	mipmap => 1, wrap => 1;	1360	mipmap => 1, wrap => 1;
1084		1361
1085	my @border =	1362	my @border =
1086	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1087	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1364	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1365
		1366	my @icon =
		1367	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1368	qw(x1_move.png x1_resize.png);
1088		1369
1089	sub new {	1370	sub new {
1090	my ($class, %arg) = @_;	1371	my ($class, %arg) = @_;
1091		1372
1092	my $self = $class->SUPER::new (	1373	my $self = $class->SUPER::new (
…		…
1097	min_w => 64,	1378	min_w => 64,
1098	min_h => 32,	1379	min_h => 32,
1099	%arg,	1380	%arg,
1100	);	1381	);
1101		1382
1102	$self->{title_widget} = new CFClient::UI::Label	1383	$self->{title_widget} = new CFPlus::UI::Label
1103	align => 0,	1384	align => 0,
1104	valign => 1,	1385	valign => 1,
1105	text => $self->{title},	1386	text => $self->{title},
1106	fontsize => $self->{border},	1387	fontsize => $self->{border},
1107	if exists $self->{title};	1388	if exists $self->{title};
1108		1389
1109	if ($self->{has_close_button}) {	1390	if ($self->{has_close_button}) {
1110	$self->{close_button} =	1391	$self->{close_button} =
1111	new CFClient::UI::ImageButton	1392	new CFPlus::UI::ImageButton
1112	path => 'x1_close.png',	1393	path => 'x1_close.png',
1113	on_activate => sub { $self->emit ("delete") };	1394	on_activate => sub { $self->emit ("delete") };
1114		1395
1115	$self->CFClient::UI::Container::add ($self->{close_button});	1396	$self->CFPlus::UI::Container::add ($self->{close_button});
1116	}	1397	}
1117		1398
1118	$self	1399	$self
1119	}	1400	}
1120		1401
1121	sub add {	1402	sub add {
1122	my ($self, @widgets) = @_;	1403	my ($self, @widgets) = @_;
1123		1404
1124	$self->SUPER::add (@widgets);	1405	$self->SUPER::add (@widgets);
1125	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1406	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1126	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1407	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1127	}	1408	}
1128		1409
1129	sub border {	1410	sub border {
1130	int $_[0]{border} * $::FONTSIZE	1411	int $_[0]{border} * $::FONTSIZE
1131	}	1412	}
…		…
1239	$self->{motion}->($ev, $x, $y) if $self->{motion};	1520	$self->{motion}->($ev, $x, $y) if $self->{motion};
1240		1521
1241	! ! $self->{motion}	1522	! ! $self->{motion}
1242	}	1523	}
1243		1524
		1525	sub invoke_visibility_change {
		1526	my ($self, $visible) = @_;
		1527
		1528	delete $self->{motion} unless $visible;
		1529
		1530	0
		1531	}
		1532
1244	sub _draw {	1533	sub _draw {
1245	my ($self) = @_;	1534	my ($self) = @_;
1246		1535
1247	my $child = $self->{children}[0];	1536	my $child = $self->{children}[0];
1248		1537
…		…
1253	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1542	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1254		1543
1255	my $border = $self->border;	1544	my $border = $self->border;
1256		1545
1257	glColor @{ $self->{border_bg} };	1546	glColor @{ $self->{border_bg} };
1258	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1547	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1259	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1548	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1260	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1549	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1261	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1550	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1551
		1552	# move
		1553	my $w2 = ($w - $border) * .5;
		1554	my $h2 = ($h - $border) * .5;
		1555	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1556	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1557	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1558
		1559	# resize
		1560	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1561	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1562	unless $self->{has_close_button};
		1563	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1564	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1262		1565
1263	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1566	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1264	glColor @{ $self->{bg} };	1567	glColor @{ $self->{bg} };
1265		1568
1266	# TODO: repeat texture not scale	1569	# TODO: repeat texture not scale
…		…
1285	if $self->{close_button};	1588	if $self->{close_button};
1286	}	1589	}
1287		1590
1288	#############################################################################	1591	#############################################################################
1289		1592
1290	package CFClient::UI::Table;	1593	package CFPlus::UI::Table;
1291		1594
1292	our @ISA = CFClient::UI::Base::;	1595	our @ISA = CFPlus::UI::Container::;
1293		1596
1294	use List::Util qw(max sum);	1597	use List::Util qw(max sum);
1295		1598
1296	use CFClient::OpenGL;	1599	use CFPlus::OpenGL;
1297		1600
1298	sub new {	1601	sub new {
1299	my $class = shift;	1602	my $class = shift;
1300		1603
1301	$class->SUPER::new (	1604	$class->SUPER::new (
1302	col_expand => [],	1605	col_expand => [],
		1606	row_expand => [],
1303	@_,	1607	@_,
1304	)	1608	)
1305	}	1609	}
1306		1610
1307	sub children {
1308	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309	}
1310
1311	sub add {	1611	sub add {
1312	my ($self, $x, $y, $child) = @_;	1612	my ($self, @widgets) = @_;
1313		1613
1314	$child->set_parent ($self);	1614	for my $child (@widgets) {
1315	$self->{children}[$y][$x] = $child;	1615	$child->{rowspan} ||= 1;
		1616	$child->{colspan} ||= 1;
		1617	}
1316		1618
1317	$self->realloc;	1619	$self->SUPER::add (@widgets);
1318	}	1620	}
1319		1621
1320	sub remove {	1622	sub add_at {
		1623	my $self = shift;
		1624
		1625	my @widgets;
		1626
		1627	while (@_) {
		1628	my ($col, $row, $child) = splice @_, 0, 3, ();
		1629
		1630	$child->{row} = $row;
		1631	$child->{col} = $col;
		1632
		1633	push @widgets, $child;
		1634	}
		1635
		1636	$self->add (@widgets);
		1637	}
		1638
		1639	sub get_wh {
1321	my ($self, $child) = @_;	1640	my ($self) = @_;
1322		1641
1323	# TODO: not yet implemented	1642	my (@w, @h);
1324	}
1325
1326	# TODO: move to container class maybe? send children a signal on removal?
1327	sub clear {
1328	my ($self) = @_;
1329		1643
1330	my @children = $self->children;	1644	my @children = $self->children;
1331	delete $self->{children};	1645
		1646	# first pass, columns
		1647	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1648	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1649
		1650	my $sw = sum @w[$c .. $c + $cs - 1];
		1651
		1652	if ($w > $sw) {
		1653	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1654	}
1332		1655	}
1333	for (@children) {
1334	delete $_->{parent};
1335	$_->hide;
1336	}
1337		1656
1338	$self->realloc;	1657	# second pass, rows
1339	}	1658	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1340
1341	sub get_wh {
1342	my ($self) = @_;
1343
1344	my (@w, @h);
1345
1346	for my $y (0 .. $#{$self->{children}}) {
1347	my $row = $self->{children}[$y]
1348	or next;
1349
1350	for my $x (0 .. $#$row) {
1351	my $widget = $row->[$x]
1352	or next;
1353	my ($w, $h) = @$widget{qw(req_w req_h)};	1659	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1354		1660
1355	$w[$x] = max $w[$x], $w;	1661	my $sh = sum @h[$r .. $r + $rs - 1];
1356	$h[$y] = max $h[$y], $h;	1662
		1663	if ($h > $sh) {
		1664	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1357	}	1665	}
1358	}	1666	}
1359		1667
1360	(\@w, \@h)	1668	(\@w, \@h)
1361	}	1669	}
…		…
1377	my ($ws, $hs) = $self->get_wh;	1685	my ($ws, $hs) = $self->get_wh;
1378		1686
1379	my $req_w = (sum @$ws) || 1;	1687	my $req_w = (sum @$ws) || 1;
1380	my $req_h = (sum @$hs) || 1;	1688	my $req_h = (sum @$hs) || 1;
1381		1689
1382	# TODO: nicer code && do row_expand	1690	# now linearly scale the rows/columns to the allocated size
1383	my @col_expand = @{$self->{col_expand}};	1691	my @col_expand = @{$self->{col_expand}};
1384	@col_expand = (1) x @$ws unless @col_expand;	1692	@col_expand = (1) x @$ws unless @col_expand;
1385	my $col_expand = (sum @col_expand) || 1;	1693	my $col_expand = (sum @col_expand) || 1;
1386		1694
1387	# linearly scale sizes
1388	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1695	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1389	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1390		1696
1391	CFClient::UI::harmonize $ws;	1697	CFPlus::UI::harmonize $ws;
		1698
		1699	my @row_expand = @{$self->{row_expand}};
		1700	@row_expand = (1) x @$ws unless @row_expand;
		1701	my $row_expand = (sum @row_expand) || 1;
		1702
		1703	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1704
1392	CFClient::UI::harmonize $hs;	1705	CFPlus::UI::harmonize $hs;
1393		1706
1394	my $y;	1707	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1708	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1395		1709
1396	for my $r (0 .. $#{$self->{children}}) {	1710	for my $widget ($self->children) {
1397	my $row = $self->{children}[$r]	1711	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1398	or next;
1399		1712
1400	my $x = 0;	1713	$widget->configure (
1401	my $row_h = $hs->[$r];	1714	$x[$c], $y[$r],
		1715	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1402		1716	);
1403	for my $c (0 .. $#$row) {	1717	}
1404	my $col_w = $ws->[$c];
1405		1718
1406	if (my $widget = $row->[$c]) {	1719	1
1407	$widget->configure ($x, $y, $col_w, $row_h);	1720	}
1408	}
1409		1721
1410	$x += $col_w;	1722	#############################################################################
		1723
		1724	package CFPlus::UI::Fixed;
		1725
		1726	use List::Util qw(min max);
		1727
		1728	our @ISA = CFPlus::UI::Container::;
		1729
		1730	sub add {
		1731	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1732
		1733	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1734	$self->SUPER::add ($child);
		1735	}
		1736
		1737	sub _scale($$$) {
		1738	my ($mode, $val, $max) = @_;
		1739
		1740	$mode eq "abs" ? $val
		1741	: $mode eq "rel" ? $val * $max
		1742	: 0
		1743	}
		1744
		1745	sub size_request {
		1746	my ($self) = @_;
		1747
		1748	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1749
		1750	# determine overall size by querying abs widgets
		1751	for my $child ($self->visible_children) {
		1752	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1753
		1754	if ($pos eq "abs") {
		1755	$w = _scale $size, $w, $child->{req_w};
		1756	$h = _scale $size, $h, $child->{req_h};
		1757
		1758	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1759	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1411	}	1760	}
		1761	}
1412		1762
1413	$y += $row_h;	1763	my $W = $x2 - $x1;
		1764	my $H = $y2 - $y1;
		1765
		1766	# now layout remaining widgets
		1767	for my $child ($self->visible_children) {
		1768	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1769
		1770	if ($pos ne "abs") {
		1771	$x = _scale $pos, $x, $W;
		1772	$y = _scale $pos, $x, $H;
		1773	$w = _scale $size, $w, $child->{req_w};
		1774	$h = _scale $size, $h, $child->{req_h};
		1775
		1776	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1777	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1778	}
		1779	}
		1780
		1781	my $W = $x2 - $x1;
		1782	my $H = $y2 - $y1;
		1783
		1784	($W, $H)
		1785	}
		1786
		1787	sub invoke_size_allocate {
		1788	my ($self, $W, $H) = @_;
		1789
		1790	for my $child ($self->visible_children) {
		1791	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1792
		1793	$x = _scale $pos, $x, $W;
		1794	$y = _scale $pos, $x, $H;
		1795	$w = _scale $size, $w, $child->{req_w};
		1796	$h = _scale $size, $h, $child->{req_h};
		1797
		1798	$child->configure ($x, $y, $w, $h);
1414	}	1799	}
1415		1800
1416	1	1801	1
1417	}	1802	}
1418		1803
1419	sub find_widget {
1420	my ($self, $x, $y) = @_;
1421
1422	$x -= $self->{x};
1423	$y -= $self->{y};
1424
1425	my $res;
1426
1427	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1428	$res = $_->find_widget ($x, $y)
1429	and return $res;
1430	}
1431
1432	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1433	}
1434
1435	sub _draw {
1436	my ($self) = @_;
1437
1438	for (grep $_, @{$self->{children}}) {
1439	$_->draw for grep $_, @$_;
1440	}
1441	}
1442
1443	#############################################################################	1804	#############################################################################
1444		1805
1445	package CFClient::UI::Box;	1806	package CFPlus::UI::Box;
1446		1807
1447	our @ISA = CFClient::UI::Container::;	1808	our @ISA = CFPlus::UI::Container::;
1448		1809
1449	sub size_request {	1810	sub size_request {
1450	my ($self) = @_;	1811	my ($self) = @_;
1451		1812
1452	$self->{vertical}	1813	$self->{vertical}
…		…
1485	$req[$_] += $space * $children[$_]{expand}	1846	$req[$_] += $space * $children[$_]{expand}
1486	for 0 .. $#children;	1847	for 0 .. $#children;
1487	}	1848	}
1488	}	1849	}
1489		1850
1490	CFClient::UI::harmonize \@req;	1851	CFPlus::UI::harmonize \@req;
1491		1852
1492	my $pos = 0;	1853	my $pos = 0;
1493	for (0 .. $#children) {	1854	for (0 .. $#children) {
1494	my $alloc = $req[$_];	1855	my $alloc = $req[$_];
1495	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1856	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1500	1	1861	1
1501	}	1862	}
1502		1863
1503	#############################################################################	1864	#############################################################################
1504		1865
1505	package CFClient::UI::HBox;	1866	package CFPlus::UI::HBox;
1506		1867
1507	our @ISA = CFClient::UI::Box::;	1868	our @ISA = CFPlus::UI::Box::;
1508		1869
1509	sub new {	1870	sub new {
1510	my $class = shift;	1871	my $class = shift;
1511		1872
1512	$class->SUPER::new (	1873	$class->SUPER::new (
…		…
1515	)	1876	)
1516	}	1877	}
1517		1878
1518	#############################################################################	1879	#############################################################################
1519		1880
1520	package CFClient::UI::VBox;	1881	package CFPlus::UI::VBox;
1521		1882
1522	our @ISA = CFClient::UI::Box::;	1883	our @ISA = CFPlus::UI::Box::;
1523		1884
1524	sub new {	1885	sub new {
1525	my $class = shift;	1886	my $class = shift;
1526		1887
1527	$class->SUPER::new (	1888	$class->SUPER::new (
…		…
1530	)	1891	)
1531	}	1892	}
1532		1893
1533	#############################################################################	1894	#############################################################################
1534		1895
1535	package CFClient::UI::Label;	1896	package CFPlus::UI::Label;
1536		1897
1537	our @ISA = CFClient::UI::DrawBG::;	1898	our @ISA = CFPlus::UI::DrawBG::;
1538		1899
1539	use CFClient::OpenGL;	1900	use CFPlus::OpenGL;
1540		1901
1541	sub new {	1902	sub new {
1542	my ($class, %arg) = @_;	1903	my ($class, %arg) = @_;
1543		1904
1544	my $self = $class->SUPER::new (	1905	my $self = $class->SUPER::new (
…		…
1547	#active_bg => none	1908	#active_bg => none
1548	#font => default_font	1909	#font => default_font
1549	#text => initial text	1910	#text => initial text
1550	#markup => initial narkup	1911	#markup => initial narkup
1551	#max_w => maximum pixel width	1912	#max_w => maximum pixel width
		1913	#style => 0, # render flags
1552	ellipsise => 3, # end	1914	ellipsise => 3, # end
1553	layout => (new CFClient::Layout),	1915	layout => (new CFPlus::Layout),
1554	fontsize => 1,	1916	fontsize => 1,
1555	align => -1,	1917	align => -1,
1556	valign => -1,	1918	valign => -1,
1557	padding_x => 2,	1919	padding_x => 2,
1558	padding_y => 2,	1920	padding_y => 2,
1559	can_events => 0,	1921	can_events => 0,
1560	%arg	1922	%arg
1561	);	1923	);
1562		1924
1563	if (exists $self->{template}) {	1925	if (exists $self->{template}) {
1564	my $layout = new CFClient::Layout;	1926	my $layout = new CFPlus::Layout;
1565	$layout->set_text (delete $self->{template});	1927	$layout->set_text (delete $self->{template});
1566	$self->{template} = $layout;	1928	$self->{template} = $layout;
1567	}	1929	}
1568		1930
1569	if (exists $self->{markup}) {	1931	if (exists $self->{markup}) {
…		…
1571	} else {	1933	} else {
1572	$self->set_text (delete $self->{text});	1934	$self->set_text (delete $self->{text});
1573	}	1935	}
1574		1936
1575	$self	1937	$self
1576	}
1577
1578	sub escape($) {
1579	local $_ = $_[0];
1580
1581	s/&/&amp;/g;
1582	s/>/&gt;/g;
1583	s/</&lt;/g;
1584
1585	$_
1586	}	1938	}
1587		1939
1588	sub update {	1940	sub update {
1589	my ($self) = @_;	1941	my ($self) = @_;
1590		1942
…		…
1717	};	2069	};
1718		2070
1719	my $w = List::Util::min $self->{w} + 4, $size->[0];	2071	my $w = List::Util::min $self->{w} + 4, $size->[0];
1720	my $h = List::Util::min $self->{h} + 2, $size->[1];	2072	my $h = List::Util::min $self->{h} + 2, $size->[1];
1721		2073
1722	$self->{layout}->render ($self->{ox}, $self->{oy});	2074	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1723	}	2075	}
1724		2076
1725	#############################################################################	2077	#############################################################################
1726		2078
1727	package CFClient::UI::EntryBase;	2079	package CFPlus::UI::EntryBase;
1728		2080
1729	our @ISA = CFClient::UI::Label::;	2081	our @ISA = CFPlus::UI::Label::;
1730		2082
1731	use CFClient::OpenGL;	2083	use CFPlus::OpenGL;
1732		2084
1733	sub new {	2085	sub new {
1734	my $class = shift;	2086	my $class = shift;
1735		2087
1736	$class->SUPER::new (	2088	$class->SUPER::new (
…		…
1740	active_fg => [0, 0, 0],	2092	active_fg => [0, 0, 0],
1741	can_hover => 1,	2093	can_hover => 1,
1742	can_focus => 1,	2094	can_focus => 1,
1743	valign => 0,	2095	valign => 0,
1744	can_events => 1,	2096	can_events => 1,
		2097	ellipsise => 0,
1745	#text => ...	2098	#text => ...
1746	#hidden => "*",	2099	#hidden => "*",
1747	@_	2100	@_
1748	)	2101	)
1749	}	2102	}
…		…
1794	my $sym = $ev->{sym};	2147	my $sym = $ev->{sym};
1795	my $uni = $ev->{unicode};	2148	my $uni = $ev->{unicode};
1796		2149
1797	my $text = $self->get_text;	2150	my $text = $self->get_text;
1798		2151
		2152	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2153
1799	if ($uni == 8) {	2154	if ($uni == 8) {
1800	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2155	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1801	} elsif ($uni == 127) {	2156	} elsif ($uni == 127) {
1802	substr $text, $self->{cursor}, 1, "";	2157	substr $text, $self->{cursor}, 1, "";
1803	} elsif ($sym == CFClient::SDLK_LEFT) {	2158	} elsif ($sym == CFPlus::SDLK_LEFT) {
1804	--$self->{cursor} if $self->{cursor};	2159	--$self->{cursor} if $self->{cursor};
1805	} elsif ($sym == CFClient::SDLK_RIGHT) {	2160	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1806	++$self->{cursor} if $self->{cursor} < length $self->{text};	2161	++$self->{cursor} if $self->{cursor} < length $self->{text};
1807	} elsif ($sym == CFClient::SDLK_HOME) {	2162	} elsif ($sym == CFPlus::SDLK_HOME) {
		2163	# what a hack
		2164	$self->{cursor} =
		2165	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2166	? length $1
		2167	: 0;
		2168	} elsif ($sym == CFPlus::SDLK_END) {
		2169	# uh, again
		2170	$self->{cursor} =
		2171	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2172	? $self->{cursor} + length $1
		2173	: length $self->{text};
		2174	} elsif ($uni == 21) { # ctrl-u
		2175	$text = "";
1808	$self->{cursor} = 0;	2176	$self->{cursor} = 0;
1809	} elsif ($sym == CFClient::SDLK_END) {
1810	$self->{cursor} = length $text;
1811	} elsif ($uni == 27) {	2177	} elsif ($uni == 27) {
1812	$self->emit ('escape');	2178	$self->emit ('escape');
1813	} elsif ($uni) {	2179	} elsif ($uni == 0x0d) {
		2180	substr $text, $self->{cursor}++, 0, "\012";
		2181	} elsif ($uni >= 0x20) {
1814	substr $text, $self->{cursor}++, 0, chr $uni;	2182	substr $text, $self->{cursor}++, 0, chr $uni;
1815	} else {	2183	} else {
1816	return 0;	2184	return 0;
1817	}	2185	}
1818		2186
1819	$self->_set_text ($text);	2187	$self->_set_text ($text);
1820		2188
1821	$self->realloc;	2189	$self->realloc;
		2190	$self->update;
1822		2191
1823	1	2192	1
1824	}	2193	}
1825		2194
1826	sub invoke_focus_in {	2195	sub invoke_focus_in {
…		…
1888	utf8::encode $text;	2257	utf8::encode $text;
1889		2258
1890	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2259	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1891	}	2260	}
1892		2261
1893	glColor @{$self->{fg}};
1894	glBegin GL_LINES;	2262	glBegin GL_LINES;
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2263	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1896	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2264	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1897	glEnd;	2265	glEnd;
1898	}	2266	}
1899	}	2267	}
1900		2268
		2269	#############################################################################
		2270
1901	package CFClient::UI::Entry;	2271	package CFPlus::UI::Entry;
1902		2272
1903	our @ISA = CFClient::UI::EntryBase::;	2273	our @ISA = CFPlus::UI::EntryBase::;
1904		2274
1905	use CFClient::OpenGL;	2275	use CFPlus::OpenGL;
1906		2276
1907	sub invoke_key_down {	2277	sub invoke_key_down {
1908	my ($self, $ev) = @_;	2278	my ($self, $ev) = @_;
1909		2279
1910	my $sym = $ev->{sym};	2280	my $sym = $ev->{sym};
1911		2281
1912	if ($sym == 13) {	2282	if ($ev->{uni} == 0x0d || $sym == 13) {
1913	unshift @{$self->{history}},	2283	unshift @{$self->{history}},
1914	my $txt = $self->get_text;	2284	my $txt = $self->get_text;
1915		2285
1916	$self->{history_pointer} = -1;	2286	$self->{history_pointer} = -1;
1917	$self->{history_saveback} = '';	2287	$self->{history_saveback} = '';
1918	$self->emit (activate => $txt);	2288	$self->emit (activate => $txt);
1919	$self->update;	2289	$self->update;
1920		2290
1921	} elsif ($sym == CFClient::SDLK_UP) {	2291	} elsif ($sym == CFPlus::SDLK_UP) {
1922	if ($self->{history_pointer} < 0) {	2292	if ($self->{history_pointer} < 0) {
1923	$self->{history_saveback} = $self->get_text;	2293	$self->{history_saveback} = $self->get_text;
1924	}	2294	}
1925	if (@{$self->{history} || []} > 0) {	2295	if (@{$self->{history} || []} > 0) {
1926	$self->{history_pointer}++;	2296	$self->{history_pointer}++;
…		…
1928	$self->{history_pointer} = @{$self->{history} || []} - 1;	2298	$self->{history_pointer} = @{$self->{history} || []} - 1;
1929	}	2299	}
1930	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2300	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1931	}	2301	}
1932		2302
1933	} elsif ($sym == CFClient::SDLK_DOWN) {	2303	} elsif ($sym == CFPlus::SDLK_DOWN) {
1934	$self->{history_pointer}--;	2304	$self->{history_pointer}--;
1935	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2305	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1936		2306
1937	if ($self->{history_pointer} >= 0) {	2307	if ($self->{history_pointer} >= 0) {
1938	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2308	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1947	1	2317	1
1948	}	2318	}
1949		2319
1950	#############################################################################	2320	#############################################################################
1951		2321
		2322	package CFPlus::UI::TextEdit;
		2323
		2324	our @ISA = CFPlus::UI::EntryBase::;
		2325
		2326	use CFPlus::OpenGL;
		2327
		2328	sub move_cursor_ver {
		2329	my ($self, $dy) = @_;
		2330
		2331	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2332
		2333	$y += $dy;
		2334
		2335	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2336	$self->{cursor} = $index;
		2337	delete $self->{cur_h};
		2338	$self->update;
		2339	return;
		2340	}
		2341	}
		2342
		2343	sub invoke_key_down {
		2344	my ($self, $ev) = @_;
		2345
		2346	my $sym = $ev->{sym};
		2347
		2348	if ($sym == CFPlus::SDLK_UP) {
		2349	$self->move_cursor_ver (-1);
		2350	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2351	$self->move_cursor_ver (+1);
		2352	} else {
		2353	return $self->SUPER::invoke_key_down ($ev)
		2354	}
		2355
		2356	1
		2357	}
		2358
		2359	#############################################################################
		2360
1952	package CFClient::UI::Button;	2361	package CFPlus::UI::Button;
1953		2362
1954	our @ISA = CFClient::UI::Label::;	2363	our @ISA = CFPlus::UI::Label::;
1955		2364
1956	use CFClient::OpenGL;	2365	use CFPlus::OpenGL;
1957		2366
1958	my @tex =	2367	my @tex =
1959	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2368	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1960	qw(b1_button_active.png);	2369	qw(b1_button_inactive.png b1_button_active.png);
1961		2370
1962	sub new {	2371	sub new {
1963	my $class = shift;	2372	my $class = shift;
1964		2373
1965	$class->SUPER::new (	2374	$class->SUPER::new (
1966	padding_x => 4,	2375	padding_x => 4,
1967	padding_y => 4,	2376	padding_y => 4,
1968	fg => [1, 1, 1],	2377	fg => [1.0, 1.0, 1.0],
1969	active_fg => [0, 0, 1],	2378	active_fg => [0.8, 0.8, 0.8],
1970	can_hover => 1,	2379	can_hover => 1,
1971	align => 0,	2380	align => 0,
1972	valign => 0,	2381	valign => 0,
1973	can_events => 1,	2382	can_events => 1,
1974	@_	2383	@_
…		…
1992		2401
1993	glEnable GL_TEXTURE_2D;	2402	glEnable GL_TEXTURE_2D;
1994	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2403	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1995	glColor 0, 0, 0, 1;	2404	glColor 0, 0, 0, 1;
1996		2405
		2406	my $tex = $tex[$GRAB == $self];
1997	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2407	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1998		2408
1999	glDisable GL_TEXTURE_2D;	2409	glDisable GL_TEXTURE_2D;
2000		2410
2001	$self->SUPER::_draw;	2411	$self->SUPER::_draw;
2002	}	2412	}
2003		2413
2004	#############################################################################	2414	#############################################################################
2005		2415
		2416	package CFPlus::UI::CheckBox;
		2417
		2418	our @ISA = CFPlus::UI::DrawBG::;
		2419
		2420	my @tex =
		2421	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2422	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2423
		2424	use CFPlus::OpenGL;
		2425
		2426	sub new {
		2427	my $class = shift;
		2428
		2429	$class->SUPER::new (
		2430	padding_x => 2,
		2431	padding_y => 2,
		2432	fg => [1, 1, 1],
		2433	active_fg => [1, 1, 0],
		2434	bg => [0, 0, 0, 0.2],
		2435	active_bg => [1, 1, 1, 0.5],
		2436	state => 0,
		2437	can_hover => 1,
		2438	@_
		2439	)
		2440	}
		2441
		2442	sub size_request {
		2443	my ($self) = @_;
		2444
		2445	(6) x 2
		2446	}
		2447
		2448	sub toggle {
		2449	my ($self) = @_;
		2450
		2451	$self->{state} = !$self->{state};
		2452	$self->emit (changed => $self->{state});
		2453	$self->update;
		2454	}
		2455
		2456	sub invoke_button_down {
		2457	my ($self, $ev, $x, $y) = @_;
		2458
		2459	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2460	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2461	$self->toggle;
		2462	} else {
		2463	return 0
		2464	}
		2465
		2466	1
		2467	}
		2468
		2469	sub _draw {
		2470	my ($self) = @_;
		2471
		2472	$self->SUPER::_draw;
		2473
		2474	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2475
		2476	my ($w, $h) = @$self{qw(w h)};
		2477
		2478	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2479
		2480	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2481
		2482	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2483
		2484	glEnable GL_TEXTURE_2D;
		2485	$tex->draw_quad_alpha (0, 0, $s, $s);
		2486	glDisable GL_TEXTURE_2D;
		2487	}
		2488
		2489	#############################################################################
		2490
		2491	package CFPlus::UI::Image;
		2492
		2493	our @ISA = CFPlus::UI::Base::;
		2494
		2495	use CFPlus::OpenGL;
		2496
		2497	our %texture_cache;
		2498
		2499	sub new {
		2500	my $class = shift;
		2501
		2502	my $self = $class->SUPER::new (
		2503	can_events => 0,
		2504	@_,
		2505	);
		2506
		2507	$self->{path} || $self->{tex}
		2508	or Carp::croak "'path' or 'tex' attributes required";
		2509
		2510	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2511	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2512
		2513	CFPlus::weaken $texture_cache{$self->{path}};
		2514
		2515	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2516
		2517	$self
		2518	}
		2519
		2520	sub STORABLE_freeze {
		2521	my ($self, $cloning) = @_;
		2522
		2523	$self->{path}
		2524	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2525
		2526	$self->{path}
		2527	}
		2528
		2529	sub STORABLE_attach {
		2530	my ($self, $cloning, $path) = @_;
		2531
		2532	$self->new (path => $path)
		2533	}
		2534
		2535	sub size_request {
		2536	my ($self) = @_;
		2537
		2538	($self->{tex}{w}, $self->{tex}{h})
		2539	}
		2540
		2541	sub _draw {
		2542	my ($self) = @_;
		2543
		2544	my $tex = $self->{tex};
		2545
		2546	my ($w, $h) = ($self->{w}, $self->{h});
		2547
		2548	if ($self->{rot90}) {
		2549	glRotate 90, 0, 0, 1;
		2550	glTranslate 0, -$self->{w}, 0;
		2551
		2552	($w, $h) = ($h, $w);
		2553	}
		2554
		2555	glEnable GL_TEXTURE_2D;
		2556	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2557
		2558	$tex->draw_quad (0, 0, $w, $h);
		2559
		2560	glDisable GL_TEXTURE_2D;
		2561	}
		2562
		2563	#############################################################################
		2564
2006	package CFClient::UI::ImageButton;	2565	package CFPlus::UI::ImageButton;
2007		2566
2008	our @ISA = CFClient::UI::Image::;	2567	our @ISA = CFPlus::UI::Image::;
2009		2568
2010	use CFClient::OpenGL;	2569	use CFPlus::OpenGL;
2011		2570
2012	my %textures;	2571	my %textures;
2013		2572
2014	sub new {	2573	sub new {
2015	my $class = shift;	2574	my $class = shift;
…		…
2037	1	2596	1
2038	}	2597	}
2039		2598
2040	#############################################################################	2599	#############################################################################
2041		2600
2042	package CFClient::UI::CheckBox;
2043
2044	our @ISA = CFClient::UI::DrawBG::;
2045
2046	my @tex =
2047	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2048	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2049
2050	use CFClient::OpenGL;
2051
2052	sub new {
2053	my $class = shift;
2054
2055	$class->SUPER::new (
2056	padding_x => 2,
2057	padding_y => 2,
2058	fg => [1, 1, 1],
2059	active_fg => [1, 1, 0],
2060	bg => [0, 0, 0, 0.2],
2061	active_bg => [1, 1, 1, 0.5],
2062	state => 0,
2063	can_hover => 1,
2064	@_
2065	)
2066	}
2067
2068	sub size_request {
2069	my ($self) = @_;
2070
2071	(6) x 2
2072	}
2073
2074	sub toggle {
2075	my ($self) = @_;
2076
2077	$self->{state} = !$self->{state};
2078	$self->emit (changed => $self->{state});
2079	$self->update;
2080	}
2081
2082	sub invoke_button_down {
2083	my ($self, $ev, $x, $y) = @_;
2084
2085	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2086	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2087	$self->toggle;
2088	} else {
2089	return 0
2090	}
2091
2092	1
2093	}
2094
2095	sub _draw {
2096	my ($self) = @_;
2097
2098	$self->SUPER::_draw;
2099
2100	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2101
2102	my ($w, $h) = @$self{qw(w h)};
2103
2104	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2105
2106	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2107
2108	my $tex = $self->{state} ? $tex[1] : $tex[0];
2109
2110	glEnable GL_TEXTURE_2D;
2111	$tex->draw_quad_alpha (0, 0, $s, $s);
2112	glDisable GL_TEXTURE_2D;
2113	}
2114
2115	#############################################################################
2116
2117	package CFClient::UI::Image;	2601	package CFPlus::UI::VGauge;
2118		2602
2119	our @ISA = CFClient::UI::Base::;	2603	our @ISA = CFPlus::UI::Base::;
2120
2121	use CFClient::OpenGL;
2122
2123	our %texture_cache;
2124
2125	sub new {
2126	my $class = shift;
2127
2128	my $self = $class->SUPER::new (
2129	can_events => 0,
2130	@_,
2131	);
2132
2133	$self->{path} || $self->{tex}
2134	or Carp::croak "'path' or 'tex' attributes required";
2135
2136	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2137	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2138
2139	Scalar::Util::weaken $texture_cache{$self->{path}};
2140
2141	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2142
2143	$self
2144	}
2145
2146	sub size_request {
2147	my ($self) = @_;
2148
2149	($self->{tex}{w}, $self->{tex}{h})
2150	}
2151
2152	sub _draw {
2153	my ($self) = @_;
2154
2155	my $tex = $self->{tex};
2156
2157	my ($w, $h) = ($self->{w}, $self->{h});
2158
2159	if ($self->{rot90}) {
2160	glRotate 90, 0, 0, 1;
2161	glTranslate 0, -$self->{w}, 0;
2162
2163	($w, $h) = ($h, $w);
2164	}
2165
2166	glEnable GL_TEXTURE_2D;
2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2168
2169	$tex->draw_quad_alpha (0, 0, $w, $h);
2170
2171	glDisable GL_TEXTURE_2D;
2172	}
2173
2174	#############################################################################
2175
2176	package CFClient::UI::VGauge;
2177
2178	our @ISA = CFClient::UI::Base::;
2179		2604
2180	use List::Util qw(min max);	2605	use List::Util qw(min max);
2181		2606
2182	use CFClient::OpenGL;	2607	use CFPlus::OpenGL;
2183		2608
2184	my %tex = (	2609	my %tex = (
2185	food => [	2610	food => [
2186	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2611	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2612	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2188	],	2613	],
2189	grace => [	2614	grace => [
2190	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2615	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2616	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2192	],	2617	],
2193	hp => [	2618	hp => [
2194	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2619	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2195	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2620	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2196	],	2621	],
2197	mana => [	2622	mana => [
2198	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2623	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2199	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2624	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2200	],	2625	],
2201	);	2626	);
2202		2627
2203	# eg. VGauge->new (gauge => 'food'), default gauge: food	2628	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2306	glDisable GL_TEXTURE_2D;	2731	glDisable GL_TEXTURE_2D;
2307	}	2732	}
2308		2733
2309	#############################################################################	2734	#############################################################################
2310		2735
2311	package CFClient::UI::Gauge;	2736	package CFPlus::UI::Gauge;
2312		2737
2313	our @ISA = CFClient::UI::VBox::;	2738	our @ISA = CFPlus::UI::VBox::;
2314		2739
2315	sub new {	2740	sub new {
2316	my ($class, %arg) = @_;	2741	my ($class, %arg) = @_;
2317		2742
2318	my $self = $class->SUPER::new (	2743	my $self = $class->SUPER::new (
…		…
2320	can_hover => 1,	2745	can_hover => 1,
2321	can_events => 1,	2746	can_events => 1,
2322	%arg,	2747	%arg,
2323	);	2748	);
2324		2749
2325	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2750	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2326	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2751	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2327	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2752	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2328		2753
2329	$self	2754	$self
2330	}	2755	}
2331		2756
2332	sub set_fontsize {	2757	sub set_fontsize {
…		…
2353	$self->{value}->set_text ($val);	2778	$self->{value}->set_text ($val);
2354	}	2779	}
2355		2780
2356	#############################################################################	2781	#############################################################################
2357		2782
2358	package CFClient::UI::Slider;	2783	package CFPlus::UI::Slider;
2359		2784
2360	use strict;	2785	use strict;
2361		2786
2362	use CFClient::OpenGL;	2787	use CFPlus::OpenGL;
2363		2788
2364	our @ISA = CFClient::UI::DrawBG::;	2789	our @ISA = CFPlus::UI::DrawBG::;
2365		2790
2366	my @tex =	2791	my @tex =
2367	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2792	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2368	qw(s1_slider.png s1_slider_bg.png);	2793	qw(s1_slider.png s1_slider_bg.png);
2369		2794
2370	sub new {	2795	sub new {
2371	my $class = shift;	2796	my $class = shift;
2372		2797
…		…
2461	}	2886	}
2462		2887
2463	1	2888	1
2464	}	2889	}
2465		2890
		2891	sub invoke_mouse_wheel {
		2892	my ($self, $ev) = @_;
		2893
		2894	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2895
		2896	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2897
		2898	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2899
		2900	! ! $delta
		2901	}
		2902
2466	sub update {	2903	sub update {
2467	my ($self) = @_;	2904	my ($self) = @_;
2468		2905
2469	delete $self->{knob_w};	2906	delete $self->{knob_w};
2470	$self->SUPER::update;	2907	$self->SUPER::update;
…		…
2517	glDisable GL_TEXTURE_2D;	2954	glDisable GL_TEXTURE_2D;
2518	}	2955	}
2519		2956
2520	#############################################################################	2957	#############################################################################
2521		2958
2522	package CFClient::UI::ValSlider;	2959	package CFPlus::UI::ValSlider;
2523		2960
2524	our @ISA = CFClient::UI::HBox::;	2961	our @ISA = CFPlus::UI::HBox::;
2525		2962
2526	sub new {	2963	sub new {
2527	my ($class, %arg) = @_;	2964	my ($class, %arg) = @_;
2528		2965
2529	my $range = delete $arg{range};	2966	my $range = delete $arg{range};
2530		2967
2531	my $self = $class->SUPER::new (	2968	my $self = $class->SUPER::new (
2532	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2969	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2533	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2970	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2534	to_value => sub { shift },	2971	to_value => sub { shift },
2535	from_value => sub { shift },	2972	from_value => sub { shift },
2536	%arg,	2973	%arg,
2537	);	2974	);
2538		2975
…		…
2558	sub set_range { shift->{slider}->set_range (@_) }	2995	sub set_range { shift->{slider}->set_range (@_) }
2559	sub set_value { shift->{slider}->set_value (@_) }	2996	sub set_value { shift->{slider}->set_value (@_) }
2560		2997
2561	#############################################################################	2998	#############################################################################
2562		2999
2563	package CFClient::UI::TextScroller;	3000	package CFPlus::UI::TextScroller;
2564		3001
2565	our @ISA = CFClient::UI::HBox::;	3002	our @ISA = CFPlus::UI::HBox::;
2566		3003
2567	use CFClient::OpenGL;	3004	use CFPlus::OpenGL;
2568		3005
2569	sub new {	3006	sub new {
2570	my $class = shift;	3007	my $class = shift;
2571		3008
2572	my $self = $class->SUPER::new (	3009	my $self = $class->SUPER::new (
2573	fontsize => 1,	3010	fontsize => 1,
2574	can_events => 0,	3011	can_events => 1,
2575	indent => 0,	3012	indent => 0,
2576	#font => default_font	3013	#font => default_font
2577	@_,	3014	@_,
2578		3015
2579	layout => (new CFClient::Layout),	3016	layout => (new CFPlus::Layout),
2580	par => [],	3017	par => [],
		3018	max_par => 0,
2581	height => 0,	3019	height => 0,
2582	children => [	3020	children => [
2583	(new CFClient::UI::Empty expand => 1),	3021	(new CFPlus::UI::Empty expand => 1),
2584	(new CFClient::UI::Slider vertical => 1),	3022	(new CFPlus::UI::Slider vertical => 1),
2585	],	3023	],
2586	);	3024	);
2587		3025
2588	$self->{children}[1]->connect (changed => sub { $self->update });	3026	$self->{children}[1]->connect (changed => sub { $self->update });
2589		3027
…		…
2619		3057
2620	$self->reflow;	3058	$self->reflow;
2621		3059
2622	local $self->{children} = [$empty, $slider];	3060	local $self->{children} = [$empty, $slider];
2623	$self->SUPER::invoke_size_allocate ($w, $h)	3061	$self->SUPER::invoke_size_allocate ($w, $h)
		3062	}
		3063
		3064	sub invoke_mouse_wheel {
		3065	my ($self, $ev) = @_;
		3066
		3067	return 0 unless $ev->{dy}; # only vertical movements
		3068
		3069	$self->{children}[1]->emit (mouse_wheel => $ev);
		3070
		3071	1
2624	}	3072	}
2625		3073
2626	sub get_layout {	3074	sub get_layout {
2627	my ($self, $para) = @_;	3075	my ($self, $para) = @_;
2628		3076
…		…
2656		3104
2657	# todo: base offset on lines or so, not on pixels	3105	# todo: base offset on lines or so, not on pixels
2658	$self->{children}[1]->set_value ($offset);	3106	$self->{children}[1]->set_value ($offset);
2659	}	3107	}
2660		3108
		3109	sub current_paragraph {
		3110	my ($self) = @_;
		3111
		3112	$self->{top_paragraph} - 1
		3113	}
		3114
		3115	sub scroll_to {
		3116	my ($self, $para) = @_;
		3117
		3118	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3119
		3120	$self->{scroll_to} = $para;
		3121	$self->update;
		3122	}
		3123
2661	sub clear {	3124	sub clear {
2662	my ($self) = @_;	3125	my ($self) = @_;
2663		3126
2664	my (undef, undef, @other) = @{ $self->{children} };	3127	my (undef, undef, @other) = @{ $self->{children} };
2665	$self->remove ($_) for @other;	3128	$self->remove ($_) for @other;
…		…
2668	$self->{height} = 0;	3131	$self->{height} = 0;
2669	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3132	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2670	}	3133	}
2671		3134
2672	sub add_paragraph {	3135	sub add_paragraph {
2673	my ($self, $color, $para, $indent) = @_;	3136	my $self = shift;
2674		3137
2675	my ($text, @w) = ref $para ? @$para : $para;	3138	for my $para (@_) {
2676
2677	$para = {	3139	$para = {
		3140	fg => [1, 1, 1, 1],
		3141	indent => 0,
		3142	markup => "",
		3143	widget => [],
		3144	ref $para ? %$para : (markup => $para),
2678	w => 1e10,	3145	w => 1e10,
2679	wrapped => 1,	3146	wrapped => 1,
2680	fg => $color,
2681	indent => $indent,
2682	markup => $text,
2683	widget => \@w,
2684	};	3147	};
2685		3148
2686	$self->add (@w) if @w;	3149	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2687	push @{$self->{par}}, $para;	3150	push @{$self->{par}}, $para;
		3151	}
		3152
		3153	if (my $max = $self->{max_par}) {
		3154	shift @{$self->{par}} while @{$self->{par}} > $max;
		3155	}
2688		3156
2689	$self->{need_reflow}++;	3157	$self->{need_reflow}++;
2690	$self->update;	3158	$self->update;
2691	}	3159	}
2692		3160
2693	sub scroll_to_bottom {	3161	sub scroll_to_bottom {
2694	my ($self) = @_;	3162	my ($self) = @_;
2695		3163
2696	$self->{scroll_to_bottom} = 1;	3164	$self->{scroll_to} = $#{$self->{par}};
2697	$self->update;	3165	$self->update;
2698	}	3166	}
2699		3167
		3168	sub force_uptodate {
		3169	my ($self) = @_;
		3170
		3171	if (delete $self->{need_reflow}) {
		3172	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3173
		3174	my $height = 0;
		3175
		3176	for my $para (@{$self->{par}}) {
		3177	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3178	my $layout = $self->get_layout ($para);
		3179	my ($w, $h) = $layout->size;
		3180
		3181	$para->{w} = $w + $para->{indent};
		3182	$para->{h} = $h;
		3183	$para->{wrapped} = $layout->has_wrapped;
		3184	}
		3185
		3186	$para->{y} = $height;
		3187	$height += $para->{h};
		3188	}
		3189
		3190	$self->{height} = $height;
		3191	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3192
		3193	delete $self->{texture};
		3194	}
		3195
		3196	if (my $paridx = delete $self->{scroll_to}) {
		3197	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3198	}
		3199	}
		3200
2700	sub update {	3201	sub update {
2701	my ($self) = @_;	3202	my ($self) = @_;
2702		3203
2703	$self->SUPER::update;	3204	$self->SUPER::update;
2704		3205
2705	return unless $self->{h} > 0;	3206	return unless $self->{h} > 0;
2706		3207
2707	delete $self->{texture};	3208	delete $self->{texture};
2708		3209
2709	$ROOT->on_post_alloc ($self => sub {	3210	$ROOT->on_post_alloc ($self => sub {
		3211	$self->force_uptodate;
		3212
2710	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3213	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711		3214
2712	if (delete $self->{need_reflow}) {
2713	my $height = 0;
2714
2715	for my $para (@{$self->{par}}) {
2716	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2717	my $layout = $self->get_layout ($para);
2718	my ($w, $h) = $layout->size;
2719
2720	$para->{w} = $w + $para->{indent};
2721	$para->{h} = $h;
2722	$para->{wrapped} = $layout->has_wrapped;
2723	}
2724
2725	$height += $para->{h};
2726	}
2727
2728	$self->{height} = $height;
2729
2730	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2731
2732	delete $self->{texture};
2733	}
2734
2735	if (delete $self->{scroll_to_bottom}) {
2736	$self->{children}[1]->set_value (1e10);
2737	}
2738
2739	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3215	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2740	glClearColor 0, 0, 0, 0;	3216	glClearColor 0, 0, 0, 0;
2741	glClear GL_COLOR_BUFFER_BIT;	3217	glClear GL_COLOR_BUFFER_BIT;
2742		3218
		3219	package CFPlus::UI::Base;
		3220	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3221	(0, 0, $self->{w}, $self->{h});
		3222
		3223	my $top = int $self->{children}[1]{range}[0];
		3224
		3225	my $paridx = 0;
		3226	my $top_paragraph;
2743	my $top = int $self->{children}[1]{range}[0];	3227	my $top = int $self->{children}[1]{range}[0];
2744		3228
2745	my $y0 = $top;	3229	my $y0 = $top;
2746	my $y1 = $top + $H;	3230	my $y1 = $top + $H;
2747		3231
2748	my $y = 0;
2749
2750	for my $para (@{$self->{par}}) {	3232	for my $para (@{$self->{par}}) {
2751	my $h = $para->{h};	3233	my $h = $para->{h};
		3234	my $y = $para->{y};
2752		3235
2753	if ($y0 < $y + $h && $y < $y1) {	3236	if ($y0 < $y + $h && $y < $y1) {
2754
2755	my $layout = $self->get_layout ($para);	3237	my $layout = $self->get_layout ($para);
2756		3238
2757	$layout->render ($para->{indent}, $y - $y0);	3239	$layout->render ($para->{indent}, $y - $y0);
2758		3240
2759	if (my @w = @{ $para->{widget} }) {	3241	if (my @w = @{ $para->{widget} }) {
…		…
2768	$_->draw;	3250	$_->draw;
2769	}	3251	}
2770	}	3252	}
2771	}	3253	}
2772		3254
2773	$y += $h;	3255	$paridx++;
		3256	$top_paragraph ||= $paridx if $y >= $top;
2774	}	3257	}
		3258
		3259	$self->{top_paragraph} = $top_paragraph;
2775	};	3260	};
2776	});	3261	});
2777	}	3262	}
2778		3263
2779	sub reconfigure {	3264	sub reconfigure {
…		…
2797	$self->{children}[1]->draw;	3282	$self->{children}[1]->draw;
2798	}	3283	}
2799		3284
2800	#############################################################################	3285	#############################################################################
2801		3286
2802	package CFClient::UI::Animator;	3287	package CFPlus::UI::Animator;
2803		3288
2804	use CFClient::OpenGL;	3289	use CFPlus::OpenGL;
2805		3290
2806	our @ISA = CFClient::UI::Bin::;	3291	our @ISA = CFPlus::UI::Bin::;
2807		3292
2808	sub moveto {	3293	sub moveto {
2809	my ($self, $x, $y) = @_;	3294	my ($self, $x, $y) = @_;
2810		3295
2811	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3296	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2839	glPopMatrix;	3324	glPopMatrix;
2840	}	3325	}
2841		3326
2842	#############################################################################	3327	#############################################################################
2843		3328
2844	package CFClient::UI::Flopper;	3329	package CFPlus::UI::Flopper;
2845		3330
2846	our @ISA = CFClient::UI::Button::;	3331	our @ISA = CFPlus::UI::Button::;
2847		3332
2848	sub new {	3333	sub new {
2849	my $class = shift;	3334	my $class = shift;
2850		3335
2851	my $self = $class->SUPER::new (	3336	my $self = $class->SUPER::new (
…		…
2863	$self->{other}->toggle_visibility;	3348	$self->{other}->toggle_visibility;
2864	}	3349	}
2865		3350
2866	#############################################################################	3351	#############################################################################
2867		3352
2868	package CFClient::UI::Tooltip;	3353	package CFPlus::UI::Tooltip;
2869		3354
2870	our @ISA = CFClient::UI::Bin::;	3355	our @ISA = CFPlus::UI::Bin::;
2871		3356
2872	use CFClient::OpenGL;	3357	use CFPlus::OpenGL;
2873		3358
2874	sub new {	3359	sub new {
2875	my $class = shift;	3360	my $class = shift;
2876		3361
2877	$class->SUPER::new (	3362	$class->SUPER::new (
…		…
2880	)	3365	)
2881	}	3366	}
2882		3367
2883	sub set_tooltip_from {	3368	sub set_tooltip_from {
2884	my ($self, $widget) = @_;	3369	my ($self, $widget) = @_;
		3370
		3371	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3372	if $widget->{tooltip} =~ /^#(.*)$/;
2885		3373
2886	my $tooltip = $widget->{tooltip};	3374	my $tooltip = $widget->{tooltip};
2887		3375
2888	if ($ENV{CFPLUS_DEBUG} & 2) {	3376	if ($ENV{CFPLUS_DEBUG} & 2) {
2889	$tooltip .= "\n\n" . (ref $widget) . "\n"	3377	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2893	}	3381	}
2894		3382
2895	$tooltip =~ s/^\n+//;	3383	$tooltip =~ s/^\n+//;
2896	$tooltip =~ s/\n+$//;	3384	$tooltip =~ s/\n+$//;
2897		3385
2898	$self->add (new CFClient::UI::Label	3386	$self->add (new CFPlus::UI::Label
2899	markup => $tooltip,	3387	markup => $tooltip,
2900	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3388	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2901	fontsize => 0.8,	3389	fontsize => 0.8,
2902	fg => [0, 0, 0, 1],	3390	style => 1, # FLAG_INVERSE
2903	ellipsise => 0,	3391	ellipsise => 0,
2904	font => ($widget->{tooltip_font} || $::FONT_PROP),	3392	font => ($widget->{tooltip_font} || $::FONT_PROP),
2905	);	3393	);
2906	}	3394	}
2907		3395
…		…
2926		3414
2927	$self->{root}->on_post_alloc ("move_$self" => sub {	3415	$self->{root}->on_post_alloc ("move_$self" => sub {
2928	my $widget = $self->{owner}	3416	my $widget = $self->{owner}
2929	or return;	3417	or return;
2930		3418
		3419	if ($widget->{visible}) {
2931	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3420	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932		3421
2933	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3422	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934	if $x + $self->{w} > $self->{root}{w};	3423	if $x + $self->{w} > $self->{root}{w};
2935		3424
2936	$self->move_abs ($x, $y);	3425	$self->move_abs ($x, $y);
		3426	} else {
		3427	$self->hide;
		3428	}
2937	});	3429	});
2938	}	3430	}
2939		3431
2940	sub _draw {	3432	sub _draw {
2941	my ($self) = @_;	3433	my ($self) = @_;
…		…
2965	$self->SUPER::_draw;	3457	$self->SUPER::_draw;
2966	}	3458	}
2967		3459
2968	#############################################################################	3460	#############################################################################
2969		3461
2970	package CFClient::UI::Face;	3462	package CFPlus::UI::Face;
2971		3463
2972	our @ISA = CFClient::UI::Base::;	3464	our @ISA = CFPlus::UI::DrawBG::;
2973		3465
2974	use CFClient::OpenGL;	3466	use CFPlus::OpenGL;
2975		3467
2976	sub new {	3468	sub new {
2977	my $class = shift;	3469	my $class = shift;
2978		3470
2979	my $self = $class->SUPER::new (	3471	my $self = $class->SUPER::new (
		3472	size_w => 32,
		3473	size_h => 8,
2980	aspect => 1,	3474	aspect => 1,
2981	can_events => 0,	3475	can_events => 0,
2982	@_,	3476	@_,
2983	);	3477	);
2984		3478
2985	if ($self->{anim} && $self->{animspeed}) {	3479	if ($self->{anim} && $self->{animspeed}) {
2986	Scalar::Util::weaken (my $widget = $self);	3480	CFPlus::weaken (my $widget = $self);
2987		3481
		3482	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3483	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2988	$self->{timer} = Event->timer (	3484	$self->{timer} = Event->timer (
2989	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2990	hard => 1,	3485	parked => 1,
2991	interval => $self->{animspeed},
2992	cb => sub {	3486	cb => sub {
		3487	return unless $::CONN && $widget;
		3488
2993	++$widget->{frame};	3489	++$widget->{frame};
		3490	$widget->update_face;
2994	$widget->update;	3491	$widget->update;
		3492
		3493	$widget->update_timer;
2995	},	3494	},
2996	);	3495	);
		3496
		3497	$self->update_face;
		3498	$self->update_timer;
2997	}	3499	}
2998		3500
2999	$self	3501	$self
3000	}	3502	}
3001		3503
		3504	sub update_timer {
		3505	my ($self) = @_;
		3506
		3507	return unless $self->{timer};
		3508
		3509	if ($self->{visible}) {
		3510	$self->{timer}->at (
		3511	$self->{anim_start}
		3512	+ $self->{animspeed}
		3513	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3514	);
		3515	$self->{timer}->start;
		3516	} else {
		3517	$self->{timer}->stop;
		3518	}
		3519	}
		3520
		3521	sub update_face {
		3522	my ($self) = @_;
		3523
		3524	return unless $::CONN;
		3525
		3526	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3527	if ($anim && @$anim) {
		3528	delete $self->{wait_face};
		3529	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3530	}
		3531	}
		3532	}
		3533
3002	sub size_request {	3534	sub size_request {
3003	(32, 8)	3535	my ($self) = @_;
		3536
		3537	if ($::CONN) {
		3538	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3539	if (my $tex = $::CONN->{texture}[$faceid]) {
		3540	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3541	} else {
		3542	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3543	$self->realloc;
		3544	});
		3545	}
		3546	}
		3547	}
		3548
		3549	($self->{size_w} || 8, $self->{size_h} || 8)
3004	}	3550	}
3005		3551
3006	sub update {	3552	sub update {
3007	my ($self) = @_;	3553	my ($self) = @_;
3008		3554
3009	return unless $self->{visible};	3555	return unless $self->{visible};
3010		3556
3011	$self->SUPER::update;	3557	$self->SUPER::update;
3012	}	3558	}
3013		3559
		3560	sub invoke_visibility_change {
		3561	my ($self) = @_;
		3562
		3563	$self->update_timer;
		3564
		3565	0
		3566	}
		3567
3014	sub _draw {	3568	sub _draw {
3015	my ($self) = @_;	3569	my ($self) = @_;
3016		3570
3017	return unless $::CONN;	3571	return unless $::CONN;
3018		3572
3019	my $face;	3573	$self->SUPER::_draw;
3020		3574
3021	if ($self->{frame}) {
3022	my $anim = $::CONN->{anim}[$self->{anim}];	3575	my $faceid = $::CONN->{faceid}[$self->{face}]
3023		3576	or return;
3024	$face = $anim->[ $self->{frame} % @$anim ]
3025	if $anim && @$anim;
3026	}
3027		3577
3028	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3578	my $tex = $::CONN->{texture}[$faceid];
3029		3579
3030	if ($tex) {	3580	if ($tex) {
3031	glEnable GL_TEXTURE_2D;	3581	glEnable GL_TEXTURE_2D;
3032	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3582	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3033	glColor 0, 0, 0, 1;	3583	glColor 0, 0, 0, 1;
…		…
3037	}	3587	}
3038		3588
3039	sub destroy {	3589	sub destroy {
3040	my ($self) = @_;	3590	my ($self) = @_;
3041		3591
3042	$self->{timer}->cancel	3592	(delete $self->{timer})->cancel
3043	if $self->{timer};	3593	if $self->{timer};
3044		3594
3045	$self->SUPER::destroy;	3595	$self->SUPER::destroy;
3046	}	3596	}
3047		3597
3048	#############################################################################	3598	#############################################################################
3049		3599
3050	package CFClient::UI::Buttonbar;	3600	package CFPlus::UI::Buttonbar;
3051		3601
3052	our @ISA = CFClient::UI::HBox::;	3602	our @ISA = CFPlus::UI::HBox::;
3053		3603
3054	# TODO: should actualyl wrap buttons and other goodies.	3604	# TODO: should actually wrap buttons and other goodies.
3055		3605
3056	#############################################################################	3606	#############################################################################
3057		3607
3058	package CFClient::UI::Menu;	3608	package CFPlus::UI::Menu;
3059		3609
3060	our @ISA = CFClient::UI::FancyFrame::;	3610	our @ISA = CFPlus::UI::Toplevel::;
3061		3611
3062	use CFClient::OpenGL;	3612	use CFPlus::OpenGL;
3063		3613
3064	sub new {	3614	sub new {
3065	my $class = shift;	3615	my $class = shift;
3066		3616
3067	my $self = $class->SUPER::new (	3617	my $self = $class->SUPER::new (
3068	items => [],	3618	items => [],
3069	z => 100,	3619	z => 100,
3070	@_,	3620	@_,
3071	);	3621	);
3072		3622
3073	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3623	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3074		3624
3075	for my $item (@{ $self->{items} }) {	3625	for my $item (@{ $self->{items} }) {
3076	my ($widget, $cb, $tooltip) = @$item;	3626	my ($widget, $cb, $tooltip) = @$item;
3077		3627
3078	# handle various types of items, only text for now	3628	# handle various types of items, only text for now
3079	if (!ref $widget) {	3629	if (!ref $widget) {
3080	if ($widget =~ /\t/) {	3630	if ($widget =~ /\t/) {
3081	my ($left, $right) = split /\t/, $widget, 2;	3631	my ($left, $right) = split /\t/, $widget, 2;
3082		3632
3083	$widget = new CFClient::UI::HBox	3633	$widget = new CFPlus::UI::HBox
3084	can_hover => 1,	3634	can_hover => 1,
3085	can_events => 1,	3635	can_events => 1,
3086	tooltip => $tooltip,	3636	tooltip => $tooltip,
3087	children => [	3637	children => [
3088	(new CFClient::UI::Label markup => $left, expand => 1),	3638	(new CFPlus::UI::Label markup => $left, expand => 1),
3089	(new CFClient::UI::Label markup => $right, align => +1),	3639	(new CFPlus::UI::Label markup => $right, align => +1),
3090	],	3640	],
3091	;	3641	;
3092		3642
3093	} else {	3643	} else {
3094	$widget = new CFClient::UI::Label	3644	$widget = new CFPlus::UI::Label
3095	can_hover => 1,	3645	can_hover => 1,
3096	can_events => 1,	3646	can_events => 1,
3097	markup => $widget,	3647	markup => $widget,
3098	tooltip => $tooltip;	3648	tooltip => $tooltip;
3099	}	3649	}
…		…
3147	1	3697	1
3148	}	3698	}
3149		3699
3150	#############################################################################	3700	#############################################################################
3151		3701
3152	package CFClient::UI::Multiplexer;	3702	package CFPlus::UI::Multiplexer;
3153		3703
3154	our @ISA = CFClient::UI::Container::;	3704	our @ISA = CFPlus::UI::Container::;
3155		3705
3156	sub new {	3706	sub new {
3157	my $class = shift;	3707	my $class = shift;
3158		3708
3159	my $self = $class->SUPER::new (	3709	my $self = $class->SUPER::new (
…		…
3220	$self->{current}->draw;	3770	$self->{current}->draw;
3221	}	3771	}
3222		3772
3223	#############################################################################	3773	#############################################################################
3224		3774
3225	package CFClient::UI::Notebook;	3775	package CFPlus::UI::Notebook;
3226		3776
3227	our @ISA = CFClient::UI::VBox::;	3777	our @ISA = CFPlus::UI::VBox::;
3228		3778
3229	sub new {	3779	sub new {
3230	my $class = shift;	3780	my $class = shift;
3231		3781
3232	my $self = $class->SUPER::new (	3782	my $self = $class->SUPER::new (
3233	buttonbar => (new CFClient::UI::Buttonbar),	3783	buttonbar => (new CFPlus::UI::Buttonbar),
3234	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3784	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3235	# filter => # will be put between multiplexer and $self	3785	# filter => # will be put between multiplexer and $self
3236	@_,	3786	@_,
3237	);	3787	);
3238		3788
3239	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3789	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3243	}	3793	}
3244		3794
3245	sub add {	3795	sub add {
3246	my ($self, $title, $widget, $tooltip) = @_;	3796	my ($self, $title, $widget, $tooltip) = @_;
3247		3797
3248	Scalar::Util::weaken $self;	3798	CFPlus::weaken $self;
3249		3799
3250	$self->{buttonbar}->add (new CFClient::UI::Button	3800	$self->{buttonbar}->add (new CFPlus::UI::Button
3251	markup => $title,	3801	markup => $title,
3252	tooltip => $tooltip,	3802	tooltip => $tooltip,
3253	on_activate => sub { $self->set_current_page ($widget) },	3803	on_activate => sub { $self->set_current_page ($widget) },
3254	);	3804	);
3255		3805
…		…
3269	$self->emit (page_changed => $self->{multiplexer}{current});	3819	$self->emit (page_changed => $self->{multiplexer}{current});
3270	}	3820	}
3271		3821
3272	#############################################################################	3822	#############################################################################
3273		3823
3274	package CFClient::UI::Combobox;	3824	package CFPlus::UI::Selector;
3275		3825
3276	use utf8;	3826	use utf8;
3277		3827
3278	our @ISA = CFClient::UI::Button::;	3828	our @ISA = CFPlus::UI::Button::;
3279		3829
3280	sub new {	3830	sub new {
3281	my $class = shift;	3831	my $class = shift;
3282		3832
3283	my $self = $class->SUPER::new (	3833	my $self = $class->SUPER::new (
…		…
3300	my ($value, $title, $tooltip) = @$_;	3850	my ($value, $title, $tooltip) = @$_;
3301		3851
3302	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3852	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303	}	3853	}
3304		3854
3305	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3855	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306	}	3856	}
3307		3857
3308	sub _set_value {	3858	sub _set_value {
3309	my ($self, $value) = @_;	3859	my ($self, $value) = @_;
3310		3860
…		…
3325	$self->emit (changed => $value);	3875	$self->emit (changed => $value);
3326	}	3876	}
3327		3877
3328	#############################################################################	3878	#############################################################################
3329		3879
3330	package CFClient::UI::Statusbox;	3880	package CFPlus::UI::Statusbox;
3331		3881
3332	our @ISA = CFClient::UI::VBox::;	3882	our @ISA = CFPlus::UI::VBox::;
3333		3883
3334	sub new {	3884	sub new {
3335	my $class = shift;	3885	my $class = shift;
3336		3886
3337	my $self = $class->SUPER::new (	3887	my $self = $class->SUPER::new (
3338	fontsize => 0.8,	3888	fontsize => 0.8,
3339	@_,	3889	@_,
3340	);	3890	);
3341		3891
3342	Scalar::Util::weaken (my $this = $self);	3892	CFPlus::weaken (my $this = $self);
3343		3893
3344	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3894	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345		3895
3346	$self	3896	$self
3347	}	3897	}
…		…
3349	sub reorder {	3899	sub reorder {
3350	my ($self) = @_;	3900	my ($self) = @_;
3351	my $NOW = Time::HiRes::time;	3901	my $NOW = Time::HiRes::time;
3352		3902
3353	# freeze display when hovering over any label	3903	# freeze display when hovering over any label
3354	return if $CFClient::UI::TOOLTIP->{owner}	3904	return if $CFPlus::UI::TOOLTIP->{owner}
3355	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3905	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3356	values %{ $self->{item} };	3906	values %{ $self->{item} };
3357		3907
3358	while (my ($k, $v) = each %{ $self->{item} }) {	3908	while (my ($k, $v) = each %{ $self->{item} }) {
3359	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3909	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3360	}	3910	}
…		…
3381	for ($short) {	3931	for ($short) {
3382	s/^\s+//;	3932	s/^\s+//;
3383	s/\s+/ /g;	3933	s/\s+/ /g;
3384	}	3934	}
3385		3935
3386	new CFClient::UI::Label	3936	new CFPlus::UI::Label
3387	markup => $short,	3937	markup => $short,
3388	tooltip => $item->{tooltip},	3938	tooltip => $item->{tooltip},
3389	tooltip_font => $::FONT_PROP,	3939	tooltip_font => $::FONT_PROP,
3390	tooltip_width => 0.67,	3940	tooltip_width => 0.67,
3391	fontsize => $item->{fontsize} || $self->{fontsize},	3941	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3470	$self->SUPER::destroy;	4020	$self->SUPER::destroy;
3471	}	4021	}
3472		4022
3473	#############################################################################	4023	#############################################################################
3474		4024
3475	package CFClient::UI::Inventory;
3476
3477	our @ISA = CFClient::UI::Table::;
3478
3479	sub new {
3480	my $class = shift;
3481
3482	my $self = $class->SUPER::new (
3483	col_expand => [0, 1, 0],
3484	@_,
3485	);
3486
3487	$self
3488	}
3489
3490	sub set_items {
3491	my ($self, $items) = @_;
3492
3493	$self->clear;
3494	return unless $items;
3495
3496	my @items = sort {
3497	($a->{type} <=> $b->{type})
3498	or ($a->{name} cmp $b->{name})
3499	} values %$items;
3500
3501	$self->{real_items} = \@items;
3502
3503	my $row = 0;
3504	for my $item (@items) {
3505	CFClient::Item::update_widgets $item;
3506
3507	$self->add (0, $row, $item->{face_widget});
3508	$self->add (1, $row, $item->{desc_widget});
3509	$self->add (2, $row, $item->{weight_widget});
3510
3511	$row++;
3512	}
3513	}
3514
3515	#############################################################################
3516
3517	package CFClient::UI::SpellList;
3518
3519	our @ISA = CFClient::UI::Table::;
3520
3521	sub new {
3522	my $class = shift;
3523
3524	my $self = $class->SUPER::new (
3525	binding => [],
3526	commands => [],
3527	@_,
3528	)
3529	}
3530
3531	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3532
3533	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543
3544	sub rebuild_spell_list {
3545	my ($self) = @_;
3546
3547	$CFClient::UI::ROOT->on_refresh ($self => sub {
3548	$self->clear;
3549
3550	return unless $::CONN;
3551
3552	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558	my $row = 0;
3559
3560	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561	my $spell = $self->{spell}{$_};
3562
3563	$row++;
3564
3565	my $spell_cb = sub {
3566	my ($widget, $ev) = @_;
3567
3568	if ($ev->{button} == 1) {
3569	$::CONN->user_send ("cast $spell->{name}");
3570	} elsif ($ev->{button} == 2) {
3571	$::CONN->user_send ("invoke $spell->{name}");
3572	} elsif ($ev->{button} == 3) {
3573	(new CFClient::UI::Menu
3574	items => [
3575	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577	],
3578	)->popup ($ev);
3579	} else {
3580	return 0;
3581	}
3582
3583	1
3584	};
3585
3586	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588	#TODO: add path info to tooltip
3589	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591	$self->add (0, $row, new CFClient::UI::Face
3592	face => $spell->{face},
3593	can_hover => 1,
3594	can_events => 1,
3595	tooltip => $tooltip,
3596	on_button_down => $spell_cb,
3597	);
3598
3599	$self->add (1, $row, new CFClient::UI::Label
3600	expand => 1,
3601	text => $spell->{name},
3602	can_hover => 1,
3603	can_events => 1,
3604	tooltip => $tooltip,
3605	on_button_down => $spell_cb,
3606	);
3607
3608	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612	}
3613	});
3614	}
3615
3616	sub add_spell {
3617	my ($self, $spell) = @_;
3618
3619	$self->{spell}->{$spell->{name}} = $spell;
3620	$self->rebuild_spell_list;
3621	}
3622
3623	sub remove_spell {
3624	my ($self, $spell) = @_;
3625
3626	delete $self->{spell}->{$spell->{name}};
3627	$self->rebuild_spell_list;
3628	}
3629
3630	sub clear_spells {
3631	my ($self) = @_;
3632
3633	$self->{spell} = {};
3634	$self->rebuild_spell_list;
3635	}
3636
3637	#############################################################################
3638
3639	package CFClient::UI::Root;	4025	package CFPlus::UI::Root;
3640		4026
3641	our @ISA = CFClient::UI::Container::;	4027	our @ISA = CFPlus::UI::Container::;
3642		4028
3643	use List::Util qw(min max);	4029	use List::Util qw(min max);
3644		4030
3645	use CFClient::OpenGL;	4031	use CFPlus::OpenGL;
3646		4032
3647	sub new {	4033	sub new {
3648	my $class = shift;	4034	my $class = shift;
3649		4035
3650	my $self = $class->SUPER::new (	4036	my $self = $class->SUPER::new (
3651	visible => 1,	4037	visible => 1,
3652	@_,	4038	@_,
3653	);	4039	);
3654		4040
3655	Scalar::Util::weaken ($self->{root} = $self);	4041	CFPlus::weaken ($self->{root} = $self);
3656		4042
3657	$self	4043	$self
3658	}	4044	}
3659		4045
3660	sub size_request {	4046	sub size_request {
…		…
3829	$h = 0 if $h < 0;	4215	$h = 0 if $h < 0;
3830		4216
3831	$w = max $widget->{min_w}, $w;	4217	$w = max $widget->{min_w}, $w;
3832	$h = max $widget->{min_h}, $h;	4218	$h = max $widget->{min_h}, $h;
3833		4219
		4220	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4221	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4222
3834	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4223	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4224	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836		4225
3837	$w = int $w + 0.5;	4226	$w = int $w + 0.5;
3838	$h = int $h + 0.5;	4227	$h = int $h + 0.5;
…		…
3851		4240
3852	while ($self->{post_alloc_hook}) {	4241	while ($self->{post_alloc_hook}) {
3853	$_->()	4242	$_->()
3854	for values %{delete $self->{post_alloc_hook}};	4243	for values %{delete $self->{post_alloc_hook}};
3855	}	4244	}
3856
3857		4245
3858	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4246	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3859	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4247	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3860	glClear GL_COLOR_BUFFER_BIT;	4248	glClear GL_COLOR_BUFFER_BIT;
3861		4249
…		…
3864	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4252	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3865	glMatrixMode GL_MODELVIEW;	4253	glMatrixMode GL_MODELVIEW;
3866	glLoadIdentity;	4254	glLoadIdentity;
3867		4255
3868	{	4256	{
3869	package CFClient::UI::Base;	4257	package CFPlus::UI::Base;
3870		4258
3871	($draw_x, $draw_y, $draw_w, $draw_h) =	4259	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3872	(0, 0, $self->{w}, $self->{h});	4260	(0, 0, $self->{w}, $self->{h});
3873	}
3874		4261
3875	$self->_draw;	4262	$self->_draw;
		4263	}
3876	}	4264	}
3877		4265
3878	#############################################################################	4266	#############################################################################
3879		4267
3880	package CFClient::UI;	4268	package CFPlus::UI;
3881		4269
3882	$ROOT = new CFClient::UI::Root;	4270	$ROOT = new CFPlus::UI::Root;
3883	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4271	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3884		4272
3885	1	4273	1
3886		4274

Diff Legend

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