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

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

Diff Legend

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