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.325 by root, Thu Jul 13 01:29:17 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	80	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	81	if $FOCUS;
82	}	82	}
83		83
		84	sub check_hover {
		85	my ($widget) = @_;
		86
		87	if ($widget != $HOVER) {
		88	my $hover = $HOVER; $HOVER = $widget;
		89
		90	$hover->update if $hover && $hover->{can_hover};
		91	$HOVER->update if $HOVER && $HOVER->{can_hover};
		92
		93	$TOOLTIP_WATCHER->start;
		94	}
		95	}
		96
84	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	98	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	99	my ($x, $y) = ($ev->{x}, $ev->{y});
87		100
88	if (!$BUTTON_STATE) {	101	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		102
		103	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
90		105
91	$GRAB = $widget;	106	$GRAB = $widget;
92	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
93		108
94	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->cb->();
95	}	110	}
96		111
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	112	if ($GRAB) {
98		113	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	114	# mousewheel
100	if $GRAB;	115	$ev->{dx} = 0;
		116	$ev->{dy} = $ev->{button} * 2 - 9;
		117	$GRAB->emit (mouse_wheel => $ev);
		118	} else {
		119	$GRAB->emit (button_down => $ev)
		120	}
		121	}
101	}	122	}
102		123
103	sub feed_sdl_button_up_event {	124	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	125	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		126
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	127	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		128
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	129	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		130
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	131	$GRAB->emit (button_up => $ev)
112	if $GRAB;	132	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		133
114	if (!$BUTTON_STATE) {	134	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	135	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	136	$grab->update if $grab;
117	$GRAB->update if $GRAB;	137	$GRAB->update if $GRAB;
118		138
		139	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	140	$TOOLTIP_WATCHER->cb->();
120	}	141	}
121	}	142	}
122		143
123	sub feed_sdl_motion_event {	144	sub feed_sdl_motion_event {
124	my ($ev) = @_;	145	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	146	my ($x, $y) = ($ev->{x}, $ev->{y});
126		147
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	148	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		149
129	if ($widget != $HOVER) {	150	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		151
132	$hover->update if $hover && $hover->{can_hover};	152	$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;	153	if $HOVER;
140	}	154	}
141		155
142	# convert position array to integers	156	# convert position array to integers
143	sub harmonize {	157	sub harmonize {
…		…
193	reconfigure_widgets;	207	reconfigure_widgets;
194	}	208	}
195		209
196	#############################################################################	210	#############################################################################
197		211
		212	package CFPlus::UI::Event;
		213
		214	sub xy {
		215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		216	}
		217
		218	#############################################################################
		219
198	package CFClient::UI::Base;	220	package CFPlus::UI::Base;
199		221
200	use strict;	222	use strict;
201		223
202	use CFClient::OpenGL;	224	use CFPlus::OpenGL;
203		225
204	sub new {	226	sub new {
205	my $class = shift;	227	my $class = shift;
206		228
207	my $self = bless {	229	my $self = bless {
…		…
212	h => undef,	234	h => undef,
213	can_events => 1,	235	can_events => 1,
214	@_	236	@_
215	}, $class;	237	}, $class;
216		238
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	239	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		240
219	for (keys %$self) {	241	for (keys %$self) {
220	if (/^on_(.*)$/) {	242	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	243	$self->connect ($1 => delete $self->{$_});
222	}	244	}
223	}	245	}
224		246
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	247	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	248	$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};	249	$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};	250	$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};	251	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		252
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		255
234	$self->show if $layout->{show};	256	$self->show if $layout->{show};
…		…
239		261
240	sub destroy {	262	sub destroy {
241	my ($self) = @_;	263	my ($self) = @_;
242		264
243	$self->hide;	265	$self->hide;
		266	$self->emit ("destroy");
244	%$self = ();	267	%$self = ();
245	}	268	}
246		269
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) = @_;
…		…
452		479
453	$FOCUS->emit ("focus_out") if $FOCUS;	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	sub disconnect_all {
		510	my ($self, $signal) = @_;
		511
		512	delete $self->{signal_cb}{$signal};
		513	}
		514
		515	my %has_coords = (
		516	button_down => 1,
		517	button_up => 1,
		518	mouse_motion => 1,
		519	mouse_wheel => 1,
		520	);
475		521
476	sub emit {	522	sub emit {
477	my ($self, $signal, @args) = @_;	523	my ($self, $signal, @args) = @_;
478		524
479	#d##TODO# stop propagating at first true, do not use sum	525	# I do not really like this solution, but I do not like duplication
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	526	# and needlessly verbose code, either.
		527	my @append
		528	= $has_coords{$signal}
		529	? $args[0]->xy ($self)
		530	: ();
		531
		532	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		533
		534	for my $cb (
		535	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	536	($self->can ("invoke_$signal") || sub { 1 }), # closure
		537	) {
		538	return $cb->($self, @args, @append) || next;
		539	}
		540
		541	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	542	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	543	}
484		544
485	sub find_widget {	545	sub find_widget {
486	my ($self, $x, $y) = @_;	546	my ($self, $x, $y) = @_;
487		547
…		…
495	}	555	}
496		556
497	sub set_parent {	557	sub set_parent {
498	my ($self, $parent) = @_;	558	my ($self, $parent) = @_;
499		559
500	Scalar::Util::weaken ($self->{parent} = $parent);	560	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	561	$self->set_visible if $parent->{visible};
502	}	562	}
503		563
504	sub realloc {	564	sub realloc {
505	my ($self) = @_;	565	my ($self) = @_;
…		…
571	glVertex $self->{w} - 1, 0;	631	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	632	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	633	glVertex 0 , $self->{h} - 1;
574	glEnd;	634	glEnd;
575	glPopMatrix;	635	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	636	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}	637	}
578		638
579	$self->_draw;	639	$self->_draw;
580	glPopMatrix;	640	glPopMatrix;
581	}	641	}
…		…
584	my ($self) = @_;	644	my ($self) = @_;
585		645
586	warn "no draw defined for $self\n";	646	warn "no draw defined for $self\n";
587	}	647	}
588		648
		649	my $cntx;#d#
589	sub DESTROY {	650	sub DESTROY {
590	my ($self) = @_;	651	my ($self) = @_;
591		652
592	return if CFClient::in_destruct;	653	return if CFPlus::in_destruct;
593
594	delete $WIDGET{$self+0};
595		654
596	eval { $self->destroy };	655	eval { $self->destroy };
597	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	656	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		657
		658	delete $WIDGET{$self+0};
598	}	659	}
599		660
600	#############################################################################	661	#############################################################################
601		662
602	package CFClient::UI::DrawBG;	663	package CFPlus::UI::DrawBG;
603		664
604	our @ISA = CFClient::UI::Base::;	665	our @ISA = CFPlus::UI::Base::;
605		666
606	use strict;	667	use strict;
607	use CFClient::OpenGL;	668	use CFPlus::OpenGL;
608		669
609	sub new {	670	sub new {
610	my $class = shift;	671	my $class = shift;
611		672
612	# range [value, low, high, page]	673	# range [value, low, high, page]
…		…
643	}	704	}
644	}	705	}
645		706
646	#############################################################################	707	#############################################################################
647		708
648	package CFClient::UI::Empty;	709	package CFPlus::UI::Empty;
649		710
650	our @ISA = CFClient::UI::Base::;	711	our @ISA = CFPlus::UI::Base::;
651		712
652	sub new {	713	sub new {
653	my ($class, %arg) = @_;	714	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	715	$class->SUPER::new (can_events => 0, %arg);
655	}	716	}
…		…
662		723
663	sub draw { }	724	sub draw { }
664		725
665	#############################################################################	726	#############################################################################
666		727
667	package CFClient::UI::Container;	728	package CFPlus::UI::Container;
668		729
669	our @ISA = CFClient::UI::Base::;	730	our @ISA = CFPlus::UI::Base::;
670		731
671	sub new {	732	sub new {
672	my ($class, %arg) = @_;	733	my ($class, %arg) = @_;
673		734
674	my $children = delete $arg{children};	735	my $children = delete $arg{children};
…		…
683	if $children;	744	if $children;
684		745
685	$self	746	$self
686	}	747	}
687		748
		749	sub realloc {
		750	my ($self) = @_;
		751
		752	$self->{force_realloc} = 1;
		753	$self->{force_size_alloc} = 1;
		754	$self->SUPER::realloc;
		755	}
		756
688	sub add {	757	sub add {
689	my ($self, @widgets) = @_;	758	my ($self, @widgets) = @_;
690		759
691	$_->set_parent ($self)	760	$_->set_parent ($self)
692	for @widgets;	761	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	821	$_->draw for @{$self->{children}};
753	}	822	}
754		823
755	#############################################################################	824	#############################################################################
756		825
757	package CFClient::UI::Bin;	826	package CFPlus::UI::Bin;
758		827
759	our @ISA = CFClient::UI::Container::;	828	our @ISA = CFPlus::UI::Container::;
760		829
761	sub new {	830	sub new {
762	my ($class, %arg) = @_;	831	my ($class, %arg) = @_;
763		832
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	833	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		834
766	$class->SUPER::new (children => [$child], %arg)	835	$class->SUPER::new (children => [$child], %arg)
767	}	836	}
768		837
769	sub add {	838	sub add {
…		…
776	sub remove {	845	sub remove {
777	my ($self, $widget) = @_;	846	my ($self, $widget) = @_;
778		847
779	$self->SUPER::remove ($widget);	848	$self->SUPER::remove ($widget);
780		849
781	$self->{children} = [new CFClient::UI::Empty]	850	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	851	unless @{$self->{children}};
783	}	852	}
784		853
785	sub child { $_[0]->{children}[0] }	854	sub child { $_[0]->{children}[0] }
786		855
…		…
798		867
799	#############################################################################	868	#############################################################################
800		869
801	# back-buffered drawing area	870	# back-buffered drawing area
802		871
803	package CFClient::UI::Window;	872	package CFPlus::UI::Window;
804		873
805	our @ISA = CFClient::UI::Bin::;	874	our @ISA = CFPlus::UI::Bin::;
806		875
807	use CFClient::OpenGL;	876	use CFPlus::OpenGL;
808		877
809	sub new {	878	sub new {
810	my ($class, %arg) = @_;	879	my ($class, %arg) = @_;
811		880
812	my $self = $class->SUPER::new (%arg);	881	my $self = $class->SUPER::new (%arg);
…		…
834	}	903	}
835		904
836	sub render_child {	905	sub render_child {
837	my ($self) = @_;	906	my ($self) = @_;
838		907
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	908	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	909	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	910	glClear GL_COLOR_BUFFER_BIT;
842		911
843	{	912	{
844	package CFClient::UI::Base;	913	package CFPlus::UI::Base;
845		914
846	($draw_x, $draw_y, $draw_w, $draw_h) =	915	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	916	(0, 0, $self->{w}, $self->{h});
		917
		918	$self->_render;
848	}	919	}
849
850	$self->_render;
851	};	920	};
852	}	921	}
853		922
854	sub _draw {	923	sub _draw {
855	my ($self) = @_;	924	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		925
859	my $tex = $self->{texture}	926	my $tex = $self->{texture}
860	or return;	927	or return;
861		928
862	glEnable GL_TEXTURE_2D;	929	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	930	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	931	glColor 0, 0, 0, 1;
865		932
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	933	$tex->draw_quad_alpha_premultiplied (0, 0);
867		934
868	glDisable GL_TEXTURE_2D;	935	glDisable GL_TEXTURE_2D;
869	}	936	}
870		937
871	#############################################################################	938	#############################################################################
872		939
873	package CFClient::UI::ViewPort;	940	package CFPlus::UI::ViewPort;
874		941
875	our @ISA = CFClient::UI::Window::;	942	our @ISA = CFPlus::UI::Window::;
876		943
877	sub new {	944	sub new {
878	my $class = shift;	945	my $class = shift;
879		946
880	$class->SUPER::new (	947	$class->SUPER::new (
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	1009	) {
943	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1010	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944	} else {	1011	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1012	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1013	}
947	}	1014	}
948		1015
949	sub _render {	1016	sub _render {
950	my ($self) = @_;	1017	my ($self) = @_;
951		1018
952	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1019	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1020	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954		1021
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1022	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1023
957	$self->SUPER::_render;	1024	$self->SUPER::_render;
958	}	1025	}
959		1026
960	#############################################################################	1027	#############################################################################
961		1028
962	package CFClient::UI::ScrolledWindow;	1029	package CFPlus::UI::ScrolledWindow;
963		1030
964	our @ISA = CFClient::UI::HBox::;	1031	our @ISA = CFPlus::UI::HBox::;
965		1032
966	sub new {	1033	sub new {
967	my ($class, %arg) = @_;	1034	my ($class, %arg) = @_;
968		1035
969	my $child = delete $arg{child};	1036	my $child = delete $arg{child};
970		1037
971	my $self;	1038	my $self;
972		1039
973	my $slider = new CFClient::UI::Slider	1040	my $slider = new CFPlus::UI::Slider
974	vertical => 1,	1041	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1042	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1043	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1044	$self->{vp}->set_offset (0, $_[1]);
978	},	1045	},
979	;	1046	;
980		1047
981	$self = $class->SUPER::new (	1048	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1049	vp => (new CFPlus::UI::ViewPort expand => 1),
		1050	can_events => 1,
983	slider => $slider,	1051	slider => $slider,
984	%arg,	1052	%arg,
985	);	1053	);
986		1054
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1055	$self->SUPER::add ($self->{vp}, $self->{slider});
988	$self->add ($child) if $child;	1056	$self->add ($child) if $child;
…		…
996	my ($self, $widget) = @_;	1064	my ($self, $widget) = @_;
997		1065
998	$self->{vp}->add ($self->{child} = $widget);	1066	$self->{vp}->add ($self->{child} = $widget);
999	}	1067	}
1000		1068
		1069	sub invoke_mouse_wheel {
		1070	my ($self, $ev) = @_;
		1071
		1072	return 0 unless $ev->{dy}; # only vertical movements
		1073
		1074	$self->{slider}->emit (mouse_wheel => $ev);
		1075
		1076	1
		1077	}
		1078
1001	sub update_slider {	1079	sub update_slider {
1002	my ($self) = @_;	1080	my ($self) = @_;
1003		1081
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1082	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1005	}	1083	}
…		…
1020	$self->SUPER::invoke_size_allocate ($w, $h)	1098	$self->SUPER::invoke_size_allocate ($w, $h)
1021	}	1099	}
1022		1100
1023	#############################################################################	1101	#############################################################################
1024		1102
1025	package CFClient::UI::Frame;	1103	package CFPlus::UI::Frame;
1026		1104
1027	our @ISA = CFClient::UI::Bin::;	1105	our @ISA = CFPlus::UI::Bin::;
1028		1106
1029	use CFClient::OpenGL;	1107	use CFPlus::OpenGL;
1030		1108
1031	sub new {	1109	sub new {
1032	my $class = shift;	1110	my $class = shift;
1033		1111
1034	$class->SUPER::new (	1112	$class->SUPER::new (
…		…
1060	$self->SUPER::_draw;	1138	$self->SUPER::_draw;
1061	}	1139	}
1062		1140
1063	#############################################################################	1141	#############################################################################
1064		1142
1065	package CFClient::UI::FancyFrame;	1143	package CFPlus::UI::FancyFrame;
1066		1144
1067	our @ISA = CFClient::UI::Bin::;	1145	our @ISA = CFPlus::UI::Bin::;
1068		1146
1069	use CFClient::OpenGL;	1147	use CFPlus::OpenGL;
		1148
		1149	sub new {
		1150	my ($class, %arg) = @_;
		1151
		1152	if ((exists $arg{label}) && !ref $arg{label}) {
		1153	$arg{label} = new CFPlus::UI::Label
		1154	align => 1,
		1155	valign => 0,
		1156	text => $arg{label},
		1157	fontsize => ($arg{border} || 0.8) * 0.75;
		1158	}
		1159
		1160	my $self = $class->SUPER::new (
		1161	# label => "",
		1162	fg => [0.6, 0.3, 0.1],
		1163	border => 0.8,
		1164	style => 'single',
		1165	%arg,
		1166	);
		1167
		1168	$self
		1169	}
		1170
		1171	sub add {
		1172	my ($self, @widgets) = @_;
		1173
		1174	$self->SUPER::add (@widgets);
		1175	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1176	}
		1177
		1178	sub border {
		1179	int $_[0]{border} * $::FONTSIZE
		1180	}
		1181
		1182	sub size_request {
		1183	my ($self) = @_;
		1184
		1185	($self->{label_w}, undef) = $self->{label}->size_request
		1186	if $self->{label};
		1187
		1188	my ($w, $h) = $self->SUPER::size_request;
		1189
		1190	(
		1191	$w + $self->border * 2,
		1192	$h + $self->border * 2,
		1193	)
		1194	}
		1195
		1196	sub invoke_size_allocate {
		1197	my ($self, $w, $h) = @_;
		1198
		1199	my $border = $self->border;
		1200
		1201	$w -= List::Util::max 0, $border * 2;
		1202	$h -= List::Util::max 0, $border * 2;
		1203
		1204	if (my $label = $self->{label}) {
		1205	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1206	$label->{h} = List::Util::min $h, $border;
		1207	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1208	}
		1209
		1210	$self->child->configure ($border, $border, $w, $h);
		1211
		1212	1
		1213	}
		1214
		1215	sub _draw {
		1216	my ($self) = @_;
		1217
		1218	my $child = $self->{children}[0];
		1219
		1220	my $border = $self->border;
		1221	my ($w, $h) = ($self->{w}, $self->{h});
		1222
		1223	$child->draw;
		1224
		1225	glColor @{$self->{fg}};
		1226	glBegin GL_LINE_STRIP;
		1227	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1228	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1229	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1230	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1231	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1232	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1233	glEnd;
		1234
		1235	if ($self->{label}) {
		1236	glTranslate $border * 2, 0;
		1237	$self->{label}->_draw;
		1238	}
		1239	}
		1240
		1241	#############################################################################
		1242
		1243	package CFPlus::UI::Toplevel;
		1244
		1245	our @ISA = CFPlus::UI::Bin::;
		1246
		1247	use CFPlus::OpenGL;
1070		1248
1071	my $bg =	1249	my $bg =
1072	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1250	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1073	mipmap => 1, wrap => 1;	1251	mipmap => 1, wrap => 1;
1074		1252
1075	my @border =	1253	my @border =
1076	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1254	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1077	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1255	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1078		1256
1079	sub new {	1257	sub new {
1080	my ($class, %arg) = @_;	1258	my ($class, %arg) = @_;
1081		1259
1082	my $self = $class->SUPER::new (	1260	my $self = $class->SUPER::new (
1083	bg => [1, 1, 1, 1],	1261	bg => [1, 1, 1, 1],
1084	border_bg => [1, 1, 1, 1],	1262	border_bg => [1, 1, 1, 1],
1085	border => 0.6,	1263	border => 0.6,
1086	can_events => 1,	1264	can_events => 1,
1087	min_w => 16,	1265	min_w => 64,
1088	min_h => 16,	1266	min_h => 32,
1089	%arg,	1267	%arg,
1090	);	1268	);
1091		1269
1092	$self->{title_widget} = new CFClient::UI::Label	1270	$self->{title_widget} = new CFPlus::UI::Label
1093	align => 0,	1271	align => 0,
1094	valign => 1,	1272	valign => 1,
1095	text => $self->{title},	1273	text => $self->{title},
1096	fontsize => $self->{border},	1274	fontsize => $self->{border},
1097	if exists $self->{title};	1275	if exists $self->{title};
1098		1276
1099	if ($self->{has_close_button}) {	1277	if ($self->{has_close_button}) {
1100	$self->{close_button} =	1278	$self->{close_button} =
1101	new CFClient::UI::ImageButton	1279	new CFPlus::UI::ImageButton
1102	path => 'x1_close.png',	1280	path => 'x1_close.png',
1103	on_activate => sub { $self->emit ("delete") };	1281	on_activate => sub { $self->emit ("delete") };
1104		1282
1105	$self->CFClient::UI::Container::add ($self->{close_button});	1283	$self->CFPlus::UI::Container::add ($self->{close_button});
1106	}	1284	}
1107		1285
1108	$self	1286	$self
1109	}	1287	}
1110		1288
1111	sub add {	1289	sub add {
1112	my ($self, @widgets) = @_;	1290	my ($self, @widgets) = @_;
1113		1291
1114	$self->SUPER::add (@widgets);	1292	$self->SUPER::add (@widgets);
1115	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1293	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1116	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1294	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1117	}	1295	}
1118		1296
1119	sub border {	1297	sub border {
1120	int $_[0]{border} * $::FONTSIZE	1298	int $_[0]{border} * $::FONTSIZE
1121	}	1299	}
…		…
1229	$self->{motion}->($ev, $x, $y) if $self->{motion};	1407	$self->{motion}->($ev, $x, $y) if $self->{motion};
1230		1408
1231	! ! $self->{motion}	1409	! ! $self->{motion}
1232	}	1410	}
1233		1411
		1412	sub invoke_visibility_change {
		1413	my ($self, $visible) = @_;
		1414
		1415	delete $self->{motion} unless $visible;
		1416
		1417	0
		1418	}
		1419
1234	sub _draw {	1420	sub _draw {
1235	my ($self) = @_;	1421	my ($self) = @_;
1236		1422
1237	my $child = $self->{children}[0];	1423	my $child = $self->{children}[0];
1238		1424
…		…
1275	if $self->{close_button};	1461	if $self->{close_button};
1276	}	1462	}
1277		1463
1278	#############################################################################	1464	#############################################################################
1279		1465
1280	package CFClient::UI::Table;	1466	package CFPlus::UI::Table;
1281		1467
1282	our @ISA = CFClient::UI::Base::;	1468	our @ISA = CFPlus::UI::Base::;
1283		1469
1284	use List::Util qw(max sum);	1470	use List::Util qw(max sum);
1285		1471
1286	use CFClient::OpenGL;	1472	use CFPlus::OpenGL;
1287		1473
1288	sub new {	1474	sub new {
1289	my $class = shift;	1475	my $class = shift;
1290		1476
1291	$class->SUPER::new (	1477	$class->SUPER::new (
…		…
1297	sub children {	1483	sub children {
1298	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1484	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1299	}	1485	}
1300		1486
1301	sub add {	1487	sub add {
1302	my ($self, $x, $y, $child) = @_;	1488	my ($self) = shift;
1303		1489
		1490	while (@_) {
		1491	my ($x, $y, $child) = splice @_, 0, 3, ();
1304	$child->set_parent ($self);	1492	$child->set_parent ($self);
1305	$self->{children}[$y][$x] = $child;	1493	$self->{children}[$y][$x] = $child;
		1494	}
1306		1495
		1496	$self->{force_realloc} = 1;
		1497	$self->{force_size_alloc} = 1;
1307	$self->realloc;	1498	$self->realloc;
1308	}	1499	}
1309		1500
1310	sub remove {	1501	sub remove {
1311	my ($self, $child) = @_;	1502	my ($self, $child) = @_;
…		…
1376		1567
1377	# linearly scale sizes	1568	# linearly scale sizes
1378	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1569	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1379	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1570	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1380		1571
1381	CFClient::UI::harmonize $ws;	1572	CFPlus::UI::harmonize $ws;
1382	CFClient::UI::harmonize $hs;	1573	CFPlus::UI::harmonize $hs;
1383		1574
1384	my $y;	1575	my $y;
1385		1576
1386	for my $r (0 .. $#{$self->{children}}) {	1577	for my $r (0 .. $#{$self->{children}}) {
1387	my $row = $self->{children}[$r]	1578	my $row = $self->{children}[$r]
…		…
1430	}	1621	}
1431	}	1622	}
1432		1623
1433	#############################################################################	1624	#############################################################################
1434		1625
1435	package CFClient::UI::Box;	1626	package CFPlus::UI::Box;
1436		1627
1437	our @ISA = CFClient::UI::Container::;	1628	our @ISA = CFPlus::UI::Container::;
1438		1629
1439	sub size_request {	1630	sub size_request {
1440	my ($self) = @_;	1631	my ($self) = @_;
1441		1632
1442	$self->{vertical}	1633	$self->{vertical}
…		…
1475	$req[$_] += $space * $children[$_]{expand}	1666	$req[$_] += $space * $children[$_]{expand}
1476	for 0 .. $#children;	1667	for 0 .. $#children;
1477	}	1668	}
1478	}	1669	}
1479		1670
1480	CFClient::UI::harmonize \@req;	1671	CFPlus::UI::harmonize \@req;
1481		1672
1482	my $pos = 0;	1673	my $pos = 0;
1483	for (0 .. $#children) {	1674	for (0 .. $#children) {
1484	my $alloc = $req[$_];	1675	my $alloc = $req[$_];
1485	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1676	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1490	1	1681	1
1491	}	1682	}
1492		1683
1493	#############################################################################	1684	#############################################################################
1494		1685
1495	package CFClient::UI::HBox;	1686	package CFPlus::UI::HBox;
1496		1687
1497	our @ISA = CFClient::UI::Box::;	1688	our @ISA = CFPlus::UI::Box::;
1498		1689
1499	sub new {	1690	sub new {
1500	my $class = shift;	1691	my $class = shift;
1501		1692
1502	$class->SUPER::new (	1693	$class->SUPER::new (
…		…
1505	)	1696	)
1506	}	1697	}
1507		1698
1508	#############################################################################	1699	#############################################################################
1509		1700
1510	package CFClient::UI::VBox;	1701	package CFPlus::UI::VBox;
1511		1702
1512	our @ISA = CFClient::UI::Box::;	1703	our @ISA = CFPlus::UI::Box::;
1513		1704
1514	sub new {	1705	sub new {
1515	my $class = shift;	1706	my $class = shift;
1516		1707
1517	$class->SUPER::new (	1708	$class->SUPER::new (
…		…
1520	)	1711	)
1521	}	1712	}
1522		1713
1523	#############################################################################	1714	#############################################################################
1524		1715
1525	package CFClient::UI::Label;	1716	package CFPlus::UI::Label;
1526		1717
1527	our @ISA = CFClient::UI::DrawBG::;	1718	our @ISA = CFPlus::UI::DrawBG::;
1528		1719
1529	use CFClient::OpenGL;	1720	use CFPlus::OpenGL;
1530		1721
1531	sub new {	1722	sub new {
1532	my ($class, %arg) = @_;	1723	my ($class, %arg) = @_;
1533		1724
1534	my $self = $class->SUPER::new (	1725	my $self = $class->SUPER::new (
…		…
1537	#active_bg => none	1728	#active_bg => none
1538	#font => default_font	1729	#font => default_font
1539	#text => initial text	1730	#text => initial text
1540	#markup => initial narkup	1731	#markup => initial narkup
1541	#max_w => maximum pixel width	1732	#max_w => maximum pixel width
		1733	#style => 0, # render flags
1542	ellipsise => 3, # end	1734	ellipsise => 3, # end
1543	layout => (new CFClient::Layout),	1735	layout => (new CFPlus::Layout),
1544	fontsize => 1,	1736	fontsize => 1,
1545	align => -1,	1737	align => -1,
1546	valign => -1,	1738	valign => -1,
1547	padding_x => 2,	1739	padding_x => 2,
1548	padding_y => 2,	1740	padding_y => 2,
1549	can_events => 0,	1741	can_events => 0,
1550	%arg	1742	%arg
1551	);	1743	);
1552		1744
1553	if (exists $self->{template}) {	1745	if (exists $self->{template}) {
1554	my $layout = new CFClient::Layout;	1746	my $layout = new CFPlus::Layout;
1555	$layout->set_text (delete $self->{template});	1747	$layout->set_text (delete $self->{template});
1556	$self->{template} = $layout;	1748	$self->{template} = $layout;
1557	}	1749	}
1558		1750
1559	if (exists $self->{markup}) {	1751	if (exists $self->{markup}) {
…		…
1561	} else {	1753	} else {
1562	$self->set_text (delete $self->{text});	1754	$self->set_text (delete $self->{text});
1563	}	1755	}
1564		1756
1565	$self	1757	$self
1566	}
1567
1568	sub escape($) {
1569	local $_ = $_[0];
1570
1571	s/&/&amp;/g;
1572	s/>/&gt;/g;
1573	s/</&lt;/g;
1574
1575	$_
1576	}	1758	}
1577		1759
1578	sub update {	1760	sub update {
1579	my ($self) = @_;	1761	my ($self) = @_;
1580		1762
…		…
1707	};	1889	};
1708		1890
1709	my $w = List::Util::min $self->{w} + 4, $size->[0];	1891	my $w = List::Util::min $self->{w} + 4, $size->[0];
1710	my $h = List::Util::min $self->{h} + 2, $size->[1];	1892	my $h = List::Util::min $self->{h} + 2, $size->[1];
1711		1893
1712	$self->{layout}->render ($self->{ox}, $self->{oy});	1894	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713	}	1895	}
1714		1896
1715	#############################################################################	1897	#############################################################################
1716		1898
1717	package CFClient::UI::EntryBase;	1899	package CFPlus::UI::EntryBase;
1718		1900
1719	our @ISA = CFClient::UI::Label::;	1901	our @ISA = CFPlus::UI::Label::;
1720		1902
1721	use CFClient::OpenGL;	1903	use CFPlus::OpenGL;
1722		1904
1723	sub new {	1905	sub new {
1724	my $class = shift;	1906	my $class = shift;
1725		1907
1726	$class->SUPER::new (	1908	$class->SUPER::new (
…		…
1730	active_fg => [0, 0, 0],	1912	active_fg => [0, 0, 0],
1731	can_hover => 1,	1913	can_hover => 1,
1732	can_focus => 1,	1914	can_focus => 1,
1733	valign => 0,	1915	valign => 0,
1734	can_events => 1,	1916	can_events => 1,
		1917	ellipsise => 0,
1735	#text => ...	1918	#text => ...
1736	#hidden => "*",	1919	#hidden => "*",
1737	@_	1920	@_
1738	)	1921	)
1739	}	1922	}
…		…
1788		1971
1789	if ($uni == 8) {	1972	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	1974	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
		1981	# what a hack
		1982	$self->{cursor} =
		1983	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1984	? length $1
		1985	: 0;
		1986	} elsif ($sym == CFPlus::SDLK_END) {
		1987	# uh, again
		1988	$self->{cursor} =
		1989	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1990	? $self->{cursor} + length $1
		1991	: length $self->{text};
		1992	} elsif ($uni == 21) { # ctrl-u
		1993	$text = "";
1798	$self->{cursor} = 0;	1994	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {
1800	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	1995	} elsif ($uni == 27) {
1802	$self->emit ('escape');	1996	$self->emit ('escape');
1803	} elsif ($uni) {	1997	} elsif ($uni == 0x0d) {
		1998	substr $text, $self->{cursor}++, 0, "\012";
		1999	} elsif ($uni >= 0x20) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	2000	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	2001	} else {
1806	return 0;	2002	return 0;
1807	}	2003	}
1808		2004
1809	$self->_set_text ($text);	2005	$self->_set_text ($text);
1810		2006
1811	$self->realloc;	2007	$self->realloc;
		2008	$self->update;
1812		2009
1813	1	2010	1
1814	}	2011	}
1815		2012
1816	sub invoke_focus_in {	2013	sub invoke_focus_in {
…		…
1878	utf8::encode $text;	2075	utf8::encode $text;
1879		2076
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2077	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	2078	}
1882		2079
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2080	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2081	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};	2082	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2083	glEnd;
1888	}	2084	}
1889	}	2085	}
1890		2086
		2087	#############################################################################
		2088
1891	package CFClient::UI::Entry;	2089	package CFPlus::UI::Entry;
1892		2090
1893	our @ISA = CFClient::UI::EntryBase::;	2091	our @ISA = CFPlus::UI::EntryBase::;
1894		2092
1895	use CFClient::OpenGL;	2093	use CFPlus::OpenGL;
1896		2094
1897	sub invoke_key_down {	2095	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2096	my ($self, $ev) = @_;
1899		2097
1900	my $sym = $ev->{sym};	2098	my $sym = $ev->{sym};
1901		2099
1902	if ($sym == 13) {	2100	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2101	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2102	my $txt = $self->get_text;
1905		2103
1906	$self->{history_pointer} = -1;	2104	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2105	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2106	$self->emit (activate => $txt);
1909	$self->update;	2107	$self->update;
1910		2108
1911	} elsif ($sym == CFClient::SDLK_UP) {	2109	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2110	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2111	$self->{history_saveback} = $self->get_text;
1914	}	2112	}
1915	if (@{$self->{history} || []} > 0) {	2113	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2114	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2116	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2117	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2118	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2119	}
1922		2120
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2121	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2122	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2123	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2124
1927	if ($self->{history_pointer} >= 0) {	2125	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2126	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2135	1
1938	}	2136	}
1939		2137
1940	#############################################################################	2138	#############################################################################
1941		2139
		2140	package CFPlus::UI::TextEdit;
		2141
		2142	our @ISA = CFPlus::UI::EntryBase::;
		2143
		2144	use CFPlus::OpenGL;
		2145
		2146	sub move_cursor_ver {
		2147	my ($self, $dy) = @_;
		2148
		2149	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2150
		2151	$y += $dy;
		2152
		2153	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2154	$self->{cursor} = $index;
		2155	delete $self->{cur_h};
		2156	$self->update;
		2157	return;
		2158	}
		2159	}
		2160
		2161	sub invoke_key_down {
		2162	my ($self, $ev) = @_;
		2163
		2164	my $sym = $ev->{sym};
		2165
		2166	if ($sym == CFPlus::SDLK_UP) {
		2167	$self->move_cursor_ver (-1);
		2168	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2169	$self->move_cursor_ver (+1);
		2170	} else {
		2171	return $self->SUPER::invoke_key_down ($ev)
		2172	}
		2173
		2174	1
		2175	}
		2176
		2177	#############################################################################
		2178
1942	package CFClient::UI::Button;	2179	package CFPlus::UI::Button;
1943		2180
1944	our @ISA = CFClient::UI::Label::;	2181	our @ISA = CFPlus::UI::Label::;
1945		2182
1946	use CFClient::OpenGL;	2183	use CFPlus::OpenGL;
1947		2184
1948	my @tex =	2185	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2187	qw(b1_button_active.png);
1951		2188
1952	sub new {	2189	sub new {
1953	my $class = shift;	2190	my $class = shift;
1954		2191
…		…
1991	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
1992	}	2229	}
1993		2230
1994	#############################################################################	2231	#############################################################################
1995		2232
		2233	package CFPlus::UI::CheckBox;
		2234
		2235	our @ISA = CFPlus::UI::DrawBG::;
		2236
		2237	my @tex =
		2238	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2239	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2240
		2241	use CFPlus::OpenGL;
		2242
		2243	sub new {
		2244	my $class = shift;
		2245
		2246	$class->SUPER::new (
		2247	padding_x => 2,
		2248	padding_y => 2,
		2249	fg => [1, 1, 1],
		2250	active_fg => [1, 1, 0],
		2251	bg => [0, 0, 0, 0.2],
		2252	active_bg => [1, 1, 1, 0.5],
		2253	state => 0,
		2254	can_hover => 1,
		2255	@_
		2256	)
		2257	}
		2258
		2259	sub size_request {
		2260	my ($self) = @_;
		2261
		2262	(6) x 2
		2263	}
		2264
		2265	sub toggle {
		2266	my ($self) = @_;
		2267
		2268	$self->{state} = !$self->{state};
		2269	$self->emit (changed => $self->{state});
		2270	$self->update;
		2271	}
		2272
		2273	sub invoke_button_down {
		2274	my ($self, $ev, $x, $y) = @_;
		2275
		2276	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2277	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2278	$self->toggle;
		2279	} else {
		2280	return 0
		2281	}
		2282
		2283	1
		2284	}
		2285
		2286	sub _draw {
		2287	my ($self) = @_;
		2288
		2289	$self->SUPER::_draw;
		2290
		2291	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2292
		2293	my ($w, $h) = @$self{qw(w h)};
		2294
		2295	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2296
		2297	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2298
		2299	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2300
		2301	glEnable GL_TEXTURE_2D;
		2302	$tex->draw_quad_alpha (0, 0, $s, $s);
		2303	glDisable GL_TEXTURE_2D;
		2304	}
		2305
		2306	#############################################################################
		2307
		2308	package CFPlus::UI::Image;
		2309
		2310	our @ISA = CFPlus::UI::Base::;
		2311
		2312	use CFPlus::OpenGL;
		2313
		2314	our %texture_cache;
		2315
		2316	sub new {
		2317	my $class = shift;
		2318
		2319	my $self = $class->SUPER::new (
		2320	can_events => 0,
		2321	@_,
		2322	);
		2323
		2324	$self->{path} || $self->{tex}
		2325	or Carp::croak "'path' or 'tex' attributes required";
		2326
		2327	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2328	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2329
		2330	CFPlus::weaken $texture_cache{$self->{path}};
		2331
		2332	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2333
		2334	$self
		2335	}
		2336
		2337	sub STORABLE_freeze {
		2338	my ($self, $cloning) = @_;
		2339
		2340	$self->{path}
		2341	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2342
		2343	$self->{path}
		2344	}
		2345
		2346	sub STORABLE_attach {
		2347	my ($self, $cloning, $path) = @_;
		2348
		2349	$self->new (path => $path)
		2350	}
		2351
		2352	sub size_request {
		2353	my ($self) = @_;
		2354
		2355	($self->{tex}{w}, $self->{tex}{h})
		2356	}
		2357
		2358	sub _draw {
		2359	my ($self) = @_;
		2360
		2361	my $tex = $self->{tex};
		2362
		2363	my ($w, $h) = ($self->{w}, $self->{h});
		2364
		2365	if ($self->{rot90}) {
		2366	glRotate 90, 0, 0, 1;
		2367	glTranslate 0, -$self->{w}, 0;
		2368
		2369	($w, $h) = ($h, $w);
		2370	}
		2371
		2372	glEnable GL_TEXTURE_2D;
		2373	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2374
		2375	$tex->draw_quad (0, 0, $w, $h);
		2376
		2377	glDisable GL_TEXTURE_2D;
		2378	}
		2379
		2380	#############################################################################
		2381
1996	package CFClient::UI::ImageButton;	2382	package CFPlus::UI::ImageButton;
1997		2383
1998	our @ISA = CFClient::UI::Image::;	2384	our @ISA = CFPlus::UI::Image::;
1999		2385
2000	use CFClient::OpenGL;	2386	use CFPlus::OpenGL;
2001		2387
2002	my %textures;	2388	my %textures;
2003		2389
2004	sub new {	2390	sub new {
2005	my $class = shift;	2391	my $class = shift;
…		…
2027	1	2413	1
2028	}	2414	}
2029		2415
2030	#############################################################################	2416	#############################################################################
2031		2417
2032	package CFClient::UI::CheckBox;
2033
2034	our @ISA = CFClient::UI::DrawBG::;
2035
2036	my @tex =
2037	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040	use CFClient::OpenGL;
2041
2042	sub new {
2043	my $class = shift;
2044
2045	$class->SUPER::new (
2046	padding_x => 2,
2047	padding_y => 2,
2048	fg => [1, 1, 1],
2049	active_fg => [1, 1, 0],
2050	bg => [0, 0, 0, 0.2],
2051	active_bg => [1, 1, 1, 0.5],
2052	state => 0,
2053	can_hover => 1,
2054	@_
2055	)
2056	}
2057
2058	sub size_request {
2059	my ($self) = @_;
2060
2061	(6) x 2
2062	}
2063
2064	sub toggle {
2065	my ($self) = @_;
2066
2067	$self->{state} = !$self->{state};
2068	$self->emit (changed => $self->{state});
2069	$self->update;
2070	}
2071
2072	sub invoke_button_down {
2073	my ($self, $ev, $x, $y) = @_;
2074
2075	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2076	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2077	$self->toggle;
2078	} else {
2079	return 0
2080	}
2081
2082	1
2083	}
2084
2085	sub _draw {
2086	my ($self) = @_;
2087
2088	$self->SUPER::_draw;
2089
2090	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2091
2092	my ($w, $h) = @$self{qw(w h)};
2093
2094	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2095
2096	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2097
2098	my $tex = $self->{state} ? $tex[1] : $tex[0];
2099
2100	glEnable GL_TEXTURE_2D;
2101	$tex->draw_quad_alpha (0, 0, $s, $s);
2102	glDisable GL_TEXTURE_2D;
2103	}
2104
2105	#############################################################################
2106
2107	package CFClient::UI::Image;	2418	package CFPlus::UI::VGauge;
2108		2419
2109	our @ISA = CFClient::UI::Base::;	2420	our @ISA = CFPlus::UI::Base::;
2110
2111	use CFClient::OpenGL;
2112
2113	our %texture_cache;
2114
2115	sub new {
2116	my $class = shift;
2117
2118	my $self = $class->SUPER::new (
2119	can_events => 0,
2120	@_,
2121	);
2122
2123	$self->{path}
2124	or Carp::croak "required attribute 'path' not set";
2125
2126	$self->{tex} = $texture_cache{$self->{path}} ||=
2127	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2128
2129	Scalar::Util::weaken $texture_cache{$self->{path}};
2130
2131	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2132
2133	$self
2134	}
2135
2136	sub size_request {
2137	my ($self) = @_;
2138
2139	($self->{tex}{w}, $self->{tex}{h})
2140	}
2141
2142	sub _draw {
2143	my ($self) = @_;
2144
2145	my $tex = $self->{tex};
2146
2147	my ($w, $h) = ($self->{w}, $self->{h});
2148
2149	if ($self->{rot90}) {
2150	glRotate 90, 0, 0, 1;
2151	glTranslate 0, -$self->{w}, 0;
2152
2153	($w, $h) = ($h, $w);
2154	}
2155
2156	glEnable GL_TEXTURE_2D;
2157	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158
2159	$tex->draw_quad_alpha (0, 0, $w, $h);
2160
2161	glDisable GL_TEXTURE_2D;
2162	}
2163
2164	#############################################################################
2165
2166	package CFClient::UI::VGauge;
2167
2168	our @ISA = CFClient::UI::Base::;
2169		2421
2170	use List::Util qw(min max);	2422	use List::Util qw(min max);
2171		2423
2172	use CFClient::OpenGL;	2424	use CFPlus::OpenGL;
2173		2425
2174	my %tex = (	2426	my %tex = (
2175	food => [	2427	food => [
2176	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2428	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2429	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2178	],	2430	],
2179	grace => [	2431	grace => [
2180	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2432	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2181	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2433	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2182	],	2434	],
2183	hp => [	2435	hp => [
2184	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2436	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2185	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2437	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2186	],	2438	],
2187	mana => [	2439	mana => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2440	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2441	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2190	],	2442	],
2191	);	2443	);
2192		2444
2193	# eg. VGauge->new (gauge => 'food'), default gauge: food	2445	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2296	glDisable GL_TEXTURE_2D;	2548	glDisable GL_TEXTURE_2D;
2297	}	2549	}
2298		2550
2299	#############################################################################	2551	#############################################################################
2300		2552
2301	package CFClient::UI::Gauge;	2553	package CFPlus::UI::Gauge;
2302		2554
2303	our @ISA = CFClient::UI::VBox::;	2555	our @ISA = CFPlus::UI::VBox::;
2304		2556
2305	sub new {	2557	sub new {
2306	my ($class, %arg) = @_;	2558	my ($class, %arg) = @_;
2307		2559
2308	my $self = $class->SUPER::new (	2560	my $self = $class->SUPER::new (
…		…
2310	can_hover => 1,	2562	can_hover => 1,
2311	can_events => 1,	2563	can_events => 1,
2312	%arg,	2564	%arg,
2313	);	2565	);
2314		2566
2315	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2567	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2316	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2568	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2317	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2569	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2318		2570
2319	$self	2571	$self
2320	}	2572	}
2321		2573
2322	sub set_fontsize {	2574	sub set_fontsize {
…		…
2343	$self->{value}->set_text ($val);	2595	$self->{value}->set_text ($val);
2344	}	2596	}
2345		2597
2346	#############################################################################	2598	#############################################################################
2347		2599
2348	package CFClient::UI::Slider;	2600	package CFPlus::UI::Slider;
2349		2601
2350	use strict;	2602	use strict;
2351		2603
2352	use CFClient::OpenGL;	2604	use CFPlus::OpenGL;
2353		2605
2354	our @ISA = CFClient::UI::DrawBG::;	2606	our @ISA = CFPlus::UI::DrawBG::;
2355		2607
2356	my @tex =	2608	my @tex =
2357	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2609	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2358	qw(s1_slider.png s1_slider_bg.png);	2610	qw(s1_slider.png s1_slider_bg.png);
2359		2611
2360	sub new {	2612	sub new {
2361	my $class = shift;	2613	my $class = shift;
2362		2614
…		…
2451	}	2703	}
2452		2704
2453	1	2705	1
2454	}	2706	}
2455		2707
		2708	sub invoke_mouse_wheel {
		2709	my ($self, $ev) = @_;
		2710
		2711	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2712
		2713	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2714
		2715	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2716
		2717	! ! $delta
		2718	}
		2719
2456	sub update {	2720	sub update {
2457	my ($self) = @_;	2721	my ($self) = @_;
2458		2722
2459	delete $self->{knob_w};	2723	delete $self->{knob_w};
2460	$self->SUPER::update;	2724	$self->SUPER::update;
…		…
2507	glDisable GL_TEXTURE_2D;	2771	glDisable GL_TEXTURE_2D;
2508	}	2772	}
2509		2773
2510	#############################################################################	2774	#############################################################################
2511		2775
2512	package CFClient::UI::ValSlider;	2776	package CFPlus::UI::ValSlider;
2513		2777
2514	our @ISA = CFClient::UI::HBox::;	2778	our @ISA = CFPlus::UI::HBox::;
2515		2779
2516	sub new {	2780	sub new {
2517	my ($class, %arg) = @_;	2781	my ($class, %arg) = @_;
2518		2782
2519	my $range = delete $arg{range};	2783	my $range = delete $arg{range};
2520		2784
2521	my $self = $class->SUPER::new (	2785	my $self = $class->SUPER::new (
2522	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2786	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2523	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2787	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2524	to_value => sub { shift },	2788	to_value => sub { shift },
2525	from_value => sub { shift },	2789	from_value => sub { shift },
2526	%arg,	2790	%arg,
2527	);	2791	);
2528		2792
…		…
2548	sub set_range { shift->{slider}->set_range (@_) }	2812	sub set_range { shift->{slider}->set_range (@_) }
2549	sub set_value { shift->{slider}->set_value (@_) }	2813	sub set_value { shift->{slider}->set_value (@_) }
2550		2814
2551	#############################################################################	2815	#############################################################################
2552		2816
2553	package CFClient::UI::TextScroller;	2817	package CFPlus::UI::TextScroller;
2554		2818
2555	our @ISA = CFClient::UI::HBox::;	2819	our @ISA = CFPlus::UI::HBox::;
2556		2820
2557	use CFClient::OpenGL;	2821	use CFPlus::OpenGL;
2558		2822
2559	sub new {	2823	sub new {
2560	my $class = shift;	2824	my $class = shift;
2561		2825
2562	my $self = $class->SUPER::new (	2826	my $self = $class->SUPER::new (
2563	fontsize => 1,	2827	fontsize => 1,
2564	can_events => 0,	2828	can_events => 1,
2565	indent => 0,	2829	indent => 0,
2566	#font => default_font	2830	#font => default_font
2567	@_,	2831	@_,
2568		2832
2569	layout => (new CFClient::Layout),	2833	layout => (new CFPlus::Layout),
2570	par => [],	2834	par => [],
		2835	max_par => 0,
2571	height => 0,	2836	height => 0,
2572	children => [	2837	children => [
2573	(new CFClient::UI::Empty expand => 1),	2838	(new CFPlus::UI::Empty expand => 1),
2574	(new CFClient::UI::Slider vertical => 1),	2839	(new CFPlus::UI::Slider vertical => 1),
2575	],	2840	],
2576	);	2841	);
2577		2842
2578	$self->{children}[1]->connect (changed => sub { $self->update });	2843	$self->{children}[1]->connect (changed => sub { $self->update });
2579		2844
…		…
2609		2874
2610	$self->reflow;	2875	$self->reflow;
2611		2876
2612	local $self->{children} = [$empty, $slider];	2877	local $self->{children} = [$empty, $slider];
2613	$self->SUPER::invoke_size_allocate ($w, $h)	2878	$self->SUPER::invoke_size_allocate ($w, $h)
		2879	}
		2880
		2881	sub invoke_mouse_wheel {
		2882	my ($self, $ev) = @_;
		2883
		2884	return 0 unless $ev->{dy}; # only vertical movements
		2885
		2886	$self->{children}[1]->emit (mouse_wheel => $ev);
		2887
		2888	1
2614	}	2889	}
2615		2890
2616	sub get_layout {	2891	sub get_layout {
2617	my ($self, $para) = @_;	2892	my ($self, $para) = @_;
2618		2893
…		…
2646		2921
2647	# todo: base offset on lines or so, not on pixels	2922	# todo: base offset on lines or so, not on pixels
2648	$self->{children}[1]->set_value ($offset);	2923	$self->{children}[1]->set_value ($offset);
2649	}	2924	}
2650		2925
		2926	sub current_paragraph {
		2927	my ($self) = @_;
		2928
		2929	$self->{top_paragraph} - 1
		2930	}
		2931
		2932	sub scroll_to {
		2933	my ($self, $para) = @_;
		2934
		2935	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2936
		2937	$self->{scroll_to} = $para;
		2938	$self->update;
		2939	}
		2940
2651	sub clear {	2941	sub clear {
2652	my ($self) = @_;	2942	my ($self) = @_;
2653		2943
2654	my (undef, undef, @other) = @{ $self->{children} };	2944	my (undef, undef, @other) = @{ $self->{children} };
2655	$self->remove ($_) for @other;	2945	$self->remove ($_) for @other;
…		…
2658	$self->{height} = 0;	2948	$self->{height} = 0;
2659	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2949	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2660	}	2950	}
2661		2951
2662	sub add_paragraph {	2952	sub add_paragraph {
2663	my ($self, $color, $para, $indent) = @_;	2953	my $self = shift;
2664		2954
2665	my ($text, @w) = ref $para ? @$para : $para;	2955	for my $para (@_) {
2666
2667	$para = {	2956	$para = {
		2957	fg => [1, 1, 1, 1],
		2958	indent => 0,
		2959	markup => "",
		2960	widget => [],
		2961	ref $para ? %$para : (markup => $para),
2668	w => 1e10,	2962	w => 1e10,
2669	wrapped => 1,	2963	wrapped => 1,
2670	fg => $color,
2671	indent => $indent,
2672	markup => $text,
2673	widget => \@w,
2674	};	2964	};
2675		2965
2676	$self->add (@w) if @w;	2966	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2677	push @{$self->{par}}, $para;	2967	push @{$self->{par}}, $para;
		2968	}
		2969
		2970	if (my $max = $self->{max_par}) {
		2971	shift @{$self->{par}} while @{$self->{par}} > $max;
		2972	}
2678		2973
2679	$self->{need_reflow}++;	2974	$self->{need_reflow}++;
2680	$self->update;	2975	$self->update;
2681	}	2976	}
2682		2977
2683	sub scroll_to_bottom {	2978	sub scroll_to_bottom {
2684	my ($self) = @_;	2979	my ($self) = @_;
2685		2980
2686	$self->{scroll_to_bottom} = 1;	2981	$self->{scroll_to} = $#{$self->{par}};
2687	$self->update;	2982	$self->update;
2688	}	2983	}
2689		2984
		2985	sub force_uptodate {
		2986	my ($self) = @_;
		2987
		2988	if (delete $self->{need_reflow}) {
		2989	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2990
		2991	my $height = 0;
		2992
		2993	for my $para (@{$self->{par}}) {
		2994	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2995	my $layout = $self->get_layout ($para);
		2996	my ($w, $h) = $layout->size;
		2997
		2998	$para->{w} = $w + $para->{indent};
		2999	$para->{h} = $h;
		3000	$para->{wrapped} = $layout->has_wrapped;
		3001	}
		3002
		3003	$para->{y} = $height;
		3004	$height += $para->{h};
		3005	}
		3006
		3007	$self->{height} = $height;
		3008	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3009
		3010	delete $self->{texture};
		3011	}
		3012
		3013	if (my $paridx = delete $self->{scroll_to}) {
		3014	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3015	}
		3016	}
		3017
2690	sub update {	3018	sub update {
2691	my ($self) = @_;	3019	my ($self) = @_;
2692		3020
2693	$self->SUPER::update;	3021	$self->SUPER::update;
2694		3022
2695	return unless $self->{h} > 0;	3023	return unless $self->{h} > 0;
2696		3024
2697	delete $self->{texture};	3025	delete $self->{texture};
2698		3026
2699	$ROOT->on_post_alloc ($self => sub {	3027	$ROOT->on_post_alloc ($self => sub {
		3028	$self->force_uptodate;
		3029
2700	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3030	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2701		3031
2702	if (delete $self->{need_reflow}) {
2703	my $height = 0;
2704
2705	for my $para (@{$self->{par}}) {
2706	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2707	my $layout = $self->get_layout ($para);
2708	my ($w, $h) = $layout->size;
2709
2710	$para->{w} = $w + $para->{indent};
2711	$para->{h} = $h;
2712	$para->{wrapped} = $layout->has_wrapped;
2713	}
2714
2715	$height += $para->{h};
2716	}
2717
2718	$self->{height} = $height;
2719
2720	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2721
2722	delete $self->{texture};
2723	}
2724
2725	if (delete $self->{scroll_to_bottom}) {
2726	$self->{children}[1]->set_value (1e10);
2727	}
2728
2729	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3032	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2730	glClearColor 0, 0, 0, 0;	3033	glClearColor 0, 0, 0, 0;
2731	glClear GL_COLOR_BUFFER_BIT;	3034	glClear GL_COLOR_BUFFER_BIT;
2732		3035
		3036	package CFPlus::UI::Base;
		3037	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3038	(0, 0, $self->{w}, $self->{h});
		3039
		3040	my $top = int $self->{children}[1]{range}[0];
		3041
		3042	my $paridx = 0;
		3043	my $top_paragraph;
2733	my $top = int $self->{children}[1]{range}[0];	3044	my $top = int $self->{children}[1]{range}[0];
2734		3045
2735	my $y0 = $top;	3046	my $y0 = $top;
2736	my $y1 = $top + $H;	3047	my $y1 = $top + $H;
2737		3048
2738	my $y = 0;
2739
2740	for my $para (@{$self->{par}}) {	3049	for my $para (@{$self->{par}}) {
2741	my $h = $para->{h};	3050	my $h = $para->{h};
		3051	my $y = $para->{y};
2742		3052
2743	if ($y0 < $y + $h && $y < $y1) {	3053	if ($y0 < $y + $h && $y < $y1) {
2744
2745	my $layout = $self->get_layout ($para);	3054	my $layout = $self->get_layout ($para);
2746		3055
2747	$layout->render ($para->{indent}, $y - $y0);	3056	$layout->render ($para->{indent}, $y - $y0);
2748		3057
2749	if (my @w = @{ $para->{widget} }) {	3058	if (my @w = @{ $para->{widget} }) {
…		…
2758	$_->draw;	3067	$_->draw;
2759	}	3068	}
2760	}	3069	}
2761	}	3070	}
2762		3071
2763	$y += $h;	3072	$paridx++;
		3073	$top_paragraph ||= $paridx if $y >= $top;
2764	}	3074	}
		3075
		3076	$self->{top_paragraph} = $top_paragraph;
2765	};	3077	};
2766	});	3078	});
2767	}	3079	}
2768		3080
2769	sub reconfigure {	3081	sub reconfigure {
…		…
2787	$self->{children}[1]->draw;	3099	$self->{children}[1]->draw;
2788	}	3100	}
2789		3101
2790	#############################################################################	3102	#############################################################################
2791		3103
2792	package CFClient::UI::Animator;	3104	package CFPlus::UI::Animator;
2793		3105
2794	use CFClient::OpenGL;	3106	use CFPlus::OpenGL;
2795		3107
2796	our @ISA = CFClient::UI::Bin::;	3108	our @ISA = CFPlus::UI::Bin::;
2797		3109
2798	sub moveto {	3110	sub moveto {
2799	my ($self, $x, $y) = @_;	3111	my ($self, $x, $y) = @_;
2800		3112
2801	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3113	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2829	glPopMatrix;	3141	glPopMatrix;
2830	}	3142	}
2831		3143
2832	#############################################################################	3144	#############################################################################
2833		3145
2834	package CFClient::UI::Flopper;	3146	package CFPlus::UI::Flopper;
2835		3147
2836	our @ISA = CFClient::UI::Button::;	3148	our @ISA = CFPlus::UI::Button::;
2837		3149
2838	sub new {	3150	sub new {
2839	my $class = shift;	3151	my $class = shift;
2840		3152
2841	my $self = $class->SUPER::new (	3153	my $self = $class->SUPER::new (
…		…
2853	$self->{other}->toggle_visibility;	3165	$self->{other}->toggle_visibility;
2854	}	3166	}
2855		3167
2856	#############################################################################	3168	#############################################################################
2857		3169
2858	package CFClient::UI::Tooltip;	3170	package CFPlus::UI::Tooltip;
2859		3171
2860	our @ISA = CFClient::UI::Bin::;	3172	our @ISA = CFPlus::UI::Bin::;
2861		3173
2862	use CFClient::OpenGL;	3174	use CFPlus::OpenGL;
2863		3175
2864	sub new {	3176	sub new {
2865	my $class = shift;	3177	my $class = shift;
2866		3178
2867	$class->SUPER::new (	3179	$class->SUPER::new (
…		…
2870	)	3182	)
2871	}	3183	}
2872		3184
2873	sub set_tooltip_from {	3185	sub set_tooltip_from {
2874	my ($self, $widget) = @_;	3186	my ($self, $widget) = @_;
		3187
		3188	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3189	if $widget->{tooltip} =~ /^#(.*)$/;
2875		3190
2876	my $tooltip = $widget->{tooltip};	3191	my $tooltip = $widget->{tooltip};
2877		3192
2878	if ($ENV{CFPLUS_DEBUG} & 2) {	3193	if ($ENV{CFPLUS_DEBUG} & 2) {
2879	$tooltip .= "\n\n" . (ref $widget) . "\n"	3194	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2883	}	3198	}
2884		3199
2885	$tooltip =~ s/^\n+//;	3200	$tooltip =~ s/^\n+//;
2886	$tooltip =~ s/\n+$//;	3201	$tooltip =~ s/\n+$//;
2887		3202
2888	$self->add (new CFClient::UI::Label	3203	$self->add (new CFPlus::UI::Label
2889	markup => $tooltip,	3204	markup => $tooltip,
2890	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3205	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891	fontsize => 0.8,	3206	fontsize => 0.8,
2892	fg => [0, 0, 0, 1],	3207	style => 1, # FLAG_INVERSE
2893	ellipsise => 0,	3208	ellipsise => 0,
2894	font => ($widget->{tooltip_font} || $::FONT_PROP),	3209	font => ($widget->{tooltip_font} || $::FONT_PROP),
2895	);	3210	);
2896	}	3211	}
2897		3212
…		…
2916		3231
2917	$self->{root}->on_post_alloc ("move_$self" => sub {	3232	$self->{root}->on_post_alloc ("move_$self" => sub {
2918	my $widget = $self->{owner}	3233	my $widget = $self->{owner}
2919	or return;	3234	or return;
2920		3235
		3236	if ($widget->{visible}) {
2921	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3237	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922		3238
2923	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3239	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924	if $x + $self->{w} > $self->{root}{w};	3240	if $x + $self->{w} > $self->{root}{w};
2925		3241
2926	$self->move_abs ($x, $y);	3242	$self->move_abs ($x, $y);
		3243	} else {
		3244	$self->hide;
		3245	}
2927	});	3246	});
2928	}	3247	}
2929		3248
2930	sub _draw {	3249	sub _draw {
2931	my ($self) = @_;	3250	my ($self) = @_;
…		…
2955	$self->SUPER::_draw;	3274	$self->SUPER::_draw;
2956	}	3275	}
2957		3276
2958	#############################################################################	3277	#############################################################################
2959		3278
2960	package CFClient::UI::Face;	3279	package CFPlus::UI::Face;
2961		3280
2962	our @ISA = CFClient::UI::Base::;	3281	our @ISA = CFPlus::UI::DrawBG::;
2963		3282
2964	use CFClient::OpenGL;	3283	use CFPlus::OpenGL;
2965		3284
2966	sub new {	3285	sub new {
2967	my $class = shift;	3286	my $class = shift;
2968		3287
2969	my $self = $class->SUPER::new (	3288	my $self = $class->SUPER::new (
…		…
2971	can_events => 0,	3290	can_events => 0,
2972	@_,	3291	@_,
2973	);	3292	);
2974		3293
2975	if ($self->{anim} && $self->{animspeed}) {	3294	if ($self->{anim} && $self->{animspeed}) {
2976	Scalar::Util::weaken (my $widget = $self);	3295	CFPlus::weaken (my $widget = $self);
2977		3296
2978	$self->{timer} = Event->timer (	3297	$self->{timer} = Event->timer (
2979	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3298	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980	hard => 1,	3299	hard => 1,
2981	interval => $self->{animspeed},	3300	interval => $self->{animspeed},
…		…
3004	sub _draw {	3323	sub _draw {
3005	my ($self) = @_;	3324	my ($self) = @_;
3006		3325
3007	return unless $::CONN;	3326	return unless $::CONN;
3008		3327
		3328	$self->SUPER::_draw;
		3329
3009	my $face;	3330	my $face;
3010		3331
3011	if ($self->{frame}) {	3332	if ($self->{frame}) {
3012	my $anim = $::CONN->{anim}[$self->{anim}];	3333	my $anim = $::CONN->{anim}[$self->{anim}];
3013		3334
…		…
3035	$self->SUPER::destroy;	3356	$self->SUPER::destroy;
3036	}	3357	}
3037		3358
3038	#############################################################################	3359	#############################################################################
3039		3360
3040	package CFClient::UI::Buttonbar;	3361	package CFPlus::UI::Buttonbar;
3041		3362
3042	our @ISA = CFClient::UI::HBox::;	3363	our @ISA = CFPlus::UI::HBox::;
3043		3364
3044	# TODO: should actualyl wrap buttons and other goodies.	3365	# TODO: should actually wrap buttons and other goodies.
3045		3366
3046	#############################################################################	3367	#############################################################################
3047		3368
3048	package CFClient::UI::Menu;	3369	package CFPlus::UI::Menu;
3049		3370
3050	our @ISA = CFClient::UI::FancyFrame::;	3371	our @ISA = CFPlus::UI::Toplevel::;
3051		3372
3052	use CFClient::OpenGL;	3373	use CFPlus::OpenGL;
3053		3374
3054	sub new {	3375	sub new {
3055	my $class = shift;	3376	my $class = shift;
3056		3377
3057	my $self = $class->SUPER::new (	3378	my $self = $class->SUPER::new (
3058	items => [],	3379	items => [],
3059	z => 100,	3380	z => 100,
3060	@_,	3381	@_,
3061	);	3382	);
3062		3383
3063	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3384	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064		3385
3065	for my $item (@{ $self->{items} }) {	3386	for my $item (@{ $self->{items} }) {
3066	my ($widget, $cb, $tooltip) = @$item;	3387	my ($widget, $cb, $tooltip) = @$item;
3067		3388
3068	# handle various types of items, only text for now	3389	# handle various types of items, only text for now
3069	if (!ref $widget) {	3390	if (!ref $widget) {
3070	if ($widget =~ /\t/) {	3391	if ($widget =~ /\t/) {
3071	my ($left, $right) = split /\t/, $widget, 2;	3392	my ($left, $right) = split /\t/, $widget, 2;
3072		3393
3073	$widget = new CFClient::UI::HBox	3394	$widget = new CFPlus::UI::HBox
3074	can_hover => 1,	3395	can_hover => 1,
3075	can_events => 1,	3396	can_events => 1,
3076	tooltip => $tooltip,	3397	tooltip => $tooltip,
3077	children => [	3398	children => [
3078	(new CFClient::UI::Label markup => $left, expand => 1),	3399	(new CFPlus::UI::Label markup => $left, expand => 1),
3079	(new CFClient::UI::Label markup => $right, align => +1),	3400	(new CFPlus::UI::Label markup => $right, align => +1),
3080	],	3401	],
3081	;	3402	;
3082		3403
3083	} else {	3404	} else {
3084	$widget = new CFClient::UI::Label	3405	$widget = new CFPlus::UI::Label
3085	can_hover => 1,	3406	can_hover => 1,
3086	can_events => 1,	3407	can_events => 1,
3087	markup => $widget,	3408	markup => $widget,
3088	tooltip => $tooltip;	3409	tooltip => $tooltip;
3089	}	3410	}
…		…
3137	1	3458	1
3138	}	3459	}
3139		3460
3140	#############################################################################	3461	#############################################################################
3141		3462
3142	package CFClient::UI::Multiplexer;	3463	package CFPlus::UI::Multiplexer;
3143		3464
3144	our @ISA = CFClient::UI::Container::;	3465	our @ISA = CFPlus::UI::Container::;
3145		3466
3146	sub new {	3467	sub new {
3147	my $class = shift;	3468	my $class = shift;
3148		3469
3149	my $self = $class->SUPER::new (	3470	my $self = $class->SUPER::new (
…		…
3210	$self->{current}->draw;	3531	$self->{current}->draw;
3211	}	3532	}
3212		3533
3213	#############################################################################	3534	#############################################################################
3214		3535
3215	package CFClient::UI::Notebook;	3536	package CFPlus::UI::Notebook;
3216		3537
3217	our @ISA = CFClient::UI::VBox::;	3538	our @ISA = CFPlus::UI::VBox::;
3218		3539
3219	sub new {	3540	sub new {
3220	my $class = shift;	3541	my $class = shift;
3221		3542
3222	my $self = $class->SUPER::new (	3543	my $self = $class->SUPER::new (
3223	buttonbar => (new CFClient::UI::Buttonbar),	3544	buttonbar => (new CFPlus::UI::Buttonbar),
3224	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3545	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3225	# filter => # will be put between multiplexer and $self	3546	# filter => # will be put between multiplexer and $self
3226	@_,	3547	@_,
3227	);	3548	);
3228		3549
3229	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3550	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3233	}	3554	}
3234		3555
3235	sub add {	3556	sub add {
3236	my ($self, $title, $widget, $tooltip) = @_;	3557	my ($self, $title, $widget, $tooltip) = @_;
3237		3558
3238	Scalar::Util::weaken $self;	3559	CFPlus::weaken $self;
3239		3560
3240	$self->{buttonbar}->add (new CFClient::UI::Button	3561	$self->{buttonbar}->add (new CFPlus::UI::Button
3241	markup => $title,	3562	markup => $title,
3242	tooltip => $tooltip,	3563	tooltip => $tooltip,
3243	on_activate => sub { $self->set_current_page ($widget) },	3564	on_activate => sub { $self->set_current_page ($widget) },
3244	);	3565	);
3245		3566
…		…
3259	$self->emit (page_changed => $self->{multiplexer}{current});	3580	$self->emit (page_changed => $self->{multiplexer}{current});
3260	}	3581	}
3261		3582
3262	#############################################################################	3583	#############################################################################
3263		3584
3264	package CFClient::UI::Combobox;	3585	package CFPlus::UI::Selector;
3265		3586
3266	use utf8;	3587	use utf8;
3267		3588
3268	our @ISA = CFClient::UI::Button::;	3589	our @ISA = CFPlus::UI::Button::;
3269		3590
3270	sub new {	3591	sub new {
3271	my $class = shift;	3592	my $class = shift;
3272		3593
3273	my $self = $class->SUPER::new (	3594	my $self = $class->SUPER::new (
…		…
3290	my ($value, $title, $tooltip) = @$_;	3611	my ($value, $title, $tooltip) = @$_;
3291		3612
3292	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3613	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293	}	3614	}
3294		3615
3295	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3616	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296	}	3617	}
3297		3618
3298	sub _set_value {	3619	sub _set_value {
3299	my ($self, $value) = @_;	3620	my ($self, $value) = @_;
3300		3621
…		…
3315	$self->emit (changed => $value);	3636	$self->emit (changed => $value);
3316	}	3637	}
3317		3638
3318	#############################################################################	3639	#############################################################################
3319		3640
3320	package CFClient::UI::Statusbox;	3641	package CFPlus::UI::Statusbox;
3321		3642
3322	our @ISA = CFClient::UI::VBox::;	3643	our @ISA = CFPlus::UI::VBox::;
3323		3644
3324	sub new {	3645	sub new {
3325	my $class = shift;	3646	my $class = shift;
3326		3647
3327	my $self = $class->SUPER::new (	3648	my $self = $class->SUPER::new (
3328	fontsize => 0.8,	3649	fontsize => 0.8,
3329	@_,	3650	@_,
3330	);	3651	);
3331		3652
3332	Scalar::Util::weaken (my $this = $self);	3653	CFPlus::weaken (my $this = $self);
3333		3654
3334	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3655	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3335		3656
3336	$self	3657	$self
3337	}	3658	}
…		…
3339	sub reorder {	3660	sub reorder {
3340	my ($self) = @_;	3661	my ($self) = @_;
3341	my $NOW = Time::HiRes::time;	3662	my $NOW = Time::HiRes::time;
3342		3663
3343	# freeze display when hovering over any label	3664	# freeze display when hovering over any label
3344	return if $CFClient::UI::TOOLTIP->{owner}	3665	return if $CFPlus::UI::TOOLTIP->{owner}
3345	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3666	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3346	values %{ $self->{item} };	3667	values %{ $self->{item} };
3347		3668
3348	while (my ($k, $v) = each %{ $self->{item} }) {	3669	while (my ($k, $v) = each %{ $self->{item} }) {
3349	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3670	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3350	}	3671	}
…		…
3371	for ($short) {	3692	for ($short) {
3372	s/^\s+//;	3693	s/^\s+//;
3373	s/\s+/ /g;	3694	s/\s+/ /g;
3374	}	3695	}
3375		3696
3376	new CFClient::UI::Label	3697	new CFPlus::UI::Label
3377	markup => $short,	3698	markup => $short,
3378	tooltip => $item->{tooltip},	3699	tooltip => $item->{tooltip},
3379	tooltip_font => $::FONT_PROP,	3700	tooltip_font => $::FONT_PROP,
3380	tooltip_width => 0.67,	3701	tooltip_width => 0.67,
3381	fontsize => $item->{fontsize} || $self->{fontsize},	3702	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3460	$self->SUPER::destroy;	3781	$self->SUPER::destroy;
3461	}	3782	}
3462		3783
3463	#############################################################################	3784	#############################################################################
3464		3785
3465	package CFClient::UI::Inventory;
3466
3467	our @ISA = CFClient::UI::Table::;
3468
3469	sub new {
3470	my $class = shift;
3471
3472	my $self = $class->SUPER::new (
3473	col_expand => [0, 1, 0],
3474	@_,
3475	);
3476
3477	$self
3478	}
3479
3480	sub set_items {
3481	my ($self, $items) = @_;
3482
3483	$self->clear;
3484	return unless $items;
3485
3486	my @items = sort {
3487	($a->{type} <=> $b->{type})
3488	or ($a->{name} cmp $b->{name})
3489	} values %$items;
3490
3491	$self->{real_items} = \@items;
3492
3493	my $row = 0;
3494	for my $item (@items) {
3495	CFClient::Item::update_widgets $item;
3496
3497	$self->add (0, $row, $item->{face_widget});
3498	$self->add (1, $row, $item->{desc_widget});
3499	$self->add (2, $row, $item->{weight_widget});
3500
3501	$row++;
3502	}
3503	}
3504
3505	#############################################################################
3506
3507	package CFClient::UI::SpellList;
3508
3509	our @ISA = CFClient::UI::Table::;
3510
3511	sub new {
3512	my $class = shift;
3513
3514	my $self = $class->SUPER::new (
3515	binding => [],
3516	commands => [],
3517	@_,
3518	)
3519	}
3520
3521	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3522
3523	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3525	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3526	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3527	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3529	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3531	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3532	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3533
3534	sub rebuild_spell_list {
3535	my ($self) = @_;
3536
3537	$CFClient::UI::ROOT->on_refresh ($self => sub {
3538	$self->clear;
3539
3540	return unless $::CONN;
3541
3542	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3543	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3544	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3545	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3546	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3547
3548	my $row = 0;
3549
3550	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3551	my $spell = $self->{spell}{$_};
3552
3553	$row++;
3554
3555	my $spell_cb = sub {
3556	my ($widget, $ev) = @_;
3557
3558	if ($ev->{button} == 1) {
3559	$::CONN->user_send ("cast $spell->{name}");
3560	} elsif ($ev->{button} == 2) {
3561	$::CONN->user_send ("invoke $spell->{name}");
3562	} elsif ($ev->{button} == 3) {
3563	(new CFClient::UI::Menu
3564	items => [
3565	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3566	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3567	],
3568	)->popup ($ev);
3569	} else {
3570	return 0;
3571	}
3572
3573	1
3574	};
3575
3576	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3577
3578	#TODO: add path info to tooltip
3579	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3580
3581	$self->add (0, $row, new CFClient::UI::Face
3582	face => $spell->{face},
3583	can_hover => 1,
3584	can_events => 1,
3585	tooltip => $tooltip,
3586	on_button_down => $spell_cb,
3587	);
3588
3589	$self->add (1, $row, new CFClient::UI::Label
3590	expand => 1,
3591	text => $spell->{name},
3592	can_hover => 1,
3593	can_events => 1,
3594	tooltip => $tooltip,
3595	on_button_down => $spell_cb,
3596	);
3597
3598	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3599	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3600	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3601	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3602	}
3603	});
3604	}
3605
3606	sub add_spell {
3607	my ($self, $spell) = @_;
3608
3609	$self->{spell}->{$spell->{name}} = $spell;
3610	$self->rebuild_spell_list;
3611	}
3612
3613	sub remove_spell {
3614	my ($self, $spell) = @_;
3615
3616	delete $self->{spell}->{$spell->{name}};
3617	$self->rebuild_spell_list;
3618	}
3619
3620	sub clear_spells {
3621	my ($self) = @_;
3622
3623	$self->{spell} = {};
3624	$self->rebuild_spell_list;
3625	}
3626
3627	#############################################################################
3628
3629	package CFClient::UI::Root;	3786	package CFPlus::UI::Root;
3630		3787
3631	our @ISA = CFClient::UI::Container::;	3788	our @ISA = CFPlus::UI::Container::;
3632		3789
3633	use List::Util qw(min max);	3790	use List::Util qw(min max);
3634		3791
3635	use CFClient::OpenGL;	3792	use CFPlus::OpenGL;
3636		3793
3637	sub new {	3794	sub new {
3638	my $class = shift;	3795	my $class = shift;
3639		3796
3640	my $self = $class->SUPER::new (	3797	my $self = $class->SUPER::new (
3641	visible => 1,	3798	visible => 1,
3642	@_,	3799	@_,
3643	);	3800	);
3644		3801
3645	Scalar::Util::weaken ($self->{root} = $self);	3802	CFPlus::weaken ($self->{root} = $self);
3646		3803
3647	$self	3804	$self
3648	}	3805	}
3649		3806
3650	sub size_request {	3807	sub size_request {
…		…
3816	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3973	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3817		3974
3818	$w = 0 if $w < 0;	3975	$w = 0 if $w < 0;
3819	$h = 0 if $h < 0;	3976	$h = 0 if $h < 0;
3820		3977
		3978	$w = max $widget->{min_w}, $w;
		3979	$h = max $widget->{min_h}, $h;
		3980
		3981	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3982	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3983
		3984	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3985	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3986
3821	$w = int $w + 0.5;	3987	$w = int $w + 0.5;
3822	$h = int $h + 0.5;	3988	$h = int $h + 0.5;
3823		3989
3824	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3990	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3825	$widget->{old_w} = $widget->{w};	3991	$widget->{old_w} = $widget->{w};
…		…
3848	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4014	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3849	glMatrixMode GL_MODELVIEW;	4015	glMatrixMode GL_MODELVIEW;
3850	glLoadIdentity;	4016	glLoadIdentity;
3851		4017
3852	{	4018	{
3853	package CFClient::UI::Base;	4019	package CFPlus::UI::Base;
3854		4020
3855	($draw_x, $draw_y, $draw_w, $draw_h) =	4021	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3856	(0, 0, $self->{w}, $self->{h});	4022	(0, 0, $self->{w}, $self->{h});
3857	}
3858		4023
3859	$self->_draw;	4024	$self->_draw;
		4025	}
3860	}	4026	}
3861		4027
3862	#############################################################################	4028	#############################################################################
3863		4029
3864	package CFClient::UI;	4030	package CFPlus::UI;
3865		4031
3866	$ROOT = new CFClient::UI::Root;	4032	$ROOT = new CFPlus::UI::Root;
3867	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4033	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3868		4034
3869	1	4035	1
3870		4036

Diff Legend

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