ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

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

Diff Legend

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