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.395 by root, Sat Jul 21 13:56:00 2007 UTC

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

Diff Legend

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