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.322 by root, Wed Jul 5 01:53:24 2006 UTC vs.
Revision 1.418 by elmex, Tue Jul 24 18:39:39 2007 UTC

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

Diff Legend

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