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.322 by root, Wed Jul 5 01:53:24 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 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
		949	use List::Util qw(min max);
		950
873	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
874		952
875	sub new {	953	sub new {
876	my $class = shift;	954	my $class = shift;
877		955
878	$class->SUPER::new (	956	$class->SUPER::new (
…		…
908	}	986	}
909		987
910	sub set_offset {	988	sub set_offset {
911	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
912		990
913	$self->{view_x} = int $x;	991	$self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
914	$self->{view_y} = int $y;	992	$self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
915		993
		994	$self->emit (changed => $self->{view_x}, $self->{view_y});
916	$self->update;	995	$self->update;
917	}	996	}
918		997
919	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
920	sub coord2local {	999	sub coord2local {
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1019	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1021	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1023	}
945	}	1024	}
946		1025
947	sub _render {	1026	sub _render {
948	my ($self) = @_;	1027	my ($self) = @_;
949		1028
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1029	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};	1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1031
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1033
955	$self->SUPER::_render;	1034	$self->SUPER::_render;
956	}	1035	}
957		1036
958	#############################################################################	1037	#############################################################################
959		1038
960	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
961		1040
962	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
963		1042
964	sub new {	1043	sub new {
965	my ($class, %arg) = @_;	1044	my ($class, %arg) = @_;
966		1045
967	my $child = delete $arg{child};	1046	my $child = delete $arg{child};
968		1047
969	my $self;	1048	my $self;
970		1049
971	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
972	vertical => 1,	1060	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1062	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1065	},
977	;	1066	;
978		1067
979	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
		1071	can_events => 1,
981	slider => $slider,	1072	hslider => $hslider,
		1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
982	%arg,	1076	%arg,
983	);	1077	);
984		1078
		1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085	$vp->{parent}{hslider}->set_value ($x);
		1086	$vp->{parent}{vslider}->set_value ($y);
		1087
		1088	0
		1089	},
		1090	;
		1091
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1092	$self->SUPER::add (0, 0, $self->{vp});
		1093
986	$self->add ($child) if $child;	1094	$self->add ($child) if $child;
987		1095
988	$self	1096	$self
989	}	1097	}
990		1098
…		…
997	}	1105	}
998		1106
999	sub update_slider {	1107	sub update_slider {
1000	my ($self) = @_;	1108	my ($self) = @_;
1001		1109
		1110	my $child = ($self->{vp} or return)->child;
		1111
		1112	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]);	1113	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1114
		1115	my $visible = $w1 > $w2;
		1116	if ($visible != $self->{hslider}{visible}) {
		1117	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1118	: $self->{hslider}->hide;
		1119	}
		1120
		1121	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1122	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1123
		1124	my $visible = $h1 > $h2;
		1125	if ($visible != $self->{vslider}{visible}) {
		1126	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1127	: $self->{vslider}->hide;
		1128	}
1003	}	1129	}
1004		1130
1005	sub update {	1131	sub update {
1006	my ($self) = @_;	1132	my ($self) = @_;
1007		1133
1008	$self->SUPER::update;	1134	$self->SUPER::update;
1009
1010	$self->update_slider;	1135	$self->update_slider;
		1136	}
		1137
		1138	sub invoke_mouse_wheel {
		1139	my ($self, $ev) = @_;
		1140
		1141	return 0 unless $ev->{dy}; # only vertical movements for now
		1142
		1143	$self->{vslider}->emit (mouse_wheel => $ev);
		1144
		1145	1
		1146	}
		1147
		1148	sub invoke_button_down {
		1149	my ($self, $ev, $x, $y) = @_;
		1150
		1151	if ($ev->{button} == 2) {
		1152	$self->grab_focus;
		1153
		1154	my $ox = $self->{vp}{view_x} + $ev->{x};
		1155	my $oy = $self->{vp}{view_y} + $ev->{y};
		1156
		1157	$self->{motion} = sub {
		1158	my ($ev, $x, $y) = @_;
		1159
		1160	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1161	$self->update;
		1162	};
		1163
		1164	return 1;
		1165	}
		1166
		1167	0
		1168	}
		1169
		1170	sub invoke_button_up {
		1171	my ($self, $ev, $x, $y) = @_;
		1172
		1173	if (delete $self->{motion}) {
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_mouse_motion {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if ($self->{motion}) {
		1184	$self->{motion}->($ev, $x, $y);
		1185	return 1;
		1186	}
		1187
		1188	0
1011	}	1189	}
1012		1190
1013	sub invoke_size_allocate {	1191	sub invoke_size_allocate {
1014	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
1015		1193
1016	$self->update_slider;	1194	$self->update_slider;
1017
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1195	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1196	}
1020		1197
1021	#############################################################################	1198	#############################################################################
1022		1199
1023	package CFClient::UI::Frame;	1200	package CFPlus::UI::Frame;
1024		1201
1025	our @ISA = CFClient::UI::Bin::;	1202	our @ISA = CFPlus::UI::Bin::;
1026		1203
1027	use CFClient::OpenGL;	1204	use CFPlus::OpenGL;
1028		1205
1029	sub new {	1206	sub new {
1030	my $class = shift;	1207	my $class = shift;
1031		1208
1032	$class->SUPER::new (	1209	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1235	$self->SUPER::_draw;
1059	}	1236	}
1060		1237
1061	#############################################################################	1238	#############################################################################
1062		1239
1063	package CFClient::UI::FancyFrame;	1240	package CFPlus::UI::FancyFrame;
1064		1241
1065	our @ISA = CFClient::UI::Bin::;	1242	our @ISA = CFPlus::UI::Bin::;
1066		1243
1067	use CFClient::OpenGL;	1244	use CFPlus::OpenGL;
		1245
		1246	sub new {
		1247	my ($class, %arg) = @_;
		1248
		1249	if ((exists $arg{label}) && !ref $arg{label}) {
		1250	$arg{label} = new CFPlus::UI::Label
		1251	align => 1,
		1252	valign => 0,
		1253	text => $arg{label},
		1254	fontsize => ($arg{border} || 0.8) * 0.75;
		1255	}
		1256
		1257	my $self = $class->SUPER::new (
		1258	# label => "",
		1259	fg => [0.6, 0.3, 0.1],
		1260	border => 0.8,
		1261	style => 'single',
		1262	%arg,
		1263	);
		1264
		1265	$self
		1266	}
		1267
		1268	sub add {
		1269	my ($self, @widgets) = @_;
		1270
		1271	$self->SUPER::add (@widgets);
		1272	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1273	}
		1274
		1275	sub border {
		1276	int $_[0]{border} * $::FONTSIZE
		1277	}
		1278
		1279	sub size_request {
		1280	my ($self) = @_;
		1281
		1282	($self->{label_w}, undef) = $self->{label}->size_request
		1283	if $self->{label};
		1284
		1285	my ($w, $h) = $self->SUPER::size_request;
		1286
		1287	(
		1288	$w + $self->border * 2,
		1289	$h + $self->border * 2,
		1290	)
		1291	}
		1292
		1293	sub invoke_size_allocate {
		1294	my ($self, $w, $h) = @_;
		1295
		1296	my $border = $self->border;
		1297
		1298	$w -= List::Util::max 0, $border * 2;
		1299	$h -= List::Util::max 0, $border * 2;
		1300
		1301	if (my $label = $self->{label}) {
		1302	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1303	$label->{h} = List::Util::min $h, $border;
		1304	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1305	}
		1306
		1307	$self->child->configure ($border, $border, $w, $h);
		1308
		1309	1
		1310	}
		1311
		1312	sub _draw {
		1313	my ($self) = @_;
		1314
		1315	my $child = $self->{children}[0];
		1316
		1317	my $border = $self->border;
		1318	my ($w, $h) = ($self->{w}, $self->{h});
		1319
		1320	$child->draw;
		1321
		1322	glColor @{$self->{fg}};
		1323	glBegin GL_LINE_STRIP;
		1324	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1325	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1326	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1327	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1328	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1330	glEnd;
		1331
		1332	if ($self->{label}) {
		1333	glTranslate $border * 2, 0;
		1334	$self->{label}->_draw;
		1335	}
		1336	}
		1337
		1338	#############################################################################
		1339
		1340	package CFPlus::UI::Toplevel;
		1341
		1342	our @ISA = CFPlus::UI::Bin::;
		1343
		1344	use CFPlus::OpenGL;
1068		1345
1069	my $bg =	1346	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1347	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1348	mipmap => 1, wrap => 1;
1072		1349
1073	my @border =	1350	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1351	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);	1352	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1353
1077	sub new {	1354	sub new {
1078	my ($class, %arg) = @_;	1355	my ($class, %arg) = @_;
1079		1356
1080	my $self = $class->SUPER::new (	1357	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1358	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1359	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1360	border => 0.6,
1084	can_events => 1,	1361	can_events => 1,
1085	min_w => 16,	1362	min_w => 64,
1086	min_h => 16,	1363	min_h => 32,
1087	%arg,	1364	%arg,
1088	);	1365	);
1089		1366
1090	$self->{title_widget} = new CFClient::UI::Label	1367	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1368	align => 0,
1092	valign => 1,	1369	valign => 1,
1093	text => $self->{title},	1370	text => $self->{title},
1094	fontsize => $self->{border},	1371	fontsize => $self->{border},
1095	if exists $self->{title};	1372	if exists $self->{title};
1096		1373
1097	if ($self->{has_close_button}) {	1374	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1375	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1376	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1377	path => 'x1_close.png',
1101	on_activate => sub { $self->emit ("delete") };	1378	on_activate => sub { $self->emit ("delete") };
1102		1379
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1380	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1381	}
1105		1382
1106	$self	1383	$self
1107	}	1384	}
1108		1385
1109	sub add {	1386	sub add {
1110	my ($self, @widgets) = @_;	1387	my ($self, @widgets) = @_;
1111		1388
1112	$self->SUPER::add (@widgets);	1389	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1390	$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};	1391	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1392	}
1116		1393
1117	sub border {	1394	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1395	int $_[0]{border} * $::FONTSIZE
1119	}	1396	}
…		…
1227	$self->{motion}->($ev, $x, $y) if $self->{motion};	1504	$self->{motion}->($ev, $x, $y) if $self->{motion};
1228		1505
1229	! ! $self->{motion}	1506	! ! $self->{motion}
1230	}	1507	}
1231		1508
		1509	sub invoke_visibility_change {
		1510	my ($self, $visible) = @_;
		1511
		1512	delete $self->{motion} unless $visible;
		1513
		1514	0
		1515	}
		1516
1232	sub _draw {	1517	sub _draw {
1233	my ($self) = @_;	1518	my ($self) = @_;
1234		1519
1235	my $child = $self->{children}[0];	1520	my $child = $self->{children}[0];
1236		1521
…		…
1273	if $self->{close_button};	1558	if $self->{close_button};
1274	}	1559	}
1275		1560
1276	#############################################################################	1561	#############################################################################
1277		1562
1278	package CFClient::UI::Table;	1563	package CFPlus::UI::Table;
1279		1564
1280	our @ISA = CFClient::UI::Base::;	1565	our @ISA = CFPlus::UI::Base::;
1281		1566
1282	use List::Util qw(max sum);	1567	use List::Util qw(max sum);
1283		1568
1284	use CFClient::OpenGL;	1569	use CFPlus::OpenGL;
1285		1570
1286	sub new {	1571	sub new {
1287	my $class = shift;	1572	my $class = shift;
1288		1573
1289	$class->SUPER::new (	1574	$class->SUPER::new (
		1575	children => [],
1290	col_expand => [],	1576	col_expand => [],
		1577	row_expand => [],
1291	@_,	1578	@_,
1292	)	1579	)
1293	}	1580	}
1294		1581
1295	sub children {	1582	sub children {
1296	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1583	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297	}	1584	}
1298		1585
		1586	# TODO: store row/col info in child widget and use standard add/del
1299	sub add {	1587	sub add {
1300	my ($self, $x, $y, $child) = @_;	1588	my ($self) = shift;
1301		1589
		1590	while (@_) {
		1591	my ($x, $y, $child) = splice @_, 0, 3, ();
1302	$child->set_parent ($self);	1592	$child->set_parent ($self);
1303	$self->{children}[$y][$x] = $child;	1593	$self->{children}[$y][$x] = $child;
		1594	}
1304		1595
		1596	$self->{force_realloc} = 1;
		1597	$self->{force_size_alloc} = 1;
1305	$self->realloc;	1598	$self->realloc;
1306	}	1599	}
1307		1600
1308	sub remove {	1601	sub remove {
1309	my ($self, $child) = @_;	1602	my ($self, $child) = @_;
1310		1603
1311	# TODO: not yet implemented	1604	for (@{ $self->{children} }) {
		1605	for (@{ $_ || [] }) {
		1606	$_ = undef if $_ == $child;
		1607	}
		1608	}
1312	}	1609	}
1313		1610
1314	# TODO: move to container class maybe? send children a signal on removal?	1611	# TODO: move to container class maybe? send children a signal on removal?
1315	sub clear {	1612	sub clear {
1316	my ($self) = @_;	1613	my ($self) = @_;
…		…
1365	my ($ws, $hs) = $self->get_wh;	1662	my ($ws, $hs) = $self->get_wh;
1366		1663
1367	my $req_w = (sum @$ws) || 1;	1664	my $req_w = (sum @$ws) || 1;
1368	my $req_h = (sum @$hs) || 1;	1665	my $req_h = (sum @$hs) || 1;
1369		1666
1370	# TODO: nicer code && do row_expand	1667	# TODO: nicer code
1371	my @col_expand = @{$self->{col_expand}};	1668	my @col_expand = @{$self->{col_expand}};
1372	@col_expand = (1) x @$ws unless @col_expand;	1669	@col_expand = (1) x @$ws unless @col_expand;
1373	my $col_expand = (sum @col_expand) || 1;	1670	my $col_expand = (sum @col_expand) || 1;
1374		1671
1375	# linearly scale sizes
1376	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1672	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378		1673
1379	CFClient::UI::harmonize $ws;	1674	CFPlus::UI::harmonize $ws;
		1675
		1676	my @row_expand = @{$self->{row_expand}};
		1677	@row_expand = (1) x @$ws unless @row_expand;
		1678	my $row_expand = (sum @row_expand) || 1;
		1679
		1680	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1681
1380	CFClient::UI::harmonize $hs;	1682	CFPlus::UI::harmonize $hs;
1381		1683
1382	my $y;	1684	my $y;
1383		1685
1384	for my $r (0 .. $#{$self->{children}}) {	1686	for my $r (0 .. $#{$self->{children}}) {
1385	my $row = $self->{children}[$r]	1687	my $row = $self->{children}[$r]
…		…
1428	}	1730	}
1429	}	1731	}
1430		1732
1431	#############################################################################	1733	#############################################################################
1432		1734
1433	package CFClient::UI::Box;	1735	package CFPlus::UI::Fixed;
1434		1736
		1737	use List::Util qw(min max);
		1738
1435	our @ISA = CFClient::UI::Container::;	1739	our @ISA = CFPlus::UI::Container::;
		1740
		1741	sub add {
		1742	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1743
		1744	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1745	$self->SUPER::add ($child);
		1746	}
		1747
		1748	sub _scale($$$) {
		1749	my ($mode, $val, $max) = @_;
		1750
		1751	$mode eq "abs" ? $val
		1752	: $mode eq "rel" ? $val * $max
		1753	: 0
		1754	}
		1755
		1756	sub size_request {
		1757	my ($self) = @_;
		1758
		1759	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1760
		1761	# determine overall size by querying abs widgets
		1762	for my $child ($self->visible_children) {
		1763	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1764
		1765	if ($pos eq "abs") {
		1766	$w = _scale $size, $w, $child->{req_w};
		1767	$h = _scale $size, $h, $child->{req_h};
		1768
		1769	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1770	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1771	}
		1772	}
		1773
		1774	my $W = $x2 - $x1;
		1775	my $H = $y2 - $y1;
		1776
		1777	# now layout remaining widgets
		1778	for my $child ($self->visible_children) {
		1779	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1780
		1781	if ($pos ne "abs") {
		1782	$x = _scale $pos, $x, $W;
		1783	$y = _scale $pos, $x, $H;
		1784	$w = _scale $size, $w, $child->{req_w};
		1785	$h = _scale $size, $h, $child->{req_h};
		1786
		1787	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1788	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1789	}
		1790	}
		1791
		1792	my $W = $x2 - $x1;
		1793	my $H = $y2 - $y1;
		1794
		1795	($W, $H)
		1796	}
		1797
		1798	sub invoke_size_allocate {
		1799	my ($self, $W, $H) = @_;
		1800
		1801	for my $child ($self->visible_children) {
		1802	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1803
		1804	$x = _scale $pos, $x, $W;
		1805	$y = _scale $pos, $x, $H;
		1806	$w = _scale $size, $w, $child->{req_w};
		1807	$h = _scale $size, $h, $child->{req_h};
		1808
		1809	$child->configure ($x, $y, $w, $h);
		1810	}
		1811
		1812	1
		1813	}
		1814
		1815	#############################################################################
		1816
		1817	package CFPlus::UI::Box;
		1818
		1819	our @ISA = CFPlus::UI::Container::;
1436		1820
1437	sub size_request {	1821	sub size_request {
1438	my ($self) = @_;	1822	my ($self) = @_;
1439		1823
1440	$self->{vertical}	1824	$self->{vertical}
…		…
1473	$req[$_] += $space * $children[$_]{expand}	1857	$req[$_] += $space * $children[$_]{expand}
1474	for 0 .. $#children;	1858	for 0 .. $#children;
1475	}	1859	}
1476	}	1860	}
1477		1861
1478	CFClient::UI::harmonize \@req;	1862	CFPlus::UI::harmonize \@req;
1479		1863
1480	my $pos = 0;	1864	my $pos = 0;
1481	for (0 .. $#children) {	1865	for (0 .. $#children) {
1482	my $alloc = $req[$_];	1866	my $alloc = $req[$_];
1483	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1867	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1488	1	1872	1
1489	}	1873	}
1490		1874
1491	#############################################################################	1875	#############################################################################
1492		1876
1493	package CFClient::UI::HBox;	1877	package CFPlus::UI::HBox;
1494		1878
1495	our @ISA = CFClient::UI::Box::;	1879	our @ISA = CFPlus::UI::Box::;
1496		1880
1497	sub new {	1881	sub new {
1498	my $class = shift;	1882	my $class = shift;
1499		1883
1500	$class->SUPER::new (	1884	$class->SUPER::new (
…		…
1503	)	1887	)
1504	}	1888	}
1505		1889
1506	#############################################################################	1890	#############################################################################
1507		1891
1508	package CFClient::UI::VBox;	1892	package CFPlus::UI::VBox;
1509		1893
1510	our @ISA = CFClient::UI::Box::;	1894	our @ISA = CFPlus::UI::Box::;
1511		1895
1512	sub new {	1896	sub new {
1513	my $class = shift;	1897	my $class = shift;
1514		1898
1515	$class->SUPER::new (	1899	$class->SUPER::new (
…		…
1518	)	1902	)
1519	}	1903	}
1520		1904
1521	#############################################################################	1905	#############################################################################
1522		1906
1523	package CFClient::UI::Label;	1907	package CFPlus::UI::Label;
1524		1908
1525	our @ISA = CFClient::UI::DrawBG::;	1909	our @ISA = CFPlus::UI::DrawBG::;
1526		1910
1527	use CFClient::OpenGL;	1911	use CFPlus::OpenGL;
1528		1912
1529	sub new {	1913	sub new {
1530	my ($class, %arg) = @_;	1914	my ($class, %arg) = @_;
1531		1915
1532	my $self = $class->SUPER::new (	1916	my $self = $class->SUPER::new (
…		…
1535	#active_bg => none	1919	#active_bg => none
1536	#font => default_font	1920	#font => default_font
1537	#text => initial text	1921	#text => initial text
1538	#markup => initial narkup	1922	#markup => initial narkup
1539	#max_w => maximum pixel width	1923	#max_w => maximum pixel width
		1924	#style => 0, # render flags
1540	ellipsise => 3, # end	1925	ellipsise => 3, # end
1541	layout => (new CFClient::Layout 2),	1926	layout => (new CFPlus::Layout),
1542	fontsize => 1,	1927	fontsize => 1,
1543	align => -1,	1928	align => -1,
1544	valign => -1,	1929	valign => -1,
1545	padding_x => 2,	1930	padding_x => 2,
1546	padding_y => 2,	1931	padding_y => 2,
1547	can_events => 0,	1932	can_events => 0,
1548	%arg	1933	%arg
1549	);	1934	);
1550		1935
1551	if (exists $self->{template}) {	1936	if (exists $self->{template}) {
1552	my $layout = new CFClient::Layout 2;	1937	my $layout = new CFPlus::Layout;
1553	$layout->set_text (delete $self->{template});	1938	$layout->set_text (delete $self->{template});
1554	$self->{template} = $layout;	1939	$self->{template} = $layout;
1555	}	1940	}
1556		1941
1557	if (exists $self->{markup}) {	1942	if (exists $self->{markup}) {
…		…
1559	} else {	1944	} else {
1560	$self->set_text (delete $self->{text});	1945	$self->set_text (delete $self->{text});
1561	}	1946	}
1562		1947
1563	$self	1948	$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	}	1949	}
1575		1950
1576	sub update {	1951	sub update {
1577	my ($self) = @_;	1952	my ($self) = @_;
1578		1953
…		…
1627		2002
1628	my ($w, $h) = $self->{layout}->size;	2003	my ($w, $h) = $self->{layout}->size;
1629		2004
1630	if (exists $self->{template}) {	2005	if (exists $self->{template}) {
1631	$self->{template}->set_font ($self->{font}) if $self->{font};	2006	$self->{template}->set_font ($self->{font}) if $self->{font};
		2007	$self->{template}->set_width ($self->{max_w} || -1);
1632	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2008	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1633		2009
1634	my ($w2, $h2) = $self->{template}->size;	2010	my ($w2, $h2) = $self->{template}->size;
1635		2011
1636	$w = List::Util::max $w, $w2;	2012	$w = List::Util::max $w, $w2;
…		…
1688	$self->{layout}->set_width ($self->{w});	2064	$self->{layout}->set_width ($self->{w});
1689	$self->{layout}->set_ellipsise ($self->{ellipsise});	2065	$self->{layout}->set_ellipsise ($self->{ellipsise});
1690	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2066	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1691	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2067	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1692		2068
1693	$self->{size_req}	2069	[$self->{layout}->size]
1694	};	2070	};
1695		2071
1696	unless (exists $self->{ox}) {	2072	unless (exists $self->{ox}) {
1697	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2073	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1698	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}	2074	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
…		…
1704	};	2080	};
1705		2081
1706	my $w = List::Util::min $self->{w} + 4, $size->[0];	2082	my $w = List::Util::min $self->{w} + 4, $size->[0];
1707	my $h = List::Util::min $self->{h} + 2, $size->[1];	2083	my $h = List::Util::min $self->{h} + 2, $size->[1];
1708		2084
1709	$self->{layout}->render ($self->{ox}, $self->{oy});	2085	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1710	}	2086	}
1711		2087
1712	#############################################################################	2088	#############################################################################
1713		2089
1714	package CFClient::UI::EntryBase;	2090	package CFPlus::UI::EntryBase;
1715		2091
1716	our @ISA = CFClient::UI::Label::;	2092	our @ISA = CFPlus::UI::Label::;
1717		2093
1718	use CFClient::OpenGL;	2094	use CFPlus::OpenGL;
1719		2095
1720	sub new {	2096	sub new {
1721	my $class = shift;	2097	my $class = shift;
1722		2098
1723	$class->SUPER::new (	2099	$class->SUPER::new (
…		…
1727	active_fg => [0, 0, 0],	2103	active_fg => [0, 0, 0],
1728	can_hover => 1,	2104	can_hover => 1,
1729	can_focus => 1,	2105	can_focus => 1,
1730	valign => 0,	2106	valign => 0,
1731	can_events => 1,	2107	can_events => 1,
		2108	ellipsise => 0,
1732	#text => ...	2109	#text => ...
1733	#hidden => "*",	2110	#hidden => "*",
1734	@_	2111	@_
1735	)	2112	)
1736	}	2113	}
…		…
1781	my $sym = $ev->{sym};	2158	my $sym = $ev->{sym};
1782	my $uni = $ev->{unicode};	2159	my $uni = $ev->{unicode};
1783		2160
1784	my $text = $self->get_text;	2161	my $text = $self->get_text;
1785		2162
		2163	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2164
1786	if ($uni == 8) {	2165	if ($uni == 8) {
1787	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2166	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1788	} elsif ($uni == 127) {	2167	} elsif ($uni == 127) {
1789	substr $text, $self->{cursor}, 1, "";	2168	substr $text, $self->{cursor}, 1, "";
1790	} elsif ($sym == CFClient::SDLK_LEFT) {	2169	} elsif ($sym == CFPlus::SDLK_LEFT) {
1791	--$self->{cursor} if $self->{cursor};	2170	--$self->{cursor} if $self->{cursor};
1792	} elsif ($sym == CFClient::SDLK_RIGHT) {	2171	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1793	++$self->{cursor} if $self->{cursor} < length $self->{text};	2172	++$self->{cursor} if $self->{cursor} < length $self->{text};
1794	} elsif ($sym == CFClient::SDLK_HOME) {	2173	} elsif ($sym == CFPlus::SDLK_HOME) {
		2174	# what a hack
		2175	$self->{cursor} =
		2176	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2177	? length $1
		2178	: 0;
		2179	} elsif ($sym == CFPlus::SDLK_END) {
		2180	# uh, again
		2181	$self->{cursor} =
		2182	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2183	? $self->{cursor} + length $1
		2184	: length $self->{text};
		2185	} elsif ($uni == 21) { # ctrl-u
		2186	$text = "";
1795	$self->{cursor} = 0;	2187	$self->{cursor} = 0;
1796	} elsif ($sym == CFClient::SDLK_END) {
1797	$self->{cursor} = length $text;
1798	} elsif ($uni == 27) {	2188	} elsif ($uni == 27) {
1799	$self->emit ('escape');	2189	$self->emit ('escape');
1800	} elsif ($uni) {	2190	} elsif ($uni == 0x0d) {
		2191	substr $text, $self->{cursor}++, 0, "\012";
		2192	} elsif ($uni >= 0x20) {
1801	substr $text, $self->{cursor}++, 0, chr $uni;	2193	substr $text, $self->{cursor}++, 0, chr $uni;
1802	} else {	2194	} else {
1803	return 0;	2195	return 0;
1804	}	2196	}
1805		2197
1806	$self->_set_text ($text);	2198	$self->_set_text ($text);
1807		2199
1808	$self->realloc;	2200	$self->realloc;
		2201	$self->update;
1809		2202
1810	1	2203	1
1811	}	2204	}
1812		2205
1813	sub invoke_focus_in {	2206	sub invoke_focus_in {
…		…
1825		2218
1826	my $idx = $self->{layout}->xy_to_index ($x, $y);	2219	my $idx = $self->{layout}->xy_to_index ($x, $y);
1827		2220
1828	# byte-index to char-index	2221	# byte-index to char-index
1829	my $text = $self->{text};	2222	my $text = $self->{text};
1830	utf8::encode $text;	2223	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1831	$self->{cursor} = length substr $text, 0, $idx;	2224	$self->{cursor} = length $text;
1832		2225
1833	$self->_set_text ($self->{text});	2226	$self->_set_text ($self->{text});
1834	$self->update;	2227	$self->update;
1835		2228
1836	1	2229	1
…		…
1875	utf8::encode $text;	2268	utf8::encode $text;
1876		2269
1877	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2270	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1878	}	2271	}
1879		2272
1880	glColor @{$self->{fg}};
1881	glBegin GL_LINES;	2273	glBegin GL_LINES;
1882	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2274	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2275	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1884	glEnd;	2276	glEnd;
1885	}	2277	}
1886	}	2278	}
1887		2279
		2280	#############################################################################
		2281
1888	package CFClient::UI::Entry;	2282	package CFPlus::UI::Entry;
1889		2283
1890	our @ISA = CFClient::UI::EntryBase::;	2284	our @ISA = CFPlus::UI::EntryBase::;
1891		2285
1892	use CFClient::OpenGL;	2286	use CFPlus::OpenGL;
1893		2287
1894	sub invoke_key_down {	2288	sub invoke_key_down {
1895	my ($self, $ev) = @_;	2289	my ($self, $ev) = @_;
1896		2290
1897	my $sym = $ev->{sym};	2291	my $sym = $ev->{sym};
1898		2292
1899	if ($sym == 13) {	2293	if ($ev->{uni} == 0x0d || $sym == 13) {
1900	unshift @{$self->{history}},	2294	unshift @{$self->{history}},
1901	my $txt = $self->get_text;	2295	my $txt = $self->get_text;
1902		2296
1903	$self->{history_pointer} = -1;	2297	$self->{history_pointer} = -1;
1904	$self->{history_saveback} = '';	2298	$self->{history_saveback} = '';
1905	$self->emit (activate => $txt);	2299	$self->emit (activate => $txt);
1906	$self->update;	2300	$self->update;
1907		2301
1908	} elsif ($sym == CFClient::SDLK_UP) {	2302	} elsif ($sym == CFPlus::SDLK_UP) {
1909	if ($self->{history_pointer} < 0) {	2303	if ($self->{history_pointer} < 0) {
1910	$self->{history_saveback} = $self->get_text;	2304	$self->{history_saveback} = $self->get_text;
1911	}	2305	}
1912	if (@{$self->{history} || []} > 0) {	2306	if (@{$self->{history} || []} > 0) {
1913	$self->{history_pointer}++;	2307	$self->{history_pointer}++;
…		…
1915	$self->{history_pointer} = @{$self->{history} || []} - 1;	2309	$self->{history_pointer} = @{$self->{history} || []} - 1;
1916	}	2310	}
1917	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2311	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1918	}	2312	}
1919		2313
1920	} elsif ($sym == CFClient::SDLK_DOWN) {	2314	} elsif ($sym == CFPlus::SDLK_DOWN) {
1921	$self->{history_pointer}--;	2315	$self->{history_pointer}--;
1922	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2316	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1923		2317
1924	if ($self->{history_pointer} >= 0) {	2318	if ($self->{history_pointer} >= 0) {
1925	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2319	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1934	1	2328	1
1935	}	2329	}
1936		2330
1937	#############################################################################	2331	#############################################################################
1938		2332
		2333	package CFPlus::UI::TextEdit;
		2334
		2335	our @ISA = CFPlus::UI::EntryBase::;
		2336
		2337	use CFPlus::OpenGL;
		2338
		2339	sub move_cursor_ver {
		2340	my ($self, $dy) = @_;
		2341
		2342	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2343
		2344	$y += $dy;
		2345
		2346	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2347	$self->{cursor} = $index;
		2348	delete $self->{cur_h};
		2349	$self->update;
		2350	return;
		2351	}
		2352	}
		2353
		2354	sub invoke_key_down {
		2355	my ($self, $ev) = @_;
		2356
		2357	my $sym = $ev->{sym};
		2358
		2359	if ($sym == CFPlus::SDLK_UP) {
		2360	$self->move_cursor_ver (-1);
		2361	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2362	$self->move_cursor_ver (+1);
		2363	} else {
		2364	return $self->SUPER::invoke_key_down ($ev)
		2365	}
		2366
		2367	1
		2368	}
		2369
		2370	#############################################################################
		2371
1939	package CFClient::UI::Button;	2372	package CFPlus::UI::Button;
1940		2373
1941	our @ISA = CFClient::UI::Label::;	2374	our @ISA = CFPlus::UI::Label::;
1942		2375
1943	use CFClient::OpenGL;	2376	use CFPlus::OpenGL;
1944		2377
1945	my @tex =	2378	my @tex =
1946	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2379	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1947	qw(b1_button_active.png);	2380	qw(b1_button_active.png);
1948		2381
1949	sub new {	2382	sub new {
1950	my $class = shift;	2383	my $class = shift;
1951		2384
…		…
1988	$self->SUPER::_draw;	2421	$self->SUPER::_draw;
1989	}	2422	}
1990		2423
1991	#############################################################################	2424	#############################################################################
1992		2425
		2426	package CFPlus::UI::CheckBox;
		2427
		2428	our @ISA = CFPlus::UI::DrawBG::;
		2429
		2430	my @tex =
		2431	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2432	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2433
		2434	use CFPlus::OpenGL;
		2435
		2436	sub new {
		2437	my $class = shift;
		2438
		2439	$class->SUPER::new (
		2440	padding_x => 2,
		2441	padding_y => 2,
		2442	fg => [1, 1, 1],
		2443	active_fg => [1, 1, 0],
		2444	bg => [0, 0, 0, 0.2],
		2445	active_bg => [1, 1, 1, 0.5],
		2446	state => 0,
		2447	can_hover => 1,
		2448	@_
		2449	)
		2450	}
		2451
		2452	sub size_request {
		2453	my ($self) = @_;
		2454
		2455	(6) x 2
		2456	}
		2457
		2458	sub toggle {
		2459	my ($self) = @_;
		2460
		2461	$self->{state} = !$self->{state};
		2462	$self->emit (changed => $self->{state});
		2463	$self->update;
		2464	}
		2465
		2466	sub invoke_button_down {
		2467	my ($self, $ev, $x, $y) = @_;
		2468
		2469	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2470	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2471	$self->toggle;
		2472	} else {
		2473	return 0
		2474	}
		2475
		2476	1
		2477	}
		2478
		2479	sub _draw {
		2480	my ($self) = @_;
		2481
		2482	$self->SUPER::_draw;
		2483
		2484	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2485
		2486	my ($w, $h) = @$self{qw(w h)};
		2487
		2488	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2489
		2490	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2491
		2492	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2493
		2494	glEnable GL_TEXTURE_2D;
		2495	$tex->draw_quad_alpha (0, 0, $s, $s);
		2496	glDisable GL_TEXTURE_2D;
		2497	}
		2498
		2499	#############################################################################
		2500
		2501	package CFPlus::UI::Image;
		2502
		2503	our @ISA = CFPlus::UI::Base::;
		2504
		2505	use CFPlus::OpenGL;
		2506
		2507	our %texture_cache;
		2508
		2509	sub new {
		2510	my $class = shift;
		2511
		2512	my $self = $class->SUPER::new (
		2513	can_events => 0,
		2514	@_,
		2515	);
		2516
		2517	$self->{path} || $self->{tex}
		2518	or Carp::croak "'path' or 'tex' attributes required";
		2519
		2520	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2521	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2522
		2523	CFPlus::weaken $texture_cache{$self->{path}};
		2524
		2525	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2526
		2527	$self
		2528	}
		2529
		2530	sub STORABLE_freeze {
		2531	my ($self, $cloning) = @_;
		2532
		2533	$self->{path}
		2534	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2535
		2536	$self->{path}
		2537	}
		2538
		2539	sub STORABLE_attach {
		2540	my ($self, $cloning, $path) = @_;
		2541
		2542	$self->new (path => $path)
		2543	}
		2544
		2545	sub size_request {
		2546	my ($self) = @_;
		2547
		2548	($self->{tex}{w}, $self->{tex}{h})
		2549	}
		2550
		2551	sub _draw {
		2552	my ($self) = @_;
		2553
		2554	my $tex = $self->{tex};
		2555
		2556	my ($w, $h) = ($self->{w}, $self->{h});
		2557
		2558	if ($self->{rot90}) {
		2559	glRotate 90, 0, 0, 1;
		2560	glTranslate 0, -$self->{w}, 0;
		2561
		2562	($w, $h) = ($h, $w);
		2563	}
		2564
		2565	glEnable GL_TEXTURE_2D;
		2566	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2567
		2568	$tex->draw_quad (0, 0, $w, $h);
		2569
		2570	glDisable GL_TEXTURE_2D;
		2571	}
		2572
		2573	#############################################################################
		2574
1993	package CFClient::UI::ImageButton;	2575	package CFPlus::UI::ImageButton;
1994		2576
1995	our @ISA = CFClient::UI::Image::;	2577	our @ISA = CFPlus::UI::Image::;
1996		2578
1997	use CFClient::OpenGL;	2579	use CFPlus::OpenGL;
1998		2580
1999	my %textures;	2581	my %textures;
2000		2582
2001	sub new {	2583	sub new {
2002	my $class = shift;	2584	my $class = shift;
…		…
2024	1	2606	1
2025	}	2607	}
2026		2608
2027	#############################################################################	2609	#############################################################################
2028		2610
2029	package CFClient::UI::CheckBox;
2030
2031	our @ISA = CFClient::UI::DrawBG::;
2032
2033	my @tex =
2034	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2035	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2036
2037	use CFClient::OpenGL;
2038
2039	sub new {
2040	my $class = shift;
2041
2042	$class->SUPER::new (
2043	padding_x => 2,
2044	padding_y => 2,
2045	fg => [1, 1, 1],
2046	active_fg => [1, 1, 0],
2047	bg => [0, 0, 0, 0.2],
2048	active_bg => [1, 1, 1, 0.5],
2049	state => 0,
2050	can_hover => 1,
2051	@_
2052	)
2053	}
2054
2055	sub size_request {
2056	my ($self) = @_;
2057
2058	(6) x 2
2059	}
2060
2061	sub toggle {
2062	my ($self) = @_;
2063
2064	$self->{state} = !$self->{state};
2065	$self->emit (changed => $self->{state});
2066	$self->update;
2067	}
2068
2069	sub invoke_button_down {
2070	my ($self, $ev, $x, $y) = @_;
2071
2072	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2073	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2074	$self->toggle;
2075	} else {
2076	return 0
2077	}
2078
2079	1
2080	}
2081
2082	sub _draw {
2083	my ($self) = @_;
2084
2085	$self->SUPER::_draw;
2086
2087	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2088
2089	my ($w, $h) = @$self{qw(w h)};
2090
2091	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2092
2093	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2094
2095	my $tex = $self->{state} ? $tex[1] : $tex[0];
2096
2097	glEnable GL_TEXTURE_2D;
2098	$tex->draw_quad_alpha (0, 0, $s, $s);
2099	glDisable GL_TEXTURE_2D;
2100	}
2101
2102	#############################################################################
2103
2104	package CFClient::UI::Image;	2611	package CFPlus::UI::VGauge;
2105		2612
2106	our @ISA = CFClient::UI::Base::;	2613	our @ISA = CFPlus::UI::Base::;
2107
2108	use CFClient::OpenGL;
2109
2110	our %texture_cache;
2111
2112	sub new {
2113	my $class = shift;
2114
2115	my $self = $class->SUPER::new (
2116	can_events => 0,
2117	@_,
2118	);
2119
2120	$self->{path}
2121	or Carp::croak "required attribute 'path' not set";
2122
2123	$self->{tex} = $texture_cache{$self->{path}} ||=
2124	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2125
2126	Scalar::Util::weaken $texture_cache{$self->{path}};
2127
2128	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2129
2130	$self
2131	}
2132
2133	sub size_request {
2134	my ($self) = @_;
2135
2136	($self->{tex}{w}, $self->{tex}{h})
2137	}
2138
2139	sub _draw {
2140	my ($self) = @_;
2141
2142	my $tex = $self->{tex};
2143
2144	my ($w, $h) = ($self->{w}, $self->{h});
2145
2146	if ($self->{rot90}) {
2147	glRotate 90, 0, 0, 1;
2148	glTranslate 0, -$self->{w}, 0;
2149
2150	($w, $h) = ($h, $w);
2151	}
2152
2153	glEnable GL_TEXTURE_2D;
2154	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155
2156	$tex->draw_quad_alpha (0, 0, $w, $h);
2157
2158	glDisable GL_TEXTURE_2D;
2159	}
2160
2161	#############################################################################
2162
2163	package CFClient::UI::VGauge;
2164
2165	our @ISA = CFClient::UI::Base::;
2166		2614
2167	use List::Util qw(min max);	2615	use List::Util qw(min max);
2168		2616
2169	use CFClient::OpenGL;	2617	use CFPlus::OpenGL;
2170		2618
2171	my %tex = (	2619	my %tex = (
2172	food => [	2620	food => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2621	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2622	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2175	],	2623	],
2176	grace => [	2624	grace => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2625	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2626	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2179	],	2627	],
2180	hp => [	2628	hp => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2629	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2630	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2183	],	2631	],
2184	mana => [	2632	mana => [
2185	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2633	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2186	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2634	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2187	],	2635	],
2188	);	2636	);
2189		2637
2190	# eg. VGauge->new (gauge => 'food'), default gauge: food	2638	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2293	glDisable GL_TEXTURE_2D;	2741	glDisable GL_TEXTURE_2D;
2294	}	2742	}
2295		2743
2296	#############################################################################	2744	#############################################################################
2297		2745
2298	package CFClient::UI::Gauge;	2746	package CFPlus::UI::Gauge;
2299		2747
2300	our @ISA = CFClient::UI::VBox::;	2748	our @ISA = CFPlus::UI::VBox::;
2301		2749
2302	sub new {	2750	sub new {
2303	my ($class, %arg) = @_;	2751	my ($class, %arg) = @_;
2304		2752
2305	my $self = $class->SUPER::new (	2753	my $self = $class->SUPER::new (
…		…
2307	can_hover => 1,	2755	can_hover => 1,
2308	can_events => 1,	2756	can_events => 1,
2309	%arg,	2757	%arg,
2310	);	2758	);
2311		2759
2312	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2760	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2313	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2761	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2314	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2762	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2315		2763
2316	$self	2764	$self
2317	}	2765	}
2318		2766
2319	sub set_fontsize {	2767	sub set_fontsize {
…		…
2340	$self->{value}->set_text ($val);	2788	$self->{value}->set_text ($val);
2341	}	2789	}
2342		2790
2343	#############################################################################	2791	#############################################################################
2344		2792
2345	package CFClient::UI::Slider;	2793	package CFPlus::UI::Slider;
2346		2794
2347	use strict;	2795	use strict;
2348		2796
2349	use CFClient::OpenGL;	2797	use CFPlus::OpenGL;
2350		2798
2351	our @ISA = CFClient::UI::DrawBG::;	2799	our @ISA = CFPlus::UI::DrawBG::;
2352		2800
2353	my @tex =	2801	my @tex =
2354	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2802	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2355	qw(s1_slider.png s1_slider_bg.png);	2803	qw(s1_slider.png s1_slider_bg.png);
2356		2804
2357	sub new {	2805	sub new {
2358	my $class = shift;	2806	my $class = shift;
2359		2807
…		…
2448	}	2896	}
2449		2897
2450	1	2898	1
2451	}	2899	}
2452		2900
		2901	sub invoke_mouse_wheel {
		2902	my ($self, $ev) = @_;
		2903
		2904	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2905
		2906	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2907
		2908	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2909
		2910	! ! $delta
		2911	}
		2912
2453	sub update {	2913	sub update {
2454	my ($self) = @_;	2914	my ($self) = @_;
2455		2915
2456	delete $self->{knob_w};	2916	delete $self->{knob_w};
2457	$self->SUPER::update;	2917	$self->SUPER::update;
…		…
2504	glDisable GL_TEXTURE_2D;	2964	glDisable GL_TEXTURE_2D;
2505	}	2965	}
2506		2966
2507	#############################################################################	2967	#############################################################################
2508		2968
2509	package CFClient::UI::ValSlider;	2969	package CFPlus::UI::ValSlider;
2510		2970
2511	our @ISA = CFClient::UI::HBox::;	2971	our @ISA = CFPlus::UI::HBox::;
2512		2972
2513	sub new {	2973	sub new {
2514	my ($class, %arg) = @_;	2974	my ($class, %arg) = @_;
2515		2975
2516	my $range = delete $arg{range};	2976	my $range = delete $arg{range};
2517		2977
2518	my $self = $class->SUPER::new (	2978	my $self = $class->SUPER::new (
2519	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2979	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2520	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2980	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2521	to_value => sub { shift },	2981	to_value => sub { shift },
2522	from_value => sub { shift },	2982	from_value => sub { shift },
2523	%arg,	2983	%arg,
2524	);	2984	);
2525		2985
…		…
2545	sub set_range { shift->{slider}->set_range (@_) }	3005	sub set_range { shift->{slider}->set_range (@_) }
2546	sub set_value { shift->{slider}->set_value (@_) }	3006	sub set_value { shift->{slider}->set_value (@_) }
2547		3007
2548	#############################################################################	3008	#############################################################################
2549		3009
2550	package CFClient::UI::TextScroller;	3010	package CFPlus::UI::TextScroller;
2551		3011
2552	our @ISA = CFClient::UI::HBox::;	3012	our @ISA = CFPlus::UI::HBox::;
2553		3013
2554	use CFClient::OpenGL;	3014	use CFPlus::OpenGL;
2555		3015
2556	sub new {	3016	sub new {
2557	my $class = shift;	3017	my $class = shift;
2558		3018
2559	my $self = $class->SUPER::new (	3019	my $self = $class->SUPER::new (
2560	fontsize => 1,	3020	fontsize => 1,
2561	can_events => 0,	3021	can_events => 1,
2562	indent => 0,	3022	indent => 0,
2563	#font => default_font	3023	#font => default_font
2564	@_,	3024	@_,
2565		3025
2566	layout => (new CFClient::Layout 2),	3026	layout => (new CFPlus::Layout),
2567	par => [],	3027	par => [],
		3028	max_par => 0,
2568	height => 0,	3029	height => 0,
2569	children => [	3030	children => [
2570	(new CFClient::UI::Empty expand => 1),	3031	(new CFPlus::UI::Empty expand => 1),
2571	(new CFClient::UI::Slider vertical => 1),	3032	(new CFPlus::UI::Slider vertical => 1),
2572	],	3033	],
2573	);	3034	);
2574		3035
2575	$self->{children}[1]->connect (changed => sub { $self->update });	3036	$self->{children}[1]->connect (changed => sub { $self->update });
2576		3037
…		…
2606		3067
2607	$self->reflow;	3068	$self->reflow;
2608		3069
2609	local $self->{children} = [$empty, $slider];	3070	local $self->{children} = [$empty, $slider];
2610	$self->SUPER::invoke_size_allocate ($w, $h)	3071	$self->SUPER::invoke_size_allocate ($w, $h)
		3072	}
		3073
		3074	sub invoke_mouse_wheel {
		3075	my ($self, $ev) = @_;
		3076
		3077	return 0 unless $ev->{dy}; # only vertical movements
		3078
		3079	$self->{children}[1]->emit (mouse_wheel => $ev);
		3080
		3081	1
2611	}	3082	}
2612		3083
2613	sub get_layout {	3084	sub get_layout {
2614	my ($self, $para) = @_;	3085	my ($self, $para) = @_;
2615		3086
…		…
2643		3114
2644	# todo: base offset on lines or so, not on pixels	3115	# todo: base offset on lines or so, not on pixels
2645	$self->{children}[1]->set_value ($offset);	3116	$self->{children}[1]->set_value ($offset);
2646	}	3117	}
2647		3118
		3119	sub current_paragraph {
		3120	my ($self) = @_;
		3121
		3122	$self->{top_paragraph} - 1
		3123	}
		3124
		3125	sub scroll_to {
		3126	my ($self, $para) = @_;
		3127
		3128	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3129
		3130	$self->{scroll_to} = $para;
		3131	$self->update;
		3132	}
		3133
2648	sub clear {	3134	sub clear {
2649	my ($self) = @_;	3135	my ($self) = @_;
2650		3136
2651	my (undef, undef, @other) = @{ $self->{children} };	3137	my (undef, undef, @other) = @{ $self->{children} };
2652	$self->remove ($_) for @other;	3138	$self->remove ($_) for @other;
…		…
2655	$self->{height} = 0;	3141	$self->{height} = 0;
2656	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3142	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2657	}	3143	}
2658		3144
2659	sub add_paragraph {	3145	sub add_paragraph {
2660	my ($self, $color, $para, $indent) = @_;	3146	my $self = shift;
2661		3147
2662	my ($text, @w) = ref $para ? @$para : $para;	3148	for my $para (@_) {
2663
2664	$para = {	3149	$para = {
		3150	fg => [1, 1, 1, 1],
		3151	indent => 0,
		3152	markup => "",
		3153	widget => [],
		3154	ref $para ? %$para : (markup => $para),
2665	w => 1e10,	3155	w => 1e10,
2666	wrapped => 1,	3156	wrapped => 1,
2667	fg => $color,
2668	indent => $indent,
2669	markup => $text,
2670	widget => \@w,
2671	};	3157	};
2672		3158
2673	$self->add (@w) if @w;	3159	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2674	push @{$self->{par}}, $para;	3160	push @{$self->{par}}, $para;
		3161	}
		3162
		3163	if (my $max = $self->{max_par}) {
		3164	shift @{$self->{par}} while @{$self->{par}} > $max;
		3165	}
2675		3166
2676	$self->{need_reflow}++;	3167	$self->{need_reflow}++;
2677	$self->update;	3168	$self->update;
2678	}	3169	}
2679		3170
2680	sub scroll_to_bottom {	3171	sub scroll_to_bottom {
2681	my ($self) = @_;	3172	my ($self) = @_;
2682		3173
2683	$self->{scroll_to_bottom} = 1;	3174	$self->{scroll_to} = $#{$self->{par}};
2684	$self->update;	3175	$self->update;
2685	}	3176	}
2686		3177
		3178	sub force_uptodate {
		3179	my ($self) = @_;
		3180
		3181	if (delete $self->{need_reflow}) {
		3182	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3183
		3184	my $height = 0;
		3185
		3186	for my $para (@{$self->{par}}) {
		3187	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3188	my $layout = $self->get_layout ($para);
		3189	my ($w, $h) = $layout->size;
		3190
		3191	$para->{w} = $w + $para->{indent};
		3192	$para->{h} = $h;
		3193	$para->{wrapped} = $layout->has_wrapped;
		3194	}
		3195
		3196	$para->{y} = $height;
		3197	$height += $para->{h};
		3198	}
		3199
		3200	$self->{height} = $height;
		3201	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3202
		3203	delete $self->{texture};
		3204	}
		3205
		3206	if (my $paridx = delete $self->{scroll_to}) {
		3207	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3208	}
		3209	}
		3210
2687	sub update {	3211	sub update {
2688	my ($self) = @_;	3212	my ($self) = @_;
2689		3213
2690	$self->SUPER::update;	3214	$self->SUPER::update;
2691		3215
2692	return unless $self->{h} > 0;	3216	return unless $self->{h} > 0;
2693		3217
2694	delete $self->{texture};	3218	delete $self->{texture};
2695		3219
2696	$ROOT->on_post_alloc ($self => sub {	3220	$ROOT->on_post_alloc ($self => sub {
		3221	$self->force_uptodate;
		3222
2697	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3223	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2698		3224
2699	if (delete $self->{need_reflow}) {
2700	my $height = 0;
2701
2702	for my $para (@{$self->{par}}) {
2703	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2704	my $layout = $self->get_layout ($para);
2705	my ($w, $h) = $layout->size;
2706
2707	$para->{w} = $w + $para->{indent};
2708	$para->{h} = $h;
2709	$para->{wrapped} = $layout->has_wrapped;
2710	}
2711
2712	$height += $para->{h};
2713	}
2714
2715	$self->{height} = $height;
2716
2717	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2718
2719	delete $self->{texture};
2720	}
2721
2722	if (delete $self->{scroll_to_bottom}) {
2723	$self->{children}[1]->set_value (1e10);
2724	}
2725
2726	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3225	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2727	glClearColor 0, 0, 0, 0;	3226	glClearColor 0, 0, 0, 0;
2728	glClear GL_COLOR_BUFFER_BIT;	3227	glClear GL_COLOR_BUFFER_BIT;
2729		3228
		3229	package CFPlus::UI::Base;
		3230	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3231	(0, 0, $self->{w}, $self->{h});
		3232
		3233	my $top = int $self->{children}[1]{range}[0];
		3234
		3235	my $paridx = 0;
		3236	my $top_paragraph;
2730	my $top = int $self->{children}[1]{range}[0];	3237	my $top = int $self->{children}[1]{range}[0];
2731		3238
2732	my $y0 = $top;	3239	my $y0 = $top;
2733	my $y1 = $top + $H;	3240	my $y1 = $top + $H;
2734		3241
2735	my $y = 0;
2736
2737	for my $para (@{$self->{par}}) {	3242	for my $para (@{$self->{par}}) {
2738	my $h = $para->{h};	3243	my $h = $para->{h};
		3244	my $y = $para->{y};
2739		3245
2740	if ($y0 < $y + $h && $y < $y1) {	3246	if ($y0 < $y + $h && $y < $y1) {
2741
2742	my $layout = $self->get_layout ($para);	3247	my $layout = $self->get_layout ($para);
2743		3248
2744	$layout->render ($para->{indent}, $y - $y0);	3249	$layout->render ($para->{indent}, $y - $y0);
2745		3250
2746	if (my @w = @{ $para->{widget} }) {	3251	if (my @w = @{ $para->{widget} }) {
…		…
2755	$_->draw;	3260	$_->draw;
2756	}	3261	}
2757	}	3262	}
2758	}	3263	}
2759		3264
2760	$y += $h;	3265	$paridx++;
		3266	$top_paragraph ||= $paridx if $y >= $top;
2761	}	3267	}
		3268
		3269	$self->{top_paragraph} = $top_paragraph;
2762	};	3270	};
2763	});	3271	});
2764	}	3272	}
2765		3273
2766	sub reconfigure {	3274	sub reconfigure {
…		…
2784	$self->{children}[1]->draw;	3292	$self->{children}[1]->draw;
2785	}	3293	}
2786		3294
2787	#############################################################################	3295	#############################################################################
2788		3296
2789	package CFClient::UI::Animator;	3297	package CFPlus::UI::Animator;
2790		3298
2791	use CFClient::OpenGL;	3299	use CFPlus::OpenGL;
2792		3300
2793	our @ISA = CFClient::UI::Bin::;	3301	our @ISA = CFPlus::UI::Bin::;
2794		3302
2795	sub moveto {	3303	sub moveto {
2796	my ($self, $x, $y) = @_;	3304	my ($self, $x, $y) = @_;
2797		3305
2798	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3306	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2826	glPopMatrix;	3334	glPopMatrix;
2827	}	3335	}
2828		3336
2829	#############################################################################	3337	#############################################################################
2830		3338
2831	package CFClient::UI::Flopper;	3339	package CFPlus::UI::Flopper;
2832		3340
2833	our @ISA = CFClient::UI::Button::;	3341	our @ISA = CFPlus::UI::Button::;
2834		3342
2835	sub new {	3343	sub new {
2836	my $class = shift;	3344	my $class = shift;
2837		3345
2838	my $self = $class->SUPER::new (	3346	my $self = $class->SUPER::new (
…		…
2850	$self->{other}->toggle_visibility;	3358	$self->{other}->toggle_visibility;
2851	}	3359	}
2852		3360
2853	#############################################################################	3361	#############################################################################
2854		3362
2855	package CFClient::UI::Tooltip;	3363	package CFPlus::UI::Tooltip;
2856		3364
2857	our @ISA = CFClient::UI::Bin::;	3365	our @ISA = CFPlus::UI::Bin::;
2858		3366
2859	use CFClient::OpenGL;	3367	use CFPlus::OpenGL;
2860		3368
2861	sub new {	3369	sub new {
2862	my $class = shift;	3370	my $class = shift;
2863		3371
2864	$class->SUPER::new (	3372	$class->SUPER::new (
…		…
2867	)	3375	)
2868	}	3376	}
2869		3377
2870	sub set_tooltip_from {	3378	sub set_tooltip_from {
2871	my ($self, $widget) = @_;	3379	my ($self, $widget) = @_;
		3380
		3381	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3382	if $widget->{tooltip} =~ /^#(.*)$/;
2872		3383
2873	my $tooltip = $widget->{tooltip};	3384	my $tooltip = $widget->{tooltip};
2874		3385
2875	if ($ENV{CFPLUS_DEBUG} & 2) {	3386	if ($ENV{CFPLUS_DEBUG} & 2) {
2876	$tooltip .= "\n\n" . (ref $widget) . "\n"	3387	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2880	}	3391	}
2881		3392
2882	$tooltip =~ s/^\n+//;	3393	$tooltip =~ s/^\n+//;
2883	$tooltip =~ s/\n+$//;	3394	$tooltip =~ s/\n+$//;
2884		3395
2885	$self->add (new CFClient::UI::Label	3396	$self->add (new CFPlus::UI::Label
2886	markup => $tooltip,	3397	markup => $tooltip,
2887	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3398	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888	fontsize => 0.8,	3399	fontsize => 0.8,
2889	fg => [0, 0, 0, 1],	3400	style => 1, # FLAG_INVERSE
2890	ellipsise => 0,	3401	ellipsise => 0,
2891	font => ($widget->{tooltip_font} || $::FONT_PROP),	3402	font => ($widget->{tooltip_font} || $::FONT_PROP),
2892	);	3403	);
2893	}	3404	}
2894		3405
…		…
2913		3424
2914	$self->{root}->on_post_alloc ("move_$self" => sub {	3425	$self->{root}->on_post_alloc ("move_$self" => sub {
2915	my $widget = $self->{owner}	3426	my $widget = $self->{owner}
2916	or return;	3427	or return;
2917		3428
		3429	if ($widget->{visible}) {
2918	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3430	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919		3431
2920	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3432	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921	if $x + $self->{w} > $self->{root}{w};	3433	if $x + $self->{w} > $self->{root}{w};
2922		3434
2923	$self->move_abs ($x, $y);	3435	$self->move_abs ($x, $y);
		3436	} else {
		3437	$self->hide;
		3438	}
2924	});	3439	});
2925	}	3440	}
2926		3441
2927	sub _draw {	3442	sub _draw {
2928	my ($self) = @_;	3443	my ($self) = @_;
…		…
2952	$self->SUPER::_draw;	3467	$self->SUPER::_draw;
2953	}	3468	}
2954		3469
2955	#############################################################################	3470	#############################################################################
2956		3471
2957	package CFClient::UI::Face;	3472	package CFPlus::UI::Face;
2958		3473
2959	our @ISA = CFClient::UI::Base::;	3474	our @ISA = CFPlus::UI::DrawBG::;
2960		3475
2961	use CFClient::OpenGL;	3476	use CFPlus::OpenGL;
2962		3477
2963	sub new {	3478	sub new {
2964	my $class = shift;	3479	my $class = shift;
2965		3480
2966	my $self = $class->SUPER::new (	3481	my $self = $class->SUPER::new (
		3482	size_w => 32,
		3483	size_h => 8,
2967	aspect => 1,	3484	aspect => 1,
2968	can_events => 0,	3485	can_events => 0,
2969	@_,	3486	@_,
2970	);	3487	);
2971		3488
2972	if ($self->{anim} && $self->{animspeed}) {	3489	if ($self->{anim} && $self->{animspeed}) {
2973	Scalar::Util::weaken (my $widget = $self);	3490	CFPlus::weaken (my $widget = $self);
2974		3491
2975	$self->{timer} = Event->timer (	3492	$self->{timer} = Event->timer (
2976	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3493	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977	hard => 1,	3494	hard => 1,
2978	interval => $self->{animspeed},	3495	interval => $self->{animspeed},
2979	cb => sub {	3496	cb => sub {
		3497	return unless $::CONN;
		3498
2980	++$widget->{frame};	3499	++$widget->{frame};
		3500	$self->update_face;
2981	$widget->update;	3501	$self->update;
2982	},	3502	},
2983	);	3503	);
		3504
		3505	$self->update_face;
2984	}	3506	}
2985		3507
2986	$self	3508	$self
2987	}	3509	}
2988		3510
		3511	sub update_face {
		3512	my ($self) = @_;
		3513
		3514	return unless $::CONN;
		3515
		3516	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3517	if ($anim && @$anim) {
		3518	delete $self->{wait_face};
		3519	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3520	}
		3521	}
		3522	}
		3523
2989	sub size_request {	3524	sub size_request {
2990	(32, 8)	3525	my ($self) = @_;
		3526
		3527	if ($::CONN) {
		3528	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3529	if (my $tex = $::CONN->{texture}[$faceid]) {
		3530	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3531	} else {
		3532	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3533	$self->realloc;
		3534	});
		3535	}
		3536	}
		3537	}
		3538
		3539	($self->{size_w} || 8, $self->{size_h} || 8)
2991	}	3540	}
2992		3541
2993	sub update {	3542	sub update {
2994	my ($self) = @_;	3543	my ($self) = @_;
2995		3544
…		…
3001	sub _draw {	3550	sub _draw {
3002	my ($self) = @_;	3551	my ($self) = @_;
3003		3552
3004	return unless $::CONN;	3553	return unless $::CONN;
3005		3554
3006	my $face;	3555	$self->SUPER::_draw;
3007		3556
3008	if ($self->{frame}) {
3009	my $anim = $::CONN->{anim}[$self->{anim}];	3557	my $faceid = $::CONN->{faceid}[$self->{face}]
3010		3558	or return;
3011	$face = $anim->[ $self->{frame} % @$anim ]
3012	if $anim && @$anim;
3013	}
3014		3559
3015	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3560	my $tex = $::CONN->{texture}[$faceid];
3016		3561
3017	if ($tex) {	3562	if ($tex) {
3018	glEnable GL_TEXTURE_2D;	3563	glEnable GL_TEXTURE_2D;
3019	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020	glColor 0, 0, 0, 1;	3565	glColor 0, 0, 0, 1;
…		…
3032	$self->SUPER::destroy;	3577	$self->SUPER::destroy;
3033	}	3578	}
3034		3579
3035	#############################################################################	3580	#############################################################################
3036		3581
3037	package CFClient::UI::Buttonbar;	3582	package CFPlus::UI::Buttonbar;
3038		3583
3039	our @ISA = CFClient::UI::HBox::;	3584	our @ISA = CFPlus::UI::HBox::;
3040		3585
3041	# TODO: should actualyl wrap buttons and other goodies.	3586	# TODO: should actually wrap buttons and other goodies.
3042		3587
3043	#############################################################################	3588	#############################################################################
3044		3589
3045	package CFClient::UI::Menu;	3590	package CFPlus::UI::Menu;
3046		3591
3047	our @ISA = CFClient::UI::FancyFrame::;	3592	our @ISA = CFPlus::UI::Toplevel::;
3048		3593
3049	use CFClient::OpenGL;	3594	use CFPlus::OpenGL;
3050		3595
3051	sub new {	3596	sub new {
3052	my $class = shift;	3597	my $class = shift;
3053		3598
3054	my $self = $class->SUPER::new (	3599	my $self = $class->SUPER::new (
3055	items => [],	3600	items => [],
3056	z => 100,	3601	z => 100,
3057	@_,	3602	@_,
3058	);	3603	);
3059		3604
3060	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3605	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061		3606
3062	for my $item (@{ $self->{items} }) {	3607	for my $item (@{ $self->{items} }) {
3063	my ($widget, $cb, $tooltip) = @$item;	3608	my ($widget, $cb, $tooltip) = @$item;
3064		3609
3065	# handle various types of items, only text for now	3610	# handle various types of items, only text for now
3066	if (!ref $widget) {	3611	if (!ref $widget) {
3067	if ($widget =~ /\t/) {	3612	if ($widget =~ /\t/) {
3068	my ($left, $right) = split /\t/, $widget, 2;	3613	my ($left, $right) = split /\t/, $widget, 2;
3069		3614
3070	$widget = new CFClient::UI::HBox	3615	$widget = new CFPlus::UI::HBox
3071	can_hover => 1,	3616	can_hover => 1,
3072	can_events => 1,	3617	can_events => 1,
3073	tooltip => $tooltip,	3618	tooltip => $tooltip,
3074	children => [	3619	children => [
3075	(new CFClient::UI::Label markup => $left, expand => 1),	3620	(new CFPlus::UI::Label markup => $left, expand => 1),
3076	(new CFClient::UI::Label markup => $right, align => +1),	3621	(new CFPlus::UI::Label markup => $right, align => +1),
3077	],	3622	],
3078	;	3623	;
3079		3624
3080	} else {	3625	} else {
3081	$widget = new CFClient::UI::Label	3626	$widget = new CFPlus::UI::Label
3082	can_hover => 1,	3627	can_hover => 1,
3083	can_events => 1,	3628	can_events => 1,
3084	markup => $widget,	3629	markup => $widget,
3085	tooltip => $tooltip;	3630	tooltip => $tooltip;
3086	}	3631	}
…		…
3134	1	3679	1
3135	}	3680	}
3136		3681
3137	#############################################################################	3682	#############################################################################
3138		3683
3139	package CFClient::UI::Multiplexer;	3684	package CFPlus::UI::Multiplexer;
3140		3685
3141	our @ISA = CFClient::UI::Container::;	3686	our @ISA = CFPlus::UI::Container::;
3142		3687
3143	sub new {	3688	sub new {
3144	my $class = shift;	3689	my $class = shift;
3145		3690
3146	my $self = $class->SUPER::new (	3691	my $self = $class->SUPER::new (
…		…
3207	$self->{current}->draw;	3752	$self->{current}->draw;
3208	}	3753	}
3209		3754
3210	#############################################################################	3755	#############################################################################
3211		3756
3212	package CFClient::UI::Notebook;	3757	package CFPlus::UI::Notebook;
3213		3758
3214	our @ISA = CFClient::UI::VBox::;	3759	our @ISA = CFPlus::UI::VBox::;
3215		3760
3216	sub new {	3761	sub new {
3217	my $class = shift;	3762	my $class = shift;
3218		3763
3219	my $self = $class->SUPER::new (	3764	my $self = $class->SUPER::new (
3220	buttonbar => (new CFClient::UI::Buttonbar),	3765	buttonbar => (new CFPlus::UI::Buttonbar),
3221	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3766	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3222	# filter => # will be put between multiplexer and $self	3767	# filter => # will be put between multiplexer and $self
3223	@_,	3768	@_,
3224	);	3769	);
3225		3770
3226	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3771	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3230	}	3775	}
3231		3776
3232	sub add {	3777	sub add {
3233	my ($self, $title, $widget, $tooltip) = @_;	3778	my ($self, $title, $widget, $tooltip) = @_;
3234		3779
3235	Scalar::Util::weaken $self;	3780	CFPlus::weaken $self;
3236		3781
3237	$self->{buttonbar}->add (new CFClient::UI::Button	3782	$self->{buttonbar}->add (new CFPlus::UI::Button
3238	markup => $title,	3783	markup => $title,
3239	tooltip => $tooltip,	3784	tooltip => $tooltip,
3240	on_activate => sub { $self->set_current_page ($widget) },	3785	on_activate => sub { $self->set_current_page ($widget) },
3241	);	3786	);
3242		3787
…		…
3256	$self->emit (page_changed => $self->{multiplexer}{current});	3801	$self->emit (page_changed => $self->{multiplexer}{current});
3257	}	3802	}
3258		3803
3259	#############################################################################	3804	#############################################################################
3260		3805
3261	package CFClient::UI::Combobox;	3806	package CFPlus::UI::Selector;
3262		3807
3263	use utf8;	3808	use utf8;
3264		3809
3265	our @ISA = CFClient::UI::Button::;	3810	our @ISA = CFPlus::UI::Button::;
3266		3811
3267	sub new {	3812	sub new {
3268	my $class = shift;	3813	my $class = shift;
3269		3814
3270	my $self = $class->SUPER::new (	3815	my $self = $class->SUPER::new (
…		…
3287	my ($value, $title, $tooltip) = @$_;	3832	my ($value, $title, $tooltip) = @$_;
3288		3833
3289	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3834	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3290	}	3835	}
3291		3836
3292	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3837	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3293	}	3838	}
3294		3839
3295	sub _set_value {	3840	sub _set_value {
3296	my ($self, $value) = @_;	3841	my ($self, $value) = @_;
3297		3842
…		…
3312	$self->emit (changed => $value);	3857	$self->emit (changed => $value);
3313	}	3858	}
3314		3859
3315	#############################################################################	3860	#############################################################################
3316		3861
3317	package CFClient::UI::Statusbox;	3862	package CFPlus::UI::Statusbox;
3318		3863
3319	our @ISA = CFClient::UI::VBox::;	3864	our @ISA = CFPlus::UI::VBox::;
3320		3865
3321	sub new {	3866	sub new {
3322	my $class = shift;	3867	my $class = shift;
3323		3868
3324	my $self = $class->SUPER::new (	3869	my $self = $class->SUPER::new (
3325	fontsize => 0.8,	3870	fontsize => 0.8,
3326	@_,	3871	@_,
3327	);	3872	);
3328		3873
3329	Scalar::Util::weaken (my $this = $self);	3874	CFPlus::weaken (my $this = $self);
3330		3875
3331	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3876	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3332		3877
3333	$self	3878	$self
3334	}	3879	}
…		…
3336	sub reorder {	3881	sub reorder {
3337	my ($self) = @_;	3882	my ($self) = @_;
3338	my $NOW = Time::HiRes::time;	3883	my $NOW = Time::HiRes::time;
3339		3884
3340	# freeze display when hovering over any label	3885	# freeze display when hovering over any label
3341	return if $CFClient::UI::TOOLTIP->{owner}	3886	return if $CFPlus::UI::TOOLTIP->{owner}
3342	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3887	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3343	values %{ $self->{item} };	3888	values %{ $self->{item} };
3344		3889
3345	while (my ($k, $v) = each %{ $self->{item} }) {	3890	while (my ($k, $v) = each %{ $self->{item} }) {
3346	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3891	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3347	}	3892	}
…		…
3368	for ($short) {	3913	for ($short) {
3369	s/^\s+//;	3914	s/^\s+//;
3370	s/\s+/ /g;	3915	s/\s+/ /g;
3371	}	3916	}
3372		3917
3373	new CFClient::UI::Label	3918	new CFPlus::UI::Label
3374	markup => $short,	3919	markup => $short,
3375	tooltip => $item->{tooltip},	3920	tooltip => $item->{tooltip},
3376	tooltip_font => $::FONT_PROP,	3921	tooltip_font => $::FONT_PROP,
3377	tooltip_width => 0.67,	3922	tooltip_width => 0.67,
3378	fontsize => $item->{fontsize} || $self->{fontsize},	3923	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3457	$self->SUPER::destroy;	4002	$self->SUPER::destroy;
3458	}	4003	}
3459		4004
3460	#############################################################################	4005	#############################################################################
3461		4006
3462	package CFClient::UI::Inventory;
3463
3464	our @ISA = CFClient::UI::Table::;
3465
3466	sub new {
3467	my $class = shift;
3468
3469	my $self = $class->SUPER::new (
3470	col_expand => [0, 1, 0],
3471	@_,
3472	);
3473
3474	$self
3475	}
3476
3477	sub set_items {
3478	my ($self, $items) = @_;
3479
3480	$self->clear;
3481	return unless $items;
3482
3483	my @items = sort {
3484	($a->{type} <=> $b->{type})
3485	or ($a->{name} cmp $b->{name})
3486	} values %$items;
3487
3488	$self->{real_items} = \@items;
3489
3490	my $row = 0;
3491	for my $item (@items) {
3492	CFClient::Item::update_widgets $item;
3493
3494	$self->add (0, $row, $item->{face_widget});
3495	$self->add (1, $row, $item->{desc_widget});
3496	$self->add (2, $row, $item->{weight_widget});
3497
3498	$row++;
3499	}
3500	}
3501
3502	#############################################################################
3503
3504	package CFClient::UI::SpellList;
3505
3506	our @ISA = CFClient::UI::Table::;
3507
3508	sub new {
3509	my $class = shift;
3510
3511	my $self = $class->SUPER::new (
3512	binding => [],
3513	commands => [],
3514	@_,
3515	)
3516	}
3517
3518	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3519
3520	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3521	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3522	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3523	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3524	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3525	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3526	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3527	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3528	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3529	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3530
3531	sub rebuild_spell_list {
3532	my ($self) = @_;
3533
3534	$CFClient::UI::ROOT->on_refresh ($self => sub {
3535	$self->clear;
3536
3537	return unless $::CONN;
3538
3539	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3540	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3541	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3542	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3543	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3544
3545	my $row = 0;
3546
3547	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3548	my $spell = $self->{spell}{$_};
3549
3550	$row++;
3551
3552	my $spell_cb = sub {
3553	my ($widget, $ev) = @_;
3554
3555	if ($ev->{button} == 1) {
3556	$::CONN->user_send ("cast $spell->{name}");
3557	} elsif ($ev->{button} == 2) {
3558	$::CONN->user_send ("invoke $spell->{name}");
3559	} elsif ($ev->{button} == 3) {
3560	(new CFClient::UI::Menu
3561	items => [
3562	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3563	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3564	],
3565	)->popup ($ev);
3566	} else {
3567	return 0;
3568	}
3569
3570	1
3571	};
3572
3573	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3574
3575	#TODO: add path info to tooltip
3576	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3577
3578	$self->add (0, $row, new CFClient::UI::Face
3579	face => $spell->{face},
3580	can_hover => 1,
3581	can_events => 1,
3582	tooltip => $tooltip,
3583	on_button_down => $spell_cb,
3584	);
3585
3586	$self->add (1, $row, new CFClient::UI::Label
3587	expand => 1,
3588	text => $spell->{name},
3589	can_hover => 1,
3590	can_events => 1,
3591	tooltip => $tooltip,
3592	on_button_down => $spell_cb,
3593	);
3594
3595	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3596	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3597	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3598	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3599	}
3600	});
3601	}
3602
3603	sub add_spell {
3604	my ($self, $spell) = @_;
3605
3606	$self->{spell}->{$spell->{name}} = $spell;
3607	$self->rebuild_spell_list;
3608	}
3609
3610	sub remove_spell {
3611	my ($self, $spell) = @_;
3612
3613	delete $self->{spell}->{$spell->{name}};
3614	$self->rebuild_spell_list;
3615	}
3616
3617	sub clear_spells {
3618	my ($self) = @_;
3619
3620	$self->{spell} = {};
3621	$self->rebuild_spell_list;
3622	}
3623
3624	#############################################################################
3625
3626	package CFClient::UI::Root;	4007	package CFPlus::UI::Root;
3627		4008
3628	our @ISA = CFClient::UI::Container::;	4009	our @ISA = CFPlus::UI::Container::;
3629		4010
3630	use List::Util qw(min max);	4011	use List::Util qw(min max);
3631		4012
3632	use CFClient::OpenGL;	4013	use CFPlus::OpenGL;
3633		4014
3634	sub new {	4015	sub new {
3635	my $class = shift;	4016	my $class = shift;
3636		4017
3637	my $self = $class->SUPER::new (	4018	my $self = $class->SUPER::new (
3638	visible => 1,	4019	visible => 1,
3639	@_,	4020	@_,
3640	);	4021	);
3641		4022
3642	Scalar::Util::weaken ($self->{root} = $self);	4023	CFPlus::weaken ($self->{root} = $self);
3643		4024
3644	$self	4025	$self
3645	}	4026	}
3646		4027
3647	sub size_request {	4028	sub size_request {
…		…
3813	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4194	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3814		4195
3815	$w = 0 if $w < 0;	4196	$w = 0 if $w < 0;
3816	$h = 0 if $h < 0;	4197	$h = 0 if $h < 0;
3817		4198
		4199	$w = max $widget->{min_w}, $w;
		4200	$h = max $widget->{min_h}, $h;
		4201
		4202	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4203	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4204
		4205	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4206	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4207
3818	$w = int $w + 0.5;	4208	$w = int $w + 0.5;
3819	$h = int $h + 0.5;	4209	$h = int $h + 0.5;
3820		4210
3821	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4211	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3822	$widget->{old_w} = $widget->{w};	4212	$widget->{old_w} = $widget->{w};
…		…
3845	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4235	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3846	glMatrixMode GL_MODELVIEW;	4236	glMatrixMode GL_MODELVIEW;
3847	glLoadIdentity;	4237	glLoadIdentity;
3848		4238
3849	{	4239	{
3850	package CFClient::UI::Base;	4240	package CFPlus::UI::Base;
3851		4241
3852	($draw_x, $draw_y, $draw_w, $draw_h) =	4242	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3853	(0, 0, $self->{w}, $self->{h});	4243	(0, 0, $self->{w}, $self->{h});
3854	}
3855		4244
3856	$self->_draw;	4245	$self->_draw;
		4246	}
3857	}	4247	}
3858		4248
3859	#############################################################################	4249	#############################################################################
3860		4250
3861	package CFClient::UI;	4251	package CFPlus::UI;
3862		4252
3863	$ROOT = new CFClient::UI::Root;	4253	$ROOT = new CFPlus::UI::Root;
3864	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4254	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3865		4255
3866	1	4256	1
3867		4257

Diff Legend

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