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.290 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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