ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 2007 UTC

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

Diff Legend

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