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.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 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
…		…
278	delete $self->{root};	301	delete $self->{root};
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->emit ("focus_out");	309	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
288	}	311	}
…		…
335	sub size_request {	358	sub size_request {
336	require Carp;	359	require Carp;
337	Carp::confess "size_request is abstract";	360	Carp::confess "size_request is abstract";
338	}	361	}
339		362
		363	sub baseline_shift {
		364	0
		365	}
		366
340	sub configure {	367	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
342		369
343	if ($self->{aspect}) {	370	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
345		372
346	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		375
349	# use alignment to adjust x, y	376	# use alignment to adjust x, y
350		377
351	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
393		420
394	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
395		422
396	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
397		424
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	428	}
402	}	429	}
403		430
404	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
405	sub coord2local {	432	sub coord2local {
406	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
407		434
		435	Carp::confess unless $self->{parent};#d#
		436
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	438	}
410		439
411	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
412	sub coord2global {	441	sub coord2global {
413	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
414		443
		444	Carp::confess unless $self->{parent};#d#
		445
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	447	}
417		448
418	sub invoke_focus_in {	449	sub invoke_focus_in {
419	my ($self) = @_;	450	my ($self) = @_;
420		451
421	return if $FOCUS == $self;	452	return if $FOCUS == $self;
422	return unless $self->{can_focus};	453	return unless $self->{can_focus};
423		454
424	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
425		456
426	$focus->update if $focus;	457	$self->update;
427	$FOCUS->update;
428		458
429	0	459	0
430	}	460	}
431		461
432	sub invoke_focus_out {	462	sub invoke_focus_out {
433	my ($self) = @_;	463	my ($self) = @_;
434		464
435	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
436		466
437	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
438		468
439	$focus->update if $focus; #?	469	$self->update;
440		470
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	472	unless $FOCUS;
443		473
444	0	474	0
445	}	475	}
446		476
447	sub grab_focus {	477	sub grab_focus {
448	my ($self) = @_;	478	my ($self) = @_;
449		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	481	$self->emit ("focus_in");
451	}	482	}
452		483
453	sub invoke_mouse_motion { 1 }	484	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	485	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	486	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
457		489
458	sub invoke_button_down {	490	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
460		492
461	$self->grab_focus;	493	$self->grab_focus;
462		494
463	1	495	0
464	}	496	}
465		497
466	sub connect {	498	sub connect {
467	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
468		500
469	push @{ $self->{signal_cb}{$signal} }, $cb;	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	}
470	}	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	);
471		521
472	sub emit {	522	sub emit {
473	my ($self, $signal, @args) = @_;	523	my ($self, $signal, @args) = @_;
474		524
475	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before	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
476	($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure	536	($self->can ("invoke_$signal") || sub { 1 }), # closure
		537	) {
		538	return $cb->($self, @args, @append) || next;
		539	}
		540
		541	# parent
477	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	542	$self->{parent} && $self->{parent}->emit ($signal, @args)
478	}	543	}
479		544
480	sub find_widget {	545	sub find_widget {
481	my ($self, $x, $y) = @_;	546	my ($self, $x, $y) = @_;
482		547
…		…
490	}	555	}
491		556
492	sub set_parent {	557	sub set_parent {
493	my ($self, $parent) = @_;	558	my ($self, $parent) = @_;
494		559
495	Scalar::Util::weaken ($self->{parent} = $parent);	560	CFPlus::weaken ($self->{parent} = $parent);
496	$self->set_visible if $parent->{visible};	561	$self->set_visible if $parent->{visible};
497	}	562	}
498		563
499	sub realloc {	564	sub realloc {
500	my ($self) = @_;	565	my ($self) = @_;
…		…
534	return unless $self->{h} && $self->{w};	599	return unless $self->{h} && $self->{w};
535		600
536	# update screen rectangle	601	# update screen rectangle
537	local $draw_x = $draw_x + $self->{x};	602	local $draw_x = $draw_x + $self->{x};
538	local $draw_y = $draw_y + $self->{y};	603	local $draw_y = $draw_y + $self->{y};
539	local $draw_w = $draw_x + $self->{w};
540	local $draw_h = $draw_y + $self->{h};
541		604
542	# skip widgets that are entirely outside the drawing area	605	# skip widgets that are entirely outside the drawing area
543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	606	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	607	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545		608
…		…
568	glVertex $self->{w} - 1, 0;	631	glVertex $self->{w} - 1, 0;
569	glVertex $self->{w} - 1, $self->{h} - 1;	632	glVertex $self->{w} - 1, $self->{h} - 1;
570	glVertex 0 , $self->{h} - 1;	633	glVertex 0 , $self->{h} - 1;
571	glEnd;	634	glEnd;
572	glPopMatrix;	635	glPopMatrix;
573	#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;
574	}	637	}
575		638
576	$self->_draw;	639	$self->_draw;
577	glPopMatrix;	640	glPopMatrix;
578	}	641	}
…		…
581	my ($self) = @_;	644	my ($self) = @_;
582		645
583	warn "no draw defined for $self\n";	646	warn "no draw defined for $self\n";
584	}	647	}
585		648
		649	my $cntx;#d#
586	sub DESTROY {	650	sub DESTROY {
587	my ($self) = @_;	651	my ($self) = @_;
588		652
589	delete $WIDGET{$self+0};	653	return if CFPlus::in_destruct;
590		654
591	eval { $self->destroy };	655	eval { $self->destroy };
592	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	656	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		657
		658	delete $WIDGET{$self+0};
593	}	659	}
594		660
595	#############################################################################	661	#############################################################################
596		662
597	package CFClient::UI::DrawBG;	663	package CFPlus::UI::DrawBG;
598		664
599	our @ISA = CFClient::UI::Base::;	665	our @ISA = CFPlus::UI::Base::;
600		666
601	use strict;	667	use strict;
602	use CFClient::OpenGL;	668	use CFPlus::OpenGL;
603		669
604	sub new {	670	sub new {
605	my $class = shift;	671	my $class = shift;
606		672
607	# range [value, low, high, page]	673	# range [value, low, high, page]
…		…
638	}	704	}
639	}	705	}
640		706
641	#############################################################################	707	#############################################################################
642		708
643	package CFClient::UI::Empty;	709	package CFPlus::UI::Empty;
644		710
645	our @ISA = CFClient::UI::Base::;	711	our @ISA = CFPlus::UI::Base::;
646		712
647	sub new {	713	sub new {
648	my ($class, %arg) = @_;	714	my ($class, %arg) = @_;
649	$class->SUPER::new (can_events => 0, %arg);	715	$class->SUPER::new (can_events => 0, %arg);
650	}	716	}
…		…
657		723
658	sub draw { }	724	sub draw { }
659		725
660	#############################################################################	726	#############################################################################
661		727
662	package CFClient::UI::Container;	728	package CFPlus::UI::Container;
663		729
664	our @ISA = CFClient::UI::Base::;	730	our @ISA = CFPlus::UI::Base::;
665		731
666	sub new {	732	sub new {
667	my ($class, %arg) = @_;	733	my ($class, %arg) = @_;
668		734
669	my $children = delete $arg{children};	735	my $children = delete $arg{children};
…		…
678	if $children;	744	if $children;
679		745
680	$self	746	$self
681	}	747	}
682		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
683	sub add {	757	sub add {
684	my ($self, @widgets) = @_;	758	my ($self, @widgets) = @_;
685		759
686	$_->set_parent ($self)	760	$_->set_parent ($self)
687	for @widgets;	761	for @widgets;
…		…
747	$_->draw for @{$self->{children}};	821	$_->draw for @{$self->{children}};
748	}	822	}
749		823
750	#############################################################################	824	#############################################################################
751		825
752	package CFClient::UI::Bin;	826	package CFPlus::UI::Bin;
753		827
754	our @ISA = CFClient::UI::Container::;	828	our @ISA = CFPlus::UI::Container::;
755		829
756	sub new {	830	sub new {
757	my ($class, %arg) = @_;	831	my ($class, %arg) = @_;
758		832
759	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	833	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760		834
761	$class->SUPER::new (children => [$child], %arg)	835	$class->SUPER::new (children => [$child], %arg)
762	}	836	}
763		837
764	sub add {	838	sub add {
…		…
771	sub remove {	845	sub remove {
772	my ($self, $widget) = @_;	846	my ($self, $widget) = @_;
773		847
774	$self->SUPER::remove ($widget);	848	$self->SUPER::remove ($widget);
775		849
776	$self->{children} = [new CFClient::UI::Empty]	850	$self->{children} = [new CFPlus::UI::Empty]
777	unless @{$self->{children}};	851	unless @{$self->{children}};
778	}	852	}
779		853
780	sub child { $_[0]->{children}[0] }	854	sub child { $_[0]->{children}[0] }
781		855
…		…
793		867
794	#############################################################################	868	#############################################################################
795		869
796	# back-buffered drawing area	870	# back-buffered drawing area
797		871
798	package CFClient::UI::Window;	872	package CFPlus::UI::Window;
799		873
800	our @ISA = CFClient::UI::Bin::;	874	our @ISA = CFPlus::UI::Bin::;
801		875
802	use CFClient::OpenGL;	876	use CFPlus::OpenGL;
803		877
804	sub new {	878	sub new {
805	my ($class, %arg) = @_;	879	my ($class, %arg) = @_;
806		880
807	my $self = $class->SUPER::new (%arg);	881	my $self = $class->SUPER::new (%arg);
…		…
829	}	903	}
830		904
831	sub render_child {	905	sub render_child {
832	my ($self) = @_;	906	my ($self) = @_;
833		907
834	$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 {
835	glClearColor 0, 0, 0, 0;	909	glClearColor 0, 0, 0, 0;
836	glClear GL_COLOR_BUFFER_BIT;	910	glClear GL_COLOR_BUFFER_BIT;
837		911
838	{	912	{
839	package CFClient::UI::Base;	913	package CFPlus::UI::Base;
840		914
841	($draw_x, $draw_y, $draw_w, $draw_h) =	915	local ($draw_x, $draw_y, $draw_w, $draw_h) =
842	(0, 0, $self->{w}, $self->{h});	916	(0, 0, $self->{w}, $self->{h});
		917
		918	$self->_render;
843	}	919	}
844
845	$self->_render;
846	};	920	};
847	}	921	}
848		922
849	sub _draw {	923	sub _draw {
850	my ($self) = @_;	924	my ($self) = @_;
851
852	my ($w, $h) = @$self{qw(w h)};
853		925
854	my $tex = $self->{texture}	926	my $tex = $self->{texture}
855	or return;	927	or return;
856		928
857	glEnable GL_TEXTURE_2D;	929	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	930	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 0, 0, 0, 1;	931	glColor 0, 0, 0, 1;
860		932
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	933	$tex->draw_quad_alpha_premultiplied (0, 0);
862		934
863	glDisable GL_TEXTURE_2D;	935	glDisable GL_TEXTURE_2D;
864	}	936	}
865		937
866	#############################################################################	938	#############################################################################
867		939
868	package CFClient::UI::ViewPort;	940	package CFPlus::UI::ViewPort;
869		941
870	our @ISA = CFClient::UI::Window::;	942	our @ISA = CFPlus::UI::Window::;
871		943
872	sub new {	944	sub new {
873	my $class = shift;	945	my $class = shift;
874		946
875	$class->SUPER::new (	947	$class->SUPER::new (
…		…
935	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
937	) {	1009	) {
938	$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})
939	} else {	1011	} else {
940	$self->CFClient::UI::Base::find_widget ($x, $y)	1012	$self->CFPlus::UI::Base::find_widget ($x, $y)
941	}	1013	}
942	}	1014	}
943		1015
944	sub _render {	1016	sub _render {
945	my ($self) = @_;	1017	my ($self) = @_;
946		1018
947	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};
948	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};
949		1021
950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1022	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951		1023
952	$self->SUPER::_render;	1024	$self->SUPER::_render;
953	}	1025	}
954		1026
955	#############################################################################	1027	#############################################################################
956		1028
957	package CFClient::UI::ScrolledWindow;	1029	package CFPlus::UI::ScrolledWindow;
958		1030
959	our @ISA = CFClient::UI::HBox::;	1031	our @ISA = CFPlus::UI::HBox::;
960		1032
961	sub new {	1033	sub new {
962	my ($class, %arg) = @_;	1034	my ($class, %arg) = @_;
963		1035
964	my $child = delete $arg{child};	1036	my $child = delete $arg{child};
965		1037
966	my $self;	1038	my $self;
967		1039
968	my $slider = new CFClient::UI::Slider	1040	my $slider = new CFPlus::UI::Slider
969	vertical => 1,	1041	vertical => 1,
970	range => [0, 0, 1, 0.01], # HACK fix	1042	range => [0, 0, 1, 0.01], # HACK fix
971	on_changed => sub {	1043	on_changed => sub {
972	$self->{vp}->set_offset (0, $_[1]);	1044	$self->{vp}->set_offset (0, $_[1]);
973	},	1045	},
974	;	1046	;
975		1047
976	$self = $class->SUPER::new (	1048	$self = $class->SUPER::new (
977	vp => (new CFClient::UI::ViewPort expand => 1),	1049	vp => (new CFPlus::UI::ViewPort expand => 1),
		1050	can_events => 1,
978	slider => $slider,	1051	slider => $slider,
979	%arg,	1052	%arg,
980	);	1053	);
981		1054
982	$self->SUPER::add ($self->{vp}, $self->{slider});	1055	$self->SUPER::add ($self->{vp}, $self->{slider});
983	$self->add ($child) if $child;	1056	$self->add ($child) if $child;
984		1057
985	$self	1058	$self
986	}	1059	}
987		1060
		1061	#TODO# update range on size_allocate depending on child
		1062
988	sub add {	1063	sub add {
989	my ($self, $widget) = @_;	1064	my ($self, $widget) = @_;
990		1065
991	$self->{vp}->add ($self->{child} = $widget);	1066	$self->{vp}->add ($self->{child} = $widget);
992	}	1067	}
993		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
994	sub update {	1085	sub update {
995	my ($self) = @_;	1086	my ($self) = @_;
996		1087
997	$self->SUPER::update;	1088	$self->SUPER::update;
998		1089
999	# todo: overwrite size_allocate of child	1090	$self->update_slider;
1000	my $child = $self->{vp}->child;
1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002	}	1091	}
1003		1092
1004	sub invoke_size_allocate {	1093	sub invoke_size_allocate {
1005	my ($self, $w, $h) = @_;	1094	my ($self, $w, $h) = @_;
1006		1095
1007	my $child = $self->{vp}->child;	1096	$self->update_slider;
1008	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009		1097
1010	$self->SUPER::invoke_size_allocate ($w, $h)	1098	$self->SUPER::invoke_size_allocate ($w, $h)
1011	}	1099	}
1012		1100
1013	#TODO# update range on size_allocate depending on child
1014	# update viewport offset on scroll
1015
1016	#############################################################################	1101	#############################################################################
1017		1102
1018	package CFClient::UI::Frame;	1103	package CFPlus::UI::Frame;
1019		1104
1020	our @ISA = CFClient::UI::Bin::;	1105	our @ISA = CFPlus::UI::Bin::;
1021		1106
1022	use CFClient::OpenGL;	1107	use CFPlus::OpenGL;
1023		1108
1024	sub new {	1109	sub new {
1025	my $class = shift;	1110	my $class = shift;
1026		1111
1027	$class->SUPER::new (	1112	$class->SUPER::new (
…		…
1053	$self->SUPER::_draw;	1138	$self->SUPER::_draw;
1054	}	1139	}
1055		1140
1056	#############################################################################	1141	#############################################################################
1057		1142
1058	package CFClient::UI::FancyFrame;	1143	package CFPlus::UI::FancyFrame;
1059		1144
1060	our @ISA = CFClient::UI::Bin::;	1145	our @ISA = CFPlus::UI::Bin::;
1061		1146
1062	use CFClient::OpenGL;	1147	use CFPlus::OpenGL;
		1148
		1149	sub new {
		1150	my ($class, %arg) = @_;
		1151
		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;
1063		1248
1064	my $bg =	1249	my $bg =
1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1250	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066	mipmap => 1, wrap => 1;	1251	mipmap => 1, wrap => 1;
1067		1252
1068	my @border =	1253	my @border =
1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1254	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1255	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071		1256
1072	sub new {	1257	sub new {
1073	my ($class, %arg) = @_;	1258	my ($class, %arg) = @_;
1074		1259
1075	my $self = $class->SUPER::new (	1260	my $self = $class->SUPER::new (
1076	bg => [1, 1, 1, 1],	1261	bg => [1, 1, 1, 1],
1077	border_bg => [1, 1, 1, 1],	1262	border_bg => [1, 1, 1, 1],
1078	border => 0.6,	1263	border => 0.6,
1079	can_events => 1,	1264	can_events => 1,
1080	min_w => 16,	1265	min_w => 64,
1081	min_h => 16,	1266	min_h => 32,
1082	%arg,	1267	%arg,
1083	);	1268	);
1084		1269
1085	$self->{title_widget} = new CFClient::UI::Label	1270	$self->{title_widget} = new CFPlus::UI::Label
1086	align => 0,	1271	align => 0,
1087	valign => 1,	1272	valign => 1,
1088	text => $self->{title},	1273	text => $self->{title},
1089	fontsize => $self->{border},	1274	fontsize => $self->{border},
1090	if exists $self->{title};	1275	if exists $self->{title};
1091		1276
1092	if ($self->{has_close_button}) {	1277	if ($self->{has_close_button}) {
1093	$self->{close_button} =	1278	$self->{close_button} =
1094	new CFClient::UI::ImageButton	1279	new CFPlus::UI::ImageButton
1095	image => 'x1_close.png',	1280	path => 'x1_close.png',
1096	on_activate => sub { $self->hide };	1281	on_activate => sub { $self->emit ("delete") };
1097		1282
1098	$self->CFClient::UI::Container::add ($self->{close_button});	1283	$self->CFPlus::UI::Container::add ($self->{close_button});
1099	}	1284	}
1100		1285
1101	$self	1286	$self
1102	}	1287	}
1103		1288
1104	sub add {	1289	sub add {
1105	my ($self, @widgets) = @_;	1290	my ($self, @widgets) = @_;
1106		1291
1107	$self->SUPER::add (@widgets);	1292	$self->SUPER::add (@widgets);
1108	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1293	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1294	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110	}	1295	}
1111		1296
1112	sub border {	1297	sub border {
1113	int $_[0]{border} * $::FONTSIZE	1298	int $_[0]{border} * $::FONTSIZE
1114	}	1299	}
…		…
1147	$self->child->configure ($border, $border, $w, $h);	1332	$self->child->configure ($border, $border, $w, $h);
1148		1333
1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1334	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150	if $self->{close_button};	1335	if $self->{close_button};
1151		1336
		1337	1
		1338	}
		1339
		1340	sub invoke_delete {
		1341	my ($self) = @_;
		1342
		1343	$self->hide;
		1344
1152	1	1345	1
1153	}	1346	}
1154		1347
1155	sub invoke_button_down {	1348	sub invoke_button_down {
1156	my ($self, $ev, $x, $y) = @_;	1349	my ($self, $ev, $x, $y) = @_;
…		…
1214	$self->{motion}->($ev, $x, $y) if $self->{motion};	1407	$self->{motion}->($ev, $x, $y) if $self->{motion};
1215		1408
1216	! ! $self->{motion}	1409	! ! $self->{motion}
1217	}	1410	}
1218		1411
		1412	sub invoke_visibility_change {
		1413	my ($self, $visible) = @_;
		1414
		1415	delete $self->{motion} unless $visible;
		1416
		1417	0
		1418	}
		1419
1219	sub _draw {	1420	sub _draw {
1220	my ($self) = @_;	1421	my ($self) = @_;
1221		1422
1222	my $child = $self->{children}[0];	1423	my $child = $self->{children}[0];
1223		1424
…		…
1260	if $self->{close_button};	1461	if $self->{close_button};
1261	}	1462	}
1262		1463
1263	#############################################################################	1464	#############################################################################
1264		1465
1265	package CFClient::UI::Table;	1466	package CFPlus::UI::Table;
1266		1467
1267	our @ISA = CFClient::UI::Base::;	1468	our @ISA = CFPlus::UI::Base::;
1268		1469
1269	use List::Util qw(max sum);	1470	use List::Util qw(max sum);
1270		1471
1271	use CFClient::OpenGL;	1472	use CFPlus::OpenGL;
1272		1473
1273	sub new {	1474	sub new {
1274	my $class = shift;	1475	my $class = shift;
1275		1476
1276	$class->SUPER::new (	1477	$class->SUPER::new (
…		…
1282	sub children {	1483	sub children {
1283	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1484	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284	}	1485	}
1285		1486
1286	sub add {	1487	sub add {
1287	my ($self, $x, $y, $child) = @_;	1488	my ($self) = shift;
1288		1489
		1490	while (@_) {
		1491	my ($x, $y, $child) = splice @_, 0, 3, ();
1289	$child->set_parent ($self);	1492	$child->set_parent ($self);
1290	$self->{children}[$y][$x] = $child;	1493	$self->{children}[$y][$x] = $child;
		1494	}
1291		1495
		1496	$self->{force_realloc} = 1;
		1497	$self->{force_size_alloc} = 1;
1292	$self->realloc;	1498	$self->realloc;
1293	}	1499	}
1294		1500
1295	sub remove {	1501	sub remove {
1296	my ($self, $child) = @_;	1502	my ($self, $child) = @_;
…		…
1361		1567
1362	# linearly scale sizes	1568	# linearly scale sizes
1363	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1569	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1570	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365		1571
1366	CFClient::UI::harmonize $ws;	1572	CFPlus::UI::harmonize $ws;
1367	CFClient::UI::harmonize $hs;	1573	CFPlus::UI::harmonize $hs;
1368		1574
1369	my $y;	1575	my $y;
1370		1576
1371	for my $r (0 .. $#{$self->{children}}) {	1577	for my $r (0 .. $#{$self->{children}}) {
1372	my $row = $self->{children}[$r]	1578	my $row = $self->{children}[$r]
…		…
1415	}	1621	}
1416	}	1622	}
1417		1623
1418	#############################################################################	1624	#############################################################################
1419		1625
1420	package CFClient::UI::Box;	1626	package CFPlus::UI::Box;
1421		1627
1422	our @ISA = CFClient::UI::Container::;	1628	our @ISA = CFPlus::UI::Container::;
1423		1629
1424	sub size_request {	1630	sub size_request {
1425	my ($self) = @_;	1631	my ($self) = @_;
1426		1632
1427	$self->{vertical}	1633	$self->{vertical}
…		…
1437		1643
1438	sub invoke_size_allocate {	1644	sub invoke_size_allocate {
1439	my ($self, $w, $h) = @_;	1645	my ($self, $w, $h) = @_;
1440		1646
1441	my $space = $self->{vertical} ? $h : $w;	1647	my $space = $self->{vertical} ? $h : $w;
1442	my $children = $self->{children};	1648	my @children = $self->visible_children;
1443		1649
1444	my @req;	1650	my @req;
1445		1651
1446	if ($self->{homogeneous}) {	1652	if ($self->{homogeneous}) {
1447	@req = ($space / (@$children || 1)) x @$children;	1653	@req = ($space / (@children || 1)) x @children;
1448	} else {	1654	} else {
1449	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1655	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450	my $req = List::Util::sum @req;	1656	my $req = List::Util::sum @req;
1451		1657
1452	if ($req > $space) {	1658	if ($req > $space) {
1453	# ah well, not enough space	1659	# ah well, not enough space
1454	$_ *= $space / $req for @req;	1660	$_ *= $space / $req for @req;
1455	} else {	1661	} else {
1456	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1662	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457		1663
1458	$space = ($space - $req) / $expand; # remaining space to give away	1664	$space = ($space - $req) / $expand; # remaining space to give away
1459		1665
1460	$req[$_] += $space * $children->[$_]{expand}	1666	$req[$_] += $space * $children[$_]{expand}
1461	for 0 .. $#$children;	1667	for 0 .. $#children;
1462	}	1668	}
1463	}	1669	}
1464		1670
1465	CFClient::UI::harmonize \@req;	1671	CFPlus::UI::harmonize \@req;
1466		1672
1467	my $pos = 0;	1673	my $pos = 0;
1468	for (0 .. $#$children) {	1674	for (0 .. $#children) {
1469	my $alloc = $req[$_];	1675	my $alloc = $req[$_];
1470	$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));
1471		1677
1472	$pos += $alloc;	1678	$pos += $alloc;
1473	}	1679	}
1474		1680
1475	1	1681	1
1476	}	1682	}
1477		1683
1478	#############################################################################	1684	#############################################################################
1479		1685
1480	package CFClient::UI::HBox;	1686	package CFPlus::UI::HBox;
1481		1687
1482	our @ISA = CFClient::UI::Box::;	1688	our @ISA = CFPlus::UI::Box::;
1483		1689
1484	sub new {	1690	sub new {
1485	my $class = shift;	1691	my $class = shift;
1486		1692
1487	$class->SUPER::new (	1693	$class->SUPER::new (
…		…
1490	)	1696	)
1491	}	1697	}
1492		1698
1493	#############################################################################	1699	#############################################################################
1494		1700
1495	package CFClient::UI::VBox;	1701	package CFPlus::UI::VBox;
1496		1702
1497	our @ISA = CFClient::UI::Box::;	1703	our @ISA = CFPlus::UI::Box::;
1498		1704
1499	sub new {	1705	sub new {
1500	my $class = shift;	1706	my $class = shift;
1501		1707
1502	$class->SUPER::new (	1708	$class->SUPER::new (
…		…
1505	)	1711	)
1506	}	1712	}
1507		1713
1508	#############################################################################	1714	#############################################################################
1509		1715
1510	package CFClient::UI::Label;	1716	package CFPlus::UI::Label;
1511		1717
1512	our @ISA = CFClient::UI::DrawBG::;	1718	our @ISA = CFPlus::UI::DrawBG::;
1513		1719
1514	use CFClient::OpenGL;	1720	use CFPlus::OpenGL;
1515		1721
1516	sub new {	1722	sub new {
1517	my ($class, %arg) = @_;	1723	my ($class, %arg) = @_;
1518		1724
1519	my $self = $class->SUPER::new (	1725	my $self = $class->SUPER::new (
…		…
1522	#active_bg => none	1728	#active_bg => none
1523	#font => default_font	1729	#font => default_font
1524	#text => initial text	1730	#text => initial text
1525	#markup => initial narkup	1731	#markup => initial narkup
1526	#max_w => maximum pixel width	1732	#max_w => maximum pixel width
		1733	#style => 0, # render flags
1527	ellipsise => 3, # end	1734	ellipsise => 3, # end
1528	layout => (new CFClient::Layout),	1735	layout => (new CFPlus::Layout),
1529	fontsize => 1,	1736	fontsize => 1,
1530	align => -1,	1737	align => -1,
1531	valign => -1,	1738	valign => -1,
1532	padding_x => 2,	1739	padding_x => 2,
1533	padding_y => 2,	1740	padding_y => 2,
1534	can_events => 0,	1741	can_events => 0,
1535	%arg	1742	%arg
1536	);	1743	);
1537		1744
1538	if (exists $self->{template}) {	1745	if (exists $self->{template}) {
1539	my $layout = new CFClient::Layout;	1746	my $layout = new CFPlus::Layout;
1540	$layout->set_text (delete $self->{template});	1747	$layout->set_text (delete $self->{template});
1541	$self->{template} = $layout;	1748	$self->{template} = $layout;
1542	}	1749	}
1543		1750
1544	if (exists $self->{markup}) {	1751	if (exists $self->{markup}) {
…		…
1548	}	1755	}
1549		1756
1550	$self	1757	$self
1551	}	1758	}
1552		1759
1553	sub escape($) {
1554	local $_ = $_[0];
1555
1556	s/&/&amp;/g;
1557	s/>/&gt;/g;
1558	s/</&lt;/g;
1559
1560	$_
1561	}
1562
1563	sub update {	1760	sub update {
1564	my ($self) = @_;	1761	my ($self) = @_;
1565		1762
1566	delete $self->{texture};	1763	delete $self->{texture};
1567	$self->SUPER::update;	1764	$self->SUPER::update;
…		…
1578	my ($self, $text) = @_;	1775	my ($self, $text) = @_;
1579		1776
1580	return if $self->{text} eq "T$text";	1777	return if $self->{text} eq "T$text";
1581	$self->{text} = "T$text";	1778	$self->{text} = "T$text";
1582		1779
1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584	$self->{layout}->set_text ($text);	1780	$self->{layout}->set_text ($text);
1585		1781
1586	delete $self->{size_req};	1782	delete $self->{size_req};
1587	$self->realloc;	1783	$self->realloc;
1588	$self->update;	1784	$self->update;
…		…
1594	return if $self->{text} eq "M$markup";	1790	return if $self->{text} eq "M$markup";
1595	$self->{text} = "M$markup";	1791	$self->{text} = "M$markup";
1596		1792
1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1793	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598		1794
1599	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600	$self->{layout}->set_markup ($markup);	1795	$self->{layout}->set_markup ($markup);
1601		1796
1602	delete $self->{size_req};	1797	delete $self->{size_req};
1603	$self->realloc;	1798	$self->realloc;
1604	$self->update;	1799	$self->update;
…		…
1616		1811
1617	my ($w, $h) = $self->{layout}->size;	1812	my ($w, $h) = $self->{layout}->size;
1618		1813
1619	if (exists $self->{template}) {	1814	if (exists $self->{template}) {
1620	$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);
1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1817	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622		1818
1623	my ($w2, $h2) = $self->{template}->size;	1819	my ($w2, $h2) = $self->{template}->size;
1624		1820
1625	$w = List::Util::max $w, $w2;	1821	$w = List::Util::max $w, $w2;
…		…
1630	};	1826	};
1631		1827
1632	@{ $self->{size_req} }	1828	@{ $self->{size_req} }
1633	}	1829	}
1634		1830
		1831	sub baseline_shift {
		1832	$_[0]{layout}->descent
		1833	}
		1834
1635	sub invoke_size_allocate {	1835	sub invoke_size_allocate {
1636	my ($self, $w, $h) = @_;	1836	my ($self, $w, $h) = @_;
1637		1837
1638	delete $self->{ox};	1838	delete $self->{ox};
1639		1839
…		…
1645		1845
1646	sub set_fontsize {	1846	sub set_fontsize {
1647	my ($self, $fontsize) = @_;	1847	my ($self, $fontsize) = @_;
1648		1848
1649	$self->{fontsize} = $fontsize;	1849	$self->{fontsize} = $fontsize;
		1850	delete $self->{size_req};
1650	delete $self->{texture};	1851	delete $self->{texture};
1651		1852
1652	$self->realloc;	1853	$self->realloc;
1653	}	1854	}
1654		1855
1655	sub reconfigure {	1856	sub reconfigure {
1656	my ($self) = @_;	1857	my ($self) = @_;
1657		1858
1658	delete $self->{size_req};	1859	delete $self->{size_req};
		1860	delete $self->{texture};
1659		1861
1660	$self->SUPER::reconfigure;	1862	$self->SUPER::reconfigure;
1661	}	1863	}
1662		1864
1663	sub _draw {	1865	sub _draw {
1664	my ($self) = @_;	1866	my ($self) = @_;
1665		1867
1666	$self->SUPER::_draw; # draw background, if applicable	1868	$self->SUPER::_draw; # draw background, if applicable
1667		1869
1668	my $tex = $self->{texture} ||= do {	1870	my $size = $self->{texture} ||= do {
1669	$self->{layout}->set_foreground (@{$self->{fg}});	1871	$self->{layout}->set_foreground (@{$self->{fg}});
1670	$self->{layout}->set_font ($self->{font}) if $self->{font};	1872	$self->{layout}->set_font ($self->{font}) if $self->{font};
1671	$self->{layout}->set_width ($self->{w});	1873	$self->{layout}->set_width ($self->{w});
1672	$self->{layout}->set_ellipsise ($self->{ellipsise});	1874	$self->{layout}->set_ellipsise ($self->{ellipsise});
1673	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1875	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1876	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675		1877
1676	new_from_layout CFClient::Texture $self->{layout}	1878	[$self->{layout}->size]
1677	};	1879	};
1678		1880
1679	unless (exists $self->{ox}) {	1881	unless (exists $self->{ox}) {
1680	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1882	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1883	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682	: ($self->{w} - $tex->{w}) * 0.5);	1884	: ($self->{w} - $size->[0]) * 0.5);
1683		1885
1684	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1886	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1887	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686	: ($self->{h} - $tex->{h}) * 0.5);	1888	: ($self->{h} - $size->[1]) * 0.5);
1687	};	1889	};
1688		1890
1689	glEnable GL_TEXTURE_2D;
1690
1691	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1891	my $w = List::Util::min $self->{w} + 4, $size->[0];
1692	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1892	my $h = List::Util::min $self->{h} + 2, $size->[1];
1693		1893
1694	if ($tex->{format} == GL_ALPHA) {	1894	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1696	glColor @{$self->{fg}};
1697	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1698	} else {
1699	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1700	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1701	}
1702
1703	glDisable GL_TEXTURE_2D;
1704	}	1895	}
1705		1896
1706	#############################################################################	1897	#############################################################################
1707		1898
1708	package CFClient::UI::EntryBase;	1899	package CFPlus::UI::EntryBase;
1709		1900
1710	our @ISA = CFClient::UI::Label::;	1901	our @ISA = CFPlus::UI::Label::;
1711		1902
1712	use CFClient::OpenGL;	1903	use CFPlus::OpenGL;
1713		1904
1714	sub new {	1905	sub new {
1715	my $class = shift;	1906	my $class = shift;
1716		1907
1717	$class->SUPER::new (	1908	$class->SUPER::new (
…		…
1721	active_fg => [0, 0, 0],	1912	active_fg => [0, 0, 0],
1722	can_hover => 1,	1913	can_hover => 1,
1723	can_focus => 1,	1914	can_focus => 1,
1724	valign => 0,	1915	valign => 0,
1725	can_events => 1,	1916	can_events => 1,
		1917	ellipsise => 0,
1726	#text => ...	1918	#text => ...
1727	#hidden => "*",	1919	#hidden => "*",
1728	@_	1920	@_
1729	)	1921	)
1730	}	1922	}
…		…
1779		1971
1780	if ($uni == 8) {	1972	if ($uni == 8) {
1781	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782	} elsif ($uni == 127) {	1974	} elsif ($uni == 127) {
1783	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1784	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1785	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1786	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1787	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1788	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
		1981	# what a hack
		1982	$self->{cursor} =
		1983	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1984	? length $1
		1985	: 0;
		1986	} elsif ($sym == CFPlus::SDLK_END) {
		1987	# uh, again
		1988	$self->{cursor} =
		1989	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1990	? $self->{cursor} + length $1
		1991	: length $self->{text};
		1992	} elsif ($uni == 21) { # ctrl-u
		1993	$text = "";
1789	$self->{cursor} = 0;	1994	$self->{cursor} = 0;
1790	} elsif ($sym == CFClient::SDLK_END) {
1791	$self->{cursor} = length $text;
1792	} elsif ($uni == 27) {	1995	} elsif ($uni == 27) {
1793	$self->emit ('escape');	1996	$self->emit ('escape');
1794	} elsif ($uni) {	1997	} elsif ($uni == 0x0d) {
		1998	substr $text, $self->{cursor}++, 0, "\012";
		1999	} elsif ($uni >= 0x20) {
1795	substr $text, $self->{cursor}++, 0, chr $uni;	2000	substr $text, $self->{cursor}++, 0, chr $uni;
1796	} else {	2001	} else {
1797	return 0;	2002	return 0;
1798	}	2003	}
1799		2004
1800	$self->_set_text ($text);	2005	$self->_set_text ($text);
1801		2006
1802	$self->realloc;	2007	$self->realloc;
		2008	$self->update;
1803		2009
1804	1	2010	1
1805	}	2011	}
1806		2012
1807	sub invoke_focus_in {	2013	sub invoke_focus_in {
…		…
1819		2025
1820	my $idx = $self->{layout}->xy_to_index ($x, $y);	2026	my $idx = $self->{layout}->xy_to_index ($x, $y);
1821		2027
1822	# byte-index to char-index	2028	# byte-index to char-index
1823	my $text = $self->{text};	2029	my $text = $self->{text};
1824	utf8::encode $text;	2030	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825	$self->{cursor} = length substr $text, 0, $idx;	2031	$self->{cursor} = length $text;
1826		2032
1827	$self->_set_text ($self->{text});	2033	$self->_set_text ($self->{text});
1828	$self->update;	2034	$self->update;
1829		2035
1830	1	2036	1
…		…
1869	utf8::encode $text;	2075	utf8::encode $text;
1870		2076
1871	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2077	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872	}	2078	}
1873		2079
1874	glColor @{$self->{fg}};
1875	glBegin GL_LINES;	2080	glBegin GL_LINES;
1876	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2081	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2082	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878	glEnd;	2083	glEnd;
1879	}	2084	}
1880	}	2085	}
1881		2086
		2087	#############################################################################
		2088
1882	package CFClient::UI::Entry;	2089	package CFPlus::UI::Entry;
1883		2090
1884	our @ISA = CFClient::UI::EntryBase::;	2091	our @ISA = CFPlus::UI::EntryBase::;
1885		2092
1886	use CFClient::OpenGL;	2093	use CFPlus::OpenGL;
1887		2094
1888	sub invoke_key_down {	2095	sub invoke_key_down {
1889	my ($self, $ev) = @_;	2096	my ($self, $ev) = @_;
1890		2097
1891	my $sym = $ev->{sym};	2098	my $sym = $ev->{sym};
1892		2099
1893	if ($sym == 13) {	2100	if ($ev->{uni} == 0x0d || $sym == 13) {
1894	unshift @{$self->{history}},	2101	unshift @{$self->{history}},
1895	my $txt = $self->get_text;	2102	my $txt = $self->get_text;
		2103
1896	$self->{history_pointer} = -1;	2104	$self->{history_pointer} = -1;
1897	$self->{history_saveback} = '';	2105	$self->{history_saveback} = '';
1898	$self->emit (activate => $txt);	2106	$self->emit (activate => $txt);
1899	$self->update;	2107	$self->update;
1900		2108
1901	} elsif ($sym == CFClient::SDLK_UP) {	2109	} elsif ($sym == CFPlus::SDLK_UP) {
1902	if ($self->{history_pointer} < 0) {	2110	if ($self->{history_pointer} < 0) {
1903	$self->{history_saveback} = $self->get_text;	2111	$self->{history_saveback} = $self->get_text;
1904	}	2112	}
1905	if (@{$self->{history} || []} > 0) {	2113	if (@{$self->{history} || []} > 0) {
1906	$self->{history_pointer}++;	2114	$self->{history_pointer}++;
…		…
1908	$self->{history_pointer} = @{$self->{history} || []} - 1;	2116	$self->{history_pointer} = @{$self->{history} || []} - 1;
1909	}	2117	}
1910	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2118	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1911	}	2119	}
1912		2120
1913	} elsif ($sym == CFClient::SDLK_DOWN) {	2121	} elsif ($sym == CFPlus::SDLK_DOWN) {
1914	$self->{history_pointer}--;	2122	$self->{history_pointer}--;
1915	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2123	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1916		2124
1917	if ($self->{history_pointer} >= 0) {	2125	if ($self->{history_pointer} >= 0) {
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2126	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1927	1	2135	1
1928	}	2136	}
1929		2137
1930	#############################################################################	2138	#############################################################################
1931		2139
		2140	package CFPlus::UI::TextEdit;
		2141
		2142	our @ISA = CFPlus::UI::EntryBase::;
		2143
		2144	use CFPlus::OpenGL;
		2145
		2146	sub move_cursor_ver {
		2147	my ($self, $dy) = @_;
		2148
		2149	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2150
		2151	$y += $dy;
		2152
		2153	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2154	$self->{cursor} = $index;
		2155	delete $self->{cur_h};
		2156	$self->update;
		2157	return;
		2158	}
		2159	}
		2160
		2161	sub invoke_key_down {
		2162	my ($self, $ev) = @_;
		2163
		2164	my $sym = $ev->{sym};
		2165
		2166	if ($sym == CFPlus::SDLK_UP) {
		2167	$self->move_cursor_ver (-1);
		2168	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2169	$self->move_cursor_ver (+1);
		2170	} else {
		2171	return $self->SUPER::invoke_key_down ($ev)
		2172	}
		2173
		2174	1
		2175	}
		2176
		2177	#############################################################################
		2178
1932	package CFClient::UI::Button;	2179	package CFPlus::UI::Button;
1933		2180
1934	our @ISA = CFClient::UI::Label::;	2181	our @ISA = CFPlus::UI::Label::;
1935		2182
1936	use CFClient::OpenGL;	2183	use CFPlus::OpenGL;
1937		2184
1938	my @tex =	2185	my @tex =
1939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1940	qw(b1_button_active.png);	2187	qw(b1_button_active.png);
1941		2188
1942	sub new {	2189	sub new {
1943	my $class = shift;	2190	my $class = shift;
1944		2191
…		…
1981	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
1982	}	2229	}
1983		2230
1984	#############################################################################	2231	#############################################################################
1985		2232
		2233	package CFPlus::UI::CheckBox;
		2234
		2235	our @ISA = CFPlus::UI::DrawBG::;
		2236
		2237	my @tex =
		2238	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2239	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2240
		2241	use CFPlus::OpenGL;
		2242
		2243	sub new {
		2244	my $class = shift;
		2245
		2246	$class->SUPER::new (
		2247	padding_x => 2,
		2248	padding_y => 2,
		2249	fg => [1, 1, 1],
		2250	active_fg => [1, 1, 0],
		2251	bg => [0, 0, 0, 0.2],
		2252	active_bg => [1, 1, 1, 0.5],
		2253	state => 0,
		2254	can_hover => 1,
		2255	@_
		2256	)
		2257	}
		2258
		2259	sub size_request {
		2260	my ($self) = @_;
		2261
		2262	(6) x 2
		2263	}
		2264
		2265	sub toggle {
		2266	my ($self) = @_;
		2267
		2268	$self->{state} = !$self->{state};
		2269	$self->emit (changed => $self->{state});
		2270	$self->update;
		2271	}
		2272
		2273	sub invoke_button_down {
		2274	my ($self, $ev, $x, $y) = @_;
		2275
		2276	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2277	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2278	$self->toggle;
		2279	} else {
		2280	return 0
		2281	}
		2282
		2283	1
		2284	}
		2285
		2286	sub _draw {
		2287	my ($self) = @_;
		2288
		2289	$self->SUPER::_draw;
		2290
		2291	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2292
		2293	my ($w, $h) = @$self{qw(w h)};
		2294
		2295	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2296
		2297	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2298
		2299	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2300
		2301	glEnable GL_TEXTURE_2D;
		2302	$tex->draw_quad_alpha (0, 0, $s, $s);
		2303	glDisable GL_TEXTURE_2D;
		2304	}
		2305
		2306	#############################################################################
		2307
		2308	package CFPlus::UI::Image;
		2309
		2310	our @ISA = CFPlus::UI::Base::;
		2311
		2312	use CFPlus::OpenGL;
		2313
		2314	our %texture_cache;
		2315
		2316	sub new {
		2317	my $class = shift;
		2318
		2319	my $self = $class->SUPER::new (
		2320	can_events => 0,
		2321	@_,
		2322	);
		2323
		2324	$self->{path} || $self->{tex}
		2325	or Carp::croak "'path' or 'tex' attributes required";
		2326
		2327	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2328	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2329
		2330	CFPlus::weaken $texture_cache{$self->{path}};
		2331
		2332	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2333
		2334	$self
		2335	}
		2336
		2337	sub STORABLE_freeze {
		2338	my ($self, $cloning) = @_;
		2339
		2340	$self->{path}
		2341	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2342
		2343	$self->{path}
		2344	}
		2345
		2346	sub STORABLE_attach {
		2347	my ($self, $cloning, $path) = @_;
		2348
		2349	$self->new (path => $path)
		2350	}
		2351
		2352	sub size_request {
		2353	my ($self) = @_;
		2354
		2355	($self->{tex}{w}, $self->{tex}{h})
		2356	}
		2357
		2358	sub _draw {
		2359	my ($self) = @_;
		2360
		2361	my $tex = $self->{tex};
		2362
		2363	my ($w, $h) = ($self->{w}, $self->{h});
		2364
		2365	if ($self->{rot90}) {
		2366	glRotate 90, 0, 0, 1;
		2367	glTranslate 0, -$self->{w}, 0;
		2368
		2369	($w, $h) = ($h, $w);
		2370	}
		2371
		2372	glEnable GL_TEXTURE_2D;
		2373	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2374
		2375	$tex->draw_quad (0, 0, $w, $h);
		2376
		2377	glDisable GL_TEXTURE_2D;
		2378	}
		2379
		2380	#############################################################################
		2381
1986	package CFClient::UI::ImageButton;	2382	package CFPlus::UI::ImageButton;
1987		2383
1988	our @ISA = CFClient::UI::Image::;	2384	our @ISA = CFPlus::UI::Image::;
1989		2385
1990	use CFClient::OpenGL;	2386	use CFPlus::OpenGL;
1991		2387
1992	my %textures;	2388	my %textures;
1993		2389
1994	sub new {	2390	sub new {
1995	my $class = shift;	2391	my $class = shift;
…		…
2017	1	2413	1
2018	}	2414	}
2019		2415
2020	#############################################################################	2416	#############################################################################
2021		2417
2022	package CFClient::UI::CheckBox;
2023
2024	our @ISA = CFClient::UI::DrawBG::;
2025
2026	my @tex =
2027	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2028	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2029
2030	use CFClient::OpenGL;
2031
2032	sub new {
2033	my $class = shift;
2034
2035	$class->SUPER::new (
2036	padding_x => 2,
2037	padding_y => 2,
2038	fg => [1, 1, 1],
2039	active_fg => [1, 1, 0],
2040	bg => [0, 0, 0, 0.2],
2041	active_bg => [1, 1, 1, 0.5],
2042	state => 0,
2043	can_hover => 1,
2044	@_
2045	)
2046	}
2047
2048	sub size_request {
2049	my ($self) = @_;
2050
2051	(6) x 2
2052	}
2053
2054	sub invoke_button_down {
2055	my ($self, $ev, $x, $y) = @_;
2056
2057	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2058	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2059	$self->{state} = !$self->{state};
2060	$self->emit (changed => $self->{state});
2061	} else {
2062	return 0
2063	}
2064
2065	1
2066	}
2067
2068	sub _draw {
2069	my ($self) = @_;
2070
2071	$self->SUPER::_draw;
2072
2073	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2074
2075	my ($w, $h) = @$self{qw(w h)};
2076
2077	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2078
2079	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2080
2081	my $tex = $self->{state} ? $tex[1] : $tex[0];
2082
2083	glEnable GL_TEXTURE_2D;
2084	$tex->draw_quad_alpha (0, 0, $s, $s);
2085	glDisable GL_TEXTURE_2D;
2086	}
2087
2088	#############################################################################
2089
2090	package CFClient::UI::Image;	2418	package CFPlus::UI::VGauge;
2091		2419
2092	our @ISA = CFClient::UI::Base::;	2420	our @ISA = CFPlus::UI::Base::;
2093
2094	use CFClient::OpenGL;
2095	use Carp qw/confess/;
2096
2097	our %loaded_images;
2098
2099	sub new {
2100	my $class = shift;
2101
2102	my $self = $class->SUPER::new (can_events => 0, @_);
2103
2104	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2105
2106	$loaded_images{$self->{image}} ||=
2107	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2108
2109	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2110
2111	Scalar::Util::weaken $loaded_images{$self->{image}};
2112
2113	$self->{aspect} = $tex->{w} / $tex->{h};
2114
2115	$self
2116	}
2117
2118	sub size_request {
2119	my ($self) = @_;
2120
2121	($self->{tex}->{w}, $self->{tex}->{h})
2122	}
2123
2124	sub _draw {
2125	my ($self) = @_;
2126
2127	my $tex = $self->{tex};
2128
2129	my ($w, $h) = ($self->{w}, $self->{h});
2130
2131	if ($self->{rot90}) {
2132	glRotate 90, 0, 0, 1;
2133	glTranslate 0, -$self->{w}, 0;
2134
2135	($w, $h) = ($h, $w);
2136	}
2137
2138	glEnable GL_TEXTURE_2D;
2139	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2140
2141	$tex->draw_quad_alpha (0, 0, $w, $h);
2142
2143	glDisable GL_TEXTURE_2D;
2144	}
2145
2146	#############################################################################
2147
2148	package CFClient::UI::VGauge;
2149
2150	our @ISA = CFClient::UI::Base::;
2151		2421
2152	use List::Util qw(min max);	2422	use List::Util qw(min max);
2153		2423
2154	use CFClient::OpenGL;	2424	use CFPlus::OpenGL;
2155		2425
2156	my %tex = (	2426	my %tex = (
2157	food => [	2427	food => [
2158	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2428	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2159	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2429	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2160	],	2430	],
2161	grace => [	2431	grace => [
2162	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2432	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2163	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2433	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2164	],	2434	],
2165	hp => [	2435	hp => [
2166	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2436	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2167	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2437	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2168	],	2438	],
2169	mana => [	2439	mana => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2440	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2441	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2172	],	2442	],
2173	);	2443	);
2174		2444
2175	# eg. VGauge->new (gauge => 'food'), default gauge: food	2445	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2235	my $ycut1 = max 0, min 1, $ycut;	2505	my $ycut1 = max 0, min 1, $ycut;
2236	my $ycut2 = max 0, min 1, $ycut - 1;	2506	my $ycut2 = max 0, min 1, $ycut - 1;
2237		2507
2238	my $h1 = $self->{h} * (1 - $ycut1);	2508	my $h1 = $self->{h} * (1 - $ycut1);
2239	my $h2 = $self->{h} * (1 - $ycut2);	2509	my $h2 = $self->{h} * (1 - $ycut2);
		2510	my $h3 = $self->{h};
		2511
		2512	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2240		2513
2241	glEnable GL_BLEND;	2514	glEnable GL_BLEND;
2242	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2515	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2516	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244	glEnable GL_TEXTURE_2D;	2517	glEnable GL_TEXTURE_2D;
…		…
2263		2536
2264	if ($t3) {	2537	if ($t3) {
2265	glBindTexture GL_TEXTURE_2D, $t3->{name};	2538	glBindTexture GL_TEXTURE_2D, $t3->{name};
2266	glBegin GL_QUADS;	2539	glBegin GL_QUADS;
2267	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2540	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2541	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2542	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2543	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271	glEnd;	2544	glEnd;
2272	}	2545	}
2273		2546
2274	glDisable GL_BLEND;	2547	glDisable GL_BLEND;
2275	glDisable GL_TEXTURE_2D;	2548	glDisable GL_TEXTURE_2D;
2276	}	2549	}
2277		2550
2278	#############################################################################	2551	#############################################################################
2279		2552
2280	package CFClient::UI::Gauge;	2553	package CFPlus::UI::Gauge;
2281		2554
2282	our @ISA = CFClient::UI::VBox::;	2555	our @ISA = CFPlus::UI::VBox::;
2283		2556
2284	sub new {	2557	sub new {
2285	my ($class, %arg) = @_;	2558	my ($class, %arg) = @_;
2286		2559
2287	my $self = $class->SUPER::new (	2560	my $self = $class->SUPER::new (
…		…
2289	can_hover => 1,	2562	can_hover => 1,
2290	can_events => 1,	2563	can_events => 1,
2291	%arg,	2564	%arg,
2292	);	2565	);
2293		2566
2294	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2567	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2295	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2568	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2296	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2569	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2297		2570
2298	$self	2571	$self
2299	}	2572	}
2300		2573
2301	sub set_fontsize {	2574	sub set_fontsize {
…		…
2322	$self->{value}->set_text ($val);	2595	$self->{value}->set_text ($val);
2323	}	2596	}
2324		2597
2325	#############################################################################	2598	#############################################################################
2326		2599
2327	package CFClient::UI::Slider;	2600	package CFPlus::UI::Slider;
2328		2601
2329	use strict;	2602	use strict;
2330		2603
2331	use CFClient::OpenGL;	2604	use CFPlus::OpenGL;
2332		2605
2333	our @ISA = CFClient::UI::DrawBG::;	2606	our @ISA = CFPlus::UI::DrawBG::;
2334		2607
2335	my @tex =	2608	my @tex =
2336	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2609	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2337	qw(s1_slider.png s1_slider_bg.png);	2610	qw(s1_slider.png s1_slider_bg.png);
2338		2611
2339	sub new {	2612	sub new {
2340	my $class = shift;	2613	my $class = shift;
2341		2614
…		…
2409		2682
2410	$self->SUPER::invoke_button_down ($ev, $x, $y);	2683	$self->SUPER::invoke_button_down ($ev, $x, $y);
2411		2684
2412	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2685	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413		2686
2414	$self->mouse_motion ($ev, $x, $y)	2687	$self->invoke_mouse_motion ($ev, $x, $y)
2415	}	2688	}
2416		2689
2417	sub invoke_mouse_motion {	2690	sub invoke_mouse_motion {
2418	my ($self, $ev, $x, $y) = @_;	2691	my ($self, $ev, $x, $y) = @_;
2419		2692
…		…
2428	} else {	2701	} else {
2429	return 0;	2702	return 0;
2430	}	2703	}
2431		2704
2432	1	2705	1
		2706	}
		2707
		2708	sub invoke_mouse_wheel {
		2709	my ($self, $ev) = @_;
		2710
		2711	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2712
		2713	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2714
		2715	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2716
		2717	! ! $delta
2433	}	2718	}
2434		2719
2435	sub update {	2720	sub update {
2436	my ($self) = @_;	2721	my ($self) = @_;
2437		2722
…		…
2486	glDisable GL_TEXTURE_2D;	2771	glDisable GL_TEXTURE_2D;
2487	}	2772	}
2488		2773
2489	#############################################################################	2774	#############################################################################
2490		2775
2491	package CFClient::UI::ValSlider;	2776	package CFPlus::UI::ValSlider;
2492		2777
2493	our @ISA = CFClient::UI::HBox::;	2778	our @ISA = CFPlus::UI::HBox::;
2494		2779
2495	sub new {	2780	sub new {
2496	my ($class, %arg) = @_;	2781	my ($class, %arg) = @_;
2497		2782
2498	my $range = delete $arg{range};	2783	my $range = delete $arg{range};
2499		2784
2500	my $self = $class->SUPER::new (	2785	my $self = $class->SUPER::new (
2501	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2786	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2502	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2787	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2503	to_value => sub { shift },	2788	to_value => sub { shift },
2504	from_value => sub { shift },	2789	from_value => sub { shift },
2505	%arg,	2790	%arg,
2506	);	2791	);
2507		2792
…		…
2527	sub set_range { shift->{slider}->set_range (@_) }	2812	sub set_range { shift->{slider}->set_range (@_) }
2528	sub set_value { shift->{slider}->set_value (@_) }	2813	sub set_value { shift->{slider}->set_value (@_) }
2529		2814
2530	#############################################################################	2815	#############################################################################
2531		2816
2532	package CFClient::UI::TextScroller;	2817	package CFPlus::UI::TextScroller;
2533		2818
2534	our @ISA = CFClient::UI::HBox::;	2819	our @ISA = CFPlus::UI::HBox::;
2535		2820
2536	use CFClient::OpenGL;	2821	use CFPlus::OpenGL;
2537		2822
2538	sub new {	2823	sub new {
2539	my $class = shift;	2824	my $class = shift;
2540		2825
2541	my $self = $class->SUPER::new (	2826	my $self = $class->SUPER::new (
2542	fontsize => 1,	2827	fontsize => 1,
2543	can_events => 0,	2828	can_events => 1,
2544	indent => 0,	2829	indent => 0,
2545	#font => default_font	2830	#font => default_font
2546	@_,	2831	@_,
2547		2832
2548	layout => (new CFClient::Layout 1),	2833	layout => (new CFPlus::Layout),
2549	par => [],	2834	par => [],
		2835	max_par => 0,
2550	height => 0,	2836	height => 0,
2551	children => [	2837	children => [
2552	(new CFClient::UI::Empty expand => 1),	2838	(new CFPlus::UI::Empty expand => 1),
2553	(new CFClient::UI::Slider vertical => 1),	2839	(new CFPlus::UI::Slider vertical => 1),
2554	],	2840	],
2555	);	2841	);
2556		2842
2557	$self->{children}[1]->connect (changed => sub { $self->update });	2843	$self->{children}[1]->connect (changed => sub { $self->update });
2558		2844
…		…
2564		2850
2565	$self->{fontsize} = $fontsize;	2851	$self->{fontsize} = $fontsize;
2566	$self->reflow;	2852	$self->reflow;
2567	}	2853	}
2568		2854
		2855	sub size_request {
		2856	my ($self) = @_;
		2857
		2858	my ($empty, $slider) = @{ $self->{children} };
		2859
		2860	local $self->{children} = [$empty, $slider];
		2861	$self->SUPER::size_request
		2862	}
		2863
2569	sub invoke_size_allocate {	2864	sub invoke_size_allocate {
2570	my ($self, $w, $h) = @_;	2865	my ($self, $w, $h) = @_;
2571		2866
		2867	my ($empty, $slider, @other) = @{ $self->{children} };
		2868	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		2869
2572	$self->{layout}->set_font ($self->{font}) if $self->{font};	2870	$self->{layout}->set_font ($self->{font}) if $self->{font};
2573	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2871	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574	$self->{layout}->set_width ($self->{children}[0]{w});	2872	$self->{layout}->set_width ($empty->{w});
2575	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2873	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576		2874
2577	$self->reflow;	2875	$self->reflow;
2578		2876
		2877	local $self->{children} = [$empty, $slider];
2579	$self->SUPER::invoke_size_allocate ($w, $h)	2878	$self->SUPER::invoke_size_allocate ($w, $h)
2580	}	2879	}
2581		2880
2582	sub text_size {	2881	sub invoke_mouse_wheel {
2583	my ($self, $text, $indent) = @_;	2882	my ($self, $ev) = @_;
		2883
		2884	return 0 unless $ev->{dy}; # only vertical movements
		2885
		2886	$self->{children}[1]->emit (mouse_wheel => $ev);
		2887
		2888	1
		2889	}
		2890
		2891	sub get_layout {
		2892	my ($self, $para) = @_;
2584		2893
2585	my $layout = $self->{layout};	2894	my $layout = $self->{layout};
2586		2895
		2896	$layout->set_font ($self->{font}) if $self->{font};
		2897	$layout->set_foreground (@{$para->{fg}});
2587	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2898	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588	$layout->set_width ($self->{children}[0]{w} - $indent);	2899	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2900	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590	$layout->set_markup ($text);	2901	$layout->set_markup ($para->{markup});
		2902
		2903	$layout->set_shapes (
		2904	map
		2905	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2906	@{$para->{widget}}
2591		2907	);
		2908
2592	$layout->size	2909	$layout
2593	}	2910	}
2594		2911
2595	sub reflow {	2912	sub reflow {
2596	my ($self) = @_;	2913	my ($self) = @_;
2597		2914
…		…
2604		2921
2605	# todo: base offset on lines or so, not on pixels	2922	# todo: base offset on lines or so, not on pixels
2606	$self->{children}[1]->set_value ($offset);	2923	$self->{children}[1]->set_value ($offset);
2607	}	2924	}
2608		2925
		2926	sub current_paragraph {
		2927	my ($self) = @_;
		2928
		2929	$self->{top_paragraph} - 1
		2930	}
		2931
		2932	sub scroll_to {
		2933	my ($self, $para) = @_;
		2934
		2935	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2936
		2937	$self->{scroll_to} = $para;
		2938	$self->update;
		2939	}
		2940
2609	sub clear {	2941	sub clear {
2610	my ($self) = @_;	2942	my ($self) = @_;
		2943
		2944	my (undef, undef, @other) = @{ $self->{children} };
		2945	$self->remove ($_) for @other;
2611		2946
2612	$self->{par} = [];	2947	$self->{par} = [];
2613	$self->{height} = 0;	2948	$self->{height} = 0;
2614	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2949	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615	}	2950	}
2616		2951
2617	sub add_paragraph {	2952	sub add_paragraph {
2618	my ($self, $color, $text, $indent) = @_;	2953	my $self = shift;
2619		2954
2620	for my $line (split /\n/, $text) {	2955	for my $para (@_) {
2621	my ($w, $h) = $self->text_size ($line);	2956	$para = {
		2957	fg => [1, 1, 1, 1],
		2958	indent => 0,
		2959	markup => "",
		2960	widget => [],
		2961	ref $para ? %$para : (markup => $para),
		2962	w => 1e10,
		2963	wrapped => 1,
		2964	};
		2965
		2966	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2967	push @{$self->{par}}, $para;
		2968	}
		2969
		2970	if (my $max = $self->{max_par}) {
		2971	shift @{$self->{par}} while @{$self->{par}} > $max;
		2972	}
		2973
		2974	$self->{need_reflow}++;
		2975	$self->update;
		2976	}
		2977
		2978	sub scroll_to_bottom {
		2979	my ($self) = @_;
		2980
		2981	$self->{scroll_to} = $#{$self->{par}};
		2982	$self->update;
		2983	}
		2984
		2985	sub force_uptodate {
		2986	my ($self) = @_;
		2987
		2988	if (delete $self->{need_reflow}) {
		2989	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2990
		2991	my $height = 0;
		2992
		2993	for my $para (@{$self->{par}}) {
		2994	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2995	my $layout = $self->get_layout ($para);
		2996	my ($w, $h) = $layout->size;
		2997
		2998	$para->{w} = $w + $para->{indent};
		2999	$para->{h} = $h;
		3000	$para->{wrapped} = $layout->has_wrapped;
		3001	}
		3002
		3003	$para->{y} = $height;
		3004	$height += $para->{h};
		3005	}
		3006
2622	$self->{height} += $h;	3007	$self->{height} = $height;
2623	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3008	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2624	}
2625		3009
2626	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3010	delete $self->{texture};
		3011	}
		3012
		3013	if (my $paridx = delete $self->{scroll_to}) {
		3014	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3015	}
2627	}	3016	}
2628		3017
2629	sub update {	3018	sub update {
2630	my ($self) = @_;	3019	my ($self) = @_;
2631		3020
…		…
2634	return unless $self->{h} > 0;	3023	return unless $self->{h} > 0;
2635		3024
2636	delete $self->{texture};	3025	delete $self->{texture};
2637		3026
2638	$ROOT->on_post_alloc ($self => sub {	3027	$ROOT->on_post_alloc ($self => sub {
		3028	$self->force_uptodate;
		3029
2639	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3030	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640		3031
2641	if (delete $self->{need_reflow}) {
2642	my $height = 0;
2643
2644	my $layout = $self->{layout};
2645
2646	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2648	for (@{$self->{par}}) {
2649	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2650	$layout->set_width ($W - $_->[3]);
2651	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2652	$layout->set_markup ($_->[4]);
2653	my ($w, $h) = $layout->size;
2654	$_->[0] = $w + $_->[3];
2655	$_->[1] = $h;
2656	}
2657
2658	$height += $_->[1];
2659	}
2660
2661	$self->{height} = $height;
2662
2663	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2664
2665	delete $self->{texture};
2666	}
2667
2668	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3032	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2669	glClearColor 0, 0, 0, 0;	3033	glClearColor 0, 0, 0, 0;
2670	glClear GL_COLOR_BUFFER_BIT;	3034	glClear GL_COLOR_BUFFER_BIT;
2671		3035
		3036	package CFPlus::UI::Base;
		3037	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3038	(0, 0, $self->{w}, $self->{h});
		3039
		3040	my $top = int $self->{children}[1]{range}[0];
		3041
		3042	my $paridx = 0;
		3043	my $top_paragraph;
2672	my $top = int $self->{children}[1]{range}[0];	3044	my $top = int $self->{children}[1]{range}[0];
2673		3045
2674	my $y0 = $top;	3046	my $y0 = $top;
2675	my $y1 = $top + $H;	3047	my $y1 = $top + $H;
2676		3048
2677	my $y = 0;
2678
2679	my $layout = $self->{layout};
2680
2681	$layout->set_font ($self->{font}) if $self->{font};
2682
2683	glEnable GL_BLEND;
2684	#TODO# not correct in windows where rgba is forced off
2685	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2686
2687	for my $par (@{$self->{par}}) {	3049	for my $para (@{$self->{par}}) {
2688	my $h = $par->[1];	3050	my $h = $para->{h};
		3051	my $y = $para->{y};
2689		3052
2690	if ($y0 < $y + $h && $y < $y1) {	3053	if ($y0 < $y + $h && $y < $y1) {
2691	$layout->set_foreground (@{ $par->[2] });	3054	my $layout = $self->get_layout ($para);
2692	$layout->set_width ($W - $par->[3]);
2693	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2694	$layout->set_markup ($par->[4]);
2695		3055
2696	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3056	$layout->render ($para->{indent}, $y - $y0);
2697		3057
2698	glRasterPos $par->[3], $y - $y0;	3058	if (my @w = @{ $para->{widget} }) {
2699	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3059	my @s = $layout->get_shapes;
		3060
		3061	for (@w) {
		3062	my ($dx, $dy) = splice @s, 0, 2, ();
		3063
		3064	$_->{x} = $dx + $para->{indent};
		3065	$_->{y} = $dy + $y - $y0;
		3066
		3067	$_->draw;
		3068	}
		3069	}
2700	}	3070	}
2701		3071
2702	$y += $h;	3072	$paridx++;
		3073	$top_paragraph ||= $paridx if $y >= $top;
2703	}	3074	}
2704		3075
2705	glDisable GL_BLEND;	3076	$self->{top_paragraph} = $top_paragraph;
2706	};	3077	};
2707	});	3078	});
		3079	}
		3080
		3081	sub reconfigure {
		3082	my ($self) = @_;
		3083
		3084	$self->SUPER::reconfigure;
		3085
		3086	$_->{w} = 1e10 for @{ $self->{par} };
		3087	$self->reflow;
2708	}	3088	}
2709		3089
2710	sub _draw {	3090	sub _draw {
2711	my ($self) = @_;	3091	my ($self) = @_;
2712		3092
…		…
2715	glColor 0, 0, 0, 1;	3095	glColor 0, 0, 0, 1;
2716	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3096	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717	glDisable GL_TEXTURE_2D;	3097	glDisable GL_TEXTURE_2D;
2718		3098
2719	$self->{children}[1]->draw;	3099	$self->{children}[1]->draw;
2720
2721	}	3100	}
2722		3101
2723	#############################################################################	3102	#############################################################################
2724		3103
2725	package CFClient::UI::Animator;	3104	package CFPlus::UI::Animator;
2726		3105
2727	use CFClient::OpenGL;	3106	use CFPlus::OpenGL;
2728		3107
2729	our @ISA = CFClient::UI::Bin::;	3108	our @ISA = CFPlus::UI::Bin::;
2730		3109
2731	sub moveto {	3110	sub moveto {
2732	my ($self, $x, $y) = @_;	3111	my ($self, $x, $y) = @_;
2733		3112
2734	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3113	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2762	glPopMatrix;	3141	glPopMatrix;
2763	}	3142	}
2764		3143
2765	#############################################################################	3144	#############################################################################
2766		3145
2767	package CFClient::UI::Flopper;	3146	package CFPlus::UI::Flopper;
2768		3147
2769	our @ISA = CFClient::UI::Button::;	3148	our @ISA = CFPlus::UI::Button::;
2770		3149
2771	sub new {	3150	sub new {
2772	my $class = shift;	3151	my $class = shift;
2773		3152
2774	my $self = $class->SUPER::new (	3153	my $self = $class->SUPER::new (
…		…
2786	$self->{other}->toggle_visibility;	3165	$self->{other}->toggle_visibility;
2787	}	3166	}
2788		3167
2789	#############################################################################	3168	#############################################################################
2790		3169
2791	package CFClient::UI::Tooltip;	3170	package CFPlus::UI::Tooltip;
2792		3171
2793	our @ISA = CFClient::UI::Bin::;	3172	our @ISA = CFPlus::UI::Bin::;
2794		3173
2795	use CFClient::OpenGL;	3174	use CFPlus::OpenGL;
2796		3175
2797	sub new {	3176	sub new {
2798	my $class = shift;	3177	my $class = shift;
2799		3178
2800	$class->SUPER::new (	3179	$class->SUPER::new (
…		…
2803	)	3182	)
2804	}	3183	}
2805		3184
2806	sub set_tooltip_from {	3185	sub set_tooltip_from {
2807	my ($self, $widget) = @_;	3186	my ($self, $widget) = @_;
		3187
		3188	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3189	if $widget->{tooltip} =~ /^#(.*)$/;
2808		3190
2809	my $tooltip = $widget->{tooltip};	3191	my $tooltip = $widget->{tooltip};
2810		3192
2811	if ($ENV{CFPLUS_DEBUG} & 2) {	3193	if ($ENV{CFPLUS_DEBUG} & 2) {
2812	$tooltip .= "\n\n" . (ref $widget) . "\n"	3194	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2816	}	3198	}
2817		3199
2818	$tooltip =~ s/^\n+//;	3200	$tooltip =~ s/^\n+//;
2819	$tooltip =~ s/\n+$//;	3201	$tooltip =~ s/\n+$//;
2820		3202
2821	$self->add (new CFClient::UI::Label	3203	$self->add (new CFPlus::UI::Label
2822	markup => $tooltip,	3204	markup => $tooltip,
2823	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3205	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2824	fontsize => 0.8,	3206	fontsize => 0.8,
2825	fg => [0, 0, 0, 1],	3207	style => 1, # FLAG_INVERSE
2826	ellipsise => 0,	3208	ellipsise => 0,
2827	font => ($widget->{tooltip_font} || $::FONT_PROP),	3209	font => ($widget->{tooltip_font} || $::FONT_PROP),
2828	);	3210	);
2829	}	3211	}
2830		3212
…		…
2849		3231
2850	$self->{root}->on_post_alloc ("move_$self" => sub {	3232	$self->{root}->on_post_alloc ("move_$self" => sub {
2851	my $widget = $self->{owner}	3233	my $widget = $self->{owner}
2852	or return;	3234	or return;
2853		3235
		3236	if ($widget->{visible}) {
2854	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3237	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2855		3238
2856	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3239	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2857	if $x + $self->{w} > $self->{root}{w};	3240	if $x + $self->{w} > $self->{root}{w};
2858		3241
2859	$self->move_abs ($x, $y);	3242	$self->move_abs ($x, $y);
		3243	} else {
		3244	$self->hide;
		3245	}
2860	});	3246	});
2861	}	3247	}
2862		3248
2863	sub _draw {	3249	sub _draw {
2864	my ($self) = @_;	3250	my ($self) = @_;
…		…
2888	$self->SUPER::_draw;	3274	$self->SUPER::_draw;
2889	}	3275	}
2890		3276
2891	#############################################################################	3277	#############################################################################
2892		3278
2893	package CFClient::UI::Face;	3279	package CFPlus::UI::Face;
2894		3280
2895	our @ISA = CFClient::UI::Base::;	3281	our @ISA = CFPlus::UI::DrawBG::;
2896		3282
2897	use CFClient::OpenGL;	3283	use CFPlus::OpenGL;
2898		3284
2899	sub new {	3285	sub new {
2900	my $class = shift;	3286	my $class = shift;
2901		3287
2902	my $self = $class->SUPER::new (	3288	my $self = $class->SUPER::new (
…		…
2904	can_events => 0,	3290	can_events => 0,
2905	@_,	3291	@_,
2906	);	3292	);
2907		3293
2908	if ($self->{anim} && $self->{animspeed}) {	3294	if ($self->{anim} && $self->{animspeed}) {
2909	Scalar::Util::weaken (my $widget = $self);	3295	CFPlus::weaken (my $widget = $self);
2910		3296
2911	$self->{timer} = Event->timer (	3297	$self->{timer} = Event->timer (
2912	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3298	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2913	hard => 1,	3299	hard => 1,
2914	interval => $self->{animspeed},	3300	interval => $self->{animspeed},
…		…
2937	sub _draw {	3323	sub _draw {
2938	my ($self) = @_;	3324	my ($self) = @_;
2939		3325
2940	return unless $::CONN;	3326	return unless $::CONN;
2941		3327
		3328	$self->SUPER::_draw;
		3329
2942	my $face;	3330	my $face;
2943		3331
2944	if ($self->{frame}) {	3332	if ($self->{frame}) {
2945	my $anim = $::CONN->{anim}[$self->{anim}];	3333	my $anim = $::CONN->{anim}[$self->{anim}];
2946		3334
…		…
2968	$self->SUPER::destroy;	3356	$self->SUPER::destroy;
2969	}	3357	}
2970		3358
2971	#############################################################################	3359	#############################################################################
2972		3360
2973	package CFClient::UI::Buttonbar;	3361	package CFPlus::UI::Buttonbar;
2974		3362
2975	our @ISA = CFClient::UI::HBox::;	3363	our @ISA = CFPlus::UI::HBox::;
2976		3364
2977	# TODO: should actualyl wrap buttons and other goodies.	3365	# TODO: should actually wrap buttons and other goodies.
2978		3366
2979	#############################################################################	3367	#############################################################################
2980		3368
2981	package CFClient::UI::Menu;	3369	package CFPlus::UI::Menu;
2982		3370
2983	our @ISA = CFClient::UI::FancyFrame::;	3371	our @ISA = CFPlus::UI::Toplevel::;
2984		3372
2985	use CFClient::OpenGL;	3373	use CFPlus::OpenGL;
2986		3374
2987	sub new {	3375	sub new {
2988	my $class = shift;	3376	my $class = shift;
2989		3377
2990	my $self = $class->SUPER::new (	3378	my $self = $class->SUPER::new (
2991	items => [],	3379	items => [],
2992	z => 100,	3380	z => 100,
2993	@_,	3381	@_,
2994	);	3382	);
2995		3383
2996	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3384	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2997		3385
2998	for my $item (@{ $self->{items} }) {	3386	for my $item (@{ $self->{items} }) {
2999	my ($widget, $cb, $tooltip) = @$item;	3387	my ($widget, $cb, $tooltip) = @$item;
3000		3388
3001	# handle various types of items, only text for now	3389	# handle various types of items, only text for now
3002	if (!ref $widget) {	3390	if (!ref $widget) {
		3391	if ($widget =~ /\t/) {
		3392	my ($left, $right) = split /\t/, $widget, 2;
		3393
3003	$widget = new CFClient::UI::Label	3394	$widget = new CFPlus::UI::HBox
3004	can_hover => 1,	3395	can_hover => 1,
3005	can_events => 1,	3396	can_events => 1,
		3397	tooltip => $tooltip,
		3398	children => [
		3399	(new CFPlus::UI::Label markup => $left, expand => 1),
		3400	(new CFPlus::UI::Label markup => $right, align => +1),
		3401	],
		3402	;
		3403
		3404	} else {
		3405	$widget = new CFPlus::UI::Label
		3406	can_hover => 1,
		3407	can_events => 1,
3006	markup => $widget,	3408	markup => $widget,
3007	tooltip => $tooltip	3409	tooltip => $tooltip;
		3410	}
3008	}	3411	}
3009		3412
3010	$self->{item}{$widget} = $item;	3413	$self->{item}{$widget} = $item;
3011		3414
3012	$self->{vbox}->add ($widget);	3415	$self->{vbox}->add ($widget);
…		…
3055	1	3458	1
3056	}	3459	}
3057		3460
3058	#############################################################################	3461	#############################################################################
3059		3462
3060	package CFClient::UI::Multiplexer;	3463	package CFPlus::UI::Multiplexer;
3061		3464
3062	our @ISA = CFClient::UI::Container::;	3465	our @ISA = CFPlus::UI::Container::;
3063		3466
3064	sub new {	3467	sub new {
3065	my $class = shift;	3468	my $class = shift;
3066		3469
3067	my $self = $class->SUPER::new (	3470	my $self = $class->SUPER::new (
…		…
3081		3484
3082	$self->{current} = $self->{children}[0]	3485	$self->{current} = $self->{children}[0]
3083	if @{ $self->{children} };	3486	if @{ $self->{children} };
3084	}	3487	}
3085		3488
		3489	sub get_current_page {
		3490	my ($self) = @_;
		3491
		3492	$self->{current}
		3493	}
		3494
3086	sub set_current_page {	3495	sub set_current_page {
3087	my ($self, $page_or_widget) = @_;	3496	my ($self, $page_or_widget) = @_;
3088		3497
3089	my $widget = ref $page_or_widget	3498	my $widget = ref $page_or_widget
3090	? $page_or_widget	3499	? $page_or_widget
…		…
3122	$self->{current}->draw;	3531	$self->{current}->draw;
3123	}	3532	}
3124		3533
3125	#############################################################################	3534	#############################################################################
3126		3535
3127	package CFClient::UI::Notebook;	3536	package CFPlus::UI::Notebook;
3128		3537
3129	our @ISA = CFClient::UI::VBox::;	3538	our @ISA = CFPlus::UI::VBox::;
3130		3539
3131	sub new {	3540	sub new {
3132	my $class = shift;	3541	my $class = shift;
3133		3542
3134	my $self = $class->SUPER::new (	3543	my $self = $class->SUPER::new (
3135	buttonbar => (new CFClient::UI::Buttonbar),	3544	buttonbar => (new CFPlus::UI::Buttonbar),
3136	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3545	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3137	# filter => # will be put between multiplexer and $self	3546	# filter => # will be put between multiplexer and $self
3138	@_,	3547	@_,
3139	);	3548	);
3140		3549
3141	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3550	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3145	}	3554	}
3146		3555
3147	sub add {	3556	sub add {
3148	my ($self, $title, $widget, $tooltip) = @_;	3557	my ($self, $title, $widget, $tooltip) = @_;
3149		3558
3150	Scalar::Util::weaken $self;	3559	CFPlus::weaken $self;
3151		3560
3152	$self->{buttonbar}->add (new CFClient::UI::Button	3561	$self->{buttonbar}->add (new CFPlus::UI::Button
3153	markup => $title,	3562	markup => $title,
3154	tooltip => $tooltip,	3563	tooltip => $tooltip,
3155	on_activate => sub { $self->set_current_page ($widget) },	3564	on_activate => sub { $self->set_current_page ($widget) },
3156	);	3565	);
3157		3566
3158	$self->{multiplexer}->add ($widget);	3567	$self->{multiplexer}->add ($widget);
3159	}	3568	}
3160		3569
		3570	sub get_current_page {
		3571	my ($self) = @_;
		3572
		3573	$self->{multiplexer}->get_current_page
		3574	}
		3575
3161	sub set_current_page {	3576	sub set_current_page {
3162	my ($self, $page) = @_;	3577	my ($self, $page) = @_;
3163		3578
3164	$self->{multiplexer}->set_current_page ($page);	3579	$self->{multiplexer}->set_current_page ($page);
3165	$self->emit (page_changed => $self->{multiplexer}{current});	3580	$self->emit (page_changed => $self->{multiplexer}{current});
3166	}	3581	}
3167		3582
3168	#############################################################################	3583	#############################################################################
3169		3584
3170	package CFClient::UI::Combobox;	3585	package CFPlus::UI::Selector;
3171		3586
3172	use utf8;	3587	use utf8;
3173		3588
3174	our @ISA = CFClient::UI::Button::;	3589	our @ISA = CFPlus::UI::Button::;
3175		3590
3176	sub new {	3591	sub new {
3177	my $class = shift;	3592	my $class = shift;
3178		3593
3179	my $self = $class->SUPER::new (	3594	my $self = $class->SUPER::new (
…		…
3196	my ($value, $title, $tooltip) = @$_;	3611	my ($value, $title, $tooltip) = @$_;
3197		3612
3198	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3613	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199	}	3614	}
3200		3615
3201	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3616	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202	}	3617	}
3203		3618
3204	sub _set_value {	3619	sub _set_value {
3205	my ($self, $value) = @_;	3620	my ($self, $value) = @_;
3206		3621
…		…
3221	$self->emit (changed => $value);	3636	$self->emit (changed => $value);
3222	}	3637	}
3223		3638
3224	#############################################################################	3639	#############################################################################
3225		3640
3226	package CFClient::UI::Statusbox;	3641	package CFPlus::UI::Statusbox;
3227		3642
3228	our @ISA = CFClient::UI::VBox::;	3643	our @ISA = CFPlus::UI::VBox::;
3229		3644
3230	sub new {	3645	sub new {
3231	my $class = shift;	3646	my $class = shift;
3232		3647
3233	my $self = $class->SUPER::new (	3648	my $self = $class->SUPER::new (
3234	fontsize => 0.8,	3649	fontsize => 0.8,
3235	@_,	3650	@_,
3236	);	3651	);
3237		3652
3238	Scalar::Util::weaken (my $this = $self);	3653	CFPlus::weaken (my $this = $self);
3239		3654
3240	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3655	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3241		3656
3242	$self	3657	$self
3243	}	3658	}
…		…
3245	sub reorder {	3660	sub reorder {
3246	my ($self) = @_;	3661	my ($self) = @_;
3247	my $NOW = Time::HiRes::time;	3662	my $NOW = Time::HiRes::time;
3248		3663
3249	# freeze display when hovering over any label	3664	# freeze display when hovering over any label
3250	return if $CFClient::UI::TOOLTIP->{owner}	3665	return if $CFPlus::UI::TOOLTIP->{owner}
3251	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3666	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3252	values %{ $self->{item} };	3667	values %{ $self->{item} };
3253		3668
3254	while (my ($k, $v) = each %{ $self->{item} }) {	3669	while (my ($k, $v) = each %{ $self->{item} }) {
3255	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3670	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3256	}	3671	}
…		…
3277	for ($short) {	3692	for ($short) {
3278	s/^\s+//;	3693	s/^\s+//;
3279	s/\s+/ /g;	3694	s/\s+/ /g;
3280	}	3695	}
3281		3696
3282	new CFClient::UI::Label	3697	new CFPlus::UI::Label
3283	markup => $short,	3698	markup => $short,
3284	tooltip => $item->{tooltip},	3699	tooltip => $item->{tooltip},
3285	tooltip_font => $::FONT_PROP,	3700	tooltip_font => $::FONT_PROP,
3286	tooltip_width => 0.67,	3701	tooltip_width => 0.67,
3287	fontsize => $item->{fontsize} || $self->{fontsize},	3702	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3341	count => 1,	3756	count => 1,
3342	%arg,	3757	%arg,
3343	};	3758	};
3344	}	3759	}
3345		3760
		3761	$ROOT->on_refresh (reorder => sub {
3346	$self->reorder;	3762	$self->reorder;
		3763	});
3347	}	3764	}
3348		3765
3349	sub reconfigure {	3766	sub reconfigure {
3350	my ($self) = @_;	3767	my ($self) = @_;
3351		3768
…		…
3364	$self->SUPER::destroy;	3781	$self->SUPER::destroy;
3365	}	3782	}
3366		3783
3367	#############################################################################	3784	#############################################################################
3368		3785
3369	package CFClient::UI::Inventory;
3370
3371	our @ISA = CFClient::UI::ScrolledWindow::;
3372
3373	sub new {
3374	my $class = shift;
3375
3376	my $self = $class->SUPER::new (
3377	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3378	@_,
3379	);
3380
3381	$self
3382	}
3383
3384	sub set_items {
3385	my ($self, $items) = @_;
3386
3387	$self->{child}->clear;
3388	return unless $items;
3389
3390	my @items = sort {
3391	($a->{type} <=> $b->{type})
3392	or ($a->{name} cmp $b->{name})
3393	} @$items;
3394
3395	$self->{real_items} = \@items;
3396
3397	my $row = 0;
3398	for my $item (@items) {
3399	CFClient::Item::update_widgets $item;
3400
3401	$self->{child}->add (0, $row, $item->{face_widget});
3402	$self->{child}->add (1, $row, $item->{desc_widget});
3403	$self->{child}->add (2, $row, $item->{weight_widget});
3404
3405	$row++;
3406	}
3407	}
3408
3409	#############################################################################
3410
3411	package CFClient::UI::BindEditor;
3412
3413	our @ISA = CFClient::UI::FancyFrame::;
3414
3415	sub new {
3416	my $class = shift;
3417
3418	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3419
3420	$self->add (my $vb = new CFClient::UI::VBox);
3421
3422
3423	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3424	text => "start recording",
3425	tooltip => "Start/Stops recording of actions."
3426	."All subsequent actions after the recording started will be captured."
3427	."The actions are displayed after the record was stopped."
3428	."To bind the action you have to click on the 'Bind' button",
3429	on_activate => sub {
3430	unless ($self->{recording}) {
3431	$self->start;
3432	} else {
3433	$self->stop;
3434	}
3435	});
3436
3437	$vb->add (new CFClient::UI::Label text => "Actions:");
3438	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3439
3440	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3441	$vb->add (my $hb = new CFClient::UI::HBox);
3442	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3443	$hb->add (new CFClient::UI::Button
3444	text => "bind",
3445	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3446	on_activate => sub {
3447	$self->ask_for_bind;
3448	});
3449
3450	$vb->add (my $hb = new CFClient::UI::HBox);
3451	$hb->add (new CFClient::UI::Button
3452	text => "ok",
3453	expand => 1,
3454	tooltip => "This closes the binding editor and saves the binding",
3455	on_activate => sub {
3456	$self->hide;
3457	$self->commit;
3458	});
3459
3460	$hb->add (new CFClient::UI::Button
3461	text => "cancel",
3462	expand => 1,
3463	tooltip => "This closes the binding editor without saving",
3464	on_activate => sub {
3465	$self->hide;
3466	$self->{binding_cancel}->()
3467	if $self->{binding_cancel};
3468	});
3469
3470	$self->update_binding_widgets;
3471
3472	$self
3473	}
3474
3475	sub commit {
3476	my ($self) = @_;
3477	my ($mod, $sym, $cmds) = $self->get_binding;
3478	if ($sym != 0 && @$cmds > 0) {
3479	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3480	."'. Don't forget 'Save Config'!");
3481	$self->{binding_change}->($mod, $sym, $cmds)
3482	if $self->{binding_change};
3483	} else {
3484	$::STATUSBOX->add ("No action bound, no key or action specified!");
3485	$self->{binding_cancel}->()
3486	if $self->{binding_cancel};
3487	}
3488	}
3489
3490	sub start {
3491	my ($self) = @_;
3492
3493	$self->{rec_btn}->set_text ("stop recording");
3494	$self->{recording} = 1;
3495	$self->clear_command_list;
3496	$::CONN->start_record if $::CONN;
3497	}
3498
3499	sub stop {
3500	my ($self) = @_;
3501
3502	$self->{rec_btn}->set_text ("start recording");
3503	$self->{recording} = 0;
3504
3505	my $rec;
3506	$rec = $::CONN->stop_record if $::CONN;
3507	return unless ref $rec eq 'ARRAY';
3508	$self->set_command_list ($rec);
3509	}
3510
3511
3512	sub ask_for_bind_and_commit {
3513	my ($self) = @_;
3514	$self->ask_for_bind (1);
3515	}
3516
3517	sub ask_for_bind {
3518	my ($self, $commit, $end_cb) = @_;
3519
3520	CFClient::Binder::open_binding_dialog (sub {
3521	my ($mod, $sym) = @_;
3522	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3523	$self->update_binding_widgets;
3524	$self->commit if $commit;
3525	$end_cb->() if $end_cb;
3526	});
3527	}
3528
3529	# $mod and $sym are the modifiers and key symbol
3530	# $cmds is a array ref of strings (the commands)
3531	# $cb is the callback that is executed on OK
3532	# $ccb is the callback that is executed on CANCEL and
3533	# when the binding was unsuccessful on OK
3534	sub set_binding {
3535	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3536
3537	$self->clear_command_list;
3538	$self->{recording} = 0;
3539	$self->{rec_btn}->set_text ("start recording");
3540
3541	$self->{binding} = [$mod, $sym];
3542	$self->{commands} = $cmds;
3543
3544	$self->{binding_change} = $cb;
3545	$self->{binding_cancel} = $ccb;
3546
3547	$self->update_binding_widgets;
3548	}
3549
3550	# this is a shortcut method that asks for a binding
3551	# and then just binds it.
3552	sub do_quick_binding {
3553	my ($self, $cmds, $end_cb) = @_;
3554	$self->set_binding (undef, undef, $cmds, sub {
3555	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3556	});
3557	$self->ask_for_bind (1, $end_cb);
3558	}
3559
3560	sub update_binding_widgets {
3561	my ($self) = @_;
3562	my ($mod, $sym, $cmds) = $self->get_binding;
3563	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3564	$self->set_command_list ($cmds);
3565	}
3566
3567	sub get_binding {
3568	my ($self) = @_;
3569	return (
3570	$self->{binding}->[0],
3571	$self->{binding}->[1],
3572	[ grep { defined $_ } @{$self->{commands}} ]
3573	);
3574	}
3575
3576	sub clear_command_list {
3577	my ($self) = @_;
3578	$self->{cmdbox}->clear ();
3579	}
3580
3581	sub set_command_list {
3582	my ($self, $cmds) = @_;
3583
3584	$self->{cmdbox}->clear ();
3585	$self->{commands} = $cmds;
3586
3587	my $idx = 0;
3588
3589	for (@$cmds) {
3590	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3591
3592	my $i = $idx;
3593	$hb->add (new CFClient::UI::Label text => $_);
3594	$hb->add (new CFClient::UI::Button
3595	text => "delete",
3596	tooltip => "Deletes the action from the record",
3597	on_activate => sub {
3598	$self->{cmdbox}->remove ($hb);
3599	$cmds->[$i] = undef;
3600	});
3601
3602
3603	$idx++
3604	}
3605	}
3606
3607	#############################################################################
3608
3609	package CFClient::UI::SpellList;
3610
3611	our @ISA = CFClient::UI::Table::;
3612
3613	sub new {
3614	my $class = shift;
3615
3616	my $self = $class->SUPER::new (
3617	binding => [],
3618	commands => [],
3619	@_,
3620	)
3621	}
3622
3623	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3624
3625	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3626	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3627	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3629	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3630	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3631	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3633	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3635
3636	sub rebuild_spell_list {
3637	my ($self) = @_;
3638
3639	$CFClient::UI::ROOT->on_refresh ($self => sub {
3640	$self->clear;
3641
3642	return unless $::CONN;
3643
3644	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3645	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3646	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3647	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3648	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3649
3650	my $row = 0;
3651
3652	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3653	my $spell = $self->{spell}{$_};
3654
3655	$row++;
3656
3657	my $spell_cb = sub {
3658	my ($widget, $ev) = @_;
3659
3660	if ($ev->{button} == 1) {
3661	$::CONN->user_send ("cast $spell->{name}");
3662	} elsif ($ev->{button} == 2) {
3663	$::CONN->user_send ("invoke $spell->{name}");
3664	} elsif ($ev->{button} == 3) {
3665	(new CFClient::UI::Menu
3666	items => [
3667	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669	],
3670	)->popup ($ev);
3671	} else {
3672	return 0;
3673	}
3674
3675	1
3676	};
3677
3678	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3679
3680	#TODO: add path info to tooltip
3681	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3682
3683	$self->add (0, $row, new CFClient::UI::Face
3684	face => $spell->{face},
3685	can_hover => 1,
3686	can_events => 1,
3687	tooltip => $tooltip,
3688	on_button_down => $spell_cb,
3689	);
3690
3691	$self->add (1, $row, new CFClient::UI::Label
3692	expand => 1,
3693	text => $spell->{name},
3694	can_hover => 1,
3695	can_events => 1,
3696	tooltip => $tooltip,
3697	on_button_down => $spell_cb,
3698	);
3699
3700	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3701	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3702	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3703	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3704	}
3705	});
3706	}
3707
3708	sub add_spell {
3709	my ($self, $spell) = @_;
3710
3711	$self->{spell}->{$spell->{name}} = $spell;
3712	$self->rebuild_spell_list;
3713	}
3714
3715	sub remove_spell {
3716	my ($self, $spell) = @_;
3717
3718	delete $self->{spell}->{$spell->{name}};
3719	$self->rebuild_spell_list;
3720	}
3721
3722	sub clear_spells {
3723	my ($self) = @_;
3724
3725	$self->{spell} = {};
3726	$self->rebuild_spell_list;
3727	}
3728
3729	#############################################################################
3730
3731	package CFClient::UI::Root;	3786	package CFPlus::UI::Root;
3732		3787
3733	our @ISA = CFClient::UI::Container::;	3788	our @ISA = CFPlus::UI::Container::;
3734		3789
3735	use List::Util qw(min max);	3790	use List::Util qw(min max);
3736		3791
3737	use CFClient::OpenGL;	3792	use CFPlus::OpenGL;
3738		3793
3739	sub new {	3794	sub new {
3740	my $class = shift;	3795	my $class = shift;
3741		3796
3742	my $self = $class->SUPER::new (	3797	my $self = $class->SUPER::new (
3743	visible => 1,	3798	visible => 1,
3744	@_,	3799	@_,
3745	);	3800	);
3746		3801
3747	Scalar::Util::weaken ($self->{root} = $self);	3802	CFPlus::weaken ($self->{root} = $self);
3748		3803
3749	$self	3804	$self
3750	}	3805	}
3751		3806
3752	sub size_request {	3807	sub size_request {
…		…
3918	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3973	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919		3974
3920	$w = 0 if $w < 0;	3975	$w = 0 if $w < 0;
3921	$h = 0 if $h < 0;	3976	$h = 0 if $h < 0;
3922		3977
		3978	$w = max $widget->{min_w}, $w;
		3979	$h = max $widget->{min_h}, $h;
		3980
		3981	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3982	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3983
		3984	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3985	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3986
3923	$w = int $w + 0.5;	3987	$w = int $w + 0.5;
3924	$h = int $h + 0.5;	3988	$h = int $h + 0.5;
3925		3989
3926	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3990	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927	$widget->{old_w} = $widget->{w};	3991	$widget->{old_w} = $widget->{w};
…		…
3950	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4014	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3951	glMatrixMode GL_MODELVIEW;	4015	glMatrixMode GL_MODELVIEW;
3952	glLoadIdentity;	4016	glLoadIdentity;
3953		4017
3954	{	4018	{
3955	package CFClient::UI::Base;	4019	package CFPlus::UI::Base;
3956		4020
3957	($draw_x, $draw_y, $draw_w, $draw_h) =	4021	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3958	(0, 0, $self->{w}, $self->{h});	4022	(0, 0, $self->{w}, $self->{h});
3959	}
3960		4023
3961	$self->_draw;	4024	$self->_draw;
		4025	}
3962	}	4026	}
3963		4027
3964	#############################################################################	4028	#############################################################################
3965		4029
3966	package CFClient::UI;	4030	package CFPlus::UI;
3967		4031
3968	$ROOT = new CFClient::UI::Root;	4032	$ROOT = new CFPlus::UI::Root;
3969	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4033	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3970		4034
3971	1	4035	1
3972		4036

Diff Legend

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