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.366 by root, Mon Apr 23 19:17:41 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;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
98		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
100	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
101	}	125	}
102		126
103	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	128	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		129
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		131
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		133
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
112	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		136
114	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	139	$grab->update if $grab;
117	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
118		141
		142	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
120	}	144	}
121	}	145	}
122		146
123	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
124	my ($ev) = @_;	148	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
126		150
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		152
129	if ($widget != $HOVER) {	153	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		154
132	$hover->update if $hover && $hover->{can_hover};	155	$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;	156	if $HOVER;
140	}	157	}
141		158
142	# convert position array to integers	159	# convert position array to integers
143	sub harmonize {	160	sub harmonize {
…		…
193	reconfigure_widgets;	210	reconfigure_widgets;
194	}	211	}
195		212
196	#############################################################################	213	#############################################################################
197		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
198	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
199		224
200	use strict;	225	use strict;
201		226
202	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
203		228
204	sub new {	229	sub new {
205	my $class = shift;	230	my $class = shift;
206		231
207	my $self = bless {	232	my $self = bless {
…		…
212	h => undef,	237	h => undef,
213	can_events => 1,	238	can_events => 1,
214	@_	239	@_
215	}, $class;	240	}, $class;
216		241
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		243
219	for (keys %$self) {	244	for (keys %$self) {
220	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
222	}	247	}
223	}	248	}
224		249
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$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};	252	$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};	253	$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};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		255
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		258
234	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
239		264
240	sub destroy {	265	sub destroy {
241	my ($self) = @_;	266	my ($self) = @_;
242		267
243	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
244	%$self = ();	270	%$self = ();
245	}	271	}
246		272
247	sub show {	273	sub show {
248	my ($self) = @_;	274	my ($self) = @_;
249		275
250	return if $self->{parent};	276	return if $self->{parent};
251		277
252	$CFClient::UI::ROOT->add ($self);	278	$CFPlus::UI::ROOT->add ($self);
253	}	279	}
254		280
255	sub set_visible {	281	sub set_visible {
256	my ($self) = @_;	282	my ($self) = @_;
257		283
…		…
278	delete $self->{root};	304	delete $self->{root};
279		305
280	undef $GRAB if $GRAB == $self;	306	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	307	undef $HOVER if $HOVER == $self;
282		308
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	309	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	310	if $TOOLTIP->{owner} == $self;
285		311
286	$self->emit ("focus_out");	312	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	313	$self->emit (visibility_change => 0);
288	}	314	}
…		…
335	sub size_request {	361	sub size_request {
336	require Carp;	362	require Carp;
337	Carp::confess "size_request is abstract";	363	Carp::confess "size_request is abstract";
338	}	364	}
339		365
		366	sub baseline_shift {
		367	0
		368	}
		369
340	sub configure {	370	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	371	my ($self, $x, $y, $w, $h) = @_;
342		372
343	if ($self->{aspect}) {	373	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	374	my ($ow, $oh) = ($w, $h);
345		375
346	$w = List::Util::min $w, int $h * $self->{aspect};	376	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	377	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		378
349	# use alignment to adjust x, y	379	# use alignment to adjust x, y
350		380
351	$x += int 0.5 * ($ow - $w);	381	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	382	$y += int 0.5 * ($oh - $h);
…		…
393		423
394	return if $self->{tooltip} eq $tooltip;	424	return if $self->{tooltip} eq $tooltip;
395		425
396	$self->{tooltip} = $tooltip;	426	$self->{tooltip} = $tooltip;
397		427
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	428	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	429	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	430	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	431	}
402	}	432	}
403		433
404	# translate global coordinates to local coordinate system	434	# translate global coordinates to local coordinate system
405	sub coord2local {	435	sub coord2local {
406	my ($self, $x, $y) = @_;	436	my ($self, $x, $y) = @_;
407		437
		438	Carp::confess unless $self->{parent};#d#
		439
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	440	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	441	}
410		442
411	# translate local coordinates to global coordinate system	443	# translate local coordinates to global coordinate system
412	sub coord2global {	444	sub coord2global {
413	my ($self, $x, $y) = @_;	445	my ($self, $x, $y) = @_;
414		446
		447	Carp::confess unless $self->{parent};#d#
		448
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	449	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	450	}
417		451
418	sub invoke_focus_in {	452	sub invoke_focus_in {
419	my ($self) = @_;	453	my ($self) = @_;
420		454
421	return if $FOCUS == $self;	455	return if $FOCUS == $self;
422	return unless $self->{can_focus};	456	return unless $self->{can_focus};
423		457
424	my $focus = $FOCUS; $FOCUS = $self;	458	$FOCUS = $self;
425		459
426	$focus->update if $focus;	460	$self->update;
427	$FOCUS->update;
428		461
429	0	462	0
430	}	463	}
431		464
432	sub invoke_focus_out {	465	sub invoke_focus_out {
433	my ($self) = @_;	466	my ($self) = @_;
434		467
435	return unless $FOCUS == $self;	468	return unless $FOCUS == $self;
436		469
437	my $focus = $FOCUS; undef $FOCUS;	470	undef $FOCUS;
438		471
439	$focus->update if $focus; #?	472	$self->update;
440		473
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	474	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	475	unless $FOCUS;
443		476
444	0	477	0
445	}	478	}
446		479
447	sub grab_focus {	480	sub grab_focus {
448	my ($self) = @_;	481	my ($self) = @_;
449		482
		483	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	484	$self->emit ("focus_in");
451	}	485	}
452		486
453	sub invoke_mouse_motion { 1 }	487	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	488	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	489	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	490	sub invoke_key_up { 0 }
		491	sub invoke_mouse_wheel { 0 }
457		492
458	sub invoke_button_down {	493	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	494	my ($self, $ev, $x, $y) = @_;
460		495
461	$self->grab_focus;	496	$self->grab_focus;
462		497
463	1	498	0
464	}	499	}
465		500
466	sub connect {	501	sub connect {
467	my ($self, $signal, $cb) = @_;	502	my ($self, $signal, $cb) = @_;
468		503
469	push @{ $self->{signal_cb}{$signal} }, $cb;	504	push @{ $self->{signal_cb}{$signal} }, $cb;
		505
		506	defined wantarray and CFPlus::guard {
		507	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		508	@{ $self->{signal_cb}{$signal} };
		509	}
470	}	510	}
		511
		512	sub disconnect_all {
		513	my ($self, $signal) = @_;
		514
		515	delete $self->{signal_cb}{$signal};
		516	}
		517
		518	my %has_coords = (
		519	button_down => 1,
		520	button_up => 1,
		521	mouse_motion => 1,
		522	mouse_wheel => 1,
		523	);
471		524
472	sub emit {	525	sub emit {
473	my ($self, $signal, @args) = @_;	526	my ($self, $signal, @args) = @_;
474		527
475	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before	528	# I do not really like this solution, but I do not like duplication
		529	# and needlessly verbose code, either.
		530	my @append
		531	= $has_coords{$signal}
		532	? $args[0]->xy ($self)
		533	: ();
		534
		535	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		536
		537	for my $cb (
		538	@{$self->{signal_cb}{$signal} || []}, # before
476	($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure	539	($self->can ("invoke_$signal") || sub { 1 }), # closure
		540	) {
		541	return $cb->($self, @args, @append) || next;
		542	}
		543
		544	# parent
477	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	545	$self->{parent} && $self->{parent}->emit ($signal, @args)
478	}	546	}
479		547
480	sub find_widget {	548	sub find_widget {
481	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
482		550
…		…
490	}	558	}
491		559
492	sub set_parent {	560	sub set_parent {
493	my ($self, $parent) = @_;	561	my ($self, $parent) = @_;
494		562
495	Scalar::Util::weaken ($self->{parent} = $parent);	563	CFPlus::weaken ($self->{parent} = $parent);
496	$self->set_visible if $parent->{visible};	564	$self->set_visible if $parent->{visible};
497	}	565	}
498		566
499	sub realloc {	567	sub realloc {
500	my ($self) = @_;	568	my ($self) = @_;
…		…
534	return unless $self->{h} && $self->{w};	602	return unless $self->{h} && $self->{w};
535		603
536	# update screen rectangle	604	# update screen rectangle
537	local $draw_x = $draw_x + $self->{x};	605	local $draw_x = $draw_x + $self->{x};
538	local $draw_y = $draw_y + $self->{y};	606	local $draw_y = $draw_y + $self->{y};
539	local $draw_w = $draw_x + $self->{w};
540	local $draw_h = $draw_y + $self->{h};
541		607
542	# skip widgets that are entirely outside the drawing area	608	# skip widgets that are entirely outside the drawing area
543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	609	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	610	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545		611
…		…
568	glVertex $self->{w} - 1, 0;	634	glVertex $self->{w} - 1, 0;
569	glVertex $self->{w} - 1, $self->{h} - 1;	635	glVertex $self->{w} - 1, $self->{h} - 1;
570	glVertex 0 , $self->{h} - 1;	636	glVertex 0 , $self->{h} - 1;
571	glEnd;	637	glEnd;
572	glPopMatrix;	638	glPopMatrix;
573	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	639	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
574	}	640	}
575		641
576	$self->_draw;	642	$self->_draw;
577	glPopMatrix;	643	glPopMatrix;
578	}	644	}
…		…
581	my ($self) = @_;	647	my ($self) = @_;
582		648
583	warn "no draw defined for $self\n";	649	warn "no draw defined for $self\n";
584	}	650	}
585		651
		652	my $cntx;#d#
586	sub DESTROY {	653	sub DESTROY {
587	my ($self) = @_;	654	my ($self) = @_;
588		655
589	delete $WIDGET{$self+0};	656	return if CFPlus::in_destruct;
590		657
591	eval { $self->destroy };	658	eval { $self->destroy };
592	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		660
		661	delete $WIDGET{$self+0};
593	}	662	}
594		663
595	#############################################################################	664	#############################################################################
596		665
597	package CFClient::UI::DrawBG;	666	package CFPlus::UI::DrawBG;
598		667
599	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
600		669
601	use strict;	670	use strict;
602	use CFClient::OpenGL;	671	use CFPlus::OpenGL;
603		672
604	sub new {	673	sub new {
605	my $class = shift;	674	my $class = shift;
606		675
607	# range [value, low, high, page]	676	# range [value, low, high, page]
…		…
638	}	707	}
639	}	708	}
640		709
641	#############################################################################	710	#############################################################################
642		711
643	package CFClient::UI::Empty;	712	package CFPlus::UI::Empty;
644		713
645	our @ISA = CFClient::UI::Base::;	714	our @ISA = CFPlus::UI::Base::;
646		715
647	sub new {	716	sub new {
648	my ($class, %arg) = @_;	717	my ($class, %arg) = @_;
649	$class->SUPER::new (can_events => 0, %arg);	718	$class->SUPER::new (can_events => 0, %arg);
650	}	719	}
…		…
657		726
658	sub draw { }	727	sub draw { }
659		728
660	#############################################################################	729	#############################################################################
661		730
662	package CFClient::UI::Container;	731	package CFPlus::UI::Container;
663		732
664	our @ISA = CFClient::UI::Base::;	733	our @ISA = CFPlus::UI::Base::;
665		734
666	sub new {	735	sub new {
667	my ($class, %arg) = @_;	736	my ($class, %arg) = @_;
668		737
669	my $children = delete $arg{children};	738	my $children = delete $arg{children};
…		…
678	if $children;	747	if $children;
679		748
680	$self	749	$self
681	}	750	}
682		751
		752	sub realloc {
		753	my ($self) = @_;
		754
		755	$self->{force_realloc} = 1;
		756	$self->{force_size_alloc} = 1;
		757	$self->SUPER::realloc;
		758	}
		759
683	sub add {	760	sub add {
684	my ($self, @widgets) = @_;	761	my ($self, @widgets) = @_;
685		762
686	$_->set_parent ($self)	763	$_->set_parent ($self)
687	for @widgets;	764	for @widgets;
…		…
747	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
748	}	825	}
749		826
750	#############################################################################	827	#############################################################################
751		828
752	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
753		830
754	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
755		832
756	sub new {	833	sub new {
757	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
758		835
759	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760		837
761	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
762	}	839	}
763		840
764	sub add {	841	sub add {
…		…
771	sub remove {	848	sub remove {
772	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
773		850
774	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
775		852
776	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
777	unless @{$self->{children}};	854	unless @{$self->{children}};
778	}	855	}
779		856
780	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
781		858
…		…
793		870
794	#############################################################################	871	#############################################################################
795		872
796	# back-buffered drawing area	873	# back-buffered drawing area
797		874
798	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
799		876
800	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
801		878
802	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
803		880
804	sub new {	881	sub new {
805	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
806		883
807	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
829	}	906	}
830		907
831	sub render_child {	908	sub render_child {
832	my ($self) = @_;	909	my ($self) = @_;
833		910
834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	911	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
835	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
836	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
837		914
838	{	915	{
839	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
840		917
841	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
842	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
843	}	922	}
844
845	$self->_render;
846	};	923	};
847	}	924	}
848		925
849	sub _draw {	926	sub _draw {
850	my ($self) = @_;	927	my ($self) = @_;
851
852	my ($w, $h) = @$self{qw(w h)};
853		928
854	my $tex = $self->{texture}	929	my $tex = $self->{texture}
855	or return;	930	or return;
856		931
857	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
860		935
861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
862		937
863	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
864	}	939	}
865		940
866	#############################################################################	941	#############################################################################
867		942
868	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
869		944
870	our @ISA = CFClient::UI::Window::;	945	our @ISA = CFPlus::UI::Window::;
871		946
872	sub new {	947	sub new {
873	my $class = shift;	948	my $class = shift;
874		949
875	$class->SUPER::new (	950	$class->SUPER::new (
…		…
935	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1010	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1011	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
937	) {	1012	) {
938	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1013	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939	} else {	1014	} else {
940	$self->CFClient::UI::Base::find_widget ($x, $y)	1015	$self->CFPlus::UI::Base::find_widget ($x, $y)
941	}	1016	}
942	}	1017	}
943		1018
944	sub _render {	1019	sub _render {
945	my ($self) = @_;	1020	my ($self) = @_;
946		1021
947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1022	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};	1023	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949		1024
950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1025	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951		1026
952	$self->SUPER::_render;	1027	$self->SUPER::_render;
953	}	1028	}
954		1029
955	#############################################################################	1030	#############################################################################
956		1031
957	package CFClient::UI::ScrolledWindow;	1032	package CFPlus::UI::ScrolledWindow;
958		1033
959	our @ISA = CFClient::UI::HBox::;	1034	our @ISA = CFPlus::UI::HBox::;
960		1035
961	sub new {	1036	sub new {
962	my ($class, %arg) = @_;	1037	my ($class, %arg) = @_;
963		1038
964	my $child = delete $arg{child};	1039	my $child = delete $arg{child};
965		1040
966	my $self;	1041	my $self;
967		1042
968	my $slider = new CFClient::UI::Slider	1043	my $slider = new CFPlus::UI::Slider
969	vertical => 1,	1044	vertical => 1,
970	range => [0, 0, 1, 0.01], # HACK fix	1045	range => [0, 0, 1, 0.01], # HACK fix
971	on_changed => sub {	1046	on_changed => sub {
972	$self->{vp}->set_offset (0, $_[1]);	1047	$self->{vp}->set_offset (0, $_[1]);
973	},	1048	},
974	;	1049	;
975		1050
976	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
977	vp => (new CFClient::UI::ViewPort expand => 1),	1052	vp => (new CFPlus::UI::ViewPort expand => 1),
		1053	can_events => 1,
978	slider => $slider,	1054	slider => $slider,
979	%arg,	1055	%arg,
980	);	1056	);
981		1057
982	$self->SUPER::add ($self->{vp}, $self->{slider});	1058	$self->SUPER::add ($self->{vp}, $self->{slider});
983	$self->add ($child) if $child;	1059	$self->add ($child) if $child;
984		1060
985	$self	1061	$self
986	}	1062	}
987		1063
		1064	#TODO# update range on size_allocate depending on child
		1065
988	sub add {	1066	sub add {
989	my ($self, $widget) = @_;	1067	my ($self, $widget) = @_;
990		1068
991	$self->{vp}->add ($self->{child} = $widget);	1069	$self->{vp}->add ($self->{child} = $widget);
992	}	1070	}
993		1071
		1072	sub invoke_mouse_wheel {
		1073	my ($self, $ev) = @_;
		1074
		1075	return 0 unless $ev->{dy}; # only vertical movements
		1076
		1077	$self->{slider}->emit (mouse_wheel => $ev);
		1078
		1079	1
		1080	}
		1081
		1082	sub update_slider {
		1083	my ($self) = @_;
		1084
		1085	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1086	}
		1087
994	sub update {	1088	sub update {
995	my ($self) = @_;	1089	my ($self) = @_;
996		1090
997	$self->SUPER::update;	1091	$self->SUPER::update;
998		1092
999	# todo: overwrite size_allocate of child	1093	$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	}	1094	}
1003		1095
1004	sub invoke_size_allocate {	1096	sub invoke_size_allocate {
1005	my ($self, $w, $h) = @_;	1097	my ($self, $w, $h) = @_;
1006		1098
1007	my $child = $self->{vp}->child;	1099	$self->update_slider;
1008	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009		1100
1010	$self->SUPER::invoke_size_allocate ($w, $h)	1101	$self->SUPER::invoke_size_allocate ($w, $h)
1011	}	1102	}
1012		1103
1013	#TODO# update range on size_allocate depending on child
1014	# update viewport offset on scroll
1015
1016	#############################################################################	1104	#############################################################################
1017		1105
1018	package CFClient::UI::Frame;	1106	package CFPlus::UI::Frame;
1019		1107
1020	our @ISA = CFClient::UI::Bin::;	1108	our @ISA = CFPlus::UI::Bin::;
1021		1109
1022	use CFClient::OpenGL;	1110	use CFPlus::OpenGL;
1023		1111
1024	sub new {	1112	sub new {
1025	my $class = shift;	1113	my $class = shift;
1026		1114
1027	$class->SUPER::new (	1115	$class->SUPER::new (
…		…
1053	$self->SUPER::_draw;	1141	$self->SUPER::_draw;
1054	}	1142	}
1055		1143
1056	#############################################################################	1144	#############################################################################
1057		1145
1058	package CFClient::UI::FancyFrame;	1146	package CFPlus::UI::FancyFrame;
1059		1147
1060	our @ISA = CFClient::UI::Bin::;	1148	our @ISA = CFPlus::UI::Bin::;
1061		1149
1062	use CFClient::OpenGL;	1150	use CFPlus::OpenGL;
		1151
		1152	sub new {
		1153	my ($class, %arg) = @_;
		1154
		1155	if ((exists $arg{label}) && !ref $arg{label}) {
		1156	$arg{label} = new CFPlus::UI::Label
		1157	align => 1,
		1158	valign => 0,
		1159	text => $arg{label},
		1160	fontsize => ($arg{border} || 0.8) * 0.75;
		1161	}
		1162
		1163	my $self = $class->SUPER::new (
		1164	# label => "",
		1165	fg => [0.6, 0.3, 0.1],
		1166	border => 0.8,
		1167	style => 'single',
		1168	%arg,
		1169	);
		1170
		1171	$self
		1172	}
		1173
		1174	sub add {
		1175	my ($self, @widgets) = @_;
		1176
		1177	$self->SUPER::add (@widgets);
		1178	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1179	}
		1180
		1181	sub border {
		1182	int $_[0]{border} * $::FONTSIZE
		1183	}
		1184
		1185	sub size_request {
		1186	my ($self) = @_;
		1187
		1188	($self->{label_w}, undef) = $self->{label}->size_request
		1189	if $self->{label};
		1190
		1191	my ($w, $h) = $self->SUPER::size_request;
		1192
		1193	(
		1194	$w + $self->border * 2,
		1195	$h + $self->border * 2,
		1196	)
		1197	}
		1198
		1199	sub invoke_size_allocate {
		1200	my ($self, $w, $h) = @_;
		1201
		1202	my $border = $self->border;
		1203
		1204	$w -= List::Util::max 0, $border * 2;
		1205	$h -= List::Util::max 0, $border * 2;
		1206
		1207	if (my $label = $self->{label}) {
		1208	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1209	$label->{h} = List::Util::min $h, $border;
		1210	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1211	}
		1212
		1213	$self->child->configure ($border, $border, $w, $h);
		1214
		1215	1
		1216	}
		1217
		1218	sub _draw {
		1219	my ($self) = @_;
		1220
		1221	my $child = $self->{children}[0];
		1222
		1223	my $border = $self->border;
		1224	my ($w, $h) = ($self->{w}, $self->{h});
		1225
		1226	$child->draw;
		1227
		1228	glColor @{$self->{fg}};
		1229	glBegin GL_LINE_STRIP;
		1230	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1231	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1232	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1233	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1234	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1235	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1236	glEnd;
		1237
		1238	if ($self->{label}) {
		1239	glTranslate $border * 2, 0;
		1240	$self->{label}->_draw;
		1241	}
		1242	}
		1243
		1244	#############################################################################
		1245
		1246	package CFPlus::UI::Toplevel;
		1247
		1248	our @ISA = CFPlus::UI::Bin::;
		1249
		1250	use CFPlus::OpenGL;
1063		1251
1064	my $bg =	1252	my $bg =
1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1253	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066	mipmap => 1, wrap => 1;	1254	mipmap => 1, wrap => 1;
1067		1255
1068	my @border =	1256	my @border =
1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1257	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);	1258	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071		1259
1072	sub new {	1260	sub new {
1073	my ($class, %arg) = @_;	1261	my ($class, %arg) = @_;
1074		1262
1075	my $self = $class->SUPER::new (	1263	my $self = $class->SUPER::new (
1076	bg => [1, 1, 1, 1],	1264	bg => [1, 1, 1, 1],
1077	border_bg => [1, 1, 1, 1],	1265	border_bg => [1, 1, 1, 1],
1078	border => 0.6,	1266	border => 0.6,
1079	can_events => 1,	1267	can_events => 1,
1080	min_w => 16,	1268	min_w => 64,
1081	min_h => 16,	1269	min_h => 32,
1082	%arg,	1270	%arg,
1083	);	1271	);
1084		1272
1085	$self->{title_widget} = new CFClient::UI::Label	1273	$self->{title_widget} = new CFPlus::UI::Label
1086	align => 0,	1274	align => 0,
1087	valign => 1,	1275	valign => 1,
1088	text => $self->{title},	1276	text => $self->{title},
1089	fontsize => $self->{border},	1277	fontsize => $self->{border},
1090	if exists $self->{title};	1278	if exists $self->{title};
1091		1279
1092	if ($self->{has_close_button}) {	1280	if ($self->{has_close_button}) {
1093	$self->{close_button} =	1281	$self->{close_button} =
1094	new CFClient::UI::ImageButton	1282	new CFPlus::UI::ImageButton
1095	image => 'x1_close.png',	1283	path => 'x1_close.png',
1096	on_activate => sub { $self->hide };	1284	on_activate => sub { $self->emit ("delete") };
1097		1285
1098	$self->CFClient::UI::Container::add ($self->{close_button});	1286	$self->CFPlus::UI::Container::add ($self->{close_button});
1099	}	1287	}
1100		1288
1101	$self	1289	$self
1102	}	1290	}
1103		1291
1104	sub add {	1292	sub add {
1105	my ($self, @widgets) = @_;	1293	my ($self, @widgets) = @_;
1106		1294
1107	$self->SUPER::add (@widgets);	1295	$self->SUPER::add (@widgets);
1108	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1296	$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};	1297	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110	}	1298	}
1111		1299
1112	sub border {	1300	sub border {
1113	int $_[0]{border} * $::FONTSIZE	1301	int $_[0]{border} * $::FONTSIZE
1114	}	1302	}
…		…
1147	$self->child->configure ($border, $border, $w, $h);	1335	$self->child->configure ($border, $border, $w, $h);
1148		1336
1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1337	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150	if $self->{close_button};	1338	if $self->{close_button};
1151		1339
		1340	1
		1341	}
		1342
		1343	sub invoke_delete {
		1344	my ($self) = @_;
		1345
		1346	$self->hide;
		1347
1152	1	1348	1
1153	}	1349	}
1154		1350
1155	sub invoke_button_down {	1351	sub invoke_button_down {
1156	my ($self, $ev, $x, $y) = @_;	1352	my ($self, $ev, $x, $y) = @_;
…		…
1214	$self->{motion}->($ev, $x, $y) if $self->{motion};	1410	$self->{motion}->($ev, $x, $y) if $self->{motion};
1215		1411
1216	! ! $self->{motion}	1412	! ! $self->{motion}
1217	}	1413	}
1218		1414
		1415	sub invoke_visibility_change {
		1416	my ($self, $visible) = @_;
		1417
		1418	delete $self->{motion} unless $visible;
		1419
		1420	0
		1421	}
		1422
1219	sub _draw {	1423	sub _draw {
1220	my ($self) = @_;	1424	my ($self) = @_;
1221		1425
1222	my $child = $self->{children}[0];	1426	my $child = $self->{children}[0];
1223		1427
…		…
1260	if $self->{close_button};	1464	if $self->{close_button};
1261	}	1465	}
1262		1466
1263	#############################################################################	1467	#############################################################################
1264		1468
1265	package CFClient::UI::Table;	1469	package CFPlus::UI::Table;
1266		1470
1267	our @ISA = CFClient::UI::Base::;	1471	our @ISA = CFPlus::UI::Base::;
1268		1472
1269	use List::Util qw(max sum);	1473	use List::Util qw(max sum);
1270		1474
1271	use CFClient::OpenGL;	1475	use CFPlus::OpenGL;
1272		1476
1273	sub new {	1477	sub new {
1274	my $class = shift;	1478	my $class = shift;
1275		1479
1276	$class->SUPER::new (	1480	$class->SUPER::new (
…		…
1282	sub children {	1486	sub children {
1283	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1487	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284	}	1488	}
1285		1489
1286	sub add {	1490	sub add {
1287	my ($self, $x, $y, $child) = @_;	1491	my ($self) = shift;
1288		1492
		1493	while (@_) {
		1494	my ($x, $y, $child) = splice @_, 0, 3, ();
1289	$child->set_parent ($self);	1495	$child->set_parent ($self);
1290	$self->{children}[$y][$x] = $child;	1496	$self->{children}[$y][$x] = $child;
		1497	}
1291		1498
		1499	$self->{force_realloc} = 1;
		1500	$self->{force_size_alloc} = 1;
1292	$self->realloc;	1501	$self->realloc;
1293	}	1502	}
1294		1503
1295	sub remove {	1504	sub remove {
1296	my ($self, $child) = @_;	1505	my ($self, $child) = @_;
…		…
1361		1570
1362	# linearly scale sizes	1571	# linearly scale sizes
1363	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1572	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1573	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365		1574
1366	CFClient::UI::harmonize $ws;	1575	CFPlus::UI::harmonize $ws;
1367	CFClient::UI::harmonize $hs;	1576	CFPlus::UI::harmonize $hs;
1368		1577
1369	my $y;	1578	my $y;
1370		1579
1371	for my $r (0 .. $#{$self->{children}}) {	1580	for my $r (0 .. $#{$self->{children}}) {
1372	my $row = $self->{children}[$r]	1581	my $row = $self->{children}[$r]
…		…
1415	}	1624	}
1416	}	1625	}
1417		1626
1418	#############################################################################	1627	#############################################################################
1419		1628
1420	package CFClient::UI::Box;	1629	package CFPlus::UI::Box;
1421		1630
1422	our @ISA = CFClient::UI::Container::;	1631	our @ISA = CFPlus::UI::Container::;
1423		1632
1424	sub size_request {	1633	sub size_request {
1425	my ($self) = @_;	1634	my ($self) = @_;
1426		1635
1427	$self->{vertical}	1636	$self->{vertical}
…		…
1437		1646
1438	sub invoke_size_allocate {	1647	sub invoke_size_allocate {
1439	my ($self, $w, $h) = @_;	1648	my ($self, $w, $h) = @_;
1440		1649
1441	my $space = $self->{vertical} ? $h : $w;	1650	my $space = $self->{vertical} ? $h : $w;
1442	my $children = $self->{children};	1651	my @children = $self->visible_children;
1443		1652
1444	my @req;	1653	my @req;
1445		1654
1446	if ($self->{homogeneous}) {	1655	if ($self->{homogeneous}) {
1447	@req = ($space / (@$children || 1)) x @$children;	1656	@req = ($space / (@children || 1)) x @children;
1448	} else {	1657	} else {
1449	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1658	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450	my $req = List::Util::sum @req;	1659	my $req = List::Util::sum @req;
1451		1660
1452	if ($req > $space) {	1661	if ($req > $space) {
1453	# ah well, not enough space	1662	# ah well, not enough space
1454	$_ *= $space / $req for @req;	1663	$_ *= $space / $req for @req;
1455	} else {	1664	} else {
1456	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1665	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457		1666
1458	$space = ($space - $req) / $expand; # remaining space to give away	1667	$space = ($space - $req) / $expand; # remaining space to give away
1459		1668
1460	$req[$_] += $space * $children->[$_]{expand}	1669	$req[$_] += $space * $children[$_]{expand}
1461	for 0 .. $#$children;	1670	for 0 .. $#children;
1462	}	1671	}
1463	}	1672	}
1464		1673
1465	CFClient::UI::harmonize \@req;	1674	CFPlus::UI::harmonize \@req;
1466		1675
1467	my $pos = 0;	1676	my $pos = 0;
1468	for (0 .. $#$children) {	1677	for (0 .. $#children) {
1469	my $alloc = $req[$_];	1678	my $alloc = $req[$_];
1470	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1679	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471		1680
1472	$pos += $alloc;	1681	$pos += $alloc;
1473	}	1682	}
1474		1683
1475	1	1684	1
1476	}	1685	}
1477		1686
1478	#############################################################################	1687	#############################################################################
1479		1688
1480	package CFClient::UI::HBox;	1689	package CFPlus::UI::HBox;
1481		1690
1482	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1483		1692
1484	sub new {	1693	sub new {
1485	my $class = shift;	1694	my $class = shift;
1486		1695
1487	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1490	)	1699	)
1491	}	1700	}
1492		1701
1493	#############################################################################	1702	#############################################################################
1494		1703
1495	package CFClient::UI::VBox;	1704	package CFPlus::UI::VBox;
1496		1705
1497	our @ISA = CFClient::UI::Box::;	1706	our @ISA = CFPlus::UI::Box::;
1498		1707
1499	sub new {	1708	sub new {
1500	my $class = shift;	1709	my $class = shift;
1501		1710
1502	$class->SUPER::new (	1711	$class->SUPER::new (
…		…
1505	)	1714	)
1506	}	1715	}
1507		1716
1508	#############################################################################	1717	#############################################################################
1509		1718
1510	package CFClient::UI::Label;	1719	package CFPlus::UI::Label;
1511		1720
1512	our @ISA = CFClient::UI::DrawBG::;	1721	our @ISA = CFPlus::UI::DrawBG::;
1513		1722
1514	use CFClient::OpenGL;	1723	use CFPlus::OpenGL;
1515		1724
1516	sub new {	1725	sub new {
1517	my ($class, %arg) = @_;	1726	my ($class, %arg) = @_;
1518		1727
1519	my $self = $class->SUPER::new (	1728	my $self = $class->SUPER::new (
…		…
1522	#active_bg => none	1731	#active_bg => none
1523	#font => default_font	1732	#font => default_font
1524	#text => initial text	1733	#text => initial text
1525	#markup => initial narkup	1734	#markup => initial narkup
1526	#max_w => maximum pixel width	1735	#max_w => maximum pixel width
		1736	#style => 0, # render flags
1527	ellipsise => 3, # end	1737	ellipsise => 3, # end
1528	layout => (new CFClient::Layout),	1738	layout => (new CFPlus::Layout),
1529	fontsize => 1,	1739	fontsize => 1,
1530	align => -1,	1740	align => -1,
1531	valign => -1,	1741	valign => -1,
1532	padding_x => 2,	1742	padding_x => 2,
1533	padding_y => 2,	1743	padding_y => 2,
1534	can_events => 0,	1744	can_events => 0,
1535	%arg	1745	%arg
1536	);	1746	);
1537		1747
1538	if (exists $self->{template}) {	1748	if (exists $self->{template}) {
1539	my $layout = new CFClient::Layout;	1749	my $layout = new CFPlus::Layout;
1540	$layout->set_text (delete $self->{template});	1750	$layout->set_text (delete $self->{template});
1541	$self->{template} = $layout;	1751	$self->{template} = $layout;
1542	}	1752	}
1543		1753
1544	if (exists $self->{markup}) {	1754	if (exists $self->{markup}) {
…		…
1548	}	1758	}
1549		1759
1550	$self	1760	$self
1551	}	1761	}
1552		1762
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 {	1763	sub update {
1564	my ($self) = @_;	1764	my ($self) = @_;
1565		1765
1566	delete $self->{texture};	1766	delete $self->{texture};
1567	$self->SUPER::update;	1767	$self->SUPER::update;
…		…
1578	my ($self, $text) = @_;	1778	my ($self, $text) = @_;
1579		1779
1580	return if $self->{text} eq "T$text";	1780	return if $self->{text} eq "T$text";
1581	$self->{text} = "T$text";	1781	$self->{text} = "T$text";
1582		1782
1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584	$self->{layout}->set_text ($text);	1783	$self->{layout}->set_text ($text);
1585		1784
1586	delete $self->{size_req};	1785	delete $self->{size_req};
1587	$self->realloc;	1786	$self->realloc;
1588	$self->update;	1787	$self->update;
…		…
1594	return if $self->{text} eq "M$markup";	1793	return if $self->{text} eq "M$markup";
1595	$self->{text} = "M$markup";	1794	$self->{text} = "M$markup";
1596		1795
1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1796	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598		1797
1599	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600	$self->{layout}->set_markup ($markup);	1798	$self->{layout}->set_markup ($markup);
1601		1799
1602	delete $self->{size_req};	1800	delete $self->{size_req};
1603	$self->realloc;	1801	$self->realloc;
1604	$self->update;	1802	$self->update;
…		…
1616		1814
1617	my ($w, $h) = $self->{layout}->size;	1815	my ($w, $h) = $self->{layout}->size;
1618		1816
1619	if (exists $self->{template}) {	1817	if (exists $self->{template}) {
1620	$self->{template}->set_font ($self->{font}) if $self->{font};	1818	$self->{template}->set_font ($self->{font}) if $self->{font};
		1819	$self->{template}->set_width ($self->{max_w} || -1);
1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1820	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622		1821
1623	my ($w2, $h2) = $self->{template}->size;	1822	my ($w2, $h2) = $self->{template}->size;
1624		1823
1625	$w = List::Util::max $w, $w2;	1824	$w = List::Util::max $w, $w2;
…		…
1630	};	1829	};
1631		1830
1632	@{ $self->{size_req} }	1831	@{ $self->{size_req} }
1633	}	1832	}
1634		1833
		1834	sub baseline_shift {
		1835	$_[0]{layout}->descent
		1836	}
		1837
1635	sub invoke_size_allocate {	1838	sub invoke_size_allocate {
1636	my ($self, $w, $h) = @_;	1839	my ($self, $w, $h) = @_;
1637		1840
1638	delete $self->{ox};	1841	delete $self->{ox};
1639		1842
…		…
1645		1848
1646	sub set_fontsize {	1849	sub set_fontsize {
1647	my ($self, $fontsize) = @_;	1850	my ($self, $fontsize) = @_;
1648		1851
1649	$self->{fontsize} = $fontsize;	1852	$self->{fontsize} = $fontsize;
		1853	delete $self->{size_req};
1650	delete $self->{texture};	1854	delete $self->{texture};
1651		1855
1652	$self->realloc;	1856	$self->realloc;
1653	}	1857	}
1654		1858
1655	sub reconfigure {	1859	sub reconfigure {
1656	my ($self) = @_;	1860	my ($self) = @_;
1657		1861
1658	delete $self->{size_req};	1862	delete $self->{size_req};
		1863	delete $self->{texture};
1659		1864
1660	$self->SUPER::reconfigure;	1865	$self->SUPER::reconfigure;
1661	}	1866	}
1662		1867
1663	sub _draw {	1868	sub _draw {
1664	my ($self) = @_;	1869	my ($self) = @_;
1665		1870
1666	$self->SUPER::_draw; # draw background, if applicable	1871	$self->SUPER::_draw; # draw background, if applicable
1667		1872
1668	my $tex = $self->{texture} ||= do {	1873	my $size = $self->{texture} ||= do {
1669	$self->{layout}->set_foreground (@{$self->{fg}});	1874	$self->{layout}->set_foreground (@{$self->{fg}});
1670	$self->{layout}->set_font ($self->{font}) if $self->{font};	1875	$self->{layout}->set_font ($self->{font}) if $self->{font};
1671	$self->{layout}->set_width ($self->{w});	1876	$self->{layout}->set_width ($self->{w});
1672	$self->{layout}->set_ellipsise ($self->{ellipsise});	1877	$self->{layout}->set_ellipsise ($self->{ellipsise});
1673	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1878	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1879	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675		1880
1676	new_from_layout CFClient::Texture $self->{layout}	1881	[$self->{layout}->size]
1677	};	1882	};
1678		1883
1679	unless (exists $self->{ox}) {	1884	unless (exists $self->{ox}) {
1680	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1885	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1886	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682	: ($self->{w} - $tex->{w}) * 0.5);	1887	: ($self->{w} - $size->[0]) * 0.5);
1683		1888
1684	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1889	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1890	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686	: ($self->{h} - $tex->{h}) * 0.5);	1891	: ($self->{h} - $size->[1]) * 0.5);
1687	};	1892	};
1688		1893
1689	glEnable GL_TEXTURE_2D;
1690
1691	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1894	my $w = List::Util::min $self->{w} + 4, $size->[0];
1692	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1895	my $h = List::Util::min $self->{h} + 2, $size->[1];
1693		1896
1694	if ($tex->{format} == GL_ALPHA) {	1897	$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	}	1898	}
1705		1899
1706	#############################################################################	1900	#############################################################################
1707		1901
1708	package CFClient::UI::EntryBase;	1902	package CFPlus::UI::EntryBase;
1709		1903
1710	our @ISA = CFClient::UI::Label::;	1904	our @ISA = CFPlus::UI::Label::;
1711		1905
1712	use CFClient::OpenGL;	1906	use CFPlus::OpenGL;
1713		1907
1714	sub new {	1908	sub new {
1715	my $class = shift;	1909	my $class = shift;
1716		1910
1717	$class->SUPER::new (	1911	$class->SUPER::new (
…		…
1721	active_fg => [0, 0, 0],	1915	active_fg => [0, 0, 0],
1722	can_hover => 1,	1916	can_hover => 1,
1723	can_focus => 1,	1917	can_focus => 1,
1724	valign => 0,	1918	valign => 0,
1725	can_events => 1,	1919	can_events => 1,
		1920	ellipsise => 0,
1726	#text => ...	1921	#text => ...
1727	#hidden => "*",	1922	#hidden => "*",
1728	@_	1923	@_
1729	)	1924	)
1730	}	1925	}
…		…
1779		1974
1780	if ($uni == 8) {	1975	if ($uni == 8) {
1781	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1976	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782	} elsif ($uni == 127) {	1977	} elsif ($uni == 127) {
1783	substr $text, $self->{cursor}, 1, "";	1978	substr $text, $self->{cursor}, 1, "";
1784	} elsif ($sym == CFClient::SDLK_LEFT) {	1979	} elsif ($sym == CFPlus::SDLK_LEFT) {
1785	--$self->{cursor} if $self->{cursor};	1980	--$self->{cursor} if $self->{cursor};
1786	} elsif ($sym == CFClient::SDLK_RIGHT) {	1981	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1787	++$self->{cursor} if $self->{cursor} < length $self->{text};	1982	++$self->{cursor} if $self->{cursor} < length $self->{text};
1788	} elsif ($sym == CFClient::SDLK_HOME) {	1983	} elsif ($sym == CFPlus::SDLK_HOME) {
		1984	# what a hack
		1985	$self->{cursor} =
		1986	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1987	? length $1
		1988	: 0;
		1989	} elsif ($sym == CFPlus::SDLK_END) {
		1990	# uh, again
		1991	$self->{cursor} =
		1992	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1993	? $self->{cursor} + length $1
		1994	: length $self->{text};
		1995	} elsif ($uni == 21) { # ctrl-u
		1996	$text = "";
1789	$self->{cursor} = 0;	1997	$self->{cursor} = 0;
1790	} elsif ($sym == CFClient::SDLK_END) {
1791	$self->{cursor} = length $text;
1792	} elsif ($uni == 27) {	1998	} elsif ($uni == 27) {
1793	$self->emit ('escape');	1999	$self->emit ('escape');
1794	} elsif ($uni) {	2000	} elsif ($uni == 0x0d) {
		2001	substr $text, $self->{cursor}++, 0, "\012";
		2002	} elsif ($uni >= 0x20) {
1795	substr $text, $self->{cursor}++, 0, chr $uni;	2003	substr $text, $self->{cursor}++, 0, chr $uni;
1796	} else {	2004	} else {
1797	return 0;	2005	return 0;
1798	}	2006	}
1799		2007
1800	$self->_set_text ($text);	2008	$self->_set_text ($text);
1801		2009
1802	$self->realloc;	2010	$self->realloc;
		2011	$self->update;
1803		2012
1804	1	2013	1
1805	}	2014	}
1806		2015
1807	sub invoke_focus_in {	2016	sub invoke_focus_in {
…		…
1819		2028
1820	my $idx = $self->{layout}->xy_to_index ($x, $y);	2029	my $idx = $self->{layout}->xy_to_index ($x, $y);
1821		2030
1822	# byte-index to char-index	2031	# byte-index to char-index
1823	my $text = $self->{text};	2032	my $text = $self->{text};
1824	utf8::encode $text;	2033	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825	$self->{cursor} = length substr $text, 0, $idx;	2034	$self->{cursor} = length $text;
1826		2035
1827	$self->_set_text ($self->{text});	2036	$self->_set_text ($self->{text});
1828	$self->update;	2037	$self->update;
1829		2038
1830	1	2039	1
…		…
1869	utf8::encode $text;	2078	utf8::encode $text;
1870		2079
1871	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2080	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872	}	2081	}
1873		2082
1874	glColor @{$self->{fg}};
1875	glBegin GL_LINES;	2083	glBegin GL_LINES;
1876	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2084	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};	2085	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878	glEnd;	2086	glEnd;
1879	}	2087	}
1880	}	2088	}
1881		2089
		2090	#############################################################################
		2091
1882	package CFClient::UI::Entry;	2092	package CFPlus::UI::Entry;
1883		2093
1884	our @ISA = CFClient::UI::EntryBase::;	2094	our @ISA = CFPlus::UI::EntryBase::;
1885		2095
1886	use CFClient::OpenGL;	2096	use CFPlus::OpenGL;
1887		2097
1888	sub invoke_key_down {	2098	sub invoke_key_down {
1889	my ($self, $ev) = @_;	2099	my ($self, $ev) = @_;
1890		2100
1891	my $sym = $ev->{sym};	2101	my $sym = $ev->{sym};
1892		2102
1893	if ($sym == 13) {	2103	if ($ev->{uni} == 0x0d || $sym == 13) {
1894	unshift @{$self->{history}},	2104	unshift @{$self->{history}},
1895	my $txt = $self->get_text;	2105	my $txt = $self->get_text;
		2106
1896	$self->{history_pointer} = -1;	2107	$self->{history_pointer} = -1;
1897	$self->{history_saveback} = '';	2108	$self->{history_saveback} = '';
1898	$self->emit (activate => $txt);	2109	$self->emit (activate => $txt);
1899	$self->update;	2110	$self->update;
1900		2111
1901	} elsif ($sym == CFClient::SDLK_UP) {	2112	} elsif ($sym == CFPlus::SDLK_UP) {
1902	if ($self->{history_pointer} < 0) {	2113	if ($self->{history_pointer} < 0) {
1903	$self->{history_saveback} = $self->get_text;	2114	$self->{history_saveback} = $self->get_text;
1904	}	2115	}
1905	if (@{$self->{history} || []} > 0) {	2116	if (@{$self->{history} || []} > 0) {
1906	$self->{history_pointer}++;	2117	$self->{history_pointer}++;
…		…
1908	$self->{history_pointer} = @{$self->{history} || []} - 1;	2119	$self->{history_pointer} = @{$self->{history} || []} - 1;
1909	}	2120	}
1910	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2121	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1911	}	2122	}
1912		2123
1913	} elsif ($sym == CFClient::SDLK_DOWN) {	2124	} elsif ($sym == CFPlus::SDLK_DOWN) {
1914	$self->{history_pointer}--;	2125	$self->{history_pointer}--;
1915	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2126	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1916		2127
1917	if ($self->{history_pointer} >= 0) {	2128	if ($self->{history_pointer} >= 0) {
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2129	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1927	1	2138	1
1928	}	2139	}
1929		2140
1930	#############################################################################	2141	#############################################################################
1931		2142
		2143	package CFPlus::UI::TextEdit;
		2144
		2145	our @ISA = CFPlus::UI::EntryBase::;
		2146
		2147	use CFPlus::OpenGL;
		2148
		2149	sub move_cursor_ver {
		2150	my ($self, $dy) = @_;
		2151
		2152	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2153
		2154	$y += $dy;
		2155
		2156	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2157	$self->{cursor} = $index;
		2158	delete $self->{cur_h};
		2159	$self->update;
		2160	return;
		2161	}
		2162	}
		2163
		2164	sub invoke_key_down {
		2165	my ($self, $ev) = @_;
		2166
		2167	my $sym = $ev->{sym};
		2168
		2169	if ($sym == CFPlus::SDLK_UP) {
		2170	$self->move_cursor_ver (-1);
		2171	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2172	$self->move_cursor_ver (+1);
		2173	} else {
		2174	return $self->SUPER::invoke_key_down ($ev)
		2175	}
		2176
		2177	1
		2178	}
		2179
		2180	#############################################################################
		2181
1932	package CFClient::UI::Button;	2182	package CFPlus::UI::Button;
1933		2183
1934	our @ISA = CFClient::UI::Label::;	2184	our @ISA = CFPlus::UI::Label::;
1935		2185
1936	use CFClient::OpenGL;	2186	use CFPlus::OpenGL;
1937		2187
1938	my @tex =	2188	my @tex =
1939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2189	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1940	qw(b1_button_active.png);	2190	qw(b1_button_active.png);
1941		2191
1942	sub new {	2192	sub new {
1943	my $class = shift;	2193	my $class = shift;
1944		2194
…		…
1981	$self->SUPER::_draw;	2231	$self->SUPER::_draw;
1982	}	2232	}
1983		2233
1984	#############################################################################	2234	#############################################################################
1985		2235
		2236	package CFPlus::UI::CheckBox;
		2237
		2238	our @ISA = CFPlus::UI::DrawBG::;
		2239
		2240	my @tex =
		2241	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2242	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2243
		2244	use CFPlus::OpenGL;
		2245
		2246	sub new {
		2247	my $class = shift;
		2248
		2249	$class->SUPER::new (
		2250	padding_x => 2,
		2251	padding_y => 2,
		2252	fg => [1, 1, 1],
		2253	active_fg => [1, 1, 0],
		2254	bg => [0, 0, 0, 0.2],
		2255	active_bg => [1, 1, 1, 0.5],
		2256	state => 0,
		2257	can_hover => 1,
		2258	@_
		2259	)
		2260	}
		2261
		2262	sub size_request {
		2263	my ($self) = @_;
		2264
		2265	(6) x 2
		2266	}
		2267
		2268	sub toggle {
		2269	my ($self) = @_;
		2270
		2271	$self->{state} = !$self->{state};
		2272	$self->emit (changed => $self->{state});
		2273	$self->update;
		2274	}
		2275
		2276	sub invoke_button_down {
		2277	my ($self, $ev, $x, $y) = @_;
		2278
		2279	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2280	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2281	$self->toggle;
		2282	} else {
		2283	return 0
		2284	}
		2285
		2286	1
		2287	}
		2288
		2289	sub _draw {
		2290	my ($self) = @_;
		2291
		2292	$self->SUPER::_draw;
		2293
		2294	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2295
		2296	my ($w, $h) = @$self{qw(w h)};
		2297
		2298	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2299
		2300	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2301
		2302	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2303
		2304	glEnable GL_TEXTURE_2D;
		2305	$tex->draw_quad_alpha (0, 0, $s, $s);
		2306	glDisable GL_TEXTURE_2D;
		2307	}
		2308
		2309	#############################################################################
		2310
		2311	package CFPlus::UI::Image;
		2312
		2313	our @ISA = CFPlus::UI::Base::;
		2314
		2315	use CFPlus::OpenGL;
		2316
		2317	our %texture_cache;
		2318
		2319	sub new {
		2320	my $class = shift;
		2321
		2322	my $self = $class->SUPER::new (
		2323	can_events => 0,
		2324	@_,
		2325	);
		2326
		2327	$self->{path} || $self->{tex}
		2328	or Carp::croak "'path' or 'tex' attributes required";
		2329
		2330	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2331	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2332
		2333	CFPlus::weaken $texture_cache{$self->{path}};
		2334
		2335	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2336
		2337	$self
		2338	}
		2339
		2340	sub STORABLE_freeze {
		2341	my ($self, $cloning) = @_;
		2342
		2343	$self->{path}
		2344	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2345
		2346	$self->{path}
		2347	}
		2348
		2349	sub STORABLE_attach {
		2350	my ($self, $cloning, $path) = @_;
		2351
		2352	$self->new (path => $path)
		2353	}
		2354
		2355	sub size_request {
		2356	my ($self) = @_;
		2357
		2358	($self->{tex}{w}, $self->{tex}{h})
		2359	}
		2360
		2361	sub _draw {
		2362	my ($self) = @_;
		2363
		2364	my $tex = $self->{tex};
		2365
		2366	my ($w, $h) = ($self->{w}, $self->{h});
		2367
		2368	if ($self->{rot90}) {
		2369	glRotate 90, 0, 0, 1;
		2370	glTranslate 0, -$self->{w}, 0;
		2371
		2372	($w, $h) = ($h, $w);
		2373	}
		2374
		2375	glEnable GL_TEXTURE_2D;
		2376	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2377
		2378	$tex->draw_quad (0, 0, $w, $h);
		2379
		2380	glDisable GL_TEXTURE_2D;
		2381	}
		2382
		2383	#############################################################################
		2384
1986	package CFClient::UI::ImageButton;	2385	package CFPlus::UI::ImageButton;
1987		2386
1988	our @ISA = CFClient::UI::Image::;	2387	our @ISA = CFPlus::UI::Image::;
1989		2388
1990	use CFClient::OpenGL;	2389	use CFPlus::OpenGL;
1991		2390
1992	my %textures;	2391	my %textures;
1993		2392
1994	sub new {	2393	sub new {
1995	my $class = shift;	2394	my $class = shift;
…		…
2017	1	2416	1
2018	}	2417	}
2019		2418
2020	#############################################################################	2419	#############################################################################
2021		2420
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;	2421	package CFPlus::UI::VGauge;
2091		2422
2092	our @ISA = CFClient::UI::Base::;	2423	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		2424
2152	use List::Util qw(min max);	2425	use List::Util qw(min max);
2153		2426
2154	use CFClient::OpenGL;	2427	use CFPlus::OpenGL;
2155		2428
2156	my %tex = (	2429	my %tex = (
2157	food => [	2430	food => [
2158	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2431	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2159	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2432	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2160	],	2433	],
2161	grace => [	2434	grace => [
2162	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2435	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/	2436	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2164	],	2437	],
2165	hp => [	2438	hp => [
2166	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2439	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2167	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2440	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2168	],	2441	],
2169	mana => [	2442	mana => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2443	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/	2444	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2172	],	2445	],
2173	);	2446	);
2174		2447
2175	# eg. VGauge->new (gauge => 'food'), default gauge: food	2448	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2235	my $ycut1 = max 0, min 1, $ycut;	2508	my $ycut1 = max 0, min 1, $ycut;
2236	my $ycut2 = max 0, min 1, $ycut - 1;	2509	my $ycut2 = max 0, min 1, $ycut - 1;
2237		2510
2238	my $h1 = $self->{h} * (1 - $ycut1);	2511	my $h1 = $self->{h} * (1 - $ycut1);
2239	my $h2 = $self->{h} * (1 - $ycut2);	2512	my $h2 = $self->{h} * (1 - $ycut2);
		2513	my $h3 = $self->{h};
		2514
		2515	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2240		2516
2241	glEnable GL_BLEND;	2517	glEnable GL_BLEND;
2242	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2518	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2519	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244	glEnable GL_TEXTURE_2D;	2520	glEnable GL_TEXTURE_2D;
…		…
2263		2539
2264	if ($t3) {	2540	if ($t3) {
2265	glBindTexture GL_TEXTURE_2D, $t3->{name};	2541	glBindTexture GL_TEXTURE_2D, $t3->{name};
2266	glBegin GL_QUADS;	2542	glBegin GL_QUADS;
2267	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2543	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2544	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2545	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2546	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271	glEnd;	2547	glEnd;
2272	}	2548	}
2273		2549
2274	glDisable GL_BLEND;	2550	glDisable GL_BLEND;
2275	glDisable GL_TEXTURE_2D;	2551	glDisable GL_TEXTURE_2D;
2276	}	2552	}
2277		2553
2278	#############################################################################	2554	#############################################################################
2279		2555
2280	package CFClient::UI::Gauge;	2556	package CFPlus::UI::Gauge;
2281		2557
2282	our @ISA = CFClient::UI::VBox::;	2558	our @ISA = CFPlus::UI::VBox::;
2283		2559
2284	sub new {	2560	sub new {
2285	my ($class, %arg) = @_;	2561	my ($class, %arg) = @_;
2286		2562
2287	my $self = $class->SUPER::new (	2563	my $self = $class->SUPER::new (
…		…
2289	can_hover => 1,	2565	can_hover => 1,
2290	can_events => 1,	2566	can_events => 1,
2291	%arg,	2567	%arg,
2292	);	2568	);
2293		2569
2294	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2570	$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);	2571	$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");	2572	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2297		2573
2298	$self	2574	$self
2299	}	2575	}
2300		2576
2301	sub set_fontsize {	2577	sub set_fontsize {
…		…
2322	$self->{value}->set_text ($val);	2598	$self->{value}->set_text ($val);
2323	}	2599	}
2324		2600
2325	#############################################################################	2601	#############################################################################
2326		2602
2327	package CFClient::UI::Slider;	2603	package CFPlus::UI::Slider;
2328		2604
2329	use strict;	2605	use strict;
2330		2606
2331	use CFClient::OpenGL;	2607	use CFPlus::OpenGL;
2332		2608
2333	our @ISA = CFClient::UI::DrawBG::;	2609	our @ISA = CFPlus::UI::DrawBG::;
2334		2610
2335	my @tex =	2611	my @tex =
2336	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2337	qw(s1_slider.png s1_slider_bg.png);	2613	qw(s1_slider.png s1_slider_bg.png);
2338		2614
2339	sub new {	2615	sub new {
2340	my $class = shift;	2616	my $class = shift;
2341		2617
…		…
2409		2685
2410	$self->SUPER::invoke_button_down ($ev, $x, $y);	2686	$self->SUPER::invoke_button_down ($ev, $x, $y);
2411		2687
2412	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2688	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413		2689
2414	$self->mouse_motion ($ev, $x, $y)	2690	$self->invoke_mouse_motion ($ev, $x, $y)
2415	}	2691	}
2416		2692
2417	sub invoke_mouse_motion {	2693	sub invoke_mouse_motion {
2418	my ($self, $ev, $x, $y) = @_;	2694	my ($self, $ev, $x, $y) = @_;
2419		2695
…		…
2428	} else {	2704	} else {
2429	return 0;	2705	return 0;
2430	}	2706	}
2431		2707
2432	1	2708	1
		2709	}
		2710
		2711	sub invoke_mouse_wheel {
		2712	my ($self, $ev) = @_;
		2713
		2714	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2715
		2716	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2717
		2718	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2719
		2720	! ! $delta
2433	}	2721	}
2434		2722
2435	sub update {	2723	sub update {
2436	my ($self) = @_;	2724	my ($self) = @_;
2437		2725
…		…
2486	glDisable GL_TEXTURE_2D;	2774	glDisable GL_TEXTURE_2D;
2487	}	2775	}
2488		2776
2489	#############################################################################	2777	#############################################################################
2490		2778
2491	package CFClient::UI::ValSlider;	2779	package CFPlus::UI::ValSlider;
2492		2780
2493	our @ISA = CFClient::UI::HBox::;	2781	our @ISA = CFPlus::UI::HBox::;
2494		2782
2495	sub new {	2783	sub new {
2496	my ($class, %arg) = @_;	2784	my ($class, %arg) = @_;
2497		2785
2498	my $range = delete $arg{range};	2786	my $range = delete $arg{range};
2499		2787
2500	my $self = $class->SUPER::new (	2788	my $self = $class->SUPER::new (
2501	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2789	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2502	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2790	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2503	to_value => sub { shift },	2791	to_value => sub { shift },
2504	from_value => sub { shift },	2792	from_value => sub { shift },
2505	%arg,	2793	%arg,
2506	);	2794	);
2507		2795
…		…
2527	sub set_range { shift->{slider}->set_range (@_) }	2815	sub set_range { shift->{slider}->set_range (@_) }
2528	sub set_value { shift->{slider}->set_value (@_) }	2816	sub set_value { shift->{slider}->set_value (@_) }
2529		2817
2530	#############################################################################	2818	#############################################################################
2531		2819
2532	package CFClient::UI::TextScroller;	2820	package CFPlus::UI::TextScroller;
2533		2821
2534	our @ISA = CFClient::UI::HBox::;	2822	our @ISA = CFPlus::UI::HBox::;
2535		2823
2536	use CFClient::OpenGL;	2824	use CFPlus::OpenGL;
2537		2825
2538	sub new {	2826	sub new {
2539	my $class = shift;	2827	my $class = shift;
2540		2828
2541	my $self = $class->SUPER::new (	2829	my $self = $class->SUPER::new (
2542	fontsize => 1,	2830	fontsize => 1,
2543	can_events => 0,	2831	can_events => 1,
2544	indent => 0,	2832	indent => 0,
2545	#font => default_font	2833	#font => default_font
2546	@_,	2834	@_,
2547		2835
2548	layout => (new CFClient::Layout 1),	2836	layout => (new CFPlus::Layout),
2549	par => [],	2837	par => [],
		2838	max_par => 0,
2550	height => 0,	2839	height => 0,
2551	children => [	2840	children => [
2552	(new CFClient::UI::Empty expand => 1),	2841	(new CFPlus::UI::Empty expand => 1),
2553	(new CFClient::UI::Slider vertical => 1),	2842	(new CFPlus::UI::Slider vertical => 1),
2554	],	2843	],
2555	);	2844	);
2556		2845
2557	$self->{children}[1]->connect (changed => sub { $self->update });	2846	$self->{children}[1]->connect (changed => sub { $self->update });
2558		2847
…		…
2564		2853
2565	$self->{fontsize} = $fontsize;	2854	$self->{fontsize} = $fontsize;
2566	$self->reflow;	2855	$self->reflow;
2567	}	2856	}
2568		2857
		2858	sub size_request {
		2859	my ($self) = @_;
		2860
		2861	my ($empty, $slider) = @{ $self->{children} };
		2862
		2863	local $self->{children} = [$empty, $slider];
		2864	$self->SUPER::size_request
		2865	}
		2866
2569	sub invoke_size_allocate {	2867	sub invoke_size_allocate {
2570	my ($self, $w, $h) = @_;	2868	my ($self, $w, $h) = @_;
2571		2869
		2870	my ($empty, $slider, @other) = @{ $self->{children} };
		2871	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		2872
2572	$self->{layout}->set_font ($self->{font}) if $self->{font};	2873	$self->{layout}->set_font ($self->{font}) if $self->{font};
2573	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2874	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574	$self->{layout}->set_width ($self->{children}[0]{w});	2875	$self->{layout}->set_width ($empty->{w});
2575	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2876	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576		2877
2577	$self->reflow;	2878	$self->reflow;
2578		2879
		2880	local $self->{children} = [$empty, $slider];
2579	$self->SUPER::invoke_size_allocate ($w, $h)	2881	$self->SUPER::invoke_size_allocate ($w, $h)
2580	}	2882	}
2581		2883
2582	sub text_size {	2884	sub invoke_mouse_wheel {
2583	my ($self, $text, $indent) = @_;	2885	my ($self, $ev) = @_;
		2886
		2887	return 0 unless $ev->{dy}; # only vertical movements
		2888
		2889	$self->{children}[1]->emit (mouse_wheel => $ev);
		2890
		2891	1
		2892	}
		2893
		2894	sub get_layout {
		2895	my ($self, $para) = @_;
2584		2896
2585	my $layout = $self->{layout};	2897	my $layout = $self->{layout};
2586		2898
		2899	$layout->set_font ($self->{font}) if $self->{font};
		2900	$layout->set_foreground (@{$para->{fg}});
2587	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2901	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588	$layout->set_width ($self->{children}[0]{w} - $indent);	2902	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2903	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590	$layout->set_markup ($text);	2904	$layout->set_markup ($para->{markup});
		2905
		2906	$layout->set_shapes (
		2907	map
		2908	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2909	@{$para->{widget}}
2591		2910	);
		2911
2592	$layout->size	2912	$layout
2593	}	2913	}
2594		2914
2595	sub reflow {	2915	sub reflow {
2596	my ($self) = @_;	2916	my ($self) = @_;
2597		2917
…		…
2604		2924
2605	# todo: base offset on lines or so, not on pixels	2925	# todo: base offset on lines or so, not on pixels
2606	$self->{children}[1]->set_value ($offset);	2926	$self->{children}[1]->set_value ($offset);
2607	}	2927	}
2608		2928
		2929	sub current_paragraph {
		2930	my ($self) = @_;
		2931
		2932	$self->{top_paragraph} - 1
		2933	}
		2934
		2935	sub scroll_to {
		2936	my ($self, $para) = @_;
		2937
		2938	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2939
		2940	$self->{scroll_to} = $para;
		2941	$self->update;
		2942	}
		2943
2609	sub clear {	2944	sub clear {
2610	my ($self) = @_;	2945	my ($self) = @_;
		2946
		2947	my (undef, undef, @other) = @{ $self->{children} };
		2948	$self->remove ($_) for @other;
2611		2949
2612	$self->{par} = [];	2950	$self->{par} = [];
2613	$self->{height} = 0;	2951	$self->{height} = 0;
2614	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2952	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615	}	2953	}
2616		2954
2617	sub add_paragraph {	2955	sub add_paragraph {
2618	my ($self, $color, $text, $indent) = @_;	2956	my $self = shift;
2619		2957
2620	for my $line (split /\n/, $text) {	2958	for my $para (@_) {
2621	my ($w, $h) = $self->text_size ($line);	2959	$para = {
		2960	fg => [1, 1, 1, 1],
		2961	indent => 0,
		2962	markup => "",
		2963	widget => [],
		2964	ref $para ? %$para : (markup => $para),
		2965	w => 1e10,
		2966	wrapped => 1,
		2967	};
		2968
		2969	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2970	push @{$self->{par}}, $para;
		2971	}
		2972
		2973	if (my $max = $self->{max_par}) {
		2974	shift @{$self->{par}} while @{$self->{par}} > $max;
		2975	}
		2976
		2977	$self->{need_reflow}++;
		2978	$self->update;
		2979	}
		2980
		2981	sub scroll_to_bottom {
		2982	my ($self) = @_;
		2983
		2984	$self->{scroll_to} = $#{$self->{par}};
		2985	$self->update;
		2986	}
		2987
		2988	sub force_uptodate {
		2989	my ($self) = @_;
		2990
		2991	if (delete $self->{need_reflow}) {
		2992	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2993
		2994	my $height = 0;
		2995
		2996	for my $para (@{$self->{par}}) {
		2997	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2998	my $layout = $self->get_layout ($para);
		2999	my ($w, $h) = $layout->size;
		3000
		3001	$para->{w} = $w + $para->{indent};
		3002	$para->{h} = $h;
		3003	$para->{wrapped} = $layout->has_wrapped;
		3004	}
		3005
		3006	$para->{y} = $height;
		3007	$height += $para->{h};
		3008	}
		3009
2622	$self->{height} += $h;	3010	$self->{height} = $height;
2623	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3011	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2624	}
2625		3012
2626	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3013	delete $self->{texture};
		3014	}
		3015
		3016	if (my $paridx = delete $self->{scroll_to}) {
		3017	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3018	}
2627	}	3019	}
2628		3020
2629	sub update {	3021	sub update {
2630	my ($self) = @_;	3022	my ($self) = @_;
2631		3023
…		…
2634	return unless $self->{h} > 0;	3026	return unless $self->{h} > 0;
2635		3027
2636	delete $self->{texture};	3028	delete $self->{texture};
2637		3029
2638	$ROOT->on_post_alloc ($self => sub {	3030	$ROOT->on_post_alloc ($self => sub {
		3031	$self->force_uptodate;
		3032
2639	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3033	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640		3034
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 {	3035	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2669	glClearColor 0, 0, 0, 0;	3036	glClearColor 0, 0, 0, 0;
2670	glClear GL_COLOR_BUFFER_BIT;	3037	glClear GL_COLOR_BUFFER_BIT;
2671		3038
		3039	package CFPlus::UI::Base;
		3040	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3041	(0, 0, $self->{w}, $self->{h});
		3042
		3043	my $top = int $self->{children}[1]{range}[0];
		3044
		3045	my $paridx = 0;
		3046	my $top_paragraph;
2672	my $top = int $self->{children}[1]{range}[0];	3047	my $top = int $self->{children}[1]{range}[0];
2673		3048
2674	my $y0 = $top;	3049	my $y0 = $top;
2675	my $y1 = $top + $H;	3050	my $y1 = $top + $H;
2676		3051
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}}) {	3052	for my $para (@{$self->{par}}) {
2688	my $h = $par->[1];	3053	my $h = $para->{h};
		3054	my $y = $para->{y};
2689		3055
2690	if ($y0 < $y + $h && $y < $y1) {	3056	if ($y0 < $y + $h && $y < $y1) {
2691	$layout->set_foreground (@{ $par->[2] });	3057	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		3058
2696	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3059	$layout->render ($para->{indent}, $y - $y0);
2697		3060
2698	glRasterPos $par->[3], $y - $y0;	3061	if (my @w = @{ $para->{widget} }) {
2699	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3062	my @s = $layout->get_shapes;
		3063
		3064	for (@w) {
		3065	my ($dx, $dy) = splice @s, 0, 2, ();
		3066
		3067	$_->{x} = $dx + $para->{indent};
		3068	$_->{y} = $dy + $y - $y0;
		3069
		3070	$_->draw;
		3071	}
		3072	}
2700	}	3073	}
2701		3074
2702	$y += $h;	3075	$paridx++;
		3076	$top_paragraph ||= $paridx if $y >= $top;
2703	}	3077	}
2704		3078
2705	glDisable GL_BLEND;	3079	$self->{top_paragraph} = $top_paragraph;
2706	};	3080	};
2707	});	3081	});
		3082	}
		3083
		3084	sub reconfigure {
		3085	my ($self) = @_;
		3086
		3087	$self->SUPER::reconfigure;
		3088
		3089	$_->{w} = 1e10 for @{ $self->{par} };
		3090	$self->reflow;
2708	}	3091	}
2709		3092
2710	sub _draw {	3093	sub _draw {
2711	my ($self) = @_;	3094	my ($self) = @_;
2712		3095
…		…
2715	glColor 0, 0, 0, 1;	3098	glColor 0, 0, 0, 1;
2716	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3099	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717	glDisable GL_TEXTURE_2D;	3100	glDisable GL_TEXTURE_2D;
2718		3101
2719	$self->{children}[1]->draw;	3102	$self->{children}[1]->draw;
2720
2721	}	3103	}
2722		3104
2723	#############################################################################	3105	#############################################################################
2724		3106
2725	package CFClient::UI::Animator;	3107	package CFPlus::UI::Animator;
2726		3108
2727	use CFClient::OpenGL;	3109	use CFPlus::OpenGL;
2728		3110
2729	our @ISA = CFClient::UI::Bin::;	3111	our @ISA = CFPlus::UI::Bin::;
2730		3112
2731	sub moveto {	3113	sub moveto {
2732	my ($self, $x, $y) = @_;	3114	my ($self, $x, $y) = @_;
2733		3115
2734	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3116	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2762	glPopMatrix;	3144	glPopMatrix;
2763	}	3145	}
2764		3146
2765	#############################################################################	3147	#############################################################################
2766		3148
2767	package CFClient::UI::Flopper;	3149	package CFPlus::UI::Flopper;
2768		3150
2769	our @ISA = CFClient::UI::Button::;	3151	our @ISA = CFPlus::UI::Button::;
2770		3152
2771	sub new {	3153	sub new {
2772	my $class = shift;	3154	my $class = shift;
2773		3155
2774	my $self = $class->SUPER::new (	3156	my $self = $class->SUPER::new (
…		…
2786	$self->{other}->toggle_visibility;	3168	$self->{other}->toggle_visibility;
2787	}	3169	}
2788		3170
2789	#############################################################################	3171	#############################################################################
2790		3172
2791	package CFClient::UI::Tooltip;	3173	package CFPlus::UI::Tooltip;
2792		3174
2793	our @ISA = CFClient::UI::Bin::;	3175	our @ISA = CFPlus::UI::Bin::;
2794		3176
2795	use CFClient::OpenGL;	3177	use CFPlus::OpenGL;
2796		3178
2797	sub new {	3179	sub new {
2798	my $class = shift;	3180	my $class = shift;
2799		3181
2800	$class->SUPER::new (	3182	$class->SUPER::new (
…		…
2803	)	3185	)
2804	}	3186	}
2805		3187
2806	sub set_tooltip_from {	3188	sub set_tooltip_from {
2807	my ($self, $widget) = @_;	3189	my ($self, $widget) = @_;
		3190
		3191	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3192	if $widget->{tooltip} =~ /^#(.*)$/;
2808		3193
2809	my $tooltip = $widget->{tooltip};	3194	my $tooltip = $widget->{tooltip};
2810		3195
2811	if ($ENV{CFPLUS_DEBUG} & 2) {	3196	if ($ENV{CFPLUS_DEBUG} & 2) {
2812	$tooltip .= "\n\n" . (ref $widget) . "\n"	3197	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2816	}	3201	}
2817		3202
2818	$tooltip =~ s/^\n+//;	3203	$tooltip =~ s/^\n+//;
2819	$tooltip =~ s/\n+$//;	3204	$tooltip =~ s/\n+$//;
2820		3205
2821	$self->add (new CFClient::UI::Label	3206	$self->add (new CFPlus::UI::Label
2822	markup => $tooltip,	3207	markup => $tooltip,
2823	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3208	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2824	fontsize => 0.8,	3209	fontsize => 0.8,
2825	fg => [0, 0, 0, 1],	3210	style => 1, # FLAG_INVERSE
2826	ellipsise => 0,	3211	ellipsise => 0,
2827	font => ($widget->{tooltip_font} || $::FONT_PROP),	3212	font => ($widget->{tooltip_font} || $::FONT_PROP),
2828	);	3213	);
2829	}	3214	}
2830		3215
…		…
2849		3234
2850	$self->{root}->on_post_alloc ("move_$self" => sub {	3235	$self->{root}->on_post_alloc ("move_$self" => sub {
2851	my $widget = $self->{owner}	3236	my $widget = $self->{owner}
2852	or return;	3237	or return;
2853		3238
		3239	if ($widget->{visible}) {
2854	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3240	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2855		3241
2856	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3242	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2857	if $x + $self->{w} > $self->{root}{w};	3243	if $x + $self->{w} > $self->{root}{w};
2858		3244
2859	$self->move_abs ($x, $y);	3245	$self->move_abs ($x, $y);
		3246	} else {
		3247	$self->hide;
		3248	}
2860	});	3249	});
2861	}	3250	}
2862		3251
2863	sub _draw {	3252	sub _draw {
2864	my ($self) = @_;	3253	my ($self) = @_;
…		…
2888	$self->SUPER::_draw;	3277	$self->SUPER::_draw;
2889	}	3278	}
2890		3279
2891	#############################################################################	3280	#############################################################################
2892		3281
2893	package CFClient::UI::Face;	3282	package CFPlus::UI::Face;
2894		3283
2895	our @ISA = CFClient::UI::Base::;	3284	our @ISA = CFPlus::UI::DrawBG::;
2896		3285
2897	use CFClient::OpenGL;	3286	use CFPlus::OpenGL;
2898		3287
2899	sub new {	3288	sub new {
2900	my $class = shift;	3289	my $class = shift;
2901		3290
2902	my $self = $class->SUPER::new (	3291	my $self = $class->SUPER::new (
…		…
2904	can_events => 0,	3293	can_events => 0,
2905	@_,	3294	@_,
2906	);	3295	);
2907		3296
2908	if ($self->{anim} && $self->{animspeed}) {	3297	if ($self->{anim} && $self->{animspeed}) {
2909	Scalar::Util::weaken (my $widget = $self);	3298	CFPlus::weaken (my $widget = $self);
2910		3299
2911	$self->{timer} = Event->timer (	3300	$self->{timer} = Event->timer (
2912	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3301	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2913	hard => 1,	3302	hard => 1,
2914	interval => $self->{animspeed},	3303	interval => $self->{animspeed},
…		…
2937	sub _draw {	3326	sub _draw {
2938	my ($self) = @_;	3327	my ($self) = @_;
2939		3328
2940	return unless $::CONN;	3329	return unless $::CONN;
2941		3330
		3331	$self->SUPER::_draw;
		3332
2942	my $face;	3333	my $face;
2943		3334
2944	if ($self->{frame}) {	3335	if ($self->{frame}) {
2945	my $anim = $::CONN->{anim}[$self->{anim}];	3336	my $anim = $::CONN->{anim}[$self->{anim}];
2946		3337
…		…
2968	$self->SUPER::destroy;	3359	$self->SUPER::destroy;
2969	}	3360	}
2970		3361
2971	#############################################################################	3362	#############################################################################
2972		3363
2973	package CFClient::UI::Buttonbar;	3364	package CFPlus::UI::Buttonbar;
2974		3365
2975	our @ISA = CFClient::UI::HBox::;	3366	our @ISA = CFPlus::UI::HBox::;
2976		3367
2977	# TODO: should actualyl wrap buttons and other goodies.	3368	# TODO: should actually wrap buttons and other goodies.
2978		3369
2979	#############################################################################	3370	#############################################################################
2980		3371
2981	package CFClient::UI::Menu;	3372	package CFPlus::UI::Menu;
2982		3373
2983	our @ISA = CFClient::UI::FancyFrame::;	3374	our @ISA = CFPlus::UI::Toplevel::;
2984		3375
2985	use CFClient::OpenGL;	3376	use CFPlus::OpenGL;
2986		3377
2987	sub new {	3378	sub new {
2988	my $class = shift;	3379	my $class = shift;
2989		3380
2990	my $self = $class->SUPER::new (	3381	my $self = $class->SUPER::new (
2991	items => [],	3382	items => [],
2992	z => 100,	3383	z => 100,
2993	@_,	3384	@_,
2994	);	3385	);
2995		3386
2996	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3387	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2997		3388
2998	for my $item (@{ $self->{items} }) {	3389	for my $item (@{ $self->{items} }) {
2999	my ($widget, $cb, $tooltip) = @$item;	3390	my ($widget, $cb, $tooltip) = @$item;
3000		3391
3001	# handle various types of items, only text for now	3392	# handle various types of items, only text for now
3002	if (!ref $widget) {	3393	if (!ref $widget) {
		3394	if ($widget =~ /\t/) {
		3395	my ($left, $right) = split /\t/, $widget, 2;
		3396
3003	$widget = new CFClient::UI::Label	3397	$widget = new CFPlus::UI::HBox
3004	can_hover => 1,	3398	can_hover => 1,
3005	can_events => 1,	3399	can_events => 1,
		3400	tooltip => $tooltip,
		3401	children => [
		3402	(new CFPlus::UI::Label markup => $left, expand => 1),
		3403	(new CFPlus::UI::Label markup => $right, align => +1),
		3404	],
		3405	;
		3406
		3407	} else {
		3408	$widget = new CFPlus::UI::Label
		3409	can_hover => 1,
		3410	can_events => 1,
3006	markup => $widget,	3411	markup => $widget,
3007	tooltip => $tooltip	3412	tooltip => $tooltip;
		3413	}
3008	}	3414	}
3009		3415
3010	$self->{item}{$widget} = $item;	3416	$self->{item}{$widget} = $item;
3011		3417
3012	$self->{vbox}->add ($widget);	3418	$self->{vbox}->add ($widget);
…		…
3055	1	3461	1
3056	}	3462	}
3057		3463
3058	#############################################################################	3464	#############################################################################
3059		3465
3060	package CFClient::UI::Multiplexer;	3466	package CFPlus::UI::Multiplexer;
3061		3467
3062	our @ISA = CFClient::UI::Container::;	3468	our @ISA = CFPlus::UI::Container::;
3063		3469
3064	sub new {	3470	sub new {
3065	my $class = shift;	3471	my $class = shift;
3066		3472
3067	my $self = $class->SUPER::new (	3473	my $self = $class->SUPER::new (
…		…
3081		3487
3082	$self->{current} = $self->{children}[0]	3488	$self->{current} = $self->{children}[0]
3083	if @{ $self->{children} };	3489	if @{ $self->{children} };
3084	}	3490	}
3085		3491
		3492	sub get_current_page {
		3493	my ($self) = @_;
		3494
		3495	$self->{current}
		3496	}
		3497
3086	sub set_current_page {	3498	sub set_current_page {
3087	my ($self, $page_or_widget) = @_;	3499	my ($self, $page_or_widget) = @_;
3088		3500
3089	my $widget = ref $page_or_widget	3501	my $widget = ref $page_or_widget
3090	? $page_or_widget	3502	? $page_or_widget
…		…
3122	$self->{current}->draw;	3534	$self->{current}->draw;
3123	}	3535	}
3124		3536
3125	#############################################################################	3537	#############################################################################
3126		3538
3127	package CFClient::UI::Notebook;	3539	package CFPlus::UI::Notebook;
3128		3540
3129	our @ISA = CFClient::UI::VBox::;	3541	our @ISA = CFPlus::UI::VBox::;
3130		3542
3131	sub new {	3543	sub new {
3132	my $class = shift;	3544	my $class = shift;
3133		3545
3134	my $self = $class->SUPER::new (	3546	my $self = $class->SUPER::new (
3135	buttonbar => (new CFClient::UI::Buttonbar),	3547	buttonbar => (new CFPlus::UI::Buttonbar),
3136	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3548	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3137	# filter => # will be put between multiplexer and $self	3549	# filter => # will be put between multiplexer and $self
3138	@_,	3550	@_,
3139	);	3551	);
3140		3552
3141	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3553	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3145	}	3557	}
3146		3558
3147	sub add {	3559	sub add {
3148	my ($self, $title, $widget, $tooltip) = @_;	3560	my ($self, $title, $widget, $tooltip) = @_;
3149		3561
3150	Scalar::Util::weaken $self;	3562	CFPlus::weaken $self;
3151		3563
3152	$self->{buttonbar}->add (new CFClient::UI::Button	3564	$self->{buttonbar}->add (new CFPlus::UI::Button
3153	markup => $title,	3565	markup => $title,
3154	tooltip => $tooltip,	3566	tooltip => $tooltip,
3155	on_activate => sub { $self->set_current_page ($widget) },	3567	on_activate => sub { $self->set_current_page ($widget) },
3156	);	3568	);
3157		3569
3158	$self->{multiplexer}->add ($widget);	3570	$self->{multiplexer}->add ($widget);
3159	}	3571	}
3160		3572
		3573	sub get_current_page {
		3574	my ($self) = @_;
		3575
		3576	$self->{multiplexer}->get_current_page
		3577	}
		3578
3161	sub set_current_page {	3579	sub set_current_page {
3162	my ($self, $page) = @_;	3580	my ($self, $page) = @_;
3163		3581
3164	$self->{multiplexer}->set_current_page ($page);	3582	$self->{multiplexer}->set_current_page ($page);
3165	$self->emit (page_changed => $self->{multiplexer}{current});	3583	$self->emit (page_changed => $self->{multiplexer}{current});
3166	}	3584	}
3167		3585
3168	#############################################################################	3586	#############################################################################
3169		3587
3170	package CFClient::UI::Combobox;	3588	package CFPlus::UI::Selector;
3171		3589
3172	use utf8;	3590	use utf8;
3173		3591
3174	our @ISA = CFClient::UI::Button::;	3592	our @ISA = CFPlus::UI::Button::;
3175		3593
3176	sub new {	3594	sub new {
3177	my $class = shift;	3595	my $class = shift;
3178		3596
3179	my $self = $class->SUPER::new (	3597	my $self = $class->SUPER::new (
…		…
3196	my ($value, $title, $tooltip) = @$_;	3614	my ($value, $title, $tooltip) = @$_;
3197		3615
3198	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3616	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199	}	3617	}
3200		3618
3201	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3619	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202	}	3620	}
3203		3621
3204	sub _set_value {	3622	sub _set_value {
3205	my ($self, $value) = @_;	3623	my ($self, $value) = @_;
3206		3624
…		…
3221	$self->emit (changed => $value);	3639	$self->emit (changed => $value);
3222	}	3640	}
3223		3641
3224	#############################################################################	3642	#############################################################################
3225		3643
3226	package CFClient::UI::Statusbox;	3644	package CFPlus::UI::Statusbox;
3227		3645
3228	our @ISA = CFClient::UI::VBox::;	3646	our @ISA = CFPlus::UI::VBox::;
3229		3647
3230	sub new {	3648	sub new {
3231	my $class = shift;	3649	my $class = shift;
3232		3650
3233	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
3234	fontsize => 0.8,	3652	fontsize => 0.8,
3235	@_,	3653	@_,
3236	);	3654	);
3237		3655
3238	Scalar::Util::weaken (my $this = $self);	3656	CFPlus::weaken (my $this = $self);
3239		3657
3240	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3658	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3241		3659
3242	$self	3660	$self
3243	}	3661	}
…		…
3245	sub reorder {	3663	sub reorder {
3246	my ($self) = @_;	3664	my ($self) = @_;
3247	my $NOW = Time::HiRes::time;	3665	my $NOW = Time::HiRes::time;
3248		3666
3249	# freeze display when hovering over any label	3667	# freeze display when hovering over any label
3250	return if $CFClient::UI::TOOLTIP->{owner}	3668	return if $CFPlus::UI::TOOLTIP->{owner}
3251	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3669	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3252	values %{ $self->{item} };	3670	values %{ $self->{item} };
3253		3671
3254	while (my ($k, $v) = each %{ $self->{item} }) {	3672	while (my ($k, $v) = each %{ $self->{item} }) {
3255	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3673	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3256	}	3674	}
…		…
3277	for ($short) {	3695	for ($short) {
3278	s/^\s+//;	3696	s/^\s+//;
3279	s/\s+/ /g;	3697	s/\s+/ /g;
3280	}	3698	}
3281		3699
3282	new CFClient::UI::Label	3700	new CFPlus::UI::Label
3283	markup => $short,	3701	markup => $short,
3284	tooltip => $item->{tooltip},	3702	tooltip => $item->{tooltip},
3285	tooltip_font => $::FONT_PROP,	3703	tooltip_font => $::FONT_PROP,
3286	tooltip_width => 0.67,	3704	tooltip_width => 0.67,
3287	fontsize => $item->{fontsize} || $self->{fontsize},	3705	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3341	count => 1,	3759	count => 1,
3342	%arg,	3760	%arg,
3343	};	3761	};
3344	}	3762	}
3345		3763
		3764	$ROOT->on_refresh (reorder => sub {
3346	$self->reorder;	3765	$self->reorder;
		3766	});
3347	}	3767	}
3348		3768
3349	sub reconfigure {	3769	sub reconfigure {
3350	my ($self) = @_;	3770	my ($self) = @_;
3351		3771
…		…
3364	$self->SUPER::destroy;	3784	$self->SUPER::destroy;
3365	}	3785	}
3366		3786
3367	#############################################################################	3787	#############################################################################
3368		3788
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;	3789	package CFPlus::UI::Root;
3732		3790
3733	our @ISA = CFClient::UI::Container::;	3791	our @ISA = CFPlus::UI::Container::;
3734		3792
3735	use List::Util qw(min max);	3793	use List::Util qw(min max);
3736		3794
3737	use CFClient::OpenGL;	3795	use CFPlus::OpenGL;
3738		3796
3739	sub new {	3797	sub new {
3740	my $class = shift;	3798	my $class = shift;
3741		3799
3742	my $self = $class->SUPER::new (	3800	my $self = $class->SUPER::new (
3743	visible => 1,	3801	visible => 1,
3744	@_,	3802	@_,
3745	);	3803	);
3746		3804
3747	Scalar::Util::weaken ($self->{root} = $self);	3805	CFPlus::weaken ($self->{root} = $self);
3748		3806
3749	$self	3807	$self
3750	}	3808	}
3751		3809
3752	sub size_request {	3810	sub size_request {
…		…
3918	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3976	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919		3977
3920	$w = 0 if $w < 0;	3978	$w = 0 if $w < 0;
3921	$h = 0 if $h < 0;	3979	$h = 0 if $h < 0;
3922		3980
		3981	$w = max $widget->{min_w}, $w;
		3982	$h = max $widget->{min_h}, $h;
		3983
		3984	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3985	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3986
		3987	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3988	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3989
3923	$w = int $w + 0.5;	3990	$w = int $w + 0.5;
3924	$h = int $h + 0.5;	3991	$h = int $h + 0.5;
3925		3992
3926	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3993	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927	$widget->{old_w} = $widget->{w};	3994	$widget->{old_w} = $widget->{w};
…		…
3950	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4017	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3951	glMatrixMode GL_MODELVIEW;	4018	glMatrixMode GL_MODELVIEW;
3952	glLoadIdentity;	4019	glLoadIdentity;
3953		4020
3954	{	4021	{
3955	package CFClient::UI::Base;	4022	package CFPlus::UI::Base;
3956		4023
3957	($draw_x, $draw_y, $draw_w, $draw_h) =	4024	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3958	(0, 0, $self->{w}, $self->{h});	4025	(0, 0, $self->{w}, $self->{h});
3959	}
3960		4026
3961	$self->_draw;	4027	$self->_draw;
		4028	}
3962	}	4029	}
3963		4030
3964	#############################################################################	4031	#############################################################################
3965		4032
3966	package CFClient::UI;	4033	package CFPlus::UI;
3967		4034
3968	$ROOT = new CFClient::UI::Root;	4035	$ROOT = new CFPlus::UI::Root;
3969	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4036	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3970		4037
3971	1	4038	1
3972		4039

Diff Legend

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