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

Diff Legend

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