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.400 by root, Sat Jul 21 16:15:03 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	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	;
		1100
991	$self->SUPER::add ($self->{vp}, $self->{slider});	1101	$self->SUPER::add ($self->{vp});
		1102
992	$self->add ($child) if $child;	1103	$self->add ($child) if $child;
993		1104
994	$self	1105	$self
995	}	1106	}
996
997	#TODO# update range on size_allocate depending on child
998		1107
999	sub add {	1108	sub add {
1000	my ($self, $widget) = @_;	1109	my ($self, $widget) = @_;
1001		1110
1002	$self->{vp}->add ($self->{child} = $widget);	1111	$self->{vp}->add ($self->{child} = $widget);
1003	}	1112	}
1004		1113
		1114	sub update_slider {
		1115	my ($self) = @_;
		1116
		1117	my $child = ($self->{vp} or return)->child;
		1118
		1119	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1120	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1121
		1122	my $visible = $w1 > $w2;
		1123	if ($visible != $self->{hslider_visible}) {
		1124	$self->{hslider_visible} = $visible;
		1125	$visible ? $self->SUPER::add ($self->{hslider})
		1126	: $self->SUPER::remove ($self->{hslider});
		1127	}
		1128
		1129	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1130	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1131
		1132	my $visible = $h1 > $h2;
		1133	if ($visible != $self->{vslider_visible}) {
		1134	$self->{vslider_visible} = $visible;
		1135	$visible ? $self->SUPER::add ($self->{vslider})
		1136	: $self->SUPER::remove ($self->{vslider});
		1137	}
		1138	}
		1139
		1140	sub start_dragging {
		1141	my ($self, $ev) = @_;
		1142
		1143	$self->grab_focus;
		1144
		1145	my $ox = $self->{vp}{view_x};
		1146	my $oy = $self->{vp}{view_y};
		1147
		1148	$self->{motion} = sub {
		1149	my ($ev, $x, $y) = @_;
		1150
		1151	$ox -= $ev->{xrel};
		1152	$oy -= $ev->{yrel};
		1153
		1154	$self->{vp}->set_offset ($ox, $oy);
		1155	};
		1156	}
		1157
		1158	sub invoke_mouse_wheel {
		1159	my ($self, $ev) = @_;
		1160
		1161	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1162	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1163
		1164	1
		1165	}
		1166
1005	sub invoke_button_down {	1167	sub invoke_button_down {
1006	my ($self, $ev) = @_;	1168	my ($self, $ev, $x, $y) = @_;
1007		1169
1008	warn "button down $ev->{button}\n";#d#	1170	if ($ev->{button} == 2) {
		1171	$self->start_dragging ($ev);
		1172	return 1;
1009		1173	}
		1174
1010	0	1175	0
1011	}	1176	}
1012		1177
1013	sub update_slider {	1178	sub invoke_button_up {
1014	my ($self) = @_;	1179	my ($self, $ev, $x, $y) = @_;
1015		1180
1016	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1181	if (delete $self->{motion}) {
1017	}	1182	return 1;
		1183	}
1018		1184
1019	sub update {	1185	0
1020	my ($self) = @_;	1186	}
1021		1187
1022	$self->SUPER::update;	1188	sub invoke_mouse_motion {
		1189	my ($self, $ev, $x, $y) = @_;
1023		1190
1024	$self->update_slider;	1191	if ($self->{motion}) {
		1192	$self->{motion}->($ev, $x, $y);
		1193	return 1;
		1194	}
		1195
		1196	0
1025	}	1197	}
1026		1198
1027	sub invoke_size_allocate {	1199	sub invoke_size_allocate {
1028	my ($self, $w, $h) = @_;	1200	my ($self, $w, $h) = @_;
1029		1201
1030	$self->update_slider;	1202	$self->update_slider;
1031
1032	$self->SUPER::invoke_size_allocate ($w, $h)	1203	$self->SUPER::invoke_size_allocate ($w, $h)
1033	}	1204	}
1034		1205
1035	#############################################################################	1206	#############################################################################
1036		1207
1037	package CFClient::UI::Frame;	1208	package CFPlus::UI::Frame;
1038		1209
1039	our @ISA = CFClient::UI::Bin::;	1210	our @ISA = CFPlus::UI::Bin::;
1040		1211
1041	use CFClient::OpenGL;	1212	use CFPlus::OpenGL;
1042		1213
1043	sub new {	1214	sub new {
1044	my $class = shift;	1215	my $class = shift;
1045		1216
1046	$class->SUPER::new (	1217	$class->SUPER::new (
…		…
1072	$self->SUPER::_draw;	1243	$self->SUPER::_draw;
1073	}	1244	}
1074		1245
1075	#############################################################################	1246	#############################################################################
1076		1247
1077	package CFClient::UI::FancyFrame;	1248	package CFPlus::UI::FancyFrame;
1078		1249
1079	our @ISA = CFClient::UI::Bin::;	1250	our @ISA = CFPlus::UI::Bin::;
1080		1251
1081	use CFClient::OpenGL;	1252	use CFPlus::OpenGL;
		1253
		1254	sub new {
		1255	my ($class, %arg) = @_;
		1256
		1257	if ((exists $arg{label}) && !ref $arg{label}) {
		1258	$arg{label} = new CFPlus::UI::Label
		1259	align => 1,
		1260	valign => 0,
		1261	text => $arg{label},
		1262	fontsize => ($arg{border} || 0.8) * 0.75;
		1263	}
		1264
		1265	my $self = $class->SUPER::new (
		1266	# label => "",
		1267	fg => [0.6, 0.3, 0.1],
		1268	border => 0.8,
		1269	style => 'single',
		1270	%arg,
		1271	);
		1272
		1273	$self
		1274	}
		1275
		1276	sub add {
		1277	my ($self, @widgets) = @_;
		1278
		1279	$self->SUPER::add (@widgets);
		1280	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1281	}
		1282
		1283	sub border {
		1284	int $_[0]{border} * $::FONTSIZE
		1285	}
		1286
		1287	sub size_request {
		1288	my ($self) = @_;
		1289
		1290	($self->{label_w}, undef) = $self->{label}->size_request
		1291	if $self->{label};
		1292
		1293	my ($w, $h) = $self->SUPER::size_request;
		1294
		1295	(
		1296	$w + $self->border * 2,
		1297	$h + $self->border * 2,
		1298	)
		1299	}
		1300
		1301	sub invoke_size_allocate {
		1302	my ($self, $w, $h) = @_;
		1303
		1304	my $border = $self->border;
		1305
		1306	$w -= List::Util::max 0, $border * 2;
		1307	$h -= List::Util::max 0, $border * 2;
		1308
		1309	if (my $label = $self->{label}) {
		1310	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1311	$label->{h} = List::Util::min $h, $border;
		1312	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1313	}
		1314
		1315	$self->child->configure ($border, $border, $w, $h);
		1316
		1317	1
		1318	}
		1319
		1320	sub _draw {
		1321	my ($self) = @_;
		1322
		1323	my $child = $self->{children}[0];
		1324
		1325	my $border = $self->border;
		1326	my ($w, $h) = ($self->{w}, $self->{h});
		1327
		1328	$child->draw;
		1329
		1330	glColor @{$self->{fg}};
		1331	glBegin GL_LINE_STRIP;
		1332	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1333	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1334	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1335	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1336	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1337	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1338	glEnd;
		1339
		1340	if ($self->{label}) {
		1341	glTranslate $border * 2, 0;
		1342	$self->{label}->_draw;
		1343	}
		1344	}
		1345
		1346	#############################################################################
		1347
		1348	package CFPlus::UI::Toplevel;
		1349
		1350	our @ISA = CFPlus::UI::Bin::;
		1351
		1352	use CFPlus::OpenGL;
1082		1353
1083	my $bg =	1354	my $bg =
1084	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1355	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1085	mipmap => 1, wrap => 1;	1356	mipmap => 1, wrap => 1;
1086		1357
1087	my @border =	1358	my @border =
1088	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1359	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);	1360	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1361
		1362	my @icon =
		1363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1364	qw(x1_move.png x1_resize.png);
1090		1365
1091	sub new {	1366	sub new {
1092	my ($class, %arg) = @_;	1367	my ($class, %arg) = @_;
1093		1368
1094	my $self = $class->SUPER::new (	1369	my $self = $class->SUPER::new (
…		…
1099	min_w => 64,	1374	min_w => 64,
1100	min_h => 32,	1375	min_h => 32,
1101	%arg,	1376	%arg,
1102	);	1377	);
1103		1378
1104	$self->{title_widget} = new CFClient::UI::Label	1379	$self->{title_widget} = new CFPlus::UI::Label
1105	align => 0,	1380	align => 0,
1106	valign => 1,	1381	valign => 1,
1107	text => $self->{title},	1382	text => $self->{title},
1108	fontsize => $self->{border},	1383	fontsize => $self->{border},
1109	if exists $self->{title};	1384	if exists $self->{title};
1110		1385
1111	if ($self->{has_close_button}) {	1386	if ($self->{has_close_button}) {
1112	$self->{close_button} =	1387	$self->{close_button} =
1113	new CFClient::UI::ImageButton	1388	new CFPlus::UI::ImageButton
1114	path => 'x1_close.png',	1389	path => 'x1_close.png',
1115	on_activate => sub { $self->emit ("delete") };	1390	on_activate => sub { $self->emit ("delete") };
1116		1391
1117	$self->CFClient::UI::Container::add ($self->{close_button});	1392	$self->CFPlus::UI::Container::add ($self->{close_button});
1118	}	1393	}
1119		1394
1120	$self	1395	$self
1121	}	1396	}
1122		1397
1123	sub add {	1398	sub add {
1124	my ($self, @widgets) = @_;	1399	my ($self, @widgets) = @_;
1125		1400
1126	$self->SUPER::add (@widgets);	1401	$self->SUPER::add (@widgets);
1127	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1402	$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};	1403	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1129	}	1404	}
1130		1405
1131	sub border {	1406	sub border {
1132	int $_[0]{border} * $::FONTSIZE	1407	int $_[0]{border} * $::FONTSIZE
1133	}	1408	}
…		…
1241	$self->{motion}->($ev, $x, $y) if $self->{motion};	1516	$self->{motion}->($ev, $x, $y) if $self->{motion};
1242		1517
1243	! ! $self->{motion}	1518	! ! $self->{motion}
1244	}	1519	}
1245		1520
		1521	sub invoke_visibility_change {
		1522	my ($self, $visible) = @_;
		1523
		1524	delete $self->{motion} unless $visible;
		1525
		1526	0
		1527	}
		1528
1246	sub _draw {	1529	sub _draw {
1247	my ($self) = @_;	1530	my ($self) = @_;
1248		1531
1249	my $child = $self->{children}[0];	1532	my $child = $self->{children}[0];
1250		1533
…		…
1255	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1538	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1256		1539
1257	my $border = $self->border;	1540	my $border = $self->border;
1258		1541
1259	glColor @{ $self->{border_bg} };	1542	glColor @{ $self->{border_bg} };
1260	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1543	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1261	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1544	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1262	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1545	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1263	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1546	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1547
		1548	# move
		1549	my $w2 = ($w - $border) * .5;
		1550	my $h2 = ($h - $border) * .5;
		1551	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1552	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1553	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1554
		1555	# resize
		1556	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1557	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1558	unless $self->{has_close_button};
		1559	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1560	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1264		1561
1265	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1562	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1266	glColor @{ $self->{bg} };	1563	glColor @{ $self->{bg} };
1267		1564
1268	# TODO: repeat texture not scale	1565	# TODO: repeat texture not scale
…		…
1287	if $self->{close_button};	1584	if $self->{close_button};
1288	}	1585	}
1289		1586
1290	#############################################################################	1587	#############################################################################
1291		1588
1292	package CFClient::UI::Table;	1589	package CFPlus::UI::Table;
1293		1590
1294	our @ISA = CFClient::UI::Base::;	1591	our @ISA = CFPlus::UI::Container::;
1295		1592
1296	use List::Util qw(max sum);	1593	use List::Util qw(max sum);
1297		1594
1298	use CFClient::OpenGL;	1595	use CFPlus::OpenGL;
1299		1596
1300	sub new {	1597	sub new {
1301	my $class = shift;	1598	my $class = shift;
1302		1599
1303	$class->SUPER::new (	1600	$class->SUPER::new (
1304	col_expand => [],	1601	col_expand => [],
		1602	row_expand => [],
1305	@_,	1603	@_,
1306	)	1604	)
1307	}	1605	}
1308		1606
1309	sub children {
1310	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311	}
1312
1313	sub add {	1607	sub add {
1314	my ($self, $x, $y, $child) = @_;	1608	my ($self, @widgets) = @_;
1315		1609
1316	$child->set_parent ($self);	1610	for my $child (@widgets) {
1317	$self->{children}[$y][$x] = $child;	1611	$child->{rowspan} ||= 1;
		1612	$child->{colspan} ||= 1;
		1613	}
1318		1614
1319	$self->realloc;	1615	$self->SUPER::add (@widgets);
1320	}	1616	}
1321		1617
1322	sub remove {	1618	sub add_at {
		1619	my $self = shift;
		1620
		1621	my @widgets;
		1622
		1623	while (@_) {
		1624	my ($col, $row, $child) = splice @_, 0, 3, ();
		1625
		1626	$child->{row} = $row;
		1627	$child->{col} = $col;
		1628
		1629	push @widgets, $child;
		1630	}
		1631
		1632	$self->add (@widgets);
		1633	}
		1634
		1635	sub get_wh {
1323	my ($self, $child) = @_;	1636	my ($self) = @_;
1324		1637
1325	# TODO: not yet implemented	1638	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		1639
1332	my @children = $self->children;	1640	my @children = $self->children;
1333	delete $self->{children};	1641
		1642	# first pass, columns
		1643	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1644	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1645
		1646	my $sw = sum @w[$c .. $c + $cs - 1];
		1647
		1648	if ($w > $sw) {
		1649	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1650	}
1334		1651	}
1335	for (@children) {
1336	delete $_->{parent};
1337	$_->hide;
1338	}
1339		1652
1340	$self->realloc;	1653	# second pass, rows
1341	}	1654	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)};	1655	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1356		1656
1357	$w[$x] = max $w[$x], $w;	1657	my $sh = sum @h[$r .. $r + $rs - 1];
1358	$h[$y] = max $h[$y], $h;	1658
		1659	if ($h > $sh) {
		1660	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1359	}	1661	}
1360	}	1662	}
1361		1663
1362	(\@w, \@h)	1664	(\@w, \@h)
1363	}	1665	}
…		…
1379	my ($ws, $hs) = $self->get_wh;	1681	my ($ws, $hs) = $self->get_wh;
1380		1682
1381	my $req_w = (sum @$ws) || 1;	1683	my $req_w = (sum @$ws) || 1;
1382	my $req_h = (sum @$hs) || 1;	1684	my $req_h = (sum @$hs) || 1;
1383		1685
1384	# TODO: nicer code && do row_expand	1686	# now linearly scale the rows/columns to the allocated size
1385	my @col_expand = @{$self->{col_expand}};	1687	my @col_expand = @{$self->{col_expand}};
1386	@col_expand = (1) x @$ws unless @col_expand;	1688	@col_expand = (1) x @$ws unless @col_expand;
1387	my $col_expand = (sum @col_expand) || 1;	1689	my $col_expand = (sum @col_expand) || 1;
1388		1690
1389	# linearly scale sizes
1390	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1691	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1391	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1392		1692
1393	CFClient::UI::harmonize $ws;	1693	CFPlus::UI::harmonize $ws;
		1694
		1695	my @row_expand = @{$self->{row_expand}};
		1696	@row_expand = (1) x @$ws unless @row_expand;
		1697	my $row_expand = (sum @row_expand) || 1;
		1698
		1699	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1700
1394	CFClient::UI::harmonize $hs;	1701	CFPlus::UI::harmonize $hs;
1395		1702
1396	my $y;	1703	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1704	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1397		1705
1398	for my $r (0 .. $#{$self->{children}}) {	1706	for my $widget ($self->children) {
1399	my $row = $self->{children}[$r]	1707	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1400	or next;
1401		1708
1402	my $x = 0;	1709	$widget->configure (
1403	my $row_h = $hs->[$r];	1710	$x[$c], $y[$r],
		1711	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1404		1712	);
1405	for my $c (0 .. $#$row) {	1713	}
1406	my $col_w = $ws->[$c];
1407		1714
1408	if (my $widget = $row->[$c]) {	1715	1
1409	$widget->configure ($x, $y, $col_w, $row_h);	1716	}
1410	}
1411		1717
1412	$x += $col_w;	1718	#############################################################################
		1719
		1720	package CFPlus::UI::Fixed;
		1721
		1722	use List::Util qw(min max);
		1723
		1724	our @ISA = CFPlus::UI::Container::;
		1725
		1726	sub add {
		1727	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1728
		1729	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1730	$self->SUPER::add ($child);
		1731	}
		1732
		1733	sub _scale($$$) {
		1734	my ($mode, $val, $max) = @_;
		1735
		1736	$mode eq "abs" ? $val
		1737	: $mode eq "rel" ? $val * $max
		1738	: 0
		1739	}
		1740
		1741	sub size_request {
		1742	my ($self) = @_;
		1743
		1744	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1745
		1746	# determine overall size by querying abs widgets
		1747	for my $child ($self->visible_children) {
		1748	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1749
		1750	if ($pos eq "abs") {
		1751	$w = _scale $size, $w, $child->{req_w};
		1752	$h = _scale $size, $h, $child->{req_h};
		1753
		1754	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1755	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1413	}	1756	}
		1757	}
1414		1758
1415	$y += $row_h;	1759	my $W = $x2 - $x1;
		1760	my $H = $y2 - $y1;
		1761
		1762	# now layout remaining widgets
		1763	for my $child ($self->visible_children) {
		1764	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1765
		1766	if ($pos ne "abs") {
		1767	$x = _scale $pos, $x, $W;
		1768	$y = _scale $pos, $x, $H;
		1769	$w = _scale $size, $w, $child->{req_w};
		1770	$h = _scale $size, $h, $child->{req_h};
		1771
		1772	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1773	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1774	}
		1775	}
		1776
		1777	my $W = $x2 - $x1;
		1778	my $H = $y2 - $y1;
		1779
		1780	($W, $H)
		1781	}
		1782
		1783	sub invoke_size_allocate {
		1784	my ($self, $W, $H) = @_;
		1785
		1786	for my $child ($self->visible_children) {
		1787	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1788
		1789	$x = _scale $pos, $x, $W;
		1790	$y = _scale $pos, $x, $H;
		1791	$w = _scale $size, $w, $child->{req_w};
		1792	$h = _scale $size, $h, $child->{req_h};
		1793
		1794	$child->configure ($x, $y, $w, $h);
1416	}	1795	}
1417		1796
1418	1	1797	1
1419	}	1798	}
1420		1799
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	#############################################################################	1800	#############################################################################
1446		1801
1447	package CFClient::UI::Box;	1802	package CFPlus::UI::Box;
1448		1803
1449	our @ISA = CFClient::UI::Container::;	1804	our @ISA = CFPlus::UI::Container::;
1450		1805
1451	sub size_request {	1806	sub size_request {
1452	my ($self) = @_;	1807	my ($self) = @_;
1453		1808
1454	$self->{vertical}	1809	$self->{vertical}
…		…
1487	$req[$_] += $space * $children[$_]{expand}	1842	$req[$_] += $space * $children[$_]{expand}
1488	for 0 .. $#children;	1843	for 0 .. $#children;
1489	}	1844	}
1490	}	1845	}
1491		1846
1492	CFClient::UI::harmonize \@req;	1847	CFPlus::UI::harmonize \@req;
1493		1848
1494	my $pos = 0;	1849	my $pos = 0;
1495	for (0 .. $#children) {	1850	for (0 .. $#children) {
1496	my $alloc = $req[$_];	1851	my $alloc = $req[$_];
1497	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1852	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1502	1	1857	1
1503	}	1858	}
1504		1859
1505	#############################################################################	1860	#############################################################################
1506		1861
1507	package CFClient::UI::HBox;	1862	package CFPlus::UI::HBox;
1508		1863
1509	our @ISA = CFClient::UI::Box::;	1864	our @ISA = CFPlus::UI::Box::;
1510		1865
1511	sub new {	1866	sub new {
1512	my $class = shift;	1867	my $class = shift;
1513		1868
1514	$class->SUPER::new (	1869	$class->SUPER::new (
…		…
1517	)	1872	)
1518	}	1873	}
1519		1874
1520	#############################################################################	1875	#############################################################################
1521		1876
1522	package CFClient::UI::VBox;	1877	package CFPlus::UI::VBox;
1523		1878
1524	our @ISA = CFClient::UI::Box::;	1879	our @ISA = CFPlus::UI::Box::;
1525		1880
1526	sub new {	1881	sub new {
1527	my $class = shift;	1882	my $class = shift;
1528		1883
1529	$class->SUPER::new (	1884	$class->SUPER::new (
…		…
1532	)	1887	)
1533	}	1888	}
1534		1889
1535	#############################################################################	1890	#############################################################################
1536		1891
1537	package CFClient::UI::Label;	1892	package CFPlus::UI::Label;
1538		1893
1539	our @ISA = CFClient::UI::DrawBG::;	1894	our @ISA = CFPlus::UI::DrawBG::;
1540		1895
1541	use CFClient::OpenGL;	1896	use CFPlus::OpenGL;
1542		1897
1543	sub new {	1898	sub new {
1544	my ($class, %arg) = @_;	1899	my ($class, %arg) = @_;
1545		1900
1546	my $self = $class->SUPER::new (	1901	my $self = $class->SUPER::new (
…		…
1549	#active_bg => none	1904	#active_bg => none
1550	#font => default_font	1905	#font => default_font
1551	#text => initial text	1906	#text => initial text
1552	#markup => initial narkup	1907	#markup => initial narkup
1553	#max_w => maximum pixel width	1908	#max_w => maximum pixel width
		1909	#style => 0, # render flags
1554	ellipsise => 3, # end	1910	ellipsise => 3, # end
1555	layout => (new CFClient::Layout),	1911	layout => (new CFPlus::Layout),
1556	fontsize => 1,	1912	fontsize => 1,
1557	align => -1,	1913	align => -1,
1558	valign => -1,	1914	valign => -1,
1559	padding_x => 2,	1915	padding_x => 2,
1560	padding_y => 2,	1916	padding_y => 2,
1561	can_events => 0,	1917	can_events => 0,
1562	%arg	1918	%arg
1563	);	1919	);
1564		1920
1565	if (exists $self->{template}) {	1921	if (exists $self->{template}) {
1566	my $layout = new CFClient::Layout;	1922	my $layout = new CFPlus::Layout;
1567	$layout->set_text (delete $self->{template});	1923	$layout->set_text (delete $self->{template});
1568	$self->{template} = $layout;	1924	$self->{template} = $layout;
1569	}	1925	}
1570		1926
1571	if (exists $self->{markup}) {	1927	if (exists $self->{markup}) {
…		…
1573	} else {	1929	} else {
1574	$self->set_text (delete $self->{text});	1930	$self->set_text (delete $self->{text});
1575	}	1931	}
1576		1932
1577	$self	1933	$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	}	1934	}
1589		1935
1590	sub update {	1936	sub update {
1591	my ($self) = @_;	1937	my ($self) = @_;
1592		1938
…		…
1719	};	2065	};
1720		2066
1721	my $w = List::Util::min $self->{w} + 4, $size->[0];	2067	my $w = List::Util::min $self->{w} + 4, $size->[0];
1722	my $h = List::Util::min $self->{h} + 2, $size->[1];	2068	my $h = List::Util::min $self->{h} + 2, $size->[1];
1723		2069
1724	$self->{layout}->render ($self->{ox}, $self->{oy});	2070	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1725	}	2071	}
1726		2072
1727	#############################################################################	2073	#############################################################################
1728		2074
1729	package CFClient::UI::EntryBase;	2075	package CFPlus::UI::EntryBase;
1730		2076
1731	our @ISA = CFClient::UI::Label::;	2077	our @ISA = CFPlus::UI::Label::;
1732		2078
1733	use CFClient::OpenGL;	2079	use CFPlus::OpenGL;
1734		2080
1735	sub new {	2081	sub new {
1736	my $class = shift;	2082	my $class = shift;
1737		2083
1738	$class->SUPER::new (	2084	$class->SUPER::new (
…		…
1742	active_fg => [0, 0, 0],	2088	active_fg => [0, 0, 0],
1743	can_hover => 1,	2089	can_hover => 1,
1744	can_focus => 1,	2090	can_focus => 1,
1745	valign => 0,	2091	valign => 0,
1746	can_events => 1,	2092	can_events => 1,
		2093	ellipsise => 0,
1747	#text => ...	2094	#text => ...
1748	#hidden => "*",	2095	#hidden => "*",
1749	@_	2096	@_
1750	)	2097	)
1751	}	2098	}
…		…
1796	my $sym = $ev->{sym};	2143	my $sym = $ev->{sym};
1797	my $uni = $ev->{unicode};	2144	my $uni = $ev->{unicode};
1798		2145
1799	my $text = $self->get_text;	2146	my $text = $self->get_text;
1800		2147
		2148	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2149
1801	if ($uni == 8) {	2150	if ($uni == 8) {
1802	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2151	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1803	} elsif ($uni == 127) {	2152	} elsif ($uni == 127) {
1804	substr $text, $self->{cursor}, 1, "";	2153	substr $text, $self->{cursor}, 1, "";
1805	} elsif ($sym == CFClient::SDLK_LEFT) {	2154	} elsif ($sym == CFPlus::SDLK_LEFT) {
1806	--$self->{cursor} if $self->{cursor};	2155	--$self->{cursor} if $self->{cursor};
1807	} elsif ($sym == CFClient::SDLK_RIGHT) {	2156	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1808	++$self->{cursor} if $self->{cursor} < length $self->{text};	2157	++$self->{cursor} if $self->{cursor} < length $self->{text};
1809	} elsif ($sym == CFClient::SDLK_HOME) {	2158	} elsif ($sym == CFPlus::SDLK_HOME) {
		2159	# what a hack
		2160	$self->{cursor} =
		2161	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2162	? length $1
		2163	: 0;
		2164	} elsif ($sym == CFPlus::SDLK_END) {
		2165	# uh, again
		2166	$self->{cursor} =
		2167	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2168	? $self->{cursor} + length $1
		2169	: length $self->{text};
		2170	} elsif ($uni == 21) { # ctrl-u
		2171	$text = "";
1810	$self->{cursor} = 0;	2172	$self->{cursor} = 0;
1811	} elsif ($sym == CFClient::SDLK_END) {
1812	$self->{cursor} = length $text;
1813	} elsif ($uni == 27) {	2173	} elsif ($uni == 27) {
1814	$self->emit ('escape');	2174	$self->emit ('escape');
1815	} elsif ($uni) {	2175	} elsif ($uni == 0x0d) {
		2176	substr $text, $self->{cursor}++, 0, "\012";
		2177	} elsif ($uni >= 0x20) {
1816	substr $text, $self->{cursor}++, 0, chr $uni;	2178	substr $text, $self->{cursor}++, 0, chr $uni;
1817	} else {	2179	} else {
1818	return 0;	2180	return 0;
1819	}	2181	}
1820		2182
1821	$self->_set_text ($text);	2183	$self->_set_text ($text);
1822		2184
1823	$self->realloc;	2185	$self->realloc;
		2186	$self->update;
1824		2187
1825	1	2188	1
1826	}	2189	}
1827		2190
1828	sub invoke_focus_in {	2191	sub invoke_focus_in {
…		…
1890	utf8::encode $text;	2253	utf8::encode $text;
1891		2254
1892	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2255	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1893	}	2256	}
1894		2257
1895	glColor @{$self->{fg}};
1896	glBegin GL_LINES;	2258	glBegin GL_LINES;
1897	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2259	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};	2260	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1899	glEnd;	2261	glEnd;
1900	}	2262	}
1901	}	2263	}
1902		2264
		2265	#############################################################################
		2266
1903	package CFClient::UI::Entry;	2267	package CFPlus::UI::Entry;
1904		2268
1905	our @ISA = CFClient::UI::EntryBase::;	2269	our @ISA = CFPlus::UI::EntryBase::;
1906		2270
1907	use CFClient::OpenGL;	2271	use CFPlus::OpenGL;
1908		2272
1909	sub invoke_key_down {	2273	sub invoke_key_down {
1910	my ($self, $ev) = @_;	2274	my ($self, $ev) = @_;
1911		2275
1912	my $sym = $ev->{sym};	2276	my $sym = $ev->{sym};
1913		2277
1914	if ($sym == 13) {	2278	if ($ev->{uni} == 0x0d || $sym == 13) {
1915	unshift @{$self->{history}},	2279	unshift @{$self->{history}},
1916	my $txt = $self->get_text;	2280	my $txt = $self->get_text;
1917		2281
1918	$self->{history_pointer} = -1;	2282	$self->{history_pointer} = -1;
1919	$self->{history_saveback} = '';	2283	$self->{history_saveback} = '';
1920	$self->emit (activate => $txt);	2284	$self->emit (activate => $txt);
1921	$self->update;	2285	$self->update;
1922		2286
1923	} elsif ($sym == CFClient::SDLK_UP) {	2287	} elsif ($sym == CFPlus::SDLK_UP) {
1924	if ($self->{history_pointer} < 0) {	2288	if ($self->{history_pointer} < 0) {
1925	$self->{history_saveback} = $self->get_text;	2289	$self->{history_saveback} = $self->get_text;
1926	}	2290	}
1927	if (@{$self->{history} || []} > 0) {	2291	if (@{$self->{history} || []} > 0) {
1928	$self->{history_pointer}++;	2292	$self->{history_pointer}++;
…		…
1930	$self->{history_pointer} = @{$self->{history} || []} - 1;	2294	$self->{history_pointer} = @{$self->{history} || []} - 1;
1931	}	2295	}
1932	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2296	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1933	}	2297	}
1934		2298
1935	} elsif ($sym == CFClient::SDLK_DOWN) {	2299	} elsif ($sym == CFPlus::SDLK_DOWN) {
1936	$self->{history_pointer}--;	2300	$self->{history_pointer}--;
1937	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2301	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1938		2302
1939	if ($self->{history_pointer} >= 0) {	2303	if ($self->{history_pointer} >= 0) {
1940	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2304	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1949	1	2313	1
1950	}	2314	}
1951		2315
1952	#############################################################################	2316	#############################################################################
1953		2317
		2318	package CFPlus::UI::TextEdit;
		2319
		2320	our @ISA = CFPlus::UI::EntryBase::;
		2321
		2322	use CFPlus::OpenGL;
		2323
		2324	sub move_cursor_ver {
		2325	my ($self, $dy) = @_;
		2326
		2327	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2328
		2329	$y += $dy;
		2330
		2331	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2332	$self->{cursor} = $index;
		2333	delete $self->{cur_h};
		2334	$self->update;
		2335	return;
		2336	}
		2337	}
		2338
		2339	sub invoke_key_down {
		2340	my ($self, $ev) = @_;
		2341
		2342	my $sym = $ev->{sym};
		2343
		2344	if ($sym == CFPlus::SDLK_UP) {
		2345	$self->move_cursor_ver (-1);
		2346	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2347	$self->move_cursor_ver (+1);
		2348	} else {
		2349	return $self->SUPER::invoke_key_down ($ev)
		2350	}
		2351
		2352	1
		2353	}
		2354
		2355	#############################################################################
		2356
1954	package CFClient::UI::Button;	2357	package CFPlus::UI::Button;
1955		2358
1956	our @ISA = CFClient::UI::Label::;	2359	our @ISA = CFPlus::UI::Label::;
1957		2360
1958	use CFClient::OpenGL;	2361	use CFPlus::OpenGL;
1959		2362
1960	my @tex =	2363	my @tex =
1961	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2364	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1962	qw(b1_button_active.png);	2365	qw(b1_button_inactive.png b1_button_active.png);
1963		2366
1964	sub new {	2367	sub new {
1965	my $class = shift;	2368	my $class = shift;
1966		2369
1967	$class->SUPER::new (	2370	$class->SUPER::new (
1968	padding_x => 4,	2371	padding_x => 4,
1969	padding_y => 4,	2372	padding_y => 4,
1970	fg => [1, 1, 1],	2373	fg => [1.0, 1.0, 1.0],
1971	active_fg => [0, 0, 1],	2374	active_fg => [0.8, 0.8, 0.8],
1972	can_hover => 1,	2375	can_hover => 1,
1973	align => 0,	2376	align => 0,
1974	valign => 0,	2377	valign => 0,
1975	can_events => 1,	2378	can_events => 1,
1976	@_	2379	@_
…		…
1994		2397
1995	glEnable GL_TEXTURE_2D;	2398	glEnable GL_TEXTURE_2D;
1996	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2399	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1997	glColor 0, 0, 0, 1;	2400	glColor 0, 0, 0, 1;
1998		2401
		2402	my $tex = $tex[$GRAB == $self];
1999	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2403	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2000		2404
2001	glDisable GL_TEXTURE_2D;	2405	glDisable GL_TEXTURE_2D;
2002		2406
2003	$self->SUPER::_draw;	2407	$self->SUPER::_draw;
2004	}	2408	}
2005		2409
2006	#############################################################################	2410	#############################################################################
2007		2411
		2412	package CFPlus::UI::CheckBox;
		2413
		2414	our @ISA = CFPlus::UI::DrawBG::;
		2415
		2416	my @tex =
		2417	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2418	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2419
		2420	use CFPlus::OpenGL;
		2421
		2422	sub new {
		2423	my $class = shift;
		2424
		2425	$class->SUPER::new (
		2426	padding_x => 2,
		2427	padding_y => 2,
		2428	fg => [1, 1, 1],
		2429	active_fg => [1, 1, 0],
		2430	bg => [0, 0, 0, 0.2],
		2431	active_bg => [1, 1, 1, 0.5],
		2432	state => 0,
		2433	can_hover => 1,
		2434	@_
		2435	)
		2436	}
		2437
		2438	sub size_request {
		2439	my ($self) = @_;
		2440
		2441	(6) x 2
		2442	}
		2443
		2444	sub toggle {
		2445	my ($self) = @_;
		2446
		2447	$self->{state} = !$self->{state};
		2448	$self->emit (changed => $self->{state});
		2449	$self->update;
		2450	}
		2451
		2452	sub invoke_button_down {
		2453	my ($self, $ev, $x, $y) = @_;
		2454
		2455	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2456	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2457	$self->toggle;
		2458	} else {
		2459	return 0
		2460	}
		2461
		2462	1
		2463	}
		2464
		2465	sub _draw {
		2466	my ($self) = @_;
		2467
		2468	$self->SUPER::_draw;
		2469
		2470	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2471
		2472	my ($w, $h) = @$self{qw(w h)};
		2473
		2474	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2475
		2476	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2477
		2478	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2479
		2480	glEnable GL_TEXTURE_2D;
		2481	$tex->draw_quad_alpha (0, 0, $s, $s);
		2482	glDisable GL_TEXTURE_2D;
		2483	}
		2484
		2485	#############################################################################
		2486
		2487	package CFPlus::UI::Image;
		2488
		2489	our @ISA = CFPlus::UI::Base::;
		2490
		2491	use CFPlus::OpenGL;
		2492
		2493	our %texture_cache;
		2494
		2495	sub new {
		2496	my $class = shift;
		2497
		2498	my $self = $class->SUPER::new (
		2499	can_events => 0,
		2500	@_,
		2501	);
		2502
		2503	$self->{path} || $self->{tex}
		2504	or Carp::croak "'path' or 'tex' attributes required";
		2505
		2506	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2507	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2508
		2509	CFPlus::weaken $texture_cache{$self->{path}};
		2510
		2511	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2512
		2513	$self
		2514	}
		2515
		2516	sub STORABLE_freeze {
		2517	my ($self, $cloning) = @_;
		2518
		2519	$self->{path}
		2520	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2521
		2522	$self->{path}
		2523	}
		2524
		2525	sub STORABLE_attach {
		2526	my ($self, $cloning, $path) = @_;
		2527
		2528	$self->new (path => $path)
		2529	}
		2530
		2531	sub size_request {
		2532	my ($self) = @_;
		2533
		2534	($self->{tex}{w}, $self->{tex}{h})
		2535	}
		2536
		2537	sub _draw {
		2538	my ($self) = @_;
		2539
		2540	my $tex = $self->{tex};
		2541
		2542	my ($w, $h) = ($self->{w}, $self->{h});
		2543
		2544	if ($self->{rot90}) {
		2545	glRotate 90, 0, 0, 1;
		2546	glTranslate 0, -$self->{w}, 0;
		2547
		2548	($w, $h) = ($h, $w);
		2549	}
		2550
		2551	glEnable GL_TEXTURE_2D;
		2552	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2553
		2554	$tex->draw_quad (0, 0, $w, $h);
		2555
		2556	glDisable GL_TEXTURE_2D;
		2557	}
		2558
		2559	#############################################################################
		2560
2008	package CFClient::UI::ImageButton;	2561	package CFPlus::UI::ImageButton;
2009		2562
2010	our @ISA = CFClient::UI::Image::;	2563	our @ISA = CFPlus::UI::Image::;
2011		2564
2012	use CFClient::OpenGL;	2565	use CFPlus::OpenGL;
2013		2566
2014	my %textures;	2567	my %textures;
2015		2568
2016	sub new {	2569	sub new {
2017	my $class = shift;	2570	my $class = shift;
…		…
2039	1	2592	1
2040	}	2593	}
2041		2594
2042	#############################################################################	2595	#############################################################################
2043		2596
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;	2597	package CFPlus::UI::VGauge;
2120		2598
2121	our @ISA = CFClient::UI::Base::;	2599	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		2600
2182	use List::Util qw(min max);	2601	use List::Util qw(min max);
2183		2602
2184	use CFClient::OpenGL;	2603	use CFPlus::OpenGL;
2185		2604
2186	my %tex = (	2605	my %tex = (
2187	food => [	2606	food => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2607	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2608	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2190	],	2609	],
2191	grace => [	2610	grace => [
2192	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2611	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/	2612	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2194	],	2613	],
2195	hp => [	2614	hp => [
2196	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2615	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2197	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2616	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2198	],	2617	],
2199	mana => [	2618	mana => [
2200	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2619	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/	2620	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2202	],	2621	],
2203	);	2622	);
2204		2623
2205	# eg. VGauge->new (gauge => 'food'), default gauge: food	2624	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2308	glDisable GL_TEXTURE_2D;	2727	glDisable GL_TEXTURE_2D;
2309	}	2728	}
2310		2729
2311	#############################################################################	2730	#############################################################################
2312		2731
2313	package CFClient::UI::Gauge;	2732	package CFPlus::UI::Gauge;
2314		2733
2315	our @ISA = CFClient::UI::VBox::;	2734	our @ISA = CFPlus::UI::VBox::;
2316		2735
2317	sub new {	2736	sub new {
2318	my ($class, %arg) = @_;	2737	my ($class, %arg) = @_;
2319		2738
2320	my $self = $class->SUPER::new (	2739	my $self = $class->SUPER::new (
…		…
2322	can_hover => 1,	2741	can_hover => 1,
2323	can_events => 1,	2742	can_events => 1,
2324	%arg,	2743	%arg,
2325	);	2744	);
2326		2745
2327	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2746	$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);	2747	$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");	2748	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2330		2749
2331	$self	2750	$self
2332	}	2751	}
2333		2752
2334	sub set_fontsize {	2753	sub set_fontsize {
…		…
2355	$self->{value}->set_text ($val);	2774	$self->{value}->set_text ($val);
2356	}	2775	}
2357		2776
2358	#############################################################################	2777	#############################################################################
2359		2778
2360	package CFClient::UI::Slider;	2779	package CFPlus::UI::Slider;
2361		2780
2362	use strict;	2781	use strict;
2363		2782
2364	use CFClient::OpenGL;	2783	use CFPlus::OpenGL;
2365		2784
2366	our @ISA = CFClient::UI::DrawBG::;	2785	our @ISA = CFPlus::UI::DrawBG::;
2367		2786
2368	my @tex =	2787	my @tex =
2369	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2788	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2370	qw(s1_slider.png s1_slider_bg.png);	2789	qw(s1_slider.png s1_slider_bg.png);
2371		2790
2372	sub new {	2791	sub new {
2373	my $class = shift;	2792	my $class = shift;
2374		2793
…		…
2463	}	2882	}
2464		2883
2465	1	2884	1
2466	}	2885	}
2467		2886
		2887	sub invoke_mouse_wheel {
		2888	my ($self, $ev) = @_;
		2889
		2890	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2891
		2892	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2893
		2894	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2895
		2896	! ! $delta
		2897	}
		2898
2468	sub update {	2899	sub update {
2469	my ($self) = @_;	2900	my ($self) = @_;
2470		2901
2471	delete $self->{knob_w};	2902	delete $self->{knob_w};
2472	$self->SUPER::update;	2903	$self->SUPER::update;
…		…
2519	glDisable GL_TEXTURE_2D;	2950	glDisable GL_TEXTURE_2D;
2520	}	2951	}
2521		2952
2522	#############################################################################	2953	#############################################################################
2523		2954
2524	package CFClient::UI::ValSlider;	2955	package CFPlus::UI::ValSlider;
2525		2956
2526	our @ISA = CFClient::UI::HBox::;	2957	our @ISA = CFPlus::UI::HBox::;
2527		2958
2528	sub new {	2959	sub new {
2529	my ($class, %arg) = @_;	2960	my ($class, %arg) = @_;
2530		2961
2531	my $range = delete $arg{range};	2962	my $range = delete $arg{range};
2532		2963
2533	my $self = $class->SUPER::new (	2964	my $self = $class->SUPER::new (
2534	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2965	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2535	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2966	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2536	to_value => sub { shift },	2967	to_value => sub { shift },
2537	from_value => sub { shift },	2968	from_value => sub { shift },
2538	%arg,	2969	%arg,
2539	);	2970	);
2540		2971
…		…
2560	sub set_range { shift->{slider}->set_range (@_) }	2991	sub set_range { shift->{slider}->set_range (@_) }
2561	sub set_value { shift->{slider}->set_value (@_) }	2992	sub set_value { shift->{slider}->set_value (@_) }
2562		2993
2563	#############################################################################	2994	#############################################################################
2564		2995
2565	package CFClient::UI::TextScroller;	2996	package CFPlus::UI::TextScroller;
2566		2997
2567	our @ISA = CFClient::UI::HBox::;	2998	our @ISA = CFPlus::UI::HBox::;
2568		2999
2569	use CFClient::OpenGL;	3000	use CFPlus::OpenGL;
2570		3001
2571	sub new {	3002	sub new {
2572	my $class = shift;	3003	my $class = shift;
2573		3004
2574	my $self = $class->SUPER::new (	3005	my $self = $class->SUPER::new (
2575	fontsize => 1,	3006	fontsize => 1,
2576	can_events => 0,	3007	can_events => 1,
2577	indent => 0,	3008	indent => 0,
2578	#font => default_font	3009	#font => default_font
2579	@_,	3010	@_,
2580		3011
2581	layout => (new CFClient::Layout),	3012	layout => (new CFPlus::Layout),
2582	par => [],	3013	par => [],
		3014	max_par => 0,
2583	height => 0,	3015	height => 0,
2584	children => [	3016	children => [
2585	(new CFClient::UI::Empty expand => 1),	3017	(new CFPlus::UI::Empty expand => 1),
2586	(new CFClient::UI::Slider vertical => 1),	3018	(new CFPlus::UI::Slider vertical => 1),
2587	],	3019	],
2588	);	3020	);
2589		3021
2590	$self->{children}[1]->connect (changed => sub { $self->update });	3022	$self->{children}[1]->connect (changed => sub { $self->update });
2591		3023
…		…
2621		3053
2622	$self->reflow;	3054	$self->reflow;
2623		3055
2624	local $self->{children} = [$empty, $slider];	3056	local $self->{children} = [$empty, $slider];
2625	$self->SUPER::invoke_size_allocate ($w, $h)	3057	$self->SUPER::invoke_size_allocate ($w, $h)
		3058	}
		3059
		3060	sub invoke_mouse_wheel {
		3061	my ($self, $ev) = @_;
		3062
		3063	return 0 unless $ev->{dy}; # only vertical movements
		3064
		3065	$self->{children}[1]->emit (mouse_wheel => $ev);
		3066
		3067	1
2626	}	3068	}
2627		3069
2628	sub get_layout {	3070	sub get_layout {
2629	my ($self, $para) = @_;	3071	my ($self, $para) = @_;
2630		3072
…		…
2658		3100
2659	# todo: base offset on lines or so, not on pixels	3101	# todo: base offset on lines or so, not on pixels
2660	$self->{children}[1]->set_value ($offset);	3102	$self->{children}[1]->set_value ($offset);
2661	}	3103	}
2662		3104
		3105	sub current_paragraph {
		3106	my ($self) = @_;
		3107
		3108	$self->{top_paragraph} - 1
		3109	}
		3110
		3111	sub scroll_to {
		3112	my ($self, $para) = @_;
		3113
		3114	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3115
		3116	$self->{scroll_to} = $para;
		3117	$self->update;
		3118	}
		3119
2663	sub clear {	3120	sub clear {
2664	my ($self) = @_;	3121	my ($self) = @_;
2665		3122
2666	my (undef, undef, @other) = @{ $self->{children} };	3123	my (undef, undef, @other) = @{ $self->{children} };
2667	$self->remove ($_) for @other;	3124	$self->remove ($_) for @other;
…		…
2670	$self->{height} = 0;	3127	$self->{height} = 0;
2671	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3128	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672	}	3129	}
2673		3130
2674	sub add_paragraph {	3131	sub add_paragraph {
2675	my ($self, $color, $para, $indent) = @_;	3132	my $self = shift;
2676		3133
2677	my ($text, @w) = ref $para ? @$para : $para;	3134	for my $para (@_) {
2678
2679	$para = {	3135	$para = {
		3136	fg => [1, 1, 1, 1],
		3137	indent => 0,
		3138	markup => "",
		3139	widget => [],
		3140	ref $para ? %$para : (markup => $para),
2680	w => 1e10,	3141	w => 1e10,
2681	wrapped => 1,	3142	wrapped => 1,
2682	fg => $color,
2683	indent => $indent,
2684	markup => $text,
2685	widget => \@w,
2686	};	3143	};
2687		3144
2688	$self->add (@w) if @w;	3145	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2689	push @{$self->{par}}, $para;	3146	push @{$self->{par}}, $para;
		3147	}
		3148
		3149	if (my $max = $self->{max_par}) {
		3150	shift @{$self->{par}} while @{$self->{par}} > $max;
		3151	}
2690		3152
2691	$self->{need_reflow}++;	3153	$self->{need_reflow}++;
2692	$self->update;	3154	$self->update;
2693	}	3155	}
2694		3156
2695	sub scroll_to_bottom {	3157	sub scroll_to_bottom {
2696	my ($self) = @_;	3158	my ($self) = @_;
2697		3159
2698	$self->{scroll_to_bottom} = 1;	3160	$self->{scroll_to} = $#{$self->{par}};
2699	$self->update;	3161	$self->update;
2700	}	3162	}
2701		3163
		3164	sub force_uptodate {
		3165	my ($self) = @_;
		3166
		3167	if (delete $self->{need_reflow}) {
		3168	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3169
		3170	my $height = 0;
		3171
		3172	for my $para (@{$self->{par}}) {
		3173	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3174	my $layout = $self->get_layout ($para);
		3175	my ($w, $h) = $layout->size;
		3176
		3177	$para->{w} = $w + $para->{indent};
		3178	$para->{h} = $h;
		3179	$para->{wrapped} = $layout->has_wrapped;
		3180	}
		3181
		3182	$para->{y} = $height;
		3183	$height += $para->{h};
		3184	}
		3185
		3186	$self->{height} = $height;
		3187	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3188
		3189	delete $self->{texture};
		3190	}
		3191
		3192	if (my $paridx = delete $self->{scroll_to}) {
		3193	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3194	}
		3195	}
		3196
2702	sub update {	3197	sub update {
2703	my ($self) = @_;	3198	my ($self) = @_;
2704		3199
2705	$self->SUPER::update;	3200	$self->SUPER::update;
2706		3201
2707	return unless $self->{h} > 0;	3202	return unless $self->{h} > 0;
2708		3203
2709	delete $self->{texture};	3204	delete $self->{texture};
2710		3205
2711	$ROOT->on_post_alloc ($self => sub {	3206	$ROOT->on_post_alloc ($self => sub {
		3207	$self->force_uptodate;
		3208
2712	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3209	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713		3210
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 {	3211	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2742	glClearColor 0, 0, 0, 0;	3212	glClearColor 0, 0, 0, 0;
2743	glClear GL_COLOR_BUFFER_BIT;	3213	glClear GL_COLOR_BUFFER_BIT;
2744		3214
		3215	package CFPlus::UI::Base;
		3216	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3217	(0, 0, $self->{w}, $self->{h});
		3218
		3219	my $top = int $self->{children}[1]{range}[0];
		3220
		3221	my $paridx = 0;
		3222	my $top_paragraph;
2745	my $top = int $self->{children}[1]{range}[0];	3223	my $top = int $self->{children}[1]{range}[0];
2746		3224
2747	my $y0 = $top;	3225	my $y0 = $top;
2748	my $y1 = $top + $H;	3226	my $y1 = $top + $H;
2749		3227
2750	my $y = 0;
2751
2752	for my $para (@{$self->{par}}) {	3228	for my $para (@{$self->{par}}) {
2753	my $h = $para->{h};	3229	my $h = $para->{h};
		3230	my $y = $para->{y};
2754		3231
2755	if ($y0 < $y + $h && $y < $y1) {	3232	if ($y0 < $y + $h && $y < $y1) {
2756
2757	my $layout = $self->get_layout ($para);	3233	my $layout = $self->get_layout ($para);
2758		3234
2759	$layout->render ($para->{indent}, $y - $y0);	3235	$layout->render ($para->{indent}, $y - $y0);
2760		3236
2761	if (my @w = @{ $para->{widget} }) {	3237	if (my @w = @{ $para->{widget} }) {
…		…
2770	$_->draw;	3246	$_->draw;
2771	}	3247	}
2772	}	3248	}
2773	}	3249	}
2774		3250
2775	$y += $h;	3251	$paridx++;
		3252	$top_paragraph ||= $paridx if $y >= $top;
2776	}	3253	}
		3254
		3255	$self->{top_paragraph} = $top_paragraph;
2777	};	3256	};
2778	});	3257	});
2779	}	3258	}
2780		3259
2781	sub reconfigure {	3260	sub reconfigure {
…		…
2799	$self->{children}[1]->draw;	3278	$self->{children}[1]->draw;
2800	}	3279	}
2801		3280
2802	#############################################################################	3281	#############################################################################
2803		3282
2804	package CFClient::UI::Animator;	3283	package CFPlus::UI::Animator;
2805		3284
2806	use CFClient::OpenGL;	3285	use CFPlus::OpenGL;
2807		3286
2808	our @ISA = CFClient::UI::Bin::;	3287	our @ISA = CFPlus::UI::Bin::;
2809		3288
2810	sub moveto {	3289	sub moveto {
2811	my ($self, $x, $y) = @_;	3290	my ($self, $x, $y) = @_;
2812		3291
2813	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3292	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2841	glPopMatrix;	3320	glPopMatrix;
2842	}	3321	}
2843		3322
2844	#############################################################################	3323	#############################################################################
2845		3324
2846	package CFClient::UI::Flopper;	3325	package CFPlus::UI::Flopper;
2847		3326
2848	our @ISA = CFClient::UI::Button::;	3327	our @ISA = CFPlus::UI::Button::;
2849		3328
2850	sub new {	3329	sub new {
2851	my $class = shift;	3330	my $class = shift;
2852		3331
2853	my $self = $class->SUPER::new (	3332	my $self = $class->SUPER::new (
…		…
2865	$self->{other}->toggle_visibility;	3344	$self->{other}->toggle_visibility;
2866	}	3345	}
2867		3346
2868	#############################################################################	3347	#############################################################################
2869		3348
2870	package CFClient::UI::Tooltip;	3349	package CFPlus::UI::Tooltip;
2871		3350
2872	our @ISA = CFClient::UI::Bin::;	3351	our @ISA = CFPlus::UI::Bin::;
2873		3352
2874	use CFClient::OpenGL;	3353	use CFPlus::OpenGL;
2875		3354
2876	sub new {	3355	sub new {
2877	my $class = shift;	3356	my $class = shift;
2878		3357
2879	$class->SUPER::new (	3358	$class->SUPER::new (
…		…
2882	)	3361	)
2883	}	3362	}
2884		3363
2885	sub set_tooltip_from {	3364	sub set_tooltip_from {
2886	my ($self, $widget) = @_;	3365	my ($self, $widget) = @_;
		3366
		3367	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3368	if $widget->{tooltip} =~ /^#(.*)$/;
2887		3369
2888	my $tooltip = $widget->{tooltip};	3370	my $tooltip = $widget->{tooltip};
2889		3371
2890	if ($ENV{CFPLUS_DEBUG} & 2) {	3372	if ($ENV{CFPLUS_DEBUG} & 2) {
2891	$tooltip .= "\n\n" . (ref $widget) . "\n"	3373	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2895	}	3377	}
2896		3378
2897	$tooltip =~ s/^\n+//;	3379	$tooltip =~ s/^\n+//;
2898	$tooltip =~ s/\n+$//;	3380	$tooltip =~ s/\n+$//;
2899		3381
2900	$self->add (new CFClient::UI::Label	3382	$self->add (new CFPlus::UI::Label
2901	markup => $tooltip,	3383	markup => $tooltip,
2902	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3384	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2903	fontsize => 0.8,	3385	fontsize => 0.8,
2904	fg => [0, 0, 0, 1],	3386	style => 1, # FLAG_INVERSE
2905	ellipsise => 0,	3387	ellipsise => 0,
2906	font => ($widget->{tooltip_font} || $::FONT_PROP),	3388	font => ($widget->{tooltip_font} || $::FONT_PROP),
2907	);	3389	);
2908	}	3390	}
2909		3391
…		…
2928		3410
2929	$self->{root}->on_post_alloc ("move_$self" => sub {	3411	$self->{root}->on_post_alloc ("move_$self" => sub {
2930	my $widget = $self->{owner}	3412	my $widget = $self->{owner}
2931	or return;	3413	or return;
2932		3414
		3415	if ($widget->{visible}) {
2933	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3416	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934		3417
2935	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3418	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936	if $x + $self->{w} > $self->{root}{w};	3419	if $x + $self->{w} > $self->{root}{w};
2937		3420
2938	$self->move_abs ($x, $y);	3421	$self->move_abs ($x, $y);
		3422	} else {
		3423	$self->hide;
		3424	}
2939	});	3425	});
2940	}	3426	}
2941		3427
2942	sub _draw {	3428	sub _draw {
2943	my ($self) = @_;	3429	my ($self) = @_;
…		…
2967	$self->SUPER::_draw;	3453	$self->SUPER::_draw;
2968	}	3454	}
2969		3455
2970	#############################################################################	3456	#############################################################################
2971		3457
2972	package CFClient::UI::Face;	3458	package CFPlus::UI::Face;
2973		3459
2974	our @ISA = CFClient::UI::Base::;	3460	our @ISA = CFPlus::UI::DrawBG::;
2975		3461
2976	use CFClient::OpenGL;	3462	use CFPlus::OpenGL;
2977		3463
2978	sub new {	3464	sub new {
2979	my $class = shift;	3465	my $class = shift;
2980		3466
2981	my $self = $class->SUPER::new (	3467	my $self = $class->SUPER::new (
		3468	size_w => 32,
		3469	size_h => 8,
2982	aspect => 1,	3470	aspect => 1,
2983	can_events => 0,	3471	can_events => 0,
2984	@_,	3472	@_,
2985	);	3473	);
2986		3474
2987	if ($self->{anim} && $self->{animspeed}) {	3475	if ($self->{anim} && $self->{animspeed}) {
2988	Scalar::Util::weaken (my $widget = $self);	3476	CFPlus::weaken (my $widget = $self);
2989		3477
		3478	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3479	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2990	$self->{timer} = Event->timer (	3480	$self->{timer} = Event->timer (
2991	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2992	hard => 1,	3481	parked => 1,
2993	interval => $self->{animspeed},
2994	cb => sub {	3482	cb => sub {
		3483	return unless $::CONN && $widget;
		3484
2995	++$widget->{frame};	3485	++$widget->{frame};
		3486	$widget->update_face;
2996	$widget->update;	3487	$widget->update;
		3488
		3489	$widget->update_timer;
2997	},	3490	},
2998	);	3491	);
		3492
		3493	$self->update_face;
		3494	$self->update_timer;
2999	}	3495	}
3000		3496
3001	$self	3497	$self
3002	}	3498	}
3003		3499
		3500	sub update_timer {
		3501	my ($self) = @_;
		3502
		3503	return unless $self->{timer};
		3504
		3505	if ($self->{visible}) {
		3506	$self->{timer}->at (
		3507	$self->{anim_start}
		3508	+ $self->{animspeed}
		3509	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3510	);
		3511	$self->{timer}->start;
		3512	} else {
		3513	$self->{timer}->stop;
		3514	}
		3515	}
		3516
		3517	sub update_face {
		3518	my ($self) = @_;
		3519
		3520	return unless $::CONN;
		3521
		3522	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3523	if ($anim && @$anim) {
		3524	delete $self->{wait_face};
		3525	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3526	}
		3527	}
		3528	}
		3529
3004	sub size_request {	3530	sub size_request {
3005	(32, 8)	3531	my ($self) = @_;
		3532
		3533	if ($::CONN) {
		3534	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3535	if (my $tex = $::CONN->{texture}[$faceid]) {
		3536	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3537	} else {
		3538	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3539	$self->realloc;
		3540	});
		3541	}
		3542	}
		3543	}
		3544
		3545	($self->{size_w} || 8, $self->{size_h} || 8)
3006	}	3546	}
3007		3547
3008	sub update {	3548	sub update {
3009	my ($self) = @_;	3549	my ($self) = @_;
3010		3550
3011	return unless $self->{visible};	3551	return unless $self->{visible};
3012		3552
3013	$self->SUPER::update;	3553	$self->SUPER::update;
3014	}	3554	}
3015		3555
		3556	sub invoke_visibility_change {
		3557	my ($self) = @_;
		3558
		3559	$self->update_timer;
		3560
		3561	0
		3562	}
		3563
3016	sub _draw {	3564	sub _draw {
3017	my ($self) = @_;	3565	my ($self) = @_;
3018		3566
3019	return unless $::CONN;	3567	return unless $::CONN;
3020		3568
3021	my $face;	3569	$self->SUPER::_draw;
3022		3570
3023	if ($self->{frame}) {
3024	my $anim = $::CONN->{anim}[$self->{anim}];	3571	my $faceid = $::CONN->{faceid}[$self->{face}]
3025		3572	or return;
3026	$face = $anim->[ $self->{frame} % @$anim ]
3027	if $anim && @$anim;
3028	}
3029		3573
3030	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3574	my $tex = $::CONN->{texture}[$faceid];
3031		3575
3032	if ($tex) {	3576	if ($tex) {
3033	glEnable GL_TEXTURE_2D;	3577	glEnable GL_TEXTURE_2D;
3034	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3578	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3035	glColor 0, 0, 0, 1;	3579	glColor 0, 0, 0, 1;
…		…
3039	}	3583	}
3040		3584
3041	sub destroy {	3585	sub destroy {
3042	my ($self) = @_;	3586	my ($self) = @_;
3043		3587
3044	$self->{timer}->cancel	3588	(delete $self->{timer})->cancel
3045	if $self->{timer};	3589	if $self->{timer};
3046		3590
3047	$self->SUPER::destroy;	3591	$self->SUPER::destroy;
3048	}	3592	}
3049		3593
3050	#############################################################################	3594	#############################################################################
3051		3595
3052	package CFClient::UI::Buttonbar;	3596	package CFPlus::UI::Buttonbar;
3053		3597
3054	our @ISA = CFClient::UI::HBox::;	3598	our @ISA = CFPlus::UI::HBox::;
3055		3599
3056	# TODO: should actualyl wrap buttons and other goodies.	3600	# TODO: should actually wrap buttons and other goodies.
3057		3601
3058	#############################################################################	3602	#############################################################################
3059		3603
3060	package CFClient::UI::Menu;	3604	package CFPlus::UI::Menu;
3061		3605
3062	our @ISA = CFClient::UI::FancyFrame::;	3606	our @ISA = CFPlus::UI::Toplevel::;
3063		3607
3064	use CFClient::OpenGL;	3608	use CFPlus::OpenGL;
3065		3609
3066	sub new {	3610	sub new {
3067	my $class = shift;	3611	my $class = shift;
3068		3612
3069	my $self = $class->SUPER::new (	3613	my $self = $class->SUPER::new (
3070	items => [],	3614	items => [],
3071	z => 100,	3615	z => 100,
3072	@_,	3616	@_,
3073	);	3617	);
3074		3618
3075	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3619	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3076		3620
3077	for my $item (@{ $self->{items} }) {	3621	for my $item (@{ $self->{items} }) {
3078	my ($widget, $cb, $tooltip) = @$item;	3622	my ($widget, $cb, $tooltip) = @$item;
3079		3623
3080	# handle various types of items, only text for now	3624	# handle various types of items, only text for now
3081	if (!ref $widget) {	3625	if (!ref $widget) {
3082	if ($widget =~ /\t/) {	3626	if ($widget =~ /\t/) {
3083	my ($left, $right) = split /\t/, $widget, 2;	3627	my ($left, $right) = split /\t/, $widget, 2;
3084		3628
3085	$widget = new CFClient::UI::HBox	3629	$widget = new CFPlus::UI::HBox
3086	can_hover => 1,	3630	can_hover => 1,
3087	can_events => 1,	3631	can_events => 1,
3088	tooltip => $tooltip,	3632	tooltip => $tooltip,
3089	children => [	3633	children => [
3090	(new CFClient::UI::Label markup => $left, expand => 1),	3634	(new CFPlus::UI::Label markup => $left, expand => 1),
3091	(new CFClient::UI::Label markup => $right, align => +1),	3635	(new CFPlus::UI::Label markup => $right, align => +1),
3092	],	3636	],
3093	;	3637	;
3094		3638
3095	} else {	3639	} else {
3096	$widget = new CFClient::UI::Label	3640	$widget = new CFPlus::UI::Label
3097	can_hover => 1,	3641	can_hover => 1,
3098	can_events => 1,	3642	can_events => 1,
3099	markup => $widget,	3643	markup => $widget,
3100	tooltip => $tooltip;	3644	tooltip => $tooltip;
3101	}	3645	}
…		…
3149	1	3693	1
3150	}	3694	}
3151		3695
3152	#############################################################################	3696	#############################################################################
3153		3697
3154	package CFClient::UI::Multiplexer;	3698	package CFPlus::UI::Multiplexer;
3155		3699
3156	our @ISA = CFClient::UI::Container::;	3700	our @ISA = CFPlus::UI::Container::;
3157		3701
3158	sub new {	3702	sub new {
3159	my $class = shift;	3703	my $class = shift;
3160		3704
3161	my $self = $class->SUPER::new (	3705	my $self = $class->SUPER::new (
…		…
3222	$self->{current}->draw;	3766	$self->{current}->draw;
3223	}	3767	}
3224		3768
3225	#############################################################################	3769	#############################################################################
3226		3770
3227	package CFClient::UI::Notebook;	3771	package CFPlus::UI::Notebook;
3228		3772
3229	our @ISA = CFClient::UI::VBox::;	3773	our @ISA = CFPlus::UI::VBox::;
3230		3774
3231	sub new {	3775	sub new {
3232	my $class = shift;	3776	my $class = shift;
3233		3777
3234	my $self = $class->SUPER::new (	3778	my $self = $class->SUPER::new (
3235	buttonbar => (new CFClient::UI::Buttonbar),	3779	buttonbar => (new CFPlus::UI::Buttonbar),
3236	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3780	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3237	# filter => # will be put between multiplexer and $self	3781	# filter => # will be put between multiplexer and $self
3238	@_,	3782	@_,
3239	);	3783	);
3240		3784
3241	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3785	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3245	}	3789	}
3246		3790
3247	sub add {	3791	sub add {
3248	my ($self, $title, $widget, $tooltip) = @_;	3792	my ($self, $title, $widget, $tooltip) = @_;
3249		3793
3250	Scalar::Util::weaken $self;	3794	CFPlus::weaken $self;
3251		3795
3252	$self->{buttonbar}->add (new CFClient::UI::Button	3796	$self->{buttonbar}->add (new CFPlus::UI::Button
3253	markup => $title,	3797	markup => $title,
3254	tooltip => $tooltip,	3798	tooltip => $tooltip,
3255	on_activate => sub { $self->set_current_page ($widget) },	3799	on_activate => sub { $self->set_current_page ($widget) },
3256	);	3800	);
3257		3801
…		…
3271	$self->emit (page_changed => $self->{multiplexer}{current});	3815	$self->emit (page_changed => $self->{multiplexer}{current});
3272	}	3816	}
3273		3817
3274	#############################################################################	3818	#############################################################################
3275		3819
3276	package CFClient::UI::Combobox;	3820	package CFPlus::UI::Selector;
3277		3821
3278	use utf8;	3822	use utf8;
3279		3823
3280	our @ISA = CFClient::UI::Button::;	3824	our @ISA = CFPlus::UI::Button::;
3281		3825
3282	sub new {	3826	sub new {
3283	my $class = shift;	3827	my $class = shift;
3284		3828
3285	my $self = $class->SUPER::new (	3829	my $self = $class->SUPER::new (
…		…
3302	my ($value, $title, $tooltip) = @$_;	3846	my ($value, $title, $tooltip) = @$_;
3303		3847
3304	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3848	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305	}	3849	}
3306		3850
3307	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3851	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308	}	3852	}
3309		3853
3310	sub _set_value {	3854	sub _set_value {
3311	my ($self, $value) = @_;	3855	my ($self, $value) = @_;
3312		3856
…		…
3327	$self->emit (changed => $value);	3871	$self->emit (changed => $value);
3328	}	3872	}
3329		3873
3330	#############################################################################	3874	#############################################################################
3331		3875
3332	package CFClient::UI::Statusbox;	3876	package CFPlus::UI::Statusbox;
3333		3877
3334	our @ISA = CFClient::UI::VBox::;	3878	our @ISA = CFPlus::UI::VBox::;
3335		3879
3336	sub new {	3880	sub new {
3337	my $class = shift;	3881	my $class = shift;
3338		3882
3339	my $self = $class->SUPER::new (	3883	my $self = $class->SUPER::new (
3340	fontsize => 0.8,	3884	fontsize => 0.8,
3341	@_,	3885	@_,
3342	);	3886	);
3343		3887
3344	Scalar::Util::weaken (my $this = $self);	3888	CFPlus::weaken (my $this = $self);
3345		3889
3346	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3890	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3347		3891
3348	$self	3892	$self
3349	}	3893	}
…		…
3351	sub reorder {	3895	sub reorder {
3352	my ($self) = @_;	3896	my ($self) = @_;
3353	my $NOW = Time::HiRes::time;	3897	my $NOW = Time::HiRes::time;
3354		3898
3355	# freeze display when hovering over any label	3899	# freeze display when hovering over any label
3356	return if $CFClient::UI::TOOLTIP->{owner}	3900	return if $CFPlus::UI::TOOLTIP->{owner}
3357	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3901	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3358	values %{ $self->{item} };	3902	values %{ $self->{item} };
3359		3903
3360	while (my ($k, $v) = each %{ $self->{item} }) {	3904	while (my ($k, $v) = each %{ $self->{item} }) {
3361	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3905	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3362	}	3906	}
…		…
3383	for ($short) {	3927	for ($short) {
3384	s/^\s+//;	3928	s/^\s+//;
3385	s/\s+/ /g;	3929	s/\s+/ /g;
3386	}	3930	}
3387		3931
3388	new CFClient::UI::Label	3932	new CFPlus::UI::Label
3389	markup => $short,	3933	markup => $short,
3390	tooltip => $item->{tooltip},	3934	tooltip => $item->{tooltip},
3391	tooltip_font => $::FONT_PROP,	3935	tooltip_font => $::FONT_PROP,
3392	tooltip_width => 0.67,	3936	tooltip_width => 0.67,
3393	fontsize => $item->{fontsize} || $self->{fontsize},	3937	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3472	$self->SUPER::destroy;	4016	$self->SUPER::destroy;
3473	}	4017	}
3474		4018
3475	#############################################################################	4019	#############################################################################
3476		4020
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;	4021	package CFPlus::UI::Root;
3642		4022
3643	our @ISA = CFClient::UI::Container::;	4023	our @ISA = CFPlus::UI::Container::;
3644		4024
3645	use List::Util qw(min max);	4025	use List::Util qw(min max);
3646		4026
3647	use CFClient::OpenGL;	4027	use CFPlus::OpenGL;
3648		4028
3649	sub new {	4029	sub new {
3650	my $class = shift;	4030	my $class = shift;
3651		4031
3652	my $self = $class->SUPER::new (	4032	my $self = $class->SUPER::new (
3653	visible => 1,	4033	visible => 1,
3654	@_,	4034	@_,
3655	);	4035	);
3656		4036
3657	Scalar::Util::weaken ($self->{root} = $self);	4037	CFPlus::weaken ($self->{root} = $self);
3658		4038
3659	$self	4039	$self
3660	}	4040	}
3661		4041
3662	sub size_request {	4042	sub size_request {
…		…
3831	$h = 0 if $h < 0;	4211	$h = 0 if $h < 0;
3832		4212
3833	$w = max $widget->{min_w}, $w;	4213	$w = max $widget->{min_w}, $w;
3834	$h = max $widget->{min_h}, $h;	4214	$h = max $widget->{min_h}, $h;
3835		4215
		4216	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4217	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4218
3836	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4219	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4220	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838		4221
3839	$w = int $w + 0.5;	4222	$w = int $w + 0.5;
3840	$h = int $h + 0.5;	4223	$h = int $h + 0.5;
…		…
3853		4236
3854	while ($self->{post_alloc_hook}) {	4237	while ($self->{post_alloc_hook}) {
3855	$_->()	4238	$_->()
3856	for values %{delete $self->{post_alloc_hook}};	4239	for values %{delete $self->{post_alloc_hook}};
3857	}	4240	}
3858
3859		4241
3860	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4242	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3861	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4243	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3862	glClear GL_COLOR_BUFFER_BIT;	4244	glClear GL_COLOR_BUFFER_BIT;
3863		4245
…		…
3866	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4248	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3867	glMatrixMode GL_MODELVIEW;	4249	glMatrixMode GL_MODELVIEW;
3868	glLoadIdentity;	4250	glLoadIdentity;
3869		4251
3870	{	4252	{
3871	package CFClient::UI::Base;	4253	package CFPlus::UI::Base;
3872		4254
3873	($draw_x, $draw_y, $draw_w, $draw_h) =	4255	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3874	(0, 0, $self->{w}, $self->{h});	4256	(0, 0, $self->{w}, $self->{h});
3875	}
3876		4257
3877	$self->_draw;	4258	$self->_draw;
		4259	}
3878	}	4260	}
3879		4261
3880	#############################################################################	4262	#############################################################################
3881		4263
3882	package CFClient::UI;	4264	package CFPlus::UI;
3883		4265
3884	$ROOT = new CFClient::UI::Root;	4266	$ROOT = new CFPlus::UI::Root;
3885	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4267	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3886		4268
3887	1	4269	1
3888		4270

Diff Legend

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