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.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC

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

Diff Legend

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