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.401 by root, Sat Jul 21 20:05:37 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	}
…		…
591	}	649	}
592		650
593	sub DESTROY {	651	sub DESTROY {
594	my ($self) = @_;	652	my ($self) = @_;
595		653
596	return if CFClient::in_destruct;	654	return if CFPlus::in_destruct;
597
598	delete $WIDGET{$self+0};
599		655
600	eval { $self->destroy };	656	eval { $self->destroy };
601	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	657	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		658
		659	delete $WIDGET{$self+0};
602	}	660	}
603		661
604	#############################################################################	662	#############################################################################
605		663
606	package CFClient::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
607		665
608	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
609		667
610	use strict;	668	use strict;
611	use CFClient::OpenGL;	669	use CFPlus::OpenGL;
612		670
613	sub new {	671	sub new {
614	my $class = shift;	672	my $class = shift;
615		673
616	# range [value, low, high, page]	674	# range [value, low, high, page]
…		…
647	}	705	}
648	}	706	}
649		707
650	#############################################################################	708	#############################################################################
651		709
652	package CFClient::UI::Empty;	710	package CFPlus::UI::Empty;
653		711
654	our @ISA = CFClient::UI::Base::;	712	our @ISA = CFPlus::UI::Base::;
655		713
656	sub new {	714	sub new {
657	my ($class, %arg) = @_;	715	my ($class, %arg) = @_;
658	$class->SUPER::new (can_events => 0, %arg);	716	$class->SUPER::new (can_events => 0, %arg);
659	}	717	}
…		…
666		724
667	sub draw { }	725	sub draw { }
668		726
669	#############################################################################	727	#############################################################################
670		728
671	package CFClient::UI::Container;	729	package CFPlus::UI::Container;
672		730
673	our @ISA = CFClient::UI::Base::;	731	our @ISA = CFPlus::UI::Base::;
674		732
675	sub new {	733	sub new {
676	my ($class, %arg) = @_;	734	my ($class, %arg) = @_;
677		735
678	my $children = delete $arg{children};	736	my $children = delete $arg{children};
…		…
682	can_events => 0,	740	can_events => 0,
683	%arg,	741	%arg,
684	);	742	);
685		743
686	$self->add (@$children)	744	$self->add (@$children)
687	if $children;	745	if $children && @$children;
688		746
689	$self	747	$self
		748	}
		749
		750	sub realloc {
		751	my ($self) = @_;
		752
		753	$self->{force_realloc} = 1;
		754	$self->{force_size_alloc} = 1;
		755	$self->SUPER::realloc;
690	}	756	}
691		757
692	sub add {	758	sub add {
693	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
694		760
695	$_->set_parent ($self)	761	$_->set_parent ($self)
696	for @widgets;	762	for @widgets;
697		763
		764	# TODO: only do this in widgets that need it, e.g. root, fixed
698	use sort 'stable';	765	use sort 'stable';
699		766
700	$self->{children} = [	767	$self->{children} = [
701	sort { $a->{z} <=> $b->{z} }	768	sort { $a->{z} <=> $b->{z} }
702	@{$self->{children}}, @widgets	769	@{$self->{children}}, @widgets
703	];	770	];
704		771
705	$self->realloc;	772	$self->realloc;
		773
		774	map $_+0, @widgets
706	}	775	}
707		776
708	sub children {	777	sub children {
709	@{ $_[0]{children} }	778	@{ $_[0]{children} }
710	}	779	}
…		…
721	}	790	}
722		791
723	sub clear {	792	sub clear {
724	my ($self) = @_;	793	my ($self) = @_;
725		794
726	my $children = delete $self->{children};	795	my $children = $self->{children};
727	$self->{children} = [];	796	$self->{children} = [];
728		797
729	for (@$children) {	798	for (@$children) {
730	delete $_->{parent};	799	delete $_->{parent};
731	$_->hide;	800	$_->hide;
…		…
756	$_->draw for @{$self->{children}};	825	$_->draw for @{$self->{children}};
757	}	826	}
758		827
759	#############################################################################	828	#############################################################################
760		829
761	package CFClient::UI::Bin;	830	package CFPlus::UI::Bin;
762		831
763	our @ISA = CFClient::UI::Container::;	832	our @ISA = CFPlus::UI::Container::;
764		833
765	sub new {	834	sub new {
766	my ($class, %arg) = @_;	835	my ($class, %arg) = @_;
767		836
768	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	837	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
769		838
770	$class->SUPER::new (children => [$child], %arg)	839	$class->SUPER::new (children => [$child], %arg)
771	}	840	}
772		841
773	sub add {	842	sub add {
…		…
780	sub remove {	849	sub remove {
781	my ($self, $widget) = @_;	850	my ($self, $widget) = @_;
782		851
783	$self->SUPER::remove ($widget);	852	$self->SUPER::remove ($widget);
784		853
785	$self->{children} = [new CFClient::UI::Empty]	854	$self->{children} = [new CFPlus::UI::Empty]
786	unless @{$self->{children}};	855	unless @{$self->{children}};
787	}	856	}
788		857
789	sub child { $_[0]->{children}[0] }	858	sub child { $_[0]->{children}[0] }
790		859
…		…
802		871
803	#############################################################################	872	#############################################################################
804		873
805	# back-buffered drawing area	874	# back-buffered drawing area
806		875
807	package CFClient::UI::Window;	876	package CFPlus::UI::Window;
808		877
809	our @ISA = CFClient::UI::Bin::;	878	our @ISA = CFPlus::UI::Bin::;
810		879
811	use CFClient::OpenGL;	880	use CFPlus::OpenGL;
812		881
813	sub new {	882	sub new {
814	my ($class, %arg) = @_;	883	my ($class, %arg) = @_;
815		884
816	my $self = $class->SUPER::new (%arg);	885	my $self = $class->SUPER::new (%arg);
…		…
838	}	907	}
839		908
840	sub render_child {	909	sub render_child {
841	my ($self) = @_;	910	my ($self) = @_;
842		911
843	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	912	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
844	glClearColor 0, 0, 0, 0;	913	glClearColor 0, 0, 0, 0;
845	glClear GL_COLOR_BUFFER_BIT;	914	glClear GL_COLOR_BUFFER_BIT;
846		915
847	{	916	{
848	package CFClient::UI::Base;	917	package CFPlus::UI::Base;
849		918
850	($draw_x, $draw_y, $draw_w, $draw_h) =	919	local ($draw_x, $draw_y, $draw_w, $draw_h) =
851	(0, 0, $self->{w}, $self->{h});	920	(0, 0, $self->{w}, $self->{h});
		921
		922	$self->_render;
852	}	923	}
853
854	$self->_render;
855	};	924	};
856	}	925	}
857		926
858	sub _draw {	927	sub _draw {
859	my ($self) = @_;	928	my ($self) = @_;
860
861	my ($w, $h) = @$self{qw(w h)};
862		929
863	my $tex = $self->{texture}	930	my $tex = $self->{texture}
864	or return;	931	or return;
865		932
866	glEnable GL_TEXTURE_2D;	933	glEnable GL_TEXTURE_2D;
867	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	934	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
868	glColor 0, 0, 0, 1;	935	glColor 0, 0, 0, 1;
869		936
870	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	937	$tex->draw_quad_alpha_premultiplied (0, 0);
871		938
872	glDisable GL_TEXTURE_2D;	939	glDisable GL_TEXTURE_2D;
873	}	940	}
874		941
875	#############################################################################	942	#############################################################################
876		943
877	package CFClient::UI::ViewPort;	944	package CFPlus::UI::ViewPort;
878		945
		946	use List::Util qw(min max);
		947
879	our @ISA = CFClient::UI::Window::;	948	our @ISA = CFPlus::UI::Window::;
880		949
881	sub new {	950	sub new {
882	my $class = shift;	951	my $class = shift;
883		952
884	$class->SUPER::new (	953	$class->SUPER::new (
…		…
891	sub size_request {	960	sub size_request {
892	my ($self) = @_;	961	my ($self) = @_;
893		962
894	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	963	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
895		964
896	$w = 10 if $self->{scroll_x};	965	$w = 1 if $self->{scroll_x};
897	$h = 10 if $self->{scroll_y};	966	$h = 1 if $self->{scroll_y};
898		967
899	($w, $h)	968	($w, $h)
900	}	969	}
901		970
902	sub invoke_size_allocate {	971	sub invoke_size_allocate {
…		…
914	}	983	}
915		984
916	sub set_offset {	985	sub set_offset {
917	my ($self, $x, $y) = @_;	986	my ($self, $x, $y) = @_;
918		987
		988	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		989	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		990
		991	if ($x != $self->{view_x} or $y != $self->{view_y}) {
919	$self->{view_x} = int $x;	992	$self->{view_x} = $x;
920	$self->{view_y} = int $y;	993	$self->{view_y} = $y;
921		994
		995	$self->emit (changed => $x, $y);
922	$self->update;	996	$self->update;
		997	}
923	}	998	}
924		999
925	# hmm, this does not work for topleft of $self... but we should not ask for that	1000	# hmm, this does not work for topleft of $self... but we should not ask for that
926	sub coord2local {	1001	sub coord2local {
927	my ($self, $x, $y) = @_;	1002	my ($self, $x, $y) = @_;
…		…
942	my ($self, $x, $y) = @_;	1017	my ($self, $x, $y) = @_;
943		1018
944	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1019	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
945	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1020	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
946	) {	1021	) {
947	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1022	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
948	} else {	1023	} else {
949	$self->CFClient::UI::Base::find_widget ($x, $y)	1024	$self->CFPlus::UI::Base::find_widget ($x, $y)
950	}	1025	}
951	}	1026	}
952		1027
953	sub _render {	1028	sub _render {
954	my ($self) = @_;	1029	my ($self) = @_;
955		1030
956	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1031	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};	1032	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
958		1033
959	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1034	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
960		1035
961	$self->SUPER::_render;	1036	$self->SUPER::_render;
962	}	1037	}
963		1038
964	#############################################################################	1039	#############################################################################
965		1040
966	package CFClient::UI::ScrolledWindow;	1041	package CFPlus::UI::ScrolledWindow;
967		1042
968	our @ISA = CFClient::UI::HBox::;	1043	our @ISA = CFPlus::UI::Table::;
969		1044
970	sub new {	1045	sub new {
971	my ($class, %arg) = @_;	1046	my ($class, %arg) = @_;
972		1047
973	my $child = delete $arg{child};	1048	my $child = delete $arg{child};
974		1049
975	my $self;	1050	my $self;
976		1051
977	my $slider = new CFClient::UI::Slider	1052	my $hslider = new CFPlus::UI::Slider
		1053	col => 0,
		1054	row => 1,
		1055	vertical => 0,
		1056	range => [0, 0, 1, 0.01], # HACK fix
		1057	on_changed => sub {
		1058	$self->{hpos} = $_[1];
		1059	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1060	},
		1061	;
		1062
		1063	my $vslider = new CFPlus::UI::Slider
		1064	col => 1,
		1065	row => 0,
978	vertical => 1,	1066	vertical => 1,
979	range => [0, 0, 1, 0.01], # HACK fix	1067	range => [0, 0, 1, 0.01], # HACK fix
980	on_changed => sub {	1068	on_changed => sub {
981	$self->{vp}->set_offset (0, $_[1]);	1069	$self->{vpos} = $_[1];
		1070	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
982	},	1071	},
983	;	1072	;
984		1073
985	$self = $class->SUPER::new (	1074	$self = $class->SUPER::new (
986	vp => (new CFClient::UI::ViewPort expand => 1),	1075	scroll_x => 0,
		1076	scroll_y => 1,
		1077	can_events => 1,
987	slider => $slider,	1078	hslider => $hslider,
		1079	vslider => $vslider,
		1080	col_expand => [1, 0],
		1081	row_expand => [1, 0],
988	%arg,	1082	%arg,
989	);	1083	);
990		1084
		1085	$self->{vp} = new CFPlus::UI::ViewPort
		1086	col => 0,
		1087	row => 0,
		1088	expand => 1,
		1089	scroll_x => $self->{scroll_x},
		1090	scroll_y => $self->{scroll_y},
		1091	on_changed => sub {
		1092	my ($vp, $x, $y) = @_;
		1093
		1094	$vp->{parent}{hslider}->set_value ($x);
		1095	$vp->{parent}{vslider}->set_value ($y);
		1096
		1097	0
		1098	},
		1099	on_size_allocate => sub {
		1100	my ($vp, $w, $h) = @_;
		1101	$vp->{parent}->update_slider;
		1102	0
		1103	},
		1104	;
		1105
991	$self->SUPER::add ($self->{vp}, $self->{slider});	1106	$self->SUPER::add ($self->{vp});
		1107
992	$self->add ($child) if $child;	1108	$self->add ($child) if $child;
993		1109
994	$self	1110	$self
995	}	1111	}
996
997	#TODO# update range on size_allocate depending on child
998		1112
999	sub add {	1113	sub add {
1000	my ($self, $widget) = @_;	1114	my ($self, $widget) = @_;
1001		1115
1002	$self->{vp}->add ($self->{child} = $widget);	1116	$self->{vp}->add ($self->{child} = $widget);
1003	}	1117	}
1004		1118
		1119	sub update_slider {
		1120	my ($self) = @_;
		1121
		1122	my $child = ($self->{vp} or return)->child;
		1123
		1124	if ($self->{scroll_x}) {
		1125	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1126	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1127
		1128	my $visible = $w1 > $w2;
		1129	if ($visible != $self->{hslider_visible}) {
		1130	$self->{hslider_visible} = $visible;
		1131	$visible ? $self->SUPER::add ($self->{hslider})
		1132	: $self->SUPER::remove ($self->{hslider});
		1133	}
		1134	}
		1135
		1136	if ($self->{scroll_y}) {
		1137	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1138	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1139
		1140	my $visible = $h1 > $h2;
		1141	if ($visible != $self->{vslider_visible}) {
		1142	$self->{vslider_visible} = $visible;
		1143	$visible ? $self->SUPER::add ($self->{vslider})
		1144	: $self->SUPER::remove ($self->{vslider});
		1145	}
		1146	}
		1147	}
		1148
		1149	sub start_dragging {
		1150	my ($self, $ev) = @_;
		1151
		1152	$self->grab_focus;
		1153
		1154	my $ox = $self->{vp}{view_x};
		1155	my $oy = $self->{vp}{view_y};
		1156
		1157	$self->{motion} = sub {
		1158	my ($ev, $x, $y) = @_;
		1159
		1160	$ox -= $ev->{xrel};
		1161	$oy -= $ev->{yrel};
		1162
		1163	$self->{vp}->set_offset ($ox, $oy);
		1164	};
		1165	}
		1166
		1167	sub invoke_mouse_wheel {
		1168	my ($self, $ev) = @_;
		1169
		1170	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1171	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1172
		1173	1
		1174	}
		1175
1005	sub invoke_button_down {	1176	sub invoke_button_down {
1006	my ($self, $ev) = @_;	1177	my ($self, $ev, $x, $y) = @_;
1007		1178
1008	warn "button down $ev->{button}\n";#d#	1179	if ($ev->{button} == 2) {
		1180	$self->start_dragging ($ev);
		1181	return 1;
1009		1182	}
		1183
1010	0	1184	0
1011	}	1185	}
1012		1186
1013	sub update_slider {	1187	sub invoke_button_up {
1014	my ($self) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1015		1189
1016	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1190	if (delete $self->{motion}) {
1017	}	1191	return 1;
		1192	}
1018		1193
1019	sub update {	1194	0
1020	my ($self) = @_;	1195	}
1021		1196
1022	$self->SUPER::update;	1197	sub invoke_mouse_motion {
		1198	my ($self, $ev, $x, $y) = @_;
1023		1199
1024	$self->update_slider;	1200	if ($self->{motion}) {
		1201	$self->{motion}->($ev, $x, $y);
		1202	return 1;
		1203	}
		1204
		1205	0
1025	}	1206	}
1026		1207
1027	sub invoke_size_allocate {	1208	sub invoke_size_allocate {
1028	my ($self, $w, $h) = @_;	1209	my ($self, $w, $h) = @_;
1029		1210
1030	$self->update_slider;	1211	$self->update_slider;
1031
1032	$self->SUPER::invoke_size_allocate ($w, $h)	1212	$self->SUPER::invoke_size_allocate ($w, $h)
1033	}	1213	}
1034		1214
1035	#############################################################################	1215	#############################################################################
1036		1216
1037	package CFClient::UI::Frame;	1217	package CFPlus::UI::Frame;
1038		1218
1039	our @ISA = CFClient::UI::Bin::;	1219	our @ISA = CFPlus::UI::Bin::;
1040		1220
1041	use CFClient::OpenGL;	1221	use CFPlus::OpenGL;
1042		1222
1043	sub new {	1223	sub new {
1044	my $class = shift;	1224	my $class = shift;
1045		1225
1046	$class->SUPER::new (	1226	$class->SUPER::new (
…		…
1072	$self->SUPER::_draw;	1252	$self->SUPER::_draw;
1073	}	1253	}
1074		1254
1075	#############################################################################	1255	#############################################################################
1076		1256
1077	package CFClient::UI::FancyFrame;	1257	package CFPlus::UI::FancyFrame;
1078		1258
1079	our @ISA = CFClient::UI::Bin::;	1259	our @ISA = CFPlus::UI::Bin::;
1080		1260
1081	use CFClient::OpenGL;	1261	use CFPlus::OpenGL;
		1262
		1263	sub new {
		1264	my ($class, %arg) = @_;
		1265
		1266	if ((exists $arg{label}) && !ref $arg{label}) {
		1267	$arg{label} = new CFPlus::UI::Label
		1268	align => 1,
		1269	valign => 0,
		1270	text => $arg{label},
		1271	fontsize => ($arg{border} || 0.8) * 0.75;
		1272	}
		1273
		1274	my $self = $class->SUPER::new (
		1275	# label => "",
		1276	fg => [0.6, 0.3, 0.1],
		1277	border => 0.8,
		1278	style => 'single',
		1279	%arg,
		1280	);
		1281
		1282	$self
		1283	}
		1284
		1285	sub add {
		1286	my ($self, @widgets) = @_;
		1287
		1288	$self->SUPER::add (@widgets);
		1289	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1290	}
		1291
		1292	sub border {
		1293	int $_[0]{border} * $::FONTSIZE
		1294	}
		1295
		1296	sub size_request {
		1297	my ($self) = @_;
		1298
		1299	($self->{label_w}, undef) = $self->{label}->size_request
		1300	if $self->{label};
		1301
		1302	my ($w, $h) = $self->SUPER::size_request;
		1303
		1304	(
		1305	$w + $self->border * 2,
		1306	$h + $self->border * 2,
		1307	)
		1308	}
		1309
		1310	sub invoke_size_allocate {
		1311	my ($self, $w, $h) = @_;
		1312
		1313	my $border = $self->border;
		1314
		1315	$w -= List::Util::max 0, $border * 2;
		1316	$h -= List::Util::max 0, $border * 2;
		1317
		1318	if (my $label = $self->{label}) {
		1319	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1320	$label->{h} = List::Util::min $h, $border;
		1321	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1322	}
		1323
		1324	$self->child->configure ($border, $border, $w, $h);
		1325
		1326	1
		1327	}
		1328
		1329	sub _draw {
		1330	my ($self) = @_;
		1331
		1332	my $child = $self->{children}[0];
		1333
		1334	my $border = $self->border;
		1335	my ($w, $h) = ($self->{w}, $self->{h});
		1336
		1337	$child->draw;
		1338
		1339	glColor @{$self->{fg}};
		1340	glBegin GL_LINE_STRIP;
		1341	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1342	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1343	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1344	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1345	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1346	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1347	glEnd;
		1348
		1349	if ($self->{label}) {
		1350	glTranslate $border * 2, 0;
		1351	$self->{label}->_draw;
		1352	}
		1353	}
		1354
		1355	#############################################################################
		1356
		1357	package CFPlus::UI::Toplevel;
		1358
		1359	our @ISA = CFPlus::UI::Bin::;
		1360
		1361	use CFPlus::OpenGL;
1082		1362
1083	my $bg =	1363	my $bg =
1084	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1364	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1085	mipmap => 1, wrap => 1;	1365	mipmap => 1, wrap => 1;
1086		1366
1087	my @border =	1367	my @border =
1088	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1368	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);	1369	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1370
		1371	my @icon =
		1372	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1373	qw(x1_move.png x1_resize.png);
1090		1374
1091	sub new {	1375	sub new {
1092	my ($class, %arg) = @_;	1376	my ($class, %arg) = @_;
1093		1377
1094	my $self = $class->SUPER::new (	1378	my $self = $class->SUPER::new (
…		…
1099	min_w => 64,	1383	min_w => 64,
1100	min_h => 32,	1384	min_h => 32,
1101	%arg,	1385	%arg,
1102	);	1386	);
1103		1387
1104	$self->{title_widget} = new CFClient::UI::Label	1388	$self->{title_widget} = new CFPlus::UI::Label
1105	align => 0,	1389	align => 0,
1106	valign => 1,	1390	valign => 1,
1107	text => $self->{title},	1391	text => $self->{title},
1108	fontsize => $self->{border},	1392	fontsize => $self->{border},
1109	if exists $self->{title};	1393	if exists $self->{title};
1110		1394
1111	if ($self->{has_close_button}) {	1395	if ($self->{has_close_button}) {
1112	$self->{close_button} =	1396	$self->{close_button} =
1113	new CFClient::UI::ImageButton	1397	new CFPlus::UI::ImageButton
1114	path => 'x1_close.png',	1398	path => 'x1_close.png',
1115	on_activate => sub { $self->emit ("delete") };	1399	on_activate => sub { $self->emit ("delete") };
1116		1400
1117	$self->CFClient::UI::Container::add ($self->{close_button});	1401	$self->CFPlus::UI::Container::add ($self->{close_button});
1118	}	1402	}
1119		1403
1120	$self	1404	$self
1121	}	1405	}
1122		1406
1123	sub add {	1407	sub add {
1124	my ($self, @widgets) = @_;	1408	my ($self, @widgets) = @_;
1125		1409
1126	$self->SUPER::add (@widgets);	1410	$self->SUPER::add (@widgets);
1127	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1411	$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};	1412	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1129	}	1413	}
1130		1414
1131	sub border {	1415	sub border {
1132	int $_[0]{border} * $::FONTSIZE	1416	int $_[0]{border} * $::FONTSIZE
1133	}	1417	}
…		…
1241	$self->{motion}->($ev, $x, $y) if $self->{motion};	1525	$self->{motion}->($ev, $x, $y) if $self->{motion};
1242		1526
1243	! ! $self->{motion}	1527	! ! $self->{motion}
1244	}	1528	}
1245		1529
		1530	sub invoke_visibility_change {
		1531	my ($self, $visible) = @_;
		1532
		1533	delete $self->{motion} unless $visible;
		1534
		1535	0
		1536	}
		1537
1246	sub _draw {	1538	sub _draw {
1247	my ($self) = @_;	1539	my ($self) = @_;
1248		1540
1249	my $child = $self->{children}[0];	1541	my $child = $self->{children}[0];
1250		1542
…		…
1255	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1256		1548
1257	my $border = $self->border;	1549	my $border = $self->border;
1258		1550
1259	glColor @{ $self->{border_bg} };	1551	glColor @{ $self->{border_bg} };
1260	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1552	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1261	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1553	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1262	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1554	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1263	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1555	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1556
		1557	# move
		1558	my $w2 = ($w - $border) * .5;
		1559	my $h2 = ($h - $border) * .5;
		1560	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1561	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1562	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1563
		1564	# resize
		1565	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1566	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1567	unless $self->{has_close_button};
		1568	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1569	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1264		1570
1265	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1571	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1266	glColor @{ $self->{bg} };	1572	glColor @{ $self->{bg} };
1267		1573
1268	# TODO: repeat texture not scale	1574	# TODO: repeat texture not scale
…		…
1287	if $self->{close_button};	1593	if $self->{close_button};
1288	}	1594	}
1289		1595
1290	#############################################################################	1596	#############################################################################
1291		1597
1292	package CFClient::UI::Table;	1598	package CFPlus::UI::Table;
1293		1599
1294	our @ISA = CFClient::UI::Base::;	1600	our @ISA = CFPlus::UI::Container::;
1295		1601
1296	use List::Util qw(max sum);	1602	use List::Util qw(max sum);
1297		1603
1298	use CFClient::OpenGL;	1604	use CFPlus::OpenGL;
1299		1605
1300	sub new {	1606	sub new {
1301	my $class = shift;	1607	my $class = shift;
1302		1608
1303	$class->SUPER::new (	1609	$class->SUPER::new (
1304	col_expand => [],	1610	col_expand => [],
		1611	row_expand => [],
1305	@_,	1612	@_,
1306	)	1613	)
1307	}	1614	}
1308		1615
1309	sub children {
1310	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311	}
1312
1313	sub add {	1616	sub add {
1314	my ($self, $x, $y, $child) = @_;	1617	my ($self, @widgets) = @_;
1315		1618
1316	$child->set_parent ($self);	1619	for my $child (@widgets) {
1317	$self->{children}[$y][$x] = $child;	1620	$child->{rowspan} ||= 1;
		1621	$child->{colspan} ||= 1;
		1622	}
1318		1623
1319	$self->realloc;	1624	$self->SUPER::add (@widgets);
1320	}	1625	}
1321		1626
1322	sub remove {	1627	sub add_at {
		1628	my $self = shift;
		1629
		1630	my @widgets;
		1631
		1632	while (@_) {
		1633	my ($col, $row, $child) = splice @_, 0, 3, ();
		1634
		1635	$child->{row} = $row;
		1636	$child->{col} = $col;
		1637
		1638	push @widgets, $child;
		1639	}
		1640
		1641	$self->add (@widgets);
		1642	}
		1643
		1644	sub get_wh {
1323	my ($self, $child) = @_;	1645	my ($self) = @_;
1324		1646
1325	# TODO: not yet implemented	1647	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		1648
1332	my @children = $self->children;	1649	my @children = $self->children;
1333	delete $self->{children};	1650
		1651	# first pass, columns
		1652	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1653	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1654
		1655	my $sw = sum @w[$c .. $c + $cs - 1];
		1656
		1657	if ($w > $sw) {
		1658	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1659	}
1334		1660	}
1335	for (@children) {
1336	delete $_->{parent};
1337	$_->hide;
1338	}
1339		1661
1340	$self->realloc;	1662	# second pass, rows
1341	}	1663	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)};	1664	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1356		1665
1357	$w[$x] = max $w[$x], $w;	1666	my $sh = sum @h[$r .. $r + $rs - 1];
1358	$h[$y] = max $h[$y], $h;	1667
		1668	if ($h > $sh) {
		1669	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1359	}	1670	}
1360	}	1671	}
1361		1672
1362	(\@w, \@h)	1673	(\@w, \@h)
1363	}	1674	}
…		…
1379	my ($ws, $hs) = $self->get_wh;	1690	my ($ws, $hs) = $self->get_wh;
1380		1691
1381	my $req_w = (sum @$ws) || 1;	1692	my $req_w = (sum @$ws) || 1;
1382	my $req_h = (sum @$hs) || 1;	1693	my $req_h = (sum @$hs) || 1;
1383		1694
1384	# TODO: nicer code && do row_expand	1695	# now linearly scale the rows/columns to the allocated size
1385	my @col_expand = @{$self->{col_expand}};	1696	my @col_expand = @{$self->{col_expand}};
1386	@col_expand = (1) x @$ws unless @col_expand;	1697	@col_expand = (1) x @$ws unless @col_expand;
1387	my $col_expand = (sum @col_expand) || 1;	1698	my $col_expand = (sum @col_expand) || 1;
1388		1699
1389	# linearly scale sizes
1390	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1700	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1391	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1392		1701
1393	CFClient::UI::harmonize $ws;	1702	CFPlus::UI::harmonize $ws;
		1703
		1704	my @row_expand = @{$self->{row_expand}};
		1705	@row_expand = (1) x @$ws unless @row_expand;
		1706	my $row_expand = (sum @row_expand) || 1;
		1707
		1708	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1709
1394	CFClient::UI::harmonize $hs;	1710	CFPlus::UI::harmonize $hs;
1395		1711
1396	my $y;	1712	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1713	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1397		1714
1398	for my $r (0 .. $#{$self->{children}}) {	1715	for my $widget ($self->children) {
1399	my $row = $self->{children}[$r]	1716	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1400	or next;
1401		1717
1402	my $x = 0;	1718	$widget->configure (
1403	my $row_h = $hs->[$r];	1719	$x[$c], $y[$r],
		1720	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1404		1721	);
1405	for my $c (0 .. $#$row) {	1722	}
1406	my $col_w = $ws->[$c];
1407		1723
1408	if (my $widget = $row->[$c]) {	1724	1
1409	$widget->configure ($x, $y, $col_w, $row_h);	1725	}
1410	}
1411		1726
1412	$x += $col_w;	1727	#############################################################################
		1728
		1729	package CFPlus::UI::Fixed;
		1730
		1731	use List::Util qw(min max);
		1732
		1733	our @ISA = CFPlus::UI::Container::;
		1734
		1735	sub add_fixed {
		1736	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1737
		1738	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1739	$self->SUPER::add ($child);
		1740	}
		1741
		1742	sub _scale($$$) {
		1743	my ($mode, $val, $max) = @_;
		1744
		1745	$mode eq "abs" ? $val
		1746	: $mode eq "rel" ? $val * $max
		1747	: 0
		1748	}
		1749
		1750	sub size_request {
		1751	my ($self) = @_;
		1752
		1753	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1754
		1755	# determine overall size by querying abs widgets
		1756	for my $child ($self->visible_children) {
		1757	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1758
		1759	if ($pos eq "abs") {
		1760	$w = _scale $size, $w, $child->{req_w};
		1761	$h = _scale $size, $h, $child->{req_h};
		1762
		1763	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1764	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1413	}	1765	}
		1766	}
1414		1767
1415	$y += $row_h;	1768	my $W = $x2 - $x1;
		1769	my $H = $y2 - $y1;
		1770
		1771	# now layout remaining widgets
		1772	for my $child ($self->visible_children) {
		1773	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1774
		1775	if ($pos ne "abs") {
		1776	$x = _scale $pos, $x, $W;
		1777	$y = _scale $pos, $x, $H;
		1778	$w = _scale $size, $w, $child->{req_w};
		1779	$h = _scale $size, $h, $child->{req_h};
		1780
		1781	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1782	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1783	}
		1784	}
		1785
		1786	my $W = $x2 - $x1;
		1787	my $H = $y2 - $y1;
		1788
		1789	($W, $H)
		1790	}
		1791
		1792	sub invoke_size_allocate {
		1793	my ($self, $W, $H) = @_;
		1794
		1795	for my $child ($self->visible_children) {
		1796	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1797
		1798	$x = _scale $pos, $x, $W;
		1799	$y = _scale $pos, $x, $H;
		1800	$w = _scale $size, $w, $child->{req_w};
		1801	$h = _scale $size, $h, $child->{req_h};
		1802
		1803	$child->configure ($x, $y, $w, $h);
1416	}	1804	}
1417		1805
1418	1	1806	1
1419	}	1807	}
1420		1808
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	#############################################################################	1809	#############################################################################
1446		1810
1447	package CFClient::UI::Box;	1811	package CFPlus::UI::Box;
1448		1812
1449	our @ISA = CFClient::UI::Container::;	1813	our @ISA = CFPlus::UI::Container::;
1450		1814
1451	sub size_request {	1815	sub size_request {
1452	my ($self) = @_;	1816	my ($self) = @_;
1453		1817
1454	$self->{vertical}	1818	$self->{vertical}
…		…
1487	$req[$_] += $space * $children[$_]{expand}	1851	$req[$_] += $space * $children[$_]{expand}
1488	for 0 .. $#children;	1852	for 0 .. $#children;
1489	}	1853	}
1490	}	1854	}
1491		1855
1492	CFClient::UI::harmonize \@req;	1856	CFPlus::UI::harmonize \@req;
1493		1857
1494	my $pos = 0;	1858	my $pos = 0;
1495	for (0 .. $#children) {	1859	for (0 .. $#children) {
1496	my $alloc = $req[$_];	1860	my $alloc = $req[$_];
1497	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1861	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1502	1	1866	1
1503	}	1867	}
1504		1868
1505	#############################################################################	1869	#############################################################################
1506		1870
1507	package CFClient::UI::HBox;	1871	package CFPlus::UI::HBox;
1508		1872
1509	our @ISA = CFClient::UI::Box::;	1873	our @ISA = CFPlus::UI::Box::;
1510		1874
1511	sub new {	1875	sub new {
1512	my $class = shift;	1876	my $class = shift;
1513		1877
1514	$class->SUPER::new (	1878	$class->SUPER::new (
…		…
1517	)	1881	)
1518	}	1882	}
1519		1883
1520	#############################################################################	1884	#############################################################################
1521		1885
1522	package CFClient::UI::VBox;	1886	package CFPlus::UI::VBox;
1523		1887
1524	our @ISA = CFClient::UI::Box::;	1888	our @ISA = CFPlus::UI::Box::;
1525		1889
1526	sub new {	1890	sub new {
1527	my $class = shift;	1891	my $class = shift;
1528		1892
1529	$class->SUPER::new (	1893	$class->SUPER::new (
…		…
1532	)	1896	)
1533	}	1897	}
1534		1898
1535	#############################################################################	1899	#############################################################################
1536		1900
1537	package CFClient::UI::Label;	1901	package CFPlus::UI::Label;
1538		1902
1539	our @ISA = CFClient::UI::DrawBG::;	1903	our @ISA = CFPlus::UI::DrawBG::;
1540		1904
1541	use CFClient::OpenGL;	1905	use CFPlus::OpenGL;
1542		1906
1543	sub new {	1907	sub new {
1544	my ($class, %arg) = @_;	1908	my ($class, %arg) = @_;
1545		1909
1546	my $self = $class->SUPER::new (	1910	my $self = $class->SUPER::new (
…		…
1549	#active_bg => none	1913	#active_bg => none
1550	#font => default_font	1914	#font => default_font
1551	#text => initial text	1915	#text => initial text
1552	#markup => initial narkup	1916	#markup => initial narkup
1553	#max_w => maximum pixel width	1917	#max_w => maximum pixel width
		1918	#style => 0, # render flags
1554	ellipsise => 3, # end	1919	ellipsise => 3, # end
1555	layout => (new CFClient::Layout),	1920	layout => (new CFPlus::Layout),
1556	fontsize => 1,	1921	fontsize => 1,
1557	align => -1,	1922	align => -1,
1558	valign => -1,	1923	valign => -1,
1559	padding_x => 2,	1924	padding_x => 2,
1560	padding_y => 2,	1925	padding_y => 2,
1561	can_events => 0,	1926	can_events => 0,
1562	%arg	1927	%arg
1563	);	1928	);
1564		1929
1565	if (exists $self->{template}) {	1930	if (exists $self->{template}) {
1566	my $layout = new CFClient::Layout;	1931	my $layout = new CFPlus::Layout;
1567	$layout->set_text (delete $self->{template});	1932	$layout->set_text (delete $self->{template});
1568	$self->{template} = $layout;	1933	$self->{template} = $layout;
1569	}	1934	}
1570		1935
1571	if (exists $self->{markup}) {	1936	if (exists $self->{markup}) {
…		…
1573	} else {	1938	} else {
1574	$self->set_text (delete $self->{text});	1939	$self->set_text (delete $self->{text});
1575	}	1940	}
1576		1941
1577	$self	1942	$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	}	1943	}
1589		1944
1590	sub update {	1945	sub update {
1591	my ($self) = @_;	1946	my ($self) = @_;
1592		1947
…		…
1719	};	2074	};
1720		2075
1721	my $w = List::Util::min $self->{w} + 4, $size->[0];	2076	my $w = List::Util::min $self->{w} + 4, $size->[0];
1722	my $h = List::Util::min $self->{h} + 2, $size->[1];	2077	my $h = List::Util::min $self->{h} + 2, $size->[1];
1723		2078
1724	$self->{layout}->render ($self->{ox}, $self->{oy});	2079	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1725	}	2080	}
1726		2081
1727	#############################################################################	2082	#############################################################################
1728		2083
1729	package CFClient::UI::EntryBase;	2084	package CFPlus::UI::EntryBase;
1730		2085
1731	our @ISA = CFClient::UI::Label::;	2086	our @ISA = CFPlus::UI::Label::;
1732		2087
1733	use CFClient::OpenGL;	2088	use CFPlus::OpenGL;
1734		2089
1735	sub new {	2090	sub new {
1736	my $class = shift;	2091	my $class = shift;
1737		2092
1738	$class->SUPER::new (	2093	$class->SUPER::new (
…		…
1742	active_fg => [0, 0, 0],	2097	active_fg => [0, 0, 0],
1743	can_hover => 1,	2098	can_hover => 1,
1744	can_focus => 1,	2099	can_focus => 1,
1745	valign => 0,	2100	valign => 0,
1746	can_events => 1,	2101	can_events => 1,
		2102	ellipsise => 0,
1747	#text => ...	2103	#text => ...
1748	#hidden => "*",	2104	#hidden => "*",
1749	@_	2105	@_
1750	)	2106	)
1751	}	2107	}
…		…
1796	my $sym = $ev->{sym};	2152	my $sym = $ev->{sym};
1797	my $uni = $ev->{unicode};	2153	my $uni = $ev->{unicode};
1798		2154
1799	my $text = $self->get_text;	2155	my $text = $self->get_text;
1800		2156
		2157	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2158
1801	if ($uni == 8) {	2159	if ($uni == 8) {
1802	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2160	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1803	} elsif ($uni == 127) {	2161	} elsif ($uni == 127) {
1804	substr $text, $self->{cursor}, 1, "";	2162	substr $text, $self->{cursor}, 1, "";
1805	} elsif ($sym == CFClient::SDLK_LEFT) {	2163	} elsif ($sym == CFPlus::SDLK_LEFT) {
1806	--$self->{cursor} if $self->{cursor};	2164	--$self->{cursor} if $self->{cursor};
1807	} elsif ($sym == CFClient::SDLK_RIGHT) {	2165	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1808	++$self->{cursor} if $self->{cursor} < length $self->{text};	2166	++$self->{cursor} if $self->{cursor} < length $self->{text};
1809	} elsif ($sym == CFClient::SDLK_HOME) {	2167	} elsif ($sym == CFPlus::SDLK_HOME) {
		2168	# what a hack
		2169	$self->{cursor} =
		2170	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2171	? length $1
		2172	: 0;
		2173	} elsif ($sym == CFPlus::SDLK_END) {
		2174	# uh, again
		2175	$self->{cursor} =
		2176	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2177	? $self->{cursor} + length $1
		2178	: length $self->{text};
		2179	} elsif ($uni == 21) { # ctrl-u
		2180	$text = "";
1810	$self->{cursor} = 0;	2181	$self->{cursor} = 0;
1811	} elsif ($sym == CFClient::SDLK_END) {
1812	$self->{cursor} = length $text;
1813	} elsif ($uni == 27) {	2182	} elsif ($uni == 27) {
1814	$self->emit ('escape');	2183	$self->emit ('escape');
1815	} elsif ($uni) {	2184	} elsif ($uni == 0x0d) {
		2185	substr $text, $self->{cursor}++, 0, "\012";
		2186	} elsif ($uni >= 0x20) {
1816	substr $text, $self->{cursor}++, 0, chr $uni;	2187	substr $text, $self->{cursor}++, 0, chr $uni;
1817	} else {	2188	} else {
1818	return 0;	2189	return 0;
1819	}	2190	}
1820		2191
1821	$self->_set_text ($text);	2192	$self->_set_text ($text);
1822		2193
1823	$self->realloc;	2194	$self->realloc;
		2195	$self->update;
1824		2196
1825	1	2197	1
1826	}	2198	}
1827		2199
1828	sub invoke_focus_in {	2200	sub invoke_focus_in {
…		…
1890	utf8::encode $text;	2262	utf8::encode $text;
1891		2263
1892	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2264	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1893	}	2265	}
1894		2266
1895	glColor @{$self->{fg}};
1896	glBegin GL_LINES;	2267	glBegin GL_LINES;
1897	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2268	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};	2269	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1899	glEnd;	2270	glEnd;
1900	}	2271	}
1901	}	2272	}
1902		2273
		2274	#############################################################################
		2275
1903	package CFClient::UI::Entry;	2276	package CFPlus::UI::Entry;
1904		2277
1905	our @ISA = CFClient::UI::EntryBase::;	2278	our @ISA = CFPlus::UI::EntryBase::;
1906		2279
1907	use CFClient::OpenGL;	2280	use CFPlus::OpenGL;
1908		2281
1909	sub invoke_key_down {	2282	sub invoke_key_down {
1910	my ($self, $ev) = @_;	2283	my ($self, $ev) = @_;
1911		2284
1912	my $sym = $ev->{sym};	2285	my $sym = $ev->{sym};
1913		2286
1914	if ($sym == 13) {	2287	if ($ev->{uni} == 0x0d || $sym == 13) {
1915	unshift @{$self->{history}},	2288	unshift @{$self->{history}},
1916	my $txt = $self->get_text;	2289	my $txt = $self->get_text;
1917		2290
1918	$self->{history_pointer} = -1;	2291	$self->{history_pointer} = -1;
1919	$self->{history_saveback} = '';	2292	$self->{history_saveback} = '';
1920	$self->emit (activate => $txt);	2293	$self->emit (activate => $txt);
1921	$self->update;	2294	$self->update;
1922		2295
1923	} elsif ($sym == CFClient::SDLK_UP) {	2296	} elsif ($sym == CFPlus::SDLK_UP) {
1924	if ($self->{history_pointer} < 0) {	2297	if ($self->{history_pointer} < 0) {
1925	$self->{history_saveback} = $self->get_text;	2298	$self->{history_saveback} = $self->get_text;
1926	}	2299	}
1927	if (@{$self->{history} || []} > 0) {	2300	if (@{$self->{history} || []} > 0) {
1928	$self->{history_pointer}++;	2301	$self->{history_pointer}++;
…		…
1930	$self->{history_pointer} = @{$self->{history} || []} - 1;	2303	$self->{history_pointer} = @{$self->{history} || []} - 1;
1931	}	2304	}
1932	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2305	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1933	}	2306	}
1934		2307
1935	} elsif ($sym == CFClient::SDLK_DOWN) {	2308	} elsif ($sym == CFPlus::SDLK_DOWN) {
1936	$self->{history_pointer}--;	2309	$self->{history_pointer}--;
1937	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2310	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1938		2311
1939	if ($self->{history_pointer} >= 0) {	2312	if ($self->{history_pointer} >= 0) {
1940	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2313	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1949	1	2322	1
1950	}	2323	}
1951		2324
1952	#############################################################################	2325	#############################################################################
1953		2326
		2327	package CFPlus::UI::TextEdit;
		2328
		2329	our @ISA = CFPlus::UI::EntryBase::;
		2330
		2331	use CFPlus::OpenGL;
		2332
		2333	sub move_cursor_ver {
		2334	my ($self, $dy) = @_;
		2335
		2336	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2337
		2338	$y += $dy;
		2339
		2340	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2341	$self->{cursor} = $index;
		2342	delete $self->{cur_h};
		2343	$self->update;
		2344	return;
		2345	}
		2346	}
		2347
		2348	sub invoke_key_down {
		2349	my ($self, $ev) = @_;
		2350
		2351	my $sym = $ev->{sym};
		2352
		2353	if ($sym == CFPlus::SDLK_UP) {
		2354	$self->move_cursor_ver (-1);
		2355	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2356	$self->move_cursor_ver (+1);
		2357	} else {
		2358	return $self->SUPER::invoke_key_down ($ev)
		2359	}
		2360
		2361	1
		2362	}
		2363
		2364	#############################################################################
		2365
1954	package CFClient::UI::Button;	2366	package CFPlus::UI::Button;
1955		2367
1956	our @ISA = CFClient::UI::Label::;	2368	our @ISA = CFPlus::UI::Label::;
1957		2369
1958	use CFClient::OpenGL;	2370	use CFPlus::OpenGL;
1959		2371
1960	my @tex =	2372	my @tex =
1961	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2373	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1962	qw(b1_button_active.png);	2374	qw(b1_button_inactive.png b1_button_active.png);
1963		2375
1964	sub new {	2376	sub new {
1965	my $class = shift;	2377	my $class = shift;
1966		2378
1967	$class->SUPER::new (	2379	$class->SUPER::new (
1968	padding_x => 4,	2380	padding_x => 4,
1969	padding_y => 4,	2381	padding_y => 4,
1970	fg => [1, 1, 1],	2382	fg => [1.0, 1.0, 1.0],
1971	active_fg => [0, 0, 1],	2383	active_fg => [0.8, 0.8, 0.8],
1972	can_hover => 1,	2384	can_hover => 1,
1973	align => 0,	2385	align => 0,
1974	valign => 0,	2386	valign => 0,
1975	can_events => 1,	2387	can_events => 1,
1976	@_	2388	@_
…		…
1994		2406
1995	glEnable GL_TEXTURE_2D;	2407	glEnable GL_TEXTURE_2D;
1996	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1997	glColor 0, 0, 0, 1;	2409	glColor 0, 0, 0, 1;
1998		2410
		2411	my $tex = $tex[$GRAB == $self];
1999	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2412	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2000		2413
2001	glDisable GL_TEXTURE_2D;	2414	glDisable GL_TEXTURE_2D;
2002		2415
2003	$self->SUPER::_draw;	2416	$self->SUPER::_draw;
2004	}	2417	}
2005		2418
2006	#############################################################################	2419	#############################################################################
2007		2420
		2421	package CFPlus::UI::CheckBox;
		2422
		2423	our @ISA = CFPlus::UI::DrawBG::;
		2424
		2425	my @tex =
		2426	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2427	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2428
		2429	use CFPlus::OpenGL;
		2430
		2431	sub new {
		2432	my $class = shift;
		2433
		2434	$class->SUPER::new (
		2435	padding_x => 2,
		2436	padding_y => 2,
		2437	fg => [1, 1, 1],
		2438	active_fg => [1, 1, 0],
		2439	bg => [0, 0, 0, 0.2],
		2440	active_bg => [1, 1, 1, 0.5],
		2441	state => 0,
		2442	can_hover => 1,
		2443	@_
		2444	)
		2445	}
		2446
		2447	sub size_request {
		2448	my ($self) = @_;
		2449
		2450	(6) x 2
		2451	}
		2452
		2453	sub toggle {
		2454	my ($self) = @_;
		2455
		2456	$self->{state} = !$self->{state};
		2457	$self->emit (changed => $self->{state});
		2458	$self->update;
		2459	}
		2460
		2461	sub invoke_button_down {
		2462	my ($self, $ev, $x, $y) = @_;
		2463
		2464	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2465	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2466	$self->toggle;
		2467	} else {
		2468	return 0
		2469	}
		2470
		2471	1
		2472	}
		2473
		2474	sub _draw {
		2475	my ($self) = @_;
		2476
		2477	$self->SUPER::_draw;
		2478
		2479	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2480
		2481	my ($w, $h) = @$self{qw(w h)};
		2482
		2483	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2484
		2485	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2486
		2487	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2488
		2489	glEnable GL_TEXTURE_2D;
		2490	$tex->draw_quad_alpha (0, 0, $s, $s);
		2491	glDisable GL_TEXTURE_2D;
		2492	}
		2493
		2494	#############################################################################
		2495
		2496	package CFPlus::UI::Image;
		2497
		2498	our @ISA = CFPlus::UI::Base::;
		2499
		2500	use CFPlus::OpenGL;
		2501
		2502	our %texture_cache;
		2503
		2504	sub new {
		2505	my $class = shift;
		2506
		2507	my $self = $class->SUPER::new (
		2508	can_events => 0,
		2509	@_,
		2510	);
		2511
		2512	$self->{path} || $self->{tex}
		2513	or Carp::croak "'path' or 'tex' attributes required";
		2514
		2515	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2516	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2517
		2518	CFPlus::weaken $texture_cache{$self->{path}};
		2519
		2520	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2521
		2522	$self
		2523	}
		2524
		2525	sub STORABLE_freeze {
		2526	my ($self, $cloning) = @_;
		2527
		2528	$self->{path}
		2529	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2530
		2531	$self->{path}
		2532	}
		2533
		2534	sub STORABLE_attach {
		2535	my ($self, $cloning, $path) = @_;
		2536
		2537	$self->new (path => $path)
		2538	}
		2539
		2540	sub size_request {
		2541	my ($self) = @_;
		2542
		2543	($self->{tex}{w}, $self->{tex}{h})
		2544	}
		2545
		2546	sub _draw {
		2547	my ($self) = @_;
		2548
		2549	my $tex = $self->{tex};
		2550
		2551	my ($w, $h) = ($self->{w}, $self->{h});
		2552
		2553	if ($self->{rot90}) {
		2554	glRotate 90, 0, 0, 1;
		2555	glTranslate 0, -$self->{w}, 0;
		2556
		2557	($w, $h) = ($h, $w);
		2558	}
		2559
		2560	glEnable GL_TEXTURE_2D;
		2561	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2562
		2563	$tex->draw_quad (0, 0, $w, $h);
		2564
		2565	glDisable GL_TEXTURE_2D;
		2566	}
		2567
		2568	#############################################################################
		2569
2008	package CFClient::UI::ImageButton;	2570	package CFPlus::UI::ImageButton;
2009		2571
2010	our @ISA = CFClient::UI::Image::;	2572	our @ISA = CFPlus::UI::Image::;
2011		2573
2012	use CFClient::OpenGL;	2574	use CFPlus::OpenGL;
2013		2575
2014	my %textures;	2576	my %textures;
2015		2577
2016	sub new {	2578	sub new {
2017	my $class = shift;	2579	my $class = shift;
…		…
2039	1	2601	1
2040	}	2602	}
2041		2603
2042	#############################################################################	2604	#############################################################################
2043		2605
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;	2606	package CFPlus::UI::VGauge;
2120		2607
2121	our @ISA = CFClient::UI::Base::;	2608	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		2609
2182	use List::Util qw(min max);	2610	use List::Util qw(min max);
2183		2611
2184	use CFClient::OpenGL;	2612	use CFPlus::OpenGL;
2185		2613
2186	my %tex = (	2614	my %tex = (
2187	food => [	2615	food => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2617	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2190	],	2618	],
2191	grace => [	2619	grace => [
2192	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	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/	2621	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2194	],	2622	],
2195	hp => [	2623	hp => [
2196	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2624	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2197	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2625	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2198	],	2626	],
2199	mana => [	2627	mana => [
2200	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2628	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/	2629	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2202	],	2630	],
2203	);	2631	);
2204		2632
2205	# eg. VGauge->new (gauge => 'food'), default gauge: food	2633	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2308	glDisable GL_TEXTURE_2D;	2736	glDisable GL_TEXTURE_2D;
2309	}	2737	}
2310		2738
2311	#############################################################################	2739	#############################################################################
2312		2740
2313	package CFClient::UI::Gauge;	2741	package CFPlus::UI::Gauge;
2314		2742
2315	our @ISA = CFClient::UI::VBox::;	2743	our @ISA = CFPlus::UI::VBox::;
2316		2744
2317	sub new {	2745	sub new {
2318	my ($class, %arg) = @_;	2746	my ($class, %arg) = @_;
2319		2747
2320	my $self = $class->SUPER::new (	2748	my $self = $class->SUPER::new (
…		…
2322	can_hover => 1,	2750	can_hover => 1,
2323	can_events => 1,	2751	can_events => 1,
2324	%arg,	2752	%arg,
2325	);	2753	);
2326		2754
2327	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2755	$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);	2756	$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");	2757	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2330		2758
2331	$self	2759	$self
2332	}	2760	}
2333		2761
2334	sub set_fontsize {	2762	sub set_fontsize {
…		…
2355	$self->{value}->set_text ($val);	2783	$self->{value}->set_text ($val);
2356	}	2784	}
2357		2785
2358	#############################################################################	2786	#############################################################################
2359		2787
2360	package CFClient::UI::Slider;	2788	package CFPlus::UI::Slider;
2361		2789
2362	use strict;	2790	use strict;
2363		2791
2364	use CFClient::OpenGL;	2792	use CFPlus::OpenGL;
2365		2793
2366	our @ISA = CFClient::UI::DrawBG::;	2794	our @ISA = CFPlus::UI::DrawBG::;
2367		2795
2368	my @tex =	2796	my @tex =
2369	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2797	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2370	qw(s1_slider.png s1_slider_bg.png);	2798	qw(s1_slider.png s1_slider_bg.png);
2371		2799
2372	sub new {	2800	sub new {
2373	my $class = shift;	2801	my $class = shift;
2374		2802
…		…
2463	}	2891	}
2464		2892
2465	1	2893	1
2466	}	2894	}
2467		2895
		2896	sub invoke_mouse_wheel {
		2897	my ($self, $ev) = @_;
		2898
		2899	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2900
		2901	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2902
		2903	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2904
		2905	! ! $delta
		2906	}
		2907
2468	sub update {	2908	sub update {
2469	my ($self) = @_;	2909	my ($self) = @_;
2470		2910
2471	delete $self->{knob_w};	2911	delete $self->{knob_w};
2472	$self->SUPER::update;	2912	$self->SUPER::update;
…		…
2519	glDisable GL_TEXTURE_2D;	2959	glDisable GL_TEXTURE_2D;
2520	}	2960	}
2521		2961
2522	#############################################################################	2962	#############################################################################
2523		2963
2524	package CFClient::UI::ValSlider;	2964	package CFPlus::UI::ValSlider;
2525		2965
2526	our @ISA = CFClient::UI::HBox::;	2966	our @ISA = CFPlus::UI::HBox::;
2527		2967
2528	sub new {	2968	sub new {
2529	my ($class, %arg) = @_;	2969	my ($class, %arg) = @_;
2530		2970
2531	my $range = delete $arg{range};	2971	my $range = delete $arg{range};
2532		2972
2533	my $self = $class->SUPER::new (	2973	my $self = $class->SUPER::new (
2534	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2974	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2535	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2975	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2536	to_value => sub { shift },	2976	to_value => sub { shift },
2537	from_value => sub { shift },	2977	from_value => sub { shift },
2538	%arg,	2978	%arg,
2539	);	2979	);
2540		2980
…		…
2560	sub set_range { shift->{slider}->set_range (@_) }	3000	sub set_range { shift->{slider}->set_range (@_) }
2561	sub set_value { shift->{slider}->set_value (@_) }	3001	sub set_value { shift->{slider}->set_value (@_) }
2562		3002
2563	#############################################################################	3003	#############################################################################
2564		3004
2565	package CFClient::UI::TextScroller;	3005	package CFPlus::UI::TextScroller;
2566		3006
2567	our @ISA = CFClient::UI::HBox::;	3007	our @ISA = CFPlus::UI::HBox::;
2568		3008
2569	use CFClient::OpenGL;	3009	use CFPlus::OpenGL;
2570		3010
2571	sub new {	3011	sub new {
2572	my $class = shift;	3012	my $class = shift;
2573		3013
2574	my $self = $class->SUPER::new (	3014	my $self = $class->SUPER::new (
2575	fontsize => 1,	3015	fontsize => 1,
2576	can_events => 0,	3016	can_events => 1,
2577	indent => 0,	3017	indent => 0,
2578	#font => default_font	3018	#font => default_font
2579	@_,	3019	@_,
2580		3020
2581	layout => (new CFClient::Layout),	3021	layout => (new CFPlus::Layout),
2582	par => [],	3022	par => [],
		3023	max_par => 0,
2583	height => 0,	3024	height => 0,
2584	children => [	3025	children => [
2585	(new CFClient::UI::Empty expand => 1),	3026	(new CFPlus::UI::Empty expand => 1),
2586	(new CFClient::UI::Slider vertical => 1),	3027	(new CFPlus::UI::Slider vertical => 1),
2587	],	3028	],
2588	);	3029	);
2589		3030
2590	$self->{children}[1]->connect (changed => sub { $self->update });	3031	$self->{children}[1]->connect (changed => sub { $self->update });
2591		3032
…		…
2621		3062
2622	$self->reflow;	3063	$self->reflow;
2623		3064
2624	local $self->{children} = [$empty, $slider];	3065	local $self->{children} = [$empty, $slider];
2625	$self->SUPER::invoke_size_allocate ($w, $h)	3066	$self->SUPER::invoke_size_allocate ($w, $h)
		3067	}
		3068
		3069	sub invoke_mouse_wheel {
		3070	my ($self, $ev) = @_;
		3071
		3072	return 0 unless $ev->{dy}; # only vertical movements
		3073
		3074	$self->{children}[1]->emit (mouse_wheel => $ev);
		3075
		3076	1
2626	}	3077	}
2627		3078
2628	sub get_layout {	3079	sub get_layout {
2629	my ($self, $para) = @_;	3080	my ($self, $para) = @_;
2630		3081
…		…
2658		3109
2659	# todo: base offset on lines or so, not on pixels	3110	# todo: base offset on lines or so, not on pixels
2660	$self->{children}[1]->set_value ($offset);	3111	$self->{children}[1]->set_value ($offset);
2661	}	3112	}
2662		3113
		3114	sub current_paragraph {
		3115	my ($self) = @_;
		3116
		3117	$self->{top_paragraph} - 1
		3118	}
		3119
		3120	sub scroll_to {
		3121	my ($self, $para) = @_;
		3122
		3123	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3124
		3125	$self->{scroll_to} = $para;
		3126	$self->update;
		3127	}
		3128
2663	sub clear {	3129	sub clear {
2664	my ($self) = @_;	3130	my ($self) = @_;
2665		3131
2666	my (undef, undef, @other) = @{ $self->{children} };	3132	my (undef, undef, @other) = @{ $self->{children} };
2667	$self->remove ($_) for @other;	3133	$self->remove ($_) for @other;
…		…
2670	$self->{height} = 0;	3136	$self->{height} = 0;
2671	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3137	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672	}	3138	}
2673		3139
2674	sub add_paragraph {	3140	sub add_paragraph {
2675	my ($self, $color, $para, $indent) = @_;	3141	my $self = shift;
2676		3142
2677	my ($text, @w) = ref $para ? @$para : $para;	3143	for my $para (@_) {
2678
2679	$para = {	3144	$para = {
		3145	fg => [1, 1, 1, 1],
		3146	indent => 0,
		3147	markup => "",
		3148	widget => [],
		3149	ref $para ? %$para : (markup => $para),
2680	w => 1e10,	3150	w => 1e10,
2681	wrapped => 1,	3151	wrapped => 1,
2682	fg => $color,
2683	indent => $indent,
2684	markup => $text,
2685	widget => \@w,
2686	};	3152	};
2687		3153
2688	$self->add (@w) if @w;	3154	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2689	push @{$self->{par}}, $para;	3155	push @{$self->{par}}, $para;
		3156	}
		3157
		3158	if (my $max = $self->{max_par}) {
		3159	shift @{$self->{par}} while @{$self->{par}} > $max;
		3160	}
2690		3161
2691	$self->{need_reflow}++;	3162	$self->{need_reflow}++;
2692	$self->update;	3163	$self->update;
2693	}	3164	}
2694		3165
2695	sub scroll_to_bottom {	3166	sub scroll_to_bottom {
2696	my ($self) = @_;	3167	my ($self) = @_;
2697		3168
2698	$self->{scroll_to_bottom} = 1;	3169	$self->{scroll_to} = $#{$self->{par}};
2699	$self->update;	3170	$self->update;
2700	}	3171	}
2701		3172
		3173	sub force_uptodate {
		3174	my ($self) = @_;
		3175
		3176	if (delete $self->{need_reflow}) {
		3177	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3178
		3179	my $height = 0;
		3180
		3181	for my $para (@{$self->{par}}) {
		3182	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3183	my $layout = $self->get_layout ($para);
		3184	my ($w, $h) = $layout->size;
		3185
		3186	$para->{w} = $w + $para->{indent};
		3187	$para->{h} = $h;
		3188	$para->{wrapped} = $layout->has_wrapped;
		3189	}
		3190
		3191	$para->{y} = $height;
		3192	$height += $para->{h};
		3193	}
		3194
		3195	$self->{height} = $height;
		3196	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3197
		3198	delete $self->{texture};
		3199	}
		3200
		3201	if (my $paridx = delete $self->{scroll_to}) {
		3202	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3203	}
		3204	}
		3205
2702	sub update {	3206	sub update {
2703	my ($self) = @_;	3207	my ($self) = @_;
2704		3208
2705	$self->SUPER::update;	3209	$self->SUPER::update;
2706		3210
2707	return unless $self->{h} > 0;	3211	return unless $self->{h} > 0;
2708		3212
2709	delete $self->{texture};	3213	delete $self->{texture};
2710		3214
2711	$ROOT->on_post_alloc ($self => sub {	3215	$ROOT->on_post_alloc ($self => sub {
		3216	$self->force_uptodate;
		3217
2712	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3218	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713		3219
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 {	3220	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2742	glClearColor 0, 0, 0, 0;	3221	glClearColor 0, 0, 0, 0;
2743	glClear GL_COLOR_BUFFER_BIT;	3222	glClear GL_COLOR_BUFFER_BIT;
2744		3223
		3224	package CFPlus::UI::Base;
		3225	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3226	(0, 0, $self->{w}, $self->{h});
		3227
		3228	my $top = int $self->{children}[1]{range}[0];
		3229
		3230	my $paridx = 0;
		3231	my $top_paragraph;
2745	my $top = int $self->{children}[1]{range}[0];	3232	my $top = int $self->{children}[1]{range}[0];
2746		3233
2747	my $y0 = $top;	3234	my $y0 = $top;
2748	my $y1 = $top + $H;	3235	my $y1 = $top + $H;
2749		3236
2750	my $y = 0;
2751
2752	for my $para (@{$self->{par}}) {	3237	for my $para (@{$self->{par}}) {
2753	my $h = $para->{h};	3238	my $h = $para->{h};
		3239	my $y = $para->{y};
2754		3240
2755	if ($y0 < $y + $h && $y < $y1) {	3241	if ($y0 < $y + $h && $y < $y1) {
2756
2757	my $layout = $self->get_layout ($para);	3242	my $layout = $self->get_layout ($para);
2758		3243
2759	$layout->render ($para->{indent}, $y - $y0);	3244	$layout->render ($para->{indent}, $y - $y0);
2760		3245
2761	if (my @w = @{ $para->{widget} }) {	3246	if (my @w = @{ $para->{widget} }) {
…		…
2770	$_->draw;	3255	$_->draw;
2771	}	3256	}
2772	}	3257	}
2773	}	3258	}
2774		3259
2775	$y += $h;	3260	$paridx++;
		3261	$top_paragraph ||= $paridx if $y >= $top;
2776	}	3262	}
		3263
		3264	$self->{top_paragraph} = $top_paragraph;
2777	};	3265	};
2778	});	3266	});
2779	}	3267	}
2780		3268
2781	sub reconfigure {	3269	sub reconfigure {
…		…
2799	$self->{children}[1]->draw;	3287	$self->{children}[1]->draw;
2800	}	3288	}
2801		3289
2802	#############################################################################	3290	#############################################################################
2803		3291
2804	package CFClient::UI::Animator;	3292	package CFPlus::UI::Animator;
2805		3293
2806	use CFClient::OpenGL;	3294	use CFPlus::OpenGL;
2807		3295
2808	our @ISA = CFClient::UI::Bin::;	3296	our @ISA = CFPlus::UI::Bin::;
2809		3297
2810	sub moveto {	3298	sub moveto {
2811	my ($self, $x, $y) = @_;	3299	my ($self, $x, $y) = @_;
2812		3300
2813	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3301	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2841	glPopMatrix;	3329	glPopMatrix;
2842	}	3330	}
2843		3331
2844	#############################################################################	3332	#############################################################################
2845		3333
2846	package CFClient::UI::Flopper;	3334	package CFPlus::UI::Flopper;
2847		3335
2848	our @ISA = CFClient::UI::Button::;	3336	our @ISA = CFPlus::UI::Button::;
2849		3337
2850	sub new {	3338	sub new {
2851	my $class = shift;	3339	my $class = shift;
2852		3340
2853	my $self = $class->SUPER::new (	3341	my $self = $class->SUPER::new (
…		…
2865	$self->{other}->toggle_visibility;	3353	$self->{other}->toggle_visibility;
2866	}	3354	}
2867		3355
2868	#############################################################################	3356	#############################################################################
2869		3357
2870	package CFClient::UI::Tooltip;	3358	package CFPlus::UI::Tooltip;
2871		3359
2872	our @ISA = CFClient::UI::Bin::;	3360	our @ISA = CFPlus::UI::Bin::;
2873		3361
2874	use CFClient::OpenGL;	3362	use CFPlus::OpenGL;
2875		3363
2876	sub new {	3364	sub new {
2877	my $class = shift;	3365	my $class = shift;
2878		3366
2879	$class->SUPER::new (	3367	$class->SUPER::new (
…		…
2882	)	3370	)
2883	}	3371	}
2884		3372
2885	sub set_tooltip_from {	3373	sub set_tooltip_from {
2886	my ($self, $widget) = @_;	3374	my ($self, $widget) = @_;
		3375
		3376	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3377	if $widget->{tooltip} =~ /^#(.*)$/;
2887		3378
2888	my $tooltip = $widget->{tooltip};	3379	my $tooltip = $widget->{tooltip};
2889		3380
2890	if ($ENV{CFPLUS_DEBUG} & 2) {	3381	if ($ENV{CFPLUS_DEBUG} & 2) {
2891	$tooltip .= "\n\n" . (ref $widget) . "\n"	3382	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2895	}	3386	}
2896		3387
2897	$tooltip =~ s/^\n+//;	3388	$tooltip =~ s/^\n+//;
2898	$tooltip =~ s/\n+$//;	3389	$tooltip =~ s/\n+$//;
2899		3390
2900	$self->add (new CFClient::UI::Label	3391	$self->add (new CFPlus::UI::Label
2901	markup => $tooltip,	3392	markup => $tooltip,
2902	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3393	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2903	fontsize => 0.8,	3394	fontsize => 0.8,
2904	fg => [0, 0, 0, 1],	3395	style => 1, # FLAG_INVERSE
2905	ellipsise => 0,	3396	ellipsise => 0,
2906	font => ($widget->{tooltip_font} || $::FONT_PROP),	3397	font => ($widget->{tooltip_font} || $::FONT_PROP),
2907	);	3398	);
2908	}	3399	}
2909		3400
…		…
2928		3419
2929	$self->{root}->on_post_alloc ("move_$self" => sub {	3420	$self->{root}->on_post_alloc ("move_$self" => sub {
2930	my $widget = $self->{owner}	3421	my $widget = $self->{owner}
2931	or return;	3422	or return;
2932		3423
		3424	if ($widget->{visible}) {
2933	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3425	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934		3426
2935	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3427	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936	if $x + $self->{w} > $self->{root}{w};	3428	if $x + $self->{w} > $self->{root}{w};
2937		3429
2938	$self->move_abs ($x, $y);	3430	$self->move_abs ($x, $y);
		3431	} else {
		3432	$self->hide;
		3433	}
2939	});	3434	});
2940	}	3435	}
2941		3436
2942	sub _draw {	3437	sub _draw {
2943	my ($self) = @_;	3438	my ($self) = @_;
…		…
2967	$self->SUPER::_draw;	3462	$self->SUPER::_draw;
2968	}	3463	}
2969		3464
2970	#############################################################################	3465	#############################################################################
2971		3466
2972	package CFClient::UI::Face;	3467	package CFPlus::UI::Face;
2973		3468
2974	our @ISA = CFClient::UI::Base::;	3469	our @ISA = CFPlus::UI::DrawBG::;
2975		3470
2976	use CFClient::OpenGL;	3471	use CFPlus::OpenGL;
2977		3472
2978	sub new {	3473	sub new {
2979	my $class = shift;	3474	my $class = shift;
2980		3475
2981	my $self = $class->SUPER::new (	3476	my $self = $class->SUPER::new (
		3477	size_w => 32,
		3478	size_h => 8,
2982	aspect => 1,	3479	aspect => 1,
2983	can_events => 0,	3480	can_events => 0,
2984	@_,	3481	@_,
2985	);	3482	);
2986		3483
2987	if ($self->{anim} && $self->{animspeed}) {	3484	if ($self->{anim} && $self->{animspeed}) {
2988	Scalar::Util::weaken (my $widget = $self);	3485	CFPlus::weaken (my $widget = $self);
2989		3486
		3487	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3488	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2990	$self->{timer} = Event->timer (	3489	$self->{timer} = Event->timer (
2991	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2992	hard => 1,	3490	parked => 1,
2993	interval => $self->{animspeed},
2994	cb => sub {	3491	cb => sub {
		3492	return unless $::CONN && $widget;
		3493
2995	++$widget->{frame};	3494	++$widget->{frame};
		3495	$widget->update_face;
2996	$widget->update;	3496	$widget->update;
		3497
		3498	$widget->update_timer;
2997	},	3499	},
2998	);	3500	);
		3501
		3502	$self->update_face;
		3503	$self->update_timer;
2999	}	3504	}
3000		3505
3001	$self	3506	$self
3002	}	3507	}
3003		3508
		3509	sub update_timer {
		3510	my ($self) = @_;
		3511
		3512	return unless $self->{timer};
		3513
		3514	if ($self->{visible}) {
		3515	$self->{timer}->at (
		3516	$self->{anim_start}
		3517	+ $self->{animspeed}
		3518	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3519	);
		3520	$self->{timer}->start;
		3521	} else {
		3522	$self->{timer}->stop;
		3523	}
		3524	}
		3525
		3526	sub update_face {
		3527	my ($self) = @_;
		3528
		3529	return unless $::CONN;
		3530
		3531	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3532	if ($anim && @$anim) {
		3533	delete $self->{wait_face};
		3534	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3535	}
		3536	}
		3537	}
		3538
3004	sub size_request {	3539	sub size_request {
3005	(32, 8)	3540	my ($self) = @_;
		3541
		3542	if ($::CONN) {
		3543	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3544	if (my $tex = $::CONN->{texture}[$faceid]) {
		3545	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3546	} else {
		3547	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3548	$self->realloc;
		3549	});
		3550	}
		3551	}
		3552	}
		3553
		3554	($self->{size_w} || 8, $self->{size_h} || 8)
3006	}	3555	}
3007		3556
3008	sub update {	3557	sub update {
3009	my ($self) = @_;	3558	my ($self) = @_;
3010		3559
3011	return unless $self->{visible};	3560	return unless $self->{visible};
3012		3561
3013	$self->SUPER::update;	3562	$self->SUPER::update;
3014	}	3563	}
3015		3564
		3565	sub invoke_visibility_change {
		3566	my ($self) = @_;
		3567
		3568	$self->update_timer;
		3569
		3570	0
		3571	}
		3572
3016	sub _draw {	3573	sub _draw {
3017	my ($self) = @_;	3574	my ($self) = @_;
3018		3575
3019	return unless $::CONN;	3576	return unless $::CONN;
3020		3577
3021	my $face;	3578	$self->SUPER::_draw;
3022		3579
3023	if ($self->{frame}) {
3024	my $anim = $::CONN->{anim}[$self->{anim}];	3580	my $faceid = $::CONN->{faceid}[$self->{face}]
3025		3581	or return;
3026	$face = $anim->[ $self->{frame} % @$anim ]
3027	if $anim && @$anim;
3028	}
3029		3582
3030	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3583	my $tex = $::CONN->{texture}[$faceid];
3031		3584
3032	if ($tex) {	3585	if ($tex) {
3033	glEnable GL_TEXTURE_2D;	3586	glEnable GL_TEXTURE_2D;
3034	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3587	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3035	glColor 0, 0, 0, 1;	3588	glColor 0, 0, 0, 1;
…		…
3039	}	3592	}
3040		3593
3041	sub destroy {	3594	sub destroy {
3042	my ($self) = @_;	3595	my ($self) = @_;
3043		3596
3044	$self->{timer}->cancel	3597	(delete $self->{timer})->cancel
3045	if $self->{timer};	3598	if $self->{timer};
3046		3599
3047	$self->SUPER::destroy;	3600	$self->SUPER::destroy;
3048	}	3601	}
3049		3602
3050	#############################################################################	3603	#############################################################################
3051		3604
3052	package CFClient::UI::Buttonbar;	3605	package CFPlus::UI::Buttonbar;
3053		3606
3054	our @ISA = CFClient::UI::HBox::;	3607	our @ISA = CFPlus::UI::HBox::;
3055		3608
3056	# TODO: should actualyl wrap buttons and other goodies.	3609	# TODO: should actually wrap buttons and other goodies.
3057		3610
3058	#############################################################################	3611	#############################################################################
3059		3612
3060	package CFClient::UI::Menu;	3613	package CFPlus::UI::Menu;
3061		3614
3062	our @ISA = CFClient::UI::FancyFrame::;	3615	our @ISA = CFPlus::UI::Toplevel::;
3063		3616
3064	use CFClient::OpenGL;	3617	use CFPlus::OpenGL;
3065		3618
3066	sub new {	3619	sub new {
3067	my $class = shift;	3620	my $class = shift;
3068		3621
3069	my $self = $class->SUPER::new (	3622	my $self = $class->SUPER::new (
3070	items => [],	3623	items => [],
3071	z => 100,	3624	z => 100,
3072	@_,	3625	@_,
3073	);	3626	);
3074		3627
3075	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3628	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3076		3629
3077	for my $item (@{ $self->{items} }) {	3630	for my $item (@{ $self->{items} }) {
3078	my ($widget, $cb, $tooltip) = @$item;	3631	my ($widget, $cb, $tooltip) = @$item;
3079		3632
3080	# handle various types of items, only text for now	3633	# handle various types of items, only text for now
3081	if (!ref $widget) {	3634	if (!ref $widget) {
3082	if ($widget =~ /\t/) {	3635	if ($widget =~ /\t/) {
3083	my ($left, $right) = split /\t/, $widget, 2;	3636	my ($left, $right) = split /\t/, $widget, 2;
3084		3637
3085	$widget = new CFClient::UI::HBox	3638	$widget = new CFPlus::UI::HBox
3086	can_hover => 1,	3639	can_hover => 1,
3087	can_events => 1,	3640	can_events => 1,
3088	tooltip => $tooltip,	3641	tooltip => $tooltip,
3089	children => [	3642	children => [
3090	(new CFClient::UI::Label markup => $left, expand => 1),	3643	(new CFPlus::UI::Label markup => $left, expand => 1),
3091	(new CFClient::UI::Label markup => $right, align => +1),	3644	(new CFPlus::UI::Label markup => $right, align => +1),
3092	],	3645	],
3093	;	3646	;
3094		3647
3095	} else {	3648	} else {
3096	$widget = new CFClient::UI::Label	3649	$widget = new CFPlus::UI::Label
3097	can_hover => 1,	3650	can_hover => 1,
3098	can_events => 1,	3651	can_events => 1,
3099	markup => $widget,	3652	markup => $widget,
3100	tooltip => $tooltip;	3653	tooltip => $tooltip;
3101	}	3654	}
…		…
3149	1	3702	1
3150	}	3703	}
3151		3704
3152	#############################################################################	3705	#############################################################################
3153		3706
3154	package CFClient::UI::Multiplexer;	3707	package CFPlus::UI::Multiplexer;
3155		3708
3156	our @ISA = CFClient::UI::Container::;	3709	our @ISA = CFPlus::UI::Container::;
3157		3710
3158	sub new {	3711	sub new {
3159	my $class = shift;	3712	my $class = shift;
3160		3713
3161	my $self = $class->SUPER::new (	3714	my $self = $class->SUPER::new (
…		…
3222	$self->{current}->draw;	3775	$self->{current}->draw;
3223	}	3776	}
3224		3777
3225	#############################################################################	3778	#############################################################################
3226		3779
3227	package CFClient::UI::Notebook;	3780	package CFPlus::UI::Notebook;
3228		3781
3229	our @ISA = CFClient::UI::VBox::;	3782	our @ISA = CFPlus::UI::VBox::;
3230		3783
3231	sub new {	3784	sub new {
3232	my $class = shift;	3785	my $class = shift;
3233		3786
3234	my $self = $class->SUPER::new (	3787	my $self = $class->SUPER::new (
3235	buttonbar => (new CFClient::UI::Buttonbar),	3788	buttonbar => (new CFPlus::UI::Buttonbar),
3236	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3789	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3237	# filter => # will be put between multiplexer and $self	3790	# filter => # will be put between multiplexer and $self
3238	@_,	3791	@_,
3239	);	3792	);
3240		3793
3241	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3794	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3245	}	3798	}
3246		3799
3247	sub add {	3800	sub add {
3248	my ($self, $title, $widget, $tooltip) = @_;	3801	my ($self, $title, $widget, $tooltip) = @_;
3249		3802
3250	Scalar::Util::weaken $self;	3803	CFPlus::weaken $self;
3251		3804
3252	$self->{buttonbar}->add (new CFClient::UI::Button	3805	$self->{buttonbar}->add (new CFPlus::UI::Button
3253	markup => $title,	3806	markup => $title,
3254	tooltip => $tooltip,	3807	tooltip => $tooltip,
3255	on_activate => sub { $self->set_current_page ($widget) },	3808	on_activate => sub { $self->set_current_page ($widget) },
3256	);	3809	);
3257		3810
…		…
3271	$self->emit (page_changed => $self->{multiplexer}{current});	3824	$self->emit (page_changed => $self->{multiplexer}{current});
3272	}	3825	}
3273		3826
3274	#############################################################################	3827	#############################################################################
3275		3828
3276	package CFClient::UI::Combobox;	3829	package CFPlus::UI::Selector;
3277		3830
3278	use utf8;	3831	use utf8;
3279		3832
3280	our @ISA = CFClient::UI::Button::;	3833	our @ISA = CFPlus::UI::Button::;
3281		3834
3282	sub new {	3835	sub new {
3283	my $class = shift;	3836	my $class = shift;
3284		3837
3285	my $self = $class->SUPER::new (	3838	my $self = $class->SUPER::new (
…		…
3302	my ($value, $title, $tooltip) = @$_;	3855	my ($value, $title, $tooltip) = @$_;
3303		3856
3304	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3857	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305	}	3858	}
3306		3859
3307	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3860	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308	}	3861	}
3309		3862
3310	sub _set_value {	3863	sub _set_value {
3311	my ($self, $value) = @_;	3864	my ($self, $value) = @_;
3312		3865
…		…
3327	$self->emit (changed => $value);	3880	$self->emit (changed => $value);
3328	}	3881	}
3329		3882
3330	#############################################################################	3883	#############################################################################
3331		3884
3332	package CFClient::UI::Statusbox;	3885	package CFPlus::UI::Statusbox;
3333		3886
3334	our @ISA = CFClient::UI::VBox::;	3887	our @ISA = CFPlus::UI::VBox::;
3335		3888
3336	sub new {	3889	sub new {
3337	my $class = shift;	3890	my $class = shift;
3338		3891
3339	my $self = $class->SUPER::new (	3892	my $self = $class->SUPER::new (
3340	fontsize => 0.8,	3893	fontsize => 0.8,
3341	@_,	3894	@_,
3342	);	3895	);
3343		3896
3344	Scalar::Util::weaken (my $this = $self);	3897	CFPlus::weaken (my $this = $self);
3345		3898
3346	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3899	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3347		3900
3348	$self	3901	$self
3349	}	3902	}
…		…
3351	sub reorder {	3904	sub reorder {
3352	my ($self) = @_;	3905	my ($self) = @_;
3353	my $NOW = Time::HiRes::time;	3906	my $NOW = Time::HiRes::time;
3354		3907
3355	# freeze display when hovering over any label	3908	# freeze display when hovering over any label
3356	return if $CFClient::UI::TOOLTIP->{owner}	3909	return if $CFPlus::UI::TOOLTIP->{owner}
3357	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3910	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3358	values %{ $self->{item} };	3911	values %{ $self->{item} };
3359		3912
3360	while (my ($k, $v) = each %{ $self->{item} }) {	3913	while (my ($k, $v) = each %{ $self->{item} }) {
3361	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3914	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3362	}	3915	}
…		…
3383	for ($short) {	3936	for ($short) {
3384	s/^\s+//;	3937	s/^\s+//;
3385	s/\s+/ /g;	3938	s/\s+/ /g;
3386	}	3939	}
3387		3940
3388	new CFClient::UI::Label	3941	new CFPlus::UI::Label
3389	markup => $short,	3942	markup => $short,
3390	tooltip => $item->{tooltip},	3943	tooltip => $item->{tooltip},
3391	tooltip_font => $::FONT_PROP,	3944	tooltip_font => $::FONT_PROP,
3392	tooltip_width => 0.67,	3945	tooltip_width => 0.67,
3393	fontsize => $item->{fontsize} || $self->{fontsize},	3946	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3472	$self->SUPER::destroy;	4025	$self->SUPER::destroy;
3473	}	4026	}
3474		4027
3475	#############################################################################	4028	#############################################################################
3476		4029
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;	4030	package CFPlus::UI::Root;
3642		4031
3643	our @ISA = CFClient::UI::Container::;	4032	our @ISA = CFPlus::UI::Container::;
3644		4033
3645	use List::Util qw(min max);	4034	use List::Util qw(min max);
3646		4035
3647	use CFClient::OpenGL;	4036	use CFPlus::OpenGL;
3648		4037
3649	sub new {	4038	sub new {
3650	my $class = shift;	4039	my $class = shift;
3651		4040
3652	my $self = $class->SUPER::new (	4041	my $self = $class->SUPER::new (
3653	visible => 1,	4042	visible => 1,
3654	@_,	4043	@_,
3655	);	4044	);
3656		4045
3657	Scalar::Util::weaken ($self->{root} = $self);	4046	CFPlus::weaken ($self->{root} = $self);
3658		4047
3659	$self	4048	$self
3660	}	4049	}
3661		4050
3662	sub size_request {	4051	sub size_request {
…		…
3757	while ($self->{refresh_hook}) {	4146	while ($self->{refresh_hook}) {
3758	$_->()	4147	$_->()
3759	for values %{delete $self->{refresh_hook}};	4148	for values %{delete $self->{refresh_hook}};
3760	}	4149	}
3761		4150
3762	if ($self->{realloc}) {	4151	while ($self->{realloc}) {
3763	my %queue;	4152	my %queue;
3764	my @queue;	4153	my @queue;
3765	my $widget;	4154	my $widget;
3766		4155
3767	outer:	4156	outer:
…		…
3814	}	4203	}
3815	}	4204	}
3816		4205
3817	delete $self->{realloc}{$widget+0};	4206	delete $self->{realloc}{$widget+0};
3818	}	4207	}
3819	}
3820		4208
3821	while (my $size_alloc = delete $self->{size_alloc}) {	4209	while (my $size_alloc = delete $self->{size_alloc}) {
3822	my @queue = sort { $b->{visible} <=> $a->{visible} }	4210	my @queue = sort { $a->{visible} <=> $b->{visible} }
3823	values %$size_alloc;	4211	values %$size_alloc;
3824		4212
3825	while () {	4213	while () {
3826	my $widget = pop @queue || last;	4214	my $widget = pop @queue || last;
3827		4215
3828	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4216	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3829		4217
3830	$w = 0 if $w < 0;
3831	$h = 0 if $h < 0;
3832
3833	$w = max $widget->{min_w}, $w;	4218	$w = max $widget->{min_w}, $w;
3834	$h = max $widget->{min_h}, $h;	4219	$h = max $widget->{min_h}, $h;
3835		4220
		4221	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4222	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4223
3836	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4224	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4225	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838		4226
3839	$w = int $w + 0.5;	4227	$w = int $w + 0.5;
3840	$h = int $h + 0.5;	4228	$h = int $h + 0.5;
3841		4229
3842	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4230	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3843	$widget->{old_w} = $widget->{w};	4231	$widget->{old_w} = $widget->{w};
3844	$widget->{old_h} = $widget->{h};	4232	$widget->{old_h} = $widget->{h};
3845		4233
3846	$widget->{w} = $w;	4234	$widget->{w} = $w;
3847	$widget->{h} = $h;	4235	$widget->{h} = $h;
3848		4236
3849	$widget->emit (size_allocate => $w, $h);	4237	$widget->emit (size_allocate => $w, $h);
		4238	}
3850	}	4239	}
3851	}	4240	}
3852	}	4241	}
3853		4242
3854	while ($self->{post_alloc_hook}) {	4243	while ($self->{post_alloc_hook}) {
3855	$_->()	4244	$_->()
3856	for values %{delete $self->{post_alloc_hook}};	4245	for values %{delete $self->{post_alloc_hook}};
3857	}	4246	}
3858
3859		4247
3860	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4248	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3861	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4249	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3862	glClear GL_COLOR_BUFFER_BIT;	4250	glClear GL_COLOR_BUFFER_BIT;
3863		4251
…		…
3866	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4254	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3867	glMatrixMode GL_MODELVIEW;	4255	glMatrixMode GL_MODELVIEW;
3868	glLoadIdentity;	4256	glLoadIdentity;
3869		4257
3870	{	4258	{
3871	package CFClient::UI::Base;	4259	package CFPlus::UI::Base;
3872		4260
3873	($draw_x, $draw_y, $draw_w, $draw_h) =	4261	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3874	(0, 0, $self->{w}, $self->{h});	4262	(0, 0, $self->{w}, $self->{h});
3875	}
3876		4263
3877	$self->_draw;	4264	$self->_draw;
		4265	}
3878	}	4266	}
3879		4267
3880	#############################################################################	4268	#############################################################################
3881		4269
3882	package CFClient::UI;	4270	package CFPlus::UI;
3883		4271
3884	$ROOT = new CFClient::UI::Root;	4272	$ROOT = new CFPlus::UI::Root;
3885	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4273	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3886		4274
3887	1	4275	1
3888		4276

Diff Legend

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