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.314 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.367 by root, Fri Apr 27 00:59:14 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) {
98		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
100	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
101	}	125	}
102		126
103	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	128	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		129
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		131
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		133
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
112	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		136
114	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	139	$grab->update if $grab;
117	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
118		141
		142	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
120	}	144	}
121	}	145	}
122		146
123	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
124	my ($ev) = @_;	148	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
126		150
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		152
129	if ($widget != $HOVER) {	153	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		154
132	$hover->update if $hover && $hover->{can_hover};	155	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	156	if $HOVER;
140	}	157	}
141		158
142	# convert position array to integers	159	# convert position array to integers
143	sub harmonize {	160	sub harmonize {
…		…
193	reconfigure_widgets;	210	reconfigure_widgets;
194	}	211	}
195		212
196	#############################################################################	213	#############################################################################
197		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
198	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
199		224
200	use strict;	225	use strict;
201		226
202	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
203		228
204	sub new {	229	sub new {
205	my $class = shift;	230	my $class = shift;
206		231
207	my $self = bless {	232	my $self = bless {
…		…
212	h => undef,	237	h => undef,
213	can_events => 1,	238	can_events => 1,
214	@_	239	@_
215	}, $class;	240	}, $class;
216		241
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		243
219	for (keys %$self) {	244	for (keys %$self) {
220	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
222	}	247	}
223	}	248	}
224		249
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		255
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		258
234	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
239		264
240	sub destroy {	265	sub destroy {
241	my ($self) = @_;	266	my ($self) = @_;
242		267
243	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
244	%$self = ();	270	%$self = ();
245	}	271	}
246		272
247	sub show {	273	sub show {
248	my ($self) = @_;	274	my ($self) = @_;
249		275
250	return if $self->{parent};	276	return if $self->{parent};
251		277
252	$CFClient::UI::ROOT->add ($self);	278	$CFPlus::UI::ROOT->add ($self);
253	}	279	}
254		280
255	sub set_visible {	281	sub set_visible {
256	my ($self) = @_;	282	my ($self) = @_;
257		283
…		…
278	delete $self->{root};	304	delete $self->{root};
279		305
280	undef $GRAB if $GRAB == $self;	306	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	307	undef $HOVER if $HOVER == $self;
282		308
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	309	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	310	if $TOOLTIP->{owner} == $self;
285		311
286	$self->emit ("focus_out");	312	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	313	$self->emit (visibility_change => 0);
288	}	314	}
…		…
345	my ($self, $x, $y, $w, $h) = @_;	371	my ($self, $x, $y, $w, $h) = @_;
346		372
347	if ($self->{aspect}) {	373	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	374	my ($ow, $oh) = ($w, $h);
349		375
350	$w = List::Util::min $w, int $h * $self->{aspect};	376	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	377	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		378
353	# use alignment to adjust x, y	379	# use alignment to adjust x, y
354		380
355	$x += int 0.5 * ($ow - $w);	381	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	382	$y += int 0.5 * ($oh - $h);
…		…
397		423
398	return if $self->{tooltip} eq $tooltip;	424	return if $self->{tooltip} eq $tooltip;
399		425
400	$self->{tooltip} = $tooltip;	426	$self->{tooltip} = $tooltip;
401		427
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	428	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	429	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	430	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	431	}
406	}	432	}
407		433
408	# translate global coordinates to local coordinate system	434	# translate global coordinates to local coordinate system
409	sub coord2local {	435	sub coord2local {
410	my ($self, $x, $y) = @_;	436	my ($self, $x, $y) = @_;
411		437
		438	Carp::confess unless $self->{parent};#d#
		439
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	440	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	441	}
414		442
415	# translate local coordinates to global coordinate system	443	# translate local coordinates to global coordinate system
416	sub coord2global {	444	sub coord2global {
417	my ($self, $x, $y) = @_;	445	my ($self, $x, $y) = @_;
418		446
		447	Carp::confess unless $self->{parent};#d#
		448
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	449	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	450	}
421		451
422	sub invoke_focus_in {	452	sub invoke_focus_in {
423	my ($self) = @_;	453	my ($self) = @_;
424		454
425	return if $FOCUS == $self;	455	return if $FOCUS == $self;
426	return unless $self->{can_focus};	456	return unless $self->{can_focus};
427		457
428	my $focus = $FOCUS; $FOCUS = $self;	458	$FOCUS = $self;
429		459
430	$focus->update if $focus;	460	$self->update;
431	$FOCUS->update;
432		461
433	0	462	0
434	}	463	}
435		464
436	sub invoke_focus_out {	465	sub invoke_focus_out {
437	my ($self) = @_;	466	my ($self) = @_;
438		467
439	return unless $FOCUS == $self;	468	return unless $FOCUS == $self;
440		469
441	my $focus = $FOCUS; undef $FOCUS;	470	undef $FOCUS;
442		471
443	$focus->update if $focus; #?	472	$self->update;
444		473
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	474	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	475	unless $FOCUS;
447		476
448	0	477	0
449	}	478	}
450		479
451	sub grab_focus {	480	sub grab_focus {
452	my ($self) = @_;	481	my ($self) = @_;
453		482
		483	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	484	$self->emit ("focus_in");
455	}	485	}
456		486
457	sub invoke_mouse_motion { 1 }	487	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	488	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	489	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	490	sub invoke_key_up { 0 }
		491	sub invoke_mouse_wheel { 0 }
461		492
462	sub invoke_button_down {	493	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	494	my ($self, $ev, $x, $y) = @_;
464		495
465	$self->grab_focus;	496	$self->grab_focus;
466		497
467	1	498	0
468	}	499	}
469		500
470	sub connect {	501	sub connect {
471	my ($self, $signal, $cb) = @_;	502	my ($self, $signal, $cb) = @_;
472		503
473	push @{ $self->{signal_cb}{$signal} }, $cb;	504	push @{ $self->{signal_cb}{$signal} }, $cb;
		505
		506	defined wantarray and CFPlus::guard {
		507	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		508	@{ $self->{signal_cb}{$signal} };
		509	}
474	}	510	}
		511
		512	sub disconnect_all {
		513	my ($self, $signal) = @_;
		514
		515	delete $self->{signal_cb}{$signal};
		516	}
		517
		518	my %has_coords = (
		519	button_down => 1,
		520	button_up => 1,
		521	mouse_motion => 1,
		522	mouse_wheel => 1,
		523	);
475		524
476	sub emit {	525	sub emit {
477	my ($self, $signal, @args) = @_;	526	my ($self, $signal, @args) = @_;
478		527
479	#d##TODO# stop propagating at first true, do not use sum	528	# 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	529	# and needlessly verbose code, either.
		530	my @append
		531	= $has_coords{$signal}
		532	? $args[0]->xy ($self)
		533	: ();
		534
		535	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		536
		537	for my $cb (
		538	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	539	($self->can ("invoke_$signal") || sub { 1 }), # closure
		540	) {
		541	return $cb->($self, @args, @append) || next;
		542	}
		543
		544	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	545	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	546	}
484		547
485	sub find_widget {	548	sub find_widget {
486	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
487		550
…		…
495	}	558	}
496		559
497	sub set_parent {	560	sub set_parent {
498	my ($self, $parent) = @_;	561	my ($self, $parent) = @_;
499		562
500	Scalar::Util::weaken ($self->{parent} = $parent);	563	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	564	$self->set_visible if $parent->{visible};
502	}	565	}
503		566
504	sub realloc {	567	sub realloc {
505	my ($self) = @_;	568	my ($self) = @_;
…		…
571	glVertex $self->{w} - 1, 0;	634	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	635	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	636	glVertex 0 , $self->{h} - 1;
574	glEnd;	637	glEnd;
575	glPopMatrix;	638	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	639	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}	640	}
578		641
579	$self->_draw;	642	$self->_draw;
580	glPopMatrix;	643	glPopMatrix;
581	}	644	}
…		…
584	my ($self) = @_;	647	my ($self) = @_;
585		648
586	warn "no draw defined for $self\n";	649	warn "no draw defined for $self\n";
587	}	650	}
588		651
		652	my $cntx;#d#
589	sub DESTROY {	653	sub DESTROY {
590	my ($self) = @_;	654	my ($self) = @_;
591		655
592	delete $WIDGET{$self+0};	656	return if CFPlus::in_destruct;
593		657
594	eval { $self->destroy };	658	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		660
		661	delete $WIDGET{$self+0};
596	}	662	}
597		663
598	#############################################################################	664	#############################################################################
599		665
600	package CFClient::UI::DrawBG;	666	package CFPlus::UI::DrawBG;
601		667
602	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
603		669
604	use strict;	670	use strict;
605	use CFClient::OpenGL;	671	use CFPlus::OpenGL;
606		672
607	sub new {	673	sub new {
608	my $class = shift;	674	my $class = shift;
609		675
610	# range [value, low, high, page]	676	# range [value, low, high, page]
…		…
641	}	707	}
642	}	708	}
643		709
644	#############################################################################	710	#############################################################################
645		711
646	package CFClient::UI::Empty;	712	package CFPlus::UI::Empty;
647		713
648	our @ISA = CFClient::UI::Base::;	714	our @ISA = CFPlus::UI::Base::;
649		715
650	sub new {	716	sub new {
651	my ($class, %arg) = @_;	717	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	718	$class->SUPER::new (can_events => 0, %arg);
653	}	719	}
…		…
660		726
661	sub draw { }	727	sub draw { }
662		728
663	#############################################################################	729	#############################################################################
664		730
665	package CFClient::UI::Container;	731	package CFPlus::UI::Container;
666		732
667	our @ISA = CFClient::UI::Base::;	733	our @ISA = CFPlus::UI::Base::;
668		734
669	sub new {	735	sub new {
670	my ($class, %arg) = @_;	736	my ($class, %arg) = @_;
671		737
672	my $children = delete $arg{children};	738	my $children = delete $arg{children};
…		…
681	if $children;	747	if $children;
682		748
683	$self	749	$self
684	}	750	}
685		751
		752	sub realloc {
		753	my ($self) = @_;
		754
		755	$self->{force_realloc} = 1;
		756	$self->{force_size_alloc} = 1;
		757	$self->SUPER::realloc;
		758	}
		759
686	sub add {	760	sub add {
687	my ($self, @widgets) = @_;	761	my ($self, @widgets) = @_;
688		762
689	$_->set_parent ($self)	763	$_->set_parent ($self)
690	for @widgets;	764	for @widgets;
…		…
750	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
751	}	825	}
752		826
753	#############################################################################	827	#############################################################################
754		828
755	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
756		830
757	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
758		832
759	sub new {	833	sub new {
760	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
761		835
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		837
764	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
765	}	839	}
766		840
767	sub add {	841	sub add {
…		…
774	sub remove {	848	sub remove {
775	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
776		850
777	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
778		852
779	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	854	unless @{$self->{children}};
781	}	855	}
782		856
783	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
784		858
…		…
796		870
797	#############################################################################	871	#############################################################################
798		872
799	# back-buffered drawing area	873	# back-buffered drawing area
800		874
801	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
802		876
803	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
804		878
805	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
806		880
807	sub new {	881	sub new {
808	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
809		883
810	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
832	}	906	}
833		907
834	sub render_child {	908	sub render_child {
835	my ($self) = @_;	909	my ($self) = @_;
836		910
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	911	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
840		914
841	{	915	{
842	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
843		917
844	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
846	}	922	}
847
848	$self->_render;
849	};	923	};
850	}	924	}
851		925
852	sub _draw {	926	sub _draw {
853	my ($self) = @_;	927	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		928
857	my $tex = $self->{texture}	929	my $tex = $self->{texture}
858	or return;	930	or return;
859		931
860	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
863		935
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
865		937
866	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
867	}	939	}
868		940
869	#############################################################################	941	#############################################################################
870		942
871	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
872		944
873	our @ISA = CFClient::UI::Window::;	945	our @ISA = CFPlus::UI::Window::;
874		946
875	sub new {	947	sub new {
876	my $class = shift;	948	my $class = shift;
877		949
878	$class->SUPER::new (	950	$class->SUPER::new (
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1010	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1011	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1012	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1013	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1014	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1015	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1016	}
945	}	1017	}
946		1018
947	sub _render {	1019	sub _render {
948	my ($self) = @_;	1020	my ($self) = @_;
949		1021
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1022	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};	1023	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1024
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1025	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1026
955	$self->SUPER::_render;	1027	$self->SUPER::_render;
956	}	1028	}
957		1029
958	#############################################################################	1030	#############################################################################
959		1031
960	package CFClient::UI::ScrolledWindow;	1032	package CFPlus::UI::ScrolledWindow;
961		1033
962	our @ISA = CFClient::UI::HBox::;	1034	our @ISA = CFPlus::UI::HBox::;
963		1035
964	sub new {	1036	sub new {
965	my ($class, %arg) = @_;	1037	my ($class, %arg) = @_;
966		1038
967	my $child = delete $arg{child};	1039	my $child = delete $arg{child};
968		1040
969	my $self;	1041	my $self;
970		1042
971	my $slider = new CFClient::UI::Slider	1043	my $slider = new CFPlus::UI::Slider
972	vertical => 1,	1044	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1045	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1046	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1047	$self->{vp}->set_offset (0, $_[1]);
976	},	1048	},
977	;	1049	;
978		1050
979	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1052	vp => (new CFPlus::UI::ViewPort expand => 1),
		1053	can_events => 1,
981	slider => $slider,	1054	slider => $slider,
982	%arg,	1055	%arg,
983	);	1056	);
984		1057
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1058	$self->SUPER::add ($self->{vp}, $self->{slider});
986	$self->add ($child) if $child;	1059	$self->add ($child) if $child;
…		…
994	my ($self, $widget) = @_;	1067	my ($self, $widget) = @_;
995		1068
996	$self->{vp}->add ($self->{child} = $widget);	1069	$self->{vp}->add ($self->{child} = $widget);
997	}	1070	}
998		1071
		1072	sub invoke_mouse_wheel {
		1073	my ($self, $ev) = @_;
		1074
		1075	return 0 unless $ev->{dy}; # only vertical movements
		1076
		1077	$self->{slider}->emit (mouse_wheel => $ev);
		1078
		1079	1
		1080	}
		1081
999	sub update_slider {	1082	sub update_slider {
1000	my ($self) = @_;	1083	my ($self) = @_;
1001		1084
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1085	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003	}	1086	}
…		…
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1101	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1102	}
1020		1103
1021	#############################################################################	1104	#############################################################################
1022		1105
1023	package CFClient::UI::Frame;	1106	package CFPlus::UI::Frame;
1024		1107
1025	our @ISA = CFClient::UI::Bin::;	1108	our @ISA = CFPlus::UI::Bin::;
1026		1109
1027	use CFClient::OpenGL;	1110	use CFPlus::OpenGL;
1028		1111
1029	sub new {	1112	sub new {
1030	my $class = shift;	1113	my $class = shift;
1031		1114
1032	$class->SUPER::new (	1115	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1141	$self->SUPER::_draw;
1059	}	1142	}
1060		1143
1061	#############################################################################	1144	#############################################################################
1062		1145
1063	package CFClient::UI::FancyFrame;	1146	package CFPlus::UI::FancyFrame;
1064		1147
1065	our @ISA = CFClient::UI::Bin::;	1148	our @ISA = CFPlus::UI::Bin::;
1066		1149
1067	use CFClient::OpenGL;	1150	use CFPlus::OpenGL;
		1151
		1152	sub new {
		1153	my ($class, %arg) = @_;
		1154
		1155	if ((exists $arg{label}) && !ref $arg{label}) {
		1156	$arg{label} = new CFPlus::UI::Label
		1157	align => 1,
		1158	valign => 0,
		1159	text => $arg{label},
		1160	fontsize => ($arg{border} || 0.8) * 0.75;
		1161	}
		1162
		1163	my $self = $class->SUPER::new (
		1164	# label => "",
		1165	fg => [0.6, 0.3, 0.1],
		1166	border => 0.8,
		1167	style => 'single',
		1168	%arg,
		1169	);
		1170
		1171	$self
		1172	}
		1173
		1174	sub add {
		1175	my ($self, @widgets) = @_;
		1176
		1177	$self->SUPER::add (@widgets);
		1178	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1179	}
		1180
		1181	sub border {
		1182	int $_[0]{border} * $::FONTSIZE
		1183	}
		1184
		1185	sub size_request {
		1186	my ($self) = @_;
		1187
		1188	($self->{label_w}, undef) = $self->{label}->size_request
		1189	if $self->{label};
		1190
		1191	my ($w, $h) = $self->SUPER::size_request;
		1192
		1193	(
		1194	$w + $self->border * 2,
		1195	$h + $self->border * 2,
		1196	)
		1197	}
		1198
		1199	sub invoke_size_allocate {
		1200	my ($self, $w, $h) = @_;
		1201
		1202	my $border = $self->border;
		1203
		1204	$w -= List::Util::max 0, $border * 2;
		1205	$h -= List::Util::max 0, $border * 2;
		1206
		1207	if (my $label = $self->{label}) {
		1208	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1209	$label->{h} = List::Util::min $h, $border;
		1210	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1211	}
		1212
		1213	$self->child->configure ($border, $border, $w, $h);
		1214
		1215	1
		1216	}
		1217
		1218	sub _draw {
		1219	my ($self) = @_;
		1220
		1221	my $child = $self->{children}[0];
		1222
		1223	my $border = $self->border;
		1224	my ($w, $h) = ($self->{w}, $self->{h});
		1225
		1226	$child->draw;
		1227
		1228	glColor @{$self->{fg}};
		1229	glBegin GL_LINE_STRIP;
		1230	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1231	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1232	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1233	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1234	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1235	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1236	glEnd;
		1237
		1238	if ($self->{label}) {
		1239	glTranslate $border * 2, 0;
		1240	$self->{label}->_draw;
		1241	}
		1242	}
		1243
		1244	#############################################################################
		1245
		1246	package CFPlus::UI::Toplevel;
		1247
		1248	our @ISA = CFPlus::UI::Bin::;
		1249
		1250	use CFPlus::OpenGL;
1068		1251
1069	my $bg =	1252	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1253	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1254	mipmap => 1, wrap => 1;
1072		1255
1073	my @border =	1256	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1257	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);	1258	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1259
1077	sub new {	1260	sub new {
1078	my ($class, %arg) = @_;	1261	my ($class, %arg) = @_;
1079		1262
1080	my $self = $class->SUPER::new (	1263	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1264	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1265	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1266	border => 0.6,
1084	can_events => 1,	1267	can_events => 1,
1085	min_w => 16,	1268	min_w => 64,
1086	min_h => 16,	1269	min_h => 32,
1087	%arg,	1270	%arg,
1088	);	1271	);
1089		1272
1090	$self->{title_widget} = new CFClient::UI::Label	1273	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1274	align => 0,
1092	valign => 1,	1275	valign => 1,
1093	text => $self->{title},	1276	text => $self->{title},
1094	fontsize => $self->{border},	1277	fontsize => $self->{border},
1095	if exists $self->{title};	1278	if exists $self->{title};
1096		1279
1097	if ($self->{has_close_button}) {	1280	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1281	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1282	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1283	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1284	on_activate => sub { $self->emit ("delete") };
1102		1285
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1286	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1287	}
1105		1288
1106	$self	1289	$self
1107	}	1290	}
1108		1291
1109	sub add {	1292	sub add {
1110	my ($self, @widgets) = @_;	1293	my ($self, @widgets) = @_;
1111		1294
1112	$self->SUPER::add (@widgets);	1295	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1296	$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};	1297	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1298	}
1116		1299
1117	sub border {	1300	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1301	int $_[0]{border} * $::FONTSIZE
1119	}	1302	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1335	$self->child->configure ($border, $border, $w, $h);
1153		1336
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1337	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1338	if $self->{close_button};
1156		1339
		1340	1
		1341	}
		1342
		1343	sub invoke_delete {
		1344	my ($self) = @_;
		1345
		1346	$self->hide;
		1347
1157	1	1348	1
1158	}	1349	}
1159		1350
1160	sub invoke_button_down {	1351	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1352	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1410	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1411
1221	! ! $self->{motion}	1412	! ! $self->{motion}
1222	}	1413	}
1223		1414
		1415	sub invoke_visibility_change {
		1416	my ($self, $visible) = @_;
		1417
		1418	delete $self->{motion} unless $visible;
		1419
		1420	0
		1421	}
		1422
1224	sub _draw {	1423	sub _draw {
1225	my ($self) = @_;	1424	my ($self) = @_;
1226		1425
1227	my $child = $self->{children}[0];	1426	my $child = $self->{children}[0];
1228		1427
…		…
1265	if $self->{close_button};	1464	if $self->{close_button};
1266	}	1465	}
1267		1466
1268	#############################################################################	1467	#############################################################################
1269		1468
1270	package CFClient::UI::Table;	1469	package CFPlus::UI::Table;
1271		1470
1272	our @ISA = CFClient::UI::Base::;	1471	our @ISA = CFPlus::UI::Base::;
1273		1472
1274	use List::Util qw(max sum);	1473	use List::Util qw(max sum);
1275		1474
1276	use CFClient::OpenGL;	1475	use CFPlus::OpenGL;
1277		1476
1278	sub new {	1477	sub new {
1279	my $class = shift;	1478	my $class = shift;
1280		1479
1281	$class->SUPER::new (	1480	$class->SUPER::new (
…		…
1287	sub children {	1486	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1487	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}	1488	}
1290		1489
1291	sub add {	1490	sub add {
1292	my ($self, $x, $y, $child) = @_;	1491	my ($self) = shift;
1293		1492
		1493	while (@_) {
		1494	my ($x, $y, $child) = splice @_, 0, 3, ();
1294	$child->set_parent ($self);	1495	$child->set_parent ($self);
1295	$self->{children}[$y][$x] = $child;	1496	$self->{children}[$y][$x] = $child;
		1497	}
1296		1498
		1499	$self->{force_realloc} = 1;
		1500	$self->{force_size_alloc} = 1;
1297	$self->realloc;	1501	$self->realloc;
1298	}	1502	}
1299		1503
1300	sub remove {	1504	sub remove {
1301	my ($self, $child) = @_;	1505	my ($self, $child) = @_;
…		…
1366		1570
1367	# linearly scale sizes	1571	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1572	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1573	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1574
1371	CFClient::UI::harmonize $ws;	1575	CFPlus::UI::harmonize $ws;
1372	CFClient::UI::harmonize $hs;	1576	CFPlus::UI::harmonize $hs;
1373		1577
1374	my $y;	1578	my $y;
1375		1579
1376	for my $r (0 .. $#{$self->{children}}) {	1580	for my $r (0 .. $#{$self->{children}}) {
1377	my $row = $self->{children}[$r]	1581	my $row = $self->{children}[$r]
…		…
1420	}	1624	}
1421	}	1625	}
1422		1626
1423	#############################################################################	1627	#############################################################################
1424		1628
1425	package CFClient::UI::Box;	1629	package CFPlus::UI::Box;
1426		1630
1427	our @ISA = CFClient::UI::Container::;	1631	our @ISA = CFPlus::UI::Container::;
1428		1632
1429	sub size_request {	1633	sub size_request {
1430	my ($self) = @_;	1634	my ($self) = @_;
1431		1635
1432	$self->{vertical}	1636	$self->{vertical}
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1669	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1670	for 0 .. $#children;
1467	}	1671	}
1468	}	1672	}
1469		1673
1470	CFClient::UI::harmonize \@req;	1674	CFPlus::UI::harmonize \@req;
1471		1675
1472	my $pos = 0;	1676	my $pos = 0;
1473	for (0 .. $#children) {	1677	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1678	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1679	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1684	1
1481	}	1685	}
1482		1686
1483	#############################################################################	1687	#############################################################################
1484		1688
1485	package CFClient::UI::HBox;	1689	package CFPlus::UI::HBox;
1486		1690
1487	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1488		1692
1489	sub new {	1693	sub new {
1490	my $class = shift;	1694	my $class = shift;
1491		1695
1492	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1495	)	1699	)
1496	}	1700	}
1497		1701
1498	#############################################################################	1702	#############################################################################
1499		1703
1500	package CFClient::UI::VBox;	1704	package CFPlus::UI::VBox;
1501		1705
1502	our @ISA = CFClient::UI::Box::;	1706	our @ISA = CFPlus::UI::Box::;
1503		1707
1504	sub new {	1708	sub new {
1505	my $class = shift;	1709	my $class = shift;
1506		1710
1507	$class->SUPER::new (	1711	$class->SUPER::new (
…		…
1510	)	1714	)
1511	}	1715	}
1512		1716
1513	#############################################################################	1717	#############################################################################
1514		1718
1515	package CFClient::UI::Label;	1719	package CFPlus::UI::Label;
1516		1720
1517	our @ISA = CFClient::UI::DrawBG::;	1721	our @ISA = CFPlus::UI::DrawBG::;
1518		1722
1519	use CFClient::OpenGL;	1723	use CFPlus::OpenGL;
1520		1724
1521	sub new {	1725	sub new {
1522	my ($class, %arg) = @_;	1726	my ($class, %arg) = @_;
1523		1727
1524	my $self = $class->SUPER::new (	1728	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1731	#active_bg => none
1528	#font => default_font	1732	#font => default_font
1529	#text => initial text	1733	#text => initial text
1530	#markup => initial narkup	1734	#markup => initial narkup
1531	#max_w => maximum pixel width	1735	#max_w => maximum pixel width
		1736	#style => 0, # render flags
1532	ellipsise => 3, # end	1737	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1738	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1739	fontsize => 1,
1535	align => -1,	1740	align => -1,
1536	valign => -1,	1741	valign => -1,
1537	padding_x => 2,	1742	padding_x => 2,
1538	padding_y => 2,	1743	padding_y => 2,
1539	can_events => 0,	1744	can_events => 0,
1540	%arg	1745	%arg
1541	);	1746	);
1542		1747
1543	if (exists $self->{template}) {	1748	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1749	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1750	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1751	$self->{template} = $layout;
1547	}	1752	}
1548		1753
1549	if (exists $self->{markup}) {	1754	if (exists $self->{markup}) {
…		…
1553	}	1758	}
1554		1759
1555	$self	1760	$self
1556	}	1761	}
1557		1762
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 {	1763	sub update {
1569	my ($self) = @_;	1764	my ($self) = @_;
1570		1765
1571	delete $self->{texture};	1766	delete $self->{texture};
1572	$self->SUPER::update;	1767	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1778	my ($self, $text) = @_;
1584		1779
1585	return if $self->{text} eq "T$text";	1780	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1781	$self->{text} = "T$text";
1587		1782
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1783	$self->{layout}->set_text ($text);
1590		1784
1591	delete $self->{size_req};	1785	delete $self->{size_req};
1592	$self->realloc;	1786	$self->realloc;
1593	$self->update;	1787	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1793	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1794	$self->{text} = "M$markup";
1601		1795
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1796	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1797
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1798	$self->{layout}->set_markup ($markup);
1606		1799
1607	delete $self->{size_req};	1800	delete $self->{size_req};
1608	$self->realloc;	1801	$self->realloc;
1609	$self->update;	1802	$self->update;
…		…
1621		1814
1622	my ($w, $h) = $self->{layout}->size;	1815	my ($w, $h) = $self->{layout}->size;
1623		1816
1624	if (exists $self->{template}) {	1817	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1818	$self->{template}->set_font ($self->{font}) if $self->{font};
		1819	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1820	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1821
1628	my ($w2, $h2) = $self->{template}->size;	1822	my ($w2, $h2) = $self->{template}->size;
1629		1823
1630	$w = List::Util::max $w, $w2;	1824	$w = List::Util::max $w, $w2;
…		…
1654		1848
1655	sub set_fontsize {	1849	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	1850	my ($self, $fontsize) = @_;
1657		1851
1658	$self->{fontsize} = $fontsize;	1852	$self->{fontsize} = $fontsize;
		1853	delete $self->{size_req};
1659	delete $self->{texture};	1854	delete $self->{texture};
1660		1855
1661	$self->realloc;	1856	$self->realloc;
1662	}	1857	}
1663		1858
1664	sub reconfigure {	1859	sub reconfigure {
1665	my ($self) = @_;	1860	my ($self) = @_;
1666		1861
1667	delete $self->{size_req};	1862	delete $self->{size_req};
		1863	delete $self->{texture};
1668		1864
1669	$self->SUPER::reconfigure;	1865	$self->SUPER::reconfigure;
1670	}	1866	}
1671		1867
1672	sub _draw {	1868	sub _draw {
1673	my ($self) = @_;	1869	my ($self) = @_;
1674		1870
1675	$self->SUPER::_draw; # draw background, if applicable	1871	$self->SUPER::_draw; # draw background, if applicable
1676		1872
1677	my $tex = $self->{texture} ||= do {	1873	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	1874	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	1875	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	1876	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	1877	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1878	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1879	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		1880
1685	new_from_layout CFClient::Texture $self->{layout}	1881	[$self->{layout}->size]
1686	};	1882	};
1687		1883
1688	unless (exists $self->{ox}) {	1884	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1885	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1886	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	1887	: ($self->{w} - $size->[0]) * 0.5);
1692		1888
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1889	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1890	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	1891	: ($self->{h} - $size->[1]) * 0.5);
1696	};	1892	};
1697		1893
1698	glEnable GL_TEXTURE_2D;
1699
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1894	my $w = List::Util::min $self->{w} + 4, $size->[0];
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1895	my $h = List::Util::min $self->{h} + 2, $size->[1];
1702		1896
1703	if ($tex->{format} == GL_ALPHA) {	1897	$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	}	1898	}
1714		1899
1715	#############################################################################	1900	#############################################################################
1716		1901
1717	package CFClient::UI::EntryBase;	1902	package CFPlus::UI::EntryBase;
1718		1903
1719	our @ISA = CFClient::UI::Label::;	1904	our @ISA = CFPlus::UI::Label::;
1720		1905
1721	use CFClient::OpenGL;	1906	use CFPlus::OpenGL;
1722		1907
1723	sub new {	1908	sub new {
1724	my $class = shift;	1909	my $class = shift;
1725		1910
1726	$class->SUPER::new (	1911	$class->SUPER::new (
…		…
1730	active_fg => [0, 0, 0],	1915	active_fg => [0, 0, 0],
1731	can_hover => 1,	1916	can_hover => 1,
1732	can_focus => 1,	1917	can_focus => 1,
1733	valign => 0,	1918	valign => 0,
1734	can_events => 1,	1919	can_events => 1,
		1920	ellipsise => 0,
1735	#text => ...	1921	#text => ...
1736	#hidden => "*",	1922	#hidden => "*",
1737	@_	1923	@_
1738	)	1924	)
1739	}	1925	}
…		…
1784	my $sym = $ev->{sym};	1970	my $sym = $ev->{sym};
1785	my $uni = $ev->{unicode};	1971	my $uni = $ev->{unicode};
1786		1972
1787	my $text = $self->get_text;	1973	my $text = $self->get_text;
1788		1974
		1975	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		1976
1789	if ($uni == 8) {	1977	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1978	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	1979	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	1980	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	1981	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	1982	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	1983	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	1984	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	1985	} elsif ($sym == CFPlus::SDLK_HOME) {
		1986	# what a hack
		1987	$self->{cursor} =
		1988	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1989	? length $1
		1990	: 0;
		1991	} elsif ($sym == CFPlus::SDLK_END) {
		1992	# uh, again
		1993	$self->{cursor} =
		1994	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1995	? $self->{cursor} + length $1
		1996	: length $self->{text};
		1997	} elsif ($uni == 21) { # ctrl-u
		1998	$text = "";
1798	$self->{cursor} = 0;	1999	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {
1800	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	2000	} elsif ($uni == 27) {
1802	$self->emit ('escape');	2001	$self->emit ('escape');
1803	} elsif ($uni) {	2002	} elsif ($uni == 0x0d) {
		2003	substr $text, $self->{cursor}++, 0, "\012";
		2004	} elsif ($uni >= 0x20) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	2005	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	2006	} else {
1806	return 0;	2007	return 0;
1807	}	2008	}
1808		2009
1809	$self->_set_text ($text);	2010	$self->_set_text ($text);
1810		2011
1811	$self->realloc;	2012	$self->realloc;
		2013	$self->update;
1812		2014
1813	1	2015	1
1814	}	2016	}
1815		2017
1816	sub invoke_focus_in {	2018	sub invoke_focus_in {
…		…
1828		2030
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2031	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2032
1831	# byte-index to char-index	2033	# byte-index to char-index
1832	my $text = $self->{text};	2034	my $text = $self->{text};
1833	utf8::encode $text;	2035	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2036	$self->{cursor} = length $text;
1835		2037
1836	$self->_set_text ($self->{text});	2038	$self->_set_text ($self->{text});
1837	$self->update;	2039	$self->update;
1838		2040
1839	1	2041	1
…		…
1878	utf8::encode $text;	2080	utf8::encode $text;
1879		2081
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2082	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881	}	2083	}
1882		2084
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2085	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2086	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};	2087	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2088	glEnd;
1888	}	2089	}
1889	}	2090	}
1890		2091
		2092	#############################################################################
		2093
1891	package CFClient::UI::Entry;	2094	package CFPlus::UI::Entry;
1892		2095
1893	our @ISA = CFClient::UI::EntryBase::;	2096	our @ISA = CFPlus::UI::EntryBase::;
1894		2097
1895	use CFClient::OpenGL;	2098	use CFPlus::OpenGL;
1896		2099
1897	sub invoke_key_down {	2100	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2101	my ($self, $ev) = @_;
1899		2102
1900	my $sym = $ev->{sym};	2103	my $sym = $ev->{sym};
1901		2104
1902	if ($sym == 13) {	2105	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2106	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2107	my $txt = $self->get_text;
1905		2108
1906	$self->{history_pointer} = -1;	2109	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2110	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2111	$self->emit (activate => $txt);
1909	$self->update;	2112	$self->update;
1910		2113
1911	} elsif ($sym == CFClient::SDLK_UP) {	2114	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2115	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2116	$self->{history_saveback} = $self->get_text;
1914	}	2117	}
1915	if (@{$self->{history} || []} > 0) {	2118	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2119	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2121	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2122	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2123	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2124	}
1922		2125
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2126	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2127	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2128	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2129
1927	if ($self->{history_pointer} >= 0) {	2130	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2131	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2140	1
1938	}	2141	}
1939		2142
1940	#############################################################################	2143	#############################################################################
1941		2144
		2145	package CFPlus::UI::TextEdit;
		2146
		2147	our @ISA = CFPlus::UI::EntryBase::;
		2148
		2149	use CFPlus::OpenGL;
		2150
		2151	sub move_cursor_ver {
		2152	my ($self, $dy) = @_;
		2153
		2154	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2155
		2156	$y += $dy;
		2157
		2158	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2159	$self->{cursor} = $index;
		2160	delete $self->{cur_h};
		2161	$self->update;
		2162	return;
		2163	}
		2164	}
		2165
		2166	sub invoke_key_down {
		2167	my ($self, $ev) = @_;
		2168
		2169	my $sym = $ev->{sym};
		2170
		2171	if ($sym == CFPlus::SDLK_UP) {
		2172	$self->move_cursor_ver (-1);
		2173	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2174	$self->move_cursor_ver (+1);
		2175	} else {
		2176	return $self->SUPER::invoke_key_down ($ev)
		2177	}
		2178
		2179	1
		2180	}
		2181
		2182	#############################################################################
		2183
1942	package CFClient::UI::Button;	2184	package CFPlus::UI::Button;
1943		2185
1944	our @ISA = CFClient::UI::Label::;	2186	our @ISA = CFPlus::UI::Label::;
1945		2187
1946	use CFClient::OpenGL;	2188	use CFPlus::OpenGL;
1947		2189
1948	my @tex =	2190	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2191	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2192	qw(b1_button_active.png);
1951		2193
1952	sub new {	2194	sub new {
1953	my $class = shift;	2195	my $class = shift;
1954		2196
…		…
1991	$self->SUPER::_draw;	2233	$self->SUPER::_draw;
1992	}	2234	}
1993		2235
1994	#############################################################################	2236	#############################################################################
1995		2237
		2238	package CFPlus::UI::CheckBox;
		2239
		2240	our @ISA = CFPlus::UI::DrawBG::;
		2241
		2242	my @tex =
		2243	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2244	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2245
		2246	use CFPlus::OpenGL;
		2247
		2248	sub new {
		2249	my $class = shift;
		2250
		2251	$class->SUPER::new (
		2252	padding_x => 2,
		2253	padding_y => 2,
		2254	fg => [1, 1, 1],
		2255	active_fg => [1, 1, 0],
		2256	bg => [0, 0, 0, 0.2],
		2257	active_bg => [1, 1, 1, 0.5],
		2258	state => 0,
		2259	can_hover => 1,
		2260	@_
		2261	)
		2262	}
		2263
		2264	sub size_request {
		2265	my ($self) = @_;
		2266
		2267	(6) x 2
		2268	}
		2269
		2270	sub toggle {
		2271	my ($self) = @_;
		2272
		2273	$self->{state} = !$self->{state};
		2274	$self->emit (changed => $self->{state});
		2275	$self->update;
		2276	}
		2277
		2278	sub invoke_button_down {
		2279	my ($self, $ev, $x, $y) = @_;
		2280
		2281	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2282	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2283	$self->toggle;
		2284	} else {
		2285	return 0
		2286	}
		2287
		2288	1
		2289	}
		2290
		2291	sub _draw {
		2292	my ($self) = @_;
		2293
		2294	$self->SUPER::_draw;
		2295
		2296	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2297
		2298	my ($w, $h) = @$self{qw(w h)};
		2299
		2300	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2301
		2302	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2303
		2304	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2305
		2306	glEnable GL_TEXTURE_2D;
		2307	$tex->draw_quad_alpha (0, 0, $s, $s);
		2308	glDisable GL_TEXTURE_2D;
		2309	}
		2310
		2311	#############################################################################
		2312
		2313	package CFPlus::UI::Image;
		2314
		2315	our @ISA = CFPlus::UI::Base::;
		2316
		2317	use CFPlus::OpenGL;
		2318
		2319	our %texture_cache;
		2320
		2321	sub new {
		2322	my $class = shift;
		2323
		2324	my $self = $class->SUPER::new (
		2325	can_events => 0,
		2326	@_,
		2327	);
		2328
		2329	$self->{path} || $self->{tex}
		2330	or Carp::croak "'path' or 'tex' attributes required";
		2331
		2332	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2333	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2334
		2335	CFPlus::weaken $texture_cache{$self->{path}};
		2336
		2337	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2338
		2339	$self
		2340	}
		2341
		2342	sub STORABLE_freeze {
		2343	my ($self, $cloning) = @_;
		2344
		2345	$self->{path}
		2346	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2347
		2348	$self->{path}
		2349	}
		2350
		2351	sub STORABLE_attach {
		2352	my ($self, $cloning, $path) = @_;
		2353
		2354	$self->new (path => $path)
		2355	}
		2356
		2357	sub size_request {
		2358	my ($self) = @_;
		2359
		2360	($self->{tex}{w}, $self->{tex}{h})
		2361	}
		2362
		2363	sub _draw {
		2364	my ($self) = @_;
		2365
		2366	my $tex = $self->{tex};
		2367
		2368	my ($w, $h) = ($self->{w}, $self->{h});
		2369
		2370	if ($self->{rot90}) {
		2371	glRotate 90, 0, 0, 1;
		2372	glTranslate 0, -$self->{w}, 0;
		2373
		2374	($w, $h) = ($h, $w);
		2375	}
		2376
		2377	glEnable GL_TEXTURE_2D;
		2378	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2379
		2380	$tex->draw_quad (0, 0, $w, $h);
		2381
		2382	glDisable GL_TEXTURE_2D;
		2383	}
		2384
		2385	#############################################################################
		2386
1996	package CFClient::UI::ImageButton;	2387	package CFPlus::UI::ImageButton;
1997		2388
1998	our @ISA = CFClient::UI::Image::;	2389	our @ISA = CFPlus::UI::Image::;
1999		2390
2000	use CFClient::OpenGL;	2391	use CFPlus::OpenGL;
2001		2392
2002	my %textures;	2393	my %textures;
2003		2394
2004	sub new {	2395	sub new {
2005	my $class = shift;	2396	my $class = shift;
…		…
2027	1	2418	1
2028	}	2419	}
2029		2420
2030	#############################################################################	2421	#############################################################################
2031		2422
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;	2423	package CFPlus::UI::VGauge;
2101		2424
2102	our @ISA = CFClient::UI::Base::;	2425	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		2426
2163	use List::Util qw(min max);	2427	use List::Util qw(min max);
2164		2428
2165	use CFClient::OpenGL;	2429	use CFPlus::OpenGL;
2166		2430
2167	my %tex = (	2431	my %tex = (
2168	food => [	2432	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2433	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2434	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2435	],
2172	grace => [	2436	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2437	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/	2438	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2439	],
2176	hp => [	2440	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2442	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2443	],
2180	mana => [	2444	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2445	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/	2446	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2447	],
2184	);	2448	);
2185		2449
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2450	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2510	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2511	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2512
2249	my $h1 = $self->{h} * (1 - $ycut1);	2513	my $h1 = $self->{h} * (1 - $ycut1);
2250	my $h2 = $self->{h} * (1 - $ycut2);	2514	my $h2 = $self->{h} * (1 - $ycut2);
		2515	my $h3 = $self->{h};
		2516
		2517	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251		2518
2252	glEnable GL_BLEND;	2519	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2520	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2521	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2522	glEnable GL_TEXTURE_2D;
…		…
2274		2541
2275	if ($t3) {	2542	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2543	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2544	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2545	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2546	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2547	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2548	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2549	glEnd;
2283	}	2550	}
2284		2551
2285	glDisable GL_BLEND;	2552	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2553	glDisable GL_TEXTURE_2D;
2287	}	2554	}
2288		2555
2289	#############################################################################	2556	#############################################################################
2290		2557
2291	package CFClient::UI::Gauge;	2558	package CFPlus::UI::Gauge;
2292		2559
2293	our @ISA = CFClient::UI::VBox::;	2560	our @ISA = CFPlus::UI::VBox::;
2294		2561
2295	sub new {	2562	sub new {
2296	my ($class, %arg) = @_;	2563	my ($class, %arg) = @_;
2297		2564
2298	my $self = $class->SUPER::new (	2565	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2567	can_hover => 1,
2301	can_events => 1,	2568	can_events => 1,
2302	%arg,	2569	%arg,
2303	);	2570	);
2304		2571
2305	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2572	$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);	2573	$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");	2574	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308		2575
2309	$self	2576	$self
2310	}	2577	}
2311		2578
2312	sub set_fontsize {	2579	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2600	$self->{value}->set_text ($val);
2334	}	2601	}
2335		2602
2336	#############################################################################	2603	#############################################################################
2337		2604
2338	package CFClient::UI::Slider;	2605	package CFPlus::UI::Slider;
2339		2606
2340	use strict;	2607	use strict;
2341		2608
2342	use CFClient::OpenGL;	2609	use CFPlus::OpenGL;
2343		2610
2344	our @ISA = CFClient::UI::DrawBG::;	2611	our @ISA = CFPlus::UI::DrawBG::;
2345		2612
2346	my @tex =	2613	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2614	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2615	qw(s1_slider.png s1_slider_bg.png);
2349		2616
2350	sub new {	2617	sub new {
2351	my $class = shift;	2618	my $class = shift;
2352		2619
…		…
2441	}	2708	}
2442		2709
2443	1	2710	1
2444	}	2711	}
2445		2712
		2713	sub invoke_mouse_wheel {
		2714	my ($self, $ev) = @_;
		2715
		2716	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2717
		2718	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2719
		2720	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2721
		2722	! ! $delta
		2723	}
		2724
2446	sub update {	2725	sub update {
2447	my ($self) = @_;	2726	my ($self) = @_;
2448		2727
2449	delete $self->{knob_w};	2728	delete $self->{knob_w};
2450	$self->SUPER::update;	2729	$self->SUPER::update;
…		…
2497	glDisable GL_TEXTURE_2D;	2776	glDisable GL_TEXTURE_2D;
2498	}	2777	}
2499		2778
2500	#############################################################################	2779	#############################################################################
2501		2780
2502	package CFClient::UI::ValSlider;	2781	package CFPlus::UI::ValSlider;
2503		2782
2504	our @ISA = CFClient::UI::HBox::;	2783	our @ISA = CFPlus::UI::HBox::;
2505		2784
2506	sub new {	2785	sub new {
2507	my ($class, %arg) = @_;	2786	my ($class, %arg) = @_;
2508		2787
2509	my $range = delete $arg{range};	2788	my $range = delete $arg{range};
2510		2789
2511	my $self = $class->SUPER::new (	2790	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2791	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2792	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	2793	to_value => sub { shift },
2515	from_value => sub { shift },	2794	from_value => sub { shift },
2516	%arg,	2795	%arg,
2517	);	2796	);
2518		2797
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	2817	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	2818	sub set_value { shift->{slider}->set_value (@_) }
2540		2819
2541	#############################################################################	2820	#############################################################################
2542		2821
2543	package CFClient::UI::TextScroller;	2822	package CFPlus::UI::TextScroller;
2544		2823
2545	our @ISA = CFClient::UI::HBox::;	2824	our @ISA = CFPlus::UI::HBox::;
2546		2825
2547	use CFClient::OpenGL;	2826	use CFPlus::OpenGL;
2548		2827
2549	sub new {	2828	sub new {
2550	my $class = shift;	2829	my $class = shift;
2551		2830
2552	my $self = $class->SUPER::new (	2831	my $self = $class->SUPER::new (
2553	fontsize => 1,	2832	fontsize => 1,
2554	can_events => 0,	2833	can_events => 1,
2555	indent => 0,	2834	indent => 0,
2556	#font => default_font	2835	#font => default_font
2557	@_,	2836	@_,
2558		2837
2559	layout => (new CFClient::Layout 1),	2838	layout => (new CFPlus::Layout),
2560	par => [],	2839	par => [],
		2840	max_par => 0,
2561	height => 0,	2841	height => 0,
2562	children => [	2842	children => [
2563	(new CFClient::UI::Empty expand => 1),	2843	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	2844	(new CFPlus::UI::Slider vertical => 1),
2565	],	2845	],
2566	);	2846	);
2567		2847
2568	$self->{children}[1]->connect (changed => sub { $self->update });	2848	$self->{children}[1]->connect (changed => sub { $self->update });
2569		2849
…		…
2599		2879
2600	$self->reflow;	2880	$self->reflow;
2601		2881
2602	local $self->{children} = [$empty, $slider];	2882	local $self->{children} = [$empty, $slider];
2603	$self->SUPER::invoke_size_allocate ($w, $h)	2883	$self->SUPER::invoke_size_allocate ($w, $h)
		2884	}
		2885
		2886	sub invoke_mouse_wheel {
		2887	my ($self, $ev) = @_;
		2888
		2889	return 0 unless $ev->{dy}; # only vertical movements
		2890
		2891	$self->{children}[1]->emit (mouse_wheel => $ev);
		2892
		2893	1
2604	}	2894	}
2605		2895
2606	sub get_layout {	2896	sub get_layout {
2607	my ($self, $para) = @_;	2897	my ($self, $para) = @_;
2608		2898
…		…
2636		2926
2637	# todo: base offset on lines or so, not on pixels	2927	# todo: base offset on lines or so, not on pixels
2638	$self->{children}[1]->set_value ($offset);	2928	$self->{children}[1]->set_value ($offset);
2639	}	2929	}
2640		2930
		2931	sub current_paragraph {
		2932	my ($self) = @_;
		2933
		2934	$self->{top_paragraph} - 1
		2935	}
		2936
		2937	sub scroll_to {
		2938	my ($self, $para) = @_;
		2939
		2940	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2941
		2942	$self->{scroll_to} = $para;
		2943	$self->update;
		2944	}
		2945
2641	sub clear {	2946	sub clear {
2642	my ($self) = @_;	2947	my ($self) = @_;
2643		2948
2644	my (undef, undef, @other) = @{ $self->{children} };	2949	my (undef, undef, @other) = @{ $self->{children} };
2645	$self->remove ($_) for @other;	2950	$self->remove ($_) for @other;
…		…
2648	$self->{height} = 0;	2953	$self->{height} = 0;
2649	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2954	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2650	}	2955	}
2651		2956
2652	sub add_paragraph {	2957	sub add_paragraph {
2653	my ($self, $color, $para, $indent) = @_;	2958	my $self = shift;
2654		2959
2655	my ($text, @w) = ref $para ? @$para : $para;	2960	for my $para (@_) {
2656
2657	$para = {	2961	$para = {
		2962	fg => [1, 1, 1, 1],
		2963	indent => 0,
		2964	markup => "",
		2965	widget => [],
		2966	ref $para ? %$para : (markup => $para),
2658	w => 1e10,	2967	w => 1e10,
2659	wrapped => 1,	2968	wrapped => 1,
2660	fg => $color,
2661	indent => $indent,
2662	markup => $text,
2663	widget => \@w,
2664	};	2969	};
2665		2970
2666	$self->add (@w) if @w;	2971	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2667	push @{$self->{par}}, $para;	2972	push @{$self->{par}}, $para;
		2973	}
		2974
		2975	if (my $max = $self->{max_par}) {
		2976	shift @{$self->{par}} while @{$self->{par}} > $max;
		2977	}
2668		2978
2669	$self->{need_reflow}++;	2979	$self->{need_reflow}++;
2670	$self->update;	2980	$self->update;
2671	}	2981	}
2672		2982
2673	sub scroll_to_bottom {	2983	sub scroll_to_bottom {
2674	my ($self) = @_;	2984	my ($self) = @_;
2675		2985
2676	$self->{scroll_to_bottom} = 1;	2986	$self->{scroll_to} = $#{$self->{par}};
2677	$self->update;	2987	$self->update;
2678	}	2988	}
2679		2989
		2990	sub force_uptodate {
		2991	my ($self) = @_;
		2992
		2993	if (delete $self->{need_reflow}) {
		2994	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2995
		2996	my $height = 0;
		2997
		2998	for my $para (@{$self->{par}}) {
		2999	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3000	my $layout = $self->get_layout ($para);
		3001	my ($w, $h) = $layout->size;
		3002
		3003	$para->{w} = $w + $para->{indent};
		3004	$para->{h} = $h;
		3005	$para->{wrapped} = $layout->has_wrapped;
		3006	}
		3007
		3008	$para->{y} = $height;
		3009	$height += $para->{h};
		3010	}
		3011
		3012	$self->{height} = $height;
		3013	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3014
		3015	delete $self->{texture};
		3016	}
		3017
		3018	if (my $paridx = delete $self->{scroll_to}) {
		3019	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3020	}
		3021	}
		3022
2680	sub update {	3023	sub update {
2681	my ($self) = @_;	3024	my ($self) = @_;
2682		3025
2683	$self->SUPER::update;	3026	$self->SUPER::update;
2684		3027
2685	return unless $self->{h} > 0;	3028	return unless $self->{h} > 0;
2686		3029
2687	delete $self->{texture};	3030	delete $self->{texture};
2688		3031
2689	$ROOT->on_post_alloc ($self => sub {	3032	$ROOT->on_post_alloc ($self => sub {
		3033	$self->force_uptodate;
		3034
2690	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3035	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2691		3036
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 {	3037	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2720	glClearColor 0, 0, 0, 0;	3038	glClearColor 0, 0, 0, 0;
2721	glClear GL_COLOR_BUFFER_BIT;	3039	glClear GL_COLOR_BUFFER_BIT;
2722		3040
		3041	package CFPlus::UI::Base;
		3042	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3043	(0, 0, $self->{w}, $self->{h});
		3044
		3045	my $top = int $self->{children}[1]{range}[0];
		3046
		3047	my $paridx = 0;
		3048	my $top_paragraph;
2723	my $top = int $self->{children}[1]{range}[0];	3049	my $top = int $self->{children}[1]{range}[0];
2724		3050
2725	my $y0 = $top;	3051	my $y0 = $top;
2726	my $y1 = $top + $H;	3052	my $y1 = $top + $H;
2727		3053
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}}) {	3054	for my $para (@{$self->{par}}) {
2735	my $h = $para->{h};	3055	my $h = $para->{h};
		3056	my $y = $para->{y};
2736		3057
2737	if ($y0 < $y + $h && $y < $y1) {	3058	if ($y0 < $y + $h && $y < $y1) {
2738
2739	my $layout = $self->get_layout ($para);	3059	my $layout = $self->get_layout ($para);
2740		3060
2741	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743	glRasterPos $para->{indent}, $y - $y0;	3061	$layout->render ($para->{indent}, $y - $y0);
2744	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745		3062
2746	if (my @w = @{ $para->{widget} }) {	3063	if (my @w = @{ $para->{widget} }) {
2747	my @s = $layout->get_shapes;	3064	my @s = $layout->get_shapes;
2748		3065
2749	glDisable GL_BLEND;
2750	for (@w) {	3066	for (@w) {
2751	my ($dx, $dy) = splice @s, 0, 2, ();	3067	my ($dx, $dy) = splice @s, 0, 2, ();
2752		3068
2753	$_->{x} = $dx + $para->{indent};	3069	$_->{x} = $dx + $para->{indent};
2754	$_->{y} = $dy + $y - $y0;	3070	$_->{y} = $dy + $y - $y0;
2755		3071
2756	$_->draw;	3072	$_->draw;
2757	}	3073	}
2758	glEnable GL_BLEND;
2759	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760	}	3074	}
2761	}	3075	}
2762		3076
2763	$y += $h;	3077	$paridx++;
		3078	$top_paragraph ||= $paridx if $y >= $top;
2764	}	3079	}
2765		3080
2766	glDisable GL_BLEND;	3081	$self->{top_paragraph} = $top_paragraph;
2767	};	3082	};
2768	});	3083	});
2769	}	3084	}
2770		3085
2771	sub reconfigure {	3086	sub reconfigure {
…		…
2789	$self->{children}[1]->draw;	3104	$self->{children}[1]->draw;
2790	}	3105	}
2791		3106
2792	#############################################################################	3107	#############################################################################
2793		3108
2794	package CFClient::UI::Animator;	3109	package CFPlus::UI::Animator;
2795		3110
2796	use CFClient::OpenGL;	3111	use CFPlus::OpenGL;
2797		3112
2798	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2799		3114
2800	sub moveto {	3115	sub moveto {
2801	my ($self, $x, $y) = @_;	3116	my ($self, $x, $y) = @_;
2802		3117
2803	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3118	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2831	glPopMatrix;	3146	glPopMatrix;
2832	}	3147	}
2833		3148
2834	#############################################################################	3149	#############################################################################
2835		3150
2836	package CFClient::UI::Flopper;	3151	package CFPlus::UI::Flopper;
2837		3152
2838	our @ISA = CFClient::UI::Button::;	3153	our @ISA = CFPlus::UI::Button::;
2839		3154
2840	sub new {	3155	sub new {
2841	my $class = shift;	3156	my $class = shift;
2842		3157
2843	my $self = $class->SUPER::new (	3158	my $self = $class->SUPER::new (
…		…
2855	$self->{other}->toggle_visibility;	3170	$self->{other}->toggle_visibility;
2856	}	3171	}
2857		3172
2858	#############################################################################	3173	#############################################################################
2859		3174
2860	package CFClient::UI::Tooltip;	3175	package CFPlus::UI::Tooltip;
2861		3176
2862	our @ISA = CFClient::UI::Bin::;	3177	our @ISA = CFPlus::UI::Bin::;
2863		3178
2864	use CFClient::OpenGL;	3179	use CFPlus::OpenGL;
2865		3180
2866	sub new {	3181	sub new {
2867	my $class = shift;	3182	my $class = shift;
2868		3183
2869	$class->SUPER::new (	3184	$class->SUPER::new (
…		…
2872	)	3187	)
2873	}	3188	}
2874		3189
2875	sub set_tooltip_from {	3190	sub set_tooltip_from {
2876	my ($self, $widget) = @_;	3191	my ($self, $widget) = @_;
		3192
		3193	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3194	if $widget->{tooltip} =~ /^#(.*)$/;
2877		3195
2878	my $tooltip = $widget->{tooltip};	3196	my $tooltip = $widget->{tooltip};
2879		3197
2880	if ($ENV{CFPLUS_DEBUG} & 2) {	3198	if ($ENV{CFPLUS_DEBUG} & 2) {
2881	$tooltip .= "\n\n" . (ref $widget) . "\n"	3199	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2885	}	3203	}
2886		3204
2887	$tooltip =~ s/^\n+//;	3205	$tooltip =~ s/^\n+//;
2888	$tooltip =~ s/\n+$//;	3206	$tooltip =~ s/\n+$//;
2889		3207
2890	$self->add (new CFClient::UI::Label	3208	$self->add (new CFPlus::UI::Label
2891	markup => $tooltip,	3209	markup => $tooltip,
2892	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3210	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2893	fontsize => 0.8,	3211	fontsize => 0.8,
2894	fg => [0, 0, 0, 1],	3212	style => 1, # FLAG_INVERSE
2895	ellipsise => 0,	3213	ellipsise => 0,
2896	font => ($widget->{tooltip_font} || $::FONT_PROP),	3214	font => ($widget->{tooltip_font} || $::FONT_PROP),
2897	);	3215	);
2898	}	3216	}
2899		3217
…		…
2918		3236
2919	$self->{root}->on_post_alloc ("move_$self" => sub {	3237	$self->{root}->on_post_alloc ("move_$self" => sub {
2920	my $widget = $self->{owner}	3238	my $widget = $self->{owner}
2921	or return;	3239	or return;
2922		3240
		3241	if ($widget->{visible}) {
2923	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3242	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924		3243
2925	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3244	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926	if $x + $self->{w} > $self->{root}{w};	3245	if $x + $self->{w} > $self->{root}{w};
2927		3246
2928	$self->move_abs ($x, $y);	3247	$self->move_abs ($x, $y);
		3248	} else {
		3249	$self->hide;
		3250	}
2929	});	3251	});
2930	}	3252	}
2931		3253
2932	sub _draw {	3254	sub _draw {
2933	my ($self) = @_;	3255	my ($self) = @_;
…		…
2957	$self->SUPER::_draw;	3279	$self->SUPER::_draw;
2958	}	3280	}
2959		3281
2960	#############################################################################	3282	#############################################################################
2961		3283
2962	package CFClient::UI::Face;	3284	package CFPlus::UI::Face;
2963		3285
2964	our @ISA = CFClient::UI::Base::;	3286	our @ISA = CFPlus::UI::DrawBG::;
2965		3287
2966	use CFClient::OpenGL;	3288	use CFPlus::OpenGL;
2967		3289
2968	sub new {	3290	sub new {
2969	my $class = shift;	3291	my $class = shift;
2970		3292
2971	my $self = $class->SUPER::new (	3293	my $self = $class->SUPER::new (
…		…
2973	can_events => 0,	3295	can_events => 0,
2974	@_,	3296	@_,
2975	);	3297	);
2976		3298
2977	if ($self->{anim} && $self->{animspeed}) {	3299	if ($self->{anim} && $self->{animspeed}) {
2978	Scalar::Util::weaken (my $widget = $self);	3300	CFPlus::weaken (my $widget = $self);
2979		3301
2980	$self->{timer} = Event->timer (	3302	$self->{timer} = Event->timer (
2981	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3303	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2982	hard => 1,	3304	hard => 1,
2983	interval => $self->{animspeed},	3305	interval => $self->{animspeed},
…		…
3006	sub _draw {	3328	sub _draw {
3007	my ($self) = @_;	3329	my ($self) = @_;
3008		3330
3009	return unless $::CONN;	3331	return unless $::CONN;
3010		3332
		3333	$self->SUPER::_draw;
		3334
3011	my $face;	3335	my $face;
3012		3336
3013	if ($self->{frame}) {	3337	if ($self->{frame}) {
3014	my $anim = $::CONN->{anim}[$self->{anim}];	3338	my $anim = $::CONN->{anim}[$self->{anim}];
3015		3339
…		…
3037	$self->SUPER::destroy;	3361	$self->SUPER::destroy;
3038	}	3362	}
3039		3363
3040	#############################################################################	3364	#############################################################################
3041		3365
3042	package CFClient::UI::Buttonbar;	3366	package CFPlus::UI::Buttonbar;
3043		3367
3044	our @ISA = CFClient::UI::HBox::;	3368	our @ISA = CFPlus::UI::HBox::;
3045		3369
3046	# TODO: should actualyl wrap buttons and other goodies.	3370	# TODO: should actually wrap buttons and other goodies.
3047		3371
3048	#############################################################################	3372	#############################################################################
3049		3373
3050	package CFClient::UI::Menu;	3374	package CFPlus::UI::Menu;
3051		3375
3052	our @ISA = CFClient::UI::FancyFrame::;	3376	our @ISA = CFPlus::UI::Toplevel::;
3053		3377
3054	use CFClient::OpenGL;	3378	use CFPlus::OpenGL;
3055		3379
3056	sub new {	3380	sub new {
3057	my $class = shift;	3381	my $class = shift;
3058		3382
3059	my $self = $class->SUPER::new (	3383	my $self = $class->SUPER::new (
3060	items => [],	3384	items => [],
3061	z => 100,	3385	z => 100,
3062	@_,	3386	@_,
3063	);	3387	);
3064		3388
3065	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3389	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3066		3390
3067	for my $item (@{ $self->{items} }) {	3391	for my $item (@{ $self->{items} }) {
3068	my ($widget, $cb, $tooltip) = @$item;	3392	my ($widget, $cb, $tooltip) = @$item;
3069		3393
3070	# handle various types of items, only text for now	3394	# handle various types of items, only text for now
3071	if (!ref $widget) {	3395	if (!ref $widget) {
		3396	if ($widget =~ /\t/) {
		3397	my ($left, $right) = split /\t/, $widget, 2;
		3398
3072	$widget = new CFClient::UI::Label	3399	$widget = new CFPlus::UI::HBox
3073	can_hover => 1,	3400	can_hover => 1,
3074	can_events => 1,	3401	can_events => 1,
		3402	tooltip => $tooltip,
		3403	children => [
		3404	(new CFPlus::UI::Label markup => $left, expand => 1),
		3405	(new CFPlus::UI::Label markup => $right, align => +1),
		3406	],
		3407	;
		3408
		3409	} else {
		3410	$widget = new CFPlus::UI::Label
		3411	can_hover => 1,
		3412	can_events => 1,
3075	markup => $widget,	3413	markup => $widget,
3076	tooltip => $tooltip	3414	tooltip => $tooltip;
		3415	}
3077	}	3416	}
3078		3417
3079	$self->{item}{$widget} = $item;	3418	$self->{item}{$widget} = $item;
3080		3419
3081	$self->{vbox}->add ($widget);	3420	$self->{vbox}->add ($widget);
…		…
3124	1	3463	1
3125	}	3464	}
3126		3465
3127	#############################################################################	3466	#############################################################################
3128		3467
3129	package CFClient::UI::Multiplexer;	3468	package CFPlus::UI::Multiplexer;
3130		3469
3131	our @ISA = CFClient::UI::Container::;	3470	our @ISA = CFPlus::UI::Container::;
3132		3471
3133	sub new {	3472	sub new {
3134	my $class = shift;	3473	my $class = shift;
3135		3474
3136	my $self = $class->SUPER::new (	3475	my $self = $class->SUPER::new (
…		…
3150		3489
3151	$self->{current} = $self->{children}[0]	3490	$self->{current} = $self->{children}[0]
3152	if @{ $self->{children} };	3491	if @{ $self->{children} };
3153	}	3492	}
3154		3493
		3494	sub get_current_page {
		3495	my ($self) = @_;
		3496
		3497	$self->{current}
		3498	}
		3499
3155	sub set_current_page {	3500	sub set_current_page {
3156	my ($self, $page_or_widget) = @_;	3501	my ($self, $page_or_widget) = @_;
3157		3502
3158	my $widget = ref $page_or_widget	3503	my $widget = ref $page_or_widget
3159	? $page_or_widget	3504	? $page_or_widget
…		…
3191	$self->{current}->draw;	3536	$self->{current}->draw;
3192	}	3537	}
3193		3538
3194	#############################################################################	3539	#############################################################################
3195		3540
3196	package CFClient::UI::Notebook;	3541	package CFPlus::UI::Notebook;
3197		3542
3198	our @ISA = CFClient::UI::VBox::;	3543	our @ISA = CFPlus::UI::VBox::;
3199		3544
3200	sub new {	3545	sub new {
3201	my $class = shift;	3546	my $class = shift;
3202		3547
3203	my $self = $class->SUPER::new (	3548	my $self = $class->SUPER::new (
3204	buttonbar => (new CFClient::UI::Buttonbar),	3549	buttonbar => (new CFPlus::UI::Buttonbar),
3205	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3550	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3206	# filter => # will be put between multiplexer and $self	3551	# filter => # will be put between multiplexer and $self
3207	@_,	3552	@_,
3208	);	3553	);
3209		3554
3210	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3555	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3214	}	3559	}
3215		3560
3216	sub add {	3561	sub add {
3217	my ($self, $title, $widget, $tooltip) = @_;	3562	my ($self, $title, $widget, $tooltip) = @_;
3218		3563
3219	Scalar::Util::weaken $self;	3564	CFPlus::weaken $self;
3220		3565
3221	$self->{buttonbar}->add (new CFClient::UI::Button	3566	$self->{buttonbar}->add (new CFPlus::UI::Button
3222	markup => $title,	3567	markup => $title,
3223	tooltip => $tooltip,	3568	tooltip => $tooltip,
3224	on_activate => sub { $self->set_current_page ($widget) },	3569	on_activate => sub { $self->set_current_page ($widget) },
3225	);	3570	);
3226		3571
3227	$self->{multiplexer}->add ($widget);	3572	$self->{multiplexer}->add ($widget);
3228	}	3573	}
3229		3574
		3575	sub get_current_page {
		3576	my ($self) = @_;
		3577
		3578	$self->{multiplexer}->get_current_page
		3579	}
		3580
3230	sub set_current_page {	3581	sub set_current_page {
3231	my ($self, $page) = @_;	3582	my ($self, $page) = @_;
3232		3583
3233	$self->{multiplexer}->set_current_page ($page);	3584	$self->{multiplexer}->set_current_page ($page);
3234	$self->emit (page_changed => $self->{multiplexer}{current});	3585	$self->emit (page_changed => $self->{multiplexer}{current});
3235	}	3586	}
3236		3587
3237	#############################################################################	3588	#############################################################################
3238		3589
3239	package CFClient::UI::Combobox;	3590	package CFPlus::UI::Selector;
3240		3591
3241	use utf8;	3592	use utf8;
3242		3593
3243	our @ISA = CFClient::UI::Button::;	3594	our @ISA = CFPlus::UI::Button::;
3244		3595
3245	sub new {	3596	sub new {
3246	my $class = shift;	3597	my $class = shift;
3247		3598
3248	my $self = $class->SUPER::new (	3599	my $self = $class->SUPER::new (
…		…
3265	my ($value, $title, $tooltip) = @$_;	3616	my ($value, $title, $tooltip) = @$_;
3266		3617
3267	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3618	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268	}	3619	}
3269		3620
3270	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3621	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271	}	3622	}
3272		3623
3273	sub _set_value {	3624	sub _set_value {
3274	my ($self, $value) = @_;	3625	my ($self, $value) = @_;
3275		3626
…		…
3290	$self->emit (changed => $value);	3641	$self->emit (changed => $value);
3291	}	3642	}
3292		3643
3293	#############################################################################	3644	#############################################################################
3294		3645
3295	package CFClient::UI::Statusbox;	3646	package CFPlus::UI::Statusbox;
3296		3647
3297	our @ISA = CFClient::UI::VBox::;	3648	our @ISA = CFPlus::UI::VBox::;
3298		3649
3299	sub new {	3650	sub new {
3300	my $class = shift;	3651	my $class = shift;
3301		3652
3302	my $self = $class->SUPER::new (	3653	my $self = $class->SUPER::new (
3303	fontsize => 0.8,	3654	fontsize => 0.8,
3304	@_,	3655	@_,
3305	);	3656	);
3306		3657
3307	Scalar::Util::weaken (my $this = $self);	3658	CFPlus::weaken (my $this = $self);
3308		3659
3309	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3660	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310		3661
3311	$self	3662	$self
3312	}	3663	}
…		…
3314	sub reorder {	3665	sub reorder {
3315	my ($self) = @_;	3666	my ($self) = @_;
3316	my $NOW = Time::HiRes::time;	3667	my $NOW = Time::HiRes::time;
3317		3668
3318	# freeze display when hovering over any label	3669	# freeze display when hovering over any label
3319	return if $CFClient::UI::TOOLTIP->{owner}	3670	return if $CFPlus::UI::TOOLTIP->{owner}
3320	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3671	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3321	values %{ $self->{item} };	3672	values %{ $self->{item} };
3322		3673
3323	while (my ($k, $v) = each %{ $self->{item} }) {	3674	while (my ($k, $v) = each %{ $self->{item} }) {
3324	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3675	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325	}	3676	}
…		…
3346	for ($short) {	3697	for ($short) {
3347	s/^\s+//;	3698	s/^\s+//;
3348	s/\s+/ /g;	3699	s/\s+/ /g;
3349	}	3700	}
3350		3701
3351	new CFClient::UI::Label	3702	new CFPlus::UI::Label
3352	markup => $short,	3703	markup => $short,
3353	tooltip => $item->{tooltip},	3704	tooltip => $item->{tooltip},
3354	tooltip_font => $::FONT_PROP,	3705	tooltip_font => $::FONT_PROP,
3355	tooltip_width => 0.67,	3706	tooltip_width => 0.67,
3356	fontsize => $item->{fontsize} || $self->{fontsize},	3707	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3410	count => 1,	3761	count => 1,
3411	%arg,	3762	%arg,
3412	};	3763	};
3413	}	3764	}
3414		3765
		3766	$ROOT->on_refresh (reorder => sub {
3415	$self->reorder;	3767	$self->reorder;
		3768	});
3416	}	3769	}
3417		3770
3418	sub reconfigure {	3771	sub reconfigure {
3419	my ($self) = @_;	3772	my ($self) = @_;
3420		3773
…		…
3433	$self->SUPER::destroy;	3786	$self->SUPER::destroy;
3434	}	3787	}
3435		3788
3436	#############################################################################	3789	#############################################################################
3437		3790
3438	package CFClient::UI::Inventory;
3439
3440	our @ISA = CFClient::UI::ScrolledWindow::;
3441
3442	sub new {
3443	my $class = shift;
3444
3445	my $self = $class->SUPER::new (
3446	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3447	@_,
3448	);
3449
3450	$self
3451	}
3452
3453	sub set_items {
3454	my ($self, $items) = @_;
3455
3456	$self->{child}->clear;
3457	return unless $items;
3458
3459	my @items = sort {
3460	($a->{type} <=> $b->{type})
3461	or ($a->{name} cmp $b->{name})
3462	} @$items;
3463
3464	$self->{real_items} = \@items;
3465
3466	my $row = 0;
3467	for my $item (@items) {
3468	CFClient::Item::update_widgets $item;
3469
3470	$self->{child}->add (0, $row, $item->{face_widget});
3471	$self->{child}->add (1, $row, $item->{desc_widget});
3472	$self->{child}->add (2, $row, $item->{weight_widget});
3473
3474	$row++;
3475	}
3476	}
3477
3478	#############################################################################
3479
3480	package CFClient::UI::SpellList;
3481
3482	our @ISA = CFClient::UI::Table::;
3483
3484	sub new {
3485	my $class = shift;
3486
3487	my $self = $class->SUPER::new (
3488	binding => [],
3489	commands => [],
3490	@_,
3491	)
3492	}
3493
3494	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3495
3496	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3497	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3498	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3500	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3501	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3502	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3504	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3506
3507	sub rebuild_spell_list {
3508	my ($self) = @_;
3509
3510	$CFClient::UI::ROOT->on_refresh ($self => sub {
3511	$self->clear;
3512
3513	return unless $::CONN;
3514
3515	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520
3521	my $row = 0;
3522
3523	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524	my $spell = $self->{spell}{$_};
3525
3526	$row++;
3527
3528	my $spell_cb = sub {
3529	my ($widget, $ev) = @_;
3530
3531	if ($ev->{button} == 1) {
3532	$::CONN->user_send ("cast $spell->{name}");
3533	} elsif ($ev->{button} == 2) {
3534	$::CONN->user_send ("invoke $spell->{name}");
3535	} elsif ($ev->{button} == 3) {
3536	(new CFClient::UI::Menu
3537	items => [
3538	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540	],
3541	)->popup ($ev);
3542	} else {
3543	return 0;
3544	}
3545
3546	1
3547	};
3548
3549	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550
3551	#TODO: add path info to tooltip
3552	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3553
3554	$self->add (0, $row, new CFClient::UI::Face
3555	face => $spell->{face},
3556	can_hover => 1,
3557	can_events => 1,
3558	tooltip => $tooltip,
3559	on_button_down => $spell_cb,
3560	);
3561
3562	$self->add (1, $row, new CFClient::UI::Label
3563	expand => 1,
3564	text => $spell->{name},
3565	can_hover => 1,
3566	can_events => 1,
3567	tooltip => $tooltip,
3568	on_button_down => $spell_cb,
3569	);
3570
3571	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575	}
3576	});
3577	}
3578
3579	sub add_spell {
3580	my ($self, $spell) = @_;
3581
3582	$self->{spell}->{$spell->{name}} = $spell;
3583	$self->rebuild_spell_list;
3584	}
3585
3586	sub remove_spell {
3587	my ($self, $spell) = @_;
3588
3589	delete $self->{spell}->{$spell->{name}};
3590	$self->rebuild_spell_list;
3591	}
3592
3593	sub clear_spells {
3594	my ($self) = @_;
3595
3596	$self->{spell} = {};
3597	$self->rebuild_spell_list;
3598	}
3599
3600	#############################################################################
3601
3602	package CFClient::UI::Root;	3791	package CFPlus::UI::Root;
3603		3792
3604	our @ISA = CFClient::UI::Container::;	3793	our @ISA = CFPlus::UI::Container::;
3605		3794
3606	use List::Util qw(min max);	3795	use List::Util qw(min max);
3607		3796
3608	use CFClient::OpenGL;	3797	use CFPlus::OpenGL;
3609		3798
3610	sub new {	3799	sub new {
3611	my $class = shift;	3800	my $class = shift;
3612		3801
3613	my $self = $class->SUPER::new (	3802	my $self = $class->SUPER::new (
3614	visible => 1,	3803	visible => 1,
3615	@_,	3804	@_,
3616	);	3805	);
3617		3806
3618	Scalar::Util::weaken ($self->{root} = $self);	3807	CFPlus::weaken ($self->{root} = $self);
3619		3808
3620	$self	3809	$self
3621	}	3810	}
3622		3811
3623	sub size_request {	3812	sub size_request {
…		…
3789	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3978	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3790		3979
3791	$w = 0 if $w < 0;	3980	$w = 0 if $w < 0;
3792	$h = 0 if $h < 0;	3981	$h = 0 if $h < 0;
3793		3982
		3983	$w = max $widget->{min_w}, $w;
		3984	$h = max $widget->{min_h}, $h;
		3985
		3986	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3987	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3988
		3989	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3990	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3991
3794	$w = int $w + 0.5;	3992	$w = int $w + 0.5;
3795	$h = int $h + 0.5;	3993	$h = int $h + 0.5;
3796		3994
3797	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3995	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3798	$widget->{old_w} = $widget->{w};	3996	$widget->{old_w} = $widget->{w};
…		…
3821	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4019	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3822	glMatrixMode GL_MODELVIEW;	4020	glMatrixMode GL_MODELVIEW;
3823	glLoadIdentity;	4021	glLoadIdentity;
3824		4022
3825	{	4023	{
3826	package CFClient::UI::Base;	4024	package CFPlus::UI::Base;
3827		4025
3828	($draw_x, $draw_y, $draw_w, $draw_h) =	4026	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3829	(0, 0, $self->{w}, $self->{h});	4027	(0, 0, $self->{w}, $self->{h});
3830	}
3831		4028
3832	$self->_draw;	4029	$self->_draw;
		4030	}
3833	}	4031	}
3834		4032
3835	#############################################################################	4033	#############################################################################
3836		4034
3837	package CFClient::UI;	4035	package CFPlus::UI;
3838		4036
3839	$ROOT = new CFClient::UI::Root;	4037	$ROOT = new CFPlus::UI::Root;
3840	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4038	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3841		4039
3842	1	4040	1
3843		4041

Diff Legend

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