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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 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 do not like duplication
		520	# and needlessly verbose code, either.
		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	if ($self->{tooltip} =~ /Apply.*audio/) {
		529	warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
		530	warn "3 $self->{parent}\n";#d#
		531	}
		532
		533	#d##TODO# stop propagating at first true, do not use sum
		534	my $res =
		535	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
		536	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
		537	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
		538	;
		539	if ($self->{tooltip} =~ /Apply.*audio/) {
		540	warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
		541	warn "5 $self->{parent}\n";#d#
		542	}
		543
		544	$res
463	}	545	}
464		546
465	sub find_widget {	547	sub find_widget {
466	my ($self, $x, $y) = @_;	548	my ($self, $x, $y) = @_;
467		549
…		…
477	sub set_parent {	559	sub set_parent {
478	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
479		561
480	Scalar::Util::weaken ($self->{parent} = $parent);	562	Scalar::Util::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	563	$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	}	564	}
506		565
507	sub realloc {	566	sub realloc {
508	my ($self) = @_;	567	my ($self) = @_;
509		568
…		…
542	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
543		602
544	# update screen rectangle	603	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};	604	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};	605	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549		606
550	# skip widgets that are entirely outside the drawing area	607	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553		610
…		…
576	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
577	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
578	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
579	glEnd;	636	glEnd;
580	glPopMatrix;	637	glPopMatrix;
581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582	}	639	}
583		640
584	$self->_draw;	641	$self->_draw;
585	glPopMatrix;	642	glPopMatrix;
586	}	643	}
…		…
592	}	649	}
593		650
594	sub DESTROY {	651	sub DESTROY {
595	my ($self) = @_;	652	my ($self) = @_;
596		653
		654	return if CFPlus::in_destruct;
		655
597	delete $WIDGET{$self+0};	656	delete $WIDGET{$self+0};
598		657
599	eval { $self->destroy };	658	eval { $self->destroy };
600	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
601	}	660	}
602		661
603	#############################################################################	662	#############################################################################
604		663
605	package CFClient::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
606		665
607	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
608		667
609	use strict;	668	use strict;
610	use CFClient::OpenGL;	669	use CFPlus::OpenGL;
611		670
612	sub new {	671	sub new {
613	my $class = shift;	672	my $class = shift;
614		673
615	# range [value, low, high, page]	674	# range [value, low, high, page]
…		…
646	}	705	}
647	}	706	}
648		707
649	#############################################################################	708	#############################################################################
650		709
651	package CFClient::UI::Empty;	710	package CFPlus::UI::Empty;
652		711
653	our @ISA = CFClient::UI::Base::;	712	our @ISA = CFPlus::UI::Base::;
654		713
655	sub new {	714	sub new {
656	my ($class, %arg) = @_;	715	my ($class, %arg) = @_;
657	$class->SUPER::new (can_events => 0, %arg);	716	$class->SUPER::new (can_events => 0, %arg);
658	}	717	}
…		…
665		724
666	sub draw { }	725	sub draw { }
667		726
668	#############################################################################	727	#############################################################################
669		728
670	package CFClient::UI::Container;	729	package CFPlus::UI::Container;
671		730
672	our @ISA = CFClient::UI::Base::;	731	our @ISA = CFPlus::UI::Base::;
673		732
674	sub new {	733	sub new {
675	my ($class, %arg) = @_;	734	my ($class, %arg) = @_;
676		735
677	my $children = delete $arg{children};	736	my $children = delete $arg{children};
…		…
686	if $children;	745	if $children;
687		746
688	$self	747	$self
689	}	748	}
690		749
		750	sub realloc {
		751	my ($self) = @_;
		752
		753	$self->{force_realloc} = 1;
		754	$self->{force_size_alloc} = 1;
		755	$self->SUPER::realloc;
		756	}
		757
691	sub add {	758	sub add {
692	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
693		760
694	$_->set_parent ($self)	761	$_->set_parent ($self)
695	for @widgets;	762	for @widgets;
…		…
755	$_->draw for @{$self->{children}};	822	$_->draw for @{$self->{children}};
756	}	823	}
757		824
758	#############################################################################	825	#############################################################################
759		826
760	package CFClient::UI::Bin;	827	package CFPlus::UI::Bin;
761		828
762	our @ISA = CFClient::UI::Container::;	829	our @ISA = CFPlus::UI::Container::;
763		830
764	sub new {	831	sub new {
765	my ($class, %arg) = @_;	832	my ($class, %arg) = @_;
766		833
767	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	834	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768		835
769	$class->SUPER::new (children => [$child], %arg)	836	$class->SUPER::new (children => [$child], %arg)
770	}	837	}
771		838
772	sub add {	839	sub add {
…		…
779	sub remove {	846	sub remove {
780	my ($self, $widget) = @_;	847	my ($self, $widget) = @_;
781		848
782	$self->SUPER::remove ($widget);	849	$self->SUPER::remove ($widget);
783		850
784	$self->{children} = [new CFClient::UI::Empty]	851	$self->{children} = [new CFPlus::UI::Empty]
785	unless @{$self->{children}};	852	unless @{$self->{children}};
786	}	853	}
787		854
788	sub child { $_[0]->{children}[0] }	855	sub child { $_[0]->{children}[0] }
789		856
790	sub size_request {	857	sub size_request {
791	$_[0]{children}[0]->size_request	858	$_[0]{children}[0]->size_request
792	}	859	}
793		860
794	sub size_allocate {	861	sub invoke_size_allocate {
795	my ($self, $w, $h) = @_;	862	my ($self, $w, $h) = @_;
796		863
797	$self->{children}[0]->configure (0, 0, $w, $h);	864	$self->{children}[0]->configure (0, 0, $w, $h);
		865
		866	1
798	}	867	}
799		868
800	#############################################################################	869	#############################################################################
801		870
802	# back-buffered drawing area	871	# back-buffered drawing area
803		872
804	package CFClient::UI::Window;	873	package CFPlus::UI::Window;
805		874
806	our @ISA = CFClient::UI::Bin::;	875	our @ISA = CFPlus::UI::Bin::;
807		876
808	use CFClient::OpenGL;	877	use CFPlus::OpenGL;
809		878
810	sub new {	879	sub new {
811	my ($class, %arg) = @_;	880	my ($class, %arg) = @_;
812		881
813	my $self = $class->SUPER::new (%arg);	882	my $self = $class->SUPER::new (%arg);
…		…
818		887
819	$ROOT->on_post_alloc ($self => sub { $self->render_child });	888	$ROOT->on_post_alloc ($self => sub { $self->render_child });
820	$self->SUPER::update;	889	$self->SUPER::update;
821	}	890	}
822		891
823	sub size_allocate {	892	sub invoke_size_allocate {
824	my ($self, $w, $h) = @_;	893	my ($self, $w, $h) = @_;
825		894
826	$self->SUPER::size_allocate ($w, $h);
827	$self->update;	895	$self->update;
		896
		897	$self->SUPER::invoke_size_allocate ($w, $h)
828	}	898	}
829		899
830	sub _render {	900	sub _render {
831	my ($self) = @_;	901	my ($self) = @_;
832		902
…		…
834	}	904	}
835		905
836	sub render_child {	906	sub render_child {
837	my ($self) = @_;	907	my ($self) = @_;
838		908
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	909	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	910	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	911	glClear GL_COLOR_BUFFER_BIT;
842		912
843	{	913	{
844	package CFClient::UI::Base;	914	package CFPlus::UI::Base;
845		915
846	($draw_x, $draw_y, $draw_w, $draw_h) =	916	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	917	(0, 0, $self->{w}, $self->{h});
		918
		919	$self->_render;
848	}	920	}
849
850	$self->_render;
851	};	921	};
852	}	922	}
853		923
854	sub _draw {	924	sub _draw {
855	my ($self) = @_;	925	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		926
859	my $tex = $self->{texture}	927	my $tex = $self->{texture}
860	or return;	928	or return;
861		929
862	glEnable GL_TEXTURE_2D;	930	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	931	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	932	glColor 0, 0, 0, 1;
865		933
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	934	$tex->draw_quad_alpha_premultiplied (0, 0);
867		935
868	glDisable GL_TEXTURE_2D;	936	glDisable GL_TEXTURE_2D;
869	}	937	}
870		938
871	#############################################################################	939	#############################################################################
872		940
873	package CFClient::UI::ViewPort;	941	package CFPlus::UI::ViewPort;
874		942
875	our @ISA = CFClient::UI::Window::;	943	our @ISA = CFPlus::UI::Window::;
876		944
877	sub new {	945	sub new {
878	my $class = shift;	946	my $class = shift;
879		947
880	$class->SUPER::new (	948	$class->SUPER::new (
…		…
893	$h = 10 if $self->{scroll_y};	961	$h = 10 if $self->{scroll_y};
894		962
895	($w, $h)	963	($w, $h)
896	}	964	}
897		965
898	sub size_allocate {	966	sub invoke_size_allocate {
899	my ($self, $w, $h) = @_;	967	my ($self, $w, $h) = @_;
900		968
901	my $child = $self->child;	969	my $child = $self->child;
902		970
903	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	971	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	972	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905		973
906	$self->child->configure (0, 0, $w, $h);	974	$self->child->configure (0, 0, $w, $h);
907	$self->update;	975	$self->update;
		976
		977	1
908	}	978	}
909		979
910	sub set_offset {	980	sub set_offset {
911	my ($self, $x, $y) = @_;	981	my ($self, $x, $y) = @_;
912		982
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1008	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1009	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1010	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1011	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1012	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1013	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1014	}
945	}	1015	}
946		1016
947	sub _render {	1017	sub _render {
948	my ($self) = @_;	1018	my ($self) = @_;
949		1019
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1020	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};	1021	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1022
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1023	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1024
955	$self->SUPER::_render;	1025	$self->SUPER::_render;
956	}	1026	}
957		1027
958	#############################################################################	1028	#############################################################################
959		1029
960	package CFClient::UI::ScrolledWindow;	1030	package CFPlus::UI::ScrolledWindow;
961		1031
962	our @ISA = CFClient::UI::HBox::;	1032	our @ISA = CFPlus::UI::HBox::;
963		1033
964	sub new {	1034	sub new {
965	my ($class, %arg) = @_;	1035	my ($class, %arg) = @_;
966		1036
967	my $child = delete $arg{child};	1037	my $child = delete $arg{child};
968		1038
969	my $self;	1039	my $self;
970		1040
971	my $slider = new CFClient::UI::Slider	1041	my $slider = new CFPlus::UI::Slider
972	vertical => 1,	1042	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1044	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1045	$self->{vp}->set_offset (0, $_[1]);
976	},	1046	},
977	;	1047	;
978		1048
979	$self = $class->SUPER::new (	1049	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1050	vp => (new CFPlus::UI::ViewPort expand => 1),
		1051	can_events => 1,
981	slider => $slider,	1052	slider => $slider,
982	%arg,	1053	%arg,
983	);	1054	);
984		1055
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1056	$self->SUPER::add ($self->{vp}, $self->{slider});
986	$self->add ($child) if $child;	1057	$self->add ($child) if $child;
987		1058
988	$self	1059	$self
989	}	1060	}
990		1061
		1062	#TODO# update range on size_allocate depending on child
		1063
991	sub add {	1064	sub add {
992	my ($self, $widget) = @_;	1065	my ($self, $widget) = @_;
993		1066
994	$self->{vp}->add ($self->{child} = $widget);	1067	$self->{vp}->add ($self->{child} = $widget);
995	}	1068	}
996		1069
		1070	sub invoke_mouse_wheel {
		1071	my ($self, $ev) = @_;
		1072
		1073	return 0 unless $ev->{dy}; # only vertical movements
		1074
		1075	$self->{slider}->emit (mouse_wheel => $ev);
		1076
		1077	1
		1078	}
		1079
		1080	sub update_slider {
		1081	my ($self) = @_;
		1082
		1083	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1084	}
		1085
997	sub update {	1086	sub update {
998	my ($self) = @_;	1087	my ($self) = @_;
999		1088
1000	$self->SUPER::update;	1089	$self->SUPER::update;
1001		1090
1002	# todo: overwrite size_allocate of child	1091	$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	}	1092	}
1006		1093
1007	sub size_allocate {	1094	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1095	my ($self, $w, $h) = @_;
1009		1096
		1097	$self->update_slider;
		1098
1010	$self->SUPER::size_allocate ($w, $h);	1099	$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	}	1100	}
1015
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018		1101
1019	#############################################################################	1102	#############################################################################
1020		1103
1021	package CFClient::UI::Frame;	1104	package CFPlus::UI::Frame;
1022		1105
1023	our @ISA = CFClient::UI::Bin::;	1106	our @ISA = CFPlus::UI::Bin::;
1024		1107
1025	use CFClient::OpenGL;	1108	use CFPlus::OpenGL;
1026		1109
1027	sub new {	1110	sub new {
1028	my $class = shift;	1111	my $class = shift;
1029		1112
1030	$class->SUPER::new (	1113	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1139	$self->SUPER::_draw;
1057	}	1140	}
1058		1141
1059	#############################################################################	1142	#############################################################################
1060		1143
1061	package CFClient::UI::FancyFrame;	1144	package CFPlus::UI::FancyFrame;
1062		1145
1063	our @ISA = CFClient::UI::Bin::;	1146	our @ISA = CFPlus::UI::Bin::;
1064		1147
1065	use CFClient::OpenGL;	1148	use CFPlus::OpenGL;
		1149
		1150	sub new {
		1151	my ($class, %arg) = @_;
		1152
		1153	if ((exists $arg{label}) && !ref $arg{label}) {
		1154	$arg{label} = new CFPlus::UI::Label
		1155	align => 1,
		1156	valign => 0,
		1157	text => $arg{label},
		1158	fontsize => ($arg{border} || 0.8) * 0.75;
		1159	}
		1160
		1161	my $self = $class->SUPER::new (
		1162	# label => "",
		1163	fg => [0.6, 0.3, 0.1],
		1164	border => 0.8,
		1165	style => 'single',
		1166	%arg,
		1167	);
		1168
		1169	$self
		1170	}
		1171
		1172	sub add {
		1173	my ($self, @widgets) = @_;
		1174
		1175	$self->SUPER::add (@widgets);
		1176	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1177	}
		1178
		1179	sub border {
		1180	int $_[0]{border} * $::FONTSIZE
		1181	}
		1182
		1183	sub size_request {
		1184	my ($self) = @_;
		1185
		1186	($self->{label_w}, undef) = $self->{label}->size_request
		1187	if $self->{label};
		1188
		1189	my ($w, $h) = $self->SUPER::size_request;
		1190
		1191	(
		1192	$w + $self->border * 2,
		1193	$h + $self->border * 2,
		1194	)
		1195	}
		1196
		1197	sub invoke_size_allocate {
		1198	my ($self, $w, $h) = @_;
		1199
		1200	my $border = $self->border;
		1201
		1202	$w -= List::Util::max 0, $border * 2;
		1203	$h -= List::Util::max 0, $border * 2;
		1204
		1205	if (my $label = $self->{label}) {
		1206	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1207	$label->{h} = List::Util::min $h, $border;
		1208	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1209	}
		1210
		1211	$self->child->configure ($border, $border, $w, $h);
		1212
		1213	1
		1214	}
		1215
		1216	sub _draw {
		1217	my ($self) = @_;
		1218
		1219	my $child = $self->{children}[0];
		1220
		1221	my $border = $self->border;
		1222	my ($w, $h) = ($self->{w}, $self->{h});
		1223
		1224	$child->draw;
		1225
		1226	glColor @{$self->{fg}};
		1227	glBegin GL_LINE_STRIP;
		1228	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1229	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1230	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1231	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1232	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1233	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1234	glEnd;
		1235
		1236	if ($self->{label}) {
		1237	glTranslate $border * 2, 0;
		1238	$self->{label}->_draw;
		1239	}
		1240	}
		1241
		1242	#############################################################################
		1243
		1244	package CFPlus::UI::Toplevel;
		1245
		1246	our @ISA = CFPlus::UI::Bin::;
		1247
		1248	use CFPlus::OpenGL;
1066		1249
1067	my $bg =	1250	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1251	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1252	mipmap => 1, wrap => 1;
1070		1253
1071	my @border =	1254	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1255	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);	1256	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074		1257
1075	sub new {	1258	sub new {
1076	my ($class, %arg) = @_;	1259	my ($class, %arg) = @_;
1077		1260
1078	my $self = $class->SUPER::new (	1261	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1262	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1263	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1264	border => 0.6,
1082	can_events => 1,	1265	can_events => 1,
1083	min_w => 16,	1266	min_w => 64,
1084	min_h => 16,	1267	min_h => 32,
1085	%arg,	1268	%arg,
1086	);	1269	);
1087		1270
1088	$self->{title_widget} = new CFClient::UI::Label	1271	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1272	align => 0,
1090	valign => 1,	1273	valign => 1,
1091	text => $self->{title},	1274	text => $self->{title},
1092	fontsize => $self->{border},	1275	fontsize => $self->{border},
1093	if exists $self->{title};	1276	if exists $self->{title};
1094		1277
		1278	if ($self->{has_close_button}) {
		1279	$self->{close_button} =
		1280	new CFPlus::UI::ImageButton
		1281	path => 'x1_close.png',
		1282	on_activate => sub { $self->emit ("delete") };
		1283
		1284	$self->CFPlus::UI::Container::add ($self->{close_button});
		1285	}
		1286
1095	$self	1287	$self
1096	}	1288	}
1097		1289
1098	sub add {	1290	sub add {
1099	my ($self, @widgets) = @_;	1291	my ($self, @widgets) = @_;
1100		1292
1101	$self->SUPER::add (@widgets);	1293	$self->SUPER::add (@widgets);
		1294	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1295	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103	}	1296	}
1104		1297
1105	sub border {	1298	sub border {
1106	int $_[0]{border} * $::FONTSIZE	1299	int $_[0]{border} * $::FONTSIZE
1107	}	1300	}
…		…
1109	sub size_request {	1302	sub size_request {
1110	my ($self) = @_;	1303	my ($self) = @_;
1111		1304
1112	$self->{title_widget}->size_request	1305	$self->{title_widget}->size_request
1113	if $self->{title_widget};	1306	if $self->{title_widget};
		1307
		1308	$self->{close_button}->size_request
		1309	if $self->{close_button};
1114		1310
1115	my ($w, $h) = $self->SUPER::size_request;	1311	my ($w, $h) = $self->SUPER::size_request;
1116		1312
1117	(	1313	(
1118	$w + $self->border * 2,	1314	$w + $self->border * 2,
1119	$h + $self->border * 2,	1315	$h + $self->border * 2,
1120	)	1316	)
1121	}	1317	}
1122		1318
1123	sub size_allocate {	1319	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1320	my ($self, $w, $h) = @_;
1125		1321
1126	if ($self->{title_widget}) {	1322	if ($self->{title_widget}) {
1127	$self->{title_widget}{w} = $w;	1323	$self->{title_widget}{w} = $w;
1128	$self->{title_widget}{h} = $h;	1324	$self->{title_widget}{h} = $h;
1129	$self->{title_widget}->size_allocate ($w, $h);	1325	$self->{title_widget}->invoke_size_allocate ($w, $h);
1130	}	1326	}
1131		1327
1132	my $border = $self->border;	1328	my $border = $self->border;
1133		1329
1134	$h -= List::Util::max 0, $border * 2;	1330	$h -= List::Util::max 0, $border * 2;
1135	$w -= List::Util::max 0, $border * 2;	1331	$w -= List::Util::max 0, $border * 2;
		1332
		1333	$self->child->configure ($border, $border, $w, $h);
		1334
		1335	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1336	if $self->{close_button};
		1337
		1338	1
		1339	}
		1340
		1341	sub invoke_delete {
		1342	my ($self) = @_;
		1343
		1344	$self->hide;
1136		1345
1137	$self->child->configure ($border, $border, $w, $h);	1346	1
1138	}	1347	}
1139		1348
1140	sub button_down {	1349	sub invoke_button_down {
1141	my ($self, $ev, $x, $y) = @_;	1350	my ($self, $ev, $x, $y) = @_;
1142		1351
1143	my ($w, $h) = @$self{qw(w h)};	1352	my ($w, $h) = @$self{qw(w h)};
1144	my $border = $self->border;	1353	my $border = $self->border;
1145		1354
…		…
1176		1385
1177	($x, $y) = ($ev->{x}, $ev->{y});	1386	($x, $y) = ($ev->{x}, $ev->{y});
1178		1387
1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1388	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180	# HACK: the next line is required to enforce placement	1389	# HACK: the next line is required to enforce placement
1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1390	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182	};	1391	};
1183	} else {	1392	} else {
1184	return 0;	1393	return 0;
1185	}	1394	}
1186		1395
1187	1	1396	1
1188	}	1397	}
1189		1398
1190	sub button_up {	1399	sub invoke_button_up {
1191	my ($self, $ev, $x, $y) = @_;	1400	my ($self, $ev, $x, $y) = @_;
1192		1401
1193	!!delete $self->{motion}	1402	! ! delete $self->{motion}
1194	}	1403	}
1195		1404
1196	sub mouse_motion {	1405	sub invoke_mouse_motion {
1197	my ($self, $ev, $x, $y) = @_;	1406	my ($self, $ev, $x, $y) = @_;
1198		1407
1199	$self->{motion}->($ev, $x, $y) if $self->{motion};	1408	$self->{motion}->($ev, $x, $y) if $self->{motion};
1200		1409
1201	!!$self->{motion}	1410	! ! $self->{motion}
		1411	}
		1412
		1413	sub invoke_visibility_change {
		1414	my ($self, $visible) = @_;
		1415
		1416	delete $self->{motion} unless $visible;
		1417
		1418	0
1202	}	1419	}
1203		1420
1204	sub _draw {	1421	sub _draw {
1205	my ($self) = @_;	1422	my ($self) = @_;
1206		1423
…		…
1235	$child->draw;	1452	$child->draw;
1236		1453
1237	if ($self->{title_widget}) {	1454	if ($self->{title_widget}) {
1238	glTranslate 0, $border - $self->{h};	1455	glTranslate 0, $border - $self->{h};
1239	$self->{title_widget}->_draw;	1456	$self->{title_widget}->_draw;
		1457
		1458	glTranslate 0, - ($border - $self->{h});
1240	}	1459	}
		1460
		1461	$self->{close_button}->draw
		1462	if $self->{close_button};
1241	}	1463	}
1242		1464
1243	#############################################################################	1465	#############################################################################
1244		1466
1245	package CFClient::UI::Table;	1467	package CFPlus::UI::Table;
1246		1468
1247	our @ISA = CFClient::UI::Base::;	1469	our @ISA = CFPlus::UI::Base::;
1248		1470
1249	use List::Util qw(max sum);	1471	use List::Util qw(max sum);
1250		1472
1251	use CFClient::OpenGL;	1473	use CFPlus::OpenGL;
1252		1474
1253	sub new {	1475	sub new {
1254	my $class = shift;	1476	my $class = shift;
1255		1477
1256	$class->SUPER::new (	1478	$class->SUPER::new (
…		…
1262	sub children {	1484	sub children {
1263	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1485	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264	}	1486	}
1265		1487
1266	sub add {	1488	sub add {
1267	my ($self, $x, $y, $child) = @_;	1489	my ($self) = shift;
1268		1490
		1491	while (@_) {
		1492	my ($x, $y, $child) = splice @_, 0, 3, ();
1269	$child->set_parent ($self);	1493	$child->set_parent ($self);
1270	$self->{children}[$y][$x] = $child;	1494	$self->{children}[$y][$x] = $child;
		1495	}
1271		1496
		1497	$self->{force_realloc} = 1;
		1498	$self->{force_size_alloc} = 1;
1272	$self->realloc;	1499	$self->realloc;
1273	}	1500	}
1274		1501
1275	sub remove {	1502	sub remove {
1276	my ($self, $child) = @_;	1503	my ($self, $child) = @_;
…		…
1324	(sum @$ws),	1551	(sum @$ws),
1325	(sum @$hs),	1552	(sum @$hs),
1326	)	1553	)
1327	}	1554	}
1328		1555
1329	sub size_allocate {	1556	sub invoke_size_allocate {
1330	my ($self, $w, $h) = @_;	1557	my ($self, $w, $h) = @_;
1331		1558
1332	my ($ws, $hs) = $self->get_wh;	1559	my ($ws, $hs) = $self->get_wh;
1333		1560
1334	my $req_w = (sum @$ws) || 1;	1561	my $req_w = (sum @$ws) || 1;
…		…
1341		1568
1342	# linearly scale sizes	1569	# linearly scale sizes
1343	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1570	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1571	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345		1572
1346	CFClient::UI::harmonize $ws;	1573	CFPlus::UI::harmonize $ws;
1347	CFClient::UI::harmonize $hs;	1574	CFPlus::UI::harmonize $hs;
1348		1575
1349	my $y;	1576	my $y;
1350		1577
1351	for my $r (0 .. $#{$self->{children}}) {	1578	for my $r (0 .. $#{$self->{children}}) {
1352	my $row = $self->{children}[$r]	1579	my $row = $self->{children}[$r]
…		…
1366	}	1593	}
1367		1594
1368	$y += $row_h;	1595	$y += $row_h;
1369	}	1596	}
1370		1597
		1598	1
1371	}	1599	}
1372		1600
1373	sub find_widget {	1601	sub find_widget {
1374	my ($self, $x, $y) = @_;	1602	my ($self, $x, $y) = @_;
1375		1603
…		…
1394	}	1622	}
1395	}	1623	}
1396		1624
1397	#############################################################################	1625	#############################################################################
1398		1626
1399	package CFClient::UI::Box;	1627	package CFPlus::UI::Box;
1400		1628
1401	our @ISA = CFClient::UI::Container::;	1629	our @ISA = CFPlus::UI::Container::;
1402		1630
1403	sub size_request {	1631	sub size_request {
1404	my ($self) = @_;	1632	my ($self) = @_;
1405		1633
1406	$self->{vertical}	1634	$self->{vertical}
…		…
1412	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1640	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1641	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1414	)	1642	)
1415	}	1643	}
1416		1644
1417	sub size_allocate {	1645	sub invoke_size_allocate {
1418	my ($self, $w, $h) = @_;	1646	my ($self, $w, $h) = @_;
1419		1647
1420	my $space = $self->{vertical} ? $h : $w;	1648	my $space = $self->{vertical} ? $h : $w;
1421	my $children = $self->{children};	1649	my @children = $self->visible_children;
1422		1650
1423	my @req;	1651	my @req;
1424		1652
1425	if ($self->{homogeneous}) {	1653	if ($self->{homogeneous}) {
1426	@req = ($space / (@$children || 1)) x @$children;	1654	@req = ($space / (@children || 1)) x @children;
1427	} else {	1655	} else {
1428	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1656	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429	my $req = List::Util::sum @req;	1657	my $req = List::Util::sum @req;
1430		1658
1431	if ($req > $space) {	1659	if ($req > $space) {
1432	# ah well, not enough space	1660	# ah well, not enough space
1433	$_ *= $space / $req for @req;	1661	$_ *= $space / $req for @req;
1434	} else {	1662	} else {
1435	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1663	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436		1664
1437	$space = ($space - $req) / $expand; # remaining space to give away	1665	$space = ($space - $req) / $expand; # remaining space to give away
1438		1666
1439	$req[$_] += $space * $children->[$_]{expand}	1667	$req[$_] += $space * $children[$_]{expand}
1440	for 0 .. $#$children;	1668	for 0 .. $#children;
1441	}	1669	}
1442	}	1670	}
1443		1671
1444	CFClient::UI::harmonize \@req;	1672	CFPlus::UI::harmonize \@req;
1445		1673
1446	my $pos = 0;	1674	my $pos = 0;
1447	for (0 .. $#$children) {	1675	for (0 .. $#children) {
1448	my $alloc = $req[$_];	1676	my $alloc = $req[$_];
1449	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1677	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450		1678
1451	$pos += $alloc;	1679	$pos += $alloc;
1452	}	1680	}
1453		1681
1454	1	1682	1
1455	}	1683	}
1456		1684
1457	#############################################################################	1685	#############################################################################
1458		1686
1459	package CFClient::UI::HBox;	1687	package CFPlus::UI::HBox;
1460		1688
1461	our @ISA = CFClient::UI::Box::;	1689	our @ISA = CFPlus::UI::Box::;
1462		1690
1463	sub new {	1691	sub new {
1464	my $class = shift;	1692	my $class = shift;
1465		1693
1466	$class->SUPER::new (	1694	$class->SUPER::new (
…		…
1469	)	1697	)
1470	}	1698	}
1471		1699
1472	#############################################################################	1700	#############################################################################
1473		1701
1474	package CFClient::UI::VBox;	1702	package CFPlus::UI::VBox;
1475		1703
1476	our @ISA = CFClient::UI::Box::;	1704	our @ISA = CFPlus::UI::Box::;
1477		1705
1478	sub new {	1706	sub new {
1479	my $class = shift;	1707	my $class = shift;
1480		1708
1481	$class->SUPER::new (	1709	$class->SUPER::new (
…		…
1484	)	1712	)
1485	}	1713	}
1486		1714
1487	#############################################################################	1715	#############################################################################
1488		1716
1489	package CFClient::UI::Label;	1717	package CFPlus::UI::Label;
1490		1718
1491	our @ISA = CFClient::UI::DrawBG::;	1719	our @ISA = CFPlus::UI::DrawBG::;
1492		1720
1493	use CFClient::OpenGL;	1721	use CFPlus::OpenGL;
1494		1722
1495	sub new {	1723	sub new {
1496	my ($class, %arg) = @_;	1724	my ($class, %arg) = @_;
1497		1725
1498	my $self = $class->SUPER::new (	1726	my $self = $class->SUPER::new (
…		…
1501	#active_bg => none	1729	#active_bg => none
1502	#font => default_font	1730	#font => default_font
1503	#text => initial text	1731	#text => initial text
1504	#markup => initial narkup	1732	#markup => initial narkup
1505	#max_w => maximum pixel width	1733	#max_w => maximum pixel width
		1734	#style => 0, # render flags
1506	ellipsise => 3, # end	1735	ellipsise => 3, # end
1507	layout => (new CFClient::Layout),	1736	layout => (new CFPlus::Layout),
1508	fontsize => 1,	1737	fontsize => 1,
1509	align => -1,	1738	align => -1,
1510	valign => -1,	1739	valign => -1,
1511	padding_x => 2,	1740	padding_x => 2,
1512	padding_y => 2,	1741	padding_y => 2,
1513	can_events => 0,	1742	can_events => 0,
1514	%arg	1743	%arg
1515	);	1744	);
1516		1745
1517	if (exists $self->{template}) {	1746	if (exists $self->{template}) {
1518	my $layout = new CFClient::Layout;	1747	my $layout = new CFPlus::Layout;
1519	$layout->set_text (delete $self->{template});	1748	$layout->set_text (delete $self->{template});
1520	$self->{template} = $layout;	1749	$self->{template} = $layout;
1521	}	1750	}
1522		1751
1523	if (exists $self->{markup}) {	1752	if (exists $self->{markup}) {
…		…
1527	}	1756	}
1528		1757
1529	$self	1758	$self
1530	}	1759	}
1531		1760
1532	sub escape($) {
1533	local $_ = $_[0];
1534
1535	s/&/&amp;/g;
1536	s/>/&gt;/g;
1537	s/</&lt;/g;
1538
1539	$_
1540	}
1541
1542	sub update {	1761	sub update {
1543	my ($self) = @_;	1762	my ($self) = @_;
1544		1763
1545	delete $self->{texture};	1764	delete $self->{texture};
1546	$self->SUPER::update;	1765	$self->SUPER::update;
…		…
1557	my ($self, $text) = @_;	1776	my ($self, $text) = @_;
1558		1777
1559	return if $self->{text} eq "T$text";	1778	return if $self->{text} eq "T$text";
1560	$self->{text} = "T$text";	1779	$self->{text} = "T$text";
1561		1780
1562	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563	$self->{layout}->set_text ($text);	1781	$self->{layout}->set_text ($text);
1564		1782
1565	delete $self->{size_req};	1783	delete $self->{size_req};
1566	$self->realloc;	1784	$self->realloc;
1567	$self->update;	1785	$self->update;
…		…
1573	return if $self->{text} eq "M$markup";	1791	return if $self->{text} eq "M$markup";
1574	$self->{text} = "M$markup";	1792	$self->{text} = "M$markup";
1575		1793
1576	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1794	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577		1795
1578	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579	$self->{layout}->set_markup ($markup);	1796	$self->{layout}->set_markup ($markup);
1580		1797
1581	delete $self->{size_req};	1798	delete $self->{size_req};
1582	$self->realloc;	1799	$self->realloc;
1583	$self->update;	1800	$self->update;
…		…
1595		1812
1596	my ($w, $h) = $self->{layout}->size;	1813	my ($w, $h) = $self->{layout}->size;
1597		1814
1598	if (exists $self->{template}) {	1815	if (exists $self->{template}) {
1599	$self->{template}->set_font ($self->{font}) if $self->{font};	1816	$self->{template}->set_font ($self->{font}) if $self->{font};
		1817	$self->{template}->set_width ($self->{max_w} || -1);
1600	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1818	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601		1819
1602	my ($w2, $h2) = $self->{template}->size;	1820	my ($w2, $h2) = $self->{template}->size;
1603		1821
1604	$w = List::Util::max $w, $w2;	1822	$w = List::Util::max $w, $w2;
…		…
1609	};	1827	};
1610		1828
1611	@{ $self->{size_req} }	1829	@{ $self->{size_req} }
1612	}	1830	}
1613		1831
		1832	sub baseline_shift {
		1833	$_[0]{layout}->descent
		1834	}
		1835
1614	sub size_allocate {	1836	sub invoke_size_allocate {
1615	my ($self, $w, $h) = @_;	1837	my ($self, $w, $h) = @_;
1616		1838
1617	delete $self->{ox};	1839	delete $self->{ox};
1618		1840
1619	delete $self->{texture}	1841	delete $self->{texture}
1620	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1842	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1843
		1844	1
1621	}	1845	}
1622		1846
1623	sub set_fontsize {	1847	sub set_fontsize {
1624	my ($self, $fontsize) = @_;	1848	my ($self, $fontsize) = @_;
1625		1849
1626	$self->{fontsize} = $fontsize;	1850	$self->{fontsize} = $fontsize;
		1851	delete $self->{size_req};
1627	delete $self->{texture};	1852	delete $self->{texture};
1628		1853
1629	$self->realloc;	1854	$self->realloc;
1630	}	1855	}
1631		1856
1632	sub reconfigure {	1857	sub reconfigure {
1633	my ($self) = @_;	1858	my ($self) = @_;
1634		1859
1635	delete $self->{size_req};	1860	delete $self->{size_req};
		1861	delete $self->{texture};
1636		1862
1637	$self->SUPER::reconfigure;	1863	$self->SUPER::reconfigure;
1638	}	1864	}
1639		1865
1640	sub _draw {	1866	sub _draw {
1641	my ($self) = @_;	1867	my ($self) = @_;
1642		1868
1643	$self->SUPER::_draw; # draw background, if applicable	1869	$self->SUPER::_draw; # draw background, if applicable
1644		1870
1645	my $tex = $self->{texture} ||= do {	1871	my $size = $self->{texture} ||= do {
1646	$self->{layout}->set_foreground (@{$self->{fg}});	1872	$self->{layout}->set_foreground (@{$self->{fg}});
1647	$self->{layout}->set_font ($self->{font}) if $self->{font};	1873	$self->{layout}->set_font ($self->{font}) if $self->{font};
1648	$self->{layout}->set_width ($self->{w});	1874	$self->{layout}->set_width ($self->{w});
1649	$self->{layout}->set_ellipsise ($self->{ellipsise});	1875	$self->{layout}->set_ellipsise ($self->{ellipsise});
1650	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1876	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1877	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652		1878
1653	new_from_layout CFClient::Texture $self->{layout}	1879	[$self->{layout}->size]
1654	};	1880	};
1655		1881
1656	unless (exists $self->{ox}) {	1882	unless (exists $self->{ox}) {
1657	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1883	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1884	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659	: ($self->{w} - $tex->{w}) * 0.5);	1885	: ($self->{w} - $size->[0]) * 0.5);
1660		1886
1661	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1887	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1888	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663	: ($self->{h} - $tex->{h}) * 0.5);	1889	: ($self->{h} - $size->[1]) * 0.5);
1664	};	1890	};
1665		1891
1666	glEnable GL_TEXTURE_2D;
1667
1668	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1892	my $w = List::Util::min $self->{w} + 4, $size->[0];
1669	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1893	my $h = List::Util::min $self->{h} + 2, $size->[1];
1670		1894
1671	if ($tex->{format} == GL_ALPHA) {	1895	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673	glColor @{$self->{fg}};
1674	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675	} else {
1676	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678	}
1679
1680	glDisable GL_TEXTURE_2D;
1681	}	1896	}
1682		1897
1683	#############################################################################	1898	#############################################################################
1684		1899
1685	package CFClient::UI::EntryBase;	1900	package CFPlus::UI::EntryBase;
1686		1901
1687	our @ISA = CFClient::UI::Label::;	1902	our @ISA = CFPlus::UI::Label::;
1688		1903
1689	use CFClient::OpenGL;	1904	use CFPlus::OpenGL;
1690		1905
1691	sub new {	1906	sub new {
1692	my $class = shift;	1907	my $class = shift;
1693		1908
1694	$class->SUPER::new (	1909	$class->SUPER::new (
…		…
1718		1933
1719	$text =~ s/./*/g if $self->{hidden};	1934	$text =~ s/./*/g if $self->{hidden};
1720	$self->{layout}->set_text ("$text ");	1935	$self->{layout}->set_text ("$text ");
1721	delete $self->{size_req};	1936	delete $self->{size_req};
1722		1937
1723	$self->_emit (changed => $self->{text});	1938	$self->emit (changed => $self->{text});
1724		1939
1725	$self->realloc;	1940	$self->realloc;
1726	$self->update;	1941	$self->update;
1727	}	1942	}
1728		1943
…		…
1743	my ($w, $h) = $self->SUPER::size_request;	1958	my ($w, $h) = $self->SUPER::size_request;
1744		1959
1745	($w + 1, $h) # add 1 for cursor	1960	($w + 1, $h) # add 1 for cursor
1746	}	1961	}
1747		1962
1748	sub key_down {	1963	sub invoke_key_down {
1749	my ($self, $ev) = @_;	1964	my ($self, $ev) = @_;
1750		1965
1751	my $mod = $ev->{mod};	1966	my $mod = $ev->{mod};
1752	my $sym = $ev->{sym};	1967	my $sym = $ev->{sym};
1753	my $uni = $ev->{unicode};	1968	my $uni = $ev->{unicode};
…		…
1756		1971
1757	if ($uni == 8) {	1972	if ($uni == 8) {
1758	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759	} elsif ($uni == 127) {	1974	} elsif ($uni == 127) {
1760	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1761	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1762	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1763	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1764	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1765	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
1766	$self->{cursor} = 0;	1981	$self->{cursor} = 0;
1767	} elsif ($sym == CFClient::SDLK_END) {	1982	} elsif ($sym == CFPlus::SDLK_END) {
1768	$self->{cursor} = length $text;	1983	$self->{cursor} = length $text;
		1984	} elsif ($uni == 21) { # ctrl-u
		1985	$text = "";
		1986	$self->{cursor} = 0;
1769	} elsif ($uni == 27) {	1987	} elsif ($uni == 27) {
1770	$self->_emit ('escape');	1988	$self->emit ('escape');
1771	} elsif ($uni) {	1989	} elsif ($uni) {
1772	substr $text, $self->{cursor}++, 0, chr $uni;	1990	substr $text, $self->{cursor}++, 0, chr $uni;
1773	} else {	1991	} else {
1774	return 0;	1992	return 0;
1775	}	1993	}
…		…
1779	$self->realloc;	1997	$self->realloc;
1780		1998
1781	1	1999	1
1782	}	2000	}
1783		2001
1784	sub focus_in {	2002	sub invoke_focus_in {
1785	my ($self) = @_;	2003	my ($self) = @_;
1786		2004
1787	$self->{last_activity} = $::NOW;	2005	$self->{last_activity} = $::NOW;
1788		2006
1789	$self->SUPER::focus_in;	2007	$self->SUPER::invoke_focus_in
1790	}	2008	}
1791		2009
1792	sub button_down {	2010	sub invoke_button_down {
1793	my ($self, $ev, $x, $y) = @_;	2011	my ($self, $ev, $x, $y) = @_;
1794		2012
1795	$self->SUPER::button_down ($ev, $x, $y);	2013	$self->SUPER::invoke_button_down ($ev, $x, $y);
1796		2014
1797	my $idx = $self->{layout}->xy_to_index ($x, $y);	2015	my $idx = $self->{layout}->xy_to_index ($x, $y);
1798		2016
1799	# byte-index to char-index	2017	# byte-index to char-index
1800	my $text = $self->{text};	2018	my $text = $self->{text};
1801	utf8::encode $text;	2019	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802	$self->{cursor} = length substr $text, 0, $idx;	2020	$self->{cursor} = length $text;
1803		2021
1804	$self->_set_text ($self->{text});	2022	$self->_set_text ($self->{text});
1805	$self->update;	2023	$self->update;
1806		2024
1807	1	2025	1
1808	}	2026	}
1809		2027
1810	sub mouse_motion {	2028	sub invoke_mouse_motion {
1811	my ($self, $ev, $x, $y) = @_;	2029	my ($self, $ev, $x, $y) = @_;
1812	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2030	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813		2031
1814	0	2032	1
1815	}	2033	}
1816		2034
1817	sub _draw {	2035	sub _draw {
1818	my ($self) = @_;	2036	my ($self) = @_;
1819		2037
…		…
1846	utf8::encode $text;	2064	utf8::encode $text;
1847		2065
1848	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2066	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1849	}	2067	}
1850		2068
1851	glColor @{$self->{fg}};
1852	glBegin GL_LINES;	2069	glBegin GL_LINES;
1853	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2070	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1854	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2071	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855	glEnd;	2072	glEnd;
1856	}	2073	}
1857	}	2074	}
1858		2075
1859	package CFClient::UI::Entry;	2076	package CFPlus::UI::Entry;
1860		2077
1861	our @ISA = CFClient::UI::EntryBase::;	2078	our @ISA = CFPlus::UI::EntryBase::;
1862		2079
1863	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1864		2081
1865	sub key_down {	2082	sub invoke_key_down {
1866	my ($self, $ev) = @_;	2083	my ($self, $ev) = @_;
1867		2084
1868	my $sym = $ev->{sym};	2085	my $sym = $ev->{sym};
1869		2086
1870	if ($sym == 13) {	2087	if ($sym == 13) {
1871	unshift @{$self->{history}},	2088	unshift @{$self->{history}},
1872	my $txt = $self->get_text;	2089	my $txt = $self->get_text;
		2090
1873	$self->{history_pointer} = -1;	2091	$self->{history_pointer} = -1;
1874	$self->{history_saveback} = '';	2092	$self->{history_saveback} = '';
1875	$self->_emit (activate => $txt);	2093	$self->emit (activate => $txt);
1876	$self->update;	2094	$self->update;
1877		2095
1878	} elsif ($sym == CFClient::SDLK_UP) {	2096	} elsif ($sym == CFPlus::SDLK_UP) {
1879	if ($self->{history_pointer} < 0) {	2097	if ($self->{history_pointer} < 0) {
1880	$self->{history_saveback} = $self->get_text;	2098	$self->{history_saveback} = $self->get_text;
1881	}	2099	}
1882	if (@{$self->{history} || []} > 0) {	2100	if (@{$self->{history} || []} > 0) {
1883	$self->{history_pointer}++;	2101	$self->{history_pointer}++;
…		…
1885	$self->{history_pointer} = @{$self->{history} || []} - 1;	2103	$self->{history_pointer} = @{$self->{history} || []} - 1;
1886	}	2104	}
1887	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2105	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1888	}	2106	}
1889		2107
1890	} elsif ($sym == CFClient::SDLK_DOWN) {	2108	} elsif ($sym == CFPlus::SDLK_DOWN) {
1891	$self->{history_pointer}--;	2109	$self->{history_pointer}--;
1892	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2110	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893		2111
1894	if ($self->{history_pointer} >= 0) {	2112	if ($self->{history_pointer} >= 0) {
1895	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2113	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1896	} else {	2114	} else {
1897	$self->set_text ($self->{history_saveback});	2115	$self->set_text ($self->{history_saveback});
1898	}	2116	}
1899		2117
1900	} else {	2118	} else {
1901	return $self->SUPER::key_down ($ev)	2119	return $self->SUPER::invoke_key_down ($ev)
1902	}	2120	}
1903		2121
1904	1	2122	1
1905	}	2123	}
1906		2124
1907	#############################################################################	2125	#############################################################################
1908		2126
1909	package CFClient::UI::Button;	2127	package CFPlus::UI::Button;
1910		2128
1911	our @ISA = CFClient::UI::Label::;	2129	our @ISA = CFPlus::UI::Label::;
1912		2130
1913	use CFClient::OpenGL;	2131	use CFPlus::OpenGL;
1914		2132
1915	my @tex =	2133	my @tex =
1916	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2134	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917	qw(b1_button_active.png);	2135	qw(b1_button_active.png);
1918		2136
1919	sub new {	2137	sub new {
1920	my $class = shift;	2138	my $class = shift;
1921		2139
…		…
1930	can_events => 1,	2148	can_events => 1,
1931	@_	2149	@_
1932	)	2150	)
1933	}	2151	}
1934		2152
1935	sub activate { }
1936
1937	sub button_up {	2153	sub invoke_button_up {
1938	my ($self, $ev, $x, $y) = @_;	2154	my ($self, $ev, $x, $y) = @_;
1939		2155
1940	$self->emit ("activate")	2156	$self->emit ("activate")
1941	if $x >= 0 && $x < $self->{w}	2157	if $x >= 0 && $x < $self->{w}
1942	&& $y >= 0 && $y < $self->{h};	2158	&& $y >= 0 && $y < $self->{h};
…		…
1960	$self->SUPER::_draw;	2176	$self->SUPER::_draw;
1961	}	2177	}
1962		2178
1963	#############################################################################	2179	#############################################################################
1964		2180
1965	package CFClient::UI::CheckBox;	2181	package CFPlus::UI::CheckBox;
1966		2182
1967	our @ISA = CFClient::UI::DrawBG::;	2183	our @ISA = CFPlus::UI::DrawBG::;
1968		2184
1969	my @tex =	2185	my @tex =
1970	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2187	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972		2188
1973	use CFClient::OpenGL;	2189	use CFPlus::OpenGL;
1974		2190
1975	sub new {	2191	sub new {
1976	my $class = shift;	2192	my $class = shift;
1977		2193
1978	$class->SUPER::new (	2194	$class->SUPER::new (
…		…
1992	my ($self) = @_;	2208	my ($self) = @_;
1993		2209
1994	(6) x 2	2210	(6) x 2
1995	}	2211	}
1996		2212
		2213	sub toggle {
		2214	my ($self) = @_;
		2215
		2216	$self->{state} = !$self->{state};
		2217	$self->emit (changed => $self->{state});
		2218	$self->update;
		2219	}
		2220
1997	sub button_down {	2221	sub invoke_button_down {
1998	my ($self, $ev, $x, $y) = @_;	2222	my ($self, $ev, $x, $y) = @_;
1999		2223
2000	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2224	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2225	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002	$self->{state} = !$self->{state};	2226	$self->toggle;
2003	$self->_emit (changed => $self->{state});
2004	} else {	2227	} else {
2005	return 0	2228	return 0
2006	}	2229	}
2007		2230
2008	1	2231	1
…		…
2028	glDisable GL_TEXTURE_2D;	2251	glDisable GL_TEXTURE_2D;
2029	}	2252	}
2030		2253
2031	#############################################################################	2254	#############################################################################
2032		2255
2033	package CFClient::UI::Image;	2256	package CFPlus::UI::Image;
2034		2257
2035	our @ISA = CFClient::UI::Base::;	2258	our @ISA = CFPlus::UI::Base::;
2036		2259
2037	use CFClient::OpenGL;	2260	use CFPlus::OpenGL;
2038	use Carp qw/confess/;
2039		2261
2040	our %loaded_images;	2262	our %texture_cache;
2041		2263
2042	sub new {	2264	sub new {
2043	my $class = shift;	2265	my $class = shift;
2044		2266
2045	my $self = $class->SUPER::new (can_events => 0, @_);	2267	my $self = $class->SUPER::new (
		2268	can_events => 0,
		2269	@_,
		2270	);
2046		2271
2047	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2272	$self->{path} || $self->{tex}
		2273	or Carp::croak "'path' or 'tex' attributes required";
2048		2274
2049	$loaded_images{$self->{image}} ||=	2275	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2050	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2276	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051		2277
2052	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2278	Scalar::Util::weaken $texture_cache{$self->{path}};
2053		2279
2054	Scalar::Util::weaken $loaded_images{$self->{image}};	2280	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056	$self->{aspect} = $tex->{w} / $tex->{h};
2057		2281
2058	$self	2282	$self
2059	}	2283	}
2060		2284
		2285	sub STORABLE_freeze {
		2286	my ($self, $cloning) = @_;
		2287
		2288	$self->{path}
		2289	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2290
		2291	$self->{path}
		2292	}
		2293
		2294	sub STORABLE_attach {
		2295	my ($self, $cloning, $path) = @_;
		2296
		2297	$self->new (path => $path)
		2298	}
		2299
2061	sub size_request {	2300	sub size_request {
2062	my ($self) = @_;	2301	my ($self) = @_;
2063		2302
2064	($self->{tex}->{w}, $self->{tex}->{h})	2303	($self->{tex}{w}, $self->{tex}{h})
2065	}	2304	}
2066		2305
2067	sub _draw {	2306	sub _draw {
2068	my ($self) = @_;	2307	my ($self) = @_;
2069		2308
…		…
2079	}	2318	}
2080		2319
2081	glEnable GL_TEXTURE_2D;	2320	glEnable GL_TEXTURE_2D;
2082	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2321	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083		2322
2084	$tex->draw_quad_alpha (0, 0, $w, $h);	2323	$tex->draw_quad (0, 0, $w, $h);
2085		2324
2086	glDisable GL_TEXTURE_2D;	2325	glDisable GL_TEXTURE_2D;
2087	}	2326	}
2088		2327
2089	#############################################################################	2328	#############################################################################
2090		2329
		2330	package CFPlus::UI::ImageButton;
		2331
		2332	our @ISA = CFPlus::UI::Image::;
		2333
		2334	use CFPlus::OpenGL;
		2335
		2336	my %textures;
		2337
		2338	sub new {
		2339	my $class = shift;
		2340
		2341	my $self = $class->SUPER::new (
		2342	padding_x => 4,
		2343	padding_y => 4,
		2344	fg => [1, 1, 1],
		2345	active_fg => [0, 0, 1],
		2346	can_hover => 1,
		2347	align => 0,
		2348	valign => 0,
		2349	can_events => 1,
		2350	@_
		2351	);
		2352	}
		2353
		2354	sub invoke_button_up {
		2355	my ($self, $ev, $x, $y) = @_;
		2356
		2357	$self->emit ("activate")
		2358	if $x >= 0 && $x < $self->{w}
		2359	&& $y >= 0 && $y < $self->{h};
		2360
		2361	1
		2362	}
		2363
		2364	#############################################################################
		2365
2091	package CFClient::UI::VGauge;	2366	package CFPlus::UI::VGauge;
2092		2367
2093	our @ISA = CFClient::UI::Base::;	2368	our @ISA = CFPlus::UI::Base::;
2094		2369
2095	use List::Util qw(min max);	2370	use List::Util qw(min max);
2096		2371
2097	use CFClient::OpenGL;	2372	use CFPlus::OpenGL;
2098		2373
2099	my %tex = (	2374	my %tex = (
2100	food => [	2375	food => [
2101	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2376	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2377	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103	],	2378	],
2104	grace => [	2379	grace => [
2105	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2380	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2381	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107	],	2382	],
2108	hp => [	2383	hp => [
2109	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2384	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2385	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111	],	2386	],
2112	mana => [	2387	mana => [
2113	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2388	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2389	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115	],	2390	],
2116	);	2391	);
2117		2392
2118	# eg. VGauge->new (gauge => 'food'), default gauge: food	2393	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2178	my $ycut1 = max 0, min 1, $ycut;	2453	my $ycut1 = max 0, min 1, $ycut;
2179	my $ycut2 = max 0, min 1, $ycut - 1;	2454	my $ycut2 = max 0, min 1, $ycut - 1;
2180		2455
2181	my $h1 = $self->{h} * (1 - $ycut1);	2456	my $h1 = $self->{h} * (1 - $ycut1);
2182	my $h2 = $self->{h} * (1 - $ycut2);	2457	my $h2 = $self->{h} * (1 - $ycut2);
		2458	my $h3 = $self->{h};
		2459
		2460	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183		2461
2184	glEnable GL_BLEND;	2462	glEnable GL_BLEND;
2185	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2463	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2464	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187	glEnable GL_TEXTURE_2D;	2465	glEnable GL_TEXTURE_2D;
…		…
2206		2484
2207	if ($t3) {	2485	if ($t3) {
2208	glBindTexture GL_TEXTURE_2D, $t3->{name};	2486	glBindTexture GL_TEXTURE_2D, $t3->{name};
2209	glBegin GL_QUADS;	2487	glBegin GL_QUADS;
2210	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2488	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2489	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2490	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2491	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214	glEnd;	2492	glEnd;
2215	}	2493	}
2216		2494
2217	glDisable GL_BLEND;	2495	glDisable GL_BLEND;
2218	glDisable GL_TEXTURE_2D;	2496	glDisable GL_TEXTURE_2D;
2219	}	2497	}
2220		2498
2221	#############################################################################	2499	#############################################################################
2222		2500
2223	package CFClient::UI::Gauge;	2501	package CFPlus::UI::Gauge;
2224		2502
2225	our @ISA = CFClient::UI::VBox::;	2503	our @ISA = CFPlus::UI::VBox::;
2226		2504
2227	sub new {	2505	sub new {
2228	my ($class, %arg) = @_;	2506	my ($class, %arg) = @_;
2229		2507
2230	my $self = $class->SUPER::new (	2508	my $self = $class->SUPER::new (
…		…
2232	can_hover => 1,	2510	can_hover => 1,
2233	can_events => 1,	2511	can_events => 1,
2234	%arg,	2512	%arg,
2235	);	2513	);
2236		2514
2237	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2515	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2238	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2516	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2239	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2517	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240		2518
2241	$self	2519	$self
2242	}	2520	}
2243		2521
2244	sub set_fontsize {	2522	sub set_fontsize {
…		…
2265	$self->{value}->set_text ($val);	2543	$self->{value}->set_text ($val);
2266	}	2544	}
2267		2545
2268	#############################################################################	2546	#############################################################################
2269		2547
2270	package CFClient::UI::Slider;	2548	package CFPlus::UI::Slider;
2271		2549
2272	use strict;	2550	use strict;
2273		2551
2274	use CFClient::OpenGL;	2552	use CFPlus::OpenGL;
2275		2553
2276	our @ISA = CFClient::UI::DrawBG::;	2554	our @ISA = CFPlus::UI::DrawBG::;
2277		2555
2278	my @tex =	2556	my @tex =
2279	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2557	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280	qw(s1_slider.png s1_slider_bg.png);	2558	qw(s1_slider.png s1_slider_bg.png);
2281		2559
2282	sub new {	2560	sub new {
2283	my $class = shift;	2561	my $class = shift;
2284		2562
…		…
2305	$self->update;	2583	$self->update;
2306		2584
2307	$self	2585	$self
2308	}	2586	}
2309		2587
2310	sub changed { }
2311
2312	sub set_range {	2588	sub set_range {
2313	my ($self, $range) = @_;	2589	my ($self, $range) = @_;
2314		2590
2315	($range, $self->{range}) = ($self->{range}, $range);	2591	($range, $self->{range}) = ($self->{range}, $range);
2316		2592
…		…
2336	if $unit;	2612	if $unit;
2337		2613
2338	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2614	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339		2615
2340	if ($value != $old_value) {	2616	if ($value != $old_value) {
2341	$self->_emit (changed => $value);	2617	$self->emit (changed => $value);
2342	$self->update;	2618	$self->update;
2343	}	2619	}
2344	}	2620	}
2345		2621
2346	sub size_request {	2622	sub size_request {
2347	my ($self) = @_;	2623	my ($self) = @_;
2348		2624
2349	($self->{req_w}, $self->{req_h})	2625	($self->{req_w}, $self->{req_h})
2350	}	2626	}
2351		2627
2352	sub button_down {	2628	sub invoke_button_down {
2353	my ($self, $ev, $x, $y) = @_;	2629	my ($self, $ev, $x, $y) = @_;
2354		2630
2355	$self->SUPER::button_down ($ev, $x, $y);	2631	$self->SUPER::invoke_button_down ($ev, $x, $y);
2356		2632
2357	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2633	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358		2634
2359	$self->mouse_motion ($ev, $x, $y)	2635	$self->invoke_mouse_motion ($ev, $x, $y)
2360	}	2636	}
2361		2637
2362	sub mouse_motion {	2638	sub invoke_mouse_motion {
2363	my ($self, $ev, $x, $y) = @_;	2639	my ($self, $ev, $x, $y) = @_;
2364		2640
2365	if ($GRAB == $self) {	2641	if ($GRAB == $self) {
2366	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2642	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367		2643
…		…
2373	} else {	2649	} else {
2374	return 0;	2650	return 0;
2375	}	2651	}
2376		2652
2377	1	2653	1
		2654	}
		2655
		2656	sub invoke_mouse_wheel {
		2657	my ($self, $ev) = @_;
		2658
		2659	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2660
		2661	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2662
		2663	! ! $delta
2378	}	2664	}
2379		2665
2380	sub update {	2666	sub update {
2381	my ($self) = @_;	2667	my ($self) = @_;
2382		2668
…		…
2431	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2432	}	2718	}
2433		2719
2434	#############################################################################	2720	#############################################################################
2435		2721
2436	package CFClient::UI::ValSlider;	2722	package CFPlus::UI::ValSlider;
2437		2723
2438	our @ISA = CFClient::UI::HBox::;	2724	our @ISA = CFPlus::UI::HBox::;
2439		2725
2440	sub new {	2726	sub new {
2441	my ($class, %arg) = @_;	2727	my ($class, %arg) = @_;
2442		2728
2443	my $range = delete $arg{range};	2729	my $range = delete $arg{range};
2444		2730
2445	my $self = $class->SUPER::new (	2731	my $self = $class->SUPER::new (
2446	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2732	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2733	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448	to_value => sub { shift },	2734	to_value => sub { shift },
2449	from_value => sub { shift },	2735	from_value => sub { shift },
2450	%arg,	2736	%arg,
2451	);	2737	);
2452		2738
…		…
2472	sub set_range { shift->{slider}->set_range (@_) }	2758	sub set_range { shift->{slider}->set_range (@_) }
2473	sub set_value { shift->{slider}->set_value (@_) }	2759	sub set_value { shift->{slider}->set_value (@_) }
2474		2760
2475	#############################################################################	2761	#############################################################################
2476		2762
2477	package CFClient::UI::TextScroller;	2763	package CFPlus::UI::TextScroller;
2478		2764
2479	our @ISA = CFClient::UI::HBox::;	2765	our @ISA = CFPlus::UI::HBox::;
2480		2766
2481	use CFClient::OpenGL;	2767	use CFPlus::OpenGL;
2482		2768
2483	sub new {	2769	sub new {
2484	my $class = shift;	2770	my $class = shift;
2485		2771
2486	my $self = $class->SUPER::new (	2772	my $self = $class->SUPER::new (
2487	fontsize => 1,	2773	fontsize => 1,
2488	can_events => 0,	2774	can_events => 1,
2489	indent => 0,	2775	indent => 0,
2490	#font => default_font	2776	#font => default_font
2491	@_,	2777	@_,
2492		2778
2493	layout => (new CFClient::Layout 1),	2779	layout => (new CFPlus::Layout),
2494	par => [],	2780	par => [],
2495	height => 0,	2781	height => 0,
2496	children => [	2782	children => [
2497	(new CFClient::UI::Empty expand => 1),	2783	(new CFPlus::UI::Empty expand => 1),
2498	(new CFClient::UI::Slider vertical => 1),	2784	(new CFPlus::UI::Slider vertical => 1),
2499	],	2785	],
2500	);	2786	);
2501		2787
2502	$self->{children}[1]->connect (changed => sub { $self->update });	2788	$self->{children}[1]->connect (changed => sub { $self->update });
2503		2789
…		…
2509		2795
2510	$self->{fontsize} = $fontsize;	2796	$self->{fontsize} = $fontsize;
2511	$self->reflow;	2797	$self->reflow;
2512	}	2798	}
2513		2799
		2800	sub size_request {
		2801	my ($self) = @_;
		2802
		2803	my ($empty, $slider) = @{ $self->{children} };
		2804
		2805	local $self->{children} = [$empty, $slider];
		2806	$self->SUPER::size_request
		2807	}
		2808
2514	sub size_allocate {	2809	sub invoke_size_allocate {
2515	my ($self, $w, $h) = @_;	2810	my ($self, $w, $h) = @_;
2516		2811
2517	$self->SUPER::size_allocate ($w, $h);	2812	my ($empty, $slider, @other) = @{ $self->{children} };
		2813	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518		2814
2519	$self->{layout}->set_font ($self->{font}) if $self->{font};	2815	$self->{layout}->set_font ($self->{font}) if $self->{font};
2520	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2816	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521	$self->{layout}->set_width ($self->{children}[0]{w});	2817	$self->{layout}->set_width ($empty->{w});
2522	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2818	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523		2819
2524	$self->reflow;	2820	$self->reflow;
2525	}
2526		2821
2527	sub text_size {	2822	local $self->{children} = [$empty, $slider];
		2823	$self->SUPER::invoke_size_allocate ($w, $h)
		2824	}
		2825
		2826	sub invoke_mouse_wheel {
2528	my ($self, $text, $indent) = @_;	2827	my ($self, $ev) = @_;
		2828
		2829	return 0 unless $ev->{dy}; # only vertical movements
		2830
		2831	$self->{children}[1]->emit (mouse_wheel => $ev);
		2832
		2833	1
		2834	}
		2835
		2836	sub get_layout {
		2837	my ($self, $para) = @_;
2529		2838
2530	my $layout = $self->{layout};	2839	my $layout = $self->{layout};
2531		2840
		2841	$layout->set_font ($self->{font}) if $self->{font};
		2842	$layout->set_foreground (@{$para->{fg}});
2532	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2843	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533	$layout->set_width ($self->{children}[0]{w} - $indent);	2844	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2845	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535	$layout->set_markup ($text);	2846	$layout->set_markup ($para->{markup});
		2847
		2848	$layout->set_shapes (
		2849	map
		2850	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2851	@{$para->{widget}}
2536		2852	);
		2853
2537	$layout->size	2854	$layout
2538	}	2855	}
2539		2856
2540	sub reflow {	2857	sub reflow {
2541	my ($self) = @_;	2858	my ($self) = @_;
2542		2859
…		…
2549		2866
2550	# todo: base offset on lines or so, not on pixels	2867	# todo: base offset on lines or so, not on pixels
2551	$self->{children}[1]->set_value ($offset);	2868	$self->{children}[1]->set_value ($offset);
2552	}	2869	}
2553		2870
		2871	sub current_paragraph {
		2872	my ($self) = @_;
		2873
		2874	$self->{top_paragraph} - 1
		2875	}
		2876
		2877	sub scroll_to {
		2878	my ($self, $para) = @_;
		2879
		2880	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2881
		2882	$self->{scroll_to} = $para;
		2883	$self->update;
		2884	}
		2885
2554	sub clear {	2886	sub clear {
2555	my ($self) = @_;	2887	my ($self) = @_;
		2888
		2889	my (undef, undef, @other) = @{ $self->{children} };
		2890	$self->remove ($_) for @other;
2556		2891
2557	$self->{par} = [];	2892	$self->{par} = [];
2558	$self->{height} = 0;	2893	$self->{height} = 0;
2559	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2894	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560	}	2895	}
2561		2896
2562	sub add_paragraph {	2897	sub add_paragraph {
2563	my ($self, $color, $text, $indent) = @_;	2898	my $self = shift;
2564		2899
2565	for my $line (split /\n/, $text) {	2900	for my $para (@_) {
2566	my ($w, $h) = $self->text_size ($line);	2901	$para = {
		2902	fg => [1, 1, 1, 1],
		2903	indent => 0,
		2904	markup => "",
		2905	widget => [],
		2906	ref $para ? %$para : (markup => $para),
		2907	w => 1e10,
		2908	wrapped => 1,
		2909	};
		2910
		2911	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2912	push @{$self->{par}}, $para;
		2913	}
		2914
		2915	$self->{need_reflow}++;
		2916	$self->update;
		2917	}
		2918
		2919	sub scroll_to_bottom {
		2920	my ($self) = @_;
		2921
		2922	$self->{scroll_to} = $#{$self->{par}};
		2923	$self->update;
		2924	}
		2925
		2926	sub force_uptodate {
		2927	my ($self) = @_;
		2928
		2929	if (delete $self->{need_reflow}) {
		2930	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2931
		2932	my $height = 0;
		2933
		2934	for my $para (@{$self->{par}}) {
		2935	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2936	my $layout = $self->get_layout ($para);
		2937	my ($w, $h) = $layout->size;
		2938
		2939	$para->{w} = $w + $para->{indent};
		2940	$para->{h} = $h;
		2941	$para->{wrapped} = $layout->has_wrapped;
		2942	}
		2943
		2944	$para->{y} = $height;
		2945	$height += $para->{h};
		2946	}
		2947
2567	$self->{height} += $h;	2948	$self->{height} = $height;
2568	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2949	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569	}
2570		2950
2571	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2951	delete $self->{texture};
		2952	}
		2953
		2954	if (my $paridx = delete $self->{scroll_to}) {
		2955	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2956	}
2572	}	2957	}
2573		2958
2574	sub update {	2959	sub update {
2575	my ($self) = @_;	2960	my ($self) = @_;
2576		2961
…		…
2579	return unless $self->{h} > 0;	2964	return unless $self->{h} > 0;
2580		2965
2581	delete $self->{texture};	2966	delete $self->{texture};
2582		2967
2583	$ROOT->on_post_alloc ($self => sub {	2968	$ROOT->on_post_alloc ($self => sub {
		2969	$self->force_uptodate;
		2970
2584	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2971	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585		2972
2586	if (delete $self->{need_reflow}) {
2587	my $height = 0;
2588
2589	my $layout = $self->{layout};
2590
2591	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593	for (@{$self->{par}}) {
2594	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595	$layout->set_width ($W - $_->[3]);
2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597	$layout->set_markup ($_->[4]);
2598	my ($w, $h) = $layout->size;
2599	$_->[0] = $w + $_->[3];
2600	$_->[1] = $h;
2601	}
2602
2603	$height += $_->[1];
2604	}
2605
2606	$self->{height} = $height;
2607
2608	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610	delete $self->{texture};
2611	}
2612
2613	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2973	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614	glClearColor 0, 0, 0, 0;	2974	glClearColor 0, 0, 0, 0;
2615	glClear GL_COLOR_BUFFER_BIT;	2975	glClear GL_COLOR_BUFFER_BIT;
2616		2976
		2977	package CFPlus::UI::Base;
		2978	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		2979	(0, 0, $self->{w}, $self->{h});
		2980
		2981	my $top = int $self->{children}[1]{range}[0];
		2982
		2983	my $paridx = 0;
		2984	my $top_paragraph;
2617	my $top = int $self->{children}[1]{range}[0];	2985	my $top = int $self->{children}[1]{range}[0];
2618		2986
2619	my $y0 = $top;	2987	my $y0 = $top;
2620	my $y1 = $top + $H;	2988	my $y1 = $top + $H;
2621		2989
2622	my $y = 0;
2623
2624	my $layout = $self->{layout};
2625
2626	$layout->set_font ($self->{font}) if $self->{font};
2627
2628	glEnable GL_BLEND;
2629	#TODO# not correct in windows where rgba is forced off
2630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632	for my $par (@{$self->{par}}) {	2990	for my $para (@{$self->{par}}) {
2633	my $h = $par->[1];	2991	my $h = $para->{h};
		2992	my $y = $para->{y};
2634		2993
2635	if ($y0 < $y + $h && $y < $y1) {	2994	if ($y0 < $y + $h && $y < $y1) {
2636	$layout->set_foreground (@{ $par->[2] });	2995	my $layout = $self->get_layout ($para);
2637	$layout->set_width ($W - $par->[3]);
2638	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639	$layout->set_markup ($par->[4]);
2640		2996
2641	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2997	$layout->render ($para->{indent}, $y - $y0);
2642		2998
2643	glRasterPos $par->[3], $y - $y0;	2999	if (my @w = @{ $para->{widget} }) {
2644	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3000	my @s = $layout->get_shapes;
		3001
		3002	for (@w) {
		3003	my ($dx, $dy) = splice @s, 0, 2, ();
		3004
		3005	$_->{x} = $dx + $para->{indent};
		3006	$_->{y} = $dy + $y - $y0;
		3007
		3008	$_->draw;
		3009	}
		3010	}
2645	}	3011	}
2646		3012
2647	$y += $h;	3013	$paridx++;
		3014	$top_paragraph ||= $paridx if $y >= $top;
2648	}	3015	}
2649		3016
2650	glDisable GL_BLEND;	3017	$self->{top_paragraph} = $top_paragraph;
2651	};	3018	};
2652	});	3019	});
		3020	}
		3021
		3022	sub reconfigure {
		3023	my ($self) = @_;
		3024
		3025	$self->SUPER::reconfigure;
		3026
		3027	$_->{w} = 1e10 for @{ $self->{par} };
		3028	$self->reflow;
2653	}	3029	}
2654		3030
2655	sub _draw {	3031	sub _draw {
2656	my ($self) = @_;	3032	my ($self) = @_;
2657		3033
…		…
2660	glColor 0, 0, 0, 1;	3036	glColor 0, 0, 0, 1;
2661	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3037	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662	glDisable GL_TEXTURE_2D;	3038	glDisable GL_TEXTURE_2D;
2663		3039
2664	$self->{children}[1]->draw;	3040	$self->{children}[1]->draw;
2665
2666	}	3041	}
2667		3042
2668	#############################################################################	3043	#############################################################################
2669		3044
2670	package CFClient::UI::Animator;	3045	package CFPlus::UI::Animator;
2671		3046
2672	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2673		3048
2674	our @ISA = CFClient::UI::Bin::;	3049	our @ISA = CFPlus::UI::Bin::;
2675		3050
2676	sub moveto {	3051	sub moveto {
2677	my ($self, $x, $y) = @_;	3052	my ($self, $x, $y) = @_;
2678		3053
2679	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3054	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2707	glPopMatrix;	3082	glPopMatrix;
2708	}	3083	}
2709		3084
2710	#############################################################################	3085	#############################################################################
2711		3086
2712	package CFClient::UI::Flopper;	3087	package CFPlus::UI::Flopper;
2713		3088
2714	our @ISA = CFClient::UI::Button::;	3089	our @ISA = CFPlus::UI::Button::;
2715		3090
2716	sub new {	3091	sub new {
2717	my $class = shift;	3092	my $class = shift;
2718		3093
2719	my $self = $class->SUPER::new (	3094	my $self = $class->SUPER::new (
…		…
2731	$self->{other}->toggle_visibility;	3106	$self->{other}->toggle_visibility;
2732	}	3107	}
2733		3108
2734	#############################################################################	3109	#############################################################################
2735		3110
2736	package CFClient::UI::Tooltip;	3111	package CFPlus::UI::Tooltip;
2737		3112
2738	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2739		3114
2740	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2741		3116
2742	sub new {	3117	sub new {
2743	my $class = shift;	3118	my $class = shift;
2744		3119
2745	$class->SUPER::new (	3120	$class->SUPER::new (
…		…
2748	)	3123	)
2749	}	3124	}
2750		3125
2751	sub set_tooltip_from {	3126	sub set_tooltip_from {
2752	my ($self, $widget) = @_;	3127	my ($self, $widget) = @_;
		3128
		3129	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3130	if $widget->{tooltip} =~ /^#(.*)$/;
2753		3131
2754	my $tooltip = $widget->{tooltip};	3132	my $tooltip = $widget->{tooltip};
2755		3133
2756	if ($ENV{CFPLUS_DEBUG} & 2) {	3134	if ($ENV{CFPLUS_DEBUG} & 2) {
2757	$tooltip .= "\n\n" . (ref $widget) . "\n"	3135	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2761	}	3139	}
2762		3140
2763	$tooltip =~ s/^\n+//;	3141	$tooltip =~ s/^\n+//;
2764	$tooltip =~ s/\n+$//;	3142	$tooltip =~ s/\n+$//;
2765		3143
2766	$self->add (new CFClient::UI::Label	3144	$self->add (new CFPlus::UI::Label
2767	markup => $tooltip,	3145	markup => $tooltip,
2768	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3146	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769	fontsize => 0.8,	3147	fontsize => 0.8,
2770	fg => [0, 0, 0, 1],	3148	style => 1, # FLAG_INVERSE
2771	ellipsise => 0,	3149	ellipsise => 0,
2772	font => ($widget->{tooltip_font} || $::FONT_PROP),	3150	font => ($widget->{tooltip_font} || $::FONT_PROP),
2773	);	3151	);
2774	}	3152	}
2775		3153
…		…
2779	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3157	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780		3158
2781	($w + 4, $h + 4)	3159	($w + 4, $h + 4)
2782	}	3160	}
2783		3161
2784	sub size_allocate {	3162	sub invoke_size_allocate {
2785	my ($self, $w, $h) = @_;	3163	my ($self, $w, $h) = @_;
2786		3164
2787	$self->SUPER::size_allocate ($w - 4, $h - 4);	3165	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788	}	3166	}
2789		3167
2790	sub visibility_change {	3168	sub invoke_visibility_change {
2791	my ($self, $visible) = @_;	3169	my ($self, $visible) = @_;
2792		3170
2793	return unless $visible;	3171	return unless $visible;
2794		3172
2795	$self->{root}->on_post_alloc ("move_$self" => sub {	3173	$self->{root}->on_post_alloc ("move_$self" => sub {
2796	my $widget = $self->{owner}	3174	my $widget = $self->{owner}
2797	or return;	3175	or return;
2798		3176
		3177	if ($widget->{visible}) {
2799	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3178	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800		3179
2801	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3180	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802	if $x + $self->{w} > $self->{root}{w};	3181	if $x + $self->{w} > $self->{root}{w};
2803		3182
2804	$self->move_abs ($x, $y);	3183	$self->move_abs ($x, $y);
		3184	} else {
		3185	$self->hide;
		3186	}
2805	});	3187	});
2806	}	3188	}
2807		3189
2808	sub _draw {	3190	sub _draw {
2809	my ($self) = @_;	3191	my ($self) = @_;
…		…
2833	$self->SUPER::_draw;	3215	$self->SUPER::_draw;
2834	}	3216	}
2835		3217
2836	#############################################################################	3218	#############################################################################
2837		3219
2838	package CFClient::UI::Face;	3220	package CFPlus::UI::Face;
2839		3221
2840	our @ISA = CFClient::UI::Base::;	3222	our @ISA = CFPlus::UI::DrawBG::;
2841		3223
2842	use CFClient::OpenGL;	3224	use CFPlus::OpenGL;
2843		3225
2844	sub new {	3226	sub new {
2845	my $class = shift;	3227	my $class = shift;
2846		3228
2847	my $self = $class->SUPER::new (	3229	my $self = $class->SUPER::new (
…		…
2882	sub _draw {	3264	sub _draw {
2883	my ($self) = @_;	3265	my ($self) = @_;
2884		3266
2885	return unless $::CONN;	3267	return unless $::CONN;
2886		3268
		3269	$self->SUPER::_draw;
		3270
2887	my $face;	3271	my $face;
2888		3272
2889	if ($self->{frame}) {	3273	if ($self->{frame}) {
2890	my $anim = $::CONN->{anim}[$self->{anim}];	3274	my $anim = $::CONN->{anim}[$self->{anim}];
2891		3275
…		…
2913	$self->SUPER::destroy;	3297	$self->SUPER::destroy;
2914	}	3298	}
2915		3299
2916	#############################################################################	3300	#############################################################################
2917		3301
2918	package CFClient::UI::Buttonbar;	3302	package CFPlus::UI::Buttonbar;
2919		3303
2920	our @ISA = CFClient::UI::HBox::;	3304	our @ISA = CFPlus::UI::HBox::;
2921		3305
2922	# TODO: should actualyl wrap buttons and other goodies.	3306	# TODO: should actually wrap buttons and other goodies.
2923		3307
2924	#############################################################################	3308	#############################################################################
2925		3309
2926	package CFClient::UI::Menu;	3310	package CFPlus::UI::Menu;
2927		3311
2928	our @ISA = CFClient::UI::FancyFrame::;	3312	our @ISA = CFPlus::UI::Toplevel::;
2929		3313
2930	use CFClient::OpenGL;	3314	use CFPlus::OpenGL;
2931		3315
2932	sub new {	3316	sub new {
2933	my $class = shift;	3317	my $class = shift;
2934		3318
2935	my $self = $class->SUPER::new (	3319	my $self = $class->SUPER::new (
2936	items => [],	3320	items => [],
2937	z => 100,	3321	z => 100,
2938	@_,	3322	@_,
2939	);	3323	);
2940		3324
2941	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3325	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942		3326
2943	for my $item (@{ $self->{items} }) {	3327	for my $item (@{ $self->{items} }) {
2944	my ($widget, $cb, $tooltip) = @$item;	3328	my ($widget, $cb, $tooltip) = @$item;
2945		3329
2946	# handle various types of items, only text for now	3330	# handle various types of items, only text for now
2947	if (!ref $widget) {	3331	if (!ref $widget) {
		3332	if ($widget =~ /\t/) {
		3333	my ($left, $right) = split /\t/, $widget, 2;
		3334
2948	$widget = new CFClient::UI::Label	3335	$widget = new CFPlus::UI::HBox
2949	can_hover => 1,	3336	can_hover => 1,
2950	can_events => 1,	3337	can_events => 1,
		3338	tooltip => $tooltip,
		3339	children => [
		3340	(new CFPlus::UI::Label markup => $left, expand => 1),
		3341	(new CFPlus::UI::Label markup => $right, align => +1),
		3342	],
		3343	;
		3344
		3345	} else {
		3346	$widget = new CFPlus::UI::Label
		3347	can_hover => 1,
		3348	can_events => 1,
2951	markup => $widget,	3349	markup => $widget,
2952	tooltip => $tooltip	3350	tooltip => $tooltip;
		3351	}
2953	}	3352	}
2954		3353
2955	$self->{item}{$widget} = $item;	3354	$self->{item}{$widget} = $item;
2956		3355
2957	$self->{vbox}->add ($widget);	3356	$self->{vbox}->add ($widget);
…		…
2962		3361
2963	# popup given the event (must be a mouse button down event currently)	3362	# popup given the event (must be a mouse button down event currently)
2964	sub popup {	3363	sub popup {
2965	my ($self, $ev) = @_;	3364	my ($self, $ev) = @_;
2966		3365
2967	$self->_emit ("popdown");	3366	$self->emit ("popdown");
2968		3367
2969	# maybe save $GRAB? must be careful about events...	3368	# maybe save $GRAB? must be careful about events...
2970	$GRAB = $self;	3369	$GRAB = $self;
2971	$self->{button} = $ev->{button};	3370	$self->{button} = $ev->{button};
2972		3371
2973	$self->show;	3372	$self->show;
2974	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3373	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975	}	3374	}
2976		3375
2977	sub mouse_motion {	3376	sub invoke_mouse_motion {
2978	my ($self, $ev, $x, $y) = @_;	3377	my ($self, $ev, $x, $y) = @_;
2979		3378
2980	# TODO: should use vbox->find_widget or so	3379	# TODO: should use vbox->find_widget or so
2981	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3380	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982	$self->{hover} = $self->{item}{$HOVER};	3381	$self->{hover} = $self->{item}{$HOVER};
2983		3382
2984	0	3383	0
2985	}	3384	}
2986		3385
2987	sub button_up {	3386	sub invoke_button_up {
2988	my ($self, $ev, $x, $y) = @_;	3387	my ($self, $ev, $x, $y) = @_;
2989		3388
2990	if ($ev->{button} == $self->{button}) {	3389	if ($ev->{button} == $self->{button}) {
2991	undef $GRAB;	3390	undef $GRAB;
2992	$self->hide;	3391	$self->hide;
2993		3392
2994	$self->_emit ("popdown");	3393	$self->emit ("popdown");
2995	$self->{hover}[1]->() if $self->{hover};	3394	$self->{hover}[1]->() if $self->{hover};
2996	} else {	3395	} else {
2997	return 0	3396	return 0
2998	}	3397	}
2999		3398
3000	1	3399	1
3001	}	3400	}
3002		3401
3003	#############################################################################	3402	#############################################################################
3004		3403
3005	package CFClient::UI::Multiplexer;	3404	package CFPlus::UI::Multiplexer;
3006		3405
3007	our @ISA = CFClient::UI::Container::;	3406	our @ISA = CFPlus::UI::Container::;
3008		3407
3009	sub new {	3408	sub new {
3010	my $class = shift;	3409	my $class = shift;
3011		3410
3012	my $self = $class->SUPER::new (	3411	my $self = $class->SUPER::new (
…		…
3026		3425
3027	$self->{current} = $self->{children}[0]	3426	$self->{current} = $self->{children}[0]
3028	if @{ $self->{children} };	3427	if @{ $self->{children} };
3029	}	3428	}
3030		3429
		3430	sub get_current_page {
		3431	my ($self) = @_;
		3432
		3433	$self->{current}
		3434	}
		3435
3031	sub set_current_page {	3436	sub set_current_page {
3032	my ($self, $page_or_widget) = @_;	3437	my ($self, $page_or_widget) = @_;
3033		3438
3034	my $widget = ref $page_or_widget	3439	my $widget = ref $page_or_widget
3035	? $page_or_widget	3440	? $page_or_widget
3036	: $self->{children}[$page_or_widget];	3441	: $self->{children}[$page_or_widget];
3037		3442
3038	$self->{current} = $widget;	3443	$self->{current} = $widget;
3039	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3444	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040		3445
3041	$self->_emit (page_changed => $self->{current});	3446	$self->emit (page_changed => $self->{current});
3042		3447
3043	$self->realloc;	3448	$self->realloc;
3044	}	3449	}
3045		3450
3046	sub visible_children {	3451	sub visible_children {
…		…
3051	my ($self) = @_;	3456	my ($self) = @_;
3052		3457
3053	$self->{current}->size_request	3458	$self->{current}->size_request
3054	}	3459	}
3055		3460
3056	sub size_allocate {	3461	sub invoke_size_allocate {
3057	my ($self, $w, $h) = @_;	3462	my ($self, $w, $h) = @_;
3058		3463
3059	$self->{current}->configure (0, 0, $w, $h);	3464	$self->{current}->configure (0, 0, $w, $h);
		3465
		3466	1
3060	}	3467	}
3061		3468
3062	sub _draw {	3469	sub _draw {
3063	my ($self) = @_;	3470	my ($self) = @_;
3064		3471
3065	$self->{current}->draw;	3472	$self->{current}->draw;
3066	}	3473	}
3067		3474
3068	#############################################################################	3475	#############################################################################
3069		3476
3070	package CFClient::UI::Notebook;	3477	package CFPlus::UI::Notebook;
3071		3478
3072	our @ISA = CFClient::UI::VBox::;	3479	our @ISA = CFPlus::UI::VBox::;
3073		3480
3074	sub new {	3481	sub new {
3075	my $class = shift;	3482	my $class = shift;
3076		3483
3077	my $self = $class->SUPER::new (	3484	my $self = $class->SUPER::new (
3078	buttonbar => (new CFClient::UI::Buttonbar),	3485	buttonbar => (new CFPlus::UI::Buttonbar),
3079	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3486	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080	# filter => # will be put between multiplexer and $self	3487	# filter => # will be put between multiplexer and $self
3081	@_,	3488	@_,
3082	);	3489	);
3083		3490
3084	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3491	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3090	sub add {	3497	sub add {
3091	my ($self, $title, $widget, $tooltip) = @_;	3498	my ($self, $title, $widget, $tooltip) = @_;
3092		3499
3093	Scalar::Util::weaken $self;	3500	Scalar::Util::weaken $self;
3094		3501
3095	$self->{buttonbar}->add (new CFClient::UI::Button	3502	$self->{buttonbar}->add (new CFPlus::UI::Button
3096	markup => $title,	3503	markup => $title,
3097	tooltip => $tooltip,	3504	tooltip => $tooltip,
3098	on_activate => sub { $self->set_current_page ($widget) },	3505	on_activate => sub { $self->set_current_page ($widget) },
3099	);	3506	);
3100		3507
3101	$self->{multiplexer}->add ($widget);	3508	$self->{multiplexer}->add ($widget);
3102	}	3509	}
3103		3510
		3511	sub get_current_page {
		3512	my ($self) = @_;
		3513
		3514	$self->{multiplexer}->get_current_page
		3515	}
		3516
3104	sub set_current_page {	3517	sub set_current_page {
3105	my ($self, $page) = @_;	3518	my ($self, $page) = @_;
3106		3519
3107	$self->{multiplexer}->set_current_page ($page);	3520	$self->{multiplexer}->set_current_page ($page);
3108	$self->_emit (page_changed => $self->{multiplexer}{current});	3521	$self->emit (page_changed => $self->{multiplexer}{current});
3109	}	3522	}
3110		3523
3111	#############################################################################	3524	#############################################################################
3112		3525
3113	package CFClient::UI::Combobox;	3526	package CFPlus::UI::Selector;
3114		3527
3115	use utf8;	3528	use utf8;
3116		3529
3117	our @ISA = CFClient::UI::Button::;	3530	our @ISA = CFPlus::UI::Button::;
3118		3531
3119	sub new {	3532	sub new {
3120	my $class = shift;	3533	my $class = shift;
3121		3534
3122	my $self = $class->SUPER::new (	3535	my $self = $class->SUPER::new (
…		…
3128	$self->_set_value ($self->{value});	3541	$self->_set_value ($self->{value});
3129		3542
3130	$self	3543	$self
3131	}	3544	}
3132		3545
3133	sub button_down {	3546	sub invoke_button_down {
3134	my ($self, $ev) = @_;	3547	my ($self, $ev) = @_;
3135		3548
3136	my @menu_items;	3549	my @menu_items;
3137		3550
3138	for (@{ $self->{options} }) {	3551	for (@{ $self->{options} }) {
3139	my ($value, $title, $tooltip) = @$_;	3552	my ($value, $title, $tooltip) = @$_;
3140		3553
3141	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3554	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142	}	3555	}
3143		3556
3144	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3557	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145	}	3558	}
3146		3559
3147	sub _set_value {	3560	sub _set_value {
3148	my ($self, $value) = @_;	3561	my ($self, $value) = @_;
3149		3562
…		…
3159	my ($self, $value) = @_;	3572	my ($self, $value) = @_;
3160		3573
3161	return unless $self->{value} ne $value;	3574	return unless $self->{value} ne $value;
3162		3575
3163	$self->_set_value ($value);	3576	$self->_set_value ($value);
3164	$self->_emit (changed => $value);	3577	$self->emit (changed => $value);
3165	}	3578	}
3166		3579
3167	#############################################################################	3580	#############################################################################
3168		3581
3169	package CFClient::UI::Statusbox;	3582	package CFPlus::UI::Statusbox;
3170		3583
3171	our @ISA = CFClient::UI::VBox::;	3584	our @ISA = CFPlus::UI::VBox::;
3172		3585
3173	sub new {	3586	sub new {
3174	my $class = shift;	3587	my $class = shift;
3175		3588
3176	my $self = $class->SUPER::new (	3589	my $self = $class->SUPER::new (
…		…
3188	sub reorder {	3601	sub reorder {
3189	my ($self) = @_;	3602	my ($self) = @_;
3190	my $NOW = Time::HiRes::time;	3603	my $NOW = Time::HiRes::time;
3191		3604
3192	# freeze display when hovering over any label	3605	# freeze display when hovering over any label
3193	return if $CFClient::UI::TOOLTIP->{owner}	3606	return if $CFPlus::UI::TOOLTIP->{owner}
3194	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3607	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195	values %{ $self->{item} };	3608	values %{ $self->{item} };
3196		3609
3197	while (my ($k, $v) = each %{ $self->{item} }) {	3610	while (my ($k, $v) = each %{ $self->{item} }) {
3198	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3611	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199	}	3612	}
…		…
3220	for ($short) {	3633	for ($short) {
3221	s/^\s+//;	3634	s/^\s+//;
3222	s/\s+/ /g;	3635	s/\s+/ /g;
3223	}	3636	}
3224		3637
3225	new CFClient::UI::Label	3638	new CFPlus::UI::Label
3226	markup => $short,	3639	markup => $short,
3227	tooltip => $item->{tooltip},	3640	tooltip => $item->{tooltip},
3228	tooltip_font => $::FONT_PROP,	3641	tooltip_font => $::FONT_PROP,
3229	tooltip_width => 0.67,	3642	tooltip_width => 0.67,
3230	fontsize => $item->{fontsize} || $self->{fontsize},	3643	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3284	count => 1,	3697	count => 1,
3285	%arg,	3698	%arg,
3286	};	3699	};
3287	}	3700	}
3288		3701
		3702	$ROOT->on_refresh (reorder => sub {
3289	$self->reorder;	3703	$self->reorder;
		3704	});
3290	}	3705	}
3291		3706
3292	sub reconfigure {	3707	sub reconfigure {
3293	my ($self) = @_;	3708	my ($self) = @_;
3294		3709
…		…
3307	$self->SUPER::destroy;	3722	$self->SUPER::destroy;
3308	}	3723	}
3309		3724
3310	#############################################################################	3725	#############################################################################
3311		3726
3312	package CFClient::UI::Inventory;	3727	package CFPlus::UI::Inventory;
3313		3728
3314	our @ISA = CFClient::UI::ScrolledWindow::;	3729	our @ISA = CFPlus::UI::Table::;
3315		3730
3316	sub new {	3731	sub new {
3317	my $class = shift;	3732	my $class = shift;
3318		3733
3319	my $self = $class->SUPER::new (	3734	my $self = $class->SUPER::new (
3320	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3735	col_expand => [0, 1, 0],
		3736	items => [],
3321	@_,	3737	@_,
3322	);	3738	);
3323		3739
		3740	$self->set_sort_order (undef);
		3741
3324	$self	3742	$self
		3743	}
		3744
		3745	sub update_items {
		3746	my ($self) = @_;
		3747
		3748	$self->clear;
		3749
		3750	my @item = $self->{sort}->(@{ $self->{items} });
		3751
		3752	my @adds;
		3753	my $row = 0;
		3754	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3755	CFPlus::Item::update_widgets $item;
		3756
		3757	push @adds, 0, $row, $item->{face_widget};
		3758	push @adds, 1, $row, $item->{desc_widget};
		3759	push @adds, 2, $row, $item->{weight_widget};
		3760
		3761	$row++;
		3762	}
		3763
		3764	$self->add (@adds);
		3765	}
		3766
		3767	sub set_sort_order {
		3768	my ($self, $order) = @_;
		3769
		3770	$self->{sort} = $order ||= sub {
		3771	sort {
		3772	$a->{type} <=> $b->{type}
		3773	or $a->{name} cmp $b->{name}
		3774	} @_
		3775	};
		3776
		3777	$self->update_items;
3325	}	3778	}
3326		3779
3327	sub set_items {	3780	sub set_items {
3328	my ($self, $items) = @_;	3781	my ($self, $items) = @_;
3329		3782
3330	$self->{child}->clear;	3783	$self->{items} = [$items ? values %$items : ()];
3331	return unless $items;	3784	$self->update_items;
3332
3333	my @items = sort {
3334	($a->{type} <=> $b->{type})
3335	or ($a->{name} cmp $b->{name})
3336	} @$items;
3337
3338	$self->{real_items} = \@items;
3339
3340	my $row = 0;
3341	for my $item (@items) {
3342	CFClient::Item::update_widgets $item;
3343
3344	$self->{child}->add (0, $row, $item->{face_widget});
3345	$self->{child}->add (1, $row, $item->{desc_widget});
3346	$self->{child}->add (2, $row, $item->{weight_widget});
3347
3348	$row++;
3349	}
3350	}	3785	}
3351		3786
3352	#############################################################################	3787	#############################################################################
3353		3788
3354	package CFClient::UI::BindEditor;
3355
3356	our @ISA = CFClient::UI::FancyFrame::;
3357
3358	sub new {
3359	my $class = shift;
3360
3361	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363	$self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367	text => "start recording",
3368	tooltip => "Start/Stops recording of actions."
3369	."All subsequent actions after the recording started will be captured."
3370	."The actions are displayed after the record was stopped."
3371	."To bind the action you have to click on the 'Bind' button",
3372	on_activate => sub {
3373	unless ($self->{recording}) {
3374	$self->start;
3375	} else {
3376	$self->stop;
3377	}
3378	});
3379
3380	$vb->add (new CFClient::UI::Label text => "Actions:");
3381	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3384	$vb->add (my $hb = new CFClient::UI::HBox);
3385	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386	$hb->add (new CFClient::UI::Button
3387	text => "bind",
3388	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389	on_activate => sub {
3390	$self->ask_for_bind;
3391	});
3392
3393	$vb->add (my $hb = new CFClient::UI::HBox);
3394	$hb->add (new CFClient::UI::Button
3395	text => "ok",
3396	expand => 1,
3397	tooltip => "This closes the binding editor and saves the binding",
3398	on_activate => sub {
3399	$self->hide;
3400	$self->commit;
3401	});
3402
3403	$hb->add (new CFClient::UI::Button
3404	text => "cancel",
3405	expand => 1,
3406	tooltip => "This closes the binding editor without saving",
3407	on_activate => sub {
3408	$self->hide;
3409	$self->{binding_cancel}->()
3410	if $self->{binding_cancel};
3411	});
3412
3413	$self->update_binding_widgets;
3414
3415	$self
3416	}
3417
3418	sub commit {
3419	my ($self) = @_;
3420	my ($mod, $sym, $cmds) = $self->get_binding;
3421	if ($sym != 0 && @$cmds > 0) {
3422	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423	."'. Don't forget 'Save Config'!");
3424	$self->{binding_change}->($mod, $sym, $cmds)
3425	if $self->{binding_change};
3426	} else {
3427	$::STATUSBOX->add ("No action bound, no key or action specified!");
3428	$self->{binding_cancel}->()
3429	if $self->{binding_cancel};
3430	}
3431	}
3432
3433	sub start {
3434	my ($self) = @_;
3435
3436	$self->{rec_btn}->set_text ("stop recording");
3437	$self->{recording} = 1;
3438	$self->clear_command_list;
3439	$::CONN->start_record if $::CONN;
3440	}
3441
3442	sub stop {
3443	my ($self) = @_;
3444
3445	$self->{rec_btn}->set_text ("start recording");
3446	$self->{recording} = 0;
3447
3448	my $rec;
3449	$rec = $::CONN->stop_record if $::CONN;
3450	return unless ref $rec eq 'ARRAY';
3451	$self->set_command_list ($rec);
3452	}
3453
3454
3455	sub ask_for_bind_and_commit {
3456	my ($self) = @_;
3457	$self->ask_for_bind (1);
3458	}
3459
3460	sub ask_for_bind {
3461	my ($self, $commit) = @_;
3462
3463	CFClient::Binder::open_binding_dialog (sub {
3464	my ($mod, $sym) = @_;
3465	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466	$self->update_binding_widgets;
3467	$self->commit if $commit;
3468	});
3469	}
3470
3471	# $mod and $sym are the modifiers and key symbol
3472	# $cmds is a array ref of strings (the commands)
3473	# $cb is the callback that is executed on OK
3474	# $ccb is the callback that is executed on CANCEL and
3475	# when the binding was unsuccessful on OK
3476	sub set_binding {
3477	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479	$self->clear_command_list;
3480	$self->{recording} = 0;
3481	$self->{rec_btn}->set_text ("start recording");
3482
3483	$self->{binding} = [$mod, $sym];
3484	$self->{commands} = $cmds;
3485
3486	$self->{binding_change} = $cb;
3487	$self->{binding_cancel} = $ccb;
3488
3489	$self->update_binding_widgets;
3490	}
3491
3492	# this is a shortcut method that asks for a binding
3493	# and then just binds it.
3494	sub do_quick_binding {
3495	my ($self, $cmds) = @_;
3496	$self->set_binding (undef, undef, $cmds, sub {
3497	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498	});
3499	$self->ask_for_bind (1);
3500	}
3501
3502	sub update_binding_widgets {
3503	my ($self) = @_;
3504	my ($mod, $sym, $cmds) = $self->get_binding;
3505	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506	$self->set_command_list ($cmds);
3507	}
3508
3509	sub get_binding {
3510	my ($self) = @_;
3511	return (
3512	$self->{binding}->[0],
3513	$self->{binding}->[1],
3514	[ grep { defined $_ } @{$self->{commands}} ]
3515	);
3516	}
3517
3518	sub clear_command_list {
3519	my ($self) = @_;
3520	$self->{cmdbox}->clear ();
3521	}
3522
3523	sub set_command_list {
3524	my ($self, $cmds) = @_;
3525
3526	$self->{cmdbox}->clear ();
3527	$self->{commands} = $cmds;
3528
3529	my $idx = 0;
3530
3531	for (@$cmds) {
3532	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534	my $i = $idx;
3535	$hb->add (new CFClient::UI::Label text => $_);
3536	$hb->add (new CFClient::UI::Button
3537	text => "delete",
3538	tooltip => "Deletes the action from the record",
3539	on_activate => sub {
3540	$self->{cmdbox}->remove ($hb);
3541	$cmds->[$i] = undef;
3542	});
3543
3544
3545	$idx++
3546	}
3547	}
3548
3549	#############################################################################
3550
3551	package CFClient::UI::SpellList;	3789	package CFPlus::UI::SpellList;
3552		3790
3553	our @ISA = CFClient::UI::Table::;	3791	our @ISA = CFPlus::UI::Table::;
3554		3792
3555	sub new {	3793	sub new {
3556	my $class = shift;	3794	my $class = shift;
3557		3795
3558	my $self = $class->SUPER::new (	3796	my $self = $class->SUPER::new (
…		…
3576	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3814	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577		3815
3578	sub rebuild_spell_list {	3816	sub rebuild_spell_list {
3579	my ($self) = @_;	3817	my ($self) = @_;
3580		3818
3581	$CFClient::UI::ROOT->on_refresh ($self => sub {	3819	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3582	$self->clear;	3820	$self->clear;
3583		3821
3584	return unless $::CONN;	3822	return unless $::CONN;
3585		3823
3586	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3824	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3825	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3826	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3827	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3828	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591		3829
3592	my $row = 0;	3830	my $row = 0;
3593		3831
3594	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3832	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595	my $spell = $self->{spell}{$_};	3833	my $spell = $self->{spell}{$_};
…		…
3602	if ($ev->{button} == 1) {	3840	if ($ev->{button} == 1) {
3603	$::CONN->user_send ("cast $spell->{name}");	3841	$::CONN->user_send ("cast $spell->{name}");
3604	} elsif ($ev->{button} == 2) {	3842	} elsif ($ev->{button} == 2) {
3605	$::CONN->user_send ("invoke $spell->{name}");	3843	$::CONN->user_send ("invoke $spell->{name}");
3606	} elsif ($ev->{button} == 3) {	3844	} elsif ($ev->{button} == 3) {
3607	(new CFClient::UI::Menu	3845	(new CFPlus::UI::Menu
3608	items => [	3846	items => [
3609	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3847	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3848	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611	],	3849	],
3612	)->popup ($ev);	3850	)->popup ($ev);
3613	} else {	3851	} else {
3614	return 0;	3852	return 0;
3615	}	3853	}
3616		3854
3617	1	3855	1
3618	};	3856	};
3619		3857
3620	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3858	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3621		3859
3622	#TODO: add path info to tooltip	3860	#TODO: add path info to tooltip
3623	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3861	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3624		3862
3625	$self->add (0, $row, new CFClient::UI::Face	3863	$self->add (0, $row, new CFPlus::UI::Face
3626	face => $spell->{face},	3864	face => $spell->{face},
3627	can_hover => 1,	3865	can_hover => 1,
3628	can_events => 1,	3866	can_events => 1,
3629	tooltip => $tooltip,	3867	tooltip => $tooltip,
3630	on_button_down => $spell_cb,	3868	on_button_down => $spell_cb,
3631	);	3869	);
3632		3870
3633	$self->add (1, $row, new CFClient::UI::Label	3871	$self->add (1, $row, new CFPlus::UI::Label
3634	expand => 1,	3872	expand => 1,
3635	text => $spell->{name},	3873	text => $spell->{name},
3636	can_hover => 1,	3874	can_hover => 1,
3637	can_events => 1,	3875	can_events => 1,
3638	tooltip => $tooltip,	3876	tooltip => $tooltip,
3639	on_button_down => $spell_cb,	3877	on_button_down => $spell_cb,
3640	);	3878	);
3641		3879
3642	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3880	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3881	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3882	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3883	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646	}	3884	}
3647	});	3885	});
3648	}	3886	}
3649		3887
3650	sub add_spell {	3888	sub add_spell {
…		…
3668	$self->rebuild_spell_list;	3906	$self->rebuild_spell_list;
3669	}	3907	}
3670		3908
3671	#############################################################################	3909	#############################################################################
3672		3910
3673	package CFClient::UI::Root;	3911	package CFPlus::UI::Root;
3674		3912
3675	our @ISA = CFClient::UI::Container::;	3913	our @ISA = CFPlus::UI::Container::;
3676		3914
3677	use List::Util qw(min max);	3915	use List::Util qw(min max);
3678		3916
3679	use CFClient::OpenGL;	3917	use CFPlus::OpenGL;
3680		3918
3681	sub new {	3919	sub new {
3682	my $class = shift;	3920	my $class = shift;
3683		3921
3684	my $self = $class->SUPER::new (	3922	my $self = $class->SUPER::new (
…		…
3709	$coord = $max - $size if $coord > $max - $size;	3947	$coord = $max - $size if $coord > $max - $size;
3710		3948
3711	int $coord + 0.5	3949	int $coord + 0.5
3712	}	3950	}
3713		3951
3714	sub size_allocate {	3952	sub invoke_size_allocate {
3715	my ($self, $w, $h) = @_;	3953	my ($self, $w, $h) = @_;
3716		3954
3717	for my $child ($self->children) {	3955	for my $child ($self->children) {
3718	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3956	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719		3957
…		…
3723	$X = _to_pixel $X, $W, $self->{w};	3961	$X = _to_pixel $X, $W, $self->{w};
3724	$Y = _to_pixel $Y, $H, $self->{h};	3962	$Y = _to_pixel $Y, $H, $self->{h};
3725		3963
3726	$child->configure ($X, $Y, $W, $H);	3964	$child->configure ($X, $Y, $W, $H);
3727	}	3965	}
		3966
		3967	1
3728	}	3968	}
3729		3969
3730	sub coord2local {	3970	sub coord2local {
3731	my ($self, $x, $y) = @_;	3971	my ($self, $x, $y) = @_;
3732		3972
…		…
3858	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4098	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859		4099
3860	$w = 0 if $w < 0;	4100	$w = 0 if $w < 0;
3861	$h = 0 if $h < 0;	4101	$h = 0 if $h < 0;
3862		4102
		4103	$w = max $widget->{min_w}, $w;
		4104	$h = max $widget->{min_h}, $h;
		4105
		4106	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4107	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4108
		4109	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4110	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4111
3863	$w = int $w + 0.5;	4112	$w = int $w + 0.5;
3864	$h = int $h + 0.5;	4113	$h = int $h + 0.5;
3865		4114
3866	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4115	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867	$widget->{old_w} = $widget->{w};	4116	$widget->{old_w} = $widget->{w};
…		…
3890	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4139	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891	glMatrixMode GL_MODELVIEW;	4140	glMatrixMode GL_MODELVIEW;
3892	glLoadIdentity;	4141	glLoadIdentity;
3893		4142
3894	{	4143	{
3895	package CFClient::UI::Base;	4144	package CFPlus::UI::Base;
3896		4145
3897	($draw_x, $draw_y, $draw_w, $draw_h) =	4146	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898	(0, 0, $self->{w}, $self->{h});	4147	(0, 0, $self->{w}, $self->{h});
3899	}
3900		4148
3901	$self->_draw;	4149	$self->_draw;
		4150	}
3902	}	4151	}
3903		4152
3904	#############################################################################	4153	#############################################################################
3905		4154
3906	package CFClient::UI;	4155	package CFPlus::UI;
3907		4156
3908	$ROOT = new CFClient::UI::Root;	4157	$ROOT = new CFPlus::UI::Root;
3909	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4158	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910		4159
3911	1	4160	1
3912		4161

Diff Legend

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