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.318 by elmex, Sun Jul 2 19:32:55 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		120
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
101	}	129	}
102		130
103	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	132	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		133
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		135
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		137
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
112	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		140
114	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	143	$grab->update if $grab;
117	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
118		145
		146	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	147	$TOOLTIP_WATCHER->cb->();
120	}	148	}
121	}	149	}
122		150
123	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
124	my ($ev) = @_;	152	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
126		154
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		156
129	if ($widget != $HOVER) {	157	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		158
132	$hover->update if $hover && $hover->{can_hover};	159	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	160	if $HOVER;
140	}	161	}
141		162
142	# convert position array to integers	163	# convert position array to integers
143	sub harmonize {	164	sub harmonize {
…		…
193	reconfigure_widgets;	214	reconfigure_widgets;
194	}	215	}
195		216
196	#############################################################################	217	#############################################################################
197		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
198	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
199		228
200	use strict;	229	use strict;
201		230
202	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
203		232
204	sub new {	233	sub new {
205	my $class = shift;	234	my $class = shift;
206		235
207	my $self = bless {	236	my $self = bless {
…		…
212	h => undef,	241	h => undef,
213	can_events => 1,	242	can_events => 1,
214	@_	243	@_
215	}, $class;	244	}, $class;
216		245
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		247
219	for (keys %$self) {	248	for (keys %$self) {
220	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
222	}	251	}
223	}	252	}
224		253
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		259
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		262
234	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
239		268
240	sub destroy {	269	sub destroy {
241	my ($self) = @_;	270	my ($self) = @_;
242		271
243	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
244	%$self = ();	274	%$self = ();
245	}	275	}
246		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
247	sub show {	281	sub show {
248	my ($self) = @_;	282	my ($self) = @_;
249		283
250	return if $self->{parent};	284	return if $self->{parent};
251		285
252	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
253	}	287	}
254		288
255	sub set_visible {	289	sub set_visible {
256	my ($self) = @_;	290	my ($self) = @_;
257		291
…		…
278	delete $self->{root};	312	delete $self->{root};
279		313
280	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
282		316
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
285		319
286	$self->emit ("focus_out");	320	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
288	}	322	}
…		…
290	sub set_visibility {	324	sub set_visibility {
291	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
292		326
293	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
294		328
295	$visible ? $self->hide	329	$visible ? $self->show
296	: $self->show;	330	: $self->hide;
297	}	331	}
298		332
299	sub toggle_visibility {	333	sub toggle_visibility {
300	my ($self) = @_;	334	my ($self) = @_;
301		335
…		…
345	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
346		380
347	if ($self->{aspect}) {	381	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
349		383
350	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		386
353	# use alignment to adjust x, y	387	# use alignment to adjust x, y
354		388
355	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
397		431
398	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
399		433
400	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
401		435
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	439	}
406	}	440	}
407		441
408	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
409	sub coord2local {	443	sub coord2local {
410	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
411		445
		446	Carp::confess unless $self->{parent};#d#
		447
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	449	}
414		450
415	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
416	sub coord2global {	452	sub coord2global {
417	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
418		454
		455	Carp::confess unless $self->{parent};#d#
		456
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	458	}
421		459
422	sub invoke_focus_in {	460	sub invoke_focus_in {
423	my ($self) = @_;	461	my ($self) = @_;
…		…
452		490
453	$FOCUS->emit ("focus_out") if $FOCUS;	491	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	492	$self->emit ("focus_in");
455	}	493	}
456		494
457	sub invoke_mouse_motion { 1 }	495	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	496	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	497	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
461		500
462	sub invoke_button_down {	501	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
464		503
465	$self->grab_focus;	504	$self->grab_focus;
466		505
467	1	506	0
468	}	507	}
469		508
470	sub connect {	509	sub connect {
471	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
472		511
473	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
474	}	518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
475		532
476	sub emit {	533	sub emit {
477	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
478		535
479	#d##TODO# stop propagating at first true, do not use sum	536	# I do not really like this solution, but I do not like duplication
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	554	}
484		555
485	sub find_widget {	556	#sub find_widget {
486	my ($self, $x, $y) = @_;	557	# in .xs
487
488	return () unless $self->{can_events};
489
490	return $self
491	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494	()
495	}
496		558
497	sub set_parent {	559	sub set_parent {
498	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
499		561
500	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
502	}	564	}
503		565
504	sub realloc {	566	sub realloc {
505	my ($self) = @_;	567	my ($self) = @_;
…		…
571	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
574	glEnd;	636	glEnd;
575	glPopMatrix;	637	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}	639	}
578		640
579	$self->_draw;	641	$self->_draw;
580	glPopMatrix;	642	glPopMatrix;
581	}	643	}
…		…
584	my ($self) = @_;	646	my ($self) = @_;
585		647
586	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
587	}	649	}
588		650
		651	my $cntx;#d#
589	sub DESTROY {	652	sub DESTROY {
590	my ($self) = @_;	653	my ($self) = @_;
591		654
592	delete $WIDGET{$self+0};	655	return if CFPlus::in_destruct;
593		656
594	eval { $self->destroy };	657	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
596	}	661	}
597		662
598	#############################################################################	663	#############################################################################
599		664
600	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
601		666
602	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
603		668
604	use strict;	669	use strict;
605	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
606		671
607	sub new {	672	sub new {
608	my $class = shift;	673	my $class = shift;
609		674
610	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
641	}	706	}
642	}	707	}
643		708
644	#############################################################################	709	#############################################################################
645		710
646	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
647		712
648	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
649		714
650	sub new {	715	sub new {
651	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
653	}	718	}
…		…
660		725
661	sub draw { }	726	sub draw { }
662		727
663	#############################################################################	728	#############################################################################
664		729
665	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
666		731
667	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
668		733
669	sub new {	734	sub new {
670	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
671		736
672	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
681	if $children;	746	if $children;
682		747
683	$self	748	$self
684	}	749	}
685		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
		757	}
		758
686	sub add {	759	sub add {
687	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
688		761
689	$_->set_parent ($self)	762	$_->set_parent ($self)
690	for @widgets;	763	for @widgets;
…		…
750	$_->draw for @{$self->{children}};	823	$_->draw for @{$self->{children}};
751	}	824	}
752		825
753	#############################################################################	826	#############################################################################
754		827
755	package CFClient::UI::Bin;	828	package CFPlus::UI::Bin;
756		829
757	our @ISA = CFClient::UI::Container::;	830	our @ISA = CFPlus::UI::Container::;
758		831
759	sub new {	832	sub new {
760	my ($class, %arg) = @_;	833	my ($class, %arg) = @_;
761		834
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	835	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		836
764	$class->SUPER::new (children => [$child], %arg)	837	$class->SUPER::new (children => [$child], %arg)
765	}	838	}
766		839
767	sub add {	840	sub add {
…		…
774	sub remove {	847	sub remove {
775	my ($self, $widget) = @_;	848	my ($self, $widget) = @_;
776		849
777	$self->SUPER::remove ($widget);	850	$self->SUPER::remove ($widget);
778		851
779	$self->{children} = [new CFClient::UI::Empty]	852	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	853	unless @{$self->{children}};
781	}	854	}
782		855
783	sub child { $_[0]->{children}[0] }	856	sub child { $_[0]->{children}[0] }
784		857
…		…
796		869
797	#############################################################################	870	#############################################################################
798		871
799	# back-buffered drawing area	872	# back-buffered drawing area
800		873
801	package CFClient::UI::Window;	874	package CFPlus::UI::Window;
802		875
803	our @ISA = CFClient::UI::Bin::;	876	our @ISA = CFPlus::UI::Bin::;
804		877
805	use CFClient::OpenGL;	878	use CFPlus::OpenGL;
806		879
807	sub new {	880	sub new {
808	my ($class, %arg) = @_;	881	my ($class, %arg) = @_;
809		882
810	my $self = $class->SUPER::new (%arg);	883	my $self = $class->SUPER::new (%arg);
…		…
832	}	905	}
833		906
834	sub render_child {	907	sub render_child {
835	my ($self) = @_;	908	my ($self) = @_;
836		909
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	910	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	911	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	912	glClear GL_COLOR_BUFFER_BIT;
840		913
841	{	914	{
842	package CFClient::UI::Base;	915	package CFPlus::UI::Base;
843		916
844	($draw_x, $draw_y, $draw_w, $draw_h) =	917	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	918	(0, 0, $self->{w}, $self->{h});
		919
		920	$self->_render;
846	}	921	}
847
848	$self->_render;
849	};	922	};
850	}	923	}
851		924
852	sub _draw {	925	sub _draw {
853	my ($self) = @_;	926	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		927
857	my $tex = $self->{texture}	928	my $tex = $self->{texture}
858	or return;	929	or return;
859		930
860	glEnable GL_TEXTURE_2D;	931	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	933	glColor 0, 0, 0, 1;
863		934
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	935	$tex->draw_quad_alpha_premultiplied (0, 0);
865		936
866	glDisable GL_TEXTURE_2D;	937	glDisable GL_TEXTURE_2D;
867	}	938	}
868		939
869	#############################################################################	940	#############################################################################
870		941
871	package CFClient::UI::ViewPort;	942	package CFPlus::UI::ViewPort;
872		943
		944	use List::Util qw(min max);
		945
873	our @ISA = CFClient::UI::Window::;	946	our @ISA = CFPlus::UI::Window::;
874		947
875	sub new {	948	sub new {
876	my $class = shift;	949	my $class = shift;
877		950
878	$class->SUPER::new (	951	$class->SUPER::new (
…		…
908	}	981	}
909		982
910	sub set_offset {	983	sub set_offset {
911	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
912		985
		986	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		987	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		988
		989	if ($x != $self->{view_x} or $y != $self->{view_y}) {
913	$self->{view_x} = int $x;	990	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	991	$self->{view_y} = $y;
915		992
		993	$self->emit (changed => $x, $y);
916	$self->update;	994	$self->update;
		995	}
917	}	996	}
918		997
919	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
920	sub coord2local {	999	sub coord2local {
921	my ($self, $x, $y) = @_;	1000	my ($self, $x, $y) = @_;
…		…
936	my ($self, $x, $y) = @_;	1015	my ($self, $x, $y) = @_;
937		1016
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1019	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1021	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1023	}
945	}	1024	}
946		1025
947	sub _render {	1026	sub _render {
948	my ($self) = @_;	1027	my ($self) = @_;
949		1028
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1029	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1031
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1033
955	$self->SUPER::_render;	1034	$self->SUPER::_render;
956	}	1035	}
957		1036
958	#############################################################################	1037	#############################################################################
959		1038
960	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
961		1040
962	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
963		1042
964	sub new {	1043	sub new {
965	my ($class, %arg) = @_;	1044	my ($class, %arg) = @_;
966		1045
967	my $child = delete $arg{child};	1046	my $child = delete $arg{child};
968		1047
969	my $self;	1048	my $self;
970		1049
971	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
972	vertical => 1,	1060	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1062	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1065	},
977	;	1066	;
978		1067
979	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
		1071	can_events => 1,
981	slider => $slider,	1072	hslider => $hslider,
		1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
982	%arg,	1076	%arg,
983	);	1077	);
984		1078
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085
		1086	$vp->{parent}{hslider}->set_value ($x);
		1087	$vp->{parent}{vslider}->set_value ($y);
		1088
		1089	0
		1090	},
		1091	;
		1092
		1093	$self->SUPER::add_at (0, 0, $self->{vp});
		1094
986	$self->add ($child) if $child;	1095	$self->add ($child) if $child;
987		1096
988	$self	1097	$self
989	}	1098	}
990		1099
…		…
997	}	1106	}
998		1107
999	sub update_slider {	1108	sub update_slider {
1000	my ($self) = @_;	1109	my ($self) = @_;
1001		1110
		1111	my $child = ($self->{vp} or return)->child;
		1112
		1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1115
		1116	my $visible = $w1 > $w2;
		1117	if ($visible != $self->{hslider}{visible}) {
		1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1119	: $self->{hslider}->hide;
		1120	}
		1121
		1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1124
		1125	my $visible = $h1 > $h2;
		1126	if ($visible != $self->{vslider}{visible}) {
		1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1128	: $self->{vslider}->hide;
		1129	}
1003	}	1130	}
1004		1131
1005	sub update {	1132	sub update {
1006	my ($self) = @_;	1133	my ($self) = @_;
1007		1134
		1135	$self->update_slider;
1008	$self->SUPER::update;	1136	$self->SUPER::update;
		1137	}
1009		1138
1010	$self->update_slider;	1139	sub invoke_mouse_wheel {
		1140	my ($self, $ev) = @_;
		1141
		1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
		1144
		1145	$self->{hslider}->emit (mouse_wheel => $ev)
		1146	if $ev->{dx};
		1147
		1148	1
		1149	}
		1150
		1151	sub invoke_button_down {
		1152	my ($self, $ev, $x, $y) = @_;
		1153
		1154	if ($ev->{button} == 2) {
		1155	$self->grab_focus;
		1156
		1157	my $ox = $self->{vp}{view_x} + $ev->{x};
		1158	my $oy = $self->{vp}{view_y} + $ev->{y};
		1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
		1162
		1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1164	$self->update;
		1165	};
		1166
		1167	return 1;
		1168	}
		1169
		1170	0
		1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_mouse_motion {
		1184	my ($self, $ev, $x, $y) = @_;
		1185
		1186	if ($self->{motion}) {
		1187	$self->{motion}->($ev, $x, $y);
		1188	return 1;
		1189	}
		1190
		1191	0
1011	}	1192	}
1012		1193
1013	sub invoke_size_allocate {	1194	sub invoke_size_allocate {
1014	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
1015		1196
1016	$self->update_slider;	1197	$self->update_slider;
1017
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1198	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1199	}
1020		1200
1021	#############################################################################	1201	#############################################################################
1022		1202
1023	package CFClient::UI::Frame;	1203	package CFPlus::UI::Frame;
1024		1204
1025	our @ISA = CFClient::UI::Bin::;	1205	our @ISA = CFPlus::UI::Bin::;
1026		1206
1027	use CFClient::OpenGL;	1207	use CFPlus::OpenGL;
1028		1208
1029	sub new {	1209	sub new {
1030	my $class = shift;	1210	my $class = shift;
1031		1211
1032	$class->SUPER::new (	1212	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1238	$self->SUPER::_draw;
1059	}	1239	}
1060		1240
1061	#############################################################################	1241	#############################################################################
1062		1242
1063	package CFClient::UI::FancyFrame;	1243	package CFPlus::UI::FancyFrame;
1064		1244
1065	our @ISA = CFClient::UI::Bin::;	1245	our @ISA = CFPlus::UI::Bin::;
1066		1246
1067	use CFClient::OpenGL;	1247	use CFPlus::OpenGL;
		1248
		1249	sub new {
		1250	my ($class, %arg) = @_;
		1251
		1252	if ((exists $arg{label}) && !ref $arg{label}) {
		1253	$arg{label} = new CFPlus::UI::Label
		1254	align => 1,
		1255	valign => 0,
		1256	text => $arg{label},
		1257	fontsize => ($arg{border} || 0.8) * 0.75;
		1258	}
		1259
		1260	my $self = $class->SUPER::new (
		1261	# label => "",
		1262	fg => [0.6, 0.3, 0.1],
		1263	border => 0.8,
		1264	style => 'single',
		1265	%arg,
		1266	);
		1267
		1268	$self
		1269	}
		1270
		1271	sub add {
		1272	my ($self, @widgets) = @_;
		1273
		1274	$self->SUPER::add (@widgets);
		1275	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1276	}
		1277
		1278	sub border {
		1279	int $_[0]{border} * $::FONTSIZE
		1280	}
		1281
		1282	sub size_request {
		1283	my ($self) = @_;
		1284
		1285	($self->{label_w}, undef) = $self->{label}->size_request
		1286	if $self->{label};
		1287
		1288	my ($w, $h) = $self->SUPER::size_request;
		1289
		1290	(
		1291	$w + $self->border * 2,
		1292	$h + $self->border * 2,
		1293	)
		1294	}
		1295
		1296	sub invoke_size_allocate {
		1297	my ($self, $w, $h) = @_;
		1298
		1299	my $border = $self->border;
		1300
		1301	$w -= List::Util::max 0, $border * 2;
		1302	$h -= List::Util::max 0, $border * 2;
		1303
		1304	if (my $label = $self->{label}) {
		1305	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1306	$label->{h} = List::Util::min $h, $border;
		1307	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1308	}
		1309
		1310	$self->child->configure ($border, $border, $w, $h);
		1311
		1312	1
		1313	}
		1314
		1315	sub _draw {
		1316	my ($self) = @_;
		1317
		1318	my $child = $self->{children}[0];
		1319
		1320	my $border = $self->border;
		1321	my ($w, $h) = ($self->{w}, $self->{h});
		1322
		1323	$child->draw;
		1324
		1325	glColor @{$self->{fg}};
		1326	glBegin GL_LINE_STRIP;
		1327	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1328	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1330	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1331	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1333	glEnd;
		1334
		1335	if ($self->{label}) {
		1336	glTranslate $border * 2, 0;
		1337	$self->{label}->_draw;
		1338	}
		1339	}
		1340
		1341	#############################################################################
		1342
		1343	package CFPlus::UI::Toplevel;
		1344
		1345	our @ISA = CFPlus::UI::Bin::;
		1346
		1347	use CFPlus::OpenGL;
1068		1348
1069	my $bg =	1349	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1350	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1351	mipmap => 1, wrap => 1;
1072		1352
1073	my @border =	1353	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1354	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
1076		1360
1077	sub new {	1361	sub new {
1078	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1079		1363
1080	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1365	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1366	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1367	border => 0.6,
1084	can_events => 1,	1368	can_events => 1,
1085	min_w => 16,	1369	min_w => 64,
1086	min_h => 16,	1370	min_h => 32,
1087	%arg,	1371	%arg,
1088	);	1372	);
1089		1373
1090	$self->{title_widget} = new CFClient::UI::Label	1374	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1375	align => 0,
1092	valign => 1,	1376	valign => 1,
1093	text => $self->{title},	1377	text => $self->{title},
1094	fontsize => $self->{border},	1378	fontsize => $self->{border},
1095	if exists $self->{title};	1379	if exists $self->{title};
1096		1380
1097	if ($self->{has_close_button}) {	1381	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1382	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1383	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1384	path => 'x1_close.png',
1101	on_activate => sub { $self->emit ("delete") };	1385	on_activate => sub { $self->emit ("delete") };
1102		1386
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1387	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1388	}
1105		1389
1106	$self	1390	$self
1107	}	1391	}
1108		1392
1109	sub add {	1393	sub add {
1110	my ($self, @widgets) = @_;	1394	my ($self, @widgets) = @_;
1111		1395
1112	$self->SUPER::add (@widgets);	1396	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1397	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1398	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1399	}
1116		1400
1117	sub border {	1401	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1402	int $_[0]{border} * $::FONTSIZE
1119	}	1403	}
…		…
1227	$self->{motion}->($ev, $x, $y) if $self->{motion};	1511	$self->{motion}->($ev, $x, $y) if $self->{motion};
1228		1512
1229	! ! $self->{motion}	1513	! ! $self->{motion}
1230	}	1514	}
1231		1515
		1516	sub invoke_visibility_change {
		1517	my ($self, $visible) = @_;
		1518
		1519	delete $self->{motion} unless $visible;
		1520
		1521	0
		1522	}
		1523
1232	sub _draw {	1524	sub _draw {
1233	my ($self) = @_;	1525	my ($self) = @_;
1234		1526
1235	my $child = $self->{children}[0];	1527	my $child = $self->{children}[0];
1236		1528
…		…
1241	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1242		1534
1243	my $border = $self->border;	1535	my $border = $self->border;
1244		1536
1245	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1246	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1247	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1248	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1249	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1250		1556
1251	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1252	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1253		1559
1254	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1273	if $self->{close_button};	1579	if $self->{close_button};
1274	}	1580	}
1275		1581
1276	#############################################################################	1582	#############################################################################
1277		1583
1278	package CFClient::UI::Table;	1584	package CFPlus::UI::Table;
1279		1585
1280	our @ISA = CFClient::UI::Base::;	1586	our @ISA = CFPlus::UI::Base::;
1281		1587
1282	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1283		1589
1284	use CFClient::OpenGL;	1590	use CFPlus::OpenGL;
1285		1591
1286	sub new {	1592	sub new {
1287	my $class = shift;	1593	my $class = shift;
1288		1594
1289	$class->SUPER::new (	1595	$class->SUPER::new (
		1596	children => [],
1290	col_expand => [],	1597	col_expand => [],
		1598	row_expand => [],
1291	@_,	1599	@_,
1292	)	1600	)
1293	}	1601	}
1294		1602
1295	sub children {	1603	sub children {
1296	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297	}	1605	}
1298		1606
		1607	# TODO: store row/col info in child widget and use standard add/del
1299	sub add {	1608	sub add {
1300	my ($self, $x, $y, $child) = @_;	1609	my $self = shift;
1301		1610
		1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1612	$self->add_at (@_);
		1613	}
		1614
		1615	sub add_at {
		1616	my $self = shift;
		1617
		1618	while (@_) {
		1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
1302	$child->set_parent ($self);	1621	$child->set_parent ($self);
1303	$self->{children}[$y][$x] = $child;	1622	$self->{children}[$row][$col] = $child;
		1623	}
1304		1624
		1625	$self->{force_realloc} = 1;
		1626	$self->{force_size_alloc} = 1;
1305	$self->realloc;	1627	$self->realloc;
1306	}	1628	}
1307		1629
1308	sub remove {	1630	sub remove {
1309	my ($self, $child) = @_;	1631	my ($self, $child) = @_;
1310		1632
1311	# TODO: not yet implemented	1633	for (@{ $self->{children} }) {
		1634	for (@{ $_ || [] }) {
		1635	$_ = undef if $_ == $child;
		1636	}
		1637	}
1312	}	1638	}
1313		1639
1314	# TODO: move to container class maybe? send children a signal on removal?	1640	# TODO: move to container class maybe? send children a signal on removal?
1315	sub clear {	1641	sub clear {
1316	my ($self) = @_;	1642	my ($self) = @_;
…		…
1365	my ($ws, $hs) = $self->get_wh;	1691	my ($ws, $hs) = $self->get_wh;
1366		1692
1367	my $req_w = (sum @$ws) || 1;	1693	my $req_w = (sum @$ws) || 1;
1368	my $req_h = (sum @$hs) || 1;	1694	my $req_h = (sum @$hs) || 1;
1369		1695
1370	# TODO: nicer code && do row_expand	1696	# TODO: nicer code
1371	my @col_expand = @{$self->{col_expand}};	1697	my @col_expand = @{$self->{col_expand}};
1372	@col_expand = (1) x @$ws unless @col_expand;	1698	@col_expand = (1) x @$ws unless @col_expand;
1373	my $col_expand = (sum @col_expand) || 1;	1699	my $col_expand = (sum @col_expand) || 1;
1374		1700
1375	# linearly scale sizes
1376	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1701	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378		1702
1379	CFClient::UI::harmonize $ws;	1703	CFPlus::UI::harmonize $ws;
		1704
		1705	my @row_expand = @{$self->{row_expand}};
		1706	@row_expand = (1) x @$ws unless @row_expand;
		1707	my $row_expand = (sum @row_expand) || 1;
		1708
		1709	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1710
1380	CFClient::UI::harmonize $hs;	1711	CFPlus::UI::harmonize $hs;
1381		1712
1382	my $y;	1713	my $y;
1383		1714
1384	for my $r (0 .. $#{$self->{children}}) {	1715	for my $r (0 .. $#{$self->{children}}) {
1385	my $row = $self->{children}[$r]	1716	my $row = $self->{children}[$r]
…		…
1428	}	1759	}
1429	}	1760	}
1430		1761
1431	#############################################################################	1762	#############################################################################
1432		1763
1433	package CFClient::UI::Box;	1764	package CFPlus::UI::Fixed;
1434		1765
		1766	use List::Util qw(min max);
		1767
1435	our @ISA = CFClient::UI::Container::;	1768	our @ISA = CFPlus::UI::Container::;
		1769
		1770	sub add {
		1771	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1772
		1773	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1774	$self->SUPER::add ($child);
		1775	}
		1776
		1777	sub _scale($$$) {
		1778	my ($mode, $val, $max) = @_;
		1779
		1780	$mode eq "abs" ? $val
		1781	: $mode eq "rel" ? $val * $max
		1782	: 0
		1783	}
		1784
		1785	sub size_request {
		1786	my ($self) = @_;
		1787
		1788	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1789
		1790	# determine overall size by querying abs widgets
		1791	for my $child ($self->visible_children) {
		1792	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1793
		1794	if ($pos eq "abs") {
		1795	$w = _scale $size, $w, $child->{req_w};
		1796	$h = _scale $size, $h, $child->{req_h};
		1797
		1798	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1799	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1800	}
		1801	}
		1802
		1803	my $W = $x2 - $x1;
		1804	my $H = $y2 - $y1;
		1805
		1806	# now layout remaining widgets
		1807	for my $child ($self->visible_children) {
		1808	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1809
		1810	if ($pos ne "abs") {
		1811	$x = _scale $pos, $x, $W;
		1812	$y = _scale $pos, $x, $H;
		1813	$w = _scale $size, $w, $child->{req_w};
		1814	$h = _scale $size, $h, $child->{req_h};
		1815
		1816	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1817	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1818	}
		1819	}
		1820
		1821	my $W = $x2 - $x1;
		1822	my $H = $y2 - $y1;
		1823
		1824	($W, $H)
		1825	}
		1826
		1827	sub invoke_size_allocate {
		1828	my ($self, $W, $H) = @_;
		1829
		1830	for my $child ($self->visible_children) {
		1831	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1832
		1833	$x = _scale $pos, $x, $W;
		1834	$y = _scale $pos, $x, $H;
		1835	$w = _scale $size, $w, $child->{req_w};
		1836	$h = _scale $size, $h, $child->{req_h};
		1837
		1838	$child->configure ($x, $y, $w, $h);
		1839	}
		1840
		1841	1
		1842	}
		1843
		1844	#############################################################################
		1845
		1846	package CFPlus::UI::Box;
		1847
		1848	our @ISA = CFPlus::UI::Container::;
1436		1849
1437	sub size_request {	1850	sub size_request {
1438	my ($self) = @_;	1851	my ($self) = @_;
1439		1852
1440	$self->{vertical}	1853	$self->{vertical}
…		…
1473	$req[$_] += $space * $children[$_]{expand}	1886	$req[$_] += $space * $children[$_]{expand}
1474	for 0 .. $#children;	1887	for 0 .. $#children;
1475	}	1888	}
1476	}	1889	}
1477		1890
1478	CFClient::UI::harmonize \@req;	1891	CFPlus::UI::harmonize \@req;
1479		1892
1480	my $pos = 0;	1893	my $pos = 0;
1481	for (0 .. $#children) {	1894	for (0 .. $#children) {
1482	my $alloc = $req[$_];	1895	my $alloc = $req[$_];
1483	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1896	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1488	1	1901	1
1489	}	1902	}
1490		1903
1491	#############################################################################	1904	#############################################################################
1492		1905
1493	package CFClient::UI::HBox;	1906	package CFPlus::UI::HBox;
1494		1907
1495	our @ISA = CFClient::UI::Box::;	1908	our @ISA = CFPlus::UI::Box::;
1496		1909
1497	sub new {	1910	sub new {
1498	my $class = shift;	1911	my $class = shift;
1499		1912
1500	$class->SUPER::new (	1913	$class->SUPER::new (
…		…
1503	)	1916	)
1504	}	1917	}
1505		1918
1506	#############################################################################	1919	#############################################################################
1507		1920
1508	package CFClient::UI::VBox;	1921	package CFPlus::UI::VBox;
1509		1922
1510	our @ISA = CFClient::UI::Box::;	1923	our @ISA = CFPlus::UI::Box::;
1511		1924
1512	sub new {	1925	sub new {
1513	my $class = shift;	1926	my $class = shift;
1514		1927
1515	$class->SUPER::new (	1928	$class->SUPER::new (
…		…
1518	)	1931	)
1519	}	1932	}
1520		1933
1521	#############################################################################	1934	#############################################################################
1522		1935
1523	package CFClient::UI::Label;	1936	package CFPlus::UI::Label;
1524		1937
1525	our @ISA = CFClient::UI::DrawBG::;	1938	our @ISA = CFPlus::UI::DrawBG::;
1526		1939
1527	use CFClient::OpenGL;	1940	use CFPlus::OpenGL;
1528		1941
1529	sub new {	1942	sub new {
1530	my ($class, %arg) = @_;	1943	my ($class, %arg) = @_;
1531		1944
1532	my $self = $class->SUPER::new (	1945	my $self = $class->SUPER::new (
…		…
1535	#active_bg => none	1948	#active_bg => none
1536	#font => default_font	1949	#font => default_font
1537	#text => initial text	1950	#text => initial text
1538	#markup => initial narkup	1951	#markup => initial narkup
1539	#max_w => maximum pixel width	1952	#max_w => maximum pixel width
		1953	#style => 0, # render flags
1540	ellipsise => 3, # end	1954	ellipsise => 3, # end
1541	layout => (new CFClient::Layout),	1955	layout => (new CFPlus::Layout),
1542	fontsize => 1,	1956	fontsize => 1,
1543	align => -1,	1957	align => -1,
1544	valign => -1,	1958	valign => -1,
1545	padding_x => 2,	1959	padding_x => 2,
1546	padding_y => 2,	1960	padding_y => 2,
1547	can_events => 0,	1961	can_events => 0,
1548	%arg	1962	%arg
1549	);	1963	);
1550		1964
1551	if (exists $self->{template}) {	1965	if (exists $self->{template}) {
1552	my $layout = new CFClient::Layout;	1966	my $layout = new CFPlus::Layout;
1553	$layout->set_text (delete $self->{template});	1967	$layout->set_text (delete $self->{template});
1554	$self->{template} = $layout;	1968	$self->{template} = $layout;
1555	}	1969	}
1556		1970
1557	if (exists $self->{markup}) {	1971	if (exists $self->{markup}) {
…		…
1561	}	1975	}
1562		1976
1563	$self	1977	$self
1564	}	1978	}
1565		1979
1566	sub escape($) {
1567	local $_ = $_[0];
1568
1569	s/&/&amp;/g;
1570	s/>/&gt;/g;
1571	s/</&lt;/g;
1572
1573	$_
1574	}
1575
1576	sub update {	1980	sub update {
1577	my ($self) = @_;	1981	my ($self) = @_;
1578		1982
1579	delete $self->{texture};	1983	delete $self->{texture};
1580	$self->SUPER::update;	1984	$self->SUPER::update;
…		…
1591	my ($self, $text) = @_;	1995	my ($self, $text) = @_;
1592		1996
1593	return if $self->{text} eq "T$text";	1997	return if $self->{text} eq "T$text";
1594	$self->{text} = "T$text";	1998	$self->{text} = "T$text";
1595		1999
1596	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597	$self->{layout}->set_text ($text);	2000	$self->{layout}->set_text ($text);
1598		2001
1599	delete $self->{size_req};	2002	delete $self->{size_req};
1600	$self->realloc;	2003	$self->realloc;
1601	$self->update;	2004	$self->update;
…		…
1607	return if $self->{text} eq "M$markup";	2010	return if $self->{text} eq "M$markup";
1608	$self->{text} = "M$markup";	2011	$self->{text} = "M$markup";
1609		2012
1610	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2013	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611		2014
1612	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613	$self->{layout}->set_markup ($markup);	2015	$self->{layout}->set_markup ($markup);
1614		2016
1615	delete $self->{size_req};	2017	delete $self->{size_req};
1616	$self->realloc;	2018	$self->realloc;
1617	$self->update;	2019	$self->update;
…		…
1629		2031
1630	my ($w, $h) = $self->{layout}->size;	2032	my ($w, $h) = $self->{layout}->size;
1631		2033
1632	if (exists $self->{template}) {	2034	if (exists $self->{template}) {
1633	$self->{template}->set_font ($self->{font}) if $self->{font};	2035	$self->{template}->set_font ($self->{font}) if $self->{font};
		2036	$self->{template}->set_width ($self->{max_w} || -1);
1634	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2037	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635		2038
1636	my ($w2, $h2) = $self->{template}->size;	2039	my ($w2, $h2) = $self->{template}->size;
1637		2040
1638	$w = List::Util::max $w, $w2;	2041	$w = List::Util::max $w, $w2;
…		…
1672		2075
1673	sub reconfigure {	2076	sub reconfigure {
1674	my ($self) = @_;	2077	my ($self) = @_;
1675		2078
1676	delete $self->{size_req};	2079	delete $self->{size_req};
		2080	delete $self->{texture};
1677		2081
1678	$self->SUPER::reconfigure;	2082	$self->SUPER::reconfigure;
1679	}	2083	}
1680		2084
1681	sub _draw {	2085	sub _draw {
1682	my ($self) = @_;	2086	my ($self) = @_;
1683		2087
1684	$self->SUPER::_draw; # draw background, if applicable	2088	$self->SUPER::_draw; # draw background, if applicable
1685		2089
1686	my $tex = $self->{texture} ||= do {	2090	my $size = $self->{texture} ||= do {
1687	$self->{layout}->set_foreground (@{$self->{fg}});	2091	$self->{layout}->set_foreground (@{$self->{fg}});
1688	$self->{layout}->set_font ($self->{font}) if $self->{font};	2092	$self->{layout}->set_font ($self->{font}) if $self->{font};
1689	$self->{layout}->set_width ($self->{w});	2093	$self->{layout}->set_width ($self->{w});
1690	$self->{layout}->set_ellipsise ($self->{ellipsise});	2094	$self->{layout}->set_ellipsise ($self->{ellipsise});
1691	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2095	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2096	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693		2097
1694	new_from_layout CFClient::Texture $self->{layout}	2098	[$self->{layout}->size]
1695	};	2099	};
1696		2100
1697	unless (exists $self->{ox}) {	2101	unless (exists $self->{ox}) {
1698	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2102	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2103	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700	: ($self->{w} - $tex->{w}) * 0.5);	2104	: ($self->{w} - $size->[0]) * 0.5);
1701		2105
1702	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2106	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2107	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704	: ($self->{h} - $tex->{h}) * 0.5);	2108	: ($self->{h} - $size->[1]) * 0.5);
1705	};	2109	};
1706		2110
1707	glEnable GL_TEXTURE_2D;
1708
1709	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2111	my $w = List::Util::min $self->{w} + 4, $size->[0];
1710	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2112	my $h = List::Util::min $self->{h} + 2, $size->[1];
1711		2113
1712	if ($tex->{format} == GL_ALPHA) {	2114	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714	glColor @{$self->{fg}};
1715	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716	} else {
1717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719	}
1720
1721	glDisable GL_TEXTURE_2D;
1722	}	2115	}
1723		2116
1724	#############################################################################	2117	#############################################################################
1725		2118
1726	package CFClient::UI::EntryBase;	2119	package CFPlus::UI::EntryBase;
1727		2120
1728	our @ISA = CFClient::UI::Label::;	2121	our @ISA = CFPlus::UI::Label::;
1729		2122
1730	use CFClient::OpenGL;	2123	use CFPlus::OpenGL;
1731		2124
1732	sub new {	2125	sub new {
1733	my $class = shift;	2126	my $class = shift;
1734		2127
1735	$class->SUPER::new (	2128	$class->SUPER::new (
…		…
1739	active_fg => [0, 0, 0],	2132	active_fg => [0, 0, 0],
1740	can_hover => 1,	2133	can_hover => 1,
1741	can_focus => 1,	2134	can_focus => 1,
1742	valign => 0,	2135	valign => 0,
1743	can_events => 1,	2136	can_events => 1,
		2137	ellipsise => 0,
1744	#text => ...	2138	#text => ...
1745	#hidden => "*",	2139	#hidden => "*",
1746	@_	2140	@_
1747	)	2141	)
1748	}	2142	}
…		…
1793	my $sym = $ev->{sym};	2187	my $sym = $ev->{sym};
1794	my $uni = $ev->{unicode};	2188	my $uni = $ev->{unicode};
1795		2189
1796	my $text = $self->get_text;	2190	my $text = $self->get_text;
1797		2191
		2192	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2193
1798	if ($uni == 8) {	2194	if ($uni == 8) {
1799	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2195	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1800	} elsif ($uni == 127) {	2196	} elsif ($uni == 127) {
1801	substr $text, $self->{cursor}, 1, "";	2197	substr $text, $self->{cursor}, 1, "";
1802	} elsif ($sym == CFClient::SDLK_LEFT) {	2198	} elsif ($sym == CFPlus::SDLK_LEFT) {
1803	--$self->{cursor} if $self->{cursor};	2199	--$self->{cursor} if $self->{cursor};
1804	} elsif ($sym == CFClient::SDLK_RIGHT) {	2200	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1805	++$self->{cursor} if $self->{cursor} < length $self->{text};	2201	++$self->{cursor} if $self->{cursor} < length $self->{text};
1806	} elsif ($sym == CFClient::SDLK_HOME) {	2202	} elsif ($sym == CFPlus::SDLK_HOME) {
		2203	# what a hack
		2204	$self->{cursor} =
		2205	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2206	? length $1
		2207	: 0;
		2208	} elsif ($sym == CFPlus::SDLK_END) {
		2209	# uh, again
		2210	$self->{cursor} =
		2211	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2212	? $self->{cursor} + length $1
		2213	: length $self->{text};
		2214	} elsif ($uni == 21) { # ctrl-u
		2215	$text = "";
1807	$self->{cursor} = 0;	2216	$self->{cursor} = 0;
1808	} elsif ($sym == CFClient::SDLK_END) {
1809	$self->{cursor} = length $text;
1810	} elsif ($uni == 27) {	2217	} elsif ($uni == 27) {
1811	$self->emit ('escape');	2218	$self->emit ('escape');
1812	} elsif ($uni) {	2219	} elsif ($uni == 0x0d) {
		2220	substr $text, $self->{cursor}++, 0, "\012";
		2221	} elsif ($uni >= 0x20) {
1813	substr $text, $self->{cursor}++, 0, chr $uni;	2222	substr $text, $self->{cursor}++, 0, chr $uni;
1814	} else {	2223	} else {
1815	return 0;	2224	return 0;
1816	}	2225	}
1817		2226
1818	$self->_set_text ($text);	2227	$self->_set_text ($text);
1819		2228
1820	$self->realloc;	2229	$self->realloc;
		2230	$self->update;
1821		2231
1822	1	2232	1
1823	}	2233	}
1824		2234
1825	sub invoke_focus_in {	2235	sub invoke_focus_in {
…		…
1837		2247
1838	my $idx = $self->{layout}->xy_to_index ($x, $y);	2248	my $idx = $self->{layout}->xy_to_index ($x, $y);
1839		2249
1840	# byte-index to char-index	2250	# byte-index to char-index
1841	my $text = $self->{text};	2251	my $text = $self->{text};
1842	utf8::encode $text;	2252	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843	$self->{cursor} = length substr $text, 0, $idx;	2253	$self->{cursor} = length $text;
1844		2254
1845	$self->_set_text ($self->{text});	2255	$self->_set_text ($self->{text});
1846	$self->update;	2256	$self->update;
1847		2257
1848	1	2258	1
…		…
1887	utf8::encode $text;	2297	utf8::encode $text;
1888		2298
1889	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2299	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1890	}	2300	}
1891		2301
1892	glColor @{$self->{fg}};
1893	glBegin GL_LINES;	2302	glBegin GL_LINES;
1894	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2303	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2304	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1896	glEnd;	2305	glEnd;
1897	}	2306	}
1898	}	2307	}
1899		2308
		2309	#############################################################################
		2310
1900	package CFClient::UI::Entry;	2311	package CFPlus::UI::Entry;
1901		2312
1902	our @ISA = CFClient::UI::EntryBase::;	2313	our @ISA = CFPlus::UI::EntryBase::;
1903		2314
1904	use CFClient::OpenGL;	2315	use CFPlus::OpenGL;
1905		2316
1906	sub invoke_key_down {	2317	sub invoke_key_down {
1907	my ($self, $ev) = @_;	2318	my ($self, $ev) = @_;
1908		2319
1909	my $sym = $ev->{sym};	2320	my $sym = $ev->{sym};
1910		2321
1911	if ($sym == 13) {	2322	if ($ev->{uni} == 0x0d || $sym == 13) {
1912	unshift @{$self->{history}},	2323	unshift @{$self->{history}},
1913	my $txt = $self->get_text;	2324	my $txt = $self->get_text;
1914		2325
1915	$self->{history_pointer} = -1;	2326	$self->{history_pointer} = -1;
1916	$self->{history_saveback} = '';	2327	$self->{history_saveback} = '';
1917	$self->emit (activate => $txt);	2328	$self->emit (activate => $txt);
1918	$self->update;	2329	$self->update;
1919		2330
1920	} elsif ($sym == CFClient::SDLK_UP) {	2331	} elsif ($sym == CFPlus::SDLK_UP) {
1921	if ($self->{history_pointer} < 0) {	2332	if ($self->{history_pointer} < 0) {
1922	$self->{history_saveback} = $self->get_text;	2333	$self->{history_saveback} = $self->get_text;
1923	}	2334	}
1924	if (@{$self->{history} || []} > 0) {	2335	if (@{$self->{history} || []} > 0) {
1925	$self->{history_pointer}++;	2336	$self->{history_pointer}++;
…		…
1927	$self->{history_pointer} = @{$self->{history} || []} - 1;	2338	$self->{history_pointer} = @{$self->{history} || []} - 1;
1928	}	2339	}
1929	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2340	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1930	}	2341	}
1931		2342
1932	} elsif ($sym == CFClient::SDLK_DOWN) {	2343	} elsif ($sym == CFPlus::SDLK_DOWN) {
1933	$self->{history_pointer}--;	2344	$self->{history_pointer}--;
1934	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2345	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1935		2346
1936	if ($self->{history_pointer} >= 0) {	2347	if ($self->{history_pointer} >= 0) {
1937	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2348	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1946	1	2357	1
1947	}	2358	}
1948		2359
1949	#############################################################################	2360	#############################################################################
1950		2361
		2362	package CFPlus::UI::TextEdit;
		2363
		2364	our @ISA = CFPlus::UI::EntryBase::;
		2365
		2366	use CFPlus::OpenGL;
		2367
		2368	sub move_cursor_ver {
		2369	my ($self, $dy) = @_;
		2370
		2371	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2372
		2373	$y += $dy;
		2374
		2375	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2376	$self->{cursor} = $index;
		2377	delete $self->{cur_h};
		2378	$self->update;
		2379	return;
		2380	}
		2381	}
		2382
		2383	sub invoke_key_down {
		2384	my ($self, $ev) = @_;
		2385
		2386	my $sym = $ev->{sym};
		2387
		2388	if ($sym == CFPlus::SDLK_UP) {
		2389	$self->move_cursor_ver (-1);
		2390	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2391	$self->move_cursor_ver (+1);
		2392	} else {
		2393	return $self->SUPER::invoke_key_down ($ev)
		2394	}
		2395
		2396	1
		2397	}
		2398
		2399	#############################################################################
		2400
1951	package CFClient::UI::Button;	2401	package CFPlus::UI::Button;
1952		2402
1953	our @ISA = CFClient::UI::Label::;	2403	our @ISA = CFPlus::UI::Label::;
1954		2404
1955	use CFClient::OpenGL;	2405	use CFPlus::OpenGL;
1956		2406
1957	my @tex =	2407	my @tex =
1958	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2408	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1959	qw(b1_button_active.png);	2409	qw(b1_button_inactive.png b1_button_active.png);
1960		2410
1961	sub new {	2411	sub new {
1962	my $class = shift;	2412	my $class = shift;
1963		2413
1964	$class->SUPER::new (	2414	$class->SUPER::new (
1965	padding_x => 4,	2415	padding_x => 4,
1966	padding_y => 4,	2416	padding_y => 4,
1967	fg => [1, 1, 1],	2417	fg => [1.0, 1.0, 1.0],
1968	active_fg => [0, 0, 1],	2418	active_fg => [0.8, 0.8, 0.8],
1969	can_hover => 1,	2419	can_hover => 1,
1970	align => 0,	2420	align => 0,
1971	valign => 0,	2421	valign => 0,
1972	can_events => 1,	2422	can_events => 1,
1973	@_	2423	@_
…		…
1991		2441
1992	glEnable GL_TEXTURE_2D;	2442	glEnable GL_TEXTURE_2D;
1993	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1994	glColor 0, 0, 0, 1;	2444	glColor 0, 0, 0, 1;
1995		2445
		2446	my $tex = $tex[$GRAB == $self];
1996	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2447	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1997		2448
1998	glDisable GL_TEXTURE_2D;	2449	glDisable GL_TEXTURE_2D;
1999		2450
2000	$self->SUPER::_draw;	2451	$self->SUPER::_draw;
2001	}	2452	}
2002		2453
2003	#############################################################################	2454	#############################################################################
2004		2455
		2456	package CFPlus::UI::CheckBox;
		2457
		2458	our @ISA = CFPlus::UI::DrawBG::;
		2459
		2460	my @tex =
		2461	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2462	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2463
		2464	use CFPlus::OpenGL;
		2465
		2466	sub new {
		2467	my $class = shift;
		2468
		2469	$class->SUPER::new (
		2470	padding_x => 2,
		2471	padding_y => 2,
		2472	fg => [1, 1, 1],
		2473	active_fg => [1, 1, 0],
		2474	bg => [0, 0, 0, 0.2],
		2475	active_bg => [1, 1, 1, 0.5],
		2476	state => 0,
		2477	can_hover => 1,
		2478	@_
		2479	)
		2480	}
		2481
		2482	sub size_request {
		2483	my ($self) = @_;
		2484
		2485	(6) x 2
		2486	}
		2487
		2488	sub toggle {
		2489	my ($self) = @_;
		2490
		2491	$self->{state} = !$self->{state};
		2492	$self->emit (changed => $self->{state});
		2493	$self->update;
		2494	}
		2495
		2496	sub invoke_button_down {
		2497	my ($self, $ev, $x, $y) = @_;
		2498
		2499	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2500	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2501	$self->toggle;
		2502	} else {
		2503	return 0
		2504	}
		2505
		2506	1
		2507	}
		2508
		2509	sub _draw {
		2510	my ($self) = @_;
		2511
		2512	$self->SUPER::_draw;
		2513
		2514	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2515
		2516	my ($w, $h) = @$self{qw(w h)};
		2517
		2518	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2519
		2520	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2521
		2522	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2523
		2524	glEnable GL_TEXTURE_2D;
		2525	$tex->draw_quad_alpha (0, 0, $s, $s);
		2526	glDisable GL_TEXTURE_2D;
		2527	}
		2528
		2529	#############################################################################
		2530
		2531	package CFPlus::UI::Image;
		2532
		2533	our @ISA = CFPlus::UI::Base::;
		2534
		2535	use CFPlus::OpenGL;
		2536
		2537	our %texture_cache;
		2538
		2539	sub new {
		2540	my $class = shift;
		2541
		2542	my $self = $class->SUPER::new (
		2543	can_events => 0,
		2544	@_,
		2545	);
		2546
		2547	$self->{path} || $self->{tex}
		2548	or Carp::croak "'path' or 'tex' attributes required";
		2549
		2550	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2551	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2552
		2553	CFPlus::weaken $texture_cache{$self->{path}};
		2554
		2555	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2556
		2557	$self
		2558	}
		2559
		2560	sub STORABLE_freeze {
		2561	my ($self, $cloning) = @_;
		2562
		2563	$self->{path}
		2564	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2565
		2566	$self->{path}
		2567	}
		2568
		2569	sub STORABLE_attach {
		2570	my ($self, $cloning, $path) = @_;
		2571
		2572	$self->new (path => $path)
		2573	}
		2574
		2575	sub size_request {
		2576	my ($self) = @_;
		2577
		2578	($self->{tex}{w}, $self->{tex}{h})
		2579	}
		2580
		2581	sub _draw {
		2582	my ($self) = @_;
		2583
		2584	my $tex = $self->{tex};
		2585
		2586	my ($w, $h) = ($self->{w}, $self->{h});
		2587
		2588	if ($self->{rot90}) {
		2589	glRotate 90, 0, 0, 1;
		2590	glTranslate 0, -$self->{w}, 0;
		2591
		2592	($w, $h) = ($h, $w);
		2593	}
		2594
		2595	glEnable GL_TEXTURE_2D;
		2596	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2597
		2598	$tex->draw_quad (0, 0, $w, $h);
		2599
		2600	glDisable GL_TEXTURE_2D;
		2601	}
		2602
		2603	#############################################################################
		2604
2005	package CFClient::UI::ImageButton;	2605	package CFPlus::UI::ImageButton;
2006		2606
2007	our @ISA = CFClient::UI::Image::;	2607	our @ISA = CFPlus::UI::Image::;
2008		2608
2009	use CFClient::OpenGL;	2609	use CFPlus::OpenGL;
2010		2610
2011	my %textures;	2611	my %textures;
2012		2612
2013	sub new {	2613	sub new {
2014	my $class = shift;	2614	my $class = shift;
…		…
2036	1	2636	1
2037	}	2637	}
2038		2638
2039	#############################################################################	2639	#############################################################################
2040		2640
2041	package CFClient::UI::CheckBox;
2042
2043	our @ISA = CFClient::UI::DrawBG::;
2044
2045	my @tex =
2046	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2047	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2048
2049	use CFClient::OpenGL;
2050
2051	sub new {
2052	my $class = shift;
2053
2054	$class->SUPER::new (
2055	padding_x => 2,
2056	padding_y => 2,
2057	fg => [1, 1, 1],
2058	active_fg => [1, 1, 0],
2059	bg => [0, 0, 0, 0.2],
2060	active_bg => [1, 1, 1, 0.5],
2061	state => 0,
2062	can_hover => 1,
2063	@_
2064	)
2065	}
2066
2067	sub size_request {
2068	my ($self) = @_;
2069
2070	(6) x 2
2071	}
2072
2073	sub invoke_button_down {
2074	my ($self, $ev, $x, $y) = @_;
2075
2076	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2077	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2078	$self->{state} = !$self->{state};
2079	$self->emit (changed => $self->{state});
2080	} else {
2081	return 0
2082	}
2083
2084	1
2085	}
2086
2087	sub _draw {
2088	my ($self) = @_;
2089
2090	$self->SUPER::_draw;
2091
2092	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2093
2094	my ($w, $h) = @$self{qw(w h)};
2095
2096	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2097
2098	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2099
2100	my $tex = $self->{state} ? $tex[1] : $tex[0];
2101
2102	glEnable GL_TEXTURE_2D;
2103	$tex->draw_quad_alpha (0, 0, $s, $s);
2104	glDisable GL_TEXTURE_2D;
2105	}
2106
2107	#############################################################################
2108
2109	package CFClient::UI::Image;	2641	package CFPlus::UI::VGauge;
2110		2642
2111	our @ISA = CFClient::UI::Base::;	2643	our @ISA = CFPlus::UI::Base::;
2112
2113	use CFClient::OpenGL;
2114
2115	our %texture_cache;
2116
2117	sub new {
2118	my $class = shift;
2119
2120	my $self = $class->SUPER::new (
2121	can_events => 0,
2122	@_,
2123	);
2124
2125	$self->{path}
2126	or Carp::croak "required attribute 'path' not set";
2127
2128	$self->{tex} = $texture_cache{$self->{path}} ||=
2129	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2130
2131	Scalar::Util::weaken $texture_cache{$self->{path}};
2132
2133	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2134
2135	$self
2136	}
2137
2138	sub size_request {
2139	my ($self) = @_;
2140
2141	($self->{tex}{w}, $self->{tex}{h})
2142	}
2143
2144	sub _draw {
2145	my ($self) = @_;
2146
2147	my $tex = $self->{tex};
2148
2149	my ($w, $h) = ($self->{w}, $self->{h});
2150
2151	if ($self->{rot90}) {
2152	glRotate 90, 0, 0, 1;
2153	glTranslate 0, -$self->{w}, 0;
2154
2155	($w, $h) = ($h, $w);
2156	}
2157
2158	glEnable GL_TEXTURE_2D;
2159	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2160
2161	$tex->draw_quad_alpha (0, 0, $w, $h);
2162
2163	glDisable GL_TEXTURE_2D;
2164	}
2165
2166	#############################################################################
2167
2168	package CFClient::UI::VGauge;
2169
2170	our @ISA = CFClient::UI::Base::;
2171		2644
2172	use List::Util qw(min max);	2645	use List::Util qw(min max);
2173		2646
2174	use CFClient::OpenGL;	2647	use CFPlus::OpenGL;
2175		2648
2176	my %tex = (	2649	my %tex = (
2177	food => [	2650	food => [
2178	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2651	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2652	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2180	],	2653	],
2181	grace => [	2654	grace => [
2182	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2655	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2656	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2184	],	2657	],
2185	hp => [	2658	hp => [
2186	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2659	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2660	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2188	],	2661	],
2189	mana => [	2662	mana => [
2190	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2663	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2664	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2192	],	2665	],
2193	);	2666	);
2194		2667
2195	# eg. VGauge->new (gauge => 'food'), default gauge: food	2668	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2298	glDisable GL_TEXTURE_2D;	2771	glDisable GL_TEXTURE_2D;
2299	}	2772	}
2300		2773
2301	#############################################################################	2774	#############################################################################
2302		2775
2303	package CFClient::UI::Gauge;	2776	package CFPlus::UI::Gauge;
2304		2777
2305	our @ISA = CFClient::UI::VBox::;	2778	our @ISA = CFPlus::UI::VBox::;
2306		2779
2307	sub new {	2780	sub new {
2308	my ($class, %arg) = @_;	2781	my ($class, %arg) = @_;
2309		2782
2310	my $self = $class->SUPER::new (	2783	my $self = $class->SUPER::new (
…		…
2312	can_hover => 1,	2785	can_hover => 1,
2313	can_events => 1,	2786	can_events => 1,
2314	%arg,	2787	%arg,
2315	);	2788	);
2316		2789
2317	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2790	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2318	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2791	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2319	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2792	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2320		2793
2321	$self	2794	$self
2322	}	2795	}
2323		2796
2324	sub set_fontsize {	2797	sub set_fontsize {
…		…
2345	$self->{value}->set_text ($val);	2818	$self->{value}->set_text ($val);
2346	}	2819	}
2347		2820
2348	#############################################################################	2821	#############################################################################
2349		2822
2350	package CFClient::UI::Slider;	2823	package CFPlus::UI::Slider;
2351		2824
2352	use strict;	2825	use strict;
2353		2826
2354	use CFClient::OpenGL;	2827	use CFPlus::OpenGL;
2355		2828
2356	our @ISA = CFClient::UI::DrawBG::;	2829	our @ISA = CFPlus::UI::DrawBG::;
2357		2830
2358	my @tex =	2831	my @tex =
2359	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2832	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2360	qw(s1_slider.png s1_slider_bg.png);	2833	qw(s1_slider.png s1_slider_bg.png);
2361		2834
2362	sub new {	2835	sub new {
2363	my $class = shift;	2836	my $class = shift;
2364		2837
…		…
2453	}	2926	}
2454		2927
2455	1	2928	1
2456	}	2929	}
2457		2930
		2931	sub invoke_mouse_wheel {
		2932	my ($self, $ev) = @_;
		2933
		2934	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2935
		2936	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2937
		2938	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2939
		2940	! ! $delta
		2941	}
		2942
2458	sub update {	2943	sub update {
2459	my ($self) = @_;	2944	my ($self) = @_;
2460		2945
2461	delete $self->{knob_w};	2946	delete $self->{knob_w};
2462	$self->SUPER::update;	2947	$self->SUPER::update;
…		…
2509	glDisable GL_TEXTURE_2D;	2994	glDisable GL_TEXTURE_2D;
2510	}	2995	}
2511		2996
2512	#############################################################################	2997	#############################################################################
2513		2998
2514	package CFClient::UI::ValSlider;	2999	package CFPlus::UI::ValSlider;
2515		3000
2516	our @ISA = CFClient::UI::HBox::;	3001	our @ISA = CFPlus::UI::HBox::;
2517		3002
2518	sub new {	3003	sub new {
2519	my ($class, %arg) = @_;	3004	my ($class, %arg) = @_;
2520		3005
2521	my $range = delete $arg{range};	3006	my $range = delete $arg{range};
2522		3007
2523	my $self = $class->SUPER::new (	3008	my $self = $class->SUPER::new (
2524	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3009	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2525	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3010	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2526	to_value => sub { shift },	3011	to_value => sub { shift },
2527	from_value => sub { shift },	3012	from_value => sub { shift },
2528	%arg,	3013	%arg,
2529	);	3014	);
2530		3015
…		…
2550	sub set_range { shift->{slider}->set_range (@_) }	3035	sub set_range { shift->{slider}->set_range (@_) }
2551	sub set_value { shift->{slider}->set_value (@_) }	3036	sub set_value { shift->{slider}->set_value (@_) }
2552		3037
2553	#############################################################################	3038	#############################################################################
2554		3039
2555	package CFClient::UI::TextScroller;	3040	package CFPlus::UI::TextScroller;
2556		3041
2557	our @ISA = CFClient::UI::HBox::;	3042	our @ISA = CFPlus::UI::HBox::;
2558		3043
2559	use CFClient::OpenGL;	3044	use CFPlus::OpenGL;
2560		3045
2561	sub new {	3046	sub new {
2562	my $class = shift;	3047	my $class = shift;
2563		3048
2564	my $self = $class->SUPER::new (	3049	my $self = $class->SUPER::new (
2565	fontsize => 1,	3050	fontsize => 1,
2566	can_events => 0,	3051	can_events => 1,
2567	indent => 0,	3052	indent => 0,
2568	#font => default_font	3053	#font => default_font
2569	@_,	3054	@_,
2570		3055
2571	layout => (new CFClient::Layout 1),	3056	layout => (new CFPlus::Layout),
2572	par => [],	3057	par => [],
		3058	max_par => 0,
2573	height => 0,	3059	height => 0,
2574	children => [	3060	children => [
2575	(new CFClient::UI::Empty expand => 1),	3061	(new CFPlus::UI::Empty expand => 1),
2576	(new CFClient::UI::Slider vertical => 1),	3062	(new CFPlus::UI::Slider vertical => 1),
2577	],	3063	],
2578	);	3064	);
2579		3065
2580	$self->{children}[1]->connect (changed => sub { $self->update });	3066	$self->{children}[1]->connect (changed => sub { $self->update });
2581		3067
…		…
2611		3097
2612	$self->reflow;	3098	$self->reflow;
2613		3099
2614	local $self->{children} = [$empty, $slider];	3100	local $self->{children} = [$empty, $slider];
2615	$self->SUPER::invoke_size_allocate ($w, $h)	3101	$self->SUPER::invoke_size_allocate ($w, $h)
		3102	}
		3103
		3104	sub invoke_mouse_wheel {
		3105	my ($self, $ev) = @_;
		3106
		3107	return 0 unless $ev->{dy}; # only vertical movements
		3108
		3109	$self->{children}[1]->emit (mouse_wheel => $ev);
		3110
		3111	1
2616	}	3112	}
2617		3113
2618	sub get_layout {	3114	sub get_layout {
2619	my ($self, $para) = @_;	3115	my ($self, $para) = @_;
2620		3116
…		…
2648		3144
2649	# todo: base offset on lines or so, not on pixels	3145	# todo: base offset on lines or so, not on pixels
2650	$self->{children}[1]->set_value ($offset);	3146	$self->{children}[1]->set_value ($offset);
2651	}	3147	}
2652		3148
		3149	sub current_paragraph {
		3150	my ($self) = @_;
		3151
		3152	$self->{top_paragraph} - 1
		3153	}
		3154
		3155	sub scroll_to {
		3156	my ($self, $para) = @_;
		3157
		3158	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3159
		3160	$self->{scroll_to} = $para;
		3161	$self->update;
		3162	}
		3163
2653	sub clear {	3164	sub clear {
2654	my ($self) = @_;	3165	my ($self) = @_;
2655		3166
2656	my (undef, undef, @other) = @{ $self->{children} };	3167	my (undef, undef, @other) = @{ $self->{children} };
2657	$self->remove ($_) for @other;	3168	$self->remove ($_) for @other;
…		…
2660	$self->{height} = 0;	3171	$self->{height} = 0;
2661	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3172	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2662	}	3173	}
2663		3174
2664	sub add_paragraph {	3175	sub add_paragraph {
2665	my ($self, $color, $para, $indent) = @_;	3176	my $self = shift;
2666		3177
2667	my ($text, @w) = ref $para ? @$para : $para;	3178	for my $para (@_) {
2668
2669	$para = {	3179	$para = {
		3180	fg => [1, 1, 1, 1],
		3181	indent => 0,
		3182	markup => "",
		3183	widget => [],
		3184	ref $para ? %$para : (markup => $para),
2670	w => 1e10,	3185	w => 1e10,
2671	wrapped => 1,	3186	wrapped => 1,
2672	fg => $color,
2673	indent => $indent,
2674	markup => $text,
2675	widget => \@w,
2676	};	3187	};
2677		3188
2678	$self->add (@w) if @w;	3189	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2679	push @{$self->{par}}, $para;	3190	push @{$self->{par}}, $para;
		3191	}
		3192
		3193	if (my $max = $self->{max_par}) {
		3194	shift @{$self->{par}} while @{$self->{par}} > $max;
		3195	}
2680		3196
2681	$self->{need_reflow}++;	3197	$self->{need_reflow}++;
2682	$self->update;	3198	$self->update;
2683	}	3199	}
2684		3200
2685	sub scroll_to_bottom {	3201	sub scroll_to_bottom {
2686	my ($self) = @_;	3202	my ($self) = @_;
2687		3203
2688	$self->{scroll_to_bottom} = 1;	3204	$self->{scroll_to} = $#{$self->{par}};
2689	$self->update;	3205	$self->update;
2690	}	3206	}
2691		3207
		3208	sub force_uptodate {
		3209	my ($self) = @_;
		3210
		3211	if (delete $self->{need_reflow}) {
		3212	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3213
		3214	my $height = 0;
		3215
		3216	for my $para (@{$self->{par}}) {
		3217	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3218	my $layout = $self->get_layout ($para);
		3219	my ($w, $h) = $layout->size;
		3220
		3221	$para->{w} = $w + $para->{indent};
		3222	$para->{h} = $h;
		3223	$para->{wrapped} = $layout->has_wrapped;
		3224	}
		3225
		3226	$para->{y} = $height;
		3227	$height += $para->{h};
		3228	}
		3229
		3230	$self->{height} = $height;
		3231	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3232
		3233	delete $self->{texture};
		3234	}
		3235
		3236	if (my $paridx = delete $self->{scroll_to}) {
		3237	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3238	}
		3239	}
		3240
2692	sub update {	3241	sub update {
2693	my ($self) = @_;	3242	my ($self) = @_;
2694		3243
2695	$self->SUPER::update;	3244	$self->SUPER::update;
2696		3245
2697	return unless $self->{h} > 0;	3246	return unless $self->{h} > 0;
2698		3247
2699	delete $self->{texture};	3248	delete $self->{texture};
2700		3249
2701	$ROOT->on_post_alloc ($self => sub {	3250	$ROOT->on_post_alloc ($self => sub {
		3251	$self->force_uptodate;
		3252
2702	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3253	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2703		3254
2704	if (delete $self->{need_reflow}) {
2705	my $height = 0;
2706
2707	for my $para (@{$self->{par}}) {
2708	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2709	my $layout = $self->get_layout ($para);
2710	my ($w, $h) = $layout->size;
2711
2712	$para->{w} = $w + $para->{indent};
2713	$para->{h} = $h;
2714	$para->{wrapped} = $layout->has_wrapped;
2715	}
2716
2717	$height += $para->{h};
2718	}
2719
2720	$self->{height} = $height;
2721
2722	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2723
2724	delete $self->{texture};
2725	}
2726
2727	if (delete $self->{scroll_to_bottom}) {
2728	$self->{children}[1]->set_value (1e10);
2729	}
2730
2731	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3255	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2732	glClearColor 0, 0, 0, 0;	3256	glClearColor 0, 0, 0, 0;
2733	glClear GL_COLOR_BUFFER_BIT;	3257	glClear GL_COLOR_BUFFER_BIT;
2734		3258
		3259	package CFPlus::UI::Base;
		3260	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3261	(0, 0, $self->{w}, $self->{h});
		3262
		3263	my $top = int $self->{children}[1]{range}[0];
		3264
		3265	my $paridx = 0;
		3266	my $top_paragraph;
2735	my $top = int $self->{children}[1]{range}[0];	3267	my $top = int $self->{children}[1]{range}[0];
2736		3268
2737	my $y0 = $top;	3269	my $y0 = $top;
2738	my $y1 = $top + $H;	3270	my $y1 = $top + $H;
2739		3271
2740	my $y = 0;
2741
2742	glEnable GL_BLEND;
2743	#TODO# not correct in windows where rgba is forced off
2744	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2745
2746	for my $para (@{$self->{par}}) {	3272	for my $para (@{$self->{par}}) {
2747	my $h = $para->{h};	3273	my $h = $para->{h};
		3274	my $y = $para->{y};
2748		3275
2749	if ($y0 < $y + $h && $y < $y1) {	3276	if ($y0 < $y + $h && $y < $y1) {
2750
2751	my $layout = $self->get_layout ($para);	3277	my $layout = $self->get_layout ($para);
2752		3278
2753	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2754
2755	glRasterPos $para->{indent}, $y - $y0;	3279	$layout->render ($para->{indent}, $y - $y0);
2756	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2757		3280
2758	if (my @w = @{ $para->{widget} }) {	3281	if (my @w = @{ $para->{widget} }) {
2759	my @s = $layout->get_shapes;	3282	my @s = $layout->get_shapes;
2760		3283
2761	glDisable GL_BLEND;
2762	for (@w) {	3284	for (@w) {
2763	my ($dx, $dy) = splice @s, 0, 2, ();	3285	my ($dx, $dy) = splice @s, 0, 2, ();
2764		3286
2765	$_->{x} = $dx + $para->{indent};	3287	$_->{x} = $dx + $para->{indent};
2766	$_->{y} = $dy + $y - $y0;	3288	$_->{y} = $dy + $y - $y0;
2767		3289
2768	$_->draw;	3290	$_->draw;
2769	}	3291	}
2770	glEnable GL_BLEND;
2771	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2772	}	3292	}
2773	}	3293	}
2774		3294
2775	$y += $h;	3295	$paridx++;
		3296	$top_paragraph ||= $paridx if $y >= $top;
2776	}	3297	}
2777		3298
2778	glDisable GL_BLEND;	3299	$self->{top_paragraph} = $top_paragraph;
2779	};	3300	};
2780	});	3301	});
2781	}	3302	}
2782		3303
2783	sub reconfigure {	3304	sub reconfigure {
…		…
2801	$self->{children}[1]->draw;	3322	$self->{children}[1]->draw;
2802	}	3323	}
2803		3324
2804	#############################################################################	3325	#############################################################################
2805		3326
2806	package CFClient::UI::Animator;	3327	package CFPlus::UI::Animator;
2807		3328
2808	use CFClient::OpenGL;	3329	use CFPlus::OpenGL;
2809		3330
2810	our @ISA = CFClient::UI::Bin::;	3331	our @ISA = CFPlus::UI::Bin::;
2811		3332
2812	sub moveto {	3333	sub moveto {
2813	my ($self, $x, $y) = @_;	3334	my ($self, $x, $y) = @_;
2814		3335
2815	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3336	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2843	glPopMatrix;	3364	glPopMatrix;
2844	}	3365	}
2845		3366
2846	#############################################################################	3367	#############################################################################
2847		3368
2848	package CFClient::UI::Flopper;	3369	package CFPlus::UI::Flopper;
2849		3370
2850	our @ISA = CFClient::UI::Button::;	3371	our @ISA = CFPlus::UI::Button::;
2851		3372
2852	sub new {	3373	sub new {
2853	my $class = shift;	3374	my $class = shift;
2854		3375
2855	my $self = $class->SUPER::new (	3376	my $self = $class->SUPER::new (
…		…
2867	$self->{other}->toggle_visibility;	3388	$self->{other}->toggle_visibility;
2868	}	3389	}
2869		3390
2870	#############################################################################	3391	#############################################################################
2871		3392
2872	package CFClient::UI::Tooltip;	3393	package CFPlus::UI::Tooltip;
2873		3394
2874	our @ISA = CFClient::UI::Bin::;	3395	our @ISA = CFPlus::UI::Bin::;
2875		3396
2876	use CFClient::OpenGL;	3397	use CFPlus::OpenGL;
2877		3398
2878	sub new {	3399	sub new {
2879	my $class = shift;	3400	my $class = shift;
2880		3401
2881	$class->SUPER::new (	3402	$class->SUPER::new (
…		…
2884	)	3405	)
2885	}	3406	}
2886		3407
2887	sub set_tooltip_from {	3408	sub set_tooltip_from {
2888	my ($self, $widget) = @_;	3409	my ($self, $widget) = @_;
		3410
		3411	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3412	if $widget->{tooltip} =~ /^#(.*)$/;
2889		3413
2890	my $tooltip = $widget->{tooltip};	3414	my $tooltip = $widget->{tooltip};
2891		3415
2892	if ($ENV{CFPLUS_DEBUG} & 2) {	3416	if ($ENV{CFPLUS_DEBUG} & 2) {
2893	$tooltip .= "\n\n" . (ref $widget) . "\n"	3417	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2897	}	3421	}
2898		3422
2899	$tooltip =~ s/^\n+//;	3423	$tooltip =~ s/^\n+//;
2900	$tooltip =~ s/\n+$//;	3424	$tooltip =~ s/\n+$//;
2901		3425
2902	$self->add (new CFClient::UI::Label	3426	$self->add (new CFPlus::UI::Label
2903	markup => $tooltip,	3427	markup => $tooltip,
2904	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3428	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2905	fontsize => 0.8,	3429	fontsize => 0.8,
2906	fg => [0, 0, 0, 1],	3430	style => 1, # FLAG_INVERSE
2907	ellipsise => 0,	3431	ellipsise => 0,
2908	font => ($widget->{tooltip_font} || $::FONT_PROP),	3432	font => ($widget->{tooltip_font} || $::FONT_PROP),
2909	);	3433	);
2910	}	3434	}
2911		3435
…		…
2930		3454
2931	$self->{root}->on_post_alloc ("move_$self" => sub {	3455	$self->{root}->on_post_alloc ("move_$self" => sub {
2932	my $widget = $self->{owner}	3456	my $widget = $self->{owner}
2933	or return;	3457	or return;
2934		3458
		3459	if ($widget->{visible}) {
2935	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3460	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2936		3461
2937	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3462	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2938	if $x + $self->{w} > $self->{root}{w};	3463	if $x + $self->{w} > $self->{root}{w};
2939		3464
2940	$self->move_abs ($x, $y);	3465	$self->move_abs ($x, $y);
		3466	} else {
		3467	$self->hide;
		3468	}
2941	});	3469	});
2942	}	3470	}
2943		3471
2944	sub _draw {	3472	sub _draw {
2945	my ($self) = @_;	3473	my ($self) = @_;
…		…
2969	$self->SUPER::_draw;	3497	$self->SUPER::_draw;
2970	}	3498	}
2971		3499
2972	#############################################################################	3500	#############################################################################
2973		3501
2974	package CFClient::UI::Face;	3502	package CFPlus::UI::Face;
2975		3503
2976	our @ISA = CFClient::UI::Base::;	3504	our @ISA = CFPlus::UI::DrawBG::;
2977		3505
2978	use CFClient::OpenGL;	3506	use CFPlus::OpenGL;
2979		3507
2980	sub new {	3508	sub new {
2981	my $class = shift;	3509	my $class = shift;
2982		3510
2983	my $self = $class->SUPER::new (	3511	my $self = $class->SUPER::new (
		3512	size_w => 32,
		3513	size_h => 8,
2984	aspect => 1,	3514	aspect => 1,
2985	can_events => 0,	3515	can_events => 0,
2986	@_,	3516	@_,
2987	);	3517	);
2988		3518
2989	if ($self->{anim} && $self->{animspeed}) {	3519	if ($self->{anim} && $self->{animspeed}) {
2990	Scalar::Util::weaken (my $widget = $self);	3520	CFPlus::weaken (my $widget = $self);
2991		3521
		3522	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3523	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2992	$self->{timer} = Event->timer (	3524	$self->{timer} = Event->timer (
2993	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2994	hard => 1,	3525	parked => 1,
2995	interval => $self->{animspeed},
2996	cb => sub {	3526	cb => sub {
		3527	return unless $::CONN && $widget;
		3528
2997	++$widget->{frame};	3529	++$widget->{frame};
		3530	$widget->update_face;
2998	$widget->update;	3531	$widget->update;
		3532
		3533	$widget->update_timer;
2999	},	3534	},
3000	);	3535	);
		3536
		3537	$self->update_face;
		3538	$self->update_timer;
3001	}	3539	}
3002		3540
3003	$self	3541	$self
3004	}	3542	}
3005		3543
		3544	sub update_timer {
		3545	my ($self) = @_;
		3546
		3547	return unless $self->{timer};
		3548
		3549	if ($self->{visible}) {
		3550	$self->{timer}->at (
		3551	$self->{anim_start}
		3552	+ $self->{animspeed}
		3553	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3554	);
		3555	$self->{timer}->start;
		3556	} else {
		3557	$self->{timer}->stop;
		3558	}
		3559	}
		3560
		3561	sub update_face {
		3562	my ($self) = @_;
		3563
		3564	return unless $::CONN;
		3565
		3566	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3567	if ($anim && @$anim) {
		3568	delete $self->{wait_face};
		3569	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3570	}
		3571	}
		3572	}
		3573
3006	sub size_request {	3574	sub size_request {
3007	(32, 8)	3575	my ($self) = @_;
		3576
		3577	if ($::CONN) {
		3578	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3579	if (my $tex = $::CONN->{texture}[$faceid]) {
		3580	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3581	} else {
		3582	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3583	$self->realloc;
		3584	});
		3585	}
		3586	}
		3587	}
		3588
		3589	($self->{size_w} || 8, $self->{size_h} || 8)
3008	}	3590	}
3009		3591
3010	sub update {	3592	sub update {
3011	my ($self) = @_;	3593	my ($self) = @_;
3012		3594
3013	return unless $self->{visible};	3595	return unless $self->{visible};
3014		3596
3015	$self->SUPER::update;	3597	$self->SUPER::update;
3016	}	3598	}
3017		3599
		3600	sub invoke_visibility_change {
		3601	my ($self) = @_;
		3602
		3603	$self->update_timer;
		3604
		3605	0
		3606	}
		3607
3018	sub _draw {	3608	sub _draw {
3019	my ($self) = @_;	3609	my ($self) = @_;
3020		3610
3021	return unless $::CONN;	3611	return unless $::CONN;
3022		3612
3023	my $face;	3613	$self->SUPER::_draw;
3024		3614
3025	if ($self->{frame}) {
3026	my $anim = $::CONN->{anim}[$self->{anim}];	3615	my $faceid = $::CONN->{faceid}[$self->{face}]
3027		3616	or return;
3028	$face = $anim->[ $self->{frame} % @$anim ]
3029	if $anim && @$anim;
3030	}
3031		3617
3032	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3618	my $tex = $::CONN->{texture}[$faceid];
3033		3619
3034	if ($tex) {	3620	if ($tex) {
3035	glEnable GL_TEXTURE_2D;	3621	glEnable GL_TEXTURE_2D;
3036	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3037	glColor 0, 0, 0, 1;	3623	glColor 0, 0, 0, 1;
…		…
3041	}	3627	}
3042		3628
3043	sub destroy {	3629	sub destroy {
3044	my ($self) = @_;	3630	my ($self) = @_;
3045		3631
3046	$self->{timer}->cancel	3632	(delete $self->{timer})->cancel
3047	if $self->{timer};	3633	if $self->{timer};
3048		3634
3049	$self->SUPER::destroy;	3635	$self->SUPER::destroy;
3050	}	3636	}
3051		3637
3052	#############################################################################	3638	#############################################################################
3053		3639
3054	package CFClient::UI::Buttonbar;	3640	package CFPlus::UI::Buttonbar;
3055		3641
3056	our @ISA = CFClient::UI::HBox::;	3642	our @ISA = CFPlus::UI::HBox::;
3057		3643
3058	# TODO: should actualyl wrap buttons and other goodies.	3644	# TODO: should actually wrap buttons and other goodies.
3059		3645
3060	#############################################################################	3646	#############################################################################
3061		3647
3062	package CFClient::UI::Menu;	3648	package CFPlus::UI::Menu;
3063		3649
3064	our @ISA = CFClient::UI::FancyFrame::;	3650	our @ISA = CFPlus::UI::Toplevel::;
3065		3651
3066	use CFClient::OpenGL;	3652	use CFPlus::OpenGL;
3067		3653
3068	sub new {	3654	sub new {
3069	my $class = shift;	3655	my $class = shift;
3070		3656
3071	my $self = $class->SUPER::new (	3657	my $self = $class->SUPER::new (
3072	items => [],	3658	items => [],
3073	z => 100,	3659	z => 100,
3074	@_,	3660	@_,
3075	);	3661	);
3076		3662
3077	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3663	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3078		3664
3079	for my $item (@{ $self->{items} }) {	3665	for my $item (@{ $self->{items} }) {
3080	my ($widget, $cb, $tooltip) = @$item;	3666	my ($widget, $cb, $tooltip) = @$item;
3081		3667
3082	# handle various types of items, only text for now	3668	# handle various types of items, only text for now
3083	if (!ref $widget) {	3669	if (!ref $widget) {
		3670	if ($widget =~ /\t/) {
		3671	my ($left, $right) = split /\t/, $widget, 2;
		3672
3084	$widget = new CFClient::UI::Label	3673	$widget = new CFPlus::UI::HBox
3085	can_hover => 1,	3674	can_hover => 1,
3086	can_events => 1,	3675	can_events => 1,
		3676	tooltip => $tooltip,
		3677	children => [
		3678	(new CFPlus::UI::Label markup => $left, expand => 1),
		3679	(new CFPlus::UI::Label markup => $right, align => +1),
		3680	],
		3681	;
		3682
		3683	} else {
		3684	$widget = new CFPlus::UI::Label
		3685	can_hover => 1,
		3686	can_events => 1,
3087	markup => $widget,	3687	markup => $widget,
3088	tooltip => $tooltip	3688	tooltip => $tooltip;
		3689	}
3089	}	3690	}
3090		3691
3091	$self->{item}{$widget} = $item;	3692	$self->{item}{$widget} = $item;
3092		3693
3093	$self->{vbox}->add ($widget);	3694	$self->{vbox}->add ($widget);
…		…
3136	1	3737	1
3137	}	3738	}
3138		3739
3139	#############################################################################	3740	#############################################################################
3140		3741
3141	package CFClient::UI::Multiplexer;	3742	package CFPlus::UI::Multiplexer;
3142		3743
3143	our @ISA = CFClient::UI::Container::;	3744	our @ISA = CFPlus::UI::Container::;
3144		3745
3145	sub new {	3746	sub new {
3146	my $class = shift;	3747	my $class = shift;
3147		3748
3148	my $self = $class->SUPER::new (	3749	my $self = $class->SUPER::new (
…		…
3162		3763
3163	$self->{current} = $self->{children}[0]	3764	$self->{current} = $self->{children}[0]
3164	if @{ $self->{children} };	3765	if @{ $self->{children} };
3165	}	3766	}
3166		3767
		3768	sub get_current_page {
		3769	my ($self) = @_;
		3770
		3771	$self->{current}
		3772	}
		3773
3167	sub set_current_page {	3774	sub set_current_page {
3168	my ($self, $page_or_widget) = @_;	3775	my ($self, $page_or_widget) = @_;
3169		3776
3170	my $widget = ref $page_or_widget	3777	my $widget = ref $page_or_widget
3171	? $page_or_widget	3778	? $page_or_widget
…		…
3203	$self->{current}->draw;	3810	$self->{current}->draw;
3204	}	3811	}
3205		3812
3206	#############################################################################	3813	#############################################################################
3207		3814
3208	package CFClient::UI::Notebook;	3815	package CFPlus::UI::Notebook;
3209		3816
3210	our @ISA = CFClient::UI::VBox::;	3817	our @ISA = CFPlus::UI::VBox::;
3211		3818
3212	sub new {	3819	sub new {
3213	my $class = shift;	3820	my $class = shift;
3214		3821
3215	my $self = $class->SUPER::new (	3822	my $self = $class->SUPER::new (
3216	buttonbar => (new CFClient::UI::Buttonbar),	3823	buttonbar => (new CFPlus::UI::Buttonbar),
3217	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3824	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3218	# filter => # will be put between multiplexer and $self	3825	# filter => # will be put between multiplexer and $self
3219	@_,	3826	@_,
3220	);	3827	);
3221		3828
3222	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3829	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3226	}	3833	}
3227		3834
3228	sub add {	3835	sub add {
3229	my ($self, $title, $widget, $tooltip) = @_;	3836	my ($self, $title, $widget, $tooltip) = @_;
3230		3837
3231	Scalar::Util::weaken $self;	3838	CFPlus::weaken $self;
3232		3839
3233	$self->{buttonbar}->add (new CFClient::UI::Button	3840	$self->{buttonbar}->add (new CFPlus::UI::Button
3234	markup => $title,	3841	markup => $title,
3235	tooltip => $tooltip,	3842	tooltip => $tooltip,
3236	on_activate => sub { $self->set_current_page ($widget) },	3843	on_activate => sub { $self->set_current_page ($widget) },
3237	);	3844	);
3238		3845
3239	$self->{multiplexer}->add ($widget);	3846	$self->{multiplexer}->add ($widget);
3240	}	3847	}
3241		3848
		3849	sub get_current_page {
		3850	my ($self) = @_;
		3851
		3852	$self->{multiplexer}->get_current_page
		3853	}
		3854
3242	sub set_current_page {	3855	sub set_current_page {
3243	my ($self, $page) = @_;	3856	my ($self, $page) = @_;
3244		3857
3245	$self->{multiplexer}->set_current_page ($page);	3858	$self->{multiplexer}->set_current_page ($page);
3246	$self->emit (page_changed => $self->{multiplexer}{current});	3859	$self->emit (page_changed => $self->{multiplexer}{current});
3247	}	3860	}
3248		3861
3249	#############################################################################	3862	#############################################################################
3250		3863
3251	package CFClient::UI::Combobox;	3864	package CFPlus::UI::Selector;
3252		3865
3253	use utf8;	3866	use utf8;
3254		3867
3255	our @ISA = CFClient::UI::Button::;	3868	our @ISA = CFPlus::UI::Button::;
3256		3869
3257	sub new {	3870	sub new {
3258	my $class = shift;	3871	my $class = shift;
3259		3872
3260	my $self = $class->SUPER::new (	3873	my $self = $class->SUPER::new (
…		…
3277	my ($value, $title, $tooltip) = @$_;	3890	my ($value, $title, $tooltip) = @$_;
3278		3891
3279	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3892	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3280	}	3893	}
3281		3894
3282	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3895	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3283	}	3896	}
3284		3897
3285	sub _set_value {	3898	sub _set_value {
3286	my ($self, $value) = @_;	3899	my ($self, $value) = @_;
3287		3900
…		…
3302	$self->emit (changed => $value);	3915	$self->emit (changed => $value);
3303	}	3916	}
3304		3917
3305	#############################################################################	3918	#############################################################################
3306		3919
3307	package CFClient::UI::Statusbox;	3920	package CFPlus::UI::Statusbox;
3308		3921
3309	our @ISA = CFClient::UI::VBox::;	3922	our @ISA = CFPlus::UI::VBox::;
3310		3923
3311	sub new {	3924	sub new {
3312	my $class = shift;	3925	my $class = shift;
3313		3926
3314	my $self = $class->SUPER::new (	3927	my $self = $class->SUPER::new (
3315	fontsize => 0.8,	3928	fontsize => 0.8,
3316	@_,	3929	@_,
3317	);	3930	);
3318		3931
3319	Scalar::Util::weaken (my $this = $self);	3932	CFPlus::weaken (my $this = $self);
3320		3933
3321	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3934	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3322		3935
3323	$self	3936	$self
3324	}	3937	}
…		…
3326	sub reorder {	3939	sub reorder {
3327	my ($self) = @_;	3940	my ($self) = @_;
3328	my $NOW = Time::HiRes::time;	3941	my $NOW = Time::HiRes::time;
3329		3942
3330	# freeze display when hovering over any label	3943	# freeze display when hovering over any label
3331	return if $CFClient::UI::TOOLTIP->{owner}	3944	return if $CFPlus::UI::TOOLTIP->{owner}
3332	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3945	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3333	values %{ $self->{item} };	3946	values %{ $self->{item} };
3334		3947
3335	while (my ($k, $v) = each %{ $self->{item} }) {	3948	while (my ($k, $v) = each %{ $self->{item} }) {
3336	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3949	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3337	}	3950	}
…		…
3358	for ($short) {	3971	for ($short) {
3359	s/^\s+//;	3972	s/^\s+//;
3360	s/\s+/ /g;	3973	s/\s+/ /g;
3361	}	3974	}
3362		3975
3363	new CFClient::UI::Label	3976	new CFPlus::UI::Label
3364	markup => $short,	3977	markup => $short,
3365	tooltip => $item->{tooltip},	3978	tooltip => $item->{tooltip},
3366	tooltip_font => $::FONT_PROP,	3979	tooltip_font => $::FONT_PROP,
3367	tooltip_width => 0.67,	3980	tooltip_width => 0.67,
3368	fontsize => $item->{fontsize} || $self->{fontsize},	3981	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3447	$self->SUPER::destroy;	4060	$self->SUPER::destroy;
3448	}	4061	}
3449		4062
3450	#############################################################################	4063	#############################################################################
3451		4064
3452	package CFClient::UI::Inventory;
3453
3454	our @ISA = CFClient::UI::Table::;
3455
3456	sub new {
3457	my $class = shift;
3458
3459	my $self = $class->SUPER::new (
3460	col_expand => [0, 1, 0],
3461	@_,
3462	);
3463
3464	$self
3465	}
3466
3467	sub set_items {
3468	my ($self, $items) = @_;
3469
3470	$self->clear;
3471	return unless $items;
3472
3473	my @items = sort {
3474	($a->{type} <=> $b->{type})
3475	or ($a->{name} cmp $b->{name})
3476	} values %$items;
3477
3478	$self->{real_items} = \@items;
3479
3480	my $row = 0;
3481	for my $item (@items) {
3482	CFClient::Item::update_widgets $item;
3483
3484	$self->add (0, $row, $item->{face_widget});
3485	$self->add (1, $row, $item->{desc_widget});
3486	$self->add (2, $row, $item->{weight_widget});
3487
3488	$row++;
3489	}
3490	}
3491
3492	#############################################################################
3493
3494	package CFClient::UI::SpellList;
3495
3496	our @ISA = CFClient::UI::Table::;
3497
3498	sub new {
3499	my $class = shift;
3500
3501	my $self = $class->SUPER::new (
3502	binding => [],
3503	commands => [],
3504	@_,
3505	)
3506	}
3507
3508	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3509
3510	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3511	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3512	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3513	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3514	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3515	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3516	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3517	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3518	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3519	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3520
3521	sub rebuild_spell_list {
3522	my ($self) = @_;
3523
3524	$CFClient::UI::ROOT->on_refresh ($self => sub {
3525	$self->clear;
3526
3527	return unless $::CONN;
3528
3529	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3530	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3531	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3532	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3533	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3534
3535	my $row = 0;
3536
3537	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3538	my $spell = $self->{spell}{$_};
3539
3540	$row++;
3541
3542	my $spell_cb = sub {
3543	my ($widget, $ev) = @_;
3544
3545	if ($ev->{button} == 1) {
3546	$::CONN->user_send ("cast $spell->{name}");
3547	} elsif ($ev->{button} == 2) {
3548	$::CONN->user_send ("invoke $spell->{name}");
3549	} elsif ($ev->{button} == 3) {
3550	(new CFClient::UI::Menu
3551	items => [
3552	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3553	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3554	],
3555	)->popup ($ev);
3556	} else {
3557	return 0;
3558	}
3559
3560	1
3561	};
3562
3563	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3564
3565	#TODO: add path info to tooltip
3566	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3567
3568	$self->add (0, $row, new CFClient::UI::Face
3569	face => $spell->{face},
3570	can_hover => 1,
3571	can_events => 1,
3572	tooltip => $tooltip,
3573	on_button_down => $spell_cb,
3574	);
3575
3576	$self->add (1, $row, new CFClient::UI::Label
3577	expand => 1,
3578	text => $spell->{name},
3579	can_hover => 1,
3580	can_events => 1,
3581	tooltip => $tooltip,
3582	on_button_down => $spell_cb,
3583	);
3584
3585	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3586	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3587	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3588	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3589	}
3590	});
3591	}
3592
3593	sub add_spell {
3594	my ($self, $spell) = @_;
3595
3596	$self->{spell}->{$spell->{name}} = $spell;
3597	$self->rebuild_spell_list;
3598	}
3599
3600	sub remove_spell {
3601	my ($self, $spell) = @_;
3602
3603	delete $self->{spell}->{$spell->{name}};
3604	$self->rebuild_spell_list;
3605	}
3606
3607	sub clear_spells {
3608	my ($self) = @_;
3609
3610	$self->{spell} = {};
3611	$self->rebuild_spell_list;
3612	}
3613
3614	#############################################################################
3615
3616	package CFClient::UI::Root;	4065	package CFPlus::UI::Root;
3617		4066
3618	our @ISA = CFClient::UI::Container::;	4067	our @ISA = CFPlus::UI::Container::;
3619		4068
3620	use List::Util qw(min max);	4069	use List::Util qw(min max);
3621		4070
3622	use CFClient::OpenGL;	4071	use CFPlus::OpenGL;
3623		4072
3624	sub new {	4073	sub new {
3625	my $class = shift;	4074	my $class = shift;
3626		4075
3627	my $self = $class->SUPER::new (	4076	my $self = $class->SUPER::new (
3628	visible => 1,	4077	visible => 1,
3629	@_,	4078	@_,
3630	);	4079	);
3631		4080
3632	Scalar::Util::weaken ($self->{root} = $self);	4081	CFPlus::weaken ($self->{root} = $self);
3633		4082
3634	$self	4083	$self
3635	}	4084	}
3636		4085
3637	sub size_request {	4086	sub size_request {
…		…
3803	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4252	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3804		4253
3805	$w = 0 if $w < 0;	4254	$w = 0 if $w < 0;
3806	$h = 0 if $h < 0;	4255	$h = 0 if $h < 0;
3807		4256
		4257	$w = max $widget->{min_w}, $w;
		4258	$h = max $widget->{min_h}, $h;
		4259
		4260	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4261	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4262
		4263	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4264	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4265
3808	$w = int $w + 0.5;	4266	$w = int $w + 0.5;
3809	$h = int $h + 0.5;	4267	$h = int $h + 0.5;
3810		4268
3811	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4269	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3812	$widget->{old_w} = $widget->{w};	4270	$widget->{old_w} = $widget->{w};
…		…
3822		4280
3823	while ($self->{post_alloc_hook}) {	4281	while ($self->{post_alloc_hook}) {
3824	$_->()	4282	$_->()
3825	for values %{delete $self->{post_alloc_hook}};	4283	for values %{delete $self->{post_alloc_hook}};
3826	}	4284	}
3827
3828		4285
3829	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4286	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3830	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4287	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3831	glClear GL_COLOR_BUFFER_BIT;	4288	glClear GL_COLOR_BUFFER_BIT;
3832		4289
…		…
3835	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4292	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3836	glMatrixMode GL_MODELVIEW;	4293	glMatrixMode GL_MODELVIEW;
3837	glLoadIdentity;	4294	glLoadIdentity;
3838		4295
3839	{	4296	{
3840	package CFClient::UI::Base;	4297	package CFPlus::UI::Base;
3841		4298
3842	($draw_x, $draw_y, $draw_w, $draw_h) =	4299	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3843	(0, 0, $self->{w}, $self->{h});	4300	(0, 0, $self->{w}, $self->{h});
3844	}
3845		4301
3846	$self->_draw;	4302	$self->_draw;
		4303	}
3847	}	4304	}
3848		4305
3849	#############################################################################	4306	#############################################################################
3850		4307
3851	package CFClient::UI;	4308	package CFPlus::UI;
3852		4309
3853	$ROOT = new CFClient::UI::Root;	4310	$ROOT = new CFPlus::UI::Root;
3854	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4311	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3855		4312
3856	1	4313	1
3857		4314

Diff Legend

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