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.292 by root, Tue Jun 6 03:02:15 2006 UTC vs.
Revision 1.350 by root, Sat Aug 19 18:39:24 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);
1559		1769
1560	delete $self->{size_req};	1770	delete $self->{size_req};
1561	$self->realloc;	1771	$self->realloc;
1562	$self->update;	1772	$self->update;
…		…
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);
1575		1784
1576	delete $self->{size_req};	1785	delete $self->{size_req};
1577	$self->realloc;	1786	$self->realloc;
1578	$self->update;	1787	$self->update;
…		…
1590		1799
1591	my ($w, $h) = $self->{layout}->size;	1800	my ($w, $h) = $self->{layout}->size;
1592		1801
1593	if (exists $self->{template}) {	1802	if (exists $self->{template}) {
1594	$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);
1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1805	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596		1806
1597	my ($w2, $h2) = $self->{template}->size;	1807	my ($w2, $h2) = $self->{template}->size;
1598		1808
1599	$w = List::Util::max $w, $w2;	1809	$w = List::Util::max $w, $w2;
…		…
1604	};	1814	};
1605		1815
1606	@{ $self->{size_req} }	1816	@{ $self->{size_req} }
1607	}	1817	}
1608		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
1627	sub reconfigure {	1844	sub reconfigure {
1628	my ($self) = @_;	1845	my ($self) = @_;
1629		1846
1630	delete $self->{size_req};	1847	delete $self->{size_req};
		1848	delete $self->{texture};
1631		1849
1632	$self->SUPER::reconfigure;	1850	$self->SUPER::reconfigure;
1633	}	1851	}
1634		1852
1635	sub _draw {	1853	sub _draw {
1636	my ($self) = @_;	1854	my ($self) = @_;
1637		1855
1638	$self->SUPER::_draw; # draw background, if applicable	1856	$self->SUPER::_draw; # draw background, if applicable
1639		1857
1640	my $tex = $self->{texture} ||= do {	1858	my $size = $self->{texture} ||= do {
1641	$self->{layout}->set_foreground (@{$self->{fg}});	1859	$self->{layout}->set_foreground (@{$self->{fg}});
1642	$self->{layout}->set_font ($self->{font}) if $self->{font};	1860	$self->{layout}->set_font ($self->{font}) if $self->{font};
1643	$self->{layout}->set_width ($self->{w});	1861	$self->{layout}->set_width ($self->{w});
1644	$self->{layout}->set_ellipsise ($self->{ellipsise});	1862	$self->{layout}->set_ellipsise ($self->{ellipsise});
1645	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1863	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1864	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647		1865
1648	new_from_layout CFClient::Texture $self->{layout}	1866	[$self->{layout}->size]
1649	};	1867	};
1650		1868
1651	unless (exists $self->{ox}) {	1869	unless (exists $self->{ox}) {
1652	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1870	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1871	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654	: ($self->{w} - $tex->{w}) * 0.5);	1872	: ($self->{w} - $size->[0]) * 0.5);
1655		1873
1656	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1874	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1875	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658	: ($self->{h} - $tex->{h}) * 0.5);	1876	: ($self->{h} - $size->[1]) * 0.5);
1659	};	1877	};
1660		1878
1661	glEnable GL_TEXTURE_2D;	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
		1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1662		1881
1663	if ($tex->{format} == GL_ALPHA) {	1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665	glColor @{$self->{fg}};
1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667	} else {
1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670	}
1671
1672	glDisable GL_TEXTURE_2D;
1673	}	1883	}
1674		1884
1675	#############################################################################	1885	#############################################################################
1676		1886
1677	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1678		1888
1679	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1680		1890
1681	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1682		1892
1683	sub new {	1893	sub new {
1684	my $class = shift;	1894	my $class = shift;
1685		1895
1686	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1710		1920
1711	$text =~ s/./*/g if $self->{hidden};	1921	$text =~ s/./*/g if $self->{hidden};
1712	$self->{layout}->set_text ("$text ");	1922	$self->{layout}->set_text ("$text ");
1713	delete $self->{size_req};	1923	delete $self->{size_req};
1714		1924
1715	$self->_emit (changed => $self->{text});	1925	$self->emit (changed => $self->{text});
1716		1926
1717	$self->realloc;	1927	$self->realloc;
1718	$self->update;	1928	$self->update;
1719	}	1929	}
1720		1930
…		…
1735	my ($w, $h) = $self->SUPER::size_request;	1945	my ($w, $h) = $self->SUPER::size_request;
1736		1946
1737	($w + 1, $h) # add 1 for cursor	1947	($w + 1, $h) # add 1 for cursor
1738	}	1948	}
1739		1949
1740	sub key_down {	1950	sub invoke_key_down {
1741	my ($self, $ev) = @_;	1951	my ($self, $ev) = @_;
1742		1952
1743	my $mod = $ev->{mod};	1953	my $mod = $ev->{mod};
1744	my $sym = $ev->{sym};	1954	my $sym = $ev->{sym};
1745	my $uni = $ev->{unicode};	1955	my $uni = $ev->{unicode};
…		…
1748		1958
1749	if ($uni == 8) {	1959	if ($uni == 8) {
1750	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1751	} elsif ($uni == 127) {	1961	} elsif ($uni == 127) {
1752	substr $text, $self->{cursor}, 1, "";	1962	substr $text, $self->{cursor}, 1, "";
1753	} elsif ($sym == CFClient::SDLK_LEFT) {	1963	} elsif ($sym == CFPlus::SDLK_LEFT) {
1754	--$self->{cursor} if $self->{cursor};	1964	--$self->{cursor} if $self->{cursor};
1755	} elsif ($sym == CFClient::SDLK_RIGHT) {	1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1756	++$self->{cursor} if $self->{cursor} < length $self->{text};	1966	++$self->{cursor} if $self->{cursor} < length $self->{text};
1757	} elsif ($sym == CFClient::SDLK_HOME) {	1967	} elsif ($sym == CFPlus::SDLK_HOME) {
1758	$self->{cursor} = 0;	1968	$self->{cursor} = 0;
1759	} elsif ($sym == CFClient::SDLK_END) {	1969	} elsif ($sym == CFPlus::SDLK_END) {
1760	$self->{cursor} = length $text;	1970	$self->{cursor} = length $text;
		1971	} elsif ($uni == 21) { # ctrl-u
		1972	$text = "";
		1973	$self->{cursor} = 0;
1761	} elsif ($uni == 27) {	1974	} elsif ($uni == 27) {
1762	$self->_emit ('escape');	1975	$self->emit ('escape');
1763	} elsif ($uni) {	1976	} elsif ($uni) {
1764	substr $text, $self->{cursor}++, 0, chr $uni;	1977	substr $text, $self->{cursor}++, 0, chr $uni;
1765	} else {	1978	} else {
1766	return 0;	1979	return 0;
1767	}	1980	}
…		…
1771	$self->realloc;	1984	$self->realloc;
1772		1985
1773	1	1986	1
1774	}	1987	}
1775		1988
1776	sub focus_in {	1989	sub invoke_focus_in {
1777	my ($self) = @_;	1990	my ($self) = @_;
1778		1991
1779	$self->{last_activity} = $::NOW;	1992	$self->{last_activity} = $::NOW;
1780		1993
1781	$self->SUPER::focus_in;	1994	$self->SUPER::invoke_focus_in
1782	}	1995	}
1783		1996
1784	sub button_down {	1997	sub invoke_button_down {
1785	my ($self, $ev, $x, $y) = @_;	1998	my ($self, $ev, $x, $y) = @_;
1786		1999
1787	$self->SUPER::button_down ($ev, $x, $y);	2000	$self->SUPER::invoke_button_down ($ev, $x, $y);
1788		2001
1789	my $idx = $self->{layout}->xy_to_index ($x, $y);	2002	my $idx = $self->{layout}->xy_to_index ($x, $y);
1790		2003
1791	# byte-index to char-index	2004	# byte-index to char-index
1792	my $text = $self->{text};	2005	my $text = $self->{text};
1793	utf8::encode $text;	2006	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1794	$self->{cursor} = length substr $text, 0, $idx;	2007	$self->{cursor} = length $text;
1795		2008
1796	$self->_set_text ($self->{text});	2009	$self->_set_text ($self->{text});
1797	$self->update;	2010	$self->update;
1798		2011
1799	1	2012	1
1800	}	2013	}
1801		2014
1802	sub mouse_motion {	2015	sub invoke_mouse_motion {
1803	my ($self, $ev, $x, $y) = @_;	2016	my ($self, $ev, $x, $y) = @_;
1804	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2017	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805		2018
1806	0	2019	1
1807	}	2020	}
1808		2021
1809	sub _draw {	2022	sub _draw {
1810	my ($self) = @_;	2023	my ($self) = @_;
1811		2024
…		…
1838	utf8::encode $text;	2051	utf8::encode $text;
1839		2052
1840	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2053	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1841	}	2054	}
1842		2055
1843	glColor @{$self->{fg}};
1844	glBegin GL_LINES;	2056	glBegin GL_LINES;
1845	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2057	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1846	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2058	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1847	glEnd;	2059	glEnd;
1848	}	2060	}
1849	}	2061	}
1850		2062
1851	package CFClient::UI::Entry;	2063	package CFPlus::UI::Entry;
1852		2064
1853	our @ISA = CFClient::UI::EntryBase::;	2065	our @ISA = CFPlus::UI::EntryBase::;
1854		2066
1855	use CFClient::OpenGL;	2067	use CFPlus::OpenGL;
1856		2068
1857	sub key_down {	2069	sub invoke_key_down {
1858	my ($self, $ev) = @_;	2070	my ($self, $ev) = @_;
1859		2071
1860	my $sym = $ev->{sym};	2072	my $sym = $ev->{sym};
1861		2073
1862	if ($sym == 13) {	2074	if ($sym == 13) {
1863	unshift @{$self->{history}},	2075	unshift @{$self->{history}},
1864	my $txt = $self->get_text;	2076	my $txt = $self->get_text;
		2077
1865	$self->{history_pointer} = -1;	2078	$self->{history_pointer} = -1;
1866	$self->{history_saveback} = '';	2079	$self->{history_saveback} = '';
1867	$self->_emit (activate => $txt);	2080	$self->emit (activate => $txt);
1868	$self->update;	2081	$self->update;
1869		2082
1870	} elsif ($sym == CFClient::SDLK_UP) {	2083	} elsif ($sym == CFPlus::SDLK_UP) {
1871	if ($self->{history_pointer} < 0) {	2084	if ($self->{history_pointer} < 0) {
1872	$self->{history_saveback} = $self->get_text;	2085	$self->{history_saveback} = $self->get_text;
1873	}	2086	}
1874	if (@{$self->{history} || []} > 0) {	2087	if (@{$self->{history} || []} > 0) {
1875	$self->{history_pointer}++;	2088	$self->{history_pointer}++;
…		…
1877	$self->{history_pointer} = @{$self->{history} || []} - 1;	2090	$self->{history_pointer} = @{$self->{history} || []} - 1;
1878	}	2091	}
1879	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2092	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1880	}	2093	}
1881		2094
1882	} elsif ($sym == CFClient::SDLK_DOWN) {	2095	} elsif ($sym == CFPlus::SDLK_DOWN) {
1883	$self->{history_pointer}--;	2096	$self->{history_pointer}--;
1884	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2097	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1885		2098
1886	if ($self->{history_pointer} >= 0) {	2099	if ($self->{history_pointer} >= 0) {
1887	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2100	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1888	} else {	2101	} else {
1889	$self->set_text ($self->{history_saveback});	2102	$self->set_text ($self->{history_saveback});
1890	}	2103	}
1891		2104
1892	} else {	2105	} else {
1893	return $self->SUPER::key_down ($ev)	2106	return $self->SUPER::invoke_key_down ($ev)
1894	}	2107	}
1895		2108
1896	1	2109	1
1897	}	2110	}
1898		2111
1899	#############################################################################	2112	#############################################################################
1900		2113
1901	package CFClient::UI::Button;	2114	package CFPlus::UI::Button;
1902		2115
1903	our @ISA = CFClient::UI::Label::;	2116	our @ISA = CFPlus::UI::Label::;
1904		2117
1905	use CFClient::OpenGL;	2118	use CFPlus::OpenGL;
1906		2119
1907	my @tex =	2120	my @tex =
1908	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2121	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1909	qw(b1_button_active.png);	2122	qw(b1_button_active.png);
1910		2123
1911	sub new {	2124	sub new {
1912	my $class = shift;	2125	my $class = shift;
1913		2126
…		…
1922	can_events => 1,	2135	can_events => 1,
1923	@_	2136	@_
1924	)	2137	)
1925	}	2138	}
1926		2139
1927	sub activate { }
1928
1929	sub button_up {	2140	sub invoke_button_up {
1930	my ($self, $ev, $x, $y) = @_;	2141	my ($self, $ev, $x, $y) = @_;
1931		2142
1932	$self->emit ("activate")	2143	$self->emit ("activate")
1933	if $x >= 0 && $x < $self->{w}	2144	if $x >= 0 && $x < $self->{w}
1934	&& $y >= 0 && $y < $self->{h};	2145	&& $y >= 0 && $y < $self->{h};
…		…
1952	$self->SUPER::_draw;	2163	$self->SUPER::_draw;
1953	}	2164	}
1954		2165
1955	#############################################################################	2166	#############################################################################
1956		2167
1957	package CFClient::UI::CheckBox;	2168	package CFPlus::UI::CheckBox;
1958		2169
1959	our @ISA = CFClient::UI::DrawBG::;	2170	our @ISA = CFPlus::UI::DrawBG::;
1960		2171
1961	my @tex =	2172	my @tex =
1962	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2173	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1963	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2174	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1964		2175
1965	use CFClient::OpenGL;	2176	use CFPlus::OpenGL;
1966		2177
1967	sub new {	2178	sub new {
1968	my $class = shift;	2179	my $class = shift;
1969		2180
1970	$class->SUPER::new (	2181	$class->SUPER::new (
…		…
1984	my ($self) = @_;	2195	my ($self) = @_;
1985		2196
1986	(6) x 2	2197	(6) x 2
1987	}	2198	}
1988		2199
		2200	sub toggle {
		2201	my ($self) = @_;
		2202
		2203	$self->{state} = !$self->{state};
		2204	$self->emit (changed => $self->{state});
		2205	$self->update;
		2206	}
		2207
1989	sub button_down {	2208	sub invoke_button_down {
1990	my ($self, $ev, $x, $y) = @_;	2209	my ($self, $ev, $x, $y) = @_;
1991		2210
1992	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2211	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1993	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2212	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1994	$self->{state} = !$self->{state};	2213	$self->toggle;
1995	$self->_emit (changed => $self->{state});
1996	} else {	2214	} else {
1997	return 0	2215	return 0
1998	}	2216	}
1999		2217
2000	1	2218	1
…		…
2020	glDisable GL_TEXTURE_2D;	2238	glDisable GL_TEXTURE_2D;
2021	}	2239	}
2022		2240
2023	#############################################################################	2241	#############################################################################
2024		2242
2025	package CFClient::UI::Image;	2243	package CFPlus::UI::Image;
2026		2244
2027	our @ISA = CFClient::UI::Base::;	2245	our @ISA = CFPlus::UI::Base::;
2028		2246
2029	use CFClient::OpenGL;	2247	use CFPlus::OpenGL;
2030	use Carp qw/confess/;
2031		2248
2032	our %loaded_images;	2249	our %texture_cache;
2033		2250
2034	sub new {	2251	sub new {
2035	my $class = shift;	2252	my $class = shift;
2036		2253
2037	my $self = $class->SUPER::new (can_events => 0, @_);	2254	my $self = $class->SUPER::new (
		2255	can_events => 0,
		2256	@_,
		2257	);
2038		2258
2039	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2259	$self->{path} || $self->{tex}
		2260	or Carp::croak "'path' or 'tex' attributes required";
2040		2261
2041	$loaded_images{$self->{image}} ||=	2262	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2042	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2263	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2043		2264
2044	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2265	Scalar::Util::weaken $texture_cache{$self->{path}};
2045		2266
2046	Scalar::Util::weaken $loaded_images{$self->{image}};	2267	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2047
2048	$self->{aspect} = $tex->{w} / $tex->{h};
2049		2268
2050	$self	2269	$self
2051	}	2270	}
2052		2271
		2272	sub STORABLE_freeze {
		2273	my ($self, $cloning) = @_;
		2274
		2275	$self->{path}
		2276	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2277
		2278	$self->{path}
		2279	}
		2280
		2281	sub STORABLE_attach {
		2282	my ($self, $cloning, $path) = @_;
		2283
		2284	$self->new (path => $path)
		2285	}
		2286
2053	sub size_request {	2287	sub size_request {
2054	my ($self) = @_;	2288	my ($self) = @_;
2055		2289
2056	($self->{tex}->{w}, $self->{tex}->{h})	2290	($self->{tex}{w}, $self->{tex}{h})
2057	}	2291	}
2058		2292
2059	sub _draw {	2293	sub _draw {
2060	my ($self) = @_;	2294	my ($self) = @_;
2061		2295
…		…
2071	}	2305	}
2072		2306
2073	glEnable GL_TEXTURE_2D;	2307	glEnable GL_TEXTURE_2D;
2074	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2308	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2075		2309
2076	$tex->draw_quad_alpha (0, 0, $w, $h);	2310	$tex->draw_quad (0, 0, $w, $h);
2077		2311
2078	glDisable GL_TEXTURE_2D;	2312	glDisable GL_TEXTURE_2D;
2079	}	2313	}
2080		2314
2081	#############################################################################	2315	#############################################################################
2082		2316
		2317	package CFPlus::UI::ImageButton;
		2318
		2319	our @ISA = CFPlus::UI::Image::;
		2320
		2321	use CFPlus::OpenGL;
		2322
		2323	my %textures;
		2324
		2325	sub new {
		2326	my $class = shift;
		2327
		2328	my $self = $class->SUPER::new (
		2329	padding_x => 4,
		2330	padding_y => 4,
		2331	fg => [1, 1, 1],
		2332	active_fg => [0, 0, 1],
		2333	can_hover => 1,
		2334	align => 0,
		2335	valign => 0,
		2336	can_events => 1,
		2337	@_
		2338	);
		2339	}
		2340
		2341	sub invoke_button_up {
		2342	my ($self, $ev, $x, $y) = @_;
		2343
		2344	$self->emit ("activate")
		2345	if $x >= 0 && $x < $self->{w}
		2346	&& $y >= 0 && $y < $self->{h};
		2347
		2348	1
		2349	}
		2350
		2351	#############################################################################
		2352
2083	package CFClient::UI::VGauge;	2353	package CFPlus::UI::VGauge;
2084		2354
2085	our @ISA = CFClient::UI::Base::;	2355	our @ISA = CFPlus::UI::Base::;
2086		2356
2087	use List::Util qw(min max);	2357	use List::Util qw(min max);
2088		2358
2089	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
2090		2360
2091	my %tex = (	2361	my %tex = (
2092	food => [	2362	food => [
2093	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2094	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2364	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2095	],	2365	],
2096	grace => [	2366	grace => [
2097	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2367	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2098	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2368	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2099	],	2369	],
2100	hp => [	2370	hp => [
2101	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2371	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2372	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2103	],	2373	],
2104	mana => [	2374	mana => [
2105	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2375	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2376	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2107	],	2377	],
2108	);	2378	);
2109		2379
2110	# eg. VGauge->new (gauge => 'food'), default gauge: food	2380	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2170	my $ycut1 = max 0, min 1, $ycut;	2440	my $ycut1 = max 0, min 1, $ycut;
2171	my $ycut2 = max 0, min 1, $ycut - 1;	2441	my $ycut2 = max 0, min 1, $ycut - 1;
2172		2442
2173	my $h1 = $self->{h} * (1 - $ycut1);	2443	my $h1 = $self->{h} * (1 - $ycut1);
2174	my $h2 = $self->{h} * (1 - $ycut2);	2444	my $h2 = $self->{h} * (1 - $ycut2);
		2445	my $h3 = $self->{h};
		2446
		2447	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2175		2448
2176	glEnable GL_BLEND;	2449	glEnable GL_BLEND;
2177	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2450	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2451	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2179	glEnable GL_TEXTURE_2D;	2452	glEnable GL_TEXTURE_2D;
…		…
2198		2471
2199	if ($t3) {	2472	if ($t3) {
2200	glBindTexture GL_TEXTURE_2D, $t3->{name};	2473	glBindTexture GL_TEXTURE_2D, $t3->{name};
2201	glBegin GL_QUADS;	2474	glBegin GL_QUADS;
2202	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2475	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2203	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2476	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2204	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2477	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2205	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2478	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2206	glEnd;	2479	glEnd;
2207	}	2480	}
2208		2481
2209	glDisable GL_BLEND;	2482	glDisable GL_BLEND;
2210	glDisable GL_TEXTURE_2D;	2483	glDisable GL_TEXTURE_2D;
2211	}	2484	}
2212		2485
2213	#############################################################################	2486	#############################################################################
2214		2487
2215	package CFClient::UI::Gauge;	2488	package CFPlus::UI::Gauge;
2216		2489
2217	our @ISA = CFClient::UI::VBox::;	2490	our @ISA = CFPlus::UI::VBox::;
2218		2491
2219	sub new {	2492	sub new {
2220	my ($class, %arg) = @_;	2493	my ($class, %arg) = @_;
2221		2494
2222	my $self = $class->SUPER::new (	2495	my $self = $class->SUPER::new (
…		…
2224	can_hover => 1,	2497	can_hover => 1,
2225	can_events => 1,	2498	can_events => 1,
2226	%arg,	2499	%arg,
2227	);	2500	);
2228		2501
2229	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2502	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2230	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2503	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2231	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2504	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2232		2505
2233	$self	2506	$self
2234	}	2507	}
2235		2508
2236	sub set_fontsize {	2509	sub set_fontsize {
…		…
2257	$self->{value}->set_text ($val);	2530	$self->{value}->set_text ($val);
2258	}	2531	}
2259		2532
2260	#############################################################################	2533	#############################################################################
2261		2534
2262	package CFClient::UI::Slider;	2535	package CFPlus::UI::Slider;
2263		2536
2264	use strict;	2537	use strict;
2265		2538
2266	use CFClient::OpenGL;	2539	use CFPlus::OpenGL;
2267		2540
2268	our @ISA = CFClient::UI::DrawBG::;	2541	our @ISA = CFPlus::UI::DrawBG::;
2269		2542
2270	my @tex =	2543	my @tex =
2271	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2544	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2272	qw(s1_slider.png s1_slider_bg.png);	2545	qw(s1_slider.png s1_slider_bg.png);
2273		2546
2274	sub new {	2547	sub new {
2275	my $class = shift;	2548	my $class = shift;
2276		2549
…		…
2297	$self->update;	2570	$self->update;
2298		2571
2299	$self	2572	$self
2300	}	2573	}
2301		2574
2302	sub changed { }
2303
2304	sub set_range {	2575	sub set_range {
2305	my ($self, $range) = @_;	2576	my ($self, $range) = @_;
2306		2577
2307	($range, $self->{range}) = ($self->{range}, $range);	2578	($range, $self->{range}) = ($self->{range}, $range);
2308		2579
2309	$self->update
2310	if "@$range" ne "@{$self->{range}}";	2580	if ("@$range" ne "@{$self->{range}}") {
		2581	$self->update;
		2582	$self->set_value ($self->{range}[0]);
		2583	}
2311	}	2584	}
2312		2585
2313	sub set_value {	2586	sub set_value {
2314	my ($self, $value) = @_;	2587	my ($self, $value) = @_;
2315		2588
…		…
2326	if $unit;	2599	if $unit;
2327		2600
2328	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2601	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329		2602
2330	if ($value != $old_value) {	2603	if ($value != $old_value) {
2331	$self->_emit (changed => $value);	2604	$self->emit (changed => $value);
2332	$self->update;	2605	$self->update;
2333	}	2606	}
2334	}	2607	}
2335		2608
2336	sub size_request {	2609	sub size_request {
2337	my ($self) = @_;	2610	my ($self) = @_;
2338		2611
2339	($self->{req_w}, $self->{req_h})	2612	($self->{req_w}, $self->{req_h})
2340	}	2613	}
2341		2614
2342	sub button_down {	2615	sub invoke_button_down {
2343	my ($self, $ev, $x, $y) = @_;	2616	my ($self, $ev, $x, $y) = @_;
2344		2617
2345	$self->SUPER::button_down ($ev, $x, $y);	2618	$self->SUPER::invoke_button_down ($ev, $x, $y);
2346		2619
2347	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2620	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348		2621
2349	$self->mouse_motion ($ev, $x, $y)	2622	$self->invoke_mouse_motion ($ev, $x, $y)
2350	}	2623	}
2351		2624
2352	sub mouse_motion {	2625	sub invoke_mouse_motion {
2353	my ($self, $ev, $x, $y) = @_;	2626	my ($self, $ev, $x, $y) = @_;
2354		2627
2355	if ($GRAB == $self) {	2628	if ($GRAB == $self) {
2356	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2629	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357		2630
…		…
2363	} else {	2636	} else {
2364	return 0;	2637	return 0;
2365	}	2638	}
2366		2639
2367	1	2640	1
		2641	}
		2642
		2643	sub invoke_mouse_wheel {
		2644	my ($self, $ev) = @_;
		2645
		2646	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2647
		2648	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2649
		2650	! ! $delta
2368	}	2651	}
2369		2652
2370	sub update {	2653	sub update {
2371	my ($self) = @_;	2654	my ($self) = @_;
2372		2655
…		…
2421	glDisable GL_TEXTURE_2D;	2704	glDisable GL_TEXTURE_2D;
2422	}	2705	}
2423		2706
2424	#############################################################################	2707	#############################################################################
2425		2708
2426	package CFClient::UI::ValSlider;	2709	package CFPlus::UI::ValSlider;
2427		2710
2428	our @ISA = CFClient::UI::HBox::;	2711	our @ISA = CFPlus::UI::HBox::;
2429		2712
2430	sub new {	2713	sub new {
2431	my ($class, %arg) = @_;	2714	my ($class, %arg) = @_;
2432		2715
2433	my $range = delete $arg{range};	2716	my $range = delete $arg{range};
2434		2717
2435	my $self = $class->SUPER::new (	2718	my $self = $class->SUPER::new (
2436	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2719	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2437	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2720	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2438	to_value => sub { shift },	2721	to_value => sub { shift },
2439	from_value => sub { shift },	2722	from_value => sub { shift },
2440	%arg,	2723	%arg,
2441	);	2724	);
2442		2725
…		…
2462	sub set_range { shift->{slider}->set_range (@_) }	2745	sub set_range { shift->{slider}->set_range (@_) }
2463	sub set_value { shift->{slider}->set_value (@_) }	2746	sub set_value { shift->{slider}->set_value (@_) }
2464		2747
2465	#############################################################################	2748	#############################################################################
2466		2749
2467	package CFClient::UI::TextView;	2750	package CFPlus::UI::TextScroller;
2468		2751
2469	our @ISA = CFClient::UI::HBox::;	2752	our @ISA = CFPlus::UI::HBox::;
2470		2753
2471	use CFClient::OpenGL;	2754	use CFPlus::OpenGL;
2472		2755
2473	sub new {	2756	sub new {
2474	my $class = shift;	2757	my $class = shift;
2475		2758
2476	my $self = $class->SUPER::new (	2759	my $self = $class->SUPER::new (
2477	fontsize => 1,	2760	fontsize => 1,
2478	can_events => 0,	2761	can_events => 1,
		2762	indent => 0,
2479	#font => default_font	2763	#font => default_font
2480	@_,	2764	@_,
2481		2765
2482	layout => (new CFClient::Layout 1),	2766	layout => (new CFPlus::Layout),
2483	par => [],	2767	par => [],
2484	height => 0,	2768	height => 0,
2485	children => [	2769	children => [
2486	(new CFClient::UI::Empty expand => 1),	2770	(new CFPlus::UI::Empty expand => 1),
2487	(new CFClient::UI::Slider vertical => 1),	2771	(new CFPlus::UI::Slider vertical => 1),
2488	],	2772	],
2489	);	2773	);
2490		2774
2491	$self->{children}[1]->connect (changed => sub { $self->update });	2775	$self->{children}[1]->connect (changed => sub { $self->update });
2492		2776
…		…
2498		2782
2499	$self->{fontsize} = $fontsize;	2783	$self->{fontsize} = $fontsize;
2500	$self->reflow;	2784	$self->reflow;
2501	}	2785	}
2502		2786
		2787	sub size_request {
		2788	my ($self) = @_;
		2789
		2790	my ($empty, $slider) = @{ $self->{children} };
		2791
		2792	local $self->{children} = [$empty, $slider];
		2793	$self->SUPER::size_request
		2794	}
		2795
2503	sub size_allocate {	2796	sub invoke_size_allocate {
2504	my ($self, $w, $h) = @_;	2797	my ($self, $w, $h) = @_;
2505		2798
2506	$self->SUPER::size_allocate ($w, $h);	2799	my ($empty, $slider, @other) = @{ $self->{children} };
		2800	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2507		2801
2508	$self->{layout}->set_font ($self->{font}) if $self->{font};	2802	$self->{layout}->set_font ($self->{font}) if $self->{font};
2509	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2803	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2510	$self->{layout}->set_width ($self->{children}[0]{w});	2804	$self->{layout}->set_width ($empty->{w});
2511	$self->{layout}->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);	2805	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512		2806
2513	$self->reflow;	2807	$self->reflow;
2514	}
2515		2808
2516	sub text_size {	2809	local $self->{children} = [$empty, $slider];
		2810	$self->SUPER::invoke_size_allocate ($w, $h)
		2811	}
		2812
		2813	sub invoke_mouse_wheel {
2517	my ($self, $text, $indent) = @_;	2814	my ($self, $ev) = @_;
		2815
		2816	return 0 unless $ev->{dy}; # only vertical movements
		2817
		2818	$self->{children}[1]->emit (mouse_wheel => $ev);
		2819
		2820	1
		2821	}
		2822
		2823	sub get_layout {
		2824	my ($self, $para) = @_;
2518		2825
2519	my $layout = $self->{layout};	2826	my $layout = $self->{layout};
2520		2827
		2828	$layout->set_font ($self->{font}) if $self->{font};
		2829	$layout->set_foreground (@{$para->{fg}});
2521	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2830	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2522	$layout->set_width ($self->{children}[0]{w} - $indent);	2831	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2523	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);	2832	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2524	$layout->set_markup ($text);	2833	$layout->set_markup ($para->{markup});
		2834
		2835	$layout->set_shapes (
		2836	map
		2837	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2838	@{$para->{widget}}
2525		2839	);
		2840
2526	$layout->size	2841	$layout
2527	}	2842	}
2528		2843
2529	sub reflow {	2844	sub reflow {
2530	my ($self) = @_;	2845	my ($self) = @_;
2531		2846
…		…
2538		2853
2539	# todo: base offset on lines or so, not on pixels	2854	# todo: base offset on lines or so, not on pixels
2540	$self->{children}[1]->set_value ($offset);	2855	$self->{children}[1]->set_value ($offset);
2541	}	2856	}
2542		2857
		2858	sub current_paragraph {
		2859	my ($self) = @_;
		2860
		2861	$self->{top_paragraph} - 1
		2862	}
		2863
		2864	sub scroll_to {
		2865	my ($self, $para) = @_;
		2866
		2867	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2868
		2869	$self->{scroll_to} = $para;
		2870	$self->update;
		2871	}
		2872
2543	sub clear {	2873	sub clear {
2544	my ($self) = @_;	2874	my ($self) = @_;
		2875
		2876	my (undef, undef, @other) = @{ $self->{children} };
		2877	$self->remove ($_) for @other;
2545		2878
2546	$self->{par} = [];	2879	$self->{par} = [];
2547	$self->{height} = 0;	2880	$self->{height} = 0;
2548	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2881	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2549	}	2882	}
2550		2883
2551	sub add_paragraph {	2884	sub add_paragraph {
2552	my ($self, $color, $text, $indent) = @_;	2885	my $self = shift;
2553		2886
2554	for my $line (split /\n/, $text) {	2887	for my $para (@_) {
2555	my ($w, $h) = $self->text_size ($line);	2888	$para = {
		2889	fg => [1, 1, 1, 1],
		2890	indent => 0,
		2891	markup => "",
		2892	widget => [],
		2893	ref $para ? %$para : (markup => $para),
		2894	w => 1e10,
		2895	wrapped => 1,
		2896	};
		2897
		2898	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2899	push @{$self->{par}}, $para;
		2900	}
		2901
		2902	$self->{need_reflow}++;
		2903	$self->update;
		2904	}
		2905
		2906	sub scroll_to_bottom {
		2907	my ($self) = @_;
		2908
		2909	$self->{scroll_to} = $#{$self->{par}};
		2910	$self->update;
		2911	}
		2912
		2913	sub force_uptodate {
		2914	my ($self) = @_;
		2915
		2916	if (delete $self->{need_reflow}) {
		2917	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2918
		2919	my $height = 0;
		2920
		2921	for my $para (@{$self->{par}}) {
		2922	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2923	my $layout = $self->get_layout ($para);
		2924	my ($w, $h) = $layout->size;
		2925
		2926	$para->{w} = $w + $para->{indent};
		2927	$para->{h} = $h;
		2928	$para->{wrapped} = $layout->has_wrapped;
		2929	}
		2930
		2931	$para->{y} = $height;
		2932	$height += $para->{h};
		2933	}
		2934
2556	$self->{height} += $h;	2935	$self->{height} = $height;
2557	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2936	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2558	}
2559		2937
2560	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2938	delete $self->{texture};
		2939	}
		2940
		2941	if (my $paridx = delete $self->{scroll_to}) {
		2942	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2943	}
2561	}	2944	}
2562		2945
2563	sub update {	2946	sub update {
2564	my ($self) = @_;	2947	my ($self) = @_;
2565		2948
…		…
2567		2950
2568	return unless $self->{h} > 0;	2951	return unless $self->{h} > 0;
2569		2952
2570	delete $self->{texture};	2953	delete $self->{texture};
2571		2954
2572	$ROOT->on_post_alloc ($self, sub {	2955	$ROOT->on_post_alloc ($self => sub {
		2956	$self->force_uptodate;
		2957
2573	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2958	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2574		2959
2575	if (delete $self->{need_reflow}) {
2576	my $height = 0;
2577
2578	my $layout = $self->{layout};
2579
2580	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2581
2582	for (@{$self->{par}}) {
2583	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2584	$layout->set_width ($W - $_->[3]);
2585	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2586	$layout->set_markup ($_->[4]);
2587	my ($w, $h) = $layout->size;
2588	$_->[0] = $w + $_->[3];
2589	$_->[1] = $h;
2590	}
2591
2592	$height += $_->[1];
2593	}
2594
2595	$self->{height} = $height;
2596
2597	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2598
2599	delete $self->{texture};
2600	}
2601
2602	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2960	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2603	glClearColor 0, 0, 0, 0;	2961	glClearColor 0, 0, 0, 0;
2604	glClear GL_COLOR_BUFFER_BIT;	2962	glClear GL_COLOR_BUFFER_BIT;
2605		2963
2606	my $top = int $self->{children}[1]{range}[0];	2964	my $top = int $self->{children}[1]{range}[0];
2607		2965
		2966	my $paridx = 0;
		2967	my $top_paragraph;
		2968	my $top = int $self->{children}[1]{range}[0];
		2969
2608	my $y0 = $top;	2970	my $y0 = $top;
2609	my $y1 = $top + $H;	2971	my $y1 = $top + $H;
2610		2972
2611	my $y = 0;
2612
2613	my $layout = $self->{layout};
2614
2615	$layout->set_font ($self->{font}) if $self->{font};
2616
2617	glEnable GL_BLEND;
2618	#TODO# not correct in windows where rgba is forced off
2619	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2620
2621	for my $par (@{$self->{par}}) {	2973	for my $para (@{$self->{par}}) {
2622	my $h = $par->[1];	2974	my $h = $para->{h};
		2975	my $y = $para->{y};
2623		2976
2624	if ($y0 < $y + $h && $y < $y1) {	2977	if ($y0 < $y + $h && $y < $y1) {
2625	$layout->set_foreground (@{ $par->[2] });	2978	my $layout = $self->get_layout ($para);
2626	$layout->set_width ($W - $par->[3]);
2627	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2628	$layout->set_markup ($par->[4]);
2629		2979
2630	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2980	$layout->render ($para->{indent}, $y - $y0);
2631		2981
2632	glRasterPos $par->[3], $y - $y0;	2982	if (my @w = @{ $para->{widget} }) {
2633	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2983	my @s = $layout->get_shapes;
		2984
		2985	for (@w) {
		2986	my ($dx, $dy) = splice @s, 0, 2, ();
		2987
		2988	$_->{x} = $dx + $para->{indent};
		2989	$_->{y} = $dy + $y - $y0;
		2990
		2991	$_->draw;
		2992	}
		2993	}
2634	}	2994	}
2635		2995
2636	$y += $h;	2996	$paridx++;
		2997	$top_paragraph ||= $paridx if $y >= $top;
2637	}	2998	}
2638		2999
2639	glDisable GL_BLEND;	3000	$self->{top_paragraph} = $top_paragraph;
2640	};	3001	};
2641	});	3002	});
		3003	}
		3004
		3005	sub reconfigure {
		3006	my ($self) = @_;
		3007
		3008	$self->SUPER::reconfigure;
		3009
		3010	$_->{w} = 1e10 for @{ $self->{par} };
		3011	$self->reflow;
2642	}	3012	}
2643		3013
2644	sub _draw {	3014	sub _draw {
2645	my ($self) = @_;	3015	my ($self) = @_;
2646		3016
…		…
2649	glColor 0, 0, 0, 1;	3019	glColor 0, 0, 0, 1;
2650	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3020	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2651	glDisable GL_TEXTURE_2D;	3021	glDisable GL_TEXTURE_2D;
2652		3022
2653	$self->{children}[1]->draw;	3023	$self->{children}[1]->draw;
2654
2655	}	3024	}
2656		3025
2657	#############################################################################	3026	#############################################################################
2658		3027
2659	package CFClient::UI::Animator;	3028	package CFPlus::UI::Animator;
2660		3029
2661	use CFClient::OpenGL;	3030	use CFPlus::OpenGL;
2662		3031
2663	our @ISA = CFClient::UI::Bin::;	3032	our @ISA = CFPlus::UI::Bin::;
2664		3033
2665	sub moveto {	3034	sub moveto {
2666	my ($self, $x, $y) = @_;	3035	my ($self, $x, $y) = @_;
2667		3036
2668	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3037	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2696	glPopMatrix;	3065	glPopMatrix;
2697	}	3066	}
2698		3067
2699	#############################################################################	3068	#############################################################################
2700		3069
2701	package CFClient::UI::Flopper;	3070	package CFPlus::UI::Flopper;
2702		3071
2703	our @ISA = CFClient::UI::Button::;	3072	our @ISA = CFPlus::UI::Button::;
2704		3073
2705	sub new {	3074	sub new {
2706	my $class = shift;	3075	my $class = shift;
2707		3076
2708	my $self = $class->SUPER::new (	3077	my $self = $class->SUPER::new (
…		…
2720	$self->{other}->toggle_visibility;	3089	$self->{other}->toggle_visibility;
2721	}	3090	}
2722		3091
2723	#############################################################################	3092	#############################################################################
2724		3093
2725	package CFClient::UI::Tooltip;	3094	package CFPlus::UI::Tooltip;
2726		3095
2727	our @ISA = CFClient::UI::Bin::;	3096	our @ISA = CFPlus::UI::Bin::;
2728		3097
2729	use CFClient::OpenGL;	3098	use CFPlus::OpenGL;
2730		3099
2731	sub new {	3100	sub new {
2732	my $class = shift;	3101	my $class = shift;
2733		3102
2734	$class->SUPER::new (	3103	$class->SUPER::new (
…		…
2737	)	3106	)
2738	}	3107	}
2739		3108
2740	sub set_tooltip_from {	3109	sub set_tooltip_from {
2741	my ($self, $widget) = @_;	3110	my ($self, $widget) = @_;
		3111
		3112	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3113	if $widget->{tooltip} =~ /^#(.*)$/;
2742		3114
2743	my $tooltip = $widget->{tooltip};	3115	my $tooltip = $widget->{tooltip};
2744		3116
2745	if ($ENV{CFPLUS_DEBUG} & 2) {	3117	if ($ENV{CFPLUS_DEBUG} & 2) {
2746	$tooltip .= "\n\n" . (ref $widget) . "\n"	3118	$tooltip .= "\n\n" . (ref $widget) . "\n"
2747	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3119	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2748	. "req $widget->{req_w} $widget->{req_h}\n"	3120	. "req $widget->{req_w} $widget->{req_h}\n"
2749	. "visible $widget->{visible}";	3121	. "visible $widget->{visible}";
2750	}	3122	}
2751		3123
		3124	$tooltip =~ s/^\n+//;
		3125	$tooltip =~ s/\n+$//;
		3126
2752	$self->add (new CFClient::UI::Label	3127	$self->add (new CFPlus::UI::Label
2753	markup => $tooltip,	3128	markup => $tooltip,
2754	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3129	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2755	fontsize => 0.8,	3130	fontsize => 0.8,
2756	fg => [0, 0, 0, 1],	3131	style => 1, # FLAG_INVERSE
2757	ellipsise => 0,	3132	ellipsise => 0,
2758	font => ($widget->{tooltip_font} || $::FONT_PROP),	3133	font => ($widget->{tooltip_font} || $::FONT_PROP),
2759	);	3134	);
2760	}	3135	}
2761		3136
…		…
2765	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3140	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2766		3141
2767	($w + 4, $h + 4)	3142	($w + 4, $h + 4)
2768	}	3143	}
2769		3144
2770	sub size_allocate {	3145	sub invoke_size_allocate {
2771	my ($self, $w, $h) = @_;	3146	my ($self, $w, $h) = @_;
2772		3147
2773	$self->SUPER::size_allocate ($w - 4, $h - 4);	3148	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2774	}	3149	}
2775		3150
2776	sub visibility_change {	3151	sub invoke_visibility_change {
2777	my ($self, $visible) = @_;	3152	my ($self, $visible) = @_;
2778		3153
2779	return unless $visible;	3154	return unless $visible;
2780		3155
2781	$self->{root}->on_post_alloc ("move_$self" => sub {	3156	$self->{root}->on_post_alloc ("move_$self" => sub {
2782	my $widget = $self->{owner}	3157	my $widget = $self->{owner}
2783	or return;	3158	or return;
2784		3159
		3160	if ($widget->{visible}) {
2785	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3161	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2786		3162
2787	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3163	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2788	if $x + $self->{w} > $::WIDTH;	3164	if $x + $self->{w} > $self->{root}{w};
2789		3165
2790	$self->move_abs ($x, $y);	3166	$self->move_abs ($x, $y);
		3167	} else {
		3168	$self->hide;
		3169	}
2791	});	3170	});
2792	}	3171	}
2793		3172
2794	sub _draw {	3173	sub _draw {
2795	my ($self) = @_;	3174	my ($self) = @_;
…		…
2819	$self->SUPER::_draw;	3198	$self->SUPER::_draw;
2820	}	3199	}
2821		3200
2822	#############################################################################	3201	#############################################################################
2823		3202
2824	package CFClient::UI::Face;	3203	package CFPlus::UI::Face;
2825		3204
2826	our @ISA = CFClient::UI::Base::;	3205	our @ISA = CFPlus::UI::DrawBG::;
2827		3206
2828	use CFClient::OpenGL;	3207	use CFPlus::OpenGL;
2829		3208
2830	sub new {	3209	sub new {
2831	my $class = shift;	3210	my $class = shift;
2832		3211
2833	my $self = $class->SUPER::new (	3212	my $self = $class->SUPER::new (
…		…
2868	sub _draw {	3247	sub _draw {
2869	my ($self) = @_;	3248	my ($self) = @_;
2870		3249
2871	return unless $::CONN;	3250	return unless $::CONN;
2872		3251
		3252	$self->SUPER::_draw;
		3253
2873	my $face;	3254	my $face;
2874		3255
2875	if ($self->{frame}) {	3256	if ($self->{frame}) {
2876	my $anim = $::CONN->{anim}[$self->{anim}];	3257	my $anim = $::CONN->{anim}[$self->{anim}];
2877		3258
…		…
2888	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3269	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2889	glDisable GL_TEXTURE_2D;	3270	glDisable GL_TEXTURE_2D;
2890	}	3271	}
2891	}	3272	}
2892		3273
2893	sub DESTROY {	3274	sub destroy {
2894	my ($self) = @_;	3275	my ($self) = @_;
2895		3276
2896	$self->{timer}->cancel	3277	$self->{timer}->cancel
2897	if $self->{timer};	3278	if $self->{timer};
2898		3279
2899	$self->SUPER::DESTROY;	3280	$self->SUPER::destroy;
2900	}	3281	}
2901		3282
2902	#############################################################################	3283	#############################################################################
2903		3284
2904	package CFClient::UI::Buttonbar;	3285	package CFPlus::UI::Buttonbar;
2905		3286
2906	our @ISA = CFClient::UI::HBox::;	3287	our @ISA = CFPlus::UI::HBox::;
2907		3288
2908	# TODO: should actualyl wrap buttons and other goodies.	3289	# TODO: should actualyl wrap buttons and other goodies.
2909		3290
2910	#############################################################################	3291	#############################################################################
2911		3292
2912	package CFClient::UI::Menu;	3293	package CFPlus::UI::Menu;
2913		3294
2914	our @ISA = CFClient::UI::FancyFrame::;	3295	our @ISA = CFPlus::UI::Toplevel::;
2915		3296
2916	use CFClient::OpenGL;	3297	use CFPlus::OpenGL;
2917		3298
2918	sub new {	3299	sub new {
2919	my $class = shift;	3300	my $class = shift;
2920		3301
2921	my $self = $class->SUPER::new (	3302	my $self = $class->SUPER::new (
2922	items => [],	3303	items => [],
2923	z => 100,	3304	z => 100,
2924	@_,	3305	@_,
2925	);	3306	);
2926		3307
2927	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3308	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2928		3309
2929	for my $item (@{ $self->{items} }) {	3310	for my $item (@{ $self->{items} }) {
2930	my ($widget, $cb, $tooltip) = @$item;	3311	my ($widget, $cb, $tooltip) = @$item;
2931		3312
2932	# handle various types of items, only text for now	3313	# handle various types of items, only text for now
2933	if (!ref $widget) {	3314	if (!ref $widget) {
		3315	if ($widget =~ /\t/) {
		3316	my ($left, $right) = split /\t/, $widget, 2;
		3317
2934	$widget = new CFClient::UI::Label	3318	$widget = new CFPlus::UI::HBox
2935	can_hover => 1,	3319	can_hover => 1,
2936	can_events => 1,	3320	can_events => 1,
2937	text => $widget,
2938	tooltip => $tooltip	3321	tooltip => $tooltip,
		3322	children => [
		3323	(new CFPlus::UI::Label markup => $left, expand => 1),
		3324	(new CFPlus::UI::Label markup => $right, align => +1),
		3325	],
		3326	;
		3327
		3328	} else {
		3329	$widget = new CFPlus::UI::Label
		3330	can_hover => 1,
		3331	can_events => 1,
		3332	markup => $widget,
		3333	tooltip => $tooltip;
		3334	}
2939	}	3335	}
2940		3336
2941	$self->{item}{$widget} = $item;	3337	$self->{item}{$widget} = $item;
2942		3338
2943	$self->{vbox}->add ($widget);	3339	$self->{vbox}->add ($widget);
…		…
2948		3344
2949	# popup given the event (must be a mouse button down event currently)	3345	# popup given the event (must be a mouse button down event currently)
2950	sub popup {	3346	sub popup {
2951	my ($self, $ev) = @_;	3347	my ($self, $ev) = @_;
2952		3348
2953	$self->_emit ("popdown");	3349	$self->emit ("popdown");
2954		3350
2955	# maybe save $GRAB? must be careful about events...	3351	# maybe save $GRAB? must be careful about events...
2956	$GRAB = $self;	3352	$GRAB = $self;
2957	$self->{button} = $ev->{button};	3353	$self->{button} = $ev->{button};
2958		3354
2959	$self->show;	3355	$self->show;
2960	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3356	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2961	}	3357	}
2962		3358
2963	sub mouse_motion {	3359	sub invoke_mouse_motion {
2964	my ($self, $ev, $x, $y) = @_;	3360	my ($self, $ev, $x, $y) = @_;
2965		3361
2966	# TODO: should use vbox->find_widget or so	3362	# TODO: should use vbox->find_widget or so
2967	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3363	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2968	$self->{hover} = $self->{item}{$HOVER};	3364	$self->{hover} = $self->{item}{$HOVER};
2969		3365
2970	0	3366	0
2971	}	3367	}
2972		3368
2973	sub button_up {	3369	sub invoke_button_up {
2974	my ($self, $ev, $x, $y) = @_;	3370	my ($self, $ev, $x, $y) = @_;
2975		3371
2976	if ($ev->{button} == $self->{button}) {	3372	if ($ev->{button} == $self->{button}) {
2977	undef $GRAB;	3373	undef $GRAB;
2978	$self->hide;	3374	$self->hide;
2979		3375
2980	$self->_emit ("popdown");	3376	$self->emit ("popdown");
2981	$self->{hover}[1]->() if $self->{hover};	3377	$self->{hover}[1]->() if $self->{hover};
2982	} else {	3378	} else {
2983	return 0	3379	return 0
2984	}	3380	}
2985		3381
2986	1	3382	1
2987	}	3383	}
2988		3384
2989	#############################################################################	3385	#############################################################################
2990		3386
2991	package CFClient::UI::Multiplexer;	3387	package CFPlus::UI::Multiplexer;
2992		3388
2993	our @ISA = CFClient::UI::Container::;	3389	our @ISA = CFPlus::UI::Container::;
2994		3390
2995	sub new {	3391	sub new {
2996	my $class = shift;	3392	my $class = shift;
2997		3393
2998	my $self = $class->SUPER::new (	3394	my $self = $class->SUPER::new (
…		…
3012		3408
3013	$self->{current} = $self->{children}[0]	3409	$self->{current} = $self->{children}[0]
3014	if @{ $self->{children} };	3410	if @{ $self->{children} };
3015	}	3411	}
3016		3412
		3413	sub get_current_page {
		3414	my ($self) = @_;
		3415
		3416	$self->{current}
		3417	}
		3418
3017	sub set_current_page {	3419	sub set_current_page {
3018	my ($self, $page_or_widget) = @_;	3420	my ($self, $page_or_widget) = @_;
3019		3421
3020	my $widget = ref $page_or_widget	3422	my $widget = ref $page_or_widget
3021	? $page_or_widget	3423	? $page_or_widget
3022	: $self->{children}[$page_or_widget];	3424	: $self->{children}[$page_or_widget];
3023		3425
3024	$self->{current} = $widget;	3426	$self->{current} = $widget;
3025	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3427	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3026		3428
3027	$self->_emit (page_changed => $self->{current});	3429	$self->emit (page_changed => $self->{current});
3028		3430
3029	$self->realloc;	3431	$self->realloc;
3030	}	3432	}
3031		3433
3032	sub visible_children {	3434	sub visible_children {
…		…
3037	my ($self) = @_;	3439	my ($self) = @_;
3038		3440
3039	$self->{current}->size_request	3441	$self->{current}->size_request
3040	}	3442	}
3041		3443
3042	sub size_allocate {	3444	sub invoke_size_allocate {
3043	my ($self, $w, $h) = @_;	3445	my ($self, $w, $h) = @_;
3044		3446
3045	$self->{current}->configure (0, 0, $w, $h);	3447	$self->{current}->configure (0, 0, $w, $h);
		3448
		3449	1
3046	}	3450	}
3047		3451
3048	sub _draw {	3452	sub _draw {
3049	my ($self) = @_;	3453	my ($self) = @_;
3050		3454
3051	$self->{current}->draw;	3455	$self->{current}->draw;
3052	}	3456	}
3053		3457
3054	#############################################################################	3458	#############################################################################
3055		3459
3056	package CFClient::UI::Notebook;	3460	package CFPlus::UI::Notebook;
3057		3461
3058	our @ISA = CFClient::UI::VBox::;	3462	our @ISA = CFPlus::UI::VBox::;
3059		3463
3060	sub new {	3464	sub new {
3061	my $class = shift;	3465	my $class = shift;
3062		3466
3063	my $self = $class->SUPER::new (	3467	my $self = $class->SUPER::new (
3064	buttonbar => (new CFClient::UI::Buttonbar),	3468	buttonbar => (new CFPlus::UI::Buttonbar),
3065	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3469	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3066	# filter => # will be put between multiplexer and $self	3470	# filter => # will be put between multiplexer and $self
3067	@_,	3471	@_,
3068	);	3472	);
3069		3473
3070	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3474	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3076	sub add {	3480	sub add {
3077	my ($self, $title, $widget, $tooltip) = @_;	3481	my ($self, $title, $widget, $tooltip) = @_;
3078		3482
3079	Scalar::Util::weaken $self;	3483	Scalar::Util::weaken $self;
3080		3484
3081	$self->{buttonbar}->add (new CFClient::UI::Button	3485	$self->{buttonbar}->add (new CFPlus::UI::Button
3082	markup => $title,	3486	markup => $title,
3083	tooltip => $tooltip,	3487	tooltip => $tooltip,
3084	on_activate => sub { $self->set_current_page ($widget) },	3488	on_activate => sub { $self->set_current_page ($widget) },
3085	);	3489	);
3086		3490
3087	$self->{multiplexer}->add ($widget);	3491	$self->{multiplexer}->add ($widget);
3088	}	3492	}
3089		3493
		3494	sub get_current_page {
		3495	my ($self) = @_;
		3496
		3497	$self->{multiplexer}->get_current_page
		3498	}
		3499
3090	sub set_current_page {	3500	sub set_current_page {
3091	my ($self, $page) = @_;	3501	my ($self, $page) = @_;
3092		3502
3093	$self->{multiplexer}->set_current_page ($page);	3503	$self->{multiplexer}->set_current_page ($page);
3094	$self->_emit (page_changed => $self->{multiplexer}{current});	3504	$self->emit (page_changed => $self->{multiplexer}{current});
3095	}	3505	}
3096		3506
3097	#############################################################################	3507	#############################################################################
3098		3508
3099	package CFClient::UI::Combobox;	3509	package CFPlus::UI::Selector;
3100		3510
3101	use utf8;	3511	use utf8;
3102		3512
3103	our @ISA = CFClient::UI::Button::;	3513	our @ISA = CFPlus::UI::Button::;
3104		3514
3105	sub new {	3515	sub new {
3106	my $class = shift;	3516	my $class = shift;
3107		3517
3108	my $self = $class->SUPER::new (	3518	my $self = $class->SUPER::new (
3109	options => [], # [title, value, tooltip], ...	3519	options => [], # [value, title, longdesc], ...
3110	value => undef,	3520	value => undef,
3111	@_,	3521	@_,
3112	);	3522	);
3113		3523
3114	$self->_set_value ($self->{value});	3524	$self->_set_value ($self->{value});
3115		3525
3116	$self	3526	$self
3117	}	3527	}
3118		3528
3119	sub button_down {	3529	sub invoke_button_down {
3120	my ($self, $ev) = @_;	3530	my ($self, $ev) = @_;
3121		3531
3122	my @menu_items;	3532	my @menu_items;
3123		3533
3124	for (@{ $self->{options} }) {	3534	for (@{ $self->{options} }) {
3125	my ($title, $value, $tooltip) = @$_;	3535	my ($value, $title, $tooltip) = @$_;
3126		3536
3127	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];	3537	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3128	}	3538	}
3129		3539
3130	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3540	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3131	}	3541	}
3132		3542
3133	sub _set_value {	3543	sub _set_value {
3134	my ($self, $value) = @_;	3544	my ($self, $value) = @_;
3135		3545
3136	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }	3546	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3137	or return;	3547	or return;
3138		3548
3139	$self->{value} = $item->[1];	3549	$self->{value} = $item->[0];
3140	$self->set_markup ("$item->[0] ⇓");	3550	$self->set_markup ("$item->[1] ⇓");
3141	$self->set_tooltip ($item->[2]);	3551	$self->set_tooltip ($item->[2]);
3142	}	3552	}
3143		3553
3144	sub set_value {	3554	sub set_value {
3145	my ($self, $value) = @_;	3555	my ($self, $value) = @_;
3146		3556
3147	return unless $self->{value} ne $value;	3557	return unless $self->{value} ne $value;
3148		3558
3149	$self->_set_value ($value);	3559	$self->_set_value ($value);
3150	$self->_emit (changed => $value);	3560	$self->emit (changed => $value);
3151	}	3561	}
3152		3562
3153	#############################################################################	3563	#############################################################################
3154		3564
3155	package CFClient::UI::Statusbox;	3565	package CFPlus::UI::Statusbox;
3156		3566
3157	our @ISA = CFClient::UI::VBox::;	3567	our @ISA = CFPlus::UI::VBox::;
3158		3568
3159	sub new {	3569	sub new {
3160	my $class = shift;	3570	my $class = shift;
3161		3571
3162	my $self = $class->SUPER::new (	3572	my $self = $class->SUPER::new (
…		…
3174	sub reorder {	3584	sub reorder {
3175	my ($self) = @_;	3585	my ($self) = @_;
3176	my $NOW = Time::HiRes::time;	3586	my $NOW = Time::HiRes::time;
3177		3587
3178	# freeze display when hovering over any label	3588	# freeze display when hovering over any label
3179	return if $CFClient::UI::TOOLTIP->{owner}	3589	return if $CFPlus::UI::TOOLTIP->{owner}
3180	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3590	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3181	values %{ $self->{item} };	3591	values %{ $self->{item} };
3182		3592
3183	while (my ($k, $v) = each %{ $self->{item} }) {	3593	while (my ($k, $v) = each %{ $self->{item} }) {
3184	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3594	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3185	}	3595	}
…		…
3206	for ($short) {	3616	for ($short) {
3207	s/^\s+//;	3617	s/^\s+//;
3208	s/\s+/ /g;	3618	s/\s+/ /g;
3209	}	3619	}
3210		3620
3211	new CFClient::UI::Label	3621	new CFPlus::UI::Label
3212	markup => $short,	3622	markup => $short,
3213	tooltip => $item->{tooltip},	3623	tooltip => $item->{tooltip},
3214	tooltip_font => $::FONT_PROP,	3624	tooltip_font => $::FONT_PROP,
3215	tooltip_width => 0.67,	3625	tooltip_width => 0.67,
3216	fontsize => $item->{fontsize} || $self->{fontsize},	3626	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3254	$item->{count}++;	3664	$item->{count}++;
3255	} else {	3665	} else {
3256	$item->{count} = 1;	3666	$item->{count} = 1;
3257	$item->{text} = $item->{tooltip} = $text;	3667	$item->{text} = $item->{tooltip} = $text;
3258	}	3668	}
3259	$item->{id} = ++$self->{id};	3669	$item->{id} += 0.2;#d#
3260	$item->{timeout} = $timeout;	3670	$item->{timeout} = $timeout;
3261	delete $item->{label};	3671	delete $item->{label};
3262	} else {	3672	} else {
3263	$self->{item}{$group} = {	3673	$self->{item}{$group} = {
3264	id => ++$self->{id},	3674	id => ++$self->{id},
…		…
3270	count => 1,	3680	count => 1,
3271	%arg,	3681	%arg,
3272	};	3682	};
3273	}	3683	}
3274		3684
		3685	$ROOT->on_refresh (reorder => sub {
3275	$self->reorder;	3686	$self->reorder;
		3687	});
3276	}	3688	}
3277		3689
3278	sub reconfigure {	3690	sub reconfigure {
3279	my ($self) = @_;	3691	my ($self) = @_;
3280		3692
…		…
3283		3695
3284	$self->reorder;	3696	$self->reorder;
3285	$self->SUPER::reconfigure;	3697	$self->SUPER::reconfigure;
3286	}	3698	}
3287		3699
3288	sub DESTROY {	3700	sub destroy {
3289	my ($self) = @_;	3701	my ($self) = @_;
3290		3702
3291	$self->{timer}->cancel;	3703	$self->{timer}->cancel;
3292		3704
3293	$self->SUPER::DESTROY;	3705	$self->SUPER::destroy;
3294	}	3706	}
3295		3707
3296	#############################################################################	3708	#############################################################################
3297		3709
3298	package CFClient::UI::Inventory;	3710	package CFPlus::UI::Inventory;
3299		3711
3300	our @ISA = CFClient::UI::ScrolledWindow::;	3712	our @ISA = CFPlus::UI::Table::;
3301		3713
3302	sub new {	3714	sub new {
3303	my $class = shift;	3715	my $class = shift;
3304		3716
3305	my $self = $class->SUPER::new (	3717	my $self = $class->SUPER::new (
3306	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3718	col_expand => [0, 1, 0],
		3719	items => [],
3307	@_,	3720	@_,
3308	);	3721	);
3309		3722
		3723	$self->set_sort_order (undef);
		3724
3310	$self	3725	$self
		3726	}
		3727
		3728	sub update_items {
		3729	my ($self) = @_;
		3730
		3731	$self->clear;
		3732
		3733	my @item = $self->{sort}->(@{ $self->{items} });
		3734
		3735	my @adds;
		3736	my $row = 0;
		3737	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3738	CFPlus::Item::update_widgets $item;
		3739
		3740	push @adds, 0, $row, $item->{face_widget};
		3741	push @adds, 1, $row, $item->{desc_widget};
		3742	push @adds, 2, $row, $item->{weight_widget};
		3743
		3744	$row++;
		3745	}
		3746
		3747	$self->add (@adds);
		3748	}
		3749
		3750	sub set_sort_order {
		3751	my ($self, $order) = @_;
		3752
		3753	$self->{sort} = $order ||= sub {
		3754	sort {
		3755	$a->{type} <=> $b->{type}
		3756	or $a->{name} cmp $b->{name}
		3757	} @_
		3758	};
		3759
		3760	$self->update_items;
3311	}	3761	}
3312		3762
3313	sub set_items {	3763	sub set_items {
3314	my ($self, $items) = @_;	3764	my ($self, $items) = @_;
3315		3765
3316	$self->{child}->clear;	3766	$self->{items} = [$items ? values %$items : ()];
3317	return unless $items;	3767	$self->update_items;
3318
3319	my @items = sort {
3320	($a->{type} <=> $b->{type})
3321	or ($a->{name} cmp $b->{name})
3322	} @$items;
3323
3324	$self->{real_items} = \@items;
3325
3326	my $row = 0;
3327	for my $item (@items) {
3328	CFClient::Item::update_widgets $item;
3329
3330	$self->{child}->add (0, $row, $item->{face_widget});
3331	$self->{child}->add (1, $row, $item->{desc_widget});
3332	$self->{child}->add (2, $row, $item->{weight_widget});
3333
3334	$row++;
3335	}
3336	}	3768	}
3337		3769
3338	#############################################################################	3770	#############################################################################
3339		3771
3340	package CFClient::UI::BindEditor;
3341
3342	our @ISA = CFClient::UI::FancyFrame::;
3343
3344	sub new {
3345	my $class = shift;
3346
3347	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3348
3349	$self->add (my $vb = new CFClient::UI::VBox);
3350
3351
3352	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3353	text => "start recording",
3354	tooltip => "Start/Stops recording of actions."
3355	."All subsequent actions after the recording started will be captured."
3356	."The actions are displayed after the record was stopped."
3357	."To bind the action you have to click on the 'Bind' button",
3358	on_activate => sub {
3359	unless ($self->{recording}) {
3360	$self->start;
3361	} else {
3362	$self->stop;
3363	}
3364	});
3365
3366	$vb->add (new CFClient::UI::Label text => "Actions:");
3367	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3368
3369	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3370	$vb->add (my $hb = new CFClient::UI::HBox);
3371	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3372	$hb->add (new CFClient::UI::Button
3373	text => "bind",
3374	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3375	on_activate => sub {
3376	$self->ask_for_bind;
3377	});
3378
3379	$vb->add (my $hb = new CFClient::UI::HBox);
3380	$hb->add (new CFClient::UI::Button
3381	text => "ok",
3382	expand => 1,
3383	tooltip => "This closes the binding editor and saves the binding",
3384	on_activate => sub {
3385	$self->hide;
3386	$self->commit;
3387	});
3388
3389	$hb->add (new CFClient::UI::Button
3390	text => "cancel",
3391	expand => 1,
3392	tooltip => "This closes the binding editor without saving",
3393	on_activate => sub {
3394	$self->hide;
3395	$self->{binding_cancel}->()
3396	if $self->{binding_cancel};
3397	});
3398
3399	$self->update_binding_widgets;
3400
3401	$self
3402	}
3403
3404	sub commit {
3405	my ($self) = @_;
3406	my ($mod, $sym, $cmds) = $self->get_binding;
3407	if ($sym != 0 && @$cmds > 0) {
3408	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3409	."'. Don't forget 'Save Config'!");
3410	$self->{binding_change}->($mod, $sym, $cmds)
3411	if $self->{binding_change};
3412	} else {
3413	$::STATUSBOX->add ("No action bound, no key or action specified!");
3414	$self->{binding_cancel}->()
3415	if $self->{binding_cancel};
3416	}
3417	}
3418
3419	sub start {
3420	my ($self) = @_;
3421
3422	$self->{rec_btn}->set_text ("stop recording");
3423	$self->{recording} = 1;
3424	$self->clear_command_list;
3425	$::CONN->start_record if $::CONN;
3426	}
3427
3428	sub stop {
3429	my ($self) = @_;
3430
3431	$self->{rec_btn}->set_text ("start recording");
3432	$self->{recording} = 0;
3433
3434	my $rec;
3435	$rec = $::CONN->stop_record if $::CONN;
3436	return unless ref $rec eq 'ARRAY';
3437	$self->set_command_list ($rec);
3438	}
3439
3440
3441	sub ask_for_bind_and_commit {
3442	my ($self) = @_;
3443	$self->ask_for_bind (1);
3444	}
3445
3446	sub ask_for_bind {
3447	my ($self, $commit) = @_;
3448
3449	CFClient::Binder::open_binding_dialog (sub {
3450	my ($mod, $sym) = @_;
3451	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3452	$self->update_binding_widgets;
3453	$self->commit if $commit;
3454	});
3455	}
3456
3457	# $mod and $sym are the modifiers and key symbol
3458	# $cmds is a array ref of strings (the commands)
3459	# $cb is the callback that is executed on OK
3460	# $ccb is the callback that is executed on CANCEL and
3461	# when the binding was unsuccessful on OK
3462	sub set_binding {
3463	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3464
3465	$self->clear_command_list;
3466	$self->{recording} = 0;
3467	$self->{rec_btn}->set_text ("start recording");
3468
3469	$self->{binding} = [$mod, $sym];
3470	$self->{commands} = $cmds;
3471
3472	$self->{binding_change} = $cb;
3473	$self->{binding_cancel} = $ccb;
3474
3475	$self->update_binding_widgets;
3476	}
3477
3478	# this is a shortcut method that asks for a binding
3479	# and then just binds it.
3480	sub do_quick_binding {
3481	my ($self, $cmds) = @_;
3482	$self->set_binding (undef, undef, $cmds, sub {
3483	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3484	});
3485	$self->ask_for_bind (1);
3486	}
3487
3488	sub update_binding_widgets {
3489	my ($self) = @_;
3490	my ($mod, $sym, $cmds) = $self->get_binding;
3491	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3492	$self->set_command_list ($cmds);
3493	}
3494
3495	sub get_binding {
3496	my ($self) = @_;
3497	return (
3498	$self->{binding}->[0],
3499	$self->{binding}->[1],
3500	[ grep { defined $_ } @{$self->{commands}} ]
3501	);
3502	}
3503
3504	sub clear_command_list {
3505	my ($self) = @_;
3506	$self->{cmdbox}->clear ();
3507	}
3508
3509	sub set_command_list {
3510	my ($self, $cmds) = @_;
3511
3512	$self->{cmdbox}->clear ();
3513	$self->{commands} = $cmds;
3514
3515	my $idx = 0;
3516
3517	for (@$cmds) {
3518	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3519
3520	my $i = $idx;
3521	$hb->add (new CFClient::UI::Label text => $_);
3522	$hb->add (new CFClient::UI::Button
3523	text => "delete",
3524	tooltip => "Deletes the action from the record",
3525	on_activate => sub {
3526	$self->{cmdbox}->remove ($hb);
3527	$cmds->[$i] = undef;
3528	});
3529
3530
3531	$idx++
3532	}
3533	}
3534
3535	#############################################################################
3536
3537	package CFClient::UI::SpellList;	3772	package CFPlus::UI::SpellList;
3538		3773
3539	our @ISA = CFClient::UI::Table::;	3774	our @ISA = CFPlus::UI::Table::;
3540		3775
3541	sub new {	3776	sub new {
3542	my $class = shift;	3777	my $class = shift;
3543		3778
3544	my $self = $class->SUPER::new (	3779	my $self = $class->SUPER::new (
…		…
3546	commands => [],	3781	commands => [],
3547	@_,	3782	@_,
3548	)	3783	)
3549	}	3784	}
3550		3785
		3786	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3787
		3788	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3789	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3790	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3791	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3551	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3792	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");	3793	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3553	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3794	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3554	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");	3795	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3555	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3796	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556	"<b>Damage</b>. The amount of damage the spell deals when it hits.");	3797	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3557		3798
3558	sub rebuild_spell_list {	3799	sub rebuild_spell_list {
3559	my ($self) = @_;	3800	my ($self) = @_;
3560		3801
3561	$CFClient::UI::ROOT->on_refresh ($self => sub {	3802	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3562	$self->clear;	3803	$self->clear;
3563		3804
		3805	return unless $::CONN;
		3806
3564	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");	3807	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3808	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3565	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3809	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3566	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3810	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3567	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3811	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3568		3812
3569	my $row = 0;	3813	my $row = 0;
3570		3814
3571	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3815	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3572	my $spell = $self->{spell}{$_};	3816	my $spell = $self->{spell}{$_};
3573		3817
3574	$row++;	3818	$row++;
3575		3819
		3820	my $spell_cb = sub {
		3821	my ($widget, $ev) = @_;
		3822
		3823	if ($ev->{button} == 1) {
		3824	$::CONN->user_send ("cast $spell->{name}");
		3825	} elsif ($ev->{button} == 2) {
		3826	$::CONN->user_send ("invoke $spell->{name}");
		3827	} elsif ($ev->{button} == 3) {
		3828	(new CFPlus::UI::Menu
		3829	items => [
		3830	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3831	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3832	],
		3833	)->popup ($ev);
		3834	} else {
		3835	return 0;
		3836	}
		3837
		3838	1
		3839	};
		3840
		3841	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
		3842
		3843	#TODO: add path info to tooltip
		3844	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
		3845
3576	$self->add (0, $row, new CFClient::UI::Face	3846	$self->add (0, $row, new CFPlus::UI::Face
3577	face => $spell->{face},	3847	face => $spell->{face},
3578	can_hover => 1,	3848	can_hover => 1,
3579	can_events => 1,	3849	can_events => 1,
3580	tooltip => $spell->{message},	3850	tooltip => $tooltip,
		3851	on_button_down => $spell_cb,
3581	);	3852	);
3582		3853
3583	$self->add (1, $row, new CFClient::UI::Label	3854	$self->add (1, $row, new CFPlus::UI::Label
3584	expand => 1,	3855	expand => 1,
3585	text => $spell->{name},	3856	text => $spell->{name},
3586	can_hover => 1,	3857	can_hover => 1,
3587	can_events => 1,	3858	can_events => 1,
3588	tooltip => $spell->{message},	3859	tooltip => $tooltip,
		3860	on_button_down => $spell_cb,
3589	);	3861	);
3590		3862
		3863	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3591	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3864	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3592	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3865	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3593	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3866	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3594
3595	# TODO: should be done via popup
3596	$self->add (5, $row, new CFClient::UI::Button
3597	text => "bind",
3598	tooltip => "bind spell readying (cast command) to key",
3599	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3600	);
3601	}	3867	}
3602	});	3868	});
3603	}	3869	}
3604		3870
3605	sub add_spell {	3871	sub add_spell {
…		…
3614		3880
3615	delete $self->{spell}->{$spell->{name}};	3881	delete $self->{spell}->{$spell->{name}};
3616	$self->rebuild_spell_list;	3882	$self->rebuild_spell_list;
3617	}	3883	}
3618		3884
		3885	sub clear_spells {
		3886	my ($self) = @_;
		3887
		3888	$self->{spell} = {};
		3889	$self->rebuild_spell_list;
		3890	}
		3891
3619	#############################################################################	3892	#############################################################################
3620		3893
3621	package CFClient::UI::Root;	3894	package CFPlus::UI::Root;
3622		3895
3623	our @ISA = CFClient::UI::Container::;	3896	our @ISA = CFPlus::UI::Container::;
3624		3897
3625	use List::Util qw(min max);	3898	use List::Util qw(min max);
3626		3899
3627	use CFClient::OpenGL;	3900	use CFPlus::OpenGL;
3628		3901
3629	sub new {	3902	sub new {
3630	my $class = shift;	3903	my $class = shift;
3631		3904
3632	my $self = $class->SUPER::new (	3905	my $self = $class->SUPER::new (
…		…
3657	$coord = $max - $size if $coord > $max - $size;	3930	$coord = $max - $size if $coord > $max - $size;
3658		3931
3659	int $coord + 0.5	3932	int $coord + 0.5
3660	}	3933	}
3661		3934
3662	sub size_allocate {	3935	sub invoke_size_allocate {
3663	my ($self, $w, $h) = @_;	3936	my ($self, $w, $h) = @_;
3664		3937
3665	for my $child ($self->children) {	3938	for my $child ($self->children) {
3666	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3939	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3667		3940
…		…
3671	$X = _to_pixel $X, $W, $self->{w};	3944	$X = _to_pixel $X, $W, $self->{w};
3672	$Y = _to_pixel $Y, $H, $self->{h};	3945	$Y = _to_pixel $Y, $H, $self->{h};
3673		3946
3674	$child->configure ($X, $Y, $W, $H);	3947	$child->configure ($X, $Y, $W, $H);
3675	}	3948	}
		3949
		3950	1
3676	}	3951	}
3677		3952
3678	sub coord2local {	3953	sub coord2local {
3679	my ($self, $x, $y) = @_;	3954	my ($self, $x, $y) = @_;
3680		3955
…		…
3806	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4081	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3807		4082
3808	$w = 0 if $w < 0;	4083	$w = 0 if $w < 0;
3809	$h = 0 if $h < 0;	4084	$h = 0 if $h < 0;
3810		4085
		4086	$w = max $widget->{min_w}, $w;
		4087	$h = max $widget->{min_h}, $h;
		4088
		4089	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4090	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4091
		4092	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4093	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4094
3811	$w = int $w + 0.5;	4095	$w = int $w + 0.5;
3812	$h = int $h + 0.5;	4096	$h = int $h + 0.5;
3813		4097
3814	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4098	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3815	$widget->{old_w} = $widget->{w};	4099	$widget->{old_w} = $widget->{w};
…		…
3838	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4122	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3839	glMatrixMode GL_MODELVIEW;	4123	glMatrixMode GL_MODELVIEW;
3840	glLoadIdentity;	4124	glLoadIdentity;
3841		4125
3842	{	4126	{
3843	package CFClient::UI::Base;	4127	package CFPlus::UI::Base;
3844		4128
3845	($draw_x, $draw_y, $draw_w, $draw_h) =	4129	($draw_x, $draw_y, $draw_w, $draw_h) =
3846	(0, 0, $self->{w}, $self->{h});	4130	(0, 0, $self->{w}, $self->{h});
3847	}	4131	}
3848		4132
3849	$self->_draw;	4133	$self->_draw;
3850	}	4134	}
3851		4135
3852	#############################################################################	4136	#############################################################################
3853		4137
3854	package CFClient::UI;	4138	package CFPlus::UI;
3855		4139
3856	$ROOT = new CFClient::UI::Root;	4140	$ROOT = new CFPlus::UI::Root;
3857	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4141	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3858		4142
3859	1	4143	1
3860		4144

Diff Legend

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