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

Diff Legend

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