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.324 by root, Wed Jul 12 17:20:04 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 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};
…		…
239		262
240	sub destroy {	263	sub destroy {
241	my ($self) = @_;	264	my ($self) = @_;
242		265
243	$self->hide;	266	$self->hide;
		267	$self->emit ("destroy");
244	%$self = ();	268	%$self = ();
245	}	269	}
246		270
247	sub show {	271	sub show {
248	my ($self) = @_;	272	my ($self) = @_;
249		273
250	return if $self->{parent};	274	return if $self->{parent};
251		275
252	$CFClient::UI::ROOT->add ($self);	276	$CFPlus::UI::ROOT->add ($self);
253	}	277	}
254		278
255	sub set_visible {	279	sub set_visible {
256	my ($self) = @_;	280	my ($self) = @_;
257		281
…		…
278	delete $self->{root};	302	delete $self->{root};
279		303
280	undef $GRAB if $GRAB == $self;	304	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	305	undef $HOVER if $HOVER == $self;
282		306
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	307	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	308	if $TOOLTIP->{owner} == $self;
285		309
286	$self->emit ("focus_out");	310	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	311	$self->emit (visibility_change => 0);
288	}	312	}
…		…
345	my ($self, $x, $y, $w, $h) = @_;	369	my ($self, $x, $y, $w, $h) = @_;
346		370
347	if ($self->{aspect}) {	371	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	372	my ($ow, $oh) = ($w, $h);
349		373
350	$w = List::Util::min $w, int $h * $self->{aspect};	374	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	375	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		376
353	# use alignment to adjust x, y	377	# use alignment to adjust x, y
354		378
355	$x += int 0.5 * ($ow - $w);	379	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	380	$y += int 0.5 * ($oh - $h);
…		…
397		421
398	return if $self->{tooltip} eq $tooltip;	422	return if $self->{tooltip} eq $tooltip;
399		423
400	$self->{tooltip} = $tooltip;	424	$self->{tooltip} = $tooltip;
401		425
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	426	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	427	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	428	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	429	}
406	}	430	}
407		431
408	# translate global coordinates to local coordinate system	432	# translate global coordinates to local coordinate system
409	sub coord2local {	433	sub coord2local {
410	my ($self, $x, $y) = @_;	434	my ($self, $x, $y) = @_;
411		435
		436	Carp::confess unless $self->{parent};#d#
		437
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	438	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	439	}
414		440
415	# translate local coordinates to global coordinate system	441	# translate local coordinates to global coordinate system
416	sub coord2global {	442	sub coord2global {
417	my ($self, $x, $y) = @_;	443	my ($self, $x, $y) = @_;
418		444
		445	Carp::confess unless $self->{parent};#d#
		446
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	447	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	448	}
421		449
422	sub invoke_focus_in {	450	sub invoke_focus_in {
423	my ($self) = @_;	451	my ($self) = @_;
…		…
452		480
453	$FOCUS->emit ("focus_out") if $FOCUS;	481	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	482	$self->emit ("focus_in");
455	}	483	}
456		484
457	sub invoke_mouse_motion { 1 }	485	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	486	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	487	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	488	sub invoke_key_up { 0 }
		489	sub invoke_mouse_wheel { 0 }
461		490
462	sub invoke_button_down {	491	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	492	my ($self, $ev, $x, $y) = @_;
464		493
465	$self->grab_focus;	494	$self->grab_focus;
466		495
467	1	496	0
468	}	497	}
469		498
470	sub connect {	499	sub connect {
471	my ($self, $signal, $cb) = @_;	500	my ($self, $signal, $cb) = @_;
472		501
473	push @{ $self->{signal_cb}{$signal} }, $cb;	502	push @{ $self->{signal_cb}{$signal} }, $cb;
		503
		504	defined wantarray and CFPlus::guard {
		505	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		506	@{ $self->{signal_cb}{$signal} };
		507	}
474	}	508	}
		509
		510	sub disconnect_all {
		511	my ($self, $signal) = @_;
		512
		513	delete $self->{signal_cb}{$signal};
		514	}
		515
		516	my %has_coords = (
		517	button_down => 1,
		518	button_up => 1,
		519	mouse_motion => 1,
		520	mouse_wheel => 1,
		521	);
475		522
476	sub emit {	523	sub emit {
477	my ($self, $signal, @args) = @_;	524	my ($self, $signal, @args) = @_;
478		525
		526	# I do not really like this solution, but I do not like duplication
		527	# and needlessly verbose code, either.
		528	my @append
		529	= $has_coords{$signal}
		530	? $args[0]->xy ($self)
		531	: ();
		532
		533	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		534
479	#d##TODO# stop propagating at first true, do not use sum	535	#d##TODO# stop propagating at first true, do not use sum
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	536	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	537	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	538	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483	}	539	}
484		540
485	sub find_widget {	541	sub find_widget {
486	my ($self, $x, $y) = @_;	542	my ($self, $x, $y) = @_;
487		543
…		…
571	glVertex $self->{w} - 1, 0;	627	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	628	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	629	glVertex 0 , $self->{h} - 1;
574	glEnd;	630	glEnd;
575	glPopMatrix;	631	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	632	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}	633	}
578		634
579	$self->_draw;	635	$self->_draw;
580	glPopMatrix;	636	glPopMatrix;
581	}	637	}
…		…
587	}	643	}
588		644
589	sub DESTROY {	645	sub DESTROY {
590	my ($self) = @_;	646	my ($self) = @_;
591		647
592	return if CFClient::in_destruct;	648	return if CFPlus::in_destruct;
593
594	delete $WIDGET{$self+0};
595		649
596	eval { $self->destroy };	650	eval { $self->destroy };
597	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	651	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		652
		653	delete $WIDGET{$self+0};
598	}	654	}
599		655
600	#############################################################################	656	#############################################################################
601		657
602	package CFClient::UI::DrawBG;	658	package CFPlus::UI::DrawBG;
603		659
604	our @ISA = CFClient::UI::Base::;	660	our @ISA = CFPlus::UI::Base::;
605		661
606	use strict;	662	use strict;
607	use CFClient::OpenGL;	663	use CFPlus::OpenGL;
608		664
609	sub new {	665	sub new {
610	my $class = shift;	666	my $class = shift;
611		667
612	# range [value, low, high, page]	668	# range [value, low, high, page]
…		…
643	}	699	}
644	}	700	}
645		701
646	#############################################################################	702	#############################################################################
647		703
648	package CFClient::UI::Empty;	704	package CFPlus::UI::Empty;
649		705
650	our @ISA = CFClient::UI::Base::;	706	our @ISA = CFPlus::UI::Base::;
651		707
652	sub new {	708	sub new {
653	my ($class, %arg) = @_;	709	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	710	$class->SUPER::new (can_events => 0, %arg);
655	}	711	}
…		…
662		718
663	sub draw { }	719	sub draw { }
664		720
665	#############################################################################	721	#############################################################################
666		722
667	package CFClient::UI::Container;	723	package CFPlus::UI::Container;
668		724
669	our @ISA = CFClient::UI::Base::;	725	our @ISA = CFPlus::UI::Base::;
670		726
671	sub new {	727	sub new {
672	my ($class, %arg) = @_;	728	my ($class, %arg) = @_;
673		729
674	my $children = delete $arg{children};	730	my $children = delete $arg{children};
…		…
683	if $children;	739	if $children;
684		740
685	$self	741	$self
686	}	742	}
687		743
		744	sub realloc {
		745	my ($self) = @_;
		746
		747	$self->{force_realloc} = 1;
		748	$self->{force_size_alloc} = 1;
		749	$self->SUPER::realloc;
		750	}
		751
688	sub add {	752	sub add {
689	my ($self, @widgets) = @_;	753	my ($self, @widgets) = @_;
690		754
691	$_->set_parent ($self)	755	$_->set_parent ($self)
692	for @widgets;	756	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	816	$_->draw for @{$self->{children}};
753	}	817	}
754		818
755	#############################################################################	819	#############################################################################
756		820
757	package CFClient::UI::Bin;	821	package CFPlus::UI::Bin;
758		822
759	our @ISA = CFClient::UI::Container::;	823	our @ISA = CFPlus::UI::Container::;
760		824
761	sub new {	825	sub new {
762	my ($class, %arg) = @_;	826	my ($class, %arg) = @_;
763		827
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	828	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		829
766	$class->SUPER::new (children => [$child], %arg)	830	$class->SUPER::new (children => [$child], %arg)
767	}	831	}
768		832
769	sub add {	833	sub add {
…		…
776	sub remove {	840	sub remove {
777	my ($self, $widget) = @_;	841	my ($self, $widget) = @_;
778		842
779	$self->SUPER::remove ($widget);	843	$self->SUPER::remove ($widget);
780		844
781	$self->{children} = [new CFClient::UI::Empty]	845	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	846	unless @{$self->{children}};
783	}	847	}
784		848
785	sub child { $_[0]->{children}[0] }	849	sub child { $_[0]->{children}[0] }
786		850
…		…
798		862
799	#############################################################################	863	#############################################################################
800		864
801	# back-buffered drawing area	865	# back-buffered drawing area
802		866
803	package CFClient::UI::Window;	867	package CFPlus::UI::Window;
804		868
805	our @ISA = CFClient::UI::Bin::;	869	our @ISA = CFPlus::UI::Bin::;
806		870
807	use CFClient::OpenGL;	871	use CFPlus::OpenGL;
808		872
809	sub new {	873	sub new {
810	my ($class, %arg) = @_;	874	my ($class, %arg) = @_;
811		875
812	my $self = $class->SUPER::new (%arg);	876	my $self = $class->SUPER::new (%arg);
…		…
834	}	898	}
835		899
836	sub render_child {	900	sub render_child {
837	my ($self) = @_;	901	my ($self) = @_;
838		902
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	903	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	904	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	905	glClear GL_COLOR_BUFFER_BIT;
842		906
843	{	907	{
844	package CFClient::UI::Base;	908	package CFPlus::UI::Base;
845		909
846	($draw_x, $draw_y, $draw_w, $draw_h) =	910	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	911	(0, 0, $self->{w}, $self->{h});
		912
		913	$self->_render;
848	}	914	}
849
850	$self->_render;
851	};	915	};
852	}	916	}
853		917
854	sub _draw {	918	sub _draw {
855	my ($self) = @_;	919	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		920
859	my $tex = $self->{texture}	921	my $tex = $self->{texture}
860	or return;	922	or return;
861		923
862	glEnable GL_TEXTURE_2D;	924	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	925	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	926	glColor 0, 0, 0, 1;
865		927
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	928	$tex->draw_quad_alpha_premultiplied (0, 0);
867		929
868	glDisable GL_TEXTURE_2D;	930	glDisable GL_TEXTURE_2D;
869	}	931	}
870		932
871	#############################################################################	933	#############################################################################
872		934
873	package CFClient::UI::ViewPort;	935	package CFPlus::UI::ViewPort;
874		936
875	our @ISA = CFClient::UI::Window::;	937	our @ISA = CFPlus::UI::Window::;
876		938
877	sub new {	939	sub new {
878	my $class = shift;	940	my $class = shift;
879		941
880	$class->SUPER::new (	942	$class->SUPER::new (
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1002	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1003	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	1004	) {
943	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1005	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944	} else {	1006	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1007	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1008	}
947	}	1009	}
948		1010
949	sub _render {	1011	sub _render {
950	my ($self) = @_;	1012	my ($self) = @_;
951		1013
952	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1014	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};	1015	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954		1016
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1017	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1018
957	$self->SUPER::_render;	1019	$self->SUPER::_render;
958	}	1020	}
959		1021
960	#############################################################################	1022	#############################################################################
961		1023
962	package CFClient::UI::ScrolledWindow;	1024	package CFPlus::UI::ScrolledWindow;
963		1025
964	our @ISA = CFClient::UI::HBox::;	1026	our @ISA = CFPlus::UI::HBox::;
965		1027
966	sub new {	1028	sub new {
967	my ($class, %arg) = @_;	1029	my ($class, %arg) = @_;
968		1030
969	my $child = delete $arg{child};	1031	my $child = delete $arg{child};
970		1032
971	my $self;	1033	my $self;
972		1034
973	my $slider = new CFClient::UI::Slider	1035	my $slider = new CFPlus::UI::Slider
974	vertical => 1,	1036	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1037	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1038	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1039	$self->{vp}->set_offset (0, $_[1]);
978	},	1040	},
979	;	1041	;
980		1042
981	$self = $class->SUPER::new (	1043	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1044	vp => (new CFPlus::UI::ViewPort expand => 1),
		1045	can_events => 1,
983	slider => $slider,	1046	slider => $slider,
984	%arg,	1047	%arg,
985	);	1048	);
986		1049
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1050	$self->SUPER::add ($self->{vp}, $self->{slider});
988	$self->add ($child) if $child;	1051	$self->add ($child) if $child;
…		…
996	my ($self, $widget) = @_;	1059	my ($self, $widget) = @_;
997		1060
998	$self->{vp}->add ($self->{child} = $widget);	1061	$self->{vp}->add ($self->{child} = $widget);
999	}	1062	}
1000		1063
		1064	sub invoke_mouse_wheel {
		1065	my ($self, $ev) = @_;
		1066
		1067	return 0 unless $ev->{dy}; # only vertical movements
		1068
		1069	$self->{slider}->emit (mouse_wheel => $ev);
		1070
		1071	1
		1072	}
		1073
1001	sub update_slider {	1074	sub update_slider {
1002	my ($self) = @_;	1075	my ($self) = @_;
1003		1076
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1077	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1005	}	1078	}
…		…
1020	$self->SUPER::invoke_size_allocate ($w, $h)	1093	$self->SUPER::invoke_size_allocate ($w, $h)
1021	}	1094	}
1022		1095
1023	#############################################################################	1096	#############################################################################
1024		1097
1025	package CFClient::UI::Frame;	1098	package CFPlus::UI::Frame;
1026		1099
1027	our @ISA = CFClient::UI::Bin::;	1100	our @ISA = CFPlus::UI::Bin::;
1028		1101
1029	use CFClient::OpenGL;	1102	use CFPlus::OpenGL;
1030		1103
1031	sub new {	1104	sub new {
1032	my $class = shift;	1105	my $class = shift;
1033		1106
1034	$class->SUPER::new (	1107	$class->SUPER::new (
…		…
1060	$self->SUPER::_draw;	1133	$self->SUPER::_draw;
1061	}	1134	}
1062		1135
1063	#############################################################################	1136	#############################################################################
1064		1137
1065	package CFClient::UI::FancyFrame;	1138	package CFPlus::UI::FancyFrame;
1066		1139
1067	our @ISA = CFClient::UI::Bin::;	1140	our @ISA = CFPlus::UI::Bin::;
1068		1141
1069	use CFClient::OpenGL;	1142	use CFPlus::OpenGL;
		1143
		1144	sub new {
		1145	my ($class, %arg) = @_;
		1146
		1147	if ((exists $arg{label}) && !ref $arg{label}) {
		1148	$arg{label} = new CFPlus::UI::Label
		1149	align => 1,
		1150	valign => 0,
		1151	text => $arg{label},
		1152	fontsize => ($arg{border} || 0.8) * 0.75;
		1153	}
		1154
		1155	my $self = $class->SUPER::new (
		1156	# label => "",
		1157	fg => [0.6, 0.3, 0.1],
		1158	border => 0.8,
		1159	style => 'single',
		1160	%arg,
		1161	);
		1162
		1163	$self
		1164	}
		1165
		1166	sub add {
		1167	my ($self, @widgets) = @_;
		1168
		1169	$self->SUPER::add (@widgets);
		1170	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1171	}
		1172
		1173	sub border {
		1174	int $_[0]{border} * $::FONTSIZE
		1175	}
		1176
		1177	sub size_request {
		1178	my ($self) = @_;
		1179
		1180	($self->{label_w}, undef) = $self->{label}->size_request
		1181	if $self->{label};
		1182
		1183	my ($w, $h) = $self->SUPER::size_request;
		1184
		1185	(
		1186	$w + $self->border * 2,
		1187	$h + $self->border * 2,
		1188	)
		1189	}
		1190
		1191	sub invoke_size_allocate {
		1192	my ($self, $w, $h) = @_;
		1193
		1194	my $border = $self->border;
		1195
		1196	$w -= List::Util::max 0, $border * 2;
		1197	$h -= List::Util::max 0, $border * 2;
		1198
		1199	if (my $label = $self->{label}) {
		1200	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1201	$label->{h} = List::Util::min $h, $border;
		1202	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1203	}
		1204
		1205	$self->child->configure ($border, $border, $w, $h);
		1206
		1207	1
		1208	}
		1209
		1210	sub _draw {
		1211	my ($self) = @_;
		1212
		1213	my $child = $self->{children}[0];
		1214
		1215	my $border = $self->border;
		1216	my ($w, $h) = ($self->{w}, $self->{h});
		1217
		1218	$child->draw;
		1219
		1220	glColor @{$self->{fg}};
		1221	glBegin GL_LINE_STRIP;
		1222	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1223	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1224	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1225	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1226	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1227	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1228	glEnd;
		1229
		1230	if ($self->{label}) {
		1231	glTranslate $border * 2, 0;
		1232	$self->{label}->_draw;
		1233	}
		1234	}
		1235
		1236	#############################################################################
		1237
		1238	package CFPlus::UI::Toplevel;
		1239
		1240	our @ISA = CFPlus::UI::Bin::;
		1241
		1242	use CFPlus::OpenGL;
1070		1243
1071	my $bg =	1244	my $bg =
1072	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1245	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1073	mipmap => 1, wrap => 1;	1246	mipmap => 1, wrap => 1;
1074		1247
1075	my @border =	1248	my @border =
1076	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1249	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);	1250	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1078		1251
1079	sub new {	1252	sub new {
1080	my ($class, %arg) = @_;	1253	my ($class, %arg) = @_;
1081		1254
1082	my $self = $class->SUPER::new (	1255	my $self = $class->SUPER::new (
1083	bg => [1, 1, 1, 1],	1256	bg => [1, 1, 1, 1],
1084	border_bg => [1, 1, 1, 1],	1257	border_bg => [1, 1, 1, 1],
1085	border => 0.6,	1258	border => 0.6,
1086	can_events => 1,	1259	can_events => 1,
1087	min_w => 16,	1260	min_w => 64,
1088	min_h => 16,	1261	min_h => 32,
1089	%arg,	1262	%arg,
1090	);	1263	);
1091		1264
1092	$self->{title_widget} = new CFClient::UI::Label	1265	$self->{title_widget} = new CFPlus::UI::Label
1093	align => 0,	1266	align => 0,
1094	valign => 1,	1267	valign => 1,
1095	text => $self->{title},	1268	text => $self->{title},
1096	fontsize => $self->{border},	1269	fontsize => $self->{border},
1097	if exists $self->{title};	1270	if exists $self->{title};
1098		1271
1099	if ($self->{has_close_button}) {	1272	if ($self->{has_close_button}) {
1100	$self->{close_button} =	1273	$self->{close_button} =
1101	new CFClient::UI::ImageButton	1274	new CFPlus::UI::ImageButton
1102	path => 'x1_close.png',	1275	path => 'x1_close.png',
1103	on_activate => sub { $self->emit ("delete") };	1276	on_activate => sub { $self->emit ("delete") };
1104		1277
1105	$self->CFClient::UI::Container::add ($self->{close_button});	1278	$self->CFPlus::UI::Container::add ($self->{close_button});
1106	}	1279	}
1107		1280
1108	$self	1281	$self
1109	}	1282	}
1110		1283
1111	sub add {	1284	sub add {
1112	my ($self, @widgets) = @_;	1285	my ($self, @widgets) = @_;
1113		1286
1114	$self->SUPER::add (@widgets);	1287	$self->SUPER::add (@widgets);
1115	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1288	$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};	1289	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1117	}	1290	}
1118		1291
1119	sub border {	1292	sub border {
1120	int $_[0]{border} * $::FONTSIZE	1293	int $_[0]{border} * $::FONTSIZE
1121	}	1294	}
…		…
1229	$self->{motion}->($ev, $x, $y) if $self->{motion};	1402	$self->{motion}->($ev, $x, $y) if $self->{motion};
1230		1403
1231	! ! $self->{motion}	1404	! ! $self->{motion}
1232	}	1405	}
1233		1406
		1407	sub invoke_visibility_change {
		1408	my ($self, $visible) = @_;
		1409
		1410	delete $self->{motion} unless $visible;
		1411
		1412	0
		1413	}
		1414
1234	sub _draw {	1415	sub _draw {
1235	my ($self) = @_;	1416	my ($self) = @_;
1236		1417
1237	my $child = $self->{children}[0];	1418	my $child = $self->{children}[0];
1238		1419
…		…
1275	if $self->{close_button};	1456	if $self->{close_button};
1276	}	1457	}
1277		1458
1278	#############################################################################	1459	#############################################################################
1279		1460
1280	package CFClient::UI::Table;	1461	package CFPlus::UI::Table;
1281		1462
1282	our @ISA = CFClient::UI::Base::;	1463	our @ISA = CFPlus::UI::Base::;
1283		1464
1284	use List::Util qw(max sum);	1465	use List::Util qw(max sum);
1285		1466
1286	use CFClient::OpenGL;	1467	use CFPlus::OpenGL;
1287		1468
1288	sub new {	1469	sub new {
1289	my $class = shift;	1470	my $class = shift;
1290		1471
1291	$class->SUPER::new (	1472	$class->SUPER::new (
…		…
1297	sub children {	1478	sub children {
1298	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1479	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1299	}	1480	}
1300		1481
1301	sub add {	1482	sub add {
1302	my ($self, $x, $y, $child) = @_;	1483	my ($self) = shift;
1303		1484
		1485	while (@_) {
		1486	my ($x, $y, $child) = splice @_, 0, 3, ();
1304	$child->set_parent ($self);	1487	$child->set_parent ($self);
1305	$self->{children}[$y][$x] = $child;	1488	$self->{children}[$y][$x] = $child;
		1489	}
1306		1490
		1491	$self->{force_realloc} = 1;
		1492	$self->{force_size_alloc} = 1;
1307	$self->realloc;	1493	$self->realloc;
1308	}	1494	}
1309		1495
1310	sub remove {	1496	sub remove {
1311	my ($self, $child) = @_;	1497	my ($self, $child) = @_;
…		…
1376		1562
1377	# linearly scale sizes	1563	# linearly scale sizes
1378	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1564	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1379	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1565	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1380		1566
1381	CFClient::UI::harmonize $ws;	1567	CFPlus::UI::harmonize $ws;
1382	CFClient::UI::harmonize $hs;	1568	CFPlus::UI::harmonize $hs;
1383		1569
1384	my $y;	1570	my $y;
1385		1571
1386	for my $r (0 .. $#{$self->{children}}) {	1572	for my $r (0 .. $#{$self->{children}}) {
1387	my $row = $self->{children}[$r]	1573	my $row = $self->{children}[$r]
…		…
1430	}	1616	}
1431	}	1617	}
1432		1618
1433	#############################################################################	1619	#############################################################################
1434		1620
1435	package CFClient::UI::Box;	1621	package CFPlus::UI::Box;
1436		1622
1437	our @ISA = CFClient::UI::Container::;	1623	our @ISA = CFPlus::UI::Container::;
1438		1624
1439	sub size_request {	1625	sub size_request {
1440	my ($self) = @_;	1626	my ($self) = @_;
1441		1627
1442	$self->{vertical}	1628	$self->{vertical}
…		…
1475	$req[$_] += $space * $children[$_]{expand}	1661	$req[$_] += $space * $children[$_]{expand}
1476	for 0 .. $#children;	1662	for 0 .. $#children;
1477	}	1663	}
1478	}	1664	}
1479		1665
1480	CFClient::UI::harmonize \@req;	1666	CFPlus::UI::harmonize \@req;
1481		1667
1482	my $pos = 0;	1668	my $pos = 0;
1483	for (0 .. $#children) {	1669	for (0 .. $#children) {
1484	my $alloc = $req[$_];	1670	my $alloc = $req[$_];
1485	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1671	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1490	1	1676	1
1491	}	1677	}
1492		1678
1493	#############################################################################	1679	#############################################################################
1494		1680
1495	package CFClient::UI::HBox;	1681	package CFPlus::UI::HBox;
1496		1682
1497	our @ISA = CFClient::UI::Box::;	1683	our @ISA = CFPlus::UI::Box::;
1498		1684
1499	sub new {	1685	sub new {
1500	my $class = shift;	1686	my $class = shift;
1501		1687
1502	$class->SUPER::new (	1688	$class->SUPER::new (
…		…
1505	)	1691	)
1506	}	1692	}
1507		1693
1508	#############################################################################	1694	#############################################################################
1509		1695
1510	package CFClient::UI::VBox;	1696	package CFPlus::UI::VBox;
1511		1697
1512	our @ISA = CFClient::UI::Box::;	1698	our @ISA = CFPlus::UI::Box::;
1513		1699
1514	sub new {	1700	sub new {
1515	my $class = shift;	1701	my $class = shift;
1516		1702
1517	$class->SUPER::new (	1703	$class->SUPER::new (
…		…
1520	)	1706	)
1521	}	1707	}
1522		1708
1523	#############################################################################	1709	#############################################################################
1524		1710
1525	package CFClient::UI::Label;	1711	package CFPlus::UI::Label;
1526		1712
1527	our @ISA = CFClient::UI::DrawBG::;	1713	our @ISA = CFPlus::UI::DrawBG::;
1528		1714
1529	use CFClient::OpenGL;	1715	use CFPlus::OpenGL;
1530		1716
1531	sub new {	1717	sub new {
1532	my ($class, %arg) = @_;	1718	my ($class, %arg) = @_;
1533		1719
1534	my $self = $class->SUPER::new (	1720	my $self = $class->SUPER::new (
…		…
1537	#active_bg => none	1723	#active_bg => none
1538	#font => default_font	1724	#font => default_font
1539	#text => initial text	1725	#text => initial text
1540	#markup => initial narkup	1726	#markup => initial narkup
1541	#max_w => maximum pixel width	1727	#max_w => maximum pixel width
		1728	#style => 0, # render flags
1542	ellipsise => 3, # end	1729	ellipsise => 3, # end
1543	layout => (new CFClient::Layout),	1730	layout => (new CFPlus::Layout),
1544	fontsize => 1,	1731	fontsize => 1,
1545	align => -1,	1732	align => -1,
1546	valign => -1,	1733	valign => -1,
1547	padding_x => 2,	1734	padding_x => 2,
1548	padding_y => 2,	1735	padding_y => 2,
1549	can_events => 0,	1736	can_events => 0,
1550	%arg	1737	%arg
1551	);	1738	);
1552		1739
1553	if (exists $self->{template}) {	1740	if (exists $self->{template}) {
1554	my $layout = new CFClient::Layout;	1741	my $layout = new CFPlus::Layout;
1555	$layout->set_text (delete $self->{template});	1742	$layout->set_text (delete $self->{template});
1556	$self->{template} = $layout;	1743	$self->{template} = $layout;
1557	}	1744	}
1558		1745
1559	if (exists $self->{markup}) {	1746	if (exists $self->{markup}) {
…		…
1561	} else {	1748	} else {
1562	$self->set_text (delete $self->{text});	1749	$self->set_text (delete $self->{text});
1563	}	1750	}
1564		1751
1565	$self	1752	$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	}	1753	}
1577		1754
1578	sub update {	1755	sub update {
1579	my ($self) = @_;	1756	my ($self) = @_;
1580		1757
…		…
1707	};	1884	};
1708		1885
1709	my $w = List::Util::min $self->{w} + 4, $size->[0];	1886	my $w = List::Util::min $self->{w} + 4, $size->[0];
1710	my $h = List::Util::min $self->{h} + 2, $size->[1];	1887	my $h = List::Util::min $self->{h} + 2, $size->[1];
1711		1888
1712	$self->{layout}->render ($self->{ox}, $self->{oy});	1889	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713	}	1890	}
1714		1891
1715	#############################################################################	1892	#############################################################################
1716		1893
1717	package CFClient::UI::EntryBase;	1894	package CFPlus::UI::EntryBase;
1718		1895
1719	our @ISA = CFClient::UI::Label::;	1896	our @ISA = CFPlus::UI::Label::;
1720		1897
1721	use CFClient::OpenGL;	1898	use CFPlus::OpenGL;
1722		1899
1723	sub new {	1900	sub new {
1724	my $class = shift;	1901	my $class = shift;
1725		1902
1726	$class->SUPER::new (	1903	$class->SUPER::new (
…		…
1730	active_fg => [0, 0, 0],	1907	active_fg => [0, 0, 0],
1731	can_hover => 1,	1908	can_hover => 1,
1732	can_focus => 1,	1909	can_focus => 1,
1733	valign => 0,	1910	valign => 0,
1734	can_events => 1,	1911	can_events => 1,
		1912	ellipsise => 0,
1735	#text => ...	1913	#text => ...
1736	#hidden => "*",	1914	#hidden => "*",
1737	@_	1915	@_
1738	)	1916	)
1739	}	1917	}
…		…
1788		1966
1789	if ($uni == 8) {	1967	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1968	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	1969	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	1970	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	1971	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	1972	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	1973	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	1974	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	1975	} elsif ($sym == CFPlus::SDLK_HOME) {
1798	$self->{cursor} = 0;	1976	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {	1977	} elsif ($sym == CFPlus::SDLK_END) {
1800	$self->{cursor} = length $text;	1978	$self->{cursor} = length $text;
		1979	} elsif ($uni == 21) { # ctrl-u
		1980	$text = "";
		1981	$self->{cursor} = 0;
1801	} elsif ($uni == 27) {	1982	} elsif ($uni == 27) {
1802	$self->emit ('escape');	1983	$self->emit ('escape');
1803	} elsif ($uni) {	1984	} elsif ($uni >= 0x20 || $uni == 0x0d) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	1985	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	1986	} else {
1806	return 0;	1987	return 0;
1807	}	1988	}
1808		1989
1809	$self->_set_text ($text);	1990	$self->_set_text ($text);
1810		1991
1811	$self->realloc;	1992	$self->realloc;
		1993	$self->update;
1812		1994
1813	1	1995	1
1814	}	1996	}
1815		1997
1816	sub invoke_focus_in {	1998	sub invoke_focus_in {
…		…
1828		2010
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2011	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2012
1831	# byte-index to char-index	2013	# byte-index to char-index
1832	my $text = $self->{text};	2014	my $text = $self->{text};
1833	utf8::encode $text;	2015	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2016	$self->{cursor} = length $text;
1835		2017
1836	$self->_set_text ($self->{text});	2018	$self->_set_text ($self->{text});
1837	$self->update;	2019	$self->update;
1838		2020
1839	1	2021	1
…		…
1878	utf8::encode $text;	2060	utf8::encode $text;
1879		2061
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2062	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	2063	}
1882		2064
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2065	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2066	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};	2067	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2068	glEnd;
1888	}	2069	}
1889	}	2070	}
1890		2071
		2072	#############################################################################
		2073
1891	package CFClient::UI::Entry;	2074	package CFPlus::UI::Entry;
1892		2075
1893	our @ISA = CFClient::UI::EntryBase::;	2076	our @ISA = CFPlus::UI::EntryBase::;
1894		2077
1895	use CFClient::OpenGL;	2078	use CFPlus::OpenGL;
1896		2079
1897	sub invoke_key_down {	2080	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2081	my ($self, $ev) = @_;
1899		2082
1900	my $sym = $ev->{sym};	2083	my $sym = $ev->{sym};
1901		2084
1902	if ($sym == 13) {	2085	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2086	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2087	my $txt = $self->get_text;
1905		2088
1906	$self->{history_pointer} = -1;	2089	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2090	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2091	$self->emit (activate => $txt);
1909	$self->update;	2092	$self->update;
1910		2093
1911	} elsif ($sym == CFClient::SDLK_UP) {	2094	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2095	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2096	$self->{history_saveback} = $self->get_text;
1914	}	2097	}
1915	if (@{$self->{history} || []} > 0) {	2098	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2099	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2101	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2102	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2103	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2104	}
1922		2105
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2106	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2107	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2108	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2109
1927	if ($self->{history_pointer} >= 0) {	2110	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2111	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2120	1
1938	}	2121	}
1939		2122
1940	#############################################################################	2123	#############################################################################
1941		2124
		2125	package CFPlus::UI::TextEdit;
		2126
		2127	our @ISA = CFPlus::UI::EntryBase::;
		2128
		2129	use CFPlus::OpenGL;
		2130
		2131	sub move_cursor_ver {
		2132	my ($self, $dy) = @_;
		2133
		2134	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2135
		2136	$y += $dy;
		2137
		2138	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2139	$self->{cursor} = $index;
		2140	delete $self->{cur_h};
		2141	$self->update;
		2142	return;
		2143	}
		2144	}
		2145
		2146	sub invoke_key_down {
		2147	my ($self, $ev) = @_;
		2148
		2149	my $sym = $ev->{sym};
		2150
		2151	if ($sym == CFPlus::SDLK_UP) {
		2152	$self->move_cursor_ver (-1);
		2153	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2154	$self->move_cursor_ver (+1);
		2155	} else {
		2156	return $self->SUPER::invoke_key_down ($ev)
		2157	}
		2158
		2159	1
		2160	}
		2161
		2162	#############################################################################
		2163
1942	package CFClient::UI::Button;	2164	package CFPlus::UI::Button;
1943		2165
1944	our @ISA = CFClient::UI::Label::;	2166	our @ISA = CFPlus::UI::Label::;
1945		2167
1946	use CFClient::OpenGL;	2168	use CFPlus::OpenGL;
1947		2169
1948	my @tex =	2170	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2171	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2172	qw(b1_button_active.png);
1951		2173
1952	sub new {	2174	sub new {
1953	my $class = shift;	2175	my $class = shift;
1954		2176
…		…
1991	$self->SUPER::_draw;	2213	$self->SUPER::_draw;
1992	}	2214	}
1993		2215
1994	#############################################################################	2216	#############################################################################
1995		2217
		2218	package CFPlus::UI::CheckBox;
		2219
		2220	our @ISA = CFPlus::UI::DrawBG::;
		2221
		2222	my @tex =
		2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2224	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2225
		2226	use CFPlus::OpenGL;
		2227
		2228	sub new {
		2229	my $class = shift;
		2230
		2231	$class->SUPER::new (
		2232	padding_x => 2,
		2233	padding_y => 2,
		2234	fg => [1, 1, 1],
		2235	active_fg => [1, 1, 0],
		2236	bg => [0, 0, 0, 0.2],
		2237	active_bg => [1, 1, 1, 0.5],
		2238	state => 0,
		2239	can_hover => 1,
		2240	@_
		2241	)
		2242	}
		2243
		2244	sub size_request {
		2245	my ($self) = @_;
		2246
		2247	(6) x 2
		2248	}
		2249
		2250	sub toggle {
		2251	my ($self) = @_;
		2252
		2253	$self->{state} = !$self->{state};
		2254	$self->emit (changed => $self->{state});
		2255	$self->update;
		2256	}
		2257
		2258	sub invoke_button_down {
		2259	my ($self, $ev, $x, $y) = @_;
		2260
		2261	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2262	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2263	$self->toggle;
		2264	} else {
		2265	return 0
		2266	}
		2267
		2268	1
		2269	}
		2270
		2271	sub _draw {
		2272	my ($self) = @_;
		2273
		2274	$self->SUPER::_draw;
		2275
		2276	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2277
		2278	my ($w, $h) = @$self{qw(w h)};
		2279
		2280	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2281
		2282	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2283
		2284	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2285
		2286	glEnable GL_TEXTURE_2D;
		2287	$tex->draw_quad_alpha (0, 0, $s, $s);
		2288	glDisable GL_TEXTURE_2D;
		2289	}
		2290
		2291	#############################################################################
		2292
		2293	package CFPlus::UI::Image;
		2294
		2295	our @ISA = CFPlus::UI::Base::;
		2296
		2297	use CFPlus::OpenGL;
		2298
		2299	our %texture_cache;
		2300
		2301	sub new {
		2302	my $class = shift;
		2303
		2304	my $self = $class->SUPER::new (
		2305	can_events => 0,
		2306	@_,
		2307	);
		2308
		2309	$self->{path} || $self->{tex}
		2310	or Carp::croak "'path' or 'tex' attributes required";
		2311
		2312	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2313	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2314
		2315	Scalar::Util::weaken $texture_cache{$self->{path}};
		2316
		2317	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2318
		2319	$self
		2320	}
		2321
		2322	sub STORABLE_freeze {
		2323	my ($self, $cloning) = @_;
		2324
		2325	$self->{path}
		2326	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2327
		2328	$self->{path}
		2329	}
		2330
		2331	sub STORABLE_attach {
		2332	my ($self, $cloning, $path) = @_;
		2333
		2334	$self->new (path => $path)
		2335	}
		2336
		2337	sub size_request {
		2338	my ($self) = @_;
		2339
		2340	($self->{tex}{w}, $self->{tex}{h})
		2341	}
		2342
		2343	sub _draw {
		2344	my ($self) = @_;
		2345
		2346	my $tex = $self->{tex};
		2347
		2348	my ($w, $h) = ($self->{w}, $self->{h});
		2349
		2350	if ($self->{rot90}) {
		2351	glRotate 90, 0, 0, 1;
		2352	glTranslate 0, -$self->{w}, 0;
		2353
		2354	($w, $h) = ($h, $w);
		2355	}
		2356
		2357	glEnable GL_TEXTURE_2D;
		2358	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2359
		2360	$tex->draw_quad (0, 0, $w, $h);
		2361
		2362	glDisable GL_TEXTURE_2D;
		2363	}
		2364
		2365	#############################################################################
		2366
1996	package CFClient::UI::ImageButton;	2367	package CFPlus::UI::ImageButton;
1997		2368
1998	our @ISA = CFClient::UI::Image::;	2369	our @ISA = CFPlus::UI::Image::;
1999		2370
2000	use CFClient::OpenGL;	2371	use CFPlus::OpenGL;
2001		2372
2002	my %textures;	2373	my %textures;
2003		2374
2004	sub new {	2375	sub new {
2005	my $class = shift;	2376	my $class = shift;
…		…
2027	1	2398	1
2028	}	2399	}
2029		2400
2030	#############################################################################	2401	#############################################################################
2031		2402
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;	2403	package CFPlus::UI::VGauge;
2108		2404
2109	our @ISA = CFClient::UI::Base::;	2405	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		2406
2170	use List::Util qw(min max);	2407	use List::Util qw(min max);
2171		2408
2172	use CFClient::OpenGL;	2409	use CFPlus::OpenGL;
2173		2410
2174	my %tex = (	2411	my %tex = (
2175	food => [	2412	food => [
2176	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2413	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2414	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2178	],	2415	],
2179	grace => [	2416	grace => [
2180	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2417	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/	2418	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2182	],	2419	],
2183	hp => [	2420	hp => [
2184	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2421	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2185	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2422	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2186	],	2423	],
2187	mana => [	2424	mana => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2425	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/	2426	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2190	],	2427	],
2191	);	2428	);
2192		2429
2193	# eg. VGauge->new (gauge => 'food'), default gauge: food	2430	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2296	glDisable GL_TEXTURE_2D;	2533	glDisable GL_TEXTURE_2D;
2297	}	2534	}
2298		2535
2299	#############################################################################	2536	#############################################################################
2300		2537
2301	package CFClient::UI::Gauge;	2538	package CFPlus::UI::Gauge;
2302		2539
2303	our @ISA = CFClient::UI::VBox::;	2540	our @ISA = CFPlus::UI::VBox::;
2304		2541
2305	sub new {	2542	sub new {
2306	my ($class, %arg) = @_;	2543	my ($class, %arg) = @_;
2307		2544
2308	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
…		…
2310	can_hover => 1,	2547	can_hover => 1,
2311	can_events => 1,	2548	can_events => 1,
2312	%arg,	2549	%arg,
2313	);	2550	);
2314		2551
2315	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2552	$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);	2553	$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");	2554	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2318		2555
2319	$self	2556	$self
2320	}	2557	}
2321		2558
2322	sub set_fontsize {	2559	sub set_fontsize {
…		…
2343	$self->{value}->set_text ($val);	2580	$self->{value}->set_text ($val);
2344	}	2581	}
2345		2582
2346	#############################################################################	2583	#############################################################################
2347		2584
2348	package CFClient::UI::Slider;	2585	package CFPlus::UI::Slider;
2349		2586
2350	use strict;	2587	use strict;
2351		2588
2352	use CFClient::OpenGL;	2589	use CFPlus::OpenGL;
2353		2590
2354	our @ISA = CFClient::UI::DrawBG::;	2591	our @ISA = CFPlus::UI::DrawBG::;
2355		2592
2356	my @tex =	2593	my @tex =
2357	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2594	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2358	qw(s1_slider.png s1_slider_bg.png);	2595	qw(s1_slider.png s1_slider_bg.png);
2359		2596
2360	sub new {	2597	sub new {
2361	my $class = shift;	2598	my $class = shift;
2362		2599
…		…
2451	}	2688	}
2452		2689
2453	1	2690	1
2454	}	2691	}
2455		2692
		2693	sub invoke_mouse_wheel {
		2694	my ($self, $ev) = @_;
		2695
		2696	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2697
		2698	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2699
		2700	! ! $delta
		2701	}
		2702
2456	sub update {	2703	sub update {
2457	my ($self) = @_;	2704	my ($self) = @_;
2458		2705
2459	delete $self->{knob_w};	2706	delete $self->{knob_w};
2460	$self->SUPER::update;	2707	$self->SUPER::update;
…		…
2507	glDisable GL_TEXTURE_2D;	2754	glDisable GL_TEXTURE_2D;
2508	}	2755	}
2509		2756
2510	#############################################################################	2757	#############################################################################
2511		2758
2512	package CFClient::UI::ValSlider;	2759	package CFPlus::UI::ValSlider;
2513		2760
2514	our @ISA = CFClient::UI::HBox::;	2761	our @ISA = CFPlus::UI::HBox::;
2515		2762
2516	sub new {	2763	sub new {
2517	my ($class, %arg) = @_;	2764	my ($class, %arg) = @_;
2518		2765
2519	my $range = delete $arg{range};	2766	my $range = delete $arg{range};
2520		2767
2521	my $self = $class->SUPER::new (	2768	my $self = $class->SUPER::new (
2522	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2769	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2523	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2770	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2524	to_value => sub { shift },	2771	to_value => sub { shift },
2525	from_value => sub { shift },	2772	from_value => sub { shift },
2526	%arg,	2773	%arg,
2527	);	2774	);
2528		2775
…		…
2548	sub set_range { shift->{slider}->set_range (@_) }	2795	sub set_range { shift->{slider}->set_range (@_) }
2549	sub set_value { shift->{slider}->set_value (@_) }	2796	sub set_value { shift->{slider}->set_value (@_) }
2550		2797
2551	#############################################################################	2798	#############################################################################
2552		2799
2553	package CFClient::UI::TextScroller;	2800	package CFPlus::UI::TextScroller;
2554		2801
2555	our @ISA = CFClient::UI::HBox::;	2802	our @ISA = CFPlus::UI::HBox::;
2556		2803
2557	use CFClient::OpenGL;	2804	use CFPlus::OpenGL;
2558		2805
2559	sub new {	2806	sub new {
2560	my $class = shift;	2807	my $class = shift;
2561		2808
2562	my $self = $class->SUPER::new (	2809	my $self = $class->SUPER::new (
2563	fontsize => 1,	2810	fontsize => 1,
2564	can_events => 0,	2811	can_events => 1,
2565	indent => 0,	2812	indent => 0,
2566	#font => default_font	2813	#font => default_font
2567	@_,	2814	@_,
2568		2815
2569	layout => (new CFClient::Layout),	2816	layout => (new CFPlus::Layout),
2570	par => [],	2817	par => [],
2571	height => 0,	2818	height => 0,
2572	children => [	2819	children => [
2573	(new CFClient::UI::Empty expand => 1),	2820	(new CFPlus::UI::Empty expand => 1),
2574	(new CFClient::UI::Slider vertical => 1),	2821	(new CFPlus::UI::Slider vertical => 1),
2575	],	2822	],
2576	);	2823	);
2577		2824
2578	$self->{children}[1]->connect (changed => sub { $self->update });	2825	$self->{children}[1]->connect (changed => sub { $self->update });
2579		2826
…		…
2609		2856
2610	$self->reflow;	2857	$self->reflow;
2611		2858
2612	local $self->{children} = [$empty, $slider];	2859	local $self->{children} = [$empty, $slider];
2613	$self->SUPER::invoke_size_allocate ($w, $h)	2860	$self->SUPER::invoke_size_allocate ($w, $h)
		2861	}
		2862
		2863	sub invoke_mouse_wheel {
		2864	my ($self, $ev) = @_;
		2865
		2866	return 0 unless $ev->{dy}; # only vertical movements
		2867
		2868	$self->{children}[1]->emit (mouse_wheel => $ev);
		2869
		2870	1
2614	}	2871	}
2615		2872
2616	sub get_layout {	2873	sub get_layout {
2617	my ($self, $para) = @_;	2874	my ($self, $para) = @_;
2618		2875
…		…
2646		2903
2647	# todo: base offset on lines or so, not on pixels	2904	# todo: base offset on lines or so, not on pixels
2648	$self->{children}[1]->set_value ($offset);	2905	$self->{children}[1]->set_value ($offset);
2649	}	2906	}
2650		2907
		2908	sub current_paragraph {
		2909	my ($self) = @_;
		2910
		2911	$self->{top_paragraph} - 1
		2912	}
		2913
		2914	sub scroll_to {
		2915	my ($self, $para) = @_;
		2916
		2917	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2918
		2919	$self->{scroll_to} = $para;
		2920	$self->update;
		2921	}
		2922
2651	sub clear {	2923	sub clear {
2652	my ($self) = @_;	2924	my ($self) = @_;
2653		2925
2654	my (undef, undef, @other) = @{ $self->{children} };	2926	my (undef, undef, @other) = @{ $self->{children} };
2655	$self->remove ($_) for @other;	2927	$self->remove ($_) for @other;
…		…
2658	$self->{height} = 0;	2930	$self->{height} = 0;
2659	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2931	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2660	}	2932	}
2661		2933
2662	sub add_paragraph {	2934	sub add_paragraph {
2663	my ($self, $color, $para, $indent) = @_;	2935	my $self = shift;
2664		2936
2665	my ($text, @w) = ref $para ? @$para : $para;	2937	for my $para (@_) {
2666
2667	$para = {	2938	$para = {
		2939	fg => [1, 1, 1, 1],
		2940	indent => 0,
		2941	markup => "",
		2942	widget => [],
		2943	ref $para ? %$para : (markup => $para),
2668	w => 1e10,	2944	w => 1e10,
2669	wrapped => 1,	2945	wrapped => 1,
2670	fg => $color,
2671	indent => $indent,
2672	markup => $text,
2673	widget => \@w,
2674	};	2946	};
2675		2947
2676	$self->add (@w) if @w;	2948	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2677	push @{$self->{par}}, $para;	2949	push @{$self->{par}}, $para;
		2950	}
2678		2951
2679	$self->{need_reflow}++;	2952	$self->{need_reflow}++;
2680	$self->update;	2953	$self->update;
2681	}	2954	}
2682		2955
2683	sub scroll_to_bottom {	2956	sub scroll_to_bottom {
2684	my ($self) = @_;	2957	my ($self) = @_;
2685		2958
2686	$self->{scroll_to_bottom} = 1;	2959	$self->{scroll_to} = $#{$self->{par}};
2687	$self->update;	2960	$self->update;
2688	}	2961	}
2689		2962
		2963	sub force_uptodate {
		2964	my ($self) = @_;
		2965
		2966	if (delete $self->{need_reflow}) {
		2967	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2968
		2969	my $height = 0;
		2970
		2971	for my $para (@{$self->{par}}) {
		2972	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2973	my $layout = $self->get_layout ($para);
		2974	my ($w, $h) = $layout->size;
		2975
		2976	$para->{w} = $w + $para->{indent};
		2977	$para->{h} = $h;
		2978	$para->{wrapped} = $layout->has_wrapped;
		2979	}
		2980
		2981	$para->{y} = $height;
		2982	$height += $para->{h};
		2983	}
		2984
		2985	$self->{height} = $height;
		2986	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2987
		2988	delete $self->{texture};
		2989	}
		2990
		2991	if (my $paridx = delete $self->{scroll_to}) {
		2992	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2993	}
		2994	}
		2995
2690	sub update {	2996	sub update {
2691	my ($self) = @_;	2997	my ($self) = @_;
2692		2998
2693	$self->SUPER::update;	2999	$self->SUPER::update;
2694		3000
2695	return unless $self->{h} > 0;	3001	return unless $self->{h} > 0;
2696		3002
2697	delete $self->{texture};	3003	delete $self->{texture};
2698		3004
2699	$ROOT->on_post_alloc ($self => sub {	3005	$ROOT->on_post_alloc ($self => sub {
		3006	$self->force_uptodate;
		3007
2700	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3008	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2701		3009
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 {	3010	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2730	glClearColor 0, 0, 0, 0;	3011	glClearColor 0, 0, 0, 0;
2731	glClear GL_COLOR_BUFFER_BIT;	3012	glClear GL_COLOR_BUFFER_BIT;
2732		3013
		3014	package CFPlus::UI::Base;
		3015	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3016	(0, 0, $self->{w}, $self->{h});
		3017
		3018	my $top = int $self->{children}[1]{range}[0];
		3019
		3020	my $paridx = 0;
		3021	my $top_paragraph;
2733	my $top = int $self->{children}[1]{range}[0];	3022	my $top = int $self->{children}[1]{range}[0];
2734		3023
2735	my $y0 = $top;	3024	my $y0 = $top;
2736	my $y1 = $top + $H;	3025	my $y1 = $top + $H;
2737		3026
2738	my $y = 0;
2739
2740	for my $para (@{$self->{par}}) {	3027	for my $para (@{$self->{par}}) {
2741	my $h = $para->{h};	3028	my $h = $para->{h};
		3029	my $y = $para->{y};
2742		3030
2743	if ($y0 < $y + $h && $y < $y1) {	3031	if ($y0 < $y + $h && $y < $y1) {
2744
2745	my $layout = $self->get_layout ($para);	3032	my $layout = $self->get_layout ($para);
2746		3033
2747	$layout->render ($para->{indent}, $y - $y0);	3034	$layout->render ($para->{indent}, $y - $y0);
2748		3035
2749	if (my @w = @{ $para->{widget} }) {	3036	if (my @w = @{ $para->{widget} }) {
…		…
2758	$_->draw;	3045	$_->draw;
2759	}	3046	}
2760	}	3047	}
2761	}	3048	}
2762		3049
2763	$y += $h;	3050	$paridx++;
		3051	$top_paragraph ||= $paridx if $y >= $top;
2764	}	3052	}
		3053
		3054	$self->{top_paragraph} = $top_paragraph;
2765	};	3055	};
2766	});	3056	});
2767	}	3057	}
2768		3058
2769	sub reconfigure {	3059	sub reconfigure {
…		…
2787	$self->{children}[1]->draw;	3077	$self->{children}[1]->draw;
2788	}	3078	}
2789		3079
2790	#############################################################################	3080	#############################################################################
2791		3081
2792	package CFClient::UI::Animator;	3082	package CFPlus::UI::Animator;
2793		3083
2794	use CFClient::OpenGL;	3084	use CFPlus::OpenGL;
2795		3085
2796	our @ISA = CFClient::UI::Bin::;	3086	our @ISA = CFPlus::UI::Bin::;
2797		3087
2798	sub moveto {	3088	sub moveto {
2799	my ($self, $x, $y) = @_;	3089	my ($self, $x, $y) = @_;
2800		3090
2801	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3091	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2829	glPopMatrix;	3119	glPopMatrix;
2830	}	3120	}
2831		3121
2832	#############################################################################	3122	#############################################################################
2833		3123
2834	package CFClient::UI::Flopper;	3124	package CFPlus::UI::Flopper;
2835		3125
2836	our @ISA = CFClient::UI::Button::;	3126	our @ISA = CFPlus::UI::Button::;
2837		3127
2838	sub new {	3128	sub new {
2839	my $class = shift;	3129	my $class = shift;
2840		3130
2841	my $self = $class->SUPER::new (	3131	my $self = $class->SUPER::new (
…		…
2853	$self->{other}->toggle_visibility;	3143	$self->{other}->toggle_visibility;
2854	}	3144	}
2855		3145
2856	#############################################################################	3146	#############################################################################
2857		3147
2858	package CFClient::UI::Tooltip;	3148	package CFPlus::UI::Tooltip;
2859		3149
2860	our @ISA = CFClient::UI::Bin::;	3150	our @ISA = CFPlus::UI::Bin::;
2861		3151
2862	use CFClient::OpenGL;	3152	use CFPlus::OpenGL;
2863		3153
2864	sub new {	3154	sub new {
2865	my $class = shift;	3155	my $class = shift;
2866		3156
2867	$class->SUPER::new (	3157	$class->SUPER::new (
…		…
2870	)	3160	)
2871	}	3161	}
2872		3162
2873	sub set_tooltip_from {	3163	sub set_tooltip_from {
2874	my ($self, $widget) = @_;	3164	my ($self, $widget) = @_;
		3165
		3166	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3167	if $widget->{tooltip} =~ /^#(.*)$/;
2875		3168
2876	my $tooltip = $widget->{tooltip};	3169	my $tooltip = $widget->{tooltip};
2877		3170
2878	if ($ENV{CFPLUS_DEBUG} & 2) {	3171	if ($ENV{CFPLUS_DEBUG} & 2) {
2879	$tooltip .= "\n\n" . (ref $widget) . "\n"	3172	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2883	}	3176	}
2884		3177
2885	$tooltip =~ s/^\n+//;	3178	$tooltip =~ s/^\n+//;
2886	$tooltip =~ s/\n+$//;	3179	$tooltip =~ s/\n+$//;
2887		3180
2888	$self->add (new CFClient::UI::Label	3181	$self->add (new CFPlus::UI::Label
2889	markup => $tooltip,	3182	markup => $tooltip,
2890	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3183	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891	fontsize => 0.8,	3184	fontsize => 0.8,
2892	fg => [0, 0, 0, 1],	3185	style => 1, # FLAG_INVERSE
2893	ellipsise => 0,	3186	ellipsise => 0,
2894	font => ($widget->{tooltip_font} || $::FONT_PROP),	3187	font => ($widget->{tooltip_font} || $::FONT_PROP),
2895	);	3188	);
2896	}	3189	}
2897		3190
…		…
2916		3209
2917	$self->{root}->on_post_alloc ("move_$self" => sub {	3210	$self->{root}->on_post_alloc ("move_$self" => sub {
2918	my $widget = $self->{owner}	3211	my $widget = $self->{owner}
2919	or return;	3212	or return;
2920		3213
		3214	if ($widget->{visible}) {
2921	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3215	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922		3216
2923	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3217	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924	if $x + $self->{w} > $self->{root}{w};	3218	if $x + $self->{w} > $self->{root}{w};
2925		3219
2926	$self->move_abs ($x, $y);	3220	$self->move_abs ($x, $y);
		3221	} else {
		3222	$self->hide;
		3223	}
2927	});	3224	});
2928	}	3225	}
2929		3226
2930	sub _draw {	3227	sub _draw {
2931	my ($self) = @_;	3228	my ($self) = @_;
…		…
2955	$self->SUPER::_draw;	3252	$self->SUPER::_draw;
2956	}	3253	}
2957		3254
2958	#############################################################################	3255	#############################################################################
2959		3256
2960	package CFClient::UI::Face;	3257	package CFPlus::UI::Face;
2961		3258
2962	our @ISA = CFClient::UI::Base::;	3259	our @ISA = CFPlus::UI::DrawBG::;
2963		3260
2964	use CFClient::OpenGL;	3261	use CFPlus::OpenGL;
2965		3262
2966	sub new {	3263	sub new {
2967	my $class = shift;	3264	my $class = shift;
2968		3265
2969	my $self = $class->SUPER::new (	3266	my $self = $class->SUPER::new (
…		…
3004	sub _draw {	3301	sub _draw {
3005	my ($self) = @_;	3302	my ($self) = @_;
3006		3303
3007	return unless $::CONN;	3304	return unless $::CONN;
3008		3305
		3306	$self->SUPER::_draw;
		3307
3009	my $face;	3308	my $face;
3010		3309
3011	if ($self->{frame}) {	3310	if ($self->{frame}) {
3012	my $anim = $::CONN->{anim}[$self->{anim}];	3311	my $anim = $::CONN->{anim}[$self->{anim}];
3013		3312
…		…
3035	$self->SUPER::destroy;	3334	$self->SUPER::destroy;
3036	}	3335	}
3037		3336
3038	#############################################################################	3337	#############################################################################
3039		3338
3040	package CFClient::UI::Buttonbar;	3339	package CFPlus::UI::Buttonbar;
3041		3340
3042	our @ISA = CFClient::UI::HBox::;	3341	our @ISA = CFPlus::UI::HBox::;
3043		3342
3044	# TODO: should actualyl wrap buttons and other goodies.	3343	# TODO: should actually wrap buttons and other goodies.
3045		3344
3046	#############################################################################	3345	#############################################################################
3047		3346
3048	package CFClient::UI::Menu;	3347	package CFPlus::UI::Menu;
3049		3348
3050	our @ISA = CFClient::UI::FancyFrame::;	3349	our @ISA = CFPlus::UI::Toplevel::;
3051		3350
3052	use CFClient::OpenGL;	3351	use CFPlus::OpenGL;
3053		3352
3054	sub new {	3353	sub new {
3055	my $class = shift;	3354	my $class = shift;
3056		3355
3057	my $self = $class->SUPER::new (	3356	my $self = $class->SUPER::new (
3058	items => [],	3357	items => [],
3059	z => 100,	3358	z => 100,
3060	@_,	3359	@_,
3061	);	3360	);
3062		3361
3063	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3362	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064		3363
3065	for my $item (@{ $self->{items} }) {	3364	for my $item (@{ $self->{items} }) {
3066	my ($widget, $cb, $tooltip) = @$item;	3365	my ($widget, $cb, $tooltip) = @$item;
3067		3366
3068	# handle various types of items, only text for now	3367	# handle various types of items, only text for now
3069	if (!ref $widget) {	3368	if (!ref $widget) {
3070	if ($widget =~ /\t/) {	3369	if ($widget =~ /\t/) {
3071	my ($left, $right) = split /\t/, $widget, 2;	3370	my ($left, $right) = split /\t/, $widget, 2;
3072		3371
3073	$widget = new CFClient::UI::HBox	3372	$widget = new CFPlus::UI::HBox
3074	can_hover => 1,	3373	can_hover => 1,
3075	can_events => 1,	3374	can_events => 1,
3076	tooltip => $tooltip,	3375	tooltip => $tooltip,
3077	children => [	3376	children => [
3078	(new CFClient::UI::Label markup => $left, expand => 1),	3377	(new CFPlus::UI::Label markup => $left, expand => 1),
3079	(new CFClient::UI::Label markup => $right, align => +1),	3378	(new CFPlus::UI::Label markup => $right, align => +1),
3080	],	3379	],
3081	;	3380	;
3082		3381
3083	} else {	3382	} else {
3084	$widget = new CFClient::UI::Label	3383	$widget = new CFPlus::UI::Label
3085	can_hover => 1,	3384	can_hover => 1,
3086	can_events => 1,	3385	can_events => 1,
3087	markup => $widget,	3386	markup => $widget,
3088	tooltip => $tooltip;	3387	tooltip => $tooltip;
3089	}	3388	}
…		…
3137	1	3436	1
3138	}	3437	}
3139		3438
3140	#############################################################################	3439	#############################################################################
3141		3440
3142	package CFClient::UI::Multiplexer;	3441	package CFPlus::UI::Multiplexer;
3143		3442
3144	our @ISA = CFClient::UI::Container::;	3443	our @ISA = CFPlus::UI::Container::;
3145		3444
3146	sub new {	3445	sub new {
3147	my $class = shift;	3446	my $class = shift;
3148		3447
3149	my $self = $class->SUPER::new (	3448	my $self = $class->SUPER::new (
…		…
3210	$self->{current}->draw;	3509	$self->{current}->draw;
3211	}	3510	}
3212		3511
3213	#############################################################################	3512	#############################################################################
3214		3513
3215	package CFClient::UI::Notebook;	3514	package CFPlus::UI::Notebook;
3216		3515
3217	our @ISA = CFClient::UI::VBox::;	3516	our @ISA = CFPlus::UI::VBox::;
3218		3517
3219	sub new {	3518	sub new {
3220	my $class = shift;	3519	my $class = shift;
3221		3520
3222	my $self = $class->SUPER::new (	3521	my $self = $class->SUPER::new (
3223	buttonbar => (new CFClient::UI::Buttonbar),	3522	buttonbar => (new CFPlus::UI::Buttonbar),
3224	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3523	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3225	# filter => # will be put between multiplexer and $self	3524	# filter => # will be put between multiplexer and $self
3226	@_,	3525	@_,
3227	);	3526	);
3228		3527
3229	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3528	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3235	sub add {	3534	sub add {
3236	my ($self, $title, $widget, $tooltip) = @_;	3535	my ($self, $title, $widget, $tooltip) = @_;
3237		3536
3238	Scalar::Util::weaken $self;	3537	Scalar::Util::weaken $self;
3239		3538
3240	$self->{buttonbar}->add (new CFClient::UI::Button	3539	$self->{buttonbar}->add (new CFPlus::UI::Button
3241	markup => $title,	3540	markup => $title,
3242	tooltip => $tooltip,	3541	tooltip => $tooltip,
3243	on_activate => sub { $self->set_current_page ($widget) },	3542	on_activate => sub { $self->set_current_page ($widget) },
3244	);	3543	);
3245		3544
…		…
3259	$self->emit (page_changed => $self->{multiplexer}{current});	3558	$self->emit (page_changed => $self->{multiplexer}{current});
3260	}	3559	}
3261		3560
3262	#############################################################################	3561	#############################################################################
3263		3562
3264	package CFClient::UI::Combobox;	3563	package CFPlus::UI::Selector;
3265		3564
3266	use utf8;	3565	use utf8;
3267		3566
3268	our @ISA = CFClient::UI::Button::;	3567	our @ISA = CFPlus::UI::Button::;
3269		3568
3270	sub new {	3569	sub new {
3271	my $class = shift;	3570	my $class = shift;
3272		3571
3273	my $self = $class->SUPER::new (	3572	my $self = $class->SUPER::new (
…		…
3290	my ($value, $title, $tooltip) = @$_;	3589	my ($value, $title, $tooltip) = @$_;
3291		3590
3292	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3591	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293	}	3592	}
3294		3593
3295	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3594	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296	}	3595	}
3297		3596
3298	sub _set_value {	3597	sub _set_value {
3299	my ($self, $value) = @_;	3598	my ($self, $value) = @_;
3300		3599
…		…
3315	$self->emit (changed => $value);	3614	$self->emit (changed => $value);
3316	}	3615	}
3317		3616
3318	#############################################################################	3617	#############################################################################
3319		3618
3320	package CFClient::UI::Statusbox;	3619	package CFPlus::UI::Statusbox;
3321		3620
3322	our @ISA = CFClient::UI::VBox::;	3621	our @ISA = CFPlus::UI::VBox::;
3323		3622
3324	sub new {	3623	sub new {
3325	my $class = shift;	3624	my $class = shift;
3326		3625
3327	my $self = $class->SUPER::new (	3626	my $self = $class->SUPER::new (
…		…
3339	sub reorder {	3638	sub reorder {
3340	my ($self) = @_;	3639	my ($self) = @_;
3341	my $NOW = Time::HiRes::time;	3640	my $NOW = Time::HiRes::time;
3342		3641
3343	# freeze display when hovering over any label	3642	# freeze display when hovering over any label
3344	return if $CFClient::UI::TOOLTIP->{owner}	3643	return if $CFPlus::UI::TOOLTIP->{owner}
3345	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3644	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3346	values %{ $self->{item} };	3645	values %{ $self->{item} };
3347		3646
3348	while (my ($k, $v) = each %{ $self->{item} }) {	3647	while (my ($k, $v) = each %{ $self->{item} }) {
3349	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3648	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3350	}	3649	}
…		…
3371	for ($short) {	3670	for ($short) {
3372	s/^\s+//;	3671	s/^\s+//;
3373	s/\s+/ /g;	3672	s/\s+/ /g;
3374	}	3673	}
3375		3674
3376	new CFClient::UI::Label	3675	new CFPlus::UI::Label
3377	markup => $short,	3676	markup => $short,
3378	tooltip => $item->{tooltip},	3677	tooltip => $item->{tooltip},
3379	tooltip_font => $::FONT_PROP,	3678	tooltip_font => $::FONT_PROP,
3380	tooltip_width => 0.67,	3679	tooltip_width => 0.67,
3381	fontsize => $item->{fontsize} || $self->{fontsize},	3680	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3460	$self->SUPER::destroy;	3759	$self->SUPER::destroy;
3461	}	3760	}
3462		3761
3463	#############################################################################	3762	#############################################################################
3464		3763
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;	3764	package CFPlus::UI::Root;
3630		3765
3631	our @ISA = CFClient::UI::Container::;	3766	our @ISA = CFPlus::UI::Container::;
3632		3767
3633	use List::Util qw(min max);	3768	use List::Util qw(min max);
3634		3769
3635	use CFClient::OpenGL;	3770	use CFPlus::OpenGL;
3636		3771
3637	sub new {	3772	sub new {
3638	my $class = shift;	3773	my $class = shift;
3639		3774
3640	my $self = $class->SUPER::new (	3775	my $self = $class->SUPER::new (
…		…
3816	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3951	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3817		3952
3818	$w = 0 if $w < 0;	3953	$w = 0 if $w < 0;
3819	$h = 0 if $h < 0;	3954	$h = 0 if $h < 0;
3820		3955
		3956	$w = max $widget->{min_w}, $w;
		3957	$h = max $widget->{min_h}, $h;
		3958
		3959	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3960	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3961
		3962	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3963	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3964
3821	$w = int $w + 0.5;	3965	$w = int $w + 0.5;
3822	$h = int $h + 0.5;	3966	$h = int $h + 0.5;
3823		3967
3824	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3968	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3825	$widget->{old_w} = $widget->{w};	3969	$widget->{old_w} = $widget->{w};
…		…
3848	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3992	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3849	glMatrixMode GL_MODELVIEW;	3993	glMatrixMode GL_MODELVIEW;
3850	glLoadIdentity;	3994	glLoadIdentity;
3851		3995
3852	{	3996	{
3853	package CFClient::UI::Base;	3997	package CFPlus::UI::Base;
3854		3998
3855	($draw_x, $draw_y, $draw_w, $draw_h) =	3999	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3856	(0, 0, $self->{w}, $self->{h});	4000	(0, 0, $self->{w}, $self->{h});
3857	}
3858		4001
3859	$self->_draw;	4002	$self->_draw;
		4003	}
3860	}	4004	}
3861		4005
3862	#############################################################################	4006	#############################################################################
3863		4007
3864	package CFClient::UI;	4008	package CFPlus::UI;
3865		4009
3866	$ROOT = new CFClient::UI::Root;	4010	$ROOT = new CFPlus::UI::Root;
3867	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4011	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3868		4012
3869	1	4013	1
3870		4014

Diff Legend

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