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.304 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.342 by root, Sun Aug 13 14:38:35 2006 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 ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
90		106
91	$GRAB = $widget;	107	$GRAB = $widget;
92	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
93		109
94	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
95	}	111	}
96		112
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
98		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
100	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
101	}	123	}
102		124
103	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	126	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		127
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		129
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		131
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
112	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		134
114	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	137	$grab->update if $grab;
117	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
118		139
		140	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
120	}	142	}
121	}	143	}
122		144
123	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
124	my ($ev) = @_;	146	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
126		148
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		150
129	if ($widget != $HOVER) {	151	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		152
132	$hover->update if $hover && $hover->{can_hover};	153	$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;	154	if $HOVER;
140	}	155	}
141		156
142	# convert position array to integers	157	# convert position array to integers
143	sub harmonize {	158	sub harmonize {
…		…
193	reconfigure_widgets;	208	reconfigure_widgets;
194	}	209	}
195		210
196	#############################################################################	211	#############################################################################
197		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
198	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
199		222
200	use strict;	223	use strict;
201		224
202	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
203		226
204	sub new {	227	sub new {
205	my $class = shift;	228	my $class = shift;
206		229
207	my $self = bless {	230	my $self = bless {
…		…
212	h => undef,	235	h => undef,
213	can_events => 1,	236	can_events => 1,
214	@_	237	@_
215	}, $class;	238	}, $class;
216		239
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		241
219	for (keys %$self) {	242	for (keys %$self) {
220	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
222	}	245	}
223	}	246	}
224		247
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$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};	250	$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};	251	$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};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		253
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		256
234	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
247	sub show {	270	sub show {
248	my ($self) = @_;	271	my ($self) = @_;
249		272
250	return if $self->{parent};	273	return if $self->{parent};
251		274
252	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
253	}	276	}
254		277
255	sub set_visible {	278	sub set_visible {
256	my ($self) = @_;	279	my ($self) = @_;
257		280
…		…
278	delete $self->{root};	301	delete $self->{root};
279		302
280	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
282		305
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
285		308
286	$self->focus_out;	309	$self->emit ("focus_out");
287
288	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
289	}	311	}
290		312
291	sub set_visibility {	313	sub set_visibility {
292	my ($self, $visible) = @_;	314	my ($self, $visible) = @_;
…		…
336	sub size_request {	358	sub size_request {
337	require Carp;	359	require Carp;
338	Carp::confess "size_request is abstract";	360	Carp::confess "size_request is abstract";
339	}	361	}
340		362
		363	sub baseline_shift {
		364	0
		365	}
		366
341	sub configure {	367	sub configure {
342	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
343		369
344	if ($self->{aspect}) {	370	if ($self->{aspect}) {
345	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
346		372
347	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349		375
350	# use alignment to adjust x, y	376	# use alignment to adjust x, y
351		377
352	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
353	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
367		393
368	$self->{root}{size_alloc}{$self+0} = $self;	394	$self->{root}{size_alloc}{$self+0} = $self;
369	}	395	}
370	}	396	}
371		397
372	sub size_allocate {
373	# nothing to be done
374	}
375
376	sub children {	398	sub children {
377	# nop	399	# nop
378	}	400	}
379		401
380	sub visible_children {	402	sub visible_children {
…		…
398		420
399	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
400		422
401	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
402		424
403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
405	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
406	}	428	}
407	}	429	}
408		430
409	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
410	sub coord2local {	432	sub coord2local {
411	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
412		434
		435	Carp::confess unless $self->{parent};#d#
		436
413	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414	}	438	}
415		439
416	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
417	sub coord2global {	441	sub coord2global {
418	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
419		443
		444	Carp::confess unless $self->{parent};#d#
		445
420	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421	}	447	}
422		448
423	sub focus_in {	449	sub invoke_focus_in {
424	my ($self) = @_;	450	my ($self) = @_;
425		451
426	return if $FOCUS == $self;	452	return if $FOCUS == $self;
427	return unless $self->{can_focus};	453	return unless $self->{can_focus};
428		454
429	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
430		456
431	$self->_emit (focus_in => $focus);	457	$self->update;
432		458
433	$focus->update if $focus;	459	0
434	$FOCUS->update;
435	}	460	}
436		461
437	sub focus_out {	462	sub invoke_focus_out {
438	my ($self) = @_;	463	my ($self) = @_;
439		464
440	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
441		466
442	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
443		468
444	$self->_emit (focus_out => $focus);	469	$self->update;
445		470
446	$focus->update if $focus; #?
447
448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449	unless $FOCUS;	472	unless $FOCUS;
450	}
451		473
		474	0
		475	}
		476
		477	sub grab_focus {
		478	my ($self) = @_;
		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
		481	$self->emit ("focus_in");
		482	}
		483
452	sub mouse_motion { 0 }	484	sub invoke_mouse_motion { 0 }
453	sub button_up { 0 }	485	sub invoke_button_up { 0 }
454	sub key_down { 0 }	486	sub invoke_key_down { 0 }
455	sub key_up { 0 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
456		489
457	sub button_down {	490	sub invoke_button_down {
458	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
459		492
460	$self->focus_in;	493	$self->grab_focus;
461		494
462	0	495	0
		496	}
		497
		498	sub connect {
		499	my ($self, $signal, $cb) = @_;
		500
		501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
		507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
		515
		516	sub emit {
		517	my ($self, $signal, @args) = @_;
		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
		528	#d##TODO# stop propagating at first true, do not use sum
		529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
		530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
		531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463	}	532	}
464		533
465	sub find_widget {	534	sub find_widget {
466	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
467		536
…		…
477	sub set_parent {	546	sub set_parent {
478	my ($self, $parent) = @_;	547	my ($self, $parent) = @_;
479		548
480	Scalar::Util::weaken ($self->{parent} = $parent);	549	Scalar::Util::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	550	$self->set_visible if $parent->{visible};
482	}
483
484	sub connect {
485	my ($self, $signal, $cb) = @_;
486
487	push @{ $self->{signal_cb}{$signal} }, $cb;
488	}
489
490	sub _emit {
491	my ($self, $signal, @args) = @_;
492
493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494	}
495
496	sub emit {
497	my ($self, $signal, @args) = @_;
498
499	$self->_emit ($signal, @args)
500	|| $self->$signal (@args);
501	}
502
503	sub visibility_change {
504	#my ($self, $visible) = @_;
505	}	551	}
506		552
507	sub realloc {	553	sub realloc {
508	my ($self) = @_;	554	my ($self) = @_;
509		555
…		…
542	return unless $self->{h} && $self->{w};	588	return unless $self->{h} && $self->{w};
543		589
544	# update screen rectangle	590	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};	591	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};	592	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549		593
550	# skip widgets that are entirely outside the drawing area	594	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	595	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	596	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553		597
…		…
576	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
577	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
578	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
579	glEnd;	623	glEnd;
580	glPopMatrix;	624	glPopMatrix;
581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582	}	626	}
583		627
584	$self->_draw;	628	$self->_draw;
585	glPopMatrix;	629	glPopMatrix;
586	}	630	}
…		…
592	}	636	}
593		637
594	sub DESTROY {	638	sub DESTROY {
595	my ($self) = @_;	639	my ($self) = @_;
596		640
		641	return if CFPlus::in_destruct;
		642
597	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
598		644
599	eval { $self->destroy };	645	eval { $self->destroy };
600	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
601	}	647	}
602		648
603	#############################################################################	649	#############################################################################
604		650
605	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
606		652
607	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
608		654
609	use strict;	655	use strict;
610	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
611		657
612	sub new {	658	sub new {
613	my $class = shift;	659	my $class = shift;
614		660
615	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
646	}	692	}
647	}	693	}
648		694
649	#############################################################################	695	#############################################################################
650		696
651	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
652		698
653	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
654		700
655	sub new {	701	sub new {
656	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
657	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
658	}	704	}
…		…
665		711
666	sub draw { }	712	sub draw { }
667		713
668	#############################################################################	714	#############################################################################
669		715
670	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
671		717
672	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
673		719
674	sub new {	720	sub new {
675	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
676		722
677	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
686	if $children;	732	if $children;
687		733
688	$self	734	$self
689	}	735	}
690		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
		743	}
		744
691	sub add {	745	sub add {
692	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
693		747
694	$_->set_parent ($self)	748	$_->set_parent ($self)
695	for @widgets;	749	for @widgets;
…		…
755	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
756	}	810	}
757		811
758	#############################################################################	812	#############################################################################
759		813
760	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
761		815
762	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
763		817
764	sub new {	818	sub new {
765	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
766		820
767	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768		822
769	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
770	}	824	}
771		825
772	sub add {	826	sub add {
…		…
779	sub remove {	833	sub remove {
780	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
781		835
782	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
783		837
784	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
785	unless @{$self->{children}};	839	unless @{$self->{children}};
786	}	840	}
787		841
788	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
789		843
790	sub size_request {	844	sub size_request {
791	$_[0]{children}[0]->size_request	845	$_[0]{children}[0]->size_request
792	}	846	}
793		847
794	sub size_allocate {	848	sub invoke_size_allocate {
795	my ($self, $w, $h) = @_;	849	my ($self, $w, $h) = @_;
796		850
797	$self->{children}[0]->configure (0, 0, $w, $h);	851	$self->{children}[0]->configure (0, 0, $w, $h);
		852
		853	1
798	}	854	}
799		855
800	#############################################################################	856	#############################################################################
801		857
802	# back-buffered drawing area	858	# back-buffered drawing area
803		859
804	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
805		861
806	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
807		863
808	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
809		865
810	sub new {	866	sub new {
811	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
812		868
813	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
818		874
819	$ROOT->on_post_alloc ($self => sub { $self->render_child });	875	$ROOT->on_post_alloc ($self => sub { $self->render_child });
820	$self->SUPER::update;	876	$self->SUPER::update;
821	}	877	}
822		878
823	sub size_allocate {	879	sub invoke_size_allocate {
824	my ($self, $w, $h) = @_;	880	my ($self, $w, $h) = @_;
825		881
826	$self->SUPER::size_allocate ($w, $h);
827	$self->update;	882	$self->update;
		883
		884	$self->SUPER::invoke_size_allocate ($w, $h)
828	}	885	}
829		886
830	sub _render {	887	sub _render {
831	my ($self) = @_;	888	my ($self) = @_;
832		889
…		…
834	}	891	}
835		892
836	sub render_child {	893	sub render_child {
837	my ($self) = @_;	894	my ($self) = @_;
838		895
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
842		899
843	{	900	{
844	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
845		902
846	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
848	}	905	}
849		906
…		…
868	glDisable GL_TEXTURE_2D;	925	glDisable GL_TEXTURE_2D;
869	}	926	}
870		927
871	#############################################################################	928	#############################################################################
872		929
873	package CFClient::UI::ViewPort;	930	package CFPlus::UI::ViewPort;
874		931
875	our @ISA = CFClient::UI::Window::;	932	our @ISA = CFPlus::UI::Window::;
876		933
877	sub new {	934	sub new {
878	my $class = shift;	935	my $class = shift;
879		936
880	$class->SUPER::new (	937	$class->SUPER::new (
…		…
893	$h = 10 if $self->{scroll_y};	950	$h = 10 if $self->{scroll_y};
894		951
895	($w, $h)	952	($w, $h)
896	}	953	}
897		954
898	sub size_allocate {	955	sub invoke_size_allocate {
899	my ($self, $w, $h) = @_;	956	my ($self, $w, $h) = @_;
900		957
901	my $child = $self->child;	958	my $child = $self->child;
902		959
903	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	960	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	961	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905		962
906	$self->child->configure (0, 0, $w, $h);	963	$self->child->configure (0, 0, $w, $h);
907	$self->update;	964	$self->update;
		965
		966	1
908	}	967	}
909		968
910	sub set_offset {	969	sub set_offset {
911	my ($self, $x, $y) = @_;	970	my ($self, $x, $y) = @_;
912		971
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	997	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	998	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	999	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1000	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1001	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1002	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1003	}
945	}	1004	}
946		1005
947	sub _render {	1006	sub _render {
948	my ($self) = @_;	1007	my ($self) = @_;
949		1008
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1009	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1010	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1011
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1012	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1013
955	$self->SUPER::_render;	1014	$self->SUPER::_render;
956	}	1015	}
957		1016
958	#############################################################################	1017	#############################################################################
959		1018
960	package CFClient::UI::ScrolledWindow;	1019	package CFPlus::UI::ScrolledWindow;
961		1020
962	our @ISA = CFClient::UI::HBox::;	1021	our @ISA = CFPlus::UI::HBox::;
963		1022
964	sub new {	1023	sub new {
965	my ($class, %arg) = @_;	1024	my ($class, %arg) = @_;
966		1025
967	my $child = delete $arg{child};	1026	my $child = delete $arg{child};
968		1027
969	my $self;	1028	my $self;
970		1029
971	my $slider = new CFClient::UI::Slider	1030	my $slider = new CFPlus::UI::Slider
972	vertical => 1,	1031	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1032	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1033	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1034	$self->{vp}->set_offset (0, $_[1]);
976	},	1035	},
977	;	1036	;
978		1037
979	$self = $class->SUPER::new (	1038	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1039	vp => (new CFPlus::UI::ViewPort expand => 1),
		1040	can_events => 1,
981	slider => $slider,	1041	slider => $slider,
982	%arg,	1042	%arg,
983	);	1043	);
984		1044
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1045	$self->SUPER::add ($self->{vp}, $self->{slider});
986	$self->add ($child) if $child;	1046	$self->add ($child) if $child;
987		1047
988	$self	1048	$self
989	}	1049	}
990		1050
		1051	#TODO# update range on size_allocate depending on child
		1052
991	sub add {	1053	sub add {
992	my ($self, $widget) = @_;	1054	my ($self, $widget) = @_;
993		1055
994	$self->{vp}->add ($self->{child} = $widget);	1056	$self->{vp}->add ($self->{child} = $widget);
995	}	1057	}
996		1058
		1059	sub invoke_mouse_wheel {
		1060	my ($self, $ev) = @_;
		1061
		1062	return 0 unless $ev->{dy}; # only vertical movements
		1063
		1064	$self->{slider}->emit (mouse_wheel => $ev);
		1065
		1066	1
		1067	}
		1068
		1069	sub update_slider {
		1070	my ($self) = @_;
		1071
		1072	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1073	}
		1074
997	sub update {	1075	sub update {
998	my ($self) = @_;	1076	my ($self) = @_;
999		1077
1000	$self->SUPER::update;	1078	$self->SUPER::update;
1001		1079
1002	# todo: overwrite size_allocate of child	1080	$self->update_slider;
1003	my $child = $self->{vp}->child;
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005	}	1081	}
1006		1082
1007	sub size_allocate {	1083	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1084	my ($self, $w, $h) = @_;
1009		1085
		1086	$self->update_slider;
		1087
1010	$self->SUPER::size_allocate ($w, $h);	1088	$self->SUPER::invoke_size_allocate ($w, $h)
1011
1012	my $child = $self->{vp}->child;
1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014	}	1089	}
1015
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018		1090
1019	#############################################################################	1091	#############################################################################
1020		1092
1021	package CFClient::UI::Frame;	1093	package CFPlus::UI::Frame;
1022		1094
1023	our @ISA = CFClient::UI::Bin::;	1095	our @ISA = CFPlus::UI::Bin::;
1024		1096
1025	use CFClient::OpenGL;	1097	use CFPlus::OpenGL;
1026		1098
1027	sub new {	1099	sub new {
1028	my $class = shift;	1100	my $class = shift;
1029		1101
1030	$class->SUPER::new (	1102	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1128	$self->SUPER::_draw;
1057	}	1129	}
1058		1130
1059	#############################################################################	1131	#############################################################################
1060		1132
1061	package CFClient::UI::FancyFrame;	1133	package CFPlus::UI::FancyFrame;
1062		1134
1063	our @ISA = CFClient::UI::Bin::;	1135	our @ISA = CFPlus::UI::Bin::;
1064		1136
1065	use CFClient::OpenGL;	1137	use CFPlus::OpenGL;
1066		1138
1067	my $bg =	1139	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1140	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1141	mipmap => 1, wrap => 1;
1070		1142
1071	my @border =	1143	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1144	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1145	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074		1146
1075	sub new {	1147	sub new {
1076	my ($class, %arg) = @_;	1148	my ($class, %arg) = @_;
1077		1149
1078	my $self = $class->SUPER::new (	1150	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1151	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1152	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1153	border => 0.6,
1082	can_events => 1,	1154	can_events => 1,
1083	min_w => 16,	1155	min_w => 64,
1084	min_h => 16,	1156	min_h => 32,
1085	%arg,	1157	%arg,
1086	);	1158	);
1087		1159
1088	$self->{title_widget} = new CFClient::UI::Label	1160	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1161	align => 0,
1090	valign => 1,	1162	valign => 1,
1091	text => $self->{title},	1163	text => $self->{title},
1092	fontsize => $self->{border},	1164	fontsize => $self->{border},
1093	if exists $self->{title};	1165	if exists $self->{title};
1094		1166
1095	unless ($self->{no_close_button}) {	1167	if ($self->{has_close_button}) {
1096	$self->{close_btn} =	1168	$self->{close_button} =
1097	new CFClient::UI::ImageButton	1169	new CFPlus::UI::ImageButton
1098	image => 'x1_close.png',	1170	path => 'x1_close.png',
1099	on_activate => sub { $self->hide };	1171	on_activate => sub { $self->emit ("delete") };
1100		1172
1101	$self->CFClient::UI::Container::add ($self->{close_btn});	1173	$self->CFPlus::UI::Container::add ($self->{close_button});
1102	}	1174	}
1103		1175
1104	$self	1176	$self
1105	}	1177	}
1106		1178
1107	sub add {	1179	sub add {
1108	my ($self, @widgets) = @_;	1180	my ($self, @widgets) = @_;
1109		1181
1110	$self->SUPER::add (@widgets);	1182	$self->SUPER::add (@widgets);
1111	$self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};	1183	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1184	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113	}	1185	}
1114		1186
1115	sub border {	1187	sub border {
1116	int $_[0]{border} * $::FONTSIZE	1188	int $_[0]{border} * $::FONTSIZE
1117	}	1189	}
…		…
1120	my ($self) = @_;	1192	my ($self) = @_;
1121		1193
1122	$self->{title_widget}->size_request	1194	$self->{title_widget}->size_request
1123	if $self->{title_widget};	1195	if $self->{title_widget};
1124		1196
1125	$self->{close_btn}->size_request	1197	$self->{close_button}->size_request
1126	if $self->{close_btn};	1198	if $self->{close_button};
1127		1199
1128	my ($w, $h) = $self->SUPER::size_request;	1200	my ($w, $h) = $self->SUPER::size_request;
1129		1201
1130	(	1202	(
1131	$w + $self->border * 2,	1203	$w + $self->border * 2,
1132	$h + $self->border * 2,	1204	$h + $self->border * 2,
1133	)	1205	)
1134	}	1206	}
1135		1207
1136	sub size_allocate {	1208	sub invoke_size_allocate {
1137	my ($self, $w, $h) = @_;	1209	my ($self, $w, $h) = @_;
1138		1210
1139	if ($self->{title_widget}) {	1211	if ($self->{title_widget}) {
1140	$self->{title_widget}{w} = $w;	1212	$self->{title_widget}{w} = $w;
1141	$self->{title_widget}{h} = $h;	1213	$self->{title_widget}{h} = $h;
1142	$self->{title_widget}->size_allocate ($w, $h);	1214	$self->{title_widget}->invoke_size_allocate ($w, $h);
1143	}	1215	}
1144		1216
1145	my $border = $self->border;	1217	my $border = $self->border;
1146		1218
1147	$h -= List::Util::max 0, $border * 2;	1219	$h -= List::Util::max 0, $border * 2;
1148	$w -= List::Util::max 0, $border * 2;	1220	$w -= List::Util::max 0, $border * 2;
1149		1221
1150	$self->child->configure ($border, $border, $w, $h);	1222	$self->child->configure ($border, $border, $w, $h);
1151		1223
1152	$self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)	1224	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153	if $self->{close_btn};	1225	if $self->{close_button};
1154	}
1155		1226
		1227	1
		1228	}
		1229
		1230	sub invoke_delete {
		1231	my ($self) = @_;
		1232
		1233	$self->hide;
		1234
		1235	1
		1236	}
		1237
1156	sub button_down {	1238	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1239	my ($self, $ev, $x, $y) = @_;
1158		1240
1159	my ($w, $h) = @$self{qw(w h)};	1241	my ($w, $h) = @$self{qw(w h)};
1160	my $border = $self->border;	1242	my $border = $self->border;
1161		1243
…		…
1192		1274
1193	($x, $y) = ($ev->{x}, $ev->{y});	1275	($x, $y) = ($ev->{x}, $ev->{y});
1194		1276
1195	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1277	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196	# HACK: the next line is required to enforce placement	1278	# HACK: the next line is required to enforce placement
1197	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1279	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198	};	1280	};
1199	} else {	1281	} else {
1200	return 0;	1282	return 0;
1201	}	1283	}
1202		1284
1203	1	1285	1
1204	}	1286	}
1205		1287
1206	sub button_up {	1288	sub invoke_button_up {
1207	my ($self, $ev, $x, $y) = @_;	1289	my ($self, $ev, $x, $y) = @_;
1208		1290
1209	$self->{close_btn}->button_up ($ev, $x, $y)
1210	if $self->{close_btn};
1211
1212	!!delete $self->{motion}	1291	! ! delete $self->{motion}
1213	}	1292	}
1214		1293
1215	sub mouse_motion {	1294	sub invoke_mouse_motion {
1216	my ($self, $ev, $x, $y) = @_;	1295	my ($self, $ev, $x, $y) = @_;
1217		1296
1218	$self->{motion}->($ev, $x, $y) if $self->{motion};	1297	$self->{motion}->($ev, $x, $y) if $self->{motion};
1219		1298
1220	!!$self->{motion}	1299	! ! $self->{motion}
		1300	}
		1301
		1302	sub invoke_visibility_change {
		1303	my ($self, $visible) = @_;
		1304
		1305	delete $self->{motion} unless $visible;
		1306
		1307	0
1221	}	1308	}
1222		1309
1223	sub _draw {	1310	sub _draw {
1224	my ($self) = @_;	1311	my ($self) = @_;
1225		1312
…		…
1258	$self->{title_widget}->_draw;	1345	$self->{title_widget}->_draw;
1259		1346
1260	glTranslate 0, - ($border - $self->{h});	1347	glTranslate 0, - ($border - $self->{h});
1261	}	1348	}
1262		1349
1263	$self->{close_btn}->draw	1350	$self->{close_button}->draw
1264	if $self->{close_btn};	1351	if $self->{close_button};
1265	}	1352	}
1266		1353
1267	#############################################################################	1354	#############################################################################
1268		1355
1269	package CFClient::UI::Table;	1356	package CFPlus::UI::Table;
1270		1357
1271	our @ISA = CFClient::UI::Base::;	1358	our @ISA = CFPlus::UI::Base::;
1272		1359
1273	use List::Util qw(max sum);	1360	use List::Util qw(max sum);
1274		1361
1275	use CFClient::OpenGL;	1362	use CFPlus::OpenGL;
1276		1363
1277	sub new {	1364	sub new {
1278	my $class = shift;	1365	my $class = shift;
1279		1366
1280	$class->SUPER::new (	1367	$class->SUPER::new (
…		…
1286	sub children {	1373	sub children {
1287	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1374	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1288	}	1375	}
1289		1376
1290	sub add {	1377	sub add {
1291	my ($self, $x, $y, $child) = @_;	1378	my ($self) = shift;
1292		1379
		1380	while (@_) {
		1381	my ($x, $y, $child) = splice @_, 0, 3, ();
1293	$child->set_parent ($self);	1382	$child->set_parent ($self);
1294	$self->{children}[$y][$x] = $child;	1383	$self->{children}[$y][$x] = $child;
		1384	}
1295		1385
		1386	$self->{force_realloc} = 1;
		1387	$self->{force_size_alloc} = 1;
1296	$self->realloc;	1388	$self->realloc;
1297	}	1389	}
1298		1390
1299	sub remove {	1391	sub remove {
1300	my ($self, $child) = @_;	1392	my ($self, $child) = @_;
…		…
1348	(sum @$ws),	1440	(sum @$ws),
1349	(sum @$hs),	1441	(sum @$hs),
1350	)	1442	)
1351	}	1443	}
1352		1444
1353	sub size_allocate {	1445	sub invoke_size_allocate {
1354	my ($self, $w, $h) = @_;	1446	my ($self, $w, $h) = @_;
1355		1447
1356	my ($ws, $hs) = $self->get_wh;	1448	my ($ws, $hs) = $self->get_wh;
1357		1449
1358	my $req_w = (sum @$ws) || 1;	1450	my $req_w = (sum @$ws) || 1;
…		…
1365		1457
1366	# linearly scale sizes	1458	# linearly scale sizes
1367	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1459	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1368	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1460	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1369		1461
1370	CFClient::UI::harmonize $ws;	1462	CFPlus::UI::harmonize $ws;
1371	CFClient::UI::harmonize $hs;	1463	CFPlus::UI::harmonize $hs;
1372		1464
1373	my $y;	1465	my $y;
1374		1466
1375	for my $r (0 .. $#{$self->{children}}) {	1467	for my $r (0 .. $#{$self->{children}}) {
1376	my $row = $self->{children}[$r]	1468	my $row = $self->{children}[$r]
…		…
1390	}	1482	}
1391		1483
1392	$y += $row_h;	1484	$y += $row_h;
1393	}	1485	}
1394		1486
		1487	1
1395	}	1488	}
1396		1489
1397	sub find_widget {	1490	sub find_widget {
1398	my ($self, $x, $y) = @_;	1491	my ($self, $x, $y) = @_;
1399		1492
…		…
1418	}	1511	}
1419	}	1512	}
1420		1513
1421	#############################################################################	1514	#############################################################################
1422		1515
1423	package CFClient::UI::Box;	1516	package CFPlus::UI::Box;
1424		1517
1425	our @ISA = CFClient::UI::Container::;	1518	our @ISA = CFPlus::UI::Container::;
1426		1519
1427	sub size_request {	1520	sub size_request {
1428	my ($self) = @_;	1521	my ($self) = @_;
1429		1522
1430	$self->{vertical}	1523	$self->{vertical}
…		…
1436	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1529	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1530	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1438	)	1531	)
1439	}	1532	}
1440		1533
1441	sub size_allocate {	1534	sub invoke_size_allocate {
1442	my ($self, $w, $h) = @_;	1535	my ($self, $w, $h) = @_;
1443		1536
1444	my $space = $self->{vertical} ? $h : $w;	1537	my $space = $self->{vertical} ? $h : $w;
1445	my $children = $self->{children};	1538	my @children = $self->visible_children;
1446		1539
1447	my @req;	1540	my @req;
1448		1541
1449	if ($self->{homogeneous}) {	1542	if ($self->{homogeneous}) {
1450	@req = ($space / (@$children || 1)) x @$children;	1543	@req = ($space / (@children || 1)) x @children;
1451	} else {	1544	} else {
1452	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1545	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453	my $req = List::Util::sum @req;	1546	my $req = List::Util::sum @req;
1454		1547
1455	if ($req > $space) {	1548	if ($req > $space) {
1456	# ah well, not enough space	1549	# ah well, not enough space
1457	$_ *= $space / $req for @req;	1550	$_ *= $space / $req for @req;
1458	} else {	1551	} else {
1459	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1552	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460		1553
1461	$space = ($space - $req) / $expand; # remaining space to give away	1554	$space = ($space - $req) / $expand; # remaining space to give away
1462		1555
1463	$req[$_] += $space * $children->[$_]{expand}	1556	$req[$_] += $space * $children[$_]{expand}
1464	for 0 .. $#$children;	1557	for 0 .. $#children;
1465	}	1558	}
1466	}	1559	}
1467		1560
1468	CFClient::UI::harmonize \@req;	1561	CFPlus::UI::harmonize \@req;
1469		1562
1470	my $pos = 0;	1563	my $pos = 0;
1471	for (0 .. $#$children) {	1564	for (0 .. $#children) {
1472	my $alloc = $req[$_];	1565	my $alloc = $req[$_];
1473	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1566	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474		1567
1475	$pos += $alloc;	1568	$pos += $alloc;
1476	}	1569	}
1477		1570
1478	1	1571	1
1479	}	1572	}
1480		1573
1481	#############################################################################	1574	#############################################################################
1482		1575
1483	package CFClient::UI::HBox;	1576	package CFPlus::UI::HBox;
1484		1577
1485	our @ISA = CFClient::UI::Box::;	1578	our @ISA = CFPlus::UI::Box::;
1486		1579
1487	sub new {	1580	sub new {
1488	my $class = shift;	1581	my $class = shift;
1489		1582
1490	$class->SUPER::new (	1583	$class->SUPER::new (
…		…
1493	)	1586	)
1494	}	1587	}
1495		1588
1496	#############################################################################	1589	#############################################################################
1497		1590
1498	package CFClient::UI::VBox;	1591	package CFPlus::UI::VBox;
1499		1592
1500	our @ISA = CFClient::UI::Box::;	1593	our @ISA = CFPlus::UI::Box::;
1501		1594
1502	sub new {	1595	sub new {
1503	my $class = shift;	1596	my $class = shift;
1504		1597
1505	$class->SUPER::new (	1598	$class->SUPER::new (
…		…
1508	)	1601	)
1509	}	1602	}
1510		1603
1511	#############################################################################	1604	#############################################################################
1512		1605
1513	package CFClient::UI::Label;	1606	package CFPlus::UI::Label;
1514		1607
1515	our @ISA = CFClient::UI::DrawBG::;	1608	our @ISA = CFPlus::UI::DrawBG::;
1516		1609
1517	use CFClient::OpenGL;	1610	use CFPlus::OpenGL;
1518		1611
1519	sub new {	1612	sub new {
1520	my ($class, %arg) = @_;	1613	my ($class, %arg) = @_;
1521		1614
1522	my $self = $class->SUPER::new (	1615	my $self = $class->SUPER::new (
…		…
1526	#font => default_font	1619	#font => default_font
1527	#text => initial text	1620	#text => initial text
1528	#markup => initial narkup	1621	#markup => initial narkup
1529	#max_w => maximum pixel width	1622	#max_w => maximum pixel width
1530	ellipsise => 3, # end	1623	ellipsise => 3, # end
1531	layout => (new CFClient::Layout),	1624	layout => (new CFPlus::Layout),
1532	fontsize => 1,	1625	fontsize => 1,
1533	align => -1,	1626	align => -1,
1534	valign => -1,	1627	valign => -1,
1535	padding_x => 2,	1628	padding_x => 2,
1536	padding_y => 2,	1629	padding_y => 2,
1537	can_events => 0,	1630	can_events => 0,
1538	%arg	1631	%arg
1539	);	1632	);
1540		1633
1541	if (exists $self->{template}) {	1634	if (exists $self->{template}) {
1542	my $layout = new CFClient::Layout;	1635	my $layout = new CFPlus::Layout;
1543	$layout->set_text (delete $self->{template});	1636	$layout->set_text (delete $self->{template});
1544	$self->{template} = $layout;	1637	$self->{template} = $layout;
1545	}	1638	}
1546		1639
1547	if (exists $self->{markup}) {	1640	if (exists $self->{markup}) {
…		…
1551	}	1644	}
1552		1645
1553	$self	1646	$self
1554	}	1647	}
1555		1648
1556	sub escape($) {
1557	local $_ = $_[0];
1558
1559	s/&/&amp;/g;
1560	s/>/&gt;/g;
1561	s/</&lt;/g;
1562
1563	$_
1564	}
1565
1566	sub update {	1649	sub update {
1567	my ($self) = @_;	1650	my ($self) = @_;
1568		1651
1569	delete $self->{texture};	1652	delete $self->{texture};
1570	$self->SUPER::update;	1653	$self->SUPER::update;
…		…
1581	my ($self, $text) = @_;	1664	my ($self, $text) = @_;
1582		1665
1583	return if $self->{text} eq "T$text";	1666	return if $self->{text} eq "T$text";
1584	$self->{text} = "T$text";	1667	$self->{text} = "T$text";
1585		1668
1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587	$self->{layout}->set_text ($text);	1669	$self->{layout}->set_text ($text);
1588		1670
1589	delete $self->{size_req};	1671	delete $self->{size_req};
1590	$self->realloc;	1672	$self->realloc;
1591	$self->update;	1673	$self->update;
…		…
1597	return if $self->{text} eq "M$markup";	1679	return if $self->{text} eq "M$markup";
1598	$self->{text} = "M$markup";	1680	$self->{text} = "M$markup";
1599		1681
1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1682	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601		1683
1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603	$self->{layout}->set_markup ($markup);	1684	$self->{layout}->set_markup ($markup);
1604		1685
1605	delete $self->{size_req};	1686	delete $self->{size_req};
1606	$self->realloc;	1687	$self->realloc;
1607	$self->update;	1688	$self->update;
…		…
1619		1700
1620	my ($w, $h) = $self->{layout}->size;	1701	my ($w, $h) = $self->{layout}->size;
1621		1702
1622	if (exists $self->{template}) {	1703	if (exists $self->{template}) {
1623	$self->{template}->set_font ($self->{font}) if $self->{font};	1704	$self->{template}->set_font ($self->{font}) if $self->{font};
		1705	$self->{template}->set_width ($self->{max_w} || -1);
1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1706	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		1707
1626	my ($w2, $h2) = $self->{template}->size;	1708	my ($w2, $h2) = $self->{template}->size;
1627		1709
1628	$w = List::Util::max $w, $w2;	1710	$w = List::Util::max $w, $w2;
…		…
1633	};	1715	};
1634		1716
1635	@{ $self->{size_req} }	1717	@{ $self->{size_req} }
1636	}	1718	}
1637		1719
		1720	sub baseline_shift {
		1721	$_[0]{layout}->descent
		1722	}
		1723
1638	sub size_allocate {	1724	sub invoke_size_allocate {
1639	my ($self, $w, $h) = @_;	1725	my ($self, $w, $h) = @_;
1640		1726
1641	delete $self->{ox};	1727	delete $self->{ox};
1642		1728
1643	delete $self->{texture}	1729	delete $self->{texture}
1644	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1730	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1731
		1732	1
1645	}	1733	}
1646		1734
1647	sub set_fontsize {	1735	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	1736	my ($self, $fontsize) = @_;
1649		1737
1650	$self->{fontsize} = $fontsize;	1738	$self->{fontsize} = $fontsize;
		1739	delete $self->{size_req};
1651	delete $self->{texture};	1740	delete $self->{texture};
1652		1741
1653	$self->realloc;	1742	$self->realloc;
1654	}	1743	}
1655		1744
1656	sub reconfigure {	1745	sub reconfigure {
1657	my ($self) = @_;	1746	my ($self) = @_;
1658		1747
1659	delete $self->{size_req};	1748	delete $self->{size_req};
		1749	delete $self->{texture};
1660		1750
1661	$self->SUPER::reconfigure;	1751	$self->SUPER::reconfigure;
1662	}	1752	}
1663		1753
1664	sub _draw {	1754	sub _draw {
1665	my ($self) = @_;	1755	my ($self) = @_;
1666		1756
1667	$self->SUPER::_draw; # draw background, if applicable	1757	$self->SUPER::_draw; # draw background, if applicable
1668		1758
1669	my $tex = $self->{texture} ||= do {	1759	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	1760	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	1761	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	1762	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	1763	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1764	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1765	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		1766
1677	new_from_layout CFClient::Texture $self->{layout}	1767	[$self->{layout}->size]
1678	};	1768	};
1679		1769
1680	unless (exists $self->{ox}) {	1770	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1771	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1772	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	1773	: ($self->{w} - $size->[0]) * 0.5);
1684		1774
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1775	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1776	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	1777	: ($self->{h} - $size->[1]) * 0.5);
1688	};	1778	};
1689		1779
1690	glEnable GL_TEXTURE_2D;
1691
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1780	my $w = List::Util::min $self->{w} + 4, $size->[0];
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1781	my $h = List::Util::min $self->{h} + 2, $size->[1];
1694		1782
1695	if ($tex->{format} == GL_ALPHA) {	1783	$self->{layout}->render ($self->{ox}, $self->{oy});
1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697	glColor @{$self->{fg}};
1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699	} else {
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702	}
1703
1704	glDisable GL_TEXTURE_2D;
1705	}	1784	}
1706		1785
1707	#############################################################################	1786	#############################################################################
1708		1787
1709	package CFClient::UI::EntryBase;	1788	package CFPlus::UI::EntryBase;
1710		1789
1711	our @ISA = CFClient::UI::Label::;	1790	our @ISA = CFPlus::UI::Label::;
1712		1791
1713	use CFClient::OpenGL;	1792	use CFPlus::OpenGL;
1714		1793
1715	sub new {	1794	sub new {
1716	my $class = shift;	1795	my $class = shift;
1717		1796
1718	$class->SUPER::new (	1797	$class->SUPER::new (
…		…
1742		1821
1743	$text =~ s/./*/g if $self->{hidden};	1822	$text =~ s/./*/g if $self->{hidden};
1744	$self->{layout}->set_text ("$text ");	1823	$self->{layout}->set_text ("$text ");
1745	delete $self->{size_req};	1824	delete $self->{size_req};
1746		1825
1747	$self->_emit (changed => $self->{text});	1826	$self->emit (changed => $self->{text});
1748		1827
1749	$self->realloc;	1828	$self->realloc;
1750	$self->update;	1829	$self->update;
1751	}	1830	}
1752		1831
…		…
1767	my ($w, $h) = $self->SUPER::size_request;	1846	my ($w, $h) = $self->SUPER::size_request;
1768		1847
1769	($w + 1, $h) # add 1 for cursor	1848	($w + 1, $h) # add 1 for cursor
1770	}	1849	}
1771		1850
1772	sub key_down {	1851	sub invoke_key_down {
1773	my ($self, $ev) = @_;	1852	my ($self, $ev) = @_;
1774		1853
1775	my $mod = $ev->{mod};	1854	my $mod = $ev->{mod};
1776	my $sym = $ev->{sym};	1855	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	1856	my $uni = $ev->{unicode};
…		…
1780		1859
1781	if ($uni == 8) {	1860	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1861	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	1862	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	1863	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	1864	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	1865	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	1866	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	1867	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} elsif ($sym == CFClient::SDLK_HOME) {	1868	} elsif ($sym == CFPlus::SDLK_HOME) {
1790	$self->{cursor} = 0;	1869	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {	1870	} elsif ($sym == CFPlus::SDLK_END) {
1792	$self->{cursor} = length $text;	1871	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	1872	} elsif ($uni == 27) {
1794	$self->_emit ('escape');	1873	$self->emit ('escape');
1795	} elsif ($uni) {	1874	} elsif ($uni) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	1875	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	1876	} else {
1798	return 0;	1877	return 0;
1799	}	1878	}
…		…
1803	$self->realloc;	1882	$self->realloc;
1804		1883
1805	1	1884	1
1806	}	1885	}
1807		1886
1808	sub focus_in {	1887	sub invoke_focus_in {
1809	my ($self) = @_;	1888	my ($self) = @_;
1810		1889
1811	$self->{last_activity} = $::NOW;	1890	$self->{last_activity} = $::NOW;
1812		1891
1813	$self->SUPER::focus_in;	1892	$self->SUPER::invoke_focus_in
1814	}	1893	}
1815		1894
1816	sub button_down {	1895	sub invoke_button_down {
1817	my ($self, $ev, $x, $y) = @_;	1896	my ($self, $ev, $x, $y) = @_;
1818		1897
1819	$self->SUPER::button_down ($ev, $x, $y);	1898	$self->SUPER::invoke_button_down ($ev, $x, $y);
1820		1899
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	1900	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		1901
1823	# byte-index to char-index	1902	# byte-index to char-index
1824	my $text = $self->{text};	1903	my $text = $self->{text};
1825	utf8::encode $text;	1904	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	1905	$self->{cursor} = length $text;
1827		1906
1828	$self->_set_text ($self->{text});	1907	$self->_set_text ($self->{text});
1829	$self->update;	1908	$self->update;
1830		1909
1831	1	1910	1
1832	}	1911	}
1833		1912
1834	sub mouse_motion {	1913	sub invoke_mouse_motion {
1835	my ($self, $ev, $x, $y) = @_;	1914	my ($self, $ev, $x, $y) = @_;
1836	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1915	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837		1916
1838	0	1917	1
1839	}	1918	}
1840		1919
1841	sub _draw {	1920	sub _draw {
1842	my ($self) = @_;	1921	my ($self) = @_;
1843		1922
…		…
1878	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	1957	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	1958	glEnd;
1880	}	1959	}
1881	}	1960	}
1882		1961
1883	package CFClient::UI::Entry;	1962	package CFPlus::UI::Entry;
1884		1963
1885	our @ISA = CFClient::UI::EntryBase::;	1964	our @ISA = CFPlus::UI::EntryBase::;
1886		1965
1887	use CFClient::OpenGL;	1966	use CFPlus::OpenGL;
1888		1967
1889	sub key_down {	1968	sub invoke_key_down {
1890	my ($self, $ev) = @_;	1969	my ($self, $ev) = @_;
1891		1970
1892	my $sym = $ev->{sym};	1971	my $sym = $ev->{sym};
1893		1972
1894	if ($sym == 13) {	1973	if ($sym == 13) {
1895	unshift @{$self->{history}},	1974	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	1975	my $txt = $self->get_text;
		1976
1897	$self->{history_pointer} = -1;	1977	$self->{history_pointer} = -1;
1898	$self->{history_saveback} = '';	1978	$self->{history_saveback} = '';
1899	$self->_emit (activate => $txt);	1979	$self->emit (activate => $txt);
1900	$self->update;	1980	$self->update;
1901		1981
1902	} elsif ($sym == CFClient::SDLK_UP) {	1982	} elsif ($sym == CFPlus::SDLK_UP) {
1903	if ($self->{history_pointer} < 0) {	1983	if ($self->{history_pointer} < 0) {
1904	$self->{history_saveback} = $self->get_text;	1984	$self->{history_saveback} = $self->get_text;
1905	}	1985	}
1906	if (@{$self->{history} || []} > 0) {	1986	if (@{$self->{history} || []} > 0) {
1907	$self->{history_pointer}++;	1987	$self->{history_pointer}++;
…		…
1909	$self->{history_pointer} = @{$self->{history} || []} - 1;	1989	$self->{history_pointer} = @{$self->{history} || []} - 1;
1910	}	1990	}
1911	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1991	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1912	}	1992	}
1913		1993
1914	} elsif ($sym == CFClient::SDLK_DOWN) {	1994	} elsif ($sym == CFPlus::SDLK_DOWN) {
1915	$self->{history_pointer}--;	1995	$self->{history_pointer}--;
1916	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1996	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917		1997
1918	if ($self->{history_pointer} >= 0) {	1998	if ($self->{history_pointer} >= 0) {
1919	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1999	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1920	} else {	2000	} else {
1921	$self->set_text ($self->{history_saveback});	2001	$self->set_text ($self->{history_saveback});
1922	}	2002	}
1923		2003
1924	} else {	2004	} else {
1925	return $self->SUPER::key_down ($ev)	2005	return $self->SUPER::invoke_key_down ($ev)
1926	}	2006	}
1927		2007
1928	1	2008	1
1929	}	2009	}
1930		2010
1931	#############################################################################	2011	#############################################################################
1932		2012
1933	package CFClient::UI::Button;	2013	package CFPlus::UI::Button;
1934		2014
1935	our @ISA = CFClient::UI::Label::;	2015	our @ISA = CFPlus::UI::Label::;
1936		2016
1937	use CFClient::OpenGL;	2017	use CFPlus::OpenGL;
1938		2018
1939	my @tex =	2019	my @tex =
1940	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2020	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941	qw(b1_button_active.png);	2021	qw(b1_button_active.png);
1942		2022
1943	sub new {	2023	sub new {
1944	my $class = shift;	2024	my $class = shift;
1945		2025
…		…
1954	can_events => 1,	2034	can_events => 1,
1955	@_	2035	@_
1956	)	2036	)
1957	}	2037	}
1958		2038
1959	sub activate { }
1960
1961	sub button_up {	2039	sub invoke_button_up {
1962	my ($self, $ev, $x, $y) = @_;	2040	my ($self, $ev, $x, $y) = @_;
1963		2041
1964	$self->emit ("activate")	2042	$self->emit ("activate")
1965	if $x >= 0 && $x < $self->{w}	2043	if $x >= 0 && $x < $self->{w}
1966	&& $y >= 0 && $y < $self->{h};	2044	&& $y >= 0 && $y < $self->{h};
…		…
1984	$self->SUPER::_draw;	2062	$self->SUPER::_draw;
1985	}	2063	}
1986		2064
1987	#############################################################################	2065	#############################################################################
1988		2066
		2067	package CFPlus::UI::CheckBox;
		2068
		2069	our @ISA = CFPlus::UI::DrawBG::;
		2070
		2071	my @tex =
		2072	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2073	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2074
		2075	use CFPlus::OpenGL;
		2076
		2077	sub new {
		2078	my $class = shift;
		2079
		2080	$class->SUPER::new (
		2081	padding_x => 2,
		2082	padding_y => 2,
		2083	fg => [1, 1, 1],
		2084	active_fg => [1, 1, 0],
		2085	bg => [0, 0, 0, 0.2],
		2086	active_bg => [1, 1, 1, 0.5],
		2087	state => 0,
		2088	can_hover => 1,
		2089	@_
		2090	)
		2091	}
		2092
		2093	sub size_request {
		2094	my ($self) = @_;
		2095
		2096	(6) x 2
		2097	}
		2098
		2099	sub toggle {
		2100	my ($self) = @_;
		2101
		2102	$self->{state} = !$self->{state};
		2103	$self->emit (changed => $self->{state});
		2104	$self->update;
		2105	}
		2106
		2107	sub invoke_button_down {
		2108	my ($self, $ev, $x, $y) = @_;
		2109
		2110	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2111	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2112	$self->toggle;
		2113	} else {
		2114	return 0
		2115	}
		2116
		2117	1
		2118	}
		2119
		2120	sub _draw {
		2121	my ($self) = @_;
		2122
		2123	$self->SUPER::_draw;
		2124
		2125	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2126
		2127	my ($w, $h) = @$self{qw(w h)};
		2128
		2129	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2130
		2131	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2132
		2133	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2134
		2135	glEnable GL_TEXTURE_2D;
		2136	$tex->draw_quad_alpha (0, 0, $s, $s);
		2137	glDisable GL_TEXTURE_2D;
		2138	}
		2139
		2140	#############################################################################
		2141
		2142	package CFPlus::UI::Image;
		2143
		2144	our @ISA = CFPlus::UI::Base::;
		2145
		2146	use CFPlus::OpenGL;
		2147
		2148	our %texture_cache;
		2149
		2150	sub new {
		2151	my $class = shift;
		2152
		2153	my $self = $class->SUPER::new (
		2154	can_events => 0,
		2155	@_,
		2156	);
		2157
		2158	$self->{path} || $self->{tex}
		2159	or Carp::croak "'path' or 'tex' attributes required";
		2160
		2161	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2162	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2163
		2164	Scalar::Util::weaken $texture_cache{$self->{path}};
		2165
		2166	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2167
		2168	$self
		2169	}
		2170
		2171	sub STORABLE_freeze {
		2172	my ($self, $cloning) = @_;
		2173
		2174	$self->{path}
		2175	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2176
		2177	$self->{path}
		2178	}
		2179
		2180	sub STORABLE_attach {
		2181	my ($self, $cloning, $path) = @_;
		2182
		2183	$self->new (path => $path)
		2184	}
		2185
		2186	sub size_request {
		2187	my ($self) = @_;
		2188
		2189	($self->{tex}{w}, $self->{tex}{h})
		2190	}
		2191
		2192	sub _draw {
		2193	my ($self) = @_;
		2194
		2195	my $tex = $self->{tex};
		2196
		2197	my ($w, $h) = ($self->{w}, $self->{h});
		2198
		2199	if ($self->{rot90}) {
		2200	glRotate 90, 0, 0, 1;
		2201	glTranslate 0, -$self->{w}, 0;
		2202
		2203	($w, $h) = ($h, $w);
		2204	}
		2205
		2206	glEnable GL_TEXTURE_2D;
		2207	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2208
		2209	$tex->draw_quad (0, 0, $w, $h);
		2210
		2211	glDisable GL_TEXTURE_2D;
		2212	}
		2213
		2214	#############################################################################
		2215
1989	package CFClient::UI::ImageButton;	2216	package CFPlus::UI::ImageButton;
1990		2217
1991	our @ISA = CFClient::UI::Image::;	2218	our @ISA = CFPlus::UI::Image::;
1992		2219
1993	use CFClient::OpenGL;	2220	use CFPlus::OpenGL;
1994		2221
1995	my %textures;	2222	my %textures;
1996		2223
1997	sub new {	2224	sub new {
1998	my $class = shift;	2225	my $class = shift;
…		…
2008	can_events => 1,	2235	can_events => 1,
2009	@_	2236	@_
2010	);	2237	);
2011	}	2238	}
2012		2239
2013	sub activate { }
2014
2015	sub button_up {	2240	sub invoke_button_up {
2016	my ($self, $ev, $x, $y) = @_;	2241	my ($self, $ev, $x, $y) = @_;
2017		2242
2018	$self->emit ("activate")	2243	$self->emit ("activate")
2019	if $x >= 0 && $x < $self->{w}	2244	if $x >= 0 && $x < $self->{w}
2020	&& $y >= 0 && $y < $self->{h};	2245	&& $y >= 0 && $y < $self->{h};
…		…
2022	1	2247	1
2023	}	2248	}
2024		2249
2025	#############################################################################	2250	#############################################################################
2026		2251
2027	package CFClient::UI::CheckBox;
2028
2029	our @ISA = CFClient::UI::DrawBG::;
2030
2031	my @tex =
2032	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2033	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2034
2035	use CFClient::OpenGL;
2036
2037	sub new {
2038	my $class = shift;
2039
2040	$class->SUPER::new (
2041	padding_x => 2,
2042	padding_y => 2,
2043	fg => [1, 1, 1],
2044	active_fg => [1, 1, 0],
2045	bg => [0, 0, 0, 0.2],
2046	active_bg => [1, 1, 1, 0.5],
2047	state => 0,
2048	can_hover => 1,
2049	@_
2050	)
2051	}
2052
2053	sub size_request {
2054	my ($self) = @_;
2055
2056	(6) x 2
2057	}
2058
2059	sub button_down {
2060	my ($self, $ev, $x, $y) = @_;
2061
2062	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064	$self->{state} = !$self->{state};
2065	$self->_emit (changed => $self->{state});
2066	} else {
2067	return 0
2068	}
2069
2070	1
2071	}
2072
2073	sub _draw {
2074	my ($self) = @_;
2075
2076	$self->SUPER::_draw;
2077
2078	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2079
2080	my ($w, $h) = @$self{qw(w h)};
2081
2082	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2083
2084	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2085
2086	my $tex = $self->{state} ? $tex[1] : $tex[0];
2087
2088	glEnable GL_TEXTURE_2D;
2089	$tex->draw_quad_alpha (0, 0, $s, $s);
2090	glDisable GL_TEXTURE_2D;
2091	}
2092
2093	#############################################################################
2094
2095	package CFClient::UI::Image;	2252	package CFPlus::UI::VGauge;
2096		2253
2097	our @ISA = CFClient::UI::Base::;	2254	our @ISA = CFPlus::UI::Base::;
2098
2099	use CFClient::OpenGL;
2100	use Carp qw/confess/;
2101
2102	our %loaded_images;
2103
2104	sub new {
2105	my $class = shift;
2106
2107	my $self = $class->SUPER::new (can_events => 0, @_);
2108
2109	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2110
2111	$loaded_images{$self->{image}} ||=
2112	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2113
2114	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2115
2116	Scalar::Util::weaken $loaded_images{$self->{image}};
2117
2118	$self->{aspect} = $tex->{w} / $tex->{h};
2119
2120	$self
2121	}
2122
2123	sub size_request {
2124	my ($self) = @_;
2125
2126	($self->{tex}->{w}, $self->{tex}->{h})
2127	}
2128
2129	sub _draw {
2130	my ($self) = @_;
2131
2132	my $tex = $self->{tex};
2133
2134	my ($w, $h) = ($self->{w}, $self->{h});
2135
2136	if ($self->{rot90}) {
2137	glRotate 90, 0, 0, 1;
2138	glTranslate 0, -$self->{w}, 0;
2139
2140	($w, $h) = ($h, $w);
2141	}
2142
2143	glEnable GL_TEXTURE_2D;
2144	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2145
2146	$tex->draw_quad_alpha (0, 0, $w, $h);
2147
2148	glDisable GL_TEXTURE_2D;
2149	}
2150
2151	#############################################################################
2152
2153	package CFClient::UI::VGauge;
2154
2155	our @ISA = CFClient::UI::Base::;
2156		2255
2157	use List::Util qw(min max);	2256	use List::Util qw(min max);
2158		2257
2159	use CFClient::OpenGL;	2258	use CFPlus::OpenGL;
2160		2259
2161	my %tex = (	2260	my %tex = (
2162	food => [	2261	food => [
2163	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2262	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2263	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2165	],	2264	],
2166	grace => [	2265	grace => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2266	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2267	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2169	],	2268	],
2170	hp => [	2269	hp => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2270	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2271	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2173	],	2272	],
2174	mana => [	2273	mana => [
2175	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2274	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2275	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2177	],	2276	],
2178	);	2277	);
2179		2278
2180	# eg. VGauge->new (gauge => 'food'), default gauge: food	2279	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2240	my $ycut1 = max 0, min 1, $ycut;	2339	my $ycut1 = max 0, min 1, $ycut;
2241	my $ycut2 = max 0, min 1, $ycut - 1;	2340	my $ycut2 = max 0, min 1, $ycut - 1;
2242		2341
2243	my $h1 = $self->{h} * (1 - $ycut1);	2342	my $h1 = $self->{h} * (1 - $ycut1);
2244	my $h2 = $self->{h} * (1 - $ycut2);	2343	my $h2 = $self->{h} * (1 - $ycut2);
		2344	my $h3 = $self->{h};
		2345
		2346	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245		2347
2246	glEnable GL_BLEND;	2348	glEnable GL_BLEND;
2247	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2349	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2350	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249	glEnable GL_TEXTURE_2D;	2351	glEnable GL_TEXTURE_2D;
…		…
2268		2370
2269	if ($t3) {	2371	if ($t3) {
2270	glBindTexture GL_TEXTURE_2D, $t3->{name};	2372	glBindTexture GL_TEXTURE_2D, $t3->{name};
2271	glBegin GL_QUADS;	2373	glBegin GL_QUADS;
2272	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2374	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2375	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2376	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2377	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276	glEnd;	2378	glEnd;
2277	}	2379	}
2278		2380
2279	glDisable GL_BLEND;	2381	glDisable GL_BLEND;
2280	glDisable GL_TEXTURE_2D;	2382	glDisable GL_TEXTURE_2D;
2281	}	2383	}
2282		2384
2283	#############################################################################	2385	#############################################################################
2284		2386
2285	package CFClient::UI::Gauge;	2387	package CFPlus::UI::Gauge;
2286		2388
2287	our @ISA = CFClient::UI::VBox::;	2389	our @ISA = CFPlus::UI::VBox::;
2288		2390
2289	sub new {	2391	sub new {
2290	my ($class, %arg) = @_;	2392	my ($class, %arg) = @_;
2291		2393
2292	my $self = $class->SUPER::new (	2394	my $self = $class->SUPER::new (
…		…
2294	can_hover => 1,	2396	can_hover => 1,
2295	can_events => 1,	2397	can_events => 1,
2296	%arg,	2398	%arg,
2297	);	2399	);
2298		2400
2299	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2401	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2300	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2402	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2301	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2403	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2302		2404
2303	$self	2405	$self
2304	}	2406	}
2305		2407
2306	sub set_fontsize {	2408	sub set_fontsize {
…		…
2327	$self->{value}->set_text ($val);	2429	$self->{value}->set_text ($val);
2328	}	2430	}
2329		2431
2330	#############################################################################	2432	#############################################################################
2331		2433
2332	package CFClient::UI::Slider;	2434	package CFPlus::UI::Slider;
2333		2435
2334	use strict;	2436	use strict;
2335		2437
2336	use CFClient::OpenGL;	2438	use CFPlus::OpenGL;
2337		2439
2338	our @ISA = CFClient::UI::DrawBG::;	2440	our @ISA = CFPlus::UI::DrawBG::;
2339		2441
2340	my @tex =	2442	my @tex =
2341	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2443	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2342	qw(s1_slider.png s1_slider_bg.png);	2444	qw(s1_slider.png s1_slider_bg.png);
2343		2445
2344	sub new {	2446	sub new {
2345	my $class = shift;	2447	my $class = shift;
2346		2448
…		…
2367	$self->update;	2469	$self->update;
2368		2470
2369	$self	2471	$self
2370	}	2472	}
2371		2473
2372	sub changed { }
2373
2374	sub set_range {	2474	sub set_range {
2375	my ($self, $range) = @_;	2475	my ($self, $range) = @_;
2376		2476
2377	($range, $self->{range}) = ($self->{range}, $range);	2477	($range, $self->{range}) = ($self->{range}, $range);
2378		2478
…		…
2398	if $unit;	2498	if $unit;
2399		2499
2400	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2500	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401		2501
2402	if ($value != $old_value) {	2502	if ($value != $old_value) {
2403	$self->_emit (changed => $value);	2503	$self->emit (changed => $value);
2404	$self->update;	2504	$self->update;
2405	}	2505	}
2406	}	2506	}
2407		2507
2408	sub size_request {	2508	sub size_request {
2409	my ($self) = @_;	2509	my ($self) = @_;
2410		2510
2411	($self->{req_w}, $self->{req_h})	2511	($self->{req_w}, $self->{req_h})
2412	}	2512	}
2413		2513
2414	sub button_down {	2514	sub invoke_button_down {
2415	my ($self, $ev, $x, $y) = @_;	2515	my ($self, $ev, $x, $y) = @_;
2416		2516
2417	$self->SUPER::button_down ($ev, $x, $y);	2517	$self->SUPER::invoke_button_down ($ev, $x, $y);
2418		2518
2419	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2519	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420		2520
2421	$self->mouse_motion ($ev, $x, $y)	2521	$self->invoke_mouse_motion ($ev, $x, $y)
2422	}	2522	}
2423		2523
2424	sub mouse_motion {	2524	sub invoke_mouse_motion {
2425	my ($self, $ev, $x, $y) = @_;	2525	my ($self, $ev, $x, $y) = @_;
2426		2526
2427	if ($GRAB == $self) {	2527	if ($GRAB == $self) {
2428	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2528	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429		2529
…		…
2435	} else {	2535	} else {
2436	return 0;	2536	return 0;
2437	}	2537	}
2438		2538
2439	1	2539	1
		2540	}
		2541
		2542	sub invoke_mouse_wheel {
		2543	my ($self, $ev) = @_;
		2544
		2545	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2546
		2547	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2548
		2549	! ! $delta
2440	}	2550	}
2441		2551
2442	sub update {	2552	sub update {
2443	my ($self) = @_;	2553	my ($self) = @_;
2444		2554
…		…
2493	glDisable GL_TEXTURE_2D;	2603	glDisable GL_TEXTURE_2D;
2494	}	2604	}
2495		2605
2496	#############################################################################	2606	#############################################################################
2497		2607
2498	package CFClient::UI::ValSlider;	2608	package CFPlus::UI::ValSlider;
2499		2609
2500	our @ISA = CFClient::UI::HBox::;	2610	our @ISA = CFPlus::UI::HBox::;
2501		2611
2502	sub new {	2612	sub new {
2503	my ($class, %arg) = @_;	2613	my ($class, %arg) = @_;
2504		2614
2505	my $range = delete $arg{range};	2615	my $range = delete $arg{range};
2506		2616
2507	my $self = $class->SUPER::new (	2617	my $self = $class->SUPER::new (
2508	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2618	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2509	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2619	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2510	to_value => sub { shift },	2620	to_value => sub { shift },
2511	from_value => sub { shift },	2621	from_value => sub { shift },
2512	%arg,	2622	%arg,
2513	);	2623	);
2514		2624
…		…
2534	sub set_range { shift->{slider}->set_range (@_) }	2644	sub set_range { shift->{slider}->set_range (@_) }
2535	sub set_value { shift->{slider}->set_value (@_) }	2645	sub set_value { shift->{slider}->set_value (@_) }
2536		2646
2537	#############################################################################	2647	#############################################################################
2538		2648
2539	package CFClient::UI::TextScroller;	2649	package CFPlus::UI::TextScroller;
2540		2650
2541	our @ISA = CFClient::UI::HBox::;	2651	our @ISA = CFPlus::UI::HBox::;
2542		2652
2543	use CFClient::OpenGL;	2653	use CFPlus::OpenGL;
2544		2654
2545	sub new {	2655	sub new {
2546	my $class = shift;	2656	my $class = shift;
2547		2657
2548	my $self = $class->SUPER::new (	2658	my $self = $class->SUPER::new (
2549	fontsize => 1,	2659	fontsize => 1,
2550	can_events => 0,	2660	can_events => 1,
2551	indent => 0,	2661	indent => 0,
2552	#font => default_font	2662	#font => default_font
2553	@_,	2663	@_,
2554		2664
2555	layout => (new CFClient::Layout 1),	2665	layout => (new CFPlus::Layout),
2556	par => [],	2666	par => [],
2557	height => 0,	2667	height => 0,
2558	children => [	2668	children => [
2559	(new CFClient::UI::Empty expand => 1),	2669	(new CFPlus::UI::Empty expand => 1),
2560	(new CFClient::UI::Slider vertical => 1),	2670	(new CFPlus::UI::Slider vertical => 1),
2561	],	2671	],
2562	);	2672	);
2563		2673
2564	$self->{children}[1]->connect (changed => sub { $self->update });	2674	$self->{children}[1]->connect (changed => sub { $self->update });
2565		2675
…		…
2571		2681
2572	$self->{fontsize} = $fontsize;	2682	$self->{fontsize} = $fontsize;
2573	$self->reflow;	2683	$self->reflow;
2574	}	2684	}
2575		2685
		2686	sub size_request {
		2687	my ($self) = @_;
		2688
		2689	my ($empty, $slider) = @{ $self->{children} };
		2690
		2691	local $self->{children} = [$empty, $slider];
		2692	$self->SUPER::size_request
		2693	}
		2694
2576	sub size_allocate {	2695	sub invoke_size_allocate {
2577	my ($self, $w, $h) = @_;	2696	my ($self, $w, $h) = @_;
2578		2697
2579	$self->SUPER::size_allocate ($w, $h);	2698	my ($empty, $slider, @other) = @{ $self->{children} };
		2699	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580		2700
2581	$self->{layout}->set_font ($self->{font}) if $self->{font};	2701	$self->{layout}->set_font ($self->{font}) if $self->{font};
2582	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2702	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583	$self->{layout}->set_width ($self->{children}[0]{w});	2703	$self->{layout}->set_width ($empty->{w});
2584	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2704	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585		2705
2586	$self->reflow;	2706	$self->reflow;
2587	}
2588		2707
2589	sub text_size {	2708	local $self->{children} = [$empty, $slider];
		2709	$self->SUPER::invoke_size_allocate ($w, $h)
		2710	}
		2711
		2712	sub invoke_mouse_wheel {
2590	my ($self, $text, $indent) = @_;	2713	my ($self, $ev) = @_;
		2714
		2715	return 0 unless $ev->{dy}; # only vertical movements
		2716
		2717	$self->{children}[1]->emit (mouse_wheel => $ev);
		2718
		2719	1
		2720	}
		2721
		2722	sub get_layout {
		2723	my ($self, $para) = @_;
2591		2724
2592	my $layout = $self->{layout};	2725	my $layout = $self->{layout};
2593		2726
		2727	$layout->set_font ($self->{font}) if $self->{font};
		2728	$layout->set_foreground (@{$para->{fg}});
2594	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2729	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595	$layout->set_width ($self->{children}[0]{w} - $indent);	2730	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2731	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597	$layout->set_markup ($text);	2732	$layout->set_markup ($para->{markup});
		2733
		2734	$layout->set_shapes (
		2735	map
		2736	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2737	@{$para->{widget}}
2598		2738	);
		2739
2599	$layout->size	2740	$layout
2600	}	2741	}
2601		2742
2602	sub reflow {	2743	sub reflow {
2603	my ($self) = @_;	2744	my ($self) = @_;
2604		2745
…		…
2613	$self->{children}[1]->set_value ($offset);	2754	$self->{children}[1]->set_value ($offset);
2614	}	2755	}
2615		2756
2616	sub clear {	2757	sub clear {
2617	my ($self) = @_;	2758	my ($self) = @_;
		2759
		2760	my (undef, undef, @other) = @{ $self->{children} };
		2761	$self->remove ($_) for @other;
2618		2762
2619	$self->{par} = [];	2763	$self->{par} = [];
2620	$self->{height} = 0;	2764	$self->{height} = 0;
2621	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2765	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622	}	2766	}
2623		2767
2624	sub add_paragraph {	2768	sub add_paragraph {
2625	my ($self, $color, $text, $indent) = @_;	2769	my $self = shift;
2626		2770
2627	for my $line (split /\n/, $text) {	2771	for my $para (@_) {
2628	my ($w, $h) = $self->text_size ($line);	2772	$para = {
2629	$self->{height} += $h;	2773	fg => [1, 1, 1, 1],
2630	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2774	indent => 0,
2631	}	2775	markup => "",
		2776	widget => [],
		2777	ref $para ? %$para : (markup => $para),
		2778	w => 1e10,
		2779	wrapped => 1,
		2780	};
2632		2781
2633	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2782	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2783	push @{$self->{par}}, $para;
		2784	}
		2785
		2786	$self->{need_reflow}++;
		2787	$self->update;
		2788	}
		2789
		2790	sub scroll_to_bottom {
		2791	my ($self) = @_;
		2792
		2793	$self->{scroll_to_bottom} = 1;
		2794	$self->update;
2634	}	2795	}
2635		2796
2636	sub update {	2797	sub update {
2637	my ($self) = @_;	2798	my ($self) = @_;
2638		2799
…		…
2646	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2807	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647		2808
2648	if (delete $self->{need_reflow}) {	2809	if (delete $self->{need_reflow}) {
2649	my $height = 0;	2810	my $height = 0;
2650		2811
2651	my $layout = $self->{layout};
2652
2653	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655	for (@{$self->{par}}) {	2812	for my $para (@{$self->{par}}) {
2656	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2813	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2657	$layout->set_width ($W - $_->[3]);	2814	my $layout = $self->get_layout ($para);
2658	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659	$layout->set_markup ($_->[4]);
2660	my ($w, $h) = $layout->size;	2815	my ($w, $h) = $layout->size;
2661	$_->[0] = $w + $_->[3];	2816
2662	$_->[1] = $h;	2817	$para->{w} = $w + $para->{indent};
		2818	$para->{h} = $h;
		2819	$para->{wrapped} = $layout->has_wrapped;
2663	}	2820	}
2664		2821
2665	$height += $_->[1];	2822	$height += $para->{h};
2666	}	2823	}
2667		2824
2668	$self->{height} = $height;	2825	$self->{height} = $height;
2669		2826
2670	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2827	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2671		2828
2672	delete $self->{texture};	2829	delete $self->{texture};
2673	}	2830	}
2674		2831
		2832	if (delete $self->{scroll_to_bottom}) {
		2833	$self->{children}[1]->set_value (1e10);
		2834	}
		2835
2675	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2836	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2676	glClearColor 0, 0, 0, 0;	2837	glClearColor 0, 0, 0, 0;
2677	glClear GL_COLOR_BUFFER_BIT;	2838	glClear GL_COLOR_BUFFER_BIT;
2678		2839
2679	my $top = int $self->{children}[1]{range}[0];	2840	my $top = int $self->{children}[1]{range}[0];
2680		2841
2681	my $y0 = $top;	2842	my $y0 = $top;
2682	my $y1 = $top + $H;	2843	my $y1 = $top + $H;
2683		2844
2684	my $y = 0;	2845	my $y = 0;
2685		2846
2686	my $layout = $self->{layout};
2687
2688	$layout->set_font ($self->{font}) if $self->{font};
2689
2690	glEnable GL_BLEND;
2691	#TODO# not correct in windows where rgba is forced off
2692	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693
2694	for my $par (@{$self->{par}}) {	2847	for my $para (@{$self->{par}}) {
2695	my $h = $par->[1];	2848	my $h = $para->{h};
2696		2849
2697	if ($y0 < $y + $h && $y < $y1) {	2850	if ($y0 < $y + $h && $y < $y1) {
2698	$layout->set_foreground (@{ $par->[2] });
2699	$layout->set_width ($W - $par->[3]);
2700	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701	$layout->set_markup ($par->[4]);
2702		2851
2703	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2852	my $layout = $self->get_layout ($para);
2704		2853
2705	glRasterPos $par->[3], $y - $y0;	2854	$layout->render ($para->{indent}, $y - $y0);
2706	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2855
		2856	if (my @w = @{ $para->{widget} }) {
		2857	my @s = $layout->get_shapes;
		2858
		2859	for (@w) {
		2860	my ($dx, $dy) = splice @s, 0, 2, ();
		2861
		2862	$_->{x} = $dx + $para->{indent};
		2863	$_->{y} = $dy + $y - $y0;
		2864
		2865	$_->draw;
		2866	}
		2867	}
2707	}	2868	}
2708		2869
2709	$y += $h;	2870	$y += $h;
2710	}	2871	}
2711
2712	glDisable GL_BLEND;
2713	};	2872	};
2714	});	2873	});
		2874	}
		2875
		2876	sub reconfigure {
		2877	my ($self) = @_;
		2878
		2879	$self->SUPER::reconfigure;
		2880
		2881	$_->{w} = 1e10 for @{ $self->{par} };
		2882	$self->reflow;
2715	}	2883	}
2716		2884
2717	sub _draw {	2885	sub _draw {
2718	my ($self) = @_;	2886	my ($self) = @_;
2719		2887
…		…
2722	glColor 0, 0, 0, 1;	2890	glColor 0, 0, 0, 1;
2723	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2891	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724	glDisable GL_TEXTURE_2D;	2892	glDisable GL_TEXTURE_2D;
2725		2893
2726	$self->{children}[1]->draw;	2894	$self->{children}[1]->draw;
2727
2728	}	2895	}
2729		2896
2730	#############################################################################	2897	#############################################################################
2731		2898
2732	package CFClient::UI::Animator;	2899	package CFPlus::UI::Animator;
2733		2900
2734	use CFClient::OpenGL;	2901	use CFPlus::OpenGL;
2735		2902
2736	our @ISA = CFClient::UI::Bin::;	2903	our @ISA = CFPlus::UI::Bin::;
2737		2904
2738	sub moveto {	2905	sub moveto {
2739	my ($self, $x, $y) = @_;	2906	my ($self, $x, $y) = @_;
2740		2907
2741	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2908	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2769	glPopMatrix;	2936	glPopMatrix;
2770	}	2937	}
2771		2938
2772	#############################################################################	2939	#############################################################################
2773		2940
2774	package CFClient::UI::Flopper;	2941	package CFPlus::UI::Flopper;
2775		2942
2776	our @ISA = CFClient::UI::Button::;	2943	our @ISA = CFPlus::UI::Button::;
2777		2944
2778	sub new {	2945	sub new {
2779	my $class = shift;	2946	my $class = shift;
2780		2947
2781	my $self = $class->SUPER::new (	2948	my $self = $class->SUPER::new (
…		…
2793	$self->{other}->toggle_visibility;	2960	$self->{other}->toggle_visibility;
2794	}	2961	}
2795		2962
2796	#############################################################################	2963	#############################################################################
2797		2964
2798	package CFClient::UI::Tooltip;	2965	package CFPlus::UI::Tooltip;
2799		2966
2800	our @ISA = CFClient::UI::Bin::;	2967	our @ISA = CFPlus::UI::Bin::;
2801		2968
2802	use CFClient::OpenGL;	2969	use CFPlus::OpenGL;
2803		2970
2804	sub new {	2971	sub new {
2805	my $class = shift;	2972	my $class = shift;
2806		2973
2807	$class->SUPER::new (	2974	$class->SUPER::new (
…		…
2810	)	2977	)
2811	}	2978	}
2812		2979
2813	sub set_tooltip_from {	2980	sub set_tooltip_from {
2814	my ($self, $widget) = @_;	2981	my ($self, $widget) = @_;
		2982
		2983	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		2984	if $widget->{tooltip} =~ /^#(.*)$/;
2815		2985
2816	my $tooltip = $widget->{tooltip};	2986	my $tooltip = $widget->{tooltip};
2817		2987
2818	if ($ENV{CFPLUS_DEBUG} & 2) {	2988	if ($ENV{CFPLUS_DEBUG} & 2) {
2819	$tooltip .= "\n\n" . (ref $widget) . "\n"	2989	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2823	}	2993	}
2824		2994
2825	$tooltip =~ s/^\n+//;	2995	$tooltip =~ s/^\n+//;
2826	$tooltip =~ s/\n+$//;	2996	$tooltip =~ s/\n+$//;
2827		2997
2828	$self->add (new CFClient::UI::Label	2998	$self->add (new CFPlus::UI::Label
2829	markup => $tooltip,	2999	markup => $tooltip,
2830	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3000	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2831	fontsize => 0.8,	3001	fontsize => 0.8,
2832	fg => [0, 0, 0, 1],	3002	fg => [0, 0, 0, 1],
2833	ellipsise => 0,	3003	ellipsise => 0,
…		…
2841	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3011	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842		3012
2843	($w + 4, $h + 4)	3013	($w + 4, $h + 4)
2844	}	3014	}
2845		3015
2846	sub size_allocate {	3016	sub invoke_size_allocate {
2847	my ($self, $w, $h) = @_;	3017	my ($self, $w, $h) = @_;
2848		3018
2849	$self->SUPER::size_allocate ($w - 4, $h - 4);	3019	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850	}	3020	}
2851		3021
2852	sub visibility_change {	3022	sub invoke_visibility_change {
2853	my ($self, $visible) = @_;	3023	my ($self, $visible) = @_;
2854		3024
2855	return unless $visible;	3025	return unless $visible;
2856		3026
2857	$self->{root}->on_post_alloc ("move_$self" => sub {	3027	$self->{root}->on_post_alloc ("move_$self" => sub {
2858	my $widget = $self->{owner}	3028	my $widget = $self->{owner}
2859	or return;	3029	or return;
2860		3030
		3031	if ($widget->{visible}) {
2861	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3032	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862		3033
2863	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3034	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864	if $x + $self->{w} > $self->{root}{w};	3035	if $x + $self->{w} > $self->{root}{w};
2865		3036
2866	$self->move_abs ($x, $y);	3037	$self->move_abs ($x, $y);
		3038	} else {
		3039	$self->hide;
		3040	}
2867	});	3041	});
2868	}	3042	}
2869		3043
2870	sub _draw {	3044	sub _draw {
2871	my ($self) = @_;	3045	my ($self) = @_;
…		…
2895	$self->SUPER::_draw;	3069	$self->SUPER::_draw;
2896	}	3070	}
2897		3071
2898	#############################################################################	3072	#############################################################################
2899		3073
2900	package CFClient::UI::Face;	3074	package CFPlus::UI::Face;
2901		3075
2902	our @ISA = CFClient::UI::Base::;	3076	our @ISA = CFPlus::UI::DrawBG::;
2903		3077
2904	use CFClient::OpenGL;	3078	use CFPlus::OpenGL;
2905		3079
2906	sub new {	3080	sub new {
2907	my $class = shift;	3081	my $class = shift;
2908		3082
2909	my $self = $class->SUPER::new (	3083	my $self = $class->SUPER::new (
…		…
2944	sub _draw {	3118	sub _draw {
2945	my ($self) = @_;	3119	my ($self) = @_;
2946		3120
2947	return unless $::CONN;	3121	return unless $::CONN;
2948		3122
		3123	$self->SUPER::_draw;
		3124
2949	my $face;	3125	my $face;
2950		3126
2951	if ($self->{frame}) {	3127	if ($self->{frame}) {
2952	my $anim = $::CONN->{anim}[$self->{anim}];	3128	my $anim = $::CONN->{anim}[$self->{anim}];
2953		3129
…		…
2975	$self->SUPER::destroy;	3151	$self->SUPER::destroy;
2976	}	3152	}
2977		3153
2978	#############################################################################	3154	#############################################################################
2979		3155
2980	package CFClient::UI::Buttonbar;	3156	package CFPlus::UI::Buttonbar;
2981		3157
2982	our @ISA = CFClient::UI::HBox::;	3158	our @ISA = CFPlus::UI::HBox::;
2983		3159
2984	# TODO: should actualyl wrap buttons and other goodies.	3160	# TODO: should actualyl wrap buttons and other goodies.
2985		3161
2986	#############################################################################	3162	#############################################################################
2987		3163
2988	package CFClient::UI::Menu;	3164	package CFPlus::UI::Menu;
2989		3165
2990	our @ISA = CFClient::UI::FancyFrame::;	3166	our @ISA = CFPlus::UI::FancyFrame::;
2991		3167
2992	use CFClient::OpenGL;	3168	use CFPlus::OpenGL;
2993		3169
2994	sub new {	3170	sub new {
2995	my $class = shift;	3171	my $class = shift;
2996		3172
2997	my $self = $class->SUPER::new (	3173	my $self = $class->SUPER::new (
2998	items => [],	3174	items => [],
2999	z => 100,	3175	z => 100,
3000	@_,	3176	@_,
3001	);	3177	);
3002		3178
3003	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3179	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3004		3180
3005	for my $item (@{ $self->{items} }) {	3181	for my $item (@{ $self->{items} }) {
3006	my ($widget, $cb, $tooltip) = @$item;	3182	my ($widget, $cb, $tooltip) = @$item;
3007		3183
3008	# handle various types of items, only text for now	3184	# handle various types of items, only text for now
3009	if (!ref $widget) {	3185	if (!ref $widget) {
		3186	if ($widget =~ /\t/) {
		3187	my ($left, $right) = split /\t/, $widget, 2;
		3188
3010	$widget = new CFClient::UI::Label	3189	$widget = new CFPlus::UI::HBox
3011	can_hover => 1,	3190	can_hover => 1,
3012	can_events => 1,	3191	can_events => 1,
		3192	tooltip => $tooltip,
		3193	children => [
		3194	(new CFPlus::UI::Label markup => $left, expand => 1),
		3195	(new CFPlus::UI::Label markup => $right, align => +1),
		3196	],
		3197	;
		3198
		3199	} else {
		3200	$widget = new CFPlus::UI::Label
		3201	can_hover => 1,
		3202	can_events => 1,
3013	markup => $widget,	3203	markup => $widget,
3014	tooltip => $tooltip	3204	tooltip => $tooltip;
		3205	}
3015	}	3206	}
3016		3207
3017	$self->{item}{$widget} = $item;	3208	$self->{item}{$widget} = $item;
3018		3209
3019	$self->{vbox}->add ($widget);	3210	$self->{vbox}->add ($widget);
…		…
3024		3215
3025	# popup given the event (must be a mouse button down event currently)	3216	# popup given the event (must be a mouse button down event currently)
3026	sub popup {	3217	sub popup {
3027	my ($self, $ev) = @_;	3218	my ($self, $ev) = @_;
3028		3219
3029	$self->_emit ("popdown");	3220	$self->emit ("popdown");
3030		3221
3031	# maybe save $GRAB? must be careful about events...	3222	# maybe save $GRAB? must be careful about events...
3032	$GRAB = $self;	3223	$GRAB = $self;
3033	$self->{button} = $ev->{button};	3224	$self->{button} = $ev->{button};
3034		3225
3035	$self->show;	3226	$self->show;
3036	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3227	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037	}	3228	}
3038		3229
3039	sub mouse_motion {	3230	sub invoke_mouse_motion {
3040	my ($self, $ev, $x, $y) = @_;	3231	my ($self, $ev, $x, $y) = @_;
3041		3232
3042	# TODO: should use vbox->find_widget or so	3233	# TODO: should use vbox->find_widget or so
3043	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3234	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044	$self->{hover} = $self->{item}{$HOVER};	3235	$self->{hover} = $self->{item}{$HOVER};
3045		3236
3046	0	3237	0
3047	}	3238	}
3048		3239
3049	sub button_up {	3240	sub invoke_button_up {
3050	my ($self, $ev, $x, $y) = @_;	3241	my ($self, $ev, $x, $y) = @_;
3051		3242
3052	if ($ev->{button} == $self->{button}) {	3243	if ($ev->{button} == $self->{button}) {
3053	undef $GRAB;	3244	undef $GRAB;
3054	$self->hide;	3245	$self->hide;
3055		3246
3056	$self->_emit ("popdown");	3247	$self->emit ("popdown");
3057	$self->{hover}[1]->() if $self->{hover};	3248	$self->{hover}[1]->() if $self->{hover};
3058	} else {	3249	} else {
3059	return 0	3250	return 0
3060	}	3251	}
3061		3252
3062	1	3253	1
3063	}	3254	}
3064		3255
3065	#############################################################################	3256	#############################################################################
3066		3257
3067	package CFClient::UI::Multiplexer;	3258	package CFPlus::UI::Multiplexer;
3068		3259
3069	our @ISA = CFClient::UI::Container::;	3260	our @ISA = CFPlus::UI::Container::;
3070		3261
3071	sub new {	3262	sub new {
3072	my $class = shift;	3263	my $class = shift;
3073		3264
3074	my $self = $class->SUPER::new (	3265	my $self = $class->SUPER::new (
…		…
3088		3279
3089	$self->{current} = $self->{children}[0]	3280	$self->{current} = $self->{children}[0]
3090	if @{ $self->{children} };	3281	if @{ $self->{children} };
3091	}	3282	}
3092		3283
		3284	sub get_current_page {
		3285	my ($self) = @_;
		3286
		3287	$self->{current}
		3288	}
		3289
3093	sub set_current_page {	3290	sub set_current_page {
3094	my ($self, $page_or_widget) = @_;	3291	my ($self, $page_or_widget) = @_;
3095		3292
3096	my $widget = ref $page_or_widget	3293	my $widget = ref $page_or_widget
3097	? $page_or_widget	3294	? $page_or_widget
3098	: $self->{children}[$page_or_widget];	3295	: $self->{children}[$page_or_widget];
3099		3296
3100	$self->{current} = $widget;	3297	$self->{current} = $widget;
3101	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3298	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102		3299
3103	$self->_emit (page_changed => $self->{current});	3300	$self->emit (page_changed => $self->{current});
3104		3301
3105	$self->realloc;	3302	$self->realloc;
3106	}	3303	}
3107		3304
3108	sub visible_children {	3305	sub visible_children {
…		…
3113	my ($self) = @_;	3310	my ($self) = @_;
3114		3311
3115	$self->{current}->size_request	3312	$self->{current}->size_request
3116	}	3313	}
3117		3314
3118	sub size_allocate {	3315	sub invoke_size_allocate {
3119	my ($self, $w, $h) = @_;	3316	my ($self, $w, $h) = @_;
3120		3317
3121	$self->{current}->configure (0, 0, $w, $h);	3318	$self->{current}->configure (0, 0, $w, $h);
		3319
		3320	1
3122	}	3321	}
3123		3322
3124	sub _draw {	3323	sub _draw {
3125	my ($self) = @_;	3324	my ($self) = @_;
3126		3325
3127	$self->{current}->draw;	3326	$self->{current}->draw;
3128	}	3327	}
3129		3328
3130	#############################################################################	3329	#############################################################################
3131		3330
3132	package CFClient::UI::Notebook;	3331	package CFPlus::UI::Notebook;
3133		3332
3134	our @ISA = CFClient::UI::VBox::;	3333	our @ISA = CFPlus::UI::VBox::;
3135		3334
3136	sub new {	3335	sub new {
3137	my $class = shift;	3336	my $class = shift;
3138		3337
3139	my $self = $class->SUPER::new (	3338	my $self = $class->SUPER::new (
3140	buttonbar => (new CFClient::UI::Buttonbar),	3339	buttonbar => (new CFPlus::UI::Buttonbar),
3141	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3340	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3142	# filter => # will be put between multiplexer and $self	3341	# filter => # will be put between multiplexer and $self
3143	@_,	3342	@_,
3144	);	3343	);
3145		3344
3146	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3345	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3152	sub add {	3351	sub add {
3153	my ($self, $title, $widget, $tooltip) = @_;	3352	my ($self, $title, $widget, $tooltip) = @_;
3154		3353
3155	Scalar::Util::weaken $self;	3354	Scalar::Util::weaken $self;
3156		3355
3157	$self->{buttonbar}->add (new CFClient::UI::Button	3356	$self->{buttonbar}->add (new CFPlus::UI::Button
3158	markup => $title,	3357	markup => $title,
3159	tooltip => $tooltip,	3358	tooltip => $tooltip,
3160	on_activate => sub { $self->set_current_page ($widget) },	3359	on_activate => sub { $self->set_current_page ($widget) },
3161	);	3360	);
3162		3361
3163	$self->{multiplexer}->add ($widget);	3362	$self->{multiplexer}->add ($widget);
3164	}	3363	}
3165		3364
		3365	sub get_current_page {
		3366	my ($self) = @_;
		3367
		3368	$self->{multiplexer}->get_current_page
		3369	}
		3370
3166	sub set_current_page {	3371	sub set_current_page {
3167	my ($self, $page) = @_;	3372	my ($self, $page) = @_;
3168		3373
3169	$self->{multiplexer}->set_current_page ($page);	3374	$self->{multiplexer}->set_current_page ($page);
3170	$self->_emit (page_changed => $self->{multiplexer}{current});	3375	$self->emit (page_changed => $self->{multiplexer}{current});
3171	}	3376	}
3172		3377
3173	#############################################################################	3378	#############################################################################
3174		3379
3175	package CFClient::UI::Combobox;	3380	package CFPlus::UI::Selector;
3176		3381
3177	use utf8;	3382	use utf8;
3178		3383
3179	our @ISA = CFClient::UI::Button::;	3384	our @ISA = CFPlus::UI::Button::;
3180		3385
3181	sub new {	3386	sub new {
3182	my $class = shift;	3387	my $class = shift;
3183		3388
3184	my $self = $class->SUPER::new (	3389	my $self = $class->SUPER::new (
…		…
3190	$self->_set_value ($self->{value});	3395	$self->_set_value ($self->{value});
3191		3396
3192	$self	3397	$self
3193	}	3398	}
3194		3399
3195	sub button_down {	3400	sub invoke_button_down {
3196	my ($self, $ev) = @_;	3401	my ($self, $ev) = @_;
3197		3402
3198	my @menu_items;	3403	my @menu_items;
3199		3404
3200	for (@{ $self->{options} }) {	3405	for (@{ $self->{options} }) {
3201	my ($value, $title, $tooltip) = @$_;	3406	my ($value, $title, $tooltip) = @$_;
3202		3407
3203	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3408	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204	}	3409	}
3205		3410
3206	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3411	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207	}	3412	}
3208		3413
3209	sub _set_value {	3414	sub _set_value {
3210	my ($self, $value) = @_;	3415	my ($self, $value) = @_;
3211		3416
…		…
3221	my ($self, $value) = @_;	3426	my ($self, $value) = @_;
3222		3427
3223	return unless $self->{value} ne $value;	3428	return unless $self->{value} ne $value;
3224		3429
3225	$self->_set_value ($value);	3430	$self->_set_value ($value);
3226	$self->_emit (changed => $value);	3431	$self->emit (changed => $value);
3227	}	3432	}
3228		3433
3229	#############################################################################	3434	#############################################################################
3230		3435
3231	package CFClient::UI::Statusbox;	3436	package CFPlus::UI::Statusbox;
3232		3437
3233	our @ISA = CFClient::UI::VBox::;	3438	our @ISA = CFPlus::UI::VBox::;
3234		3439
3235	sub new {	3440	sub new {
3236	my $class = shift;	3441	my $class = shift;
3237		3442
3238	my $self = $class->SUPER::new (	3443	my $self = $class->SUPER::new (
…		…
3250	sub reorder {	3455	sub reorder {
3251	my ($self) = @_;	3456	my ($self) = @_;
3252	my $NOW = Time::HiRes::time;	3457	my $NOW = Time::HiRes::time;
3253		3458
3254	# freeze display when hovering over any label	3459	# freeze display when hovering over any label
3255	return if $CFClient::UI::TOOLTIP->{owner}	3460	return if $CFPlus::UI::TOOLTIP->{owner}
3256	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3461	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3257	values %{ $self->{item} };	3462	values %{ $self->{item} };
3258		3463
3259	while (my ($k, $v) = each %{ $self->{item} }) {	3464	while (my ($k, $v) = each %{ $self->{item} }) {
3260	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3465	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3261	}	3466	}
…		…
3282	for ($short) {	3487	for ($short) {
3283	s/^\s+//;	3488	s/^\s+//;
3284	s/\s+/ /g;	3489	s/\s+/ /g;
3285	}	3490	}
3286		3491
3287	new CFClient::UI::Label	3492	new CFPlus::UI::Label
3288	markup => $short,	3493	markup => $short,
3289	tooltip => $item->{tooltip},	3494	tooltip => $item->{tooltip},
3290	tooltip_font => $::FONT_PROP,	3495	tooltip_font => $::FONT_PROP,
3291	tooltip_width => 0.67,	3496	tooltip_width => 0.67,
3292	fontsize => $item->{fontsize} || $self->{fontsize},	3497	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3346	count => 1,	3551	count => 1,
3347	%arg,	3552	%arg,
3348	};	3553	};
3349	}	3554	}
3350		3555
		3556	$ROOT->on_refresh (reorder => sub {
3351	$self->reorder;	3557	$self->reorder;
		3558	});
3352	}	3559	}
3353		3560
3354	sub reconfigure {	3561	sub reconfigure {
3355	my ($self) = @_;	3562	my ($self) = @_;
3356		3563
…		…
3369	$self->SUPER::destroy;	3576	$self->SUPER::destroy;
3370	}	3577	}
3371		3578
3372	#############################################################################	3579	#############################################################################
3373		3580
3374	package CFClient::UI::Inventory;	3581	package CFPlus::UI::Inventory;
3375		3582
3376	our @ISA = CFClient::UI::ScrolledWindow::;	3583	our @ISA = CFPlus::UI::Table::;
3377		3584
3378	sub new {	3585	sub new {
3379	my $class = shift;	3586	my $class = shift;
3380		3587
3381	my $self = $class->SUPER::new (	3588	my $self = $class->SUPER::new (
3382	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3589	col_expand => [0, 1, 0],
		3590	items => [],
3383	@_,	3591	@_,
3384	);	3592	);
3385		3593
		3594	$self->set_sort_order (undef);
		3595
3386	$self	3596	$self
		3597	}
		3598
		3599	sub update_items {
		3600	my ($self) = @_;
		3601
		3602	$self->clear;
		3603
		3604	my @item = $self->{sort}->(@{ $self->{items} });
		3605
		3606	my @adds;
		3607	my $row = 0;
		3608	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3609	CFPlus::Item::update_widgets $item;
		3610
		3611	push @adds, 0, $row, $item->{face_widget};
		3612	push @adds, 1, $row, $item->{desc_widget};
		3613	push @adds, 2, $row, $item->{weight_widget};
		3614
		3615	$row++;
		3616	}
		3617
		3618	$self->add (@adds);
		3619	}
		3620
		3621	sub set_sort_order {
		3622	my ($self, $order) = @_;
		3623
		3624	$self->{sort} = $order ||= sub {
		3625	sort {
		3626	$a->{type} <=> $b->{type}
		3627	or $a->{name} cmp $b->{name}
		3628	} @_
		3629	};
		3630
		3631	$self->update_items;
3387	}	3632	}
3388		3633
3389	sub set_items {	3634	sub set_items {
3390	my ($self, $items) = @_;	3635	my ($self, $items) = @_;
3391		3636
3392	$self->{child}->clear;	3637	$self->{items} = [$items ? values %$items : ()];
3393	return unless $items;	3638	$self->update_items;
3394
3395	my @items = sort {
3396	($a->{type} <=> $b->{type})
3397	or ($a->{name} cmp $b->{name})
3398	} @$items;
3399
3400	$self->{real_items} = \@items;
3401
3402	my $row = 0;
3403	for my $item (@items) {
3404	CFClient::Item::update_widgets $item;
3405
3406	$self->{child}->add (0, $row, $item->{face_widget});
3407	$self->{child}->add (1, $row, $item->{desc_widget});
3408	$self->{child}->add (2, $row, $item->{weight_widget});
3409
3410	$row++;
3411	}
3412	}	3639	}
3413		3640
3414	#############################################################################	3641	#############################################################################
3415		3642
3416	package CFClient::UI::BindEditor;
3417
3418	our @ISA = CFClient::UI::FancyFrame::;
3419
3420	sub new {
3421	my $class = shift;
3422
3423	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425	$self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429	text => "start recording",
3430	tooltip => "Start/Stops recording of actions."
3431	."All subsequent actions after the recording started will be captured."
3432	."The actions are displayed after the record was stopped."
3433	."To bind the action you have to click on the 'Bind' button",
3434	on_activate => sub {
3435	unless ($self->{recording}) {
3436	$self->start;
3437	} else {
3438	$self->stop;
3439	}
3440	});
3441
3442	$vb->add (new CFClient::UI::Label text => "Actions:");
3443	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3446	$vb->add (my $hb = new CFClient::UI::HBox);
3447	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448	$hb->add (new CFClient::UI::Button
3449	text => "bind",
3450	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451	on_activate => sub {
3452	$self->ask_for_bind;
3453	});
3454
3455	$vb->add (my $hb = new CFClient::UI::HBox);
3456	$hb->add (new CFClient::UI::Button
3457	text => "ok",
3458	expand => 1,
3459	tooltip => "This closes the binding editor and saves the binding",
3460	on_activate => sub {
3461	$self->hide;
3462	$self->commit;
3463	});
3464
3465	$hb->add (new CFClient::UI::Button
3466	text => "cancel",
3467	expand => 1,
3468	tooltip => "This closes the binding editor without saving",
3469	on_activate => sub {
3470	$self->hide;
3471	$self->{binding_cancel}->()
3472	if $self->{binding_cancel};
3473	});
3474
3475	$self->update_binding_widgets;
3476
3477	$self
3478	}
3479
3480	sub commit {
3481	my ($self) = @_;
3482	my ($mod, $sym, $cmds) = $self->get_binding;
3483	if ($sym != 0 && @$cmds > 0) {
3484	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485	."'. Don't forget 'Save Config'!");
3486	$self->{binding_change}->($mod, $sym, $cmds)
3487	if $self->{binding_change};
3488	} else {
3489	$::STATUSBOX->add ("No action bound, no key or action specified!");
3490	$self->{binding_cancel}->()
3491	if $self->{binding_cancel};
3492	}
3493	}
3494
3495	sub start {
3496	my ($self) = @_;
3497
3498	$self->{rec_btn}->set_text ("stop recording");
3499	$self->{recording} = 1;
3500	$self->clear_command_list;
3501	$::CONN->start_record if $::CONN;
3502	}
3503
3504	sub stop {
3505	my ($self) = @_;
3506
3507	$self->{rec_btn}->set_text ("start recording");
3508	$self->{recording} = 0;
3509
3510	my $rec;
3511	$rec = $::CONN->stop_record if $::CONN;
3512	return unless ref $rec eq 'ARRAY';
3513	$self->set_command_list ($rec);
3514	}
3515
3516
3517	sub ask_for_bind_and_commit {
3518	my ($self) = @_;
3519	$self->ask_for_bind (1);
3520	}
3521
3522	sub ask_for_bind {
3523	my ($self, $commit, $end_cb) = @_;
3524
3525	CFClient::Binder::open_binding_dialog (sub {
3526	my ($mod, $sym) = @_;
3527	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528	$self->update_binding_widgets;
3529	$self->commit if $commit;
3530	$end_cb->() if $end_cb;
3531	});
3532	}
3533
3534	# $mod and $sym are the modifiers and key symbol
3535	# $cmds is a array ref of strings (the commands)
3536	# $cb is the callback that is executed on OK
3537	# $ccb is the callback that is executed on CANCEL and
3538	# when the binding was unsuccessful on OK
3539	sub set_binding {
3540	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542	$self->clear_command_list;
3543	$self->{recording} = 0;
3544	$self->{rec_btn}->set_text ("start recording");
3545
3546	$self->{binding} = [$mod, $sym];
3547	$self->{commands} = $cmds;
3548
3549	$self->{binding_change} = $cb;
3550	$self->{binding_cancel} = $ccb;
3551
3552	$self->update_binding_widgets;
3553	}
3554
3555	# this is a shortcut method that asks for a binding
3556	# and then just binds it.
3557	sub do_quick_binding {
3558	my ($self, $cmds, $end_cb) = @_;
3559	$self->set_binding (undef, undef, $cmds, sub {
3560	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561	});
3562	$self->ask_for_bind (1, $end_cb);
3563	}
3564
3565	sub update_binding_widgets {
3566	my ($self) = @_;
3567	my ($mod, $sym, $cmds) = $self->get_binding;
3568	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569	$self->set_command_list ($cmds);
3570	}
3571
3572	sub get_binding {
3573	my ($self) = @_;
3574	return (
3575	$self->{binding}->[0],
3576	$self->{binding}->[1],
3577	[ grep { defined $_ } @{$self->{commands}} ]
3578	);
3579	}
3580
3581	sub clear_command_list {
3582	my ($self) = @_;
3583	$self->{cmdbox}->clear ();
3584	}
3585
3586	sub set_command_list {
3587	my ($self, $cmds) = @_;
3588
3589	$self->{cmdbox}->clear ();
3590	$self->{commands} = $cmds;
3591
3592	my $idx = 0;
3593
3594	for (@$cmds) {
3595	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597	my $i = $idx;
3598	$hb->add (new CFClient::UI::Label text => $_);
3599	$hb->add (new CFClient::UI::Button
3600	text => "delete",
3601	tooltip => "Deletes the action from the record",
3602	on_activate => sub {
3603	$self->{cmdbox}->remove ($hb);
3604	$cmds->[$i] = undef;
3605	});
3606
3607
3608	$idx++
3609	}
3610	}
3611
3612	#############################################################################
3613
3614	package CFClient::UI::SpellList;	3643	package CFPlus::UI::SpellList;
3615		3644
3616	our @ISA = CFClient::UI::Table::;	3645	our @ISA = CFPlus::UI::Table::;
3617		3646
3618	sub new {	3647	sub new {
3619	my $class = shift;	3648	my $class = shift;
3620		3649
3621	my $self = $class->SUPER::new (	3650	my $self = $class->SUPER::new (
…		…
3639	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3668	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640		3669
3641	sub rebuild_spell_list {	3670	sub rebuild_spell_list {
3642	my ($self) = @_;	3671	my ($self) = @_;
3643		3672
3644	$CFClient::UI::ROOT->on_refresh ($self => sub {	3673	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3645	$self->clear;	3674	$self->clear;
3646		3675
3647	return unless $::CONN;	3676	return unless $::CONN;
3648		3677
3649	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3678	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3679	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3680	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3681	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3682	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654		3683
3655	my $row = 0;	3684	my $row = 0;
3656		3685
3657	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3686	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658	my $spell = $self->{spell}{$_};	3687	my $spell = $self->{spell}{$_};
…		…
3665	if ($ev->{button} == 1) {	3694	if ($ev->{button} == 1) {
3666	$::CONN->user_send ("cast $spell->{name}");	3695	$::CONN->user_send ("cast $spell->{name}");
3667	} elsif ($ev->{button} == 2) {	3696	} elsif ($ev->{button} == 2) {
3668	$::CONN->user_send ("invoke $spell->{name}");	3697	$::CONN->user_send ("invoke $spell->{name}");
3669	} elsif ($ev->{button} == 3) {	3698	} elsif ($ev->{button} == 3) {
3670	(new CFClient::UI::Menu	3699	(new CFPlus::UI::Menu
3671	items => [	3700	items => [
3672	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3701	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3702	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674	],	3703	],
3675	)->popup ($ev);	3704	)->popup ($ev);
3676	} else {	3705	} else {
3677	return 0;	3706	return 0;
…		…
3681	};	3710	};
3682		3711
3683	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3712	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684		3713
3685	#TODO: add path info to tooltip	3714	#TODO: add path info to tooltip
3686	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3715	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3687		3716
3688	$self->add (0, $row, new CFClient::UI::Face	3717	$self->add (0, $row, new CFPlus::UI::Face
3689	face => $spell->{face},	3718	face => $spell->{face},
3690	can_hover => 1,	3719	can_hover => 1,
3691	can_events => 1,	3720	can_events => 1,
3692	tooltip => $tooltip,	3721	tooltip => $tooltip,
3693	on_button_down => $spell_cb,	3722	on_button_down => $spell_cb,
3694	);	3723	);
3695		3724
3696	$self->add (1, $row, new CFClient::UI::Label	3725	$self->add (1, $row, new CFPlus::UI::Label
3697	expand => 1,	3726	expand => 1,
3698	text => $spell->{name},	3727	text => $spell->{name},
3699	can_hover => 1,	3728	can_hover => 1,
3700	can_events => 1,	3729	can_events => 1,
3701	tooltip => $tooltip,	3730	tooltip => $tooltip,
3702	on_button_down => $spell_cb,	3731	on_button_down => $spell_cb,
3703	);	3732	);
3704		3733
3705	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3734	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3735	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3736	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3737	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709	}	3738	}
3710	});	3739	});
3711	}	3740	}
3712		3741
3713	sub add_spell {	3742	sub add_spell {
…		…
3731	$self->rebuild_spell_list;	3760	$self->rebuild_spell_list;
3732	}	3761	}
3733		3762
3734	#############################################################################	3763	#############################################################################
3735		3764
3736	package CFClient::UI::Root;	3765	package CFPlus::UI::Root;
3737		3766
3738	our @ISA = CFClient::UI::Container::;	3767	our @ISA = CFPlus::UI::Container::;
3739		3768
3740	use List::Util qw(min max);	3769	use List::Util qw(min max);
3741		3770
3742	use CFClient::OpenGL;	3771	use CFPlus::OpenGL;
3743		3772
3744	sub new {	3773	sub new {
3745	my $class = shift;	3774	my $class = shift;
3746		3775
3747	my $self = $class->SUPER::new (	3776	my $self = $class->SUPER::new (
…		…
3772	$coord = $max - $size if $coord > $max - $size;	3801	$coord = $max - $size if $coord > $max - $size;
3773		3802
3774	int $coord + 0.5	3803	int $coord + 0.5
3775	}	3804	}
3776		3805
3777	sub size_allocate {	3806	sub invoke_size_allocate {
3778	my ($self, $w, $h) = @_;	3807	my ($self, $w, $h) = @_;
3779		3808
3780	for my $child ($self->children) {	3809	for my $child ($self->children) {
3781	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3810	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3782		3811
…		…
3786	$X = _to_pixel $X, $W, $self->{w};	3815	$X = _to_pixel $X, $W, $self->{w};
3787	$Y = _to_pixel $Y, $H, $self->{h};	3816	$Y = _to_pixel $Y, $H, $self->{h};
3788		3817
3789	$child->configure ($X, $Y, $W, $H);	3818	$child->configure ($X, $Y, $W, $H);
3790	}	3819	}
		3820
		3821	1
3791	}	3822	}
3792		3823
3793	sub coord2local {	3824	sub coord2local {
3794	my ($self, $x, $y) = @_;	3825	my ($self, $x, $y) = @_;
3795		3826
…		…
3921	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3952	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3922		3953
3923	$w = 0 if $w < 0;	3954	$w = 0 if $w < 0;
3924	$h = 0 if $h < 0;	3955	$h = 0 if $h < 0;
3925		3956
		3957	$w = max $widget->{min_w}, $w;
		3958	$h = max $widget->{min_h}, $h;
		3959
		3960	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3961	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3962
		3963	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3964	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3965
3926	$w = int $w + 0.5;	3966	$w = int $w + 0.5;
3927	$h = int $h + 0.5;	3967	$h = int $h + 0.5;
3928		3968
3929	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3969	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930	$widget->{old_w} = $widget->{w};	3970	$widget->{old_w} = $widget->{w};
…		…
3953	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3993	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3954	glMatrixMode GL_MODELVIEW;	3994	glMatrixMode GL_MODELVIEW;
3955	glLoadIdentity;	3995	glLoadIdentity;
3956		3996
3957	{	3997	{
3958	package CFClient::UI::Base;	3998	package CFPlus::UI::Base;
3959		3999
3960	($draw_x, $draw_y, $draw_w, $draw_h) =	4000	($draw_x, $draw_y, $draw_w, $draw_h) =
3961	(0, 0, $self->{w}, $self->{h});	4001	(0, 0, $self->{w}, $self->{h});
3962	}	4002	}
3963		4003
3964	$self->_draw;	4004	$self->_draw;
3965	}	4005	}
3966		4006
3967	#############################################################################	4007	#############################################################################
3968		4008
3969	package CFClient::UI;	4009	package CFPlus::UI;
3970		4010
3971	$ROOT = new CFClient::UI::Root;	4011	$ROOT = new CFPlus::UI::Root;
3972	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4012	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3973		4013
3974	1	4014	1
3975		4015

Diff Legend

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