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.315 by root, Wed Jun 28 21:17:01 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 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	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
247	sub show {	281	sub show {
248	my ($self) = @_;	282	my ($self) = @_;
249		283
250	return if $self->{parent};	284	return if $self->{parent};
251		285
252	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
253	}	287	}
254		288
255	sub set_visible {	289	sub set_visible {
256	my ($self) = @_;	290	my ($self) = @_;
257		291
…		…
278	delete $self->{root};	312	delete $self->{root};
279		313
280	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
282		316
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
285		319
286	$self->emit ("focus_out");	320	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
288	}	322	}
…		…
290	sub set_visibility {	324	sub set_visibility {
291	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
292		326
293	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
294		328
295	$visible ? $self->hide	329	$visible ? $self->show
296	: $self->show;	330	: $self->hide;
297	}	331	}
298		332
299	sub toggle_visibility {	333	sub toggle_visibility {
300	my ($self) = @_;	334	my ($self) = @_;
301		335
…		…
345	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
346		380
347	if ($self->{aspect}) {	381	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
349		383
350	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		386
353	# use alignment to adjust x, y	387	# use alignment to adjust x, y
354		388
355	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
397		431
398	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
399		433
400	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
401		435
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	439	}
406	}	440	}
407		441
408	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
409	sub coord2local {	443	sub coord2local {
410	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
411		445
		446	Carp::confess unless $self->{parent};#d#
		447
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	449	}
414		450
415	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
416	sub coord2global {	452	sub coord2global {
417	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
418		454
		455	Carp::confess unless $self->{parent};#d#
		456
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	458	}
421		459
422	sub invoke_focus_in {	460	sub invoke_focus_in {
423	my ($self) = @_;	461	my ($self) = @_;
424		462
425	return if $FOCUS == $self;	463	return if $FOCUS == $self;
426	return unless $self->{can_focus};	464	return unless $self->{can_focus};
427		465
428	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
429		467
430	$focus->update if $focus;	468	$self->update;
431	$FOCUS->update;
432		469
433	0	470	0
434	}	471	}
435		472
436	sub invoke_focus_out {	473	sub invoke_focus_out {
437	my ($self) = @_;	474	my ($self) = @_;
438		475
439	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
440		477
441	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
442		479
443	$focus->update if $focus; #?	480	$self->update;
444		481
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	483	unless $FOCUS;
447		484
448	0	485	0
449	}	486	}
450		487
451	sub grab_focus {	488	sub grab_focus {
452	my ($self) = @_;	489	my ($self) = @_;
453		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	492	$self->emit ("focus_in");
455	}	493	}
456		494
457	sub invoke_mouse_motion { 1 }	495	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	496	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	497	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
461		500
462	sub invoke_button_down {	501	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
464		503
465	$self->grab_focus;	504	$self->grab_focus;
466		505
467	1	506	0
468	}	507	}
469		508
470	sub connect {	509	sub connect {
471	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
472		511
473	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
474	}	518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
475		532
476	sub emit {	533	sub emit {
477	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
478		535
479	#d##TODO# stop propagating at first true, do not use sum	536	# I do not really like this solution, but I do not like duplication
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	554	}
484		555
485	sub find_widget {	556	#sub find_widget {
486	my ($self, $x, $y) = @_;	557	# in .xs
487
488	return () unless $self->{can_events};
489
490	return $self
491	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494	()
495	}
496		558
497	sub set_parent {	559	sub set_parent {
498	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
499		561
500	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
502	}	564	}
503		565
504	sub realloc {	566	sub realloc {
505	my ($self) = @_;	567	my ($self) = @_;
…		…
571	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
574	glEnd;	636	glEnd;
575	glPopMatrix;	637	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}	639	}
578		640
579	$self->_draw;	641	$self->_draw;
580	glPopMatrix;	642	glPopMatrix;
581	}	643	}
…		…
584	my ($self) = @_;	646	my ($self) = @_;
585		647
586	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
587	}	649	}
588		650
		651	my $cntx;#d#
589	sub DESTROY {	652	sub DESTROY {
590	my ($self) = @_;	653	my ($self) = @_;
591		654
592	delete $WIDGET{$self+0};	655	return if CFPlus::in_destruct;
593		656
594	eval { $self->destroy };	657	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
596	}	661	}
597		662
598	#############################################################################	663	#############################################################################
599		664
600	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
601		666
602	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
603		668
604	use strict;	669	use strict;
605	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
606		671
607	sub new {	672	sub new {
608	my $class = shift;	673	my $class = shift;
609		674
610	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
641	}	706	}
642	}	707	}
643		708
644	#############################################################################	709	#############################################################################
645		710
646	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
647		712
648	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
649		714
650	sub new {	715	sub new {
651	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
653	}	718	}
…		…
660		725
661	sub draw { }	726	sub draw { }
662		727
663	#############################################################################	728	#############################################################################
664		729
665	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
666		731
667	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
668		733
669	sub new {	734	sub new {
670	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
671		736
672	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
681	if $children;	746	if $children;
682		747
683	$self	748	$self
684	}	749	}
685		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
		757	}
		758
686	sub add {	759	sub add {
687	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
688		761
689	$_->set_parent ($self)	762	$_->set_parent ($self)
690	for @widgets;	763	for @widgets;
…		…
750	$_->draw for @{$self->{children}};	823	$_->draw for @{$self->{children}};
751	}	824	}
752		825
753	#############################################################################	826	#############################################################################
754		827
755	package CFClient::UI::Bin;	828	package CFPlus::UI::Bin;
756		829
757	our @ISA = CFClient::UI::Container::;	830	our @ISA = CFPlus::UI::Container::;
758		831
759	sub new {	832	sub new {
760	my ($class, %arg) = @_;	833	my ($class, %arg) = @_;
761		834
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	835	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		836
764	$class->SUPER::new (children => [$child], %arg)	837	$class->SUPER::new (children => [$child], %arg)
765	}	838	}
766		839
767	sub add {	840	sub add {
…		…
774	sub remove {	847	sub remove {
775	my ($self, $widget) = @_;	848	my ($self, $widget) = @_;
776		849
777	$self->SUPER::remove ($widget);	850	$self->SUPER::remove ($widget);
778		851
779	$self->{children} = [new CFClient::UI::Empty]	852	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	853	unless @{$self->{children}};
781	}	854	}
782		855
783	sub child { $_[0]->{children}[0] }	856	sub child { $_[0]->{children}[0] }
784		857
…		…
796		869
797	#############################################################################	870	#############################################################################
798		871
799	# back-buffered drawing area	872	# back-buffered drawing area
800		873
801	package CFClient::UI::Window;	874	package CFPlus::UI::Window;
802		875
803	our @ISA = CFClient::UI::Bin::;	876	our @ISA = CFPlus::UI::Bin::;
804		877
805	use CFClient::OpenGL;	878	use CFPlus::OpenGL;
806		879
807	sub new {	880	sub new {
808	my ($class, %arg) = @_;	881	my ($class, %arg) = @_;
809		882
810	my $self = $class->SUPER::new (%arg);	883	my $self = $class->SUPER::new (%arg);
…		…
832	}	905	}
833		906
834	sub render_child {	907	sub render_child {
835	my ($self) = @_;	908	my ($self) = @_;
836		909
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	910	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	911	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	912	glClear GL_COLOR_BUFFER_BIT;
840		913
841	{	914	{
842	package CFClient::UI::Base;	915	package CFPlus::UI::Base;
843		916
844	($draw_x, $draw_y, $draw_w, $draw_h) =	917	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	918	(0, 0, $self->{w}, $self->{h});
		919
		920	$self->_render;
846	}	921	}
847
848	$self->_render;
849	};	922	};
850	}	923	}
851		924
852	sub _draw {	925	sub _draw {
853	my ($self) = @_;	926	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		927
857	my $tex = $self->{texture}	928	my $tex = $self->{texture}
858	or return;	929	or return;
859		930
860	glEnable GL_TEXTURE_2D;	931	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	933	glColor 0, 0, 0, 1;
863		934
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	935	$tex->draw_quad_alpha_premultiplied (0, 0);
865		936
866	glDisable GL_TEXTURE_2D;	937	glDisable GL_TEXTURE_2D;
867	}	938	}
868		939
869	#############################################################################	940	#############################################################################
870		941
871	package CFClient::UI::ViewPort;	942	package CFPlus::UI::ViewPort;
872		943
		944	use List::Util qw(min max);
		945
873	our @ISA = CFClient::UI::Window::;	946	our @ISA = CFPlus::UI::Window::;
874		947
875	sub new {	948	sub new {
876	my $class = shift;	949	my $class = shift;
877		950
878	$class->SUPER::new (	951	$class->SUPER::new (
…		…
885	sub size_request {	958	sub size_request {
886	my ($self) = @_;	959	my ($self) = @_;
887		960
888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	961	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889		962
890	$w = 10 if $self->{scroll_x};	963	$w = 1 if $self->{scroll_x};
891	$h = 10 if $self->{scroll_y};	964	$h = 1 if $self->{scroll_y};
892		965
893	($w, $h)	966	($w, $h)
894	}	967	}
895		968
896	sub invoke_size_allocate {	969	sub invoke_size_allocate {
…		…
908	}	981	}
909		982
910	sub set_offset {	983	sub set_offset {
911	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
912		985
		986	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		987	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		988
		989	if ($x != $self->{view_x} or $y != $self->{view_y}) {
913	$self->{view_x} = int $x;	990	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	991	$self->{view_y} = $y;
915		992
		993	$self->emit (changed => $x, $y);
916	$self->update;	994	$self->update;
		995	}
917	}	996	}
918		997
919	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
920	sub coord2local {	999	sub coord2local {
921	my ($self, $x, $y) = @_;	1000	my ($self, $x, $y) = @_;
…		…
936	my ($self, $x, $y) = @_;	1015	my ($self, $x, $y) = @_;
937		1016
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1019	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1021	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1023	}
945	}	1024	}
946		1025
947	sub _render {	1026	sub _render {
948	my ($self) = @_;	1027	my ($self) = @_;
949		1028
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1029	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1031
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1033
955	$self->SUPER::_render;	1034	$self->SUPER::_render;
956	}	1035	}
957		1036
958	#############################################################################	1037	#############################################################################
959		1038
960	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
961		1040
962	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
963		1042
964	sub new {	1043	sub new {
965	my ($class, %arg) = @_;	1044	my ($class, %arg) = @_;
966		1045
967	my $child = delete $arg{child};	1046	my $child = delete $arg{child};
968		1047
969	my $self;	1048	my $self;
970		1049
971	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
972	vertical => 1,	1060	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1062	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1065	},
977	;	1066	;
978		1067
979	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
		1071	can_events => 1,
981	slider => $slider,	1072	hslider => $hslider,
		1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
982	%arg,	1076	%arg,
983	);	1077	);
984		1078
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085
		1086	$vp->{parent}{hslider}->set_value ($x);
		1087	$vp->{parent}{vslider}->set_value ($y);
		1088
		1089	0
		1090	},
		1091	;
		1092
		1093	$self->SUPER::add_at (0, 0, $self->{vp});
		1094
986	$self->add ($child) if $child;	1095	$self->add ($child) if $child;
987		1096
988	$self	1097	$self
989	}	1098	}
990		1099
…		…
997	}	1106	}
998		1107
999	sub update_slider {	1108	sub update_slider {
1000	my ($self) = @_;	1109	my ($self) = @_;
1001		1110
		1111	my $child = ($self->{vp} or return)->child;
		1112
		1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1115
		1116	my $visible = $w1 > $w2;
		1117	if ($visible != $self->{hslider}{visible}) {
		1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1119	: $self->{hslider}->hide;
		1120	}
		1121
		1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1124
		1125	my $visible = $h1 > $h2;
		1126	if ($visible != $self->{vslider}{visible}) {
		1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1128	: $self->{vslider}->hide;
		1129	}
1003	}	1130	}
1004		1131
1005	sub update {	1132	sub update {
1006	my ($self) = @_;	1133	my ($self) = @_;
1007		1134
		1135	$self->update_slider;
1008	$self->SUPER::update;	1136	$self->SUPER::update;
		1137	}
1009		1138
1010	$self->update_slider;	1139	sub invoke_mouse_wheel {
		1140	my ($self, $ev) = @_;
		1141
		1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
		1144
		1145	$self->{hslider}->emit (mouse_wheel => $ev)
		1146	if $ev->{dx};
		1147
		1148	1
		1149	}
		1150
		1151	sub invoke_button_down {
		1152	my ($self, $ev, $x, $y) = @_;
		1153
		1154	if ($ev->{button} == 2) {
		1155	$self->grab_focus;
		1156
		1157	my $ox = $self->{vp}{view_x} + $ev->{x};
		1158	my $oy = $self->{vp}{view_y} + $ev->{y};
		1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
		1162
		1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1164	$self->update;
		1165	};
		1166
		1167	return 1;
		1168	}
		1169
		1170	0
		1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_mouse_motion {
		1184	my ($self, $ev, $x, $y) = @_;
		1185
		1186	if ($self->{motion}) {
		1187	$self->{motion}->($ev, $x, $y);
		1188	return 1;
		1189	}
		1190
		1191	0
1011	}	1192	}
1012		1193
1013	sub invoke_size_allocate {	1194	sub invoke_size_allocate {
1014	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
1015		1196
1016	$self->update_slider;	1197	$self->update_slider;
1017
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1198	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1199	}
1020		1200
1021	#############################################################################	1201	#############################################################################
1022		1202
1023	package CFClient::UI::Frame;	1203	package CFPlus::UI::Frame;
1024		1204
1025	our @ISA = CFClient::UI::Bin::;	1205	our @ISA = CFPlus::UI::Bin::;
1026		1206
1027	use CFClient::OpenGL;	1207	use CFPlus::OpenGL;
1028		1208
1029	sub new {	1209	sub new {
1030	my $class = shift;	1210	my $class = shift;
1031		1211
1032	$class->SUPER::new (	1212	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1238	$self->SUPER::_draw;
1059	}	1239	}
1060		1240
1061	#############################################################################	1241	#############################################################################
1062		1242
1063	package CFClient::UI::FancyFrame;	1243	package CFPlus::UI::FancyFrame;
1064		1244
1065	our @ISA = CFClient::UI::Bin::;	1245	our @ISA = CFPlus::UI::Bin::;
1066		1246
1067	use CFClient::OpenGL;	1247	use CFPlus::OpenGL;
		1248
		1249	sub new {
		1250	my ($class, %arg) = @_;
		1251
		1252	if ((exists $arg{label}) && !ref $arg{label}) {
		1253	$arg{label} = new CFPlus::UI::Label
		1254	align => 1,
		1255	valign => 0,
		1256	text => $arg{label},
		1257	fontsize => ($arg{border} || 0.8) * 0.75;
		1258	}
		1259
		1260	my $self = $class->SUPER::new (
		1261	# label => "",
		1262	fg => [0.6, 0.3, 0.1],
		1263	border => 0.8,
		1264	style => 'single',
		1265	%arg,
		1266	);
		1267
		1268	$self
		1269	}
		1270
		1271	sub add {
		1272	my ($self, @widgets) = @_;
		1273
		1274	$self->SUPER::add (@widgets);
		1275	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1276	}
		1277
		1278	sub border {
		1279	int $_[0]{border} * $::FONTSIZE
		1280	}
		1281
		1282	sub size_request {
		1283	my ($self) = @_;
		1284
		1285	($self->{label_w}, undef) = $self->{label}->size_request
		1286	if $self->{label};
		1287
		1288	my ($w, $h) = $self->SUPER::size_request;
		1289
		1290	(
		1291	$w + $self->border * 2,
		1292	$h + $self->border * 2,
		1293	)
		1294	}
		1295
		1296	sub invoke_size_allocate {
		1297	my ($self, $w, $h) = @_;
		1298
		1299	my $border = $self->border;
		1300
		1301	$w -= List::Util::max 0, $border * 2;
		1302	$h -= List::Util::max 0, $border * 2;
		1303
		1304	if (my $label = $self->{label}) {
		1305	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1306	$label->{h} = List::Util::min $h, $border;
		1307	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1308	}
		1309
		1310	$self->child->configure ($border, $border, $w, $h);
		1311
		1312	1
		1313	}
		1314
		1315	sub _draw {
		1316	my ($self) = @_;
		1317
		1318	my $child = $self->{children}[0];
		1319
		1320	my $border = $self->border;
		1321	my ($w, $h) = ($self->{w}, $self->{h});
		1322
		1323	$child->draw;
		1324
		1325	glColor @{$self->{fg}};
		1326	glBegin GL_LINE_STRIP;
		1327	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1328	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1330	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1331	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1333	glEnd;
		1334
		1335	if ($self->{label}) {
		1336	glTranslate $border * 2, 0;
		1337	$self->{label}->_draw;
		1338	}
		1339	}
		1340
		1341	#############################################################################
		1342
		1343	package CFPlus::UI::Toplevel;
		1344
		1345	our @ISA = CFPlus::UI::Bin::;
		1346
		1347	use CFPlus::OpenGL;
1068		1348
1069	my $bg =	1349	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1350	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1351	mipmap => 1, wrap => 1;
1072		1352
1073	my @border =	1353	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1354	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
1076		1360
1077	sub new {	1361	sub new {
1078	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1079		1363
1080	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1365	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1366	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1367	border => 0.6,
1084	can_events => 1,	1368	can_events => 1,
1085	min_w => 16,	1369	min_w => 64,
1086	min_h => 16,	1370	min_h => 32,
1087	%arg,	1371	%arg,
1088	);	1372	);
1089		1373
1090	$self->{title_widget} = new CFClient::UI::Label	1374	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1375	align => 0,
1092	valign => 1,	1376	valign => 1,
1093	text => $self->{title},	1377	text => $self->{title},
1094	fontsize => $self->{border},	1378	fontsize => $self->{border},
1095	if exists $self->{title};	1379	if exists $self->{title};
1096		1380
1097	if ($self->{has_close_button}) {	1381	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1382	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1383	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1384	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1385	on_activate => sub { $self->emit ("delete") };
1102		1386
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1387	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1388	}
1105		1389
1106	$self	1390	$self
1107	}	1391	}
1108		1392
1109	sub add {	1393	sub add {
1110	my ($self, @widgets) = @_;	1394	my ($self, @widgets) = @_;
1111		1395
1112	$self->SUPER::add (@widgets);	1396	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1397	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1398	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1399	}
1116		1400
1117	sub border {	1401	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1402	int $_[0]{border} * $::FONTSIZE
1119	}	1403	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1436	$self->child->configure ($border, $border, $w, $h);
1153		1437
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1438	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1439	if $self->{close_button};
1156		1440
		1441	1
		1442	}
		1443
		1444	sub invoke_delete {
		1445	my ($self) = @_;
		1446
		1447	$self->hide;
		1448
1157	1	1449	1
1158	}	1450	}
1159		1451
1160	sub invoke_button_down {	1452	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1453	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1511	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1512
1221	! ! $self->{motion}	1513	! ! $self->{motion}
1222	}	1514	}
1223		1515
		1516	sub invoke_visibility_change {
		1517	my ($self, $visible) = @_;
		1518
		1519	delete $self->{motion} unless $visible;
		1520
		1521	0
		1522	}
		1523
1224	sub _draw {	1524	sub _draw {
1225	my ($self) = @_;	1525	my ($self) = @_;
1226		1526
1227	my $child = $self->{children}[0];	1527	my $child = $self->{children}[0];
1228		1528
…		…
1233	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234		1534
1235	my $border = $self->border;	1535	my $border = $self->border;
1236		1536
1237	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1238	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242		1556
1243	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1245		1559
1246	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1265	if $self->{close_button};	1579	if $self->{close_button};
1266	}	1580	}
1267		1581
1268	#############################################################################	1582	#############################################################################
1269		1583
1270	package CFClient::UI::Table;	1584	package CFPlus::UI::Table;
1271		1585
1272	our @ISA = CFClient::UI::Base::;	1586	our @ISA = CFPlus::UI::Base::;
1273		1587
1274	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1275		1589
1276	use CFClient::OpenGL;	1590	use CFPlus::OpenGL;
1277		1591
1278	sub new {	1592	sub new {
1279	my $class = shift;	1593	my $class = shift;
1280		1594
1281	$class->SUPER::new (	1595	$class->SUPER::new (
		1596	children => [],
1282	col_expand => [],	1597	col_expand => [],
		1598	row_expand => [],
1283	@_,	1599	@_,
1284	)	1600	)
1285	}	1601	}
1286		1602
1287	sub children {	1603	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1605	}
1290		1606
		1607	# TODO: store row/col info in child widget and use standard add/del
1291	sub add {	1608	sub add {
1292	my ($self, $x, $y, $child) = @_;	1609	my $self = shift;
1293		1610
		1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1612	$self->add_at (@_);
		1613	}
		1614
		1615	sub add_at {
		1616	my $self = shift;
		1617
		1618	while (@_) {
		1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
		1621	$child->{row} = $row;
		1622	$child->{col} = $col;
		1623
		1624	$child->{rowspan} ||= 1;
		1625	$child->{colspan} ||= 1;
		1626
1294	$child->set_parent ($self);	1627	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1628	$self->{children}[$row][$col] = $child;
		1629	}
1296		1630
		1631	$self->{force_realloc} = 1;
		1632	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1633	$self->realloc;
1298	}	1634	}
1299		1635
1300	sub remove {	1636	sub remove {
1301	my ($self, $child) = @_;	1637	my ($self, $child) = @_;
1302		1638
1303	# TODO: not yet implemented	1639	for (@{ $self->{children} }) {
		1640	for (@{ $_ || [] }) {
		1641	$_ = undef if $_ == $child;
		1642	}
		1643	}
1304	}	1644	}
1305		1645
1306	# TODO: move to container class maybe? send children a signal on removal?	1646	# TODO: move to container class maybe? send children a signal on removal?
1307	sub clear {	1647	sub clear {
1308	my ($self) = @_;	1648	my ($self) = @_;
…		…
1321	sub get_wh {	1661	sub get_wh {
1322	my ($self) = @_;	1662	my ($self) = @_;
1323		1663
1324	my (@w, @h);	1664	my (@w, @h);
1325		1665
1326	for my $y (0 .. $#{$self->{children}}) {	1666	my @children = $self->children;
1327	my $row = $self->{children}[$y]
1328	or next;
1329		1667
1330	for my $x (0 .. $#$row) {	1668	for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1331	my $widget = $row->[$x]	1669	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1332	or next;
1333	my ($w, $h) = @$widget{qw(req_w req_h)};
1334		1670
1335	$w[$x] = max $w[$x], $w;	1671	my $sw = sum @w[$c .. $c + $cs - 1];
1336	$h[$y] = max $h[$y], $h;	1672	my $sh = sum @h[$r .. $r + $rs - 1];
		1673
		1674	if ($w > $sw) {
		1675	$_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
		1676	}
		1677
		1678	if ($h > $sh) {
		1679	$_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1337	}	1680	}
1338	}	1681	}
1339		1682
1340	(\@w, \@h)	1683	(\@w, \@h)
1341	}	1684	}
…		…
1357	my ($ws, $hs) = $self->get_wh;	1700	my ($ws, $hs) = $self->get_wh;
1358		1701
1359	my $req_w = (sum @$ws) || 1;	1702	my $req_w = (sum @$ws) || 1;
1360	my $req_h = (sum @$hs) || 1;	1703	my $req_h = (sum @$hs) || 1;
1361		1704
1362	# TODO: nicer code && do row_expand	1705	# now linearly scale the rows/columns to the allocated size
1363	my @col_expand = @{$self->{col_expand}};	1706	my @col_expand = @{$self->{col_expand}};
1364	@col_expand = (1) x @$ws unless @col_expand;	1707	@col_expand = (1) x @$ws unless @col_expand;
1365	my $col_expand = (sum @col_expand) || 1;	1708	my $col_expand = (sum @col_expand) || 1;
1366		1709
1367	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1710	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1711
1371	CFClient::UI::harmonize $ws;	1712	CFPlus::UI::harmonize $ws;
		1713
		1714	my @row_expand = @{$self->{row_expand}};
		1715	@row_expand = (1) x @$ws unless @row_expand;
		1716	my $row_expand = (sum @row_expand) || 1;
		1717
		1718	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1719
1372	CFClient::UI::harmonize $hs;	1720	CFPlus::UI::harmonize $hs;
1373		1721
1374	my $y;	1722	my (@x, @y);
1375		1723
		1724	for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1725	for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
		1726
1376	for my $r (0 .. $#{$self->{children}}) {	1727	for my $widget ($self->children) {
1377	my $row = $self->{children}[$r]	1728	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1378	or next;
1379		1729
1380	my $x = 0;	1730	$widget->configure (
1381	my $row_h = $hs->[$r];	1731	$x[$c], $y[$r],
		1732	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382		1733	);
1383	for my $c (0 .. $#$row) {
1384	my $col_w = $ws->[$c];
1385
1386	if (my $widget = $row->[$c]) {
1387	$widget->configure ($x, $y, $col_w, $row_h);
1388	}
1389
1390	$x += $col_w;
1391	}
1392
1393	$y += $row_h;
1394	}	1734	}
1395		1735
1396	1	1736	1
1397	}	1737	}
1398		1738
…		…
1420	}	1760	}
1421	}	1761	}
1422		1762
1423	#############################################################################	1763	#############################################################################
1424		1764
1425	package CFClient::UI::Box;	1765	package CFPlus::UI::Fixed;
1426		1766
		1767	use List::Util qw(min max);
		1768
1427	our @ISA = CFClient::UI::Container::;	1769	our @ISA = CFPlus::UI::Container::;
		1770
		1771	sub add {
		1772	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1773
		1774	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1775	$self->SUPER::add ($child);
		1776	}
		1777
		1778	sub _scale($$$) {
		1779	my ($mode, $val, $max) = @_;
		1780
		1781	$mode eq "abs" ? $val
		1782	: $mode eq "rel" ? $val * $max
		1783	: 0
		1784	}
		1785
		1786	sub size_request {
		1787	my ($self) = @_;
		1788
		1789	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1790
		1791	# determine overall size by querying abs widgets
		1792	for my $child ($self->visible_children) {
		1793	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1794
		1795	if ($pos eq "abs") {
		1796	$w = _scale $size, $w, $child->{req_w};
		1797	$h = _scale $size, $h, $child->{req_h};
		1798
		1799	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1800	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1801	}
		1802	}
		1803
		1804	my $W = $x2 - $x1;
		1805	my $H = $y2 - $y1;
		1806
		1807	# now layout remaining widgets
		1808	for my $child ($self->visible_children) {
		1809	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1810
		1811	if ($pos ne "abs") {
		1812	$x = _scale $pos, $x, $W;
		1813	$y = _scale $pos, $x, $H;
		1814	$w = _scale $size, $w, $child->{req_w};
		1815	$h = _scale $size, $h, $child->{req_h};
		1816
		1817	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1818	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1819	}
		1820	}
		1821
		1822	my $W = $x2 - $x1;
		1823	my $H = $y2 - $y1;
		1824
		1825	($W, $H)
		1826	}
		1827
		1828	sub invoke_size_allocate {
		1829	my ($self, $W, $H) = @_;
		1830
		1831	for my $child ($self->visible_children) {
		1832	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1833
		1834	$x = _scale $pos, $x, $W;
		1835	$y = _scale $pos, $x, $H;
		1836	$w = _scale $size, $w, $child->{req_w};
		1837	$h = _scale $size, $h, $child->{req_h};
		1838
		1839	$child->configure ($x, $y, $w, $h);
		1840	}
		1841
		1842	1
		1843	}
		1844
		1845	#############################################################################
		1846
		1847	package CFPlus::UI::Box;
		1848
		1849	our @ISA = CFPlus::UI::Container::;
1428		1850
1429	sub size_request {	1851	sub size_request {
1430	my ($self) = @_;	1852	my ($self) = @_;
1431		1853
1432	$self->{vertical}	1854	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1887	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1888	for 0 .. $#children;
1467	}	1889	}
1468	}	1890	}
1469		1891
1470	CFClient::UI::harmonize \@req;	1892	CFPlus::UI::harmonize \@req;
1471		1893
1472	my $pos = 0;	1894	my $pos = 0;
1473	for (0 .. $#children) {	1895	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1896	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1897	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1902	1
1481	}	1903	}
1482		1904
1483	#############################################################################	1905	#############################################################################
1484		1906
1485	package CFClient::UI::HBox;	1907	package CFPlus::UI::HBox;
1486		1908
1487	our @ISA = CFClient::UI::Box::;	1909	our @ISA = CFPlus::UI::Box::;
1488		1910
1489	sub new {	1911	sub new {
1490	my $class = shift;	1912	my $class = shift;
1491		1913
1492	$class->SUPER::new (	1914	$class->SUPER::new (
…		…
1495	)	1917	)
1496	}	1918	}
1497		1919
1498	#############################################################################	1920	#############################################################################
1499		1921
1500	package CFClient::UI::VBox;	1922	package CFPlus::UI::VBox;
1501		1923
1502	our @ISA = CFClient::UI::Box::;	1924	our @ISA = CFPlus::UI::Box::;
1503		1925
1504	sub new {	1926	sub new {
1505	my $class = shift;	1927	my $class = shift;
1506		1928
1507	$class->SUPER::new (	1929	$class->SUPER::new (
…		…
1510	)	1932	)
1511	}	1933	}
1512		1934
1513	#############################################################################	1935	#############################################################################
1514		1936
1515	package CFClient::UI::Label;	1937	package CFPlus::UI::Label;
1516		1938
1517	our @ISA = CFClient::UI::DrawBG::;	1939	our @ISA = CFPlus::UI::DrawBG::;
1518		1940
1519	use CFClient::OpenGL;	1941	use CFPlus::OpenGL;
1520		1942
1521	sub new {	1943	sub new {
1522	my ($class, %arg) = @_;	1944	my ($class, %arg) = @_;
1523		1945
1524	my $self = $class->SUPER::new (	1946	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1949	#active_bg => none
1528	#font => default_font	1950	#font => default_font
1529	#text => initial text	1951	#text => initial text
1530	#markup => initial narkup	1952	#markup => initial narkup
1531	#max_w => maximum pixel width	1953	#max_w => maximum pixel width
		1954	#style => 0, # render flags
1532	ellipsise => 3, # end	1955	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1956	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1957	fontsize => 1,
1535	align => -1,	1958	align => -1,
1536	valign => -1,	1959	valign => -1,
1537	padding_x => 2,	1960	padding_x => 2,
1538	padding_y => 2,	1961	padding_y => 2,
1539	can_events => 0,	1962	can_events => 0,
1540	%arg	1963	%arg
1541	);	1964	);
1542		1965
1543	if (exists $self->{template}) {	1966	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1967	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1968	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1969	$self->{template} = $layout;
1547	}	1970	}
1548		1971
1549	if (exists $self->{markup}) {	1972	if (exists $self->{markup}) {
…		…
1553	}	1976	}
1554		1977
1555	$self	1978	$self
1556	}	1979	}
1557		1980
1558	sub escape($) {
1559	local $_ = $_[0];
1560
1561	s/&/&amp;/g;
1562	s/>/&gt;/g;
1563	s/</&lt;/g;
1564
1565	$_
1566	}
1567
1568	sub update {	1981	sub update {
1569	my ($self) = @_;	1982	my ($self) = @_;
1570		1983
1571	delete $self->{texture};	1984	delete $self->{texture};
1572	$self->SUPER::update;	1985	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1996	my ($self, $text) = @_;
1584		1997
1585	return if $self->{text} eq "T$text";	1998	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1999	$self->{text} = "T$text";
1587		2000
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	2001	$self->{layout}->set_text ($text);
1590		2002
1591	delete $self->{size_req};	2003	delete $self->{size_req};
1592	$self->realloc;	2004	$self->realloc;
1593	$self->update;	2005	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	2011	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	2012	$self->{text} = "M$markup";
1601		2013
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2014	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		2015
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	2016	$self->{layout}->set_markup ($markup);
1606		2017
1607	delete $self->{size_req};	2018	delete $self->{size_req};
1608	$self->realloc;	2019	$self->realloc;
1609	$self->update;	2020	$self->update;
…		…
1621		2032
1622	my ($w, $h) = $self->{layout}->size;	2033	my ($w, $h) = $self->{layout}->size;
1623		2034
1624	if (exists $self->{template}) {	2035	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	2036	$self->{template}->set_font ($self->{font}) if $self->{font};
		2037	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2038	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		2039
1628	my ($w2, $h2) = $self->{template}->size;	2040	my ($w2, $h2) = $self->{template}->size;
1629		2041
1630	$w = List::Util::max $w, $w2;	2042	$w = List::Util::max $w, $w2;
…		…
1654		2066
1655	sub set_fontsize {	2067	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	2068	my ($self, $fontsize) = @_;
1657		2069
1658	$self->{fontsize} = $fontsize;	2070	$self->{fontsize} = $fontsize;
		2071	delete $self->{size_req};
1659	delete $self->{texture};	2072	delete $self->{texture};
1660		2073
1661	$self->realloc;	2074	$self->realloc;
1662	}	2075	}
1663		2076
1664	sub reconfigure {	2077	sub reconfigure {
1665	my ($self) = @_;	2078	my ($self) = @_;
1666		2079
1667	delete $self->{size_req};	2080	delete $self->{size_req};
		2081	delete $self->{texture};
1668		2082
1669	$self->SUPER::reconfigure;	2083	$self->SUPER::reconfigure;
1670	}	2084	}
1671		2085
1672	sub _draw {	2086	sub _draw {
1673	my ($self) = @_;	2087	my ($self) = @_;
1674		2088
1675	$self->SUPER::_draw; # draw background, if applicable	2089	$self->SUPER::_draw; # draw background, if applicable
1676		2090
1677	my $tex = $self->{texture} ||= do {	2091	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	2092	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	2093	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	2094	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	2095	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2096	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2097	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		2098
1685	new_from_layout CFClient::Texture $self->{layout}	2099	[$self->{layout}->size]
1686	};	2100	};
1687		2101
1688	unless (exists $self->{ox}) {	2102	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2103	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2104	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	2105	: ($self->{w} - $size->[0]) * 0.5);
1692		2106
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2107	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2108	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	2109	: ($self->{h} - $size->[1]) * 0.5);
1696	};	2110	};
1697		2111
1698	glEnable GL_TEXTURE_2D;
1699
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2112	my $w = List::Util::min $self->{w} + 4, $size->[0];
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2113	my $h = List::Util::min $self->{h} + 2, $size->[1];
1702		2114
1703	if ($tex->{format} == GL_ALPHA) {	2115	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705	glColor @{$self->{fg}};
1706	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707	} else {
1708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710	}
1711
1712	glDisable GL_TEXTURE_2D;
1713	}	2116	}
1714		2117
1715	#############################################################################	2118	#############################################################################
1716		2119
1717	package CFClient::UI::EntryBase;	2120	package CFPlus::UI::EntryBase;
1718		2121
1719	our @ISA = CFClient::UI::Label::;	2122	our @ISA = CFPlus::UI::Label::;
1720		2123
1721	use CFClient::OpenGL;	2124	use CFPlus::OpenGL;
1722		2125
1723	sub new {	2126	sub new {
1724	my $class = shift;	2127	my $class = shift;
1725		2128
1726	$class->SUPER::new (	2129	$class->SUPER::new (
…		…
1730	active_fg => [0, 0, 0],	2133	active_fg => [0, 0, 0],
1731	can_hover => 1,	2134	can_hover => 1,
1732	can_focus => 1,	2135	can_focus => 1,
1733	valign => 0,	2136	valign => 0,
1734	can_events => 1,	2137	can_events => 1,
		2138	ellipsise => 0,
1735	#text => ...	2139	#text => ...
1736	#hidden => "*",	2140	#hidden => "*",
1737	@_	2141	@_
1738	)	2142	)
1739	}	2143	}
…		…
1784	my $sym = $ev->{sym};	2188	my $sym = $ev->{sym};
1785	my $uni = $ev->{unicode};	2189	my $uni = $ev->{unicode};
1786		2190
1787	my $text = $self->get_text;	2191	my $text = $self->get_text;
1788		2192
		2193	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2194
1789	if ($uni == 8) {	2195	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2196	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	2197	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	2198	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	2199	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	2200	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	2201	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	2202	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	2203	} elsif ($sym == CFPlus::SDLK_HOME) {
		2204	# what a hack
		2205	$self->{cursor} =
		2206	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2207	? length $1
		2208	: 0;
		2209	} elsif ($sym == CFPlus::SDLK_END) {
		2210	# uh, again
		2211	$self->{cursor} =
		2212	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2213	? $self->{cursor} + length $1
		2214	: length $self->{text};
		2215	} elsif ($uni == 21) { # ctrl-u
		2216	$text = "";
1798	$self->{cursor} = 0;	2217	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {
1800	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	2218	} elsif ($uni == 27) {
1802	$self->emit ('escape');	2219	$self->emit ('escape');
1803	} elsif ($uni) {	2220	} elsif ($uni == 0x0d) {
		2221	substr $text, $self->{cursor}++, 0, "\012";
		2222	} elsif ($uni >= 0x20) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	2223	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	2224	} else {
1806	return 0;	2225	return 0;
1807	}	2226	}
1808		2227
1809	$self->_set_text ($text);	2228	$self->_set_text ($text);
1810		2229
1811	$self->realloc;	2230	$self->realloc;
		2231	$self->update;
1812		2232
1813	1	2233	1
1814	}	2234	}
1815		2235
1816	sub invoke_focus_in {	2236	sub invoke_focus_in {
…		…
1828		2248
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2249	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2250
1831	# byte-index to char-index	2251	# byte-index to char-index
1832	my $text = $self->{text};	2252	my $text = $self->{text};
1833	utf8::encode $text;	2253	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2254	$self->{cursor} = length $text;
1835		2255
1836	$self->_set_text ($self->{text});	2256	$self->_set_text ($self->{text});
1837	$self->update;	2257	$self->update;
1838		2258
1839	1	2259	1
…		…
1878	utf8::encode $text;	2298	utf8::encode $text;
1879		2299
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2300	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	2301	}
1882		2302
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2303	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2304	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2305	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2306	glEnd;
1888	}	2307	}
1889	}	2308	}
1890		2309
		2310	#############################################################################
		2311
1891	package CFClient::UI::Entry;	2312	package CFPlus::UI::Entry;
1892		2313
1893	our @ISA = CFClient::UI::EntryBase::;	2314	our @ISA = CFPlus::UI::EntryBase::;
1894		2315
1895	use CFClient::OpenGL;	2316	use CFPlus::OpenGL;
1896		2317
1897	sub invoke_key_down {	2318	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2319	my ($self, $ev) = @_;
1899		2320
1900	my $sym = $ev->{sym};	2321	my $sym = $ev->{sym};
1901		2322
1902	if ($sym == 13) {	2323	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2324	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2325	my $txt = $self->get_text;
1905		2326
1906	$self->{history_pointer} = -1;	2327	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2328	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2329	$self->emit (activate => $txt);
1909	$self->update;	2330	$self->update;
1910		2331
1911	} elsif ($sym == CFClient::SDLK_UP) {	2332	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2333	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2334	$self->{history_saveback} = $self->get_text;
1914	}	2335	}
1915	if (@{$self->{history} || []} > 0) {	2336	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2337	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2339	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2340	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2341	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2342	}
1922		2343
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2344	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2345	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2346	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2347
1927	if ($self->{history_pointer} >= 0) {	2348	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2349	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2358	1
1938	}	2359	}
1939		2360
1940	#############################################################################	2361	#############################################################################
1941		2362
		2363	package CFPlus::UI::TextEdit;
		2364
		2365	our @ISA = CFPlus::UI::EntryBase::;
		2366
		2367	use CFPlus::OpenGL;
		2368
		2369	sub move_cursor_ver {
		2370	my ($self, $dy) = @_;
		2371
		2372	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2373
		2374	$y += $dy;
		2375
		2376	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2377	$self->{cursor} = $index;
		2378	delete $self->{cur_h};
		2379	$self->update;
		2380	return;
		2381	}
		2382	}
		2383
		2384	sub invoke_key_down {
		2385	my ($self, $ev) = @_;
		2386
		2387	my $sym = $ev->{sym};
		2388
		2389	if ($sym == CFPlus::SDLK_UP) {
		2390	$self->move_cursor_ver (-1);
		2391	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2392	$self->move_cursor_ver (+1);
		2393	} else {
		2394	return $self->SUPER::invoke_key_down ($ev)
		2395	}
		2396
		2397	1
		2398	}
		2399
		2400	#############################################################################
		2401
1942	package CFClient::UI::Button;	2402	package CFPlus::UI::Button;
1943		2403
1944	our @ISA = CFClient::UI::Label::;	2404	our @ISA = CFPlus::UI::Label::;
1945		2405
1946	use CFClient::OpenGL;	2406	use CFPlus::OpenGL;
1947		2407
1948	my @tex =	2408	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2409	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2410	qw(b1_button_inactive.png b1_button_active.png);
1951		2411
1952	sub new {	2412	sub new {
1953	my $class = shift;	2413	my $class = shift;
1954		2414
1955	$class->SUPER::new (	2415	$class->SUPER::new (
1956	padding_x => 4,	2416	padding_x => 4,
1957	padding_y => 4,	2417	padding_y => 4,
1958	fg => [1, 1, 1],	2418	fg => [1.0, 1.0, 1.0],
1959	active_fg => [0, 0, 1],	2419	active_fg => [0.8, 0.8, 0.8],
1960	can_hover => 1,	2420	can_hover => 1,
1961	align => 0,	2421	align => 0,
1962	valign => 0,	2422	valign => 0,
1963	can_events => 1,	2423	can_events => 1,
1964	@_	2424	@_
…		…
1982		2442
1983	glEnable GL_TEXTURE_2D;	2443	glEnable GL_TEXTURE_2D;
1984	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2444	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985	glColor 0, 0, 0, 1;	2445	glColor 0, 0, 0, 1;
1986		2446
		2447	my $tex = $tex[$GRAB == $self];
1987	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2448	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988		2449
1989	glDisable GL_TEXTURE_2D;	2450	glDisable GL_TEXTURE_2D;
1990		2451
1991	$self->SUPER::_draw;	2452	$self->SUPER::_draw;
1992	}	2453	}
1993		2454
1994	#############################################################################	2455	#############################################################################
1995		2456
		2457	package CFPlus::UI::CheckBox;
		2458
		2459	our @ISA = CFPlus::UI::DrawBG::;
		2460
		2461	my @tex =
		2462	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2463	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2464
		2465	use CFPlus::OpenGL;
		2466
		2467	sub new {
		2468	my $class = shift;
		2469
		2470	$class->SUPER::new (
		2471	padding_x => 2,
		2472	padding_y => 2,
		2473	fg => [1, 1, 1],
		2474	active_fg => [1, 1, 0],
		2475	bg => [0, 0, 0, 0.2],
		2476	active_bg => [1, 1, 1, 0.5],
		2477	state => 0,
		2478	can_hover => 1,
		2479	@_
		2480	)
		2481	}
		2482
		2483	sub size_request {
		2484	my ($self) = @_;
		2485
		2486	(6) x 2
		2487	}
		2488
		2489	sub toggle {
		2490	my ($self) = @_;
		2491
		2492	$self->{state} = !$self->{state};
		2493	$self->emit (changed => $self->{state});
		2494	$self->update;
		2495	}
		2496
		2497	sub invoke_button_down {
		2498	my ($self, $ev, $x, $y) = @_;
		2499
		2500	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2501	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2502	$self->toggle;
		2503	} else {
		2504	return 0
		2505	}
		2506
		2507	1
		2508	}
		2509
		2510	sub _draw {
		2511	my ($self) = @_;
		2512
		2513	$self->SUPER::_draw;
		2514
		2515	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2516
		2517	my ($w, $h) = @$self{qw(w h)};
		2518
		2519	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2520
		2521	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2522
		2523	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2524
		2525	glEnable GL_TEXTURE_2D;
		2526	$tex->draw_quad_alpha (0, 0, $s, $s);
		2527	glDisable GL_TEXTURE_2D;
		2528	}
		2529
		2530	#############################################################################
		2531
		2532	package CFPlus::UI::Image;
		2533
		2534	our @ISA = CFPlus::UI::Base::;
		2535
		2536	use CFPlus::OpenGL;
		2537
		2538	our %texture_cache;
		2539
		2540	sub new {
		2541	my $class = shift;
		2542
		2543	my $self = $class->SUPER::new (
		2544	can_events => 0,
		2545	@_,
		2546	);
		2547
		2548	$self->{path} || $self->{tex}
		2549	or Carp::croak "'path' or 'tex' attributes required";
		2550
		2551	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2552	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2553
		2554	CFPlus::weaken $texture_cache{$self->{path}};
		2555
		2556	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2557
		2558	$self
		2559	}
		2560
		2561	sub STORABLE_freeze {
		2562	my ($self, $cloning) = @_;
		2563
		2564	$self->{path}
		2565	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2566
		2567	$self->{path}
		2568	}
		2569
		2570	sub STORABLE_attach {
		2571	my ($self, $cloning, $path) = @_;
		2572
		2573	$self->new (path => $path)
		2574	}
		2575
		2576	sub size_request {
		2577	my ($self) = @_;
		2578
		2579	($self->{tex}{w}, $self->{tex}{h})
		2580	}
		2581
		2582	sub _draw {
		2583	my ($self) = @_;
		2584
		2585	my $tex = $self->{tex};
		2586
		2587	my ($w, $h) = ($self->{w}, $self->{h});
		2588
		2589	if ($self->{rot90}) {
		2590	glRotate 90, 0, 0, 1;
		2591	glTranslate 0, -$self->{w}, 0;
		2592
		2593	($w, $h) = ($h, $w);
		2594	}
		2595
		2596	glEnable GL_TEXTURE_2D;
		2597	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2598
		2599	$tex->draw_quad (0, 0, $w, $h);
		2600
		2601	glDisable GL_TEXTURE_2D;
		2602	}
		2603
		2604	#############################################################################
		2605
1996	package CFClient::UI::ImageButton;	2606	package CFPlus::UI::ImageButton;
1997		2607
1998	our @ISA = CFClient::UI::Image::;	2608	our @ISA = CFPlus::UI::Image::;
1999		2609
2000	use CFClient::OpenGL;	2610	use CFPlus::OpenGL;
2001		2611
2002	my %textures;	2612	my %textures;
2003		2613
2004	sub new {	2614	sub new {
2005	my $class = shift;	2615	my $class = shift;
…		…
2027	1	2637	1
2028	}	2638	}
2029		2639
2030	#############################################################################	2640	#############################################################################
2031		2641
2032	package CFClient::UI::CheckBox;
2033
2034	our @ISA = CFClient::UI::DrawBG::;
2035
2036	my @tex =
2037	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040	use CFClient::OpenGL;
2041
2042	sub new {
2043	my $class = shift;
2044
2045	$class->SUPER::new (
2046	padding_x => 2,
2047	padding_y => 2,
2048	fg => [1, 1, 1],
2049	active_fg => [1, 1, 0],
2050	bg => [0, 0, 0, 0.2],
2051	active_bg => [1, 1, 1, 0.5],
2052	state => 0,
2053	can_hover => 1,
2054	@_
2055	)
2056	}
2057
2058	sub size_request {
2059	my ($self) = @_;
2060
2061	(6) x 2
2062	}
2063
2064	sub invoke_button_down {
2065	my ($self, $ev, $x, $y) = @_;
2066
2067	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069	$self->{state} = !$self->{state};
2070	$self->emit (changed => $self->{state});
2071	} else {
2072	return 0
2073	}
2074
2075	1
2076	}
2077
2078	sub _draw {
2079	my ($self) = @_;
2080
2081	$self->SUPER::_draw;
2082
2083	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085	my ($w, $h) = @$self{qw(w h)};
2086
2087	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091	my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093	glEnable GL_TEXTURE_2D;
2094	$tex->draw_quad_alpha (0, 0, $s, $s);
2095	glDisable GL_TEXTURE_2D;
2096	}
2097
2098	#############################################################################
2099
2100	package CFClient::UI::Image;	2642	package CFPlus::UI::VGauge;
2101		2643
2102	our @ISA = CFClient::UI::Base::;	2644	our @ISA = CFPlus::UI::Base::;
2103
2104	use CFClient::OpenGL;
2105
2106	our %texture_cache;
2107
2108	sub new {
2109	my $class = shift;
2110
2111	my $self = $class->SUPER::new (
2112	can_events => 0,
2113	@_,
2114	);
2115
2116	$self->{path}
2117	or Carp::croak "required attribute 'path' not set";
2118
2119	$self->{tex} = $texture_cache{$self->{path}} ||=
2120	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122	Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126	$self
2127	}
2128
2129	sub size_request {
2130	my ($self) = @_;
2131
2132	($self->{tex}{w}, $self->{tex}{h})
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	my $tex = $self->{tex};
2139
2140	my ($w, $h) = ($self->{w}, $self->{h});
2141
2142	if ($self->{rot90}) {
2143	glRotate 90, 0, 0, 1;
2144	glTranslate 0, -$self->{w}, 0;
2145
2146	($w, $h) = ($h, $w);
2147	}
2148
2149	glEnable GL_TEXTURE_2D;
2150	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152	$tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154	glDisable GL_TEXTURE_2D;
2155	}
2156
2157	#############################################################################
2158
2159	package CFClient::UI::VGauge;
2160
2161	our @ISA = CFClient::UI::Base::;
2162		2645
2163	use List::Util qw(min max);	2646	use List::Util qw(min max);
2164		2647
2165	use CFClient::OpenGL;	2648	use CFPlus::OpenGL;
2166		2649
2167	my %tex = (	2650	my %tex = (
2168	food => [	2651	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2652	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2653	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2654	],
2172	grace => [	2655	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2656	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2657	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2658	],
2176	hp => [	2659	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2660	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2661	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2662	],
2180	mana => [	2663	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2664	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2665	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2666	],
2184	);	2667	);
2185		2668
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2669	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2729	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2730	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2731
2249	my $h1 = $self->{h} * (1 - $ycut1);	2732	my $h1 = $self->{h} * (1 - $ycut1);
2250	my $h2 = $self->{h} * (1 - $ycut2);	2733	my $h2 = $self->{h} * (1 - $ycut2);
		2734	my $h3 = $self->{h};
		2735
		2736	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251		2737
2252	glEnable GL_BLEND;	2738	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2739	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2740	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2741	glEnable GL_TEXTURE_2D;
…		…
2274		2760
2275	if ($t3) {	2761	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2762	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2763	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2764	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2765	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2766	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2767	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2768	glEnd;
2283	}	2769	}
2284		2770
2285	glDisable GL_BLEND;	2771	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2772	glDisable GL_TEXTURE_2D;
2287	}	2773	}
2288		2774
2289	#############################################################################	2775	#############################################################################
2290		2776
2291	package CFClient::UI::Gauge;	2777	package CFPlus::UI::Gauge;
2292		2778
2293	our @ISA = CFClient::UI::VBox::;	2779	our @ISA = CFPlus::UI::VBox::;
2294		2780
2295	sub new {	2781	sub new {
2296	my ($class, %arg) = @_;	2782	my ($class, %arg) = @_;
2297		2783
2298	my $self = $class->SUPER::new (	2784	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2786	can_hover => 1,
2301	can_events => 1,	2787	can_events => 1,
2302	%arg,	2788	%arg,
2303	);	2789	);
2304		2790
2305	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2791	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2792	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2793	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308		2794
2309	$self	2795	$self
2310	}	2796	}
2311		2797
2312	sub set_fontsize {	2798	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2819	$self->{value}->set_text ($val);
2334	}	2820	}
2335		2821
2336	#############################################################################	2822	#############################################################################
2337		2823
2338	package CFClient::UI::Slider;	2824	package CFPlus::UI::Slider;
2339		2825
2340	use strict;	2826	use strict;
2341		2827
2342	use CFClient::OpenGL;	2828	use CFPlus::OpenGL;
2343		2829
2344	our @ISA = CFClient::UI::DrawBG::;	2830	our @ISA = CFPlus::UI::DrawBG::;
2345		2831
2346	my @tex =	2832	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2833	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2834	qw(s1_slider.png s1_slider_bg.png);
2349		2835
2350	sub new {	2836	sub new {
2351	my $class = shift;	2837	my $class = shift;
2352		2838
…		…
2441	}	2927	}
2442		2928
2443	1	2929	1
2444	}	2930	}
2445		2931
		2932	sub invoke_mouse_wheel {
		2933	my ($self, $ev) = @_;
		2934
		2935	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2936
		2937	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2938
		2939	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2940
		2941	! ! $delta
		2942	}
		2943
2446	sub update {	2944	sub update {
2447	my ($self) = @_;	2945	my ($self) = @_;
2448		2946
2449	delete $self->{knob_w};	2947	delete $self->{knob_w};
2450	$self->SUPER::update;	2948	$self->SUPER::update;
…		…
2497	glDisable GL_TEXTURE_2D;	2995	glDisable GL_TEXTURE_2D;
2498	}	2996	}
2499		2997
2500	#############################################################################	2998	#############################################################################
2501		2999
2502	package CFClient::UI::ValSlider;	3000	package CFPlus::UI::ValSlider;
2503		3001
2504	our @ISA = CFClient::UI::HBox::;	3002	our @ISA = CFPlus::UI::HBox::;
2505		3003
2506	sub new {	3004	sub new {
2507	my ($class, %arg) = @_;	3005	my ($class, %arg) = @_;
2508		3006
2509	my $range = delete $arg{range};	3007	my $range = delete $arg{range};
2510		3008
2511	my $self = $class->SUPER::new (	3009	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3010	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3011	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	3012	to_value => sub { shift },
2515	from_value => sub { shift },	3013	from_value => sub { shift },
2516	%arg,	3014	%arg,
2517	);	3015	);
2518		3016
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	3036	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	3037	sub set_value { shift->{slider}->set_value (@_) }
2540		3038
2541	#############################################################################	3039	#############################################################################
2542		3040
2543	package CFClient::UI::TextScroller;	3041	package CFPlus::UI::TextScroller;
2544		3042
2545	our @ISA = CFClient::UI::HBox::;	3043	our @ISA = CFPlus::UI::HBox::;
2546		3044
2547	use CFClient::OpenGL;	3045	use CFPlus::OpenGL;
2548		3046
2549	sub new {	3047	sub new {
2550	my $class = shift;	3048	my $class = shift;
2551		3049
2552	my $self = $class->SUPER::new (	3050	my $self = $class->SUPER::new (
2553	fontsize => 1,	3051	fontsize => 1,
2554	can_events => 0,	3052	can_events => 1,
2555	indent => 0,	3053	indent => 0,
2556	#font => default_font	3054	#font => default_font
2557	@_,	3055	@_,
2558		3056
2559	layout => (new CFClient::Layout 1),	3057	layout => (new CFPlus::Layout),
2560	par => [],	3058	par => [],
		3059	max_par => 0,
2561	height => 0,	3060	height => 0,
2562	children => [	3061	children => [
2563	(new CFClient::UI::Empty expand => 1),	3062	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	3063	(new CFPlus::UI::Slider vertical => 1),
2565	],	3064	],
2566	);	3065	);
2567		3066
2568	$self->{children}[1]->connect (changed => sub { $self->update });	3067	$self->{children}[1]->connect (changed => sub { $self->update });
2569		3068
…		…
2599		3098
2600	$self->reflow;	3099	$self->reflow;
2601		3100
2602	local $self->{children} = [$empty, $slider];	3101	local $self->{children} = [$empty, $slider];
2603	$self->SUPER::invoke_size_allocate ($w, $h)	3102	$self->SUPER::invoke_size_allocate ($w, $h)
		3103	}
		3104
		3105	sub invoke_mouse_wheel {
		3106	my ($self, $ev) = @_;
		3107
		3108	return 0 unless $ev->{dy}; # only vertical movements
		3109
		3110	$self->{children}[1]->emit (mouse_wheel => $ev);
		3111
		3112	1
2604	}	3113	}
2605		3114
2606	sub get_layout {	3115	sub get_layout {
2607	my ($self, $para) = @_;	3116	my ($self, $para) = @_;
2608		3117
…		…
2636		3145
2637	# todo: base offset on lines or so, not on pixels	3146	# todo: base offset on lines or so, not on pixels
2638	$self->{children}[1]->set_value ($offset);	3147	$self->{children}[1]->set_value ($offset);
2639	}	3148	}
2640		3149
		3150	sub current_paragraph {
		3151	my ($self) = @_;
		3152
		3153	$self->{top_paragraph} - 1
		3154	}
		3155
		3156	sub scroll_to {
		3157	my ($self, $para) = @_;
		3158
		3159	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3160
		3161	$self->{scroll_to} = $para;
		3162	$self->update;
		3163	}
		3164
2641	sub clear {	3165	sub clear {
2642	my ($self) = @_;	3166	my ($self) = @_;
2643		3167
2644	my (undef, undef, @other) = @{ $self->{children} };	3168	my (undef, undef, @other) = @{ $self->{children} };
2645	$self->remove ($_) for @other;	3169	$self->remove ($_) for @other;
…		…
2648	$self->{height} = 0;	3172	$self->{height} = 0;
2649	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3173	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2650	}	3174	}
2651		3175
2652	sub add_paragraph {	3176	sub add_paragraph {
2653	my ($self, $color, $para, $indent) = @_;	3177	my $self = shift;
2654		3178
2655	my ($text, @w) = ref $para ? @$para : $para;	3179	for my $para (@_) {
2656
2657	$para = {	3180	$para = {
		3181	fg => [1, 1, 1, 1],
		3182	indent => 0,
		3183	markup => "",
		3184	widget => [],
		3185	ref $para ? %$para : (markup => $para),
2658	w => 1e10,	3186	w => 1e10,
2659	wrapped => 1,	3187	wrapped => 1,
2660	fg => $color,
2661	indent => $indent,
2662	markup => $text,
2663	widget => \@w,
2664	};	3188	};
2665		3189
2666	$self->add (@w) if @w;	3190	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2667	push @{$self->{par}}, $para;	3191	push @{$self->{par}}, $para;
		3192	}
		3193
		3194	if (my $max = $self->{max_par}) {
		3195	shift @{$self->{par}} while @{$self->{par}} > $max;
		3196	}
2668		3197
2669	$self->{need_reflow}++;	3198	$self->{need_reflow}++;
2670	$self->update;	3199	$self->update;
2671	}	3200	}
2672		3201
2673	sub scroll_to_bottom {	3202	sub scroll_to_bottom {
2674	my ($self) = @_;	3203	my ($self) = @_;
2675		3204
2676	$self->{scroll_to_bottom} = 1;	3205	$self->{scroll_to} = $#{$self->{par}};
2677	$self->update;	3206	$self->update;
2678	}	3207	}
2679		3208
		3209	sub force_uptodate {
		3210	my ($self) = @_;
		3211
		3212	if (delete $self->{need_reflow}) {
		3213	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3214
		3215	my $height = 0;
		3216
		3217	for my $para (@{$self->{par}}) {
		3218	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3219	my $layout = $self->get_layout ($para);
		3220	my ($w, $h) = $layout->size;
		3221
		3222	$para->{w} = $w + $para->{indent};
		3223	$para->{h} = $h;
		3224	$para->{wrapped} = $layout->has_wrapped;
		3225	}
		3226
		3227	$para->{y} = $height;
		3228	$height += $para->{h};
		3229	}
		3230
		3231	$self->{height} = $height;
		3232	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3233
		3234	delete $self->{texture};
		3235	}
		3236
		3237	if (my $paridx = delete $self->{scroll_to}) {
		3238	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3239	}
		3240	}
		3241
2680	sub update {	3242	sub update {
2681	my ($self) = @_;	3243	my ($self) = @_;
2682		3244
2683	$self->SUPER::update;	3245	$self->SUPER::update;
2684		3246
2685	return unless $self->{h} > 0;	3247	return unless $self->{h} > 0;
2686		3248
2687	delete $self->{texture};	3249	delete $self->{texture};
2688		3250
2689	$ROOT->on_post_alloc ($self => sub {	3251	$ROOT->on_post_alloc ($self => sub {
		3252	$self->force_uptodate;
		3253
2690	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3254	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2691		3255
2692	if (delete $self->{need_reflow}) {
2693	my $height = 0;
2694
2695	for my $para (@{$self->{par}}) {
2696	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2697	my $layout = $self->get_layout ($para);
2698	my ($w, $h) = $layout->size;
2699
2700	$para->{w} = $w + $para->{indent};
2701	$para->{h} = $h;
2702	$para->{wrapped} = $layout->has_wrapped;
2703	}
2704
2705	$height += $para->{h};
2706	}
2707
2708	$self->{height} = $height;
2709
2710	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2711
2712	delete $self->{texture};
2713	}
2714
2715	if (delete $self->{scroll_to_bottom}) {
2716	$self->{children}[1]->set_value (1e10);
2717	}
2718
2719	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3256	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2720	glClearColor 0, 0, 0, 0;	3257	glClearColor 0, 0, 0, 0;
2721	glClear GL_COLOR_BUFFER_BIT;	3258	glClear GL_COLOR_BUFFER_BIT;
2722		3259
		3260	package CFPlus::UI::Base;
		3261	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3262	(0, 0, $self->{w}, $self->{h});
		3263
		3264	my $top = int $self->{children}[1]{range}[0];
		3265
		3266	my $paridx = 0;
		3267	my $top_paragraph;
2723	my $top = int $self->{children}[1]{range}[0];	3268	my $top = int $self->{children}[1]{range}[0];
2724		3269
2725	my $y0 = $top;	3270	my $y0 = $top;
2726	my $y1 = $top + $H;	3271	my $y1 = $top + $H;
2727		3272
2728	my $y = 0;
2729
2730	glEnable GL_BLEND;
2731	#TODO# not correct in windows where rgba is forced off
2732	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2733
2734	for my $para (@{$self->{par}}) {	3273	for my $para (@{$self->{par}}) {
2735	my $h = $para->{h};	3274	my $h = $para->{h};
		3275	my $y = $para->{y};
2736		3276
2737	if ($y0 < $y + $h && $y < $y1) {	3277	if ($y0 < $y + $h && $y < $y1) {
2738
2739	my $layout = $self->get_layout ($para);	3278	my $layout = $self->get_layout ($para);
2740		3279
2741	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743	glRasterPos $para->{indent}, $y - $y0;	3280	$layout->render ($para->{indent}, $y - $y0);
2744	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745		3281
2746	if (my @w = @{ $para->{widget} }) {	3282	if (my @w = @{ $para->{widget} }) {
2747	my @s = $layout->get_shapes;	3283	my @s = $layout->get_shapes;
2748		3284
2749	glDisable GL_BLEND;
2750	for (@w) {	3285	for (@w) {
2751	my ($dx, $dy) = splice @s, 0, 2, ();	3286	my ($dx, $dy) = splice @s, 0, 2, ();
2752		3287
2753	$_->{x} = $dx + $para->{indent};	3288	$_->{x} = $dx + $para->{indent};
2754	$_->{y} = $dy + $y - $y0;	3289	$_->{y} = $dy + $y - $y0;
2755		3290
2756	$_->draw;	3291	$_->draw;
2757	}	3292	}
2758	glEnable GL_BLEND;
2759	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760	}	3293	}
2761	}	3294	}
2762		3295
2763	$y += $h;	3296	$paridx++;
		3297	$top_paragraph ||= $paridx if $y >= $top;
2764	}	3298	}
2765		3299
2766	glDisable GL_BLEND;	3300	$self->{top_paragraph} = $top_paragraph;
2767	};	3301	};
2768	});	3302	});
2769	}	3303	}
2770		3304
2771	sub reconfigure {	3305	sub reconfigure {
…		…
2789	$self->{children}[1]->draw;	3323	$self->{children}[1]->draw;
2790	}	3324	}
2791		3325
2792	#############################################################################	3326	#############################################################################
2793		3327
2794	package CFClient::UI::Animator;	3328	package CFPlus::UI::Animator;
2795		3329
2796	use CFClient::OpenGL;	3330	use CFPlus::OpenGL;
2797		3331
2798	our @ISA = CFClient::UI::Bin::;	3332	our @ISA = CFPlus::UI::Bin::;
2799		3333
2800	sub moveto {	3334	sub moveto {
2801	my ($self, $x, $y) = @_;	3335	my ($self, $x, $y) = @_;
2802		3336
2803	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3337	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2831	glPopMatrix;	3365	glPopMatrix;
2832	}	3366	}
2833		3367
2834	#############################################################################	3368	#############################################################################
2835		3369
2836	package CFClient::UI::Flopper;	3370	package CFPlus::UI::Flopper;
2837		3371
2838	our @ISA = CFClient::UI::Button::;	3372	our @ISA = CFPlus::UI::Button::;
2839		3373
2840	sub new {	3374	sub new {
2841	my $class = shift;	3375	my $class = shift;
2842		3376
2843	my $self = $class->SUPER::new (	3377	my $self = $class->SUPER::new (
…		…
2855	$self->{other}->toggle_visibility;	3389	$self->{other}->toggle_visibility;
2856	}	3390	}
2857		3391
2858	#############################################################################	3392	#############################################################################
2859		3393
2860	package CFClient::UI::Tooltip;	3394	package CFPlus::UI::Tooltip;
2861		3395
2862	our @ISA = CFClient::UI::Bin::;	3396	our @ISA = CFPlus::UI::Bin::;
2863		3397
2864	use CFClient::OpenGL;	3398	use CFPlus::OpenGL;
2865		3399
2866	sub new {	3400	sub new {
2867	my $class = shift;	3401	my $class = shift;
2868		3402
2869	$class->SUPER::new (	3403	$class->SUPER::new (
…		…
2872	)	3406	)
2873	}	3407	}
2874		3408
2875	sub set_tooltip_from {	3409	sub set_tooltip_from {
2876	my ($self, $widget) = @_;	3410	my ($self, $widget) = @_;
		3411
		3412	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3413	if $widget->{tooltip} =~ /^#(.*)$/;
2877		3414
2878	my $tooltip = $widget->{tooltip};	3415	my $tooltip = $widget->{tooltip};
2879		3416
2880	if ($ENV{CFPLUS_DEBUG} & 2) {	3417	if ($ENV{CFPLUS_DEBUG} & 2) {
2881	$tooltip .= "\n\n" . (ref $widget) . "\n"	3418	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2885	}	3422	}
2886		3423
2887	$tooltip =~ s/^\n+//;	3424	$tooltip =~ s/^\n+//;
2888	$tooltip =~ s/\n+$//;	3425	$tooltip =~ s/\n+$//;
2889		3426
2890	$self->add (new CFClient::UI::Label	3427	$self->add (new CFPlus::UI::Label
2891	markup => $tooltip,	3428	markup => $tooltip,
2892	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3429	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2893	fontsize => 0.8,	3430	fontsize => 0.8,
2894	fg => [0, 0, 0, 1],	3431	style => 1, # FLAG_INVERSE
2895	ellipsise => 0,	3432	ellipsise => 0,
2896	font => ($widget->{tooltip_font} || $::FONT_PROP),	3433	font => ($widget->{tooltip_font} || $::FONT_PROP),
2897	);	3434	);
2898	}	3435	}
2899		3436
…		…
2918		3455
2919	$self->{root}->on_post_alloc ("move_$self" => sub {	3456	$self->{root}->on_post_alloc ("move_$self" => sub {
2920	my $widget = $self->{owner}	3457	my $widget = $self->{owner}
2921	or return;	3458	or return;
2922		3459
		3460	if ($widget->{visible}) {
2923	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3461	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924		3462
2925	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3463	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926	if $x + $self->{w} > $self->{root}{w};	3464	if $x + $self->{w} > $self->{root}{w};
2927		3465
2928	$self->move_abs ($x, $y);	3466	$self->move_abs ($x, $y);
		3467	} else {
		3468	$self->hide;
		3469	}
2929	});	3470	});
2930	}	3471	}
2931		3472
2932	sub _draw {	3473	sub _draw {
2933	my ($self) = @_;	3474	my ($self) = @_;
…		…
2957	$self->SUPER::_draw;	3498	$self->SUPER::_draw;
2958	}	3499	}
2959		3500
2960	#############################################################################	3501	#############################################################################
2961		3502
2962	package CFClient::UI::Face;	3503	package CFPlus::UI::Face;
2963		3504
2964	our @ISA = CFClient::UI::Base::;	3505	our @ISA = CFPlus::UI::DrawBG::;
2965		3506
2966	use CFClient::OpenGL;	3507	use CFPlus::OpenGL;
2967		3508
2968	sub new {	3509	sub new {
2969	my $class = shift;	3510	my $class = shift;
2970		3511
2971	my $self = $class->SUPER::new (	3512	my $self = $class->SUPER::new (
		3513	size_w => 32,
		3514	size_h => 8,
2972	aspect => 1,	3515	aspect => 1,
2973	can_events => 0,	3516	can_events => 0,
2974	@_,	3517	@_,
2975	);	3518	);
2976		3519
2977	if ($self->{anim} && $self->{animspeed}) {	3520	if ($self->{anim} && $self->{animspeed}) {
2978	Scalar::Util::weaken (my $widget = $self);	3521	CFPlus::weaken (my $widget = $self);
2979		3522
		3523	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3524	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2980	$self->{timer} = Event->timer (	3525	$self->{timer} = Event->timer (
2981	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2982	hard => 1,	3526	parked => 1,
2983	interval => $self->{animspeed},
2984	cb => sub {	3527	cb => sub {
		3528	return unless $::CONN && $widget;
		3529
2985	++$widget->{frame};	3530	++$widget->{frame};
		3531	$widget->update_face;
2986	$widget->update;	3532	$widget->update;
		3533
		3534	$widget->update_timer;
2987	},	3535	},
2988	);	3536	);
		3537
		3538	$self->update_face;
		3539	$self->update_timer;
2989	}	3540	}
2990		3541
2991	$self	3542	$self
2992	}	3543	}
2993		3544
		3545	sub update_timer {
		3546	my ($self) = @_;
		3547
		3548	return unless $self->{timer};
		3549
		3550	if ($self->{visible}) {
		3551	$self->{timer}->at (
		3552	$self->{anim_start}
		3553	+ $self->{animspeed}
		3554	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3555	);
		3556	$self->{timer}->start;
		3557	} else {
		3558	$self->{timer}->stop;
		3559	}
		3560	}
		3561
		3562	sub update_face {
		3563	my ($self) = @_;
		3564
		3565	return unless $::CONN;
		3566
		3567	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3568	if ($anim && @$anim) {
		3569	delete $self->{wait_face};
		3570	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3571	}
		3572	}
		3573	}
		3574
2994	sub size_request {	3575	sub size_request {
2995	(32, 8)	3576	my ($self) = @_;
		3577
		3578	if ($::CONN) {
		3579	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3580	if (my $tex = $::CONN->{texture}[$faceid]) {
		3581	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3582	} else {
		3583	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3584	$self->realloc;
		3585	});
		3586	}
		3587	}
		3588	}
		3589
		3590	($self->{size_w} || 8, $self->{size_h} || 8)
2996	}	3591	}
2997		3592
2998	sub update {	3593	sub update {
2999	my ($self) = @_;	3594	my ($self) = @_;
3000		3595
3001	return unless $self->{visible};	3596	return unless $self->{visible};
3002		3597
3003	$self->SUPER::update;	3598	$self->SUPER::update;
3004	}	3599	}
3005		3600
		3601	sub invoke_visibility_change {
		3602	my ($self) = @_;
		3603
		3604	$self->update_timer;
		3605
		3606	0
		3607	}
		3608
3006	sub _draw {	3609	sub _draw {
3007	my ($self) = @_;	3610	my ($self) = @_;
3008		3611
3009	return unless $::CONN;	3612	return unless $::CONN;
3010		3613
3011	my $face;	3614	$self->SUPER::_draw;
3012		3615
3013	if ($self->{frame}) {
3014	my $anim = $::CONN->{anim}[$self->{anim}];	3616	my $faceid = $::CONN->{faceid}[$self->{face}]
3015		3617	or return;
3016	$face = $anim->[ $self->{frame} % @$anim ]
3017	if $anim && @$anim;
3018	}
3019		3618
3020	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3619	my $tex = $::CONN->{texture}[$faceid];
3021		3620
3022	if ($tex) {	3621	if ($tex) {
3023	glEnable GL_TEXTURE_2D;	3622	glEnable GL_TEXTURE_2D;
3024	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3623	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3025	glColor 0, 0, 0, 1;	3624	glColor 0, 0, 0, 1;
…		…
3029	}	3628	}
3030		3629
3031	sub destroy {	3630	sub destroy {
3032	my ($self) = @_;	3631	my ($self) = @_;
3033		3632
3034	$self->{timer}->cancel	3633	(delete $self->{timer})->cancel
3035	if $self->{timer};	3634	if $self->{timer};
3036		3635
3037	$self->SUPER::destroy;	3636	$self->SUPER::destroy;
3038	}	3637	}
3039		3638
3040	#############################################################################	3639	#############################################################################
3041		3640
3042	package CFClient::UI::Buttonbar;	3641	package CFPlus::UI::Buttonbar;
3043		3642
3044	our @ISA = CFClient::UI::HBox::;	3643	our @ISA = CFPlus::UI::HBox::;
3045		3644
3046	# TODO: should actualyl wrap buttons and other goodies.	3645	# TODO: should actually wrap buttons and other goodies.
3047		3646
3048	#############################################################################	3647	#############################################################################
3049		3648
3050	package CFClient::UI::Menu;	3649	package CFPlus::UI::Menu;
3051		3650
3052	our @ISA = CFClient::UI::FancyFrame::;	3651	our @ISA = CFPlus::UI::Toplevel::;
3053		3652
3054	use CFClient::OpenGL;	3653	use CFPlus::OpenGL;
3055		3654
3056	sub new {	3655	sub new {
3057	my $class = shift;	3656	my $class = shift;
3058		3657
3059	my $self = $class->SUPER::new (	3658	my $self = $class->SUPER::new (
3060	items => [],	3659	items => [],
3061	z => 100,	3660	z => 100,
3062	@_,	3661	@_,
3063	);	3662	);
3064		3663
3065	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3664	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3066		3665
3067	for my $item (@{ $self->{items} }) {	3666	for my $item (@{ $self->{items} }) {
3068	my ($widget, $cb, $tooltip) = @$item;	3667	my ($widget, $cb, $tooltip) = @$item;
3069		3668
3070	# handle various types of items, only text for now	3669	# handle various types of items, only text for now
3071	if (!ref $widget) {	3670	if (!ref $widget) {
		3671	if ($widget =~ /\t/) {
		3672	my ($left, $right) = split /\t/, $widget, 2;
		3673
3072	$widget = new CFClient::UI::Label	3674	$widget = new CFPlus::UI::HBox
3073	can_hover => 1,	3675	can_hover => 1,
3074	can_events => 1,	3676	can_events => 1,
		3677	tooltip => $tooltip,
		3678	children => [
		3679	(new CFPlus::UI::Label markup => $left, expand => 1),
		3680	(new CFPlus::UI::Label markup => $right, align => +1),
		3681	],
		3682	;
		3683
		3684	} else {
		3685	$widget = new CFPlus::UI::Label
		3686	can_hover => 1,
		3687	can_events => 1,
3075	markup => $widget,	3688	markup => $widget,
3076	tooltip => $tooltip	3689	tooltip => $tooltip;
		3690	}
3077	}	3691	}
3078		3692
3079	$self->{item}{$widget} = $item;	3693	$self->{item}{$widget} = $item;
3080		3694
3081	$self->{vbox}->add ($widget);	3695	$self->{vbox}->add ($widget);
…		…
3124	1	3738	1
3125	}	3739	}
3126		3740
3127	#############################################################################	3741	#############################################################################
3128		3742
3129	package CFClient::UI::Multiplexer;	3743	package CFPlus::UI::Multiplexer;
3130		3744
3131	our @ISA = CFClient::UI::Container::;	3745	our @ISA = CFPlus::UI::Container::;
3132		3746
3133	sub new {	3747	sub new {
3134	my $class = shift;	3748	my $class = shift;
3135		3749
3136	my $self = $class->SUPER::new (	3750	my $self = $class->SUPER::new (
…		…
3150		3764
3151	$self->{current} = $self->{children}[0]	3765	$self->{current} = $self->{children}[0]
3152	if @{ $self->{children} };	3766	if @{ $self->{children} };
3153	}	3767	}
3154		3768
		3769	sub get_current_page {
		3770	my ($self) = @_;
		3771
		3772	$self->{current}
		3773	}
		3774
3155	sub set_current_page {	3775	sub set_current_page {
3156	my ($self, $page_or_widget) = @_;	3776	my ($self, $page_or_widget) = @_;
3157		3777
3158	my $widget = ref $page_or_widget	3778	my $widget = ref $page_or_widget
3159	? $page_or_widget	3779	? $page_or_widget
…		…
3191	$self->{current}->draw;	3811	$self->{current}->draw;
3192	}	3812	}
3193		3813
3194	#############################################################################	3814	#############################################################################
3195		3815
3196	package CFClient::UI::Notebook;	3816	package CFPlus::UI::Notebook;
3197		3817
3198	our @ISA = CFClient::UI::VBox::;	3818	our @ISA = CFPlus::UI::VBox::;
3199		3819
3200	sub new {	3820	sub new {
3201	my $class = shift;	3821	my $class = shift;
3202		3822
3203	my $self = $class->SUPER::new (	3823	my $self = $class->SUPER::new (
3204	buttonbar => (new CFClient::UI::Buttonbar),	3824	buttonbar => (new CFPlus::UI::Buttonbar),
3205	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3825	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3206	# filter => # will be put between multiplexer and $self	3826	# filter => # will be put between multiplexer and $self
3207	@_,	3827	@_,
3208	);	3828	);
3209		3829
3210	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3830	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3214	}	3834	}
3215		3835
3216	sub add {	3836	sub add {
3217	my ($self, $title, $widget, $tooltip) = @_;	3837	my ($self, $title, $widget, $tooltip) = @_;
3218		3838
3219	Scalar::Util::weaken $self;	3839	CFPlus::weaken $self;
3220		3840
3221	$self->{buttonbar}->add (new CFClient::UI::Button	3841	$self->{buttonbar}->add (new CFPlus::UI::Button
3222	markup => $title,	3842	markup => $title,
3223	tooltip => $tooltip,	3843	tooltip => $tooltip,
3224	on_activate => sub { $self->set_current_page ($widget) },	3844	on_activate => sub { $self->set_current_page ($widget) },
3225	);	3845	);
3226		3846
3227	$self->{multiplexer}->add ($widget);	3847	$self->{multiplexer}->add ($widget);
3228	}	3848	}
3229		3849
		3850	sub get_current_page {
		3851	my ($self) = @_;
		3852
		3853	$self->{multiplexer}->get_current_page
		3854	}
		3855
3230	sub set_current_page {	3856	sub set_current_page {
3231	my ($self, $page) = @_;	3857	my ($self, $page) = @_;
3232		3858
3233	$self->{multiplexer}->set_current_page ($page);	3859	$self->{multiplexer}->set_current_page ($page);
3234	$self->emit (page_changed => $self->{multiplexer}{current});	3860	$self->emit (page_changed => $self->{multiplexer}{current});
3235	}	3861	}
3236		3862
3237	#############################################################################	3863	#############################################################################
3238		3864
3239	package CFClient::UI::Combobox;	3865	package CFPlus::UI::Selector;
3240		3866
3241	use utf8;	3867	use utf8;
3242		3868
3243	our @ISA = CFClient::UI::Button::;	3869	our @ISA = CFPlus::UI::Button::;
3244		3870
3245	sub new {	3871	sub new {
3246	my $class = shift;	3872	my $class = shift;
3247		3873
3248	my $self = $class->SUPER::new (	3874	my $self = $class->SUPER::new (
…		…
3265	my ($value, $title, $tooltip) = @$_;	3891	my ($value, $title, $tooltip) = @$_;
3266		3892
3267	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3893	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268	}	3894	}
3269		3895
3270	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3896	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271	}	3897	}
3272		3898
3273	sub _set_value {	3899	sub _set_value {
3274	my ($self, $value) = @_;	3900	my ($self, $value) = @_;
3275		3901
…		…
3290	$self->emit (changed => $value);	3916	$self->emit (changed => $value);
3291	}	3917	}
3292		3918
3293	#############################################################################	3919	#############################################################################
3294		3920
3295	package CFClient::UI::Statusbox;	3921	package CFPlus::UI::Statusbox;
3296		3922
3297	our @ISA = CFClient::UI::VBox::;	3923	our @ISA = CFPlus::UI::VBox::;
3298		3924
3299	sub new {	3925	sub new {
3300	my $class = shift;	3926	my $class = shift;
3301		3927
3302	my $self = $class->SUPER::new (	3928	my $self = $class->SUPER::new (
3303	fontsize => 0.8,	3929	fontsize => 0.8,
3304	@_,	3930	@_,
3305	);	3931	);
3306		3932
3307	Scalar::Util::weaken (my $this = $self);	3933	CFPlus::weaken (my $this = $self);
3308		3934
3309	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3935	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310		3936
3311	$self	3937	$self
3312	}	3938	}
…		…
3314	sub reorder {	3940	sub reorder {
3315	my ($self) = @_;	3941	my ($self) = @_;
3316	my $NOW = Time::HiRes::time;	3942	my $NOW = Time::HiRes::time;
3317		3943
3318	# freeze display when hovering over any label	3944	# freeze display when hovering over any label
3319	return if $CFClient::UI::TOOLTIP->{owner}	3945	return if $CFPlus::UI::TOOLTIP->{owner}
3320	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3946	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3321	values %{ $self->{item} };	3947	values %{ $self->{item} };
3322		3948
3323	while (my ($k, $v) = each %{ $self->{item} }) {	3949	while (my ($k, $v) = each %{ $self->{item} }) {
3324	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3950	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325	}	3951	}
…		…
3346	for ($short) {	3972	for ($short) {
3347	s/^\s+//;	3973	s/^\s+//;
3348	s/\s+/ /g;	3974	s/\s+/ /g;
3349	}	3975	}
3350		3976
3351	new CFClient::UI::Label	3977	new CFPlus::UI::Label
3352	markup => $short,	3978	markup => $short,
3353	tooltip => $item->{tooltip},	3979	tooltip => $item->{tooltip},
3354	tooltip_font => $::FONT_PROP,	3980	tooltip_font => $::FONT_PROP,
3355	tooltip_width => 0.67,	3981	tooltip_width => 0.67,
3356	fontsize => $item->{fontsize} || $self->{fontsize},	3982	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3435	$self->SUPER::destroy;	4061	$self->SUPER::destroy;
3436	}	4062	}
3437		4063
3438	#############################################################################	4064	#############################################################################
3439		4065
3440	package CFClient::UI::Inventory;
3441
3442	our @ISA = CFClient::UI::ScrolledWindow::;
3443
3444	sub new {
3445	my $class = shift;
3446
3447	my $self = $class->SUPER::new (
3448	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3449	@_,
3450	);
3451
3452	$self
3453	}
3454
3455	sub set_items {
3456	my ($self, $items) = @_;
3457
3458	$self->{child}->clear;
3459	return unless $items;
3460
3461	my @items = sort {
3462	($a->{type} <=> $b->{type})
3463	or ($a->{name} cmp $b->{name})
3464	} values %$items;
3465
3466	$self->{real_items} = \@items;
3467
3468	my $row = 0;
3469	for my $item (@items) {
3470	CFClient::Item::update_widgets $item;
3471
3472	$self->{child}->add (0, $row, $item->{face_widget});
3473	$self->{child}->add (1, $row, $item->{desc_widget});
3474	$self->{child}->add (2, $row, $item->{weight_widget});
3475
3476	$row++;
3477	}
3478	}
3479
3480	#############################################################################
3481
3482	package CFClient::UI::SpellList;
3483
3484	our @ISA = CFClient::UI::Table::;
3485
3486	sub new {
3487	my $class = shift;
3488
3489	my $self = $class->SUPER::new (
3490	binding => [],
3491	commands => [],
3492	@_,
3493	)
3494	}
3495
3496	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3497
3498	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3500	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3501	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3502	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3504	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3506	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3507	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3508
3509	sub rebuild_spell_list {
3510	my ($self) = @_;
3511
3512	$CFClient::UI::ROOT->on_refresh ($self => sub {
3513	$self->clear;
3514
3515	return unless $::CONN;
3516
3517	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3518	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3519	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3520	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3521	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3522
3523	my $row = 0;
3524
3525	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3526	my $spell = $self->{spell}{$_};
3527
3528	$row++;
3529
3530	my $spell_cb = sub {
3531	my ($widget, $ev) = @_;
3532
3533	if ($ev->{button} == 1) {
3534	$::CONN->user_send ("cast $spell->{name}");
3535	} elsif ($ev->{button} == 2) {
3536	$::CONN->user_send ("invoke $spell->{name}");
3537	} elsif ($ev->{button} == 3) {
3538	(new CFClient::UI::Menu
3539	items => [
3540	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3541	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3542	],
3543	)->popup ($ev);
3544	} else {
3545	return 0;
3546	}
3547
3548	1
3549	};
3550
3551	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3552
3553	#TODO: add path info to tooltip
3554	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3555
3556	$self->add (0, $row, new CFClient::UI::Face
3557	face => $spell->{face},
3558	can_hover => 1,
3559	can_events => 1,
3560	tooltip => $tooltip,
3561	on_button_down => $spell_cb,
3562	);
3563
3564	$self->add (1, $row, new CFClient::UI::Label
3565	expand => 1,
3566	text => $spell->{name},
3567	can_hover => 1,
3568	can_events => 1,
3569	tooltip => $tooltip,
3570	on_button_down => $spell_cb,
3571	);
3572
3573	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3574	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3575	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3576	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3577	}
3578	});
3579	}
3580
3581	sub add_spell {
3582	my ($self, $spell) = @_;
3583
3584	$self->{spell}->{$spell->{name}} = $spell;
3585	$self->rebuild_spell_list;
3586	}
3587
3588	sub remove_spell {
3589	my ($self, $spell) = @_;
3590
3591	delete $self->{spell}->{$spell->{name}};
3592	$self->rebuild_spell_list;
3593	}
3594
3595	sub clear_spells {
3596	my ($self) = @_;
3597
3598	$self->{spell} = {};
3599	$self->rebuild_spell_list;
3600	}
3601
3602	#############################################################################
3603
3604	package CFClient::UI::Root;	4066	package CFPlus::UI::Root;
3605		4067
3606	our @ISA = CFClient::UI::Container::;	4068	our @ISA = CFPlus::UI::Container::;
3607		4069
3608	use List::Util qw(min max);	4070	use List::Util qw(min max);
3609		4071
3610	use CFClient::OpenGL;	4072	use CFPlus::OpenGL;
3611		4073
3612	sub new {	4074	sub new {
3613	my $class = shift;	4075	my $class = shift;
3614		4076
3615	my $self = $class->SUPER::new (	4077	my $self = $class->SUPER::new (
3616	visible => 1,	4078	visible => 1,
3617	@_,	4079	@_,
3618	);	4080	);
3619		4081
3620	Scalar::Util::weaken ($self->{root} = $self);	4082	CFPlus::weaken ($self->{root} = $self);
3621		4083
3622	$self	4084	$self
3623	}	4085	}
3624		4086
3625	sub size_request {	4087	sub size_request {
…		…
3791	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4253	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3792		4254
3793	$w = 0 if $w < 0;	4255	$w = 0 if $w < 0;
3794	$h = 0 if $h < 0;	4256	$h = 0 if $h < 0;
3795		4257
		4258	$w = max $widget->{min_w}, $w;
		4259	$h = max $widget->{min_h}, $h;
		4260
		4261	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4262	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4263
		4264	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4265	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4266
3796	$w = int $w + 0.5;	4267	$w = int $w + 0.5;
3797	$h = int $h + 0.5;	4268	$h = int $h + 0.5;
3798		4269
3799	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4270	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3800	$widget->{old_w} = $widget->{w};	4271	$widget->{old_w} = $widget->{w};
…		…
3810		4281
3811	while ($self->{post_alloc_hook}) {	4282	while ($self->{post_alloc_hook}) {
3812	$_->()	4283	$_->()
3813	for values %{delete $self->{post_alloc_hook}};	4284	for values %{delete $self->{post_alloc_hook}};
3814	}	4285	}
3815
3816		4286
3817	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4287	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3818	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4288	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3819	glClear GL_COLOR_BUFFER_BIT;	4289	glClear GL_COLOR_BUFFER_BIT;
3820		4290
…		…
3823	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4293	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3824	glMatrixMode GL_MODELVIEW;	4294	glMatrixMode GL_MODELVIEW;
3825	glLoadIdentity;	4295	glLoadIdentity;
3826		4296
3827	{	4297	{
3828	package CFClient::UI::Base;	4298	package CFPlus::UI::Base;
3829		4299
3830	($draw_x, $draw_y, $draw_w, $draw_h) =	4300	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3831	(0, 0, $self->{w}, $self->{h});	4301	(0, 0, $self->{w}, $self->{h});
3832	}
3833		4302
3834	$self->_draw;	4303	$self->_draw;
		4304	}
3835	}	4305	}
3836		4306
3837	#############################################################################	4307	#############################################################################
3838		4308
3839	package CFClient::UI;	4309	package CFPlus::UI;
3840		4310
3841	$ROOT = new CFClient::UI::Root;	4311	$ROOT = new CFPlus::UI::Root;
3842	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4312	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3843		4313
3844	1	4314	1
3845		4315

Diff Legend

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