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.320 by root, Tue Jul 4 23:23:32 2006 UTC vs.
Revision 1.369 by root, Sun Jul 15 20:25:26 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
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
247	sub show {	277	sub show {
248	my ($self) = @_;	278	my ($self) = @_;
249		279
250	return if $self->{parent};	280	return if $self->{parent};
251		281
252	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
253	}	283	}
254		284
255	sub set_visible {	285	sub set_visible {
256	my ($self) = @_;	286	my ($self) = @_;
257		287
…		…
278	delete $self->{root};	308	delete $self->{root};
279		309
280	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
282		312
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
285		315
286	$self->emit ("focus_out");	316	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
288	}	318	}
…		…
290	sub set_visibility {	320	sub set_visibility {
291	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
292		322
293	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
294		324
295	$visible ? $self->hide	325	$visible ? $self->show
296	: $self->show;	326	: $self->hide;
297	}	327	}
298		328
299	sub toggle_visibility {	329	sub toggle_visibility {
300	my ($self) = @_;	330	my ($self) = @_;
301		331
…		…
345	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
346		376
347	if ($self->{aspect}) {	377	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
349		379
350	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		382
353	# use alignment to adjust x, y	383	# use alignment to adjust x, y
354		384
355	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
397		427
398	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
399		429
400	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
401		431
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	435	}
406	}	436	}
407		437
408	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
409	sub coord2local {	439	sub coord2local {
410	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
411		441
		442	Carp::confess unless $self->{parent};#d#
		443
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	445	}
414		446
415	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
416	sub coord2global {	448	sub coord2global {
417	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
418		450
		451	Carp::confess unless $self->{parent};#d#
		452
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	454	}
421		455
422	sub invoke_focus_in {	456	sub invoke_focus_in {
423	my ($self) = @_;	457	my ($self) = @_;
…		…
452		486
453	$FOCUS->emit ("focus_out") if $FOCUS;	487	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	488	$self->emit ("focus_in");
455	}	489	}
456		490
457	sub invoke_mouse_motion { 1 }	491	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	492	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	493	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
461		496
462	sub invoke_button_down {	497	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
464		499
465	$self->grab_focus;	500	$self->grab_focus;
466		501
467	1	502	0
468	}	503	}
469		504
470	sub connect {	505	sub connect {
471	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
472		507
473	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
		509
		510	defined wantarray and CFPlus::guard {
		511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		512	@{ $self->{signal_cb}{$signal} };
		513	}
474	}	514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
		520	}
		521
		522	my %has_coords = (
		523	button_down => 1,
		524	button_up => 1,
		525	mouse_motion => 1,
		526	mouse_wheel => 1,
		527	);
475		528
476	sub emit {	529	sub emit {
477	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
478		531
479	#d##TODO# stop propagating at first true, do not use sum	532	# 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	533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
		539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		540
		541	for my $cb (
		542	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	550	}
484		551
485	sub find_widget {	552	sub find_widget {
486	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
487		554
…		…
495	}	562	}
496		563
497	sub set_parent {	564	sub set_parent {
498	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
499		566
500	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
502	}	569	}
503		570
504	sub realloc {	571	sub realloc {
505	my ($self) = @_;	572	my ($self) = @_;
…		…
571	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
574	glEnd;	641	glEnd;
575	glPopMatrix;	642	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}	644	}
578		645
579	$self->_draw;	646	$self->_draw;
580	glPopMatrix;	647	glPopMatrix;
581	}	648	}
…		…
584	my ($self) = @_;	651	my ($self) = @_;
585		652
586	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
587	}	654	}
588		655
		656	my $cntx;#d#
589	sub DESTROY {	657	sub DESTROY {
590	my ($self) = @_;	658	my ($self) = @_;
591		659
592	delete $WIDGET{$self+0};	660	return if CFPlus::in_destruct;
593		661
594	eval { $self->destroy };	662	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
		665	delete $WIDGET{$self+0};
596	}	666	}
597		667
598	#############################################################################	668	#############################################################################
599		669
600	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
601		671
602	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
603		673
604	use strict;	674	use strict;
605	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
606		676
607	sub new {	677	sub new {
608	my $class = shift;	678	my $class = shift;
609		679
610	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
641	}	711	}
642	}	712	}
643		713
644	#############################################################################	714	#############################################################################
645		715
646	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
647		717
648	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
649		719
650	sub new {	720	sub new {
651	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
653	}	723	}
…		…
660		730
661	sub draw { }	731	sub draw { }
662		732
663	#############################################################################	733	#############################################################################
664		734
665	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
666		736
667	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
668		738
669	sub new {	739	sub new {
670	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
671		741
672	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
681	if $children;	751	if $children;
682		752
683	$self	753	$self
684	}	754	}
685		755
		756	sub realloc {
		757	my ($self) = @_;
		758
		759	$self->{force_realloc} = 1;
		760	$self->{force_size_alloc} = 1;
		761	$self->SUPER::realloc;
		762	}
		763
686	sub add {	764	sub add {
687	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
688		766
689	$_->set_parent ($self)	767	$_->set_parent ($self)
690	for @widgets;	768	for @widgets;
…		…
750	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
751	}	829	}
752		830
753	#############################################################################	831	#############################################################################
754		832
755	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
756		834
757	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
758		836
759	sub new {	837	sub new {
760	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
761		839
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		841
764	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
765	}	843	}
766		844
767	sub add {	845	sub add {
…		…
774	sub remove {	852	sub remove {
775	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
776		854
777	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
778		856
779	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	858	unless @{$self->{children}};
781	}	859	}
782		860
783	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
784		862
…		…
796		874
797	#############################################################################	875	#############################################################################
798		876
799	# back-buffered drawing area	877	# back-buffered drawing area
800		878
801	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
802		880
803	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
804		882
805	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
806		884
807	sub new {	885	sub new {
808	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
809		887
810	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
832	}	910	}
833		911
834	sub render_child {	912	sub render_child {
835	my ($self) = @_;	913	my ($self) = @_;
836		914
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	915	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
840		918
841	{	919	{
842	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
843		921
844	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
846	}	926	}
847
848	$self->_render;
849	};	927	};
850	}	928	}
851		929
852	sub _draw {	930	sub _draw {
853	my ($self) = @_;	931	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		932
857	my $tex = $self->{texture}	933	my $tex = $self->{texture}
858	or return;	934	or return;
859		935
860	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
863		939
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
865		941
866	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
867	}	943	}
868		944
869	#############################################################################	945	#############################################################################
870		946
871	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
872		948
873	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
874		950
875	sub new {	951	sub new {
876	my $class = shift;	952	my $class = shift;
877		953
878	$class->SUPER::new (	954	$class->SUPER::new (
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1016	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1018	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1020	}
945	}	1021	}
946		1022
947	sub _render {	1023	sub _render {
948	my ($self) = @_;	1024	my ($self) = @_;
949		1025
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1026	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1027	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1028
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1030
955	$self->SUPER::_render;	1031	$self->SUPER::_render;
956	}	1032	}
957		1033
958	#############################################################################	1034	#############################################################################
959		1035
960	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
961		1037
962	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::Table::;
963		1039
964	sub new {	1040	sub new {
965	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
966		1042
967	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
968		1044
969	my $self;	1045	my $self;
970		1046
971	my $slider = new CFClient::UI::Slider	1047	my $hslider = new CFPlus::UI::Slider
		1048	vertical => 0,
		1049	range => [0, 0, 1, 0.01], # HACK fix
		1050	on_changed => sub {
		1051	$self->{hpos} = $_[1];
		1052	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1053	},
		1054	;
		1055
		1056	my $vslider = new CFPlus::UI::Slider
972	vertical => 1,	1057	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1058	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1059	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1060	$self->{vpos} = $_[1];
		1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1062	},
977	;	1063	;
978		1064
979	$self = $class->SUPER::new (	1065	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1066	vp => (new CFPlus::UI::ViewPort expand => 1),
		1067	can_events => 1,
981	slider => $slider,	1068	hslider => $hslider,
		1069	vslider => $vslider,
		1070	col_expand => [1, 0],
		1071	row_expand => [1, 0],
982	%arg,	1072	%arg,
983	);	1073	);
984		1074
		1075	$self->SUPER::add (0, 0, $self->{vp});
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1076	$self->SUPER::add (1, 0, $self->{vslider});
		1077	$self->SUPER::add (0, 1, $self->{hslider});
		1078
986	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
987		1080
988	$self	1081	$self
989	}	1082	}
990		1083
…		…
994	my ($self, $widget) = @_;	1087	my ($self, $widget) = @_;
995		1088
996	$self->{vp}->add ($self->{child} = $widget);	1089	$self->{vp}->add ($self->{child} = $widget);
997	}	1090	}
998		1091
		1092	sub invoke_mouse_wheel {
		1093	my ($self, $ev) = @_;
		1094
		1095	return 0 unless $ev->{dy}; # only vertical movements
		1096
		1097	$self->{vslider}->emit (mouse_wheel => $ev);
		1098
		1099	1
		1100	}
		1101
999	sub update_slider {	1102	sub update_slider {
1000	my ($self) = @_;	1103	my ($self) = @_;
1001		1104
		1105	my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1107	#$self->{hslider}->set_visibility ($w1 != $w2);
		1108
		1109	my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
		1110	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1111	#$self->{vslider}->set_visibility ($h1 != $h2);
1003	}	1112	}
1004		1113
1005	sub update {	1114	sub update {
1006	my ($self) = @_;	1115	my ($self) = @_;
1007		1116
…		…
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1127	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1128	}
1020		1129
1021	#############################################################################	1130	#############################################################################
1022		1131
1023	package CFClient::UI::Frame;	1132	package CFPlus::UI::Frame;
1024		1133
1025	our @ISA = CFClient::UI::Bin::;	1134	our @ISA = CFPlus::UI::Bin::;
1026		1135
1027	use CFClient::OpenGL;	1136	use CFPlus::OpenGL;
1028		1137
1029	sub new {	1138	sub new {
1030	my $class = shift;	1139	my $class = shift;
1031		1140
1032	$class->SUPER::new (	1141	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1167	$self->SUPER::_draw;
1059	}	1168	}
1060		1169
1061	#############################################################################	1170	#############################################################################
1062		1171
1063	package CFClient::UI::FancyFrame;	1172	package CFPlus::UI::FancyFrame;
1064		1173
1065	our @ISA = CFClient::UI::Bin::;	1174	our @ISA = CFPlus::UI::Bin::;
1066		1175
1067	use CFClient::OpenGL;	1176	use CFPlus::OpenGL;
		1177
		1178	sub new {
		1179	my ($class, %arg) = @_;
		1180
		1181	if ((exists $arg{label}) && !ref $arg{label}) {
		1182	$arg{label} = new CFPlus::UI::Label
		1183	align => 1,
		1184	valign => 0,
		1185	text => $arg{label},
		1186	fontsize => ($arg{border} || 0.8) * 0.75;
		1187	}
		1188
		1189	my $self = $class->SUPER::new (
		1190	# label => "",
		1191	fg => [0.6, 0.3, 0.1],
		1192	border => 0.8,
		1193	style => 'single',
		1194	%arg,
		1195	);
		1196
		1197	$self
		1198	}
		1199
		1200	sub add {
		1201	my ($self, @widgets) = @_;
		1202
		1203	$self->SUPER::add (@widgets);
		1204	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1205	}
		1206
		1207	sub border {
		1208	int $_[0]{border} * $::FONTSIZE
		1209	}
		1210
		1211	sub size_request {
		1212	my ($self) = @_;
		1213
		1214	($self->{label_w}, undef) = $self->{label}->size_request
		1215	if $self->{label};
		1216
		1217	my ($w, $h) = $self->SUPER::size_request;
		1218
		1219	(
		1220	$w + $self->border * 2,
		1221	$h + $self->border * 2,
		1222	)
		1223	}
		1224
		1225	sub invoke_size_allocate {
		1226	my ($self, $w, $h) = @_;
		1227
		1228	my $border = $self->border;
		1229
		1230	$w -= List::Util::max 0, $border * 2;
		1231	$h -= List::Util::max 0, $border * 2;
		1232
		1233	if (my $label = $self->{label}) {
		1234	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1235	$label->{h} = List::Util::min $h, $border;
		1236	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1237	}
		1238
		1239	$self->child->configure ($border, $border, $w, $h);
		1240
		1241	1
		1242	}
		1243
		1244	sub _draw {
		1245	my ($self) = @_;
		1246
		1247	my $child = $self->{children}[0];
		1248
		1249	my $border = $self->border;
		1250	my ($w, $h) = ($self->{w}, $self->{h});
		1251
		1252	$child->draw;
		1253
		1254	glColor @{$self->{fg}};
		1255	glBegin GL_LINE_STRIP;
		1256	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1257	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1258	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1259	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1260	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1261	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1262	glEnd;
		1263
		1264	if ($self->{label}) {
		1265	glTranslate $border * 2, 0;
		1266	$self->{label}->_draw;
		1267	}
		1268	}
		1269
		1270	#############################################################################
		1271
		1272	package CFPlus::UI::Toplevel;
		1273
		1274	our @ISA = CFPlus::UI::Bin::;
		1275
		1276	use CFPlus::OpenGL;
1068		1277
1069	my $bg =	1278	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1279	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1280	mipmap => 1, wrap => 1;
1072		1281
1073	my @border =	1282	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1283	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1284	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1285
1077	sub new {	1286	sub new {
1078	my ($class, %arg) = @_;	1287	my ($class, %arg) = @_;
1079		1288
1080	my $self = $class->SUPER::new (	1289	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1290	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1291	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1292	border => 0.6,
1084	can_events => 1,	1293	can_events => 1,
1085	min_w => 16,	1294	min_w => 64,
1086	min_h => 16,	1295	min_h => 32,
1087	%arg,	1296	%arg,
1088	);	1297	);
1089		1298
1090	$self->{title_widget} = new CFClient::UI::Label	1299	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1300	align => 0,
1092	valign => 1,	1301	valign => 1,
1093	text => $self->{title},	1302	text => $self->{title},
1094	fontsize => $self->{border},	1303	fontsize => $self->{border},
1095	if exists $self->{title};	1304	if exists $self->{title};
1096		1305
1097	if ($self->{has_close_button}) {	1306	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1307	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1308	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1309	path => 'x1_close.png',
1101	on_activate => sub { $self->emit ("delete") };	1310	on_activate => sub { $self->emit ("delete") };
1102		1311
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1312	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1313	}
1105		1314
1106	$self	1315	$self
1107	}	1316	}
1108		1317
1109	sub add {	1318	sub add {
1110	my ($self, @widgets) = @_;	1319	my ($self, @widgets) = @_;
1111		1320
1112	$self->SUPER::add (@widgets);	1321	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1322	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1323	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1324	}
1116		1325
1117	sub border {	1326	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1327	int $_[0]{border} * $::FONTSIZE
1119	}	1328	}
…		…
1227	$self->{motion}->($ev, $x, $y) if $self->{motion};	1436	$self->{motion}->($ev, $x, $y) if $self->{motion};
1228		1437
1229	! ! $self->{motion}	1438	! ! $self->{motion}
1230	}	1439	}
1231		1440
		1441	sub invoke_visibility_change {
		1442	my ($self, $visible) = @_;
		1443
		1444	delete $self->{motion} unless $visible;
		1445
		1446	0
		1447	}
		1448
1232	sub _draw {	1449	sub _draw {
1233	my ($self) = @_;	1450	my ($self) = @_;
1234		1451
1235	my $child = $self->{children}[0];	1452	my $child = $self->{children}[0];
1236		1453
…		…
1273	if $self->{close_button};	1490	if $self->{close_button};
1274	}	1491	}
1275		1492
1276	#############################################################################	1493	#############################################################################
1277		1494
1278	package CFClient::UI::Table;	1495	package CFPlus::UI::Table;
1279		1496
1280	our @ISA = CFClient::UI::Base::;	1497	our @ISA = CFPlus::UI::Base::;
1281		1498
1282	use List::Util qw(max sum);	1499	use List::Util qw(max sum);
1283		1500
1284	use CFClient::OpenGL;	1501	use CFPlus::OpenGL;
1285		1502
1286	sub new {	1503	sub new {
1287	my $class = shift;	1504	my $class = shift;
1288		1505
1289	$class->SUPER::new (	1506	$class->SUPER::new (
1290	col_expand => [],	1507	col_expand => [],
		1508	row_expand => [],
1291	@_,	1509	@_,
1292	)	1510	)
1293	}	1511	}
1294		1512
1295	sub children {	1513	sub children {
1296	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1514	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297	}	1515	}
1298		1516
1299	sub add {	1517	sub add {
1300	my ($self, $x, $y, $child) = @_;	1518	my ($self) = shift;
1301		1519
		1520	while (@_) {
		1521	my ($x, $y, $child) = splice @_, 0, 3, ();
1302	$child->set_parent ($self);	1522	$child->set_parent ($self);
1303	$self->{children}[$y][$x] = $child;	1523	$self->{children}[$y][$x] = $child;
		1524	}
1304		1525
		1526	$self->{force_realloc} = 1;
		1527	$self->{force_size_alloc} = 1;
1305	$self->realloc;	1528	$self->realloc;
1306	}	1529	}
1307		1530
1308	sub remove {	1531	sub remove {
1309	my ($self, $child) = @_;	1532	my ($self, $child) = @_;
…		…
1365	my ($ws, $hs) = $self->get_wh;	1588	my ($ws, $hs) = $self->get_wh;
1366		1589
1367	my $req_w = (sum @$ws) || 1;	1590	my $req_w = (sum @$ws) || 1;
1368	my $req_h = (sum @$hs) || 1;	1591	my $req_h = (sum @$hs) || 1;
1369		1592
1370	# TODO: nicer code && do row_expand	1593	# TODO: nicer code
1371	my @col_expand = @{$self->{col_expand}};	1594	my @col_expand = @{$self->{col_expand}};
1372	@col_expand = (1) x @$ws unless @col_expand;	1595	@col_expand = (1) x @$ws unless @col_expand;
1373	my $col_expand = (sum @col_expand) || 1;	1596	my $col_expand = (sum @col_expand) || 1;
1374		1597
1375	# linearly scale sizes
1376	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1598	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378		1599
1379	CFClient::UI::harmonize $ws;	1600	CFPlus::UI::harmonize $ws;
		1601
		1602	my @row_expand = @{$self->{row_expand}};
		1603	@row_expand = (1) x @$ws unless @row_expand;
		1604	my $row_expand = (sum @row_expand) || 1;
		1605
		1606	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1607
1380	CFClient::UI::harmonize $hs;	1608	CFPlus::UI::harmonize $hs;
1381		1609
1382	my $y;	1610	my $y;
1383		1611
1384	for my $r (0 .. $#{$self->{children}}) {	1612	for my $r (0 .. $#{$self->{children}}) {
1385	my $row = $self->{children}[$r]	1613	my $row = $self->{children}[$r]
…		…
1428	}	1656	}
1429	}	1657	}
1430		1658
1431	#############################################################################	1659	#############################################################################
1432		1660
1433	package CFClient::UI::Box;	1661	package CFPlus::UI::Box;
1434		1662
1435	our @ISA = CFClient::UI::Container::;	1663	our @ISA = CFPlus::UI::Container::;
1436		1664
1437	sub size_request {	1665	sub size_request {
1438	my ($self) = @_;	1666	my ($self) = @_;
1439		1667
1440	$self->{vertical}	1668	$self->{vertical}
…		…
1473	$req[$_] += $space * $children[$_]{expand}	1701	$req[$_] += $space * $children[$_]{expand}
1474	for 0 .. $#children;	1702	for 0 .. $#children;
1475	}	1703	}
1476	}	1704	}
1477		1705
1478	CFClient::UI::harmonize \@req;	1706	CFPlus::UI::harmonize \@req;
1479		1707
1480	my $pos = 0;	1708	my $pos = 0;
1481	for (0 .. $#children) {	1709	for (0 .. $#children) {
1482	my $alloc = $req[$_];	1710	my $alloc = $req[$_];
1483	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1711	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1488	1	1716	1
1489	}	1717	}
1490		1718
1491	#############################################################################	1719	#############################################################################
1492		1720
1493	package CFClient::UI::HBox;	1721	package CFPlus::UI::HBox;
1494		1722
1495	our @ISA = CFClient::UI::Box::;	1723	our @ISA = CFPlus::UI::Box::;
1496		1724
1497	sub new {	1725	sub new {
1498	my $class = shift;	1726	my $class = shift;
1499		1727
1500	$class->SUPER::new (	1728	$class->SUPER::new (
…		…
1503	)	1731	)
1504	}	1732	}
1505		1733
1506	#############################################################################	1734	#############################################################################
1507		1735
1508	package CFClient::UI::VBox;	1736	package CFPlus::UI::VBox;
1509		1737
1510	our @ISA = CFClient::UI::Box::;	1738	our @ISA = CFPlus::UI::Box::;
1511		1739
1512	sub new {	1740	sub new {
1513	my $class = shift;	1741	my $class = shift;
1514		1742
1515	$class->SUPER::new (	1743	$class->SUPER::new (
…		…
1518	)	1746	)
1519	}	1747	}
1520		1748
1521	#############################################################################	1749	#############################################################################
1522		1750
1523	package CFClient::UI::Label;	1751	package CFPlus::UI::Label;
1524		1752
1525	our @ISA = CFClient::UI::DrawBG::;	1753	our @ISA = CFPlus::UI::DrawBG::;
1526		1754
1527	use CFClient::OpenGL;	1755	use CFPlus::OpenGL;
1528		1756
1529	sub new {	1757	sub new {
1530	my ($class, %arg) = @_;	1758	my ($class, %arg) = @_;
1531		1759
1532	my $self = $class->SUPER::new (	1760	my $self = $class->SUPER::new (
…		…
1535	#active_bg => none	1763	#active_bg => none
1536	#font => default_font	1764	#font => default_font
1537	#text => initial text	1765	#text => initial text
1538	#markup => initial narkup	1766	#markup => initial narkup
1539	#max_w => maximum pixel width	1767	#max_w => maximum pixel width
		1768	#style => 0, # render flags
1540	ellipsise => 3, # end	1769	ellipsise => 3, # end
1541	layout => (new CFClient::Layout 2),	1770	layout => (new CFPlus::Layout),
1542	fontsize => 1,	1771	fontsize => 1,
1543	align => -1,	1772	align => -1,
1544	valign => -1,	1773	valign => -1,
1545	padding_x => 2,	1774	padding_x => 2,
1546	padding_y => 2,	1775	padding_y => 2,
1547	can_events => 0,	1776	can_events => 0,
1548	%arg	1777	%arg
1549	);	1778	);
1550		1779
1551	if (exists $self->{template}) {	1780	if (exists $self->{template}) {
1552	my $layout = new CFClient::Layout 2;	1781	my $layout = new CFPlus::Layout;
1553	$layout->set_text (delete $self->{template});	1782	$layout->set_text (delete $self->{template});
1554	$self->{template} = $layout;	1783	$self->{template} = $layout;
1555	}	1784	}
1556		1785
1557	if (exists $self->{markup}) {	1786	if (exists $self->{markup}) {
…		…
1559	} else {	1788	} else {
1560	$self->set_text (delete $self->{text});	1789	$self->set_text (delete $self->{text});
1561	}	1790	}
1562		1791
1563	$self	1792	$self
1564	}
1565
1566	sub escape($) {
1567	local $_ = $_[0];
1568
1569	s/&/&amp;/g;
1570	s/>/&gt;/g;
1571	s/</&lt;/g;
1572
1573	$_
1574	}	1793	}
1575		1794
1576	sub update {	1795	sub update {
1577	my ($self) = @_;	1796	my ($self) = @_;
1578		1797
…		…
1627		1846
1628	my ($w, $h) = $self->{layout}->size;	1847	my ($w, $h) = $self->{layout}->size;
1629		1848
1630	if (exists $self->{template}) {	1849	if (exists $self->{template}) {
1631	$self->{template}->set_font ($self->{font}) if $self->{font};	1850	$self->{template}->set_font ($self->{font}) if $self->{font};
		1851	$self->{template}->set_width ($self->{max_w} || -1);
1632	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1852	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1633		1853
1634	my ($w2, $h2) = $self->{template}->size;	1854	my ($w2, $h2) = $self->{template}->size;
1635		1855
1636	$w = List::Util::max $w, $w2;	1856	$w = List::Util::max $w, $w2;
…		…
1688	$self->{layout}->set_width ($self->{w});	1908	$self->{layout}->set_width ($self->{w});
1689	$self->{layout}->set_ellipsise ($self->{ellipsise});	1909	$self->{layout}->set_ellipsise ($self->{ellipsise});
1690	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1910	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1691	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1911	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1692		1912
1693	$self->{size_req}	1913	[$self->{layout}->size]
1694	};	1914	};
1695		1915
1696	unless (exists $self->{ox}) {	1916	unless (exists $self->{ox}) {
1697	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1917	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1698	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}	1918	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
…		…
1704	};	1924	};
1705		1925
1706	my $w = List::Util::min $self->{w} + 4, $size->[0];	1926	my $w = List::Util::min $self->{w} + 4, $size->[0];
1707	my $h = List::Util::min $self->{h} + 2, $size->[1];	1927	my $h = List::Util::min $self->{h} + 2, $size->[1];
1708		1928
1709	$self->{layout}->render ($self->{ox}, $self->{oy});	1929	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1710	}	1930	}
1711		1931
1712	#############################################################################	1932	#############################################################################
1713		1933
1714	package CFClient::UI::EntryBase;	1934	package CFPlus::UI::EntryBase;
1715		1935
1716	our @ISA = CFClient::UI::Label::;	1936	our @ISA = CFPlus::UI::Label::;
1717		1937
1718	use CFClient::OpenGL;	1938	use CFPlus::OpenGL;
1719		1939
1720	sub new {	1940	sub new {
1721	my $class = shift;	1941	my $class = shift;
1722		1942
1723	$class->SUPER::new (	1943	$class->SUPER::new (
…		…
1727	active_fg => [0, 0, 0],	1947	active_fg => [0, 0, 0],
1728	can_hover => 1,	1948	can_hover => 1,
1729	can_focus => 1,	1949	can_focus => 1,
1730	valign => 0,	1950	valign => 0,
1731	can_events => 1,	1951	can_events => 1,
		1952	ellipsise => 0,
1732	#text => ...	1953	#text => ...
1733	#hidden => "*",	1954	#hidden => "*",
1734	@_	1955	@_
1735	)	1956	)
1736	}	1957	}
…		…
1781	my $sym = $ev->{sym};	2002	my $sym = $ev->{sym};
1782	my $uni = $ev->{unicode};	2003	my $uni = $ev->{unicode};
1783		2004
1784	my $text = $self->get_text;	2005	my $text = $self->get_text;
1785		2006
		2007	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2008
1786	if ($uni == 8) {	2009	if ($uni == 8) {
1787	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2010	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1788	} elsif ($uni == 127) {	2011	} elsif ($uni == 127) {
1789	substr $text, $self->{cursor}, 1, "";	2012	substr $text, $self->{cursor}, 1, "";
1790	} elsif ($sym == CFClient::SDLK_LEFT) {	2013	} elsif ($sym == CFPlus::SDLK_LEFT) {
1791	--$self->{cursor} if $self->{cursor};	2014	--$self->{cursor} if $self->{cursor};
1792	} elsif ($sym == CFClient::SDLK_RIGHT) {	2015	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1793	++$self->{cursor} if $self->{cursor} < length $self->{text};	2016	++$self->{cursor} if $self->{cursor} < length $self->{text};
1794	} elsif ($sym == CFClient::SDLK_HOME) {	2017	} elsif ($sym == CFPlus::SDLK_HOME) {
		2018	# what a hack
		2019	$self->{cursor} =
		2020	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2021	? length $1
		2022	: 0;
		2023	} elsif ($sym == CFPlus::SDLK_END) {
		2024	# uh, again
		2025	$self->{cursor} =
		2026	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2027	? $self->{cursor} + length $1
		2028	: length $self->{text};
		2029	} elsif ($uni == 21) { # ctrl-u
		2030	$text = "";
1795	$self->{cursor} = 0;	2031	$self->{cursor} = 0;
1796	} elsif ($sym == CFClient::SDLK_END) {
1797	$self->{cursor} = length $text;
1798	} elsif ($uni == 27) {	2032	} elsif ($uni == 27) {
1799	$self->emit ('escape');	2033	$self->emit ('escape');
1800	} elsif ($uni) {	2034	} elsif ($uni == 0x0d) {
		2035	substr $text, $self->{cursor}++, 0, "\012";
		2036	} elsif ($uni >= 0x20) {
1801	substr $text, $self->{cursor}++, 0, chr $uni;	2037	substr $text, $self->{cursor}++, 0, chr $uni;
1802	} else {	2038	} else {
1803	return 0;	2039	return 0;
1804	}	2040	}
1805		2041
1806	$self->_set_text ($text);	2042	$self->_set_text ($text);
1807		2043
1808	$self->realloc;	2044	$self->realloc;
		2045	$self->update;
1809		2046
1810	1	2047	1
1811	}	2048	}
1812		2049
1813	sub invoke_focus_in {	2050	sub invoke_focus_in {
…		…
1825		2062
1826	my $idx = $self->{layout}->xy_to_index ($x, $y);	2063	my $idx = $self->{layout}->xy_to_index ($x, $y);
1827		2064
1828	# byte-index to char-index	2065	# byte-index to char-index
1829	my $text = $self->{text};	2066	my $text = $self->{text};
1830	utf8::encode $text;	2067	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1831	$self->{cursor} = length substr $text, 0, $idx;	2068	$self->{cursor} = length $text;
1832		2069
1833	$self->_set_text ($self->{text});	2070	$self->_set_text ($self->{text});
1834	$self->update;	2071	$self->update;
1835		2072
1836	1	2073	1
…		…
1875	utf8::encode $text;	2112	utf8::encode $text;
1876		2113
1877	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2114	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1878	}	2115	}
1879		2116
1880	glColor @{$self->{fg}};
1881	glBegin GL_LINES;	2117	glBegin GL_LINES;
1882	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2118	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2119	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1884	glEnd;	2120	glEnd;
1885	}	2121	}
1886	}	2122	}
1887		2123
		2124	#############################################################################
		2125
1888	package CFClient::UI::Entry;	2126	package CFPlus::UI::Entry;
1889		2127
1890	our @ISA = CFClient::UI::EntryBase::;	2128	our @ISA = CFPlus::UI::EntryBase::;
1891		2129
1892	use CFClient::OpenGL;	2130	use CFPlus::OpenGL;
1893		2131
1894	sub invoke_key_down {	2132	sub invoke_key_down {
1895	my ($self, $ev) = @_;	2133	my ($self, $ev) = @_;
1896		2134
1897	my $sym = $ev->{sym};	2135	my $sym = $ev->{sym};
1898		2136
1899	if ($sym == 13) {	2137	if ($ev->{uni} == 0x0d || $sym == 13) {
1900	unshift @{$self->{history}},	2138	unshift @{$self->{history}},
1901	my $txt = $self->get_text;	2139	my $txt = $self->get_text;
1902		2140
1903	$self->{history_pointer} = -1;	2141	$self->{history_pointer} = -1;
1904	$self->{history_saveback} = '';	2142	$self->{history_saveback} = '';
1905	$self->emit (activate => $txt);	2143	$self->emit (activate => $txt);
1906	$self->update;	2144	$self->update;
1907		2145
1908	} elsif ($sym == CFClient::SDLK_UP) {	2146	} elsif ($sym == CFPlus::SDLK_UP) {
1909	if ($self->{history_pointer} < 0) {	2147	if ($self->{history_pointer} < 0) {
1910	$self->{history_saveback} = $self->get_text;	2148	$self->{history_saveback} = $self->get_text;
1911	}	2149	}
1912	if (@{$self->{history} || []} > 0) {	2150	if (@{$self->{history} || []} > 0) {
1913	$self->{history_pointer}++;	2151	$self->{history_pointer}++;
…		…
1915	$self->{history_pointer} = @{$self->{history} || []} - 1;	2153	$self->{history_pointer} = @{$self->{history} || []} - 1;
1916	}	2154	}
1917	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2155	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1918	}	2156	}
1919		2157
1920	} elsif ($sym == CFClient::SDLK_DOWN) {	2158	} elsif ($sym == CFPlus::SDLK_DOWN) {
1921	$self->{history_pointer}--;	2159	$self->{history_pointer}--;
1922	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2160	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1923		2161
1924	if ($self->{history_pointer} >= 0) {	2162	if ($self->{history_pointer} >= 0) {
1925	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2163	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1934	1	2172	1
1935	}	2173	}
1936		2174
1937	#############################################################################	2175	#############################################################################
1938		2176
		2177	package CFPlus::UI::TextEdit;
		2178
		2179	our @ISA = CFPlus::UI::EntryBase::;
		2180
		2181	use CFPlus::OpenGL;
		2182
		2183	sub move_cursor_ver {
		2184	my ($self, $dy) = @_;
		2185
		2186	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2187
		2188	$y += $dy;
		2189
		2190	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2191	$self->{cursor} = $index;
		2192	delete $self->{cur_h};
		2193	$self->update;
		2194	return;
		2195	}
		2196	}
		2197
		2198	sub invoke_key_down {
		2199	my ($self, $ev) = @_;
		2200
		2201	my $sym = $ev->{sym};
		2202
		2203	if ($sym == CFPlus::SDLK_UP) {
		2204	$self->move_cursor_ver (-1);
		2205	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2206	$self->move_cursor_ver (+1);
		2207	} else {
		2208	return $self->SUPER::invoke_key_down ($ev)
		2209	}
		2210
		2211	1
		2212	}
		2213
		2214	#############################################################################
		2215
1939	package CFClient::UI::Button;	2216	package CFPlus::UI::Button;
1940		2217
1941	our @ISA = CFClient::UI::Label::;	2218	our @ISA = CFPlus::UI::Label::;
1942		2219
1943	use CFClient::OpenGL;	2220	use CFPlus::OpenGL;
1944		2221
1945	my @tex =	2222	my @tex =
1946	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1947	qw(b1_button_active.png);	2224	qw(b1_button_active.png);
1948		2225
1949	sub new {	2226	sub new {
1950	my $class = shift;	2227	my $class = shift;
1951		2228
…		…
1988	$self->SUPER::_draw;	2265	$self->SUPER::_draw;
1989	}	2266	}
1990		2267
1991	#############################################################################	2268	#############################################################################
1992		2269
		2270	package CFPlus::UI::CheckBox;
		2271
		2272	our @ISA = CFPlus::UI::DrawBG::;
		2273
		2274	my @tex =
		2275	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2276	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2277
		2278	use CFPlus::OpenGL;
		2279
		2280	sub new {
		2281	my $class = shift;
		2282
		2283	$class->SUPER::new (
		2284	padding_x => 2,
		2285	padding_y => 2,
		2286	fg => [1, 1, 1],
		2287	active_fg => [1, 1, 0],
		2288	bg => [0, 0, 0, 0.2],
		2289	active_bg => [1, 1, 1, 0.5],
		2290	state => 0,
		2291	can_hover => 1,
		2292	@_
		2293	)
		2294	}
		2295
		2296	sub size_request {
		2297	my ($self) = @_;
		2298
		2299	(6) x 2
		2300	}
		2301
		2302	sub toggle {
		2303	my ($self) = @_;
		2304
		2305	$self->{state} = !$self->{state};
		2306	$self->emit (changed => $self->{state});
		2307	$self->update;
		2308	}
		2309
		2310	sub invoke_button_down {
		2311	my ($self, $ev, $x, $y) = @_;
		2312
		2313	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2314	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2315	$self->toggle;
		2316	} else {
		2317	return 0
		2318	}
		2319
		2320	1
		2321	}
		2322
		2323	sub _draw {
		2324	my ($self) = @_;
		2325
		2326	$self->SUPER::_draw;
		2327
		2328	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2329
		2330	my ($w, $h) = @$self{qw(w h)};
		2331
		2332	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2333
		2334	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2335
		2336	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2337
		2338	glEnable GL_TEXTURE_2D;
		2339	$tex->draw_quad_alpha (0, 0, $s, $s);
		2340	glDisable GL_TEXTURE_2D;
		2341	}
		2342
		2343	#############################################################################
		2344
		2345	package CFPlus::UI::Image;
		2346
		2347	our @ISA = CFPlus::UI::Base::;
		2348
		2349	use CFPlus::OpenGL;
		2350
		2351	our %texture_cache;
		2352
		2353	sub new {
		2354	my $class = shift;
		2355
		2356	my $self = $class->SUPER::new (
		2357	can_events => 0,
		2358	@_,
		2359	);
		2360
		2361	$self->{path} || $self->{tex}
		2362	or Carp::croak "'path' or 'tex' attributes required";
		2363
		2364	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2365	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2366
		2367	CFPlus::weaken $texture_cache{$self->{path}};
		2368
		2369	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2370
		2371	$self
		2372	}
		2373
		2374	sub STORABLE_freeze {
		2375	my ($self, $cloning) = @_;
		2376
		2377	$self->{path}
		2378	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2379
		2380	$self->{path}
		2381	}
		2382
		2383	sub STORABLE_attach {
		2384	my ($self, $cloning, $path) = @_;
		2385
		2386	$self->new (path => $path)
		2387	}
		2388
		2389	sub size_request {
		2390	my ($self) = @_;
		2391
		2392	($self->{tex}{w}, $self->{tex}{h})
		2393	}
		2394
		2395	sub _draw {
		2396	my ($self) = @_;
		2397
		2398	my $tex = $self->{tex};
		2399
		2400	my ($w, $h) = ($self->{w}, $self->{h});
		2401
		2402	if ($self->{rot90}) {
		2403	glRotate 90, 0, 0, 1;
		2404	glTranslate 0, -$self->{w}, 0;
		2405
		2406	($w, $h) = ($h, $w);
		2407	}
		2408
		2409	glEnable GL_TEXTURE_2D;
		2410	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2411
		2412	$tex->draw_quad (0, 0, $w, $h);
		2413
		2414	glDisable GL_TEXTURE_2D;
		2415	}
		2416
		2417	#############################################################################
		2418
1993	package CFClient::UI::ImageButton;	2419	package CFPlus::UI::ImageButton;
1994		2420
1995	our @ISA = CFClient::UI::Image::;	2421	our @ISA = CFPlus::UI::Image::;
1996		2422
1997	use CFClient::OpenGL;	2423	use CFPlus::OpenGL;
1998		2424
1999	my %textures;	2425	my %textures;
2000		2426
2001	sub new {	2427	sub new {
2002	my $class = shift;	2428	my $class = shift;
…		…
2024	1	2450	1
2025	}	2451	}
2026		2452
2027	#############################################################################	2453	#############################################################################
2028		2454
2029	package CFClient::UI::CheckBox;
2030
2031	our @ISA = CFClient::UI::DrawBG::;
2032
2033	my @tex =
2034	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2035	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2036
2037	use CFClient::OpenGL;
2038
2039	sub new {
2040	my $class = shift;
2041
2042	$class->SUPER::new (
2043	padding_x => 2,
2044	padding_y => 2,
2045	fg => [1, 1, 1],
2046	active_fg => [1, 1, 0],
2047	bg => [0, 0, 0, 0.2],
2048	active_bg => [1, 1, 1, 0.5],
2049	state => 0,
2050	can_hover => 1,
2051	@_
2052	)
2053	}
2054
2055	sub size_request {
2056	my ($self) = @_;
2057
2058	(6) x 2
2059	}
2060
2061	sub toggle {
2062	my ($self) = @_;
2063
2064	$self->{state} = !$self->{state};
2065	$self->emit (changed => $self->{state});
2066	$self->update;
2067	}
2068
2069	sub invoke_button_down {
2070	my ($self, $ev, $x, $y) = @_;
2071
2072	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2073	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2074	$self->toggle;
2075	} else {
2076	return 0
2077	}
2078
2079	1
2080	}
2081
2082	sub _draw {
2083	my ($self) = @_;
2084
2085	$self->SUPER::_draw;
2086
2087	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2088
2089	my ($w, $h) = @$self{qw(w h)};
2090
2091	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2092
2093	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2094
2095	my $tex = $self->{state} ? $tex[1] : $tex[0];
2096
2097	glEnable GL_TEXTURE_2D;
2098	$tex->draw_quad_alpha (0, 0, $s, $s);
2099	glDisable GL_TEXTURE_2D;
2100	}
2101
2102	#############################################################################
2103
2104	package CFClient::UI::Image;	2455	package CFPlus::UI::VGauge;
2105		2456
2106	our @ISA = CFClient::UI::Base::;	2457	our @ISA = CFPlus::UI::Base::;
2107
2108	use CFClient::OpenGL;
2109
2110	our %texture_cache;
2111
2112	sub new {
2113	my $class = shift;
2114
2115	my $self = $class->SUPER::new (
2116	can_events => 0,
2117	@_,
2118	);
2119
2120	$self->{path}
2121	or Carp::croak "required attribute 'path' not set";
2122
2123	$self->{tex} = $texture_cache{$self->{path}} ||=
2124	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2125
2126	Scalar::Util::weaken $texture_cache{$self->{path}};
2127
2128	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2129
2130	$self
2131	}
2132
2133	sub size_request {
2134	my ($self) = @_;
2135
2136	($self->{tex}{w}, $self->{tex}{h})
2137	}
2138
2139	sub _draw {
2140	my ($self) = @_;
2141
2142	my $tex = $self->{tex};
2143
2144	my ($w, $h) = ($self->{w}, $self->{h});
2145
2146	if ($self->{rot90}) {
2147	glRotate 90, 0, 0, 1;
2148	glTranslate 0, -$self->{w}, 0;
2149
2150	($w, $h) = ($h, $w);
2151	}
2152
2153	glEnable GL_TEXTURE_2D;
2154	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155
2156	$tex->draw_quad_alpha (0, 0, $w, $h);
2157
2158	glDisable GL_TEXTURE_2D;
2159	}
2160
2161	#############################################################################
2162
2163	package CFClient::UI::VGauge;
2164
2165	our @ISA = CFClient::UI::Base::;
2166		2458
2167	use List::Util qw(min max);	2459	use List::Util qw(min max);
2168		2460
2169	use CFClient::OpenGL;	2461	use CFPlus::OpenGL;
2170		2462
2171	my %tex = (	2463	my %tex = (
2172	food => [	2464	food => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2465	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2466	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2175	],	2467	],
2176	grace => [	2468	grace => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2469	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2470	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2179	],	2471	],
2180	hp => [	2472	hp => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2473	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2474	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2183	],	2475	],
2184	mana => [	2476	mana => [
2185	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2477	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2186	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2478	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2187	],	2479	],
2188	);	2480	);
2189		2481
2190	# eg. VGauge->new (gauge => 'food'), default gauge: food	2482	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2293	glDisable GL_TEXTURE_2D;	2585	glDisable GL_TEXTURE_2D;
2294	}	2586	}
2295		2587
2296	#############################################################################	2588	#############################################################################
2297		2589
2298	package CFClient::UI::Gauge;	2590	package CFPlus::UI::Gauge;
2299		2591
2300	our @ISA = CFClient::UI::VBox::;	2592	our @ISA = CFPlus::UI::VBox::;
2301		2593
2302	sub new {	2594	sub new {
2303	my ($class, %arg) = @_;	2595	my ($class, %arg) = @_;
2304		2596
2305	my $self = $class->SUPER::new (	2597	my $self = $class->SUPER::new (
…		…
2307	can_hover => 1,	2599	can_hover => 1,
2308	can_events => 1,	2600	can_events => 1,
2309	%arg,	2601	%arg,
2310	);	2602	);
2311		2603
2312	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2604	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2313	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2605	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2314	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2606	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2315		2607
2316	$self	2608	$self
2317	}	2609	}
2318		2610
2319	sub set_fontsize {	2611	sub set_fontsize {
…		…
2340	$self->{value}->set_text ($val);	2632	$self->{value}->set_text ($val);
2341	}	2633	}
2342		2634
2343	#############################################################################	2635	#############################################################################
2344		2636
2345	package CFClient::UI::Slider;	2637	package CFPlus::UI::Slider;
2346		2638
2347	use strict;	2639	use strict;
2348		2640
2349	use CFClient::OpenGL;	2641	use CFPlus::OpenGL;
2350		2642
2351	our @ISA = CFClient::UI::DrawBG::;	2643	our @ISA = CFPlus::UI::DrawBG::;
2352		2644
2353	my @tex =	2645	my @tex =
2354	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2646	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2355	qw(s1_slider.png s1_slider_bg.png);	2647	qw(s1_slider.png s1_slider_bg.png);
2356		2648
2357	sub new {	2649	sub new {
2358	my $class = shift;	2650	my $class = shift;
2359		2651
…		…
2448	}	2740	}
2449		2741
2450	1	2742	1
2451	}	2743	}
2452		2744
		2745	sub invoke_mouse_wheel {
		2746	my ($self, $ev) = @_;
		2747
		2748	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2749
		2750	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2751
		2752	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2753
		2754	! ! $delta
		2755	}
		2756
2453	sub update {	2757	sub update {
2454	my ($self) = @_;	2758	my ($self) = @_;
2455		2759
2456	delete $self->{knob_w};	2760	delete $self->{knob_w};
2457	$self->SUPER::update;	2761	$self->SUPER::update;
…		…
2504	glDisable GL_TEXTURE_2D;	2808	glDisable GL_TEXTURE_2D;
2505	}	2809	}
2506		2810
2507	#############################################################################	2811	#############################################################################
2508		2812
2509	package CFClient::UI::ValSlider;	2813	package CFPlus::UI::ValSlider;
2510		2814
2511	our @ISA = CFClient::UI::HBox::;	2815	our @ISA = CFPlus::UI::HBox::;
2512		2816
2513	sub new {	2817	sub new {
2514	my ($class, %arg) = @_;	2818	my ($class, %arg) = @_;
2515		2819
2516	my $range = delete $arg{range};	2820	my $range = delete $arg{range};
2517		2821
2518	my $self = $class->SUPER::new (	2822	my $self = $class->SUPER::new (
2519	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2823	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2520	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2824	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2521	to_value => sub { shift },	2825	to_value => sub { shift },
2522	from_value => sub { shift },	2826	from_value => sub { shift },
2523	%arg,	2827	%arg,
2524	);	2828	);
2525		2829
…		…
2545	sub set_range { shift->{slider}->set_range (@_) }	2849	sub set_range { shift->{slider}->set_range (@_) }
2546	sub set_value { shift->{slider}->set_value (@_) }	2850	sub set_value { shift->{slider}->set_value (@_) }
2547		2851
2548	#############################################################################	2852	#############################################################################
2549		2853
2550	package CFClient::UI::TextScroller;	2854	package CFPlus::UI::TextScroller;
2551		2855
2552	our @ISA = CFClient::UI::HBox::;	2856	our @ISA = CFPlus::UI::HBox::;
2553		2857
2554	use CFClient::OpenGL;	2858	use CFPlus::OpenGL;
2555		2859
2556	sub new {	2860	sub new {
2557	my $class = shift;	2861	my $class = shift;
2558		2862
2559	my $self = $class->SUPER::new (	2863	my $self = $class->SUPER::new (
2560	fontsize => 1,	2864	fontsize => 1,
2561	can_events => 0,	2865	can_events => 1,
2562	indent => 0,	2866	indent => 0,
2563	#font => default_font	2867	#font => default_font
2564	@_,	2868	@_,
2565		2869
2566	layout => (new CFClient::Layout 2),	2870	layout => (new CFPlus::Layout),
2567	par => [],	2871	par => [],
		2872	max_par => 0,
2568	height => 0,	2873	height => 0,
2569	children => [	2874	children => [
2570	(new CFClient::UI::Empty expand => 1),	2875	(new CFPlus::UI::Empty expand => 1),
2571	(new CFClient::UI::Slider vertical => 1),	2876	(new CFPlus::UI::Slider vertical => 1),
2572	],	2877	],
2573	);	2878	);
2574		2879
2575	$self->{children}[1]->connect (changed => sub { $self->update });	2880	$self->{children}[1]->connect (changed => sub { $self->update });
2576		2881
…		…
2606		2911
2607	$self->reflow;	2912	$self->reflow;
2608		2913
2609	local $self->{children} = [$empty, $slider];	2914	local $self->{children} = [$empty, $slider];
2610	$self->SUPER::invoke_size_allocate ($w, $h)	2915	$self->SUPER::invoke_size_allocate ($w, $h)
		2916	}
		2917
		2918	sub invoke_mouse_wheel {
		2919	my ($self, $ev) = @_;
		2920
		2921	return 0 unless $ev->{dy}; # only vertical movements
		2922
		2923	$self->{children}[1]->emit (mouse_wheel => $ev);
		2924
		2925	1
2611	}	2926	}
2612		2927
2613	sub get_layout {	2928	sub get_layout {
2614	my ($self, $para) = @_;	2929	my ($self, $para) = @_;
2615		2930
…		…
2643		2958
2644	# todo: base offset on lines or so, not on pixels	2959	# todo: base offset on lines or so, not on pixels
2645	$self->{children}[1]->set_value ($offset);	2960	$self->{children}[1]->set_value ($offset);
2646	}	2961	}
2647		2962
		2963	sub current_paragraph {
		2964	my ($self) = @_;
		2965
		2966	$self->{top_paragraph} - 1
		2967	}
		2968
		2969	sub scroll_to {
		2970	my ($self, $para) = @_;
		2971
		2972	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2973
		2974	$self->{scroll_to} = $para;
		2975	$self->update;
		2976	}
		2977
2648	sub clear {	2978	sub clear {
2649	my ($self) = @_;	2979	my ($self) = @_;
2650		2980
2651	my (undef, undef, @other) = @{ $self->{children} };	2981	my (undef, undef, @other) = @{ $self->{children} };
2652	$self->remove ($_) for @other;	2982	$self->remove ($_) for @other;
…		…
2655	$self->{height} = 0;	2985	$self->{height} = 0;
2656	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2986	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2657	}	2987	}
2658		2988
2659	sub add_paragraph {	2989	sub add_paragraph {
2660	my ($self, $color, $para, $indent) = @_;	2990	my $self = shift;
2661		2991
2662	my ($text, @w) = ref $para ? @$para : $para;	2992	for my $para (@_) {
2663
2664	$para = {	2993	$para = {
		2994	fg => [1, 1, 1, 1],
		2995	indent => 0,
		2996	markup => "",
		2997	widget => [],
		2998	ref $para ? %$para : (markup => $para),
2665	w => 1e10,	2999	w => 1e10,
2666	wrapped => 1,	3000	wrapped => 1,
2667	fg => $color,
2668	indent => $indent,
2669	markup => $text,
2670	widget => \@w,
2671	};	3001	};
2672		3002
2673	$self->add (@w) if @w;	3003	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2674	push @{$self->{par}}, $para;	3004	push @{$self->{par}}, $para;
		3005	}
		3006
		3007	if (my $max = $self->{max_par}) {
		3008	shift @{$self->{par}} while @{$self->{par}} > $max;
		3009	}
2675		3010
2676	$self->{need_reflow}++;	3011	$self->{need_reflow}++;
2677	$self->update;	3012	$self->update;
2678	}	3013	}
2679		3014
2680	sub scroll_to_bottom {	3015	sub scroll_to_bottom {
2681	my ($self) = @_;	3016	my ($self) = @_;
2682		3017
2683	$self->{scroll_to_bottom} = 1;	3018	$self->{scroll_to} = $#{$self->{par}};
2684	$self->update;	3019	$self->update;
2685	}	3020	}
2686		3021
		3022	sub force_uptodate {
		3023	my ($self) = @_;
		3024
		3025	if (delete $self->{need_reflow}) {
		3026	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3027
		3028	my $height = 0;
		3029
		3030	for my $para (@{$self->{par}}) {
		3031	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3032	my $layout = $self->get_layout ($para);
		3033	my ($w, $h) = $layout->size;
		3034
		3035	$para->{w} = $w + $para->{indent};
		3036	$para->{h} = $h;
		3037	$para->{wrapped} = $layout->has_wrapped;
		3038	}
		3039
		3040	$para->{y} = $height;
		3041	$height += $para->{h};
		3042	}
		3043
		3044	$self->{height} = $height;
		3045	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3046
		3047	delete $self->{texture};
		3048	}
		3049
		3050	if (my $paridx = delete $self->{scroll_to}) {
		3051	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3052	}
		3053	}
		3054
2687	sub update {	3055	sub update {
2688	my ($self) = @_;	3056	my ($self) = @_;
2689		3057
2690	$self->SUPER::update;	3058	$self->SUPER::update;
2691		3059
2692	return unless $self->{h} > 0;	3060	return unless $self->{h} > 0;
2693		3061
2694	delete $self->{texture};	3062	delete $self->{texture};
2695		3063
2696	$ROOT->on_post_alloc ($self => sub {	3064	$ROOT->on_post_alloc ($self => sub {
		3065	$self->force_uptodate;
		3066
2697	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3067	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2698		3068
2699	if (delete $self->{need_reflow}) {
2700	my $height = 0;
2701
2702	for my $para (@{$self->{par}}) {
2703	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2704	my $layout = $self->get_layout ($para);
2705	my ($w, $h) = $layout->size;
2706
2707	$para->{w} = $w + $para->{indent};
2708	$para->{h} = $h;
2709	$para->{wrapped} = $layout->has_wrapped;
2710	}
2711
2712	$height += $para->{h};
2713	}
2714
2715	$self->{height} = $height;
2716
2717	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2718
2719	delete $self->{texture};
2720	}
2721
2722	if (delete $self->{scroll_to_bottom}) {
2723	$self->{children}[1]->set_value (1e10);
2724	}
2725
2726	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3069	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2727	glClearColor 0, 0, 0, 0;	3070	glClearColor 0, 0, 0, 0;
2728	glClear GL_COLOR_BUFFER_BIT;	3071	glClear GL_COLOR_BUFFER_BIT;
2729		3072
		3073	package CFPlus::UI::Base;
		3074	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3075	(0, 0, $self->{w}, $self->{h});
		3076
		3077	my $top = int $self->{children}[1]{range}[0];
		3078
		3079	my $paridx = 0;
		3080	my $top_paragraph;
2730	my $top = int $self->{children}[1]{range}[0];	3081	my $top = int $self->{children}[1]{range}[0];
2731		3082
2732	my $y0 = $top;	3083	my $y0 = $top;
2733	my $y1 = $top + $H;	3084	my $y1 = $top + $H;
2734		3085
2735	my $y = 0;
2736
2737	for my $para (@{$self->{par}}) {	3086	for my $para (@{$self->{par}}) {
2738	my $h = $para->{h};	3087	my $h = $para->{h};
		3088	my $y = $para->{y};
2739		3089
2740	if ($y0 < $y + $h && $y < $y1) {	3090	if ($y0 < $y + $h && $y < $y1) {
2741
2742	my $layout = $self->get_layout ($para);	3091	my $layout = $self->get_layout ($para);
2743		3092
2744	$layout->render ($para->{indent}, $y - $y0);	3093	$layout->render ($para->{indent}, $y - $y0);
2745		3094
2746	if (my @w = @{ $para->{widget} }) {	3095	if (my @w = @{ $para->{widget} }) {
…		…
2755	$_->draw;	3104	$_->draw;
2756	}	3105	}
2757	}	3106	}
2758	}	3107	}
2759		3108
2760	$y += $h;	3109	$paridx++;
		3110	$top_paragraph ||= $paridx if $y >= $top;
2761	}	3111	}
		3112
		3113	$self->{top_paragraph} = $top_paragraph;
2762	};	3114	};
2763	});	3115	});
2764	}	3116	}
2765		3117
2766	sub reconfigure {	3118	sub reconfigure {
…		…
2784	$self->{children}[1]->draw;	3136	$self->{children}[1]->draw;
2785	}	3137	}
2786		3138
2787	#############################################################################	3139	#############################################################################
2788		3140
2789	package CFClient::UI::Animator;	3141	package CFPlus::UI::Animator;
2790		3142
2791	use CFClient::OpenGL;	3143	use CFPlus::OpenGL;
2792		3144
2793	our @ISA = CFClient::UI::Bin::;	3145	our @ISA = CFPlus::UI::Bin::;
2794		3146
2795	sub moveto {	3147	sub moveto {
2796	my ($self, $x, $y) = @_;	3148	my ($self, $x, $y) = @_;
2797		3149
2798	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3150	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2826	glPopMatrix;	3178	glPopMatrix;
2827	}	3179	}
2828		3180
2829	#############################################################################	3181	#############################################################################
2830		3182
2831	package CFClient::UI::Flopper;	3183	package CFPlus::UI::Flopper;
2832		3184
2833	our @ISA = CFClient::UI::Button::;	3185	our @ISA = CFPlus::UI::Button::;
2834		3186
2835	sub new {	3187	sub new {
2836	my $class = shift;	3188	my $class = shift;
2837		3189
2838	my $self = $class->SUPER::new (	3190	my $self = $class->SUPER::new (
…		…
2850	$self->{other}->toggle_visibility;	3202	$self->{other}->toggle_visibility;
2851	}	3203	}
2852		3204
2853	#############################################################################	3205	#############################################################################
2854		3206
2855	package CFClient::UI::Tooltip;	3207	package CFPlus::UI::Tooltip;
2856		3208
2857	our @ISA = CFClient::UI::Bin::;	3209	our @ISA = CFPlus::UI::Bin::;
2858		3210
2859	use CFClient::OpenGL;	3211	use CFPlus::OpenGL;
2860		3212
2861	sub new {	3213	sub new {
2862	my $class = shift;	3214	my $class = shift;
2863		3215
2864	$class->SUPER::new (	3216	$class->SUPER::new (
…		…
2867	)	3219	)
2868	}	3220	}
2869		3221
2870	sub set_tooltip_from {	3222	sub set_tooltip_from {
2871	my ($self, $widget) = @_;	3223	my ($self, $widget) = @_;
		3224
		3225	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3226	if $widget->{tooltip} =~ /^#(.*)$/;
2872		3227
2873	my $tooltip = $widget->{tooltip};	3228	my $tooltip = $widget->{tooltip};
2874		3229
2875	if ($ENV{CFPLUS_DEBUG} & 2) {	3230	if ($ENV{CFPLUS_DEBUG} & 2) {
2876	$tooltip .= "\n\n" . (ref $widget) . "\n"	3231	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2880	}	3235	}
2881		3236
2882	$tooltip =~ s/^\n+//;	3237	$tooltip =~ s/^\n+//;
2883	$tooltip =~ s/\n+$//;	3238	$tooltip =~ s/\n+$//;
2884		3239
2885	$self->add (new CFClient::UI::Label	3240	$self->add (new CFPlus::UI::Label
2886	markup => $tooltip,	3241	markup => $tooltip,
2887	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3242	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888	fontsize => 0.8,	3243	fontsize => 0.8,
2889	fg => [0, 0, 0, 1],	3244	style => 1, # FLAG_INVERSE
2890	ellipsise => 0,	3245	ellipsise => 0,
2891	font => ($widget->{tooltip_font} || $::FONT_PROP),	3246	font => ($widget->{tooltip_font} || $::FONT_PROP),
2892	);	3247	);
2893	}	3248	}
2894		3249
…		…
2913		3268
2914	$self->{root}->on_post_alloc ("move_$self" => sub {	3269	$self->{root}->on_post_alloc ("move_$self" => sub {
2915	my $widget = $self->{owner}	3270	my $widget = $self->{owner}
2916	or return;	3271	or return;
2917		3272
		3273	if ($widget->{visible}) {
2918	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3274	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919		3275
2920	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3276	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921	if $x + $self->{w} > $self->{root}{w};	3277	if $x + $self->{w} > $self->{root}{w};
2922		3278
2923	$self->move_abs ($x, $y);	3279	$self->move_abs ($x, $y);
		3280	} else {
		3281	$self->hide;
		3282	}
2924	});	3283	});
2925	}	3284	}
2926		3285
2927	sub _draw {	3286	sub _draw {
2928	my ($self) = @_;	3287	my ($self) = @_;
…		…
2952	$self->SUPER::_draw;	3311	$self->SUPER::_draw;
2953	}	3312	}
2954		3313
2955	#############################################################################	3314	#############################################################################
2956		3315
2957	package CFClient::UI::Face;	3316	package CFPlus::UI::Face;
2958		3317
2959	our @ISA = CFClient::UI::Base::;	3318	our @ISA = CFPlus::UI::DrawBG::;
2960		3319
2961	use CFClient::OpenGL;	3320	use CFPlus::OpenGL;
2962		3321
2963	sub new {	3322	sub new {
2964	my $class = shift;	3323	my $class = shift;
2965		3324
2966	my $self = $class->SUPER::new (	3325	my $self = $class->SUPER::new (
…		…
2968	can_events => 0,	3327	can_events => 0,
2969	@_,	3328	@_,
2970	);	3329	);
2971		3330
2972	if ($self->{anim} && $self->{animspeed}) {	3331	if ($self->{anim} && $self->{animspeed}) {
2973	Scalar::Util::weaken (my $widget = $self);	3332	CFPlus::weaken (my $widget = $self);
2974		3333
2975	$self->{timer} = Event->timer (	3334	$self->{timer} = Event->timer (
2976	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3335	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977	hard => 1,	3336	hard => 1,
2978	interval => $self->{animspeed},	3337	interval => $self->{animspeed},
…		…
3001	sub _draw {	3360	sub _draw {
3002	my ($self) = @_;	3361	my ($self) = @_;
3003		3362
3004	return unless $::CONN;	3363	return unless $::CONN;
3005		3364
		3365	$self->SUPER::_draw;
		3366
3006	my $face;	3367	my $face;
3007		3368
3008	if ($self->{frame}) {	3369	if ($self->{frame}) {
3009	my $anim = $::CONN->{anim}[$self->{anim}];	3370	my $anim = $::CONN->{anim}[$self->{anim}];
3010		3371
…		…
3032	$self->SUPER::destroy;	3393	$self->SUPER::destroy;
3033	}	3394	}
3034		3395
3035	#############################################################################	3396	#############################################################################
3036		3397
3037	package CFClient::UI::Buttonbar;	3398	package CFPlus::UI::Buttonbar;
3038		3399
3039	our @ISA = CFClient::UI::HBox::;	3400	our @ISA = CFPlus::UI::HBox::;
3040		3401
3041	# TODO: should actualyl wrap buttons and other goodies.	3402	# TODO: should actually wrap buttons and other goodies.
3042		3403
3043	#############################################################################	3404	#############################################################################
3044		3405
3045	package CFClient::UI::Menu;	3406	package CFPlus::UI::Menu;
3046		3407
3047	our @ISA = CFClient::UI::FancyFrame::;	3408	our @ISA = CFPlus::UI::Toplevel::;
3048		3409
3049	use CFClient::OpenGL;	3410	use CFPlus::OpenGL;
3050		3411
3051	sub new {	3412	sub new {
3052	my $class = shift;	3413	my $class = shift;
3053		3414
3054	my $self = $class->SUPER::new (	3415	my $self = $class->SUPER::new (
3055	items => [],	3416	items => [],
3056	z => 100,	3417	z => 100,
3057	@_,	3418	@_,
3058	);	3419	);
3059		3420
3060	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3421	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061		3422
3062	for my $item (@{ $self->{items} }) {	3423	for my $item (@{ $self->{items} }) {
3063	my ($widget, $cb, $tooltip) = @$item;	3424	my ($widget, $cb, $tooltip) = @$item;
3064		3425
3065	# handle various types of items, only text for now	3426	# handle various types of items, only text for now
3066	if (!ref $widget) {	3427	if (!ref $widget) {
		3428	if ($widget =~ /\t/) {
		3429	my ($left, $right) = split /\t/, $widget, 2;
		3430
3067	$widget = new CFClient::UI::Label	3431	$widget = new CFPlus::UI::HBox
3068	can_hover => 1,	3432	can_hover => 1,
3069	can_events => 1,	3433	can_events => 1,
		3434	tooltip => $tooltip,
		3435	children => [
		3436	(new CFPlus::UI::Label markup => $left, expand => 1),
		3437	(new CFPlus::UI::Label markup => $right, align => +1),
		3438	],
		3439	;
		3440
		3441	} else {
		3442	$widget = new CFPlus::UI::Label
		3443	can_hover => 1,
		3444	can_events => 1,
3070	markup => $widget,	3445	markup => $widget,
3071	tooltip => $tooltip	3446	tooltip => $tooltip;
		3447	}
3072	}	3448	}
3073		3449
3074	$self->{item}{$widget} = $item;	3450	$self->{item}{$widget} = $item;
3075		3451
3076	$self->{vbox}->add ($widget);	3452	$self->{vbox}->add ($widget);
…		…
3119	1	3495	1
3120	}	3496	}
3121		3497
3122	#############################################################################	3498	#############################################################################
3123		3499
3124	package CFClient::UI::Multiplexer;	3500	package CFPlus::UI::Multiplexer;
3125		3501
3126	our @ISA = CFClient::UI::Container::;	3502	our @ISA = CFPlus::UI::Container::;
3127		3503
3128	sub new {	3504	sub new {
3129	my $class = shift;	3505	my $class = shift;
3130		3506
3131	my $self = $class->SUPER::new (	3507	my $self = $class->SUPER::new (
…		…
3192	$self->{current}->draw;	3568	$self->{current}->draw;
3193	}	3569	}
3194		3570
3195	#############################################################################	3571	#############################################################################
3196		3572
3197	package CFClient::UI::Notebook;	3573	package CFPlus::UI::Notebook;
3198		3574
3199	our @ISA = CFClient::UI::VBox::;	3575	our @ISA = CFPlus::UI::VBox::;
3200		3576
3201	sub new {	3577	sub new {
3202	my $class = shift;	3578	my $class = shift;
3203		3579
3204	my $self = $class->SUPER::new (	3580	my $self = $class->SUPER::new (
3205	buttonbar => (new CFClient::UI::Buttonbar),	3581	buttonbar => (new CFPlus::UI::Buttonbar),
3206	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3582	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3207	# filter => # will be put between multiplexer and $self	3583	# filter => # will be put between multiplexer and $self
3208	@_,	3584	@_,
3209	);	3585	);
3210		3586
3211	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3587	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3215	}	3591	}
3216		3592
3217	sub add {	3593	sub add {
3218	my ($self, $title, $widget, $tooltip) = @_;	3594	my ($self, $title, $widget, $tooltip) = @_;
3219		3595
3220	Scalar::Util::weaken $self;	3596	CFPlus::weaken $self;
3221		3597
3222	$self->{buttonbar}->add (new CFClient::UI::Button	3598	$self->{buttonbar}->add (new CFPlus::UI::Button
3223	markup => $title,	3599	markup => $title,
3224	tooltip => $tooltip,	3600	tooltip => $tooltip,
3225	on_activate => sub { $self->set_current_page ($widget) },	3601	on_activate => sub { $self->set_current_page ($widget) },
3226	);	3602	);
3227		3603
…		…
3241	$self->emit (page_changed => $self->{multiplexer}{current});	3617	$self->emit (page_changed => $self->{multiplexer}{current});
3242	}	3618	}
3243		3619
3244	#############################################################################	3620	#############################################################################
3245		3621
3246	package CFClient::UI::Combobox;	3622	package CFPlus::UI::Selector;
3247		3623
3248	use utf8;	3624	use utf8;
3249		3625
3250	our @ISA = CFClient::UI::Button::;	3626	our @ISA = CFPlus::UI::Button::;
3251		3627
3252	sub new {	3628	sub new {
3253	my $class = shift;	3629	my $class = shift;
3254		3630
3255	my $self = $class->SUPER::new (	3631	my $self = $class->SUPER::new (
…		…
3272	my ($value, $title, $tooltip) = @$_;	3648	my ($value, $title, $tooltip) = @$_;
3273		3649
3274	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3650	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3275	}	3651	}
3276		3652
3277	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3653	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3278	}	3654	}
3279		3655
3280	sub _set_value {	3656	sub _set_value {
3281	my ($self, $value) = @_;	3657	my ($self, $value) = @_;
3282		3658
…		…
3297	$self->emit (changed => $value);	3673	$self->emit (changed => $value);
3298	}	3674	}
3299		3675
3300	#############################################################################	3676	#############################################################################
3301		3677
3302	package CFClient::UI::Statusbox;	3678	package CFPlus::UI::Statusbox;
3303		3679
3304	our @ISA = CFClient::UI::VBox::;	3680	our @ISA = CFPlus::UI::VBox::;
3305		3681
3306	sub new {	3682	sub new {
3307	my $class = shift;	3683	my $class = shift;
3308		3684
3309	my $self = $class->SUPER::new (	3685	my $self = $class->SUPER::new (
3310	fontsize => 0.8,	3686	fontsize => 0.8,
3311	@_,	3687	@_,
3312	);	3688	);
3313		3689
3314	Scalar::Util::weaken (my $this = $self);	3690	CFPlus::weaken (my $this = $self);
3315		3691
3316	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3692	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3317		3693
3318	$self	3694	$self
3319	}	3695	}
…		…
3321	sub reorder {	3697	sub reorder {
3322	my ($self) = @_;	3698	my ($self) = @_;
3323	my $NOW = Time::HiRes::time;	3699	my $NOW = Time::HiRes::time;
3324		3700
3325	# freeze display when hovering over any label	3701	# freeze display when hovering over any label
3326	return if $CFClient::UI::TOOLTIP->{owner}	3702	return if $CFPlus::UI::TOOLTIP->{owner}
3327	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3703	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3328	values %{ $self->{item} };	3704	values %{ $self->{item} };
3329		3705
3330	while (my ($k, $v) = each %{ $self->{item} }) {	3706	while (my ($k, $v) = each %{ $self->{item} }) {
3331	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3707	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3332	}	3708	}
…		…
3353	for ($short) {	3729	for ($short) {
3354	s/^\s+//;	3730	s/^\s+//;
3355	s/\s+/ /g;	3731	s/\s+/ /g;
3356	}	3732	}
3357		3733
3358	new CFClient::UI::Label	3734	new CFPlus::UI::Label
3359	markup => $short,	3735	markup => $short,
3360	tooltip => $item->{tooltip},	3736	tooltip => $item->{tooltip},
3361	tooltip_font => $::FONT_PROP,	3737	tooltip_font => $::FONT_PROP,
3362	tooltip_width => 0.67,	3738	tooltip_width => 0.67,
3363	fontsize => $item->{fontsize} || $self->{fontsize},	3739	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3442	$self->SUPER::destroy;	3818	$self->SUPER::destroy;
3443	}	3819	}
3444		3820
3445	#############################################################################	3821	#############################################################################
3446		3822
3447	package CFClient::UI::Inventory;
3448
3449	our @ISA = CFClient::UI::Table::;
3450
3451	sub new {
3452	my $class = shift;
3453
3454	my $self = $class->SUPER::new (
3455	col_expand => [0, 1, 0],
3456	@_,
3457	);
3458
3459	$self
3460	}
3461
3462	sub set_items {
3463	my ($self, $items) = @_;
3464
3465	$self->clear;
3466	return unless $items;
3467
3468	my @items = sort {
3469	($a->{type} <=> $b->{type})
3470	or ($a->{name} cmp $b->{name})
3471	} values %$items;
3472
3473	$self->{real_items} = \@items;
3474
3475	my $row = 0;
3476	for my $item (@items) {
3477	CFClient::Item::update_widgets $item;
3478
3479	$self->add (0, $row, $item->{face_widget});
3480	$self->add (1, $row, $item->{desc_widget});
3481	$self->add (2, $row, $item->{weight_widget});
3482
3483	$row++;
3484	}
3485	}
3486
3487	#############################################################################
3488
3489	package CFClient::UI::SpellList;
3490
3491	our @ISA = CFClient::UI::Table::;
3492
3493	sub new {
3494	my $class = shift;
3495
3496	my $self = $class->SUPER::new (
3497	binding => [],
3498	commands => [],
3499	@_,
3500	)
3501	}
3502
3503	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3504
3505	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3506	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3507	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3508	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3509	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3510	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3511	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3512	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3513	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3514	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3515
3516	sub rebuild_spell_list {
3517	my ($self) = @_;
3518
3519	$CFClient::UI::ROOT->on_refresh ($self => sub {
3520	$self->clear;
3521
3522	return unless $::CONN;
3523
3524	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3525	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3526	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3527	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3528	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3529
3530	my $row = 0;
3531
3532	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3533	my $spell = $self->{spell}{$_};
3534
3535	$row++;
3536
3537	my $spell_cb = sub {
3538	my ($widget, $ev) = @_;
3539
3540	if ($ev->{button} == 1) {
3541	$::CONN->user_send ("cast $spell->{name}");
3542	} elsif ($ev->{button} == 2) {
3543	$::CONN->user_send ("invoke $spell->{name}");
3544	} elsif ($ev->{button} == 3) {
3545	(new CFClient::UI::Menu
3546	items => [
3547	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3548	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3549	],
3550	)->popup ($ev);
3551	} else {
3552	return 0;
3553	}
3554
3555	1
3556	};
3557
3558	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3559
3560	#TODO: add path info to tooltip
3561	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3562
3563	$self->add (0, $row, new CFClient::UI::Face
3564	face => $spell->{face},
3565	can_hover => 1,
3566	can_events => 1,
3567	tooltip => $tooltip,
3568	on_button_down => $spell_cb,
3569	);
3570
3571	$self->add (1, $row, new CFClient::UI::Label
3572	expand => 1,
3573	text => $spell->{name},
3574	can_hover => 1,
3575	can_events => 1,
3576	tooltip => $tooltip,
3577	on_button_down => $spell_cb,
3578	);
3579
3580	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3581	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3582	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3583	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3584	}
3585	});
3586	}
3587
3588	sub add_spell {
3589	my ($self, $spell) = @_;
3590
3591	$self->{spell}->{$spell->{name}} = $spell;
3592	$self->rebuild_spell_list;
3593	}
3594
3595	sub remove_spell {
3596	my ($self, $spell) = @_;
3597
3598	delete $self->{spell}->{$spell->{name}};
3599	$self->rebuild_spell_list;
3600	}
3601
3602	sub clear_spells {
3603	my ($self) = @_;
3604
3605	$self->{spell} = {};
3606	$self->rebuild_spell_list;
3607	}
3608
3609	#############################################################################
3610
3611	package CFClient::UI::Root;	3823	package CFPlus::UI::Root;
3612		3824
3613	our @ISA = CFClient::UI::Container::;	3825	our @ISA = CFPlus::UI::Container::;
3614		3826
3615	use List::Util qw(min max);	3827	use List::Util qw(min max);
3616		3828
3617	use CFClient::OpenGL;	3829	use CFPlus::OpenGL;
3618		3830
3619	sub new {	3831	sub new {
3620	my $class = shift;	3832	my $class = shift;
3621		3833
3622	my $self = $class->SUPER::new (	3834	my $self = $class->SUPER::new (
3623	visible => 1,	3835	visible => 1,
3624	@_,	3836	@_,
3625	);	3837	);
3626		3838
3627	Scalar::Util::weaken ($self->{root} = $self);	3839	CFPlus::weaken ($self->{root} = $self);
3628		3840
3629	$self	3841	$self
3630	}	3842	}
3631		3843
3632	sub size_request {	3844	sub size_request {
…		…
3798	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4010	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3799		4011
3800	$w = 0 if $w < 0;	4012	$w = 0 if $w < 0;
3801	$h = 0 if $h < 0;	4013	$h = 0 if $h < 0;
3802		4014
		4015	$w = max $widget->{min_w}, $w;
		4016	$h = max $widget->{min_h}, $h;
		4017
		4018	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4019	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4020
		4021	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4022	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4023
3803	$w = int $w + 0.5;	4024	$w = int $w + 0.5;
3804	$h = int $h + 0.5;	4025	$h = int $h + 0.5;
3805		4026
3806	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4027	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3807	$widget->{old_w} = $widget->{w};	4028	$widget->{old_w} = $widget->{w};
…		…
3830	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4051	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3831	glMatrixMode GL_MODELVIEW;	4052	glMatrixMode GL_MODELVIEW;
3832	glLoadIdentity;	4053	glLoadIdentity;
3833		4054
3834	{	4055	{
3835	package CFClient::UI::Base;	4056	package CFPlus::UI::Base;
3836		4057
3837	($draw_x, $draw_y, $draw_w, $draw_h) =	4058	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3838	(0, 0, $self->{w}, $self->{h});	4059	(0, 0, $self->{w}, $self->{h});
3839	}
3840		4060
3841	$self->_draw;	4061	$self->_draw;
3842
3843	#TODO#d# display texture cache
3844	{	4062	}
3845	glEnable GL_TEXTURE_2D;
3846	glBindTexture GL_TEXTURE_2D, 41;
3847	glColor 1, 1, 1, 1;
3848	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
3849	glEnable GL_BLEND;
3850	glBlendFunc GL_SRC_ALPHA, GL_ZERO;
3851	glBegin GL_QUADS;
3852	glTexCoord 0,1; glVertex 0,0;
3853	glTexCoord 1,1; glVertex 255,0;
3854	glTexCoord 1,0; glVertex 255,255;
3855	glTexCoord 0,0; glVertex 0,255;
3856	glEnd;
3857	glDisable GL_BLEND;
3858	glDisable GL_TEXTURE_2D;
3859	}
3860
3861	}	4063	}
3862		4064
3863	#############################################################################	4065	#############################################################################
3864		4066
3865	package CFClient::UI;	4067	package CFPlus::UI;
3866		4068
3867	$ROOT = new CFClient::UI::Root;	4069	$ROOT = new CFPlus::UI::Root;
3868	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4070	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3869		4071
3870	1	4072	1
3871		4073

Diff Legend

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