ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.418 by elmex, Tue Jul 24 18:39:39 2007 UTC

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

Diff Legend

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