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.314 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.350 by root, Sat Aug 19 18:39:24 2006 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 ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
90		106
91	$GRAB = $widget;	107	$GRAB = $widget;
92	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
93		109
94	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
95	}	111	}
96		112
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
98		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
100	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
101	}	123	}
102		124
103	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	126	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		127
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		129
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		131
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
112	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		134
114	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	137	$grab->update if $grab;
117	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
118		139
		140	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
120	}	142	}
121	}	143	}
122		144
123	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
124	my ($ev) = @_;	146	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
126		148
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		150
129	if ($widget != $HOVER) {	151	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		152
132	$hover->update if $hover && $hover->{can_hover};	153	$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;	154	if $HOVER;
140	}	155	}
141		156
142	# convert position array to integers	157	# convert position array to integers
143	sub harmonize {	158	sub harmonize {
…		…
193	reconfigure_widgets;	208	reconfigure_widgets;
194	}	209	}
195		210
196	#############################################################################	211	#############################################################################
197		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
198	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
199		222
200	use strict;	223	use strict;
201		224
202	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
203		226
204	sub new {	227	sub new {
205	my $class = shift;	228	my $class = shift;
206		229
207	my $self = bless {	230	my $self = bless {
…		…
212	h => undef,	235	h => undef,
213	can_events => 1,	236	can_events => 1,
214	@_	237	@_
215	}, $class;	238	}, $class;
216		239
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		241
219	for (keys %$self) {	242	for (keys %$self) {
220	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
222	}	245	}
223	}	246	}
224		247
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$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};	250	$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};	251	$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};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		253
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		256
234	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
247	sub show {	270	sub show {
248	my ($self) = @_;	271	my ($self) = @_;
249		272
250	return if $self->{parent};	273	return if $self->{parent};
251		274
252	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
253	}	276	}
254		277
255	sub set_visible {	278	sub set_visible {
256	my ($self) = @_;	279	my ($self) = @_;
257		280
…		…
278	delete $self->{root};	301	delete $self->{root};
279		302
280	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
282		305
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
285		308
286	$self->emit ("focus_out");	309	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
288	}	311	}
…		…
345	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
346		369
347	if ($self->{aspect}) {	370	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
349		372
350	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		375
353	# use alignment to adjust x, y	376	# use alignment to adjust x, y
354		377
355	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
397		420
398	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
399		422
400	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
401		424
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	428	}
406	}	429	}
407		430
408	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
409	sub coord2local {	432	sub coord2local {
410	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
411		434
		435	Carp::confess unless $self->{parent};#d#
		436
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	438	}
414		439
415	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
416	sub coord2global {	441	sub coord2global {
417	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
418		443
		444	Carp::confess unless $self->{parent};#d#
		445
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	447	}
421		448
422	sub invoke_focus_in {	449	sub invoke_focus_in {
423	my ($self) = @_;	450	my ($self) = @_;
424		451
425	return if $FOCUS == $self;	452	return if $FOCUS == $self;
426	return unless $self->{can_focus};	453	return unless $self->{can_focus};
427		454
428	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
429		456
430	$focus->update if $focus;	457	$self->update;
431	$FOCUS->update;
432		458
433	0	459	0
434	}	460	}
435		461
436	sub invoke_focus_out {	462	sub invoke_focus_out {
437	my ($self) = @_;	463	my ($self) = @_;
438		464
439	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
440		466
441	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
442		468
443	$focus->update if $focus; #?	469	$self->update;
444		470
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	472	unless $FOCUS;
447		473
448	0	474	0
449	}	475	}
450		476
451	sub grab_focus {	477	sub grab_focus {
452	my ($self) = @_;	478	my ($self) = @_;
453		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	481	$self->emit ("focus_in");
455	}	482	}
456		483
457	sub invoke_mouse_motion { 1 }	484	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	485	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	486	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
461		489
462	sub invoke_button_down {	490	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
464		492
465	$self->grab_focus;	493	$self->grab_focus;
466		494
467	1	495	0
468	}	496	}
469		497
470	sub connect {	498	sub connect {
471	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
472		500
473	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
474	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
475		515
476	sub emit {	516	sub emit {
477	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
478		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
479	#d##TODO# stop propagating at first true, do not use sum	528	#d##TODO# stop propagating at first true, do not use sum
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483	}	532	}
484		533
485	sub find_widget {	534	sub find_widget {
486	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
487		536
…		…
571	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
574	glEnd;	623	glEnd;
575	glPopMatrix;	624	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}	626	}
578		627
579	$self->_draw;	628	$self->_draw;
580	glPopMatrix;	629	glPopMatrix;
581	}	630	}
…		…
587	}	636	}
588		637
589	sub DESTROY {	638	sub DESTROY {
590	my ($self) = @_;	639	my ($self) = @_;
591		640
		641	return if CFPlus::in_destruct;
		642
592	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
593		644
594	eval { $self->destroy };	645	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596	}	647	}
597		648
598	#############################################################################	649	#############################################################################
599		650
600	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
601		652
602	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
603		654
604	use strict;	655	use strict;
605	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
606		657
607	sub new {	658	sub new {
608	my $class = shift;	659	my $class = shift;
609		660
610	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
641	}	692	}
642	}	693	}
643		694
644	#############################################################################	695	#############################################################################
645		696
646	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
647		698
648	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
649		700
650	sub new {	701	sub new {
651	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
653	}	704	}
…		…
660		711
661	sub draw { }	712	sub draw { }
662		713
663	#############################################################################	714	#############################################################################
664		715
665	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
666		717
667	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
668		719
669	sub new {	720	sub new {
670	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
671		722
672	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
681	if $children;	732	if $children;
682		733
683	$self	734	$self
684	}	735	}
685		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
		743	}
		744
686	sub add {	745	sub add {
687	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
688		747
689	$_->set_parent ($self)	748	$_->set_parent ($self)
690	for @widgets;	749	for @widgets;
…		…
750	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
751	}	810	}
752		811
753	#############################################################################	812	#############################################################################
754		813
755	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
756		815
757	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
758		817
759	sub new {	818	sub new {
760	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
761		820
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		822
764	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
765	}	824	}
766		825
767	sub add {	826	sub add {
…		…
774	sub remove {	833	sub remove {
775	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
776		835
777	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
778		837
779	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	839	unless @{$self->{children}};
781	}	840	}
782		841
783	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
784		843
…		…
796		855
797	#############################################################################	856	#############################################################################
798		857
799	# back-buffered drawing area	858	# back-buffered drawing area
800		859
801	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
802		861
803	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
804		863
805	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
806		865
807	sub new {	866	sub new {
808	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
809		868
810	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
832	}	891	}
833		892
834	sub render_child {	893	sub render_child {
835	my ($self) = @_;	894	my ($self) = @_;
836		895
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
840		899
841	{	900	{
842	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
843		902
844	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
846	}	905	}
847		906
…		…
850	}	909	}
851		910
852	sub _draw {	911	sub _draw {
853	my ($self) = @_;	912	my ($self) = @_;
854		913
855	my ($w, $h) = @$self{qw(w h)};
856
857	my $tex = $self->{texture}	914	my $tex = $self->{texture}
858	or return;	915	or return;
859		916
860	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
863		920
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
865		922
866	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
867	}	924	}
868		925
869	#############################################################################	926	#############################################################################
870		927
871	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
872		929
873	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
874		931
875	sub new {	932	sub new {
876	my $class = shift;	933	my $class = shift;
877		934
878	$class->SUPER::new (	935	$class->SUPER::new (
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	997	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	999	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1001	}
945	}	1002	}
946		1003
947	sub _render {	1004	sub _render {
948	my ($self) = @_;	1005	my ($self) = @_;
949		1006
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	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};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1009
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1011
955	$self->SUPER::_render;	1012	$self->SUPER::_render;
956	}	1013	}
957		1014
958	#############################################################################	1015	#############################################################################
959		1016
960	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
961		1018
962	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
963		1020
964	sub new {	1021	sub new {
965	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
966		1023
967	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
968		1025
969	my $self;	1026	my $self;
970		1027
971	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
972	vertical => 1,	1029	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1031	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
976	},	1033	},
977	;	1034	;
978		1035
979	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
		1038	can_events => 1,
981	slider => $slider,	1039	slider => $slider,
982	%arg,	1040	%arg,
983	);	1041	);
984		1042
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1043	$self->SUPER::add ($self->{vp}, $self->{slider});
986	$self->add ($child) if $child;	1044	$self->add ($child) if $child;
…		…
994	my ($self, $widget) = @_;	1052	my ($self, $widget) = @_;
995		1053
996	$self->{vp}->add ($self->{child} = $widget);	1054	$self->{vp}->add ($self->{child} = $widget);
997	}	1055	}
998		1056
		1057	sub invoke_mouse_wheel {
		1058	my ($self, $ev) = @_;
		1059
		1060	return 0 unless $ev->{dy}; # only vertical movements
		1061
		1062	$self->{slider}->emit (mouse_wheel => $ev);
		1063
		1064	1
		1065	}
		1066
999	sub update_slider {	1067	sub update_slider {
1000	my ($self) = @_;	1068	my ($self) = @_;
1001		1069
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003	}	1071	}
…		…
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1087	}
1020		1088
1021	#############################################################################	1089	#############################################################################
1022		1090
1023	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1024		1092
1025	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1026		1094
1027	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1028		1096
1029	sub new {	1097	sub new {
1030	my $class = shift;	1098	my $class = shift;
1031		1099
1032	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1059	}	1127	}
1060		1128
1061	#############################################################################	1129	#############################################################################
1062		1130
1063	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1064		1132
1065	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1066		1134
1067	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
		1136
		1137	sub new {
		1138	my ($class, %arg) = @_;
		1139
		1140	if ((exists $arg{label}) && !ref $arg{label}) {
		1141	$arg{label} = new CFPlus::UI::Label
		1142	align => 1,
		1143	valign => 0,
		1144	text => $arg{label},
		1145	fontsize => ($arg{border} || 0.8) * 0.75;
		1146	}
		1147
		1148	my $self = $class->SUPER::new (
		1149	# label => "",
		1150	fg => [0.6, 0.3, 0.1],
		1151	border => 0.8,
		1152	style => 'single',
		1153	%arg,
		1154	);
		1155
		1156	$self
		1157	}
		1158
		1159	sub add {
		1160	my ($self, @widgets) = @_;
		1161
		1162	$self->SUPER::add (@widgets);
		1163	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1164	}
		1165
		1166	sub border {
		1167	int $_[0]{border} * $::FONTSIZE
		1168	}
		1169
		1170	sub size_request {
		1171	my ($self) = @_;
		1172
		1173	($self->{label_w}, undef) = $self->{label}->size_request
		1174	if $self->{label};
		1175
		1176	my ($w, $h) = $self->SUPER::size_request;
		1177
		1178	(
		1179	$w + $self->border * 2,
		1180	$h + $self->border * 2,
		1181	)
		1182	}
		1183
		1184	sub invoke_size_allocate {
		1185	my ($self, $w, $h) = @_;
		1186
		1187	my $border = $self->border;
		1188
		1189	$w -= List::Util::max 0, $border * 2;
		1190	$h -= List::Util::max 0, $border * 2;
		1191
		1192	if (my $label = $self->{label}) {
		1193	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1194	$label->{h} = List::Util::min $h, $border;
		1195	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1196	}
		1197
		1198	$self->child->configure ($border, $border, $w, $h);
		1199
		1200	1
		1201	}
		1202
		1203	sub _draw {
		1204	my ($self) = @_;
		1205
		1206	my $child = $self->{children}[0];
		1207
		1208	my $border = $self->border;
		1209	my ($w, $h) = ($self->{w}, $self->{h});
		1210
		1211	$child->draw;
		1212
		1213	glColor @{$self->{fg}};
		1214	glBegin GL_LINE_STRIP;
		1215	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1216	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1217	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1218	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1219	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1220	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1221	glEnd;
		1222
		1223	if ($self->{label}) {
		1224	glTranslate $border * 2, 0;
		1225	$self->{label}->_draw;
		1226	}
		1227	}
		1228
		1229	#############################################################################
		1230
		1231	package CFPlus::UI::Toplevel;
		1232
		1233	our @ISA = CFPlus::UI::Bin::;
		1234
		1235	use CFPlus::OpenGL;
1068		1236
1069	my $bg =	1237	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1238	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1239	mipmap => 1, wrap => 1;
1072		1240
1073	my @border =	1241	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1242	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);	1243	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1244
1077	sub new {	1245	sub new {
1078	my ($class, %arg) = @_;	1246	my ($class, %arg) = @_;
1079		1247
1080	my $self = $class->SUPER::new (	1248	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1249	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1250	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1251	border => 0.6,
1084	can_events => 1,	1252	can_events => 1,
1085	min_w => 16,	1253	min_w => 64,
1086	min_h => 16,	1254	min_h => 32,
1087	%arg,	1255	%arg,
1088	);	1256	);
1089		1257
1090	$self->{title_widget} = new CFClient::UI::Label	1258	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1259	align => 0,
1092	valign => 1,	1260	valign => 1,
1093	text => $self->{title},	1261	text => $self->{title},
1094	fontsize => $self->{border},	1262	fontsize => $self->{border},
1095	if exists $self->{title};	1263	if exists $self->{title};
1096		1264
1097	if ($self->{has_close_button}) {	1265	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1266	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1267	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1268	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1269	on_activate => sub { $self->emit ("delete") };
1102		1270
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1271	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1272	}
1105		1273
1106	$self	1274	$self
1107	}	1275	}
1108		1276
1109	sub add {	1277	sub add {
1110	my ($self, @widgets) = @_;	1278	my ($self, @widgets) = @_;
1111		1279
1112	$self->SUPER::add (@widgets);	1280	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1281	$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};	1282	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1283	}
1116		1284
1117	sub border {	1285	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1286	int $_[0]{border} * $::FONTSIZE
1119	}	1287	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1320	$self->child->configure ($border, $border, $w, $h);
1153		1321
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1322	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1323	if $self->{close_button};
1156		1324
		1325	1
		1326	}
		1327
		1328	sub invoke_delete {
		1329	my ($self) = @_;
		1330
		1331	$self->hide;
		1332
1157	1	1333	1
1158	}	1334	}
1159		1335
1160	sub invoke_button_down {	1336	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1337	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1395	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1396
1221	! ! $self->{motion}	1397	! ! $self->{motion}
1222	}	1398	}
1223		1399
		1400	sub invoke_visibility_change {
		1401	my ($self, $visible) = @_;
		1402
		1403	delete $self->{motion} unless $visible;
		1404
		1405	0
		1406	}
		1407
1224	sub _draw {	1408	sub _draw {
1225	my ($self) = @_;	1409	my ($self) = @_;
1226		1410
1227	my $child = $self->{children}[0];	1411	my $child = $self->{children}[0];
1228		1412
…		…
1265	if $self->{close_button};	1449	if $self->{close_button};
1266	}	1450	}
1267		1451
1268	#############################################################################	1452	#############################################################################
1269		1453
1270	package CFClient::UI::Table;	1454	package CFPlus::UI::Table;
1271		1455
1272	our @ISA = CFClient::UI::Base::;	1456	our @ISA = CFPlus::UI::Base::;
1273		1457
1274	use List::Util qw(max sum);	1458	use List::Util qw(max sum);
1275		1459
1276	use CFClient::OpenGL;	1460	use CFPlus::OpenGL;
1277		1461
1278	sub new {	1462	sub new {
1279	my $class = shift;	1463	my $class = shift;
1280		1464
1281	$class->SUPER::new (	1465	$class->SUPER::new (
…		…
1287	sub children {	1471	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1473	}
1290		1474
1291	sub add {	1475	sub add {
1292	my ($self, $x, $y, $child) = @_;	1476	my ($self) = shift;
1293		1477
		1478	while (@_) {
		1479	my ($x, $y, $child) = splice @_, 0, 3, ();
1294	$child->set_parent ($self);	1480	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1481	$self->{children}[$y][$x] = $child;
		1482	}
1296		1483
		1484	$self->{force_realloc} = 1;
		1485	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1486	$self->realloc;
1298	}	1487	}
1299		1488
1300	sub remove {	1489	sub remove {
1301	my ($self, $child) = @_;	1490	my ($self, $child) = @_;
…		…
1366		1555
1367	# linearly scale sizes	1556	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1559
1371	CFClient::UI::harmonize $ws;	1560	CFPlus::UI::harmonize $ws;
1372	CFClient::UI::harmonize $hs;	1561	CFPlus::UI::harmonize $hs;
1373		1562
1374	my $y;	1563	my $y;
1375		1564
1376	for my $r (0 .. $#{$self->{children}}) {	1565	for my $r (0 .. $#{$self->{children}}) {
1377	my $row = $self->{children}[$r]	1566	my $row = $self->{children}[$r]
…		…
1420	}	1609	}
1421	}	1610	}
1422		1611
1423	#############################################################################	1612	#############################################################################
1424		1613
1425	package CFClient::UI::Box;	1614	package CFPlus::UI::Box;
1426		1615
1427	our @ISA = CFClient::UI::Container::;	1616	our @ISA = CFPlus::UI::Container::;
1428		1617
1429	sub size_request {	1618	sub size_request {
1430	my ($self) = @_;	1619	my ($self) = @_;
1431		1620
1432	$self->{vertical}	1621	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1654	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1655	for 0 .. $#children;
1467	}	1656	}
1468	}	1657	}
1469		1658
1470	CFClient::UI::harmonize \@req;	1659	CFPlus::UI::harmonize \@req;
1471		1660
1472	my $pos = 0;	1661	my $pos = 0;
1473	for (0 .. $#children) {	1662	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1663	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1664	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1669	1
1481	}	1670	}
1482		1671
1483	#############################################################################	1672	#############################################################################
1484		1673
1485	package CFClient::UI::HBox;	1674	package CFPlus::UI::HBox;
1486		1675
1487	our @ISA = CFClient::UI::Box::;	1676	our @ISA = CFPlus::UI::Box::;
1488		1677
1489	sub new {	1678	sub new {
1490	my $class = shift;	1679	my $class = shift;
1491		1680
1492	$class->SUPER::new (	1681	$class->SUPER::new (
…		…
1495	)	1684	)
1496	}	1685	}
1497		1686
1498	#############################################################################	1687	#############################################################################
1499		1688
1500	package CFClient::UI::VBox;	1689	package CFPlus::UI::VBox;
1501		1690
1502	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1503		1692
1504	sub new {	1693	sub new {
1505	my $class = shift;	1694	my $class = shift;
1506		1695
1507	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1510	)	1699	)
1511	}	1700	}
1512		1701
1513	#############################################################################	1702	#############################################################################
1514		1703
1515	package CFClient::UI::Label;	1704	package CFPlus::UI::Label;
1516		1705
1517	our @ISA = CFClient::UI::DrawBG::;	1706	our @ISA = CFPlus::UI::DrawBG::;
1518		1707
1519	use CFClient::OpenGL;	1708	use CFPlus::OpenGL;
1520		1709
1521	sub new {	1710	sub new {
1522	my ($class, %arg) = @_;	1711	my ($class, %arg) = @_;
1523		1712
1524	my $self = $class->SUPER::new (	1713	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1716	#active_bg => none
1528	#font => default_font	1717	#font => default_font
1529	#text => initial text	1718	#text => initial text
1530	#markup => initial narkup	1719	#markup => initial narkup
1531	#max_w => maximum pixel width	1720	#max_w => maximum pixel width
		1721	#style => 0, # render flags
1532	ellipsise => 3, # end	1722	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1723	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1724	fontsize => 1,
1535	align => -1,	1725	align => -1,
1536	valign => -1,	1726	valign => -1,
1537	padding_x => 2,	1727	padding_x => 2,
1538	padding_y => 2,	1728	padding_y => 2,
1539	can_events => 0,	1729	can_events => 0,
1540	%arg	1730	%arg
1541	);	1731	);
1542		1732
1543	if (exists $self->{template}) {	1733	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1734	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1735	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1736	$self->{template} = $layout;
1547	}	1737	}
1548		1738
1549	if (exists $self->{markup}) {	1739	if (exists $self->{markup}) {
…		…
1553	}	1743	}
1554		1744
1555	$self	1745	$self
1556	}	1746	}
1557		1747
1558	sub escape($) {
1559	local $_ = $_[0];
1560
1561	s/&/&amp;/g;
1562	s/>/&gt;/g;
1563	s/</&lt;/g;
1564
1565	$_
1566	}
1567
1568	sub update {	1748	sub update {
1569	my ($self) = @_;	1749	my ($self) = @_;
1570		1750
1571	delete $self->{texture};	1751	delete $self->{texture};
1572	$self->SUPER::update;	1752	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1763	my ($self, $text) = @_;
1584		1764
1585	return if $self->{text} eq "T$text";	1765	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1766	$self->{text} = "T$text";
1587		1767
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1768	$self->{layout}->set_text ($text);
1590		1769
1591	delete $self->{size_req};	1770	delete $self->{size_req};
1592	$self->realloc;	1771	$self->realloc;
1593	$self->update;	1772	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1778	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1779	$self->{text} = "M$markup";
1601		1780
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1781	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1782
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1783	$self->{layout}->set_markup ($markup);
1606		1784
1607	delete $self->{size_req};	1785	delete $self->{size_req};
1608	$self->realloc;	1786	$self->realloc;
1609	$self->update;	1787	$self->update;
…		…
1621		1799
1622	my ($w, $h) = $self->{layout}->size;	1800	my ($w, $h) = $self->{layout}->size;
1623		1801
1624	if (exists $self->{template}) {	1802	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1803	$self->{template}->set_font ($self->{font}) if $self->{font};
		1804	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1805	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1806
1628	my ($w2, $h2) = $self->{template}->size;	1807	my ($w2, $h2) = $self->{template}->size;
1629		1808
1630	$w = List::Util::max $w, $w2;	1809	$w = List::Util::max $w, $w2;
…		…
1654		1833
1655	sub set_fontsize {	1834	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	1835	my ($self, $fontsize) = @_;
1657		1836
1658	$self->{fontsize} = $fontsize;	1837	$self->{fontsize} = $fontsize;
		1838	delete $self->{size_req};
1659	delete $self->{texture};	1839	delete $self->{texture};
1660		1840
1661	$self->realloc;	1841	$self->realloc;
1662	}	1842	}
1663		1843
1664	sub reconfigure {	1844	sub reconfigure {
1665	my ($self) = @_;	1845	my ($self) = @_;
1666		1846
1667	delete $self->{size_req};	1847	delete $self->{size_req};
		1848	delete $self->{texture};
1668		1849
1669	$self->SUPER::reconfigure;	1850	$self->SUPER::reconfigure;
1670	}	1851	}
1671		1852
1672	sub _draw {	1853	sub _draw {
1673	my ($self) = @_;	1854	my ($self) = @_;
1674		1855
1675	$self->SUPER::_draw; # draw background, if applicable	1856	$self->SUPER::_draw; # draw background, if applicable
1676		1857
1677	my $tex = $self->{texture} ||= do {	1858	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	1859	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	1860	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	1861	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	1862	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1863	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1864	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		1865
1685	new_from_layout CFClient::Texture $self->{layout}	1866	[$self->{layout}->size]
1686	};	1867	};
1687		1868
1688	unless (exists $self->{ox}) {	1869	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1870	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1871	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	1872	: ($self->{w} - $size->[0]) * 0.5);
1692		1873
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1874	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1875	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	1876	: ($self->{h} - $size->[1]) * 0.5);
1696	};	1877	};
1697		1878
1698	glEnable GL_TEXTURE_2D;
1699
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1702		1881
1703	if ($tex->{format} == GL_ALPHA) {	1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705	glColor @{$self->{fg}};
1706	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707	} else {
1708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710	}
1711
1712	glDisable GL_TEXTURE_2D;
1713	}	1883	}
1714		1884
1715	#############################################################################	1885	#############################################################################
1716		1886
1717	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1718		1888
1719	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1720		1890
1721	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1722		1892
1723	sub new {	1893	sub new {
1724	my $class = shift;	1894	my $class = shift;
1725		1895
1726	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1788		1958
1789	if ($uni == 8) {	1959	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	1961	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	1962	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	1963	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	1964	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	1966	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	1967	} elsif ($sym == CFPlus::SDLK_HOME) {
1798	$self->{cursor} = 0;	1968	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {	1969	} elsif ($sym == CFPlus::SDLK_END) {
1800	$self->{cursor} = length $text;	1970	$self->{cursor} = length $text;
		1971	} elsif ($uni == 21) { # ctrl-u
		1972	$text = "";
		1973	$self->{cursor} = 0;
1801	} elsif ($uni == 27) {	1974	} elsif ($uni == 27) {
1802	$self->emit ('escape');	1975	$self->emit ('escape');
1803	} elsif ($uni) {	1976	} elsif ($uni) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	1977	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	1978	} else {
…		…
1828		2001
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2002	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2003
1831	# byte-index to char-index	2004	# byte-index to char-index
1832	my $text = $self->{text};	2005	my $text = $self->{text};
1833	utf8::encode $text;	2006	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2007	$self->{cursor} = length $text;
1835		2008
1836	$self->_set_text ($self->{text});	2009	$self->_set_text ($self->{text});
1837	$self->update;	2010	$self->update;
1838		2011
1839	1	2012	1
…		…
1878	utf8::encode $text;	2051	utf8::encode $text;
1879		2052
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2053	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	2054	}
1882		2055
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2056	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2057	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2058	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2059	glEnd;
1888	}	2060	}
1889	}	2061	}
1890		2062
1891	package CFClient::UI::Entry;	2063	package CFPlus::UI::Entry;
1892		2064
1893	our @ISA = CFClient::UI::EntryBase::;	2065	our @ISA = CFPlus::UI::EntryBase::;
1894		2066
1895	use CFClient::OpenGL;	2067	use CFPlus::OpenGL;
1896		2068
1897	sub invoke_key_down {	2069	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2070	my ($self, $ev) = @_;
1899		2071
1900	my $sym = $ev->{sym};	2072	my $sym = $ev->{sym};
…		…
1906	$self->{history_pointer} = -1;	2078	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2079	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2080	$self->emit (activate => $txt);
1909	$self->update;	2081	$self->update;
1910		2082
1911	} elsif ($sym == CFClient::SDLK_UP) {	2083	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2084	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2085	$self->{history_saveback} = $self->get_text;
1914	}	2086	}
1915	if (@{$self->{history} || []} > 0) {	2087	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2088	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2090	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2091	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2092	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2093	}
1922		2094
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2095	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2096	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2097	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2098
1927	if ($self->{history_pointer} >= 0) {	2099	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2100	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2109	1
1938	}	2110	}
1939		2111
1940	#############################################################################	2112	#############################################################################
1941		2113
1942	package CFClient::UI::Button;	2114	package CFPlus::UI::Button;
1943		2115
1944	our @ISA = CFClient::UI::Label::;	2116	our @ISA = CFPlus::UI::Label::;
1945		2117
1946	use CFClient::OpenGL;	2118	use CFPlus::OpenGL;
1947		2119
1948	my @tex =	2120	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2121	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2122	qw(b1_button_active.png);
1951		2123
1952	sub new {	2124	sub new {
1953	my $class = shift;	2125	my $class = shift;
1954		2126
…		…
1991	$self->SUPER::_draw;	2163	$self->SUPER::_draw;
1992	}	2164	}
1993		2165
1994	#############################################################################	2166	#############################################################################
1995		2167
		2168	package CFPlus::UI::CheckBox;
		2169
		2170	our @ISA = CFPlus::UI::DrawBG::;
		2171
		2172	my @tex =
		2173	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2174	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2175
		2176	use CFPlus::OpenGL;
		2177
		2178	sub new {
		2179	my $class = shift;
		2180
		2181	$class->SUPER::new (
		2182	padding_x => 2,
		2183	padding_y => 2,
		2184	fg => [1, 1, 1],
		2185	active_fg => [1, 1, 0],
		2186	bg => [0, 0, 0, 0.2],
		2187	active_bg => [1, 1, 1, 0.5],
		2188	state => 0,
		2189	can_hover => 1,
		2190	@_
		2191	)
		2192	}
		2193
		2194	sub size_request {
		2195	my ($self) = @_;
		2196
		2197	(6) x 2
		2198	}
		2199
		2200	sub toggle {
		2201	my ($self) = @_;
		2202
		2203	$self->{state} = !$self->{state};
		2204	$self->emit (changed => $self->{state});
		2205	$self->update;
		2206	}
		2207
		2208	sub invoke_button_down {
		2209	my ($self, $ev, $x, $y) = @_;
		2210
		2211	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2212	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2213	$self->toggle;
		2214	} else {
		2215	return 0
		2216	}
		2217
		2218	1
		2219	}
		2220
		2221	sub _draw {
		2222	my ($self) = @_;
		2223
		2224	$self->SUPER::_draw;
		2225
		2226	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2227
		2228	my ($w, $h) = @$self{qw(w h)};
		2229
		2230	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2231
		2232	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2233
		2234	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2235
		2236	glEnable GL_TEXTURE_2D;
		2237	$tex->draw_quad_alpha (0, 0, $s, $s);
		2238	glDisable GL_TEXTURE_2D;
		2239	}
		2240
		2241	#############################################################################
		2242
		2243	package CFPlus::UI::Image;
		2244
		2245	our @ISA = CFPlus::UI::Base::;
		2246
		2247	use CFPlus::OpenGL;
		2248
		2249	our %texture_cache;
		2250
		2251	sub new {
		2252	my $class = shift;
		2253
		2254	my $self = $class->SUPER::new (
		2255	can_events => 0,
		2256	@_,
		2257	);
		2258
		2259	$self->{path} || $self->{tex}
		2260	or Carp::croak "'path' or 'tex' attributes required";
		2261
		2262	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2263	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2264
		2265	Scalar::Util::weaken $texture_cache{$self->{path}};
		2266
		2267	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2268
		2269	$self
		2270	}
		2271
		2272	sub STORABLE_freeze {
		2273	my ($self, $cloning) = @_;
		2274
		2275	$self->{path}
		2276	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2277
		2278	$self->{path}
		2279	}
		2280
		2281	sub STORABLE_attach {
		2282	my ($self, $cloning, $path) = @_;
		2283
		2284	$self->new (path => $path)
		2285	}
		2286
		2287	sub size_request {
		2288	my ($self) = @_;
		2289
		2290	($self->{tex}{w}, $self->{tex}{h})
		2291	}
		2292
		2293	sub _draw {
		2294	my ($self) = @_;
		2295
		2296	my $tex = $self->{tex};
		2297
		2298	my ($w, $h) = ($self->{w}, $self->{h});
		2299
		2300	if ($self->{rot90}) {
		2301	glRotate 90, 0, 0, 1;
		2302	glTranslate 0, -$self->{w}, 0;
		2303
		2304	($w, $h) = ($h, $w);
		2305	}
		2306
		2307	glEnable GL_TEXTURE_2D;
		2308	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2309
		2310	$tex->draw_quad (0, 0, $w, $h);
		2311
		2312	glDisable GL_TEXTURE_2D;
		2313	}
		2314
		2315	#############################################################################
		2316
1996	package CFClient::UI::ImageButton;	2317	package CFPlus::UI::ImageButton;
1997		2318
1998	our @ISA = CFClient::UI::Image::;	2319	our @ISA = CFPlus::UI::Image::;
1999		2320
2000	use CFClient::OpenGL;	2321	use CFPlus::OpenGL;
2001		2322
2002	my %textures;	2323	my %textures;
2003		2324
2004	sub new {	2325	sub new {
2005	my $class = shift;	2326	my $class = shift;
…		…
2027	1	2348	1
2028	}	2349	}
2029		2350
2030	#############################################################################	2351	#############################################################################
2031		2352
2032	package CFClient::UI::CheckBox;
2033
2034	our @ISA = CFClient::UI::DrawBG::;
2035
2036	my @tex =
2037	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040	use CFClient::OpenGL;
2041
2042	sub new {
2043	my $class = shift;
2044
2045	$class->SUPER::new (
2046	padding_x => 2,
2047	padding_y => 2,
2048	fg => [1, 1, 1],
2049	active_fg => [1, 1, 0],
2050	bg => [0, 0, 0, 0.2],
2051	active_bg => [1, 1, 1, 0.5],
2052	state => 0,
2053	can_hover => 1,
2054	@_
2055	)
2056	}
2057
2058	sub size_request {
2059	my ($self) = @_;
2060
2061	(6) x 2
2062	}
2063
2064	sub invoke_button_down {
2065	my ($self, $ev, $x, $y) = @_;
2066
2067	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069	$self->{state} = !$self->{state};
2070	$self->emit (changed => $self->{state});
2071	} else {
2072	return 0
2073	}
2074
2075	1
2076	}
2077
2078	sub _draw {
2079	my ($self) = @_;
2080
2081	$self->SUPER::_draw;
2082
2083	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085	my ($w, $h) = @$self{qw(w h)};
2086
2087	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091	my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093	glEnable GL_TEXTURE_2D;
2094	$tex->draw_quad_alpha (0, 0, $s, $s);
2095	glDisable GL_TEXTURE_2D;
2096	}
2097
2098	#############################################################################
2099
2100	package CFClient::UI::Image;	2353	package CFPlus::UI::VGauge;
2101		2354
2102	our @ISA = CFClient::UI::Base::;	2355	our @ISA = CFPlus::UI::Base::;
2103
2104	use CFClient::OpenGL;
2105
2106	our %texture_cache;
2107
2108	sub new {
2109	my $class = shift;
2110
2111	my $self = $class->SUPER::new (
2112	can_events => 0,
2113	@_,
2114	);
2115
2116	$self->{path}
2117	or Carp::croak "required attribute 'path' not set";
2118
2119	$self->{tex} = $texture_cache{$self->{path}} ||=
2120	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122	Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126	$self
2127	}
2128
2129	sub size_request {
2130	my ($self) = @_;
2131
2132	($self->{tex}{w}, $self->{tex}{h})
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	my $tex = $self->{tex};
2139
2140	my ($w, $h) = ($self->{w}, $self->{h});
2141
2142	if ($self->{rot90}) {
2143	glRotate 90, 0, 0, 1;
2144	glTranslate 0, -$self->{w}, 0;
2145
2146	($w, $h) = ($h, $w);
2147	}
2148
2149	glEnable GL_TEXTURE_2D;
2150	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152	$tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154	glDisable GL_TEXTURE_2D;
2155	}
2156
2157	#############################################################################
2158
2159	package CFClient::UI::VGauge;
2160
2161	our @ISA = CFClient::UI::Base::;
2162		2356
2163	use List::Util qw(min max);	2357	use List::Util qw(min max);
2164		2358
2165	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
2166		2360
2167	my %tex = (	2361	my %tex = (
2168	food => [	2362	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2364	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2365	],
2172	grace => [	2366	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2367	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2368	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2369	],
2176	hp => [	2370	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2371	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2372	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2373	],
2180	mana => [	2374	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2375	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2376	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2377	],
2184	);	2378	);
2185		2379
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2380	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2440	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2441	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2442
2249	my $h1 = $self->{h} * (1 - $ycut1);	2443	my $h1 = $self->{h} * (1 - $ycut1);
2250	my $h2 = $self->{h} * (1 - $ycut2);	2444	my $h2 = $self->{h} * (1 - $ycut2);
		2445	my $h3 = $self->{h};
		2446
		2447	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251		2448
2252	glEnable GL_BLEND;	2449	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2450	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2451	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2452	glEnable GL_TEXTURE_2D;
…		…
2274		2471
2275	if ($t3) {	2472	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2473	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2474	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2475	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2476	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2477	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2478	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2479	glEnd;
2283	}	2480	}
2284		2481
2285	glDisable GL_BLEND;	2482	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2483	glDisable GL_TEXTURE_2D;
2287	}	2484	}
2288		2485
2289	#############################################################################	2486	#############################################################################
2290		2487
2291	package CFClient::UI::Gauge;	2488	package CFPlus::UI::Gauge;
2292		2489
2293	our @ISA = CFClient::UI::VBox::;	2490	our @ISA = CFPlus::UI::VBox::;
2294		2491
2295	sub new {	2492	sub new {
2296	my ($class, %arg) = @_;	2493	my ($class, %arg) = @_;
2297		2494
2298	my $self = $class->SUPER::new (	2495	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2497	can_hover => 1,
2301	can_events => 1,	2498	can_events => 1,
2302	%arg,	2499	%arg,
2303	);	2500	);
2304		2501
2305	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2502	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2503	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2504	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308		2505
2309	$self	2506	$self
2310	}	2507	}
2311		2508
2312	sub set_fontsize {	2509	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2530	$self->{value}->set_text ($val);
2334	}	2531	}
2335		2532
2336	#############################################################################	2533	#############################################################################
2337		2534
2338	package CFClient::UI::Slider;	2535	package CFPlus::UI::Slider;
2339		2536
2340	use strict;	2537	use strict;
2341		2538
2342	use CFClient::OpenGL;	2539	use CFPlus::OpenGL;
2343		2540
2344	our @ISA = CFClient::UI::DrawBG::;	2541	our @ISA = CFPlus::UI::DrawBG::;
2345		2542
2346	my @tex =	2543	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2544	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2545	qw(s1_slider.png s1_slider_bg.png);
2349		2546
2350	sub new {	2547	sub new {
2351	my $class = shift;	2548	my $class = shift;
2352		2549
…		…
2441	}	2638	}
2442		2639
2443	1	2640	1
2444	}	2641	}
2445		2642
		2643	sub invoke_mouse_wheel {
		2644	my ($self, $ev) = @_;
		2645
		2646	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2647
		2648	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2649
		2650	! ! $delta
		2651	}
		2652
2446	sub update {	2653	sub update {
2447	my ($self) = @_;	2654	my ($self) = @_;
2448		2655
2449	delete $self->{knob_w};	2656	delete $self->{knob_w};
2450	$self->SUPER::update;	2657	$self->SUPER::update;
…		…
2497	glDisable GL_TEXTURE_2D;	2704	glDisable GL_TEXTURE_2D;
2498	}	2705	}
2499		2706
2500	#############################################################################	2707	#############################################################################
2501		2708
2502	package CFClient::UI::ValSlider;	2709	package CFPlus::UI::ValSlider;
2503		2710
2504	our @ISA = CFClient::UI::HBox::;	2711	our @ISA = CFPlus::UI::HBox::;
2505		2712
2506	sub new {	2713	sub new {
2507	my ($class, %arg) = @_;	2714	my ($class, %arg) = @_;
2508		2715
2509	my $range = delete $arg{range};	2716	my $range = delete $arg{range};
2510		2717
2511	my $self = $class->SUPER::new (	2718	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2719	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2720	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	2721	to_value => sub { shift },
2515	from_value => sub { shift },	2722	from_value => sub { shift },
2516	%arg,	2723	%arg,
2517	);	2724	);
2518		2725
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	2745	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	2746	sub set_value { shift->{slider}->set_value (@_) }
2540		2747
2541	#############################################################################	2748	#############################################################################
2542		2749
2543	package CFClient::UI::TextScroller;	2750	package CFPlus::UI::TextScroller;
2544		2751
2545	our @ISA = CFClient::UI::HBox::;	2752	our @ISA = CFPlus::UI::HBox::;
2546		2753
2547	use CFClient::OpenGL;	2754	use CFPlus::OpenGL;
2548		2755
2549	sub new {	2756	sub new {
2550	my $class = shift;	2757	my $class = shift;
2551		2758
2552	my $self = $class->SUPER::new (	2759	my $self = $class->SUPER::new (
2553	fontsize => 1,	2760	fontsize => 1,
2554	can_events => 0,	2761	can_events => 1,
2555	indent => 0,	2762	indent => 0,
2556	#font => default_font	2763	#font => default_font
2557	@_,	2764	@_,
2558		2765
2559	layout => (new CFClient::Layout 1),	2766	layout => (new CFPlus::Layout),
2560	par => [],	2767	par => [],
2561	height => 0,	2768	height => 0,
2562	children => [	2769	children => [
2563	(new CFClient::UI::Empty expand => 1),	2770	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	2771	(new CFPlus::UI::Slider vertical => 1),
2565	],	2772	],
2566	);	2773	);
2567		2774
2568	$self->{children}[1]->connect (changed => sub { $self->update });	2775	$self->{children}[1]->connect (changed => sub { $self->update });
2569		2776
…		…
2599		2806
2600	$self->reflow;	2807	$self->reflow;
2601		2808
2602	local $self->{children} = [$empty, $slider];	2809	local $self->{children} = [$empty, $slider];
2603	$self->SUPER::invoke_size_allocate ($w, $h)	2810	$self->SUPER::invoke_size_allocate ($w, $h)
		2811	}
		2812
		2813	sub invoke_mouse_wheel {
		2814	my ($self, $ev) = @_;
		2815
		2816	return 0 unless $ev->{dy}; # only vertical movements
		2817
		2818	$self->{children}[1]->emit (mouse_wheel => $ev);
		2819
		2820	1
2604	}	2821	}
2605		2822
2606	sub get_layout {	2823	sub get_layout {
2607	my ($self, $para) = @_;	2824	my ($self, $para) = @_;
2608		2825
…		…
2636		2853
2637	# todo: base offset on lines or so, not on pixels	2854	# todo: base offset on lines or so, not on pixels
2638	$self->{children}[1]->set_value ($offset);	2855	$self->{children}[1]->set_value ($offset);
2639	}	2856	}
2640		2857
		2858	sub current_paragraph {
		2859	my ($self) = @_;
		2860
		2861	$self->{top_paragraph} - 1
		2862	}
		2863
		2864	sub scroll_to {
		2865	my ($self, $para) = @_;
		2866
		2867	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2868
		2869	$self->{scroll_to} = $para;
		2870	$self->update;
		2871	}
		2872
2641	sub clear {	2873	sub clear {
2642	my ($self) = @_;	2874	my ($self) = @_;
2643		2875
2644	my (undef, undef, @other) = @{ $self->{children} };	2876	my (undef, undef, @other) = @{ $self->{children} };
2645	$self->remove ($_) for @other;	2877	$self->remove ($_) for @other;
…		…
2648	$self->{height} = 0;	2880	$self->{height} = 0;
2649	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2881	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2650	}	2882	}
2651		2883
2652	sub add_paragraph {	2884	sub add_paragraph {
2653	my ($self, $color, $para, $indent) = @_;	2885	my $self = shift;
2654		2886
2655	my ($text, @w) = ref $para ? @$para : $para;	2887	for my $para (@_) {
2656
2657	$para = {	2888	$para = {
		2889	fg => [1, 1, 1, 1],
		2890	indent => 0,
		2891	markup => "",
		2892	widget => [],
		2893	ref $para ? %$para : (markup => $para),
2658	w => 1e10,	2894	w => 1e10,
2659	wrapped => 1,	2895	wrapped => 1,
2660	fg => $color,
2661	indent => $indent,
2662	markup => $text,
2663	widget => \@w,
2664	};	2896	};
2665		2897
2666	$self->add (@w) if @w;	2898	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2667	push @{$self->{par}}, $para;	2899	push @{$self->{par}}, $para;
		2900	}
2668		2901
2669	$self->{need_reflow}++;	2902	$self->{need_reflow}++;
2670	$self->update;	2903	$self->update;
2671	}	2904	}
2672		2905
2673	sub scroll_to_bottom {	2906	sub scroll_to_bottom {
2674	my ($self) = @_;	2907	my ($self) = @_;
2675		2908
2676	$self->{scroll_to_bottom} = 1;	2909	$self->{scroll_to} = $#{$self->{par}};
2677	$self->update;	2910	$self->update;
2678	}	2911	}
2679		2912
		2913	sub force_uptodate {
		2914	my ($self) = @_;
		2915
		2916	if (delete $self->{need_reflow}) {
		2917	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2918
		2919	my $height = 0;
		2920
		2921	for my $para (@{$self->{par}}) {
		2922	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2923	my $layout = $self->get_layout ($para);
		2924	my ($w, $h) = $layout->size;
		2925
		2926	$para->{w} = $w + $para->{indent};
		2927	$para->{h} = $h;
		2928	$para->{wrapped} = $layout->has_wrapped;
		2929	}
		2930
		2931	$para->{y} = $height;
		2932	$height += $para->{h};
		2933	}
		2934
		2935	$self->{height} = $height;
		2936	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2937
		2938	delete $self->{texture};
		2939	}
		2940
		2941	if (my $paridx = delete $self->{scroll_to}) {
		2942	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2943	}
		2944	}
		2945
2680	sub update {	2946	sub update {
2681	my ($self) = @_;	2947	my ($self) = @_;
2682		2948
2683	$self->SUPER::update;	2949	$self->SUPER::update;
2684		2950
2685	return unless $self->{h} > 0;	2951	return unless $self->{h} > 0;
2686		2952
2687	delete $self->{texture};	2953	delete $self->{texture};
2688		2954
2689	$ROOT->on_post_alloc ($self => sub {	2955	$ROOT->on_post_alloc ($self => sub {
		2956	$self->force_uptodate;
		2957
2690	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2958	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2691		2959
2692	if (delete $self->{need_reflow}) {
2693	my $height = 0;
2694
2695	for my $para (@{$self->{par}}) {
2696	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2697	my $layout = $self->get_layout ($para);
2698	my ($w, $h) = $layout->size;
2699
2700	$para->{w} = $w + $para->{indent};
2701	$para->{h} = $h;
2702	$para->{wrapped} = $layout->has_wrapped;
2703	}
2704
2705	$height += $para->{h};
2706	}
2707
2708	$self->{height} = $height;
2709
2710	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2711
2712	delete $self->{texture};
2713	}
2714
2715	if (delete $self->{scroll_to_bottom}) {
2716	$self->{children}[1]->set_value (1e10);
2717	}
2718
2719	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2960	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2720	glClearColor 0, 0, 0, 0;	2961	glClearColor 0, 0, 0, 0;
2721	glClear GL_COLOR_BUFFER_BIT;	2962	glClear GL_COLOR_BUFFER_BIT;
2722		2963
2723	my $top = int $self->{children}[1]{range}[0];	2964	my $top = int $self->{children}[1]{range}[0];
2724		2965
		2966	my $paridx = 0;
		2967	my $top_paragraph;
		2968	my $top = int $self->{children}[1]{range}[0];
		2969
2725	my $y0 = $top;	2970	my $y0 = $top;
2726	my $y1 = $top + $H;	2971	my $y1 = $top + $H;
2727		2972
2728	my $y = 0;
2729
2730	glEnable GL_BLEND;
2731	#TODO# not correct in windows where rgba is forced off
2732	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2733
2734	for my $para (@{$self->{par}}) {	2973	for my $para (@{$self->{par}}) {
2735	my $h = $para->{h};	2974	my $h = $para->{h};
		2975	my $y = $para->{y};
2736		2976
2737	if ($y0 < $y + $h && $y < $y1) {	2977	if ($y0 < $y + $h && $y < $y1) {
2738
2739	my $layout = $self->get_layout ($para);	2978	my $layout = $self->get_layout ($para);
2740		2979
2741	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743	glRasterPos $para->{indent}, $y - $y0;	2980	$layout->render ($para->{indent}, $y - $y0);
2744	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745		2981
2746	if (my @w = @{ $para->{widget} }) {	2982	if (my @w = @{ $para->{widget} }) {
2747	my @s = $layout->get_shapes;	2983	my @s = $layout->get_shapes;
2748		2984
2749	glDisable GL_BLEND;
2750	for (@w) {	2985	for (@w) {
2751	my ($dx, $dy) = splice @s, 0, 2, ();	2986	my ($dx, $dy) = splice @s, 0, 2, ();
2752		2987
2753	$_->{x} = $dx + $para->{indent};	2988	$_->{x} = $dx + $para->{indent};
2754	$_->{y} = $dy + $y - $y0;	2989	$_->{y} = $dy + $y - $y0;
2755		2990
2756	$_->draw;	2991	$_->draw;
2757	}	2992	}
2758	glEnable GL_BLEND;
2759	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760	}	2993	}
2761	}	2994	}
2762		2995
2763	$y += $h;	2996	$paridx++;
		2997	$top_paragraph ||= $paridx if $y >= $top;
2764	}	2998	}
2765		2999
2766	glDisable GL_BLEND;	3000	$self->{top_paragraph} = $top_paragraph;
2767	};	3001	};
2768	});	3002	});
2769	}	3003	}
2770		3004
2771	sub reconfigure {	3005	sub reconfigure {
…		…
2789	$self->{children}[1]->draw;	3023	$self->{children}[1]->draw;
2790	}	3024	}
2791		3025
2792	#############################################################################	3026	#############################################################################
2793		3027
2794	package CFClient::UI::Animator;	3028	package CFPlus::UI::Animator;
2795		3029
2796	use CFClient::OpenGL;	3030	use CFPlus::OpenGL;
2797		3031
2798	our @ISA = CFClient::UI::Bin::;	3032	our @ISA = CFPlus::UI::Bin::;
2799		3033
2800	sub moveto {	3034	sub moveto {
2801	my ($self, $x, $y) = @_;	3035	my ($self, $x, $y) = @_;
2802		3036
2803	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3037	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2831	glPopMatrix;	3065	glPopMatrix;
2832	}	3066	}
2833		3067
2834	#############################################################################	3068	#############################################################################
2835		3069
2836	package CFClient::UI::Flopper;	3070	package CFPlus::UI::Flopper;
2837		3071
2838	our @ISA = CFClient::UI::Button::;	3072	our @ISA = CFPlus::UI::Button::;
2839		3073
2840	sub new {	3074	sub new {
2841	my $class = shift;	3075	my $class = shift;
2842		3076
2843	my $self = $class->SUPER::new (	3077	my $self = $class->SUPER::new (
…		…
2855	$self->{other}->toggle_visibility;	3089	$self->{other}->toggle_visibility;
2856	}	3090	}
2857		3091
2858	#############################################################################	3092	#############################################################################
2859		3093
2860	package CFClient::UI::Tooltip;	3094	package CFPlus::UI::Tooltip;
2861		3095
2862	our @ISA = CFClient::UI::Bin::;	3096	our @ISA = CFPlus::UI::Bin::;
2863		3097
2864	use CFClient::OpenGL;	3098	use CFPlus::OpenGL;
2865		3099
2866	sub new {	3100	sub new {
2867	my $class = shift;	3101	my $class = shift;
2868		3102
2869	$class->SUPER::new (	3103	$class->SUPER::new (
…		…
2872	)	3106	)
2873	}	3107	}
2874		3108
2875	sub set_tooltip_from {	3109	sub set_tooltip_from {
2876	my ($self, $widget) = @_;	3110	my ($self, $widget) = @_;
		3111
		3112	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3113	if $widget->{tooltip} =~ /^#(.*)$/;
2877		3114
2878	my $tooltip = $widget->{tooltip};	3115	my $tooltip = $widget->{tooltip};
2879		3116
2880	if ($ENV{CFPLUS_DEBUG} & 2) {	3117	if ($ENV{CFPLUS_DEBUG} & 2) {
2881	$tooltip .= "\n\n" . (ref $widget) . "\n"	3118	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2885	}	3122	}
2886		3123
2887	$tooltip =~ s/^\n+//;	3124	$tooltip =~ s/^\n+//;
2888	$tooltip =~ s/\n+$//;	3125	$tooltip =~ s/\n+$//;
2889		3126
2890	$self->add (new CFClient::UI::Label	3127	$self->add (new CFPlus::UI::Label
2891	markup => $tooltip,	3128	markup => $tooltip,
2892	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3129	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2893	fontsize => 0.8,	3130	fontsize => 0.8,
2894	fg => [0, 0, 0, 1],	3131	style => 1, # FLAG_INVERSE
2895	ellipsise => 0,	3132	ellipsise => 0,
2896	font => ($widget->{tooltip_font} || $::FONT_PROP),	3133	font => ($widget->{tooltip_font} || $::FONT_PROP),
2897	);	3134	);
2898	}	3135	}
2899		3136
…		…
2918		3155
2919	$self->{root}->on_post_alloc ("move_$self" => sub {	3156	$self->{root}->on_post_alloc ("move_$self" => sub {
2920	my $widget = $self->{owner}	3157	my $widget = $self->{owner}
2921	or return;	3158	or return;
2922		3159
		3160	if ($widget->{visible}) {
2923	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3161	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924		3162
2925	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3163	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926	if $x + $self->{w} > $self->{root}{w};	3164	if $x + $self->{w} > $self->{root}{w};
2927		3165
2928	$self->move_abs ($x, $y);	3166	$self->move_abs ($x, $y);
		3167	} else {
		3168	$self->hide;
		3169	}
2929	});	3170	});
2930	}	3171	}
2931		3172
2932	sub _draw {	3173	sub _draw {
2933	my ($self) = @_;	3174	my ($self) = @_;
…		…
2957	$self->SUPER::_draw;	3198	$self->SUPER::_draw;
2958	}	3199	}
2959		3200
2960	#############################################################################	3201	#############################################################################
2961		3202
2962	package CFClient::UI::Face;	3203	package CFPlus::UI::Face;
2963		3204
2964	our @ISA = CFClient::UI::Base::;	3205	our @ISA = CFPlus::UI::DrawBG::;
2965		3206
2966	use CFClient::OpenGL;	3207	use CFPlus::OpenGL;
2967		3208
2968	sub new {	3209	sub new {
2969	my $class = shift;	3210	my $class = shift;
2970		3211
2971	my $self = $class->SUPER::new (	3212	my $self = $class->SUPER::new (
…		…
3006	sub _draw {	3247	sub _draw {
3007	my ($self) = @_;	3248	my ($self) = @_;
3008		3249
3009	return unless $::CONN;	3250	return unless $::CONN;
3010		3251
		3252	$self->SUPER::_draw;
		3253
3011	my $face;	3254	my $face;
3012		3255
3013	if ($self->{frame}) {	3256	if ($self->{frame}) {
3014	my $anim = $::CONN->{anim}[$self->{anim}];	3257	my $anim = $::CONN->{anim}[$self->{anim}];
3015		3258
…		…
3037	$self->SUPER::destroy;	3280	$self->SUPER::destroy;
3038	}	3281	}
3039		3282
3040	#############################################################################	3283	#############################################################################
3041		3284
3042	package CFClient::UI::Buttonbar;	3285	package CFPlus::UI::Buttonbar;
3043		3286
3044	our @ISA = CFClient::UI::HBox::;	3287	our @ISA = CFPlus::UI::HBox::;
3045		3288
3046	# TODO: should actualyl wrap buttons and other goodies.	3289	# TODO: should actualyl wrap buttons and other goodies.
3047		3290
3048	#############################################################################	3291	#############################################################################
3049		3292
3050	package CFClient::UI::Menu;	3293	package CFPlus::UI::Menu;
3051		3294
3052	our @ISA = CFClient::UI::FancyFrame::;	3295	our @ISA = CFPlus::UI::Toplevel::;
3053		3296
3054	use CFClient::OpenGL;	3297	use CFPlus::OpenGL;
3055		3298
3056	sub new {	3299	sub new {
3057	my $class = shift;	3300	my $class = shift;
3058		3301
3059	my $self = $class->SUPER::new (	3302	my $self = $class->SUPER::new (
3060	items => [],	3303	items => [],
3061	z => 100,	3304	z => 100,
3062	@_,	3305	@_,
3063	);	3306	);
3064		3307
3065	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3308	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3066		3309
3067	for my $item (@{ $self->{items} }) {	3310	for my $item (@{ $self->{items} }) {
3068	my ($widget, $cb, $tooltip) = @$item;	3311	my ($widget, $cb, $tooltip) = @$item;
3069		3312
3070	# handle various types of items, only text for now	3313	# handle various types of items, only text for now
3071	if (!ref $widget) {	3314	if (!ref $widget) {
		3315	if ($widget =~ /\t/) {
		3316	my ($left, $right) = split /\t/, $widget, 2;
		3317
3072	$widget = new CFClient::UI::Label	3318	$widget = new CFPlus::UI::HBox
3073	can_hover => 1,	3319	can_hover => 1,
3074	can_events => 1,	3320	can_events => 1,
		3321	tooltip => $tooltip,
		3322	children => [
		3323	(new CFPlus::UI::Label markup => $left, expand => 1),
		3324	(new CFPlus::UI::Label markup => $right, align => +1),
		3325	],
		3326	;
		3327
		3328	} else {
		3329	$widget = new CFPlus::UI::Label
		3330	can_hover => 1,
		3331	can_events => 1,
3075	markup => $widget,	3332	markup => $widget,
3076	tooltip => $tooltip	3333	tooltip => $tooltip;
		3334	}
3077	}	3335	}
3078		3336
3079	$self->{item}{$widget} = $item;	3337	$self->{item}{$widget} = $item;
3080		3338
3081	$self->{vbox}->add ($widget);	3339	$self->{vbox}->add ($widget);
…		…
3124	1	3382	1
3125	}	3383	}
3126		3384
3127	#############################################################################	3385	#############################################################################
3128		3386
3129	package CFClient::UI::Multiplexer;	3387	package CFPlus::UI::Multiplexer;
3130		3388
3131	our @ISA = CFClient::UI::Container::;	3389	our @ISA = CFPlus::UI::Container::;
3132		3390
3133	sub new {	3391	sub new {
3134	my $class = shift;	3392	my $class = shift;
3135		3393
3136	my $self = $class->SUPER::new (	3394	my $self = $class->SUPER::new (
…		…
3150		3408
3151	$self->{current} = $self->{children}[0]	3409	$self->{current} = $self->{children}[0]
3152	if @{ $self->{children} };	3410	if @{ $self->{children} };
3153	}	3411	}
3154		3412
		3413	sub get_current_page {
		3414	my ($self) = @_;
		3415
		3416	$self->{current}
		3417	}
		3418
3155	sub set_current_page {	3419	sub set_current_page {
3156	my ($self, $page_or_widget) = @_;	3420	my ($self, $page_or_widget) = @_;
3157		3421
3158	my $widget = ref $page_or_widget	3422	my $widget = ref $page_or_widget
3159	? $page_or_widget	3423	? $page_or_widget
…		…
3191	$self->{current}->draw;	3455	$self->{current}->draw;
3192	}	3456	}
3193		3457
3194	#############################################################################	3458	#############################################################################
3195		3459
3196	package CFClient::UI::Notebook;	3460	package CFPlus::UI::Notebook;
3197		3461
3198	our @ISA = CFClient::UI::VBox::;	3462	our @ISA = CFPlus::UI::VBox::;
3199		3463
3200	sub new {	3464	sub new {
3201	my $class = shift;	3465	my $class = shift;
3202		3466
3203	my $self = $class->SUPER::new (	3467	my $self = $class->SUPER::new (
3204	buttonbar => (new CFClient::UI::Buttonbar),	3468	buttonbar => (new CFPlus::UI::Buttonbar),
3205	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3469	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3206	# filter => # will be put between multiplexer and $self	3470	# filter => # will be put between multiplexer and $self
3207	@_,	3471	@_,
3208	);	3472	);
3209		3473
3210	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3474	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3216	sub add {	3480	sub add {
3217	my ($self, $title, $widget, $tooltip) = @_;	3481	my ($self, $title, $widget, $tooltip) = @_;
3218		3482
3219	Scalar::Util::weaken $self;	3483	Scalar::Util::weaken $self;
3220		3484
3221	$self->{buttonbar}->add (new CFClient::UI::Button	3485	$self->{buttonbar}->add (new CFPlus::UI::Button
3222	markup => $title,	3486	markup => $title,
3223	tooltip => $tooltip,	3487	tooltip => $tooltip,
3224	on_activate => sub { $self->set_current_page ($widget) },	3488	on_activate => sub { $self->set_current_page ($widget) },
3225	);	3489	);
3226		3490
3227	$self->{multiplexer}->add ($widget);	3491	$self->{multiplexer}->add ($widget);
3228	}	3492	}
3229		3493
		3494	sub get_current_page {
		3495	my ($self) = @_;
		3496
		3497	$self->{multiplexer}->get_current_page
		3498	}
		3499
3230	sub set_current_page {	3500	sub set_current_page {
3231	my ($self, $page) = @_;	3501	my ($self, $page) = @_;
3232		3502
3233	$self->{multiplexer}->set_current_page ($page);	3503	$self->{multiplexer}->set_current_page ($page);
3234	$self->emit (page_changed => $self->{multiplexer}{current});	3504	$self->emit (page_changed => $self->{multiplexer}{current});
3235	}	3505	}
3236		3506
3237	#############################################################################	3507	#############################################################################
3238		3508
3239	package CFClient::UI::Combobox;	3509	package CFPlus::UI::Selector;
3240		3510
3241	use utf8;	3511	use utf8;
3242		3512
3243	our @ISA = CFClient::UI::Button::;	3513	our @ISA = CFPlus::UI::Button::;
3244		3514
3245	sub new {	3515	sub new {
3246	my $class = shift;	3516	my $class = shift;
3247		3517
3248	my $self = $class->SUPER::new (	3518	my $self = $class->SUPER::new (
…		…
3265	my ($value, $title, $tooltip) = @$_;	3535	my ($value, $title, $tooltip) = @$_;
3266		3536
3267	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3537	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268	}	3538	}
3269		3539
3270	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3540	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271	}	3541	}
3272		3542
3273	sub _set_value {	3543	sub _set_value {
3274	my ($self, $value) = @_;	3544	my ($self, $value) = @_;
3275		3545
…		…
3290	$self->emit (changed => $value);	3560	$self->emit (changed => $value);
3291	}	3561	}
3292		3562
3293	#############################################################################	3563	#############################################################################
3294		3564
3295	package CFClient::UI::Statusbox;	3565	package CFPlus::UI::Statusbox;
3296		3566
3297	our @ISA = CFClient::UI::VBox::;	3567	our @ISA = CFPlus::UI::VBox::;
3298		3568
3299	sub new {	3569	sub new {
3300	my $class = shift;	3570	my $class = shift;
3301		3571
3302	my $self = $class->SUPER::new (	3572	my $self = $class->SUPER::new (
…		…
3314	sub reorder {	3584	sub reorder {
3315	my ($self) = @_;	3585	my ($self) = @_;
3316	my $NOW = Time::HiRes::time;	3586	my $NOW = Time::HiRes::time;
3317		3587
3318	# freeze display when hovering over any label	3588	# freeze display when hovering over any label
3319	return if $CFClient::UI::TOOLTIP->{owner}	3589	return if $CFPlus::UI::TOOLTIP->{owner}
3320	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3590	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3321	values %{ $self->{item} };	3591	values %{ $self->{item} };
3322		3592
3323	while (my ($k, $v) = each %{ $self->{item} }) {	3593	while (my ($k, $v) = each %{ $self->{item} }) {
3324	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3594	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325	}	3595	}
…		…
3346	for ($short) {	3616	for ($short) {
3347	s/^\s+//;	3617	s/^\s+//;
3348	s/\s+/ /g;	3618	s/\s+/ /g;
3349	}	3619	}
3350		3620
3351	new CFClient::UI::Label	3621	new CFPlus::UI::Label
3352	markup => $short,	3622	markup => $short,
3353	tooltip => $item->{tooltip},	3623	tooltip => $item->{tooltip},
3354	tooltip_font => $::FONT_PROP,	3624	tooltip_font => $::FONT_PROP,
3355	tooltip_width => 0.67,	3625	tooltip_width => 0.67,
3356	fontsize => $item->{fontsize} || $self->{fontsize},	3626	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3410	count => 1,	3680	count => 1,
3411	%arg,	3681	%arg,
3412	};	3682	};
3413	}	3683	}
3414		3684
		3685	$ROOT->on_refresh (reorder => sub {
3415	$self->reorder;	3686	$self->reorder;
		3687	});
3416	}	3688	}
3417		3689
3418	sub reconfigure {	3690	sub reconfigure {
3419	my ($self) = @_;	3691	my ($self) = @_;
3420		3692
…		…
3433	$self->SUPER::destroy;	3705	$self->SUPER::destroy;
3434	}	3706	}
3435		3707
3436	#############################################################################	3708	#############################################################################
3437		3709
3438	package CFClient::UI::Inventory;	3710	package CFPlus::UI::Inventory;
3439		3711
3440	our @ISA = CFClient::UI::ScrolledWindow::;	3712	our @ISA = CFPlus::UI::Table::;
3441		3713
3442	sub new {	3714	sub new {
3443	my $class = shift;	3715	my $class = shift;
3444		3716
3445	my $self = $class->SUPER::new (	3717	my $self = $class->SUPER::new (
3446	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3718	col_expand => [0, 1, 0],
		3719	items => [],
3447	@_,	3720	@_,
3448	);	3721	);
3449		3722
		3723	$self->set_sort_order (undef);
		3724
3450	$self	3725	$self
		3726	}
		3727
		3728	sub update_items {
		3729	my ($self) = @_;
		3730
		3731	$self->clear;
		3732
		3733	my @item = $self->{sort}->(@{ $self->{items} });
		3734
		3735	my @adds;
		3736	my $row = 0;
		3737	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3738	CFPlus::Item::update_widgets $item;
		3739
		3740	push @adds, 0, $row, $item->{face_widget};
		3741	push @adds, 1, $row, $item->{desc_widget};
		3742	push @adds, 2, $row, $item->{weight_widget};
		3743
		3744	$row++;
		3745	}
		3746
		3747	$self->add (@adds);
		3748	}
		3749
		3750	sub set_sort_order {
		3751	my ($self, $order) = @_;
		3752
		3753	$self->{sort} = $order ||= sub {
		3754	sort {
		3755	$a->{type} <=> $b->{type}
		3756	or $a->{name} cmp $b->{name}
		3757	} @_
		3758	};
		3759
		3760	$self->update_items;
3451	}	3761	}
3452		3762
3453	sub set_items {	3763	sub set_items {
3454	my ($self, $items) = @_;	3764	my ($self, $items) = @_;
3455		3765
3456	$self->{child}->clear;	3766	$self->{items} = [$items ? values %$items : ()];
3457	return unless $items;	3767	$self->update_items;
3458
3459	my @items = sort {
3460	($a->{type} <=> $b->{type})
3461	or ($a->{name} cmp $b->{name})
3462	} @$items;
3463
3464	$self->{real_items} = \@items;
3465
3466	my $row = 0;
3467	for my $item (@items) {
3468	CFClient::Item::update_widgets $item;
3469
3470	$self->{child}->add (0, $row, $item->{face_widget});
3471	$self->{child}->add (1, $row, $item->{desc_widget});
3472	$self->{child}->add (2, $row, $item->{weight_widget});
3473
3474	$row++;
3475	}
3476	}	3768	}
3477		3769
3478	#############################################################################	3770	#############################################################################
3479		3771
3480	package CFClient::UI::SpellList;	3772	package CFPlus::UI::SpellList;
3481		3773
3482	our @ISA = CFClient::UI::Table::;	3774	our @ISA = CFPlus::UI::Table::;
3483		3775
3484	sub new {	3776	sub new {
3485	my $class = shift;	3777	my $class = shift;
3486		3778
3487	my $self = $class->SUPER::new (	3779	my $self = $class->SUPER::new (
…		…
3505	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3797	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3506		3798
3507	sub rebuild_spell_list {	3799	sub rebuild_spell_list {
3508	my ($self) = @_;	3800	my ($self) = @_;
3509		3801
3510	$CFClient::UI::ROOT->on_refresh ($self => sub {	3802	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3511	$self->clear;	3803	$self->clear;
3512		3804
3513	return unless $::CONN;	3805	return unless $::CONN;
3514		3806
3515	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3807	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3808	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3809	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3810	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3811	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520		3812
3521	my $row = 0;	3813	my $row = 0;
3522		3814
3523	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3815	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524	my $spell = $self->{spell}{$_};	3816	my $spell = $self->{spell}{$_};
…		…
3531	if ($ev->{button} == 1) {	3823	if ($ev->{button} == 1) {
3532	$::CONN->user_send ("cast $spell->{name}");	3824	$::CONN->user_send ("cast $spell->{name}");
3533	} elsif ($ev->{button} == 2) {	3825	} elsif ($ev->{button} == 2) {
3534	$::CONN->user_send ("invoke $spell->{name}");	3826	$::CONN->user_send ("invoke $spell->{name}");
3535	} elsif ($ev->{button} == 3) {	3827	} elsif ($ev->{button} == 3) {
3536	(new CFClient::UI::Menu	3828	(new CFPlus::UI::Menu
3537	items => [	3829	items => [
3538	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3830	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3831	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540	],	3832	],
3541	)->popup ($ev);	3833	)->popup ($ev);
…		…
3544	}	3836	}
3545		3837
3546	1	3838	1
3547	};	3839	};
3548		3840
3549	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3841	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3550		3842
3551	#TODO: add path info to tooltip	3843	#TODO: add path info to tooltip
3552	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3844	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3553		3845
3554	$self->add (0, $row, new CFClient::UI::Face	3846	$self->add (0, $row, new CFPlus::UI::Face
3555	face => $spell->{face},	3847	face => $spell->{face},
3556	can_hover => 1,	3848	can_hover => 1,
3557	can_events => 1,	3849	can_events => 1,
3558	tooltip => $tooltip,	3850	tooltip => $tooltip,
3559	on_button_down => $spell_cb,	3851	on_button_down => $spell_cb,
3560	);	3852	);
3561		3853
3562	$self->add (1, $row, new CFClient::UI::Label	3854	$self->add (1, $row, new CFPlus::UI::Label
3563	expand => 1,	3855	expand => 1,
3564	text => $spell->{name},	3856	text => $spell->{name},
3565	can_hover => 1,	3857	can_hover => 1,
3566	can_events => 1,	3858	can_events => 1,
3567	tooltip => $tooltip,	3859	tooltip => $tooltip,
3568	on_button_down => $spell_cb,	3860	on_button_down => $spell_cb,
3569	);	3861	);
3570		3862
3571	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3863	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3864	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3865	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3866	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575	}	3867	}
3576	});	3868	});
3577	}	3869	}
3578		3870
3579	sub add_spell {	3871	sub add_spell {
…		…
3597	$self->rebuild_spell_list;	3889	$self->rebuild_spell_list;
3598	}	3890	}
3599		3891
3600	#############################################################################	3892	#############################################################################
3601		3893
3602	package CFClient::UI::Root;	3894	package CFPlus::UI::Root;
3603		3895
3604	our @ISA = CFClient::UI::Container::;	3896	our @ISA = CFPlus::UI::Container::;
3605		3897
3606	use List::Util qw(min max);	3898	use List::Util qw(min max);
3607		3899
3608	use CFClient::OpenGL;	3900	use CFPlus::OpenGL;
3609		3901
3610	sub new {	3902	sub new {
3611	my $class = shift;	3903	my $class = shift;
3612		3904
3613	my $self = $class->SUPER::new (	3905	my $self = $class->SUPER::new (
…		…
3789	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4081	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3790		4082
3791	$w = 0 if $w < 0;	4083	$w = 0 if $w < 0;
3792	$h = 0 if $h < 0;	4084	$h = 0 if $h < 0;
3793		4085
		4086	$w = max $widget->{min_w}, $w;
		4087	$h = max $widget->{min_h}, $h;
		4088
		4089	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4090	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4091
		4092	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4093	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4094
3794	$w = int $w + 0.5;	4095	$w = int $w + 0.5;
3795	$h = int $h + 0.5;	4096	$h = int $h + 0.5;
3796		4097
3797	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4098	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3798	$widget->{old_w} = $widget->{w};	4099	$widget->{old_w} = $widget->{w};
…		…
3821	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4122	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3822	glMatrixMode GL_MODELVIEW;	4123	glMatrixMode GL_MODELVIEW;
3823	glLoadIdentity;	4124	glLoadIdentity;
3824		4125
3825	{	4126	{
3826	package CFClient::UI::Base;	4127	package CFPlus::UI::Base;
3827		4128
3828	($draw_x, $draw_y, $draw_w, $draw_h) =	4129	($draw_x, $draw_y, $draw_w, $draw_h) =
3829	(0, 0, $self->{w}, $self->{h});	4130	(0, 0, $self->{w}, $self->{h});
3830	}	4131	}
3831		4132
3832	$self->_draw;	4133	$self->_draw;
3833	}	4134	}
3834		4135
3835	#############################################################################	4136	#############################################################################
3836		4137
3837	package CFClient::UI;	4138	package CFPlus::UI;
3838		4139
3839	$ROOT = new CFClient::UI::Root;	4140	$ROOT = new CFPlus::UI::Root;
3840	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4141	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3841		4142
3842	1	4143	1
3843		4144

Diff Legend

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