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.285 by root, Mon Jun 5 03:07:01 2006 UTC vs.
Revision 1.347 by root, Mon Aug 14 03:41:28 2006 UTC

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

Diff Legend

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