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.325 by root, Thu Jul 13 01:29:17 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 2007 UTC

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

Diff Legend

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