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.325 by root, Thu Jul 13 01:29:17 2006 UTC vs.
Revision 1.394 by root, Sat Jul 21 13:54:03 2007 UTC

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

Diff Legend

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