ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC vs.
Revision 1.367 by root, Fri Apr 27 00:59:14 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	warn "button down $ev->{button}\n";#d#	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
89		105
90	if (!$BUTTON_STATE) {	106	unless ($GRAB) {
91	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
92		108
93	$GRAB = $widget;	109	$GRAB = $widget;
94	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
95		111
96	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
97	}	113	}
98		114
99	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
100		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
101	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
102	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
103	}	125	}
104		126
105	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
106	my ($ev) = @_;	128	my ($ev) = @_;
107	my ($x, $y) = ($ev->{x}, $ev->{y});
108		129
109	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
110		131
111	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
112		133
113	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
114	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
115		136
116	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
117	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
118	$grab->update if $grab;	139	$grab->update if $grab;
119	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
120		141
		142	check_hover $widget;
121	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
122	}	144	}
123	}	145	}
124		146
125	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
126	my ($ev) = @_;	148	my ($ev) = @_;
127	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
128		150
129	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
130		152
131	if ($widget != $HOVER) {	153	check_hover $widget;
132	my $hover = $HOVER; $HOVER = $widget;
133		154
134	$hover->update if $hover && $hover->{can_hover};	155	$HOVER->emit (mouse_motion => $ev)
135	$HOVER->update if $HOVER && $HOVER->{can_hover};
136
137	$TOOLTIP_WATCHER->start;
138	}
139
140	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
141	if $HOVER;	156	if $HOVER;
142	}	157	}
143		158
144	# convert position array to integers	159	# convert position array to integers
145	sub harmonize {	160	sub harmonize {
…		…
195	reconfigure_widgets;	210	reconfigure_widgets;
196	}	211	}
197		212
198	#############################################################################	213	#############################################################################
199		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
200	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
201		224
202	use strict;	225	use strict;
203		226
204	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
205		228
206	sub new {	229	sub new {
207	my $class = shift;	230	my $class = shift;
208		231
209	my $self = bless {	232	my $self = bless {
…		…
214	h => undef,	237	h => undef,
215	can_events => 1,	238	can_events => 1,
216	@_	239	@_
217	}, $class;	240	}, $class;
218		241
219	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
220		243
221	for (keys %$self) {	244	for (keys %$self) {
222	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
223	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
224	}	247	}
225	}	248	}
226		249
227	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
228	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
229	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
230	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
231	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
232		255
233	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
234	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
235		258
236	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
241		264
242	sub destroy {	265	sub destroy {
243	my ($self) = @_;	266	my ($self) = @_;
244		267
245	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
246	%$self = ();	270	%$self = ();
247	}	271	}
248		272
249	sub show {	273	sub show {
250	my ($self) = @_;	274	my ($self) = @_;
251		275
252	return if $self->{parent};	276	return if $self->{parent};
253		277
254	$CFClient::UI::ROOT->add ($self);	278	$CFPlus::UI::ROOT->add ($self);
255	}	279	}
256		280
257	sub set_visible {	281	sub set_visible {
258	my ($self) = @_;	282	my ($self) = @_;
259		283
…		…
280	delete $self->{root};	304	delete $self->{root};
281		305
282	undef $GRAB if $GRAB == $self;	306	undef $GRAB if $GRAB == $self;
283	undef $HOVER if $HOVER == $self;	307	undef $HOVER if $HOVER == $self;
284		308
285	$CFClient::UI::TOOLTIP_WATCHER->cb->()	309	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
286	if $TOOLTIP->{owner} == $self;	310	if $TOOLTIP->{owner} == $self;
287		311
288	$self->emit ("focus_out");	312	$self->emit ("focus_out");
289	$self->emit (visibility_change => 0);	313	$self->emit (visibility_change => 0);
290	}	314	}
…		…
347	my ($self, $x, $y, $w, $h) = @_;	371	my ($self, $x, $y, $w, $h) = @_;
348		372
349	if ($self->{aspect}) {	373	if ($self->{aspect}) {
350	my ($ow, $oh) = ($w, $h);	374	my ($ow, $oh) = ($w, $h);
351		375
352	$w = List::Util::min $w, int $h * $self->{aspect};	376	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
353	$h = List::Util::min $h, int $w / $self->{aspect};	377	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
354		378
355	# use alignment to adjust x, y	379	# use alignment to adjust x, y
356		380
357	$x += int 0.5 * ($ow - $w);	381	$x += int 0.5 * ($ow - $w);
358	$y += int 0.5 * ($oh - $h);	382	$y += int 0.5 * ($oh - $h);
…		…
399		423
400	return if $self->{tooltip} eq $tooltip;	424	return if $self->{tooltip} eq $tooltip;
401		425
402	$self->{tooltip} = $tooltip;	426	$self->{tooltip} = $tooltip;
403		427
404	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	428	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
405	delete $CFClient::UI::TOOLTIP->{owner};	429	delete $CFPlus::UI::TOOLTIP->{owner};
406	$CFClient::UI::TOOLTIP_WATCHER->cb->();	430	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
407	}	431	}
408	}	432	}
409		433
410	# translate global coordinates to local coordinate system	434	# translate global coordinates to local coordinate system
411	sub coord2local {	435	sub coord2local {
412	my ($self, $x, $y) = @_;	436	my ($self, $x, $y) = @_;
413		437
		438	Carp::confess unless $self->{parent};#d#
		439
414	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	440	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
415	}	441	}
416		442
417	# translate local coordinates to global coordinate system	443	# translate local coordinates to global coordinate system
418	sub coord2global {	444	sub coord2global {
419	my ($self, $x, $y) = @_;	445	my ($self, $x, $y) = @_;
		446
		447	Carp::confess unless $self->{parent};#d#
420		448
421	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	449	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
422	}	450	}
423		451
424	sub invoke_focus_in {	452	sub invoke_focus_in {
…		…
458		486
459	sub invoke_mouse_motion { 0 }	487	sub invoke_mouse_motion { 0 }
460	sub invoke_button_up { 0 }	488	sub invoke_button_up { 0 }
461	sub invoke_key_down { 0 }	489	sub invoke_key_down { 0 }
462	sub invoke_key_up { 0 }	490	sub invoke_key_up { 0 }
		491	sub invoke_mouse_wheel { 0 }
463		492
464	sub invoke_button_down {	493	sub invoke_button_down {
465	my ($self, $ev, $x, $y) = @_;	494	my ($self, $ev, $x, $y) = @_;
466		495
467	$self->grab_focus;	496	$self->grab_focus;
468		497
469	warn "button down $ev->{button} $x $y\n";#d#
470
471	0	498	0
472	}	499	}
473		500
474	sub connect {	501	sub connect {
475	my ($self, $signal, $cb) = @_;	502	my ($self, $signal, $cb) = @_;
476		503
477	push @{ $self->{signal_cb}{$signal} }, $cb;	504	push @{ $self->{signal_cb}{$signal} }, $cb;
		505
		506	defined wantarray and CFPlus::guard {
		507	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		508	@{ $self->{signal_cb}{$signal} };
		509	}
478	}	510	}
		511
		512	sub disconnect_all {
		513	my ($self, $signal) = @_;
		514
		515	delete $self->{signal_cb}{$signal};
		516	}
		517
		518	my %has_coords = (
		519	button_down => 1,
		520	button_up => 1,
		521	mouse_motion => 1,
		522	mouse_wheel => 1,
		523	);
479		524
480	sub emit {	525	sub emit {
481	my ($self, $signal, @args) = @_;	526	my ($self, $signal, @args) = @_;
482		527
483	#d##TODO# stop propagating at first true, do not use sum	528	# I do not really like this solution, but I do not like duplication
484	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	529	# and needlessly verbose code, either.
		530	my @append
		531	= $has_coords{$signal}
		532	? $args[0]->xy ($self)
		533	: ();
		534
		535	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		536
		537	for my $cb (
		538	@{$self->{signal_cb}{$signal} || []}, # before
485	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	539	($self->can ("invoke_$signal") || sub { 1 }), # closure
		540	) {
		541	return $cb->($self, @args, @append) || next;
		542	}
		543
		544	# parent
486	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	545	$self->{parent} && $self->{parent}->emit ($signal, @args)
487	}	546	}
488		547
489	sub find_widget {	548	sub find_widget {
490	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
491		550
…		…
499	}	558	}
500		559
501	sub set_parent {	560	sub set_parent {
502	my ($self, $parent) = @_;	561	my ($self, $parent) = @_;
503		562
504	Scalar::Util::weaken ($self->{parent} = $parent);	563	CFPlus::weaken ($self->{parent} = $parent);
505	$self->set_visible if $parent->{visible};	564	$self->set_visible if $parent->{visible};
506	}	565	}
507		566
508	sub realloc {	567	sub realloc {
509	my ($self) = @_;	568	my ($self) = @_;
…		…
575	glVertex $self->{w} - 1, 0;	634	glVertex $self->{w} - 1, 0;
576	glVertex $self->{w} - 1, $self->{h} - 1;	635	glVertex $self->{w} - 1, $self->{h} - 1;
577	glVertex 0 , $self->{h} - 1;	636	glVertex 0 , $self->{h} - 1;
578	glEnd;	637	glEnd;
579	glPopMatrix;	638	glPopMatrix;
580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	639	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581	}	640	}
582		641
583	$self->_draw;	642	$self->_draw;
584	glPopMatrix;	643	glPopMatrix;
585	}	644	}
…		…
588	my ($self) = @_;	647	my ($self) = @_;
589		648
590	warn "no draw defined for $self\n";	649	warn "no draw defined for $self\n";
591	}	650	}
592		651
		652	my $cntx;#d#
593	sub DESTROY {	653	sub DESTROY {
594	my ($self) = @_;	654	my ($self) = @_;
595		655
596	return if CFClient::in_destruct;	656	return if CFPlus::in_destruct;
597
598	delete $WIDGET{$self+0};
599		657
600	eval { $self->destroy };	658	eval { $self->destroy };
601	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		660
		661	delete $WIDGET{$self+0};
602	}	662	}
603		663
604	#############################################################################	664	#############################################################################
605		665
606	package CFClient::UI::DrawBG;	666	package CFPlus::UI::DrawBG;
607		667
608	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
609		669
610	use strict;	670	use strict;
611	use CFClient::OpenGL;	671	use CFPlus::OpenGL;
612		672
613	sub new {	673	sub new {
614	my $class = shift;	674	my $class = shift;
615		675
616	# range [value, low, high, page]	676	# range [value, low, high, page]
…		…
647	}	707	}
648	}	708	}
649		709
650	#############################################################################	710	#############################################################################
651		711
652	package CFClient::UI::Empty;	712	package CFPlus::UI::Empty;
653		713
654	our @ISA = CFClient::UI::Base::;	714	our @ISA = CFPlus::UI::Base::;
655		715
656	sub new {	716	sub new {
657	my ($class, %arg) = @_;	717	my ($class, %arg) = @_;
658	$class->SUPER::new (can_events => 0, %arg);	718	$class->SUPER::new (can_events => 0, %arg);
659	}	719	}
…		…
666		726
667	sub draw { }	727	sub draw { }
668		728
669	#############################################################################	729	#############################################################################
670		730
671	package CFClient::UI::Container;	731	package CFPlus::UI::Container;
672		732
673	our @ISA = CFClient::UI::Base::;	733	our @ISA = CFPlus::UI::Base::;
674		734
675	sub new {	735	sub new {
676	my ($class, %arg) = @_;	736	my ($class, %arg) = @_;
677		737
678	my $children = delete $arg{children};	738	my $children = delete $arg{children};
…		…
687	if $children;	747	if $children;
688		748
689	$self	749	$self
690	}	750	}
691		751
		752	sub realloc {
		753	my ($self) = @_;
		754
		755	$self->{force_realloc} = 1;
		756	$self->{force_size_alloc} = 1;
		757	$self->SUPER::realloc;
		758	}
		759
692	sub add {	760	sub add {
693	my ($self, @widgets) = @_;	761	my ($self, @widgets) = @_;
694		762
695	$_->set_parent ($self)	763	$_->set_parent ($self)
696	for @widgets;	764	for @widgets;
…		…
756	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
757	}	825	}
758		826
759	#############################################################################	827	#############################################################################
760		828
761	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
762		830
763	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
764		832
765	sub new {	833	sub new {
766	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
767		835
768	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
769		837
770	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
771	}	839	}
772		840
773	sub add {	841	sub add {
…		…
780	sub remove {	848	sub remove {
781	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
782		850
783	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
784		852
785	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
786	unless @{$self->{children}};	854	unless @{$self->{children}};
787	}	855	}
788		856
789	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
790		858
…		…
802		870
803	#############################################################################	871	#############################################################################
804		872
805	# back-buffered drawing area	873	# back-buffered drawing area
806		874
807	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
808		876
809	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
810		878
811	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
812		880
813	sub new {	881	sub new {
814	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
815		883
816	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
838	}	906	}
839		907
840	sub render_child {	908	sub render_child {
841	my ($self) = @_;	909	my ($self) = @_;
842		910
843	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	911	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
844	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
845	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
846		914
847	{	915	{
848	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
849		917
850	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
851	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
852	}	922	}
853
854	$self->_render;
855	};	923	};
856	}	924	}
857		925
858	sub _draw {	926	sub _draw {
859	my ($self) = @_;	927	my ($self) = @_;
860
861	my ($w, $h) = @$self{qw(w h)};
862		928
863	my $tex = $self->{texture}	929	my $tex = $self->{texture}
864	or return;	930	or return;
865		931
866	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
867	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
868	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
869		935
870	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
871		937
872	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
873	}	939	}
874		940
875	#############################################################################	941	#############################################################################
876		942
877	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
878		944
879	our @ISA = CFClient::UI::Window::;	945	our @ISA = CFPlus::UI::Window::;
880		946
881	sub new {	947	sub new {
882	my $class = shift;	948	my $class = shift;
883		949
884	$class->SUPER::new (	950	$class->SUPER::new (
…		…
944	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1010	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
945	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1011	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
946	) {	1012	) {
947	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1013	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
948	} else {	1014	} else {
949	$self->CFClient::UI::Base::find_widget ($x, $y)	1015	$self->CFPlus::UI::Base::find_widget ($x, $y)
950	}	1016	}
951	}	1017	}
952		1018
953	sub _render {	1019	sub _render {
954	my ($self) = @_;	1020	my ($self) = @_;
955		1021
956	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1022	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
957	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1023	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
958		1024
959	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1025	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
960		1026
961	$self->SUPER::_render;	1027	$self->SUPER::_render;
962	}	1028	}
963		1029
964	#############################################################################	1030	#############################################################################
965		1031
966	package CFClient::UI::ScrolledWindow;	1032	package CFPlus::UI::ScrolledWindow;
967		1033
968	our @ISA = CFClient::UI::HBox::;	1034	our @ISA = CFPlus::UI::HBox::;
969		1035
970	sub new {	1036	sub new {
971	my ($class, %arg) = @_;	1037	my ($class, %arg) = @_;
972		1038
973	my $child = delete $arg{child};	1039	my $child = delete $arg{child};
974		1040
975	my $self;	1041	my $self;
976		1042
977	my $slider = new CFClient::UI::Slider	1043	my $slider = new CFPlus::UI::Slider
978	vertical => 1,	1044	vertical => 1,
979	range => [0, 0, 1, 0.01], # HACK fix	1045	range => [0, 0, 1, 0.01], # HACK fix
980	on_changed => sub {	1046	on_changed => sub {
981	$self->{vp}->set_offset (0, $_[1]);	1047	$self->{vp}->set_offset (0, $_[1]);
982	},	1048	},
983	;	1049	;
984		1050
985	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
986	vp => (new CFClient::UI::ViewPort expand => 1),	1052	vp => (new CFPlus::UI::ViewPort expand => 1),
		1053	can_events => 1,
987	slider => $slider,	1054	slider => $slider,
988	%arg,	1055	%arg,
989	);	1056	);
990		1057
991	$self->SUPER::add ($self->{vp}, $self->{slider});	1058	$self->SUPER::add ($self->{vp}, $self->{slider});
992	$self->add ($child) if $child;	1059	$self->add ($child) if $child;
…		…
1000	my ($self, $widget) = @_;	1067	my ($self, $widget) = @_;
1001		1068
1002	$self->{vp}->add ($self->{child} = $widget);	1069	$self->{vp}->add ($self->{child} = $widget);
1003	}	1070	}
1004		1071
1005	sub invoke_button_down {	1072	sub invoke_mouse_wheel {
1006	my ($self, $ev) = @_;	1073	my ($self, $ev) = @_;
1007		1074
1008	warn "button down $ev->{button}\n";#d#	1075	return 0 unless $ev->{dy}; # only vertical movements
		1076
		1077	$self->{slider}->emit (mouse_wheel => $ev);
		1078
1009		1079	1
1010	0
1011	}	1080	}
1012		1081
1013	sub update_slider {	1082	sub update_slider {
1014	my ($self) = @_;	1083	my ($self) = @_;
1015		1084
…		…
1032	$self->SUPER::invoke_size_allocate ($w, $h)	1101	$self->SUPER::invoke_size_allocate ($w, $h)
1033	}	1102	}
1034		1103
1035	#############################################################################	1104	#############################################################################
1036		1105
1037	package CFClient::UI::Frame;	1106	package CFPlus::UI::Frame;
1038		1107
1039	our @ISA = CFClient::UI::Bin::;	1108	our @ISA = CFPlus::UI::Bin::;
1040		1109
1041	use CFClient::OpenGL;	1110	use CFPlus::OpenGL;
1042		1111
1043	sub new {	1112	sub new {
1044	my $class = shift;	1113	my $class = shift;
1045		1114
1046	$class->SUPER::new (	1115	$class->SUPER::new (
…		…
1072	$self->SUPER::_draw;	1141	$self->SUPER::_draw;
1073	}	1142	}
1074		1143
1075	#############################################################################	1144	#############################################################################
1076		1145
1077	package CFClient::UI::FancyFrame;	1146	package CFPlus::UI::FancyFrame;
1078		1147
1079	our @ISA = CFClient::UI::Bin::;	1148	our @ISA = CFPlus::UI::Bin::;
1080		1149
1081	use CFClient::OpenGL;	1150	use CFPlus::OpenGL;
		1151
		1152	sub new {
		1153	my ($class, %arg) = @_;
		1154
		1155	if ((exists $arg{label}) && !ref $arg{label}) {
		1156	$arg{label} = new CFPlus::UI::Label
		1157	align => 1,
		1158	valign => 0,
		1159	text => $arg{label},
		1160	fontsize => ($arg{border} || 0.8) * 0.75;
		1161	}
		1162
		1163	my $self = $class->SUPER::new (
		1164	# label => "",
		1165	fg => [0.6, 0.3, 0.1],
		1166	border => 0.8,
		1167	style => 'single',
		1168	%arg,
		1169	);
		1170
		1171	$self
		1172	}
		1173
		1174	sub add {
		1175	my ($self, @widgets) = @_;
		1176
		1177	$self->SUPER::add (@widgets);
		1178	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1179	}
		1180
		1181	sub border {
		1182	int $_[0]{border} * $::FONTSIZE
		1183	}
		1184
		1185	sub size_request {
		1186	my ($self) = @_;
		1187
		1188	($self->{label_w}, undef) = $self->{label}->size_request
		1189	if $self->{label};
		1190
		1191	my ($w, $h) = $self->SUPER::size_request;
		1192
		1193	(
		1194	$w + $self->border * 2,
		1195	$h + $self->border * 2,
		1196	)
		1197	}
		1198
		1199	sub invoke_size_allocate {
		1200	my ($self, $w, $h) = @_;
		1201
		1202	my $border = $self->border;
		1203
		1204	$w -= List::Util::max 0, $border * 2;
		1205	$h -= List::Util::max 0, $border * 2;
		1206
		1207	if (my $label = $self->{label}) {
		1208	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1209	$label->{h} = List::Util::min $h, $border;
		1210	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1211	}
		1212
		1213	$self->child->configure ($border, $border, $w, $h);
		1214
		1215	1
		1216	}
		1217
		1218	sub _draw {
		1219	my ($self) = @_;
		1220
		1221	my $child = $self->{children}[0];
		1222
		1223	my $border = $self->border;
		1224	my ($w, $h) = ($self->{w}, $self->{h});
		1225
		1226	$child->draw;
		1227
		1228	glColor @{$self->{fg}};
		1229	glBegin GL_LINE_STRIP;
		1230	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1231	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1232	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1233	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1234	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1235	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1236	glEnd;
		1237
		1238	if ($self->{label}) {
		1239	glTranslate $border * 2, 0;
		1240	$self->{label}->_draw;
		1241	}
		1242	}
		1243
		1244	#############################################################################
		1245
		1246	package CFPlus::UI::Toplevel;
		1247
		1248	our @ISA = CFPlus::UI::Bin::;
		1249
		1250	use CFPlus::OpenGL;
1082		1251
1083	my $bg =	1252	my $bg =
1084	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1253	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1085	mipmap => 1, wrap => 1;	1254	mipmap => 1, wrap => 1;
1086		1255
1087	my @border =	1256	my @border =
1088	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1257	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1089	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1258	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1090		1259
1091	sub new {	1260	sub new {
1092	my ($class, %arg) = @_;	1261	my ($class, %arg) = @_;
1093		1262
…		…
1099	min_w => 64,	1268	min_w => 64,
1100	min_h => 32,	1269	min_h => 32,
1101	%arg,	1270	%arg,
1102	);	1271	);
1103		1272
1104	$self->{title_widget} = new CFClient::UI::Label	1273	$self->{title_widget} = new CFPlus::UI::Label
1105	align => 0,	1274	align => 0,
1106	valign => 1,	1275	valign => 1,
1107	text => $self->{title},	1276	text => $self->{title},
1108	fontsize => $self->{border},	1277	fontsize => $self->{border},
1109	if exists $self->{title};	1278	if exists $self->{title};
1110		1279
1111	if ($self->{has_close_button}) {	1280	if ($self->{has_close_button}) {
1112	$self->{close_button} =	1281	$self->{close_button} =
1113	new CFClient::UI::ImageButton	1282	new CFPlus::UI::ImageButton
1114	path => 'x1_close.png',	1283	path => 'x1_close.png',
1115	on_activate => sub { $self->emit ("delete") };	1284	on_activate => sub { $self->emit ("delete") };
1116		1285
1117	$self->CFClient::UI::Container::add ($self->{close_button});	1286	$self->CFPlus::UI::Container::add ($self->{close_button});
1118	}	1287	}
1119		1288
1120	$self	1289	$self
1121	}	1290	}
1122		1291
1123	sub add {	1292	sub add {
1124	my ($self, @widgets) = @_;	1293	my ($self, @widgets) = @_;
1125		1294
1126	$self->SUPER::add (@widgets);	1295	$self->SUPER::add (@widgets);
1127	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1296	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1128	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1297	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1129	}	1298	}
1130		1299
1131	sub border {	1300	sub border {
1132	int $_[0]{border} * $::FONTSIZE	1301	int $_[0]{border} * $::FONTSIZE
1133	}	1302	}
…		…
1241	$self->{motion}->($ev, $x, $y) if $self->{motion};	1410	$self->{motion}->($ev, $x, $y) if $self->{motion};
1242		1411
1243	! ! $self->{motion}	1412	! ! $self->{motion}
1244	}	1413	}
1245		1414
		1415	sub invoke_visibility_change {
		1416	my ($self, $visible) = @_;
		1417
		1418	delete $self->{motion} unless $visible;
		1419
		1420	0
		1421	}
		1422
1246	sub _draw {	1423	sub _draw {
1247	my ($self) = @_;	1424	my ($self) = @_;
1248		1425
1249	my $child = $self->{children}[0];	1426	my $child = $self->{children}[0];
1250		1427
…		…
1287	if $self->{close_button};	1464	if $self->{close_button};
1288	}	1465	}
1289		1466
1290	#############################################################################	1467	#############################################################################
1291		1468
1292	package CFClient::UI::Table;	1469	package CFPlus::UI::Table;
1293		1470
1294	our @ISA = CFClient::UI::Base::;	1471	our @ISA = CFPlus::UI::Base::;
1295		1472
1296	use List::Util qw(max sum);	1473	use List::Util qw(max sum);
1297		1474
1298	use CFClient::OpenGL;	1475	use CFPlus::OpenGL;
1299		1476
1300	sub new {	1477	sub new {
1301	my $class = shift;	1478	my $class = shift;
1302		1479
1303	$class->SUPER::new (	1480	$class->SUPER::new (
…		…
1309	sub children {	1486	sub children {
1310	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1487	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311	}	1488	}
1312		1489
1313	sub add {	1490	sub add {
1314	my ($self, $x, $y, $child) = @_;	1491	my ($self) = shift;
1315		1492
		1493	while (@_) {
		1494	my ($x, $y, $child) = splice @_, 0, 3, ();
1316	$child->set_parent ($self);	1495	$child->set_parent ($self);
1317	$self->{children}[$y][$x] = $child;	1496	$self->{children}[$y][$x] = $child;
		1497	}
1318		1498
		1499	$self->{force_realloc} = 1;
		1500	$self->{force_size_alloc} = 1;
1319	$self->realloc;	1501	$self->realloc;
1320	}	1502	}
1321		1503
1322	sub remove {	1504	sub remove {
1323	my ($self, $child) = @_;	1505	my ($self, $child) = @_;
…		…
1388		1570
1389	# linearly scale sizes	1571	# linearly scale sizes
1390	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1572	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1391	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1573	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1392		1574
1393	CFClient::UI::harmonize $ws;	1575	CFPlus::UI::harmonize $ws;
1394	CFClient::UI::harmonize $hs;	1576	CFPlus::UI::harmonize $hs;
1395		1577
1396	my $y;	1578	my $y;
1397		1579
1398	for my $r (0 .. $#{$self->{children}}) {	1580	for my $r (0 .. $#{$self->{children}}) {
1399	my $row = $self->{children}[$r]	1581	my $row = $self->{children}[$r]
…		…
1442	}	1624	}
1443	}	1625	}
1444		1626
1445	#############################################################################	1627	#############################################################################
1446		1628
1447	package CFClient::UI::Box;	1629	package CFPlus::UI::Box;
1448		1630
1449	our @ISA = CFClient::UI::Container::;	1631	our @ISA = CFPlus::UI::Container::;
1450		1632
1451	sub size_request {	1633	sub size_request {
1452	my ($self) = @_;	1634	my ($self) = @_;
1453		1635
1454	$self->{vertical}	1636	$self->{vertical}
…		…
1487	$req[$_] += $space * $children[$_]{expand}	1669	$req[$_] += $space * $children[$_]{expand}
1488	for 0 .. $#children;	1670	for 0 .. $#children;
1489	}	1671	}
1490	}	1672	}
1491		1673
1492	CFClient::UI::harmonize \@req;	1674	CFPlus::UI::harmonize \@req;
1493		1675
1494	my $pos = 0;	1676	my $pos = 0;
1495	for (0 .. $#children) {	1677	for (0 .. $#children) {
1496	my $alloc = $req[$_];	1678	my $alloc = $req[$_];
1497	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1679	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1502	1	1684	1
1503	}	1685	}
1504		1686
1505	#############################################################################	1687	#############################################################################
1506		1688
1507	package CFClient::UI::HBox;	1689	package CFPlus::UI::HBox;
1508		1690
1509	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1510		1692
1511	sub new {	1693	sub new {
1512	my $class = shift;	1694	my $class = shift;
1513		1695
1514	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1517	)	1699	)
1518	}	1700	}
1519		1701
1520	#############################################################################	1702	#############################################################################
1521		1703
1522	package CFClient::UI::VBox;	1704	package CFPlus::UI::VBox;
1523		1705
1524	our @ISA = CFClient::UI::Box::;	1706	our @ISA = CFPlus::UI::Box::;
1525		1707
1526	sub new {	1708	sub new {
1527	my $class = shift;	1709	my $class = shift;
1528		1710
1529	$class->SUPER::new (	1711	$class->SUPER::new (
…		…
1532	)	1714	)
1533	}	1715	}
1534		1716
1535	#############################################################################	1717	#############################################################################
1536		1718
1537	package CFClient::UI::Label;	1719	package CFPlus::UI::Label;
1538		1720
1539	our @ISA = CFClient::UI::DrawBG::;	1721	our @ISA = CFPlus::UI::DrawBG::;
1540		1722
1541	use CFClient::OpenGL;	1723	use CFPlus::OpenGL;
1542		1724
1543	sub new {	1725	sub new {
1544	my ($class, %arg) = @_;	1726	my ($class, %arg) = @_;
1545		1727
1546	my $self = $class->SUPER::new (	1728	my $self = $class->SUPER::new (
…		…
1549	#active_bg => none	1731	#active_bg => none
1550	#font => default_font	1732	#font => default_font
1551	#text => initial text	1733	#text => initial text
1552	#markup => initial narkup	1734	#markup => initial narkup
1553	#max_w => maximum pixel width	1735	#max_w => maximum pixel width
		1736	#style => 0, # render flags
1554	ellipsise => 3, # end	1737	ellipsise => 3, # end
1555	layout => (new CFClient::Layout),	1738	layout => (new CFPlus::Layout),
1556	fontsize => 1,	1739	fontsize => 1,
1557	align => -1,	1740	align => -1,
1558	valign => -1,	1741	valign => -1,
1559	padding_x => 2,	1742	padding_x => 2,
1560	padding_y => 2,	1743	padding_y => 2,
1561	can_events => 0,	1744	can_events => 0,
1562	%arg	1745	%arg
1563	);	1746	);
1564		1747
1565	if (exists $self->{template}) {	1748	if (exists $self->{template}) {
1566	my $layout = new CFClient::Layout;	1749	my $layout = new CFPlus::Layout;
1567	$layout->set_text (delete $self->{template});	1750	$layout->set_text (delete $self->{template});
1568	$self->{template} = $layout;	1751	$self->{template} = $layout;
1569	}	1752	}
1570		1753
1571	if (exists $self->{markup}) {	1754	if (exists $self->{markup}) {
…		…
1573	} else {	1756	} else {
1574	$self->set_text (delete $self->{text});	1757	$self->set_text (delete $self->{text});
1575	}	1758	}
1576		1759
1577	$self	1760	$self
1578	}
1579
1580	sub escape($) {
1581	local $_ = $_[0];
1582
1583	s/&/&amp;/g;
1584	s/>/&gt;/g;
1585	s/</&lt;/g;
1586
1587	$_
1588	}	1761	}
1589		1762
1590	sub update {	1763	sub update {
1591	my ($self) = @_;	1764	my ($self) = @_;
1592		1765
…		…
1719	};	1892	};
1720		1893
1721	my $w = List::Util::min $self->{w} + 4, $size->[0];	1894	my $w = List::Util::min $self->{w} + 4, $size->[0];
1722	my $h = List::Util::min $self->{h} + 2, $size->[1];	1895	my $h = List::Util::min $self->{h} + 2, $size->[1];
1723		1896
1724	$self->{layout}->render ($self->{ox}, $self->{oy});	1897	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1725	}	1898	}
1726		1899
1727	#############################################################################	1900	#############################################################################
1728		1901
1729	package CFClient::UI::EntryBase;	1902	package CFPlus::UI::EntryBase;
1730		1903
1731	our @ISA = CFClient::UI::Label::;	1904	our @ISA = CFPlus::UI::Label::;
1732		1905
1733	use CFClient::OpenGL;	1906	use CFPlus::OpenGL;
1734		1907
1735	sub new {	1908	sub new {
1736	my $class = shift;	1909	my $class = shift;
1737		1910
1738	$class->SUPER::new (	1911	$class->SUPER::new (
…		…
1742	active_fg => [0, 0, 0],	1915	active_fg => [0, 0, 0],
1743	can_hover => 1,	1916	can_hover => 1,
1744	can_focus => 1,	1917	can_focus => 1,
1745	valign => 0,	1918	valign => 0,
1746	can_events => 1,	1919	can_events => 1,
		1920	ellipsise => 0,
1747	#text => ...	1921	#text => ...
1748	#hidden => "*",	1922	#hidden => "*",
1749	@_	1923	@_
1750	)	1924	)
1751	}	1925	}
…		…
1796	my $sym = $ev->{sym};	1970	my $sym = $ev->{sym};
1797	my $uni = $ev->{unicode};	1971	my $uni = $ev->{unicode};
1798		1972
1799	my $text = $self->get_text;	1973	my $text = $self->get_text;
1800		1974
		1975	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		1976
1801	if ($uni == 8) {	1977	if ($uni == 8) {
1802	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1978	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1803	} elsif ($uni == 127) {	1979	} elsif ($uni == 127) {
1804	substr $text, $self->{cursor}, 1, "";	1980	substr $text, $self->{cursor}, 1, "";
1805	} elsif ($sym == CFClient::SDLK_LEFT) {	1981	} elsif ($sym == CFPlus::SDLK_LEFT) {
1806	--$self->{cursor} if $self->{cursor};	1982	--$self->{cursor} if $self->{cursor};
1807	} elsif ($sym == CFClient::SDLK_RIGHT) {	1983	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1808	++$self->{cursor} if $self->{cursor} < length $self->{text};	1984	++$self->{cursor} if $self->{cursor} < length $self->{text};
1809	} elsif ($sym == CFClient::SDLK_HOME) {	1985	} elsif ($sym == CFPlus::SDLK_HOME) {
		1986	# what a hack
		1987	$self->{cursor} =
		1988	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1989	? length $1
		1990	: 0;
		1991	} elsif ($sym == CFPlus::SDLK_END) {
		1992	# uh, again
		1993	$self->{cursor} =
		1994	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1995	? $self->{cursor} + length $1
		1996	: length $self->{text};
		1997	} elsif ($uni == 21) { # ctrl-u
		1998	$text = "";
1810	$self->{cursor} = 0;	1999	$self->{cursor} = 0;
1811	} elsif ($sym == CFClient::SDLK_END) {
1812	$self->{cursor} = length $text;
1813	} elsif ($uni == 27) {	2000	} elsif ($uni == 27) {
1814	$self->emit ('escape');	2001	$self->emit ('escape');
1815	} elsif ($uni) {	2002	} elsif ($uni == 0x0d) {
		2003	substr $text, $self->{cursor}++, 0, "\012";
		2004	} elsif ($uni >= 0x20) {
1816	substr $text, $self->{cursor}++, 0, chr $uni;	2005	substr $text, $self->{cursor}++, 0, chr $uni;
1817	} else {	2006	} else {
1818	return 0;	2007	return 0;
1819	}	2008	}
1820		2009
1821	$self->_set_text ($text);	2010	$self->_set_text ($text);
1822		2011
1823	$self->realloc;	2012	$self->realloc;
		2013	$self->update;
1824		2014
1825	1	2015	1
1826	}	2016	}
1827		2017
1828	sub invoke_focus_in {	2018	sub invoke_focus_in {
…		…
1890	utf8::encode $text;	2080	utf8::encode $text;
1891		2081
1892	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2082	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1893	}	2083	}
1894		2084
1895	glColor @{$self->{fg}};
1896	glBegin GL_LINES;	2085	glBegin GL_LINES;
1897	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2086	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1898	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2087	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1899	glEnd;	2088	glEnd;
1900	}	2089	}
1901	}	2090	}
1902		2091
		2092	#############################################################################
		2093
1903	package CFClient::UI::Entry;	2094	package CFPlus::UI::Entry;
1904		2095
1905	our @ISA = CFClient::UI::EntryBase::;	2096	our @ISA = CFPlus::UI::EntryBase::;
1906		2097
1907	use CFClient::OpenGL;	2098	use CFPlus::OpenGL;
1908		2099
1909	sub invoke_key_down {	2100	sub invoke_key_down {
1910	my ($self, $ev) = @_;	2101	my ($self, $ev) = @_;
1911		2102
1912	my $sym = $ev->{sym};	2103	my $sym = $ev->{sym};
1913		2104
1914	if ($sym == 13) {	2105	if ($ev->{uni} == 0x0d || $sym == 13) {
1915	unshift @{$self->{history}},	2106	unshift @{$self->{history}},
1916	my $txt = $self->get_text;	2107	my $txt = $self->get_text;
1917		2108
1918	$self->{history_pointer} = -1;	2109	$self->{history_pointer} = -1;
1919	$self->{history_saveback} = '';	2110	$self->{history_saveback} = '';
1920	$self->emit (activate => $txt);	2111	$self->emit (activate => $txt);
1921	$self->update;	2112	$self->update;
1922		2113
1923	} elsif ($sym == CFClient::SDLK_UP) {	2114	} elsif ($sym == CFPlus::SDLK_UP) {
1924	if ($self->{history_pointer} < 0) {	2115	if ($self->{history_pointer} < 0) {
1925	$self->{history_saveback} = $self->get_text;	2116	$self->{history_saveback} = $self->get_text;
1926	}	2117	}
1927	if (@{$self->{history} || []} > 0) {	2118	if (@{$self->{history} || []} > 0) {
1928	$self->{history_pointer}++;	2119	$self->{history_pointer}++;
…		…
1930	$self->{history_pointer} = @{$self->{history} || []} - 1;	2121	$self->{history_pointer} = @{$self->{history} || []} - 1;
1931	}	2122	}
1932	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2123	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1933	}	2124	}
1934		2125
1935	} elsif ($sym == CFClient::SDLK_DOWN) {	2126	} elsif ($sym == CFPlus::SDLK_DOWN) {
1936	$self->{history_pointer}--;	2127	$self->{history_pointer}--;
1937	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2128	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1938		2129
1939	if ($self->{history_pointer} >= 0) {	2130	if ($self->{history_pointer} >= 0) {
1940	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2131	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1949	1	2140	1
1950	}	2141	}
1951		2142
1952	#############################################################################	2143	#############################################################################
1953		2144
		2145	package CFPlus::UI::TextEdit;
		2146
		2147	our @ISA = CFPlus::UI::EntryBase::;
		2148
		2149	use CFPlus::OpenGL;
		2150
		2151	sub move_cursor_ver {
		2152	my ($self, $dy) = @_;
		2153
		2154	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2155
		2156	$y += $dy;
		2157
		2158	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2159	$self->{cursor} = $index;
		2160	delete $self->{cur_h};
		2161	$self->update;
		2162	return;
		2163	}
		2164	}
		2165
		2166	sub invoke_key_down {
		2167	my ($self, $ev) = @_;
		2168
		2169	my $sym = $ev->{sym};
		2170
		2171	if ($sym == CFPlus::SDLK_UP) {
		2172	$self->move_cursor_ver (-1);
		2173	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2174	$self->move_cursor_ver (+1);
		2175	} else {
		2176	return $self->SUPER::invoke_key_down ($ev)
		2177	}
		2178
		2179	1
		2180	}
		2181
		2182	#############################################################################
		2183
1954	package CFClient::UI::Button;	2184	package CFPlus::UI::Button;
1955		2185
1956	our @ISA = CFClient::UI::Label::;	2186	our @ISA = CFPlus::UI::Label::;
1957		2187
1958	use CFClient::OpenGL;	2188	use CFPlus::OpenGL;
1959		2189
1960	my @tex =	2190	my @tex =
1961	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2191	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1962	qw(b1_button_active.png);	2192	qw(b1_button_active.png);
1963		2193
1964	sub new {	2194	sub new {
1965	my $class = shift;	2195	my $class = shift;
1966		2196
…		…
2003	$self->SUPER::_draw;	2233	$self->SUPER::_draw;
2004	}	2234	}
2005		2235
2006	#############################################################################	2236	#############################################################################
2007		2237
		2238	package CFPlus::UI::CheckBox;
		2239
		2240	our @ISA = CFPlus::UI::DrawBG::;
		2241
		2242	my @tex =
		2243	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2244	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2245
		2246	use CFPlus::OpenGL;
		2247
		2248	sub new {
		2249	my $class = shift;
		2250
		2251	$class->SUPER::new (
		2252	padding_x => 2,
		2253	padding_y => 2,
		2254	fg => [1, 1, 1],
		2255	active_fg => [1, 1, 0],
		2256	bg => [0, 0, 0, 0.2],
		2257	active_bg => [1, 1, 1, 0.5],
		2258	state => 0,
		2259	can_hover => 1,
		2260	@_
		2261	)
		2262	}
		2263
		2264	sub size_request {
		2265	my ($self) = @_;
		2266
		2267	(6) x 2
		2268	}
		2269
		2270	sub toggle {
		2271	my ($self) = @_;
		2272
		2273	$self->{state} = !$self->{state};
		2274	$self->emit (changed => $self->{state});
		2275	$self->update;
		2276	}
		2277
		2278	sub invoke_button_down {
		2279	my ($self, $ev, $x, $y) = @_;
		2280
		2281	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2282	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2283	$self->toggle;
		2284	} else {
		2285	return 0
		2286	}
		2287
		2288	1
		2289	}
		2290
		2291	sub _draw {
		2292	my ($self) = @_;
		2293
		2294	$self->SUPER::_draw;
		2295
		2296	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2297
		2298	my ($w, $h) = @$self{qw(w h)};
		2299
		2300	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2301
		2302	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2303
		2304	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2305
		2306	glEnable GL_TEXTURE_2D;
		2307	$tex->draw_quad_alpha (0, 0, $s, $s);
		2308	glDisable GL_TEXTURE_2D;
		2309	}
		2310
		2311	#############################################################################
		2312
		2313	package CFPlus::UI::Image;
		2314
		2315	our @ISA = CFPlus::UI::Base::;
		2316
		2317	use CFPlus::OpenGL;
		2318
		2319	our %texture_cache;
		2320
		2321	sub new {
		2322	my $class = shift;
		2323
		2324	my $self = $class->SUPER::new (
		2325	can_events => 0,
		2326	@_,
		2327	);
		2328
		2329	$self->{path} || $self->{tex}
		2330	or Carp::croak "'path' or 'tex' attributes required";
		2331
		2332	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2333	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2334
		2335	CFPlus::weaken $texture_cache{$self->{path}};
		2336
		2337	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2338
		2339	$self
		2340	}
		2341
		2342	sub STORABLE_freeze {
		2343	my ($self, $cloning) = @_;
		2344
		2345	$self->{path}
		2346	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2347
		2348	$self->{path}
		2349	}
		2350
		2351	sub STORABLE_attach {
		2352	my ($self, $cloning, $path) = @_;
		2353
		2354	$self->new (path => $path)
		2355	}
		2356
		2357	sub size_request {
		2358	my ($self) = @_;
		2359
		2360	($self->{tex}{w}, $self->{tex}{h})
		2361	}
		2362
		2363	sub _draw {
		2364	my ($self) = @_;
		2365
		2366	my $tex = $self->{tex};
		2367
		2368	my ($w, $h) = ($self->{w}, $self->{h});
		2369
		2370	if ($self->{rot90}) {
		2371	glRotate 90, 0, 0, 1;
		2372	glTranslate 0, -$self->{w}, 0;
		2373
		2374	($w, $h) = ($h, $w);
		2375	}
		2376
		2377	glEnable GL_TEXTURE_2D;
		2378	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2379
		2380	$tex->draw_quad (0, 0, $w, $h);
		2381
		2382	glDisable GL_TEXTURE_2D;
		2383	}
		2384
		2385	#############################################################################
		2386
2008	package CFClient::UI::ImageButton;	2387	package CFPlus::UI::ImageButton;
2009		2388
2010	our @ISA = CFClient::UI::Image::;	2389	our @ISA = CFPlus::UI::Image::;
2011		2390
2012	use CFClient::OpenGL;	2391	use CFPlus::OpenGL;
2013		2392
2014	my %textures;	2393	my %textures;
2015		2394
2016	sub new {	2395	sub new {
2017	my $class = shift;	2396	my $class = shift;
…		…
2039	1	2418	1
2040	}	2419	}
2041		2420
2042	#############################################################################	2421	#############################################################################
2043		2422
2044	package CFClient::UI::CheckBox;
2045
2046	our @ISA = CFClient::UI::DrawBG::;
2047
2048	my @tex =
2049	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2050	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2051
2052	use CFClient::OpenGL;
2053
2054	sub new {
2055	my $class = shift;
2056
2057	$class->SUPER::new (
2058	padding_x => 2,
2059	padding_y => 2,
2060	fg => [1, 1, 1],
2061	active_fg => [1, 1, 0],
2062	bg => [0, 0, 0, 0.2],
2063	active_bg => [1, 1, 1, 0.5],
2064	state => 0,
2065	can_hover => 1,
2066	@_
2067	)
2068	}
2069
2070	sub size_request {
2071	my ($self) = @_;
2072
2073	(6) x 2
2074	}
2075
2076	sub toggle {
2077	my ($self) = @_;
2078
2079	$self->{state} = !$self->{state};
2080	$self->emit (changed => $self->{state});
2081	$self->update;
2082	}
2083
2084	sub invoke_button_down {
2085	my ($self, $ev, $x, $y) = @_;
2086
2087	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2088	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2089	$self->toggle;
2090	} else {
2091	return 0
2092	}
2093
2094	1
2095	}
2096
2097	sub _draw {
2098	my ($self) = @_;
2099
2100	$self->SUPER::_draw;
2101
2102	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2103
2104	my ($w, $h) = @$self{qw(w h)};
2105
2106	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2107
2108	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2109
2110	my $tex = $self->{state} ? $tex[1] : $tex[0];
2111
2112	glEnable GL_TEXTURE_2D;
2113	$tex->draw_quad_alpha (0, 0, $s, $s);
2114	glDisable GL_TEXTURE_2D;
2115	}
2116
2117	#############################################################################
2118
2119	package CFClient::UI::Image;	2423	package CFPlus::UI::VGauge;
2120		2424
2121	our @ISA = CFClient::UI::Base::;	2425	our @ISA = CFPlus::UI::Base::;
2122
2123	use CFClient::OpenGL;
2124
2125	our %texture_cache;
2126
2127	sub new {
2128	my $class = shift;
2129
2130	my $self = $class->SUPER::new (
2131	can_events => 0,
2132	@_,
2133	);
2134
2135	$self->{path} || $self->{tex}
2136	or Carp::croak "'path' or 'tex' attributes required";
2137
2138	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2139	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2140
2141	Scalar::Util::weaken $texture_cache{$self->{path}};
2142
2143	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2144
2145	$self
2146	}
2147
2148	sub size_request {
2149	my ($self) = @_;
2150
2151	($self->{tex}{w}, $self->{tex}{h})
2152	}
2153
2154	sub _draw {
2155	my ($self) = @_;
2156
2157	my $tex = $self->{tex};
2158
2159	my ($w, $h) = ($self->{w}, $self->{h});
2160
2161	if ($self->{rot90}) {
2162	glRotate 90, 0, 0, 1;
2163	glTranslate 0, -$self->{w}, 0;
2164
2165	($w, $h) = ($h, $w);
2166	}
2167
2168	glEnable GL_TEXTURE_2D;
2169	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170
2171	$tex->draw_quad_alpha (0, 0, $w, $h);
2172
2173	glDisable GL_TEXTURE_2D;
2174	}
2175
2176	#############################################################################
2177
2178	package CFClient::UI::VGauge;
2179
2180	our @ISA = CFClient::UI::Base::;
2181		2426
2182	use List::Util qw(min max);	2427	use List::Util qw(min max);
2183		2428
2184	use CFClient::OpenGL;	2429	use CFPlus::OpenGL;
2185		2430
2186	my %tex = (	2431	my %tex = (
2187	food => [	2432	food => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2433	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2434	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2190	],	2435	],
2191	grace => [	2436	grace => [
2192	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2437	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2193	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2438	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2194	],	2439	],
2195	hp => [	2440	hp => [
2196	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2197	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2442	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2198	],	2443	],
2199	mana => [	2444	mana => [
2200	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2445	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2201	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2446	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2202	],	2447	],
2203	);	2448	);
2204		2449
2205	# eg. VGauge->new (gauge => 'food'), default gauge: food	2450	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2308	glDisable GL_TEXTURE_2D;	2553	glDisable GL_TEXTURE_2D;
2309	}	2554	}
2310		2555
2311	#############################################################################	2556	#############################################################################
2312		2557
2313	package CFClient::UI::Gauge;	2558	package CFPlus::UI::Gauge;
2314		2559
2315	our @ISA = CFClient::UI::VBox::;	2560	our @ISA = CFPlus::UI::VBox::;
2316		2561
2317	sub new {	2562	sub new {
2318	my ($class, %arg) = @_;	2563	my ($class, %arg) = @_;
2319		2564
2320	my $self = $class->SUPER::new (	2565	my $self = $class->SUPER::new (
…		…
2322	can_hover => 1,	2567	can_hover => 1,
2323	can_events => 1,	2568	can_events => 1,
2324	%arg,	2569	%arg,
2325	);	2570	);
2326		2571
2327	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2572	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2328	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2573	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2329	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2574	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2330		2575
2331	$self	2576	$self
2332	}	2577	}
2333		2578
2334	sub set_fontsize {	2579	sub set_fontsize {
…		…
2355	$self->{value}->set_text ($val);	2600	$self->{value}->set_text ($val);
2356	}	2601	}
2357		2602
2358	#############################################################################	2603	#############################################################################
2359		2604
2360	package CFClient::UI::Slider;	2605	package CFPlus::UI::Slider;
2361		2606
2362	use strict;	2607	use strict;
2363		2608
2364	use CFClient::OpenGL;	2609	use CFPlus::OpenGL;
2365		2610
2366	our @ISA = CFClient::UI::DrawBG::;	2611	our @ISA = CFPlus::UI::DrawBG::;
2367		2612
2368	my @tex =	2613	my @tex =
2369	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2614	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2370	qw(s1_slider.png s1_slider_bg.png);	2615	qw(s1_slider.png s1_slider_bg.png);
2371		2616
2372	sub new {	2617	sub new {
2373	my $class = shift;	2618	my $class = shift;
2374		2619
…		…
2463	}	2708	}
2464		2709
2465	1	2710	1
2466	}	2711	}
2467		2712
		2713	sub invoke_mouse_wheel {
		2714	my ($self, $ev) = @_;
		2715
		2716	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2717
		2718	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2719
		2720	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2721
		2722	! ! $delta
		2723	}
		2724
2468	sub update {	2725	sub update {
2469	my ($self) = @_;	2726	my ($self) = @_;
2470		2727
2471	delete $self->{knob_w};	2728	delete $self->{knob_w};
2472	$self->SUPER::update;	2729	$self->SUPER::update;
…		…
2519	glDisable GL_TEXTURE_2D;	2776	glDisable GL_TEXTURE_2D;
2520	}	2777	}
2521		2778
2522	#############################################################################	2779	#############################################################################
2523		2780
2524	package CFClient::UI::ValSlider;	2781	package CFPlus::UI::ValSlider;
2525		2782
2526	our @ISA = CFClient::UI::HBox::;	2783	our @ISA = CFPlus::UI::HBox::;
2527		2784
2528	sub new {	2785	sub new {
2529	my ($class, %arg) = @_;	2786	my ($class, %arg) = @_;
2530		2787
2531	my $range = delete $arg{range};	2788	my $range = delete $arg{range};
2532		2789
2533	my $self = $class->SUPER::new (	2790	my $self = $class->SUPER::new (
2534	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2791	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2535	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2792	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2536	to_value => sub { shift },	2793	to_value => sub { shift },
2537	from_value => sub { shift },	2794	from_value => sub { shift },
2538	%arg,	2795	%arg,
2539	);	2796	);
2540		2797
…		…
2560	sub set_range { shift->{slider}->set_range (@_) }	2817	sub set_range { shift->{slider}->set_range (@_) }
2561	sub set_value { shift->{slider}->set_value (@_) }	2818	sub set_value { shift->{slider}->set_value (@_) }
2562		2819
2563	#############################################################################	2820	#############################################################################
2564		2821
2565	package CFClient::UI::TextScroller;	2822	package CFPlus::UI::TextScroller;
2566		2823
2567	our @ISA = CFClient::UI::HBox::;	2824	our @ISA = CFPlus::UI::HBox::;
2568		2825
2569	use CFClient::OpenGL;	2826	use CFPlus::OpenGL;
2570		2827
2571	sub new {	2828	sub new {
2572	my $class = shift;	2829	my $class = shift;
2573		2830
2574	my $self = $class->SUPER::new (	2831	my $self = $class->SUPER::new (
2575	fontsize => 1,	2832	fontsize => 1,
2576	can_events => 0,	2833	can_events => 1,
2577	indent => 0,	2834	indent => 0,
2578	#font => default_font	2835	#font => default_font
2579	@_,	2836	@_,
2580		2837
2581	layout => (new CFClient::Layout),	2838	layout => (new CFPlus::Layout),
2582	par => [],	2839	par => [],
		2840	max_par => 0,
2583	height => 0,	2841	height => 0,
2584	children => [	2842	children => [
2585	(new CFClient::UI::Empty expand => 1),	2843	(new CFPlus::UI::Empty expand => 1),
2586	(new CFClient::UI::Slider vertical => 1),	2844	(new CFPlus::UI::Slider vertical => 1),
2587	],	2845	],
2588	);	2846	);
2589		2847
2590	$self->{children}[1]->connect (changed => sub { $self->update });	2848	$self->{children}[1]->connect (changed => sub { $self->update });
2591		2849
…		…
2621		2879
2622	$self->reflow;	2880	$self->reflow;
2623		2881
2624	local $self->{children} = [$empty, $slider];	2882	local $self->{children} = [$empty, $slider];
2625	$self->SUPER::invoke_size_allocate ($w, $h)	2883	$self->SUPER::invoke_size_allocate ($w, $h)
		2884	}
		2885
		2886	sub invoke_mouse_wheel {
		2887	my ($self, $ev) = @_;
		2888
		2889	return 0 unless $ev->{dy}; # only vertical movements
		2890
		2891	$self->{children}[1]->emit (mouse_wheel => $ev);
		2892
		2893	1
2626	}	2894	}
2627		2895
2628	sub get_layout {	2896	sub get_layout {
2629	my ($self, $para) = @_;	2897	my ($self, $para) = @_;
2630		2898
…		…
2658		2926
2659	# todo: base offset on lines or so, not on pixels	2927	# todo: base offset on lines or so, not on pixels
2660	$self->{children}[1]->set_value ($offset);	2928	$self->{children}[1]->set_value ($offset);
2661	}	2929	}
2662		2930
		2931	sub current_paragraph {
		2932	my ($self) = @_;
		2933
		2934	$self->{top_paragraph} - 1
		2935	}
		2936
		2937	sub scroll_to {
		2938	my ($self, $para) = @_;
		2939
		2940	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2941
		2942	$self->{scroll_to} = $para;
		2943	$self->update;
		2944	}
		2945
2663	sub clear {	2946	sub clear {
2664	my ($self) = @_;	2947	my ($self) = @_;
2665		2948
2666	my (undef, undef, @other) = @{ $self->{children} };	2949	my (undef, undef, @other) = @{ $self->{children} };
2667	$self->remove ($_) for @other;	2950	$self->remove ($_) for @other;
…		…
2670	$self->{height} = 0;	2953	$self->{height} = 0;
2671	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2954	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672	}	2955	}
2673		2956
2674	sub add_paragraph {	2957	sub add_paragraph {
2675	my ($self, $color, $para, $indent) = @_;	2958	my $self = shift;
2676		2959
2677	my ($text, @w) = ref $para ? @$para : $para;	2960	for my $para (@_) {
2678
2679	$para = {	2961	$para = {
		2962	fg => [1, 1, 1, 1],
		2963	indent => 0,
		2964	markup => "",
		2965	widget => [],
		2966	ref $para ? %$para : (markup => $para),
2680	w => 1e10,	2967	w => 1e10,
2681	wrapped => 1,	2968	wrapped => 1,
2682	fg => $color,
2683	indent => $indent,
2684	markup => $text,
2685	widget => \@w,
2686	};	2969	};
2687		2970
2688	$self->add (@w) if @w;	2971	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2689	push @{$self->{par}}, $para;	2972	push @{$self->{par}}, $para;
		2973	}
		2974
		2975	if (my $max = $self->{max_par}) {
		2976	shift @{$self->{par}} while @{$self->{par}} > $max;
		2977	}
2690		2978
2691	$self->{need_reflow}++;	2979	$self->{need_reflow}++;
2692	$self->update;	2980	$self->update;
2693	}	2981	}
2694		2982
2695	sub scroll_to_bottom {	2983	sub scroll_to_bottom {
2696	my ($self) = @_;	2984	my ($self) = @_;
2697		2985
2698	$self->{scroll_to_bottom} = 1;	2986	$self->{scroll_to} = $#{$self->{par}};
2699	$self->update;	2987	$self->update;
2700	}	2988	}
2701		2989
		2990	sub force_uptodate {
		2991	my ($self) = @_;
		2992
		2993	if (delete $self->{need_reflow}) {
		2994	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2995
		2996	my $height = 0;
		2997
		2998	for my $para (@{$self->{par}}) {
		2999	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3000	my $layout = $self->get_layout ($para);
		3001	my ($w, $h) = $layout->size;
		3002
		3003	$para->{w} = $w + $para->{indent};
		3004	$para->{h} = $h;
		3005	$para->{wrapped} = $layout->has_wrapped;
		3006	}
		3007
		3008	$para->{y} = $height;
		3009	$height += $para->{h};
		3010	}
		3011
		3012	$self->{height} = $height;
		3013	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3014
		3015	delete $self->{texture};
		3016	}
		3017
		3018	if (my $paridx = delete $self->{scroll_to}) {
		3019	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3020	}
		3021	}
		3022
2702	sub update {	3023	sub update {
2703	my ($self) = @_;	3024	my ($self) = @_;
2704		3025
2705	$self->SUPER::update;	3026	$self->SUPER::update;
2706		3027
2707	return unless $self->{h} > 0;	3028	return unless $self->{h} > 0;
2708		3029
2709	delete $self->{texture};	3030	delete $self->{texture};
2710		3031
2711	$ROOT->on_post_alloc ($self => sub {	3032	$ROOT->on_post_alloc ($self => sub {
		3033	$self->force_uptodate;
		3034
2712	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3035	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713		3036
2714	if (delete $self->{need_reflow}) {
2715	my $height = 0;
2716
2717	for my $para (@{$self->{par}}) {
2718	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2719	my $layout = $self->get_layout ($para);
2720	my ($w, $h) = $layout->size;
2721
2722	$para->{w} = $w + $para->{indent};
2723	$para->{h} = $h;
2724	$para->{wrapped} = $layout->has_wrapped;
2725	}
2726
2727	$height += $para->{h};
2728	}
2729
2730	$self->{height} = $height;
2731
2732	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2733
2734	delete $self->{texture};
2735	}
2736
2737	if (delete $self->{scroll_to_bottom}) {
2738	$self->{children}[1]->set_value (1e10);
2739	}
2740
2741	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3037	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2742	glClearColor 0, 0, 0, 0;	3038	glClearColor 0, 0, 0, 0;
2743	glClear GL_COLOR_BUFFER_BIT;	3039	glClear GL_COLOR_BUFFER_BIT;
2744		3040
		3041	package CFPlus::UI::Base;
		3042	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3043	(0, 0, $self->{w}, $self->{h});
		3044
		3045	my $top = int $self->{children}[1]{range}[0];
		3046
		3047	my $paridx = 0;
		3048	my $top_paragraph;
2745	my $top = int $self->{children}[1]{range}[0];	3049	my $top = int $self->{children}[1]{range}[0];
2746		3050
2747	my $y0 = $top;	3051	my $y0 = $top;
2748	my $y1 = $top + $H;	3052	my $y1 = $top + $H;
2749		3053
2750	my $y = 0;
2751
2752	for my $para (@{$self->{par}}) {	3054	for my $para (@{$self->{par}}) {
2753	my $h = $para->{h};	3055	my $h = $para->{h};
		3056	my $y = $para->{y};
2754		3057
2755	if ($y0 < $y + $h && $y < $y1) {	3058	if ($y0 < $y + $h && $y < $y1) {
2756
2757	my $layout = $self->get_layout ($para);	3059	my $layout = $self->get_layout ($para);
2758		3060
2759	$layout->render ($para->{indent}, $y - $y0);	3061	$layout->render ($para->{indent}, $y - $y0);
2760		3062
2761	if (my @w = @{ $para->{widget} }) {	3063	if (my @w = @{ $para->{widget} }) {
…		…
2770	$_->draw;	3072	$_->draw;
2771	}	3073	}
2772	}	3074	}
2773	}	3075	}
2774		3076
2775	$y += $h;	3077	$paridx++;
		3078	$top_paragraph ||= $paridx if $y >= $top;
2776	}	3079	}
		3080
		3081	$self->{top_paragraph} = $top_paragraph;
2777	};	3082	};
2778	});	3083	});
2779	}	3084	}
2780		3085
2781	sub reconfigure {	3086	sub reconfigure {
…		…
2799	$self->{children}[1]->draw;	3104	$self->{children}[1]->draw;
2800	}	3105	}
2801		3106
2802	#############################################################################	3107	#############################################################################
2803		3108
2804	package CFClient::UI::Animator;	3109	package CFPlus::UI::Animator;
2805		3110
2806	use CFClient::OpenGL;	3111	use CFPlus::OpenGL;
2807		3112
2808	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2809		3114
2810	sub moveto {	3115	sub moveto {
2811	my ($self, $x, $y) = @_;	3116	my ($self, $x, $y) = @_;
2812		3117
2813	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3118	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2841	glPopMatrix;	3146	glPopMatrix;
2842	}	3147	}
2843		3148
2844	#############################################################################	3149	#############################################################################
2845		3150
2846	package CFClient::UI::Flopper;	3151	package CFPlus::UI::Flopper;
2847		3152
2848	our @ISA = CFClient::UI::Button::;	3153	our @ISA = CFPlus::UI::Button::;
2849		3154
2850	sub new {	3155	sub new {
2851	my $class = shift;	3156	my $class = shift;
2852		3157
2853	my $self = $class->SUPER::new (	3158	my $self = $class->SUPER::new (
…		…
2865	$self->{other}->toggle_visibility;	3170	$self->{other}->toggle_visibility;
2866	}	3171	}
2867		3172
2868	#############################################################################	3173	#############################################################################
2869		3174
2870	package CFClient::UI::Tooltip;	3175	package CFPlus::UI::Tooltip;
2871		3176
2872	our @ISA = CFClient::UI::Bin::;	3177	our @ISA = CFPlus::UI::Bin::;
2873		3178
2874	use CFClient::OpenGL;	3179	use CFPlus::OpenGL;
2875		3180
2876	sub new {	3181	sub new {
2877	my $class = shift;	3182	my $class = shift;
2878		3183
2879	$class->SUPER::new (	3184	$class->SUPER::new (
…		…
2882	)	3187	)
2883	}	3188	}
2884		3189
2885	sub set_tooltip_from {	3190	sub set_tooltip_from {
2886	my ($self, $widget) = @_;	3191	my ($self, $widget) = @_;
		3192
		3193	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3194	if $widget->{tooltip} =~ /^#(.*)$/;
2887		3195
2888	my $tooltip = $widget->{tooltip};	3196	my $tooltip = $widget->{tooltip};
2889		3197
2890	if ($ENV{CFPLUS_DEBUG} & 2) {	3198	if ($ENV{CFPLUS_DEBUG} & 2) {
2891	$tooltip .= "\n\n" . (ref $widget) . "\n"	3199	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2895	}	3203	}
2896		3204
2897	$tooltip =~ s/^\n+//;	3205	$tooltip =~ s/^\n+//;
2898	$tooltip =~ s/\n+$//;	3206	$tooltip =~ s/\n+$//;
2899		3207
2900	$self->add (new CFClient::UI::Label	3208	$self->add (new CFPlus::UI::Label
2901	markup => $tooltip,	3209	markup => $tooltip,
2902	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3210	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2903	fontsize => 0.8,	3211	fontsize => 0.8,
2904	fg => [0, 0, 0, 1],	3212	style => 1, # FLAG_INVERSE
2905	ellipsise => 0,	3213	ellipsise => 0,
2906	font => ($widget->{tooltip_font} || $::FONT_PROP),	3214	font => ($widget->{tooltip_font} || $::FONT_PROP),
2907	);	3215	);
2908	}	3216	}
2909		3217
…		…
2928		3236
2929	$self->{root}->on_post_alloc ("move_$self" => sub {	3237	$self->{root}->on_post_alloc ("move_$self" => sub {
2930	my $widget = $self->{owner}	3238	my $widget = $self->{owner}
2931	or return;	3239	or return;
2932		3240
		3241	if ($widget->{visible}) {
2933	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3242	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934		3243
2935	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3244	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936	if $x + $self->{w} > $self->{root}{w};	3245	if $x + $self->{w} > $self->{root}{w};
2937		3246
2938	$self->move_abs ($x, $y);	3247	$self->move_abs ($x, $y);
		3248	} else {
		3249	$self->hide;
		3250	}
2939	});	3251	});
2940	}	3252	}
2941		3253
2942	sub _draw {	3254	sub _draw {
2943	my ($self) = @_;	3255	my ($self) = @_;
…		…
2967	$self->SUPER::_draw;	3279	$self->SUPER::_draw;
2968	}	3280	}
2969		3281
2970	#############################################################################	3282	#############################################################################
2971		3283
2972	package CFClient::UI::Face;	3284	package CFPlus::UI::Face;
2973		3285
2974	our @ISA = CFClient::UI::Base::;	3286	our @ISA = CFPlus::UI::DrawBG::;
2975		3287
2976	use CFClient::OpenGL;	3288	use CFPlus::OpenGL;
2977		3289
2978	sub new {	3290	sub new {
2979	my $class = shift;	3291	my $class = shift;
2980		3292
2981	my $self = $class->SUPER::new (	3293	my $self = $class->SUPER::new (
…		…
2983	can_events => 0,	3295	can_events => 0,
2984	@_,	3296	@_,
2985	);	3297	);
2986		3298
2987	if ($self->{anim} && $self->{animspeed}) {	3299	if ($self->{anim} && $self->{animspeed}) {
2988	Scalar::Util::weaken (my $widget = $self);	3300	CFPlus::weaken (my $widget = $self);
2989		3301
2990	$self->{timer} = Event->timer (	3302	$self->{timer} = Event->timer (
2991	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3303	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2992	hard => 1,	3304	hard => 1,
2993	interval => $self->{animspeed},	3305	interval => $self->{animspeed},
…		…
3016	sub _draw {	3328	sub _draw {
3017	my ($self) = @_;	3329	my ($self) = @_;
3018		3330
3019	return unless $::CONN;	3331	return unless $::CONN;
3020		3332
		3333	$self->SUPER::_draw;
		3334
3021	my $face;	3335	my $face;
3022		3336
3023	if ($self->{frame}) {	3337	if ($self->{frame}) {
3024	my $anim = $::CONN->{anim}[$self->{anim}];	3338	my $anim = $::CONN->{anim}[$self->{anim}];
3025		3339
…		…
3047	$self->SUPER::destroy;	3361	$self->SUPER::destroy;
3048	}	3362	}
3049		3363
3050	#############################################################################	3364	#############################################################################
3051		3365
3052	package CFClient::UI::Buttonbar;	3366	package CFPlus::UI::Buttonbar;
3053		3367
3054	our @ISA = CFClient::UI::HBox::;	3368	our @ISA = CFPlus::UI::HBox::;
3055		3369
3056	# TODO: should actualyl wrap buttons and other goodies.	3370	# TODO: should actually wrap buttons and other goodies.
3057		3371
3058	#############################################################################	3372	#############################################################################
3059		3373
3060	package CFClient::UI::Menu;	3374	package CFPlus::UI::Menu;
3061		3375
3062	our @ISA = CFClient::UI::FancyFrame::;	3376	our @ISA = CFPlus::UI::Toplevel::;
3063		3377
3064	use CFClient::OpenGL;	3378	use CFPlus::OpenGL;
3065		3379
3066	sub new {	3380	sub new {
3067	my $class = shift;	3381	my $class = shift;
3068		3382
3069	my $self = $class->SUPER::new (	3383	my $self = $class->SUPER::new (
3070	items => [],	3384	items => [],
3071	z => 100,	3385	z => 100,
3072	@_,	3386	@_,
3073	);	3387	);
3074		3388
3075	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3389	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3076		3390
3077	for my $item (@{ $self->{items} }) {	3391	for my $item (@{ $self->{items} }) {
3078	my ($widget, $cb, $tooltip) = @$item;	3392	my ($widget, $cb, $tooltip) = @$item;
3079		3393
3080	# handle various types of items, only text for now	3394	# handle various types of items, only text for now
3081	if (!ref $widget) {	3395	if (!ref $widget) {
3082	if ($widget =~ /\t/) {	3396	if ($widget =~ /\t/) {
3083	my ($left, $right) = split /\t/, $widget, 2;	3397	my ($left, $right) = split /\t/, $widget, 2;
3084		3398
3085	$widget = new CFClient::UI::HBox	3399	$widget = new CFPlus::UI::HBox
3086	can_hover => 1,	3400	can_hover => 1,
3087	can_events => 1,	3401	can_events => 1,
3088	tooltip => $tooltip,	3402	tooltip => $tooltip,
3089	children => [	3403	children => [
3090	(new CFClient::UI::Label markup => $left, expand => 1),	3404	(new CFPlus::UI::Label markup => $left, expand => 1),
3091	(new CFClient::UI::Label markup => $right, align => +1),	3405	(new CFPlus::UI::Label markup => $right, align => +1),
3092	],	3406	],
3093	;	3407	;
3094		3408
3095	} else {	3409	} else {
3096	$widget = new CFClient::UI::Label	3410	$widget = new CFPlus::UI::Label
3097	can_hover => 1,	3411	can_hover => 1,
3098	can_events => 1,	3412	can_events => 1,
3099	markup => $widget,	3413	markup => $widget,
3100	tooltip => $tooltip;	3414	tooltip => $tooltip;
3101	}	3415	}
…		…
3149	1	3463	1
3150	}	3464	}
3151		3465
3152	#############################################################################	3466	#############################################################################
3153		3467
3154	package CFClient::UI::Multiplexer;	3468	package CFPlus::UI::Multiplexer;
3155		3469
3156	our @ISA = CFClient::UI::Container::;	3470	our @ISA = CFPlus::UI::Container::;
3157		3471
3158	sub new {	3472	sub new {
3159	my $class = shift;	3473	my $class = shift;
3160		3474
3161	my $self = $class->SUPER::new (	3475	my $self = $class->SUPER::new (
…		…
3222	$self->{current}->draw;	3536	$self->{current}->draw;
3223	}	3537	}
3224		3538
3225	#############################################################################	3539	#############################################################################
3226		3540
3227	package CFClient::UI::Notebook;	3541	package CFPlus::UI::Notebook;
3228		3542
3229	our @ISA = CFClient::UI::VBox::;	3543	our @ISA = CFPlus::UI::VBox::;
3230		3544
3231	sub new {	3545	sub new {
3232	my $class = shift;	3546	my $class = shift;
3233		3547
3234	my $self = $class->SUPER::new (	3548	my $self = $class->SUPER::new (
3235	buttonbar => (new CFClient::UI::Buttonbar),	3549	buttonbar => (new CFPlus::UI::Buttonbar),
3236	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3550	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3237	# filter => # will be put between multiplexer and $self	3551	# filter => # will be put between multiplexer and $self
3238	@_,	3552	@_,
3239	);	3553	);
3240		3554
3241	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3555	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3245	}	3559	}
3246		3560
3247	sub add {	3561	sub add {
3248	my ($self, $title, $widget, $tooltip) = @_;	3562	my ($self, $title, $widget, $tooltip) = @_;
3249		3563
3250	Scalar::Util::weaken $self;	3564	CFPlus::weaken $self;
3251		3565
3252	$self->{buttonbar}->add (new CFClient::UI::Button	3566	$self->{buttonbar}->add (new CFPlus::UI::Button
3253	markup => $title,	3567	markup => $title,
3254	tooltip => $tooltip,	3568	tooltip => $tooltip,
3255	on_activate => sub { $self->set_current_page ($widget) },	3569	on_activate => sub { $self->set_current_page ($widget) },
3256	);	3570	);
3257		3571
…		…
3271	$self->emit (page_changed => $self->{multiplexer}{current});	3585	$self->emit (page_changed => $self->{multiplexer}{current});
3272	}	3586	}
3273		3587
3274	#############################################################################	3588	#############################################################################
3275		3589
3276	package CFClient::UI::Combobox;	3590	package CFPlus::UI::Selector;
3277		3591
3278	use utf8;	3592	use utf8;
3279		3593
3280	our @ISA = CFClient::UI::Button::;	3594	our @ISA = CFPlus::UI::Button::;
3281		3595
3282	sub new {	3596	sub new {
3283	my $class = shift;	3597	my $class = shift;
3284		3598
3285	my $self = $class->SUPER::new (	3599	my $self = $class->SUPER::new (
…		…
3302	my ($value, $title, $tooltip) = @$_;	3616	my ($value, $title, $tooltip) = @$_;
3303		3617
3304	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3618	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305	}	3619	}
3306		3620
3307	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3621	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308	}	3622	}
3309		3623
3310	sub _set_value {	3624	sub _set_value {
3311	my ($self, $value) = @_;	3625	my ($self, $value) = @_;
3312		3626
…		…
3327	$self->emit (changed => $value);	3641	$self->emit (changed => $value);
3328	}	3642	}
3329		3643
3330	#############################################################################	3644	#############################################################################
3331		3645
3332	package CFClient::UI::Statusbox;	3646	package CFPlus::UI::Statusbox;
3333		3647
3334	our @ISA = CFClient::UI::VBox::;	3648	our @ISA = CFPlus::UI::VBox::;
3335		3649
3336	sub new {	3650	sub new {
3337	my $class = shift;	3651	my $class = shift;
3338		3652
3339	my $self = $class->SUPER::new (	3653	my $self = $class->SUPER::new (
3340	fontsize => 0.8,	3654	fontsize => 0.8,
3341	@_,	3655	@_,
3342	);	3656	);
3343		3657
3344	Scalar::Util::weaken (my $this = $self);	3658	CFPlus::weaken (my $this = $self);
3345		3659
3346	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3660	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3347		3661
3348	$self	3662	$self
3349	}	3663	}
…		…
3351	sub reorder {	3665	sub reorder {
3352	my ($self) = @_;	3666	my ($self) = @_;
3353	my $NOW = Time::HiRes::time;	3667	my $NOW = Time::HiRes::time;
3354		3668
3355	# freeze display when hovering over any label	3669	# freeze display when hovering over any label
3356	return if $CFClient::UI::TOOLTIP->{owner}	3670	return if $CFPlus::UI::TOOLTIP->{owner}
3357	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3671	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3358	values %{ $self->{item} };	3672	values %{ $self->{item} };
3359		3673
3360	while (my ($k, $v) = each %{ $self->{item} }) {	3674	while (my ($k, $v) = each %{ $self->{item} }) {
3361	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3675	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3362	}	3676	}
…		…
3383	for ($short) {	3697	for ($short) {
3384	s/^\s+//;	3698	s/^\s+//;
3385	s/\s+/ /g;	3699	s/\s+/ /g;
3386	}	3700	}
3387		3701
3388	new CFClient::UI::Label	3702	new CFPlus::UI::Label
3389	markup => $short,	3703	markup => $short,
3390	tooltip => $item->{tooltip},	3704	tooltip => $item->{tooltip},
3391	tooltip_font => $::FONT_PROP,	3705	tooltip_font => $::FONT_PROP,
3392	tooltip_width => 0.67,	3706	tooltip_width => 0.67,
3393	fontsize => $item->{fontsize} || $self->{fontsize},	3707	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3472	$self->SUPER::destroy;	3786	$self->SUPER::destroy;
3473	}	3787	}
3474		3788
3475	#############################################################################	3789	#############################################################################
3476		3790
3477	package CFClient::UI::Inventory;
3478
3479	our @ISA = CFClient::UI::Table::;
3480
3481	sub new {
3482	my $class = shift;
3483
3484	my $self = $class->SUPER::new (
3485	col_expand => [0, 1, 0],
3486	@_,
3487	);
3488
3489	$self
3490	}
3491
3492	sub set_items {
3493	my ($self, $items) = @_;
3494
3495	$self->clear;
3496	return unless $items;
3497
3498	my @items = sort {
3499	($a->{type} <=> $b->{type})
3500	or ($a->{name} cmp $b->{name})
3501	} values %$items;
3502
3503	$self->{real_items} = \@items;
3504
3505	my $row = 0;
3506	for my $item (@items) {
3507	CFClient::Item::update_widgets $item;
3508
3509	$self->add (0, $row, $item->{face_widget});
3510	$self->add (1, $row, $item->{desc_widget});
3511	$self->add (2, $row, $item->{weight_widget});
3512
3513	$row++;
3514	}
3515	}
3516
3517	#############################################################################
3518
3519	package CFClient::UI::SpellList;
3520
3521	our @ISA = CFClient::UI::Table::;
3522
3523	sub new {
3524	my $class = shift;
3525
3526	my $self = $class->SUPER::new (
3527	binding => [],
3528	commands => [],
3529	@_,
3530	)
3531	}
3532
3533	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3534
3535	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3537	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3538	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3539	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3541	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3543	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3544	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3545
3546	sub rebuild_spell_list {
3547	my ($self) = @_;
3548
3549	$CFClient::UI::ROOT->on_refresh ($self => sub {
3550	$self->clear;
3551
3552	return unless $::CONN;
3553
3554	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3555	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3556	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3557	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3558	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3559
3560	my $row = 0;
3561
3562	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3563	my $spell = $self->{spell}{$_};
3564
3565	$row++;
3566
3567	my $spell_cb = sub {
3568	my ($widget, $ev) = @_;
3569
3570	if ($ev->{button} == 1) {
3571	$::CONN->user_send ("cast $spell->{name}");
3572	} elsif ($ev->{button} == 2) {
3573	$::CONN->user_send ("invoke $spell->{name}");
3574	} elsif ($ev->{button} == 3) {
3575	(new CFClient::UI::Menu
3576	items => [
3577	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3578	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3579	],
3580	)->popup ($ev);
3581	} else {
3582	return 0;
3583	}
3584
3585	1
3586	};
3587
3588	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3589
3590	#TODO: add path info to tooltip
3591	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3592
3593	$self->add (0, $row, new CFClient::UI::Face
3594	face => $spell->{face},
3595	can_hover => 1,
3596	can_events => 1,
3597	tooltip => $tooltip,
3598	on_button_down => $spell_cb,
3599	);
3600
3601	$self->add (1, $row, new CFClient::UI::Label
3602	expand => 1,
3603	text => $spell->{name},
3604	can_hover => 1,
3605	can_events => 1,
3606	tooltip => $tooltip,
3607	on_button_down => $spell_cb,
3608	);
3609
3610	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3611	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3612	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3613	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3614	}
3615	});
3616	}
3617
3618	sub add_spell {
3619	my ($self, $spell) = @_;
3620
3621	$self->{spell}->{$spell->{name}} = $spell;
3622	$self->rebuild_spell_list;
3623	}
3624
3625	sub remove_spell {
3626	my ($self, $spell) = @_;
3627
3628	delete $self->{spell}->{$spell->{name}};
3629	$self->rebuild_spell_list;
3630	}
3631
3632	sub clear_spells {
3633	my ($self) = @_;
3634
3635	$self->{spell} = {};
3636	$self->rebuild_spell_list;
3637	}
3638
3639	#############################################################################
3640
3641	package CFClient::UI::Root;	3791	package CFPlus::UI::Root;
3642		3792
3643	our @ISA = CFClient::UI::Container::;	3793	our @ISA = CFPlus::UI::Container::;
3644		3794
3645	use List::Util qw(min max);	3795	use List::Util qw(min max);
3646		3796
3647	use CFClient::OpenGL;	3797	use CFPlus::OpenGL;
3648		3798
3649	sub new {	3799	sub new {
3650	my $class = shift;	3800	my $class = shift;
3651		3801
3652	my $self = $class->SUPER::new (	3802	my $self = $class->SUPER::new (
3653	visible => 1,	3803	visible => 1,
3654	@_,	3804	@_,
3655	);	3805	);
3656		3806
3657	Scalar::Util::weaken ($self->{root} = $self);	3807	CFPlus::weaken ($self->{root} = $self);
3658		3808
3659	$self	3809	$self
3660	}	3810	}
3661		3811
3662	sub size_request {	3812	sub size_request {
…		…
3831	$h = 0 if $h < 0;	3981	$h = 0 if $h < 0;
3832		3982
3833	$w = max $widget->{min_w}, $w;	3983	$w = max $widget->{min_w}, $w;
3834	$h = max $widget->{min_h}, $h;	3984	$h = max $widget->{min_h}, $h;
3835		3985
		3986	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3987	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3988
3836	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3989	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3990	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838		3991
3839	$w = int $w + 0.5;	3992	$w = int $w + 0.5;
3840	$h = int $h + 0.5;	3993	$h = int $h + 0.5;
…		…
3866	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4019	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3867	glMatrixMode GL_MODELVIEW;	4020	glMatrixMode GL_MODELVIEW;
3868	glLoadIdentity;	4021	glLoadIdentity;
3869		4022
3870	{	4023	{
3871	package CFClient::UI::Base;	4024	package CFPlus::UI::Base;
3872		4025
3873	($draw_x, $draw_y, $draw_w, $draw_h) =	4026	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3874	(0, 0, $self->{w}, $self->{h});	4027	(0, 0, $self->{w}, $self->{h});
3875	}
3876		4028
3877	$self->_draw;	4029	$self->_draw;
		4030	}
3878	}	4031	}
3879		4032
3880	#############################################################################	4033	#############################################################################
3881		4034
3882	package CFClient::UI;	4035	package CFPlus::UI;
3883		4036
3884	$ROOT = new CFClient::UI::Root;	4037	$ROOT = new CFPlus::UI::Root;
3885	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4038	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3886		4039
3887	1	4040	1
3888		4041

Diff Legend

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