ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

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

Diff Legend

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