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

Diff Legend

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