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.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.379 by root, Tue Jul 17 12:04:18 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) = @_;
		450
		451	Carp::confess unless $self->{parent};#d#
418		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 {
…		…
456		490
457	sub invoke_mouse_motion { 0 }	491	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 0 }	492	sub invoke_button_up { 0 }
459	sub invoke_key_down { 0 }	493	sub invoke_key_down { 0 }
460	sub invoke_key_up { 0 }	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;
…		…
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
		532	# I do not really like this solution, but I do not like duplication
		533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
479	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480		540
481	#d##TODO# stop propagating at first true, do not use sum	541	for my $cb (
482	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	542	@{$self->{signal_cb}{$signal} || []}, # before
483	|| ($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
484	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
485	}	550	}
486		551
487	sub find_widget {	552	sub find_widget {
488	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
489		554
…		…
497	}	562	}
498		563
499	sub set_parent {	564	sub set_parent {
500	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
501		566
502	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
503	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
504	}	569	}
505		570
506	sub realloc {	571	sub realloc {
507	my ($self) = @_;	572	my ($self) = @_;
…		…
573	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
576	glEnd;	641	glEnd;
577	glPopMatrix;	642	glPopMatrix;
578	#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;
579	}	644	}
580		645
581	$self->_draw;	646	$self->_draw;
582	glPopMatrix;	647	glPopMatrix;
583	}	648	}
…		…
586	my ($self) = @_;	651	my ($self) = @_;
587		652
588	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
589	}	654	}
590		655
		656	my $cntx;#d#
591	sub DESTROY {	657	sub DESTROY {
592	my ($self) = @_;	658	my ($self) = @_;
593		659
594	return if CFClient::in_destruct;	660	return if CFPlus::in_destruct;
595
596	delete $WIDGET{$self+0};
597		661
598	eval { $self->destroy };	662	eval { $self->destroy };
599	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};
600	}	666	}
601		667
602	#############################################################################	668	#############################################################################
603		669
604	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
605		671
606	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
607		673
608	use strict;	674	use strict;
609	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
610		676
611	sub new {	677	sub new {
612	my $class = shift;	678	my $class = shift;
613		679
614	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
645	}	711	}
646	}	712	}
647		713
648	#############################################################################	714	#############################################################################
649		715
650	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
651		717
652	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
653		719
654	sub new {	720	sub new {
655	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
656	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
657	}	723	}
…		…
664		730
665	sub draw { }	731	sub draw { }
666		732
667	#############################################################################	733	#############################################################################
668		734
669	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
670		736
671	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
672		738
673	sub new {	739	sub new {
674	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
675		741
676	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
685	if $children;	751	if $children;
686		752
687	$self	753	$self
688	}	754	}
689		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
690	sub add {	764	sub add {
691	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
692		766
693	$_->set_parent ($self)	767	$_->set_parent ($self)
694	for @widgets;	768	for @widgets;
…		…
754	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
755	}	829	}
756		830
757	#############################################################################	831	#############################################################################
758		832
759	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
760		834
761	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
762		836
763	sub new {	837	sub new {
764	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
765		839
766	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
767		841
768	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
769	}	843	}
770		844
771	sub add {	845	sub add {
…		…
778	sub remove {	852	sub remove {
779	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
780		854
781	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
782		856
783	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	858	unless @{$self->{children}};
785	}	859	}
786		860
787	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
788		862
…		…
800		874
801	#############################################################################	875	#############################################################################
802		876
803	# back-buffered drawing area	877	# back-buffered drawing area
804		878
805	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
806		880
807	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
808		882
809	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
810		884
811	sub new {	885	sub new {
812	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
813		887
814	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
836	}	910	}
837		911
838	sub render_child {	912	sub render_child {
839	my ($self) = @_;	913	my ($self) = @_;
840		914
841	$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 {
842	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
843	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
844		918
845	{	919	{
846	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
847		921
848	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
849	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
850	}	926	}
851
852	$self->_render;
853	};	927	};
854	}	928	}
855		929
856	sub _draw {	930	sub _draw {
857	my ($self) = @_;	931	my ($self) = @_;
858
859	my ($w, $h) = @$self{qw(w h)};
860		932
861	my $tex = $self->{texture}	933	my $tex = $self->{texture}
862	or return;	934	or return;
863		935
864	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
865	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
866	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
867		939
868	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
869		941
870	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
871	}	943	}
872		944
873	#############################################################################	945	#############################################################################
874		946
875	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
876		948
		949	use List::Util qw(min max);
		950
877	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
878		952
879	sub new {	953	sub new {
880	my $class = shift;	954	my $class = shift;
881		955
882	$class->SUPER::new (	956	$class->SUPER::new (
…		…
912	}	986	}
913		987
914	sub set_offset {	988	sub set_offset {
915	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
916		990
		991	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		992	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		993
		994	if ($x != $self->{view_x} or $y != $self->{view_y}) {
917	$self->{view_x} = int $x;	995	$self->{view_x} = $x;
918	$self->{view_y} = int $y;	996	$self->{view_y} = $y;
919		997
		998	$self->emit (changed => $x, $y);
920	$self->update;	999	$self->update;
		1000	}
921	}	1001	}
922		1002
923	# hmm, this does not work for topleft of $self... but we should not ask for that	1003	# hmm, this does not work for topleft of $self... but we should not ask for that
924	sub coord2local {	1004	sub coord2local {
925	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
…		…
942	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1022	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
943	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1023	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
944	) {	1024	) {
945	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1025	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
946	} else {	1026	} else {
947	$self->CFClient::UI::Base::find_widget ($x, $y)	1027	$self->CFPlus::UI::Base::find_widget ($x, $y)
948	}	1028	}
949	}	1029	}
950		1030
951	sub _render {	1031	sub _render {
952	my ($self) = @_;	1032	my ($self) = @_;
953		1033
954	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1034	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
955	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1035	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
956		1036
957	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1037	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
958		1038
959	$self->SUPER::_render;	1039	$self->SUPER::_render;
960	}	1040	}
961		1041
962	#############################################################################	1042	#############################################################################
963		1043
964	package CFClient::UI::ScrolledWindow;	1044	package CFPlus::UI::ScrolledWindow;
965		1045
966	our @ISA = CFClient::UI::HBox::;	1046	our @ISA = CFPlus::UI::Table::;
967		1047
968	sub new {	1048	sub new {
969	my ($class, %arg) = @_;	1049	my ($class, %arg) = @_;
970		1050
971	my $child = delete $arg{child};	1051	my $child = delete $arg{child};
972		1052
973	my $self;	1053	my $self;
974		1054
975	my $slider = new CFClient::UI::Slider	1055	my $hslider = new CFPlus::UI::Slider
		1056	vertical => 0,
		1057	range => [0, 0, 1, 0.01], # HACK fix
		1058	on_changed => sub {
		1059	$self->{hpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1061	},
		1062	;
		1063
		1064	my $vslider = new CFPlus::UI::Slider
976	vertical => 1,	1065	vertical => 1,
977	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
978	on_changed => sub {	1067	on_changed => sub {
979	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
980	},	1070	},
981	;	1071	;
982		1072
983	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
984	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
		1076	can_events => 1,
985	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
986	%arg,	1081	%arg,
987	);	1082	);
988		1083
		1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	expand => 1,
		1086	scroll_x => $self->{scroll_x},
		1087	scroll_y => $self->{scroll_y},
		1088	on_changed => sub {
		1089	my ($vp, $x, $y) = @_;
		1090
		1091	$vp->{parent}{hslider}->set_value ($x);
		1092	$vp->{parent}{vslider}->set_value ($y);
		1093
		1094	0
		1095	},
		1096	;
		1097
989	$self->SUPER::add ($self->{vp}, $self->{slider});	1098	$self->SUPER::add (0, 0, $self->{vp});
		1099
990	$self->add ($child) if $child;	1100	$self->add ($child) if $child;
991		1101
992	$self	1102	$self
993	}	1103	}
994		1104
…		…
998	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
999		1109
1000	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
1001	}	1111	}
1002		1112
		1113	sub update_slider {
		1114	my ($self) = @_;
		1115
		1116	my $child = ($self->{vp} or return)->child;
		1117
		1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1120
		1121	my $visible = $w1 > $w2;
		1122	if ($visible != $self->{hslider}{visible}) {
		1123	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1124	: $self->{hslider}->hide;
		1125	}
		1126
		1127	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1128	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1129
		1130	my $visible = $h1 > $h2;
		1131	if ($visible != $self->{vslider}{visible}) {
		1132	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1133	: $self->{vslider}->hide;
		1134	}
		1135	}
		1136
		1137	sub update {
		1138	my ($self) = @_;
		1139
		1140	$self->SUPER::update;
		1141	$self->update_slider;
		1142	}
		1143
		1144	sub invoke_mouse_wheel {
		1145	my ($self, $ev) = @_;
		1146
		1147	return 0 unless $ev->{dy}; # only vertical movements for now
		1148
		1149	$self->{vslider}->emit (mouse_wheel => $ev);
		1150
		1151	1
		1152	}
		1153
		1154	sub invoke_button_down {
		1155	my ($self, $ev, $x, $y) = @_;
		1156
		1157	if ($ev->{button} == 2) {
		1158	$self->grab_focus;
		1159
		1160	my $ox = $self->{vp}{view_x} + $ev->{x};
		1161	my $oy = $self->{vp}{view_y} + $ev->{y};
		1162
		1163	$self->{motion} = sub {
		1164	my ($ev, $x, $y) = @_;
		1165
		1166	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1167	$self->update;
		1168	};
		1169
		1170	return 1;
		1171	}
		1172
		1173	0
		1174	}
		1175
1003	sub invoke_button_up {	1176	sub invoke_button_up {
1004	my ($self, $ev) = @_;	1177	my ($self, $ev, $x, $y) = @_;
1005		1178
1006	warn "button up $ev->{button}\n";#d#	1179	if (delete $self->{motion}) {
		1180	return 1;
1007		1181	}
		1182
1008	0	1183	0
1009	}	1184	}
1010		1185
1011	sub update_slider {	1186	sub invoke_mouse_motion {
1012	my ($self) = @_;	1187	my ($self, $ev, $x, $y) = @_;
1013		1188
1014	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1189	if ($self->{motion}) {
1015	}	1190	$self->{motion}->($ev, $x, $y);
		1191	return 1;
		1192	}
1016		1193
1017	sub update {	1194	0
1018	my ($self) = @_;
1019
1020	$self->SUPER::update;
1021
1022	$self->update_slider;
1023	}	1195	}
1024		1196
1025	sub invoke_size_allocate {	1197	sub invoke_size_allocate {
1026	my ($self, $w, $h) = @_;	1198	my ($self, $w, $h) = @_;
1027		1199
1028	$self->update_slider;	1200	$self->update_slider;
1029
1030	$self->SUPER::invoke_size_allocate ($w, $h)	1201	$self->SUPER::invoke_size_allocate ($w, $h)
1031	}	1202	}
1032		1203
1033	#############################################################################	1204	#############################################################################
1034		1205
1035	package CFClient::UI::Frame;	1206	package CFPlus::UI::Frame;
1036		1207
1037	our @ISA = CFClient::UI::Bin::;	1208	our @ISA = CFPlus::UI::Bin::;
1038		1209
1039	use CFClient::OpenGL;	1210	use CFPlus::OpenGL;
1040		1211
1041	sub new {	1212	sub new {
1042	my $class = shift;	1213	my $class = shift;
1043		1214
1044	$class->SUPER::new (	1215	$class->SUPER::new (
…		…
1070	$self->SUPER::_draw;	1241	$self->SUPER::_draw;
1071	}	1242	}
1072		1243
1073	#############################################################################	1244	#############################################################################
1074		1245
1075	package CFClient::UI::FancyFrame;	1246	package CFPlus::UI::FancyFrame;
1076		1247
1077	our @ISA = CFClient::UI::Bin::;	1248	our @ISA = CFPlus::UI::Bin::;
1078		1249
1079	use CFClient::OpenGL;	1250	use CFPlus::OpenGL;
		1251
		1252	sub new {
		1253	my ($class, %arg) = @_;
		1254
		1255	if ((exists $arg{label}) && !ref $arg{label}) {
		1256	$arg{label} = new CFPlus::UI::Label
		1257	align => 1,
		1258	valign => 0,
		1259	text => $arg{label},
		1260	fontsize => ($arg{border} || 0.8) * 0.75;
		1261	}
		1262
		1263	my $self = $class->SUPER::new (
		1264	# label => "",
		1265	fg => [0.6, 0.3, 0.1],
		1266	border => 0.8,
		1267	style => 'single',
		1268	%arg,
		1269	);
		1270
		1271	$self
		1272	}
		1273
		1274	sub add {
		1275	my ($self, @widgets) = @_;
		1276
		1277	$self->SUPER::add (@widgets);
		1278	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1279	}
		1280
		1281	sub border {
		1282	int $_[0]{border} * $::FONTSIZE
		1283	}
		1284
		1285	sub size_request {
		1286	my ($self) = @_;
		1287
		1288	($self->{label_w}, undef) = $self->{label}->size_request
		1289	if $self->{label};
		1290
		1291	my ($w, $h) = $self->SUPER::size_request;
		1292
		1293	(
		1294	$w + $self->border * 2,
		1295	$h + $self->border * 2,
		1296	)
		1297	}
		1298
		1299	sub invoke_size_allocate {
		1300	my ($self, $w, $h) = @_;
		1301
		1302	my $border = $self->border;
		1303
		1304	$w -= List::Util::max 0, $border * 2;
		1305	$h -= List::Util::max 0, $border * 2;
		1306
		1307	if (my $label = $self->{label}) {
		1308	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1309	$label->{h} = List::Util::min $h, $border;
		1310	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1311	}
		1312
		1313	$self->child->configure ($border, $border, $w, $h);
		1314
		1315	1
		1316	}
		1317
		1318	sub _draw {
		1319	my ($self) = @_;
		1320
		1321	my $child = $self->{children}[0];
		1322
		1323	my $border = $self->border;
		1324	my ($w, $h) = ($self->{w}, $self->{h});
		1325
		1326	$child->draw;
		1327
		1328	glColor @{$self->{fg}};
		1329	glBegin GL_LINE_STRIP;
		1330	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1331	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1333	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1334	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1335	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1336	glEnd;
		1337
		1338	if ($self->{label}) {
		1339	glTranslate $border * 2, 0;
		1340	$self->{label}->_draw;
		1341	}
		1342	}
		1343
		1344	#############################################################################
		1345
		1346	package CFPlus::UI::Toplevel;
		1347
		1348	our @ISA = CFPlus::UI::Bin::;
		1349
		1350	use CFPlus::OpenGL;
1080		1351
1081	my $bg =	1352	my $bg =
1082	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1353	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1083	mipmap => 1, wrap => 1;	1354	mipmap => 1, wrap => 1;
1084		1355
1085	my @border =	1356	my @border =
1086	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1087	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1358	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1088		1359
1089	sub new {	1360	sub new {
1090	my ($class, %arg) = @_;	1361	my ($class, %arg) = @_;
1091		1362
…		…
1097	min_w => 64,	1368	min_w => 64,
1098	min_h => 32,	1369	min_h => 32,
1099	%arg,	1370	%arg,
1100	);	1371	);
1101		1372
1102	$self->{title_widget} = new CFClient::UI::Label	1373	$self->{title_widget} = new CFPlus::UI::Label
1103	align => 0,	1374	align => 0,
1104	valign => 1,	1375	valign => 1,
1105	text => $self->{title},	1376	text => $self->{title},
1106	fontsize => $self->{border},	1377	fontsize => $self->{border},
1107	if exists $self->{title};	1378	if exists $self->{title};
1108		1379
1109	if ($self->{has_close_button}) {	1380	if ($self->{has_close_button}) {
1110	$self->{close_button} =	1381	$self->{close_button} =
1111	new CFClient::UI::ImageButton	1382	new CFPlus::UI::ImageButton
1112	path => 'x1_close.png',	1383	path => 'x1_close.png',
1113	on_activate => sub { $self->emit ("delete") };	1384	on_activate => sub { $self->emit ("delete") };
1114		1385
1115	$self->CFClient::UI::Container::add ($self->{close_button});	1386	$self->CFPlus::UI::Container::add ($self->{close_button});
1116	}	1387	}
1117		1388
1118	$self	1389	$self
1119	}	1390	}
1120		1391
1121	sub add {	1392	sub add {
1122	my ($self, @widgets) = @_;	1393	my ($self, @widgets) = @_;
1123		1394
1124	$self->SUPER::add (@widgets);	1395	$self->SUPER::add (@widgets);
1125	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1396	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1126	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1397	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1127	}	1398	}
1128		1399
1129	sub border {	1400	sub border {
1130	int $_[0]{border} * $::FONTSIZE	1401	int $_[0]{border} * $::FONTSIZE
1131	}	1402	}
…		…
1239	$self->{motion}->($ev, $x, $y) if $self->{motion};	1510	$self->{motion}->($ev, $x, $y) if $self->{motion};
1240		1511
1241	! ! $self->{motion}	1512	! ! $self->{motion}
1242	}	1513	}
1243		1514
		1515	sub invoke_visibility_change {
		1516	my ($self, $visible) = @_;
		1517
		1518	delete $self->{motion} unless $visible;
		1519
		1520	0
		1521	}
		1522
1244	sub _draw {	1523	sub _draw {
1245	my ($self) = @_;	1524	my ($self) = @_;
1246		1525
1247	my $child = $self->{children}[0];	1526	my $child = $self->{children}[0];
1248		1527
…		…
1285	if $self->{close_button};	1564	if $self->{close_button};
1286	}	1565	}
1287		1566
1288	#############################################################################	1567	#############################################################################
1289		1568
1290	package CFClient::UI::Table;	1569	package CFPlus::UI::Table;
1291		1570
1292	our @ISA = CFClient::UI::Base::;	1571	our @ISA = CFPlus::UI::Base::;
1293		1572
1294	use List::Util qw(max sum);	1573	use List::Util qw(max sum);
1295		1574
1296	use CFClient::OpenGL;	1575	use CFPlus::OpenGL;
1297		1576
1298	sub new {	1577	sub new {
1299	my $class = shift;	1578	my $class = shift;
1300		1579
1301	$class->SUPER::new (	1580	$class->SUPER::new (
		1581	children => [],
1302	col_expand => [],	1582	col_expand => [],
		1583	row_expand => [],
1303	@_,	1584	@_,
1304	)	1585	)
1305	}	1586	}
1306		1587
1307	sub children {	1588	sub children {
1308	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1589	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309	}	1590	}
1310		1591
		1592	# TODO: store row/col info in child widget and use standard add/del
1311	sub add {	1593	sub add {
1312	my ($self, $x, $y, $child) = @_;	1594	my ($self) = shift;
1313		1595
		1596	while (@_) {
		1597	my ($x, $y, $child) = splice @_, 0, 3, ();
1314	$child->set_parent ($self);	1598	$child->set_parent ($self);
1315	$self->{children}[$y][$x] = $child;	1599	$self->{children}[$y][$x] = $child;
		1600	}
1316		1601
		1602	$self->{force_realloc} = 1;
		1603	$self->{force_size_alloc} = 1;
1317	$self->realloc;	1604	$self->realloc;
1318	}	1605	}
1319		1606
1320	sub remove {	1607	sub remove {
1321	my ($self, $child) = @_;	1608	my ($self, $child) = @_;
1322		1609
1323	# TODO: not yet implemented	1610	for (@{ $self->{children} }) {
		1611	for (@{ $_ || [] }) {
		1612	$_ = undef if $_ == $child;
		1613	}
		1614	}
1324	}	1615	}
1325		1616
1326	# TODO: move to container class maybe? send children a signal on removal?	1617	# TODO: move to container class maybe? send children a signal on removal?
1327	sub clear {	1618	sub clear {
1328	my ($self) = @_;	1619	my ($self) = @_;
…		…
1377	my ($ws, $hs) = $self->get_wh;	1668	my ($ws, $hs) = $self->get_wh;
1378		1669
1379	my $req_w = (sum @$ws) || 1;	1670	my $req_w = (sum @$ws) || 1;
1380	my $req_h = (sum @$hs) || 1;	1671	my $req_h = (sum @$hs) || 1;
1381		1672
1382	# TODO: nicer code && do row_expand	1673	# TODO: nicer code
1383	my @col_expand = @{$self->{col_expand}};	1674	my @col_expand = @{$self->{col_expand}};
1384	@col_expand = (1) x @$ws unless @col_expand;	1675	@col_expand = (1) x @$ws unless @col_expand;
1385	my $col_expand = (sum @col_expand) || 1;	1676	my $col_expand = (sum @col_expand) || 1;
1386		1677
1387	# linearly scale sizes
1388	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1678	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1389	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1390		1679
1391	CFClient::UI::harmonize $ws;	1680	CFPlus::UI::harmonize $ws;
		1681
		1682	my @row_expand = @{$self->{row_expand}};
		1683	@row_expand = (1) x @$ws unless @row_expand;
		1684	my $row_expand = (sum @row_expand) || 1;
		1685
		1686	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1687
1392	CFClient::UI::harmonize $hs;	1688	CFPlus::UI::harmonize $hs;
1393		1689
1394	my $y;	1690	my $y;
1395		1691
1396	for my $r (0 .. $#{$self->{children}}) {	1692	for my $r (0 .. $#{$self->{children}}) {
1397	my $row = $self->{children}[$r]	1693	my $row = $self->{children}[$r]
…		…
1440	}	1736	}
1441	}	1737	}
1442		1738
1443	#############################################################################	1739	#############################################################################
1444		1740
1445	package CFClient::UI::Box;	1741	package CFPlus::UI::Fixed;
1446		1742
		1743	use List::Util qw(min max);
		1744
1447	our @ISA = CFClient::UI::Container::;	1745	our @ISA = CFPlus::UI::Container::;
		1746
		1747	sub add {
		1748	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1749
		1750	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1751	$self->SUPER::add ($child);
		1752	}
		1753
		1754	sub _scale($$$) {
		1755	my ($mode, $val, $max) = @_;
		1756
		1757	$mode eq "abs" ? $val
		1758	: $mode eq "rel" ? $val * $max
		1759	: 0
		1760	}
		1761
		1762	sub size_request {
		1763	my ($self) = @_;
		1764
		1765	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1766
		1767	# determine overall size by querying abs widgets
		1768	for my $child ($self->visible_children) {
		1769	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1770
		1771	if ($pos eq "abs") {
		1772	$w = _scale $size, $w, $child->{req_w};
		1773	$h = _scale $size, $h, $child->{req_h};
		1774
		1775	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1776	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1777	}
		1778	}
		1779
		1780	my $W = $x2 - $x1;
		1781	my $H = $y2 - $y1;
		1782
		1783	# now layout remaining widgets
		1784	for my $child ($self->visible_children) {
		1785	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1786
		1787	if ($pos ne "abs") {
		1788	$x = _scale $pos, $x, $W;
		1789	$y = _scale $pos, $x, $H;
		1790	$w = _scale $size, $w, $child->{req_w};
		1791	$h = _scale $size, $h, $child->{req_h};
		1792
		1793	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1794	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1795	}
		1796	}
		1797
		1798	my $W = $x2 - $x1;
		1799	my $H = $y2 - $y1;
		1800
		1801	($W, $H)
		1802	}
		1803
		1804	sub invoke_size_allocate {
		1805	my ($self, $W, $H) = @_;
		1806
		1807	for my $child ($self->visible_children) {
		1808	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1809
		1810	$x = _scale $pos, $x, $W;
		1811	$y = _scale $pos, $x, $H;
		1812	$w = _scale $size, $w, $child->{req_w};
		1813	$h = _scale $size, $h, $child->{req_h};
		1814
		1815	$child->configure ($x, $y, $w, $h);
		1816	}
		1817
		1818	1
		1819	}
		1820
		1821	#############################################################################
		1822
		1823	package CFPlus::UI::Box;
		1824
		1825	our @ISA = CFPlus::UI::Container::;
1448		1826
1449	sub size_request {	1827	sub size_request {
1450	my ($self) = @_;	1828	my ($self) = @_;
1451		1829
1452	$self->{vertical}	1830	$self->{vertical}
…		…
1485	$req[$_] += $space * $children[$_]{expand}	1863	$req[$_] += $space * $children[$_]{expand}
1486	for 0 .. $#children;	1864	for 0 .. $#children;
1487	}	1865	}
1488	}	1866	}
1489		1867
1490	CFClient::UI::harmonize \@req;	1868	CFPlus::UI::harmonize \@req;
1491		1869
1492	my $pos = 0;	1870	my $pos = 0;
1493	for (0 .. $#children) {	1871	for (0 .. $#children) {
1494	my $alloc = $req[$_];	1872	my $alloc = $req[$_];
1495	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1873	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1500	1	1878	1
1501	}	1879	}
1502		1880
1503	#############################################################################	1881	#############################################################################
1504		1882
1505	package CFClient::UI::HBox;	1883	package CFPlus::UI::HBox;
1506		1884
1507	our @ISA = CFClient::UI::Box::;	1885	our @ISA = CFPlus::UI::Box::;
1508		1886
1509	sub new {	1887	sub new {
1510	my $class = shift;	1888	my $class = shift;
1511		1889
1512	$class->SUPER::new (	1890	$class->SUPER::new (
…		…
1515	)	1893	)
1516	}	1894	}
1517		1895
1518	#############################################################################	1896	#############################################################################
1519		1897
1520	package CFClient::UI::VBox;	1898	package CFPlus::UI::VBox;
1521		1899
1522	our @ISA = CFClient::UI::Box::;	1900	our @ISA = CFPlus::UI::Box::;
1523		1901
1524	sub new {	1902	sub new {
1525	my $class = shift;	1903	my $class = shift;
1526		1904
1527	$class->SUPER::new (	1905	$class->SUPER::new (
…		…
1530	)	1908	)
1531	}	1909	}
1532		1910
1533	#############################################################################	1911	#############################################################################
1534		1912
1535	package CFClient::UI::Label;	1913	package CFPlus::UI::Label;
1536		1914
1537	our @ISA = CFClient::UI::DrawBG::;	1915	our @ISA = CFPlus::UI::DrawBG::;
1538		1916
1539	use CFClient::OpenGL;	1917	use CFPlus::OpenGL;
1540		1918
1541	sub new {	1919	sub new {
1542	my ($class, %arg) = @_;	1920	my ($class, %arg) = @_;
1543		1921
1544	my $self = $class->SUPER::new (	1922	my $self = $class->SUPER::new (
…		…
1547	#active_bg => none	1925	#active_bg => none
1548	#font => default_font	1926	#font => default_font
1549	#text => initial text	1927	#text => initial text
1550	#markup => initial narkup	1928	#markup => initial narkup
1551	#max_w => maximum pixel width	1929	#max_w => maximum pixel width
		1930	#style => 0, # render flags
1552	ellipsise => 3, # end	1931	ellipsise => 3, # end
1553	layout => (new CFClient::Layout),	1932	layout => (new CFPlus::Layout),
1554	fontsize => 1,	1933	fontsize => 1,
1555	align => -1,	1934	align => -1,
1556	valign => -1,	1935	valign => -1,
1557	padding_x => 2,	1936	padding_x => 2,
1558	padding_y => 2,	1937	padding_y => 2,
1559	can_events => 0,	1938	can_events => 0,
1560	%arg	1939	%arg
1561	);	1940	);
1562		1941
1563	if (exists $self->{template}) {	1942	if (exists $self->{template}) {
1564	my $layout = new CFClient::Layout;	1943	my $layout = new CFPlus::Layout;
1565	$layout->set_text (delete $self->{template});	1944	$layout->set_text (delete $self->{template});
1566	$self->{template} = $layout;	1945	$self->{template} = $layout;
1567	}	1946	}
1568		1947
1569	if (exists $self->{markup}) {	1948	if (exists $self->{markup}) {
…		…
1571	} else {	1950	} else {
1572	$self->set_text (delete $self->{text});	1951	$self->set_text (delete $self->{text});
1573	}	1952	}
1574		1953
1575	$self	1954	$self
1576	}
1577
1578	sub escape($) {
1579	local $_ = $_[0];
1580
1581	s/&/&amp;/g;
1582	s/>/&gt;/g;
1583	s/</&lt;/g;
1584
1585	$_
1586	}	1955	}
1587		1956
1588	sub update {	1957	sub update {
1589	my ($self) = @_;	1958	my ($self) = @_;
1590		1959
…		…
1717	};	2086	};
1718		2087
1719	my $w = List::Util::min $self->{w} + 4, $size->[0];	2088	my $w = List::Util::min $self->{w} + 4, $size->[0];
1720	my $h = List::Util::min $self->{h} + 2, $size->[1];	2089	my $h = List::Util::min $self->{h} + 2, $size->[1];
1721		2090
1722	$self->{layout}->render ($self->{ox}, $self->{oy});	2091	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1723	}	2092	}
1724		2093
1725	#############################################################################	2094	#############################################################################
1726		2095
1727	package CFClient::UI::EntryBase;	2096	package CFPlus::UI::EntryBase;
1728		2097
1729	our @ISA = CFClient::UI::Label::;	2098	our @ISA = CFPlus::UI::Label::;
1730		2099
1731	use CFClient::OpenGL;	2100	use CFPlus::OpenGL;
1732		2101
1733	sub new {	2102	sub new {
1734	my $class = shift;	2103	my $class = shift;
1735		2104
1736	$class->SUPER::new (	2105	$class->SUPER::new (
…		…
1740	active_fg => [0, 0, 0],	2109	active_fg => [0, 0, 0],
1741	can_hover => 1,	2110	can_hover => 1,
1742	can_focus => 1,	2111	can_focus => 1,
1743	valign => 0,	2112	valign => 0,
1744	can_events => 1,	2113	can_events => 1,
		2114	ellipsise => 0,
1745	#text => ...	2115	#text => ...
1746	#hidden => "*",	2116	#hidden => "*",
1747	@_	2117	@_
1748	)	2118	)
1749	}	2119	}
…		…
1794	my $sym = $ev->{sym};	2164	my $sym = $ev->{sym};
1795	my $uni = $ev->{unicode};	2165	my $uni = $ev->{unicode};
1796		2166
1797	my $text = $self->get_text;	2167	my $text = $self->get_text;
1798		2168
		2169	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2170
1799	if ($uni == 8) {	2171	if ($uni == 8) {
1800	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2172	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1801	} elsif ($uni == 127) {	2173	} elsif ($uni == 127) {
1802	substr $text, $self->{cursor}, 1, "";	2174	substr $text, $self->{cursor}, 1, "";
1803	} elsif ($sym == CFClient::SDLK_LEFT) {	2175	} elsif ($sym == CFPlus::SDLK_LEFT) {
1804	--$self->{cursor} if $self->{cursor};	2176	--$self->{cursor} if $self->{cursor};
1805	} elsif ($sym == CFClient::SDLK_RIGHT) {	2177	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1806	++$self->{cursor} if $self->{cursor} < length $self->{text};	2178	++$self->{cursor} if $self->{cursor} < length $self->{text};
1807	} elsif ($sym == CFClient::SDLK_HOME) {	2179	} elsif ($sym == CFPlus::SDLK_HOME) {
		2180	# what a hack
		2181	$self->{cursor} =
		2182	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2183	? length $1
		2184	: 0;
		2185	} elsif ($sym == CFPlus::SDLK_END) {
		2186	# uh, again
		2187	$self->{cursor} =
		2188	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2189	? $self->{cursor} + length $1
		2190	: length $self->{text};
		2191	} elsif ($uni == 21) { # ctrl-u
		2192	$text = "";
1808	$self->{cursor} = 0;	2193	$self->{cursor} = 0;
1809	} elsif ($sym == CFClient::SDLK_END) {
1810	$self->{cursor} = length $text;
1811	} elsif ($uni == 27) {	2194	} elsif ($uni == 27) {
1812	$self->emit ('escape');	2195	$self->emit ('escape');
1813	} elsif ($uni) {	2196	} elsif ($uni == 0x0d) {
		2197	substr $text, $self->{cursor}++, 0, "\012";
		2198	} elsif ($uni >= 0x20) {
1814	substr $text, $self->{cursor}++, 0, chr $uni;	2199	substr $text, $self->{cursor}++, 0, chr $uni;
1815	} else {	2200	} else {
1816	return 0;	2201	return 0;
1817	}	2202	}
1818		2203
1819	$self->_set_text ($text);	2204	$self->_set_text ($text);
1820		2205
1821	$self->realloc;	2206	$self->realloc;
		2207	$self->update;
1822		2208
1823	1	2209	1
1824	}	2210	}
1825		2211
1826	sub invoke_focus_in {	2212	sub invoke_focus_in {
…		…
1888	utf8::encode $text;	2274	utf8::encode $text;
1889		2275
1890	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2276	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1891	}	2277	}
1892		2278
1893	glColor @{$self->{fg}};
1894	glBegin GL_LINES;	2279	glBegin GL_LINES;
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2280	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1896	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2281	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1897	glEnd;	2282	glEnd;
1898	}	2283	}
1899	}	2284	}
1900		2285
		2286	#############################################################################
		2287
1901	package CFClient::UI::Entry;	2288	package CFPlus::UI::Entry;
1902		2289
1903	our @ISA = CFClient::UI::EntryBase::;	2290	our @ISA = CFPlus::UI::EntryBase::;
1904		2291
1905	use CFClient::OpenGL;	2292	use CFPlus::OpenGL;
1906		2293
1907	sub invoke_key_down {	2294	sub invoke_key_down {
1908	my ($self, $ev) = @_;	2295	my ($self, $ev) = @_;
1909		2296
1910	my $sym = $ev->{sym};	2297	my $sym = $ev->{sym};
1911		2298
1912	if ($sym == 13) {	2299	if ($ev->{uni} == 0x0d || $sym == 13) {
1913	unshift @{$self->{history}},	2300	unshift @{$self->{history}},
1914	my $txt = $self->get_text;	2301	my $txt = $self->get_text;
1915		2302
1916	$self->{history_pointer} = -1;	2303	$self->{history_pointer} = -1;
1917	$self->{history_saveback} = '';	2304	$self->{history_saveback} = '';
1918	$self->emit (activate => $txt);	2305	$self->emit (activate => $txt);
1919	$self->update;	2306	$self->update;
1920		2307
1921	} elsif ($sym == CFClient::SDLK_UP) {	2308	} elsif ($sym == CFPlus::SDLK_UP) {
1922	if ($self->{history_pointer} < 0) {	2309	if ($self->{history_pointer} < 0) {
1923	$self->{history_saveback} = $self->get_text;	2310	$self->{history_saveback} = $self->get_text;
1924	}	2311	}
1925	if (@{$self->{history} || []} > 0) {	2312	if (@{$self->{history} || []} > 0) {
1926	$self->{history_pointer}++;	2313	$self->{history_pointer}++;
…		…
1928	$self->{history_pointer} = @{$self->{history} || []} - 1;	2315	$self->{history_pointer} = @{$self->{history} || []} - 1;
1929	}	2316	}
1930	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2317	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1931	}	2318	}
1932		2319
1933	} elsif ($sym == CFClient::SDLK_DOWN) {	2320	} elsif ($sym == CFPlus::SDLK_DOWN) {
1934	$self->{history_pointer}--;	2321	$self->{history_pointer}--;
1935	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2322	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1936		2323
1937	if ($self->{history_pointer} >= 0) {	2324	if ($self->{history_pointer} >= 0) {
1938	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2325	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1947	1	2334	1
1948	}	2335	}
1949		2336
1950	#############################################################################	2337	#############################################################################
1951		2338
		2339	package CFPlus::UI::TextEdit;
		2340
		2341	our @ISA = CFPlus::UI::EntryBase::;
		2342
		2343	use CFPlus::OpenGL;
		2344
		2345	sub move_cursor_ver {
		2346	my ($self, $dy) = @_;
		2347
		2348	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2349
		2350	$y += $dy;
		2351
		2352	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2353	$self->{cursor} = $index;
		2354	delete $self->{cur_h};
		2355	$self->update;
		2356	return;
		2357	}
		2358	}
		2359
		2360	sub invoke_key_down {
		2361	my ($self, $ev) = @_;
		2362
		2363	my $sym = $ev->{sym};
		2364
		2365	if ($sym == CFPlus::SDLK_UP) {
		2366	$self->move_cursor_ver (-1);
		2367	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2368	$self->move_cursor_ver (+1);
		2369	} else {
		2370	return $self->SUPER::invoke_key_down ($ev)
		2371	}
		2372
		2373	1
		2374	}
		2375
		2376	#############################################################################
		2377
1952	package CFClient::UI::Button;	2378	package CFPlus::UI::Button;
1953		2379
1954	our @ISA = CFClient::UI::Label::;	2380	our @ISA = CFPlus::UI::Label::;
1955		2381
1956	use CFClient::OpenGL;	2382	use CFPlus::OpenGL;
1957		2383
1958	my @tex =	2384	my @tex =
1959	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2385	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1960	qw(b1_button_active.png);	2386	qw(b1_button_active.png);
1961		2387
1962	sub new {	2388	sub new {
1963	my $class = shift;	2389	my $class = shift;
1964		2390
…		…
2001	$self->SUPER::_draw;	2427	$self->SUPER::_draw;
2002	}	2428	}
2003		2429
2004	#############################################################################	2430	#############################################################################
2005		2431
		2432	package CFPlus::UI::CheckBox;
		2433
		2434	our @ISA = CFPlus::UI::DrawBG::;
		2435
		2436	my @tex =
		2437	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2438	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2439
		2440	use CFPlus::OpenGL;
		2441
		2442	sub new {
		2443	my $class = shift;
		2444
		2445	$class->SUPER::new (
		2446	padding_x => 2,
		2447	padding_y => 2,
		2448	fg => [1, 1, 1],
		2449	active_fg => [1, 1, 0],
		2450	bg => [0, 0, 0, 0.2],
		2451	active_bg => [1, 1, 1, 0.5],
		2452	state => 0,
		2453	can_hover => 1,
		2454	@_
		2455	)
		2456	}
		2457
		2458	sub size_request {
		2459	my ($self) = @_;
		2460
		2461	(6) x 2
		2462	}
		2463
		2464	sub toggle {
		2465	my ($self) = @_;
		2466
		2467	$self->{state} = !$self->{state};
		2468	$self->emit (changed => $self->{state});
		2469	$self->update;
		2470	}
		2471
		2472	sub invoke_button_down {
		2473	my ($self, $ev, $x, $y) = @_;
		2474
		2475	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2476	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2477	$self->toggle;
		2478	} else {
		2479	return 0
		2480	}
		2481
		2482	1
		2483	}
		2484
		2485	sub _draw {
		2486	my ($self) = @_;
		2487
		2488	$self->SUPER::_draw;
		2489
		2490	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2491
		2492	my ($w, $h) = @$self{qw(w h)};
		2493
		2494	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2495
		2496	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2497
		2498	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2499
		2500	glEnable GL_TEXTURE_2D;
		2501	$tex->draw_quad_alpha (0, 0, $s, $s);
		2502	glDisable GL_TEXTURE_2D;
		2503	}
		2504
		2505	#############################################################################
		2506
		2507	package CFPlus::UI::Image;
		2508
		2509	our @ISA = CFPlus::UI::Base::;
		2510
		2511	use CFPlus::OpenGL;
		2512
		2513	our %texture_cache;
		2514
		2515	sub new {
		2516	my $class = shift;
		2517
		2518	my $self = $class->SUPER::new (
		2519	can_events => 0,
		2520	@_,
		2521	);
		2522
		2523	$self->{path} || $self->{tex}
		2524	or Carp::croak "'path' or 'tex' attributes required";
		2525
		2526	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2527	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2528
		2529	CFPlus::weaken $texture_cache{$self->{path}};
		2530
		2531	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2532
		2533	$self
		2534	}
		2535
		2536	sub STORABLE_freeze {
		2537	my ($self, $cloning) = @_;
		2538
		2539	$self->{path}
		2540	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2541
		2542	$self->{path}
		2543	}
		2544
		2545	sub STORABLE_attach {
		2546	my ($self, $cloning, $path) = @_;
		2547
		2548	$self->new (path => $path)
		2549	}
		2550
		2551	sub size_request {
		2552	my ($self) = @_;
		2553
		2554	($self->{tex}{w}, $self->{tex}{h})
		2555	}
		2556
		2557	sub _draw {
		2558	my ($self) = @_;
		2559
		2560	my $tex = $self->{tex};
		2561
		2562	my ($w, $h) = ($self->{w}, $self->{h});
		2563
		2564	if ($self->{rot90}) {
		2565	glRotate 90, 0, 0, 1;
		2566	glTranslate 0, -$self->{w}, 0;
		2567
		2568	($w, $h) = ($h, $w);
		2569	}
		2570
		2571	glEnable GL_TEXTURE_2D;
		2572	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2573
		2574	$tex->draw_quad (0, 0, $w, $h);
		2575
		2576	glDisable GL_TEXTURE_2D;
		2577	}
		2578
		2579	#############################################################################
		2580
2006	package CFClient::UI::ImageButton;	2581	package CFPlus::UI::ImageButton;
2007		2582
2008	our @ISA = CFClient::UI::Image::;	2583	our @ISA = CFPlus::UI::Image::;
2009		2584
2010	use CFClient::OpenGL;	2585	use CFPlus::OpenGL;
2011		2586
2012	my %textures;	2587	my %textures;
2013		2588
2014	sub new {	2589	sub new {
2015	my $class = shift;	2590	my $class = shift;
…		…
2037	1	2612	1
2038	}	2613	}
2039		2614
2040	#############################################################################	2615	#############################################################################
2041		2616
2042	package CFClient::UI::CheckBox;
2043
2044	our @ISA = CFClient::UI::DrawBG::;
2045
2046	my @tex =
2047	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2048	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2049
2050	use CFClient::OpenGL;
2051
2052	sub new {
2053	my $class = shift;
2054
2055	$class->SUPER::new (
2056	padding_x => 2,
2057	padding_y => 2,
2058	fg => [1, 1, 1],
2059	active_fg => [1, 1, 0],
2060	bg => [0, 0, 0, 0.2],
2061	active_bg => [1, 1, 1, 0.5],
2062	state => 0,
2063	can_hover => 1,
2064	@_
2065	)
2066	}
2067
2068	sub size_request {
2069	my ($self) = @_;
2070
2071	(6) x 2
2072	}
2073
2074	sub toggle {
2075	my ($self) = @_;
2076
2077	$self->{state} = !$self->{state};
2078	$self->emit (changed => $self->{state});
2079	$self->update;
2080	}
2081
2082	sub invoke_button_down {
2083	my ($self, $ev, $x, $y) = @_;
2084
2085	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2086	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2087	$self->toggle;
2088	} else {
2089	return 0
2090	}
2091
2092	1
2093	}
2094
2095	sub _draw {
2096	my ($self) = @_;
2097
2098	$self->SUPER::_draw;
2099
2100	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2101
2102	my ($w, $h) = @$self{qw(w h)};
2103
2104	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2105
2106	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2107
2108	my $tex = $self->{state} ? $tex[1] : $tex[0];
2109
2110	glEnable GL_TEXTURE_2D;
2111	$tex->draw_quad_alpha (0, 0, $s, $s);
2112	glDisable GL_TEXTURE_2D;
2113	}
2114
2115	#############################################################################
2116
2117	package CFClient::UI::Image;	2617	package CFPlus::UI::VGauge;
2118		2618
2119	our @ISA = CFClient::UI::Base::;	2619	our @ISA = CFPlus::UI::Base::;
2120
2121	use CFClient::OpenGL;
2122
2123	our %texture_cache;
2124
2125	sub new {
2126	my $class = shift;
2127
2128	my $self = $class->SUPER::new (
2129	can_events => 0,
2130	@_,
2131	);
2132
2133	$self->{path} || $self->{tex}
2134	or Carp::croak "'path' or 'tex' attributes required";
2135
2136	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2137	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2138
2139	Scalar::Util::weaken $texture_cache{$self->{path}};
2140
2141	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2142
2143	$self
2144	}
2145
2146	sub size_request {
2147	my ($self) = @_;
2148
2149	($self->{tex}{w}, $self->{tex}{h})
2150	}
2151
2152	sub _draw {
2153	my ($self) = @_;
2154
2155	my $tex = $self->{tex};
2156
2157	my ($w, $h) = ($self->{w}, $self->{h});
2158
2159	if ($self->{rot90}) {
2160	glRotate 90, 0, 0, 1;
2161	glTranslate 0, -$self->{w}, 0;
2162
2163	($w, $h) = ($h, $w);
2164	}
2165
2166	glEnable GL_TEXTURE_2D;
2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2168
2169	$tex->draw_quad_alpha (0, 0, $w, $h);
2170
2171	glDisable GL_TEXTURE_2D;
2172	}
2173
2174	#############################################################################
2175
2176	package CFClient::UI::VGauge;
2177
2178	our @ISA = CFClient::UI::Base::;
2179		2620
2180	use List::Util qw(min max);	2621	use List::Util qw(min max);
2181		2622
2182	use CFClient::OpenGL;	2623	use CFPlus::OpenGL;
2183		2624
2184	my %tex = (	2625	my %tex = (
2185	food => [	2626	food => [
2186	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2627	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2628	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2188	],	2629	],
2189	grace => [	2630	grace => [
2190	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2631	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2632	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2192	],	2633	],
2193	hp => [	2634	hp => [
2194	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2635	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2195	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2636	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2196	],	2637	],
2197	mana => [	2638	mana => [
2198	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2639	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2199	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2640	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2200	],	2641	],
2201	);	2642	);
2202		2643
2203	# eg. VGauge->new (gauge => 'food'), default gauge: food	2644	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2306	glDisable GL_TEXTURE_2D;	2747	glDisable GL_TEXTURE_2D;
2307	}	2748	}
2308		2749
2309	#############################################################################	2750	#############################################################################
2310		2751
2311	package CFClient::UI::Gauge;	2752	package CFPlus::UI::Gauge;
2312		2753
2313	our @ISA = CFClient::UI::VBox::;	2754	our @ISA = CFPlus::UI::VBox::;
2314		2755
2315	sub new {	2756	sub new {
2316	my ($class, %arg) = @_;	2757	my ($class, %arg) = @_;
2317		2758
2318	my $self = $class->SUPER::new (	2759	my $self = $class->SUPER::new (
…		…
2320	can_hover => 1,	2761	can_hover => 1,
2321	can_events => 1,	2762	can_events => 1,
2322	%arg,	2763	%arg,
2323	);	2764	);
2324		2765
2325	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2766	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2326	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2767	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2327	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2768	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2328		2769
2329	$self	2770	$self
2330	}	2771	}
2331		2772
2332	sub set_fontsize {	2773	sub set_fontsize {
…		…
2353	$self->{value}->set_text ($val);	2794	$self->{value}->set_text ($val);
2354	}	2795	}
2355		2796
2356	#############################################################################	2797	#############################################################################
2357		2798
2358	package CFClient::UI::Slider;	2799	package CFPlus::UI::Slider;
2359		2800
2360	use strict;	2801	use strict;
2361		2802
2362	use CFClient::OpenGL;	2803	use CFPlus::OpenGL;
2363		2804
2364	our @ISA = CFClient::UI::DrawBG::;	2805	our @ISA = CFPlus::UI::DrawBG::;
2365		2806
2366	my @tex =	2807	my @tex =
2367	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2808	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2368	qw(s1_slider.png s1_slider_bg.png);	2809	qw(s1_slider.png s1_slider_bg.png);
2369		2810
2370	sub new {	2811	sub new {
2371	my $class = shift;	2812	my $class = shift;
2372		2813
…		…
2461	}	2902	}
2462		2903
2463	1	2904	1
2464	}	2905	}
2465		2906
		2907	sub invoke_mouse_wheel {
		2908	my ($self, $ev) = @_;
		2909
		2910	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2911
		2912	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2913
		2914	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2915
		2916	! ! $delta
		2917	}
		2918
2466	sub update {	2919	sub update {
2467	my ($self) = @_;	2920	my ($self) = @_;
2468		2921
2469	delete $self->{knob_w};	2922	delete $self->{knob_w};
2470	$self->SUPER::update;	2923	$self->SUPER::update;
…		…
2517	glDisable GL_TEXTURE_2D;	2970	glDisable GL_TEXTURE_2D;
2518	}	2971	}
2519		2972
2520	#############################################################################	2973	#############################################################################
2521		2974
2522	package CFClient::UI::ValSlider;	2975	package CFPlus::UI::ValSlider;
2523		2976
2524	our @ISA = CFClient::UI::HBox::;	2977	our @ISA = CFPlus::UI::HBox::;
2525		2978
2526	sub new {	2979	sub new {
2527	my ($class, %arg) = @_;	2980	my ($class, %arg) = @_;
2528		2981
2529	my $range = delete $arg{range};	2982	my $range = delete $arg{range};
2530		2983
2531	my $self = $class->SUPER::new (	2984	my $self = $class->SUPER::new (
2532	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2985	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2533	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2986	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2534	to_value => sub { shift },	2987	to_value => sub { shift },
2535	from_value => sub { shift },	2988	from_value => sub { shift },
2536	%arg,	2989	%arg,
2537	);	2990	);
2538		2991
…		…
2558	sub set_range { shift->{slider}->set_range (@_) }	3011	sub set_range { shift->{slider}->set_range (@_) }
2559	sub set_value { shift->{slider}->set_value (@_) }	3012	sub set_value { shift->{slider}->set_value (@_) }
2560		3013
2561	#############################################################################	3014	#############################################################################
2562		3015
2563	package CFClient::UI::TextScroller;	3016	package CFPlus::UI::TextScroller;
2564		3017
2565	our @ISA = CFClient::UI::HBox::;	3018	our @ISA = CFPlus::UI::HBox::;
2566		3019
2567	use CFClient::OpenGL;	3020	use CFPlus::OpenGL;
2568		3021
2569	sub new {	3022	sub new {
2570	my $class = shift;	3023	my $class = shift;
2571		3024
2572	my $self = $class->SUPER::new (	3025	my $self = $class->SUPER::new (
2573	fontsize => 1,	3026	fontsize => 1,
2574	can_events => 0,	3027	can_events => 1,
2575	indent => 0,	3028	indent => 0,
2576	#font => default_font	3029	#font => default_font
2577	@_,	3030	@_,
2578		3031
2579	layout => (new CFClient::Layout),	3032	layout => (new CFPlus::Layout),
2580	par => [],	3033	par => [],
		3034	max_par => 0,
2581	height => 0,	3035	height => 0,
2582	children => [	3036	children => [
2583	(new CFClient::UI::Empty expand => 1),	3037	(new CFPlus::UI::Empty expand => 1),
2584	(new CFClient::UI::Slider vertical => 1),	3038	(new CFPlus::UI::Slider vertical => 1),
2585	],	3039	],
2586	);	3040	);
2587		3041
2588	$self->{children}[1]->connect (changed => sub { $self->update });	3042	$self->{children}[1]->connect (changed => sub { $self->update });
2589		3043
…		…
2619		3073
2620	$self->reflow;	3074	$self->reflow;
2621		3075
2622	local $self->{children} = [$empty, $slider];	3076	local $self->{children} = [$empty, $slider];
2623	$self->SUPER::invoke_size_allocate ($w, $h)	3077	$self->SUPER::invoke_size_allocate ($w, $h)
		3078	}
		3079
		3080	sub invoke_mouse_wheel {
		3081	my ($self, $ev) = @_;
		3082
		3083	return 0 unless $ev->{dy}; # only vertical movements
		3084
		3085	$self->{children}[1]->emit (mouse_wheel => $ev);
		3086
		3087	1
2624	}	3088	}
2625		3089
2626	sub get_layout {	3090	sub get_layout {
2627	my ($self, $para) = @_;	3091	my ($self, $para) = @_;
2628		3092
…		…
2656		3120
2657	# todo: base offset on lines or so, not on pixels	3121	# todo: base offset on lines or so, not on pixels
2658	$self->{children}[1]->set_value ($offset);	3122	$self->{children}[1]->set_value ($offset);
2659	}	3123	}
2660		3124
		3125	sub current_paragraph {
		3126	my ($self) = @_;
		3127
		3128	$self->{top_paragraph} - 1
		3129	}
		3130
		3131	sub scroll_to {
		3132	my ($self, $para) = @_;
		3133
		3134	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3135
		3136	$self->{scroll_to} = $para;
		3137	$self->update;
		3138	}
		3139
2661	sub clear {	3140	sub clear {
2662	my ($self) = @_;	3141	my ($self) = @_;
2663		3142
2664	my (undef, undef, @other) = @{ $self->{children} };	3143	my (undef, undef, @other) = @{ $self->{children} };
2665	$self->remove ($_) for @other;	3144	$self->remove ($_) for @other;
…		…
2668	$self->{height} = 0;	3147	$self->{height} = 0;
2669	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3148	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2670	}	3149	}
2671		3150
2672	sub add_paragraph {	3151	sub add_paragraph {
2673	my ($self, $color, $para, $indent) = @_;	3152	my $self = shift;
2674		3153
2675	my ($text, @w) = ref $para ? @$para : $para;	3154	for my $para (@_) {
2676
2677	$para = {	3155	$para = {
		3156	fg => [1, 1, 1, 1],
		3157	indent => 0,
		3158	markup => "",
		3159	widget => [],
		3160	ref $para ? %$para : (markup => $para),
2678	w => 1e10,	3161	w => 1e10,
2679	wrapped => 1,	3162	wrapped => 1,
2680	fg => $color,
2681	indent => $indent,
2682	markup => $text,
2683	widget => \@w,
2684	};	3163	};
2685		3164
2686	$self->add (@w) if @w;	3165	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2687	push @{$self->{par}}, $para;	3166	push @{$self->{par}}, $para;
		3167	}
		3168
		3169	if (my $max = $self->{max_par}) {
		3170	shift @{$self->{par}} while @{$self->{par}} > $max;
		3171	}
2688		3172
2689	$self->{need_reflow}++;	3173	$self->{need_reflow}++;
2690	$self->update;	3174	$self->update;
2691	}	3175	}
2692		3176
2693	sub scroll_to_bottom {	3177	sub scroll_to_bottom {
2694	my ($self) = @_;	3178	my ($self) = @_;
2695		3179
2696	$self->{scroll_to_bottom} = 1;	3180	$self->{scroll_to} = $#{$self->{par}};
2697	$self->update;	3181	$self->update;
2698	}	3182	}
2699		3183
		3184	sub force_uptodate {
		3185	my ($self) = @_;
		3186
		3187	if (delete $self->{need_reflow}) {
		3188	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3189
		3190	my $height = 0;
		3191
		3192	for my $para (@{$self->{par}}) {
		3193	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3194	my $layout = $self->get_layout ($para);
		3195	my ($w, $h) = $layout->size;
		3196
		3197	$para->{w} = $w + $para->{indent};
		3198	$para->{h} = $h;
		3199	$para->{wrapped} = $layout->has_wrapped;
		3200	}
		3201
		3202	$para->{y} = $height;
		3203	$height += $para->{h};
		3204	}
		3205
		3206	$self->{height} = $height;
		3207	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3208
		3209	delete $self->{texture};
		3210	}
		3211
		3212	if (my $paridx = delete $self->{scroll_to}) {
		3213	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3214	}
		3215	}
		3216
2700	sub update {	3217	sub update {
2701	my ($self) = @_;	3218	my ($self) = @_;
2702		3219
2703	$self->SUPER::update;	3220	$self->SUPER::update;
2704		3221
2705	return unless $self->{h} > 0;	3222	return unless $self->{h} > 0;
2706		3223
2707	delete $self->{texture};	3224	delete $self->{texture};
2708		3225
2709	$ROOT->on_post_alloc ($self => sub {	3226	$ROOT->on_post_alloc ($self => sub {
		3227	$self->force_uptodate;
		3228
2710	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3229	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711		3230
2712	if (delete $self->{need_reflow}) {
2713	my $height = 0;
2714
2715	for my $para (@{$self->{par}}) {
2716	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2717	my $layout = $self->get_layout ($para);
2718	my ($w, $h) = $layout->size;
2719
2720	$para->{w} = $w + $para->{indent};
2721	$para->{h} = $h;
2722	$para->{wrapped} = $layout->has_wrapped;
2723	}
2724
2725	$height += $para->{h};
2726	}
2727
2728	$self->{height} = $height;
2729
2730	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2731
2732	delete $self->{texture};
2733	}
2734
2735	if (delete $self->{scroll_to_bottom}) {
2736	$self->{children}[1]->set_value (1e10);
2737	}
2738
2739	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3231	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2740	glClearColor 0, 0, 0, 0;	3232	glClearColor 0, 0, 0, 0;
2741	glClear GL_COLOR_BUFFER_BIT;	3233	glClear GL_COLOR_BUFFER_BIT;
2742		3234
		3235	package CFPlus::UI::Base;
		3236	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3237	(0, 0, $self->{w}, $self->{h});
		3238
		3239	my $top = int $self->{children}[1]{range}[0];
		3240
		3241	my $paridx = 0;
		3242	my $top_paragraph;
2743	my $top = int $self->{children}[1]{range}[0];	3243	my $top = int $self->{children}[1]{range}[0];
2744		3244
2745	my $y0 = $top;	3245	my $y0 = $top;
2746	my $y1 = $top + $H;	3246	my $y1 = $top + $H;
2747		3247
2748	my $y = 0;
2749
2750	for my $para (@{$self->{par}}) {	3248	for my $para (@{$self->{par}}) {
2751	my $h = $para->{h};	3249	my $h = $para->{h};
		3250	my $y = $para->{y};
2752		3251
2753	if ($y0 < $y + $h && $y < $y1) {	3252	if ($y0 < $y + $h && $y < $y1) {
2754
2755	my $layout = $self->get_layout ($para);	3253	my $layout = $self->get_layout ($para);
2756		3254
2757	$layout->render ($para->{indent}, $y - $y0);	3255	$layout->render ($para->{indent}, $y - $y0);
2758		3256
2759	if (my @w = @{ $para->{widget} }) {	3257	if (my @w = @{ $para->{widget} }) {
…		…
2768	$_->draw;	3266	$_->draw;
2769	}	3267	}
2770	}	3268	}
2771	}	3269	}
2772		3270
2773	$y += $h;	3271	$paridx++;
		3272	$top_paragraph ||= $paridx if $y >= $top;
2774	}	3273	}
		3274
		3275	$self->{top_paragraph} = $top_paragraph;
2775	};	3276	};
2776	});	3277	});
2777	}	3278	}
2778		3279
2779	sub reconfigure {	3280	sub reconfigure {
…		…
2797	$self->{children}[1]->draw;	3298	$self->{children}[1]->draw;
2798	}	3299	}
2799		3300
2800	#############################################################################	3301	#############################################################################
2801		3302
2802	package CFClient::UI::Animator;	3303	package CFPlus::UI::Animator;
2803		3304
2804	use CFClient::OpenGL;	3305	use CFPlus::OpenGL;
2805		3306
2806	our @ISA = CFClient::UI::Bin::;	3307	our @ISA = CFPlus::UI::Bin::;
2807		3308
2808	sub moveto {	3309	sub moveto {
2809	my ($self, $x, $y) = @_;	3310	my ($self, $x, $y) = @_;
2810		3311
2811	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3312	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2839	glPopMatrix;	3340	glPopMatrix;
2840	}	3341	}
2841		3342
2842	#############################################################################	3343	#############################################################################
2843		3344
2844	package CFClient::UI::Flopper;	3345	package CFPlus::UI::Flopper;
2845		3346
2846	our @ISA = CFClient::UI::Button::;	3347	our @ISA = CFPlus::UI::Button::;
2847		3348
2848	sub new {	3349	sub new {
2849	my $class = shift;	3350	my $class = shift;
2850		3351
2851	my $self = $class->SUPER::new (	3352	my $self = $class->SUPER::new (
…		…
2863	$self->{other}->toggle_visibility;	3364	$self->{other}->toggle_visibility;
2864	}	3365	}
2865		3366
2866	#############################################################################	3367	#############################################################################
2867		3368
2868	package CFClient::UI::Tooltip;	3369	package CFPlus::UI::Tooltip;
2869		3370
2870	our @ISA = CFClient::UI::Bin::;	3371	our @ISA = CFPlus::UI::Bin::;
2871		3372
2872	use CFClient::OpenGL;	3373	use CFPlus::OpenGL;
2873		3374
2874	sub new {	3375	sub new {
2875	my $class = shift;	3376	my $class = shift;
2876		3377
2877	$class->SUPER::new (	3378	$class->SUPER::new (
…		…
2880	)	3381	)
2881	}	3382	}
2882		3383
2883	sub set_tooltip_from {	3384	sub set_tooltip_from {
2884	my ($self, $widget) = @_;	3385	my ($self, $widget) = @_;
		3386
		3387	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3388	if $widget->{tooltip} =~ /^#(.*)$/;
2885		3389
2886	my $tooltip = $widget->{tooltip};	3390	my $tooltip = $widget->{tooltip};
2887		3391
2888	if ($ENV{CFPLUS_DEBUG} & 2) {	3392	if ($ENV{CFPLUS_DEBUG} & 2) {
2889	$tooltip .= "\n\n" . (ref $widget) . "\n"	3393	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2893	}	3397	}
2894		3398
2895	$tooltip =~ s/^\n+//;	3399	$tooltip =~ s/^\n+//;
2896	$tooltip =~ s/\n+$//;	3400	$tooltip =~ s/\n+$//;
2897		3401
2898	$self->add (new CFClient::UI::Label	3402	$self->add (new CFPlus::UI::Label
2899	markup => $tooltip,	3403	markup => $tooltip,
2900	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3404	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2901	fontsize => 0.8,	3405	fontsize => 0.8,
2902	fg => [0, 0, 0, 1],	3406	style => 1, # FLAG_INVERSE
2903	ellipsise => 0,	3407	ellipsise => 0,
2904	font => ($widget->{tooltip_font} || $::FONT_PROP),	3408	font => ($widget->{tooltip_font} || $::FONT_PROP),
2905	);	3409	);
2906	}	3410	}
2907		3411
…		…
2926		3430
2927	$self->{root}->on_post_alloc ("move_$self" => sub {	3431	$self->{root}->on_post_alloc ("move_$self" => sub {
2928	my $widget = $self->{owner}	3432	my $widget = $self->{owner}
2929	or return;	3433	or return;
2930		3434
		3435	if ($widget->{visible}) {
2931	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3436	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932		3437
2933	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3438	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934	if $x + $self->{w} > $self->{root}{w};	3439	if $x + $self->{w} > $self->{root}{w};
2935		3440
2936	$self->move_abs ($x, $y);	3441	$self->move_abs ($x, $y);
		3442	} else {
		3443	$self->hide;
		3444	}
2937	});	3445	});
2938	}	3446	}
2939		3447
2940	sub _draw {	3448	sub _draw {
2941	my ($self) = @_;	3449	my ($self) = @_;
…		…
2965	$self->SUPER::_draw;	3473	$self->SUPER::_draw;
2966	}	3474	}
2967		3475
2968	#############################################################################	3476	#############################################################################
2969		3477
2970	package CFClient::UI::Face;	3478	package CFPlus::UI::Face;
2971		3479
2972	our @ISA = CFClient::UI::Base::;	3480	our @ISA = CFPlus::UI::DrawBG::;
2973		3481
2974	use CFClient::OpenGL;	3482	use CFPlus::OpenGL;
2975		3483
2976	sub new {	3484	sub new {
2977	my $class = shift;	3485	my $class = shift;
2978		3486
2979	my $self = $class->SUPER::new (	3487	my $self = $class->SUPER::new (
		3488	size_w => 32,
		3489	size_h => 8,
2980	aspect => 1,	3490	aspect => 1,
2981	can_events => 0,	3491	can_events => 0,
2982	@_,	3492	@_,
2983	);	3493	);
2984		3494
2985	if ($self->{anim} && $self->{animspeed}) {	3495	if ($self->{anim} && $self->{animspeed}) {
2986	Scalar::Util::weaken (my $widget = $self);	3496	CFPlus::weaken (my $widget = $self);
2987		3497
		3498	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3499	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2988	$self->{timer} = Event->timer (	3500	$self->{timer} = Event->timer (
2989	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2990	hard => 1,	3501	parked => 1,
2991	interval => $self->{animspeed},
2992	cb => sub {	3502	cb => sub {
		3503	return unless $::CONN;
		3504
		3505	if (!$widget) {#d#
		3506	warn "animation widget timer active but widgetd estroyed\n";#d#
		3507	warn $_[0]->w->active;#d#
		3508	}#d#
		3509
2993	++$widget->{frame};	3510	++$widget->{frame};
		3511	$widget->update_face;
2994	$widget->update;	3512	$widget->update;
		3513
		3514	$widget->update_timer;
2995	},	3515	},
2996	);	3516	);
		3517
		3518	$self->update_face;
		3519	$self->update_timer;
2997	}	3520	}
2998		3521
2999	$self	3522	$self
3000	}	3523	}
3001		3524
		3525	sub update_timer {
		3526	my ($self) = @_;
		3527
		3528	return unless $self->{timer};
		3529
		3530	if ($self->{visible}) {
		3531	$self->{timer}->at (
		3532	$self->{anim_start}
		3533	+ $self->{animspeed}
		3534	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3535	);
		3536	$self->{timer}->start;
		3537	} else {
		3538	$self->{timer}->stop;
		3539	}
		3540	}
		3541
		3542	sub update_face {
		3543	my ($self) = @_;
		3544
		3545	return unless $::CONN;
		3546
		3547	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3548	if ($anim && @$anim) {
		3549	delete $self->{wait_face};
		3550	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3551	}
		3552	}
		3553	}
		3554
3002	sub size_request {	3555	sub size_request {
3003	(32, 8)	3556	my ($self) = @_;
		3557
		3558	if ($::CONN) {
		3559	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3560	if (my $tex = $::CONN->{texture}[$faceid]) {
		3561	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3562	} else {
		3563	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3564	$self->realloc;
		3565	});
		3566	}
		3567	}
		3568	}
		3569
		3570	($self->{size_w} || 8, $self->{size_h} || 8)
3004	}	3571	}
3005		3572
3006	sub update {	3573	sub update {
3007	my ($self) = @_;	3574	my ($self) = @_;
3008		3575
3009	return unless $self->{visible};	3576	return unless $self->{visible};
3010		3577
3011	$self->SUPER::update;	3578	$self->SUPER::update;
3012	}	3579	}
3013		3580
		3581	sub invoke_visibility_change {
		3582	my ($self) = @_;
		3583
		3584	$self->update_timer;
		3585
		3586	0
		3587	}
		3588
3014	sub _draw {	3589	sub _draw {
3015	my ($self) = @_;	3590	my ($self) = @_;
3016		3591
3017	return unless $::CONN;	3592	return unless $::CONN;
3018		3593
3019	my $face;	3594	$self->SUPER::_draw;
3020		3595
3021	if ($self->{frame}) {
3022	my $anim = $::CONN->{anim}[$self->{anim}];	3596	my $faceid = $::CONN->{faceid}[$self->{face}]
3023		3597	or return;
3024	$face = $anim->[ $self->{frame} % @$anim ]
3025	if $anim && @$anim;
3026	}
3027		3598
3028	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3599	my $tex = $::CONN->{texture}[$faceid];
3029		3600
3030	if ($tex) {	3601	if ($tex) {
3031	glEnable GL_TEXTURE_2D;	3602	glEnable GL_TEXTURE_2D;
3032	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3603	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3033	glColor 0, 0, 0, 1;	3604	glColor 0, 0, 0, 1;
…		…
3037	}	3608	}
3038		3609
3039	sub destroy {	3610	sub destroy {
3040	my ($self) = @_;	3611	my ($self) = @_;
3041		3612
3042	$self->{timer}->cancel	3613	(delete $self->{timer})->cancel
3043	if $self->{timer};	3614	if $self->{timer};
3044		3615
3045	$self->SUPER::destroy;	3616	$self->SUPER::destroy;
3046	}	3617	}
3047		3618
3048	#############################################################################	3619	#############################################################################
3049		3620
3050	package CFClient::UI::Buttonbar;	3621	package CFPlus::UI::Buttonbar;
3051		3622
3052	our @ISA = CFClient::UI::HBox::;	3623	our @ISA = CFPlus::UI::HBox::;
3053		3624
3054	# TODO: should actualyl wrap buttons and other goodies.	3625	# TODO: should actually wrap buttons and other goodies.
3055		3626
3056	#############################################################################	3627	#############################################################################
3057		3628
3058	package CFClient::UI::Menu;	3629	package CFPlus::UI::Menu;
3059		3630
3060	our @ISA = CFClient::UI::FancyFrame::;	3631	our @ISA = CFPlus::UI::Toplevel::;
3061		3632
3062	use CFClient::OpenGL;	3633	use CFPlus::OpenGL;
3063		3634
3064	sub new {	3635	sub new {
3065	my $class = shift;	3636	my $class = shift;
3066		3637
3067	my $self = $class->SUPER::new (	3638	my $self = $class->SUPER::new (
3068	items => [],	3639	items => [],
3069	z => 100,	3640	z => 100,
3070	@_,	3641	@_,
3071	);	3642	);
3072		3643
3073	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3644	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3074		3645
3075	for my $item (@{ $self->{items} }) {	3646	for my $item (@{ $self->{items} }) {
3076	my ($widget, $cb, $tooltip) = @$item;	3647	my ($widget, $cb, $tooltip) = @$item;
3077		3648
3078	# handle various types of items, only text for now	3649	# handle various types of items, only text for now
3079	if (!ref $widget) {	3650	if (!ref $widget) {
3080	if ($widget =~ /\t/) {	3651	if ($widget =~ /\t/) {
3081	my ($left, $right) = split /\t/, $widget, 2;	3652	my ($left, $right) = split /\t/, $widget, 2;
3082		3653
3083	$widget = new CFClient::UI::HBox	3654	$widget = new CFPlus::UI::HBox
3084	can_hover => 1,	3655	can_hover => 1,
3085	can_events => 1,	3656	can_events => 1,
3086	tooltip => $tooltip,	3657	tooltip => $tooltip,
3087	children => [	3658	children => [
3088	(new CFClient::UI::Label markup => $left, expand => 1),	3659	(new CFPlus::UI::Label markup => $left, expand => 1),
3089	(new CFClient::UI::Label markup => $right, align => +1),	3660	(new CFPlus::UI::Label markup => $right, align => +1),
3090	],	3661	],
3091	;	3662	;
3092		3663
3093	} else {	3664	} else {
3094	$widget = new CFClient::UI::Label	3665	$widget = new CFPlus::UI::Label
3095	can_hover => 1,	3666	can_hover => 1,
3096	can_events => 1,	3667	can_events => 1,
3097	markup => $widget,	3668	markup => $widget,
3098	tooltip => $tooltip;	3669	tooltip => $tooltip;
3099	}	3670	}
…		…
3147	1	3718	1
3148	}	3719	}
3149		3720
3150	#############################################################################	3721	#############################################################################
3151		3722
3152	package CFClient::UI::Multiplexer;	3723	package CFPlus::UI::Multiplexer;
3153		3724
3154	our @ISA = CFClient::UI::Container::;	3725	our @ISA = CFPlus::UI::Container::;
3155		3726
3156	sub new {	3727	sub new {
3157	my $class = shift;	3728	my $class = shift;
3158		3729
3159	my $self = $class->SUPER::new (	3730	my $self = $class->SUPER::new (
…		…
3220	$self->{current}->draw;	3791	$self->{current}->draw;
3221	}	3792	}
3222		3793
3223	#############################################################################	3794	#############################################################################
3224		3795
3225	package CFClient::UI::Notebook;	3796	package CFPlus::UI::Notebook;
3226		3797
3227	our @ISA = CFClient::UI::VBox::;	3798	our @ISA = CFPlus::UI::VBox::;
3228		3799
3229	sub new {	3800	sub new {
3230	my $class = shift;	3801	my $class = shift;
3231		3802
3232	my $self = $class->SUPER::new (	3803	my $self = $class->SUPER::new (
3233	buttonbar => (new CFClient::UI::Buttonbar),	3804	buttonbar => (new CFPlus::UI::Buttonbar),
3234	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3805	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3235	# filter => # will be put between multiplexer and $self	3806	# filter => # will be put between multiplexer and $self
3236	@_,	3807	@_,
3237	);	3808	);
3238		3809
3239	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3810	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3243	}	3814	}
3244		3815
3245	sub add {	3816	sub add {
3246	my ($self, $title, $widget, $tooltip) = @_;	3817	my ($self, $title, $widget, $tooltip) = @_;
3247		3818
3248	Scalar::Util::weaken $self;	3819	CFPlus::weaken $self;
3249		3820
3250	$self->{buttonbar}->add (new CFClient::UI::Button	3821	$self->{buttonbar}->add (new CFPlus::UI::Button
3251	markup => $title,	3822	markup => $title,
3252	tooltip => $tooltip,	3823	tooltip => $tooltip,
3253	on_activate => sub { $self->set_current_page ($widget) },	3824	on_activate => sub { $self->set_current_page ($widget) },
3254	);	3825	);
3255		3826
…		…
3269	$self->emit (page_changed => $self->{multiplexer}{current});	3840	$self->emit (page_changed => $self->{multiplexer}{current});
3270	}	3841	}
3271		3842
3272	#############################################################################	3843	#############################################################################
3273		3844
3274	package CFClient::UI::Combobox;	3845	package CFPlus::UI::Selector;
3275		3846
3276	use utf8;	3847	use utf8;
3277		3848
3278	our @ISA = CFClient::UI::Button::;	3849	our @ISA = CFPlus::UI::Button::;
3279		3850
3280	sub new {	3851	sub new {
3281	my $class = shift;	3852	my $class = shift;
3282		3853
3283	my $self = $class->SUPER::new (	3854	my $self = $class->SUPER::new (
…		…
3300	my ($value, $title, $tooltip) = @$_;	3871	my ($value, $title, $tooltip) = @$_;
3301		3872
3302	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3873	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303	}	3874	}
3304		3875
3305	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3876	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306	}	3877	}
3307		3878
3308	sub _set_value {	3879	sub _set_value {
3309	my ($self, $value) = @_;	3880	my ($self, $value) = @_;
3310		3881
…		…
3325	$self->emit (changed => $value);	3896	$self->emit (changed => $value);
3326	}	3897	}
3327		3898
3328	#############################################################################	3899	#############################################################################
3329		3900
3330	package CFClient::UI::Statusbox;	3901	package CFPlus::UI::Statusbox;
3331		3902
3332	our @ISA = CFClient::UI::VBox::;	3903	our @ISA = CFPlus::UI::VBox::;
3333		3904
3334	sub new {	3905	sub new {
3335	my $class = shift;	3906	my $class = shift;
3336		3907
3337	my $self = $class->SUPER::new (	3908	my $self = $class->SUPER::new (
3338	fontsize => 0.8,	3909	fontsize => 0.8,
3339	@_,	3910	@_,
3340	);	3911	);
3341		3912
3342	Scalar::Util::weaken (my $this = $self);	3913	CFPlus::weaken (my $this = $self);
3343		3914
3344	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3915	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345		3916
3346	$self	3917	$self
3347	}	3918	}
…		…
3349	sub reorder {	3920	sub reorder {
3350	my ($self) = @_;	3921	my ($self) = @_;
3351	my $NOW = Time::HiRes::time;	3922	my $NOW = Time::HiRes::time;
3352		3923
3353	# freeze display when hovering over any label	3924	# freeze display when hovering over any label
3354	return if $CFClient::UI::TOOLTIP->{owner}	3925	return if $CFPlus::UI::TOOLTIP->{owner}
3355	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3926	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3356	values %{ $self->{item} };	3927	values %{ $self->{item} };
3357		3928
3358	while (my ($k, $v) = each %{ $self->{item} }) {	3929	while (my ($k, $v) = each %{ $self->{item} }) {
3359	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3930	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3360	}	3931	}
…		…
3381	for ($short) {	3952	for ($short) {
3382	s/^\s+//;	3953	s/^\s+//;
3383	s/\s+/ /g;	3954	s/\s+/ /g;
3384	}	3955	}
3385		3956
3386	new CFClient::UI::Label	3957	new CFPlus::UI::Label
3387	markup => $short,	3958	markup => $short,
3388	tooltip => $item->{tooltip},	3959	tooltip => $item->{tooltip},
3389	tooltip_font => $::FONT_PROP,	3960	tooltip_font => $::FONT_PROP,
3390	tooltip_width => 0.67,	3961	tooltip_width => 0.67,
3391	fontsize => $item->{fontsize} || $self->{fontsize},	3962	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3470	$self->SUPER::destroy;	4041	$self->SUPER::destroy;
3471	}	4042	}
3472		4043
3473	#############################################################################	4044	#############################################################################
3474		4045
3475	package CFClient::UI::Inventory;
3476
3477	our @ISA = CFClient::UI::Table::;
3478
3479	sub new {
3480	my $class = shift;
3481
3482	my $self = $class->SUPER::new (
3483	col_expand => [0, 1, 0],
3484	@_,
3485	);
3486
3487	$self
3488	}
3489
3490	sub set_items {
3491	my ($self, $items) = @_;
3492
3493	$self->clear;
3494	return unless $items;
3495
3496	my @items = sort {
3497	($a->{type} <=> $b->{type})
3498	or ($a->{name} cmp $b->{name})
3499	} values %$items;
3500
3501	$self->{real_items} = \@items;
3502
3503	my $row = 0;
3504	for my $item (@items) {
3505	CFClient::Item::update_widgets $item;
3506
3507	$self->add (0, $row, $item->{face_widget});
3508	$self->add (1, $row, $item->{desc_widget});
3509	$self->add (2, $row, $item->{weight_widget});
3510
3511	$row++;
3512	}
3513	}
3514
3515	#############################################################################
3516
3517	package CFClient::UI::SpellList;
3518
3519	our @ISA = CFClient::UI::Table::;
3520
3521	sub new {
3522	my $class = shift;
3523
3524	my $self = $class->SUPER::new (
3525	binding => [],
3526	commands => [],
3527	@_,
3528	)
3529	}
3530
3531	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3532
3533	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543
3544	sub rebuild_spell_list {
3545	my ($self) = @_;
3546
3547	$CFClient::UI::ROOT->on_refresh ($self => sub {
3548	$self->clear;
3549
3550	return unless $::CONN;
3551
3552	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558	my $row = 0;
3559
3560	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561	my $spell = $self->{spell}{$_};
3562
3563	$row++;
3564
3565	my $spell_cb = sub {
3566	my ($widget, $ev) = @_;
3567
3568	if ($ev->{button} == 1) {
3569	$::CONN->user_send ("cast $spell->{name}");
3570	} elsif ($ev->{button} == 2) {
3571	$::CONN->user_send ("invoke $spell->{name}");
3572	} elsif ($ev->{button} == 3) {
3573	(new CFClient::UI::Menu
3574	items => [
3575	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577	],
3578	)->popup ($ev);
3579	} else {
3580	return 0;
3581	}
3582
3583	1
3584	};
3585
3586	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588	#TODO: add path info to tooltip
3589	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591	$self->add (0, $row, new CFClient::UI::Face
3592	face => $spell->{face},
3593	can_hover => 1,
3594	can_events => 1,
3595	tooltip => $tooltip,
3596	on_button_down => $spell_cb,
3597	);
3598
3599	$self->add (1, $row, new CFClient::UI::Label
3600	expand => 1,
3601	text => $spell->{name},
3602	can_hover => 1,
3603	can_events => 1,
3604	tooltip => $tooltip,
3605	on_button_down => $spell_cb,
3606	);
3607
3608	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612	}
3613	});
3614	}
3615
3616	sub add_spell {
3617	my ($self, $spell) = @_;
3618
3619	$self->{spell}->{$spell->{name}} = $spell;
3620	$self->rebuild_spell_list;
3621	}
3622
3623	sub remove_spell {
3624	my ($self, $spell) = @_;
3625
3626	delete $self->{spell}->{$spell->{name}};
3627	$self->rebuild_spell_list;
3628	}
3629
3630	sub clear_spells {
3631	my ($self) = @_;
3632
3633	$self->{spell} = {};
3634	$self->rebuild_spell_list;
3635	}
3636
3637	#############################################################################
3638
3639	package CFClient::UI::Root;	4046	package CFPlus::UI::Root;
3640		4047
3641	our @ISA = CFClient::UI::Container::;	4048	our @ISA = CFPlus::UI::Container::;
3642		4049
3643	use List::Util qw(min max);	4050	use List::Util qw(min max);
3644		4051
3645	use CFClient::OpenGL;	4052	use CFPlus::OpenGL;
3646		4053
3647	sub new {	4054	sub new {
3648	my $class = shift;	4055	my $class = shift;
3649		4056
3650	my $self = $class->SUPER::new (	4057	my $self = $class->SUPER::new (
3651	visible => 1,	4058	visible => 1,
3652	@_,	4059	@_,
3653	);	4060	);
3654		4061
3655	Scalar::Util::weaken ($self->{root} = $self);	4062	CFPlus::weaken ($self->{root} = $self);
3656		4063
3657	$self	4064	$self
3658	}	4065	}
3659		4066
3660	sub size_request {	4067	sub size_request {
…		…
3829	$h = 0 if $h < 0;	4236	$h = 0 if $h < 0;
3830		4237
3831	$w = max $widget->{min_w}, $w;	4238	$w = max $widget->{min_w}, $w;
3832	$h = max $widget->{min_h}, $h;	4239	$h = max $widget->{min_h}, $h;
3833		4240
		4241	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4242	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4243
3834	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4244	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4245	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836		4246
3837	$w = int $w + 0.5;	4247	$w = int $w + 0.5;
3838	$h = int $h + 0.5;	4248	$h = int $h + 0.5;
…		…
3864	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4274	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3865	glMatrixMode GL_MODELVIEW;	4275	glMatrixMode GL_MODELVIEW;
3866	glLoadIdentity;	4276	glLoadIdentity;
3867		4277
3868	{	4278	{
3869	package CFClient::UI::Base;	4279	package CFPlus::UI::Base;
3870		4280
3871	($draw_x, $draw_y, $draw_w, $draw_h) =	4281	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3872	(0, 0, $self->{w}, $self->{h});	4282	(0, 0, $self->{w}, $self->{h});
3873	}
3874		4283
3875	$self->_draw;	4284	$self->_draw;
		4285	}
3876	}	4286	}
3877		4287
3878	#############################################################################	4288	#############################################################################
3879		4289
3880	package CFClient::UI;	4290	package CFPlus::UI;
3881		4291
3882	$ROOT = new CFClient::UI::Root;	4292	$ROOT = new CFPlus::UI::Root;
3883	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4293	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3884		4294
3885	1	4295	1
3886		4296

Diff Legend

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