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.322 by root, Wed Jul 5 01:53:24 2006 UTC vs.
Revision 1.447 by root, Sat Dec 22 06:50:45 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;
9		7
10	use CFClient;	8	use CFPlus;
		9	use CFPlus::Pod;
11	use CFClient::Texture;	10	use CFPlus::Texture;
12		11
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		13
15	our $LAYOUT;	14	our $LAYOUT;
16	our $ROOT;	15	our $ROOT;
17	our $TOOLTIP;	16	our $TOOLTIP;
18	our $BUTTON_STATE;	17	our $BUTTON_STATE;
19		18
20	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
21		20
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	21	our $TOOLTIP_WATCHER = EV::timer_ns 0, 1/60, sub {
		22	$_[0]->stop;
		23
23	if (!$GRAB) {	24	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
		28	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	29	$TOOLTIP->hide;
28		30
29	$TOOLTIP->{owner} = $widget;	31	$TOOLTIP->{owner} = $widget;
		32	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		33
31	return if $ENV{CFPLUS_DEBUG} & 8;	34	return if $ENV{CFPLUS_DEBUG} & 8;
32		35
33	my $tip = $widget->{tooltip};
34
35	$tip = $tip->($widget) if CODE:: eq ref $tip;
36
37	$TOOLTIP->set_tooltip_from ($widget);	36	$TOOLTIP->set_tooltip_from ($widget);
38	$TOOLTIP->show;	37	$TOOLTIP->show;
39	}	38	}
40		39
41	return;	40	return;
42	}	41	}
43	}	42	}
44	}	43	}
45		44
46	$TOOLTIP->hide;	45	$TOOLTIP->hide;
		46	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
48	});	48	};
49		49
50	sub get_layout {	50	sub get_layout {
51	my $layout;	51	my $layout;
52		52
53	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
79	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	80	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	81	if $FOCUS;
82	}	82	}
83		83
		84	sub check_hover {
		85	my ($widget) = @_;
		86
		87	if ($widget != $HOVER) {
		88	my $hover = $HOVER; $HOVER = $widget;
		89
		90	$hover->update if $hover && $hover->{can_hover};
		91	$HOVER->update if $HOVER && $HOVER->{can_hover};
		92
		93	$TOOLTIP_WATCHER->again;
		94	}
		95	}
		96
84	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	98	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	99	my ($x, $y) = ($ev->{x}, $ev->{y});
87		100
88	if (!$BUTTON_STATE) {	101	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		102
		103	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
90		105
91	$GRAB = $widget;	106	$GRAB = $widget;
92	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
93		108
94	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->invoke;
95	}	110	}
96		111
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	112	if ($GRAB) {
		113	if ($ev->{button} == 4 || $ev->{button} == 5) {
		114	# mousewheel
		115	my $delta = $ev->{button} * 2 - 9;
		116	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		117
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	118	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	119	$ev->{dy} = $shift ? 0 : $delta;
		120
		121	$GRAB->emit (mouse_wheel => $ev);
		122	} else {
		123	$GRAB->emit (button_down => $ev)
		124	}
		125	}
101	}	126	}
102		127
103	sub feed_sdl_button_up_event {	128	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	129	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		130
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	131	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		132
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	133	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		134
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	135	$GRAB->emit (button_up => $ev)
112	if $GRAB;	136	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		137
114	if (!$BUTTON_STATE) {	138	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	139	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	140	$grab->update if $grab;
117	$GRAB->update if $GRAB;	141	$GRAB->update if $GRAB;
118		142
		143	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	144	$TOOLTIP_WATCHER->invoke;
120	}	145	}
121	}	146	}
122		147
123	sub feed_sdl_motion_event {	148	sub feed_sdl_motion_event {
124	my ($ev) = @_;	149	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	150	my ($x, $y) = ($ev->{x}, $ev->{y});
126		151
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	152	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		153
129	if ($widget != $HOVER) {	154	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		155
132	$hover->update if $hover && $hover->{can_hover};	156	$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;	157	if $HOVER;
140	}	158	}
141		159
142	# convert position array to integers	160	# convert position array to integers
143	sub harmonize {	161	sub harmonize {
…		…
193	reconfigure_widgets;	211	reconfigure_widgets;
194	}	212	}
195		213
196	#############################################################################	214	#############################################################################
197		215
		216	package CFPlus::UI::Event;
		217
		218	sub xy {
		219	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		220	}
		221
		222	#############################################################################
		223
198	package CFClient::UI::Base;	224	package CFPlus::UI::Base;
199		225
200	use strict;	226	use strict;
201		227
202	use CFClient::OpenGL;	228	use CFPlus::OpenGL;
203		229
204	sub new {	230	sub new {
205	my $class = shift;	231	my $class = shift;
206		232
207	my $self = bless {	233	my $self = bless {
…		…
212	h => undef,	238	h => undef,
213	can_events => 1,	239	can_events => 1,
214	@_	240	@_
215	}, $class;	241	}, $class;
216		242
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	243	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		244
219	for (keys %$self) {	245	for (keys %$self) {
220	if (/^on_(.*)$/) {	246	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	247	$self->connect ($1 => delete $self->{$_});
222	}	248	}
223	}	249	}
224		250
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	251	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	252	$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};	253	$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};	254	$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};	255	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		256
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	257	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	258	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		259
234	$self->show if $layout->{show};	260	$self->show if $layout->{show};
…		…
239		265
240	sub destroy {	266	sub destroy {
241	my ($self) = @_;	267	my ($self) = @_;
242		268
243	$self->hide;	269	$self->hide;
		270	$self->emit ("destroy");
244	%$self = ();	271	%$self = ();
245	}	272	}
246		273
		274	sub TO_JSON {
		275	{ "\fw" => $_[0]{s_id} }
		276	}
		277
247	sub show {	278	sub show {
248	my ($self) = @_;	279	my ($self) = @_;
249		280
250	return if $self->{parent};	281	return if $self->{parent};
251		282
252	$CFClient::UI::ROOT->add ($self);	283	$CFPlus::UI::ROOT->add ($self);
253	}	284	}
254		285
255	sub set_visible {	286	sub set_visible {
256	my ($self) = @_;	287	my ($self) = @_;
257		288
…		…
278	delete $self->{root};	309	delete $self->{root};
279		310
280	undef $GRAB if $GRAB == $self;	311	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	312	undef $HOVER if $HOVER == $self;
282		313
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	314	$CFPlus::UI::TOOLTIP_WATCHER->invoke
284	if $TOOLTIP->{owner} == $self;	315	if $TOOLTIP->{owner} == $self;
285		316
286	$self->emit ("focus_out");	317	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	318	$self->emit (visibility_change => 0);
288	}	319	}
…		…
290	sub set_visibility {	321	sub set_visibility {
291	my ($self, $visible) = @_;	322	my ($self, $visible) = @_;
292		323
293	return if $self->{visible} == $visible;	324	return if $self->{visible} == $visible;
294		325
295	$visible ? $self->hide	326	$visible ? $self->show
296	: $self->show;	327	: $self->hide;
297	}	328	}
298		329
299	sub toggle_visibility {	330	sub toggle_visibility {
300	my ($self) = @_;	331	my ($self) = @_;
301		332
…		…
330	$self->{force_h} = $h;	361	$self->{force_h} = $h;
331		362
332	$self->realloc;	363	$self->realloc;
333	}	364	}
334		365
		366	# traverse the widget chain up to find the maximum "physical" size constraints
		367	sub get_max_wh {
		368	my ($self) = @_;
		369
		370	return $self->{parent}->get_max_wh
		371	if $self->{parent};
		372
		373	($::WIDTH, $::HEIGHT)
		374	}
		375
335	sub size_request {	376	sub size_request {
336	require Carp;	377	require Carp;
337	Carp::confess "size_request is abstract";	378	Carp::confess "size_request is abstract";
338	}	379	}
339		380
…		…
345	my ($self, $x, $y, $w, $h) = @_;	386	my ($self, $x, $y, $w, $h) = @_;
346		387
347	if ($self->{aspect}) {	388	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	389	my ($ow, $oh) = ($w, $h);
349		390
350	$w = List::Util::min $w, int $h * $self->{aspect};	391	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	392	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		393
353	# use alignment to adjust x, y	394	# use alignment to adjust x, y
354		395
355	$x += int 0.5 * ($ow - $w);	396	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	397	$y += int 0.5 * ($oh - $h);
…		…
397		438
398	return if $self->{tooltip} eq $tooltip;	439	return if $self->{tooltip} eq $tooltip;
399		440
400	$self->{tooltip} = $tooltip;	441	$self->{tooltip} = $tooltip;
401		442
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	443	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	444	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	445	$CFPlus::UI::TOOLTIP_WATCHER->invoke;
405	}	446	}
406	}	447	}
407		448
408	# translate global coordinates to local coordinate system	449	# translate global coordinates to local coordinate system
409	sub coord2local {	450	sub coord2local {
410	my ($self, $x, $y) = @_;	451	my ($self, $x, $y) = @_;
411		452
		453	return (undef, undef) unless $self->{parent};
		454
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	455	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	456	}
414		457
415	# translate local coordinates to global coordinate system	458	# translate local coordinates to global coordinate system
416	sub coord2global {	459	sub coord2global {
417	my ($self, $x, $y) = @_;	460	my ($self, $x, $y) = @_;
418		461
		462	return (undef, undef) unless $self->{parent};
		463
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	464	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	465	}
421		466
422	sub invoke_focus_in {	467	sub invoke_focus_in {
423	my ($self) = @_;	468	my ($self) = @_;
…		…
452		497
453	$FOCUS->emit ("focus_out") if $FOCUS;	498	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	499	$self->emit ("focus_in");
455	}	500	}
456		501
457	sub invoke_mouse_motion { 1 }	502	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	503	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	504	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	505	sub invoke_key_up { 0 }
		506	sub invoke_mouse_wheel { 0 }
461		507
462	sub invoke_button_down {	508	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	509	my ($self, $ev, $x, $y) = @_;
464		510
465	$self->grab_focus;	511	$self->grab_focus;
466		512
467	1	513	0
468	}	514	}
469		515
470	sub connect {	516	sub connect {
471	my ($self, $signal, $cb) = @_;	517	my ($self, $signal, $cb) = @_;
472		518
473	push @{ $self->{signal_cb}{$signal} }, $cb;	519	push @{ $self->{signal_cb}{$signal} }, $cb;
		520
		521	defined wantarray and CFPlus::guard {
		522	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		523	@{ $self->{signal_cb}{$signal} };
		524	}
474	}	525	}
		526
		527	sub disconnect_all {
		528	my ($self, $signal) = @_;
		529
		530	delete $self->{signal_cb}{$signal};
		531	}
		532
		533	my %has_coords = (
		534	button_down => 1,
		535	button_up => 1,
		536	mouse_motion => 1,
		537	mouse_wheel => 1,
		538	);
475		539
476	sub emit {	540	sub emit {
477	my ($self, $signal, @args) = @_;	541	my ($self, $signal, @args) = @_;
478		542
479	#d##TODO# stop propagating at first true, do not use sum	543	# I do not really like this solution, but I do not like duplication
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	544	# and needlessly verbose code, either.
		545	my @append
		546	= $has_coords{$signal}
		547	? $args[0]->xy ($self)
		548	: ();
		549
		550	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		551
		552	for my $cb (
		553	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	554	($self->can ("invoke_$signal") || sub { 1 }), # closure
		555	) {
		556	return $cb->($self, @args, @append) || next;
		557	}
		558
		559	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	560	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	561	}
484		562
485	sub find_widget {	563	#sub find_widget {
486	my ($self, $x, $y) = @_;	564	# in .xs
487
488	return () unless $self->{can_events};
489
490	return $self
491	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494	()
495	}
496		565
497	sub set_parent {	566	sub set_parent {
498	my ($self, $parent) = @_;	567	my ($self, $parent) = @_;
499		568
500	Scalar::Util::weaken ($self->{parent} = $parent);	569	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	570	$self->set_visible if $parent->{visible};
502	}	571	}
503		572
504	sub realloc {	573	sub realloc {
505	my ($self) = @_;	574	my ($self) = @_;
…		…
531		600
532	# using global variables seems a bit hacky, but passing through all drawing	601	# using global variables seems a bit hacky, but passing through all drawing
533	# functions seems pointless.	602	# functions seems pointless.
534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	603	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535		604
536	sub draw {	605	#sub draw {
537	my ($self) = @_;	606	#CFPlus.xs
538
539	return unless $self->{h} && $self->{w};
540
541	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};
544
545	# skip widgets that are entirely outside the drawing area
546	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
548
549	glPushMatrix;
550	glTranslate $self->{x}, $self->{y}, 0;
551
552	if ($self == $HOVER && $self->{can_hover}) {
553	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
554	glEnable GL_BLEND;
555	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
556	glBegin GL_QUADS;
557	glVertex 0 , 0;
558	glVertex $self->{w}, 0;
559	glVertex $self->{w}, $self->{h};
560	glVertex 0 , $self->{h};
561	glEnd;
562	glDisable GL_BLEND;
563	}
564
565	if ($ENV{CFPLUS_DEBUG} & 1) {
566	glPushMatrix;
567	glColor 1, 1, 0, 1;
568	glTranslate 0.375, 0.375;
569	glBegin GL_LINE_LOOP;
570	glVertex 0 , 0;
571	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;
574	glEnd;
575	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}
578
579	$self->_draw;
580	glPopMatrix;
581	}
582		607
583	sub _draw {	608	sub _draw {
584	my ($self) = @_;	609	my ($self) = @_;
585		610
586	warn "no draw defined for $self\n";	611	warn "no draw defined for $self\n";
587	}	612	}
588		613
589	sub DESTROY {	614	sub DESTROY {
590	my ($self) = @_;	615	my ($self) = @_;
591		616
592	delete $WIDGET{$self+0};	617	return if CFPlus::in_destruct;
593		618
		619	local $@;
594	eval { $self->destroy };	620	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	621	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		622
		623	delete $WIDGET{$self+0};
596	}	624	}
597		625
598	#############################################################################	626	#############################################################################
599		627
600	package CFClient::UI::DrawBG;	628	package CFPlus::UI::DrawBG;
601		629
602	our @ISA = CFClient::UI::Base::;	630	our @ISA = CFPlus::UI::Base::;
603		631
604	use strict;	632	use strict;
605	use CFClient::OpenGL;	633	use CFPlus::OpenGL;
606		634
607	sub new {	635	sub new {
608	my $class = shift;	636	my $class = shift;
609
610	# range [value, low, high, page]
611		637
612	$class->SUPER::new (	638	$class->SUPER::new (
613	#bg => [0, 0, 0, 0.2],	639	#bg => [0, 0, 0, 0.2],
614	#active_bg => [1, 1, 1, 0.5],	640	#active_bg => [1, 1, 1, 0.5],
615	@_	641	@_
…		…
627	my ($w, $h) = @$self{qw(w h)};	653	my ($w, $h) = @$self{qw(w h)};
628		654
629	glEnable GL_BLEND;	655	glEnable GL_BLEND;
630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	656	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
631	glColor_premultiply @$color;	657	glColor_premultiply @$color;
632
633	glBegin GL_QUADS;
634	glVertex 0 , 0;
635	glVertex 0 , $h;
636	glVertex $w, $h;	658	glRect 0, 0, $w, $h;
637	glVertex $w, 0;
638	glEnd;
639
640	glDisable GL_BLEND;	659	glDisable GL_BLEND;
641	}	660	}
642	}	661	}
643		662
644	#############################################################################	663	#############################################################################
645		664
646	package CFClient::UI::Empty;	665	package CFPlus::UI::Empty;
647		666
648	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
649		668
650	sub new {	669	sub new {
651	my ($class, %arg) = @_;	670	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	671	$class->SUPER::new (can_events => 0, %arg);
653	}	672	}
…		…
660		679
661	sub draw { }	680	sub draw { }
662		681
663	#############################################################################	682	#############################################################################
664		683
665	package CFClient::UI::Container;	684	package CFPlus::UI::Container;
666		685
667	our @ISA = CFClient::UI::Base::;	686	our @ISA = CFPlus::UI::Base::;
668		687
669	sub new {	688	sub new {
670	my ($class, %arg) = @_;	689	my ($class, %arg) = @_;
671		690
672	my $children = delete $arg{children};	691	my $children = delete $arg{children};
…		…
676	can_events => 0,	695	can_events => 0,
677	%arg,	696	%arg,
678	);	697	);
679		698
680	$self->add (@$children)	699	$self->add (@$children)
681	if $children;	700	if $children && @$children;
682		701
683	$self	702	$self
		703	}
		704
		705	sub realloc {
		706	my ($self) = @_;
		707
		708	$self->{force_realloc} = 1;
		709	$self->{force_size_alloc} = 1;
		710	$self->SUPER::realloc;
684	}	711	}
685		712
686	sub add {	713	sub add {
687	my ($self, @widgets) = @_;	714	my ($self, @widgets) = @_;
688		715
689	$_->set_parent ($self)	716	$_->set_parent ($self)
690	for @widgets;	717	for @widgets;
691		718
		719	# TODO: only do this in widgets that need it, e.g. root, fixed
692	use sort 'stable';	720	use sort 'stable';
693		721
694	$self->{children} = [	722	$self->{children} = [
695	sort { $a->{z} <=> $b->{z} }	723	sort { $a->{z} <=> $b->{z} }
696	@{$self->{children}}, @widgets	724	@{$self->{children}}, @widgets
697	];	725	];
698		726
699	$self->realloc;	727	$self->realloc;
		728
		729	$self->emit (c_add => \@widgets);
		730
		731	map $_+0, @widgets
700	}	732	}
701		733
702	sub children {	734	sub children {
703	@{ $_[0]{children} }	735	@{ $_[0]{children} }
704	}	736	}
705		737
706	sub remove {	738	sub remove {
707	my ($self, $child) = @_;	739	my ($self, @widgets) = @_;
708		740
		741	$self->emit (c_remove => \@widgets);
		742
		743	for my $child (@widgets) {
709	delete $child->{parent};	744	delete $child->{parent};
710	$child->hide;	745	$child->hide;
711
712	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	746	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		747	}
713		748
714	$self->realloc;	749	$self->realloc;
715	}	750	}
716		751
717	sub clear {	752	sub clear {
718	my ($self) = @_;	753	my ($self) = @_;
719		754
720	my $children = delete $self->{children};	755	my $children = $self->{children};
721	$self->{children} = [];	756	$self->{children} = [];
722		757
723	for (@$children) {	758	for (@$children) {
724	delete $_->{parent};	759	delete $_->{parent};
725	$_->hide;	760	$_->hide;
…		…
745	}	780	}
746		781
747	sub _draw {	782	sub _draw {
748	my ($self) = @_;	783	my ($self) = @_;
749		784
750	$_->draw for @{$self->{children}};	785	$_->draw for $self->visible_children;
751	}	786	}
752		787
753	#############################################################################	788	#############################################################################
754		789
755	package CFClient::UI::Bin;	790	package CFPlus::UI::Bin;
756		791
757	our @ISA = CFClient::UI::Container::;	792	our @ISA = CFPlus::UI::Container::;
758		793
759	sub new {	794	sub new {
760	my ($class, %arg) = @_;	795	my ($class, %arg) = @_;
761		796
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	797	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		798
764	$class->SUPER::new (children => [$child], %arg)	799	$class->SUPER::new (children => [$child], %arg)
765	}	800	}
766		801
767	sub add {	802	sub add {
768	my ($self, $child) = @_;	803	my ($self, $child) = @_;
769		804
770	$self->SUPER::remove ($_) for @{ $self->{children} };	805	$self->clear;
771	$self->SUPER::add ($child);	806	$self->SUPER::add ($child);
772	}	807	}
773		808
774	sub remove {	809	sub remove {
775	my ($self, $widget) = @_;	810	my ($self, $widget) = @_;
776		811
777	$self->SUPER::remove ($widget);	812	$self->SUPER::remove ($widget);
778		813
779	$self->{children} = [new CFClient::UI::Empty]	814	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	815	unless @{$self->{children}};
781	}	816	}
782		817
783	sub child { $_[0]->{children}[0] }	818	sub child { $_[0]->{children}[0] }
784		819
…		…
793		828
794	1	829	1
795	}	830	}
796		831
797	#############################################################################	832	#############################################################################
798
799	# back-buffered drawing area	833	# back-buffered drawing area
800		834
801	package CFClient::UI::Window;	835	package CFPlus::UI::Window;
802		836
803	our @ISA = CFClient::UI::Bin::;	837	our @ISA = CFPlus::UI::Bin::;
804		838
805	use CFClient::OpenGL;	839	use CFPlus::OpenGL;
806		840
807	sub new {	841	sub new {
808	my ($class, %arg) = @_;	842	my ($class, %arg) = @_;
809		843
810	my $self = $class->SUPER::new (%arg);	844	my $self = $class->SUPER::new (%arg);
…		…
832	}	866	}
833		867
834	sub render_child {	868	sub render_child {
835	my ($self) = @_;	869	my ($self) = @_;
836		870
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	871	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	872	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	873	glClear GL_COLOR_BUFFER_BIT;
840		874
841	{	875	{
842	package CFClient::UI::Base;	876	package CFPlus::UI::Base;
843		877
844	($draw_x, $draw_y, $draw_w, $draw_h) =	878	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	879	(0, 0, $self->{w}, $self->{h});
		880
		881	$self->_render;
846	}	882	}
847
848	$self->_render;
849	};	883	};
850	}	884	}
851		885
852	sub _draw {	886	sub _draw {
853	my ($self) = @_;	887	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		888
857	my $tex = $self->{texture}	889	my $tex = $self->{texture}
858	or return;	890	or return;
859		891
860	glEnable GL_TEXTURE_2D;	892	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	894	glColor 0, 0, 0, 1;
863		895
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	896	$tex->draw_quad_alpha_premultiplied (0, 0);
865		897
866	glDisable GL_TEXTURE_2D;	898	glDisable GL_TEXTURE_2D;
867	}	899	}
868		900
869	#############################################################################	901	#############################################################################
870		902
871	package CFClient::UI::ViewPort;	903	package CFPlus::UI::ViewPort;
872		904
		905	use List::Util qw(min max);
		906
873	our @ISA = CFClient::UI::Window::;	907	our @ISA = CFPlus::UI::Window::;
874		908
875	sub new {	909	sub new {
876	my $class = shift;	910	my $class = shift;
877		911
878	$class->SUPER::new (	912	$class->SUPER::new (
…		…
885	sub size_request {	919	sub size_request {
886	my ($self) = @_;	920	my ($self) = @_;
887		921
888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	922	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889		923
890	$w = 10 if $self->{scroll_x};	924	$w = 1 if $self->{scroll_x};
891	$h = 10 if $self->{scroll_y};	925	$h = 1 if $self->{scroll_y};
892		926
893	($w, $h)	927	($w, $h)
894	}	928	}
895		929
896	sub invoke_size_allocate {	930	sub invoke_size_allocate {
…		…
908	}	942	}
909		943
910	sub set_offset {	944	sub set_offset {
911	my ($self, $x, $y) = @_;	945	my ($self, $x, $y) = @_;
912		946
		947	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		948	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		949
		950	if ($x != $self->{view_x} or $y != $self->{view_y}) {
913	$self->{view_x} = int $x;	951	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	952	$self->{view_y} = $y;
915		953
		954	$self->emit (changed => $x, $y);
916	$self->update;	955	$self->update;
		956	}
		957	}
		958
		959	sub set_center {
		960	my ($self, $x, $y) = @_;
		961
		962	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		963	}
		964
		965	sub make_visible {
		966	my ($self, $x, $y, $border) = @_;
		967
		968	if ( $x < $self->{view_x} + $self->{w} * $border
		969	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		970	|| $y < $self->{view_y} + $self->{h} * $border
		971	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		972	) {
		973	$self->set_center ($x, $y);
		974	}
917	}	975	}
918		976
919	# hmm, this does not work for topleft of $self... but we should not ask for that	977	# hmm, this does not work for topleft of $self... but we should not ask for that
920	sub coord2local {	978	sub coord2local {
921	my ($self, $x, $y) = @_;	979	my ($self, $x, $y) = @_;
…		…
936	my ($self, $x, $y) = @_;	994	my ($self, $x, $y) = @_;
937		995
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	998	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1000	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1001	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1002	}
945	}	1003	}
946		1004
947	sub _render {	1005	sub _render {
948	my ($self) = @_;	1006	my ($self) = @_;
949		1007
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1008	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1009	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1010
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1011	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1012
955	$self->SUPER::_render;	1013	$self->SUPER::_render;
956	}	1014	}
957		1015
958	#############################################################################	1016	#############################################################################
959		1017
960	package CFClient::UI::ScrolledWindow;	1018	package CFPlus::UI::ScrolledWindow;
961		1019
962	our @ISA = CFClient::UI::HBox::;	1020	our @ISA = CFPlus::UI::Table::;
963		1021
964	sub new {	1022	sub new {
965	my ($class, %arg) = @_;	1023	my ($class, %arg) = @_;
966		1024
967	my $child = delete $arg{child};	1025	my $child = delete $arg{child};
968		1026
969	my $self;	1027	my $self;
970		1028
971	my $slider = new CFClient::UI::Slider	1029	my $hslider = new CFPlus::UI::Slider
		1030	c_col => 0,
		1031	c_row => 1,
		1032	vertical => 0,
		1033	range => [0, 0, 1, 0.01], # HACK fix
		1034	on_changed => sub {
		1035	$self->{hpos} = $_[1];
		1036	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1037	},
		1038	;
		1039
		1040	my $vslider = new CFPlus::UI::Slider
		1041	c_col => 1,
		1042	c_row => 0,
972	vertical => 1,	1043	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1044	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1045	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1046	$self->{vpos} = $_[1];
		1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1048	},
977	;	1049	;
978		1050
979	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1052	scroll_x => 0,
		1053	scroll_y => 1,
		1054	can_events => 1,
981	slider => $slider,	1055	hslider => $hslider,
		1056	vslider => $vslider,
		1057	col_expand => [1, 0],
		1058	row_expand => [1, 0],
982	%arg,	1059	%arg,
983	);	1060	);
984		1061
		1062	$self->{vp} = new CFPlus::UI::ViewPort
		1063	c_col => 0,
		1064	c_row => 0,
		1065	expand => 1,
		1066	scroll_x => $self->{scroll_x},
		1067	scroll_y => $self->{scroll_y},
		1068	on_changed => sub {
		1069	my ($vp, $x, $y) = @_;
		1070
		1071	$vp->{parent}{hslider}->set_value ($x);
		1072	$vp->{parent}{vslider}->set_value ($y);
		1073
		1074	0
		1075	},
		1076	on_size_allocate => sub {
		1077	my ($vp, $w, $h) = @_;
		1078	$vp->{parent}->update_slider;
		1079	0
		1080	},
		1081	;
		1082
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1083	$self->SUPER::add ($self->{vp});
		1084
986	$self->add ($child) if $child;	1085	$self->add ($child) if $child;
987		1086
988	$self	1087	$self
989	}	1088	}
990
991	#TODO# update range on size_allocate depending on child
992		1089
993	sub add {	1090	sub add {
994	my ($self, $widget) = @_;	1091	my ($self, $widget) = @_;
995		1092
996	$self->{vp}->add ($self->{child} = $widget);	1093	$self->{vp}->add ($self->{child} = $widget);
997	}	1094	}
998		1095
		1096	sub set_offset { shift->{vp}->set_offset (@_) }
		1097	sub set_center { shift->{vp}->set_center (@_) }
		1098	sub make_visible { shift->{vp}->make_visible (@_) }
		1099
999	sub update_slider {	1100	sub update_slider {
1000	my ($self) = @_;	1101	my ($self) = @_;
1001		1102
		1103	my $child = ($self->{vp} or return)->child;
		1104
		1105	if ($self->{scroll_x}) {
		1106	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1107	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003	}
1004		1108
1005	sub update {	1109	my $visible = $w1 > $w2;
		1110	if ($visible != $self->{hslider_visible}) {
		1111	$self->{hslider_visible} = $visible;
		1112	$visible ? $self->SUPER::add ($self->{hslider})
		1113	: $self->SUPER::remove ($self->{hslider});
		1114	}
		1115	}
		1116
		1117	if ($self->{scroll_y}) {
		1118	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1119	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1120
		1121	my $visible = $h1 > $h2;
		1122	if ($visible != $self->{vslider_visible}) {
		1123	$self->{vslider_visible} = $visible;
		1124	$visible ? $self->SUPER::add ($self->{vslider})
		1125	: $self->SUPER::remove ($self->{vslider});
		1126	}
		1127	}
		1128	}
		1129
		1130	sub start_dragging {
1006	my ($self) = @_;	1131	my ($self, $ev) = @_;
1007		1132
1008	$self->SUPER::update;	1133	$self->grab_focus;
1009		1134
1010	$self->update_slider;	1135	my $ox = $self->{vp}{view_x};
		1136	my $oy = $self->{vp}{view_y};
		1137
		1138	$self->{motion} = sub {
		1139	my ($ev, $x, $y) = @_;
		1140
		1141	$ox -= $ev->{xrel};
		1142	$oy -= $ev->{yrel};
		1143
		1144	$self->{vp}->set_offset ($ox, $oy);
		1145	};
		1146	}
		1147
		1148	sub invoke_mouse_wheel {
		1149	my ($self, $ev) = @_;
		1150
		1151	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1152	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1153
		1154	1
		1155	}
		1156
		1157	sub invoke_button_down {
		1158	my ($self, $ev, $x, $y) = @_;
		1159
		1160	if ($ev->{button} == 2) {
		1161	$self->start_dragging ($ev);
		1162	return 1;
		1163	}
		1164
		1165	0
		1166	}
		1167
		1168	sub invoke_button_up {
		1169	my ($self, $ev, $x, $y) = @_;
		1170
		1171	if (delete $self->{motion}) {
		1172	return 1;
		1173	}
		1174
		1175	0
		1176	}
		1177
		1178	sub invoke_mouse_motion {
		1179	my ($self, $ev, $x, $y) = @_;
		1180
		1181	if ($self->{motion}) {
		1182	$self->{motion}->($ev, $x, $y);
		1183	return 1;
		1184	}
		1185
		1186	0
1011	}	1187	}
1012		1188
1013	sub invoke_size_allocate {	1189	sub invoke_size_allocate {
1014	my ($self, $w, $h) = @_;	1190	my ($self, $w, $h) = @_;
1015		1191
1016	$self->update_slider;	1192	$self->update_slider;
1017
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1193	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1194	}
1020		1195
1021	#############################################################################	1196	#############################################################################
1022		1197
1023	package CFClient::UI::Frame;	1198	package CFPlus::UI::Frame;
1024		1199
1025	our @ISA = CFClient::UI::Bin::;	1200	our @ISA = CFPlus::UI::Bin::;
1026		1201
1027	use CFClient::OpenGL;	1202	use CFPlus::OpenGL;
1028		1203
1029	sub new {	1204	sub new {
1030	my $class = shift;	1205	my $class = shift;
1031		1206
1032	$class->SUPER::new (	1207	$class->SUPER::new (
…		…
1042	my ($w, $h) = @$self{qw(w h)};	1217	my ($w, $h) = @$self{qw(w h)};
1043		1218
1044	glEnable GL_BLEND;	1219	glEnable GL_BLEND;
1045	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1220	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1046	glColor_premultiply @{ $self->{bg} };	1221	glColor_premultiply @{ $self->{bg} };
1047
1048	glBegin GL_QUADS;
1049	glVertex 0 , 0;
1050	glVertex 0 , $h;
1051	glVertex $w, $h;	1222	glRect 0, 0, $w, $h;
1052	glVertex $w, 0;
1053	glEnd;
1054
1055	glDisable GL_BLEND;	1223	glDisable GL_BLEND;
1056	}	1224	}
1057		1225
1058	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1059	}	1227	}
1060		1228
1061	#############################################################################	1229	#############################################################################
1062		1230
1063	package CFClient::UI::FancyFrame;	1231	package CFPlus::UI::FancyFrame;
1064		1232
1065	our @ISA = CFClient::UI::Bin::;	1233	our @ISA = CFPlus::UI::Bin::;
1066		1234
1067	use CFClient::OpenGL;	1235	use CFPlus::OpenGL;
		1236
		1237	sub new {
		1238	my ($class, %arg) = @_;
		1239
		1240	if ((exists $arg{label}) && !ref $arg{label}) {
		1241	$arg{label} = new CFPlus::UI::Label
		1242	align => 1,
		1243	valign => 0,
		1244	text => $arg{label},
		1245	fontsize => ($arg{border} || 0.8) * 0.75;
		1246	}
		1247
		1248	my $self = $class->SUPER::new (
		1249	# label => "",
		1250	fg => [0.6, 0.3, 0.1],
		1251	border => 0.8,
		1252	style => 'single',
		1253	%arg,
		1254	);
		1255
		1256	$self
		1257	}
		1258
		1259	sub add {
		1260	my ($self, @widgets) = @_;
		1261
		1262	$self->SUPER::add (@widgets);
		1263	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1264	}
		1265
		1266	sub border {
		1267	int $_[0]{border} * $::FONTSIZE
		1268	}
		1269
		1270	sub size_request {
		1271	my ($self) = @_;
		1272
		1273	($self->{label_w}, undef) = $self->{label}->size_request
		1274	if $self->{label};
		1275
		1276	my ($w, $h) = $self->SUPER::size_request;
		1277
		1278	(
		1279	$w + $self->border * 2,
		1280	$h + $self->border * 2,
		1281	)
		1282	}
		1283
		1284	sub invoke_size_allocate {
		1285	my ($self, $w, $h) = @_;
		1286
		1287	my $border = $self->border;
		1288
		1289	$w -= List::Util::max 0, $border * 2;
		1290	$h -= List::Util::max 0, $border * 2;
		1291
		1292	if (my $label = $self->{label}) {
		1293	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1294	$label->{h} = List::Util::min $h, $border;
		1295	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1296	}
		1297
		1298	$self->child->configure ($border, $border, $w, $h);
		1299
		1300	1
		1301	}
		1302
		1303	sub _draw {
		1304	my ($self) = @_;
		1305
		1306	my $child = $self->{children}[0];
		1307
		1308	my $border = $self->border;
		1309	my ($w, $h) = ($self->{w}, $self->{h});
		1310
		1311	$child->draw;
		1312
		1313	glColor @{$self->{fg}};
		1314	glBegin GL_LINE_STRIP;
		1315	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1316	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1317	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1318	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1319	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1320	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1321	glEnd;
		1322
		1323	if ($self->{label}) {
		1324	glTranslate $border * 2, 0;
		1325	$self->{label}->_draw;
		1326	}
		1327	}
		1328
		1329	#############################################################################
		1330
		1331	package CFPlus::UI::Toplevel;
		1332
		1333	our @ISA = CFPlus::UI::Bin::;
		1334
		1335	use CFPlus::OpenGL;
1068		1336
1069	my $bg =	1337	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1338	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1339	mipmap => 1, wrap => 1;
1072		1340
1073	my @border =	1341	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1342	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1343	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1344
		1345	my @icon =
		1346	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1347	qw(x1_move.png x1_resize.png);
1076		1348
1077	sub new {	1349	sub new {
1078	my ($class, %arg) = @_;	1350	my ($class, %arg) = @_;
1079		1351
1080	my $self = $class->SUPER::new (	1352	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1353	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1354	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1355	border => 0.6,
1084	can_events => 1,	1356	can_events => 1,
1085	min_w => 16,	1357	min_w => 64,
1086	min_h => 16,	1358	min_h => 32,
1087	%arg,	1359	%arg,
1088	);	1360	);
1089		1361
1090	$self->{title_widget} = new CFClient::UI::Label	1362	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1363	align => 0,
1092	valign => 1,	1364	valign => 1,
1093	text => $self->{title},	1365	text => $self->{title},
1094	fontsize => $self->{border},	1366	fontsize => $self->{border},
1095	if exists $self->{title};	1367	if exists $self->{title};
1096		1368
1097	if ($self->{has_close_button}) {	1369	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1370	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1371	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1372	path => 'x1_close.png',
1101	on_activate => sub { $self->emit ("delete") };	1373	on_activate => sub { $self->emit ("delete") };
1102		1374
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1375	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1376	}
1105		1377
1106	$self	1378	$self
1107	}	1379	}
1108		1380
1109	sub add {	1381	sub add {
1110	my ($self, @widgets) = @_;	1382	my ($self, @widgets) = @_;
1111		1383
1112	$self->SUPER::add (@widgets);	1384	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1385	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1386	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1387	}
1116		1388
1117	sub border {	1389	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1390	int $_[0]{border} * $::FONTSIZE
		1391	}
		1392
		1393	sub get_max_wh {
		1394	my ($self) = @_;
		1395
		1396	return ($self->{w}, $self->{h})
		1397	if $self->{visible} && $self->{w};
		1398
		1399	$self->SUPER::get_max_wh
1119	}	1400	}
1120		1401
1121	sub size_request {	1402	sub size_request {
1122	my ($self) = @_;	1403	my ($self) = @_;
1123		1404
…		…
1227	$self->{motion}->($ev, $x, $y) if $self->{motion};	1508	$self->{motion}->($ev, $x, $y) if $self->{motion};
1228		1509
1229	! ! $self->{motion}	1510	! ! $self->{motion}
1230	}	1511	}
1231		1512
		1513	sub invoke_visibility_change {
		1514	my ($self, $visible) = @_;
		1515
		1516	delete $self->{motion} unless $visible;
		1517
		1518	0
		1519	}
		1520
1232	sub _draw {	1521	sub _draw {
1233	my ($self) = @_;	1522	my ($self) = @_;
1234		1523
1235	my $child = $self->{children}[0];	1524	my $child = $self->{children}[0];
1236		1525
…		…
1241	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1242		1531
1243	my $border = $self->border;	1532	my $border = $self->border;
1244		1533
1245	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1246	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1247	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1248	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1249	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1538	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1539
		1540	# move
		1541	my $w2 = ($w - $border) * .5;
		1542	my $h2 = ($h - $border) * .5;
		1543	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1545	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1546
		1547	# resize
		1548	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1549	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1550	unless $self->{has_close_button};
		1551	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1250		1553
1251	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1252	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1253		1556
1254	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1273	if $self->{close_button};	1576	if $self->{close_button};
1274	}	1577	}
1275		1578
1276	#############################################################################	1579	#############################################################################
1277		1580
1278	package CFClient::UI::Table;	1581	package CFPlus::UI::Table;
1279		1582
1280	our @ISA = CFClient::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1281		1584
1282	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1283		1586
1284	use CFClient::OpenGL;	1587	use CFPlus::OpenGL;
1285		1588
1286	sub new {	1589	sub new {
1287	my $class = shift;	1590	my $class = shift;
1288		1591
1289	$class->SUPER::new (	1592	$class->SUPER::new (
1290	col_expand => [],	1593	col_expand => [],
		1594	row_expand => [],
1291	@_,	1595	@_,
1292	)	1596	)
1293	}	1597	}
1294		1598
1295	sub children {
1296	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297	}
1298
1299	sub add {	1599	sub add {
1300	my ($self, $x, $y, $child) = @_;	1600	my ($self, @widgets) = @_;
1301		1601
1302	$child->set_parent ($self);	1602	for my $child (@widgets) {
1303	$self->{children}[$y][$x] = $child;	1603	$child->{c_rowspan} ||= 1;
		1604	$child->{c_colspan} ||= 1;
		1605	}
1304		1606
1305	$self->realloc;	1607	$self->SUPER::add (@widgets);
1306	}	1608	}
1307		1609
1308	sub remove {	1610	sub add_at {
		1611	my $self = shift;
		1612
		1613	my @widgets;
		1614
		1615	while (@_) {
		1616	my ($col, $row, $child) = splice @_, 0, 3, ();
		1617
		1618	$child->{c_row} = $row;
		1619	$child->{c_col} = $col;
		1620
		1621	push @widgets, $child;
		1622	}
		1623
		1624	$self->add (@widgets);
		1625	}
		1626
		1627	sub get_wh {
1309	my ($self, $child) = @_;	1628	my ($self) = @_;
1310		1629
1311	# TODO: not yet implemented	1630	my (@w, @h);
1312	}
1313
1314	# TODO: move to container class maybe? send children a signal on removal?
1315	sub clear {
1316	my ($self) = @_;
1317		1631
1318	my @children = $self->children;	1632	my @children = $self->children;
1319	delete $self->{children};	1633
		1634	# first pass, columns
		1635	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1636	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1637
		1638	my $sw = sum @w[$c .. $c + $cs - 1];
		1639
		1640	if ($w > $sw) {
		1641	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1642	}
1320		1643	}
1321	for (@children) {
1322	delete $_->{parent};
1323	$_->hide;
1324	}
1325		1644
1326	$self->realloc;	1645	# second pass, rows
1327	}	1646	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1328
1329	sub get_wh {
1330	my ($self) = @_;
1331
1332	my (@w, @h);
1333
1334	for my $y (0 .. $#{$self->{children}}) {
1335	my $row = $self->{children}[$y]
1336	or next;
1337
1338	for my $x (0 .. $#$row) {
1339	my $widget = $row->[$x]
1340	or next;
1341	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1342		1648
1343	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1344	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1345	}	1653	}
1346	}	1654	}
1347		1655
1348	(\@w, \@h)	1656	(\@w, \@h)
1349	}	1657	}
…		…
1365	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1366		1674
1367	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1368	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1369		1677
1370	# TODO: nicer code && do row_expand	1678	# now linearly scale the rows/columns to the allocated size
1371	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1372	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1373	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1374		1682
1375	# linearly scale sizes
1376	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378		1684
1379	CFClient::UI::harmonize $ws;	1685	CFPlus::UI::harmonize $ws;
		1686
		1687	my @row_expand = @{$self->{row_expand}};
		1688	@row_expand = (1) x @$ws unless @row_expand;
		1689	my $row_expand = (sum @row_expand) || 1;
		1690
		1691	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1692
1380	CFClient::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1381		1694
1382	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1383		1697
1384	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1385	my $row = $self->{children}[$r]	1699	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1386	or next;
1387		1700
1388	my $x = 0;	1701	$widget->configure (
1389	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1390		1704	);
1391	for my $c (0 .. $#$row) {	1705	}
1392	my $col_w = $ws->[$c];
1393		1706
1394	if (my $widget = $row->[$c]) {	1707	1
1395	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1396	}
1397		1709
1398	$x += $col_w;	1710	#############################################################################
		1711
		1712	package CFPlus::UI::Fixed;
		1713
		1714	use List::Util qw(min max);
		1715
		1716	our @ISA = CFPlus::UI::Container::;
		1717
		1718	sub _scale($$$) {
		1719	my ($rel, $val, $max) = @_;
		1720
		1721	$rel ? $val * $max : $val
		1722	}
		1723
		1724	sub size_request {
		1725	my ($self) = @_;
		1726
		1727	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1728
		1729	# determine overall size by querying abs widgets
		1730	for my $child ($self->visible_children) {
		1731	unless ($child->{c_rel}) {
		1732	my $x = $child->{c_x};
		1733	my $y = $child->{c_y};
		1734
		1735	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1736	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1399	}	1737	}
		1738	}
1400		1739
1401	$y += $row_h;	1740	my $W = $x2 - $x1;
		1741	my $H = $y2 - $y1;
		1742
		1743	# now layout remaining widgets
		1744	for my $child ($self->visible_children) {
		1745	if ($child->{c_rel}) {
		1746	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1747	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1751	}
		1752	}
		1753
		1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
		1756
		1757	($W, $H)
		1758	}
		1759
		1760	sub invoke_size_allocate {
		1761	my ($self, $W, $H) = @_;
		1762
		1763	for my $child ($self->visible_children) {
		1764	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1765	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1766
		1767	$x += $child->{c_halign} * $child->{req_w};
		1768	$y += $child->{c_valign} * $child->{req_h};
		1769
		1770	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1402	}	1771	}
1403		1772
1404	1	1773	1
1405	}	1774	}
1406		1775
1407	sub find_widget {
1408	my ($self, $x, $y) = @_;
1409
1410	$x -= $self->{x};
1411	$y -= $self->{y};
1412
1413	my $res;
1414
1415	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1416	$res = $_->find_widget ($x, $y)
1417	and return $res;
1418	}
1419
1420	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1421	}
1422
1423	sub _draw {
1424	my ($self) = @_;
1425
1426	for (grep $_, @{$self->{children}}) {
1427	$_->draw for grep $_, @$_;
1428	}
1429	}
1430
1431	#############################################################################	1776	#############################################################################
1432		1777
1433	package CFClient::UI::Box;	1778	package CFPlus::UI::Box;
1434		1779
1435	our @ISA = CFClient::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1436		1781
1437	sub size_request {	1782	sub size_request {
1438	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1439		1786
1440	$self->{vertical}	1787	$self->{vertical}
1441	? (	1788	? (
1442	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1443	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1444	)	1791	)
1445	: (	1792	: (
1446	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1447	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1448	)	1795	)
1449	}	1796	}
1450		1797
1451	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1452	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
…		…
1473	$req[$_] += $space * $children[$_]{expand}	1820	$req[$_] += $space * $children[$_]{expand}
1474	for 0 .. $#children;	1821	for 0 .. $#children;
1475	}	1822	}
1476	}	1823	}
1477		1824
1478	CFClient::UI::harmonize \@req;	1825	CFPlus::UI::harmonize \@req;
1479		1826
1480	my $pos = 0;	1827	my $pos = 0;
1481	for (0 .. $#children) {	1828	for (0 .. $#children) {
1482	my $alloc = $req[$_];	1829	my $alloc = $req[$_];
1483	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1830	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1488	1	1835	1
1489	}	1836	}
1490		1837
1491	#############################################################################	1838	#############################################################################
1492		1839
1493	package CFClient::UI::HBox;	1840	package CFPlus::UI::HBox;
1494		1841
1495	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1496		1843
1497	sub new {	1844	sub new {
1498	my $class = shift;	1845	my $class = shift;
1499		1846
1500	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1503	)	1850	)
1504	}	1851	}
1505		1852
1506	#############################################################################	1853	#############################################################################
1507		1854
1508	package CFClient::UI::VBox;	1855	package CFPlus::UI::VBox;
1509		1856
1510	our @ISA = CFClient::UI::Box::;	1857	our @ISA = CFPlus::UI::Box::;
1511		1858
1512	sub new {	1859	sub new {
1513	my $class = shift;	1860	my $class = shift;
1514		1861
1515	$class->SUPER::new (	1862	$class->SUPER::new (
…		…
1518	)	1865	)
1519	}	1866	}
1520		1867
1521	#############################################################################	1868	#############################################################################
1522		1869
1523	package CFClient::UI::Label;	1870	package CFPlus::UI::Label;
1524		1871
1525	our @ISA = CFClient::UI::DrawBG::;	1872	our @ISA = CFPlus::UI::DrawBG::;
1526		1873
1527	use CFClient::OpenGL;	1874	use CFPlus::OpenGL;
1528		1875
1529	sub new {	1876	sub new {
1530	my ($class, %arg) = @_;	1877	my ($class, %arg) = @_;
1531		1878
1532	my $self = $class->SUPER::new (	1879	my $self = $class->SUPER::new (
…		…
1535	#active_bg => none	1882	#active_bg => none
1536	#font => default_font	1883	#font => default_font
1537	#text => initial text	1884	#text => initial text
1538	#markup => initial narkup	1885	#markup => initial narkup
1539	#max_w => maximum pixel width	1886	#max_w => maximum pixel width
		1887	#style => 0, # render flags
1540	ellipsise => 3, # end	1888	ellipsise => 3, # end
1541	layout => (new CFClient::Layout 2),	1889	layout => (new CFPlus::Layout),
1542	fontsize => 1,	1890	fontsize => 1,
1543	align => -1,	1891	align => -1,
1544	valign => -1,	1892	valign => -1,
1545	padding_x => 2,	1893	padding_x => 2,
1546	padding_y => 2,	1894	padding_y => 2,
1547	can_events => 0,	1895	can_events => 0,
1548	%arg	1896	%arg
1549	);	1897	);
1550		1898
1551	if (exists $self->{template}) {	1899	if (exists $self->{template}) {
1552	my $layout = new CFClient::Layout 2;	1900	my $layout = new CFPlus::Layout;
1553	$layout->set_text (delete $self->{template});	1901	$layout->set_text (delete $self->{template});
1554	$self->{template} = $layout;	1902	$self->{template} = $layout;
1555	}	1903	}
1556		1904
1557	if (exists $self->{markup}) {	1905	if (exists $self->{markup}) {
…		…
1561	}	1909	}
1562		1910
1563	$self	1911	$self
1564	}	1912	}
1565		1913
1566	sub escape($) {
1567	local $_ = $_[0];
1568
1569	s/&/&amp;/g;
1570	s/>/&gt;/g;
1571	s/</&lt;/g;
1572
1573	$_
1574	}
1575
1576	sub update {	1914	sub update {
1577	my ($self) = @_;	1915	my ($self) = @_;
1578		1916
1579	delete $self->{texture};	1917	delete $self->{texture};
1580	$self->SUPER::update;	1918	$self->SUPER::update;
…		…
1583	sub realloc {	1921	sub realloc {
1584	my ($self) = @_;	1922	my ($self) = @_;
1585		1923
1586	delete $self->{ox};	1924	delete $self->{ox};
1587	$self->SUPER::realloc;	1925	$self->SUPER::realloc;
		1926	}
		1927
		1928	sub clear {
		1929	my ($self) = @_;
		1930
		1931	$self->set_text ("");
1588	}	1932	}
1589		1933
1590	sub set_text {	1934	sub set_text {
1591	my ($self, $text) = @_;	1935	my ($self, $text) = @_;
1592		1936
…		…
1617		1961
1618	sub size_request {	1962	sub size_request {
1619	my ($self) = @_;	1963	my ($self) = @_;
1620		1964
1621	$self->{size_req} ||= do {	1965	$self->{size_req} ||= do {
		1966	my ($max_w, $max_h) = $self->get_max_wh;
		1967
1622	$self->{layout}->set_font ($self->{font}) if $self->{font};	1968	$self->{layout}->set_font ($self->{font}) if $self->{font};
1623	$self->{layout}->set_width ($self->{max_w} || -1);	1969	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1624	$self->{layout}->set_ellipsise ($self->{ellipsise});	1970	$self->{layout}->set_ellipsise ($self->{ellipsise});
1625	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1971	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1626	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1972	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1973
1628	my ($w, $h) = $self->{layout}->size;	1974	my ($w, $h) = $self->{layout}->size;
1629		1975
1630	if (exists $self->{template}) {	1976	if (exists $self->{template}) {
1631	$self->{template}->set_font ($self->{font}) if $self->{font};	1977	$self->{template}->set_font ($self->{font}) if $self->{font};
		1978	$self->{template}->set_width ($self->{max_w} || -1);
1632	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1979	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1633		1980
1634	my ($w2, $h2) = $self->{template}->size;	1981	my ($w2, $h2) = $self->{template}->size;
1635		1982
1636	$w = List::Util::max $w, $w2;	1983	$w = List::Util::max $w, $w2;
…		…
1688	$self->{layout}->set_width ($self->{w});	2035	$self->{layout}->set_width ($self->{w});
1689	$self->{layout}->set_ellipsise ($self->{ellipsise});	2036	$self->{layout}->set_ellipsise ($self->{ellipsise});
1690	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2037	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1691	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2038	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1692		2039
1693	$self->{size_req}	2040	[$self->{layout}->size]
1694	};	2041	};
1695		2042
1696	unless (exists $self->{ox}) {	2043	unless (exists $self->{ox}) {
1697	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2044	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1698	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}	2045	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1699	: ($self->{w} - $size->[0]) * 0.5);	2046	: ($self->{w} - $size->[0]) * 0.5);
1700		2047
1701	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2048	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1702	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2049	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1703	: ($self->{h} - $size->[1]) * 0.5);	2050	: ($self->{h} - $size->[1]) * 0.5);
		2051
		2052	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704	};	2053	};
1705		2054
1706	my $w = List::Util::min $self->{w} + 4, $size->[0];	2055	# unless ($self->{list}) {
1707	my $h = List::Util::min $self->{h} + 2, $size->[1];	2056	# $self->{list} = CFPlus::OpenGL::glGenList;
1708		2057	# CFPlus::OpenGL::glNewList $self->{list};
1709	$self->{layout}->render ($self->{ox}, $self->{oy});	2058	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2059	# CFPlus::OpenGL::glEndList;
		2060	# }
		2061	#
		2062	# CFPlus::OpenGL::glCallList $self->{list};
		2063
		2064	$self->{layout}->draw;
1710	}	2065	}
		2066
		2067	#sub destroy {
		2068	# my ($self) = @_;
		2069	#
		2070	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2071	#
		2072	# $self->SUPER::destroy;
		2073	#}
1711		2074
1712	#############################################################################	2075	#############################################################################
1713		2076
1714	package CFClient::UI::EntryBase;	2077	package CFPlus::UI::EntryBase;
1715		2078
1716	our @ISA = CFClient::UI::Label::;	2079	our @ISA = CFPlus::UI::Label::;
1717		2080
1718	use CFClient::OpenGL;	2081	use CFPlus::OpenGL;
1719		2082
1720	sub new {	2083	sub new {
1721	my $class = shift;	2084	my $class = shift;
1722		2085
1723	$class->SUPER::new (	2086	$class->SUPER::new (
1724	fg => [1, 1, 1],	2087	fg => [1, 1, 1],
1725	bg => [0, 0, 0, 0.2],	2088	bg => [0, 0, 0, 0.2],
		2089	outline => [0.6, 0.3, 0.1],
1726	active_bg => [1, 1, 1, 0.5],	2090	active_bg => [0, 0, 1, .2],
1727	active_fg => [0, 0, 0],	2091	active_fg => [1, 1, 1],
		2092	active_outline => [1, 1, 0],
1728	can_hover => 1,	2093	can_hover => 1,
1729	can_focus => 1,	2094	can_focus => 1,
1730	valign => 0,	2095	valign => 0,
1731	can_events => 1,	2096	can_events => 1,
		2097	ellipsise => 0,
1732	#text => ...	2098	#text => ...
1733	#hidden => "*",	2099	#hidden => "*",
1734	@_	2100	@_
1735	)	2101	)
1736	}	2102	}
…		…
1781	my $sym = $ev->{sym};	2147	my $sym = $ev->{sym};
1782	my $uni = $ev->{unicode};	2148	my $uni = $ev->{unicode};
1783		2149
1784	my $text = $self->get_text;	2150	my $text = $self->get_text;
1785		2151
		2152	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2153
1786	if ($uni == 8) {	2154	if ($uni == 8) {
1787	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2155	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1788	} elsif ($uni == 127) {	2156	} elsif ($uni == 127) {
1789	substr $text, $self->{cursor}, 1, "";	2157	substr $text, $self->{cursor}, 1, "";
1790	} elsif ($sym == CFClient::SDLK_LEFT) {	2158	} elsif ($sym == CFPlus::SDLK_LEFT) {
1791	--$self->{cursor} if $self->{cursor};	2159	--$self->{cursor} if $self->{cursor};
1792	} elsif ($sym == CFClient::SDLK_RIGHT) {	2160	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1793	++$self->{cursor} if $self->{cursor} < length $self->{text};	2161	++$self->{cursor} if $self->{cursor} < length $self->{text};
1794	} elsif ($sym == CFClient::SDLK_HOME) {	2162	} elsif ($sym == CFPlus::SDLK_HOME) {
		2163	# what a hack
		2164	$self->{cursor} =
		2165	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2166	? length $1
		2167	: 0;
		2168	} elsif ($sym == CFPlus::SDLK_END) {
		2169	# uh, again
		2170	$self->{cursor} =
		2171	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2172	? $self->{cursor} + length $1
		2173	: length $self->{text};
		2174	} elsif ($uni == 21) { # ctrl-u
		2175	$text = "";
1795	$self->{cursor} = 0;	2176	$self->{cursor} = 0;
1796	} elsif ($sym == CFClient::SDLK_END) {
1797	$self->{cursor} = length $text;
1798	} elsif ($uni == 27) {	2177	} elsif ($uni == 27) {
1799	$self->emit ('escape');	2178	$self->emit ('escape');
1800	} elsif ($uni) {	2179	} elsif ($uni == 0x0d) {
		2180	substr $text, $self->{cursor}++, 0, "\012";
		2181	} elsif ($uni >= 0x20) {
1801	substr $text, $self->{cursor}++, 0, chr $uni;	2182	substr $text, $self->{cursor}++, 0, chr $uni;
1802	} else {	2183	} else {
1803	return 0;	2184	return 0;
1804	}	2185	}
1805		2186
1806	$self->_set_text ($text);	2187	$self->_set_text ($text);
1807		2188
1808	$self->realloc;	2189	$self->realloc;
		2190	$self->update;
1809		2191
1810	1	2192	1
1811	}	2193	}
1812		2194
1813	sub invoke_focus_in {	2195	sub invoke_focus_in {
…		…
1825		2207
1826	my $idx = $self->{layout}->xy_to_index ($x, $y);	2208	my $idx = $self->{layout}->xy_to_index ($x, $y);
1827		2209
1828	# byte-index to char-index	2210	# byte-index to char-index
1829	my $text = $self->{text};	2211	my $text = $self->{text};
1830	utf8::encode $text;	2212	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1831	$self->{cursor} = length substr $text, 0, $idx;	2213	$self->{cursor} = length $text;
1832		2214
1833	$self->_set_text ($self->{text});	2215	$self->_set_text ($self->{text});
1834	$self->update;	2216	$self->update;
1835		2217
1836	1	2218	1
…		…
1855	glColor_premultiply @{$self->{bg}};	2237	glColor_premultiply @{$self->{bg}};
1856	}	2238	}
1857		2239
1858	glEnable GL_BLEND;	2240	glEnable GL_BLEND;
1859	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2241	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1860	glBegin GL_QUADS;
1861	glVertex 0 , 0;
1862	glVertex 0 , $self->{h};
1863	glVertex $self->{w}, $self->{h};	2242	glRect 0, 0, $self->{w}, $self->{h};
1864	glVertex $self->{w}, 0;
1865	glEnd;
1866	glDisable GL_BLEND;	2243	glDisable GL_BLEND;
1867		2244
1868	$self->SUPER::_draw;	2245	$self->SUPER::_draw;
1869		2246
1870	#TODO: force update every cursor change :(	2247	#TODO: force update every cursor change :(
…		…
1872		2249
1873	unless (exists $self->{cur_h}) {	2250	unless (exists $self->{cur_h}) {
1874	my $text = substr $self->{text}, 0, $self->{cursor};	2251	my $text = substr $self->{text}, 0, $self->{cursor};
1875	utf8::encode $text;	2252	utf8::encode $text;
1876		2253
1877	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2254	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1878	}	2255	}
1879		2256
1880	glColor @{$self->{fg}};	2257	glColor_premultiply @{$self->{active_fg}};
1881	glBegin GL_LINES;	2258	glBegin GL_LINES;
1882	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2259	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2260	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1884	glEnd;	2261	glEnd;
1885	}
1886	}
1887		2262
		2263	glLineWidth 3;
		2264	glColor @{$self->{active_outline}};
		2265	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2266	glLineWidth 1;
		2267
		2268	} else {
		2269	glColor @{$self->{outline}};
		2270	glBegin GL_LINE_STRIP;
		2271	glVertex .5, $self->{h} * .5;
		2272	glVertex .5, $self->{h} - 2.5;
		2273	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2274	glVertex $self->{w} - .5, $self->{h} * .5;
		2275	glEnd;
		2276	}
		2277	}
		2278
		2279	#############################################################################
		2280
1888	package CFClient::UI::Entry;	2281	package CFPlus::UI::Entry;
1889		2282
1890	our @ISA = CFClient::UI::EntryBase::;	2283	our @ISA = CFPlus::UI::EntryBase::;
1891		2284
1892	use CFClient::OpenGL;	2285	use CFPlus::OpenGL;
1893		2286
1894	sub invoke_key_down {	2287	sub invoke_key_down {
1895	my ($self, $ev) = @_;	2288	my ($self, $ev) = @_;
1896		2289
1897	my $sym = $ev->{sym};	2290	my $sym = $ev->{sym};
1898		2291
1899	if ($sym == 13) {	2292	if ($ev->{uni} == 0x0d || $sym == 13) {
1900	unshift @{$self->{history}},	2293	unshift @{$self->{history}},
1901	my $txt = $self->get_text;	2294	my $txt = $self->get_text;
1902		2295
1903	$self->{history_pointer} = -1;	2296	$self->{history_pointer} = -1;
1904	$self->{history_saveback} = '';	2297	$self->{history_saveback} = '';
1905	$self->emit (activate => $txt);	2298	$self->emit (activate => $txt);
1906	$self->update;	2299	$self->update;
1907		2300
1908	} elsif ($sym == CFClient::SDLK_UP) {	2301	} elsif ($sym == CFPlus::SDLK_UP) {
1909	if ($self->{history_pointer} < 0) {	2302	if ($self->{history_pointer} < 0) {
1910	$self->{history_saveback} = $self->get_text;	2303	$self->{history_saveback} = $self->get_text;
1911	}	2304	}
1912	if (@{$self->{history} || []} > 0) {	2305	if (@{$self->{history} || []} > 0) {
1913	$self->{history_pointer}++;	2306	$self->{history_pointer}++;
…		…
1915	$self->{history_pointer} = @{$self->{history} || []} - 1;	2308	$self->{history_pointer} = @{$self->{history} || []} - 1;
1916	}	2309	}
1917	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2310	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1918	}	2311	}
1919		2312
1920	} elsif ($sym == CFClient::SDLK_DOWN) {	2313	} elsif ($sym == CFPlus::SDLK_DOWN) {
1921	$self->{history_pointer}--;	2314	$self->{history_pointer}--;
1922	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2315	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1923		2316
1924	if ($self->{history_pointer} >= 0) {	2317	if ($self->{history_pointer} >= 0) {
1925	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2318	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1934	1	2327	1
1935	}	2328	}
1936		2329
1937	#############################################################################	2330	#############################################################################
1938		2331
		2332	package CFPlus::UI::TextEdit;
		2333
		2334	our @ISA = CFPlus::UI::EntryBase::;
		2335
		2336	use CFPlus::OpenGL;
		2337
		2338	sub move_cursor_ver {
		2339	my ($self, $dy) = @_;
		2340
		2341	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2342
		2343	$y += $dy;
		2344
		2345	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2346	$self->{cursor} = $index;
		2347	delete $self->{cur_h};
		2348	$self->update;
		2349	return;
		2350	}
		2351	}
		2352
		2353	sub invoke_key_down {
		2354	my ($self, $ev) = @_;
		2355
		2356	my $sym = $ev->{sym};
		2357
		2358	if ($sym == CFPlus::SDLK_UP) {
		2359	$self->move_cursor_ver (-1);
		2360	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2361	$self->move_cursor_ver (+1);
		2362	} else {
		2363	return $self->SUPER::invoke_key_down ($ev)
		2364	}
		2365
		2366	1
		2367	}
		2368
		2369	#############################################################################
		2370
1939	package CFClient::UI::Button;	2371	package CFPlus::UI::ButtonBin;
1940		2372
1941	our @ISA = CFClient::UI::Label::;	2373	our @ISA = CFPlus::UI::Bin::;
1942		2374
1943	use CFClient::OpenGL;	2375	use CFPlus::OpenGL;
1944		2376
1945	my @tex =	2377	my @tex =
1946	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2378	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1947	qw(b1_button_active.png);	2379	qw(b1_button_inactive.png b1_button_active.png);
1948		2380
1949	sub new {	2381	sub new {
1950	my $class = shift;	2382	my $class = shift;
1951		2383
1952	$class->SUPER::new (	2384	$class->SUPER::new (
1953	padding_x => 4,
1954	padding_y => 4,
1955	fg => [1, 1, 1],
1956	active_fg => [0, 0, 1],
1957	can_hover => 1,	2385	can_hover => 1,
1958	align => 0,	2386	align => 0,
1959	valign => 0,	2387	valign => 0,
1960	can_events => 1,	2388	can_events => 1,
1961	@_	2389	@_
…		…
1973	}	2401	}
1974		2402
1975	sub _draw {	2403	sub _draw {
1976	my ($self) = @_;	2404	my ($self) = @_;
1977		2405
1978	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1979
1980	glEnable GL_TEXTURE_2D;	2406	glEnable GL_TEXTURE_2D;
1981	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2407	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1982	glColor 0, 0, 0, 1;	2408	glColor 0, 0, 0, 1;
1983		2409
		2410	my $tex = $tex[$GRAB == $self];
1984	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2411	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1985		2412
1986	glDisable GL_TEXTURE_2D;	2413	glDisable GL_TEXTURE_2D;
1987		2414
1988	$self->SUPER::_draw;	2415	$self->SUPER::_draw;
1989	}	2416	}
1990		2417
1991	#############################################################################	2418	#############################################################################
1992		2419
		2420	package CFPlus::UI::Button;
		2421
		2422	our @ISA = CFPlus::UI::Label::;
		2423
		2424	use CFPlus::OpenGL;
		2425
		2426	my @tex =
		2427	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2428	qw(b1_button_inactive.png b1_button_active.png);
		2429
		2430	sub new {
		2431	my $class = shift;
		2432
		2433	$class->SUPER::new (
		2434	padding_x => 4,
		2435	padding_y => 4,
		2436	fg => [1.0, 1.0, 1.0],
		2437	active_fg => [0.8, 0.8, 0.8],
		2438	can_hover => 1,
		2439	align => 0,
		2440	valign => 0,
		2441	can_events => 1,
		2442	@_
		2443	)
		2444	}
		2445
		2446	sub invoke_button_up {
		2447	my ($self, $ev, $x, $y) = @_;
		2448
		2449	$self->emit ("activate")
		2450	if $x >= 0 && $x < $self->{w}
		2451	&& $y >= 0 && $y < $self->{h};
		2452
		2453	1
		2454	}
		2455
		2456	sub _draw {
		2457	my ($self) = @_;
		2458
		2459	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2460
		2461	glEnable GL_TEXTURE_2D;
		2462	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2463	glColor 0, 0, 0, 1;
		2464
		2465	my $tex = $tex[$GRAB == $self];
		2466	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2467
		2468	glDisable GL_TEXTURE_2D;
		2469
		2470	$self->SUPER::_draw;
		2471	}
		2472
		2473	#############################################################################
		2474
		2475	package CFPlus::UI::CheckBox;
		2476
		2477	our @ISA = CFPlus::UI::DrawBG::;
		2478
		2479	my @tex =
		2480	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2481	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2482
		2483	use CFPlus::OpenGL;
		2484
		2485	sub new {
		2486	my $class = shift;
		2487
		2488	$class->SUPER::new (
		2489	padding_x => 2,
		2490	padding_y => 2,
		2491	fg => [1, 1, 1],
		2492	active_fg => [1, 1, 0],
		2493	bg => [0, 0, 0, 0.2],
		2494	active_bg => [1, 1, 1, 0.5],
		2495	state => 0,
		2496	can_hover => 1,
		2497	@_
		2498	)
		2499	}
		2500
		2501	sub size_request {
		2502	my ($self) = @_;
		2503
		2504	(6) x 2
		2505	}
		2506
		2507	sub toggle {
		2508	my ($self) = @_;
		2509
		2510	$self->{state} = !$self->{state};
		2511	$self->emit (changed => $self->{state});
		2512	$self->update;
		2513	}
		2514
		2515	sub invoke_button_down {
		2516	my ($self, $ev, $x, $y) = @_;
		2517
		2518	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2519	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2520	$self->toggle;
		2521	} else {
		2522	return 0
		2523	}
		2524
		2525	1
		2526	}
		2527
		2528	sub _draw {
		2529	my ($self) = @_;
		2530
		2531	$self->SUPER::_draw;
		2532
		2533	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
		2534
		2535	my ($w, $h) = @$self{qw(w h)};
		2536
		2537	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2538
		2539	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2540
		2541	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2542
		2543	glEnable GL_TEXTURE_2D;
		2544	$tex->draw_quad_alpha (0, 0, $s, $s);
		2545	glDisable GL_TEXTURE_2D;
		2546	}
		2547
		2548	#############################################################################
		2549
		2550	package CFPlus::UI::Image;
		2551
		2552	our @ISA = CFPlus::UI::Base::;
		2553
		2554	use CFPlus::OpenGL;
		2555
		2556	our %texture_cache;
		2557
		2558	sub new {
		2559	my $class = shift;
		2560
		2561	my $self = $class->SUPER::new (
		2562	can_events => 0,
		2563	scale => 1,
		2564	@_,
		2565	);
		2566
		2567	$self->{path} || $self->{tex}
		2568	or Carp::croak "'path' or 'tex' attributes required";
		2569
		2570	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2571	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2572
		2573	CFPlus::weaken $texture_cache{$self->{path}};
		2574
		2575	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2576
		2577	$self
		2578	}
		2579
		2580	sub STORABLE_freeze {
		2581	my ($self, $cloning) = @_;
		2582
		2583	$self->{path}
		2584	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2585
		2586	$self->{path}
		2587	}
		2588
		2589	sub STORABLE_attach {
		2590	my ($self, $cloning, $path) = @_;
		2591
		2592	$self->new (path => $path)
		2593	}
		2594
		2595	sub size_request {
		2596	my ($self) = @_;
		2597
		2598	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
		2599	}
		2600
		2601	sub _draw {
		2602	my ($self) = @_;
		2603
		2604	my $tex = $self->{tex};
		2605
		2606	my ($w, $h) = ($self->{w}, $self->{h});
		2607
		2608	if ($self->{rot90}) {
		2609	glRotate 90, 0, 0, 1;
		2610	glTranslate 0, -$self->{w}, 0;
		2611
		2612	($w, $h) = ($h, $w);
		2613	}
		2614
		2615	glEnable GL_TEXTURE_2D;
		2616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2617
		2618	$tex->draw_quad_alpha (0, 0, $w, $h);
		2619
		2620	glDisable GL_TEXTURE_2D;
		2621	}
		2622
		2623	#############################################################################
		2624
1993	package CFClient::UI::ImageButton;	2625	package CFPlus::UI::ImageButton;
1994		2626
1995	our @ISA = CFClient::UI::Image::;	2627	our @ISA = CFPlus::UI::Image::;
1996		2628
1997	use CFClient::OpenGL;	2629	use CFPlus::OpenGL;
1998		2630
1999	my %textures;	2631	my %textures;
2000		2632
2001	sub new {	2633	sub new {
2002	my $class = shift;	2634	my $class = shift;
…		…
2012	can_events => 1,	2644	can_events => 1,
2013	@_	2645	@_
2014	);	2646	);
2015	}	2647	}
2016		2648
		2649	sub invoke_button_down {
		2650	my ($self, $ev, $x, $y) = @_;
		2651
		2652	1
		2653	}
		2654
2017	sub invoke_button_up {	2655	sub invoke_button_up {
2018	my ($self, $ev, $x, $y) = @_;	2656	my ($self, $ev, $x, $y) = @_;
2019		2657
2020	$self->emit ("activate")	2658	$self->emit ("activate")
2021	if $x >= 0 && $x < $self->{w}	2659	if $x >= 0 && $x < $self->{w}
…		…
2024	1	2662	1
2025	}	2663	}
2026		2664
2027	#############################################################################	2665	#############################################################################
2028		2666
2029	package CFClient::UI::CheckBox;
2030
2031	our @ISA = CFClient::UI::DrawBG::;
2032
2033	my @tex =
2034	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2035	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2036
2037	use CFClient::OpenGL;
2038
2039	sub new {
2040	my $class = shift;
2041
2042	$class->SUPER::new (
2043	padding_x => 2,
2044	padding_y => 2,
2045	fg => [1, 1, 1],
2046	active_fg => [1, 1, 0],
2047	bg => [0, 0, 0, 0.2],
2048	active_bg => [1, 1, 1, 0.5],
2049	state => 0,
2050	can_hover => 1,
2051	@_
2052	)
2053	}
2054
2055	sub size_request {
2056	my ($self) = @_;
2057
2058	(6) x 2
2059	}
2060
2061	sub toggle {
2062	my ($self) = @_;
2063
2064	$self->{state} = !$self->{state};
2065	$self->emit (changed => $self->{state});
2066	$self->update;
2067	}
2068
2069	sub invoke_button_down {
2070	my ($self, $ev, $x, $y) = @_;
2071
2072	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2073	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2074	$self->toggle;
2075	} else {
2076	return 0
2077	}
2078
2079	1
2080	}
2081
2082	sub _draw {
2083	my ($self) = @_;
2084
2085	$self->SUPER::_draw;
2086
2087	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2088
2089	my ($w, $h) = @$self{qw(w h)};
2090
2091	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2092
2093	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2094
2095	my $tex = $self->{state} ? $tex[1] : $tex[0];
2096
2097	glEnable GL_TEXTURE_2D;
2098	$tex->draw_quad_alpha (0, 0, $s, $s);
2099	glDisable GL_TEXTURE_2D;
2100	}
2101
2102	#############################################################################
2103
2104	package CFClient::UI::Image;	2667	package CFPlus::UI::VGauge;
2105		2668
2106	our @ISA = CFClient::UI::Base::;	2669	our @ISA = CFPlus::UI::Base::;
2107
2108	use CFClient::OpenGL;
2109
2110	our %texture_cache;
2111
2112	sub new {
2113	my $class = shift;
2114
2115	my $self = $class->SUPER::new (
2116	can_events => 0,
2117	@_,
2118	);
2119
2120	$self->{path}
2121	or Carp::croak "required attribute 'path' not set";
2122
2123	$self->{tex} = $texture_cache{$self->{path}} ||=
2124	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2125
2126	Scalar::Util::weaken $texture_cache{$self->{path}};
2127
2128	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2129
2130	$self
2131	}
2132
2133	sub size_request {
2134	my ($self) = @_;
2135
2136	($self->{tex}{w}, $self->{tex}{h})
2137	}
2138
2139	sub _draw {
2140	my ($self) = @_;
2141
2142	my $tex = $self->{tex};
2143
2144	my ($w, $h) = ($self->{w}, $self->{h});
2145
2146	if ($self->{rot90}) {
2147	glRotate 90, 0, 0, 1;
2148	glTranslate 0, -$self->{w}, 0;
2149
2150	($w, $h) = ($h, $w);
2151	}
2152
2153	glEnable GL_TEXTURE_2D;
2154	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155
2156	$tex->draw_quad_alpha (0, 0, $w, $h);
2157
2158	glDisable GL_TEXTURE_2D;
2159	}
2160
2161	#############################################################################
2162
2163	package CFClient::UI::VGauge;
2164
2165	our @ISA = CFClient::UI::Base::;
2166		2670
2167	use List::Util qw(min max);	2671	use List::Util qw(min max);
2168		2672
2169	use CFClient::OpenGL;	2673	use CFPlus::OpenGL;
2170		2674
2171	my %tex = (	2675	my %tex = (
2172	food => [	2676	food => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2677	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2678	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2175	],	2679	],
2176	grace => [	2680	grace => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2681	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2682	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2179	],	2683	],
2180	hp => [	2684	hp => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2685	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2686	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2183	],	2687	],
2184	mana => [	2688	mana => [
2185	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2689	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2186	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2690	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2187	],	2691	],
2188	);	2692	);
2189		2693
2190	# eg. VGauge->new (gauge => 'food'), default gauge: food	2694	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2293	glDisable GL_TEXTURE_2D;	2797	glDisable GL_TEXTURE_2D;
2294	}	2798	}
2295		2799
2296	#############################################################################	2800	#############################################################################
2297		2801
		2802	package CFPlus::UI::Progress;
		2803
		2804	our @ISA = CFPlus::UI::Label::;
		2805
		2806	use CFPlus::OpenGL;
		2807
		2808	sub new {
		2809	my ($class, %arg) = @_;
		2810
		2811	my $self = $class->SUPER::new (
		2812	fg => [1, 1, 1],
		2813	bg => [0, 0, 1, 0.2],
		2814	bar => [0.7, 0.5, 0.1, 0.8],
		2815	outline => [0.4, 0.3, 0],
		2816	fontsize => 0.9,
		2817	valign => 0,
		2818	align => 0,
		2819	can_events => 1,
		2820	ellipsise => 1,
		2821	label => "%d%%",
		2822	%arg,
		2823	);
		2824
		2825	$self->set_value ($arg{value} || -1);
		2826
		2827	$self
		2828	}
		2829
		2830	sub set_label {
		2831	my ($self, $label) = @_;
		2832
		2833	return if $self->{label} eq $label;
		2834	$self->{label} = $label;
		2835
		2836	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2837	}
		2838
		2839	sub set_value {
		2840	my ($self, $value) = @_;
		2841
		2842	if ($self->{value} ne $value) {
		2843	$self->{value} = $value;
		2844
		2845	if ($value < 0) {
		2846	$self->set_text ("-");
		2847	} else {
		2848	$self->set_text (sprintf $self->{label}, $value * 100);
		2849	}
		2850
		2851	$self->update;
		2852	}
		2853	}
		2854
		2855	sub _draw {
		2856	my ($self) = @_;
		2857
		2858	glEnable GL_BLEND;
		2859	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2860
		2861	if ($self->{value} >= 0) {
		2862	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2863
		2864	glColor_premultiply @{$self->{bar}};
		2865	glRect 2, 2, $s, $self->{h} - 2;
		2866	glColor_premultiply @{$self->{bg}};
		2867	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2868	}
		2869
		2870	glColor_premultiply @{$self->{outline}};
		2871	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2872
		2873	glDisable GL_BLEND;
		2874
		2875	{
		2876	local $self->{bg}; # do not draw background
		2877	$self->SUPER::_draw;
		2878	}
		2879	}
		2880
		2881	#############################################################################
		2882
		2883	package CFPlus::UI::ExperienceProgress;
		2884
		2885	our @ISA = CFPlus::UI::Progress::;
		2886
		2887	sub new {
		2888	my ($class, %arg) = @_;
		2889
		2890	my $self = $class->SUPER::new (
		2891	tooltip => sub {
		2892	my ($self) = @_;
		2893
		2894	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2895	$self->{lvl},
		2896	::formsep ($self->{exp}),
		2897	::formsep ($self->{nxt}),
		2898	::formsep ($self->{nxt} - $self->{exp}),
		2899	},
		2900	%arg
		2901	);
		2902
		2903	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2904	if $::CONN;
		2905
		2906	$self
		2907	}
		2908
		2909	sub DESTROY {
		2910	my ($self) = @_;
		2911
		2912	delete $::CONN->{on_exp_update}{$self+0}
		2913	if $::CONN;
		2914
		2915	$self->SUPER::DESTROY;
		2916	}
		2917
		2918	sub set_value {
		2919	my ($self, $lvl, $exp) = @_;
		2920
		2921	$self->{lvl} = $lvl;
		2922	$self->{exp} = $exp;
		2923
		2924	my $v = -1;
		2925
		2926	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2927	my $l0 = $table->[$lvl - 1];
		2928	my $l1 = $table->[$lvl];
		2929
		2930	$self->{nxt} = $l1;
		2931
		2932	$v = ($exp - $l0) / ($l1 - $l0);
		2933	}
		2934
		2935	$self->SUPER::set_value ($v);
		2936	}
		2937
		2938	#############################################################################
		2939
2298	package CFClient::UI::Gauge;	2940	package CFPlus::UI::Gauge;
2299		2941
2300	our @ISA = CFClient::UI::VBox::;	2942	our @ISA = CFPlus::UI::VBox::;
2301		2943
2302	sub new {	2944	sub new {
2303	my ($class, %arg) = @_;	2945	my ($class, %arg) = @_;
2304		2946
2305	my $self = $class->SUPER::new (	2947	my $self = $class->SUPER::new (
…		…
2307	can_hover => 1,	2949	can_hover => 1,
2308	can_events => 1,	2950	can_events => 1,
2309	%arg,	2951	%arg,
2310	);	2952	);
2311		2953
2312	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2954	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2313	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2955	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2314	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2956	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2315		2957
2316	$self	2958	$self
2317	}	2959	}
2318		2960
2319	sub set_fontsize {	2961	sub set_fontsize {
…		…
2340	$self->{value}->set_text ($val);	2982	$self->{value}->set_text ($val);
2341	}	2983	}
2342		2984
2343	#############################################################################	2985	#############################################################################
2344		2986
2345	package CFClient::UI::Slider;	2987	package CFPlus::UI::Slider;
2346		2988
2347	use strict;	2989	use strict;
2348		2990
2349	use CFClient::OpenGL;	2991	use CFPlus::OpenGL;
2350		2992
2351	our @ISA = CFClient::UI::DrawBG::;	2993	our @ISA = CFPlus::UI::DrawBG::;
2352		2994
2353	my @tex =	2995	my @tex =
2354	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2996	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2355	qw(s1_slider.png s1_slider_bg.png);	2997	qw(s1_slider.png s1_slider_bg.png);
2356		2998
2357	sub new {	2999	sub new {
2358	my $class = shift;	3000	my $class = shift;
2359		3001
…		…
2427		3069
2428	$self->SUPER::invoke_button_down ($ev, $x, $y);	3070	$self->SUPER::invoke_button_down ($ev, $x, $y);
2429		3071
2430	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3072	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2431		3073
2432	$self->invoke_mouse_motion ($ev, $x, $y)	3074	$self->invoke_mouse_motion ($ev, $x, $y);
		3075
		3076	1
2433	}	3077	}
2434		3078
2435	sub invoke_mouse_motion {	3079	sub invoke_mouse_motion {
2436	my ($self, $ev, $x, $y) = @_;	3080	my ($self, $ev, $x, $y) = @_;
2437		3081
…		…
2444		3088
2445	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3089	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2446	} else {	3090	} else {
2447	return 0;	3091	return 0;
2448	}	3092	}
		3093
		3094	1
		3095	}
		3096
		3097	sub invoke_mouse_wheel {
		3098	my ($self, $ev) = @_;
		3099
		3100	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		3101
		3102	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3103
		3104	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2449		3105
2450	1	3106	1
2451	}	3107	}
2452		3108
2453	sub update {	3109	sub update {
…		…
2504	glDisable GL_TEXTURE_2D;	3160	glDisable GL_TEXTURE_2D;
2505	}	3161	}
2506		3162
2507	#############################################################################	3163	#############################################################################
2508		3164
2509	package CFClient::UI::ValSlider;	3165	package CFPlus::UI::ValSlider;
2510		3166
2511	our @ISA = CFClient::UI::HBox::;	3167	our @ISA = CFPlus::UI::HBox::;
2512		3168
2513	sub new {	3169	sub new {
2514	my ($class, %arg) = @_;	3170	my ($class, %arg) = @_;
2515		3171
2516	my $range = delete $arg{range};	3172	my $range = delete $arg{range};
2517		3173
2518	my $self = $class->SUPER::new (	3174	my $self = $class->SUPER::new (
2519	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3175	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2520	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3176	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2521	to_value => sub { shift },	3177	to_value => sub { shift },
2522	from_value => sub { shift },	3178	from_value => sub { shift },
2523	%arg,	3179	%arg,
2524	);	3180	);
2525		3181
…		…
2545	sub set_range { shift->{slider}->set_range (@_) }	3201	sub set_range { shift->{slider}->set_range (@_) }
2546	sub set_value { shift->{slider}->set_value (@_) }	3202	sub set_value { shift->{slider}->set_value (@_) }
2547		3203
2548	#############################################################################	3204	#############################################################################
2549		3205
2550	package CFClient::UI::TextScroller;	3206	package CFPlus::UI::TextScroller;
2551		3207
2552	our @ISA = CFClient::UI::HBox::;	3208	our @ISA = CFPlus::UI::HBox::;
2553		3209
2554	use CFClient::OpenGL;	3210	use CFPlus::OpenGL;
2555		3211
2556	sub new {	3212	sub new {
2557	my $class = shift;	3213	my $class = shift;
2558		3214
2559	my $self = $class->SUPER::new (	3215	my $self = $class->SUPER::new (
2560	fontsize => 1,	3216	fontsize => 1,
2561	can_events => 0,	3217	can_events => 1,
2562	indent => 0,	3218	indent => 0,
2563	#font => default_font	3219	#font => default_font
2564	@_,	3220	@_,
2565		3221
2566	layout => (new CFClient::Layout 2),	3222	layout => (new CFPlus::Layout),
2567	par => [],	3223	par => [],
		3224	max_par => 0,
2568	height => 0,	3225	height => 0,
2569	children => [	3226	children => [
2570	(new CFClient::UI::Empty expand => 1),	3227	(new CFPlus::UI::Empty expand => 1),
2571	(new CFClient::UI::Slider vertical => 1),	3228	(new CFPlus::UI::Slider vertical => 1),
2572	],	3229	],
2573	);	3230	);
2574		3231
2575	$self->{children}[1]->connect (changed => sub { $self->update });	3232	$self->{children}[1]->connect (changed => sub { $self->update });
2576		3233
…		…
2585	}	3242	}
2586		3243
2587	sub size_request {	3244	sub size_request {
2588	my ($self) = @_;	3245	my ($self) = @_;
2589		3246
2590	my ($empty, $slider) = @{ $self->{children} };	3247	my ($empty, $slider) = $self->visible_children;
2591		3248
2592	local $self->{children} = [$empty, $slider];	3249	local $self->{children} = [$empty, $slider];
2593	$self->SUPER::size_request	3250	$self->SUPER::size_request
2594	}	3251	}
2595		3252
…		…
2606		3263
2607	$self->reflow;	3264	$self->reflow;
2608		3265
2609	local $self->{children} = [$empty, $slider];	3266	local $self->{children} = [$empty, $slider];
2610	$self->SUPER::invoke_size_allocate ($w, $h)	3267	$self->SUPER::invoke_size_allocate ($w, $h)
		3268	}
		3269
		3270	sub invoke_mouse_wheel {
		3271	my ($self, $ev) = @_;
		3272
		3273	return 0 unless $ev->{dy}; # only vertical movements
		3274
		3275	$self->{children}[1]->emit (mouse_wheel => $ev);
		3276
		3277	1
2611	}	3278	}
2612		3279
2613	sub get_layout {	3280	sub get_layout {
2614	my ($self, $para) = @_;	3281	my ($self, $para) = @_;
2615		3282
…		…
2643		3310
2644	# todo: base offset on lines or so, not on pixels	3311	# todo: base offset on lines or so, not on pixels
2645	$self->{children}[1]->set_value ($offset);	3312	$self->{children}[1]->set_value ($offset);
2646	}	3313	}
2647		3314
		3315	sub current_paragraph {
		3316	my ($self) = @_;
		3317
		3318	$self->{top_paragraph} - 1
		3319	}
		3320
		3321	sub scroll_to {
		3322	my ($self, $para) = @_;
		3323
		3324	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3325
		3326	$self->{scroll_to} = $para;
		3327	$self->update;
		3328	}
		3329
2648	sub clear {	3330	sub clear {
2649	my ($self) = @_;	3331	my ($self) = @_;
2650		3332
2651	my (undef, undef, @other) = @{ $self->{children} };	3333	my (undef, undef, @other) = @{ $self->{children} };
2652	$self->remove ($_) for @other;	3334	$self->remove ($_) for @other;
…		…
2655	$self->{height} = 0;	3337	$self->{height} = 0;
2656	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3338	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2657	}	3339	}
2658		3340
2659	sub add_paragraph {	3341	sub add_paragraph {
2660	my ($self, $color, $para, $indent) = @_;	3342	my $self = shift;
2661		3343
2662	my ($text, @w) = ref $para ? @$para : $para;	3344	for my $para (@_) {
2663
2664	$para = {	3345	$para = {
		3346	fg => [1, 1, 1, 1],
		3347	indent => 0,
		3348	markup => "",
		3349	widget => [],
		3350	ref $para ? %$para : (markup => $para),
2665	w => 1e10,	3351	w => 1e10,
2666	wrapped => 1,	3352	wrapped => 1,
2667	fg => $color,
2668	indent => $indent,
2669	markup => $text,
2670	widget => \@w,
2671	};	3353	};
2672		3354
2673	$self->add (@w) if @w;	3355	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2674	push @{$self->{par}}, $para;	3356	push @{$self->{par}}, $para;
		3357	}
		3358
		3359	if (my $max = $self->{max_par}) {
		3360	shift @{$self->{par}} while @{$self->{par}} > $max;
		3361	}
2675		3362
2676	$self->{need_reflow}++;	3363	$self->{need_reflow}++;
2677	$self->update;	3364	$self->update;
2678	}	3365	}
2679		3366
2680	sub scroll_to_bottom {	3367	sub scroll_to_bottom {
2681	my ($self) = @_;	3368	my ($self) = @_;
2682		3369
2683	$self->{scroll_to_bottom} = 1;	3370	$self->{scroll_to} = $#{$self->{par}};
2684	$self->update;	3371	$self->update;
2685	}	3372	}
2686		3373
		3374	sub force_uptodate {
		3375	my ($self) = @_;
		3376
		3377	if (delete $self->{need_reflow}) {
		3378	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3379
		3380	my $height = 0;
		3381
		3382	for my $para (@{$self->{par}}) {
		3383	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3384	my $layout = $self->get_layout ($para);
		3385	my ($w, $h) = $layout->size;
		3386
		3387	$para->{w} = $w + $para->{indent};
		3388	$para->{h} = $h;
		3389	$para->{wrapped} = $layout->has_wrapped;
		3390	}
		3391
		3392	$para->{y} = $height;
		3393	$height += $para->{h};
		3394	}
		3395
		3396	$self->{height} = $height;
		3397	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3398
		3399	delete $self->{texture};
		3400	}
		3401
		3402	if (my $paridx = delete $self->{scroll_to}) {
		3403	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3404	}
		3405	}
		3406
2687	sub update {	3407	sub update {
2688	my ($self) = @_;	3408	my ($self) = @_;
2689		3409
2690	$self->SUPER::update;	3410	$self->SUPER::update;
2691		3411
2692	return unless $self->{h} > 0;	3412	return unless $self->{h} > 0;
2693		3413
2694	delete $self->{texture};	3414	delete $self->{texture};
2695		3415
2696	$ROOT->on_post_alloc ($self => sub {	3416	$ROOT->on_post_alloc ($self => sub {
		3417	$self->force_uptodate;
		3418
2697	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3419	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2698		3420
2699	if (delete $self->{need_reflow}) {
2700	my $height = 0;
2701
2702	for my $para (@{$self->{par}}) {
2703	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2704	my $layout = $self->get_layout ($para);
2705	my ($w, $h) = $layout->size;
2706
2707	$para->{w} = $w + $para->{indent};
2708	$para->{h} = $h;
2709	$para->{wrapped} = $layout->has_wrapped;
2710	}
2711
2712	$height += $para->{h};
2713	}
2714
2715	$self->{height} = $height;
2716
2717	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2718
2719	delete $self->{texture};
2720	}
2721
2722	if (delete $self->{scroll_to_bottom}) {
2723	$self->{children}[1]->set_value (1e10);
2724	}
2725
2726	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3421	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2727	glClearColor 0, 0, 0, 0;	3422	glClearColor 0, 0, 0, 0;
2728	glClear GL_COLOR_BUFFER_BIT;	3423	glClear GL_COLOR_BUFFER_BIT;
2729		3424
		3425	package CFPlus::UI::Base;
		3426	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3427	(0, 0, $self->{w}, $self->{h});
		3428
		3429	my $top = int $self->{children}[1]{range}[0];
		3430
		3431	my $paridx = 0;
		3432	my $top_paragraph;
2730	my $top = int $self->{children}[1]{range}[0];	3433	my $top = int $self->{children}[1]{range}[0];
2731		3434
2732	my $y0 = $top;	3435	my $y0 = $top;
2733	my $y1 = $top + $H;	3436	my $y1 = $top + $H;
2734		3437
2735	my $y = 0;
2736
2737	for my $para (@{$self->{par}}) {	3438	for my $para (@{$self->{par}}) {
2738	my $h = $para->{h};	3439	my $h = $para->{h};
		3440	my $y = $para->{y};
2739		3441
2740	if ($y0 < $y + $h && $y < $y1) {	3442	if ($y0 < $y + $h && $y < $y1) {
2741
2742	my $layout = $self->get_layout ($para);	3443	my $layout = $self->get_layout ($para);
2743		3444
2744	$layout->render ($para->{indent}, $y - $y0);	3445	$layout->render ($para->{indent}, $y - $y0);
		3446	$layout->draw;
2745		3447
2746	if (my @w = @{ $para->{widget} }) {	3448	if (my @w = @{ $para->{widget} }) {
2747	my @s = $layout->get_shapes;	3449	my @s = $layout->get_shapes;
2748		3450
2749	for (@w) {	3451	for (@w) {
…		…
2755	$_->draw;	3457	$_->draw;
2756	}	3458	}
2757	}	3459	}
2758	}	3460	}
2759		3461
2760	$y += $h;	3462	$paridx++;
		3463	$top_paragraph ||= $paridx if $y >= $top;
2761	}	3464	}
		3465
		3466	$self->{top_paragraph} = $top_paragraph;
2762	};	3467	};
2763	});	3468	});
2764	}	3469	}
2765		3470
2766	sub reconfigure {	3471	sub reconfigure {
…		…
2784	$self->{children}[1]->draw;	3489	$self->{children}[1]->draw;
2785	}	3490	}
2786		3491
2787	#############################################################################	3492	#############################################################################
2788		3493
2789	package CFClient::UI::Animator;	3494	package CFPlus::UI::Animator;
2790		3495
2791	use CFClient::OpenGL;	3496	use CFPlus::OpenGL;
2792		3497
2793	our @ISA = CFClient::UI::Bin::;	3498	our @ISA = CFPlus::UI::Bin::;
2794		3499
2795	sub moveto {	3500	sub moveto {
2796	my ($self, $x, $y) = @_;	3501	my ($self, $x, $y) = @_;
2797		3502
2798	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3503	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2826	glPopMatrix;	3531	glPopMatrix;
2827	}	3532	}
2828		3533
2829	#############################################################################	3534	#############################################################################
2830		3535
2831	package CFClient::UI::Flopper;	3536	package CFPlus::UI::Flopper;
2832		3537
2833	our @ISA = CFClient::UI::Button::;	3538	our @ISA = CFPlus::UI::Button::;
2834		3539
2835	sub new {	3540	sub new {
2836	my $class = shift;	3541	my $class = shift;
2837		3542
2838	my $self = $class->SUPER::new (	3543	my $self = $class->SUPER::new (
…		…
2850	$self->{other}->toggle_visibility;	3555	$self->{other}->toggle_visibility;
2851	}	3556	}
2852		3557
2853	#############################################################################	3558	#############################################################################
2854		3559
2855	package CFClient::UI::Tooltip;	3560	package CFPlus::UI::Tooltip;
2856		3561
2857	our @ISA = CFClient::UI::Bin::;	3562	our @ISA = CFPlus::UI::Bin::;
2858		3563
2859	use CFClient::OpenGL;	3564	use CFPlus::OpenGL;
2860		3565
2861	sub new {	3566	sub new {
2862	my $class = shift;	3567	my $class = shift;
2863		3568
2864	$class->SUPER::new (	3569	$class->SUPER::new (
…		…
2868	}	3573	}
2869		3574
2870	sub set_tooltip_from {	3575	sub set_tooltip_from {
2871	my ($self, $widget) = @_;	3576	my ($self, $widget) = @_;
2872		3577
2873	my $tooltip = $widget->{tooltip};	3578	my $tip = $widget->{tooltip};
		3579	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3580
		3581	$tip = CFPlus::Pod::section_label tooltip => $1
		3582	if $tip =~ /^#(.*)$/;
2874		3583
2875	if ($ENV{CFPLUS_DEBUG} & 2) {	3584	if ($ENV{CFPLUS_DEBUG} & 2) {
2876	$tooltip .= "\n\n" . (ref $widget) . "\n"	3585	$tip .= "\n\n" . (ref $widget) . "\n"
2877	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3586	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2878	. "req $widget->{req_w} $widget->{req_h}\n"	3587	. "req $widget->{req_w} $widget->{req_h}\n"
2879	. "visible $widget->{visible}";	3588	. "visible $widget->{visible}";
2880	}	3589	}
2881		3590
2882	$tooltip =~ s/^\n+//;	3591	$tip =~ s/^\n+//;
2883	$tooltip =~ s/\n+$//;	3592	$tip =~ s/\n+$//;
2884		3593
2885	$self->add (new CFClient::UI::Label	3594	$self->add (new CFPlus::UI::Label
2886	markup => $tooltip,	3595	markup => $tip,
2887	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3596	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888	fontsize => 0.8,	3597	fontsize => 0.8,
2889	fg => [0, 0, 0, 1],	3598	style => 1, # FLAG_INVERSE
2890	ellipsise => 0,	3599	ellipsise => 0,
2891	font => ($widget->{tooltip_font} || $::FONT_PROP),	3600	font => ($widget->{tooltip_font} || $::FONT_PROP),
2892	);	3601	);
2893	}	3602	}
2894		3603
…		…
2913		3622
2914	$self->{root}->on_post_alloc ("move_$self" => sub {	3623	$self->{root}->on_post_alloc ("move_$self" => sub {
2915	my $widget = $self->{owner}	3624	my $widget = $self->{owner}
2916	or return;	3625	or return;
2917		3626
		3627	if ($widget->{visible}) {
2918	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3628	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919		3629
2920	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3630	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921	if $x + $self->{w} > $self->{root}{w};	3631	if $x + $self->{w} > $self->{root}{w};
2922		3632
2923	$self->move_abs ($x, $y);	3633	$self->move_abs ($x, $y);
		3634	} else {
		3635	$self->hide;
		3636	}
2924	});	3637	});
2925	}	3638	}
2926		3639
2927	sub _draw {	3640	sub _draw {
2928	my ($self) = @_;	3641	my ($self) = @_;
2929		3642
2930	glTranslate 0.375, 0.375;
2931
2932	my ($w, $h) = @$self{qw(w h)};	3643	my ($w, $h) = @$self{qw(w h)};
2933		3644
2934	glColor 1, 0.8, 0.4;	3645	glColor 1, 0.8, 0.4;
2935	glBegin GL_QUADS;	3646	glRect 0, 0, $w, $h;
2936	glVertex 0 , 0;
2937	glVertex 0 , $h;
2938	glVertex $w, $h;
2939	glVertex $w, 0;
2940	glEnd;
2941		3647
2942	glColor 0, 0, 0;	3648	glColor 0, 0, 0;
2943	glBegin GL_LINE_LOOP;	3649	glRect_lineloop .5, .5, $w + .5, $h + .5;
2944	glVertex 0 , 0;
2945	glVertex 0 , $h;
2946	glVertex $w, $h;
2947	glVertex $w, 0;
2948	glEnd;
2949		3650
2950	glTranslate 2 - 0.375, 2 - 0.375;	3651	glTranslate 2, 2;
2951		3652
2952	$self->SUPER::_draw;	3653	$self->SUPER::_draw;
2953	}	3654	}
2954		3655
2955	#############################################################################	3656	#############################################################################
2956		3657
2957	package CFClient::UI::Face;	3658	package CFPlus::UI::Face;
2958		3659
2959	our @ISA = CFClient::UI::Base::;	3660	our @ISA = CFPlus::UI::DrawBG::;
2960		3661
2961	use CFClient::OpenGL;	3662	use CFPlus::OpenGL;
2962		3663
2963	sub new {	3664	sub new {
2964	my $class = shift;	3665	my $class = shift;
2965		3666
2966	my $self = $class->SUPER::new (	3667	my $self = $class->SUPER::new (
		3668	size_w => 32,
		3669	size_h => 8,
2967	aspect => 1,	3670	aspect => 1,
2968	can_events => 0,	3671	can_events => 0,
2969	@_,	3672	@_,
2970	);	3673	);
2971		3674
2972	if ($self->{anim} && $self->{animspeed}) {	3675	if ($self->{anim} && $self->{animspeed}) {
2973	Scalar::Util::weaken (my $widget = $self);	3676	CFPlus::weaken (my $widget = $self);
2974		3677
2975	$self->{timer} = Event->timer (	3678	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
2976	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3679	$widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
2977	hard => 1,	3680	$self->{timer} = EV::timer_ns 0, 0, sub {
2978	interval => $self->{animspeed},	3681	return unless $::CONN;
2979	cb => sub {	3682
		3683	my $w = $widget
		3684	or return;
		3685
2980	++$widget->{frame};	3686	++$w->{frame};
		3687	$w->update_face;
		3688
		3689	# somehow, $widget can go away
2981	$widget->update;	3690	$w->update;
2982	},	3691	$w->update_timer;
2983	);	3692	};
		3693
		3694	$self->update_face;
		3695	$self->update_timer;
2984	}	3696	}
2985		3697
2986	$self	3698	$self
2987	}	3699	}
2988		3700
		3701	sub update_timer {
		3702	my ($self) = @_;
		3703
		3704	return unless $self->{timer};
		3705
		3706	$self->{timer}->stop;
		3707	if ($self->{visible}) {
		3708	$self->{timer}->set (
		3709	$self->{anim_start}
		3710	+ $self->{animspeed}
		3711	* int 1.5 + (EV::now - $self->{anim_start}) / $self->{animspeed}
		3712	);
		3713	$self->{timer}->start;
		3714	}
		3715	}
		3716
		3717	sub update_face {
		3718	my ($self) = @_;
		3719
		3720	if ($::CONN) {
		3721	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3722	if ($anim && @$anim) {
		3723	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3724	delete $self->{face_change_cb};
		3725
		3726	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3727	unless ($tex->{name} || $tex->{loading}) {
		3728	$tex->upload (sub { $self->reconfigure });
		3729	}
		3730	}
		3731	}
		3732	}
		3733	}
		3734	}
		3735
2989	sub size_request {	3736	sub size_request {
2990	(32, 8)	3737	my ($self) = @_;
		3738
		3739	if ($::CONN) {
		3740	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3741	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3742	if ($tex->{name}) {
		3743	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3744	} elsif (!$tex->{loading}) {
		3745	$tex->upload (sub { $self->reconfigure });
		3746	}
		3747	}
		3748
		3749	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3750	}
		3751	}
		3752
		3753	($self->{size_w} || 8, $self->{size_h} || 8)
2991	}	3754	}
2992		3755
2993	sub update {	3756	sub update {
2994	my ($self) = @_;	3757	my ($self) = @_;
2995		3758
2996	return unless $self->{visible};	3759	return unless $self->{visible};
2997		3760
2998	$self->SUPER::update;	3761	$self->SUPER::update;
2999	}	3762	}
3000		3763
		3764	sub invoke_visibility_change {
		3765	my ($self) = @_;
		3766
		3767	$self->update_timer;
		3768
		3769	0
		3770	}
		3771
3001	sub _draw {	3772	sub _draw {
3002	my ($self) = @_;	3773	my ($self) = @_;
3003		3774
3004	return unless $::CONN;	3775	$self->SUPER::_draw;
3005		3776
3006	my $face;	3777	if (my $tex = $self->{tex}) {
3007
3008	if ($self->{frame}) {
3009	my $anim = $::CONN->{anim}[$self->{anim}];
3010
3011	$face = $anim->[ $self->{frame} % @$anim ]
3012	if $anim && @$anim;
3013	}
3014
3015	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3016
3017	if ($tex) {
3018	glEnable GL_TEXTURE_2D;	3778	glEnable GL_TEXTURE_2D;
3019	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3779	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020	glColor 0, 0, 0, 1;	3780	glColor 0, 0, 0, 1;
3021	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3781	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3022	glDisable GL_TEXTURE_2D;	3782	glDisable GL_TEXTURE_2D;
…		…
3024	}	3784	}
3025		3785
3026	sub destroy {	3786	sub destroy {
3027	my ($self) = @_;	3787	my ($self) = @_;
3028		3788
3029	$self->{timer}->cancel	3789	(delete $self->{timer})->cancel
3030	if $self->{timer};	3790	if $self->{timer};
3031		3791
3032	$self->SUPER::destroy;	3792	$self->SUPER::destroy;
3033	}	3793	}
3034		3794
3035	#############################################################################	3795	#############################################################################
3036		3796
3037	package CFClient::UI::Buttonbar;	3797	package CFPlus::UI::Buttonbar;
3038		3798
3039	our @ISA = CFClient::UI::HBox::;	3799	our @ISA = CFPlus::UI::HBox::;
3040		3800
3041	# TODO: should actualyl wrap buttons and other goodies.	3801	# TODO: should actually wrap buttons and other goodies.
3042		3802
3043	#############################################################################	3803	#############################################################################
3044		3804
3045	package CFClient::UI::Menu;	3805	package CFPlus::UI::Menu;
3046		3806
3047	our @ISA = CFClient::UI::FancyFrame::;	3807	our @ISA = CFPlus::UI::Toplevel::;
3048		3808
3049	use CFClient::OpenGL;	3809	use CFPlus::OpenGL;
3050		3810
3051	sub new {	3811	sub new {
3052	my $class = shift;	3812	my $class = shift;
3053		3813
3054	my $self = $class->SUPER::new (	3814	my $self = $class->SUPER::new (
3055	items => [],	3815	items => [],
3056	z => 100,	3816	z => 100,
3057	@_,	3817	@_,
3058	);	3818	);
3059		3819
3060	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3820	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061		3821
3062	for my $item (@{ $self->{items} }) {	3822	for my $item (@{ $self->{items} }) {
3063	my ($widget, $cb, $tooltip) = @$item;	3823	my ($widget, $cb, $tooltip) = @$item;
3064		3824
3065	# handle various types of items, only text for now	3825	# handle various types of items, only text for now
3066	if (!ref $widget) {	3826	if (!ref $widget) {
3067	if ($widget =~ /\t/) {	3827	if ($widget =~ /\t/) {
3068	my ($left, $right) = split /\t/, $widget, 2;	3828	my ($left, $right) = split /\t/, $widget, 2;
3069		3829
3070	$widget = new CFClient::UI::HBox	3830	$widget = new CFPlus::UI::HBox
3071	can_hover => 1,	3831	can_hover => 1,
3072	can_events => 1,	3832	can_events => 1,
3073	tooltip => $tooltip,	3833	tooltip => $tooltip,
3074	children => [	3834	children => [
3075	(new CFClient::UI::Label markup => $left, expand => 1),	3835	(new CFPlus::UI::Label markup => $left, expand => 1),
3076	(new CFClient::UI::Label markup => $right, align => +1),	3836	(new CFPlus::UI::Label markup => $right, align => +1),
3077	],	3837	],
3078	;	3838	;
3079		3839
3080	} else {	3840	} else {
3081	$widget = new CFClient::UI::Label	3841	$widget = new CFPlus::UI::Label
3082	can_hover => 1,	3842	can_hover => 1,
3083	can_events => 1,	3843	can_events => 1,
3084	markup => $widget,	3844	markup => $widget,
3085	tooltip => $tooltip;	3845	tooltip => $tooltip;
3086	}	3846	}
…		…
3134	1	3894	1
3135	}	3895	}
3136		3896
3137	#############################################################################	3897	#############################################################################
3138		3898
3139	package CFClient::UI::Multiplexer;	3899	package CFPlus::UI::Multiplexer;
3140		3900
3141	our @ISA = CFClient::UI::Container::;	3901	our @ISA = CFPlus::UI::Container::;
3142		3902
3143	sub new {	3903	sub new {
3144	my $class = shift;	3904	my $class = shift;
3145		3905
3146	my $self = $class->SUPER::new (	3906	my $self = $class->SUPER::new (
…		…
3207	$self->{current}->draw;	3967	$self->{current}->draw;
3208	}	3968	}
3209		3969
3210	#############################################################################	3970	#############################################################################
3211		3971
3212	package CFClient::UI::Notebook;	3972	package CFPlus::UI::Notebook;
3213		3973
		3974	use CFPlus::OpenGL;
		3975
3214	our @ISA = CFClient::UI::VBox::;	3976	our @ISA = CFPlus::UI::VBox::;
3215		3977
3216	sub new {	3978	sub new {
3217	my $class = shift;	3979	my $class = shift;
3218		3980
3219	my $self = $class->SUPER::new (	3981	my $self = $class->SUPER::new (
3220	buttonbar => (new CFClient::UI::Buttonbar),	3982	buttonbar => (new CFPlus::UI::Buttonbar),
3221	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3983	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3984	active_outline => [.7, .7, 0.2],
3222	# filter => # will be put between multiplexer and $self	3985	# filter => # will be put between multiplexer and $self
3223	@_,	3986	@_,
3224	);	3987	);
3225		3988
3226	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3989	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3227	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3990	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3228		3991
		3992	{
		3993	Scalar::Util::weaken (my $wself = $self);
		3994
		3995	$self->{multiplexer}->connect (c_add => sub {
		3996	my ($mplex, $widgets) = @_;
		3997
		3998	for my $child (@$widgets) {
		3999	Scalar::Util::weaken $child;
		4000	$child->{c_tab_} ||= do {
		4001	my $tab =
		4002	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		4003	? $child->{c_tab}
		4004	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4005
		4006	$tab->connect (activate => sub {
		4007	$wself->set_current_page ($child);
		4008	});
		4009
		4010	$tab
		4011	};
		4012
		4013	$self->{buttonbar}->add ($child->{c_tab_});
		4014	}
		4015	});
		4016
		4017	$self->{multiplexer}->connect (c_remove => sub {
		4018	my ($mplex, $widgets) = @_;
		4019
		4020	for my $child (@$widgets) {
		4021	$wself->{buttonbar}->remove ($child->{c_tab_});
		4022	}
		4023	});
		4024	}
		4025
3229	$self	4026	$self
3230	}	4027	}
3231		4028
3232	sub add {	4029	sub add {
		4030	my ($self, @widgets) = @_;
		4031
		4032	$self->{multiplexer}->add (@widgets)
		4033	}
		4034
		4035	sub remove {
		4036	my ($self, @widgets) = @_;
		4037
		4038	$self->{multiplexer}->remove (@widgets)
		4039	}
		4040
		4041	sub pages {
		4042	my ($self) = @_;
		4043	$self->{multiplexer}->children
		4044	}
		4045
		4046	sub add_tab {
3233	my ($self, $title, $widget, $tooltip) = @_;	4047	my ($self, $title, $widget, $tooltip) = @_;
3234		4048
3235	Scalar::Util::weaken $self;	4049	$title = [$title, $tooltip] unless ref $title;
		4050	$widget->{c_tab} = $title;
3236		4051
3237	$self->{buttonbar}->add (new CFClient::UI::Button
3238	markup => $title,
3239	tooltip => $tooltip,
3240	on_activate => sub { $self->set_current_page ($widget) },
3241	);
3242
3243	$self->{multiplexer}->add ($widget);	4052	$self->add ($widget);
3244	}	4053	}
3245		4054
3246	sub get_current_page {	4055	sub get_current_page {
3247	my ($self) = @_;	4056	my ($self) = @_;
3248		4057
…		…
3254		4063
3255	$self->{multiplexer}->set_current_page ($page);	4064	$self->{multiplexer}->set_current_page ($page);
3256	$self->emit (page_changed => $self->{multiplexer}{current});	4065	$self->emit (page_changed => $self->{multiplexer}{current});
3257	}	4066	}
3258		4067
		4068	sub _draw {
		4069	my ($self) = @_;
		4070
		4071	$self->SUPER::_draw ();
		4072
		4073	if (my $cur = $self->{multiplexer}{current}) {
		4074	if ($cur = $cur->{c_tab_}) {
		4075	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4076	$self->{buttonbar}{y} + $cur->{y};
		4077	glLineWidth 3;
		4078	#glEnable GL_BLEND;
		4079	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4080	glColor @{$self->{active_outline}};
		4081	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4082	glLineWidth 1;
		4083	#glDisable GL_BLEND;
		4084	}
		4085	}
		4086	}
		4087
3259	#############################################################################	4088	#############################################################################
3260		4089
3261	package CFClient::UI::Combobox;	4090	package CFPlus::UI::Selector;
3262		4091
3263	use utf8;	4092	use utf8;
3264		4093
3265	our @ISA = CFClient::UI::Button::;	4094	our @ISA = CFPlus::UI::Button::;
3266		4095
3267	sub new {	4096	sub new {
3268	my $class = shift;	4097	my $class = shift;
3269		4098
3270	my $self = $class->SUPER::new (	4099	my $self = $class->SUPER::new (
…		…
3287	my ($value, $title, $tooltip) = @$_;	4116	my ($value, $title, $tooltip) = @$_;
3288		4117
3289	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4118	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3290	}	4119	}
3291		4120
3292	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4121	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3293	}	4122	}
3294		4123
3295	sub _set_value {	4124	sub _set_value {
3296	my ($self, $value) = @_;	4125	my ($self, $value) = @_;
3297		4126
3298	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4127	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4128	$item ||= $self->{options}[0]
3299	or return;	4129	or return;
3300		4130
3301	$self->{value} = $item->[0];	4131	$self->{value} = $item->[0];
3302	$self->set_markup ("$item->[1] ⇓");	4132	$self->set_markup ("$item->[1] ⇓");
3303	$self->set_tooltip ($item->[2]);	4133	# $self->set_tooltip ($item->[2]);
3304	}	4134	}
3305		4135
3306	sub set_value {	4136	sub set_value {
3307	my ($self, $value) = @_;	4137	my ($self, $value) = @_;
3308		4138
…		…
3310		4140
3311	$self->_set_value ($value);	4141	$self->_set_value ($value);
3312	$self->emit (changed => $value);	4142	$self->emit (changed => $value);
3313	}	4143	}
3314		4144
		4145	sub set_options {
		4146	my ($self, $options) = @_;
		4147
		4148	$self->{options} = $options;
		4149	$self->_set_value ($self->{value});
		4150	}
		4151
3315	#############################################################################	4152	#############################################################################
3316		4153
3317	package CFClient::UI::Statusbox;	4154	package CFPlus::UI::Statusbox;
3318		4155
3319	our @ISA = CFClient::UI::VBox::;	4156	our @ISA = CFPlus::UI::VBox::;
3320		4157
3321	sub new {	4158	sub new {
3322	my $class = shift;	4159	my $class = shift;
3323		4160
3324	my $self = $class->SUPER::new (	4161	my $self = $class->SUPER::new (
3325	fontsize => 0.8,	4162	fontsize => 0.8,
3326	@_,	4163	@_,
3327	);	4164	);
3328		4165
3329	Scalar::Util::weaken (my $this = $self);	4166	CFPlus::weaken (my $this = $self);
3330		4167
3331	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4168	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3332		4169
3333	$self	4170	$self
3334	}	4171	}
3335		4172
3336	sub reorder {	4173	sub reorder {
3337	my ($self) = @_;	4174	my ($self) = @_;
3338	my $NOW = Time::HiRes::time;	4175	my $NOW = Time::HiRes::time;
3339		4176
3340	# freeze display when hovering over any label	4177	# freeze display when hovering over any label
3341	return if $CFClient::UI::TOOLTIP->{owner}	4178	return if $CFPlus::UI::TOOLTIP->{owner}
3342	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4179	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3343	values %{ $self->{item} };	4180	values %{ $self->{item} };
3344		4181
3345	while (my ($k, $v) = each %{ $self->{item} }) {	4182	while (my ($k, $v) = each %{ $self->{item} }) {
3346	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4183	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3347	}	4184	}
…		…
3350		4187
3351	my @items = sort {	4188	my @items = sort {
3352	$a->{pri} <=> $b->{pri}	4189	$a->{pri} <=> $b->{pri}
3353	or $b->{id} <=> $a->{id}	4190	or $b->{id} <=> $a->{id}
3354	} values %{ $self->{item} };	4191	} values %{ $self->{item} };
3355
3356	$self->{timer}->interval (1);
3357		4192
3358	my $count = 10 + 1;	4193	my $count = 10 + 1;
3359	for my $item (@items) {	4194	for my $item (@items) {
3360	last unless --$count;	4195	last unless --$count;
3361		4196
…		…
3368	for ($short) {	4203	for ($short) {
3369	s/^\s+//;	4204	s/^\s+//;
3370	s/\s+/ /g;	4205	s/\s+/ /g;
3371	}	4206	}
3372		4207
3373	new CFClient::UI::Label	4208	new CFPlus::UI::Label
3374	markup => $short,	4209	markup => $short,
3375	tooltip => $item->{tooltip},	4210	tooltip => $item->{tooltip},
3376	tooltip_font => $::FONT_PROP,	4211	tooltip_font => $::FONT_PROP,
3377	tooltip_width => 0.67,	4212	tooltip_width => 0.67,
3378	fontsize => $item->{fontsize} || $self->{fontsize},	4213	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3385	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4220	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3386	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4221	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3387	$label->update;	4222	$label->update;
3388	$label->set_max_size (undef, $label->{req_h} * $diff)	4223	$label->set_max_size (undef, $label->{req_h} * $diff)
3389	if $diff < 1;	4224	if $diff < 1;
3390	$self->{timer}->interval (1/30);	4225	$self->{timer}->set (1/30, 1/30);
3391	} else {	4226	} else {
3392	$label->{fg}[3] = $item->{fg}[3] || 1;	4227	$label->{fg}[3] = $item->{fg}[3] || 1;
3393	}	4228	}
3394		4229
3395	push @widgets, $label;	4230	push @widgets, $label;
…		…
3457	$self->SUPER::destroy;	4292	$self->SUPER::destroy;
3458	}	4293	}
3459		4294
3460	#############################################################################	4295	#############################################################################
3461		4296
3462	package CFClient::UI::Inventory;
3463
3464	our @ISA = CFClient::UI::Table::;
3465
3466	sub new {
3467	my $class = shift;
3468
3469	my $self = $class->SUPER::new (
3470	col_expand => [0, 1, 0],
3471	@_,
3472	);
3473
3474	$self
3475	}
3476
3477	sub set_items {
3478	my ($self, $items) = @_;
3479
3480	$self->clear;
3481	return unless $items;
3482
3483	my @items = sort {
3484	($a->{type} <=> $b->{type})
3485	or ($a->{name} cmp $b->{name})
3486	} values %$items;
3487
3488	$self->{real_items} = \@items;
3489
3490	my $row = 0;
3491	for my $item (@items) {
3492	CFClient::Item::update_widgets $item;
3493
3494	$self->add (0, $row, $item->{face_widget});
3495	$self->add (1, $row, $item->{desc_widget});
3496	$self->add (2, $row, $item->{weight_widget});
3497
3498	$row++;
3499	}
3500	}
3501
3502	#############################################################################
3503
3504	package CFClient::UI::SpellList;
3505
3506	our @ISA = CFClient::UI::Table::;
3507
3508	sub new {
3509	my $class = shift;
3510
3511	my $self = $class->SUPER::new (
3512	binding => [],
3513	commands => [],
3514	@_,
3515	)
3516	}
3517
3518	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3519
3520	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3521	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3522	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3523	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3524	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3525	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3526	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3527	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3528	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3529	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3530
3531	sub rebuild_spell_list {
3532	my ($self) = @_;
3533
3534	$CFClient::UI::ROOT->on_refresh ($self => sub {
3535	$self->clear;
3536
3537	return unless $::CONN;
3538
3539	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3540	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3541	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3542	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3543	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3544
3545	my $row = 0;
3546
3547	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3548	my $spell = $self->{spell}{$_};
3549
3550	$row++;
3551
3552	my $spell_cb = sub {
3553	my ($widget, $ev) = @_;
3554
3555	if ($ev->{button} == 1) {
3556	$::CONN->user_send ("cast $spell->{name}");
3557	} elsif ($ev->{button} == 2) {
3558	$::CONN->user_send ("invoke $spell->{name}");
3559	} elsif ($ev->{button} == 3) {
3560	(new CFClient::UI::Menu
3561	items => [
3562	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3563	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3564	],
3565	)->popup ($ev);
3566	} else {
3567	return 0;
3568	}
3569
3570	1
3571	};
3572
3573	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3574
3575	#TODO: add path info to tooltip
3576	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3577
3578	$self->add (0, $row, new CFClient::UI::Face
3579	face => $spell->{face},
3580	can_hover => 1,
3581	can_events => 1,
3582	tooltip => $tooltip,
3583	on_button_down => $spell_cb,
3584	);
3585
3586	$self->add (1, $row, new CFClient::UI::Label
3587	expand => 1,
3588	text => $spell->{name},
3589	can_hover => 1,
3590	can_events => 1,
3591	tooltip => $tooltip,
3592	on_button_down => $spell_cb,
3593	);
3594
3595	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3596	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3597	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3598	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3599	}
3600	});
3601	}
3602
3603	sub add_spell {
3604	my ($self, $spell) = @_;
3605
3606	$self->{spell}->{$spell->{name}} = $spell;
3607	$self->rebuild_spell_list;
3608	}
3609
3610	sub remove_spell {
3611	my ($self, $spell) = @_;
3612
3613	delete $self->{spell}->{$spell->{name}};
3614	$self->rebuild_spell_list;
3615	}
3616
3617	sub clear_spells {
3618	my ($self) = @_;
3619
3620	$self->{spell} = {};
3621	$self->rebuild_spell_list;
3622	}
3623
3624	#############################################################################
3625
3626	package CFClient::UI::Root;	4297	package CFPlus::UI::Root;
3627		4298
3628	our @ISA = CFClient::UI::Container::;	4299	our @ISA = CFPlus::UI::Container::;
3629		4300
3630	use List::Util qw(min max);	4301	use List::Util qw(min max);
3631		4302
3632	use CFClient::OpenGL;	4303	use CFPlus::OpenGL;
3633		4304
3634	sub new {	4305	sub new {
3635	my $class = shift;	4306	my $class = shift;
3636		4307
3637	my $self = $class->SUPER::new (	4308	my $self = $class->SUPER::new (
3638	visible => 1,	4309	visible => 1,
3639	@_,	4310	@_,
3640	);	4311	);
3641		4312
3642	Scalar::Util::weaken ($self->{root} = $self);	4313	CFPlus::weaken ($self->{root} = $self);
3643		4314
3644	$self	4315	$self
3645	}	4316	}
3646		4317
3647	sub size_request {	4318	sub size_request {
…		…
3695	}	4366	}
3696		4367
3697	sub update {	4368	sub update {
3698	my ($self) = @_;	4369	my ($self) = @_;
3699		4370
3700	$::WANT_REFRESH++;	4371	$::WANT_REFRESH->start;
3701	}	4372	}
3702		4373
3703	sub add {	4374	sub add {
3704	my ($self, @children) = @_;	4375	my ($self, @children) = @_;
3705		4376
…		…
3742	while ($self->{refresh_hook}) {	4413	while ($self->{refresh_hook}) {
3743	$_->()	4414	$_->()
3744	for values %{delete $self->{refresh_hook}};	4415	for values %{delete $self->{refresh_hook}};
3745	}	4416	}
3746		4417
3747	if ($self->{realloc}) {	4418	while ($self->{realloc}) {
3748	my %queue;	4419	my %queue;
3749	my @queue;	4420	my @queue;
3750	my $widget;	4421	my $widget;
3751		4422
3752	outer:	4423	outer:
…		…
3799	}	4470	}
3800	}	4471	}
3801		4472
3802	delete $self->{realloc}{$widget+0};	4473	delete $self->{realloc}{$widget+0};
3803	}	4474	}
3804	}
3805		4475
3806	while (my $size_alloc = delete $self->{size_alloc}) {	4476	while (my $size_alloc = delete $self->{size_alloc}) {
3807	my @queue = sort { $b->{visible} <=> $a->{visible} }	4477	my @queue = sort { $a->{visible} <=> $b->{visible} }
3808	values %$size_alloc;	4478	values %$size_alloc;
3809		4479
3810	while () {	4480	while () {
3811	my $widget = pop @queue || last;	4481	my $widget = pop @queue || last;
3812		4482
3813	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4483	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3814		4484
3815	$w = 0 if $w < 0;	4485	$w = max $widget->{min_w}, $w;
3816	$h = 0 if $h < 0;	4486	$h = max $widget->{min_h}, $h;
3817		4487
		4488	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4489	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4490
		4491	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4492	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4493
3818	$w = int $w + 0.5;	4494	$w = int $w + 0.5;
3819	$h = int $h + 0.5;	4495	$h = int $h + 0.5;
3820		4496
3821	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4497	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3822	$widget->{old_w} = $widget->{w};	4498	$widget->{old_w} = $widget->{w};
3823	$widget->{old_h} = $widget->{h};	4499	$widget->{old_h} = $widget->{h};
3824		4500
3825	$widget->{w} = $w;	4501	$widget->{w} = $w;
3826	$widget->{h} = $h;	4502	$widget->{h} = $h;
3827		4503
3828	$widget->emit (size_allocate => $w, $h);	4504	$widget->emit (size_allocate => $w, $h);
		4505	}
3829	}	4506	}
3830	}	4507	}
3831	}	4508	}
3832		4509
3833	while ($self->{post_alloc_hook}) {	4510	while ($self->{post_alloc_hook}) {
3834	$_->()	4511	$_->()
3835	for values %{delete $self->{post_alloc_hook}};	4512	for values %{delete $self->{post_alloc_hook}};
3836	}	4513	}
3837
3838		4514
3839	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4515	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3840	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4516	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3841	glClear GL_COLOR_BUFFER_BIT;	4517	glClear GL_COLOR_BUFFER_BIT;
3842		4518
…		…
3845	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4521	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3846	glMatrixMode GL_MODELVIEW;	4522	glMatrixMode GL_MODELVIEW;
3847	glLoadIdentity;	4523	glLoadIdentity;
3848		4524
3849	{	4525	{
3850	package CFClient::UI::Base;	4526	package CFPlus::UI::Base;
3851		4527
3852	($draw_x, $draw_y, $draw_w, $draw_h) =	4528	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3853	(0, 0, $self->{w}, $self->{h});	4529	(0, 0, $self->{w}, $self->{h});
3854	}
3855		4530
3856	$self->_draw;	4531	$self->_draw;
		4532	}
3857	}	4533	}
3858		4534
3859	#############################################################################	4535	#############################################################################
3860		4536
3861	package CFClient::UI;	4537	package CFPlus::UI;
3862		4538
3863	$ROOT = new CFClient::UI::Root;	4539	$ROOT = new CFPlus::UI::Root;
3864	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4540	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3865		4541
3866	1	4542	1
3867		4543

Diff Legend

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