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

Diff Legend

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