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.323 by root, Wed Jul 5 03:01:01 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 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	scroll_x => 0,
		1067	scroll_y => 1,
		1068	can_events => 1,
981	slider => $slider,	1069	hslider => $hslider,
		1070	vslider => $vslider,
		1071	col_expand => [1, 0],
		1072	row_expand => [1, 0],
982	%arg,	1073	%arg,
983	);	1074	);
984		1075
		1076	$self->{vp} = new CFPlus::UI::ViewPort
		1077	expand => 1,
		1078	scroll_x => $self->{scroll_x},
		1079	scroll_y => $self->{scroll_y},
		1080	;
		1081
		1082	$self->SUPER::add (0, 0, $self->{vp});
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1083	$self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
		1084	$self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
		1085
986	$self->add ($child) if $child;	1086	$self->add ($child) if $child;
987		1087
988	$self	1088	$self
989	}	1089	}
990		1090
…		…
994	my ($self, $widget) = @_;	1094	my ($self, $widget) = @_;
995		1095
996	$self->{vp}->add ($self->{child} = $widget);	1096	$self->{vp}->add ($self->{child} = $widget);
997	}	1097	}
998		1098
		1099	sub invoke_mouse_wheel {
		1100	my ($self, $ev) = @_;
		1101
		1102	return 0 unless $ev->{dy}; # only vertical movements
		1103
		1104	$self->{vslider}->emit (mouse_wheel => $ev);
		1105
		1106	1
		1107	}
		1108
999	sub update_slider {	1109	sub update_slider {
1000	my ($self) = @_;	1110	my ($self) = @_;
1001		1111
		1112	my $child = ($self->{vp} or return)->child;
		1113
		1114	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1115	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1116	#$self->{hslider}->set_visibility ($w1 != $w2);
		1117
		1118	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1119	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1120	#$self->{vslider}->set_visibility ($h1 != $h2);
1003	}	1121	}
1004		1122
1005	sub update {	1123	sub update {
1006	my ($self) = @_;	1124	my ($self) = @_;
1007		1125
1008	$self->SUPER::update;	1126	$self->SUPER::update;
1009
1010	$self->update_slider;	1127	$self->update_slider;
1011	}	1128	}
1012		1129
1013	sub invoke_size_allocate {	1130	sub invoke_size_allocate {
1014	my ($self, $w, $h) = @_;	1131	my ($self, $w, $h) = @_;
1015		1132
1016	$self->update_slider;	1133	$self->update_slider;
1017
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1134	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1135	}
1020		1136
1021	#############################################################################	1137	#############################################################################
1022		1138
1023	package CFClient::UI::Frame;	1139	package CFPlus::UI::Frame;
1024		1140
1025	our @ISA = CFClient::UI::Bin::;	1141	our @ISA = CFPlus::UI::Bin::;
1026		1142
1027	use CFClient::OpenGL;	1143	use CFPlus::OpenGL;
1028		1144
1029	sub new {	1145	sub new {
1030	my $class = shift;	1146	my $class = shift;
1031		1147
1032	$class->SUPER::new (	1148	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1174	$self->SUPER::_draw;
1059	}	1175	}
1060		1176
1061	#############################################################################	1177	#############################################################################
1062		1178
1063	package CFClient::UI::FancyFrame;	1179	package CFPlus::UI::FancyFrame;
1064		1180
1065	our @ISA = CFClient::UI::Bin::;	1181	our @ISA = CFPlus::UI::Bin::;
1066		1182
1067	use CFClient::OpenGL;	1183	use CFPlus::OpenGL;
		1184
		1185	sub new {
		1186	my ($class, %arg) = @_;
		1187
		1188	if ((exists $arg{label}) && !ref $arg{label}) {
		1189	$arg{label} = new CFPlus::UI::Label
		1190	align => 1,
		1191	valign => 0,
		1192	text => $arg{label},
		1193	fontsize => ($arg{border} || 0.8) * 0.75;
		1194	}
		1195
		1196	my $self = $class->SUPER::new (
		1197	# label => "",
		1198	fg => [0.6, 0.3, 0.1],
		1199	border => 0.8,
		1200	style => 'single',
		1201	%arg,
		1202	);
		1203
		1204	$self
		1205	}
		1206
		1207	sub add {
		1208	my ($self, @widgets) = @_;
		1209
		1210	$self->SUPER::add (@widgets);
		1211	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1212	}
		1213
		1214	sub border {
		1215	int $_[0]{border} * $::FONTSIZE
		1216	}
		1217
		1218	sub size_request {
		1219	my ($self) = @_;
		1220
		1221	($self->{label_w}, undef) = $self->{label}->size_request
		1222	if $self->{label};
		1223
		1224	my ($w, $h) = $self->SUPER::size_request;
		1225
		1226	(
		1227	$w + $self->border * 2,
		1228	$h + $self->border * 2,
		1229	)
		1230	}
		1231
		1232	sub invoke_size_allocate {
		1233	my ($self, $w, $h) = @_;
		1234
		1235	my $border = $self->border;
		1236
		1237	$w -= List::Util::max 0, $border * 2;
		1238	$h -= List::Util::max 0, $border * 2;
		1239
		1240	if (my $label = $self->{label}) {
		1241	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1242	$label->{h} = List::Util::min $h, $border;
		1243	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1244	}
		1245
		1246	$self->child->configure ($border, $border, $w, $h);
		1247
		1248	1
		1249	}
		1250
		1251	sub _draw {
		1252	my ($self) = @_;
		1253
		1254	my $child = $self->{children}[0];
		1255
		1256	my $border = $self->border;
		1257	my ($w, $h) = ($self->{w}, $self->{h});
		1258
		1259	$child->draw;
		1260
		1261	glColor @{$self->{fg}};
		1262	glBegin GL_LINE_STRIP;
		1263	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1264	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1265	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1266	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1267	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1268	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1269	glEnd;
		1270
		1271	if ($self->{label}) {
		1272	glTranslate $border * 2, 0;
		1273	$self->{label}->_draw;
		1274	}
		1275	}
		1276
		1277	#############################################################################
		1278
		1279	package CFPlus::UI::Toplevel;
		1280
		1281	our @ISA = CFPlus::UI::Bin::;
		1282
		1283	use CFPlus::OpenGL;
1068		1284
1069	my $bg =	1285	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1286	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1287	mipmap => 1, wrap => 1;
1072		1288
1073	my @border =	1289	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1290	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);	1291	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1292
1077	sub new {	1293	sub new {
1078	my ($class, %arg) = @_;	1294	my ($class, %arg) = @_;
1079		1295
1080	my $self = $class->SUPER::new (	1296	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1297	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1298	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1299	border => 0.6,
1084	can_events => 1,	1300	can_events => 1,
1085	min_w => 16,	1301	min_w => 64,
1086	min_h => 16,	1302	min_h => 32,
1087	%arg,	1303	%arg,
1088	);	1304	);
1089		1305
1090	$self->{title_widget} = new CFClient::UI::Label	1306	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1307	align => 0,
1092	valign => 1,	1308	valign => 1,
1093	text => $self->{title},	1309	text => $self->{title},
1094	fontsize => $self->{border},	1310	fontsize => $self->{border},
1095	if exists $self->{title};	1311	if exists $self->{title};
1096		1312
1097	if ($self->{has_close_button}) {	1313	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1314	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1315	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1316	path => 'x1_close.png',
1101	on_activate => sub { $self->emit ("delete") };	1317	on_activate => sub { $self->emit ("delete") };
1102		1318
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1319	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1320	}
1105		1321
1106	$self	1322	$self
1107	}	1323	}
1108		1324
1109	sub add {	1325	sub add {
1110	my ($self, @widgets) = @_;	1326	my ($self, @widgets) = @_;
1111		1327
1112	$self->SUPER::add (@widgets);	1328	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1329	$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};	1330	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1331	}
1116		1332
1117	sub border {	1333	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1334	int $_[0]{border} * $::FONTSIZE
1119	}	1335	}
…		…
1227	$self->{motion}->($ev, $x, $y) if $self->{motion};	1443	$self->{motion}->($ev, $x, $y) if $self->{motion};
1228		1444
1229	! ! $self->{motion}	1445	! ! $self->{motion}
1230	}	1446	}
1231		1447
		1448	sub invoke_visibility_change {
		1449	my ($self, $visible) = @_;
		1450
		1451	delete $self->{motion} unless $visible;
		1452
		1453	0
		1454	}
		1455
1232	sub _draw {	1456	sub _draw {
1233	my ($self) = @_;	1457	my ($self) = @_;
1234		1458
1235	my $child = $self->{children}[0];	1459	my $child = $self->{children}[0];
1236		1460
…		…
1273	if $self->{close_button};	1497	if $self->{close_button};
1274	}	1498	}
1275		1499
1276	#############################################################################	1500	#############################################################################
1277		1501
1278	package CFClient::UI::Table;	1502	package CFPlus::UI::Table;
1279		1503
1280	our @ISA = CFClient::UI::Base::;	1504	our @ISA = CFPlus::UI::Base::;
1281		1505
1282	use List::Util qw(max sum);	1506	use List::Util qw(max sum);
1283		1507
1284	use CFClient::OpenGL;	1508	use CFPlus::OpenGL;
1285		1509
1286	sub new {	1510	sub new {
1287	my $class = shift;	1511	my $class = shift;
1288		1512
1289	$class->SUPER::new (	1513	$class->SUPER::new (
1290	col_expand => [],	1514	col_expand => [],
		1515	row_expand => [],
1291	@_,	1516	@_,
1292	)	1517	)
1293	}	1518	}
1294		1519
1295	sub children {	1520	sub children {
1296	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1521	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297	}	1522	}
1298		1523
1299	sub add {	1524	sub add {
1300	my ($self, $x, $y, $child) = @_;	1525	my ($self) = shift;
1301		1526
		1527	while (@_) {
		1528	my ($x, $y, $child) = splice @_, 0, 3, ();
1302	$child->set_parent ($self);	1529	$child->set_parent ($self);
1303	$self->{children}[$y][$x] = $child;	1530	$self->{children}[$y][$x] = $child;
		1531	}
1304		1532
		1533	$self->{force_realloc} = 1;
		1534	$self->{force_size_alloc} = 1;
1305	$self->realloc;	1535	$self->realloc;
1306	}	1536	}
1307		1537
1308	sub remove {	1538	sub remove {
1309	my ($self, $child) = @_;	1539	my ($self, $child) = @_;
…		…
1365	my ($ws, $hs) = $self->get_wh;	1595	my ($ws, $hs) = $self->get_wh;
1366		1596
1367	my $req_w = (sum @$ws) || 1;	1597	my $req_w = (sum @$ws) || 1;
1368	my $req_h = (sum @$hs) || 1;	1598	my $req_h = (sum @$hs) || 1;
1369		1599
1370	# TODO: nicer code && do row_expand	1600	# TODO: nicer code
1371	my @col_expand = @{$self->{col_expand}};	1601	my @col_expand = @{$self->{col_expand}};
1372	@col_expand = (1) x @$ws unless @col_expand;	1602	@col_expand = (1) x @$ws unless @col_expand;
1373	my $col_expand = (sum @col_expand) || 1;	1603	my $col_expand = (sum @col_expand) || 1;
1374		1604
1375	# linearly scale sizes
1376	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1605	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378		1606
1379	CFClient::UI::harmonize $ws;	1607	CFPlus::UI::harmonize $ws;
		1608
		1609	my @row_expand = @{$self->{row_expand}};
		1610	@row_expand = (1) x @$ws unless @row_expand;
		1611	my $row_expand = (sum @row_expand) || 1;
		1612
		1613	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1614
1380	CFClient::UI::harmonize $hs;	1615	CFPlus::UI::harmonize $hs;
1381		1616
1382	my $y;	1617	my $y;
1383		1618
1384	for my $r (0 .. $#{$self->{children}}) {	1619	for my $r (0 .. $#{$self->{children}}) {
1385	my $row = $self->{children}[$r]	1620	my $row = $self->{children}[$r]
…		…
1428	}	1663	}
1429	}	1664	}
1430		1665
1431	#############################################################################	1666	#############################################################################
1432		1667
1433	package CFClient::UI::Box;	1668	package CFPlus::UI::Box;
1434		1669
1435	our @ISA = CFClient::UI::Container::;	1670	our @ISA = CFPlus::UI::Container::;
1436		1671
1437	sub size_request {	1672	sub size_request {
1438	my ($self) = @_;	1673	my ($self) = @_;
1439		1674
1440	$self->{vertical}	1675	$self->{vertical}
…		…
1473	$req[$_] += $space * $children[$_]{expand}	1708	$req[$_] += $space * $children[$_]{expand}
1474	for 0 .. $#children;	1709	for 0 .. $#children;
1475	}	1710	}
1476	}	1711	}
1477		1712
1478	CFClient::UI::harmonize \@req;	1713	CFPlus::UI::harmonize \@req;
1479		1714
1480	my $pos = 0;	1715	my $pos = 0;
1481	for (0 .. $#children) {	1716	for (0 .. $#children) {
1482	my $alloc = $req[$_];	1717	my $alloc = $req[$_];
1483	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1718	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1488	1	1723	1
1489	}	1724	}
1490		1725
1491	#############################################################################	1726	#############################################################################
1492		1727
1493	package CFClient::UI::HBox;	1728	package CFPlus::UI::HBox;
1494		1729
1495	our @ISA = CFClient::UI::Box::;	1730	our @ISA = CFPlus::UI::Box::;
1496		1731
1497	sub new {	1732	sub new {
1498	my $class = shift;	1733	my $class = shift;
1499		1734
1500	$class->SUPER::new (	1735	$class->SUPER::new (
…		…
1503	)	1738	)
1504	}	1739	}
1505		1740
1506	#############################################################################	1741	#############################################################################
1507		1742
1508	package CFClient::UI::VBox;	1743	package CFPlus::UI::VBox;
1509		1744
1510	our @ISA = CFClient::UI::Box::;	1745	our @ISA = CFPlus::UI::Box::;
1511		1746
1512	sub new {	1747	sub new {
1513	my $class = shift;	1748	my $class = shift;
1514		1749
1515	$class->SUPER::new (	1750	$class->SUPER::new (
…		…
1518	)	1753	)
1519	}	1754	}
1520		1755
1521	#############################################################################	1756	#############################################################################
1522		1757
1523	package CFClient::UI::Label;	1758	package CFPlus::UI::Label;
1524		1759
1525	our @ISA = CFClient::UI::DrawBG::;	1760	our @ISA = CFPlus::UI::DrawBG::;
1526		1761
1527	use CFClient::OpenGL;	1762	use CFPlus::OpenGL;
1528		1763
1529	sub new {	1764	sub new {
1530	my ($class, %arg) = @_;	1765	my ($class, %arg) = @_;
1531		1766
1532	my $self = $class->SUPER::new (	1767	my $self = $class->SUPER::new (
…		…
1535	#active_bg => none	1770	#active_bg => none
1536	#font => default_font	1771	#font => default_font
1537	#text => initial text	1772	#text => initial text
1538	#markup => initial narkup	1773	#markup => initial narkup
1539	#max_w => maximum pixel width	1774	#max_w => maximum pixel width
		1775	#style => 0, # render flags
1540	ellipsise => 3, # end	1776	ellipsise => 3, # end
1541	layout => (new CFClient::Layout),	1777	layout => (new CFPlus::Layout),
1542	fontsize => 1,	1778	fontsize => 1,
1543	align => -1,	1779	align => -1,
1544	valign => -1,	1780	valign => -1,
1545	padding_x => 2,	1781	padding_x => 2,
1546	padding_y => 2,	1782	padding_y => 2,
1547	can_events => 0,	1783	can_events => 0,
1548	%arg	1784	%arg
1549	);	1785	);
1550		1786
1551	if (exists $self->{template}) {	1787	if (exists $self->{template}) {
1552	my $layout = new CFClient::Layout;	1788	my $layout = new CFPlus::Layout;
1553	$layout->set_text (delete $self->{template});	1789	$layout->set_text (delete $self->{template});
1554	$self->{template} = $layout;	1790	$self->{template} = $layout;
1555	}	1791	}
1556		1792
1557	if (exists $self->{markup}) {	1793	if (exists $self->{markup}) {
…		…
1559	} else {	1795	} else {
1560	$self->set_text (delete $self->{text});	1796	$self->set_text (delete $self->{text});
1561	}	1797	}
1562		1798
1563	$self	1799	$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	}	1800	}
1575		1801
1576	sub update {	1802	sub update {
1577	my ($self) = @_;	1803	my ($self) = @_;
1578		1804
…		…
1705	};	1931	};
1706		1932
1707	my $w = List::Util::min $self->{w} + 4, $size->[0];	1933	my $w = List::Util::min $self->{w} + 4, $size->[0];
1708	my $h = List::Util::min $self->{h} + 2, $size->[1];	1934	my $h = List::Util::min $self->{h} + 2, $size->[1];
1709		1935
1710	$self->{layout}->render ($self->{ox}, $self->{oy});	1936	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1711	}	1937	}
1712		1938
1713	#############################################################################	1939	#############################################################################
1714		1940
1715	package CFClient::UI::EntryBase;	1941	package CFPlus::UI::EntryBase;
1716		1942
1717	our @ISA = CFClient::UI::Label::;	1943	our @ISA = CFPlus::UI::Label::;
1718		1944
1719	use CFClient::OpenGL;	1945	use CFPlus::OpenGL;
1720		1946
1721	sub new {	1947	sub new {
1722	my $class = shift;	1948	my $class = shift;
1723		1949
1724	$class->SUPER::new (	1950	$class->SUPER::new (
…		…
1728	active_fg => [0, 0, 0],	1954	active_fg => [0, 0, 0],
1729	can_hover => 1,	1955	can_hover => 1,
1730	can_focus => 1,	1956	can_focus => 1,
1731	valign => 0,	1957	valign => 0,
1732	can_events => 1,	1958	can_events => 1,
		1959	ellipsise => 0,
1733	#text => ...	1960	#text => ...
1734	#hidden => "*",	1961	#hidden => "*",
1735	@_	1962	@_
1736	)	1963	)
1737	}	1964	}
…		…
1782	my $sym = $ev->{sym};	2009	my $sym = $ev->{sym};
1783	my $uni = $ev->{unicode};	2010	my $uni = $ev->{unicode};
1784		2011
1785	my $text = $self->get_text;	2012	my $text = $self->get_text;
1786		2013
		2014	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2015
1787	if ($uni == 8) {	2016	if ($uni == 8) {
1788	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2017	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789	} elsif ($uni == 127) {	2018	} elsif ($uni == 127) {
1790	substr $text, $self->{cursor}, 1, "";	2019	substr $text, $self->{cursor}, 1, "";
1791	} elsif ($sym == CFClient::SDLK_LEFT) {	2020	} elsif ($sym == CFPlus::SDLK_LEFT) {
1792	--$self->{cursor} if $self->{cursor};	2021	--$self->{cursor} if $self->{cursor};
1793	} elsif ($sym == CFClient::SDLK_RIGHT) {	2022	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1794	++$self->{cursor} if $self->{cursor} < length $self->{text};	2023	++$self->{cursor} if $self->{cursor} < length $self->{text};
1795	} elsif ($sym == CFClient::SDLK_HOME) {	2024	} elsif ($sym == CFPlus::SDLK_HOME) {
		2025	# what a hack
		2026	$self->{cursor} =
		2027	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2028	? length $1
		2029	: 0;
		2030	} elsif ($sym == CFPlus::SDLK_END) {
		2031	# uh, again
		2032	$self->{cursor} =
		2033	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2034	? $self->{cursor} + length $1
		2035	: length $self->{text};
		2036	} elsif ($uni == 21) { # ctrl-u
		2037	$text = "";
1796	$self->{cursor} = 0;	2038	$self->{cursor} = 0;
1797	} elsif ($sym == CFClient::SDLK_END) {
1798	$self->{cursor} = length $text;
1799	} elsif ($uni == 27) {	2039	} elsif ($uni == 27) {
1800	$self->emit ('escape');	2040	$self->emit ('escape');
1801	} elsif ($uni) {	2041	} elsif ($uni == 0x0d) {
		2042	substr $text, $self->{cursor}++, 0, "\012";
		2043	} elsif ($uni >= 0x20) {
1802	substr $text, $self->{cursor}++, 0, chr $uni;	2044	substr $text, $self->{cursor}++, 0, chr $uni;
1803	} else {	2045	} else {
1804	return 0;	2046	return 0;
1805	}	2047	}
1806		2048
1807	$self->_set_text ($text);	2049	$self->_set_text ($text);
1808		2050
1809	$self->realloc;	2051	$self->realloc;
		2052	$self->update;
1810		2053
1811	1	2054	1
1812	}	2055	}
1813		2056
1814	sub invoke_focus_in {	2057	sub invoke_focus_in {
…		…
1826		2069
1827	my $idx = $self->{layout}->xy_to_index ($x, $y);	2070	my $idx = $self->{layout}->xy_to_index ($x, $y);
1828		2071
1829	# byte-index to char-index	2072	# byte-index to char-index
1830	my $text = $self->{text};	2073	my $text = $self->{text};
1831	utf8::encode $text;	2074	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832	$self->{cursor} = length substr $text, 0, $idx;	2075	$self->{cursor} = length $text;
1833		2076
1834	$self->_set_text ($self->{text});	2077	$self->_set_text ($self->{text});
1835	$self->update;	2078	$self->update;
1836		2079
1837	1	2080	1
…		…
1876	utf8::encode $text;	2119	utf8::encode $text;
1877		2120
1878	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2121	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879	}	2122	}
1880		2123
1881	glColor @{$self->{fg}};
1882	glBegin GL_LINES;	2124	glBegin GL_LINES;
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2125	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2126	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885	glEnd;	2127	glEnd;
1886	}	2128	}
1887	}	2129	}
1888		2130
		2131	#############################################################################
		2132
1889	package CFClient::UI::Entry;	2133	package CFPlus::UI::Entry;
1890		2134
1891	our @ISA = CFClient::UI::EntryBase::;	2135	our @ISA = CFPlus::UI::EntryBase::;
1892		2136
1893	use CFClient::OpenGL;	2137	use CFPlus::OpenGL;
1894		2138
1895	sub invoke_key_down {	2139	sub invoke_key_down {
1896	my ($self, $ev) = @_;	2140	my ($self, $ev) = @_;
1897		2141
1898	my $sym = $ev->{sym};	2142	my $sym = $ev->{sym};
1899		2143
1900	if ($sym == 13) {	2144	if ($ev->{uni} == 0x0d || $sym == 13) {
1901	unshift @{$self->{history}},	2145	unshift @{$self->{history}},
1902	my $txt = $self->get_text;	2146	my $txt = $self->get_text;
1903		2147
1904	$self->{history_pointer} = -1;	2148	$self->{history_pointer} = -1;
1905	$self->{history_saveback} = '';	2149	$self->{history_saveback} = '';
1906	$self->emit (activate => $txt);	2150	$self->emit (activate => $txt);
1907	$self->update;	2151	$self->update;
1908		2152
1909	} elsif ($sym == CFClient::SDLK_UP) {	2153	} elsif ($sym == CFPlus::SDLK_UP) {
1910	if ($self->{history_pointer} < 0) {	2154	if ($self->{history_pointer} < 0) {
1911	$self->{history_saveback} = $self->get_text;	2155	$self->{history_saveback} = $self->get_text;
1912	}	2156	}
1913	if (@{$self->{history} || []} > 0) {	2157	if (@{$self->{history} || []} > 0) {
1914	$self->{history_pointer}++;	2158	$self->{history_pointer}++;
…		…
1916	$self->{history_pointer} = @{$self->{history} || []} - 1;	2160	$self->{history_pointer} = @{$self->{history} || []} - 1;
1917	}	2161	}
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2162	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1919	}	2163	}
1920		2164
1921	} elsif ($sym == CFClient::SDLK_DOWN) {	2165	} elsif ($sym == CFPlus::SDLK_DOWN) {
1922	$self->{history_pointer}--;	2166	$self->{history_pointer}--;
1923	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2167	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924		2168
1925	if ($self->{history_pointer} >= 0) {	2169	if ($self->{history_pointer} >= 0) {
1926	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2170	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1935	1	2179	1
1936	}	2180	}
1937		2181
1938	#############################################################################	2182	#############################################################################
1939		2183
		2184	package CFPlus::UI::TextEdit;
		2185
		2186	our @ISA = CFPlus::UI::EntryBase::;
		2187
		2188	use CFPlus::OpenGL;
		2189
		2190	sub move_cursor_ver {
		2191	my ($self, $dy) = @_;
		2192
		2193	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2194
		2195	$y += $dy;
		2196
		2197	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2198	$self->{cursor} = $index;
		2199	delete $self->{cur_h};
		2200	$self->update;
		2201	return;
		2202	}
		2203	}
		2204
		2205	sub invoke_key_down {
		2206	my ($self, $ev) = @_;
		2207
		2208	my $sym = $ev->{sym};
		2209
		2210	if ($sym == CFPlus::SDLK_UP) {
		2211	$self->move_cursor_ver (-1);
		2212	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2213	$self->move_cursor_ver (+1);
		2214	} else {
		2215	return $self->SUPER::invoke_key_down ($ev)
		2216	}
		2217
		2218	1
		2219	}
		2220
		2221	#############################################################################
		2222
1940	package CFClient::UI::Button;	2223	package CFPlus::UI::Button;
1941		2224
1942	our @ISA = CFClient::UI::Label::;	2225	our @ISA = CFPlus::UI::Label::;
1943		2226
1944	use CFClient::OpenGL;	2227	use CFPlus::OpenGL;
1945		2228
1946	my @tex =	2229	my @tex =
1947	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2230	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948	qw(b1_button_active.png);	2231	qw(b1_button_active.png);
1949		2232
1950	sub new {	2233	sub new {
1951	my $class = shift;	2234	my $class = shift;
1952		2235
…		…
1989	$self->SUPER::_draw;	2272	$self->SUPER::_draw;
1990	}	2273	}
1991		2274
1992	#############################################################################	2275	#############################################################################
1993		2276
		2277	package CFPlus::UI::CheckBox;
		2278
		2279	our @ISA = CFPlus::UI::DrawBG::;
		2280
		2281	my @tex =
		2282	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2283	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2284
		2285	use CFPlus::OpenGL;
		2286
		2287	sub new {
		2288	my $class = shift;
		2289
		2290	$class->SUPER::new (
		2291	padding_x => 2,
		2292	padding_y => 2,
		2293	fg => [1, 1, 1],
		2294	active_fg => [1, 1, 0],
		2295	bg => [0, 0, 0, 0.2],
		2296	active_bg => [1, 1, 1, 0.5],
		2297	state => 0,
		2298	can_hover => 1,
		2299	@_
		2300	)
		2301	}
		2302
		2303	sub size_request {
		2304	my ($self) = @_;
		2305
		2306	(6) x 2
		2307	}
		2308
		2309	sub toggle {
		2310	my ($self) = @_;
		2311
		2312	$self->{state} = !$self->{state};
		2313	$self->emit (changed => $self->{state});
		2314	$self->update;
		2315	}
		2316
		2317	sub invoke_button_down {
		2318	my ($self, $ev, $x, $y) = @_;
		2319
		2320	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2321	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2322	$self->toggle;
		2323	} else {
		2324	return 0
		2325	}
		2326
		2327	1
		2328	}
		2329
		2330	sub _draw {
		2331	my ($self) = @_;
		2332
		2333	$self->SUPER::_draw;
		2334
		2335	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2336
		2337	my ($w, $h) = @$self{qw(w h)};
		2338
		2339	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2340
		2341	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2342
		2343	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2344
		2345	glEnable GL_TEXTURE_2D;
		2346	$tex->draw_quad_alpha (0, 0, $s, $s);
		2347	glDisable GL_TEXTURE_2D;
		2348	}
		2349
		2350	#############################################################################
		2351
		2352	package CFPlus::UI::Image;
		2353
		2354	our @ISA = CFPlus::UI::Base::;
		2355
		2356	use CFPlus::OpenGL;
		2357
		2358	our %texture_cache;
		2359
		2360	sub new {
		2361	my $class = shift;
		2362
		2363	my $self = $class->SUPER::new (
		2364	can_events => 0,
		2365	@_,
		2366	);
		2367
		2368	$self->{path} || $self->{tex}
		2369	or Carp::croak "'path' or 'tex' attributes required";
		2370
		2371	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2372	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2373
		2374	CFPlus::weaken $texture_cache{$self->{path}};
		2375
		2376	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2377
		2378	$self
		2379	}
		2380
		2381	sub STORABLE_freeze {
		2382	my ($self, $cloning) = @_;
		2383
		2384	$self->{path}
		2385	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2386
		2387	$self->{path}
		2388	}
		2389
		2390	sub STORABLE_attach {
		2391	my ($self, $cloning, $path) = @_;
		2392
		2393	$self->new (path => $path)
		2394	}
		2395
		2396	sub size_request {
		2397	my ($self) = @_;
		2398
		2399	($self->{tex}{w}, $self->{tex}{h})
		2400	}
		2401
		2402	sub _draw {
		2403	my ($self) = @_;
		2404
		2405	my $tex = $self->{tex};
		2406
		2407	my ($w, $h) = ($self->{w}, $self->{h});
		2408
		2409	if ($self->{rot90}) {
		2410	glRotate 90, 0, 0, 1;
		2411	glTranslate 0, -$self->{w}, 0;
		2412
		2413	($w, $h) = ($h, $w);
		2414	}
		2415
		2416	glEnable GL_TEXTURE_2D;
		2417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2418
		2419	$tex->draw_quad (0, 0, $w, $h);
		2420
		2421	glDisable GL_TEXTURE_2D;
		2422	}
		2423
		2424	#############################################################################
		2425
1994	package CFClient::UI::ImageButton;	2426	package CFPlus::UI::ImageButton;
1995		2427
1996	our @ISA = CFClient::UI::Image::;	2428	our @ISA = CFPlus::UI::Image::;
1997		2429
1998	use CFClient::OpenGL;	2430	use CFPlus::OpenGL;
1999		2431
2000	my %textures;	2432	my %textures;
2001		2433
2002	sub new {	2434	sub new {
2003	my $class = shift;	2435	my $class = shift;
…		…
2025	1	2457	1
2026	}	2458	}
2027		2459
2028	#############################################################################	2460	#############################################################################
2029		2461
2030	package CFClient::UI::CheckBox;
2031
2032	our @ISA = CFClient::UI::DrawBG::;
2033
2034	my @tex =
2035	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038	use CFClient::OpenGL;
2039
2040	sub new {
2041	my $class = shift;
2042
2043	$class->SUPER::new (
2044	padding_x => 2,
2045	padding_y => 2,
2046	fg => [1, 1, 1],
2047	active_fg => [1, 1, 0],
2048	bg => [0, 0, 0, 0.2],
2049	active_bg => [1, 1, 1, 0.5],
2050	state => 0,
2051	can_hover => 1,
2052	@_
2053	)
2054	}
2055
2056	sub size_request {
2057	my ($self) = @_;
2058
2059	(6) x 2
2060	}
2061
2062	sub toggle {
2063	my ($self) = @_;
2064
2065	$self->{state} = !$self->{state};
2066	$self->emit (changed => $self->{state});
2067	$self->update;
2068	}
2069
2070	sub invoke_button_down {
2071	my ($self, $ev, $x, $y) = @_;
2072
2073	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2074	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2075	$self->toggle;
2076	} else {
2077	return 0
2078	}
2079
2080	1
2081	}
2082
2083	sub _draw {
2084	my ($self) = @_;
2085
2086	$self->SUPER::_draw;
2087
2088	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2089
2090	my ($w, $h) = @$self{qw(w h)};
2091
2092	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2093
2094	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2095
2096	my $tex = $self->{state} ? $tex[1] : $tex[0];
2097
2098	glEnable GL_TEXTURE_2D;
2099	$tex->draw_quad_alpha (0, 0, $s, $s);
2100	glDisable GL_TEXTURE_2D;
2101	}
2102
2103	#############################################################################
2104
2105	package CFClient::UI::Image;	2462	package CFPlus::UI::VGauge;
2106		2463
2107	our @ISA = CFClient::UI::Base::;	2464	our @ISA = CFPlus::UI::Base::;
2108
2109	use CFClient::OpenGL;
2110
2111	our %texture_cache;
2112
2113	sub new {
2114	my $class = shift;
2115
2116	my $self = $class->SUPER::new (
2117	can_events => 0,
2118	@_,
2119	);
2120
2121	$self->{path}
2122	or Carp::croak "required attribute 'path' not set";
2123
2124	$self->{tex} = $texture_cache{$self->{path}} ||=
2125	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2126
2127	Scalar::Util::weaken $texture_cache{$self->{path}};
2128
2129	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2130
2131	$self
2132	}
2133
2134	sub size_request {
2135	my ($self) = @_;
2136
2137	($self->{tex}{w}, $self->{tex}{h})
2138	}
2139
2140	sub _draw {
2141	my ($self) = @_;
2142
2143	my $tex = $self->{tex};
2144
2145	my ($w, $h) = ($self->{w}, $self->{h});
2146
2147	if ($self->{rot90}) {
2148	glRotate 90, 0, 0, 1;
2149	glTranslate 0, -$self->{w}, 0;
2150
2151	($w, $h) = ($h, $w);
2152	}
2153
2154	glEnable GL_TEXTURE_2D;
2155	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156
2157	$tex->draw_quad_alpha (0, 0, $w, $h);
2158
2159	glDisable GL_TEXTURE_2D;
2160	}
2161
2162	#############################################################################
2163
2164	package CFClient::UI::VGauge;
2165
2166	our @ISA = CFClient::UI::Base::;
2167		2465
2168	use List::Util qw(min max);	2466	use List::Util qw(min max);
2169		2467
2170	use CFClient::OpenGL;	2468	use CFPlus::OpenGL;
2171		2469
2172	my %tex = (	2470	my %tex = (
2173	food => [	2471	food => [
2174	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2472	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2473	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2176	],	2474	],
2177	grace => [	2475	grace => [
2178	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2476	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2477	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2180	],	2478	],
2181	hp => [	2479	hp => [
2182	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2480	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2481	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2184	],	2482	],
2185	mana => [	2483	mana => [
2186	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2484	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2485	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2188	],	2486	],
2189	);	2487	);
2190		2488
2191	# eg. VGauge->new (gauge => 'food'), default gauge: food	2489	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2294	glDisable GL_TEXTURE_2D;	2592	glDisable GL_TEXTURE_2D;
2295	}	2593	}
2296		2594
2297	#############################################################################	2595	#############################################################################
2298		2596
2299	package CFClient::UI::Gauge;	2597	package CFPlus::UI::Gauge;
2300		2598
2301	our @ISA = CFClient::UI::VBox::;	2599	our @ISA = CFPlus::UI::VBox::;
2302		2600
2303	sub new {	2601	sub new {
2304	my ($class, %arg) = @_;	2602	my ($class, %arg) = @_;
2305		2603
2306	my $self = $class->SUPER::new (	2604	my $self = $class->SUPER::new (
…		…
2308	can_hover => 1,	2606	can_hover => 1,
2309	can_events => 1,	2607	can_events => 1,
2310	%arg,	2608	%arg,
2311	);	2609	);
2312		2610
2313	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2611	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2314	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2612	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2315	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2613	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2316		2614
2317	$self	2615	$self
2318	}	2616	}
2319		2617
2320	sub set_fontsize {	2618	sub set_fontsize {
…		…
2341	$self->{value}->set_text ($val);	2639	$self->{value}->set_text ($val);
2342	}	2640	}
2343		2641
2344	#############################################################################	2642	#############################################################################
2345		2643
2346	package CFClient::UI::Slider;	2644	package CFPlus::UI::Slider;
2347		2645
2348	use strict;	2646	use strict;
2349		2647
2350	use CFClient::OpenGL;	2648	use CFPlus::OpenGL;
2351		2649
2352	our @ISA = CFClient::UI::DrawBG::;	2650	our @ISA = CFPlus::UI::DrawBG::;
2353		2651
2354	my @tex =	2652	my @tex =
2355	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2653	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2356	qw(s1_slider.png s1_slider_bg.png);	2654	qw(s1_slider.png s1_slider_bg.png);
2357		2655
2358	sub new {	2656	sub new {
2359	my $class = shift;	2657	my $class = shift;
2360		2658
…		…
2449	}	2747	}
2450		2748
2451	1	2749	1
2452	}	2750	}
2453		2751
		2752	sub invoke_mouse_wheel {
		2753	my ($self, $ev) = @_;
		2754
		2755	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2756
		2757	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2758
		2759	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2760
		2761	! ! $delta
		2762	}
		2763
2454	sub update {	2764	sub update {
2455	my ($self) = @_;	2765	my ($self) = @_;
2456		2766
2457	delete $self->{knob_w};	2767	delete $self->{knob_w};
2458	$self->SUPER::update;	2768	$self->SUPER::update;
…		…
2505	glDisable GL_TEXTURE_2D;	2815	glDisable GL_TEXTURE_2D;
2506	}	2816	}
2507		2817
2508	#############################################################################	2818	#############################################################################
2509		2819
2510	package CFClient::UI::ValSlider;	2820	package CFPlus::UI::ValSlider;
2511		2821
2512	our @ISA = CFClient::UI::HBox::;	2822	our @ISA = CFPlus::UI::HBox::;
2513		2823
2514	sub new {	2824	sub new {
2515	my ($class, %arg) = @_;	2825	my ($class, %arg) = @_;
2516		2826
2517	my $range = delete $arg{range};	2827	my $range = delete $arg{range};
2518		2828
2519	my $self = $class->SUPER::new (	2829	my $self = $class->SUPER::new (
2520	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2830	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2521	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2831	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2522	to_value => sub { shift },	2832	to_value => sub { shift },
2523	from_value => sub { shift },	2833	from_value => sub { shift },
2524	%arg,	2834	%arg,
2525	);	2835	);
2526		2836
…		…
2546	sub set_range { shift->{slider}->set_range (@_) }	2856	sub set_range { shift->{slider}->set_range (@_) }
2547	sub set_value { shift->{slider}->set_value (@_) }	2857	sub set_value { shift->{slider}->set_value (@_) }
2548		2858
2549	#############################################################################	2859	#############################################################################
2550		2860
2551	package CFClient::UI::TextScroller;	2861	package CFPlus::UI::TextScroller;
2552		2862
2553	our @ISA = CFClient::UI::HBox::;	2863	our @ISA = CFPlus::UI::HBox::;
2554		2864
2555	use CFClient::OpenGL;	2865	use CFPlus::OpenGL;
2556		2866
2557	sub new {	2867	sub new {
2558	my $class = shift;	2868	my $class = shift;
2559		2869
2560	my $self = $class->SUPER::new (	2870	my $self = $class->SUPER::new (
2561	fontsize => 1,	2871	fontsize => 1,
2562	can_events => 0,	2872	can_events => 1,
2563	indent => 0,	2873	indent => 0,
2564	#font => default_font	2874	#font => default_font
2565	@_,	2875	@_,
2566		2876
2567	layout => (new CFClient::Layout),	2877	layout => (new CFPlus::Layout),
2568	par => [],	2878	par => [],
		2879	max_par => 0,
2569	height => 0,	2880	height => 0,
2570	children => [	2881	children => [
2571	(new CFClient::UI::Empty expand => 1),	2882	(new CFPlus::UI::Empty expand => 1),
2572	(new CFClient::UI::Slider vertical => 1),	2883	(new CFPlus::UI::Slider vertical => 1),
2573	],	2884	],
2574	);	2885	);
2575		2886
2576	$self->{children}[1]->connect (changed => sub { $self->update });	2887	$self->{children}[1]->connect (changed => sub { $self->update });
2577		2888
…		…
2607		2918
2608	$self->reflow;	2919	$self->reflow;
2609		2920
2610	local $self->{children} = [$empty, $slider];	2921	local $self->{children} = [$empty, $slider];
2611	$self->SUPER::invoke_size_allocate ($w, $h)	2922	$self->SUPER::invoke_size_allocate ($w, $h)
		2923	}
		2924
		2925	sub invoke_mouse_wheel {
		2926	my ($self, $ev) = @_;
		2927
		2928	return 0 unless $ev->{dy}; # only vertical movements
		2929
		2930	$self->{children}[1]->emit (mouse_wheel => $ev);
		2931
		2932	1
2612	}	2933	}
2613		2934
2614	sub get_layout {	2935	sub get_layout {
2615	my ($self, $para) = @_;	2936	my ($self, $para) = @_;
2616		2937
…		…
2644		2965
2645	# todo: base offset on lines or so, not on pixels	2966	# todo: base offset on lines or so, not on pixels
2646	$self->{children}[1]->set_value ($offset);	2967	$self->{children}[1]->set_value ($offset);
2647	}	2968	}
2648		2969
		2970	sub current_paragraph {
		2971	my ($self) = @_;
		2972
		2973	$self->{top_paragraph} - 1
		2974	}
		2975
		2976	sub scroll_to {
		2977	my ($self, $para) = @_;
		2978
		2979	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2980
		2981	$self->{scroll_to} = $para;
		2982	$self->update;
		2983	}
		2984
2649	sub clear {	2985	sub clear {
2650	my ($self) = @_;	2986	my ($self) = @_;
2651		2987
2652	my (undef, undef, @other) = @{ $self->{children} };	2988	my (undef, undef, @other) = @{ $self->{children} };
2653	$self->remove ($_) for @other;	2989	$self->remove ($_) for @other;
…		…
2656	$self->{height} = 0;	2992	$self->{height} = 0;
2657	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2993	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2658	}	2994	}
2659		2995
2660	sub add_paragraph {	2996	sub add_paragraph {
2661	my ($self, $color, $para, $indent) = @_;	2997	my $self = shift;
2662		2998
2663	my ($text, @w) = ref $para ? @$para : $para;	2999	for my $para (@_) {
2664
2665	$para = {	3000	$para = {
		3001	fg => [1, 1, 1, 1],
		3002	indent => 0,
		3003	markup => "",
		3004	widget => [],
		3005	ref $para ? %$para : (markup => $para),
2666	w => 1e10,	3006	w => 1e10,
2667	wrapped => 1,	3007	wrapped => 1,
2668	fg => $color,
2669	indent => $indent,
2670	markup => $text,
2671	widget => \@w,
2672	};	3008	};
2673		3009
2674	$self->add (@w) if @w;	3010	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2675	push @{$self->{par}}, $para;	3011	push @{$self->{par}}, $para;
		3012	}
		3013
		3014	if (my $max = $self->{max_par}) {
		3015	shift @{$self->{par}} while @{$self->{par}} > $max;
		3016	}
2676		3017
2677	$self->{need_reflow}++;	3018	$self->{need_reflow}++;
2678	$self->update;	3019	$self->update;
2679	}	3020	}
2680		3021
2681	sub scroll_to_bottom {	3022	sub scroll_to_bottom {
2682	my ($self) = @_;	3023	my ($self) = @_;
2683		3024
2684	$self->{scroll_to_bottom} = 1;	3025	$self->{scroll_to} = $#{$self->{par}};
2685	$self->update;	3026	$self->update;
2686	}	3027	}
2687		3028
		3029	sub force_uptodate {
		3030	my ($self) = @_;
		3031
		3032	if (delete $self->{need_reflow}) {
		3033	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3034
		3035	my $height = 0;
		3036
		3037	for my $para (@{$self->{par}}) {
		3038	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3039	my $layout = $self->get_layout ($para);
		3040	my ($w, $h) = $layout->size;
		3041
		3042	$para->{w} = $w + $para->{indent};
		3043	$para->{h} = $h;
		3044	$para->{wrapped} = $layout->has_wrapped;
		3045	}
		3046
		3047	$para->{y} = $height;
		3048	$height += $para->{h};
		3049	}
		3050
		3051	$self->{height} = $height;
		3052	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3053
		3054	delete $self->{texture};
		3055	}
		3056
		3057	if (my $paridx = delete $self->{scroll_to}) {
		3058	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3059	}
		3060	}
		3061
2688	sub update {	3062	sub update {
2689	my ($self) = @_;	3063	my ($self) = @_;
2690		3064
2691	$self->SUPER::update;	3065	$self->SUPER::update;
2692		3066
2693	return unless $self->{h} > 0;	3067	return unless $self->{h} > 0;
2694		3068
2695	delete $self->{texture};	3069	delete $self->{texture};
2696		3070
2697	$ROOT->on_post_alloc ($self => sub {	3071	$ROOT->on_post_alloc ($self => sub {
		3072	$self->force_uptodate;
		3073
2698	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3074	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2699		3075
2700	if (delete $self->{need_reflow}) {
2701	my $height = 0;
2702
2703	for my $para (@{$self->{par}}) {
2704	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2705	my $layout = $self->get_layout ($para);
2706	my ($w, $h) = $layout->size;
2707
2708	$para->{w} = $w + $para->{indent};
2709	$para->{h} = $h;
2710	$para->{wrapped} = $layout->has_wrapped;
2711	}
2712
2713	$height += $para->{h};
2714	}
2715
2716	$self->{height} = $height;
2717
2718	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2719
2720	delete $self->{texture};
2721	}
2722
2723	if (delete $self->{scroll_to_bottom}) {
2724	$self->{children}[1]->set_value (1e10);
2725	}
2726
2727	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3076	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2728	glClearColor 0, 0, 0, 0;	3077	glClearColor 0, 0, 0, 0;
2729	glClear GL_COLOR_BUFFER_BIT;	3078	glClear GL_COLOR_BUFFER_BIT;
2730		3079
		3080	package CFPlus::UI::Base;
		3081	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3082	(0, 0, $self->{w}, $self->{h});
		3083
		3084	my $top = int $self->{children}[1]{range}[0];
		3085
		3086	my $paridx = 0;
		3087	my $top_paragraph;
2731	my $top = int $self->{children}[1]{range}[0];	3088	my $top = int $self->{children}[1]{range}[0];
2732		3089
2733	my $y0 = $top;	3090	my $y0 = $top;
2734	my $y1 = $top + $H;	3091	my $y1 = $top + $H;
2735		3092
2736	my $y = 0;
2737
2738	for my $para (@{$self->{par}}) {	3093	for my $para (@{$self->{par}}) {
2739	my $h = $para->{h};	3094	my $h = $para->{h};
		3095	my $y = $para->{y};
2740		3096
2741	if ($y0 < $y + $h && $y < $y1) {	3097	if ($y0 < $y + $h && $y < $y1) {
2742
2743	my $layout = $self->get_layout ($para);	3098	my $layout = $self->get_layout ($para);
2744		3099
2745	$layout->render ($para->{indent}, $y - $y0);	3100	$layout->render ($para->{indent}, $y - $y0);
2746		3101
2747	if (my @w = @{ $para->{widget} }) {	3102	if (my @w = @{ $para->{widget} }) {
…		…
2756	$_->draw;	3111	$_->draw;
2757	}	3112	}
2758	}	3113	}
2759	}	3114	}
2760		3115
2761	$y += $h;	3116	$paridx++;
		3117	$top_paragraph ||= $paridx if $y >= $top;
2762	}	3118	}
		3119
		3120	$self->{top_paragraph} = $top_paragraph;
2763	};	3121	};
2764	});	3122	});
2765	}	3123	}
2766		3124
2767	sub reconfigure {	3125	sub reconfigure {
…		…
2785	$self->{children}[1]->draw;	3143	$self->{children}[1]->draw;
2786	}	3144	}
2787		3145
2788	#############################################################################	3146	#############################################################################
2789		3147
2790	package CFClient::UI::Animator;	3148	package CFPlus::UI::Animator;
2791		3149
2792	use CFClient::OpenGL;	3150	use CFPlus::OpenGL;
2793		3151
2794	our @ISA = CFClient::UI::Bin::;	3152	our @ISA = CFPlus::UI::Bin::;
2795		3153
2796	sub moveto {	3154	sub moveto {
2797	my ($self, $x, $y) = @_;	3155	my ($self, $x, $y) = @_;
2798		3156
2799	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3157	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2827	glPopMatrix;	3185	glPopMatrix;
2828	}	3186	}
2829		3187
2830	#############################################################################	3188	#############################################################################
2831		3189
2832	package CFClient::UI::Flopper;	3190	package CFPlus::UI::Flopper;
2833		3191
2834	our @ISA = CFClient::UI::Button::;	3192	our @ISA = CFPlus::UI::Button::;
2835		3193
2836	sub new {	3194	sub new {
2837	my $class = shift;	3195	my $class = shift;
2838		3196
2839	my $self = $class->SUPER::new (	3197	my $self = $class->SUPER::new (
…		…
2851	$self->{other}->toggle_visibility;	3209	$self->{other}->toggle_visibility;
2852	}	3210	}
2853		3211
2854	#############################################################################	3212	#############################################################################
2855		3213
2856	package CFClient::UI::Tooltip;	3214	package CFPlus::UI::Tooltip;
2857		3215
2858	our @ISA = CFClient::UI::Bin::;	3216	our @ISA = CFPlus::UI::Bin::;
2859		3217
2860	use CFClient::OpenGL;	3218	use CFPlus::OpenGL;
2861		3219
2862	sub new {	3220	sub new {
2863	my $class = shift;	3221	my $class = shift;
2864		3222
2865	$class->SUPER::new (	3223	$class->SUPER::new (
…		…
2868	)	3226	)
2869	}	3227	}
2870		3228
2871	sub set_tooltip_from {	3229	sub set_tooltip_from {
2872	my ($self, $widget) = @_;	3230	my ($self, $widget) = @_;
		3231
		3232	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3233	if $widget->{tooltip} =~ /^#(.*)$/;
2873		3234
2874	my $tooltip = $widget->{tooltip};	3235	my $tooltip = $widget->{tooltip};
2875		3236
2876	if ($ENV{CFPLUS_DEBUG} & 2) {	3237	if ($ENV{CFPLUS_DEBUG} & 2) {
2877	$tooltip .= "\n\n" . (ref $widget) . "\n"	3238	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2881	}	3242	}
2882		3243
2883	$tooltip =~ s/^\n+//;	3244	$tooltip =~ s/^\n+//;
2884	$tooltip =~ s/\n+$//;	3245	$tooltip =~ s/\n+$//;
2885		3246
2886	$self->add (new CFClient::UI::Label	3247	$self->add (new CFPlus::UI::Label
2887	markup => $tooltip,	3248	markup => $tooltip,
2888	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3249	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2889	fontsize => 0.8,	3250	fontsize => 0.8,
2890	fg => [0, 0, 0, 1],	3251	style => 1, # FLAG_INVERSE
2891	ellipsise => 0,	3252	ellipsise => 0,
2892	font => ($widget->{tooltip_font} || $::FONT_PROP),	3253	font => ($widget->{tooltip_font} || $::FONT_PROP),
2893	);	3254	);
2894	}	3255	}
2895		3256
…		…
2914		3275
2915	$self->{root}->on_post_alloc ("move_$self" => sub {	3276	$self->{root}->on_post_alloc ("move_$self" => sub {
2916	my $widget = $self->{owner}	3277	my $widget = $self->{owner}
2917	or return;	3278	or return;
2918		3279
		3280	if ($widget->{visible}) {
2919	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3281	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2920		3282
2921	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3283	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2922	if $x + $self->{w} > $self->{root}{w};	3284	if $x + $self->{w} > $self->{root}{w};
2923		3285
2924	$self->move_abs ($x, $y);	3286	$self->move_abs ($x, $y);
		3287	} else {
		3288	$self->hide;
		3289	}
2925	});	3290	});
2926	}	3291	}
2927		3292
2928	sub _draw {	3293	sub _draw {
2929	my ($self) = @_;	3294	my ($self) = @_;
…		…
2953	$self->SUPER::_draw;	3318	$self->SUPER::_draw;
2954	}	3319	}
2955		3320
2956	#############################################################################	3321	#############################################################################
2957		3322
2958	package CFClient::UI::Face;	3323	package CFPlus::UI::Face;
2959		3324
2960	our @ISA = CFClient::UI::Base::;	3325	our @ISA = CFPlus::UI::DrawBG::;
2961		3326
2962	use CFClient::OpenGL;	3327	use CFPlus::OpenGL;
2963		3328
2964	sub new {	3329	sub new {
2965	my $class = shift;	3330	my $class = shift;
2966		3331
2967	my $self = $class->SUPER::new (	3332	my $self = $class->SUPER::new (
…		…
2969	can_events => 0,	3334	can_events => 0,
2970	@_,	3335	@_,
2971	);	3336	);
2972		3337
2973	if ($self->{anim} && $self->{animspeed}) {	3338	if ($self->{anim} && $self->{animspeed}) {
2974	Scalar::Util::weaken (my $widget = $self);	3339	CFPlus::weaken (my $widget = $self);
2975		3340
2976	$self->{timer} = Event->timer (	3341	$self->{timer} = Event->timer (
2977	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3342	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2978	hard => 1,	3343	hard => 1,
2979	interval => $self->{animspeed},	3344	interval => $self->{animspeed},
2980	cb => sub {	3345	cb => sub {
		3346	delete $self->{wait_face};
2981	++$widget->{frame};	3347	++$widget->{frame};
2982	$widget->update;	3348	$widget->update;
2983	},	3349	},
2984	);	3350	);
2985	}	3351	}
…		…
3002	sub _draw {	3368	sub _draw {
3003	my ($self) = @_;	3369	my ($self) = @_;
3004		3370
3005	return unless $::CONN;	3371	return unless $::CONN;
3006		3372
		3373	$self->SUPER::_draw;
		3374
3007	my $face;	3375	my $face;
3008		3376
3009	if ($self->{frame}) {	3377	if ($self->{frame}) {
3010	my $anim = $::CONN->{anim}[$self->{anim}];	3378	my $anim = $::CONN->{anim}[$self->{anim}];
3011		3379
3012	$face = $anim->[ $self->{frame} % @$anim ]	3380	$face = $anim->[ $self->{frame} % @$anim ]
3013	if $anim && @$anim;	3381	if $anim && @$anim;
3014	}	3382	}
		3383
		3384	my $faceid = $::CONN->{faceid}[$face || $self->{face}]
		3385	or return;
3015		3386
3016	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3387	my $tex = $::CONN->{texture}[$faceid];
3017		3388
3018	if ($tex) {	3389	if ($tex) {
3019	glEnable GL_TEXTURE_2D;	3390	glEnable GL_TEXTURE_2D;
3020	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3021	glColor 0, 0, 0, 1;	3392	glColor 0, 0, 0, 1;
3022	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3393	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3023	glDisable GL_TEXTURE_2D;	3394	glDisable GL_TEXTURE_2D;
		3395	} else {
		3396	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3397	$self->update;
		3398	});
3024	}	3399	}
3025	}	3400	}
3026		3401
3027	sub destroy {	3402	sub destroy {
3028	my ($self) = @_;	3403	my ($self) = @_;
…		…
3033	$self->SUPER::destroy;	3408	$self->SUPER::destroy;
3034	}	3409	}
3035		3410
3036	#############################################################################	3411	#############################################################################
3037		3412
3038	package CFClient::UI::Buttonbar;	3413	package CFPlus::UI::Buttonbar;
3039		3414
3040	our @ISA = CFClient::UI::HBox::;	3415	our @ISA = CFPlus::UI::HBox::;
3041		3416
3042	# TODO: should actualyl wrap buttons and other goodies.	3417	# TODO: should actually wrap buttons and other goodies.
3043		3418
3044	#############################################################################	3419	#############################################################################
3045		3420
3046	package CFClient::UI::Menu;	3421	package CFPlus::UI::Menu;
3047		3422
3048	our @ISA = CFClient::UI::FancyFrame::;	3423	our @ISA = CFPlus::UI::Toplevel::;
3049		3424
3050	use CFClient::OpenGL;	3425	use CFPlus::OpenGL;
3051		3426
3052	sub new {	3427	sub new {
3053	my $class = shift;	3428	my $class = shift;
3054		3429
3055	my $self = $class->SUPER::new (	3430	my $self = $class->SUPER::new (
3056	items => [],	3431	items => [],
3057	z => 100,	3432	z => 100,
3058	@_,	3433	@_,
3059	);	3434	);
3060		3435
3061	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3436	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3062		3437
3063	for my $item (@{ $self->{items} }) {	3438	for my $item (@{ $self->{items} }) {
3064	my ($widget, $cb, $tooltip) = @$item;	3439	my ($widget, $cb, $tooltip) = @$item;
3065		3440
3066	# handle various types of items, only text for now	3441	# handle various types of items, only text for now
3067	if (!ref $widget) {	3442	if (!ref $widget) {
3068	if ($widget =~ /\t/) {	3443	if ($widget =~ /\t/) {
3069	my ($left, $right) = split /\t/, $widget, 2;	3444	my ($left, $right) = split /\t/, $widget, 2;
3070		3445
3071	$widget = new CFClient::UI::HBox	3446	$widget = new CFPlus::UI::HBox
3072	can_hover => 1,	3447	can_hover => 1,
3073	can_events => 1,	3448	can_events => 1,
3074	tooltip => $tooltip,	3449	tooltip => $tooltip,
3075	children => [	3450	children => [
3076	(new CFClient::UI::Label markup => $left, expand => 1),	3451	(new CFPlus::UI::Label markup => $left, expand => 1),
3077	(new CFClient::UI::Label markup => $right, align => +1),	3452	(new CFPlus::UI::Label markup => $right, align => +1),
3078	],	3453	],
3079	;	3454	;
3080		3455
3081	} else {	3456	} else {
3082	$widget = new CFClient::UI::Label	3457	$widget = new CFPlus::UI::Label
3083	can_hover => 1,	3458	can_hover => 1,
3084	can_events => 1,	3459	can_events => 1,
3085	markup => $widget,	3460	markup => $widget,
3086	tooltip => $tooltip;	3461	tooltip => $tooltip;
3087	}	3462	}
…		…
3135	1	3510	1
3136	}	3511	}
3137		3512
3138	#############################################################################	3513	#############################################################################
3139		3514
3140	package CFClient::UI::Multiplexer;	3515	package CFPlus::UI::Multiplexer;
3141		3516
3142	our @ISA = CFClient::UI::Container::;	3517	our @ISA = CFPlus::UI::Container::;
3143		3518
3144	sub new {	3519	sub new {
3145	my $class = shift;	3520	my $class = shift;
3146		3521
3147	my $self = $class->SUPER::new (	3522	my $self = $class->SUPER::new (
…		…
3208	$self->{current}->draw;	3583	$self->{current}->draw;
3209	}	3584	}
3210		3585
3211	#############################################################################	3586	#############################################################################
3212		3587
3213	package CFClient::UI::Notebook;	3588	package CFPlus::UI::Notebook;
3214		3589
3215	our @ISA = CFClient::UI::VBox::;	3590	our @ISA = CFPlus::UI::VBox::;
3216		3591
3217	sub new {	3592	sub new {
3218	my $class = shift;	3593	my $class = shift;
3219		3594
3220	my $self = $class->SUPER::new (	3595	my $self = $class->SUPER::new (
3221	buttonbar => (new CFClient::UI::Buttonbar),	3596	buttonbar => (new CFPlus::UI::Buttonbar),
3222	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3597	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3223	# filter => # will be put between multiplexer and $self	3598	# filter => # will be put between multiplexer and $self
3224	@_,	3599	@_,
3225	);	3600	);
3226		3601
3227	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3602	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3231	}	3606	}
3232		3607
3233	sub add {	3608	sub add {
3234	my ($self, $title, $widget, $tooltip) = @_;	3609	my ($self, $title, $widget, $tooltip) = @_;
3235		3610
3236	Scalar::Util::weaken $self;	3611	CFPlus::weaken $self;
3237		3612
3238	$self->{buttonbar}->add (new CFClient::UI::Button	3613	$self->{buttonbar}->add (new CFPlus::UI::Button
3239	markup => $title,	3614	markup => $title,
3240	tooltip => $tooltip,	3615	tooltip => $tooltip,
3241	on_activate => sub { $self->set_current_page ($widget) },	3616	on_activate => sub { $self->set_current_page ($widget) },
3242	);	3617	);
3243		3618
…		…
3257	$self->emit (page_changed => $self->{multiplexer}{current});	3632	$self->emit (page_changed => $self->{multiplexer}{current});
3258	}	3633	}
3259		3634
3260	#############################################################################	3635	#############################################################################
3261		3636
3262	package CFClient::UI::Combobox;	3637	package CFPlus::UI::Selector;
3263		3638
3264	use utf8;	3639	use utf8;
3265		3640
3266	our @ISA = CFClient::UI::Button::;	3641	our @ISA = CFPlus::UI::Button::;
3267		3642
3268	sub new {	3643	sub new {
3269	my $class = shift;	3644	my $class = shift;
3270		3645
3271	my $self = $class->SUPER::new (	3646	my $self = $class->SUPER::new (
…		…
3288	my ($value, $title, $tooltip) = @$_;	3663	my ($value, $title, $tooltip) = @$_;
3289		3664
3290	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3665	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3291	}	3666	}
3292		3667
3293	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3668	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3294	}	3669	}
3295		3670
3296	sub _set_value {	3671	sub _set_value {
3297	my ($self, $value) = @_;	3672	my ($self, $value) = @_;
3298		3673
…		…
3313	$self->emit (changed => $value);	3688	$self->emit (changed => $value);
3314	}	3689	}
3315		3690
3316	#############################################################################	3691	#############################################################################
3317		3692
3318	package CFClient::UI::Statusbox;	3693	package CFPlus::UI::Statusbox;
3319		3694
3320	our @ISA = CFClient::UI::VBox::;	3695	our @ISA = CFPlus::UI::VBox::;
3321		3696
3322	sub new {	3697	sub new {
3323	my $class = shift;	3698	my $class = shift;
3324		3699
3325	my $self = $class->SUPER::new (	3700	my $self = $class->SUPER::new (
3326	fontsize => 0.8,	3701	fontsize => 0.8,
3327	@_,	3702	@_,
3328	);	3703	);
3329		3704
3330	Scalar::Util::weaken (my $this = $self);	3705	CFPlus::weaken (my $this = $self);
3331		3706
3332	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3707	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3333		3708
3334	$self	3709	$self
3335	}	3710	}
…		…
3337	sub reorder {	3712	sub reorder {
3338	my ($self) = @_;	3713	my ($self) = @_;
3339	my $NOW = Time::HiRes::time;	3714	my $NOW = Time::HiRes::time;
3340		3715
3341	# freeze display when hovering over any label	3716	# freeze display when hovering over any label
3342	return if $CFClient::UI::TOOLTIP->{owner}	3717	return if $CFPlus::UI::TOOLTIP->{owner}
3343	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3718	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3344	values %{ $self->{item} };	3719	values %{ $self->{item} };
3345		3720
3346	while (my ($k, $v) = each %{ $self->{item} }) {	3721	while (my ($k, $v) = each %{ $self->{item} }) {
3347	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3722	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3348	}	3723	}
…		…
3369	for ($short) {	3744	for ($short) {
3370	s/^\s+//;	3745	s/^\s+//;
3371	s/\s+/ /g;	3746	s/\s+/ /g;
3372	}	3747	}
3373		3748
3374	new CFClient::UI::Label	3749	new CFPlus::UI::Label
3375	markup => $short,	3750	markup => $short,
3376	tooltip => $item->{tooltip},	3751	tooltip => $item->{tooltip},
3377	tooltip_font => $::FONT_PROP,	3752	tooltip_font => $::FONT_PROP,
3378	tooltip_width => 0.67,	3753	tooltip_width => 0.67,
3379	fontsize => $item->{fontsize} || $self->{fontsize},	3754	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3458	$self->SUPER::destroy;	3833	$self->SUPER::destroy;
3459	}	3834	}
3460		3835
3461	#############################################################################	3836	#############################################################################
3462		3837
3463	package CFClient::UI::Inventory;
3464
3465	our @ISA = CFClient::UI::Table::;
3466
3467	sub new {
3468	my $class = shift;
3469
3470	my $self = $class->SUPER::new (
3471	col_expand => [0, 1, 0],
3472	@_,
3473	);
3474
3475	$self
3476	}
3477
3478	sub set_items {
3479	my ($self, $items) = @_;
3480
3481	$self->clear;
3482	return unless $items;
3483
3484	my @items = sort {
3485	($a->{type} <=> $b->{type})
3486	or ($a->{name} cmp $b->{name})
3487	} values %$items;
3488
3489	$self->{real_items} = \@items;
3490
3491	my $row = 0;
3492	for my $item (@items) {
3493	CFClient::Item::update_widgets $item;
3494
3495	$self->add (0, $row, $item->{face_widget});
3496	$self->add (1, $row, $item->{desc_widget});
3497	$self->add (2, $row, $item->{weight_widget});
3498
3499	$row++;
3500	}
3501	}
3502
3503	#############################################################################
3504
3505	package CFClient::UI::SpellList;
3506
3507	our @ISA = CFClient::UI::Table::;
3508
3509	sub new {
3510	my $class = shift;
3511
3512	my $self = $class->SUPER::new (
3513	binding => [],
3514	commands => [],
3515	@_,
3516	)
3517	}
3518
3519	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3520
3521	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3522	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3523	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3525	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3526	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3527	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3529	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3531
3532	sub rebuild_spell_list {
3533	my ($self) = @_;
3534
3535	$CFClient::UI::ROOT->on_refresh ($self => sub {
3536	$self->clear;
3537
3538	return unless $::CONN;
3539
3540	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3541	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3542	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3543	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3544	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3545
3546	my $row = 0;
3547
3548	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3549	my $spell = $self->{spell}{$_};
3550
3551	$row++;
3552
3553	my $spell_cb = sub {
3554	my ($widget, $ev) = @_;
3555
3556	if ($ev->{button} == 1) {
3557	$::CONN->user_send ("cast $spell->{name}");
3558	} elsif ($ev->{button} == 2) {
3559	$::CONN->user_send ("invoke $spell->{name}");
3560	} elsif ($ev->{button} == 3) {
3561	(new CFClient::UI::Menu
3562	items => [
3563	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3564	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3565	],
3566	)->popup ($ev);
3567	} else {
3568	return 0;
3569	}
3570
3571	1
3572	};
3573
3574	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3575
3576	#TODO: add path info to tooltip
3577	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3578
3579	$self->add (0, $row, new CFClient::UI::Face
3580	face => $spell->{face},
3581	can_hover => 1,
3582	can_events => 1,
3583	tooltip => $tooltip,
3584	on_button_down => $spell_cb,
3585	);
3586
3587	$self->add (1, $row, new CFClient::UI::Label
3588	expand => 1,
3589	text => $spell->{name},
3590	can_hover => 1,
3591	can_events => 1,
3592	tooltip => $tooltip,
3593	on_button_down => $spell_cb,
3594	);
3595
3596	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600	}
3601	});
3602	}
3603
3604	sub add_spell {
3605	my ($self, $spell) = @_;
3606
3607	$self->{spell}->{$spell->{name}} = $spell;
3608	$self->rebuild_spell_list;
3609	}
3610
3611	sub remove_spell {
3612	my ($self, $spell) = @_;
3613
3614	delete $self->{spell}->{$spell->{name}};
3615	$self->rebuild_spell_list;
3616	}
3617
3618	sub clear_spells {
3619	my ($self) = @_;
3620
3621	$self->{spell} = {};
3622	$self->rebuild_spell_list;
3623	}
3624
3625	#############################################################################
3626
3627	package CFClient::UI::Root;	3838	package CFPlus::UI::Root;
3628		3839
3629	our @ISA = CFClient::UI::Container::;	3840	our @ISA = CFPlus::UI::Container::;
3630		3841
3631	use List::Util qw(min max);	3842	use List::Util qw(min max);
3632		3843
3633	use CFClient::OpenGL;	3844	use CFPlus::OpenGL;
3634		3845
3635	sub new {	3846	sub new {
3636	my $class = shift;	3847	my $class = shift;
3637		3848
3638	my $self = $class->SUPER::new (	3849	my $self = $class->SUPER::new (
3639	visible => 1,	3850	visible => 1,
3640	@_,	3851	@_,
3641	);	3852	);
3642		3853
3643	Scalar::Util::weaken ($self->{root} = $self);	3854	CFPlus::weaken ($self->{root} = $self);
3644		3855
3645	$self	3856	$self
3646	}	3857	}
3647		3858
3648	sub size_request {	3859	sub size_request {
…		…
3814	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4025	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3815		4026
3816	$w = 0 if $w < 0;	4027	$w = 0 if $w < 0;
3817	$h = 0 if $h < 0;	4028	$h = 0 if $h < 0;
3818		4029
		4030	$w = max $widget->{min_w}, $w;
		4031	$h = max $widget->{min_h}, $h;
		4032
		4033	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4034	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4035
		4036	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4037	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4038
3819	$w = int $w + 0.5;	4039	$w = int $w + 0.5;
3820	$h = int $h + 0.5;	4040	$h = int $h + 0.5;
3821		4041
3822	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4042	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3823	$widget->{old_w} = $widget->{w};	4043	$widget->{old_w} = $widget->{w};
…		…
3846	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4066	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3847	glMatrixMode GL_MODELVIEW;	4067	glMatrixMode GL_MODELVIEW;
3848	glLoadIdentity;	4068	glLoadIdentity;
3849		4069
3850	{	4070	{
3851	package CFClient::UI::Base;	4071	package CFPlus::UI::Base;
3852		4072
3853	($draw_x, $draw_y, $draw_w, $draw_h) =	4073	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3854	(0, 0, $self->{w}, $self->{h});	4074	(0, 0, $self->{w}, $self->{h});
3855	}
3856		4075
3857	$self->_draw;	4076	$self->_draw;
		4077	}
3858	}	4078	}
3859		4079
3860	#############################################################################	4080	#############################################################################
3861		4081
3862	package CFClient::UI;	4082	package CFPlus::UI;
3863		4083
3864	$ROOT = new CFClient::UI::Root;	4084	$ROOT = new CFPlus::UI::Root;
3865	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4085	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3866		4086
3867	1	4087	1
3868		4088

Diff Legend

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