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

Diff Legend

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