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

Diff Legend

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