ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.325 by root, Thu Jul 13 01:29:17 2006 UTC vs.
Revision 1.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	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
98		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
100	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
101	}	125	}
102		126
103	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	128	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		129
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		131
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		133
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
112	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		136
114	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	139	$grab->update if $grab;
117	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
118		141
		142	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
120	}	144	}
121	}	145	}
122		146
123	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
124	my ($ev) = @_;	148	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
126		150
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		152
129	if ($widget != $HOVER) {	153	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		154
132	$hover->update if $hover && $hover->{can_hover};	155	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	156	if $HOVER;
140	}	157	}
141		158
142	# convert position array to integers	159	# convert position array to integers
143	sub harmonize {	160	sub harmonize {
…		…
193	reconfigure_widgets;	210	reconfigure_widgets;
194	}	211	}
195		212
196	#############################################################################	213	#############################################################################
197		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
198	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
199		224
200	use strict;	225	use strict;
201		226
202	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
203		228
204	sub new {	229	sub new {
205	my $class = shift;	230	my $class = shift;
206		231
207	my $self = bless {	232	my $self = bless {
…		…
212	h => undef,	237	h => undef,
213	can_events => 1,	238	can_events => 1,
214	@_	239	@_
215	}, $class;	240	}, $class;
216		241
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		243
219	for (keys %$self) {	244	for (keys %$self) {
220	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
222	}	247	}
223	}	248	}
224		249
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		255
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		258
234	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
239		264
240	sub destroy {	265	sub destroy {
241	my ($self) = @_;	266	my ($self) = @_;
242		267
243	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
244	%$self = ();	270	%$self = ();
245	}	271	}
246		272
247	sub show {	273	sub show {
248	my ($self) = @_;	274	my ($self) = @_;
249		275
250	return if $self->{parent};	276	return if $self->{parent};
251		277
252	$CFClient::UI::ROOT->add ($self);	278	$CFPlus::UI::ROOT->add ($self);
253	}	279	}
254		280
255	sub set_visible {	281	sub set_visible {
256	my ($self) = @_;	282	my ($self) = @_;
257		283
…		…
278	delete $self->{root};	304	delete $self->{root};
279		305
280	undef $GRAB if $GRAB == $self;	306	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	307	undef $HOVER if $HOVER == $self;
282		308
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	309	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	310	if $TOOLTIP->{owner} == $self;
285		311
286	$self->emit ("focus_out");	312	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	313	$self->emit (visibility_change => 0);
288	}	314	}
…		…
345	my ($self, $x, $y, $w, $h) = @_;	371	my ($self, $x, $y, $w, $h) = @_;
346		372
347	if ($self->{aspect}) {	373	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	374	my ($ow, $oh) = ($w, $h);
349		375
350	$w = List::Util::min $w, int $h * $self->{aspect};	376	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	377	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		378
353	# use alignment to adjust x, y	379	# use alignment to adjust x, y
354		380
355	$x += int 0.5 * ($ow - $w);	381	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	382	$y += int 0.5 * ($oh - $h);
…		…
397		423
398	return if $self->{tooltip} eq $tooltip;	424	return if $self->{tooltip} eq $tooltip;
399		425
400	$self->{tooltip} = $tooltip;	426	$self->{tooltip} = $tooltip;
401		427
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	428	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	429	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	430	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	431	}
406	}	432	}
407		433
408	# translate global coordinates to local coordinate system	434	# translate global coordinates to local coordinate system
409	sub coord2local {	435	sub coord2local {
410	my ($self, $x, $y) = @_;	436	my ($self, $x, $y) = @_;
411		437
		438	Carp::confess unless $self->{parent};#d#
		439
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	440	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	441	}
414		442
415	# translate local coordinates to global coordinate system	443	# translate local coordinates to global coordinate system
416	sub coord2global {	444	sub coord2global {
417	my ($self, $x, $y) = @_;	445	my ($self, $x, $y) = @_;
418		446
		447	Carp::confess unless $self->{parent};#d#
		448
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	449	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	450	}
421		451
422	sub invoke_focus_in {	452	sub invoke_focus_in {
423	my ($self) = @_;	453	my ($self) = @_;
…		…
452		482
453	$FOCUS->emit ("focus_out") if $FOCUS;	483	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	484	$self->emit ("focus_in");
455	}	485	}
456		486
457	sub invoke_mouse_motion { 1 }	487	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	488	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	489	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	490	sub invoke_key_up { 0 }
		491	sub invoke_mouse_wheel { 0 }
461		492
462	sub invoke_button_down {	493	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	494	my ($self, $ev, $x, $y) = @_;
464		495
465	$self->grab_focus;	496	$self->grab_focus;
466		497
467	1	498	0
468	}	499	}
469		500
470	sub connect {	501	sub connect {
471	my ($self, $signal, $cb) = @_;	502	my ($self, $signal, $cb) = @_;
472		503
473	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	}
474	}	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	);
475		524
476	sub emit {	525	sub emit {
477	my ($self, $signal, @args) = @_;	526	my ($self, $signal, @args) = @_;
478		527
479	#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
480	(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
481	|| ($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
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	545	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	546	}
484		547
485	sub find_widget {	548	sub find_widget {
486	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
487		550
…		…
495	}	558	}
496		559
497	sub set_parent {	560	sub set_parent {
498	my ($self, $parent) = @_;	561	my ($self, $parent) = @_;
499		562
500	Scalar::Util::weaken ($self->{parent} = $parent);	563	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	564	$self->set_visible if $parent->{visible};
502	}	565	}
503		566
504	sub realloc {	567	sub realloc {
505	my ($self) = @_;	568	my ($self) = @_;
…		…
571	glVertex $self->{w} - 1, 0;	634	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	635	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	636	glVertex 0 , $self->{h} - 1;
574	glEnd;	637	glEnd;
575	glPopMatrix;	638	glPopMatrix;
576	#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;
577	}	640	}
578		641
579	$self->_draw;	642	$self->_draw;
580	glPopMatrix;	643	glPopMatrix;
581	}	644	}
…		…
584	my ($self) = @_;	647	my ($self) = @_;
585		648
586	warn "no draw defined for $self\n";	649	warn "no draw defined for $self\n";
587	}	650	}
588		651
		652	my $cntx;#d#
589	sub DESTROY {	653	sub DESTROY {
590	my ($self) = @_;	654	my ($self) = @_;
591		655
592	return if CFClient::in_destruct;	656	return if CFPlus::in_destruct;
593
594	delete $WIDGET{$self+0};
595		657
596	eval { $self->destroy };	658	eval { $self->destroy };
597	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};
598	}	662	}
599		663
600	#############################################################################	664	#############################################################################
601		665
602	package CFClient::UI::DrawBG;	666	package CFPlus::UI::DrawBG;
603		667
604	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
605		669
606	use strict;	670	use strict;
607	use CFClient::OpenGL;	671	use CFPlus::OpenGL;
608		672
609	sub new {	673	sub new {
610	my $class = shift;	674	my $class = shift;
611		675
612	# range [value, low, high, page]	676	# range [value, low, high, page]
…		…
643	}	707	}
644	}	708	}
645		709
646	#############################################################################	710	#############################################################################
647		711
648	package CFClient::UI::Empty;	712	package CFPlus::UI::Empty;
649		713
650	our @ISA = CFClient::UI::Base::;	714	our @ISA = CFPlus::UI::Base::;
651		715
652	sub new {	716	sub new {
653	my ($class, %arg) = @_;	717	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	718	$class->SUPER::new (can_events => 0, %arg);
655	}	719	}
…		…
662		726
663	sub draw { }	727	sub draw { }
664		728
665	#############################################################################	729	#############################################################################
666		730
667	package CFClient::UI::Container;	731	package CFPlus::UI::Container;
668		732
669	our @ISA = CFClient::UI::Base::;	733	our @ISA = CFPlus::UI::Base::;
670		734
671	sub new {	735	sub new {
672	my ($class, %arg) = @_;	736	my ($class, %arg) = @_;
673		737
674	my $children = delete $arg{children};	738	my $children = delete $arg{children};
…		…
683	if $children;	747	if $children;
684		748
685	$self	749	$self
686	}	750	}
687		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
688	sub add {	760	sub add {
689	my ($self, @widgets) = @_;	761	my ($self, @widgets) = @_;
690		762
691	$_->set_parent ($self)	763	$_->set_parent ($self)
692	for @widgets;	764	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
753	}	825	}
754		826
755	#############################################################################	827	#############################################################################
756		828
757	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
758		830
759	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
760		832
761	sub new {	833	sub new {
762	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
763		835
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		837
766	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
767	}	839	}
768		840
769	sub add {	841	sub add {
…		…
776	sub remove {	848	sub remove {
777	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
778		850
779	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
780		852
781	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	854	unless @{$self->{children}};
783	}	855	}
784		856
785	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
786		858
…		…
798		870
799	#############################################################################	871	#############################################################################
800		872
801	# back-buffered drawing area	873	# back-buffered drawing area
802		874
803	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
804		876
805	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
806		878
807	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
808		880
809	sub new {	881	sub new {
810	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
811		883
812	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
834	}	906	}
835		907
836	sub render_child {	908	sub render_child {
837	my ($self) = @_;	909	my ($self) = @_;
838		910
839	$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 {
840	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
842		914
843	{	915	{
844	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
845		917
846	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
848	}	922	}
849
850	$self->_render;
851	};	923	};
852	}	924	}
853		925
854	sub _draw {	926	sub _draw {
855	my ($self) = @_;	927	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		928
859	my $tex = $self->{texture}	929	my $tex = $self->{texture}
860	or return;	930	or return;
861		931
862	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
865		935
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
867		937
868	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
869	}	939	}
870		940
871	#############################################################################	941	#############################################################################
872		942
873	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
874		944
875	our @ISA = CFClient::UI::Window::;	945	our @ISA = CFPlus::UI::Window::;
876		946
877	sub new {	947	sub new {
878	my $class = shift;	948	my $class = shift;
879		949
880	$class->SUPER::new (	950	$class->SUPER::new (
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1010	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1011	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	1012	) {
943	$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})
944	} else {	1014	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1015	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1016	}
947	}	1017	}
948		1018
949	sub _render {	1019	sub _render {
950	my ($self) = @_;	1020	my ($self) = @_;
951		1021
952	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};
953	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};
954		1024
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1025	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1026
957	$self->SUPER::_render;	1027	$self->SUPER::_render;
958	}	1028	}
959		1029
960	#############################################################################	1030	#############################################################################
961		1031
962	package CFClient::UI::ScrolledWindow;	1032	package CFPlus::UI::ScrolledWindow;
963		1033
964	our @ISA = CFClient::UI::HBox::;	1034	our @ISA = CFPlus::UI::HBox::;
965		1035
966	sub new {	1036	sub new {
967	my ($class, %arg) = @_;	1037	my ($class, %arg) = @_;
968		1038
969	my $child = delete $arg{child};	1039	my $child = delete $arg{child};
970		1040
971	my $self;	1041	my $self;
972		1042
973	my $slider = new CFClient::UI::Slider	1043	my $slider = new CFPlus::UI::Slider
974	vertical => 1,	1044	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1045	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1046	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1047	$self->{vp}->set_offset (0, $_[1]);
978	},	1048	},
979	;	1049	;
980		1050
981	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1052	vp => (new CFPlus::UI::ViewPort expand => 1),
		1053	can_events => 1,
983	slider => $slider,	1054	slider => $slider,
984	%arg,	1055	%arg,
985	);	1056	);
986		1057
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1058	$self->SUPER::add ($self->{vp}, $self->{slider});
988	$self->add ($child) if $child;	1059	$self->add ($child) if $child;
…		…
996	my ($self, $widget) = @_;	1067	my ($self, $widget) = @_;
997		1068
998	$self->{vp}->add ($self->{child} = $widget);	1069	$self->{vp}->add ($self->{child} = $widget);
999	}	1070	}
1000		1071
		1072	sub invoke_mouse_wheel {
		1073	my ($self, $ev) = @_;
		1074
		1075	return 0 unless $ev->{dy}; # only vertical movements
		1076
		1077	$self->{slider}->emit (mouse_wheel => $ev);
		1078
		1079	1
		1080	}
		1081
1001	sub update_slider {	1082	sub update_slider {
1002	my ($self) = @_;	1083	my ($self) = @_;
1003		1084
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1085	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1005	}	1086	}
…		…
1020	$self->SUPER::invoke_size_allocate ($w, $h)	1101	$self->SUPER::invoke_size_allocate ($w, $h)
1021	}	1102	}
1022		1103
1023	#############################################################################	1104	#############################################################################
1024		1105
1025	package CFClient::UI::Frame;	1106	package CFPlus::UI::Frame;
1026		1107
1027	our @ISA = CFClient::UI::Bin::;	1108	our @ISA = CFPlus::UI::Bin::;
1028		1109
1029	use CFClient::OpenGL;	1110	use CFPlus::OpenGL;
1030		1111
1031	sub new {	1112	sub new {
1032	my $class = shift;	1113	my $class = shift;
1033		1114
1034	$class->SUPER::new (	1115	$class->SUPER::new (
…		…
1060	$self->SUPER::_draw;	1141	$self->SUPER::_draw;
1061	}	1142	}
1062		1143
1063	#############################################################################	1144	#############################################################################
1064		1145
1065	package CFClient::UI::FancyFrame;	1146	package CFPlus::UI::FancyFrame;
1066		1147
1067	our @ISA = CFClient::UI::Bin::;	1148	our @ISA = CFPlus::UI::Bin::;
1068		1149
1069	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;
1070		1251
1071	my $bg =	1252	my $bg =
1072	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1253	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1073	mipmap => 1, wrap => 1;	1254	mipmap => 1, wrap => 1;
1074		1255
1075	my @border =	1256	my @border =
1076	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1257	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);	1258	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1078		1259
1079	sub new {	1260	sub new {
1080	my ($class, %arg) = @_;	1261	my ($class, %arg) = @_;
1081		1262
1082	my $self = $class->SUPER::new (	1263	my $self = $class->SUPER::new (
1083	bg => [1, 1, 1, 1],	1264	bg => [1, 1, 1, 1],
1084	border_bg => [1, 1, 1, 1],	1265	border_bg => [1, 1, 1, 1],
1085	border => 0.6,	1266	border => 0.6,
1086	can_events => 1,	1267	can_events => 1,
1087	min_w => 16,	1268	min_w => 64,
1088	min_h => 16,	1269	min_h => 32,
1089	%arg,	1270	%arg,
1090	);	1271	);
1091		1272
1092	$self->{title_widget} = new CFClient::UI::Label	1273	$self->{title_widget} = new CFPlus::UI::Label
1093	align => 0,	1274	align => 0,
1094	valign => 1,	1275	valign => 1,
1095	text => $self->{title},	1276	text => $self->{title},
1096	fontsize => $self->{border},	1277	fontsize => $self->{border},
1097	if exists $self->{title};	1278	if exists $self->{title};
1098		1279
1099	if ($self->{has_close_button}) {	1280	if ($self->{has_close_button}) {
1100	$self->{close_button} =	1281	$self->{close_button} =
1101	new CFClient::UI::ImageButton	1282	new CFPlus::UI::ImageButton
1102	path => 'x1_close.png',	1283	path => 'x1_close.png',
1103	on_activate => sub { $self->emit ("delete") };	1284	on_activate => sub { $self->emit ("delete") };
1104		1285
1105	$self->CFClient::UI::Container::add ($self->{close_button});	1286	$self->CFPlus::UI::Container::add ($self->{close_button});
1106	}	1287	}
1107		1288
1108	$self	1289	$self
1109	}	1290	}
1110		1291
1111	sub add {	1292	sub add {
1112	my ($self, @widgets) = @_;	1293	my ($self, @widgets) = @_;
1113		1294
1114	$self->SUPER::add (@widgets);	1295	$self->SUPER::add (@widgets);
1115	$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};
1116	$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};
1117	}	1298	}
1118		1299
1119	sub border {	1300	sub border {
1120	int $_[0]{border} * $::FONTSIZE	1301	int $_[0]{border} * $::FONTSIZE
1121	}	1302	}
…		…
1229	$self->{motion}->($ev, $x, $y) if $self->{motion};	1410	$self->{motion}->($ev, $x, $y) if $self->{motion};
1230		1411
1231	! ! $self->{motion}	1412	! ! $self->{motion}
1232	}	1413	}
1233		1414
		1415	sub invoke_visibility_change {
		1416	my ($self, $visible) = @_;
		1417
		1418	delete $self->{motion} unless $visible;
		1419
		1420	0
		1421	}
		1422
1234	sub _draw {	1423	sub _draw {
1235	my ($self) = @_;	1424	my ($self) = @_;
1236		1425
1237	my $child = $self->{children}[0];	1426	my $child = $self->{children}[0];
1238		1427
…		…
1275	if $self->{close_button};	1464	if $self->{close_button};
1276	}	1465	}
1277		1466
1278	#############################################################################	1467	#############################################################################
1279		1468
1280	package CFClient::UI::Table;	1469	package CFPlus::UI::Table;
1281		1470
1282	our @ISA = CFClient::UI::Base::;	1471	our @ISA = CFPlus::UI::Base::;
1283		1472
1284	use List::Util qw(max sum);	1473	use List::Util qw(max sum);
1285		1474
1286	use CFClient::OpenGL;	1475	use CFPlus::OpenGL;
1287		1476
1288	sub new {	1477	sub new {
1289	my $class = shift;	1478	my $class = shift;
1290		1479
1291	$class->SUPER::new (	1480	$class->SUPER::new (
…		…
1297	sub children {	1486	sub children {
1298	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1487	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1299	}	1488	}
1300		1489
1301	sub add {	1490	sub add {
1302	my ($self, $x, $y, $child) = @_;	1491	my ($self) = shift;
1303		1492
		1493	while (@_) {
		1494	my ($x, $y, $child) = splice @_, 0, 3, ();
1304	$child->set_parent ($self);	1495	$child->set_parent ($self);
1305	$self->{children}[$y][$x] = $child;	1496	$self->{children}[$y][$x] = $child;
		1497	}
1306		1498
		1499	$self->{force_realloc} = 1;
		1500	$self->{force_size_alloc} = 1;
1307	$self->realloc;	1501	$self->realloc;
1308	}	1502	}
1309		1503
1310	sub remove {	1504	sub remove {
1311	my ($self, $child) = @_;	1505	my ($self, $child) = @_;
…		…
1376		1570
1377	# linearly scale sizes	1571	# linearly scale sizes
1378	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1572	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1379	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1573	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1380		1574
1381	CFClient::UI::harmonize $ws;	1575	CFPlus::UI::harmonize $ws;
1382	CFClient::UI::harmonize $hs;	1576	CFPlus::UI::harmonize $hs;
1383		1577
1384	my $y;	1578	my $y;
1385		1579
1386	for my $r (0 .. $#{$self->{children}}) {	1580	for my $r (0 .. $#{$self->{children}}) {
1387	my $row = $self->{children}[$r]	1581	my $row = $self->{children}[$r]
…		…
1430	}	1624	}
1431	}	1625	}
1432		1626
1433	#############################################################################	1627	#############################################################################
1434		1628
1435	package CFClient::UI::Box;	1629	package CFPlus::UI::Box;
1436		1630
1437	our @ISA = CFClient::UI::Container::;	1631	our @ISA = CFPlus::UI::Container::;
1438		1632
1439	sub size_request {	1633	sub size_request {
1440	my ($self) = @_;	1634	my ($self) = @_;
1441		1635
1442	$self->{vertical}	1636	$self->{vertical}
…		…
1475	$req[$_] += $space * $children[$_]{expand}	1669	$req[$_] += $space * $children[$_]{expand}
1476	for 0 .. $#children;	1670	for 0 .. $#children;
1477	}	1671	}
1478	}	1672	}
1479		1673
1480	CFClient::UI::harmonize \@req;	1674	CFPlus::UI::harmonize \@req;
1481		1675
1482	my $pos = 0;	1676	my $pos = 0;
1483	for (0 .. $#children) {	1677	for (0 .. $#children) {
1484	my $alloc = $req[$_];	1678	my $alloc = $req[$_];
1485	$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));
…		…
1490	1	1684	1
1491	}	1685	}
1492		1686
1493	#############################################################################	1687	#############################################################################
1494		1688
1495	package CFClient::UI::HBox;	1689	package CFPlus::UI::HBox;
1496		1690
1497	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1498		1692
1499	sub new {	1693	sub new {
1500	my $class = shift;	1694	my $class = shift;
1501		1695
1502	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1505	)	1699	)
1506	}	1700	}
1507		1701
1508	#############################################################################	1702	#############################################################################
1509		1703
1510	package CFClient::UI::VBox;	1704	package CFPlus::UI::VBox;
1511		1705
1512	our @ISA = CFClient::UI::Box::;	1706	our @ISA = CFPlus::UI::Box::;
1513		1707
1514	sub new {	1708	sub new {
1515	my $class = shift;	1709	my $class = shift;
1516		1710
1517	$class->SUPER::new (	1711	$class->SUPER::new (
…		…
1520	)	1714	)
1521	}	1715	}
1522		1716
1523	#############################################################################	1717	#############################################################################
1524		1718
1525	package CFClient::UI::Label;	1719	package CFPlus::UI::Label;
1526		1720
1527	our @ISA = CFClient::UI::DrawBG::;	1721	our @ISA = CFPlus::UI::DrawBG::;
1528		1722
1529	use CFClient::OpenGL;	1723	use CFPlus::OpenGL;
1530		1724
1531	sub new {	1725	sub new {
1532	my ($class, %arg) = @_;	1726	my ($class, %arg) = @_;
1533		1727
1534	my $self = $class->SUPER::new (	1728	my $self = $class->SUPER::new (
…		…
1537	#active_bg => none	1731	#active_bg => none
1538	#font => default_font	1732	#font => default_font
1539	#text => initial text	1733	#text => initial text
1540	#markup => initial narkup	1734	#markup => initial narkup
1541	#max_w => maximum pixel width	1735	#max_w => maximum pixel width
		1736	#style => 0, # render flags
1542	ellipsise => 3, # end	1737	ellipsise => 3, # end
1543	layout => (new CFClient::Layout),	1738	layout => (new CFPlus::Layout),
1544	fontsize => 1,	1739	fontsize => 1,
1545	align => -1,	1740	align => -1,
1546	valign => -1,	1741	valign => -1,
1547	padding_x => 2,	1742	padding_x => 2,
1548	padding_y => 2,	1743	padding_y => 2,
1549	can_events => 0,	1744	can_events => 0,
1550	%arg	1745	%arg
1551	);	1746	);
1552		1747
1553	if (exists $self->{template}) {	1748	if (exists $self->{template}) {
1554	my $layout = new CFClient::Layout;	1749	my $layout = new CFPlus::Layout;
1555	$layout->set_text (delete $self->{template});	1750	$layout->set_text (delete $self->{template});
1556	$self->{template} = $layout;	1751	$self->{template} = $layout;
1557	}	1752	}
1558		1753
1559	if (exists $self->{markup}) {	1754	if (exists $self->{markup}) {
…		…
1561	} else {	1756	} else {
1562	$self->set_text (delete $self->{text});	1757	$self->set_text (delete $self->{text});
1563	}	1758	}
1564		1759
1565	$self	1760	$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	}	1761	}
1577		1762
1578	sub update {	1763	sub update {
1579	my ($self) = @_;	1764	my ($self) = @_;
1580		1765
…		…
1707	};	1892	};
1708		1893
1709	my $w = List::Util::min $self->{w} + 4, $size->[0];	1894	my $w = List::Util::min $self->{w} + 4, $size->[0];
1710	my $h = List::Util::min $self->{h} + 2, $size->[1];	1895	my $h = List::Util::min $self->{h} + 2, $size->[1];
1711		1896
1712	$self->{layout}->render ($self->{ox}, $self->{oy});	1897	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713	}	1898	}
1714		1899
1715	#############################################################################	1900	#############################################################################
1716		1901
1717	package CFClient::UI::EntryBase;	1902	package CFPlus::UI::EntryBase;
1718		1903
1719	our @ISA = CFClient::UI::Label::;	1904	our @ISA = CFPlus::UI::Label::;
1720		1905
1721	use CFClient::OpenGL;	1906	use CFPlus::OpenGL;
1722		1907
1723	sub new {	1908	sub new {
1724	my $class = shift;	1909	my $class = shift;
1725		1910
1726	$class->SUPER::new (	1911	$class->SUPER::new (
…		…
1730	active_fg => [0, 0, 0],	1915	active_fg => [0, 0, 0],
1731	can_hover => 1,	1916	can_hover => 1,
1732	can_focus => 1,	1917	can_focus => 1,
1733	valign => 0,	1918	valign => 0,
1734	can_events => 1,	1919	can_events => 1,
		1920	ellipsise => 0,
1735	#text => ...	1921	#text => ...
1736	#hidden => "*",	1922	#hidden => "*",
1737	@_	1923	@_
1738	)	1924	)
1739	}	1925	}
…		…
1784	my $sym = $ev->{sym};	1970	my $sym = $ev->{sym};
1785	my $uni = $ev->{unicode};	1971	my $uni = $ev->{unicode};
1786		1972
1787	my $text = $self->get_text;	1973	my $text = $self->get_text;
1788		1974
		1975	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		1976
1789	if ($uni == 8) {	1977	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1978	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	1979	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	1980	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	1981	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	1982	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	1983	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	1984	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} 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 = "";
1798	$self->{cursor} = 0;	1999	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {
1800	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	2000	} elsif ($uni == 27) {
1802	$self->emit ('escape');	2001	$self->emit ('escape');
1803	} elsif ($uni) {	2002	} elsif ($uni == 0x0d) {
		2003	substr $text, $self->{cursor}++, 0, "\012";
		2004	} elsif ($uni >= 0x20) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	2005	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	2006	} else {
1806	return 0;	2007	return 0;
1807	}	2008	}
1808		2009
1809	$self->_set_text ($text);	2010	$self->_set_text ($text);
1810		2011
1811	$self->realloc;	2012	$self->realloc;
		2013	$self->update;
1812		2014
1813	1	2015	1
1814	}	2016	}
1815		2017
1816	sub invoke_focus_in {	2018	sub invoke_focus_in {
…		…
1878	utf8::encode $text;	2080	utf8::encode $text;
1879		2081
1880	@$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)
1881	}	2083	}
1882		2084
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2085	glBegin GL_LINES;
1885	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};
1886	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};
1887	glEnd;	2088	glEnd;
1888	}	2089	}
1889	}	2090	}
1890		2091
		2092	#############################################################################
		2093
1891	package CFClient::UI::Entry;	2094	package CFPlus::UI::Entry;
1892		2095
1893	our @ISA = CFClient::UI::EntryBase::;	2096	our @ISA = CFPlus::UI::EntryBase::;
1894		2097
1895	use CFClient::OpenGL;	2098	use CFPlus::OpenGL;
1896		2099
1897	sub invoke_key_down {	2100	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2101	my ($self, $ev) = @_;
1899		2102
1900	my $sym = $ev->{sym};	2103	my $sym = $ev->{sym};
1901		2104
1902	if ($sym == 13) {	2105	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2106	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2107	my $txt = $self->get_text;
1905		2108
1906	$self->{history_pointer} = -1;	2109	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2110	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2111	$self->emit (activate => $txt);
1909	$self->update;	2112	$self->update;
1910		2113
1911	} elsif ($sym == CFClient::SDLK_UP) {	2114	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2115	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2116	$self->{history_saveback} = $self->get_text;
1914	}	2117	}
1915	if (@{$self->{history} || []} > 0) {	2118	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2119	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2121	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2122	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2123	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2124	}
1922		2125
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2126	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2127	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2128	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2129
1927	if ($self->{history_pointer} >= 0) {	2130	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2131	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2140	1
1938	}	2141	}
1939		2142
1940	#############################################################################	2143	#############################################################################
1941		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
1942	package CFClient::UI::Button;	2184	package CFPlus::UI::Button;
1943		2185
1944	our @ISA = CFClient::UI::Label::;	2186	our @ISA = CFPlus::UI::Label::;
1945		2187
1946	use CFClient::OpenGL;	2188	use CFPlus::OpenGL;
1947		2189
1948	my @tex =	2190	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2191	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2192	qw(b1_button_active.png);
1951		2193
1952	sub new {	2194	sub new {
1953	my $class = shift;	2195	my $class = shift;
1954		2196
…		…
1991	$self->SUPER::_draw;	2233	$self->SUPER::_draw;
1992	}	2234	}
1993		2235
1994	#############################################################################	2236	#############################################################################
1995		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
1996	package CFClient::UI::ImageButton;	2387	package CFPlus::UI::ImageButton;
1997		2388
1998	our @ISA = CFClient::UI::Image::;	2389	our @ISA = CFPlus::UI::Image::;
1999		2390
2000	use CFClient::OpenGL;	2391	use CFPlus::OpenGL;
2001		2392
2002	my %textures;	2393	my %textures;
2003		2394
2004	sub new {	2395	sub new {
2005	my $class = shift;	2396	my $class = shift;
…		…
2027	1	2418	1
2028	}	2419	}
2029		2420
2030	#############################################################################	2421	#############################################################################
2031		2422
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;	2423	package CFPlus::UI::VGauge;
2108		2424
2109	our @ISA = CFClient::UI::Base::;	2425	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		2426
2170	use List::Util qw(min max);	2427	use List::Util qw(min max);
2171		2428
2172	use CFClient::OpenGL;	2429	use CFPlus::OpenGL;
2173		2430
2174	my %tex = (	2431	my %tex = (
2175	food => [	2432	food => [
2176	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2433	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2434	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2178	],	2435	],
2179	grace => [	2436	grace => [
2180	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2437	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/	2438	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2182	],	2439	],
2183	hp => [	2440	hp => [
2184	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2185	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2442	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2186	],	2443	],
2187	mana => [	2444	mana => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2445	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/	2446	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2190	],	2447	],
2191	);	2448	);
2192		2449
2193	# eg. VGauge->new (gauge => 'food'), default gauge: food	2450	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2296	glDisable GL_TEXTURE_2D;	2553	glDisable GL_TEXTURE_2D;
2297	}	2554	}
2298		2555
2299	#############################################################################	2556	#############################################################################
2300		2557
2301	package CFClient::UI::Gauge;	2558	package CFPlus::UI::Gauge;
2302		2559
2303	our @ISA = CFClient::UI::VBox::;	2560	our @ISA = CFPlus::UI::VBox::;
2304		2561
2305	sub new {	2562	sub new {
2306	my ($class, %arg) = @_;	2563	my ($class, %arg) = @_;
2307		2564
2308	my $self = $class->SUPER::new (	2565	my $self = $class->SUPER::new (
…		…
2310	can_hover => 1,	2567	can_hover => 1,
2311	can_events => 1,	2568	can_events => 1,
2312	%arg,	2569	%arg,
2313	);	2570	);
2314		2571
2315	$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");
2316	$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);
2317	$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");
2318		2575
2319	$self	2576	$self
2320	}	2577	}
2321		2578
2322	sub set_fontsize {	2579	sub set_fontsize {
…		…
2343	$self->{value}->set_text ($val);	2600	$self->{value}->set_text ($val);
2344	}	2601	}
2345		2602
2346	#############################################################################	2603	#############################################################################
2347		2604
2348	package CFClient::UI::Slider;	2605	package CFPlus::UI::Slider;
2349		2606
2350	use strict;	2607	use strict;
2351		2608
2352	use CFClient::OpenGL;	2609	use CFPlus::OpenGL;
2353		2610
2354	our @ISA = CFClient::UI::DrawBG::;	2611	our @ISA = CFPlus::UI::DrawBG::;
2355		2612
2356	my @tex =	2613	my @tex =
2357	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2614	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2358	qw(s1_slider.png s1_slider_bg.png);	2615	qw(s1_slider.png s1_slider_bg.png);
2359		2616
2360	sub new {	2617	sub new {
2361	my $class = shift;	2618	my $class = shift;
2362		2619
…		…
2451	}	2708	}
2452		2709
2453	1	2710	1
2454	}	2711	}
2455		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
2456	sub update {	2725	sub update {
2457	my ($self) = @_;	2726	my ($self) = @_;
2458		2727
2459	delete $self->{knob_w};	2728	delete $self->{knob_w};
2460	$self->SUPER::update;	2729	$self->SUPER::update;
…		…
2507	glDisable GL_TEXTURE_2D;	2776	glDisable GL_TEXTURE_2D;
2508	}	2777	}
2509		2778
2510	#############################################################################	2779	#############################################################################
2511		2780
2512	package CFClient::UI::ValSlider;	2781	package CFPlus::UI::ValSlider;
2513		2782
2514	our @ISA = CFClient::UI::HBox::;	2783	our @ISA = CFPlus::UI::HBox::;
2515		2784
2516	sub new {	2785	sub new {
2517	my ($class, %arg) = @_;	2786	my ($class, %arg) = @_;
2518		2787
2519	my $range = delete $arg{range};	2788	my $range = delete $arg{range};
2520		2789
2521	my $self = $class->SUPER::new (	2790	my $self = $class->SUPER::new (
2522	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2791	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2523	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2792	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2524	to_value => sub { shift },	2793	to_value => sub { shift },
2525	from_value => sub { shift },	2794	from_value => sub { shift },
2526	%arg,	2795	%arg,
2527	);	2796	);
2528		2797
…		…
2548	sub set_range { shift->{slider}->set_range (@_) }	2817	sub set_range { shift->{slider}->set_range (@_) }
2549	sub set_value { shift->{slider}->set_value (@_) }	2818	sub set_value { shift->{slider}->set_value (@_) }
2550		2819
2551	#############################################################################	2820	#############################################################################
2552		2821
2553	package CFClient::UI::TextScroller;	2822	package CFPlus::UI::TextScroller;
2554		2823
2555	our @ISA = CFClient::UI::HBox::;	2824	our @ISA = CFPlus::UI::HBox::;
2556		2825
2557	use CFClient::OpenGL;	2826	use CFPlus::OpenGL;
2558		2827
2559	sub new {	2828	sub new {
2560	my $class = shift;	2829	my $class = shift;
2561		2830
2562	my $self = $class->SUPER::new (	2831	my $self = $class->SUPER::new (
2563	fontsize => 1,	2832	fontsize => 1,
2564	can_events => 0,	2833	can_events => 1,
2565	indent => 0,	2834	indent => 0,
2566	#font => default_font	2835	#font => default_font
2567	@_,	2836	@_,
2568		2837
2569	layout => (new CFClient::Layout),	2838	layout => (new CFPlus::Layout),
2570	par => [],	2839	par => [],
		2840	max_par => 0,
2571	height => 0,	2841	height => 0,
2572	children => [	2842	children => [
2573	(new CFClient::UI::Empty expand => 1),	2843	(new CFPlus::UI::Empty expand => 1),
2574	(new CFClient::UI::Slider vertical => 1),	2844	(new CFPlus::UI::Slider vertical => 1),
2575	],	2845	],
2576	);	2846	);
2577		2847
2578	$self->{children}[1]->connect (changed => sub { $self->update });	2848	$self->{children}[1]->connect (changed => sub { $self->update });
2579		2849
…		…
2609		2879
2610	$self->reflow;	2880	$self->reflow;
2611		2881
2612	local $self->{children} = [$empty, $slider];	2882	local $self->{children} = [$empty, $slider];
2613	$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
2614	}	2894	}
2615		2895
2616	sub get_layout {	2896	sub get_layout {
2617	my ($self, $para) = @_;	2897	my ($self, $para) = @_;
2618		2898
…		…
2646		2926
2647	# todo: base offset on lines or so, not on pixels	2927	# todo: base offset on lines or so, not on pixels
2648	$self->{children}[1]->set_value ($offset);	2928	$self->{children}[1]->set_value ($offset);
2649	}	2929	}
2650		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
2651	sub clear {	2946	sub clear {
2652	my ($self) = @_;	2947	my ($self) = @_;
2653		2948
2654	my (undef, undef, @other) = @{ $self->{children} };	2949	my (undef, undef, @other) = @{ $self->{children} };
2655	$self->remove ($_) for @other;	2950	$self->remove ($_) for @other;
…		…
2658	$self->{height} = 0;	2953	$self->{height} = 0;
2659	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2954	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2660	}	2955	}
2661		2956
2662	sub add_paragraph {	2957	sub add_paragraph {
2663	my ($self, $color, $para, $indent) = @_;	2958	my $self = shift;
2664		2959
2665	my ($text, @w) = ref $para ? @$para : $para;	2960	for my $para (@_) {
2666
2667	$para = {	2961	$para = {
		2962	fg => [1, 1, 1, 1],
		2963	indent => 0,
		2964	markup => "",
		2965	widget => [],
		2966	ref $para ? %$para : (markup => $para),
2668	w => 1e10,	2967	w => 1e10,
2669	wrapped => 1,	2968	wrapped => 1,
2670	fg => $color,
2671	indent => $indent,
2672	markup => $text,
2673	widget => \@w,
2674	};	2969	};
2675		2970
2676	$self->add (@w) if @w;	2971	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2677	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	}
2678		2978
2679	$self->{need_reflow}++;	2979	$self->{need_reflow}++;
2680	$self->update;	2980	$self->update;
2681	}	2981	}
2682		2982
2683	sub scroll_to_bottom {	2983	sub scroll_to_bottom {
2684	my ($self) = @_;	2984	my ($self) = @_;
2685		2985
2686	$self->{scroll_to_bottom} = 1;	2986	$self->{scroll_to} = $#{$self->{par}};
2687	$self->update;	2987	$self->update;
2688	}	2988	}
2689		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
2690	sub update {	3023	sub update {
2691	my ($self) = @_;	3024	my ($self) = @_;
2692		3025
2693	$self->SUPER::update;	3026	$self->SUPER::update;
2694		3027
2695	return unless $self->{h} > 0;	3028	return unless $self->{h} > 0;
2696		3029
2697	delete $self->{texture};	3030	delete $self->{texture};
2698		3031
2699	$ROOT->on_post_alloc ($self => sub {	3032	$ROOT->on_post_alloc ($self => sub {
		3033	$self->force_uptodate;
		3034
2700	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3035	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2701		3036
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 {	3037	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2730	glClearColor 0, 0, 0, 0;	3038	glClearColor 0, 0, 0, 0;
2731	glClear GL_COLOR_BUFFER_BIT;	3039	glClear GL_COLOR_BUFFER_BIT;
2732		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;
2733	my $top = int $self->{children}[1]{range}[0];	3049	my $top = int $self->{children}[1]{range}[0];
2734		3050
2735	my $y0 = $top;	3051	my $y0 = $top;
2736	my $y1 = $top + $H;	3052	my $y1 = $top + $H;
2737		3053
2738	my $y = 0;
2739
2740	for my $para (@{$self->{par}}) {	3054	for my $para (@{$self->{par}}) {
2741	my $h = $para->{h};	3055	my $h = $para->{h};
		3056	my $y = $para->{y};
2742		3057
2743	if ($y0 < $y + $h && $y < $y1) {	3058	if ($y0 < $y + $h && $y < $y1) {
2744
2745	my $layout = $self->get_layout ($para);	3059	my $layout = $self->get_layout ($para);
2746		3060
2747	$layout->render ($para->{indent}, $y - $y0);	3061	$layout->render ($para->{indent}, $y - $y0);
2748		3062
2749	if (my @w = @{ $para->{widget} }) {	3063	if (my @w = @{ $para->{widget} }) {
…		…
2758	$_->draw;	3072	$_->draw;
2759	}	3073	}
2760	}	3074	}
2761	}	3075	}
2762		3076
2763	$y += $h;	3077	$paridx++;
		3078	$top_paragraph ||= $paridx if $y >= $top;
2764	}	3079	}
		3080
		3081	$self->{top_paragraph} = $top_paragraph;
2765	};	3082	};
2766	});	3083	});
2767	}	3084	}
2768		3085
2769	sub reconfigure {	3086	sub reconfigure {
…		…
2787	$self->{children}[1]->draw;	3104	$self->{children}[1]->draw;
2788	}	3105	}
2789		3106
2790	#############################################################################	3107	#############################################################################
2791		3108
2792	package CFClient::UI::Animator;	3109	package CFPlus::UI::Animator;
2793		3110
2794	use CFClient::OpenGL;	3111	use CFPlus::OpenGL;
2795		3112
2796	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2797		3114
2798	sub moveto {	3115	sub moveto {
2799	my ($self, $x, $y) = @_;	3116	my ($self, $x, $y) = @_;
2800		3117
2801	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3118	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2829	glPopMatrix;	3146	glPopMatrix;
2830	}	3147	}
2831		3148
2832	#############################################################################	3149	#############################################################################
2833		3150
2834	package CFClient::UI::Flopper;	3151	package CFPlus::UI::Flopper;
2835		3152
2836	our @ISA = CFClient::UI::Button::;	3153	our @ISA = CFPlus::UI::Button::;
2837		3154
2838	sub new {	3155	sub new {
2839	my $class = shift;	3156	my $class = shift;
2840		3157
2841	my $self = $class->SUPER::new (	3158	my $self = $class->SUPER::new (
…		…
2853	$self->{other}->toggle_visibility;	3170	$self->{other}->toggle_visibility;
2854	}	3171	}
2855		3172
2856	#############################################################################	3173	#############################################################################
2857		3174
2858	package CFClient::UI::Tooltip;	3175	package CFPlus::UI::Tooltip;
2859		3176
2860	our @ISA = CFClient::UI::Bin::;	3177	our @ISA = CFPlus::UI::Bin::;
2861		3178
2862	use CFClient::OpenGL;	3179	use CFPlus::OpenGL;
2863		3180
2864	sub new {	3181	sub new {
2865	my $class = shift;	3182	my $class = shift;
2866		3183
2867	$class->SUPER::new (	3184	$class->SUPER::new (
…		…
2870	)	3187	)
2871	}	3188	}
2872		3189
2873	sub set_tooltip_from {	3190	sub set_tooltip_from {
2874	my ($self, $widget) = @_;	3191	my ($self, $widget) = @_;
		3192
		3193	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3194	if $widget->{tooltip} =~ /^#(.*)$/;
2875		3195
2876	my $tooltip = $widget->{tooltip};	3196	my $tooltip = $widget->{tooltip};
2877		3197
2878	if ($ENV{CFPLUS_DEBUG} & 2) {	3198	if ($ENV{CFPLUS_DEBUG} & 2) {
2879	$tooltip .= "\n\n" . (ref $widget) . "\n"	3199	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2883	}	3203	}
2884		3204
2885	$tooltip =~ s/^\n+//;	3205	$tooltip =~ s/^\n+//;
2886	$tooltip =~ s/\n+$//;	3206	$tooltip =~ s/\n+$//;
2887		3207
2888	$self->add (new CFClient::UI::Label	3208	$self->add (new CFPlus::UI::Label
2889	markup => $tooltip,	3209	markup => $tooltip,
2890	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3210	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891	fontsize => 0.8,	3211	fontsize => 0.8,
2892	fg => [0, 0, 0, 1],	3212	style => 1, # FLAG_INVERSE
2893	ellipsise => 0,	3213	ellipsise => 0,
2894	font => ($widget->{tooltip_font} || $::FONT_PROP),	3214	font => ($widget->{tooltip_font} || $::FONT_PROP),
2895	);	3215	);
2896	}	3216	}
2897		3217
…		…
2916		3236
2917	$self->{root}->on_post_alloc ("move_$self" => sub {	3237	$self->{root}->on_post_alloc ("move_$self" => sub {
2918	my $widget = $self->{owner}	3238	my $widget = $self->{owner}
2919	or return;	3239	or return;
2920		3240
		3241	if ($widget->{visible}) {
2921	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3242	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922		3243
2923	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3244	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924	if $x + $self->{w} > $self->{root}{w};	3245	if $x + $self->{w} > $self->{root}{w};
2925		3246
2926	$self->move_abs ($x, $y);	3247	$self->move_abs ($x, $y);
		3248	} else {
		3249	$self->hide;
		3250	}
2927	});	3251	});
2928	}	3252	}
2929		3253
2930	sub _draw {	3254	sub _draw {
2931	my ($self) = @_;	3255	my ($self) = @_;
…		…
2955	$self->SUPER::_draw;	3279	$self->SUPER::_draw;
2956	}	3280	}
2957		3281
2958	#############################################################################	3282	#############################################################################
2959		3283
2960	package CFClient::UI::Face;	3284	package CFPlus::UI::Face;
2961		3285
2962	our @ISA = CFClient::UI::Base::;	3286	our @ISA = CFPlus::UI::DrawBG::;
2963		3287
2964	use CFClient::OpenGL;	3288	use CFPlus::OpenGL;
2965		3289
2966	sub new {	3290	sub new {
2967	my $class = shift;	3291	my $class = shift;
2968		3292
2969	my $self = $class->SUPER::new (	3293	my $self = $class->SUPER::new (
…		…
2971	can_events => 0,	3295	can_events => 0,
2972	@_,	3296	@_,
2973	);	3297	);
2974		3298
2975	if ($self->{anim} && $self->{animspeed}) {	3299	if ($self->{anim} && $self->{animspeed}) {
2976	Scalar::Util::weaken (my $widget = $self);	3300	CFPlus::weaken (my $widget = $self);
2977		3301
2978	$self->{timer} = Event->timer (	3302	$self->{timer} = Event->timer (
2979	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3303	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980	hard => 1,	3304	hard => 1,
2981	interval => $self->{animspeed},	3305	interval => $self->{animspeed},
…		…
3004	sub _draw {	3328	sub _draw {
3005	my ($self) = @_;	3329	my ($self) = @_;
3006		3330
3007	return unless $::CONN;	3331	return unless $::CONN;
3008		3332
		3333	$self->SUPER::_draw;
		3334
3009	my $face;	3335	my $face;
3010		3336
3011	if ($self->{frame}) {	3337	if ($self->{frame}) {
3012	my $anim = $::CONN->{anim}[$self->{anim}];	3338	my $anim = $::CONN->{anim}[$self->{anim}];
3013		3339
…		…
3035	$self->SUPER::destroy;	3361	$self->SUPER::destroy;
3036	}	3362	}
3037		3363
3038	#############################################################################	3364	#############################################################################
3039		3365
3040	package CFClient::UI::Buttonbar;	3366	package CFPlus::UI::Buttonbar;
3041		3367
3042	our @ISA = CFClient::UI::HBox::;	3368	our @ISA = CFPlus::UI::HBox::;
3043		3369
3044	# TODO: should actualyl wrap buttons and other goodies.	3370	# TODO: should actually wrap buttons and other goodies.
3045		3371
3046	#############################################################################	3372	#############################################################################
3047		3373
3048	package CFClient::UI::Menu;	3374	package CFPlus::UI::Menu;
3049		3375
3050	our @ISA = CFClient::UI::FancyFrame::;	3376	our @ISA = CFPlus::UI::Toplevel::;
3051		3377
3052	use CFClient::OpenGL;	3378	use CFPlus::OpenGL;
3053		3379
3054	sub new {	3380	sub new {
3055	my $class = shift;	3381	my $class = shift;
3056		3382
3057	my $self = $class->SUPER::new (	3383	my $self = $class->SUPER::new (
3058	items => [],	3384	items => [],
3059	z => 100,	3385	z => 100,
3060	@_,	3386	@_,
3061	);	3387	);
3062		3388
3063	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3389	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064		3390
3065	for my $item (@{ $self->{items} }) {	3391	for my $item (@{ $self->{items} }) {
3066	my ($widget, $cb, $tooltip) = @$item;	3392	my ($widget, $cb, $tooltip) = @$item;
3067		3393
3068	# handle various types of items, only text for now	3394	# handle various types of items, only text for now
3069	if (!ref $widget) {	3395	if (!ref $widget) {
3070	if ($widget =~ /\t/) {	3396	if ($widget =~ /\t/) {
3071	my ($left, $right) = split /\t/, $widget, 2;	3397	my ($left, $right) = split /\t/, $widget, 2;
3072		3398
3073	$widget = new CFClient::UI::HBox	3399	$widget = new CFPlus::UI::HBox
3074	can_hover => 1,	3400	can_hover => 1,
3075	can_events => 1,	3401	can_events => 1,
3076	tooltip => $tooltip,	3402	tooltip => $tooltip,
3077	children => [	3403	children => [
3078	(new CFClient::UI::Label markup => $left, expand => 1),	3404	(new CFPlus::UI::Label markup => $left, expand => 1),
3079	(new CFClient::UI::Label markup => $right, align => +1),	3405	(new CFPlus::UI::Label markup => $right, align => +1),
3080	],	3406	],
3081	;	3407	;
3082		3408
3083	} else {	3409	} else {
3084	$widget = new CFClient::UI::Label	3410	$widget = new CFPlus::UI::Label
3085	can_hover => 1,	3411	can_hover => 1,
3086	can_events => 1,	3412	can_events => 1,
3087	markup => $widget,	3413	markup => $widget,
3088	tooltip => $tooltip;	3414	tooltip => $tooltip;
3089	}	3415	}
…		…
3137	1	3463	1
3138	}	3464	}
3139		3465
3140	#############################################################################	3466	#############################################################################
3141		3467
3142	package CFClient::UI::Multiplexer;	3468	package CFPlus::UI::Multiplexer;
3143		3469
3144	our @ISA = CFClient::UI::Container::;	3470	our @ISA = CFPlus::UI::Container::;
3145		3471
3146	sub new {	3472	sub new {
3147	my $class = shift;	3473	my $class = shift;
3148		3474
3149	my $self = $class->SUPER::new (	3475	my $self = $class->SUPER::new (
…		…
3210	$self->{current}->draw;	3536	$self->{current}->draw;
3211	}	3537	}
3212		3538
3213	#############################################################################	3539	#############################################################################
3214		3540
3215	package CFClient::UI::Notebook;	3541	package CFPlus::UI::Notebook;
3216		3542
3217	our @ISA = CFClient::UI::VBox::;	3543	our @ISA = CFPlus::UI::VBox::;
3218		3544
3219	sub new {	3545	sub new {
3220	my $class = shift;	3546	my $class = shift;
3221		3547
3222	my $self = $class->SUPER::new (	3548	my $self = $class->SUPER::new (
3223	buttonbar => (new CFClient::UI::Buttonbar),	3549	buttonbar => (new CFPlus::UI::Buttonbar),
3224	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3550	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3225	# filter => # will be put between multiplexer and $self	3551	# filter => # will be put between multiplexer and $self
3226	@_,	3552	@_,
3227	);	3553	);
3228		3554
3229	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3555	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3233	}	3559	}
3234		3560
3235	sub add {	3561	sub add {
3236	my ($self, $title, $widget, $tooltip) = @_;	3562	my ($self, $title, $widget, $tooltip) = @_;
3237		3563
3238	Scalar::Util::weaken $self;	3564	CFPlus::weaken $self;
3239		3565
3240	$self->{buttonbar}->add (new CFClient::UI::Button	3566	$self->{buttonbar}->add (new CFPlus::UI::Button
3241	markup => $title,	3567	markup => $title,
3242	tooltip => $tooltip,	3568	tooltip => $tooltip,
3243	on_activate => sub { $self->set_current_page ($widget) },	3569	on_activate => sub { $self->set_current_page ($widget) },
3244	);	3570	);
3245		3571
…		…
3259	$self->emit (page_changed => $self->{multiplexer}{current});	3585	$self->emit (page_changed => $self->{multiplexer}{current});
3260	}	3586	}
3261		3587
3262	#############################################################################	3588	#############################################################################
3263		3589
3264	package CFClient::UI::Combobox;	3590	package CFPlus::UI::Selector;
3265		3591
3266	use utf8;	3592	use utf8;
3267		3593
3268	our @ISA = CFClient::UI::Button::;	3594	our @ISA = CFPlus::UI::Button::;
3269		3595
3270	sub new {	3596	sub new {
3271	my $class = shift;	3597	my $class = shift;
3272		3598
3273	my $self = $class->SUPER::new (	3599	my $self = $class->SUPER::new (
…		…
3290	my ($value, $title, $tooltip) = @$_;	3616	my ($value, $title, $tooltip) = @$_;
3291		3617
3292	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3618	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293	}	3619	}
3294		3620
3295	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3621	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296	}	3622	}
3297		3623
3298	sub _set_value {	3624	sub _set_value {
3299	my ($self, $value) = @_;	3625	my ($self, $value) = @_;
3300		3626
…		…
3315	$self->emit (changed => $value);	3641	$self->emit (changed => $value);
3316	}	3642	}
3317		3643
3318	#############################################################################	3644	#############################################################################
3319		3645
3320	package CFClient::UI::Statusbox;	3646	package CFPlus::UI::Statusbox;
3321		3647
3322	our @ISA = CFClient::UI::VBox::;	3648	our @ISA = CFPlus::UI::VBox::;
3323		3649
3324	sub new {	3650	sub new {
3325	my $class = shift;	3651	my $class = shift;
3326		3652
3327	my $self = $class->SUPER::new (	3653	my $self = $class->SUPER::new (
3328	fontsize => 0.8,	3654	fontsize => 0.8,
3329	@_,	3655	@_,
3330	);	3656	);
3331		3657
3332	Scalar::Util::weaken (my $this = $self);	3658	CFPlus::weaken (my $this = $self);
3333		3659
3334	$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 });
3335		3661
3336	$self	3662	$self
3337	}	3663	}
…		…
3339	sub reorder {	3665	sub reorder {
3340	my ($self) = @_;	3666	my ($self) = @_;
3341	my $NOW = Time::HiRes::time;	3667	my $NOW = Time::HiRes::time;
3342		3668
3343	# freeze display when hovering over any label	3669	# freeze display when hovering over any label
3344	return if $CFClient::UI::TOOLTIP->{owner}	3670	return if $CFPlus::UI::TOOLTIP->{owner}
3345	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3671	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3346	values %{ $self->{item} };	3672	values %{ $self->{item} };
3347		3673
3348	while (my ($k, $v) = each %{ $self->{item} }) {	3674	while (my ($k, $v) = each %{ $self->{item} }) {
3349	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3675	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3350	}	3676	}
…		…
3371	for ($short) {	3697	for ($short) {
3372	s/^\s+//;	3698	s/^\s+//;
3373	s/\s+/ /g;	3699	s/\s+/ /g;
3374	}	3700	}
3375		3701
3376	new CFClient::UI::Label	3702	new CFPlus::UI::Label
3377	markup => $short,	3703	markup => $short,
3378	tooltip => $item->{tooltip},	3704	tooltip => $item->{tooltip},
3379	tooltip_font => $::FONT_PROP,	3705	tooltip_font => $::FONT_PROP,
3380	tooltip_width => 0.67,	3706	tooltip_width => 0.67,
3381	fontsize => $item->{fontsize} || $self->{fontsize},	3707	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3460	$self->SUPER::destroy;	3786	$self->SUPER::destroy;
3461	}	3787	}
3462		3788
3463	#############################################################################	3789	#############################################################################
3464		3790
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;	3791	package CFPlus::UI::Root;
3630		3792
3631	our @ISA = CFClient::UI::Container::;	3793	our @ISA = CFPlus::UI::Container::;
3632		3794
3633	use List::Util qw(min max);	3795	use List::Util qw(min max);
3634		3796
3635	use CFClient::OpenGL;	3797	use CFPlus::OpenGL;
3636		3798
3637	sub new {	3799	sub new {
3638	my $class = shift;	3800	my $class = shift;
3639		3801
3640	my $self = $class->SUPER::new (	3802	my $self = $class->SUPER::new (
3641	visible => 1,	3803	visible => 1,
3642	@_,	3804	@_,
3643	);	3805	);
3644		3806
3645	Scalar::Util::weaken ($self->{root} = $self);	3807	CFPlus::weaken ($self->{root} = $self);
3646		3808
3647	$self	3809	$self
3648	}	3810	}
3649		3811
3650	sub size_request {	3812	sub size_request {
…		…
3816	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3978	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3817		3979
3818	$w = 0 if $w < 0;	3980	$w = 0 if $w < 0;
3819	$h = 0 if $h < 0;	3981	$h = 0 if $h < 0;
3820		3982
		3983	$w = max $widget->{min_w}, $w;
		3984	$h = max $widget->{min_h}, $h;
		3985
		3986	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3987	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3988
		3989	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3990	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3991
3821	$w = int $w + 0.5;	3992	$w = int $w + 0.5;
3822	$h = int $h + 0.5;	3993	$h = int $h + 0.5;
3823		3994
3824	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3995	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3825	$widget->{old_w} = $widget->{w};	3996	$widget->{old_w} = $widget->{w};
…		…
3848	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4019	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3849	glMatrixMode GL_MODELVIEW;	4020	glMatrixMode GL_MODELVIEW;
3850	glLoadIdentity;	4021	glLoadIdentity;
3851		4022
3852	{	4023	{
3853	package CFClient::UI::Base;	4024	package CFPlus::UI::Base;
3854		4025
3855	($draw_x, $draw_y, $draw_w, $draw_h) =	4026	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3856	(0, 0, $self->{w}, $self->{h});	4027	(0, 0, $self->{w}, $self->{h});
3857	}
3858		4028
3859	$self->_draw;	4029	$self->_draw;
		4030	}
3860	}	4031	}
3861		4032
3862	#############################################################################	4033	#############################################################################
3863		4034
3864	package CFClient::UI;	4035	package CFPlus::UI;
3865		4036
3866	$ROOT = new CFClient::UI::Root;	4037	$ROOT = new CFPlus::UI::Root;
3867	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4038	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3868		4039
3869	1	4040	1
3870		4041

Diff Legend

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