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.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.448 by root, Tue Dec 25 07:39:18 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) = @_;
		461
		462	return (undef, undef) unless $self->{parent};
418		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 {
…		…
456		501
457	sub invoke_mouse_motion { 0 }	502	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 0 }	503	sub invoke_button_up { 0 }
459	sub invoke_key_down { 0 }	504	sub invoke_key_down { 0 }
460	sub invoke_key_up { 0 }	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;
…		…
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
		543	# I do not really like this solution, but I do not like duplication
		544	# and needlessly verbose code, either.
		545	my @append
		546	= $has_coords{$signal}
		547	? $args[0]->xy ($self)
		548	: ();
		549
479	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	550	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480		551
481	#d##TODO# stop propagating at first true, do not use sum	552	for my $cb (
482	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	553	@{$self->{signal_cb}{$signal} || []}, # before
483	|| ($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
484	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	560	$self->{parent} && $self->{parent}->emit ($signal, @args)
485	}	561	}
486		562
487	sub find_widget {	563	#sub find_widget {
488	my ($self, $x, $y) = @_;	564	# in .xs
489
490	return () unless $self->{can_events};
491
492	return $self
493	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
494	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
495
496	()
497	}
498		565
499	sub set_parent {	566	sub set_parent {
500	my ($self, $parent) = @_;	567	my ($self, $parent) = @_;
501		568
502	Scalar::Util::weaken ($self->{parent} = $parent);	569	CFPlus::weaken ($self->{parent} = $parent);
503	$self->set_visible if $parent->{visible};	570	$self->set_visible if $parent->{visible};
504	}	571	}
505		572
506	sub realloc {	573	sub realloc {
507	my ($self) = @_;	574	my ($self) = @_;
…		…
533		600
534	# 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
535	# functions seems pointless.	602	# functions seems pointless.
536	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
537		604
538	sub draw {	605	#sub draw {
539	my ($self) = @_;	606	#CFPlus.xs
540
541	return unless $self->{h} && $self->{w};
542
543	# update screen rectangle
544	local $draw_x = $draw_x + $self->{x};
545	local $draw_y = $draw_y + $self->{y};
546
547	# skip widgets that are entirely outside the drawing area
548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550
551	glPushMatrix;
552	glTranslate $self->{x}, $self->{y}, 0;
553
554	if ($self == $HOVER && $self->{can_hover}) {
555	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
556	glEnable GL_BLEND;
557	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
558	glBegin GL_QUADS;
559	glVertex 0 , 0;
560	glVertex $self->{w}, 0;
561	glVertex $self->{w}, $self->{h};
562	glVertex 0 , $self->{h};
563	glEnd;
564	glDisable GL_BLEND;
565	}
566
567	if ($ENV{CFPLUS_DEBUG} & 1) {
568	glPushMatrix;
569	glColor 1, 1, 0, 1;
570	glTranslate 0.375, 0.375;
571	glBegin GL_LINE_LOOP;
572	glVertex 0 , 0;
573	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;
576	glEnd;
577	glPopMatrix;
578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579	}
580
581	$self->_draw;
582	glPopMatrix;
583	}
584		607
585	sub _draw {	608	sub _draw {
586	my ($self) = @_;	609	my ($self) = @_;
587		610
588	warn "no draw defined for $self\n";	611	warn "no draw defined for $self\n";
589	}	612	}
590		613
591	sub DESTROY {	614	sub DESTROY {
592	my ($self) = @_;	615	my ($self) = @_;
593		616
594	return if CFClient::in_destruct;	617	return if CFPlus::in_destruct;
595		618
596	delete $WIDGET{$self+0};	619	local $@;
597
598	eval { $self->destroy };	620	eval { $self->destroy };
599	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};
600	}	624	}
601		625
602	#############################################################################	626	#############################################################################
603		627
604	package CFClient::UI::DrawBG;	628	package CFPlus::UI::DrawBG;
605		629
606	our @ISA = CFClient::UI::Base::;	630	our @ISA = CFPlus::UI::Base::;
607		631
608	use strict;	632	use strict;
609	use CFClient::OpenGL;	633	use CFPlus::OpenGL;
610		634
611	sub new {	635	sub new {
612	my $class = shift;	636	my $class = shift;
613
614	# range [value, low, high, page]
615		637
616	$class->SUPER::new (	638	$class->SUPER::new (
617	#bg => [0, 0, 0, 0.2],	639	#bg => [0, 0, 0, 0.2],
618	#active_bg => [1, 1, 1, 0.5],	640	#active_bg => [1, 1, 1, 0.5],
619	@_	641	@_
…		…
631	my ($w, $h) = @$self{qw(w h)};	653	my ($w, $h) = @$self{qw(w h)};
632		654
633	glEnable GL_BLEND;	655	glEnable GL_BLEND;
634	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	656	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
635	glColor_premultiply @$color;	657	glColor_premultiply @$color;
636
637	glBegin GL_QUADS;
638	glVertex 0 , 0;
639	glVertex 0 , $h;
640	glVertex $w, $h;	658	glRect 0, 0, $w, $h;
641	glVertex $w, 0;
642	glEnd;
643
644	glDisable GL_BLEND;	659	glDisable GL_BLEND;
645	}	660	}
646	}	661	}
647		662
648	#############################################################################	663	#############################################################################
649		664
650	package CFClient::UI::Empty;	665	package CFPlus::UI::Empty;
651		666
652	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
653		668
654	sub new {	669	sub new {
655	my ($class, %arg) = @_;	670	my ($class, %arg) = @_;
656	$class->SUPER::new (can_events => 0, %arg);	671	$class->SUPER::new (can_events => 0, %arg);
657	}	672	}
…		…
664		679
665	sub draw { }	680	sub draw { }
666		681
667	#############################################################################	682	#############################################################################
668		683
669	package CFClient::UI::Container;	684	package CFPlus::UI::Container;
670		685
671	our @ISA = CFClient::UI::Base::;	686	our @ISA = CFPlus::UI::Base::;
672		687
673	sub new {	688	sub new {
674	my ($class, %arg) = @_;	689	my ($class, %arg) = @_;
675		690
676	my $children = delete $arg{children};	691	my $children = delete $arg{children};
…		…
680	can_events => 0,	695	can_events => 0,
681	%arg,	696	%arg,
682	);	697	);
683		698
684	$self->add (@$children)	699	$self->add (@$children)
685	if $children;	700	if $children && @$children;
686		701
687	$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;
688	}	711	}
689		712
690	sub add {	713	sub add {
691	my ($self, @widgets) = @_;	714	my ($self, @widgets) = @_;
692		715
693	$_->set_parent ($self)	716	$_->set_parent ($self)
694	for @widgets;	717	for @widgets;
695		718
		719	# TODO: only do this in widgets that need it, e.g. root, fixed
696	use sort 'stable';	720	use sort 'stable';
697		721
698	$self->{children} = [	722	$self->{children} = [
699	sort { $a->{z} <=> $b->{z} }	723	sort { $a->{z} <=> $b->{z} }
700	@{$self->{children}}, @widgets	724	@{$self->{children}}, @widgets
701	];	725	];
702		726
703	$self->realloc;	727	$self->realloc;
		728
		729	$self->emit (c_add => \@widgets);
		730
		731	map $_+0, @widgets
704	}	732	}
705		733
706	sub children {	734	sub children {
707	@{ $_[0]{children} }	735	@{ $_[0]{children} }
708	}	736	}
709		737
710	sub remove {	738	sub remove {
711	my ($self, $child) = @_;	739	my ($self, @widgets) = @_;
712		740
		741	$self->emit (c_remove => \@widgets);
		742
		743	for my $child (@widgets) {
713	delete $child->{parent};	744	delete $child->{parent};
714	$child->hide;	745	$child->hide;
715
716	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	746	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		747	}
717		748
718	$self->realloc;	749	$self->realloc;
719	}	750	}
720		751
721	sub clear {	752	sub clear {
722	my ($self) = @_;	753	my ($self) = @_;
723		754
724	my $children = delete $self->{children};	755	my $children = $self->{children};
725	$self->{children} = [];	756	$self->{children} = [];
726		757
727	for (@$children) {	758	for (@$children) {
728	delete $_->{parent};	759	delete $_->{parent};
729	$_->hide;	760	$_->hide;
…		…
749	}	780	}
750		781
751	sub _draw {	782	sub _draw {
752	my ($self) = @_;	783	my ($self) = @_;
753		784
754	$_->draw for @{$self->{children}};	785	$_->draw for $self->visible_children;
755	}	786	}
756		787
757	#############################################################################	788	#############################################################################
758		789
759	package CFClient::UI::Bin;	790	package CFPlus::UI::Bin;
760		791
761	our @ISA = CFClient::UI::Container::;	792	our @ISA = CFPlus::UI::Container::;
762		793
763	sub new {	794	sub new {
764	my ($class, %arg) = @_;	795	my ($class, %arg) = @_;
765		796
766	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	797	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
767		798
768	$class->SUPER::new (children => [$child], %arg)	799	$class->SUPER::new (children => [$child], %arg)
769	}	800	}
770		801
771	sub add {	802	sub add {
772	my ($self, $child) = @_;	803	my ($self, $child) = @_;
773		804
774	$self->SUPER::remove ($_) for @{ $self->{children} };	805	$self->clear;
775	$self->SUPER::add ($child);	806	$self->SUPER::add ($child);
776	}	807	}
777		808
778	sub remove {	809	sub remove {
779	my ($self, $widget) = @_;	810	my ($self, $widget) = @_;
780		811
781	$self->SUPER::remove ($widget);	812	$self->SUPER::remove ($widget);
782		813
783	$self->{children} = [new CFClient::UI::Empty]	814	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	815	unless @{$self->{children}};
785	}	816	}
786		817
787	sub child { $_[0]->{children}[0] }	818	sub child { $_[0]->{children}[0] }
788		819
…		…
797		828
798	1	829	1
799	}	830	}
800		831
801	#############################################################################	832	#############################################################################
802
803	# back-buffered drawing area	833	# back-buffered drawing area
804		834
805	package CFClient::UI::Window;	835	package CFPlus::UI::Window;
806		836
807	our @ISA = CFClient::UI::Bin::;	837	our @ISA = CFPlus::UI::Bin::;
808		838
809	use CFClient::OpenGL;	839	use CFPlus::OpenGL;
810		840
811	sub new {	841	sub new {
812	my ($class, %arg) = @_;	842	my ($class, %arg) = @_;
813		843
814	my $self = $class->SUPER::new (%arg);	844	my $self = $class->SUPER::new (%arg);
…		…
836	}	866	}
837		867
838	sub render_child {	868	sub render_child {
839	my ($self) = @_;	869	my ($self) = @_;
840		870
841	$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 {
842	glClearColor 0, 0, 0, 0;	872	glClearColor 0, 0, 0, 0;
843	glClear GL_COLOR_BUFFER_BIT;	873	glClear GL_COLOR_BUFFER_BIT;
844		874
845	{	875	{
846	package CFClient::UI::Base;	876	package CFPlus::UI::Base;
847		877
848	($draw_x, $draw_y, $draw_w, $draw_h) =	878	local ($draw_x, $draw_y, $draw_w, $draw_h) =
849	(0, 0, $self->{w}, $self->{h});	879	(0, 0, $self->{w}, $self->{h});
		880
		881	$self->_render;
850	}	882	}
851
852	$self->_render;
853	};	883	};
854	}	884	}
855		885
856	sub _draw {	886	sub _draw {
857	my ($self) = @_;	887	my ($self) = @_;
858
859	my ($w, $h) = @$self{qw(w h)};
860		888
861	my $tex = $self->{texture}	889	my $tex = $self->{texture}
862	or return;	890	or return;
863		891
864	glEnable GL_TEXTURE_2D;	892	glEnable GL_TEXTURE_2D;
865	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
866	glColor 0, 0, 0, 1;	894	glColor 0, 0, 0, 1;
867		895
868	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	896	$tex->draw_quad_alpha_premultiplied (0, 0);
869		897
870	glDisable GL_TEXTURE_2D;	898	glDisable GL_TEXTURE_2D;
871	}	899	}
872		900
873	#############################################################################	901	#############################################################################
874		902
875	package CFClient::UI::ViewPort;	903	package CFPlus::UI::ViewPort;
876		904
		905	use List::Util qw(min max);
		906
877	our @ISA = CFClient::UI::Window::;	907	our @ISA = CFPlus::UI::Window::;
878		908
879	sub new {	909	sub new {
880	my $class = shift;	910	my $class = shift;
881		911
882	$class->SUPER::new (	912	$class->SUPER::new (
…		…
889	sub size_request {	919	sub size_request {
890	my ($self) = @_;	920	my ($self) = @_;
891		921
892	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	922	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
893		923
894	$w = 10 if $self->{scroll_x};	924	$w = 1 if $self->{scroll_x};
895	$h = 10 if $self->{scroll_y};	925	$h = 1 if $self->{scroll_y};
896		926
897	($w, $h)	927	($w, $h)
898	}	928	}
899		929
900	sub invoke_size_allocate {	930	sub invoke_size_allocate {
…		…
912	}	942	}
913		943
914	sub set_offset {	944	sub set_offset {
915	my ($self, $x, $y) = @_;	945	my ($self, $x, $y) = @_;
916		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}) {
917	$self->{view_x} = int $x;	951	$self->{view_x} = $x;
918	$self->{view_y} = int $y;	952	$self->{view_y} = $y;
919		953
		954	$self->emit (changed => $x, $y);
920	$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	}
921	}	975	}
922		976
923	# 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
924	sub coord2local {	978	sub coord2local {
925	my ($self, $x, $y) = @_;	979	my ($self, $x, $y) = @_;
…		…
940	my ($self, $x, $y) = @_;	994	my ($self, $x, $y) = @_;
941		995
942	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
943	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
944	) {	998	) {
945	$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})
946	} else {	1000	} else {
947	$self->CFClient::UI::Base::find_widget ($x, $y)	1001	$self->CFPlus::UI::Base::find_widget ($x, $y)
948	}	1002	}
949	}	1003	}
950		1004
951	sub _render {	1005	sub _render {
952	my ($self) = @_;	1006	my ($self) = @_;
953		1007
954	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};
955	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};
956		1010
957	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1011	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
958		1012
959	$self->SUPER::_render;	1013	$self->SUPER::_render;
960	}	1014	}
961		1015
962	#############################################################################	1016	#############################################################################
963		1017
964	package CFClient::UI::ScrolledWindow;	1018	package CFPlus::UI::ScrolledWindow;
965		1019
966	our @ISA = CFClient::UI::HBox::;	1020	our @ISA = CFPlus::UI::Table::;
967		1021
968	sub new {	1022	sub new {
969	my ($class, %arg) = @_;	1023	my ($class, %arg) = @_;
970		1024
971	my $child = delete $arg{child};	1025	my $child = delete $arg{child};
972		1026
973	my $self;	1027	my $self;
974		1028
975	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,
976	vertical => 1,	1043	vertical => 1,
977	range => [0, 0, 1, 0.01], # HACK fix	1044	range => [0, 0, 1, 0.01], # HACK fix
978	on_changed => sub {	1045	on_changed => sub {
979	$self->{vp}->set_offset (0, $_[1]);	1046	$self->{vpos} = $_[1];
		1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
980	},	1048	},
981	;	1049	;
982		1050
983	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
984	vp => (new CFClient::UI::ViewPort expand => 1),	1052	scroll_x => 0,
		1053	scroll_y => 1,
		1054	can_events => 1,
985	slider => $slider,	1055	hslider => $hslider,
		1056	vslider => $vslider,
		1057	col_expand => [1, 0],
		1058	row_expand => [1, 0],
986	%arg,	1059	%arg,
987	);	1060	);
988		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
989	$self->SUPER::add ($self->{vp}, $self->{slider});	1083	$self->SUPER::add ($self->{vp});
		1084
990	$self->add ($child) if $child;	1085	$self->add ($child) if $child;
991		1086
992	$self	1087	$self
993	}	1088	}
994
995	#TODO# update range on size_allocate depending on child
996		1089
997	sub add {	1090	sub add {
998	my ($self, $widget) = @_;	1091	my ($self, $widget) = @_;
999		1092
1000	$self->{vp}->add ($self->{child} = $widget);	1093	$self->{vp}->add ($self->{child} = $widget);
1001	}	1094	}
1002		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
		1100	sub update_slider {
		1101	my ($self) = @_;
		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});
		1107	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1108
		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 {
		1131	my ($self, $ev) = @_;
		1132
		1133	$self->grab_focus;
		1134
		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
1003	sub invoke_button_up {	1168	sub invoke_button_up {
1004	my ($self, $ev) = @_;	1169	my ($self, $ev, $x, $y) = @_;
1005		1170
1006	warn "button up $ev->{button}\n";#d#	1171	if (delete $self->{motion}) {
		1172	return 1;
1007		1173	}
		1174
1008	0	1175	0
1009	}	1176	}
1010		1177
1011	sub update_slider {	1178	sub invoke_mouse_motion {
1012	my ($self) = @_;	1179	my ($self, $ev, $x, $y) = @_;
1013		1180
1014	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1181	if ($self->{motion}) {
1015	}	1182	$self->{motion}->($ev, $x, $y);
		1183	return 1;
		1184	}
1016		1185
1017	sub update {	1186	0
1018	my ($self) = @_;
1019
1020	$self->SUPER::update;
1021
1022	$self->update_slider;
1023	}	1187	}
1024		1188
1025	sub invoke_size_allocate {	1189	sub invoke_size_allocate {
1026	my ($self, $w, $h) = @_;	1190	my ($self, $w, $h) = @_;
1027		1191
1028	$self->update_slider;	1192	$self->update_slider;
1029
1030	$self->SUPER::invoke_size_allocate ($w, $h)	1193	$self->SUPER::invoke_size_allocate ($w, $h)
1031	}	1194	}
1032		1195
1033	#############################################################################	1196	#############################################################################
1034		1197
1035	package CFClient::UI::Frame;	1198	package CFPlus::UI::Frame;
1036		1199
1037	our @ISA = CFClient::UI::Bin::;	1200	our @ISA = CFPlus::UI::Bin::;
1038		1201
1039	use CFClient::OpenGL;	1202	use CFPlus::OpenGL;
1040		1203
1041	sub new {	1204	sub new {
1042	my $class = shift;	1205	my $class = shift;
1043		1206
1044	$class->SUPER::new (	1207	$class->SUPER::new (
…		…
1054	my ($w, $h) = @$self{qw(w h)};	1217	my ($w, $h) = @$self{qw(w h)};
1055		1218
1056	glEnable GL_BLEND;	1219	glEnable GL_BLEND;
1057	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1220	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1058	glColor_premultiply @{ $self->{bg} };	1221	glColor_premultiply @{ $self->{bg} };
1059
1060	glBegin GL_QUADS;
1061	glVertex 0 , 0;
1062	glVertex 0 , $h;
1063	glVertex $w, $h;	1222	glRect 0, 0, $w, $h;
1064	glVertex $w, 0;
1065	glEnd;
1066
1067	glDisable GL_BLEND;	1223	glDisable GL_BLEND;
1068	}	1224	}
1069		1225
1070	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1071	}	1227	}
1072		1228
1073	#############################################################################	1229	#############################################################################
1074		1230
1075	package CFClient::UI::FancyFrame;	1231	package CFPlus::UI::FancyFrame;
1076		1232
1077	our @ISA = CFClient::UI::Bin::;	1233	our @ISA = CFPlus::UI::Bin::;
1078		1234
1079	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;
1080		1336
1081	my $bg =	1337	my $bg =
1082	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1338	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1083	mipmap => 1, wrap => 1;	1339	mipmap => 1, wrap => 1;
1084		1340
1085	my @border =	1341	my @border =
1086	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1342	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1087	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);
1088		1348
1089	sub new {	1349	sub new {
1090	my ($class, %arg) = @_;	1350	my ($class, %arg) = @_;
1091		1351
1092	my $self = $class->SUPER::new (	1352	my $self = $class->SUPER::new (
…		…
1097	min_w => 64,	1357	min_w => 64,
1098	min_h => 32,	1358	min_h => 32,
1099	%arg,	1359	%arg,
1100	);	1360	);
1101		1361
1102	$self->{title_widget} = new CFClient::UI::Label	1362	$self->{title_widget} = new CFPlus::UI::Label
1103	align => 0,	1363	align => 0,
1104	valign => 1,	1364	valign => 1,
1105	text => $self->{title},	1365	text => $self->{title},
1106	fontsize => $self->{border},	1366	fontsize => $self->{border},
1107	if exists $self->{title};	1367	if exists $self->{title};
1108		1368
1109	if ($self->{has_close_button}) {	1369	if ($self->{has_close_button}) {
1110	$self->{close_button} =	1370	$self->{close_button} =
1111	new CFClient::UI::ImageButton	1371	new CFPlus::UI::ImageButton
1112	path => 'x1_close.png',	1372	path => 'x1_close.png',
1113	on_activate => sub { $self->emit ("delete") };	1373	on_activate => sub { $self->emit ("delete") };
1114		1374
1115	$self->CFClient::UI::Container::add ($self->{close_button});	1375	$self->CFPlus::UI::Container::add ($self->{close_button});
1116	}	1376	}
1117		1377
1118	$self	1378	$self
1119	}	1379	}
1120		1380
1121	sub add {	1381	sub add {
1122	my ($self, @widgets) = @_;	1382	my ($self, @widgets) = @_;
1123		1383
1124	$self->SUPER::add (@widgets);	1384	$self->SUPER::add (@widgets);
1125	$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};
1126	$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};
1127	}	1387	}
1128		1388
1129	sub border {	1389	sub border {
1130	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
1131	}	1400	}
1132		1401
1133	sub size_request {	1402	sub size_request {
1134	my ($self) = @_;	1403	my ($self) = @_;
1135		1404
…		…
1239	$self->{motion}->($ev, $x, $y) if $self->{motion};	1508	$self->{motion}->($ev, $x, $y) if $self->{motion};
1240		1509
1241	! ! $self->{motion}	1510	! ! $self->{motion}
1242	}	1511	}
1243		1512
		1513	sub invoke_visibility_change {
		1514	my ($self, $visible) = @_;
		1515
		1516	delete $self->{motion} unless $visible;
		1517
		1518	0
		1519	}
		1520
1244	sub _draw {	1521	sub _draw {
1245	my ($self) = @_;	1522	my ($self) = @_;
1246		1523
1247	my $child = $self->{children}[0];	1524	my $child = $self->{children}[0];
1248		1525
…		…
1253	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1254		1531
1255	my $border = $self->border;	1532	my $border = $self->border;
1256		1533
1257	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1258	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1259	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1260	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1261	$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);
1262		1553
1263	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1264	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1265		1556
1266	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1285	if $self->{close_button};	1576	if $self->{close_button};
1286	}	1577	}
1287		1578
1288	#############################################################################	1579	#############################################################################
1289		1580
1290	package CFClient::UI::Table;	1581	package CFPlus::UI::Table;
1291		1582
1292	our @ISA = CFClient::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1293		1584
1294	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1295		1586
1296	use CFClient::OpenGL;	1587	use CFPlus::OpenGL;
1297		1588
1298	sub new {	1589	sub new {
1299	my $class = shift;	1590	my $class = shift;
1300		1591
1301	$class->SUPER::new (	1592	$class->SUPER::new (
1302	col_expand => [],	1593	col_expand => [],
		1594	row_expand => [],
1303	@_,	1595	@_,
1304	)	1596	)
1305	}	1597	}
1306		1598
1307	sub children {
1308	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309	}
1310
1311	sub add {	1599	sub add {
1312	my ($self, $x, $y, $child) = @_;	1600	my ($self, @widgets) = @_;
1313		1601
1314	$child->set_parent ($self);	1602	for my $child (@widgets) {
1315	$self->{children}[$y][$x] = $child;	1603	$child->{c_rowspan} ||= 1;
		1604	$child->{c_colspan} ||= 1;
		1605	}
1316		1606
1317	$self->realloc;	1607	$self->SUPER::add (@widgets);
1318	}	1608	}
1319		1609
1320	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 {
1321	my ($self, $child) = @_;	1628	my ($self) = @_;
1322		1629
1323	# TODO: not yet implemented	1630	my (@w, @h);
1324	}
1325
1326	# TODO: move to container class maybe? send children a signal on removal?
1327	sub clear {
1328	my ($self) = @_;
1329		1631
1330	my @children = $self->children;	1632	my @children = $self->children;
1331	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	}
1332		1643	}
1333	for (@children) {
1334	delete $_->{parent};
1335	$_->hide;
1336	}
1337		1644
1338	$self->realloc;	1645	# second pass, rows
1339	}	1646	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1340
1341	sub get_wh {
1342	my ($self) = @_;
1343
1344	my (@w, @h);
1345
1346	for my $y (0 .. $#{$self->{children}}) {
1347	my $row = $self->{children}[$y]
1348	or next;
1349
1350	for my $x (0 .. $#$row) {
1351	my $widget = $row->[$x]
1352	or next;
1353	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1354		1648
1355	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1356	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1357	}	1653	}
1358	}	1654	}
1359		1655
1360	(\@w, \@h)	1656	(\@w, \@h)
1361	}	1657	}
…		…
1377	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1378		1674
1379	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1380	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1381		1677
1382	# TODO: nicer code && do row_expand	1678	# now linearly scale the rows/columns to the allocated size
1383	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1384	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1385	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1386		1682
1387	# linearly scale sizes
1388	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1389	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1390		1684
1391	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
1392	CFClient::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1393		1694
1394	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1395		1697
1396	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1397	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)};
1398	or next;
1399		1700
1400	my $x = 0;	1701	$widget->configure (
1401	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1402		1704	);
1403	for my $c (0 .. $#$row) {	1705	}
1404	my $col_w = $ws->[$c];
1405		1706
1406	if (my $widget = $row->[$c]) {	1707	1
1407	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1408	}
1409		1709
1410	$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};
1411	}	1737	}
		1738	}
1412		1739
1413	$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});
1414	}	1771	}
1415		1772
1416	1	1773	1
1417	}	1774	}
1418		1775
1419	sub find_widget {
1420	my ($self, $x, $y) = @_;
1421
1422	$x -= $self->{x};
1423	$y -= $self->{y};
1424
1425	my $res;
1426
1427	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1428	$res = $_->find_widget ($x, $y)
1429	and return $res;
1430	}
1431
1432	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1433	}
1434
1435	sub _draw {
1436	my ($self) = @_;
1437
1438	for (grep $_, @{$self->{children}}) {
1439	$_->draw for grep $_, @$_;
1440	}
1441	}
1442
1443	#############################################################################	1776	#############################################################################
1444		1777
1445	package CFClient::UI::Box;	1778	package CFPlus::UI::Box;
1446		1779
1447	our @ISA = CFClient::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1448		1781
1449	sub size_request {	1782	sub size_request {
1450	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1451		1786
1452	$self->{vertical}	1787	$self->{vertical}
1453	? (	1788	? (
1454	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1455	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1456	)	1791	)
1457	: (	1792	: (
1458	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1459	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1460	)	1795	)
1461	}	1796	}
1462		1797
1463	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1464	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
…		…
1485	$req[$_] += $space * $children[$_]{expand}	1820	$req[$_] += $space * $children[$_]{expand}
1486	for 0 .. $#children;	1821	for 0 .. $#children;
1487	}	1822	}
1488	}	1823	}
1489		1824
1490	CFClient::UI::harmonize \@req;	1825	CFPlus::UI::harmonize \@req;
1491		1826
1492	my $pos = 0;	1827	my $pos = 0;
1493	for (0 .. $#children) {	1828	for (0 .. $#children) {
1494	my $alloc = $req[$_];	1829	my $alloc = $req[$_];
1495	$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));
…		…
1500	1	1835	1
1501	}	1836	}
1502		1837
1503	#############################################################################	1838	#############################################################################
1504		1839
1505	package CFClient::UI::HBox;	1840	package CFPlus::UI::HBox;
1506		1841
1507	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1508		1843
1509	sub new {	1844	sub new {
1510	my $class = shift;	1845	my $class = shift;
1511		1846
1512	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1515	)	1850	)
1516	}	1851	}
1517		1852
1518	#############################################################################	1853	#############################################################################
1519		1854
1520	package CFClient::UI::VBox;	1855	package CFPlus::UI::VBox;
1521		1856
1522	our @ISA = CFClient::UI::Box::;	1857	our @ISA = CFPlus::UI::Box::;
1523		1858
1524	sub new {	1859	sub new {
1525	my $class = shift;	1860	my $class = shift;
1526		1861
1527	$class->SUPER::new (	1862	$class->SUPER::new (
…		…
1530	)	1865	)
1531	}	1866	}
1532		1867
1533	#############################################################################	1868	#############################################################################
1534		1869
1535	package CFClient::UI::Label;	1870	package CFPlus::UI::Label;
1536		1871
1537	our @ISA = CFClient::UI::DrawBG::;	1872	our @ISA = CFPlus::UI::DrawBG::;
1538		1873
1539	use CFClient::OpenGL;	1874	use CFPlus::OpenGL;
1540		1875
1541	sub new {	1876	sub new {
1542	my ($class, %arg) = @_;	1877	my ($class, %arg) = @_;
1543		1878
1544	my $self = $class->SUPER::new (	1879	my $self = $class->SUPER::new (
…		…
1547	#active_bg => none	1882	#active_bg => none
1548	#font => default_font	1883	#font => default_font
1549	#text => initial text	1884	#text => initial text
1550	#markup => initial narkup	1885	#markup => initial narkup
1551	#max_w => maximum pixel width	1886	#max_w => maximum pixel width
		1887	#style => 0, # render flags
1552	ellipsise => 3, # end	1888	ellipsise => 3, # end
1553	layout => (new CFClient::Layout),	1889	layout => (new CFPlus::Layout),
1554	fontsize => 1,	1890	fontsize => 1,
1555	align => -1,	1891	align => -1,
1556	valign => -1,	1892	valign => -1,
1557	padding_x => 2,	1893	padding_x => 2,
1558	padding_y => 2,	1894	padding_y => 2,
1559	can_events => 0,	1895	can_events => 0,
1560	%arg	1896	%arg
1561	);	1897	);
1562		1898
1563	if (exists $self->{template}) {	1899	if (exists $self->{template}) {
1564	my $layout = new CFClient::Layout;	1900	my $layout = new CFPlus::Layout;
1565	$layout->set_text (delete $self->{template});	1901	$layout->set_text (delete $self->{template});
1566	$self->{template} = $layout;	1902	$self->{template} = $layout;
1567	}	1903	}
1568		1904
1569	if (exists $self->{markup}) {	1905	if (exists $self->{markup}) {
…		…
1573	}	1909	}
1574		1910
1575	$self	1911	$self
1576	}	1912	}
1577		1913
1578	sub escape($) {
1579	local $_ = $_[0];
1580
1581	s/&/&amp;/g;
1582	s/>/&gt;/g;
1583	s/</&lt;/g;
1584
1585	$_
1586	}
1587
1588	sub update {	1914	sub update {
1589	my ($self) = @_;	1915	my ($self) = @_;
1590		1916
1591	delete $self->{texture};	1917	delete $self->{texture};
1592	$self->SUPER::update;	1918	$self->SUPER::update;
…		…
1595	sub realloc {	1921	sub realloc {
1596	my ($self) = @_;	1922	my ($self) = @_;
1597		1923
1598	delete $self->{ox};	1924	delete $self->{ox};
1599	$self->SUPER::realloc;	1925	$self->SUPER::realloc;
		1926	}
		1927
		1928	sub clear {
		1929	my ($self) = @_;
		1930
		1931	$self->set_text ("");
1600	}	1932	}
1601		1933
1602	sub set_text {	1934	sub set_text {
1603	my ($self, $text) = @_;	1935	my ($self, $text) = @_;
1604		1936
…		…
1629		1961
1630	sub size_request {	1962	sub size_request {
1631	my ($self) = @_;	1963	my ($self) = @_;
1632		1964
1633	$self->{size_req} ||= do {	1965	$self->{size_req} ||= do {
		1966	my ($max_w, $max_h) = $self->get_max_wh;
		1967
1634	$self->{layout}->set_font ($self->{font}) if $self->{font};	1968	$self->{layout}->set_font ($self->{font}) if $self->{font};
1635	$self->{layout}->set_width ($self->{max_w} || -1);	1969	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1636	$self->{layout}->set_ellipsise ($self->{ellipsise});	1970	$self->{layout}->set_ellipsise ($self->{ellipsise});
1637	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1971	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1972	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639		1973
1640	my ($w, $h) = $self->{layout}->size;	1974	my ($w, $h) = $self->{layout}->size;
…		…
1712	: ($self->{w} - $size->[0]) * 0.5);	2046	: ($self->{w} - $size->[0]) * 0.5);
1713		2047
1714	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2048	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1715	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2049	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1716	: ($self->{h} - $size->[1]) * 0.5);	2050	: ($self->{h} - $size->[1]) * 0.5);
		2051
		2052	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1717	};	2053	};
1718		2054
1719	my $w = List::Util::min $self->{w} + 4, $size->[0];	2055	# unless ($self->{list}) {
1720	my $h = List::Util::min $self->{h} + 2, $size->[1];	2056	# $self->{list} = CFPlus::OpenGL::glGenList;
1721		2057	# CFPlus::OpenGL::glNewList $self->{list};
1722	$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;
1723	}	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	#}
1724		2074
1725	#############################################################################	2075	#############################################################################
1726		2076
1727	package CFClient::UI::EntryBase;	2077	package CFPlus::UI::EntryBase;
1728		2078
1729	our @ISA = CFClient::UI::Label::;	2079	our @ISA = CFPlus::UI::Label::;
1730		2080
1731	use CFClient::OpenGL;	2081	use CFPlus::OpenGL;
1732		2082
1733	sub new {	2083	sub new {
1734	my $class = shift;	2084	my $class = shift;
1735		2085
1736	$class->SUPER::new (	2086	$class->SUPER::new (
1737	fg => [1, 1, 1],	2087	fg => [1, 1, 1],
1738	bg => [0, 0, 0, 0.2],	2088	bg => [0, 0, 0, 0.2],
		2089	outline => [0.6, 0.3, 0.1],
1739	active_bg => [1, 1, 1, 0.5],	2090	active_bg => [0, 0, 1, .2],
1740	active_fg => [0, 0, 0],	2091	active_fg => [1, 1, 1],
		2092	active_outline => [1, 1, 0],
1741	can_hover => 1,	2093	can_hover => 1,
1742	can_focus => 1,	2094	can_focus => 1,
1743	valign => 0,	2095	valign => 0,
1744	can_events => 1,	2096	can_events => 1,
		2097	ellipsise => 0,
1745	#text => ...	2098	#text => ...
1746	#hidden => "*",	2099	#hidden => "*",
1747	@_	2100	@_
1748	)	2101	)
1749	}	2102	}
…		…
1794	my $sym = $ev->{sym};	2147	my $sym = $ev->{sym};
1795	my $uni = $ev->{unicode};	2148	my $uni = $ev->{unicode};
1796		2149
1797	my $text = $self->get_text;	2150	my $text = $self->get_text;
1798		2151
		2152	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2153
1799	if ($uni == 8) {	2154	if ($uni == 8) {
1800	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2155	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1801	} elsif ($uni == 127) {	2156	} elsif ($uni == 127) {
1802	substr $text, $self->{cursor}, 1, "";	2157	substr $text, $self->{cursor}, 1, "";
1803	} elsif ($sym == CFClient::SDLK_LEFT) {	2158	} elsif ($sym == CFPlus::SDLK_LEFT) {
1804	--$self->{cursor} if $self->{cursor};	2159	--$self->{cursor} if $self->{cursor};
1805	} elsif ($sym == CFClient::SDLK_RIGHT) {	2160	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1806	++$self->{cursor} if $self->{cursor} < length $self->{text};	2161	++$self->{cursor} if $self->{cursor} < length $self->{text};
1807	} 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 = "";
1808	$self->{cursor} = 0;	2176	$self->{cursor} = 0;
1809	} elsif ($sym == CFClient::SDLK_END) {
1810	$self->{cursor} = length $text;
1811	} elsif ($uni == 27) {	2177	} elsif ($uni == 27) {
1812	$self->emit ('escape');	2178	$self->emit ('escape');
1813	} elsif ($uni) {	2179	} elsif ($uni == 0x0d) {
		2180	substr $text, $self->{cursor}++, 0, "\012";
		2181	} elsif ($uni >= 0x20) {
1814	substr $text, $self->{cursor}++, 0, chr $uni;	2182	substr $text, $self->{cursor}++, 0, chr $uni;
1815	} else {	2183	} else {
1816	return 0;	2184	return 0;
1817	}	2185	}
1818		2186
1819	$self->_set_text ($text);	2187	$self->_set_text ($text);
1820		2188
1821	$self->realloc;	2189	$self->realloc;
		2190	$self->update;
1822		2191
1823	1	2192	1
1824	}	2193	}
1825		2194
1826	sub invoke_focus_in {	2195	sub invoke_focus_in {
…		…
1868	glColor_premultiply @{$self->{bg}};	2237	glColor_premultiply @{$self->{bg}};
1869	}	2238	}
1870		2239
1871	glEnable GL_BLEND;	2240	glEnable GL_BLEND;
1872	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2241	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1873	glBegin GL_QUADS;
1874	glVertex 0 , 0;
1875	glVertex 0 , $self->{h};
1876	glVertex $self->{w}, $self->{h};	2242	glRect 0, 0, $self->{w}, $self->{h};
1877	glVertex $self->{w}, 0;
1878	glEnd;
1879	glDisable GL_BLEND;	2243	glDisable GL_BLEND;
1880		2244
1881	$self->SUPER::_draw;	2245	$self->SUPER::_draw;
1882		2246
1883	#TODO: force update every cursor change :(	2247	#TODO: force update every cursor change :(
…		…
1885		2249
1886	unless (exists $self->{cur_h}) {	2250	unless (exists $self->{cur_h}) {
1887	my $text = substr $self->{text}, 0, $self->{cursor};	2251	my $text = substr $self->{text}, 0, $self->{cursor};
1888	utf8::encode $text;	2252	utf8::encode $text;
1889		2253
1890	@$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);
1891	}	2255	}
1892		2256
1893	glColor @{$self->{fg}};	2257	glColor_premultiply @{$self->{active_fg}};
1894	glBegin GL_LINES;	2258	glBegin GL_LINES;
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2259	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1896	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};
1897	glEnd;	2261	glEnd;
1898	}
1899	}
1900		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
1901	package CFClient::UI::Entry;	2281	package CFPlus::UI::Entry;
1902		2282
1903	our @ISA = CFClient::UI::EntryBase::;	2283	our @ISA = CFPlus::UI::EntryBase::;
1904		2284
1905	use CFClient::OpenGL;	2285	use CFPlus::OpenGL;
1906		2286
1907	sub invoke_key_down {	2287	sub invoke_key_down {
1908	my ($self, $ev) = @_;	2288	my ($self, $ev) = @_;
1909		2289
1910	my $sym = $ev->{sym};	2290	my $sym = $ev->{sym};
1911		2291
1912	if ($sym == 13) {	2292	if ($ev->{uni} == 0x0d || $sym == 13) {
1913	unshift @{$self->{history}},	2293	unshift @{$self->{history}},
1914	my $txt = $self->get_text;	2294	my $txt = $self->get_text;
1915		2295
1916	$self->{history_pointer} = -1;	2296	$self->{history_pointer} = -1;
1917	$self->{history_saveback} = '';	2297	$self->{history_saveback} = '';
1918	$self->emit (activate => $txt);	2298	$self->emit (activate => $txt);
1919	$self->update;	2299	$self->update;
1920		2300
1921	} elsif ($sym == CFClient::SDLK_UP) {	2301	} elsif ($sym == CFPlus::SDLK_UP) {
1922	if ($self->{history_pointer} < 0) {	2302	if ($self->{history_pointer} < 0) {
1923	$self->{history_saveback} = $self->get_text;	2303	$self->{history_saveback} = $self->get_text;
1924	}	2304	}
1925	if (@{$self->{history} || []} > 0) {	2305	if (@{$self->{history} || []} > 0) {
1926	$self->{history_pointer}++;	2306	$self->{history_pointer}++;
…		…
1928	$self->{history_pointer} = @{$self->{history} || []} - 1;	2308	$self->{history_pointer} = @{$self->{history} || []} - 1;
1929	}	2309	}
1930	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2310	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1931	}	2311	}
1932		2312
1933	} elsif ($sym == CFClient::SDLK_DOWN) {	2313	} elsif ($sym == CFPlus::SDLK_DOWN) {
1934	$self->{history_pointer}--;	2314	$self->{history_pointer}--;
1935	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2315	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1936		2316
1937	if ($self->{history_pointer} >= 0) {	2317	if ($self->{history_pointer} >= 0) {
1938	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2318	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1947	1	2327	1
1948	}	2328	}
1949		2329
1950	#############################################################################	2330	#############################################################################
1951		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
1952	package CFClient::UI::Button;	2371	package CFPlus::UI::ButtonBin;
1953		2372
1954	our @ISA = CFClient::UI::Label::;	2373	our @ISA = CFPlus::UI::Bin::;
1955		2374
1956	use CFClient::OpenGL;	2375	use CFPlus::OpenGL;
1957		2376
1958	my @tex =	2377	my @tex =
1959	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2378	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1960	qw(b1_button_active.png);	2379	qw(b1_button_inactive.png b1_button_active.png);
1961		2380
1962	sub new {	2381	sub new {
1963	my $class = shift;	2382	my $class = shift;
1964		2383
1965	$class->SUPER::new (	2384	$class->SUPER::new (
1966	padding_x => 4,
1967	padding_y => 4,
1968	fg => [1, 1, 1],
1969	active_fg => [0, 0, 1],
1970	can_hover => 1,	2385	can_hover => 1,
1971	align => 0,	2386	align => 0,
1972	valign => 0,	2387	valign => 0,
1973	can_events => 1,	2388	can_events => 1,
1974	@_	2389	@_
…		…
1986	}	2401	}
1987		2402
1988	sub _draw {	2403	sub _draw {
1989	my ($self) = @_;	2404	my ($self) = @_;
1990		2405
1991	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1992
1993	glEnable GL_TEXTURE_2D;	2406	glEnable GL_TEXTURE_2D;
1994	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2407	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1995	glColor 0, 0, 0, 1;	2408	glColor 0, 0, 0, 1;
1996		2409
		2410	my $tex = $tex[$GRAB == $self];
1997	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2411	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1998		2412
1999	glDisable GL_TEXTURE_2D;	2413	glDisable GL_TEXTURE_2D;
2000		2414
2001	$self->SUPER::_draw;	2415	$self->SUPER::_draw;
2002	}	2416	}
2003		2417
2004	#############################################################################	2418	#############################################################################
2005		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
2006	package CFClient::UI::ImageButton;	2625	package CFPlus::UI::ImageButton;
2007		2626
2008	our @ISA = CFClient::UI::Image::;	2627	our @ISA = CFPlus::UI::Image::;
2009		2628
2010	use CFClient::OpenGL;	2629	use CFPlus::OpenGL;
2011		2630
2012	my %textures;	2631	my %textures;
2013		2632
2014	sub new {	2633	sub new {
2015	my $class = shift;	2634	my $class = shift;
…		…
2025	can_events => 1,	2644	can_events => 1,
2026	@_	2645	@_
2027	);	2646	);
2028	}	2647	}
2029		2648
		2649	sub invoke_button_down {
		2650	my ($self, $ev, $x, $y) = @_;
		2651
		2652	1
		2653	}
		2654
2030	sub invoke_button_up {	2655	sub invoke_button_up {
2031	my ($self, $ev, $x, $y) = @_;	2656	my ($self, $ev, $x, $y) = @_;
2032		2657
2033	$self->emit ("activate")	2658	$self->emit ("activate")
2034	if $x >= 0 && $x < $self->{w}	2659	if $x >= 0 && $x < $self->{w}
…		…
2037	1	2662	1
2038	}	2663	}
2039		2664
2040	#############################################################################	2665	#############################################################################
2041		2666
2042	package CFClient::UI::CheckBox;
2043
2044	our @ISA = CFClient::UI::DrawBG::;
2045
2046	my @tex =
2047	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2048	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2049
2050	use CFClient::OpenGL;
2051
2052	sub new {
2053	my $class = shift;
2054
2055	$class->SUPER::new (
2056	padding_x => 2,
2057	padding_y => 2,
2058	fg => [1, 1, 1],
2059	active_fg => [1, 1, 0],
2060	bg => [0, 0, 0, 0.2],
2061	active_bg => [1, 1, 1, 0.5],
2062	state => 0,
2063	can_hover => 1,
2064	@_
2065	)
2066	}
2067
2068	sub size_request {
2069	my ($self) = @_;
2070
2071	(6) x 2
2072	}
2073
2074	sub toggle {
2075	my ($self) = @_;
2076
2077	$self->{state} = !$self->{state};
2078	$self->emit (changed => $self->{state});
2079	$self->update;
2080	}
2081
2082	sub invoke_button_down {
2083	my ($self, $ev, $x, $y) = @_;
2084
2085	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2086	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2087	$self->toggle;
2088	} else {
2089	return 0
2090	}
2091
2092	1
2093	}
2094
2095	sub _draw {
2096	my ($self) = @_;
2097
2098	$self->SUPER::_draw;
2099
2100	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2101
2102	my ($w, $h) = @$self{qw(w h)};
2103
2104	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2105
2106	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2107
2108	my $tex = $self->{state} ? $tex[1] : $tex[0];
2109
2110	glEnable GL_TEXTURE_2D;
2111	$tex->draw_quad_alpha (0, 0, $s, $s);
2112	glDisable GL_TEXTURE_2D;
2113	}
2114
2115	#############################################################################
2116
2117	package CFClient::UI::Image;	2667	package CFPlus::UI::VGauge;
2118		2668
2119	our @ISA = CFClient::UI::Base::;	2669	our @ISA = CFPlus::UI::Base::;
2120
2121	use CFClient::OpenGL;
2122
2123	our %texture_cache;
2124
2125	sub new {
2126	my $class = shift;
2127
2128	my $self = $class->SUPER::new (
2129	can_events => 0,
2130	@_,
2131	);
2132
2133	$self->{path} || $self->{tex}
2134	or Carp::croak "'path' or 'tex' attributes required";
2135
2136	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2137	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2138
2139	Scalar::Util::weaken $texture_cache{$self->{path}};
2140
2141	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2142
2143	$self
2144	}
2145
2146	sub size_request {
2147	my ($self) = @_;
2148
2149	($self->{tex}{w}, $self->{tex}{h})
2150	}
2151
2152	sub _draw {
2153	my ($self) = @_;
2154
2155	my $tex = $self->{tex};
2156
2157	my ($w, $h) = ($self->{w}, $self->{h});
2158
2159	if ($self->{rot90}) {
2160	glRotate 90, 0, 0, 1;
2161	glTranslate 0, -$self->{w}, 0;
2162
2163	($w, $h) = ($h, $w);
2164	}
2165
2166	glEnable GL_TEXTURE_2D;
2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2168
2169	$tex->draw_quad_alpha (0, 0, $w, $h);
2170
2171	glDisable GL_TEXTURE_2D;
2172	}
2173
2174	#############################################################################
2175
2176	package CFClient::UI::VGauge;
2177
2178	our @ISA = CFClient::UI::Base::;
2179		2670
2180	use List::Util qw(min max);	2671	use List::Util qw(min max);
2181		2672
2182	use CFClient::OpenGL;	2673	use CFPlus::OpenGL;
2183		2674
2184	my %tex = (	2675	my %tex = (
2185	food => [	2676	food => [
2186	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2677	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2678	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2188	],	2679	],
2189	grace => [	2680	grace => [
2190	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2681	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191	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/
2192	],	2683	],
2193	hp => [	2684	hp => [
2194	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2685	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2195	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2686	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2196	],	2687	],
2197	mana => [	2688	mana => [
2198	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2689	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2199	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/
2200	],	2691	],
2201	);	2692	);
2202		2693
2203	# eg. VGauge->new (gauge => 'food'), default gauge: food	2694	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2306	glDisable GL_TEXTURE_2D;	2797	glDisable GL_TEXTURE_2D;
2307	}	2798	}
2308		2799
2309	#############################################################################	2800	#############################################################################
2310		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
2311	package CFClient::UI::Gauge;	2940	package CFPlus::UI::Gauge;
2312		2941
2313	our @ISA = CFClient::UI::VBox::;	2942	our @ISA = CFPlus::UI::VBox::;
2314		2943
2315	sub new {	2944	sub new {
2316	my ($class, %arg) = @_;	2945	my ($class, %arg) = @_;
2317		2946
2318	my $self = $class->SUPER::new (	2947	my $self = $class->SUPER::new (
…		…
2320	can_hover => 1,	2949	can_hover => 1,
2321	can_events => 1,	2950	can_events => 1,
2322	%arg,	2951	%arg,
2323	);	2952	);
2324		2953
2325	$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");
2326	$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);
2327	$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");
2328		2957
2329	$self	2958	$self
2330	}	2959	}
2331		2960
2332	sub set_fontsize {	2961	sub set_fontsize {
…		…
2353	$self->{value}->set_text ($val);	2982	$self->{value}->set_text ($val);
2354	}	2983	}
2355		2984
2356	#############################################################################	2985	#############################################################################
2357		2986
2358	package CFClient::UI::Slider;	2987	package CFPlus::UI::Slider;
2359		2988
2360	use strict;	2989	use strict;
2361		2990
2362	use CFClient::OpenGL;	2991	use CFPlus::OpenGL;
2363		2992
2364	our @ISA = CFClient::UI::DrawBG::;	2993	our @ISA = CFPlus::UI::DrawBG::;
2365		2994
2366	my @tex =	2995	my @tex =
2367	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2996	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2368	qw(s1_slider.png s1_slider_bg.png);	2997	qw(s1_slider.png s1_slider_bg.png);
2369		2998
2370	sub new {	2999	sub new {
2371	my $class = shift;	3000	my $class = shift;
2372		3001
…		…
2440		3069
2441	$self->SUPER::invoke_button_down ($ev, $x, $y);	3070	$self->SUPER::invoke_button_down ($ev, $x, $y);
2442		3071
2443	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3072	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2444		3073
2445	$self->invoke_mouse_motion ($ev, $x, $y)	3074	$self->invoke_mouse_motion ($ev, $x, $y);
		3075
		3076	1
2446	}	3077	}
2447		3078
2448	sub invoke_mouse_motion {	3079	sub invoke_mouse_motion {
2449	my ($self, $ev, $x, $y) = @_;	3080	my ($self, $ev, $x, $y) = @_;
2450		3081
…		…
2457		3088
2458	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3089	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2459	} else {	3090	} else {
2460	return 0;	3091	return 0;
2461	}	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);
2462		3105
2463	1	3106	1
2464	}	3107	}
2465		3108
2466	sub update {	3109	sub update {
…		…
2517	glDisable GL_TEXTURE_2D;	3160	glDisable GL_TEXTURE_2D;
2518	}	3161	}
2519		3162
2520	#############################################################################	3163	#############################################################################
2521		3164
2522	package CFClient::UI::ValSlider;	3165	package CFPlus::UI::ValSlider;
2523		3166
2524	our @ISA = CFClient::UI::HBox::;	3167	our @ISA = CFPlus::UI::HBox::;
2525		3168
2526	sub new {	3169	sub new {
2527	my ($class, %arg) = @_;	3170	my ($class, %arg) = @_;
2528		3171
2529	my $range = delete $arg{range};	3172	my $range = delete $arg{range};
2530		3173
2531	my $self = $class->SUPER::new (	3174	my $self = $class->SUPER::new (
2532	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3175	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2533	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3176	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2534	to_value => sub { shift },	3177	to_value => sub { shift },
2535	from_value => sub { shift },	3178	from_value => sub { shift },
2536	%arg,	3179	%arg,
2537	);	3180	);
2538		3181
…		…
2558	sub set_range { shift->{slider}->set_range (@_) }	3201	sub set_range { shift->{slider}->set_range (@_) }
2559	sub set_value { shift->{slider}->set_value (@_) }	3202	sub set_value { shift->{slider}->set_value (@_) }
2560		3203
2561	#############################################################################	3204	#############################################################################
2562		3205
2563	package CFClient::UI::TextScroller;	3206	package CFPlus::UI::TextScroller;
2564		3207
2565	our @ISA = CFClient::UI::HBox::;	3208	our @ISA = CFPlus::UI::HBox::;
2566		3209
2567	use CFClient::OpenGL;	3210	use CFPlus::OpenGL;
2568		3211
2569	sub new {	3212	sub new {
2570	my $class = shift;	3213	my $class = shift;
2571		3214
2572	my $self = $class->SUPER::new (	3215	my $self = $class->SUPER::new (
2573	fontsize => 1,	3216	fontsize => 1,
2574	can_events => 0,	3217	can_events => 1,
2575	indent => 0,	3218	indent => 0,
2576	#font => default_font	3219	#font => default_font
2577	@_,	3220	@_,
2578		3221
2579	layout => (new CFClient::Layout),	3222	layout => (new CFPlus::Layout),
2580	par => [],	3223	par => [],
		3224	max_par => 0,
2581	height => 0,	3225	height => 0,
2582	children => [	3226	children => [
2583	(new CFClient::UI::Empty expand => 1),	3227	(new CFPlus::UI::Empty expand => 1),
2584	(new CFClient::UI::Slider vertical => 1),	3228	(new CFPlus::UI::Slider vertical => 1),
2585	],	3229	],
2586	);	3230	);
2587		3231
2588	$self->{children}[1]->connect (changed => sub { $self->update });	3232	$self->{children}[1]->connect (changed => sub { $self->update });
2589		3233
…		…
2598	}	3242	}
2599		3243
2600	sub size_request {	3244	sub size_request {
2601	my ($self) = @_;	3245	my ($self) = @_;
2602		3246
2603	my ($empty, $slider) = @{ $self->{children} };	3247	my ($empty, $slider) = $self->visible_children;
2604		3248
2605	local $self->{children} = [$empty, $slider];	3249	local $self->{children} = [$empty, $slider];
2606	$self->SUPER::size_request	3250	$self->SUPER::size_request
2607	}	3251	}
2608		3252
…		…
2619		3263
2620	$self->reflow;	3264	$self->reflow;
2621		3265
2622	local $self->{children} = [$empty, $slider];	3266	local $self->{children} = [$empty, $slider];
2623	$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
2624	}	3278	}
2625		3279
2626	sub get_layout {	3280	sub get_layout {
2627	my ($self, $para) = @_;	3281	my ($self, $para) = @_;
2628		3282
…		…
2656		3310
2657	# todo: base offset on lines or so, not on pixels	3311	# todo: base offset on lines or so, not on pixels
2658	$self->{children}[1]->set_value ($offset);	3312	$self->{children}[1]->set_value ($offset);
2659	}	3313	}
2660		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
2661	sub clear {	3330	sub clear {
2662	my ($self) = @_;	3331	my ($self) = @_;
2663		3332
2664	my (undef, undef, @other) = @{ $self->{children} };	3333	my (undef, undef, @other) = @{ $self->{children} };
2665	$self->remove ($_) for @other;	3334	$self->remove ($_) for @other;
…		…
2668	$self->{height} = 0;	3337	$self->{height} = 0;
2669	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3338	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2670	}	3339	}
2671		3340
2672	sub add_paragraph {	3341	sub add_paragraph {
2673	my ($self, $color, $para, $indent) = @_;	3342	my $self = shift;
2674		3343
2675	my ($text, @w) = ref $para ? @$para : $para;	3344	for my $para (@_) {
2676
2677	$para = {	3345	$para = {
		3346	fg => [1, 1, 1, 1],
		3347	indent => 0,
		3348	markup => "",
		3349	widget => [],
		3350	ref $para ? %$para : (markup => $para),
2678	w => 1e10,	3351	w => 1e10,
2679	wrapped => 1,	3352	wrapped => 1,
2680	fg => $color,
2681	indent => $indent,
2682	markup => $text,
2683	widget => \@w,
2684	};	3353	};
2685		3354
2686	$self->add (@w) if @w;	3355	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2687	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	}
2688		3362
2689	$self->{need_reflow}++;	3363	$self->{need_reflow}++;
2690	$self->update;	3364	$self->update;
2691	}	3365	}
2692		3366
2693	sub scroll_to_bottom {	3367	sub scroll_to_bottom {
2694	my ($self) = @_;	3368	my ($self) = @_;
2695		3369
2696	$self->{scroll_to_bottom} = 1;	3370	$self->{scroll_to} = $#{$self->{par}};
2697	$self->update;	3371	$self->update;
2698	}	3372	}
2699		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
2700	sub update {	3407	sub update {
2701	my ($self) = @_;	3408	my ($self) = @_;
2702		3409
2703	$self->SUPER::update;	3410	$self->SUPER::update;
2704		3411
2705	return unless $self->{h} > 0;	3412	return unless $self->{h} > 0;
2706		3413
2707	delete $self->{texture};	3414	delete $self->{texture};
2708		3415
2709	$ROOT->on_post_alloc ($self => sub {	3416	$ROOT->on_post_alloc ($self => sub {
		3417	$self->force_uptodate;
		3418
2710	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3419	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711		3420
2712	if (delete $self->{need_reflow}) {
2713	my $height = 0;
2714
2715	for my $para (@{$self->{par}}) {
2716	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2717	my $layout = $self->get_layout ($para);
2718	my ($w, $h) = $layout->size;
2719
2720	$para->{w} = $w + $para->{indent};
2721	$para->{h} = $h;
2722	$para->{wrapped} = $layout->has_wrapped;
2723	}
2724
2725	$height += $para->{h};
2726	}
2727
2728	$self->{height} = $height;
2729
2730	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2731
2732	delete $self->{texture};
2733	}
2734
2735	if (delete $self->{scroll_to_bottom}) {
2736	$self->{children}[1]->set_value (1e10);
2737	}
2738
2739	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3421	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2740	glClearColor 0, 0, 0, 0;	3422	glClearColor 0, 0, 0, 0;
2741	glClear GL_COLOR_BUFFER_BIT;	3423	glClear GL_COLOR_BUFFER_BIT;
2742		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;
2743	my $top = int $self->{children}[1]{range}[0];	3433	my $top = int $self->{children}[1]{range}[0];
2744		3434
2745	my $y0 = $top;	3435	my $y0 = $top;
2746	my $y1 = $top + $H;	3436	my $y1 = $top + $H;
2747		3437
2748	my $y = 0;
2749
2750	for my $para (@{$self->{par}}) {	3438	for my $para (@{$self->{par}}) {
2751	my $h = $para->{h};	3439	my $h = $para->{h};
		3440	my $y = $para->{y};
2752		3441
2753	if ($y0 < $y + $h && $y < $y1) {	3442	if ($y0 < $y + $h && $y < $y1) {
2754
2755	my $layout = $self->get_layout ($para);	3443	my $layout = $self->get_layout ($para);
2756		3444
2757	$layout->render ($para->{indent}, $y - $y0);	3445	$layout->render ($para->{indent}, $y - $y0);
		3446	$layout->draw;
2758		3447
2759	if (my @w = @{ $para->{widget} }) {	3448	if (my @w = @{ $para->{widget} }) {
2760	my @s = $layout->get_shapes;	3449	my @s = $layout->get_shapes;
2761		3450
2762	for (@w) {	3451	for (@w) {
…		…
2768	$_->draw;	3457	$_->draw;
2769	}	3458	}
2770	}	3459	}
2771	}	3460	}
2772		3461
2773	$y += $h;	3462	$paridx++;
		3463	$top_paragraph ||= $paridx if $y >= $top;
2774	}	3464	}
		3465
		3466	$self->{top_paragraph} = $top_paragraph;
2775	};	3467	};
2776	});	3468	});
2777	}	3469	}
2778		3470
2779	sub reconfigure {	3471	sub reconfigure {
…		…
2797	$self->{children}[1]->draw;	3489	$self->{children}[1]->draw;
2798	}	3490	}
2799		3491
2800	#############################################################################	3492	#############################################################################
2801		3493
2802	package CFClient::UI::Animator;	3494	package CFPlus::UI::Animator;
2803		3495
2804	use CFClient::OpenGL;	3496	use CFPlus::OpenGL;
2805		3497
2806	our @ISA = CFClient::UI::Bin::;	3498	our @ISA = CFPlus::UI::Bin::;
2807		3499
2808	sub moveto {	3500	sub moveto {
2809	my ($self, $x, $y) = @_;	3501	my ($self, $x, $y) = @_;
2810		3502
2811	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3503	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2839	glPopMatrix;	3531	glPopMatrix;
2840	}	3532	}
2841		3533
2842	#############################################################################	3534	#############################################################################
2843		3535
2844	package CFClient::UI::Flopper;	3536	package CFPlus::UI::Flopper;
2845		3537
2846	our @ISA = CFClient::UI::Button::;	3538	our @ISA = CFPlus::UI::Button::;
2847		3539
2848	sub new {	3540	sub new {
2849	my $class = shift;	3541	my $class = shift;
2850		3542
2851	my $self = $class->SUPER::new (	3543	my $self = $class->SUPER::new (
…		…
2863	$self->{other}->toggle_visibility;	3555	$self->{other}->toggle_visibility;
2864	}	3556	}
2865		3557
2866	#############################################################################	3558	#############################################################################
2867		3559
2868	package CFClient::UI::Tooltip;	3560	package CFPlus::UI::Tooltip;
2869		3561
2870	our @ISA = CFClient::UI::Bin::;	3562	our @ISA = CFPlus::UI::Bin::;
2871		3563
2872	use CFClient::OpenGL;	3564	use CFPlus::OpenGL;
2873		3565
2874	sub new {	3566	sub new {
2875	my $class = shift;	3567	my $class = shift;
2876		3568
2877	$class->SUPER::new (	3569	$class->SUPER::new (
…		…
2881	}	3573	}
2882		3574
2883	sub set_tooltip_from {	3575	sub set_tooltip_from {
2884	my ($self, $widget) = @_;	3576	my ($self, $widget) = @_;
2885		3577
2886	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 =~ /^#(.*)$/;
2887		3583
2888	if ($ENV{CFPLUS_DEBUG} & 2) {	3584	if ($ENV{CFPLUS_DEBUG} & 2) {
2889	$tooltip .= "\n\n" . (ref $widget) . "\n"	3585	$tip .= "\n\n" . (ref $widget) . "\n"
2890	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3586	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2891	. "req $widget->{req_w} $widget->{req_h}\n"	3587	. "req $widget->{req_w} $widget->{req_h}\n"
2892	. "visible $widget->{visible}";	3588	. "visible $widget->{visible}";
2893	}	3589	}
2894		3590
2895	$tooltip =~ s/^\n+//;	3591	$tip =~ s/^\n+//;
2896	$tooltip =~ s/\n+$//;	3592	$tip =~ s/\n+$//;
2897		3593
2898	$self->add (new CFClient::UI::Label	3594	$self->add (new CFPlus::UI::Label
2899	markup => $tooltip,	3595	markup => $tip,
2900	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3596	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2901	fontsize => 0.8,	3597	fontsize => 0.8,
2902	fg => [0, 0, 0, 1],	3598	style => 1, # FLAG_INVERSE
2903	ellipsise => 0,	3599	ellipsise => 0,
2904	font => ($widget->{tooltip_font} || $::FONT_PROP),	3600	font => ($widget->{tooltip_font} || $::FONT_PROP),
2905	);	3601	);
2906	}	3602	}
2907		3603
…		…
2926		3622
2927	$self->{root}->on_post_alloc ("move_$self" => sub {	3623	$self->{root}->on_post_alloc ("move_$self" => sub {
2928	my $widget = $self->{owner}	3624	my $widget = $self->{owner}
2929	or return;	3625	or return;
2930		3626
		3627	if ($widget->{visible}) {
2931	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3628	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932		3629
2933	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3630	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934	if $x + $self->{w} > $self->{root}{w};	3631	if $x + $self->{w} > $self->{root}{w};
2935		3632
2936	$self->move_abs ($x, $y);	3633	$self->move_abs ($x, $y);
		3634	} else {
		3635	$self->hide;
		3636	}
2937	});	3637	});
2938	}	3638	}
2939		3639
2940	sub _draw {	3640	sub _draw {
2941	my ($self) = @_;	3641	my ($self) = @_;
2942		3642
2943	glTranslate 0.375, 0.375;
2944
2945	my ($w, $h) = @$self{qw(w h)};	3643	my ($w, $h) = @$self{qw(w h)};
2946		3644
2947	glColor 1, 0.8, 0.4;	3645	glColor 1, 0.8, 0.4;
2948	glBegin GL_QUADS;	3646	glRect 0, 0, $w, $h;
2949	glVertex 0 , 0;
2950	glVertex 0 , $h;
2951	glVertex $w, $h;
2952	glVertex $w, 0;
2953	glEnd;
2954		3647
2955	glColor 0, 0, 0;	3648	glColor 0, 0, 0;
2956	glBegin GL_LINE_LOOP;	3649	glRect_lineloop .5, .5, $w + .5, $h + .5;
2957	glVertex 0 , 0;
2958	glVertex 0 , $h;
2959	glVertex $w, $h;
2960	glVertex $w, 0;
2961	glEnd;
2962		3650
2963	glTranslate 2 - 0.375, 2 - 0.375;	3651	glTranslate 2, 2;
2964		3652
2965	$self->SUPER::_draw;	3653	$self->SUPER::_draw;
2966	}	3654	}
2967		3655
2968	#############################################################################	3656	#############################################################################
2969		3657
2970	package CFClient::UI::Face;	3658	package CFPlus::UI::Face;
2971		3659
2972	our @ISA = CFClient::UI::Base::;	3660	our @ISA = CFPlus::UI::DrawBG::;
2973		3661
2974	use CFClient::OpenGL;	3662	use CFPlus::OpenGL;
2975		3663
2976	sub new {	3664	sub new {
2977	my $class = shift;	3665	my $class = shift;
2978		3666
2979	my $self = $class->SUPER::new (	3667	my $self = $class->SUPER::new (
		3668	size_w => 32,
		3669	size_h => 8,
2980	aspect => 1,	3670	aspect => 1,
2981	can_events => 0,	3671	can_events => 0,
2982	@_,	3672	@_,
2983	);	3673	);
2984		3674
2985	if ($self->{anim} && $self->{animspeed}) {	3675	if ($self->{anim} && $self->{animspeed}) {
2986	Scalar::Util::weaken (my $widget = $self);	3676	CFPlus::weaken (my $widget = $self);
2987		3677
2988	$self->{timer} = Event->timer (	3678	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2989	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3679	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2990	hard => 1,	3680	return unless $::CONN;
2991	interval => $self->{animspeed},	3681
2992	cb => sub {	3682	my $w = $widget
		3683	or return;
		3684
2993	++$widget->{frame};	3685	++$w->{frame};
		3686	$w->update_face;
		3687
		3688	# somehow, $widget can go away
2994	$widget->update;	3689	$w->update;
2995	},	3690	$w->update_timer;
2996	);	3691	};
		3692
		3693	$self->update_face;
		3694	$self->update_timer;
2997	}	3695	}
2998		3696
2999	$self	3697	$self
3000	}	3698	}
3001		3699
		3700	sub update_timer {
		3701	my ($self) = @_;
		3702
		3703	return unless $self->{timer};
		3704
		3705	if ($self->{visible}) {
		3706	$self->{timer}->start;
		3707	} else {
		3708	$self->{timer}->stop;
		3709	}
		3710	}
		3711
		3712	sub update_face {
		3713	my ($self) = @_;
		3714
		3715	if ($::CONN) {
		3716	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3717	if ($anim && @$anim) {
		3718	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3719	delete $self->{face_change_cb};
		3720
		3721	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3722	unless ($tex->{name} || $tex->{loading}) {
		3723	$tex->upload (sub { $self->reconfigure });
		3724	}
		3725	}
		3726	}
		3727	}
		3728	}
		3729	}
		3730
3002	sub size_request {	3731	sub size_request {
3003	(32, 8)	3732	my ($self) = @_;
		3733
		3734	if ($::CONN) {
		3735	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3736	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3737	if ($tex->{name}) {
		3738	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3739	} elsif (!$tex->{loading}) {
		3740	$tex->upload (sub { $self->reconfigure });
		3741	}
		3742	}
		3743
		3744	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3745	}
		3746	}
		3747
		3748	($self->{size_w} || 8, $self->{size_h} || 8)
3004	}	3749	}
3005		3750
3006	sub update {	3751	sub update {
3007	my ($self) = @_;	3752	my ($self) = @_;
3008		3753
3009	return unless $self->{visible};	3754	return unless $self->{visible};
3010		3755
3011	$self->SUPER::update;	3756	$self->SUPER::update;
3012	}	3757	}
3013		3758
		3759	sub invoke_visibility_change {
		3760	my ($self) = @_;
		3761
		3762	$self->update_timer;
		3763
		3764	0
		3765	}
		3766
3014	sub _draw {	3767	sub _draw {
3015	my ($self) = @_;	3768	my ($self) = @_;
3016		3769
3017	return unless $::CONN;	3770	$self->SUPER::_draw;
3018		3771
3019	my $face;	3772	if (my $tex = $self->{tex}) {
3020
3021	if ($self->{frame}) {
3022	my $anim = $::CONN->{anim}[$self->{anim}];
3023
3024	$face = $anim->[ $self->{frame} % @$anim ]
3025	if $anim && @$anim;
3026	}
3027
3028	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3029
3030	if ($tex) {
3031	glEnable GL_TEXTURE_2D;	3773	glEnable GL_TEXTURE_2D;
3032	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3774	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3033	glColor 0, 0, 0, 1;	3775	glColor 0, 0, 0, 1;
3034	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3776	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3035	glDisable GL_TEXTURE_2D;	3777	glDisable GL_TEXTURE_2D;
…		…
3037	}	3779	}
3038		3780
3039	sub destroy {	3781	sub destroy {
3040	my ($self) = @_;	3782	my ($self) = @_;
3041		3783
3042	$self->{timer}->cancel	3784	(delete $self->{timer})->cancel
3043	if $self->{timer};	3785	if $self->{timer};
3044		3786
3045	$self->SUPER::destroy;	3787	$self->SUPER::destroy;
3046	}	3788	}
3047		3789
3048	#############################################################################	3790	#############################################################################
3049		3791
3050	package CFClient::UI::Buttonbar;	3792	package CFPlus::UI::Buttonbar;
3051		3793
3052	our @ISA = CFClient::UI::HBox::;	3794	our @ISA = CFPlus::UI::HBox::;
3053		3795
3054	# TODO: should actualyl wrap buttons and other goodies.	3796	# TODO: should actually wrap buttons and other goodies.
3055		3797
3056	#############################################################################	3798	#############################################################################
3057		3799
3058	package CFClient::UI::Menu;	3800	package CFPlus::UI::Menu;
3059		3801
3060	our @ISA = CFClient::UI::FancyFrame::;	3802	our @ISA = CFPlus::UI::Toplevel::;
3061		3803
3062	use CFClient::OpenGL;	3804	use CFPlus::OpenGL;
3063		3805
3064	sub new {	3806	sub new {
3065	my $class = shift;	3807	my $class = shift;
3066		3808
3067	my $self = $class->SUPER::new (	3809	my $self = $class->SUPER::new (
3068	items => [],	3810	items => [],
3069	z => 100,	3811	z => 100,
3070	@_,	3812	@_,
3071	);	3813	);
3072		3814
3073	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3815	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3074		3816
3075	for my $item (@{ $self->{items} }) {	3817	for my $item (@{ $self->{items} }) {
3076	my ($widget, $cb, $tooltip) = @$item;	3818	my ($widget, $cb, $tooltip) = @$item;
3077		3819
3078	# handle various types of items, only text for now	3820	# handle various types of items, only text for now
3079	if (!ref $widget) {	3821	if (!ref $widget) {
3080	if ($widget =~ /\t/) {	3822	if ($widget =~ /\t/) {
3081	my ($left, $right) = split /\t/, $widget, 2;	3823	my ($left, $right) = split /\t/, $widget, 2;
3082		3824
3083	$widget = new CFClient::UI::HBox	3825	$widget = new CFPlus::UI::HBox
3084	can_hover => 1,	3826	can_hover => 1,
3085	can_events => 1,	3827	can_events => 1,
3086	tooltip => $tooltip,	3828	tooltip => $tooltip,
3087	children => [	3829	children => [
3088	(new CFClient::UI::Label markup => $left, expand => 1),	3830	(new CFPlus::UI::Label markup => $left, expand => 1),
3089	(new CFClient::UI::Label markup => $right, align => +1),	3831	(new CFPlus::UI::Label markup => $right, align => +1),
3090	],	3832	],
3091	;	3833	;
3092		3834
3093	} else {	3835	} else {
3094	$widget = new CFClient::UI::Label	3836	$widget = new CFPlus::UI::Label
3095	can_hover => 1,	3837	can_hover => 1,
3096	can_events => 1,	3838	can_events => 1,
3097	markup => $widget,	3839	markup => $widget,
3098	tooltip => $tooltip;	3840	tooltip => $tooltip;
3099	}	3841	}
…		…
3147	1	3889	1
3148	}	3890	}
3149		3891
3150	#############################################################################	3892	#############################################################################
3151		3893
3152	package CFClient::UI::Multiplexer;	3894	package CFPlus::UI::Multiplexer;
3153		3895
3154	our @ISA = CFClient::UI::Container::;	3896	our @ISA = CFPlus::UI::Container::;
3155		3897
3156	sub new {	3898	sub new {
3157	my $class = shift;	3899	my $class = shift;
3158		3900
3159	my $self = $class->SUPER::new (	3901	my $self = $class->SUPER::new (
…		…
3220	$self->{current}->draw;	3962	$self->{current}->draw;
3221	}	3963	}
3222		3964
3223	#############################################################################	3965	#############################################################################
3224		3966
3225	package CFClient::UI::Notebook;	3967	package CFPlus::UI::Notebook;
3226		3968
		3969	use CFPlus::OpenGL;
		3970
3227	our @ISA = CFClient::UI::VBox::;	3971	our @ISA = CFPlus::UI::VBox::;
3228		3972
3229	sub new {	3973	sub new {
3230	my $class = shift;	3974	my $class = shift;
3231		3975
3232	my $self = $class->SUPER::new (	3976	my $self = $class->SUPER::new (
3233	buttonbar => (new CFClient::UI::Buttonbar),	3977	buttonbar => (new CFPlus::UI::Buttonbar),
3234	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3978	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3979	active_outline => [.7, .7, 0.2],
3235	# filter => # will be put between multiplexer and $self	3980	# filter => # will be put between multiplexer and $self
3236	@_,	3981	@_,
3237	);	3982	);
3238		3983
3239	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3984	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3240	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3985	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3241		3986
		3987	{
		3988	Scalar::Util::weaken (my $wself = $self);
		3989
		3990	$self->{multiplexer}->connect (c_add => sub {
		3991	my ($mplex, $widgets) = @_;
		3992
		3993	for my $child (@$widgets) {
		3994	Scalar::Util::weaken $child;
		3995	$child->{c_tab_} ||= do {
		3996	my $tab =
		3997	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3998	? $child->{c_tab}
		3999	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4000
		4001	$tab->connect (activate => sub {
		4002	$wself->set_current_page ($child);
		4003	});
		4004
		4005	$tab
		4006	};
		4007
		4008	$self->{buttonbar}->add ($child->{c_tab_});
		4009	}
		4010	});
		4011
		4012	$self->{multiplexer}->connect (c_remove => sub {
		4013	my ($mplex, $widgets) = @_;
		4014
		4015	for my $child (@$widgets) {
		4016	$wself->{buttonbar}->remove ($child->{c_tab_});
		4017	}
		4018	});
		4019	}
		4020
3242	$self	4021	$self
3243	}	4022	}
3244		4023
3245	sub add {	4024	sub add {
		4025	my ($self, @widgets) = @_;
		4026
		4027	$self->{multiplexer}->add (@widgets)
		4028	}
		4029
		4030	sub remove {
		4031	my ($self, @widgets) = @_;
		4032
		4033	$self->{multiplexer}->remove (@widgets)
		4034	}
		4035
		4036	sub pages {
		4037	my ($self) = @_;
		4038	$self->{multiplexer}->children
		4039	}
		4040
		4041	sub add_tab {
3246	my ($self, $title, $widget, $tooltip) = @_;	4042	my ($self, $title, $widget, $tooltip) = @_;
3247		4043
3248	Scalar::Util::weaken $self;	4044	$title = [$title, $tooltip] unless ref $title;
		4045	$widget->{c_tab} = $title;
3249		4046
3250	$self->{buttonbar}->add (new CFClient::UI::Button
3251	markup => $title,
3252	tooltip => $tooltip,
3253	on_activate => sub { $self->set_current_page ($widget) },
3254	);
3255
3256	$self->{multiplexer}->add ($widget);	4047	$self->add ($widget);
3257	}	4048	}
3258		4049
3259	sub get_current_page {	4050	sub get_current_page {
3260	my ($self) = @_;	4051	my ($self) = @_;
3261		4052
…		…
3267		4058
3268	$self->{multiplexer}->set_current_page ($page);	4059	$self->{multiplexer}->set_current_page ($page);
3269	$self->emit (page_changed => $self->{multiplexer}{current});	4060	$self->emit (page_changed => $self->{multiplexer}{current});
3270	}	4061	}
3271		4062
		4063	sub _draw {
		4064	my ($self) = @_;
		4065
		4066	$self->SUPER::_draw ();
		4067
		4068	if (my $cur = $self->{multiplexer}{current}) {
		4069	if ($cur = $cur->{c_tab_}) {
		4070	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4071	$self->{buttonbar}{y} + $cur->{y};
		4072	glLineWidth 3;
		4073	#glEnable GL_BLEND;
		4074	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4075	glColor @{$self->{active_outline}};
		4076	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4077	glLineWidth 1;
		4078	#glDisable GL_BLEND;
		4079	}
		4080	}
		4081	}
		4082
3272	#############################################################################	4083	#############################################################################
3273		4084
3274	package CFClient::UI::Combobox;	4085	package CFPlus::UI::Selector;
3275		4086
3276	use utf8;	4087	use utf8;
3277		4088
3278	our @ISA = CFClient::UI::Button::;	4089	our @ISA = CFPlus::UI::Button::;
3279		4090
3280	sub new {	4091	sub new {
3281	my $class = shift;	4092	my $class = shift;
3282		4093
3283	my $self = $class->SUPER::new (	4094	my $self = $class->SUPER::new (
…		…
3300	my ($value, $title, $tooltip) = @$_;	4111	my ($value, $title, $tooltip) = @$_;
3301		4112
3302	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4113	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303	}	4114	}
3304		4115
3305	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4116	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306	}	4117	}
3307		4118
3308	sub _set_value {	4119	sub _set_value {
3309	my ($self, $value) = @_;	4120	my ($self, $value) = @_;
3310		4121
3311	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4122	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4123	$item ||= $self->{options}[0]
3312	or return;	4124	or return;
3313		4125
3314	$self->{value} = $item->[0];	4126	$self->{value} = $item->[0];
3315	$self->set_markup ("$item->[1] ⇓");	4127	$self->set_markup ("$item->[1] ⇓");
3316	$self->set_tooltip ($item->[2]);	4128	# $self->set_tooltip ($item->[2]);
3317	}	4129	}
3318		4130
3319	sub set_value {	4131	sub set_value {
3320	my ($self, $value) = @_;	4132	my ($self, $value) = @_;
3321		4133
…		…
3323		4135
3324	$self->_set_value ($value);	4136	$self->_set_value ($value);
3325	$self->emit (changed => $value);	4137	$self->emit (changed => $value);
3326	}	4138	}
3327		4139
		4140	sub set_options {
		4141	my ($self, $options) = @_;
		4142
		4143	$self->{options} = $options;
		4144	$self->_set_value ($self->{value});
		4145	}
		4146
3328	#############################################################################	4147	#############################################################################
3329		4148
3330	package CFClient::UI::Statusbox;	4149	package CFPlus::UI::Statusbox;
3331		4150
3332	our @ISA = CFClient::UI::VBox::;	4151	our @ISA = CFPlus::UI::VBox::;
3333		4152
3334	sub new {	4153	sub new {
3335	my $class = shift;	4154	my $class = shift;
3336		4155
3337	my $self = $class->SUPER::new (	4156	my $self = $class->SUPER::new (
3338	fontsize => 0.8,	4157	fontsize => 0.8,
3339	@_,	4158	@_,
3340	);	4159	);
3341		4160
3342	Scalar::Util::weaken (my $this = $self);	4161	CFPlus::weaken (my $this = $self);
3343		4162
3344	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4163	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3345		4164
3346	$self	4165	$self
3347	}	4166	}
3348		4167
3349	sub reorder {	4168	sub reorder {
3350	my ($self) = @_;	4169	my ($self) = @_;
3351	my $NOW = Time::HiRes::time;	4170	my $NOW = Time::HiRes::time;
3352		4171
3353	# freeze display when hovering over any label	4172	# freeze display when hovering over any label
3354	return if $CFClient::UI::TOOLTIP->{owner}	4173	return if $CFPlus::UI::TOOLTIP->{owner}
3355	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4174	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3356	values %{ $self->{item} };	4175	values %{ $self->{item} };
3357		4176
3358	while (my ($k, $v) = each %{ $self->{item} }) {	4177	while (my ($k, $v) = each %{ $self->{item} }) {
3359	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4178	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3360	}	4179	}
…		…
3363		4182
3364	my @items = sort {	4183	my @items = sort {
3365	$a->{pri} <=> $b->{pri}	4184	$a->{pri} <=> $b->{pri}
3366	or $b->{id} <=> $a->{id}	4185	or $b->{id} <=> $a->{id}
3367	} values %{ $self->{item} };	4186	} values %{ $self->{item} };
3368
3369	$self->{timer}->interval (1);
3370		4187
3371	my $count = 10 + 1;	4188	my $count = 10 + 1;
3372	for my $item (@items) {	4189	for my $item (@items) {
3373	last unless --$count;	4190	last unless --$count;
3374		4191
…		…
3381	for ($short) {	4198	for ($short) {
3382	s/^\s+//;	4199	s/^\s+//;
3383	s/\s+/ /g;	4200	s/\s+/ /g;
3384	}	4201	}
3385		4202
3386	new CFClient::UI::Label	4203	new CFPlus::UI::Label
3387	markup => $short,	4204	markup => $short,
3388	tooltip => $item->{tooltip},	4205	tooltip => $item->{tooltip},
3389	tooltip_font => $::FONT_PROP,	4206	tooltip_font => $::FONT_PROP,
3390	tooltip_width => 0.67,	4207	tooltip_width => 0.67,
3391	fontsize => $item->{fontsize} || $self->{fontsize},	4208	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3398	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4215	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3399	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4216	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3400	$label->update;	4217	$label->update;
3401	$label->set_max_size (undef, $label->{req_h} * $diff)	4218	$label->set_max_size (undef, $label->{req_h} * $diff)
3402	if $diff < 1;	4219	if $diff < 1;
3403	$self->{timer}->interval (1/30);	4220	$self->{timer}->set (1/30, 1/30);
3404	} else {	4221	} else {
3405	$label->{fg}[3] = $item->{fg}[3] || 1;	4222	$label->{fg}[3] = $item->{fg}[3] || 1;
3406	}	4223	}
3407		4224
3408	push @widgets, $label;	4225	push @widgets, $label;
…		…
3470	$self->SUPER::destroy;	4287	$self->SUPER::destroy;
3471	}	4288	}
3472		4289
3473	#############################################################################	4290	#############################################################################
3474		4291
3475	package CFClient::UI::Inventory;
3476
3477	our @ISA = CFClient::UI::Table::;
3478
3479	sub new {
3480	my $class = shift;
3481
3482	my $self = $class->SUPER::new (
3483	col_expand => [0, 1, 0],
3484	@_,
3485	);
3486
3487	$self
3488	}
3489
3490	sub set_items {
3491	my ($self, $items) = @_;
3492
3493	$self->clear;
3494	return unless $items;
3495
3496	my @items = sort {
3497	($a->{type} <=> $b->{type})
3498	or ($a->{name} cmp $b->{name})
3499	} values %$items;
3500
3501	$self->{real_items} = \@items;
3502
3503	my $row = 0;
3504	for my $item (@items) {
3505	CFClient::Item::update_widgets $item;
3506
3507	$self->add (0, $row, $item->{face_widget});
3508	$self->add (1, $row, $item->{desc_widget});
3509	$self->add (2, $row, $item->{weight_widget});
3510
3511	$row++;
3512	}
3513	}
3514
3515	#############################################################################
3516
3517	package CFClient::UI::SpellList;
3518
3519	our @ISA = CFClient::UI::Table::;
3520
3521	sub new {
3522	my $class = shift;
3523
3524	my $self = $class->SUPER::new (
3525	binding => [],
3526	commands => [],
3527	@_,
3528	)
3529	}
3530
3531	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3532
3533	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543
3544	sub rebuild_spell_list {
3545	my ($self) = @_;
3546
3547	$CFClient::UI::ROOT->on_refresh ($self => sub {
3548	$self->clear;
3549
3550	return unless $::CONN;
3551
3552	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558	my $row = 0;
3559
3560	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561	my $spell = $self->{spell}{$_};
3562
3563	$row++;
3564
3565	my $spell_cb = sub {
3566	my ($widget, $ev) = @_;
3567
3568	if ($ev->{button} == 1) {
3569	$::CONN->user_send ("cast $spell->{name}");
3570	} elsif ($ev->{button} == 2) {
3571	$::CONN->user_send ("invoke $spell->{name}");
3572	} elsif ($ev->{button} == 3) {
3573	(new CFClient::UI::Menu
3574	items => [
3575	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577	],
3578	)->popup ($ev);
3579	} else {
3580	return 0;
3581	}
3582
3583	1
3584	};
3585
3586	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588	#TODO: add path info to tooltip
3589	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591	$self->add (0, $row, new CFClient::UI::Face
3592	face => $spell->{face},
3593	can_hover => 1,
3594	can_events => 1,
3595	tooltip => $tooltip,
3596	on_button_down => $spell_cb,
3597	);
3598
3599	$self->add (1, $row, new CFClient::UI::Label
3600	expand => 1,
3601	text => $spell->{name},
3602	can_hover => 1,
3603	can_events => 1,
3604	tooltip => $tooltip,
3605	on_button_down => $spell_cb,
3606	);
3607
3608	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612	}
3613	});
3614	}
3615
3616	sub add_spell {
3617	my ($self, $spell) = @_;
3618
3619	$self->{spell}->{$spell->{name}} = $spell;
3620	$self->rebuild_spell_list;
3621	}
3622
3623	sub remove_spell {
3624	my ($self, $spell) = @_;
3625
3626	delete $self->{spell}->{$spell->{name}};
3627	$self->rebuild_spell_list;
3628	}
3629
3630	sub clear_spells {
3631	my ($self) = @_;
3632
3633	$self->{spell} = {};
3634	$self->rebuild_spell_list;
3635	}
3636
3637	#############################################################################
3638
3639	package CFClient::UI::Root;	4292	package CFPlus::UI::Root;
3640		4293
3641	our @ISA = CFClient::UI::Container::;	4294	our @ISA = CFPlus::UI::Container::;
3642		4295
3643	use List::Util qw(min max);	4296	use List::Util qw(min max);
3644		4297
3645	use CFClient::OpenGL;	4298	use CFPlus::OpenGL;
3646		4299
3647	sub new {	4300	sub new {
3648	my $class = shift;	4301	my $class = shift;
3649		4302
3650	my $self = $class->SUPER::new (	4303	my $self = $class->SUPER::new (
3651	visible => 1,	4304	visible => 1,
3652	@_,	4305	@_,
3653	);	4306	);
3654		4307
3655	Scalar::Util::weaken ($self->{root} = $self);	4308	CFPlus::weaken ($self->{root} = $self);
3656		4309
3657	$self	4310	$self
3658	}	4311	}
3659		4312
3660	sub size_request {	4313	sub size_request {
…		…
3708	}	4361	}
3709		4362
3710	sub update {	4363	sub update {
3711	my ($self) = @_;	4364	my ($self) = @_;
3712		4365
3713	$::WANT_REFRESH++;	4366	$::WANT_REFRESH->start;
3714	}	4367	}
3715		4368
3716	sub add {	4369	sub add {
3717	my ($self, @children) = @_;	4370	my ($self, @children) = @_;
3718		4371
…		…
3755	while ($self->{refresh_hook}) {	4408	while ($self->{refresh_hook}) {
3756	$_->()	4409	$_->()
3757	for values %{delete $self->{refresh_hook}};	4410	for values %{delete $self->{refresh_hook}};
3758	}	4411	}
3759		4412
3760	if ($self->{realloc}) {	4413	while ($self->{realloc}) {
3761	my %queue;	4414	my %queue;
3762	my @queue;	4415	my @queue;
3763	my $widget;	4416	my $widget;
3764		4417
3765	outer:	4418	outer:
…		…
3812	}	4465	}
3813	}	4466	}
3814		4467
3815	delete $self->{realloc}{$widget+0};	4468	delete $self->{realloc}{$widget+0};
3816	}	4469	}
3817	}
3818		4470
3819	while (my $size_alloc = delete $self->{size_alloc}) {	4471	while (my $size_alloc = delete $self->{size_alloc}) {
3820	my @queue = sort { $b->{visible} <=> $a->{visible} }	4472	my @queue = sort { $a->{visible} <=> $b->{visible} }
3821	values %$size_alloc;	4473	values %$size_alloc;
3822		4474
3823	while () {	4475	while () {
3824	my $widget = pop @queue || last;	4476	my $widget = pop @queue || last;
3825		4477
3826	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4478	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3827		4479
3828	$w = 0 if $w < 0;
3829	$h = 0 if $h < 0;
3830
3831	$w = max $widget->{min_w}, $w;	4480	$w = max $widget->{min_w}, $w;
3832	$h = max $widget->{min_h}, $h;	4481	$h = max $widget->{min_h}, $h;
3833		4482
		4483	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4484	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4485
3834	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4486	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4487	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836		4488
3837	$w = int $w + 0.5;	4489	$w = int $w + 0.5;
3838	$h = int $h + 0.5;	4490	$h = int $h + 0.5;
3839		4491
3840	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4492	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3841	$widget->{old_w} = $widget->{w};	4493	$widget->{old_w} = $widget->{w};
3842	$widget->{old_h} = $widget->{h};	4494	$widget->{old_h} = $widget->{h};
3843		4495
3844	$widget->{w} = $w;	4496	$widget->{w} = $w;
3845	$widget->{h} = $h;	4497	$widget->{h} = $h;
3846		4498
3847	$widget->emit (size_allocate => $w, $h);	4499	$widget->emit (size_allocate => $w, $h);
		4500	}
3848	}	4501	}
3849	}	4502	}
3850	}	4503	}
3851		4504
3852	while ($self->{post_alloc_hook}) {	4505	while ($self->{post_alloc_hook}) {
3853	$_->()	4506	$_->()
3854	for values %{delete $self->{post_alloc_hook}};	4507	for values %{delete $self->{post_alloc_hook}};
3855	}	4508	}
3856
3857		4509
3858	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4510	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3859	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4511	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3860	glClear GL_COLOR_BUFFER_BIT;	4512	glClear GL_COLOR_BUFFER_BIT;
3861		4513
…		…
3864	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4516	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3865	glMatrixMode GL_MODELVIEW;	4517	glMatrixMode GL_MODELVIEW;
3866	glLoadIdentity;	4518	glLoadIdentity;
3867		4519
3868	{	4520	{
3869	package CFClient::UI::Base;	4521	package CFPlus::UI::Base;
3870		4522
3871	($draw_x, $draw_y, $draw_w, $draw_h) =	4523	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3872	(0, 0, $self->{w}, $self->{h});	4524	(0, 0, $self->{w}, $self->{h});
3873	}
3874		4525
3875	$self->_draw;	4526	$self->_draw;
		4527	}
3876	}	4528	}
3877		4529
3878	#############################################################################	4530	#############################################################################
3879		4531
3880	package CFClient::UI;	4532	package CFPlus::UI;
3881		4533
3882	$ROOT = new CFClient::UI::Root;	4534	$ROOT = new CFPlus::UI::Root;
3883	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4535	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3884		4536
3885	1	4537	1
3886		4538

Diff Legend

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